@latticexyz/store-indexer 2.0.0-skystrife-playtest-19728914 → 2.0.0-skystrife-playtest-17b5d20f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/store-indexer",
-  "version": "2.0.0-skystrife-playtest-19728914",
+  "version": "2.0.0-skystrife-playtest-17b5d20f",
   "description": "Minimal Typescript indexer for Store",
   "repository": {
     "type": "git",
@@ -27,10 +27,10 @@
     "superjson": "^1.12.4",
     "viem": "1.6.0",
     "zod": "^3.21.4",
-    "@latticexyz/block-logs-stream": "2.0.0-skystrife-playtest-19728914",
-    "@latticexyz/common": "2.0.0-skystrife-playtest-19728914",
-    "@latticexyz/store": "2.0.0-skystrife-playtest-19728914",
-    "@latticexyz/store-sync": "2.0.0-skystrife-playtest-19728914"
+    "@latticexyz/block-logs-stream": "2.0.0-skystrife-playtest-17b5d20f",
+    "@latticexyz/common": "2.0.0-skystrife-playtest-17b5d20f",
+    "@latticexyz/store": "2.0.0-skystrife-playtest-17b5d20f",
+    "@latticexyz/store-sync": "2.0.0-skystrife-playtest-17b5d20f"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.4",

package/src/sqlite/createQueryAdapter.ts

@@ -5,6 +5,31 @@ import { QueryAdapter } from "@latticexyz/store-sync/trpc-indexer";
 import { debug } from "../debug";
 import { Hex, getAddress } from "viem";
 
+const EXCLUDE_TABLES = [
+  "Position",
+  "MoveDifficulty",
+  "TerrainType",
+  "ArmorModifier",
+  "Untraversable",
+  "LastAction",
+  "StaminaOnKill",
+  "UnitType",
+  "Movable",
+  "Capturer",
+  "Range",
+  "Tier",
+  "Combat",
+  "StructureType",
+  "Capturable",
+  "KillCount",
+  "Stamina",
+  "ChargeCap",
+  "Charger",
+  "Chargee",
+  "ChargedByStart",
+  "Factory",
+];
+
 /**
  * Creates a storage adapter for the tRPC server/client to query data from SQLite.
  *
@@ -36,8 +61,24 @@ export async function createQueryAdapter(database: BaseSQLiteDatabase<"sync", an
               z: "int32",
             },
           });
+
+          const Match = createSqliteTable({
+            address,
+            namespace: "",
+            name: "Match",
+            keySchema: { key: "bytes32" },
+            valueSchema: {
+              value: "int32",
+            },
+          });
+
           const positions = database.select().from(Position).where(eq(Position.z, matchId)).all();
-          return positions.map((pos) => pos.key);
+          const positionKeys = positions.map((pos) => pos.key);
+
+          const matches = database.select().from(Match).where(eq(Match.value, matchId)).all();
+          const matchKeys = matches.map((match) => match.key);
+
+          return [...new Set([...positionKeys, ...matchKeys])];
         } catch (error: unknown) {
           return [];
         }
@@ -51,10 +92,7 @@ export async function createQueryAdapter(database: BaseSQLiteDatabase<"sync", an
           .where(
             and(
               eq(sqliteTable.__isDeleted, false),
-              entities.length &&
-                (table.name === "MoveDifficulty" || table.name === "TerrainType") /* || table.name === "ArmorModifier"*/
-                ? inArray(sqliteTable.__key, entities)
-                : undefined
+              entities.length && EXCLUDE_TABLES.includes(table.name) ? inArray(sqliteTable.__key, entities) : undefined
             )
           )
           .all();