supastash 0.1.62 → 0.2.1

package/dist/{utils → desktop/utils}/sync/pullFromRemote/pullData.d.ts

@@ -1,5 +1,5 @@
-import { PayloadData } from "../../../types/query.types";
-import { RealtimeFilter } from "../../../types/realtimeData.types";
+import { PayloadData } from "../../../../shared/types/query.types";
+import { SupastashFilter } from "../../../../shared/types/realtimeData.types";
 /**
  * Pulls data from the remote database for a given table
  * @param table - The table to pull data from
@@ -7,13 +7,12 @@ import { RealtimeFilter } from "../../../types/realtimeData.types";
  */
 export declare function pullData({ table, filters, batchId, }: {
     table: string;
-    filters?: RealtimeFilter[];
+    filters?: SupastashFilter[];
     batchId: string;
 }): Promise<{
     data: PayloadData[];
     deletedIds: string[];
     timestamps: {
-        createdMax: string | null;
         updatedMax: string | null;
         deletedMax: string | null;
         updatedMaxPk: string | null;

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

@@ -0,0 +1 @@
+{"version":3,"file":"pullData.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pullFromRemote/pullData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAW9E;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,EAC7B,KAAK,EACL,OAAO,EACP,OAAO,GACR,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC;IACV,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,EAAE;QACV,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;KAC7B,CAAC;CACH,GAAG,IAAI,CAAC,CAmFR"}

package/dist/{utils → desktop/utils}/sync/pullFromRemote/pullData.js

@@ -1,11 +1,11 @@
-import { getSupastashConfig } from "../../../core/config";
-import { getSupastashDb } from "../../../db/dbInitializer";
-import log, { logWarn } from "../../logs";
-import { supabaseClientErr } from "../../supabaseClientErr";
-import { SyncInfoUpdater } from "../queryStatus";
+import { getSupastashConfig } from "../../../../shared/core/config";
+import { getSupastashDb } from "../../../../shared/db/dbInitializer";
+import log, { logWarn } from "../../../../shared/utils/logs";
+import { supabaseClientErr } from "../../../../shared/utils/supabaseClientErr";
+import { logNoUpdates, pageThrough, returnMaxDate, } from "../../../../shared/utils/sync/pullFromRemote/helpers";
+import { SyncInfoUpdater } from "../../../../shared/utils/sync/queryStatus";
 import { computeFilterKey } from "../status/filterKey";
 import { selectSyncStatus } from "../status/repo";
-import { logNoUpdates, pageThrough, returnMaxDate } from "./helpers";
 /**
  * Pulls data from the remote database for a given table
  * @param table - The table to pull data from
@@ -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/desktop/utils/sync/pullFromRemote/updateLocalDb.d.ts

@@ -0,0 +1,46 @@
+import { SupastashFilter } from "../../../../shared/types/realtimeData.types";
+import { UpsertDataParams } from "../../../../shared/types/syncEngine.types";
+/**
+ * Updates the local database with the remote changes
+ * @param table - The table to update
+ */
+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({ tx, table, record, doesExist, }: UpsertDataParams): Promise<void>;
+/**
+    •	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 declare function upsertChunkData({ tx, table, records, }: {
+    tx?: any;
+    table: string;
+    records: any[];
+}): Promise<void>;
+//# sourceMappingURL=updateLocalDb.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"updateLocalDb.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pullFromRemote/updateLocalDb.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAiB7E;;;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,iBAsGhD;AAID;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,EAC/B,EAAE,EACF,KAAK,EACL,MAAM,EACN,SAAS,GACV,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqElC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;EAyBE;AACF,wBAAsB,eAAe,CAAC,EACpC,EAAE,EACF,KAAK,EACL,OAAO,GACR,EAAE;IACD,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,GAAG,EAAE,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgGhB"}

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;
@@ -59,7 +56,7 @@ export async function pushLocalData() {
                 });
             }
             catch (e) {
-                const msg = e?.code ?? e?.name ?? String(e);
+                const msg = e?.message ?? e?.code ?? e?.name ?? String(e);
                 SyncInfoUpdater.markLogError({
                     type: "push",
                     table,

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);
@@ -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 → desktop/utils}/sync/status/filterKey.d.ts

@@ -1,15 +1,15 @@
-import { RealtimeFilter } from "../../../types/realtimeData.types";
+import { SupastashFilter } from "../../../../shared/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/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"}