spacetimedb 2.0.1 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spacetimedb",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "API and ABI bindings for the SpacetimeDB TypeScript module library",
   "homepage": "https://github.com/clockworklabs/SpacetimeDB#readme",
   "bugs": {

package/src/lib/schema.ts

@@ -91,7 +91,10 @@ export function tableToSchema<
 
   type AllowedCol = keyof T['rowType']['row'] & string;
   return {
-    sourceName: accName,
+    // For client,`schama.tableName` will always be there as canonical name.
+    // For module, if explicit name is not provided via `name`, accessor name will
+    // be used, it is stored as alias in database, hence works in query builder.
+    sourceName: schema.tableName || accName,
     accessorName: accName,
     columns: schema.rowType.row, // typed as T[i]['rowType']['row'] under TablesToSchema<T>
     rowType: schema.rowSpacetimeType,

package/src/lib/util.ts

@@ -1,20 +1,11 @@
+import type { AlgebraicType } from './algebraic_type';
+import type { Typespace } from './autogen/types';
 import BinaryReader from './binary_reader';
 import BinaryWriter from './binary_writer';
+import type { ParamsObj } from './reducers';
+import type { ColumnBuilder, TypeBuilder } from './type_builders';
 import type { CamelCase, SnakeCase } from './type_util';
 
-/**
- * Converts a string to PascalCase (UpperCamelCase).
- * @param str The string to convert
- * @returns The converted string
- */
-export function toPascalCase(s: string): string {
-  const str = s.replace(/([-_][a-z])/gi, $1 => {
-    return $1.toUpperCase().replace('-', '').replace('_', '');
-  });
-
-  return str.charAt(0).toUpperCase() + str.slice(1);
-}
-
 export function deepEqual(obj1: any, obj2: any): boolean {
   // If both are strictly equal (covers primitives and reference equality), return true
   if (obj1 === obj2) return true;
@@ -105,15 +96,26 @@ export function u256ToHexString(data: bigint): string {
   return uint8ArrayToHexString(u256ToUint8Array(data));
 }
 
+/**
+ * Converts a string to PascalCase (UpperCamelCase).
+ * @param str The string to convert
+ * @returns The converted string
+ */
+export function toPascalCase(s: string): string {
+  const str = toCamelCase(s);
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+
 /**
  * Type safe conversion from a string like "some_identifier-name" to "someIdentifierName".
  * @param str The string to convert
  * @returns The converted string
  */
-export function toCamelCase<T extends string>(str: T): CamelCase<T> {
-  return str
+export function toCamelCase<T extends string>(s: T): CamelCase<T> {
+  const str = s
     .replace(/[-_]+/g, '_') // collapse runs to a single separator (no backtracking issue)
-    .replace(/_([a-zA-Z0-9])/g, (_, c) => c.toUpperCase()) as CamelCase<T>;
+    .replace(/_([a-zA-Z0-9])/g, (_, c) => c.toUpperCase());
+  return (str.charAt(0).toLowerCase() + str.slice(1)) as CamelCase<T>;
 }
 
 /** Type safe conversion from a string like "some_Identifier-name" to "some_identifier_name".
@@ -127,11 +129,6 @@ export function toSnakeCase<T extends string>(str: T): SnakeCase<T> {
     .toLowerCase() as SnakeCase<T>;
 }
 
-import type { AlgebraicType } from './algebraic_type';
-import type { Typespace } from './autogen/types';
-import type { ColumnBuilder, TypeBuilder } from './type_builders';
-import type { ParamsObj } from './reducers';
-
 export function bsatnBaseSize(typespace: Typespace, ty: AlgebraicType): number {
   const assumedArrayLength = 4;
   while (ty.tag === 'Ref') ty = typespace.types[ty.value];

package/src/react/useTable.ts

@@ -107,6 +107,13 @@ export function useTable<TableDef extends UntypedTableDef>(
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [connectionState, accessorName, querySql, subscribeApplied]);
 
+  // Invalidate the cached snapshot when computeSnapshot changes (e.g. when
+  // subscribeApplied flips to true) so getSnapshot() recomputes on the next
+  // render instead of returning a stale [rows, false] tuple.
+  useEffect(() => {
+    lastSnapshotRef.current = null;
+  }, [computeSnapshot]);
+
   useEffect(() => {
     const connection = connectionState.getConnection()!;
     if (connectionState.isActive && connection) {

package/src/sdk/procedures.ts

@@ -19,9 +19,7 @@ export type ProceduresView<RemoteModule> = IfAny<
   RemoteModule extends UntypedRemoteModule
     ? // x: camelCase(name)
       {
-        [K in RemoteModule['procedures'][number] as CamelCase<
-          K['accessorName']
-        >]: (
+        [K in RemoteModule['procedures'][number] as K['accessorName']]: (
           params: InferTypeOfRow<K['params']>
         ) => Promise<Infer<K['returnType']>>;
       }

package/src/sdk/reducers.ts

@@ -3,7 +3,6 @@ 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 type { CamelCase } from '../lib/type_util';
 import { toCamelCase } from '../lib/util';
 import type { SubscriptionEventContextInterface } from './event_context';
 import type { UntypedRemoteModule } from './spacetime_module';
@@ -25,11 +24,10 @@ export type ReducersView<RemoteModule> = IfAny<
   RemoteModule,
   ReducersViewLoose,
   RemoteModule extends UntypedRemoteModule
-    ? // x: camelCase(name)
-      {
-        [K in RemoteModule['reducers'][number] as CamelCase<
-          K['accessorName']
-        >]: (params: InferTypeOfRow<K['params']>) => Promise<void>;
+    ? {
+        [K in RemoteModule['reducers'][number] as K['accessorName']]: (
+          params: InferTypeOfRow<K['params']>
+        ) => Promise<void>;
       }
     : never
 >;
@@ -69,7 +67,7 @@ type ReducersToSchema<T extends readonly ReducerSchema<any, any>[]> = {
     /** @type {UntypedReducerDef} */
     readonly [i in keyof T]: {
       name: T[i]['reducerName'];
-      accessorName: CamelCase<T[i]['accessorName']>;
+      accessorName: T[i]['accessorName'];
       params: T[i]['params']['row'];
       paramsType: T[i]['paramsSpacetimeType'];
     };

package/src/tanstack/SpacetimeDBQueryClient.ts

@@ -4,13 +4,15 @@ import type {
   QueryFunction,
 } from '@tanstack/react-query';
 import {
+  type Query,
+  toSql,
   type BooleanExpr,
   evaluateBooleanExpr,
   getQueryAccessorName,
   getQueryWhereClause,
 } from '../lib/query';
 
-type QueryInput = { toSql(): string } & Record<string, any>;
+type QueryInput = Query<any>;
 
 const queryRegistry = new Map<
   string,
@@ -51,7 +53,7 @@ export function spacetimeDBQuery(
   const query = queryOrSkip;
   const accessorName = getQueryAccessorName(query);
   const whereExpr = getQueryWhereClause(query);
-  const querySql = query.toSql();
+  const querySql = toSql(query);
 
   queryRegistry.set(querySql, { accessorName, whereExpr });
 

package/src/tanstack/hooks.ts

@@ -6,6 +6,7 @@ import type {
   UseSuspenseQueryResult,
 } from '@tanstack/react-query';
 import type { UntypedTableDef, RowType } from '../lib/table';
+import type { Query } from '../lib/query';
 import { spacetimeDBQuery } from './SpacetimeDBQueryClient';
 
 export type UseSpacetimeDBQueryResult<T> = [
@@ -29,7 +30,7 @@ export type UseSpacetimeDBSuspenseQueryResult<T> = [
 //   useSpacetimeDBQuery(tables.user.where(r => r.online.eq(true)))
 //   useSpacetimeDBQuery(condition ? tables.user : 'skip')
 export function useSpacetimeDBQuery<TableDef extends UntypedTableDef>(
-  queryOrSkip: ({ toSql(): string } & Record<string, any>) | 'skip',
+  queryOrSkip: Query<TableDef> | 'skip',
   // any useQuery option (e.g. enabled, refetchInterval, select, placeholderData),
   // except queryKey, queryFn, and meta (managed internally)
   options?: Omit<
@@ -60,7 +61,7 @@ export function useSpacetimeDBQuery<TableDef extends UntypedTableDef>(
 // until data is ready, a parent <Suspense fallback={…}> handles the loading UI.
 // does not support 'skip' because useSuspenseQuery must always resolve
 export function useSpacetimeDBSuspenseQuery<TableDef extends UntypedTableDef>(
-  query: { toSql(): string } & Record<string, any>,
+  query: Query<TableDef>,
   options?: Omit<
     UseSuspenseQueryOptions<
       RowType<TableDef>[],