supastash 0.1.62 → 0.2.0

package/dist/utils/sync/pullFromRemote/pullData.js

@@ -29,8 +29,10 @@ export async function pullData({ table, filters, batchId, }) {
     });
     const db = await getSupastashDb();
     const syncStatus = await selectSyncStatus(db, table, filters);
+    const cfg = getSupastashConfig();
+    const tsCol = cfg.replicationMode === "server-side" ? "arrived_at" : "updated_at";
     const updatedRows = await pageThrough({
-        tsCol: "updated_at",
+        tsCol,
         since: syncStatus.last_synced_at,
         table,
         filters,
@@ -39,7 +41,6 @@ export async function pullData({ table, filters, batchId, }) {
     });
     const updatedData = [];
     let deletedIds = [];
-    let createdMax = null;
     let updatedMax = null;
     let deletedMax = null;
     for (const r of updatedRows) {
@@ -47,15 +48,10 @@ export async function pullData({ table, filters, batchId, }) {
             logWarn(`[Supastash] Skipped row without id from "${table}"`);
             continue;
         }
-        createdMax = returnMaxDate({
-            row: r,
-            prevMax: createdMax,
-            col: "created_at",
-        });
         updatedMax = returnMaxDate({
             row: r,
             prevMax: updatedMax,
-            col: "updated_at",
+            col: tsCol,
         });
         // If the row is deleted, add the id to the deleted ids and update the deleted max
         if (r.deleted_at) {
@@ -75,7 +71,6 @@ export async function pullData({ table, filters, batchId, }) {
         return null;
     }
     const timestamps = {
-        createdMax: createdMax?.value ?? null,
         updatedMax: updatedMax?.value ?? null,
         deletedMax: deletedMax?.value ?? null,
         updatedMaxPk: updatedMax?.pk ?? null,

package/dist/utils/sync/pullFromRemote/pullDeletedData.d.ts

@@ -1,12 +1,15 @@
 import { PayloadData } from "../../../types/query.types";
-import { RealtimeFilter } from "../../../types/realtimeData.types";
+import { SupastashFilter } from "../../../types/realtimeData.types";
 /**
  * Pulls deleted data from the remote database for a given table
  * @param table - The table to pull deleted data from
  * @returns The deleted data from the table as a map of id to record and the reordered data
  */
-export declare function pullDeletedData(table: string, filters?: RealtimeFilter[]): Promise<{
-    deletedDataMap: Map<string, PayloadData>;
-    records: PayloadData[];
+export declare function pullDeletedData(
+  table: string,
+  filters?: SupastashFilter[]
+): Promise<{
+  deletedDataMap: Map<string, PayloadData>;
+  records: PayloadData[];
 } | null>;
-//# sourceMappingURL=pullDeletedData.d.ts.map
+//# sourceMappingURL=pullDeletedData.d.ts.map

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

@@ -1,4 +1,4 @@
-import { SupastashFilter } from "../../../types/supastashFilters.types";
+import { SupastashFilter } from "../../../types/realtimeData.types";
 /**
  * Updates the filter for the given table
  * Non-hook version of useSupastashFilters

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

@@ -1 +1 @@
-{"version":3,"file":"updateFilter.d.ts","sourceRoot":"","sources":["../../../../src/utils/sync/pullFromRemote/updateFilter.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAKxE;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,iBAuC3D"}
+{"version":3,"file":"updateFilter.d.ts","sourceRoot":"","sources":["../../../../src/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"}

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

@@ -1,7 +1,8 @@
 import { filterTracker, tableFilters, tableFiltersUsed, } from "../../../store/tableFilters";
 import { logWarn } from "../../logs";
+import { ReusedHelpers } from "../../reusedHelpers";
 import { checkIfTableExist } from "../../tableValidator";
-import isValidFilter, { warnOnMisMatch } from "./validateFilters";
+import { warnOnMisMatch } from "./validateFilters";
 /**
  * Updates the filter for the given table
  * Non-hook version of useSupastashFilters
@@ -26,8 +27,9 @@ export async function updateFilters(filters) {
             logWarn(`Table '${table}' does not exist; skipping filters`);
             continue;
         }
-        const raw = filters[table] ?? [];
-        const valid = raw.filter((f) => isValidFilter([f]));
+        const raw = (filters[table] ??
+            []);
+        const valid = raw.filter((f) => ReusedHelpers.isValidFilter([f]));
         if (!valid.length) {
             tableFilters.delete(table);
             tableFiltersUsed.delete(table);

package/dist/utils/sync/pullFromRemote/updateLocalDb.d.ts

@@ -1,14 +1,15 @@
-import { RealtimeFilter } from "../../../types/realtimeData.types";
+import { SupastashFilter } from "../../../types/realtimeData.types";
+import { UpsertDataParams } from "../../../types/syncEngine.types";
 /**
  * Updates the local database with the remote changes
  * @param table - The table to update
  */
-export declare function updateLocalDb(table: string, filters?: RealtimeFilter[], onReceiveData?: (payload: any) => Promise<void>): Promise<void>;
+export declare function updateLocalDb(table: string, filters?: SupastashFilter[], onReceiveData?: (payload: any) => Promise<void>): Promise<void>;
 /**
  * Upserts a record into the local database
  * @param table - The table to upsert the record into
  * @param record - The record to upsert
  * @param exists - Whether the record already exists in the database
  */
-export declare function upsertData(table: string, record: any, doesExist?: boolean): Promise<void>;
+export declare function upsertData({ tx, table, record, doesExist, }: UpsertDataParams): Promise<void>;
 //# sourceMappingURL=updateLocalDb.d.ts.map

package/dist/utils/sync/pullFromRemote/updateLocalDb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateLocalDb.d.ts","sourceRoot":"","sources":["../../../../src/utils/sync/pullFromRemote/updateLocalDb.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAkBnE;;;GAGG;AACH,wBAAsB,aAAa,CACjC,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,cAAc,EAAE,EAC1B,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,iBAwHhD;AAID;;;;;GAKG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,GAAG,EACX,SAAS,CAAC,EAAE,OAAO,iBAsEpB"}
+{"version":3,"file":"updateLocalDb.d.ts","sourceRoot":"","sources":["../../../../src/utils/sync/pullFromRemote/updateLocalDb.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAkBnE;;;GAGG;AACH,wBAAsB,aAAa,CACjC,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,eAAe,EAAE,EAC3B,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,iBA6HhD;AAID;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,EAC/B,EAAE,EACF,KAAK,EACL,MAAM,EACN,SAAS,GACV,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqElC"}

package/dist/utils/sync/pullFromRemote/updateLocalDb.js

@@ -34,9 +34,8 @@ export async function updateLocalDb(table, filters, onReceiveData) {
         const db = await getSupastashDb();
         // Initialize the batch completed map
         RECEIVED_DATA_COMPLETED_MAP[batchId] = {
-            created_at: DEFAULT_RECEIVED_DATA_COMPLETED,
+            arrived_at: DEFAULT_RECEIVED_DATA_COMPLETED,
             updated_at: DEFAULT_RECEIVED_DATA_COMPLETED,
-            deleted_at: DEFAULT_RECEIVED_DATA_COMPLETED,
         };
         let refreshNeeded = false;
         while (true) {
@@ -59,55 +58,61 @@ export async function updateLocalDb(table, filters, onReceiveData) {
             });
             refreshNeeded = !!data?.length || !!deletedIds?.length;
             // Delete records that are no longer in the remote data
-            if (deletedIds && deletedIds.length > 0) {
-                const ids = deletedIds;
-                for (let i = 0; i < ids.length; i += DELETE_CHUNK) {
-                    const slice = ids.slice(i, i + DELETE_CHUNK);
-                    const placeholders = slice.map(() => "?").join(", ");
-                    await db.runAsync(`DELETE FROM ${table} WHERE id IN (${placeholders})`, slice);
-                }
-            }
-            // Get the local stamp of the records
-            let localStamp = new Map();
-            if (data?.length) {
-                const ids = data.map((r) => r.id).filter(Boolean);
-                for (let i = 0; i < ids.length; i += DELETE_CHUNK) {
-                    const slice = ids.slice(i, i + DELETE_CHUNK);
-                    const placeholders = slice.map(() => "?").join(", ");
-                    const rows = await db.getAllAsync(`SELECT id, updated_at FROM ${table} WHERE id IN (${placeholders})`, slice);
-                    for (const row of rows ?? []) {
-                        localStamp.set(row.id, row.updated_at ?? null);
+            await db.withTransaction(async (tx) => {
+                if (deletedIds && deletedIds.length > 0) {
+                    const ids = deletedIds;
+                    for (let i = 0; i < ids.length; i += DELETE_CHUNK) {
+                        const slice = ids.slice(i, i + DELETE_CHUNK);
+                        const placeholders = slice.map(() => "?").join(", ");
+                        await tx.runAsync(`DELETE FROM ${table} WHERE id IN (${placeholders})`, slice);
                     }
                 }
-            }
-            // Update local database with remote changes
-            if (data?.length) {
-                for (let i = 0; i < data.length; i++) {
-                    const record = data[i];
-                    if (!record?.id)
-                        continue;
-                    if (deletedIdSet.has(record.id))
-                        continue;
-                    const localUpdated = localStamp.get(record.id) ?? DEFAULT_DATE;
-                    const remoteUpdated = record.updated_at ?? DEFAULT_DATE;
-                    if (new Date(localUpdated) >= new Date(remoteUpdated)) {
-                        // local is newer or same — skip
-                        continue;
-                    }
-                    if (onReceiveData) {
-                        await onReceiveData(record);
-                    }
-                    else {
-                        await upsertData(table, record, localStamp.has(record.id));
+                // Get the local stamp of the records
+                let localStamp = new Map();
+                if (data?.length) {
+                    const ids = data.map((r) => r.id).filter(Boolean);
+                    for (let i = 0; i < ids.length; i += DELETE_CHUNK) {
+                        const slice = ids.slice(i, i + DELETE_CHUNK);
+                        const placeholders = slice.map(() => "?").join(", ");
+                        const rows = await db.getAllAsync(`SELECT id, updated_at FROM ${table} WHERE id IN (${placeholders})`, slice);
+                        for (const row of rows ?? []) {
+                            localStamp.set(row.id, row.updated_at ?? null);
+                        }
                     }
-                    if ((i + 1) % BATCH_SIZE === 0) {
-                        await new Promise((res) => setTimeout(res, 0));
+                }
+                // Update local database with remote changes
+                if (data?.length) {
+                    for (let i = 0; i < data.length; i++) {
+                        const record = data[i];
+                        if (!record?.id)
+                            continue;
+                        if (deletedIdSet.has(record.id))
+                            continue;
+                        const localUpdated = localStamp.get(record.id) ?? DEFAULT_DATE;
+                        const remoteUpdated = record.updated_at ?? DEFAULT_DATE;
+                        if (new Date(localUpdated) >= new Date(remoteUpdated)) {
+                            // local is newer or same — skip
+                            continue;
+                        }
+                        if (onReceiveData) {
+                            await onReceiveData(record);
+                        }
+                        else {
+                            await upsertData({
+                                tx,
+                                table,
+                                record,
+                                doesExist: localStamp.has(record.id),
+                            });
+                        }
+                        if ((i + 1) % BATCH_SIZE === 0) {
+                            await new Promise((res) => setTimeout(res, 0));
+                        }
                     }
                 }
-            }
+            });
             if (timestamps) {
                 await setSupastashSyncStatus(table, filters, {
-                    lastCreatedAt: timestamps.createdMax,
                     lastSyncedAt: timestamps.updatedMax,
                     lastDeletedAt: timestamps.deletedMax,
                     lastSyncedAtPk: timestamps.updatedMaxPk,
@@ -138,7 +143,7 @@ const warned = new Map();
  * @param record - The record to upsert
  * @param exists - Whether the record already exists in the database
  */
-export async function upsertData(table, record, doesExist) {
+export async function upsertData({ tx, table, record, doesExist, }) {
     if (!record?.id)
         return;
     let itemExists = !!doesExist;
@@ -150,7 +155,7 @@ export async function upsertData(table, record, doesExist) {
         itemExists = exists;
     }
     try {
-        const db = await getSupastashDb();
+        const db = tx ?? (await getSupastashDb());
         const columns = await getTableSchema(table);
         const recordToSave = {
             ...record,

package/dist/utils/sync/pullFromRemote/validateFilters.d.ts

@@ -1,5 +1,3 @@
-import { RealtimeFilter } from "../../../types/realtimeData.types";
-declare function isValidFilter<R = any>(filters: RealtimeFilter<R>[]): boolean;
-export default isValidFilter;
-export declare function warnOnMisMatch<R = any>(table: string, filters: RealtimeFilter<R>[]): void;
+import { SupastashFilter } from "../../../types/realtimeData.types";
+export declare function warnOnMisMatch<R = any>(table: string, filters: SupastashFilter<R>[]): void;
 //# sourceMappingURL=validateFilters.d.ts.map

package/dist/utils/sync/pullFromRemote/validateFilters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateFilters.d.ts","sourceRoot":"","sources":["../../../../src/utils/sync/pullFromRemote/validateFilters.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAcnE,iBAAS,aAAa,CAAC,CAAC,GAAG,GAAG,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CA+DrE;AAED,eAAe,aAAa,CAAC;AAM7B,wBAAgB,cAAc,CAAC,CAAC,GAAG,GAAG,EACpC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,QAkD7B"}
+{"version":3,"file":"validateFilters.d.ts","sourceRoot":"","sources":["../../../../src/utils/sync/pullFromRemote/validateFilters.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAOpE,wBAAgB,cAAc,CAAC,CAAC,GAAG,GAAG,EACpC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,QA2D9B"}

package/dist/utils/sync/pullFromRemote/validateFilters.js

@@ -1,68 +1,5 @@
 import { filterTracker } from "../../../store/tableFilters";
 import { logWarn } from "../../logs";
-const validOperators = new Set([
-    "eq",
-    "neq",
-    "gt",
-    "lt",
-    "gte",
-    "lte",
-    "is",
-    "in",
-]);
-function isValidFilter(filters) {
-    for (const filter of filters ?? []) {
-        if (!filter || typeof filter !== "object") {
-            return false;
-        }
-        const { column, operator, value } = filter;
-        if (typeof column !== "string" || column.trim() === "") {
-            return false;
-        }
-        if (!validOperators.has(operator)) {
-            return false;
-        }
-        switch (operator) {
-            case "is":
-                if (typeof value === "boolean") {
-                    // normalize
-                    filter.value = value ? "true" : "false";
-                    break;
-                }
-                if (!(value === null ||
-                    value === "null" ||
-                    value === "true" ||
-                    value === "false")) {
-                    return false;
-                }
-                break;
-            case "in":
-                if (Array.isArray(value)) {
-                    if (value.length === 0) {
-                        return false;
-                    }
-                }
-                else if (typeof value === "string") {
-                    const trimmed = value.trim();
-                    if (trimmed === "" ||
-                        trimmed.split(",").filter((item) => item.trim() !== "").length === 0) {
-                        return false;
-                    }
-                }
-                else {
-                    return false;
-                }
-                break;
-            default:
-                if (value === undefined || value === null) {
-                    return false;
-                }
-                break;
-        }
-    }
-    return true;
-}
-export default isValidFilter;
 const tablesWarned = new Set();
 const debounceWarnTime = 2000;
 let debounceWarnTimeout = null;
@@ -74,6 +11,15 @@ export function warnOnMisMatch(table, filters) {
         for (let i = 0; i < maxLength; i++) {
             const oldFilter = existingFilters[i];
             const newFilter = filters[i];
+            if ("or" in oldFilter || "or" in newFilter) {
+                if ("or" in oldFilter && "or" in newFilter) {
+                    if (oldFilter.or.length !== newFilter.or.length) {
+                        hasMismatch = true;
+                        break;
+                    }
+                }
+                continue;
+            }
             if (!oldFilter || !newFilter) {
                 hasMismatch = true;
                 break;

package/dist/utils/sync/pushLocal/deleteChunks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteChunks.d.ts","sourceRoot":"","sources":["../../../../src/utils/sync/pushLocal/deleteChunks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AA2DzD;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,WAAW,EAAE,iBAc/B"}
+{"version":3,"file":"deleteChunks.d.ts","sourceRoot":"","sources":["../../../../src/utils/sync/pushLocal/deleteChunks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AA6DzD;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,WAAW,EAAE,iBAc/B"}

package/dist/utils/sync/pushLocal/deleteChunks.js

@@ -12,11 +12,13 @@ const SQL_CHUNK = 999;
  */
 async function permanentlyDeleteLocally(table, ids) {
     const db = await getSupastashDb();
-    for (let i = 0; i < ids.length; i += SQL_CHUNK) {
-        const slice = ids.slice(i, i + SQL_CHUNK);
-        const placeholders = slice.map(() => "?").join(", ");
-        await db.runAsync(`DELETE FROM ${table} WHERE id IN (${placeholders})`, slice);
-    }
+    await db.withTransaction(async (tx) => {
+        for (let i = 0; i < ids.length; i += SQL_CHUNK) {
+            const slice = ids.slice(i, i + SQL_CHUNK);
+            const placeholders = slice.map(() => "?").join(", ");
+            await tx.runAsync(`DELETE FROM ${table} WHERE id IN (${placeholders})`, slice);
+        }
+    });
 }
 /**
  * Deletes a chunk of data from the remote database

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

@@ -1 +1 @@
-{"version":3,"file":"getAllUnsyncedData.d.ts","sourceRoot":"","sources":["../../../../src/utils/sync/pushLocal/getAllUnsyncedData.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AA6EzD;;;;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/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"}

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

@@ -1,59 +1,27 @@
-import { getSupastashConfig } from "../../../core/config";
 import { getSupastashDb } from "../../../db/dbInitializer";
-import { tableSchemaData } from "../../../store/tableSchemaData";
 import { getTableSchema } from "../../../utils/getTableSchema";
 import log from "../../../utils/logs";
-import { isNetworkError, isOnline } from "../../connection";
-import { supabaseClientErr } from "../../supabaseClientErr";
-const numberOfErrors = new Map();
+import { getRemoteTableSchema } from "../status/remoteSchema";
 const sharedKeysCache = new Map();
 async function getRemoteKeys(table) {
-    const config = getSupastashConfig();
-    const supabase = config?.supabaseClient;
-    if (!supabase) {
-        throw new Error(`Supabase client not found, ${supabaseClientErr}`);
-    }
     if (sharedKeysCache.has(table)) {
         return sharedKeysCache.get(table);
     }
-    if (numberOfErrors.get(table) && (numberOfErrors.get(table) || 0) > 3) {
+    const remoteSchema = await getRemoteTableSchema(table);
+    if (!remoteSchema)
         return null;
-    }
-    if (!tableSchemaData.has(table)) {
-        const isConnected = await isOnline();
-        if (!isConnected) {
-            return null;
-        }
-        const { data, error } = await supabase.rpc("get_table_schema", {
-            table_name: table,
-        });
-        if (error) {
-            if (!isNetworkError(error)) {
-                log(`[Supastash] Error getting remote keys for table ${table} on public schema: ${error.message}
-        You can find more information in the Supastash docs: https://0xzekea.github.io/supastash/docs/getting-started#%EF%B8%8F-server-side-setup-for-filtered-pulls`);
-                numberOfErrors.set(table, (numberOfErrors.get(table) || 0) + 1);
-                return null;
-            }
-        }
-        tableSchemaData.set(table, data);
-    }
-    if (!tableSchemaData.get(table)) {
+    const remoteKeys = remoteSchema.map((col) => col.column_name);
+    const localSchema = await getTableSchema(table);
+    if (!localSchema)
         return null;
-    }
-    const keys = tableSchemaData.get(table)?.map((item) => item.column_name);
-    const columns = await getTableSchema(table);
-    const sharedKeys = keys?.filter((key) => columns.includes(key));
-    const missingKeys = columns.filter((column) => !keys?.includes(column) && column !== "synced_at");
-    // Inform user of missing keys
+    const localKeys = localSchema;
+    const sharedKeys = remoteKeys.filter((key) => localKeys.includes(key));
+    const missingKeys = remoteKeys.filter((key) => !localKeys.includes(key) && key !== "synced_at" && key !== "arrived_at");
     if (missingKeys.length > 0) {
-        log(`[Supastash] Missing keys for table ${table} on public schema: ${missingKeys.join(", ")}`);
-    }
-    // Return shared keys if they exist
-    if (sharedKeys) {
-        sharedKeysCache.set(table, sharedKeys);
-        return sharedKeys;
+        log(`[Supastash] Missing keys for table ${table}: ${missingKeys.join(", ")}`);
     }
-    return null;
+    sharedKeysCache.set(table, sharedKeys);
+    return sharedKeys.length ? sharedKeys : null;
 }
 /**
  * Gets all unsynced data from a table

package/dist/utils/sync/pushLocal/uploadHelpers.js

@@ -220,7 +220,7 @@ export async function rewindAndDropLocal(table, rowId, supabase) {
     }
 }
 async function replaceLocalWithServer(table, serverRow) {
-    await upsertData(table, serverRow);
+    await upsertData({ table, record: serverRow });
     await updateLocalSyncedAt(table, [serverRow.id]);
     setQueryStatus(serverRow.id, table, "success");
     supastashEventBus.emit("updateSyncStatus");

package/dist/utils/sync/status/filterKey.d.ts

@@ -1,15 +1,15 @@
-import { RealtimeFilter } from "../../../types/realtimeData.types";
+import { SupastashFilter } from "../../../types/realtimeData.types";
 /**
  * Canonicalizes a set of filters
  * @param filters - The filters to canonicalize
  * @returns The canonicalized filters
  */
-export declare function canonicalizeFilters(filters?: RealtimeFilter[] | null): string;
+export declare function canonicalizeFilters(filters?: SupastashFilter[] | null): string;
 /**
  * Computes the filter key for a given set of filters
  * @param filters - The filters to compute the key for
  * @param ns - The namespace to use for the key
  * @returns The computed filter key
  */
-export declare function computeFilterKey(filters?: RealtimeFilter[] | null, ns?: string): Promise<string>;
+export declare function computeFilterKey(filters?: SupastashFilter[] | null, ns?: string): Promise<string>;
 //# sourceMappingURL=filterKey.d.ts.map

package/dist/utils/sync/status/filterKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filterKey.d.ts","sourceRoot":"","sources":["../../../../src/utils/sync/status/filterKey.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AA4BnE;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,GAAG,MAAM,CAc7E;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,EACjC,EAAE,SAAW,mBAQd"}
+{"version":3,"file":"filterKey.d.ts","sourceRoot":"","sources":["../../../../src/utils/sync/status/filterKey.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AA4BpE;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,GACjC,MAAM,CAuBR;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,EAClC,EAAE,SAAW,mBAQd"}

package/dist/utils/sync/status/filterKey.js

@@ -31,7 +31,9 @@ function normVal(v) {
  * @returns The canonicalized filters
  */
 export function canonicalizeFilters(filters) {
-    const list = (filters ?? []).map((f) => ({
+    const list = (filters ?? [])
+        .filter((f) => !!f && typeof f === "object" && "column" in f && "operator" in f)
+        .map((f) => ({
         column: String(f.column),
         operator: f.operator,
         value: normVal(f.value),
@@ -41,7 +43,8 @@ export function canonicalizeFilters(filters) {
             return a.column < b.column ? -1 : 1;
         if (a.operator !== b.operator)
             return a.operator < b.operator ? -1 : 1;
-        const av = JSON.stringify(a.value), bv = JSON.stringify(b.value);
+        const av = JSON.stringify(a.value);
+        const bv = JSON.stringify(b.value);
         return av < bv ? -1 : av > bv ? 1 : 0;
     });
     return JSON.stringify(list);

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

@@ -0,0 +1,4 @@
+import { TableSchema } from "../../../types/realtimeData.types";
+export declare function appendSyncedAt(schema: TableSchema[]): TableSchema[];
+export declare function getRemoteTableSchema(table: string): Promise<TableSchema[] | null>;
+//# sourceMappingURL=remoteSchema.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"remoteSchema.d.ts","sourceRoot":"","sources":["../../../../src/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"}