supastash 0.2.10 → 0.2.12

package/dist/desktop/hooks/syncEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"syncEngine.d.ts","sourceRoot":"","sources":["../../../src/desktop/hooks/syncEngine.ts"],"names":[],"mappings":"AA6BA;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAqCnE;AAuDD;;;;;GAKG;AACH,wBAAgB,aAAa;;;EA2D5B;AAMD;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgC5D;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAEnD"}
+{"version":3,"file":"syncEngine.d.ts","sourceRoot":"","sources":["../../../src/desktop/hooks/syncEngine.ts"],"names":[],"mappings":"AA6BA;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAqCnE;AA2DD;;;;;GAKG;AACH,wBAAgB,aAAa;;;EA2D5B;AAMD;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgC5D;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAEnD"}

package/dist/desktop/hooks/syncEngine.js

@@ -7,8 +7,8 @@ import { isOnline } from "../../shared/utils/connection";
 import log from "../../shared/utils/logs";
 import { subscribeToAppVisibility } from "../adapters/appstate";
 import { pullFromRemote as doPullFromRemote } from "../utils/sync/pullFromRemote";
+import { pullFromRemoteBatch } from "../utils/sync/pullFromRemote/pullFromRemoteBatch";
 import { updateLocalDb } from "../utils/sync/pullFromRemote/updateLocalDb";
-import { pushLocalData as doPushLocalData } from "../utils/sync/pushLocal";
 import { pushLocalDataToRemote } from "../utils/sync/pushLocal/sendUnsyncedToSupabase";
 // -----------------------------
 // Module-scoped state & tunables
@@ -85,7 +85,12 @@ async function pushLocalDataSafe() {
         return;
     isPushing = true;
     try {
-        await doPushLocalData();
+        if (cfg.useBatchPullSync) {
+            await pullFromRemoteBatch();
+        }
+        else {
+            await doPullFromRemote();
+        }
         lastPushAt = Date.now();
     }
     catch (e) {

package/dist/desktop/index.d.ts

@@ -9,6 +9,7 @@ export { refreshScreen } from "../shared/utils/refreshScreenCalls";
 export { getSupastashRuntimeMode, reinitializeSupastash, } from "../shared/utils/supastashMode";
 export { getAllTables } from "../shared/utils/sync/getAllTables";
 export { updateFilters } from "../shared/utils/sync/pullFromRemote/updateFilter";
+export { updateRpcFilters } from "../shared/utils/sync/pullFromRemote/updateRpcFilters";
 export { refreshAllTables, refreshTable, refreshTableWithPayload, } from "../shared/utils/sync/refreshTables";
 export { clearSyncCalls, getAllSyncTables, getSyncCall, registerSyncCall, unregisterSyncCall, } from "../shared/utils/sync/registration/syncCalls";
 export { defineLocalSchema } from "./core/schemaManager";
@@ -21,8 +22,9 @@ export { updateLocalDb, upsertChunkData, upsertData, } from "./utils/sync/pullFr
 export { clearAllLocalDeleteLog, clearAllLocalSyncLog, clearLocalDeleteLog, clearLocalSyncLog, clearSyncLog, getLocalDeleteLog, getSyncLog, resetSyncLog, setLocalDeleteLog, setLocalSyncLog, setSyncLog, } from "./utils/sync/status/syncStatus";
 export type { CrudMethods } from "../shared/types/query.types";
 export type { RealtimeOptions, SupastashDataResult, SupastashFilter, } from "../shared/types/realtimeData.types";
-export type { ExpoSQLiteClient, RNSqliteNitroClient, RNStorageSQLiteClient, SupastashConfig, SupastashHookReturn, SupastashSQLiteClientTypes, SupastashSQLiteDatabase, SupastashSQLiteExecutor, TauriSQLiteClient, } from "../shared/types/supastashConfig.types";
 export type { LocalSchemaDefinition } from "../shared/types/schemaManager.types";
-export type { SyncInfo } from "../shared/types/syncEngine.types";
+export type { ExpoSQLiteClient, RNSqliteNitroClient, RNStorageSQLiteClient, SupastashConfig, SupastashHookReturn, SupastashSQLiteClientTypes, SupastashSQLiteDatabase, SupastashSQLiteExecutor, TauriSQLiteClient, } from "../shared/types/supastashConfig.types";
 export type { SupastashClient, SupastashTransactionClient, } from "../shared/utils/query/builder";
+export type { SyncInfo } from "../shared/types/syncEngine.types";
+export type { SyncCountResult } from "../shared/types/rpcFilter.types";
 //# sourceMappingURL=index.d.ts.map

package/dist/desktop/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/desktop/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,YAAY,GACb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EACL,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,kDAAkD,CAAC;AACjF,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,uBAAuB,GACxB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EACL,aAAa,EACb,SAAS,EACT,aAAa,EACb,uBAAuB,EACvB,oBAAoB,EACpB,SAAS,GACV,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EACL,aAAa,EACb,eAAe,EACf,UAAU,GACX,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,UAAU,GACX,MAAM,gCAAgC,CAAC;AAExC,YAAY,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,YAAY,EACV,eAAe,EACf,mBAAmB,EACnB,eAAe,GAChB,MAAM,oCAAoC,CAAC;AAC5C,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,mBAAmB,EACnB,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,uCAAuC,CAAC;AAE/C,YAAY,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAEjF,YAAY,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,YAAY,EACV,eAAe,EACf,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/desktop/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,YAAY,GACb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EACL,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,kDAAkD,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,sDAAsD,CAAC;AACxF,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,uBAAuB,GACxB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EACL,aAAa,EACb,SAAS,EACT,aAAa,EACb,uBAAuB,EACvB,oBAAoB,EACpB,SAAS,GACV,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EACL,aAAa,EACb,eAAe,EACf,UAAU,GACX,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,UAAU,GACX,MAAM,gCAAgC,CAAC;AAExC,YAAY,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,YAAY,EACV,eAAe,EACf,mBAAmB,EACnB,eAAe,GAChB,MAAM,oCAAoC,CAAC;AAC5C,YAAY,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AACjF,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,mBAAmB,EACnB,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EACV,eAAe,EACf,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AAEvC,YAAY,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,YAAY,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC"}

package/dist/desktop/index.js

@@ -9,6 +9,7 @@ export { refreshScreen } from "../shared/utils/refreshScreenCalls";
 export { getSupastashRuntimeMode, reinitializeSupastash, } from "../shared/utils/supastashMode";
 export { getAllTables } from "../shared/utils/sync/getAllTables";
 export { updateFilters } from "../shared/utils/sync/pullFromRemote/updateFilter";
+export { updateRpcFilters } from "../shared/utils/sync/pullFromRemote/updateRpcFilters";
 export { refreshAllTables, refreshTable, refreshTableWithPayload, } from "../shared/utils/sync/refreshTables";
 export { clearSyncCalls, getAllSyncTables, getSyncCall, registerSyncCall, unregisterSyncCall, } from "../shared/utils/sync/registration/syncCalls";
 export { defineLocalSchema } from "./core/schemaManager";

package/dist/desktop/utils/sync/pullFromRemote/index.d.ts

@@ -1,5 +1,6 @@
 /**
- * Pulls the data from the remote database to the local database
+ * Pulls the data from the remote database to the local database (per-table path).
+ * For the batch RPC path, see pullFromRemoteBatch — routed via syncEngine.
  */
 export declare function pullFromRemote(): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/desktop/utils/sync/pullFromRemote/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pullFromRemote/index.ts"],"names":[],"mappings":"AASA;;GAEG;AACH,wBAAsB,cAAc,kBAqEnC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pullFromRemote/index.ts"],"names":[],"mappings":"AASA;;;GAGG;AACH,wBAAsB,cAAc,kBAqEnC"}

package/dist/desktop/utils/sync/pullFromRemote/index.js

@@ -5,9 +5,10 @@ import log from "../../../../shared/utils/logs";
 import { getAllTables } from "../../../../shared/utils/sync/getAllTables";
 import { runLimitedConcurrency } from "../../../../shared/utils/sync/pullFromRemote/runLimitedConcurrency";
 import { SyncInfoUpdater } from "../../../../shared/utils/sync/queryStatus";
-import { updateLocalDb } from "../../../utils/sync/pullFromRemote/updateLocalDb";
+import { updateLocalDb } from "./updateLocalDb";
 /**
- * Pulls the data from the remote database to the local database
+ * Pulls the data from the remote database to the local database (per-table path).
+ * For the batch RPC path, see pullFromRemoteBatch — routed via syncEngine.
  */
 export async function pullFromRemote() {
     let numberOfTables = 0;

package/dist/desktop/utils/sync/pullFromRemote/pullFromRemoteBatch.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Batch pull: fetches all tables in a single RPC call per round,
+ * looping until `remaining_tables` is empty.
+ *
+ * Requires `useBatchPullSync: true` in config and the
+ * `supastash_pull_sync` Postgres function to be deployed.
+ */
+export declare function pullFromRemoteBatch(): Promise<void>;
+//# sourceMappingURL=pullFromRemoteBatch.d.ts.map

package/dist/desktop/utils/sync/pullFromRemote/pullFromRemoteBatch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pullFromRemoteBatch.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pullFromRemote/pullFromRemoteBatch.ts"],"names":[],"mappings":"AA+CA;;;;;;GAMG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CA4MzD"}

package/dist/desktop/utils/sync/pullFromRemote/pullFromRemoteBatch.js

@@ -0,0 +1,202 @@
+import { getSupastashConfig } from "../../../../shared/core/config";
+import { getSupastashDb } from "../../../../shared/db/dbInitializer";
+import { rpcTableFilters } from "../../../../shared/store/rpcTableFilters";
+import { tableFilters } from "../../../../shared/store/tableFilters";
+import log, { logError, logWarn } from "../../../../shared/utils/logs";
+import { refreshScreen } from "../../../../shared/utils/refreshScreenCalls";
+import { supabaseClientErr } from "../../../../shared/utils/supabaseClientErr";
+import { getAllTables } from "../../../../shared/utils/sync/getAllTables";
+import { getMaxSyncLookBack, logNoUpdates, returnMaxDate, } from "../../../../shared/utils/sync/pullFromRemote/helpers";
+import { postgrestFiltersToRpc } from "../../../../shared/utils/sync/pullFromRemote/postgrestToRpc";
+import { SyncInfoUpdater } from "../../../../shared/utils/sync/queryStatus";
+import { prefetchRemoteTableSchemas } from "../../../../shared/utils/sync/status/remoteSchema";
+import { selectSyncStatus } from "../status/repo";
+import { setSupastashSyncStatus } from "../status/services";
+import { upsertChunkData } from "./updateLocalDb";
+const CHUNK_SIZE = 999;
+function buildCursorFilter(tsCol, lastSyncedAt, lastPk) {
+    if (lastPk) {
+        return {
+            or: [
+                { col: tsCol, op: "gt", val: lastSyncedAt },
+                {
+                    and: [
+                        { col: tsCol, op: "eq", val: lastSyncedAt },
+                        { col: "id", op: "gt", val: lastPk },
+                    ],
+                },
+            ],
+        };
+    }
+    return { col: tsCol, op: "gte", val: lastSyncedAt };
+}
+/**
+ * Batch pull: fetches all tables in a single RPC call per round,
+ * looping until `remaining_tables` is empty.
+ *
+ * Requires `useBatchPullSync: true` in config and the
+ * `supastash_pull_sync` Postgres function to be deployed.
+ */
+export async function pullFromRemoteBatch() {
+    const cfg = getSupastashConfig();
+    const supabase = cfg.supabaseClient;
+    if (!supabase)
+        throw new Error(`No supabase client found: ${supabaseClientErr}`);
+    if (cfg.supastashMode === "ghost")
+        return;
+    const tables = await getAllTables();
+    if (!tables) {
+        log("[Supastash] Batch pull: no tables found");
+        return;
+    }
+    const excludeTables = cfg.excludeTables?.pull ?? [];
+    const tablesToPull = tables.filter((t) => !excludeTables.includes(t));
+    if (!tablesToPull.length)
+        return;
+    const tsCol = cfg.replicationMode === "server-side" ? "arrived_at" : "updated_at";
+    const db = await getSupastashDb();
+    const completedTables = new Set();
+    SyncInfoUpdater.setInProgress({ action: "start", type: "pull" });
+    SyncInfoUpdater.setNumberOfTables({
+        amount: tablesToPull.length,
+        type: "pull",
+    });
+    // Warm schema cache for all tables in one call if enabled
+    if (cfg.useBatchSchemaFetch) {
+        await prefetchRemoteTableSchemas(tablesToPull);
+    }
+    let remainingTables = tablesToPull;
+    try {
+        while (remainingTables.length > 0) {
+            // ── Build per-table filters: base filters + cursor ──────────────────
+            const p_filters = {};
+            for (const table of remainingTables) {
+                const syncStatus = await selectSyncStatus(db, table, tableFilters.get(table) ?? []);
+                // Mirror pageThrough: cap the cursor to maxSyncLookbackDays so a
+                // first-time sync doesn't try to pull decades of data.
+                // fullSyncTables bypass the cap (getMaxSyncLookBack returns undefined).
+                const maxLookBack = getMaxSyncLookBack({ table });
+                const effectiveSince = maxLookBack &&
+                    Date.parse(syncStatus.last_synced_at) < Date.parse(maxLookBack)
+                    ? maxLookBack
+                    : syncStatus.last_synced_at;
+                const cursorFilter = buildCursorFilter(tsCol, effectiveSince, syncStatus.last_synced_at_pk);
+                // Merge explicit RPC filters + PostgREST filters auto-converted at query time
+                const rpcBase = rpcTableFilters.get(table) ?? [];
+                const converted = postgrestFiltersToRpc(tableFilters.get(table));
+                const baseFilters = [...rpcBase, ...converted];
+                p_filters[table] = [...baseFilters, cursorFilter];
+            }
+            // ── Single RPC call ─────────────────────────────────────────────────
+            const { data, error } = await supabase.rpc("supastash_pull_sync", {
+                p_tables: remainingTables,
+                p_filters,
+                p_ts_col: tsCol,
+            });
+            if (error)
+                throw error;
+            const result = data;
+            const nextRemaining = result.remaining_tables ?? [];
+            // ── Process each table ──────────────────────────────────────────────
+            for (const [table, rows] of Object.entries(result.tables ?? {})) {
+                SyncInfoUpdater.markLogStart({ type: "pull", table });
+                try {
+                    if (!rows?.length) {
+                        logNoUpdates(table);
+                        SyncInfoUpdater.markLogSuccess({ type: "pull", table });
+                        continue;
+                    }
+                    const toDelete = [];
+                    const toUpsert = [];
+                    let prevMaxSyncedAt = null;
+                    let prevMaxDeletedAt = null;
+                    for (const row of rows) {
+                        if (!row?.id) {
+                            logWarn(`[Supastash] Batch: skipped row without id from "${table}"`);
+                            continue;
+                        }
+                        prevMaxSyncedAt = returnMaxDate({
+                            row,
+                            prevMax: prevMaxSyncedAt,
+                            col: tsCol,
+                        });
+                        prevMaxDeletedAt = returnMaxDate({
+                            row,
+                            prevMax: prevMaxDeletedAt,
+                            col: "deleted_at",
+                        });
+                        if (row.deleted_at) {
+                            toDelete.push(row.id);
+                        }
+                        else {
+                            toUpsert.push(row);
+                        }
+                    }
+                    SyncInfoUpdater.setUnsyncedDataCount({
+                        amount: toUpsert.length,
+                        type: "pull",
+                        table,
+                    });
+                    SyncInfoUpdater.setUnsyncedDeletedCount({
+                        amount: toDelete.length,
+                        type: "pull",
+                        table,
+                    });
+                    // Delete soft-deleted rows
+                    if (toDelete.length > 0) {
+                        for (let i = 0; i < toDelete.length; i += CHUNK_SIZE) {
+                            const slice = toDelete.slice(i, i + CHUNK_SIZE);
+                            const placeholders = slice.map(() => "?").join(", ");
+                            await db.runAsync(`DELETE FROM ${table} WHERE id IN (${placeholders})`, slice);
+                        }
+                    }
+                    // Upsert live rows
+                    if (toUpsert.length > 0) {
+                        await upsertChunkData({ table, records: toUpsert });
+                    }
+                    // Update sync cursor so the next round starts from the right place
+                    if (prevMaxSyncedAt || prevMaxDeletedAt) {
+                        await setSupastashSyncStatus(table, tableFilters.get(table) ?? [], {
+                            lastSyncedAt: prevMaxSyncedAt?.value ?? undefined,
+                            lastDeletedAt: prevMaxDeletedAt?.value ?? undefined,
+                            lastSyncedAtPk: prevMaxSyncedAt?.pk ?? null,
+                            filterNamespace: "global",
+                        });
+                    }
+                    if (toUpsert.length > 0 || toDelete.length > 0) {
+                        refreshScreen(table);
+                    }
+                    log(`[Supastash] Batch received ${rows.length} rows for "${table}" ` +
+                        `(u${toUpsert.length}/d${toDelete.length})`);
+                    SyncInfoUpdater.markLogSuccess({ type: "pull", table });
+                }
+                catch (e) {
+                    SyncInfoUpdater.markLogError({
+                        type: "pull",
+                        table,
+                        lastError: e,
+                        errorCount: 1,
+                    });
+                    logError(`[Supastash] Batch pull failed for "${table}"`, e);
+                }
+                finally {
+                    // Mark table as fully completed only once it leaves remaining_tables
+                    if (!nextRemaining.includes(table)) {
+                        completedTables.add(table);
+                        SyncInfoUpdater.setTablesCompleted({
+                            amount: completedTables.size,
+                            type: "pull",
+                        });
+                    }
+                }
+            }
+            remainingTables = nextRemaining;
+        }
+    }
+    catch (error) {
+        logError("[Supastash] Error in batch pull from remote", error);
+    }
+    finally {
+        SyncInfoUpdater.reset({ type: "pull" });
+    }
+}

package/dist/index.d.ts

@@ -7,6 +7,7 @@ export { refreshScreen } from "./shared/utils/refreshScreenCalls";
 export { getSupastashRuntimeMode, reinitializeSupastash, } from "./shared/utils/supastashMode";
 export { getAllTables } from "./shared/utils/sync/getAllTables";
 export { updateFilters } from "./shared/utils/sync/pullFromRemote/updateFilter";
+export { updateRpcFilters } from "./shared/utils/sync/pullFromRemote/updateRpcFilters";
 export { refreshAllTables, refreshTable, refreshTableWithPayload, } from "./shared/utils/sync/refreshTables";
 export { clearSyncCalls, getAllSyncTables, getSyncCall, registerSyncCall, unregisterSyncCall, } from "./shared/utils/sync/registration/syncCalls";
 export { supastash } from "./shared/utils/query/builder";
@@ -15,5 +16,6 @@ export type { RealtimeOptions, SupastashDataResult, SupastashFilter, } from "./s
 export type { LocalSchemaDefinition } from "./shared/types/schemaManager.types";
 export type { ExpoSQLiteClient, RNSqliteNitroClient, RNStorageSQLiteClient, SupastashConfig, SupastashHookReturn, SupastashSQLiteClientTypes, SupastashSQLiteDatabase, SupastashSQLiteExecutor, TauriSQLiteClient, } from "./shared/types/supastashConfig.types";
 export type { SyncInfo } from "./shared/types/syncEngine.types";
+export type { SyncCountResult } from "./shared/types/rpcFilter.types";
 export type { SupastashClient, SupastashTransactionClient, } from "./shared/utils/query/builder";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,YAAY,GACb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EACL,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAChF,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,uBAAuB,GACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,YAAY,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,YAAY,EACV,eAAe,EACf,mBAAmB,EACnB,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAChF,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,mBAAmB,EACnB,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,sCAAsC,CAAC;AAC9C,YAAY,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAChE,YAAY,EACV,eAAe,EACf,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,YAAY,GACb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EACL,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AACvF,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,uBAAuB,GACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,YAAY,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,YAAY,EACV,eAAe,EACf,mBAAmB,EACnB,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAChF,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,mBAAmB,EACnB,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,sCAAsC,CAAC;AAC9C,YAAY,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAChE,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,YAAY,EACV,eAAe,EACf,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC"}

package/dist/index.js

@@ -7,6 +7,7 @@ export { refreshScreen } from "./shared/utils/refreshScreenCalls";
 export { getSupastashRuntimeMode, reinitializeSupastash, } from "./shared/utils/supastashMode";
 export { getAllTables } from "./shared/utils/sync/getAllTables";
 export { updateFilters } from "./shared/utils/sync/pullFromRemote/updateFilter";
+export { updateRpcFilters } from "./shared/utils/sync/pullFromRemote/updateRpcFilters";
 export { refreshAllTables, refreshTable, refreshTableWithPayload, } from "./shared/utils/sync/refreshTables";
 export { clearSyncCalls, getAllSyncTables, getSyncCall, registerSyncCall, unregisterSyncCall, } from "./shared/utils/sync/registration/syncCalls";
 export { supastash } from "./shared/utils/query/builder";

package/dist/native/hooks/syncEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"syncEngine.d.ts","sourceRoot":"","sources":["../../../src/native/hooks/syncEngine.ts"],"names":[],"mappings":"AA6BA;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAqCnE;AAuDD;;;;;GAKG;AACH,wBAAgB,aAAa;;;EA+D5B;AAMD;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgC5D;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAEnD"}
+{"version":3,"file":"syncEngine.d.ts","sourceRoot":"","sources":["../../../src/native/hooks/syncEngine.ts"],"names":[],"mappings":"AA8BA;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAqCnE;AAyDD;;;;;GAKG;AACH,wBAAgB,aAAa;;;EA+D5B;AAMD;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgC5D;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAEnD"}

package/dist/native/hooks/syncEngine.js

@@ -7,6 +7,7 @@ import { tableFilters } from "../../shared/store/tableFilters";
 import { isOnline } from "../../shared/utils/connection";
 import log from "../../shared/utils/logs";
 import { pullFromRemote as doPullFromRemote } from "../utils/sync/pullFromRemote";
+import { pullFromRemoteBatch } from "../utils/sync/pullFromRemote/pullFromRemoteBatch";
 import { updateLocalDb } from "../utils/sync/pullFromRemote/updateLocalDb";
 import { pushLocalData as doPushLocalData } from "../utils/sync/pushLocal";
 import { pushLocalDataToRemote } from "../utils/sync/pushLocal/sendUnsyncedToSupabase";
@@ -103,7 +104,6 @@ async function pullFromRemoteSafe() {
         return;
     if (!(await isOnline()))
         return;
-    // If in ghost mode, don't pull
     const cfg = getSupastashConfig();
     if (cfg.supastashMode === "ghost")
         return;
@@ -111,7 +111,12 @@ async function pullFromRemoteSafe() {
         return;
     isPulling = true;
     try {
-        await doPullFromRemote();
+        if (cfg.useBatchPullSync) {
+            await pullFromRemoteBatch();
+        }
+        else {
+            await doPullFromRemote();
+        }
         lastPullAt = Date.now();
     }
     catch (e) {

package/dist/native/index.d.ts

@@ -9,6 +9,7 @@ export { refreshScreen } from "../shared/utils/refreshScreenCalls";
 export { getSupastashRuntimeMode, reinitializeSupastash, } from "../shared/utils/supastashMode";
 export { getAllTables } from "../shared/utils/sync/getAllTables";
 export { updateFilters } from "../shared/utils/sync/pullFromRemote/updateFilter";
+export { updateRpcFilters } from "../shared/utils/sync/pullFromRemote/updateRpcFilters";
 export { refreshAllTables, refreshTable, refreshTableWithPayload, } from "../shared/utils/sync/refreshTables";
 export { clearSyncCalls, getAllSyncTables, getSyncCall, registerSyncCall, unregisterSyncCall, } from "../shared/utils/sync/registration/syncCalls";
 export { defineLocalSchema } from "./core/schemaManager";
@@ -25,4 +26,5 @@ export type { LocalSchemaDefinition } from "../shared/types/schemaManager.types"
 export type { ExpoSQLiteClient, RNSqliteNitroClient, RNStorageSQLiteClient, SupastashConfig, SupastashHookReturn, SupastashSQLiteClientTypes, SupastashSQLiteDatabase, SupastashSQLiteExecutor, TauriSQLiteClient, } from "../shared/types/supastashConfig.types";
 export type { SupastashClient, SupastashTransactionClient, } from "../shared/utils/query/builder";
 export type { SyncInfo } from "../shared/types/syncEngine.types";
+export type { SyncCountResult } from "../shared/types/rpcFilter.types";
 //# sourceMappingURL=index.d.ts.map

package/dist/native/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/native/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,YAAY,GACb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EACL,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,kDAAkD,CAAC;AACjF,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,uBAAuB,GACxB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EACL,aAAa,EACb,SAAS,EACT,aAAa,EACb,uBAAuB,EACvB,oBAAoB,EACpB,SAAS,GACV,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EACL,aAAa,EACb,eAAe,EACf,UAAU,GACX,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,UAAU,GACX,MAAM,gCAAgC,CAAC;AAExC,YAAY,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,YAAY,EACV,eAAe,EACf,mBAAmB,EACnB,eAAe,GAChB,MAAM,oCAAoC,CAAC;AAC5C,YAAY,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AACjF,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,mBAAmB,EACnB,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EACV,eAAe,EACf,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AAEvC,YAAY,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/native/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,YAAY,GACb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EACL,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,kDAAkD,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,sDAAsD,CAAC;AACxF,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,uBAAuB,GACxB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EACL,aAAa,EACb,SAAS,EACT,aAAa,EACb,uBAAuB,EACvB,oBAAoB,EACpB,SAAS,GACV,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EACL,aAAa,EACb,eAAe,EACf,UAAU,GACX,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,UAAU,GACX,MAAM,gCAAgC,CAAC;AAExC,YAAY,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,YAAY,EACV,eAAe,EACf,mBAAmB,EACnB,eAAe,GAChB,MAAM,oCAAoC,CAAC;AAC5C,YAAY,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AACjF,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,mBAAmB,EACnB,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EACV,eAAe,EACf,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AAEvC,YAAY,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,YAAY,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC"}

package/dist/native/index.js

@@ -9,6 +9,7 @@ export { refreshScreen } from "../shared/utils/refreshScreenCalls";
 export { getSupastashRuntimeMode, reinitializeSupastash, } from "../shared/utils/supastashMode";
 export { getAllTables } from "../shared/utils/sync/getAllTables";
 export { updateFilters } from "../shared/utils/sync/pullFromRemote/updateFilter";
+export { updateRpcFilters } from "../shared/utils/sync/pullFromRemote/updateRpcFilters";
 export { refreshAllTables, refreshTable, refreshTableWithPayload, } from "../shared/utils/sync/refreshTables";
 export { clearSyncCalls, getAllSyncTables, getSyncCall, registerSyncCall, unregisterSyncCall, } from "../shared/utils/sync/registration/syncCalls";
 export { defineLocalSchema } from "./core/schemaManager";

package/dist/native/utils/sync/pullFromRemote/index.d.ts

@@ -1,5 +1,6 @@
 /**
- * Pulls the data from the remote database to the local database
+ * Pulls the data from the remote database to the local database (per-table path).
+ * For the batch RPC path, see pullFromRemoteBatch — routed via syncEngine.
  */
 export declare function pullFromRemote(): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/native/utils/sync/pullFromRemote/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/native/utils/sync/pullFromRemote/index.ts"],"names":[],"mappings":"AASA;;GAEG;AACH,wBAAsB,cAAc,kBAqEnC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/native/utils/sync/pullFromRemote/index.ts"],"names":[],"mappings":"AAUA;;;GAGG;AACH,wBAAsB,cAAc,kBA0EnC"}

package/dist/native/utils/sync/pullFromRemote/index.js

@@ -5,9 +5,11 @@ import log from "../../../../shared/utils/logs";
 import { getAllTables } from "../../../../shared/utils/sync/getAllTables";
 import { runLimitedConcurrency } from "../../../../shared/utils/sync/pullFromRemote/runLimitedConcurrency";
 import { SyncInfoUpdater } from "../../../../shared/utils/sync/queryStatus";
+import { prefetchRemoteTableSchemas } from "../../../../shared/utils/sync/status/remoteSchema";
 import { updateLocalDb } from "./updateLocalDb";
 /**
- * Pulls the data from the remote database to the local database
+ * Pulls the data from the remote database to the local database (per-table path).
+ * For the batch RPC path, see pullFromRemoteBatch — routed via syncEngine.
  */
 export async function pullFromRemote() {
     let numberOfTables = 0;
@@ -21,6 +23,10 @@ export async function pullFromRemote() {
         const excludeTables = getSupastashConfig()?.excludeTables?.pull || [];
         const tablesToPull = tables.filter((table) => !excludeTables?.includes(table));
         numberOfTables = tablesToPull.length;
+        // Warm schema cache for all tables in one call if enabled
+        if (getSupastashConfig().useBatchSchemaFetch) {
+            await prefetchRemoteTableSchemas(tablesToPull);
+        }
         SyncInfoUpdater.setInProgress({
             action: "start",
             type: "pull",

package/dist/native/utils/sync/pullFromRemote/pullFromRemoteBatch.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Batch pull: fetches all tables in a single RPC call per round,
+ * looping until `remaining_tables` is empty.
+ *
+ * Requires `useBatchPullSync: true` in config and the
+ * `supastash_pull_sync` Postgres function to be deployed.
+ */
+export declare function pullFromRemoteBatch(): Promise<void>;
+//# sourceMappingURL=pullFromRemoteBatch.d.ts.map

package/dist/native/utils/sync/pullFromRemote/pullFromRemoteBatch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pullFromRemoteBatch.d.ts","sourceRoot":"","sources":["../../../../../src/native/utils/sync/pullFromRemote/pullFromRemoteBatch.ts"],"names":[],"mappings":"AA4CA;;;;;;GAMG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CA+KzD"}

package/dist/native/utils/sync/pullFromRemote/pullFromRemoteBatch.js

@@ -0,0 +1,183 @@
+import { getSupastashConfig } from "../../../../shared/core/config";
+import { getSupastashDb } from "../../../../shared/db/dbInitializer";
+import { rpcTableFilters } from "../../../../shared/store/rpcTableFilters";
+import { tableFilters } from "../../../../shared/store/tableFilters";
+import { postgrestFiltersToRpc } from "../../../../shared/utils/sync/pullFromRemote/postgrestToRpc";
+import { getAllTables } from "../../../../shared/utils/sync/getAllTables";
+import { getMaxSyncLookBack, logNoUpdates, returnMaxDate, } from "../../../../shared/utils/sync/pullFromRemote/helpers";
+import { SyncInfoUpdater } from "../../../../shared/utils/sync/queryStatus";
+import { refreshScreen } from "../../../../shared/utils/refreshScreenCalls";
+import log, { logError, logWarn } from "../../../../shared/utils/logs";
+import { supabaseClientErr } from "../../../../shared/utils/supabaseClientErr";
+import { prefetchRemoteTableSchemas } from "../../../../shared/utils/sync/status/remoteSchema";
+import { setSupastashSyncStatus } from "../status/services";
+import { selectSyncStatus } from "../status/repo";
+import { upsertChunkData } from "./updateLocalDb";
+const CHUNK_SIZE = 999;
+function buildCursorFilter(tsCol, lastSyncedAt, lastPk) {
+    if (lastPk) {
+        return {
+            or: [
+                { col: tsCol, op: "gt", val: lastSyncedAt },
+                {
+                    and: [
+                        { col: tsCol, op: "eq", val: lastSyncedAt },
+                        { col: "id", op: "gt", val: lastPk },
+                    ],
+                },
+            ],
+        };
+    }
+    return { col: tsCol, op: "gte", val: lastSyncedAt };
+}
+/**
+ * Batch pull: fetches all tables in a single RPC call per round,
+ * looping until `remaining_tables` is empty.
+ *
+ * Requires `useBatchPullSync: true` in config and the
+ * `supastash_pull_sync` Postgres function to be deployed.
+ */
+export async function pullFromRemoteBatch() {
+    const cfg = getSupastashConfig();
+    const supabase = cfg.supabaseClient;
+    if (!supabase)
+        throw new Error(`No supabase client found: ${supabaseClientErr}`);
+    if (cfg.supastashMode === "ghost")
+        return;
+    const tables = await getAllTables();
+    if (!tables) {
+        log("[Supastash] Batch pull: no tables found");
+        return;
+    }
+    const excludeTables = cfg.excludeTables?.pull ?? [];
+    const tablesToPull = tables.filter((t) => !excludeTables.includes(t));
+    if (!tablesToPull.length)
+        return;
+    const tsCol = cfg.replicationMode === "server-side" ? "arrived_at" : "updated_at";
+    const db = await getSupastashDb();
+    const completedTables = new Set();
+    SyncInfoUpdater.setInProgress({ action: "start", type: "pull" });
+    SyncInfoUpdater.setNumberOfTables({ amount: tablesToPull.length, type: "pull" });
+    // Warm schema cache for all tables in one call if enabled
+    if (cfg.useBatchSchemaFetch) {
+        await prefetchRemoteTableSchemas(tablesToPull);
+    }
+    let remainingTables = tablesToPull;
+    try {
+        while (remainingTables.length > 0) {
+            // ── Build per-table filters: base filters + cursor ──────────────────
+            const p_filters = {};
+            for (const table of remainingTables) {
+                const syncStatus = await selectSyncStatus(db, table, tableFilters.get(table) ?? []);
+                // Mirror pageThrough: cap the cursor to maxSyncLookbackDays so a
+                // first-time sync doesn't try to pull decades of data.
+                // fullSyncTables bypass the cap (getMaxSyncLookBack returns undefined).
+                const maxLookBack = getMaxSyncLookBack({ table });
+                const effectiveSince = maxLookBack &&
+                    Date.parse(syncStatus.last_synced_at) < Date.parse(maxLookBack)
+                    ? maxLookBack
+                    : syncStatus.last_synced_at;
+                const cursorFilter = buildCursorFilter(tsCol, effectiveSince, syncStatus.last_synced_at_pk);
+                // Merge explicit RPC filters + PostgREST filters auto-converted at query time
+                const rpcBase = rpcTableFilters.get(table) ?? [];
+                const converted = postgrestFiltersToRpc(tableFilters.get(table));
+                const baseFilters = [...rpcBase, ...converted];
+                p_filters[table] = [...baseFilters, cursorFilter];
+            }
+            // ── Single RPC call ─────────────────────────────────────────────────
+            const { data, error } = await supabase.rpc("supastash_pull_sync", {
+                p_tables: remainingTables,
+                p_filters,
+                p_ts_col: tsCol,
+            });
+            if (error)
+                throw error;
+            const result = data;
+            const nextRemaining = result.remaining_tables ?? [];
+            // ── Process each table ──────────────────────────────────────────────
+            for (const [table, rows] of Object.entries(result.tables ?? {})) {
+                SyncInfoUpdater.markLogStart({ type: "pull", table });
+                try {
+                    if (!rows?.length) {
+                        logNoUpdates(table);
+                        SyncInfoUpdater.markLogSuccess({ type: "pull", table });
+                        continue;
+                    }
+                    const toDelete = [];
+                    const toUpsert = [];
+                    let prevMaxSyncedAt = null;
+                    let prevMaxDeletedAt = null;
+                    for (const row of rows) {
+                        if (!row?.id) {
+                            logWarn(`[Supastash] Batch: skipped row without id from "${table}"`);
+                            continue;
+                        }
+                        prevMaxSyncedAt = returnMaxDate({ row, prevMax: prevMaxSyncedAt, col: tsCol });
+                        prevMaxDeletedAt = returnMaxDate({ row, prevMax: prevMaxDeletedAt, col: "deleted_at" });
+                        if (row.deleted_at) {
+                            toDelete.push(row.id);
+                        }
+                        else {
+                            toUpsert.push(row);
+                        }
+                    }
+                    SyncInfoUpdater.setUnsyncedDataCount({ amount: toUpsert.length, type: "pull", table });
+                    SyncInfoUpdater.setUnsyncedDeletedCount({ amount: toDelete.length, type: "pull", table });
+                    // Delete soft-deleted rows
+                    if (toDelete.length > 0) {
+                        for (let i = 0; i < toDelete.length; i += CHUNK_SIZE) {
+                            const slice = toDelete.slice(i, i + CHUNK_SIZE);
+                            const placeholders = slice.map(() => "?").join(", ");
+                            await db.runAsync(`DELETE FROM ${table} WHERE id IN (${placeholders})`, slice);
+                        }
+                    }
+                    // Upsert live rows
+                    if (toUpsert.length > 0) {
+                        await upsertChunkData({ table, records: toUpsert });
+                    }
+                    // Update sync cursor so the next round starts from the right place
+                    if (prevMaxSyncedAt || prevMaxDeletedAt) {
+                        await setSupastashSyncStatus(table, tableFilters.get(table) ?? [], {
+                            lastSyncedAt: prevMaxSyncedAt?.value ?? undefined,
+                            lastDeletedAt: prevMaxDeletedAt?.value ?? undefined,
+                            lastSyncedAtPk: prevMaxSyncedAt?.pk ?? null,
+                            filterNamespace: "global",
+                        });
+                    }
+                    if (toUpsert.length > 0 || toDelete.length > 0) {
+                        refreshScreen(table);
+                    }
+                    log(`[Supastash] Batch received ${rows.length} rows for "${table}" ` +
+                        `(u${toUpsert.length}/d${toDelete.length})`);
+                    SyncInfoUpdater.markLogSuccess({ type: "pull", table });
+                }
+                catch (e) {
+                    SyncInfoUpdater.markLogError({
+                        type: "pull",
+                        table,
+                        lastError: e,
+                        errorCount: 1,
+                    });
+                    logError(`[Supastash] Batch pull failed for "${table}"`, e);
+                }
+                finally {
+                    // Mark table as fully completed only once it leaves remaining_tables
+                    if (!nextRemaining.includes(table)) {
+                        completedTables.add(table);
+                        SyncInfoUpdater.setTablesCompleted({
+                            amount: completedTables.size,
+                            type: "pull",
+                        });
+                    }
+                }
+            }
+            remainingTables = nextRemaining;
+        }
+    }
+    catch (error) {
+        logError("[Supastash] Error in batch pull from remote", error);
+    }
+    finally {
+        SyncInfoUpdater.reset({ type: "pull" });
+    }
+}

package/dist/shared/core/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/shared/core/config/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,0BAA0B,EAC3B,MAAM,mCAAmC,CAAC;AAmC3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AAEH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,0BAA0B,EACrE,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG;IAAE,gBAAgB,EAAE,CAAC,CAAA;CAAE,QAwCrD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAChC,CAAC,SAAS,0BAA0B,KACjC,eAAe,CAAC,CAAC,CAAC,CAEtB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,qBAAqB,CACnC,CAAC,SAAS,0BAA0B,EACpC,MAAM,EAAE;IACR,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG;QAC9B,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;KAC3B,CAAC;CACH,QAEA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/shared/core/config/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,0BAA0B,EAC3B,MAAM,mCAAmC,CAAC;AAqC3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AAEH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,0BAA0B,EACrE,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG;IAAE,gBAAgB,EAAE,CAAC,CAAA;CAAE,QAwCrD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAChC,CAAC,SAAS,0BAA0B,KACjC,eAAe,CAAC,CAAC,CAAC,CAEtB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,qBAAqB,CACnC,CAAC,SAAS,0BAA0B,EACpC,MAAM,EAAE;IACR,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG;QAC9B,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;KAC3B,CAAC;CACH,QAEA"}

package/dist/shared/core/config/index.js

@@ -16,6 +16,8 @@ let _config = {
     },
     platform: "native",
     replicationMode: "client-side",
+    useBatchPullSync: false,
+    useBatchSchemaFetch: false,
     hasEnabledSimpleNullHandling: false,
     maxSyncLookbackDays: 365,
     perTableSyncLookbackDays: undefined,

package/dist/shared/hooks/supastashFilters/index.d.ts

@@ -1,4 +1,5 @@
 import { SupastashFilter } from "../../types/realtimeData.types";
+import { RpcTableFilters } from "../../types/rpcFilter.types";
 /**
  * useSupastashFilters
  *
@@ -26,11 +27,15 @@ import { SupastashFilter } from "../../types/realtimeData.types";
  * });
  * ```
  *
- * @param {SupastashFilter} filters - An object where each key is a table name, and its value is
- *   an array of `SupastashFilter` objects that define the filter criteria for that table's pull sync.
+ * @param {Record<string, SupastashFilter[]>} filters - Per-table filters applied to both the
+ *   per-table pull path and (automatically converted) the batch RPC pull path.
+ *   Covers eq, neq, gt, gte, lt, lte, in, is (null / not-null), and or-groups.
+ * @param {RpcTableFilters} rpcFilters - Optional supplemental RPC filter nodes for the batch
+ *   pull path only. Only needed when you require `and` groups, which `SupastashFilter` doesn't
+ *   support. These are merged with the auto-converted `filters` before the RPC call.
  *
- * @note This hook does not re-run unless the `filters` object reference changes.
+ * @note This hook does not re-run unless the `filters` or `rpcFilters` object reference changes.
  *       To force re-evaluation, pass a fresh object (not just mutated data).
  */
-export declare function useSupastashFilters(filters?: Record<string, SupastashFilter[]>): void;
+export declare function useSupastashFilters(filters?: Record<string, SupastashFilter[]>, rpcFilters?: RpcTableFilters): void;
 //# sourceMappingURL=index.d.ts.map

package/dist/shared/hooks/supastashFilters/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/shared/hooks/supastashFilters/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAMjE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,QAyD5C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/shared/hooks/supastashFilters/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAO9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,EAC3C,UAAU,CAAC,EAAE,eAAe,QA6D7B"}

package/dist/shared/hooks/supastashFilters/index.js

@@ -2,6 +2,7 @@ import { useEffect } from "react";
 import { filterTracker, tableFilters, tableFiltersUsed, } from "../../store/tableFilters";
 import { logWarn } from "../../utils/logs";
 import { ReusedHelpers } from "../../utils/reusedHelpers";
+import { updateRpcFilters } from "../../utils/sync/pullFromRemote/updateRpcFilters";
 import { warnOnMisMatch } from "../../utils/sync/pullFromRemote/validateFilters";
 import { checkIfTableExist } from "../../utils/tableValidator";
 /**
@@ -31,16 +32,23 @@ import { checkIfTableExist } from "../../utils/tableValidator";
  * });
  * ```
  *
- * @param {SupastashFilter} filters - An object where each key is a table name, and its value is
- *   an array of `SupastashFilter` objects that define the filter criteria for that table's pull sync.
+ * @param {Record<string, SupastashFilter[]>} filters - Per-table filters applied to both the
+ *   per-table pull path and (automatically converted) the batch RPC pull path.
+ *   Covers eq, neq, gt, gte, lt, lte, in, is (null / not-null), and or-groups.
+ * @param {RpcTableFilters} rpcFilters - Optional supplemental RPC filter nodes for the batch
+ *   pull path only. Only needed when you require `and` groups, which `SupastashFilter` doesn't
+ *   support. These are merged with the auto-converted `filters` before the RPC call.
  *
- * @note This hook does not re-run unless the `filters` object reference changes.
+ * @note This hook does not re-run unless the `filters` or `rpcFilters` object reference changes.
  *       To force re-evaluation, pass a fresh object (not just mutated data).
  */
-export function useSupastashFilters(filters) {
+export function useSupastashFilters(filters, rpcFilters) {
     useEffect(() => {
         let cancelled = false;
         async function run() {
+            if (rpcFilters) {
+                await updateRpcFilters(rpcFilters);
+            }
             if (!filters)
                 return;
             const incoming = Object.keys(filters);
@@ -82,5 +90,5 @@ export function useSupastashFilters(filters) {
         return () => {
             cancelled = true;
         };
-    }, [filters]);
+    }, [filters, rpcFilters]);
 }

package/dist/shared/store/rpcTableFilters.d.ts

@@ -0,0 +1,7 @@
+import { RpcFilterNode } from "../types/rpcFilter.types";
+/**
+ * Stores per-table RPC filter nodes used by the batch pull sync path.
+ * Keyed by table name, value is the array of RpcFilterNode to apply.
+ */
+export declare const rpcTableFilters: Map<string, RpcFilterNode[]>;
+//# sourceMappingURL=rpcTableFilters.d.ts.map

package/dist/shared/store/rpcTableFilters.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rpcTableFilters.d.ts","sourceRoot":"","sources":["../../../src/shared/store/rpcTableFilters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD;;;GAGG;AACH,eAAO,MAAM,eAAe,8BAAqC,CAAC"}

package/dist/shared/store/rpcTableFilters.js

@@ -0,0 +1,5 @@
+/**
+ * Stores per-table RPC filter nodes used by the batch pull sync path.
+ * Keyed by table name, value is the array of RpcFilterNode to apply.
+ */
+export const rpcTableFilters = new Map();

package/dist/shared/types/rpcFilter.types.d.ts

@@ -0,0 +1,23 @@
+export type RpcFilterOp =
+  | "eq"
+  | "neq"
+  | "gt"
+  | "gte"
+  | "lt"
+  | "lte"
+  | "in"
+  | "is_null"
+  | "is_not_null";
+
+export type RpcSimpleFilter = {
+  col: string;
+  op: RpcFilterOp;
+  val?: string | number;
+};
+
+export type RpcFilterNode =
+  | RpcSimpleFilter
+  | { or: RpcFilterNode[] }
+  | { and: RpcFilterNode[] };
+
+export type RpcTableFilters = Record<string, RpcFilterNode[]>;

package/dist/shared/types/supastashConfig.types.d.ts

@@ -89,12 +89,12 @@ export type SupastashConfig<T extends SupastashSQLiteClientTypes> = {
   sqliteClient: T extends "expo"
     ? ExpoSQLiteClient
     : T extends "rn-storage"
-    ? RNStorageSQLiteClient
-    : T extends "rn-nitro"
-    ? RNSqliteNitroClient
-    : T extends "tauri"
-    ? TauriSQLiteClient
-    : null;
+      ? RNStorageSQLiteClient
+      : T extends "rn-nitro"
+        ? RNSqliteNitroClient
+        : T extends "tauri"
+          ? TauriSQLiteClient
+          : null;
 
   /**
    * Runtime platform.
@@ -319,6 +319,34 @@ export type SupastashConfig<T extends SupastashSQLiteClientTypes> = {
    * Supastash docs: https://0xzekea.github.io/supastash/docs/sync-calls#%EF%B8%8F-pushrpcpath-custom-batch-sync-rpc
    */
   pushRPCPath?: string;
+  /**
+   * When true, pull sync uses a single `supastash_pull_sync` RPC call to fetch
+   * all tables in one round trip instead of per-table queries.
+   *
+   * The RPC handles pagination internally via `remaining_tables` — Supastash
+   * will keep calling until all tables are fully synced.
+   *
+   * Use `updateRpcFilters` to set per-table filters for this mode.
+   *
+   * ⚠️ Requires the `supastash_pull_sync` Postgres function to be deployed
+   * and RLS to be enabled on every table you expose.
+   *
+   * @default false
+   */
+  useBatchPullSync?: boolean;
+  /**
+   * When true, Supastash fetches column metadata for all tables in a single
+   * `get_table_schemas` RPC call at the start of each sync cycle instead of
+   * calling `get_table_schema` once per table on demand.
+   *
+   * Warms the in-memory and SQLite schema caches up front so every subsequent
+   * per-table lookup is served from cache with zero extra network calls.
+   *
+   * Requires the `get_table_schemas` Postgres function to be deployed.
+   *
+   * @default false
+   */
+  useBatchSchemaFetch?: boolean;
   /**
    * Controls how Supastash operates at runtime.
    *
@@ -443,7 +471,7 @@ export interface SupastashSQLiteExecutor {
    */
   queryOne<T = any>(
     sql: string,
-    params?: Record<string, any>
+    params?: Record<string, any>,
   ): Promise<T | null>;
   /**
    * Executes a write or mutation statement.
@@ -500,14 +528,14 @@ export interface SupastashSQLiteDatabase extends SupastashSQLiteExecutor {
    * @returns A Promise that resolves when the transaction is complete
    */
   withTransaction(
-    fn: (tx: SupastashSQLiteExecutor) => Promise<void> | void
+    fn: (tx: SupastashSQLiteExecutor) => Promise<void> | void,
   ): Promise<void>;
 }
 
 export interface SupastashSQLiteAdapter<TClient = any> {
   openDatabaseAsync(
     name: string,
-    sqliteClient: TClient
+    sqliteClient: TClient,
   ): Promise<SupastashSQLiteDatabase>;
 }
 
@@ -515,7 +543,7 @@ export interface ExpoSQLiteClient {
   openDatabaseAsync: (
     databaseName: string,
     options?: SQLiteOpenOptions | undefined,
-    directory?: string | undefined
+    directory?: string | undefined,
   ) => Promise<ExpoSQLiteDatabase>;
 }
 

package/dist/shared/utils/schema/createSyncStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSyncStatus.d.ts","sourceRoot":"","sources":["../../../../src/shared/utils/schema/createSyncStatus.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAsB,wBAAwB,kBAE7C;AAED,eAAO,MAAM,sBAAsB,0ZAUhC,CAAC;AAEJ,eAAO,MAAM,6BAA6B,6eAezC,CAAC;AAEF,eAAO,MAAM,wBAAwB,mFAEpC,CAAC;AAEF,eAAO,MAAM,oBAAoB,2GAGhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,yHAGvC,CAAC;AAIF;;;;GAIG;AACH,wBAAsB,qBAAqB,kBAuB1C;AAED,wEAAwE;AACxE,wBAAgB,yBAAyB,SAExC"}
+{"version":3,"file":"createSyncStatus.d.ts","sourceRoot":"","sources":["../../../../src/shared/utils/schema/createSyncStatus.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAsB,wBAAwB,kBAE7C;AAED,eAAO,MAAM,sBAAsB,0ZAUhC,CAAC;AAEJ,eAAO,MAAM,6BAA6B,6eAezC,CAAC;AAEF,eAAO,MAAM,wBAAwB,mFAEpC,CAAC;AAEF,eAAO,MAAM,oBAAoB,2GAGhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,yHAGvC,CAAC;AAIF;;;;GAIG;AACH,wBAAsB,qBAAqB,kBAiC1C;AAED,wEAAwE;AACxE,wBAAgB,yBAAyB,SAExC"}

package/dist/shared/utils/schema/createSyncStatus.js

@@ -67,12 +67,19 @@ export async function createSyncStatusTable() {
             await db.execAsync(SYNC_STATUS_TABLES_SQL);
             await db.execAsync(INDEX_SYNC_MARKS_SQL);
         }
-        try {
-            await db.execAsync(ADD_PK_TO_SYNC_MARKS_SQL);
-        }
-        catch {
-            // Ignore — column already exists
-        }
+        // try {
+        //   const columns = await db.getAllAsync<{ name: string }>(
+        //     `SELECT name FROM pragma_table_info('supastash_sync_marks')`,
+        //   );
+        //   const hasColumn = columns.some(
+        //     (column) => column.name === "last_synced_at_pk",
+        //   );
+        //   if (!hasColumn) {
+        //     await db.execAsync(ADD_PK_TO_SYNC_MARKS_SQL);
+        //   }
+        // } catch {
+        //   // Ignore — column already exists
+        // }
     })();
     return syncStatusTablePromise;
 }

package/dist/shared/utils/sync/pullFromRemote/postgrestToRpc.d.ts

@@ -0,0 +1,9 @@
+import { SupastashFilter } from "../../../types/realtimeData.types";
+import { RpcFilterNode } from "../../../types/rpcFilter.types";
+/**
+ * Converts PostgREST-style SupastashFilter[] to RpcFilterNode[].
+ * Supports simple filters and { or: [...] } groups.
+ * Returns an empty array for an empty/undefined input.
+ */
+export declare function postgrestFiltersToRpc(filters: SupastashFilter[] | undefined): RpcFilterNode[];
+//# sourceMappingURL=postgrestToRpc.d.ts.map

package/dist/shared/utils/sync/pullFromRemote/postgrestToRpc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"postgrestToRpc.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/sync/pullFromRemote/postgrestToRpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAe,MAAM,gCAAgC,CAAC;AA+B5E;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS,GACrC,aAAa,EAAE,CAgBjB"}

package/dist/shared/utils/sync/pullFromRemote/postgrestToRpc.js

@@ -0,0 +1,50 @@
+/**
+ * Converts a single PostgREST Filter to an RpcFilterNode.
+ * Used so that tableFilters registered via useSupastashFilters are
+ * automatically applied in the batch pull RPC path.
+ */
+function convertFilter(f) {
+    const col = String(f.column);
+    if (f.operator === "is") {
+        return f.value === null
+            ? { col, op: "is_null" }
+            : { col, op: "is_not_null" };
+    }
+    // For "in", the SQL compiler expects a comma-separated string
+    if (f.operator === "in") {
+        const val = Array.isArray(f.value)
+            ? f.value.join(",")
+            : String(f.value ?? "");
+        return { col, op: "in", val };
+    }
+    return {
+        col,
+        op: f.operator,
+        val: f.value,
+    };
+}
+/**
+ * Converts PostgREST-style SupastashFilter[] to RpcFilterNode[].
+ * Supports simple filters and { or: [...] } groups.
+ * Returns an empty array for an empty/undefined input.
+ */
+export function postgrestFiltersToRpc(filters) {
+    if (!filters?.length)
+        return [];
+    const result = [];
+    for (const f of filters) {
+        if ("or" in f) {
+            const nodes = f.or
+                .map(convertFilter)
+                .filter((n) => n !== null);
+            if (nodes.length)
+                result.push({ or: nodes });
+        }
+        else {
+            const node = convertFilter(f);
+            if (node)
+                result.push(node);
+        }
+    }
+    return result;
+}

package/dist/shared/utils/sync/pullFromRemote/updateFilter.d.ts

@@ -1,10 +1,13 @@
 import { SupastashFilter } from "../../../types/realtimeData.types";
+import { RpcTableFilters } from "../../../types/rpcFilter.types";
 /**
- * Updates the filter for the given table
- * Non-hook version of useSupastashFilters
+ * Updates the filter for the given table.
+ * Non-hook version of useSupastashFilters.
  *
- * Filters are validated and stored in the tableFilters store
- * @param filters - The filters to update
+ * @param filters - PostgREST filters for the standard pull path. Automatically converted
+ *   and applied in the batch RPC pull path too.
+ * @param rpcFilters - Optional supplemental RPC filter nodes. Only needed for `and` groups
+ *   or other constructs SupastashFilter can't express.
  */
-export declare function updateFilters(filters: SupastashFilter): Promise<void>;
+export declare function updateFilters(filters: SupastashFilter, rpcFilters?: RpcTableFilters): Promise<void>;
 //# sourceMappingURL=updateFilter.d.ts.map

package/dist/shared/utils/sync/pullFromRemote/updateFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateFilter.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/sync/pullFromRemote/updateFilter.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAMpE;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,iBAwC3D"}
+{"version":3,"file":"updateFilter.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/sync/pullFromRemote/updateFilter.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAOjE;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,eAAe,EACxB,UAAU,CAAC,EAAE,eAAe,iBA6C7B"}

package/dist/shared/utils/sync/pullFromRemote/updateFilter.js

@@ -2,15 +2,21 @@ import { filterTracker, tableFilters, tableFiltersUsed, } from "../../../store/t
 import { logWarn } from "../../logs";
 import { ReusedHelpers } from "../../reusedHelpers";
 import { checkIfTableExist } from "../../tableValidator";
+import { updateRpcFilters } from "./updateRpcFilters";
 import { warnOnMisMatch } from "./validateFilters";
 /**
- * Updates the filter for the given table
- * Non-hook version of useSupastashFilters
+ * Updates the filter for the given table.
+ * Non-hook version of useSupastashFilters.
  *
- * Filters are validated and stored in the tableFilters store
- * @param filters - The filters to update
+ * @param filters - PostgREST filters for the standard pull path. Automatically converted
+ *   and applied in the batch RPC pull path too.
+ * @param rpcFilters - Optional supplemental RPC filter nodes. Only needed for `and` groups
+ *   or other constructs SupastashFilter can't express.
  */
-export async function updateFilters(filters) {
+export async function updateFilters(filters, rpcFilters) {
+    if (rpcFilters) {
+        await updateRpcFilters(rpcFilters);
+    }
     const incoming = Object.keys(filters ?? {});
     // Remove stale tables
     for (const t of Array.from(tableFilters.keys())) {

package/dist/shared/utils/sync/pullFromRemote/updateRpcFilters.d.ts

@@ -0,0 +1,12 @@
+import { RpcTableFilters } from "../../../types/rpcFilter.types";
+/**
+ * Registers explicit RPC filter nodes for the batch pull path (useBatchPullSync: true).
+ *
+ * Only needed for constructs SupastashFilter can't express (e.g. `and` groups).
+ * Filters registered via useSupastashFilters / updateFilters are automatically
+ * converted and applied in the batch path — no separate call needed for those.
+ *
+ * Called automatically by useSupastashFilters / updateFilters.
+ */
+export declare function updateRpcFilters(filters?: RpcTableFilters): Promise<void>;
+//# sourceMappingURL=updateRpcFilters.d.ts.map

package/dist/shared/utils/sync/pullFromRemote/updateRpcFilters.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"updateRpcFilters.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/sync/pullFromRemote/updateRpcFilters.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAIhF;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA8B/E"}

package/dist/shared/utils/sync/pullFromRemote/updateRpcFilters.js

@@ -0,0 +1,36 @@
+import { rpcTableFilters } from "../../../store/rpcTableFilters";
+import { logWarn } from "../../logs";
+import { checkIfTableExist } from "../../tableValidator";
+/**
+ * Registers explicit RPC filter nodes for the batch pull path (useBatchPullSync: true).
+ *
+ * Only needed for constructs SupastashFilter can't express (e.g. `and` groups).
+ * Filters registered via useSupastashFilters / updateFilters are automatically
+ * converted and applied in the batch path — no separate call needed for those.
+ *
+ * Called automatically by useSupastashFilters / updateFilters.
+ */
+export async function updateRpcFilters(filters) {
+    const incoming = Object.keys(filters ?? {});
+    // Remove stale tables no longer in the incoming set
+    for (const t of Array.from(rpcTableFilters.keys())) {
+        if (!incoming.includes(t)) {
+            rpcTableFilters.delete(t);
+        }
+    }
+    if (!incoming.length)
+        return;
+    const existence = await Promise.all(incoming.map(async (t) => [t, await checkIfTableExist(t)]));
+    for (const [table, exists] of existence) {
+        if (!exists) {
+            logWarn(`[Supastash] Table '${table}' does not exist; skipping RPC filters`);
+            continue;
+        }
+        const nodes = (filters[table] ?? []);
+        if (!nodes.length) {
+            rpcTableFilters.delete(table);
+            continue;
+        }
+        rpcTableFilters.set(table, nodes.map((n) => ({ ...n })));
+    }
+}

package/dist/shared/utils/sync/status/remoteSchema.d.ts

@@ -1,4 +1,16 @@
 import { TableSchema } from "../../../types/realtimeData.types";
 export declare function appendSyncedAt(schema: TableSchema[]): TableSchema[];
+/**
+ * Fetches column metadata for all supplied tables in a single RPC call
+ * and warms both the in-memory cache and the SQLite fallback store.
+ *
+ * Requires `useBatchSchemaFetch: true` in config and the
+ * `get_table_schemas` Postgres function to be deployed.
+ *
+ * Tables already in the memory cache are skipped.
+ * Validation errors for individual tables are logged and skipped —
+ * they will surface as normal errors when that table is first used.
+ */
+export declare function prefetchRemoteTableSchemas(tables: string[]): Promise<void>;
 export declare function getRemoteTableSchema(table: string): Promise<TableSchema[] | null>;
 //# sourceMappingURL=remoteSchema.d.ts.map

package/dist/shared/utils/sync/status/remoteSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remoteSchema.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/sync/status/remoteSchema.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AA4HhE,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,iBASnD;AAID,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAkD/B"}
+{"version":3,"file":"remoteSchema.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/sync/status/remoteSchema.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AA4HhE,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,iBASnD;AAID;;;;;;;;;;GAUG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,IAAI,CAAC,CAyCf;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAkD/B"}

package/dist/shared/utils/sync/status/remoteSchema.js

@@ -98,6 +98,52 @@ export function appendSyncedAt(schema) {
     ];
 }
 const localSchemaCache = new Map();
+/**
+ * Fetches column metadata for all supplied tables in a single RPC call
+ * and warms both the in-memory cache and the SQLite fallback store.
+ *
+ * Requires `useBatchSchemaFetch: true` in config and the
+ * `get_table_schemas` Postgres function to be deployed.
+ *
+ * Tables already in the memory cache are skipped.
+ * Validation errors for individual tables are logged and skipped —
+ * they will surface as normal errors when that table is first used.
+ */
+export async function prefetchRemoteTableSchemas(tables) {
+    const config = getSupastashConfig();
+    const supabase = config?.supabaseClient;
+    if (!supabase)
+        return;
+    const online = await isOnline();
+    if (!online)
+        return;
+    const toFetch = tables.filter((t) => !tableSchemaData.has(t));
+    if (!toFetch.length)
+        return;
+    const { data, error } = await supabase.rpc("get_table_schemas", {
+        p_tables: toFetch,
+    });
+    if (error || !data) {
+        if (error && !isNetworkError(error)) {
+            log(`[Supastash] Error batch-fetching table schemas: ${error.message}
+      You can find more information in the Supastash docs: ${SERVER_SIDE_DOCS_URL}`);
+        }
+        return;
+    }
+    await ensureRemoteSchemaTableExists();
+    for (const [table, schema] of Object.entries(data)) {
+        if (!Array.isArray(schema))
+            continue;
+        try {
+            validatePayloadForTable(schema, table);
+            await upsertRemoteSchema(table, schema);
+            tableSchemaData.set(table, schema);
+        }
+        catch (e) {
+            logWarn(`[Supastash] Schema validation failed for "${table}" during batch fetch: ${e?.message}`);
+        }
+    }
+}
 export async function getRemoteTableSchema(table) {
     const config = getSupastashConfig();
     const supabase = config?.supabaseClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supastash",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",