@latticexyz/store-indexer 2.0.0-next.8 → 2.0.0-skystrife-playtest-3e6ab07b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/store-indexer",
-  "version": "2.0.0-next.8",
+  "version": "2.0.0-skystrife-playtest-3e6ab07b",
   "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-next.8",
-    "@latticexyz/common": "2.0.0-next.8",
-    "@latticexyz/store": "2.0.0-next.8",
-    "@latticexyz/store-sync": "2.0.0-next.8"
+    "@latticexyz/block-logs-stream": "2.0.0-skystrife-playtest-3e6ab07b",
+    "@latticexyz/common": "2.0.0-skystrife-playtest-3e6ab07b",
+    "@latticexyz/store": "2.0.0-skystrife-playtest-3e6ab07b",
+    "@latticexyz/store-sync": "2.0.0-skystrife-playtest-3e6ab07b"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.4",

package/src/postgres/createQueryAdapter.ts

@@ -13,11 +13,11 @@ import { getAddress } from "viem";
  */
 export async function createQueryAdapter(database: PgDatabase<any>): Promise<QueryAdapter> {
   const adapter: QueryAdapter = {
-    async findAll(chainId, address) {
+    async findAll({ chainId, address, tableIds }) {
       const internalTables = buildInternalTables();
-      const tables = (await getTables(database)).filter(
-        (table) => address != null && getAddress(address) === getAddress(table.address)
-      );
+      const tables = (await getTables(database))
+        .filter((table) => address == null || getAddress(address) === getAddress(table.address))
+        .filter((table) => tableIds == null || tableIds.includes(table.tableId));
 
       const tablesWithRecords = await Promise.all(
         tables.map(async (table) => {

package/src/sqlite/createQueryAdapter.ts

@@ -1,8 +1,9 @@
-import { eq } from "drizzle-orm";
+import { eq, inArray, and } from "drizzle-orm";
 import { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core";
 import { createSqliteTable, chainState, getTables } from "@latticexyz/store-sync/sqlite";
 import { QueryAdapter } from "@latticexyz/store-sync/trpc-indexer";
 import { debug } from "../debug";
+import { Hex, getAddress } from "viem";
 
 /**
  * Creates a storage adapter for the tRPC server/client to query data from SQLite.
@@ -12,12 +13,51 @@ import { debug } from "../debug";
  */
 export async function createQueryAdapter(database: BaseSQLiteDatabase<"sync", any>): Promise<QueryAdapter> {
   const adapter: QueryAdapter = {
-    async findAll(chainId, address) {
-      const tables = getTables(database).filter((table) => table.address === address);
+    async findAll({ chainId, address, tableIds, matchId }) {
+      const tables = getTables(database)
+        .filter((table) => address == null || getAddress(address) === getAddress(table.address))
+        .filter((table) => tableIds == null || tableIds.includes(table.tableId))
+        .filter((table) =>
+          // we don't need KeysWithValue tables
+          matchId != null ? table.namespace !== "keyswval" : true
+        );
+
+      const entities = ((): Hex[] => {
+        if (!address || !matchId) return [];
+        try {
+          const Position = createSqliteTable({
+            address,
+            namespace: "",
+            name: "Position",
+            keySchema: { key: "bytes32" },
+            valueSchema: {
+              x: "int32",
+              y: "int32",
+              z: "int32",
+            },
+          });
+          const positions = database.select().from(Position).where(eq(Position.z, matchId)).all();
+          return positions.map((pos) => pos.key);
+        } catch (error: unknown) {
+          return [];
+        }
+      })();
 
       const tablesWithRecords = tables.map((table) => {
         const sqliteTable = createSqliteTable(table);
-        const records = database.select().from(sqliteTable).where(eq(sqliteTable.__isDeleted, false)).all();
+        const records = database
+          .select()
+          .from(sqliteTable)
+          .where(
+            and(
+              eq(sqliteTable.__isDeleted, false),
+              entities.length &&
+                (table.name === "MoveDifficulty" || table.name === "TerrainType") /* || table.name === "ArmorModifier"*/
+                ? inArray(sqliteTable.__key, entities)
+                : undefined
+            )
+          )
+          .all();
         return {
           ...table,
           records: records.map((record) => ({
@@ -35,7 +75,19 @@ export async function createQueryAdapter(database: BaseSQLiteDatabase<"sync", an
         tables: tablesWithRecords,
       };
 
-      debug("findAll", chainId, address, result);
+      const count = tablesWithRecords.reduce((sum, table) => sum + table.records.length, 0);
+
+      debug(
+        "findAll",
+        "chainId:",
+        chainId,
+        "address:",
+        address,
+        "tables:",
+        tablesWithRecords.length,
+        "records:",
+        count
+      );
 
       return result;
     },