spacetimedb 2.0.2 → 2.0.4

package/dist/tanstack/SpacetimeDBQueryClient.d.ts

@@ -1,7 +1,6 @@
 import type { QueryClient, QueryKey, QueryFunction } from '@tanstack/react-query';
-type QueryInput = {
-    toSql(): string;
-} & Record<string, any>;
+import { type Query } from '../lib/query';
+type QueryInput = Query<any>;
 export interface SpacetimeDBQueryOptions {
     queryKey: readonly ['spacetimedb', string, string];
     staleTime: number;
@@ -32,6 +31,7 @@ export declare class SpacetimeDBQueryClient {
     private getTableData;
     private setupSubscription;
     private processPendingQueries;
+    private hydrateSubscriptions;
     disconnect(): void;
 }
 export {};

package/dist/tanstack/SpacetimeDBQueryClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SpacetimeDBQueryClient.d.ts","sourceRoot":"","sources":["../../src/tanstack/SpacetimeDBQueryClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,QAAQ,EACR,aAAa,EACd,MAAM,uBAAuB,CAAC;AAQ/B,KAAK,UAAU,GAAG;IAAE,KAAK,IAAI,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAO5D,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,8BACf,SAAQ,uBAAuB;IAC/B,OAAO,EAAE,KAAK,CAAC;CAChB;AAMD,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,MAAM,GAClB,8BAA8B,CAAC;AAElC,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,uBAAuB,CAAC;AA0B7E,UAAU,mBAAmB;IAC3B,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACxB,mBAAmB,EAAE,MAAM;QACzB,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,GAAG,CAAC;QACnC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK;YAAE,WAAW,EAAE,MAAM,IAAI,CAAA;SAAE,CAAC;KAC3D,CAAC;CACH;AASD,qBAAa,sBAAsB;IACjC,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,aAAa,CAAwC;IAC7D,OAAO,CAAC,cAAc,CAOlB;IACJ,OAAO,CAAC,gBAAgB,CAA6B;IAGrD,aAAa,CAAC,UAAU,EAAE,mBAAmB,GAAG,IAAI;IAKpD,OAAO,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAoBvC,OAAO,EAAE,aAAa,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAoCrC;IAEF,OAAO,CAAC,YAAY;IAapB,OAAO,CAAC,iBAAiB;IAwFzB,OAAO,CAAC,qBAAqB;IAiC7B,UAAU,IAAI,IAAI;CAanB"}
+{"version":3,"file":"SpacetimeDBQueryClient.d.ts","sourceRoot":"","sources":["../../src/tanstack/SpacetimeDBQueryClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,QAAQ,EACR,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,KAAK,KAAK,EAMX,MAAM,cAAc,CAAC;AAEtB,KAAK,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;AAO7B,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,8BACf,SAAQ,uBAAuB;IAC/B,OAAO,EAAE,KAAK,CAAC;CAChB;AAMD,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,MAAM,GAClB,8BAA8B,CAAC;AAElC,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,uBAAuB,CAAC;AA0B7E,UAAU,mBAAmB;IAC3B,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACxB,mBAAmB,EAAE,MAAM;QACzB,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,GAAG,CAAC;QACnC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK;YAAE,WAAW,EAAE,MAAM,IAAI,CAAA;SAAE,CAAC;KAC3D,CAAC;CACH;AASD,qBAAa,sBAAsB;IACjC,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,aAAa,CAAwC;IAC7D,OAAO,CAAC,cAAc,CAOlB;IACJ,OAAO,CAAC,gBAAgB,CAA6B;IAGrD,aAAa,CAAC,UAAU,EAAE,mBAAmB,GAAG,IAAI;IAMpD,OAAO,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAoBvC,OAAO,EAAE,aAAa,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAoCrC;IAEF,OAAO,CAAC,YAAY;IAapB,OAAO,CAAC,iBAAiB;IAwFzB,OAAO,CAAC,qBAAqB;IAiC7B,OAAO,CAAC,oBAAoB;IAuB5B,UAAU,IAAI,IAAI;CAanB"}

package/dist/tanstack/hooks.d.ts

@@ -1,5 +1,6 @@
 import type { UseQueryOptions, UseQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult } from '@tanstack/react-query';
 import type { UntypedTableDef, RowType } from '../lib/table';
+import type { Query } from '../lib/query';
 export type UseSpacetimeDBQueryResult<T> = [
     T[],
     boolean,
@@ -10,10 +11,6 @@ export type UseSpacetimeDBSuspenseQueryResult<T> = [
     false,
     UseSuspenseQueryResult<T[], Error>
 ];
-export declare function useSpacetimeDBQuery<TableDef extends UntypedTableDef>(queryOrSkip: ({
-    toSql(): string;
-} & Record<string, any>) | 'skip', options?: Omit<UseQueryOptions<RowType<TableDef>[], Error, RowType<TableDef>[], readonly ['spacetimedb', string, string]>, 'queryKey' | 'queryFn' | 'meta'>): UseSpacetimeDBQueryResult<RowType<TableDef>>;
-export declare function useSpacetimeDBSuspenseQuery<TableDef extends UntypedTableDef>(query: {
-    toSql(): string;
-} & Record<string, any>, options?: Omit<UseSuspenseQueryOptions<RowType<TableDef>[], Error, RowType<TableDef>[], readonly ['spacetimedb', string, string]>, 'queryKey' | 'queryFn' | 'meta'>): UseSpacetimeDBSuspenseQueryResult<RowType<TableDef>>;
+export declare function useSpacetimeDBQuery<TableDef extends UntypedTableDef>(queryOrSkip: Query<TableDef> | 'skip', options?: Omit<UseQueryOptions<RowType<TableDef>[], Error, RowType<TableDef>[], readonly ['spacetimedb', string, string]>, 'queryKey' | 'queryFn' | 'meta'>): UseSpacetimeDBQueryResult<RowType<TableDef>>;
+export declare function useSpacetimeDBSuspenseQuery<TableDef extends UntypedTableDef>(query: Query<TableDef>, options?: Omit<UseSuspenseQueryOptions<RowType<TableDef>[], Error, RowType<TableDef>[], readonly ['spacetimedb', string, string]>, 'queryKey' | 'queryFn' | 'meta'>): UseSpacetimeDBSuspenseQueryResult<RowType<TableDef>>;
 //# sourceMappingURL=hooks.d.ts.map

package/dist/tanstack/hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/tanstack/hooks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACd,uBAAuB,EACvB,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAG7D,MAAM,MAAM,yBAAyB,CAAC,CAAC,IAAI;IACzC,CAAC,EAAE;IACH,OAAO;IACP,cAAc,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,iCAAiC,CAAC,CAAC,IAAI;IACjD,CAAC,EAAE;IACH,KAAK;IACL,sBAAsB,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC;CACnC,CAAC;AAUF,wBAAgB,mBAAmB,CAAC,QAAQ,SAAS,eAAe,EAClE,WAAW,EAAE,CAAC;IAAE,KAAK,IAAI,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,MAAM,EAGjE,OAAO,CAAC,EAAE,IAAI,CACZ,eAAe,CACb,OAAO,CAAC,QAAQ,CAAC,EAAE,EACnB,KAAK,EACL,OAAO,CAAC,QAAQ,CAAC,EAAE,EACnB,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CACzC,EACD,UAAU,GAAG,SAAS,GAAG,MAAM,CAChC,GACA,yBAAyB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAY9C;AAMD,wBAAgB,2BAA2B,CAAC,QAAQ,SAAS,eAAe,EAC1E,KAAK,EAAE;IAAE,KAAK,IAAI,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChD,OAAO,CAAC,EAAE,IAAI,CACZ,uBAAuB,CACrB,OAAO,CAAC,QAAQ,CAAC,EAAE,EACnB,KAAK,EACL,OAAO,CAAC,QAAQ,CAAC,EAAE,EACnB,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CACzC,EACD,UAAU,GAAG,SAAS,GAAG,MAAM,CAChC,GACA,iCAAiC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAStD"}
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/tanstack/hooks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACd,uBAAuB,EACvB,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAG1C,MAAM,MAAM,yBAAyB,CAAC,CAAC,IAAI;IACzC,CAAC,EAAE;IACH,OAAO;IACP,cAAc,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,iCAAiC,CAAC,CAAC,IAAI;IACjD,CAAC,EAAE;IACH,KAAK;IACL,sBAAsB,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC;CACnC,CAAC;AAUF,wBAAgB,mBAAmB,CAAC,QAAQ,SAAS,eAAe,EAClE,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,EAGrC,OAAO,CAAC,EAAE,IAAI,CACZ,eAAe,CACb,OAAO,CAAC,QAAQ,CAAC,EAAE,EACnB,KAAK,EACL,OAAO,CAAC,QAAQ,CAAC,EAAE,EACnB,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CACzC,EACD,UAAU,GAAG,SAAS,GAAG,MAAM,CAChC,GACA,yBAAyB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAY9C;AAMD,wBAAgB,2BAA2B,CAAC,QAAQ,SAAS,eAAe,EAC1E,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,EACtB,OAAO,CAAC,EAAE,IAAI,CACZ,uBAAuB,CACrB,OAAO,CAAC,QAAQ,CAAC,EAAE,EACnB,KAAK,EACL,OAAO,CAAC,QAAQ,CAAC,EAAE,EACnB,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CACzC,EACD,UAAU,GAAG,SAAS,GAAG,MAAM,CAChC,GACA,iCAAiC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAStD"}

package/dist/tanstack/index.cjs

@@ -604,6 +604,9 @@ var BinaryWriter = class {
   constructor(init) {
     this.buffer = typeof init === "number" ? new ResizableBuffer(init) : init;
   }
+  clear() {
+    this.offset = 0;
+  }
   reset(buffer) {
     this.buffer = buffer;
     this.offset = 0;
@@ -1421,6 +1424,9 @@ var ConnectionId = class _ConnectionId {
     }
   }
 };
+function toSql(q) {
+  return q.toSql();
+}
 function isLiteralExpr(expr) {
   return expr.type === "literal";
 }
@@ -1497,7 +1503,7 @@ function spacetimeDBQuery(queryOrSkip) {
   const query = queryOrSkip;
   const accessorName = getQueryAccessorName(query);
   const whereExpr = getQueryWhereClause(query);
-  const querySql = query.toSql();
+  const querySql = toSql(query);
   queryRegistry.set(querySql, { accessorName, whereExpr });
   return {
     queryKey: ["spacetimedb", accessorName, querySql],
@@ -1514,6 +1520,7 @@ var SpacetimeDBQueryClient = class {
   setConnection(connection) {
     this.connection = connection;
     this.processPendingQueries();
+    this.hydrateSubscriptions();
   }
   connect(queryClient) {
     this.queryClient = queryClient;
@@ -1655,6 +1662,26 @@ var SpacetimeDBQueryClient = class {
       }
     }
   }
+  // subscribe to queries with SSR cached data but no active subscription
+  hydrateSubscriptions() {
+    if (!this.connection || !this.queryClient) {
+      return;
+    }
+    for (const [querySql, { accessorName, whereExpr }] of queryRegistry) {
+      const queryKey = ["spacetimedb", accessorName, querySql];
+      const keyStr = JSON.stringify(queryKey);
+      if (this.subscriptions.has(keyStr)) {
+        continue;
+      }
+      if (this.queryClient.getQueryData(queryKey) === void 0) {
+        continue;
+      }
+      this.setupSubscription(queryKey, accessorName, querySql, whereExpr).catch(
+        () => {
+        }
+      );
+    }
+  }
   // clean up all subscriptions and disconnect
   disconnect() {
     if (this.cacheUnsubscribe) {