Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions crates/bindings-typescript/src/lib/procedures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ export function procedure<
const paramsType: ProductType = {
elements: Object.entries(params).map(([n, c]) => ({
name: n,
algebraicType:
'typeBuilder' in c ? c.typeBuilder.algebraicType : c.algebraicType,
algebraicType: registerTypesRecursively(
'typeBuilder' in c ? c.typeBuilder : c
).algebraicType,
})),
};
const returnType = registerTypesRecursively(ret).algebraicType;
Expand Down
1 change: 1 addition & 0 deletions crates/codegen/src/rust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ impl {func_name} for super::RemoteReducers {{
{callback_id}(self.imp.on_reducer(
{reducer_name:?},
Box::new(move |ctx: &super::ReducerEventContext| {{
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {{
event: __sdk::ReducerEvent {{
reducer: super::Reducer::{enum_variant_name} {{
Expand Down
14 changes: 14 additions & 0 deletions crates/codegen/tests/snapshots/codegen__codegen_rust.snap
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ impl add_player for super::RemoteReducers {
AddPlayerCallbackId(self.imp.on_reducer(
"add_player",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::AddPlayer {
Expand Down Expand Up @@ -181,6 +182,7 @@ impl add_private for super::RemoteReducers {
AddPrivateCallbackId(self.imp.on_reducer(
"add_private",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::AddPrivate {
Expand Down Expand Up @@ -294,6 +296,7 @@ age: u8,
AddCallbackId(self.imp.on_reducer(
"add",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::Add {
Expand Down Expand Up @@ -398,6 +401,7 @@ impl assert_caller_identity_is_module_identity for super::RemoteReducers {
AssertCallerIdentityIsModuleIdentityCallbackId(self.imp.on_reducer(
"assert_caller_identity_is_module_identity",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::AssertCallerIdentityIsModuleIdentity {
Expand Down Expand Up @@ -527,6 +531,7 @@ impl client_connected for super::RemoteReducers {
ClientConnectedCallbackId(self.imp.on_reducer(
"client_connected",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::ClientConnected {
Expand Down Expand Up @@ -636,6 +641,7 @@ impl delete_player for super::RemoteReducers {
DeletePlayerCallbackId(self.imp.on_reducer(
"delete_player",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::DeletePlayer {
Expand Down Expand Up @@ -745,6 +751,7 @@ impl delete_players_by_name for super::RemoteReducers {
DeletePlayersByNameCallbackId(self.imp.on_reducer(
"delete_players_by_name",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::DeletePlayersByName {
Expand Down Expand Up @@ -1066,6 +1073,7 @@ impl list_over_age for super::RemoteReducers {
ListOverAgeCallbackId(self.imp.on_reducer(
"list_over_age",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::ListOverAge {
Expand Down Expand Up @@ -1170,6 +1178,7 @@ impl log_module_identity for super::RemoteReducers {
LogModuleIdentityCallbackId(self.imp.on_reducer(
"log_module_identity",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::LogModuleIdentity {
Expand Down Expand Up @@ -3567,6 +3576,7 @@ impl query_private for super::RemoteReducers {
QueryPrivateCallbackId(self.imp.on_reducer(
"query_private",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::QueryPrivate {
Expand Down Expand Up @@ -3852,6 +3862,7 @@ impl repeating_test for super::RemoteReducers {
RepeatingTestCallbackId(self.imp.on_reducer(
"repeating_test",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::RepeatingTest {
Expand Down Expand Up @@ -4015,6 +4026,7 @@ impl say_hello for super::RemoteReducers {
SayHelloCallbackId(self.imp.on_reducer(
"say_hello",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::SayHello {
Expand Down Expand Up @@ -4325,6 +4337,7 @@ impl test_btree_index_args for super::RemoteReducers {
TestBtreeIndexArgsCallbackId(self.imp.on_reducer(
"test_btree_index_args",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::TestBtreeIndexArgs {
Expand Down Expand Up @@ -4878,6 +4891,7 @@ arg_4: NamespaceTestF,
TestCallbackId(self.imp.on_reducer(
"test",
Box::new(move |ctx: &super::ReducerEventContext| {
#[allow(irrefutable_let_patterns)]
let super::ReducerEventContext {
event: __sdk::ReducerEvent {
reducer: super::Reducer::Test {
Expand Down
9 changes: 9 additions & 0 deletions crates/core/src/host/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use spacetimedb_lib::bsatn;
use spacetimedb_lib::de::{serde::SeedWrapper, DeserializeSeed};
use spacetimedb_lib::ProductValue;
use spacetimedb_schema::def::deserialize::{ArgsSeed, FunctionDef};
use spacetimedb_schema::def::ModuleDef;

mod disk_storage;
mod host_controller;
Expand Down Expand Up @@ -41,6 +42,14 @@ pub enum FunctionArgs {
}

impl FunctionArgs {
fn into_tuple_for_def<Def: FunctionDef>(
self,
module: &ModuleDef,
def: &Def,
) -> Result<ArgsTuple, InvalidFunctionArguments> {
self.into_tuple(module.arg_seed_for(def))
}

fn into_tuple<Def: FunctionDef>(self, seed: ArgsSeed<'_, Def>) -> Result<ArgsTuple, InvalidFunctionArguments> {
self._into_tuple(seed).map_err(|err| InvalidFunctionArguments {
err,
Expand Down
Loading
Loading