supastash 0.2.0 → 0.2.2

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

@@ -0,0 +1,284 @@
+import { getSupastashConfig } from "../../../../shared/core/config";
+import { getSupastashDb } from "../../../../shared/db/dbInitializer";
+import { DEFAULT_RECEIVED_DATA_COMPLETED, RECEIVED_DATA_COMPLETED_MAP, } from "../../../../shared/store/syncStatus";
+import { generateUUIDv4 } from "../../../../shared/utils/genUUID";
+import { getTableSchema } from "../../../../shared/utils/getTableSchema";
+import log, { logError, logWarn } from "../../../../shared/utils/logs";
+import { refreshScreen } from "../../../../shared/utils/refreshScreenCalls";
+import { deleteReceivedDataCompleted } from "../../../../shared/utils/sync/pullFromRemote/helpers";
+import { stringifyValue } from "../../../../shared/utils/sync/pullFromRemote/stringifyFields";
+import { SyncInfoUpdater } from "../../../../shared/utils/sync/queryStatus";
+import { updateLocalSyncedAt } from "../../../../shared/utils/sync/status/syncUpdate";
+import { setSupastashSyncStatus } from "../status/services";
+import { pullData } from "./pullData";
+let isInSync = new Map();
+const DEFAULT_DATE = "1970-01-01T00:00:00Z";
+const BATCH_SIZE = 500;
+const CHUNK_SIZE = 999;
+/**
+ * Updates the local database with the remote changes
+ * @param table - The table to update
+ */
+export async function updateLocalDb(table, filters, onReceiveData) {
+    if (isInSync.get(table))
+        return;
+    const cfg = getSupastashConfig();
+    if (cfg.supastashMode === "ghost")
+        return;
+    isInSync.set(table, true);
+    const batchId = generateUUIDv4();
+    try {
+        const db = await getSupastashDb();
+        // Initialize the batch completed map
+        RECEIVED_DATA_COMPLETED_MAP[batchId] = {
+            arrived_at: DEFAULT_RECEIVED_DATA_COMPLETED,
+            updated_at: DEFAULT_RECEIVED_DATA_COMPLETED,
+        };
+        let refreshNeeded = false;
+        while (true) {
+            const dataResult = await pullData({ table, filters, batchId });
+            if (!dataResult)
+                break;
+            const data = dataResult?.data;
+            const timestamps = dataResult.timestamps;
+            const deletedIds = dataResult.deletedIds;
+            const deletedIdSet = new Set(deletedIds ?? []);
+            SyncInfoUpdater.setUnsyncedDataCount({
+                amount: data?.length ?? 0,
+                type: "pull",
+                table,
+            });
+            SyncInfoUpdater.setUnsyncedDeletedCount({
+                amount: deletedIds?.length ?? 0,
+                type: "pull",
+                table,
+            });
+            refreshNeeded = !!data?.length || !!deletedIds?.length;
+            // Delete records that are no longer in the remote data
+            await db.withTransaction(async (tx) => {
+                if (deletedIds && deletedIds.length > 0) {
+                    const ids = deletedIds;
+                    for (let i = 0; i < ids.length; i += CHUNK_SIZE) {
+                        const slice = ids.slice(i, i + CHUNK_SIZE);
+                        const placeholders = slice.map(() => "?").join(", ");
+                        await tx.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 += CHUNK_SIZE) {
+                        const slice = ids.slice(i, i + CHUNK_SIZE);
+                        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);
+                        }
+                    }
+                }
+                // Update local database with remote changes
+                if (data?.length) {
+                    await upsertChunkData({
+                        tx,
+                        table,
+                        records: data,
+                    });
+                }
+            });
+            if (timestamps) {
+                await setSupastashSyncStatus(table, filters, {
+                    lastSyncedAt: timestamps.updatedMax,
+                    lastDeletedAt: timestamps.deletedMax,
+                    lastSyncedAtPk: timestamps.updatedMaxPk,
+                    filterNamespace: "global",
+                });
+            }
+            const completedSet = RECEIVED_DATA_COMPLETED_MAP[batchId];
+            if (Object.values(completedSet ?? {}).every(Boolean)) {
+                break;
+            }
+        }
+        if (refreshNeeded)
+            refreshScreen(table);
+    }
+    catch (error) {
+        logWarn(`[Supastash] Error updating local db for ${table}`, error);
+        throw error;
+    }
+    finally {
+        isInSync.delete(table);
+        deleteReceivedDataCompleted(batchId);
+    }
+}
+const warned = new Map();
+/**
+ * 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 async function upsertData({ tx, table, record, doesExist, }) {
+    if (!record?.id)
+        return;
+    let itemExists = !!doesExist;
+    const cfg = getSupastashConfig();
+    if (cfg.supastashMode === "ghost")
+        return;
+    if (doesExist === undefined) {
+        const { doesExist: exists } = await checkIfRecordExistsAndIsNewer(table, record);
+        itemExists = exists;
+    }
+    try {
+        const db = tx ?? (await getSupastashDb());
+        const columns = await getTableSchema(table);
+        const recordToSave = {
+            ...record,
+            synced_at: new Date().toISOString(),
+        };
+        if (getSupastashConfig().debugMode) {
+            const unknownKeys = Object.keys(record).filter((key) => !columns.includes(key));
+            if (unknownKeys.length > 0 && !warned.get(table)) {
+                warned.set(table, true);
+                logWarn(`⚠️ [Supastash] '${table}' payload contains keys not in local schema: ${unknownKeys.join(", ")}. ` + `They will be ignored locally.`);
+            }
+        }
+        // Prep for upsert
+        const keys = columns;
+        const placeholders = keys.map(() => "?").join(", ");
+        const updateColumns = keys.filter((key) => key !== "id");
+        const updateParts = updateColumns.map((key) => `${key} = ?`);
+        const updatePlaceholders = updateParts.join(", ");
+        const values = keys.map((key) => stringifyValue(recordToSave[key]));
+        const updateValues = updateColumns.map((key) => stringifyValue(recordToSave[key]));
+        if (itemExists) {
+            // Update existing record
+            await db.runAsync(`UPDATE ${table} SET ${updatePlaceholders} WHERE id = ?`, [...updateValues, record.id]);
+        }
+        else {
+            // Insert new record
+            await db.runAsync(`INSERT INTO ${table} (${keys.join(", ")}) VALUES (${placeholders})`, values);
+        }
+        await updateLocalSyncedAt(table, [record.id]);
+    }
+    catch (error) {
+        logError(`[Supastash] Error upserting data for ${table}`, error);
+    }
+}
+/**
+    •	Bulk upserts records into a local SQLite table using a batched, conflict-aware strategy.
+    •
+    •	This function:
+    •		•	Fetches existing id and updated_at values in bulk to avoid per-row queries
+    •		•	Filters incoming records to only include new or more recent entries
+    •		•	Performs batched INSERT ... ON CONFLICT(id) DO UPDATE operations
+    •	while respecting SQLite parameter limits
+    •		•	Updates synced_at for successfully written records
+    •
+    •	Designed for high-performance sync scenarios in offline-first apps.
+    •
+    •	Key guarantees:
+    •		•	Avoids N+1 query patterns (no per-row existence checks)
+    •		•	Minimizes disk I/O pressure via batching
+    •		•	Safe for large datasets when used with chunking
+    •
+    •	Notes:
+    •		•	Assumes id is the primary or unique key
+    •		•	Requires updated_at for conflict resolution (falls back if missing)
+    •		•	Respects SQLite parameter limit (~999 variables per query)
+    •
+    •	@param tx Optional transaction instance. If not provided, a connection is used directly.
+    •	@param table Target table name
+    •	@param records Array of records to upsert
+*/
+export async function upsertChunkData({ tx, table, records, }) {
+    if (!records?.length)
+        return;
+    const cfg = getSupastashConfig();
+    if (cfg.supastashMode === "ghost")
+        return;
+    const db = tx ?? (await getSupastashDb());
+    const columns = await getTableSchema(table);
+    const syncedAt = new Date().toISOString();
+    if (cfg.debugMode) {
+        const unknownKeys = Object.keys(records[0]).filter((key) => !columns.includes(key));
+        if (unknownKeys.length > 0 && !warned.get(table)) {
+            warned.set(table, true);
+            logWarn(`⚠️ [Supastash] '${table}' payload contains keys not in local schema: ${unknownKeys.join(", ")}. ` + `They will be ignored locally.`);
+        }
+    }
+    // Step 1: Fetch existing id + updated_at for all incoming ids in bulk
+    const incomingIds = records.map((r) => r.id).filter(Boolean);
+    const localStamp = new Map();
+    for (let i = 0; i < incomingIds.length; i += CHUNK_SIZE) {
+        const slice = incomingIds.slice(i, i + CHUNK_SIZE);
+        const placeholders = slice.map(() => "?").join(", ");
+        const rows = await db.getAllAsync(`SELECT id, updated_at FROM ${table} WHERE id IN (${placeholders})`, slice);
+        console.log("rows", rows.length);
+        for (const row of rows ?? []) {
+            localStamp.set(row.id, row.updated_at ?? null);
+        }
+    }
+    // Step 2: Keep only records that are new or have a newer remote updated_at
+    const toUpsert = records.filter((record) => {
+        if (!record?.id)
+            return false;
+        const remoteUpdated = record.updated_at;
+        if (!remoteUpdated)
+            return false;
+        const localUpdated = localStamp.get(record.id);
+        if (!localUpdated)
+            return true;
+        return new Date(remoteUpdated) > new Date(localUpdated);
+    });
+    console.log("toUpsert", toUpsert.length);
+    if (!toUpsert.length)
+        return;
+    // Step 3: Build INSERT … ON CONFLICT(id) DO UPDATE in param-limit-safe chunks
+    const colList = columns.join(", ");
+    const updateSet = columns
+        .filter((key) => key !== "id")
+        .map((key) => `${key} = excluded.${key}`)
+        .join(", ");
+    const paramsPerRow = columns.length;
+    const rowsPerChunk = Math.max(1, Math.floor(999 / paramsPerRow));
+    const successfulIds = [];
+    for (let i = 0; i < toUpsert.length; i += rowsPerChunk) {
+        const chunk = toUpsert.slice(i, i + rowsPerChunk);
+        const rowPlaceholders = chunk
+            .map(() => `(${columns.map(() => "?").join(", ")})`)
+            .join(", ");
+        const values = [];
+        for (const record of chunk) {
+            const recordToSave = { ...record, synced_at: syncedAt };
+            for (const col of columns) {
+                values.push(stringifyValue(recordToSave[col]));
+            }
+        }
+        try {
+            await db.runAsync(`INSERT INTO ${table} (${colList}) VALUES ${rowPlaceholders} ON CONFLICT(id) DO UPDATE SET ${updateSet}`, values);
+            for (const record of chunk) {
+                successfulIds.push(record.id);
+            }
+        }
+        catch (error) {
+            logError(`[Supastash] Error upserting chunk for ${table}`, error);
+        }
+    }
+    if (successfulIds.length) {
+        await updateLocalSyncedAt(table, successfulIds);
+    }
+}
+async function checkIfRecordExistsAndIsNewer(table, item) {
+    if (!item?.id)
+        return { doesExist: false, newer: false };
+    const db = await getSupastashDb();
+    const record = await db.getFirstAsync(`SELECT id, updated_at FROM ${table} WHERE id = ?`, [item.id]);
+    if (record &&
+        new Date(record.updated_at || DEFAULT_DATE) >=
+            new Date(item.updated_at || DEFAULT_DATE)) {
+        log(`Skipping ${table}:${record.id} - local is newer`);
+        return { doesExist: true, newer: false };
+    }
+    return { doesExist: !!record, newer: true };
+}

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pushLocal/index.ts"],"names":[],"mappings":"AAaA;;GAEG;AACH,wBAAsB,aAAa,kBAiGlC"}

package/dist/{hooks/syncEngine → desktop/utils/sync}/pushLocal/index.js

@@ -1,11 +1,10 @@
-import { getSupastashConfig } from "../../../core/config";
-import { syncCalls } from "../../../store/syncCalls";
-import { isOnline } from "../../../utils/connection";
-import log from "../../../utils/logs";
-import { getAllTables } from "../../../utils/sync/getAllTables";
-import { runLimitedConcurrency } from "../../../utils/sync/pullFromRemote/runLimitedConcurrency";
-import { pushLocalDataToRemote } from "../../../utils/sync/pushLocal/sendUnsyncedToSupabase";
-import { SyncInfoUpdater } from "../../../utils/sync/queryStatus";
+import { getSupastashConfig } from "../../../../shared/core/config";
+import { syncCalls } from "../../../../shared/store/syncCalls";
+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 { pushLocalDataToRemote } from "./sendUnsyncedToSupabase";
 let emptyPassCount = 0;
 let lastEmptyPassAt = 0;
 const tablePushLock = new Map();
@@ -21,8 +20,6 @@ export async function pushLocalData() {
             log("[Supastash] No tables found");
             return;
         }
-        if (!(await isOnline()))
-            return;
         const excludeTables = getSupastashConfig()?.excludeTables?.push || [];
         const tablesToPush = tables.filter((table) => !excludeTables?.includes(table));
         numberOfTables = tablesToPush.length;

package/dist/desktop/utils/sync/pushLocal/sendUnsyncedToSupabase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sendUnsyncedToSupabase.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pushLocal/sendUnsyncedToSupabase.ts"],"names":[],"mappings":"AAYA;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,MAAM,EACb,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,EACrD,MAAM,CAAC,EAAE,MAAM,EAAE,gCA+ClB"}

package/dist/{utils → desktop/utils}/sync/pushLocal/sendUnsyncedToSupabase.js

@@ -1,9 +1,8 @@
-import { getSupastashConfig } from "../../../core/config";
-import { isOnline } from "../../connection";
-import { refreshScreen } from "../../refreshScreenCalls";
-import { SyncInfoUpdater } from "../queryStatus";
-import { deleteData } from "./deleteChunks";
-import { getAllDeletedData, getAllUnsyncedData } from "./getAllUnsyncedData";
+import { getSupastashConfig } from "../../../../shared/core/config";
+import { refreshScreen } from "../../../../shared/utils/refreshScreenCalls";
+import { deleteData } from "../../../../shared/utils/sync/pushLocal/deleteChunks";
+import { getAllDeletedData, getAllUnsyncedData, } from "../../../../shared/utils/sync/pushLocal/getAllUnsyncedData";
+import { SyncInfoUpdater } from "../../../../shared/utils/sync/queryStatus";
 import { uploadData } from "./uploadChunk";
 let isInSync = new Map();
 /**
@@ -16,8 +15,6 @@ export async function pushLocalDataToRemote(table, onPushToRemote, noSync) {
     const cfg = getSupastashConfig();
     if (cfg.supastashMode === "ghost")
         return false;
-    if (!(await isOnline()))
-        return false;
     isInSync.set(table, true);
     try {
         const data = await getAllUnsyncedData(table);

package/dist/{utils → desktop/utils}/sync/pushLocal/uploadChunk.d.ts

@@ -1,4 +1,4 @@
-import { PayloadData } from "../../../types/query.types";
+import { PayloadData } from "../../../../shared/types/query.types";
 /**
  * Uploads a chunk of data to the remote database
  * @param table - The table to upload to

package/dist/desktop/utils/sync/pushLocal/uploadChunk.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uploadChunk.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pushLocal/uploadChunk.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAgMnE;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,WAAW,EAAE,EAC9B,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,iBAetD"}

package/dist/{utils → desktop/utils}/sync/pushLocal/uploadChunk.js

@@ -1,11 +1,10 @@
-import { DEFAULT_CHUNK_SIZE } from "../../../constants/syncDefaults";
-import { getSupastashConfig } from "../../../core/config";
-import { isOnline } from "../../../utils/connection";
-import { normalizeForSupabase } from "../../getSafeValues";
-import log from "../../logs";
-import { supabaseClientErr } from "../../supabaseClientErr";
-import { setQueryStatus, SyncInfoUpdater } from "../queryStatus";
-import { enforceTimestamps } from "./normalize";
+import { DEFAULT_CHUNK_SIZE } from "../../../../shared/constants/syncDefaults";
+import { getSupastashConfig } from "../../../../shared/core/config";
+import { normalizeForSupabase } from "../../../../shared/utils/getSafeValues";
+import log from "../../../../shared/utils/logs";
+import { supabaseClientErr } from "../../../../shared/utils/supabaseClientErr";
+import { enforceTimestamps } from "../../../../shared/utils/sync/pushLocal/normalize";
+import { setQueryStatus, SyncInfoUpdater, } from "../../../../shared/utils/sync/queryStatus";
 import { backoff, batchUpsert, fetchRemoteHeadsChunked, filterRowsByUpdatedAt, handleRowFailure, markSynced, rpcUpsert, rpcUpsertSingle, singleUpsert, } from "./uploadHelpers";
 /**
  * Uploads a chunk of data to the remote database
@@ -23,9 +22,6 @@ async function uploadChunk(table, chunk, onPushToRemote) {
     if (!supabase) {
         throw new Error(supabaseClientErr);
     }
-    const online = await isOnline();
-    if (!online)
-        return;
     let errorCount = 0;
     let lastError = null;
     let pending = [];
@@ -165,7 +161,7 @@ export async function uploadData(table, unsyncedRecords, onPushToRemote) {
     const supabase = cfg.supabaseClient;
     if (!supabase)
         throw new Error("[Supastash] Supabase client not configured");
-    const cleaned = unsyncedRecords.map(({ synced_at, deleted_at, ...rest }) => enforceTimestamps(normalizeForSupabase(rest)));
+    const cleaned = unsyncedRecords.map(({ synced_at, deleted_at, arrived_at, ...rest }) => enforceTimestamps(normalizeForSupabase(rest)));
     for (let i = 0; i < cleaned.length; i += DEFAULT_CHUNK_SIZE) {
         const chunk = cleaned.slice(i, i + DEFAULT_CHUNK_SIZE);
         await uploadChunk(table, chunk, onPushToRemote);

package/dist/{utils → desktop/utils}/sync/pushLocal/uploadHelpers.d.ts

@@ -1,5 +1,5 @@
-import { SupastashConfig } from "../../../types/supastashConfig.types";
-import { RowLike } from "../../../types/syncEngine.types";
+import { SupastashConfig } from "../../../../shared/types/supastashConfig.types";
+import { RowLike } from "../../../../shared/types/syncEngine.types";
 export declare function classifyFailure(cfg: SupastashConfig<any>, code?: string | number): "HTTP" | "UNKNOWN" | "NON_RETRYABLE" | "FK_BLOCK" | "RETRYABLE";
 declare function batchUpsert(table: string, rows: RowLike[], supabase: any): Promise<any>;
 declare function singleUpsert(table: string, row: RowLike, supabase: any): Promise<any>;

package/dist/desktop/utils/sync/pushLocal/uploadHelpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uploadHelpers.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pushLocal/uploadHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,2CAA2C,CAAC;AAOpE,wBAAgB,eAAe,CAC7B,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,EACzB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,mEAWvB;AAED,iBAAe,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,gBAEvE;AAED,iBAAe,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,gBAErE;AAED,iBAAe,OAAO,CAAC,QAAQ,EAAE,MAAM,iBAOtC;AAmBD,iBAAe,SAAS,CAAC,EACvB,KAAK,EACL,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;CACf;;;;;;;GA+CA;AAED,iBAAe,eAAe,CAAC,EAC7B,KAAK,EACL,GAAG,EACH,QAAQ,EACR,SAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;;;;;;GAaA;AAMD,iBAAe,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,iBAIrD;AAWD,iBAAS,qBAAqB,CAC5B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,OAAO,EAAE,EAChB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,aAiCjC;AAMD,iBAAe,gBAAgB,CAC7B,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,EACzB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,GAAG,GACZ,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC,CAkDvC;AAgBD,OAAO,EACL,OAAO,EACP,WAAW,EACX,qBAAqB,EACrB,gBAAgB,EAChB,UAAU,EACV,SAAS,EACT,eAAe,EACf,YAAY,GACb,CAAC;AAEF;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,GAAG,iBAkBd;AASD,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EAAE,EACb,QAAQ,EAAE,GAAG,gCAcd"}

package/dist/{utils → desktop/utils}/sync/pushLocal/uploadHelpers.js

@@ -1,10 +1,10 @@
-import { getSupastashConfig } from "../../../core/config";
-import { getSupastashDb } from "../../../db/dbInitializer";
-import { supastashEventBus } from "../../../utils/events/eventBus";
-import log, { logWarn } from "../../../utils/logs";
+import { getSupastashConfig } from "../../../../shared/core/config";
+import { getSupastashDb } from "../../../../shared/db/dbInitializer";
+import { supastashEventBus } from "../../../../shared/utils/events/eventBus";
+import log, { logWarn } from "../../../../shared/utils/logs";
+import { setQueryStatus } from "../../../../shared/utils/sync/queryStatus";
+import { updateLocalSyncedAt } from "../../../../shared/utils/sync/status/syncUpdate";
 import { upsertData } from "../pullFromRemote/updateLocalDb";
-import { setQueryStatus } from "../queryStatus";
-import { updateLocalSyncedAt } from "../status/syncUpdate";
 export function classifyFailure(cfg, code) {
     const p = cfg.syncPolicy ?? {};
     const n = Number(code);

package/dist/{utils → desktop/utils}/sync/status/filterKey.d.ts

@@ -1,4 +1,4 @@
-import { SupastashFilter } from "../../../types/realtimeData.types";
+import { SupastashFilter } from "../../../../shared/types/realtimeData.types";
 /**
  * Canonicalizes a set of filters
  * @param filters - The filters to canonicalize

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

@@ -0,0 +1 @@
+{"version":3,"file":"filterKey.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/status/filterKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAc9E;;;;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,mBAKd"}

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

@@ -0,0 +1,48 @@
+import { webCryptoAdapter } from "../../../adapters/crypto";
+/**
+ * Normalizes a value
+ * @param v - The value to normalize
+ * @returns The normalized value
+ */
+function normVal(v) {
+    if (v === null || v === undefined)
+        return null;
+    if (Array.isArray(v))
+        return v.map(String).sort();
+    return typeof v === "number" ? String(v) : String(v);
+}
+/**
+ * Canonicalizes a set of filters
+ * @param filters - The filters to canonicalize
+ * @returns The canonicalized filters
+ */
+export function canonicalizeFilters(filters) {
+    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),
+    }));
+    list.sort((a, b) => {
+        if (a.column !== b.column)
+            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);
+        const bv = JSON.stringify(b.value);
+        return av < bv ? -1 : av > bv ? 1 : 0;
+    });
+    return JSON.stringify(list);
+}
+/**
+ * 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 async function computeFilterKey(filters, ns = "global") {
+    const canon = canonicalizeFilters(filters);
+    const namespaced = JSON.stringify({ ns, filters: JSON.parse(canon) });
+    return webCryptoAdapter.sha256(namespaced);
+}

package/dist/{utils → desktop/utils}/sync/status/repo.d.ts

@@ -1,6 +1,6 @@
-import { SupastashFilter } from "../../../types/realtimeData.types";
-import { SupastashSQLiteDatabase } from "../../../types/supastashConfig.types";
-import { SupastashSyncStatus } from "../../../types/syncEngine.types";
+import { SupastashFilter } from "../../../../shared/types/realtimeData.types";
+import { SupastashSQLiteDatabase } from "../../../../shared/types/supastashConfig.types";
+import { SupastashSyncStatus } from "../../../../shared/types/syncEngine.types";
 export declare function ensureSyncMarksTable(): Promise<void>;
 export declare function selectMarks(db: SupastashSQLiteDatabase, table: string, filterKey: string): Promise<SupastashSyncStatus | null>;
 export declare function selectSyncStatus(db: SupastashSQLiteDatabase, table: string, tableFilters?: SupastashFilter[]): Promise<SupastashSyncStatus>;

package/dist/desktop/utils/sync/status/repo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/status/repo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AACzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAuDhF,wBAAsB,oBAAoB,kBAEzC;AAED,wBAAsB,WAAW,CAC/B,EAAE,EAAE,uBAAuB,EAC3B,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,uCAOlB;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,uBAAuB,EAC3B,KAAK,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,eAAe,EAAE,GAC/B,OAAO,CAAC,mBAAmB,CAAC,CAoB9B;AAED,wBAAsB,WAAW,CAC/B,EAAE,EAAE,uBAAuB,EAC3B,GAAG,EAAE,OAAO,CAAC,mBAAmB,CAAC,gBA8BlC;AAED,wBAAsB,WAAW,CAC/B,EAAE,EAAE,uBAAuB,EAC3B,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,gBAAgB,GAAG,iBAAiB,EACzC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,gBAYnB;AAED,wBAAsB,WAAW,CAC/B,EAAE,EAAE,uBAAuB,EAC3B,KAAK,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,MAAM,gBASnB"}

package/dist/{utils → desktop/utils}/sync/status/repo.js

@@ -1,6 +1,6 @@
-import { getSupastashConfig } from "../../../core/config";
-import { logWarn } from "../../logs";
-import { createSyncStatusTable } from "../../schema/createSyncStatus";
+import { getSupastashConfig } from "../../../../shared/core/config";
+import { logWarn } from "../../../../shared/utils/logs";
+import { createSyncStatusTable } from "../../../../shared/utils/schema/createSyncStatus";
 import { computeFilterKey } from "./filterKey";
 const OLD_DATE = "2000-01-01T00:00:00Z";
 const SYNC_STATUS_TABLE = "supastash_sync_marks";

package/dist/{utils → desktop/utils}/sync/status/services.d.ts

@@ -1,5 +1,5 @@
-import { SupastashFilter } from "../../../types/realtimeData.types";
-import { PublicScope, SupastashSyncStatus } from "../../../types/syncEngine.types";
+import { SupastashFilter } from "../../../../shared/types/realtimeData.types";
+import { PublicScope, SupastashSyncStatus } from "../../../../shared/types/syncEngine.types";
 /**
  * Gets the supastash sync status for a given table and filters
  * @param table - The name of the table to get the sync status for

package/dist/desktop/utils/sync/status/services.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/status/services.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EACL,WAAW,EACX,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAmBnD;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,eAAe,EAAE,GAC1B,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAWrC;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS,EACtC,IAAI,EAAE;IACJ,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,iBAyCF;AAED;;;;;;GAMG;AACH,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS,EACtC,KAAK,GAAE,WAAmB,iBAmB3B;AAED;;;;;GAKG;AACH,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,eAAe,EAAE,iBAY5B"}

package/dist/{utils → desktop/utils}/sync/status/services.js

@@ -1,6 +1,6 @@
-import { getSupastashDb } from "../../../db/dbInitializer";
-import { tableFilters } from "../../../store/tableFilters";
-import { logError, logWarn } from "../../logs";
+import { getSupastashDb } from "../../../../shared/db/dbInitializer";
+import { tableFilters } from "../../../../shared/store/tableFilters";
+import { logError, logWarn } from "../../../../shared/utils/logs";
 import { canonicalizeFilters, computeFilterKey } from "./filterKey";
 import { deleteMarks, ensureSyncMarksTable, resetColumn, selectMarks, upsertMarks, } from "./repo";
 const maxIso = (a, b) => {

package/dist/{utils → desktop/utils}/sync/status/syncStatus.d.ts

@@ -1,5 +1,5 @@
-import { SupastashFilter } from "../../../types/realtimeData.types";
-import { PublicScope, SupastashSyncStatus } from "../../../types/syncEngine.types";
+import { SupastashFilter } from "../../../../shared/types/realtimeData.types";
+import { PublicScope, SupastashSyncStatus } from "../../../../shared/types/syncEngine.types";
 /**
  * Clears the sync log for a specific table.
  *

package/dist/desktop/utils/sync/status/syncStatus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"syncStatus.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/status/syncStatus.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EACL,WAAW,EACX,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAkBnD;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,MAAM,iBAExD;AAED;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,kBAKzC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,UAAU,CAC9B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CASrC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS,EACtC,IAAI,EAAE;IACJ,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,iBAOF;AAED;;;;;;;;;GASG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS,EACtC,KAAK,GAAE,WAAmB,iBAO3B;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,EAAE,iBAM5E;AAED,oFAAoF;AAEpF;;;GAGG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,iBAGvB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,SAAS,EAAE,MAAM,iBAE1D;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,kBAE3C;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,MAAM,iBAExD;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,iBAGtB"}

package/dist/{utils → desktop/utils}/sync/status/syncStatus.js

@@ -1,7 +1,7 @@
-import { getSupastashConfig } from "../../../core/config";
-import { getSupastashDb } from "../../../db/dbInitializer";
-import { logError } from "../../logs";
-import { createSyncStatusTable } from "../../schema/createSyncStatus";
+import { getSupastashConfig } from "../../../../shared/core/config";
+import { getSupastashDb } from "../../../../shared/db/dbInitializer";
+import { logError } from "../../../../shared/utils/logs";
+import { createSyncStatusTable } from "../../../../shared/utils/schema/createSyncStatus";
 import { clearSupastashSyncStatus, getSupastashSyncStatus, resetSupastashSyncStatus, setSupastashSyncStatus, } from "./services";
 const SYNC_STATUS_TABLE = "supastash_sync_marks";
 const SERVER_SYNC_STATUS_TABLE = "supastash_server_sync_marks";

package/dist/index.d.ts

@@ -1,26 +1,19 @@
-export { configureSupastash, getSupastashConfig } from "./core/config";
-export { defineLocalSchema } from "./core/schemaManager";
-export { getSupastashDb } from "./db/dbInitializer";
-export { useSupastashData } from "./hooks/supastashData";
-export { useSupastashFilters } from "./hooks/supastashFilters";
-export { useSupastash } from "./hooks/supastashLogic";
-export { syncAllTables, syncTable } from "./hooks/syncEngine";
-export { useSupastashSyncStatus } from "./hooks/syncStatus";
-export { closeSyncGate, isSyncGateClosed, openSyncGate, } from "./store/syncStatus";
-export { supastashEventBus } from "./utils/events/eventBus";
-export { supastash } from "./utils/query/builder";
-export { refreshScreen } from "./utils/refreshScreenCalls";
-export { dropAllTables, dropTable, wipeAllTables, wipeOldDataForAllTables, wipeOldDataForATable, wipeTable, } from "./utils/schema/wipeTables";
-export { getSupastashRuntimeMode, reinitializeSupastash, } from "./utils/supastashMode";
-export { getAllTables } from "./utils/sync/getAllTables";
-export { fetchOlderPage } from "./utils/sync/pullFromRemote/fetchOlder";
-export { updateFilters } from "./utils/sync/pullFromRemote/updateFilter";
-export { updateLocalDb, upsertData, } from "./utils/sync/pullFromRemote/updateLocalDb";
-export { refreshAllTables, refreshTable, refreshTableWithPayload, } from "./utils/sync/refreshTables";
-export { clearSyncCalls, getAllSyncTables, getSyncCall, registerSyncCall, unregisterSyncCall, } from "./utils/sync/registration/syncCalls";
-export { clearAllLocalDeleteLog, clearAllLocalSyncLog, clearLocalDeleteLog, clearLocalSyncLog, clearSyncLog, getLocalDeleteLog, getSyncLog, resetSyncLog, setLocalDeleteLog, setLocalSyncLog, setSyncLog, } from "./utils/sync/status/syncStatus";
-export type { CrudMethods } from "./types/query.types";
-export type { RealtimeOptions, SupastashDataResult, SupastashFilter, } from "./types/realtimeData.types";
-export type { SupastashConfig, SupastashHookReturn, SupastashSQLiteClientTypes, SupastashSQLiteDatabase, SupastashSQLiteExecutor, } from "./types/supastashConfig.types";
-export type { SupastashClient, SupastashTransactionClient, } from "./utils/query/builder";
+export { configureSupastash, getSupastashConfig } from "./shared/core/config";
+export { useSupastashFilters } from "./shared/hooks/supastashFilters";
+export { useSupastashSyncStatus } from "./shared/hooks/syncStatus";
+export { closeSyncGate, isSyncGateClosed, openSyncGate, } from "./shared/store/syncStatus";
+export { supastashEventBus } from "./shared/utils/events/eventBus";
+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 { 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";
+export type { CrudMethods } from "./shared/types/query.types";
+export type { RealtimeOptions, SupastashDataResult, SupastashFilter, } from "./shared/types/realtimeData.types";
+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 { SupastashClient, SupastashTransactionClient, } from "./shared/utils/query/builder";
 //# sourceMappingURL=index.d.ts.map