[bot/reopen-database-lock]: Merge remote-tracking branch 'origin/master' into bot/reopen-database-lock

Author: bfops

.github/workflows/ci.yml

@@ -261,6 +261,9 @@ jobs:
 
           wasm-bindgen --version
 
+      - name: Check engine simulation build
+        run: cargo check -p spacetimedb-engine --no-default-features --features simulation
+
         # Source emsdk environment to make emcc (Emscripten compiler) available in PATH.
       - name: Run tests
         run: |

Cargo.lock

@@ -14,6 +14,7 @@ members = [
   "crates/data-structures",
   "crates/datastore",
   "crates/durability",
+  "crates/engine",
   "crates/execution",
   "crates/expr",
   "crates/guard",
@@ -133,8 +134,10 @@ spacetimedb-core = { path = "crates/core", version = "=2.6.0" }
 spacetimedb-data-structures = { path = "crates/data-structures", version = "=2.6.0" }
 spacetimedb-datastore = { path = "crates/datastore", version = "=2.6.0" }
 spacetimedb-durability = { path = "crates/durability", version = "=2.6.0" }
+spacetimedb-engine = { path = "crates/engine", version = "=2.6.0" }
 spacetimedb-execution = { path = "crates/execution", version = "=2.6.0" }
 spacetimedb-expr = { path = "crates/expr", version = "=2.6.0" }
+spacetimedb-fs-utils = { path = "crates/fs-utils", version = "=2.6.0" }
 spacetimedb-guard = { path = "crates/guard", version = "=2.6.0" }
 spacetimedb-lib = { path = "crates/lib", default-features = false, version = "=2.6.0" }
 spacetimedb-memory-usage = { path = "crates/memory-usage", version = "=2.6.0", default-features = false }
@@ -144,16 +147,15 @@ spacetimedb-pg = { path = "crates/pg", version = "=2.6.0" }
 spacetimedb-physical-plan = { path = "crates/physical-plan", version = "=2.6.0" }
 spacetimedb-primitives = { path = "crates/primitives", version = "=2.6.0" }
 spacetimedb-query = { path = "crates/query", version = "=2.6.0" }
+spacetimedb-query-builder = { path = "crates/query-builder", version = "=2.6.0" }
+spacetimedb-runtime = { path = "crates/runtime", version = "=2.6.0" }
 spacetimedb-sats = { path = "crates/sats", version = "=2.6.0" }
 spacetimedb-schema = { path = "crates/schema", version = "=2.6.0" }
+spacetimedb-snapshot = { path = "crates/snapshot", version = "=2.6.0" }
 spacetimedb-standalone = { path = "crates/standalone", version = "=2.6.0" }
+spacetimedb-subscription = { path = "crates/subscription", version = "=2.6.0" }
 spacetimedb-sql-parser = { path = "crates/sql-parser", version = "=2.6.0" }
 spacetimedb-table = { path = "crates/table", version = "=2.6.0" }
-spacetimedb-fs-utils = { path = "crates/fs-utils", version = "=2.6.0" }
-spacetimedb-snapshot = { path = "crates/snapshot", version = "=2.6.0" }
-spacetimedb-subscription = { path = "crates/subscription", version = "=2.6.0" }
-spacetimedb-query-builder = { path = "crates/query-builder", version = "=2.6.0" }
-spacetimedb-runtime = { path = "crates/runtime", version = "=2.6.0" }
 
 # Prevent `ahash` from pulling in `getrandom` by disabling default features.
 # Modules use `getrandom02` and we need to prevent an incompatible version

Cargo.toml

@@ -1,9 +1,9 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use spacetimedb::client::consume_each_list::ConsumeEachBuffer;
 use spacetimedb::db::relational_db::RelationalDB;
+use spacetimedb::db::sql::ast::SchemaViewer;
 use spacetimedb::error::DBError;
 use spacetimedb::identity::AuthCtx;
-use spacetimedb::sql::ast::SchemaViewer;
 use spacetimedb::subscription::row_list_builder_pool::BsatnRowListBuilderPool;
 use spacetimedb::subscription::tx::DeltaTx;
 use spacetimedb::subscription::{collect_table_update, TableUpdateType};

crates/bench/benches/subscription.rs

@@ -35,6 +35,8 @@ const rowOptionOptional = {
 };
 type RowOptionOptional = InferTypeOfRow<typeof rowOptionOptional>;
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
+const _rowOptionOptionalOmitted: RowOptionOptional = {};
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const _rowOptionOptionalNone: RowOptionOptional = {
   foo: undefined,
 };

crates/bindings-typescript/src/lib/type_builders.test-d.ts

@@ -39,9 +39,45 @@ export type Infer<T> = T extends RowObj
 /**
  * Helper type to extract the type of a row from an object.
  */
-export type InferTypeOfRow<T extends RowObj> = {
-  [K in keyof T & string]: InferTypeOfTypeBuilder<CollapseColumn<T[K]>>;
-};
+type OptionalRowKeys<T extends RowObj> = {
+  [K in keyof T & string]-?: CollapseColumn<T[K]> extends OptionBuilder<any>
+    ? K
+    : never;
+}[keyof T & string];
+
+type RequiredRowKeys<T extends RowObj> = Exclude<
+  keyof T & string,
+  OptionalRowKeys<T>
+>;
+
+export type InferTypeOfRow<T extends RowObj> = Prettify<
+  {
+    [K in RequiredRowKeys<T>]: InferTypeOfTypeBuilder<CollapseColumn<T[K]>>;
+  } & {
+    [K in OptionalRowKeys<T>]?: InferTypeOfTypeBuilder<CollapseColumn<T[K]>>;
+  }
+>;
+
+type OptionalParamKeys<T extends RowObj> = {
+  [K in keyof T & string]-?: undefined extends InferTypeOfTypeBuilder<
+    CollapseColumn<T[K]>
+  >
+    ? K
+    : never;
+}[keyof T & string];
+
+type RequiredParamKeys<T extends RowObj> = Exclude<
+  keyof T & string,
+  OptionalParamKeys<T>
+>;
+
+export type InferTypeOfParams<T extends RowObj> = Prettify<
+  {
+    [K in RequiredParamKeys<T>]: InferTypeOfTypeBuilder<CollapseColumn<T[K]>>;
+  } & {
+    [K in OptionalParamKeys<T>]?: InferTypeOfTypeBuilder<CollapseColumn<T[K]>>;
+  }
+>;
 
 /**
  * Helper type to extract the type of a row from an object.

crates/bindings-typescript/src/lib/type_builders.ts

@@ -23,7 +23,12 @@ import {
   type SubscriptionEventContextInterface,
 } from './event_context.ts';
 import { EventEmitter } from './event_emitter.ts';
-import type { Deserializer, Identity, InferTypeOfRow, Serializer } from '../';
+import type {
+  Deserializer,
+  Identity,
+  InferTypeOfParams,
+  Serializer,
+} from '../';
 import type {
   ProcedureResultMessage,
   ReducerResultMessage,
@@ -383,7 +388,9 @@ export class DbConnectionImpl<RemoteModule extends UntypedRemoteModule>
       const { serialize: serializeArgs } =
         this.#reducerArgsSerializers[reducerName];
 
-      (out as any)[key] = (params: InferTypeOfRow<typeof reducer.params>) => {
+      (out as any)[key] = (
+        params: InferTypeOfParams<typeof reducer.params>
+      ) => {
         const writer = this.#reducerArgsEncoder;
         writer.clear();
         serializeArgs(writer, params);
@@ -414,7 +421,7 @@ export class DbConnectionImpl<RemoteModule extends UntypedRemoteModule>
         this.#procedureSerializers[procedureName];
 
       (out as any)[key] = (
-        params: InferTypeOfRow<typeof procedure.params>
+        params: InferTypeOfParams<typeof procedure.params>
       ): Promise<any> => {
         writer.clear();
         serializeArgs(writer, params);
@@ -436,7 +443,7 @@ export class DbConnectionImpl<RemoteModule extends UntypedRemoteModule>
     event: Event<
       ReducerEventInfo<
         RemoteModule['reducers'][number]['name'],
-        InferTypeOfRow<RemoteModule['reducers'][number]['params']>
+        InferTypeOfParams<RemoteModule['reducers'][number]['params']>
       >
     >
   ): EventContextInterface<RemoteModule> {

crates/bindings-typescript/src/sdk/db_connection_impl.ts

@@ -1,4 +1,4 @@
-import type { InferTypeOfRow } from '../lib/type_builders.ts';
+import type { InferTypeOfParams } from '../lib/type_builders.ts';
 import type { DbContext } from './db_context';
 import type { Event } from './event.ts';
 import type { ReducerEvent } from './reducer_event.ts';
@@ -13,7 +13,7 @@ export interface EventContextInterface<RemoteModule extends UntypedRemoteModule>
   event: Event<
     ReducerEventInfo<
       RemoteModule['reducers'][number]['name'],
-      InferTypeOfRow<RemoteModule['reducers'][number]['params']>
+      InferTypeOfParams<RemoteModule['reducers'][number]['params']>
     >
   >;
 }
@@ -25,7 +25,7 @@ export interface ReducerEventContextInterface<
   event: ReducerEvent<
     ReducerEventInfo<
       RemoteModule['reducers'][number]['name'],
-      InferTypeOfRow<RemoteModule['reducers'][number]['params']>
+      InferTypeOfParams<RemoteModule['reducers'][number]['params']>
     >
   >;
 }

crates/bindings-typescript/src/sdk/event_context.ts

@@ -1,5 +1,9 @@
 import type { ParamsObj } from '../lib/reducers';
-import type { Infer, InferTypeOfRow, TypeBuilder } from '../lib/type_builders';
+import type {
+  Infer,
+  InferTypeOfParams,
+  TypeBuilder,
+} from '../lib/type_builders';
 import type { CamelCase } from '../lib/type_util';
 import { coerceParams, toCamelCase, type CoerceParams } from '../lib/util';
 import type { UntypedRemoteModule } from './spacetime_module';
@@ -20,7 +24,7 @@ export type ProceduresView<RemoteModule> = IfAny<
     ? // x: camelCase(name)
       {
         [K in RemoteModule['procedures'][number] as K['accessorName']]: (
-          params: InferTypeOfRow<K['params']>
+          params: InferTypeOfParams<K['params']>
         ) => Promise<Infer<K['returnType']>>;
       }
     : never

crates/bindings-typescript/src/sdk/procedures.ts

@@ -1,8 +1,7 @@
 import type { ProductType } from '../lib/algebraic_type';
 import type { ReducerSchema } from '../lib/reducer_schema';
 import type { ParamsObj } from '../lib/reducers';
-import type { CoerceRow } from '../lib/table';
-import { RowBuilder, type InferTypeOfRow } from '../lib/type_builders';
+import { RowBuilder, type InferTypeOfParams } from '../lib/type_builders';
 import { toCamelCase } from '../lib/util';
 import type { SubscriptionEventContextInterface } from './event_context';
 import type { UntypedRemoteModule } from './spacetime_module';
@@ -26,7 +25,7 @@ export type ReducersView<RemoteModule> = IfAny<
   RemoteModule extends UntypedRemoteModule
     ? {
         [K in RemoteModule['reducers'][number] as K['accessorName']]: (
-          params: InferTypeOfRow<K['params']>
+          params: InferTypeOfParams<K['params']>
         ) => Promise<void>;
       }
     : never
@@ -43,7 +42,7 @@ export type ReducerEventInfo<
 export type UntypedReducerDef = {
   name: string;
   accessorName: string;
-  params: CoerceRow<ParamsObj>;
+  params: ParamsObj;
   paramsType: ProductType;
 };