supastash 0.2.15 → 0.2.16

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;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"}
+{"version":3,"file":"syncEngine.d.ts","sourceRoot":"","sources":["../../../src/desktop/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;;;EA2D5B;AAMD;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoC5D;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAEnD"}

package/dist/desktop/hooks/syncEngine.js

@@ -9,6 +9,7 @@ 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,12 +86,7 @@ async function pushLocalDataSafe() {
         return;
     isPushing = true;
     try {
-        if (cfg.useBatchPullSync) {
-            await pullFromRemoteBatch();
-        }
-        else {
-            await doPullFromRemote();
-        }
+        await doPushLocalData();
         lastPushAt = Date.now();
     }
     catch (e) {
@@ -108,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;
@@ -116,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) {
@@ -206,7 +206,12 @@ export async function syncTable(table) {
     // Pull
     if (cfg.syncEngine?.pull) {
         try {
-            await updateLocalDb(table, filter, syncCalls.get(table)?.pull);
+            if (cfg.useBatchPullSync) {
+                await pullFromRemoteBatch([table]);
+            }
+            else {
+                await updateLocalDb(table, filter, syncCalls.get(table)?.pull);
+            }
         }
         catch (e) {
             log("[Supastash] syncTable pull error", {

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

@@ -5,5 +5,5 @@
  * Requires `useBatchPullSync: true` in config and the
  * `supastash_pull_sync` Postgres function to be deployed.
  */
-export declare function pullFromRemoteBatch(): Promise<void>;
+export declare function pullFromRemoteBatch(specificTables?: string[]): Promise<void>;
 //# sourceMappingURL=pullFromRemoteBatch.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"pullFromRemoteBatch.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pullFromRemote/pullFromRemoteBatch.ts"],"names":[],"mappings":"AA+CA;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,cAAc,CAAC,EAAE,MAAM,EAAE,GACxB,OAAO,CAAC,IAAI,CAAC,CA4Mf"}

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

@@ -37,14 +37,14 @@ function buildCursorFilter(tsCol, lastSyncedAt, lastPk) {
  * Requires `useBatchPullSync: true` in config and the
  * `supastash_pull_sync` Postgres function to be deployed.
  */
-export async function pullFromRemoteBatch() {
+export async function pullFromRemoteBatch(specificTables) {
     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();
+    const tables = specificTables ?? (await getAllTables());
     if (!tables) {
         log("[Supastash] Batch pull: no tables found");
         return;

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":"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"}
+{"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,CAoC5D;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAEnD"}

package/dist/native/hooks/syncEngine.js

@@ -208,7 +208,12 @@ export async function syncTable(table) {
     // Pull
     if (cfg.syncEngine?.pull) {
         try {
-            await updateLocalDb(table, filter, syncCalls.get(table)?.pull);
+            if (cfg.useBatchPullSync) {
+                await pullFromRemoteBatch([table]);
+            }
+            else {
+                await updateLocalDb(table, filter, syncCalls.get(table)?.pull);
+            }
         }
         catch (e) {
             log("[Supastash] syncTable pull error", {

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

@@ -5,5 +5,5 @@
  * Requires `useBatchPullSync: true` in config and the
  * `supastash_pull_sync` Postgres function to be deployed.
  */
-export declare function pullFromRemoteBatch(): Promise<void>;
+export declare function pullFromRemoteBatch(specificTables?: string[]): Promise<void>;
 //# sourceMappingURL=pullFromRemoteBatch.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"pullFromRemoteBatch.d.ts","sourceRoot":"","sources":["../../../../../src/native/utils/sync/pullFromRemote/pullFromRemoteBatch.ts"],"names":[],"mappings":"AA+CA;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,cAAc,CAAC,EAAE,MAAM,EAAE,GACxB,OAAO,CAAC,IAAI,CAAC,CA4Mf"}

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

@@ -2,16 +2,16 @@ 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 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 { 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 { setSupastashSyncStatus } from "../status/services";
 import { upsertChunkData } from "./updateLocalDb";
 const CHUNK_SIZE = 999;
 function buildCursorFilter(tsCol, lastSyncedAt, lastPk) {
@@ -37,14 +37,14 @@ function buildCursorFilter(tsCol, lastSyncedAt, lastPk) {
  * Requires `useBatchPullSync: true` in config and the
  * `supastash_pull_sync` Postgres function to be deployed.
  */
-export async function pullFromRemoteBatch() {
+export async function pullFromRemoteBatch(specificTables) {
     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();
+    const tables = specificTables ?? (await getAllTables());
     if (!tables) {
         log("[Supastash] Batch pull: no tables found");
         return;
@@ -57,7 +57,10 @@ export async function pullFromRemoteBatch() {
     const db = await getSupastashDb();
     const completedTables = new Set();
     SyncInfoUpdater.setInProgress({ action: "start", type: "pull" });
-    SyncInfoUpdater.setNumberOfTables({ amount: tablesToPull.length, 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);
@@ -112,8 +115,16 @@ export async function pullFromRemoteBatch() {
                             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" });
+                        prevMaxSyncedAt = returnMaxDate({
+                            row,
+                            prevMax: prevMaxSyncedAt,
+                            col: tsCol,
+                        });
+                        prevMaxDeletedAt = returnMaxDate({
+                            row,
+                            prevMax: prevMaxDeletedAt,
+                            col: "deleted_at",
+                        });
                         if (row.deleted_at) {
                             toDelete.push(row.id);
                         }
@@ -121,8 +132,16 @@ export async function pullFromRemoteBatch() {
                             toUpsert.push(row);
                         }
                     }
-                    SyncInfoUpdater.setUnsyncedDataCount({ amount: toUpsert.length, type: "pull", table });
-                    SyncInfoUpdater.setUnsyncedDeletedCount({ amount: toDelete.length, type: "pull", table });
+                    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) {

package/dist/shared/utils/sync/pushLocal/getAllUnsyncedData.d.ts

@@ -1,4 +1,13 @@
 import { PayloadData } from "../../../types/query.types";
+import { SupastashFilter } from "../../../types/realtimeData.types";
+/**
+ * Builds a combined " AND (...)" SQL string + params array from a list of filters.
+ * Never throws — malformed filters are skipped and logged.
+ */
+export declare function buildFilterSql(filters: SupastashFilter[]): {
+    sql: string;
+    params: unknown[];
+};
 /**
  * Gets all unsynced data from a table
  * @param table - The table to get the data from

package/dist/shared/utils/sync/pushLocal/getAllUnsyncedData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAllUnsyncedData.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/sync/pushLocal/getAllUnsyncedData.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAwCzD;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAe/B;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAM/B"}
+{"version":3,"file":"getAllUnsyncedData.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/sync/pushLocal/getAllUnsyncedData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAgGpE;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG;IAC1D,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,OAAO,EAAE,CAAC;CACnB,CAYA;AAmCD;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAuB/B;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAS/B"}

package/dist/shared/utils/sync/pushLocal/getAllUnsyncedData.js

@@ -1,8 +1,99 @@
 import { getSupastashDb } from "../../../db/dbInitializer";
+import { tableFilters } from "../../../store/tableFilters";
 import { getTableSchema } from "../../getTableSchema";
 import log from "../../logs";
 import { getRemoteTableSchema } from "../status/remoteSchema";
 const sharedKeysCache = new Map();
+const VALID_OPERATORS = new Set([
+    "eq",
+    "neq",
+    "gt",
+    "gte",
+    "lt",
+    "lte",
+    "is",
+    "in",
+]);
+function escapeColumn(column) {
+    // Basic guard against injection via column names (should only ever be internal identifiers)
+    return `"${column.replace(/"/g, '""')}"`;
+}
+/**
+ * Builds a single SQL clause + params for one filter condition.
+ * Returns null (instead of throwing) if the filter is malformed.
+ */
+function buildSingleClause(f) {
+    try {
+        // Composite OR filter: { or: SupastashFilter[] }
+        if ("or" in f && Array.isArray(f.or)) {
+            const orFilters = f.or;
+            const built = orFilters
+                .map((sub) => buildSingleClause(sub))
+                .filter((c) => !!c);
+            if (!built.length)
+                return null;
+            const sql = "(" + built.map((c) => c.sql).join(" OR ") + ")";
+            const params = built.flatMap((c) => c.params);
+            return { sql, params };
+        }
+        // Flat filter: { column, operator, value }
+        const { column, operator, value } = f;
+        if (!column || !operator || !VALID_OPERATORS.has(operator)) {
+            log(`[Supastash] Skipping invalid filter: ${JSON.stringify(f)}`);
+            return null;
+        }
+        const col = escapeColumn(column);
+        switch (operator) {
+            case "is":
+                // sqlite uses IS for null comparisons; also support IS TRUE/FALSE-ish via 0/1
+                if (value === null) {
+                    return { sql: `${col} IS NULL`, params: [] };
+                }
+                return { sql: `${col} IS ?`, params: [value] };
+            case "in": {
+                const values = Array.isArray(value) ? value : [value];
+                if (!values.length)
+                    return null;
+                const placeholders = values.map(() => "?").join(", ");
+                return { sql: `${col} IN (${placeholders})`, params: values };
+            }
+            case "eq":
+                return { sql: `${col} = ?`, params: [value] };
+            case "neq":
+                return { sql: `${col} != ?`, params: [value] };
+            case "gt":
+                return { sql: `${col} > ?`, params: [value] };
+            case "gte":
+                return { sql: `${col} >= ?`, params: [value] };
+            case "lt":
+                return { sql: `${col} < ?`, params: [value] };
+            case "lte":
+                return { sql: `${col} <= ?`, params: [value] };
+            default:
+                return null;
+        }
+    }
+    catch (err) {
+        log(`[Supastash] Failed to build filter clause: ${String(err)}`);
+        return null;
+    }
+}
+/**
+ * Builds a combined " AND (...)" SQL string + params array from a list of filters.
+ * Never throws — malformed filters are skipped and logged.
+ */
+export function buildFilterSql(filters) {
+    if (!filters?.length)
+        return { sql: "", params: [] };
+    const clauses = filters
+        .map((f) => buildSingleClause(f))
+        .filter((c) => !!c);
+    if (!clauses.length)
+        return { sql: "", params: [] };
+    const sql = " AND " + clauses.map((c) => c.sql).join(" AND ");
+    const params = clauses.flatMap((c) => c.params);
+    return { sql, params };
+}
 async function getRemoteKeys(table) {
     if (sharedKeysCache.has(table)) {
         return sharedKeysCache.get(table);
@@ -30,15 +121,17 @@ async function getRemoteKeys(table) {
  */
 export async function getAllUnsyncedData(table) {
     const db = await getSupastashDb();
+    const filters = tableFilters.get(table) ?? [];
+    const filterSqlDetails = buildFilterSql(filters);
     const remoteKeys = await getRemoteKeys(table);
     if (!remoteKeys) {
-        const query = `SELECT * FROM ${table} WHERE synced_at IS NULL AND deleted_at IS NULL`;
-        const data = await db.getAllAsync(query);
+        const query = `SELECT * FROM ${table} WHERE synced_at IS NULL AND deleted_at IS NULL${filterSqlDetails.sql}`;
+        const data = await db.getAllAsync(query, filterSqlDetails.params);
         return data ?? null;
     }
     const columns = remoteKeys.join(", ");
-    const query = `SELECT ${columns} FROM ${table} WHERE synced_at IS NULL AND deleted_at IS NULL`;
-    const data = await db.getAllAsync(query);
+    const query = `SELECT ${columns} FROM ${table} WHERE synced_at IS NULL AND deleted_at IS NULL${filterSqlDetails.sql}`;
+    const data = await db.getAllAsync(query, filterSqlDetails.params);
     return data ?? null;
 }
 /**
@@ -48,6 +141,8 @@ export async function getAllUnsyncedData(table) {
  */
 export async function getAllDeletedData(table) {
     const db = await getSupastashDb();
-    const data = await db.getAllAsync(`SELECT deleted_at, id FROM ${table} WHERE deleted_at IS NOT NULL`);
+    const filters = tableFilters.get(table) ?? [];
+    const filterSqlDetails = buildFilterSql(filters);
+    const data = await db.getAllAsync(`SELECT deleted_at, id FROM ${table} WHERE deleted_at IS NOT NULL${filterSqlDetails.sql}`, filterSqlDetails.params);
     return data ?? null;
 }

package/package.json

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