@opendatalabs/personal-server-ts-core 1.35.1 → 1.35.3

package/dist/sync/tombstone-finality.js

@@ -0,0 +1,142 @@
+import { isTombstoneRecord } from "./tombstone.js";
+const PAGE_LIMIT = 1000;
+const MAX_PAGES = 20;
+const SETTLED = new Set(["finalized", "failed"]);
+/**
+ * Tombstone finality read from the gateway's version inventory
+ * (`GET /v1/data/:id/versions`, owner or registered-server signed).
+ *
+ * Only `finalized` counts. The gateway moves a data version
+ * pending → submitting → confirmed → finalized, and can still push a
+ * `confirmed` version back to `pending` on a reorg
+ * (data-gateway `reconcileConfirmedDataPoints`); until a tombstone is
+ * finalized its settlement can fail, the gateway rolls the head back, and
+ * a writer may recover the failed slot.
+ *
+ * While a tombstone at or above the asked version is settling, every call
+ * reads the inventory, so a sync cycle sees finality on its next pass. The
+ * route has no rate limit; a call costs one signed read of at most
+ * `MAX_PAGES` pages.
+ *
+ * When nothing is settling and nothing is finalized (a scope that was never
+ * registered, a rolled-back tombstone, a newer write above it), the scope is
+ * not read again until its recheck time, which doubles from `minRecheckMs`
+ * up to `maxRecheckMs`. Such keys may never become free, so they cost a few
+ * reads an hour, not one per sync cycle. `recheckNow` drops the wait when a
+ * new tombstone is queued. The backoff only delays a deletion, never brings
+ * one forward.
+ */
+export function createInventoryTombstoneFinality(inventory, options = {}) {
+    const now = options.now ?? Date.now;
+    const minRecheck = options.minRecheckMs ?? 60_000;
+    const maxRecheck = options.maxRecheckMs ?? 15 * 60_000;
+    const recheck = new Map();
+    const idle = {
+        finalized: null,
+        settling: false,
+        rolledBack: null,
+    };
+    async function read(scope, from) {
+        let after = (from > 0n ? from - 1n : 0n).toString();
+        let finalized = null;
+        let settling = false;
+        // The highest listed row at or above `from`, and the head as of the last
+        // page (each page is its own snapshot; the last one is the newest).
+        let top = null;
+        let head = null;
+        let complete = false;
+        for (let count = 0; count < MAX_PAGES; count++) {
+            const result = await inventory.page(scope, { after, limit: PAGE_LIMIT });
+            head = result.data.head ?? null;
+            for (const version of result.data.versions) {
+                const value = BigInt(version.expectedVersion);
+                if (value < from)
+                    continue;
+                if (top === null || value > top.version) {
+                    top = {
+                        version: value,
+                        failedTombstone: version.isTombstone && version.status === "failed",
+                    };
+                }
+                if (!version.isTombstone)
+                    continue;
+                if (version.status === "finalized") {
+                    if (finalized === null || value > finalized)
+                        finalized = value;
+                }
+                else if (!SETTLED.has(version.status)) {
+                    settling = true;
+                }
+            }
+            if (!result.pagination.hasMore) {
+                complete = true;
+                break;
+            }
+            const next = result.pagination.nextAfter;
+            if (next === null)
+                break;
+            after = next;
+        }
+        // The head counts as a tombstone row too: a re-submitted delete can take
+        // a slot below the asked version (the gateway rolls back to the latest
+        // non-failed row, which may sit below a failed data row), and its
+        // finality frees the keys at or below it.
+        if (head !== null && (head.deletedAt !== null || isTombstoneRecord(head))) {
+            const value = BigInt(head.expectedVersion);
+            if (head.status === "finalized") {
+                if (finalized === null || value > finalized)
+                    finalized = value;
+            }
+            else if (!SETTLED.has(head.status)) {
+                settling = true;
+            }
+        }
+        // An unfinished traversal can only under-report: keys wait longer, and
+        // it never reports a rollback it did not see to the end.
+        let rolledBack = null;
+        if (complete && !settling && top?.failedTombstone) {
+            const restored = head !== null &&
+                head.deletedAt === null &&
+                !isTombstoneRecord(head) &&
+                BigInt(head.expectedVersion) < top.version
+                ? head
+                : null;
+            if (restored) {
+                rolledBack = {
+                    tombstoneVersion: top.version.toString(),
+                    head: {
+                        expectedVersion: restored.expectedVersion,
+                        dataHash: restored.dataHash,
+                        metadataHash: restored.metadataHash,
+                    },
+                };
+            }
+        }
+        return {
+            finalized: finalized === null ? null : finalized.toString(),
+            settling,
+            rolledBack,
+        };
+    }
+    return {
+        async tombstoneState(scope, atOrAbove) {
+            const waiting = recheck.get(scope);
+            if (waiting && now() < waiting.at)
+                return idle;
+            const state = await read(scope, BigInt(atOrAbove));
+            if (state.finalized !== null || state.settling) {
+                recheck.delete(scope);
+                return state;
+            }
+            const interval = waiting
+                ? Math.min(waiting.interval * 2, maxRecheck)
+                : minRecheck;
+            recheck.set(scope, { at: now() + interval, interval });
+            return state;
+        },
+        recheckNow(scope) {
+            recheck.delete(scope);
+        },
+    };
+}
+//# sourceMappingURL=tombstone-finality.js.map

package/dist/sync/tombstone-finality.js.map

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

package/dist/sync/tombstone-resubmits.d.ts

@@ -0,0 +1,61 @@
+/**
+ * Bounded re-submission of a user's delete whose gateway tombstone failed.
+ *
+ * A tombstone the gateway queued can fail to settle. The gateway then rolls
+ * the head back and reports the scope live again, though the user asked to
+ * delete it. The retry pass re-submits the delete through the ordinary delete
+ * path; this tracker bounds how often. Attempt n waits
+ * `baseDelayMs * 2^(n-2)` after attempt n-1 (the first runs at once), and
+ * after `maxAttempts` failed re-submissions the scope is reported as failed
+ * and left alone until the user deletes it again.
+ *
+ * In memory per sync manager: a restart starts the count again, so the bound
+ * is per boot.
+ */
+export interface TombstoneResubmitState {
+    scope: string;
+    /** Re-submissions made so far (the user's own delete is not counted). */
+    attempts: number;
+    /** The failed tombstone version last seen for the scope. */
+    tombstoneVersion: string;
+    /** ISO time of the last re-submission. */
+    lastAttemptAt: string;
+    /**
+     * Why the delete stopped (failed entries only): every attempt failed, or
+     * the gateway restored a head other than the one the delete replaced, so
+     * it is not re-submitted automatically.
+     */
+    reason?: TombstoneResubmitFailure;
+}
+export type TombstoneResubmitFailure = "attempts-exhausted" | "head-changed";
+export interface TombstoneResubmitSnapshot {
+    /** Scopes with a re-submission in progress or due. */
+    retrying: TombstoneResubmitState[];
+    /** Scopes whose delete did not complete after the last allowed attempt. */
+    failed: Array<TombstoneResubmitState & {
+        failedAt: string;
+    }>;
+}
+export interface TombstoneResubmitTracker {
+    /** Whether another re-submission is allowed now. */
+    due(scope: string): boolean;
+    /** True once the scope has used every attempt and been reported. */
+    exhausted(scope: string): boolean;
+    /** True when the scope has used every attempt but is not reported yet. */
+    outOfAttempts(scope: string): boolean;
+    /** Count one re-submission; returns the attempt number. */
+    recordAttempt(scope: string, tombstoneVersion: string): number;
+    /** Report the scope as failed (the default reason: attempts exhausted). */
+    giveUp(scope: string, tombstoneVersion: string, reason?: TombstoneResubmitFailure): TombstoneResubmitState;
+    /** Forget the scope: the delete converged, or the user deleted it again. */
+    reset(scope: string): void;
+    snapshot(): TombstoneResubmitSnapshot;
+}
+export declare const DEFAULT_TOMBSTONE_RESUBMIT_MAX_ATTEMPTS = 5;
+export declare const DEFAULT_TOMBSTONE_RESUBMIT_BASE_DELAY_MS = 60000;
+export declare function createTombstoneResubmitTracker(options?: {
+    maxAttempts?: number;
+    baseDelayMs?: number;
+    now?: () => number;
+}): TombstoneResubmitTracker;
+//# sourceMappingURL=tombstone-resubmits.d.ts.map

package/dist/sync/tombstone-resubmits.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tombstone-resubmits.d.ts","sourceRoot":"","sources":["../../src/sync/tombstone-resubmits.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,yEAAyE;IACzE,QAAQ,EAAE,MAAM,CAAC;IACjB,4DAA4D;IAC5D,gBAAgB,EAAE,MAAM,CAAC;IACzB,0CAA0C;IAC1C,aAAa,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,MAAM,CAAC,EAAE,wBAAwB,CAAC;CACnC;AAED,MAAM,MAAM,wBAAwB,GAAG,oBAAoB,GAAG,cAAc,CAAC;AAE7E,MAAM,WAAW,yBAAyB;IACxC,sDAAsD;IACtD,QAAQ,EAAE,sBAAsB,EAAE,CAAC;IACnC,2EAA2E;IAC3E,MAAM,EAAE,KAAK,CAAC,sBAAsB,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC9D;AAED,MAAM,WAAW,wBAAwB;IACvC,oDAAoD;IACpD,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAC5B,oEAAoE;IACpE,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAClC,0EAA0E;IAC1E,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IACtC,2DAA2D;IAC3D,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/D,2EAA2E;IAC3E,MAAM,CACJ,KAAK,EAAE,MAAM,EACb,gBAAgB,EAAE,MAAM,EACxB,MAAM,CAAC,EAAE,wBAAwB,GAChC,sBAAsB,CAAC;IAC1B,4EAA4E;IAC5E,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,IAAI,yBAAyB,CAAC;CACvC;AAED,eAAO,MAAM,uCAAuC,IAAI,CAAC;AACzD,eAAO,MAAM,wCAAwC,QAAS,CAAC;AAE/D,wBAAgB,8BAA8B,CAC5C,OAAO,GAAE;IACP,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACf,GACL,wBAAwB,CA8F1B"}

package/dist/sync/tombstone-resubmits.js

@@ -0,0 +1,85 @@
+export const DEFAULT_TOMBSTONE_RESUBMIT_MAX_ATTEMPTS = 5;
+export const DEFAULT_TOMBSTONE_RESUBMIT_BASE_DELAY_MS = 60_000;
+export function createTombstoneResubmitTracker(options = {}) {
+    const maxAttempts = options.maxAttempts ?? DEFAULT_TOMBSTONE_RESUBMIT_MAX_ATTEMPTS;
+    const baseDelayMs = options.baseDelayMs ?? DEFAULT_TOMBSTONE_RESUBMIT_BASE_DELAY_MS;
+    const now = options.now ?? Date.now;
+    const states = new Map();
+    const view = (scope) => {
+        const state = states.get(scope);
+        return state
+            ? {
+                scope,
+                attempts: state.attempts,
+                tombstoneVersion: state.tombstoneVersion,
+                lastAttemptAt: new Date(state.lastAttemptMs).toISOString(),
+                ...(state.reason ? { reason: state.reason } : {}),
+            }
+            : null;
+    };
+    return {
+        due(scope) {
+            const state = states.get(scope);
+            if (!state)
+                return true;
+            if (state.failedAtMs !== null || state.attempts >= maxAttempts)
+                return false;
+            const wait = baseDelayMs * 2 ** (state.attempts - 1);
+            return now() - state.lastAttemptMs >= wait;
+        },
+        exhausted(scope) {
+            return states.get(scope)?.failedAtMs != null;
+        },
+        outOfAttempts(scope) {
+            const state = states.get(scope);
+            return (state !== undefined &&
+                state.failedAtMs === null &&
+                state.attempts >= maxAttempts);
+        },
+        recordAttempt(scope, tombstoneVersion) {
+            const state = states.get(scope);
+            const attempts = (state?.attempts ?? 0) + 1;
+            states.set(scope, {
+                attempts,
+                tombstoneVersion,
+                lastAttemptMs: now(),
+                failedAtMs: null,
+            });
+            return attempts;
+        },
+        giveUp(scope, tombstoneVersion, reason = "attempts-exhausted") {
+            const state = states.get(scope) ?? {
+                attempts: 0,
+                tombstoneVersion,
+                lastAttemptMs: now(),
+                failedAtMs: null,
+            };
+            states.set(scope, {
+                ...state,
+                tombstoneVersion,
+                failedAtMs: now(),
+                reason,
+            });
+            return view(scope);
+        },
+        reset(scope) {
+            states.delete(scope);
+        },
+        snapshot() {
+            const retrying = [];
+            const failed = [];
+            for (const [scope, state] of states) {
+                const entry = view(scope);
+                if (state.failedAtMs === null)
+                    retrying.push(entry);
+                else
+                    failed.push({
+                        ...entry,
+                        failedAt: new Date(state.failedAtMs).toISOString(),
+                    });
+            }
+            return { retrying, failed };
+        },
+    };
+}
+//# sourceMappingURL=tombstone-resubmits.js.map

package/dist/sync/tombstone-resubmits.js.map

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

package/dist/sync/types.d.ts

@@ -1,3 +1,4 @@
+import type { TombstoneResubmitSnapshot } from "./tombstone-resubmits.js";
 /** Sync engine status for GET /v1/sync/status */
 export interface SyncStatus {
     enabled: boolean;
@@ -13,6 +14,13 @@ export interface SyncStatus {
     /** Exact scopes hydrated independently of the registry cursor. */
     hydratedScopes: string[];
     errors: SyncError[];
+    /**
+     * Deletes whose gateway tombstone failed and rolled back (the data is live
+     * again). `retrying`: re-submitted automatically, a new tombstone is due or
+     * settling. `failed`: every allowed re-submission failed; the user must
+     * delete the scope again. Both lists are empty when nothing is owed.
+     */
+    deletions?: TombstoneResubmitSnapshot;
 }
 export interface SyncBlockedReason {
     reason: string;

package/dist/sync/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/sync/types.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,+CAA+C;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,mEAAmE;IACnE,OAAO,EAAE,OAAO,CAAC;IACjB,+EAA+E;IAC/E,OAAO,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACnC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,YAAY,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/sync/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,iDAAiD;AACjD,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,+CAA+C;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,mEAAmE;IACnE,OAAO,EAAE,OAAO,CAAC;IACjB,+EAA+E;IAC/E,OAAO,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACnC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,YAAY,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,yBAAyB,CAAC;CACvC;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB"}

package/dist/sync/workers/delete.d.ts

@@ -1,5 +1,6 @@
 import type { Logger } from "../../logger/index.js";
-import type { DataPointFeedPort, DataStoragePort, DeleteDataPort, PendingBlobDeletion, PendingBlobDeletionStore } from "../../ports/index.js";
+import type { DataPointFeedPort, DataStoragePort, DeleteDataPort, PendingBlobDeletion, PendingBlobDeletionStore, TombstoneFence, TombstoneFinalityPort } from "../../ports/index.js";
+import { type TombstoneResubmitState, type TombstoneResubmitTracker } from "../tombstone-resubmits.js";
 import { type ScopeDeletionTracker } from "../scope-deletions.js";
 /**
  * Exact blob deletes sent per pass. vana-storage allows 30 DELETE requests
@@ -32,6 +33,15 @@ export interface DeleteScopeDeps {
      * expand a marker whose tombstone version was not known.
      */
     dataPointFeed?: DataPointFeedPort;
+    /**
+     * When set, a covered storage key is deleted only once a tombstone at or
+     * above the one that covers it is finalized at the gateway, never on the
+     * tombstone's queue acknowledgement. Until then settlement can fail, the
+     * gateway rolls the head back, and a writer may recover the failed slot: a
+     * key freed earlier could take another writer's bytes under that slot.
+     * Without it keys are deleted as soon as the tombstone is acknowledged.
+     */
+    tombstoneFinality?: TombstoneFinalityPort;
     logger: Logger;
     now?: () => Date;
 }
@@ -125,13 +135,37 @@ export declare function planBlobDeletions(storage: Pick<DataStoragePort, "listVe
  * markers; step 3 does not wait for them because the tombstone already makes
  * the deletion stick.
  *
+ * With `tombstoneFinality` wired, step 2 queues every covered key and sends
+ * only keys whose covering tombstone the gateway reports as finalized. The
+ * gateway acknowledges a tombstone when it queues it; settlement can still
+ * fail, roll the head back and let a writer recover the failed slot with the
+ * ciphertext it uploaded there. A key freed before finality could take a
+ * second writer's bytes, and the recovered registration would then commit to
+ * bytes that are not stored. Reads refuse the scope from step 1 on, so the
+ * wait only keeps owner-encrypted ciphertext in storage until finality.
+ *
  * Not serialised here: the sync manager runs this under the same lock as its
  * upload/download cycles so a delete cannot interleave with an upload of the
  * same scope on this replica (see engine/sync-manager.ts). Uploads racing on
  * another replica are handled by the upload worker's deletion guard and the
  * download worker's reconcile.
  */
-export declare function deleteScope(deps: DeleteScopeDeps, scope: string): Promise<DeleteScopeResult>;
+export interface DeleteScopeOptions {
+    /**
+     * Automatic re-submission of a rolled-back delete: the tombstone is queued
+     * only over exactly this head (the one the failed tombstone replaced), so a
+     * write that landed after the rollback is never deleted.
+     */
+    fence?: {
+        head: TombstoneFence;
+    };
+    /**
+     * False records the storage work but sends no batch in this call; the
+     * caller's own pass already used this cycle's storage budget.
+     */
+    storagePass?: boolean;
+}
+export declare function deleteScope(deps: DeleteScopeDeps, scope: string, options?: DeleteScopeOptions): Promise<DeleteScopeResult>;
 export interface RetryPendingBlobDeletionsResult {
     /** Exact keys finished this pass (deleted, or already absent). */
     completed: PendingBlobDeletion[];
@@ -154,10 +188,25 @@ export interface RetryPendingBlobDeletionsResult {
  * are expanded from the registry first; if the registry shows the scope live
  * again the old tombstone's version is unknowable, so the marker is dropped
  * and the pre-tombstone ciphertext stays (owner-decryptable only) until the
- * next delete of that scope.
+ * next delete of that scope. With `tombstoneFinality` wired, a key is sent
+ * only once a tombstone at or above its gate is finalized; a failed
+ * tombstone's keys stay queued (the deletion did not happen) until a later
+ * deletion of the scope is finalized.
  */
-export declare function retryPendingBlobDeletions(deps: Pick<DeleteScopeDeps, "deleteData" | "pendingBlobDeletions" | "dataPointFeed" | "serverOwner" | "logger"> & {
+export declare const TOMBSTONE_RESUBMIT_MAX_ATTEMPTS = 5;
+export type RetryPendingBlobDeletionsDeps = Pick<DeleteScopeDeps, "deleteData" | "pendingBlobDeletions" | "dataPointFeed" | "serverOwner" | "tombstoneFinality" | "logger"> & {
     /** Local index, for expanding unexpanded markers into exact keys. */
     storage?: Pick<DataStoragePort, "listVersions">;
-}): Promise<RetryPendingBlobDeletionsResult>;
+    /**
+     * Re-submits the user's delete of a scope whose tombstone failed, through
+     * the ordinary delete path. The caller runs it inside the same mutation
+     * queue as this pass.
+     */
+    resubmitDeletion?: (scope: string, options: DeleteScopeOptions) => Promise<DeleteScopeResult>;
+    /** Bounds the re-submissions; required with `resubmitDeletion`. */
+    tombstoneResubmits?: TombstoneResubmitTracker;
+    /** Called once when a scope's re-submissions are used up. */
+    onDeletionAbandoned?: (state: TombstoneResubmitState) => void;
+};
+export declare function retryPendingBlobDeletions(deps: RetryPendingBlobDeletionsDeps): Promise<RetryPendingBlobDeletionsResult>;
 //# sourceMappingURL=delete.d.ts.map

package/dist/sync/workers/delete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../src/sync/workers/delete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,KAAK,EACV,iBAAiB,EAEjB,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAIL,KAAK,oBAAoB,EAC1B,MAAM,uBAAuB,CAAC;AAE/B;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,eAAe,CAAC;IACzB,yEAAyE;IACzE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,UAAU,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IACnC,oEAAoE;IACpE,oBAAoB,CAAC,EAAE,wBAAwB,CAAC;IAChD;;;OAGG;IACH,cAAc,CAAC,EAAE,oBAAoB,CAAC;IACtC;;;;OAIG;IACH,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAClB;AAED,MAAM,MAAM,gBAAgB,GAAG,IAAI,GAAG,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;AAExE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,gBAAgB,CAAC;IACzB,yEAAyE;IACzE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6CAA6C;IAC7C,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,iFAAiF;IACjF,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;;;OAIG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE;QACL,OAAO,EAAE,eAAe,GAAG;YACzB,yEAAyE;YACzE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;YACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;SAC3B,CAAC;QACF;;;;;WAKG;QACH,OAAO,EAAE,eAAe,GAAG;YACzB,YAAY,CAAC,EAAE,MAAM,CAAC;YACtB,YAAY,CAAC,EAAE,MAAM,CAAC;YACtB,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,KAAK,EAAE,eAAe,GAAG;YAAE,YAAY,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KACpD,CAAC;IACF;;;OAGG;IACH,mBAAmB,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;;;;;;OAOG;IACH,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAC5C;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,EAC9C,KAAK,EAAE,MAAM,EACb,qBAAqB,EAAE,MAAM,GAAG,IAAI,GACnC,gBAAgB,CAqBlB;AAgHD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,iBAAiB,CAAC,CAuK5B;AA+QD,MAAM,WAAW,+BAA+B;IAC9C,kEAAkE;IAClE,SAAS,EAAE,mBAAmB,EAAE,CAAC;IACjC,kEAAkE;IAClE,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACxE,kEAAkE;IAClE,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,CACR,eAAe,EACb,YAAY,GACZ,sBAAsB,GACtB,eAAe,GACf,aAAa,GACb,QAAQ,CACX,GAAG;IACF,qEAAqE;IACrE,OAAO,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;CACjD,GACA,OAAO,CAAC,+BAA+B,CAAC,CAsG1C"}
+{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../src/sync/workers/delete.ts"],"names":[],"mappings":"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"}