@powersync/common 1.57.2 → 2.0.0

package/lib/db/DBAdapter.js

@@ -2,115 +2,98 @@
  * Set of generic interfaces to allow PowerSync compatibility with
  * different SQLite DB implementations.
  */
+import { BaseObserver } from '../utils/BaseObserver.js';
+import { queryResultFromRaw, queryResultWithoutRows } from './QueryResult.js';
 /**
- * Implements {@link DBGetUtils} on a {@link SqlExecutor}.
- *
- * @internal
+ * @public
  */
-export function DBGetUtilsDefaultMixin(Base) {
-    return class extends Base {
-        async getAll(sql, parameters) {
-            const res = await this.execute(sql, parameters);
-            return res.rows?._array ?? [];
-        }
-        async getOptional(sql, parameters) {
-            const res = await this.execute(sql, parameters);
-            return res.rows?.item(0) ?? null;
-        }
-        async get(sql, parameters) {
-            const res = await this.execute(sql, parameters);
-            const first = res.rows?.item(0);
-            if (!first) {
-                throw new Error('Result set is empty');
-            }
-            return first;
+export class LockContext {
+    async getAll(sql, parameters) {
+        const rs = await this.execute(sql, parameters);
+        return Array.from(rs);
+    }
+    async getOptional(sql, parameters) {
+        const { array } = await this.execute(sql, parameters);
+        if (array.length > 0) {
+            return array[0];
         }
-        async executeBatch(query, params = []) {
-            // If this context can run batch statements natively, use that.
-            // @ts-ignore
-            if (super.executeBatch) {
-                // @ts-ignore
-                return super.executeBatch(query, params);
-            }
-            // Emulate executeBatch by running statements individually.
-            let lastInsertId;
-            let rowsAffected = 0;
-            for (const set of params) {
-                const result = await this.execute(query, set);
-                lastInsertId = result.insertId;
-                rowsAffected += result.rowsAffected;
-            }
-            return {
-                rowsAffected,
-                insertId: lastInsertId
-            };
+        return null;
+    }
+    async get(sql, parameters) {
+        const row = await this.getOptional(sql, parameters);
+        if (row == null) {
+            throw new Error('Result set is empty');
         }
-    };
+        return row;
+    }
+    async execute(query, params) {
+        const raw = await this.executeRaw(query, params);
+        return queryResultFromRaw(raw);
+    }
+    async executeBatch(query, params = []) {
+        // Emulate executeBatch by running statements individually.
+        let lastInsertId;
+        let rowsAffected = 0;
+        for (const set of params) {
+            const result = await this.execute(query, set);
+            lastInsertId = result.insertId;
+            rowsAffected += result.rowsAffected ?? 0;
+        }
+        return queryResultWithoutRows({
+            rowsAffected,
+            insertId: lastInsertId
+        });
+    }
 }
 /**
- * Update table operation numbers from SQLite
- *
  * @public
  */
-export var RowUpdateType;
-(function (RowUpdateType) {
-    RowUpdateType[RowUpdateType["SQLITE_INSERT"] = 18] = "SQLITE_INSERT";
-    RowUpdateType[RowUpdateType["SQLITE_DELETE"] = 9] = "SQLITE_DELETE";
-    RowUpdateType[RowUpdateType["SQLITE_UPDATE"] = 23] = "SQLITE_UPDATE";
-})(RowUpdateType || (RowUpdateType = {}));
-/**
- * A mixin to implement {@link DBAdapter} by delegating to {@link ConnectionPool#readLock} and
- * {@link ConnectionPool#writeLock}.
- *
- * @internal
- */
-export function DBAdapterDefaultMixin(Base) {
-    return class extends Base {
-        readTransaction(fn, options) {
-            return this.readLock((ctx) => TransactionImplementation.runWith(ctx, fn), options);
-        }
-        writeTransaction(fn, options) {
-            return this.writeLock((ctx) => TransactionImplementation.runWith(ctx, fn), options);
-        }
-        getAll(sql, parameters) {
-            return this.readLock((ctx) => ctx.getAll(sql, parameters));
-        }
-        getOptional(sql, parameters) {
-            return this.readLock((ctx) => ctx.getOptional(sql, parameters));
-        }
-        get(sql, parameters) {
-            return this.readLock((ctx) => ctx.get(sql, parameters));
-        }
-        execute(query, params) {
-            return this.writeLock((ctx) => ctx.execute(query, params));
-        }
-        executeRaw(query, params) {
-            return this.writeLock((ctx) => ctx.executeRaw(query, params));
-        }
-        executeBatch(query, params) {
-            return this.writeTransaction((tx) => tx.executeBatch(query, params));
-        }
-    };
+export class DBAdapter extends BaseObserver {
+    readTransaction(fn, options) {
+        return this.readLock((ctx) => TransactionImplementation.runWith(ctx, fn), options);
+    }
+    writeTransaction(fn, options) {
+        return this.writeLock((ctx) => TransactionImplementation.runWith(ctx, fn), options);
+    }
+    getAll(sql, parameters) {
+        return this.readLock((ctx) => ctx.getAll(sql, parameters));
+    }
+    getOptional(sql, parameters) {
+        return this.readLock((ctx) => ctx.getOptional(sql, parameters));
+    }
+    get(sql, parameters) {
+        return this.readLock((ctx) => ctx.get(sql, parameters));
+    }
+    execute(query, params) {
+        return this.writeLock((ctx) => ctx.execute(query, params));
+    }
+    executeRaw(query, params) {
+        return this.writeLock((ctx) => ctx.executeRaw(query, params));
+    }
+    executeBatch(query, params) {
+        return this.writeTransaction((tx) => tx.executeBatch(query, params));
+    }
 }
-class BaseTransaction {
+class TransactionImplementation extends LockContext {
     inner;
     finalized = false;
     constructor(inner) {
+        super();
         this.inner = inner;
     }
     async commit() {
         if (this.finalized) {
-            return { rowsAffected: 0 };
+            return;
         }
         this.finalized = true;
-        return this.inner.execute('COMMIT');
+        await this.inner.execute('COMMIT');
     }
     async rollback() {
         if (this.finalized) {
-            return { rowsAffected: 0 };
+            return;
         }
         this.finalized = true;
-        return this.inner.execute('ROLLBACK');
+        await this.inner.execute('ROLLBACK');
     }
     execute(query, params) {
         return this.inner.execute(query, params);
@@ -121,19 +104,10 @@ class BaseTransaction {
     executeBatch(query, params) {
         return this.inner.executeBatch(query, params);
     }
-}
-class TransactionImplementation extends DBGetUtilsDefaultMixin(BaseTransaction) {
     static async runWith(ctx, fn) {
         let tx = new TransactionImplementation(ctx);
-        // For write transactions, use BEGIN IMMEDIATE to immediately obtain a write lock on the database (instead of doing
-        // that on the first statement). If we have a genuine read-only connection, we also use BEGIN IMMEDIATE there: In
-        // WAL mode, that ensures we pin the current state of the database (instead of the state at the first statement in
-        // the transaction). But if we have a "fake" read-only connection implemented through `pragma query_only = true`, we
-        // can't use this trick because it would attempt to lock the connection. So there, we use a regular `BEGIN`
-        // statement.
-        const useBeginImmediate = ctx.connectionType != 'queryOnly';
         try {
-            await ctx.execute(useBeginImmediate ? 'BEGIN IMMEDIATE' : 'BEGIN');
+            await ctx.execute('BEGIN IMMEDIATE');
             const result = await fn(tx);
             await tx.commit();
             return result;
@@ -150,16 +124,4 @@ class TransactionImplementation extends DBGetUtilsDefaultMixin(BaseTransaction)
         }
     }
 }
-/**
- * @internal
- */
-export function isBatchedUpdateNotification(update) {
-    return 'tables' in update;
-}
-/**
- * @internal
- */
-export function extractTableUpdates(update) {
-    return isBatchedUpdateNotification(update) ? update.tables : [update.table];
-}
 //# sourceMappingURL=DBAdapter.js.map

package/lib/db/DBAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"DBAdapter.js","sourceRoot":"","sources":["../../src/db/DBAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DBAdapter.js","sourceRoot":"","sources":["../../src/db/DBAdapter.ts"],"names":[],"mappings":"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"}

package/lib/db/QueryResult.d.ts

@@ -0,0 +1,104 @@
+/**
+ * A SQLite value, either text, a number, a blob value or null.
+ *
+ * @public
+ */
+export type SqliteValue = string | number | bigint | number[] | Uint8Array | null;
+/**
+ * A record of SQLite values representing a row.
+ *
+ * @public
+ */
+export type SqliteRecord = Record<string, SqliteValue>;
+/**
+ * A representation of query results as JavaScript object.
+ *
+ * @public
+ */
+export interface ResultSet {
+    /**
+     * The amount of rows in the result set.
+     */
+    get length(): number;
+    /**
+     * @deprecated Use {@link QueryResult.array} instead.
+     */
+    get _array(): any[];
+    /**
+     * @deprecated Use {@link QueryResult.array} instead.
+     */
+    item<T>(idx: number): T;
+}
+/**
+ * Shared superinterface for {@link QueryResult} and {@link RawQueryResult}.
+ *
+ * @public
+ */
+export interface BaseQueryResult {
+    /** Represents the auto-generated row id if applicable. */
+    insertId?: number;
+    /**
+     * Number of affected rows reported by SQLite for a write query.
+     *
+     * When using the default client-side [JSON-based view system](https://docs.powersync.com/architecture/client-architecture#client-side-schema-and-sqlite-database-structure),
+     * `rowsAffected` may be `0` for successful `UPDATE` and `DELETE` statements.
+     * Use a `RETURNING` clause and inspect `rows` when you need to confirm which rows changed.
+     */
+    rowsAffected?: number;
+}
+/**
+ * Object returned by SQL Query executions.
+ *
+ * @public
+ */
+export interface QueryResult<T = SqliteRecord> extends BaseQueryResult, Iterable<T, undefined> {
+    /**
+     * If the query returned rows, the result set containing returned values.
+     */
+    rows?: ResultSet;
+    /**
+     * Rows in this result set.
+     */
+    array: T[];
+}
+/**
+ * A raw array-based result set representing rows returned by SQLite.
+ *
+ * @public
+ */
+export interface RawQueryResult extends BaseQueryResult {
+    /**
+     * Names of columns in this result set. Every column has a name, so the length of this array is always equal to the
+     * amount of columns in the result set.
+     *
+     * Note that column names are not necessarily unique, e.g. a `SELECT foo.user, bar.user FROM ...` will have
+     * `['user', 'user']` in this array.
+     */
+    columnNames: string[];
+    /**
+     * Rows in the result set.
+     *
+     * Each row has a length equal to {@link RawQueryResult.columnNames}.
+     */
+    rawRows: SqliteValue[][];
+}
+/**
+ * Creates a query result by mapping raw rows to JavaScript.
+ *
+ * This should not be used with libraries doing this mapping natively, as that is typically more performant.
+ *
+ * @public
+ */
+export declare function queryResultFromRaw<T>(raw: RawQueryResult): QueryResult<T>;
+/**
+ * Creates a query result from rows that have already been mapped to JavaScript.
+ *
+ * @public
+ */
+export declare function queryResultFromMapped<T>(base: BaseQueryResult, rows?: T[]): QueryResult<T>;
+/**
+ * Creates a {@link QueryResult} not containing any rows.
+ *
+ * @public
+ */
+export declare function queryResultWithoutRows(result: BaseQueryResult): QueryResult<never>;

package/lib/db/QueryResult.js

@@ -0,0 +1,96 @@
+function rowToRecord(columnNames, row) {
+    const record = {};
+    columnNames.forEach((name, idx) => (record[name] = row[idx]));
+    return record;
+}
+/**
+ * Creates a query result by mapping raw rows to JavaScript.
+ *
+ * This should not be used with libraries doing this mapping natively, as that is typically more performant.
+ *
+ * @public
+ */
+export function queryResultFromRaw(raw) {
+    const { insertId, rowsAffected, columnNames, rawRows } = raw;
+    let array;
+    function loadAsArray() {
+        if (array)
+            return array;
+        return (array = rawRows.map((row) => rowToRecord(columnNames, row)));
+    }
+    function getRow(idx) {
+        if (array)
+            return array[idx];
+        return rowToRecord(columnNames, rawRows[idx]);
+    }
+    return {
+        insertId,
+        rowsAffected,
+        get array() {
+            return loadAsArray();
+        },
+        rows: {
+            length: rawRows.length,
+            get _array() {
+                return loadAsArray();
+            },
+            item: getRow
+        },
+        [Symbol.iterator]() {
+            let nextIndex = 0;
+            return {
+                next: function () {
+                    if (nextIndex >= rawRows.length) {
+                        return { done: true, value: undefined };
+                    }
+                    const row = getRow(nextIndex);
+                    nextIndex++;
+                    return { done: false, value: row };
+                }
+            };
+        }
+    };
+}
+/**
+ * Creates a query result from rows that have already been mapped to JavaScript.
+ *
+ * @public
+ */
+export function queryResultFromMapped(base, rows) {
+    if (rows == null)
+        return queryResultWithoutRows(base);
+    return {
+        insertId: base.insertId,
+        rowsAffected: base.rowsAffected,
+        array: rows ?? [],
+        rows: {
+            length: rows.length,
+            _array: rows,
+            item(i) {
+                return rows[i];
+            }
+        },
+        [Symbol.iterator]() {
+            return rows[Symbol.iterator]();
+        }
+    };
+}
+/**
+ * Creates a {@link QueryResult} not containing any rows.
+ *
+ * @public
+ */
+export function queryResultWithoutRows(result) {
+    return {
+        ...result,
+        array: [],
+        [Symbol.iterator]() {
+            return {
+                next() {
+                    return { done: true, value: undefined };
+                }
+            };
+        }
+    };
+}
+//# sourceMappingURL=QueryResult.js.map

package/lib/db/QueryResult.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryResult.js","sourceRoot":"","sources":["../../src/db/QueryResult.ts"],"names":[],"mappings":"AA6FA,SAAS,WAAW,CAAI,WAAqB,EAAE,GAAkB;IAC/D,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC9D,OAAO,MAAW,CAAC;AACrB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAAI,GAAmB;IACvD,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;IAC7D,IAAI,KAAwB,CAAC;IAE7B,SAAS,WAAW;QAClB,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QAExB,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,SAAS,MAAM,CAAI,GAAW;QAC5B,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,OAAO,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,OAAO;QACL,QAAQ;QACR,YAAY;QACZ,IAAI,KAAK;YACP,OAAO,WAAW,EAAE,CAAC;QACvB,CAAC;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,IAAI,MAAM;gBACR,OAAO,WAAW,EAAE,CAAC;YACvB,CAAC;YACD,IAAI,EAAE,MAAM;SACO;QACrB,CAAC,MAAM,CAAC,QAAQ,CAAC;YACf,IAAI,SAAS,GAAG,CAAC,CAAC;YAElB,OAAO;gBACL,IAAI,EAAE;oBACJ,IAAI,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;wBAChC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;oBAC1C,CAAC;oBAED,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;oBAC9B,SAAS,EAAE,CAAC;oBACZ,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;gBACrC,CAAC;aACF,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAI,IAAqB,EAAE,IAAU;IACxE,IAAI,IAAI,IAAI,IAAI;QAAE,OAAO,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAEtD,OAAO;QACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,KAAK,EAAE,IAAI,IAAI,EAAE;QACjB,IAAI,EAAE;YACJ,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI;YACZ,IAAI,CAAC,CAAS;gBACZ,OAAO,IAAI,CAAC,CAAC,CAAQ,CAAC;YACxB,CAAC;SACkB;QACrB,CAAC,MAAM,CAAC,QAAQ,CAAC;YACf,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjC,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAAuB;IAC5D,OAAO;QACL,GAAG,MAAM;QACT,KAAK,EAAE,EAAE;QACT,CAAC,MAAM,CAAC,QAAQ,CAAC;YACf,OAAO;gBACL,IAAI;oBACF,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;gBAC1C,CAAC;aACF,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}

package/lib/db/crud/SyncProgress.d.ts

@@ -1,10 +1,3 @@
-import type { BucketProgress } from '../../client/sync/stream/core-instruction.js';
-/** @internal */
-export type InternalProgressInformation = Record<string, BucketProgress>;
-/**
- * @internal The priority used by the core extension to indicate that a full sync was completed.
- */
-export declare const FULL_SYNC_PRIORITY = 2147483647;
 /**
  * Information about a progressing download made by the PowerSync SDK.
  *
@@ -57,12 +50,7 @@ export interface ProgressWithOperations {
  *
  * @public
  */
-export declare class SyncProgress implements ProgressWithOperations {
-    protected internal: InternalProgressInformation;
-    totalOperations: number;
-    downloadedOperations: number;
-    downloadedFraction: number;
-    constructor(internal: InternalProgressInformation);
+export interface SyncProgress extends ProgressWithOperations {
     /**
      * Returns download progress towards all data up until the specified priority being received.
      *

package/lib/db/crud/SyncProgress.js

@@ -1,63 +1,2 @@
-/**
- * @internal The priority used by the core extension to indicate that a full sync was completed.
- */
-export const FULL_SYNC_PRIORITY = 2147483647;
-/**
- * Provides realtime progress on how PowerSync is downloading rows.
- *
- * The progress until the next complete sync is available through the fields on {@link ProgressWithOperations},
- * which this class implements.
- * Additionally, the {@link SyncProgress.untilPriority} method can be used to otbain progress towards
- * a specific priority (instead of the progress for the entire download).
- *
- * The reported progress always reflects the status towards the end of a sync iteration (after
- * which a consistent snapshot of all buckets is available locally).
- *
- * In rare cases (in particular, when a [compacting](https://docs.powersync.com/usage/lifecycle-maintenance/compacting-buckets)
- * operation takes place between syncs), it's possible for the returned numbers to be slightly
- * inaccurate. For this reason, {@link SyncProgress} should be seen as an approximation of progress.
- * The information returned is good enough to build progress bars, but not exact enough to track
- * individual download counts.
- *
- * Also note that data is downloaded in bulk, which means that individual counters are unlikely
- * to be updated one-by-one.
- *
- * @public
- */
-export class SyncProgress {
-    internal;
-    totalOperations;
-    downloadedOperations;
-    downloadedFraction;
-    constructor(internal) {
-        this.internal = internal;
-        const untilCompletion = this.untilPriority(FULL_SYNC_PRIORITY);
-        this.totalOperations = untilCompletion.totalOperations;
-        this.downloadedOperations = untilCompletion.downloadedOperations;
-        this.downloadedFraction = untilCompletion.downloadedFraction;
-    }
-    /**
-     * Returns download progress towards all data up until the specified priority being received.
-     *
-     * The returned {@link ProgressWithOperations} tracks the target amount of operations that need
-     * to be downloaded in total and how many of them have already been received.
-     */
-    untilPriority(priority) {
-        let total = 0;
-        let downloaded = 0;
-        for (const progress of Object.values(this.internal)) {
-            // Include higher-priority buckets, which are represented by lower numbers.
-            if (progress.priority <= priority) {
-                downloaded += progress.since_last;
-                total += progress.target_count - progress.at_last;
-            }
-        }
-        let progress = total == 0 ? 0.0 : downloaded / total;
-        return {
-            totalOperations: total,
-            downloadedOperations: downloaded,
-            downloadedFraction: progress
-        };
-    }
-}
+export {};
 //# sourceMappingURL=SyncProgress.js.map

package/lib/db/crud/SyncProgress.js.map

@@ -1 +1 @@
-{"version":3,"file":"SyncProgress.js","sourceRoot":"","sources":["../../../src/db/crud/SyncProgress.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,UAAU,CAAC;AAkC7C;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,OAAO,YAAY;IAKD;IAJtB,eAAe,CAAS;IACxB,oBAAoB,CAAS;IAC7B,kBAAkB,CAAS;IAE3B,YAAsB,QAAqC;QAArC,aAAQ,GAAR,QAAQ,CAA6B;QACzD,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;QAE/D,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC,eAAe,CAAC;QACvD,IAAI,CAAC,oBAAoB,GAAG,eAAe,CAAC,oBAAoB,CAAC;QACjE,IAAI,CAAC,kBAAkB,GAAG,eAAe,CAAC,kBAAkB,CAAC;IAC/D,CAAC;IAED;;;;;OAKG;IACH,aAAa,CAAC,QAAgB;QAC5B,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpD,2EAA2E;YAC3E,IAAI,QAAQ,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBAClC,UAAU,IAAI,QAAQ,CAAC,UAAU,CAAC;gBAClC,KAAK,IAAI,QAAQ,CAAC,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC;YACpD,CAAC;QACH,CAAC;QAED,IAAI,QAAQ,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,GAAG,KAAK,CAAC;QACrD,OAAO;YACL,eAAe,EAAE,KAAK;YACtB,oBAAoB,EAAE,UAAU;YAChC,kBAAkB,EAAE,QAAQ;SAC7B,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"SyncProgress.js","sourceRoot":"","sources":["../../../src/db/crud/SyncProgress.ts"],"names":[],"mappings":""}