fix: store-sync uses getKeySchema helper (#2477)

latticexyz · Mar 20, 2024 · e3f0abe · e3f0abe
1 parent fff2a53
commit e3f0abe
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/packages/store-sync/src/query-cache/common.ts b/packages/store-sync/src/query-cache/common.ts
@@ -1,4 +1,4 @@
-import { Config, Table } from "@latticexyz/store/config/v2";
+import { Store, Table } from "@latticexyz/store/config/v2";
 import { SchemaAbiType, SchemaAbiTypeToPrimitiveType } from "@latticexyz/schema-type/internal";
 import { ComparisonCondition, InCondition } from "@latticexyz/query";
 
@@ -10,7 +10,7 @@ export type subjectSchemaToPrimitive<tuple> = {
   [key in keyof tuple]: tuple[key] extends SchemaAbiType ? SchemaAbiTypeToPrimitiveType<tuple[key]> : never;
 };
 
-export type Tables = Config["tables"];
+export type Tables = Store["tables"];
 
 export type TableSubjectItem<table extends Table = Table> = keyof table["schema"];
 

diff --git a/packages/store-sync/src/query-cache/createStorageAdapter.ts b/packages/store-sync/src/query-cache/createStorageAdapter.ts
@@ -6,6 +6,7 @@ import { decodeKey, decodeValueArgs } from "@latticexyz/protocol-parser/internal
 import { flattenSchema } from "../flattenSchema";
 import debug from "debug";
 import { Tables } from "./common";
+import { getKeySchema, getValueSchema } from "@latticexyz/store/config/v2";
 
 function getRecordId({ tableId, keyTuple }: { tableId: Hex; keyTuple: readonly Hex[] }): string {
   return `${tableId}:${concatHex(keyTuple)}`;
@@ -109,8 +110,8 @@ export function createStorageAdapter({ store }: CreateStorageAdapterOptions<Quer
     const records: readonly TableRecord[] = [
       ...previousRecords.filter((record) => !touchedIds.has(record.id)),
       ...Object.values(updatedRawRecords).map((rawRecord): TableRecord => {
-        const key = decodeKey(flattenSchema(rawRecord.table.keySchema), rawRecord.keyTuple);
-        const value = decodeValueArgs(flattenSchema(rawRecord.table.valueSchema), rawRecord);
+        const key = decodeKey(flattenSchema(getKeySchema(rawRecord.table)), rawRecord.keyTuple);
+        const value = decodeValueArgs(flattenSchema(getValueSchema(rawRecord.table)), rawRecord);
 
         return {
           table: rawRecord.table,

diff --git a/packages/store-sync/src/query-cache/createStore.ts b/packages/store-sync/src/query-cache/createStore.ts
@@ -1,5 +1,5 @@
 import { StoreApi, UseBoundStore, create } from "zustand";
-import { Table } from "@latticexyz/store/config/v2";
+import { Table, getKeySchema, getValueSchema } from "@latticexyz/store/config/v2";
 import { Tables } from "./common";
 import { Hex } from "viem";
 import { StaticPrimitiveType } from "@latticexyz/schema-type/internal";
@@ -21,8 +21,8 @@ export type TableRecord<table extends Table = Table> = {
   readonly id: string;
   readonly keyTuple: readonly Hex[];
   readonly primaryKey: readonly StaticPrimitiveType[];
-  readonly key: SchemaToPrimitives<table["keySchema"]>;
-  readonly value: SchemaToPrimitives<table["valueSchema"]>;
+  readonly key: SchemaToPrimitives<getKeySchema<table>>;
+  readonly value: SchemaToPrimitives<getValueSchema<table>>;
   readonly fields: SchemaToPrimitives<table["schema"]>;
 };
 

diff --git a/packages/store-sync/src/query-cache/getTables.ts b/packages/store-sync/src/query-cache/getTables.ts
@@ -1,9 +1,9 @@
 import { resourceToHex } from "@latticexyz/common";
-import { Config } from "@latticexyz/store/config/v2";
+import { Store } from "@latticexyz/store/config/v2";
 
 // TODO(alvrs): table resolver doesn't yet provide `tableId` so we'll use this helper to inject it for now
 
-export function getTables<config extends Config>(config: config): config["tables"] {
+export function getTables<config extends Store>(config: config): config["tables"] {
   const tables = Object.fromEntries(
     Object.entries(config.tables).map(([tableName, table]) => [
       tableName,

diff --git a/packages/store-sync/src/query-cache/syncToQueryCache.ts b/packages/store-sync/src/query-cache/syncToQueryCache.ts
@@ -1,12 +1,12 @@
 import { SyncOptions, SyncResult } from "../common";
 import { createStoreSync } from "../createStoreSync";
 import { Address } from "viem";
-import { Config } from "@latticexyz/store/config/v2";
+import { Store } from "@latticexyz/store/config/v2";
 import { createStore } from "./createStore";
 import { createStorageAdapter } from "./createStorageAdapter";
 import { getTables } from "./getTables";
 
-type SyncToQueryCacheOptions<config extends Config> = Omit<SyncOptions, "config"> & {
+type SyncToQueryCacheOptions<config extends Store> = Omit<SyncOptions, "config"> & {
   // require address for now to keep the data model + retrieval simpler
   address: Address;
   config: config;
@@ -17,7 +17,7 @@ type SyncToQueryCacheResult = SyncResult & {
   stopSync: () => void;
 };
 
-export async function syncToQueryCache<config extends Config>({
+export async function syncToQueryCache<config extends Store>({
   config,
   startSync = true,
   ...syncOptions