@interop/was-react 0.8.2 → 0.9.0

package/dist/sync/feedMasterPort.js

@@ -1,3 +1,4 @@
+import { copyOptionalBodyFields } from './types.js';
 // A generous page cap so a pathological feed cannot spin forever; conflicts are
 // rare and the dev/e2e feed is small, so a full scan is acceptable.
 const MAX_PAGES = 50;
@@ -11,22 +12,71 @@ function toMasterState(doc) {
         updatedAt: doc.updatedAt,
         deleted: doc._deleted
     };
-    if (doc.data !== undefined) {
-        master.data = doc.data;
-    }
-    if (doc.metaVersion !== undefined) {
-        master.metaVersion = doc.metaVersion;
-    }
-    if (doc.custom !== undefined) {
-        master.custom = doc.custom;
-    }
+    copyOptionalBodyFields({ source: doc, target: master });
     return master;
 }
+/**
+ * Walks the changes feed from its origin looking for one resource, memoizing
+ * every document it pages past when the caller supplied a batch `cache`.
+ *
+ * @param options {object}
+ * @param options.base {WasSyncBasePort}
+ * @param options.id {string}
+ * @param [options.cache] {MasterReadCache}
+ * @returns {Promise<MasterState | null>}
+ */
+async function walkFeedFor({ base, id, cache }) {
+    let checkpoint;
+    for (let page = 0; page < MAX_PAGES; page++) {
+        const { documents, checkpoint: next } = await base.query({
+            ...(checkpoint !== undefined && { checkpoint }),
+            limit: PAGE_SIZE
+        });
+        const byId = new Map(documents.map(doc => [doc.id, doc]));
+        if (cache !== undefined) {
+            for (const [docId, doc] of byId) {
+                cache.byId.set(docId, toMasterState(doc));
+            }
+        }
+        const found = byId.get(id);
+        if (found) {
+            return toMasterState(found);
+        }
+        // Reached the end of the feed without finding it: the resource is
+        // genuinely absent (a delete/delete race), so report `null` and let the
+        // conflict assembler synthesize a tombstone. Only THIS id is memoized as
+        // absent, never "every id this completed walk did not see": a row of the
+        // same batch may have created its resource after this walk read the feed,
+        // and answering `null` for it would fabricate a tombstone and drop a live
+        // payload -- exactly what the scan-budget throw below guards against.
+        if (next === null || documents.length === 0) {
+            cache?.byId.set(id, null);
+            return null;
+        }
+        checkpoint = next;
+    }
+    // The page budget ran out before the feed's end. The feed is keyset-ordered
+    // ascending on `updatedAt`, so a just-conflicted resource sits at the tail --
+    // the least-reachable position -- and may well be past the cap. Reporting
+    // `null` here would fabricate a false tombstone in the conflict assembler and
+    // drop the winner's payload. Throw instead: RxDB treats a thrown push-handler
+    // error as retryable, so the whole replication cycle retries rather than
+    // diverging.
+    throw new Error(`Feed master re-read for resource "${id}" exhausted its ` +
+        `${MAX_PAGES}-page scan budget without reaching the end of the ` +
+        `changes feed; retrying.`);
+}
 /**
  * Wraps a base port with a `get` that resolves the master state from the changes
  * feed. `query`, `putContent`, `deleteContent`, and `putMeta` pass straight
  * through.
  *
+ * A walk starts at the feed's origin, so resolving one resource pages past many
+ * others. With a per-push-batch `cache` the walk memoizes every one of them, and
+ * a row that finds a walk already running waits for it rather than starting a
+ * second -- so a batch of k conflicting rows costs one feed scan instead of k
+ * concurrent ones. Without a `cache` the behavior is exactly as before.
+ *
  * @param base {WasSyncBasePort}
  * @returns {WasSyncPort}
  */
@@ -36,35 +86,30 @@ export function withFeedMasterRead(base) {
         putContent: base.putContent.bind(base),
         deleteContent: base.deleteContent.bind(base),
         putMeta: base.putMeta.bind(base),
-        async get({ id }) {
-            let checkpoint;
-            for (let page = 0; page < MAX_PAGES; page++) {
-                const { documents, checkpoint: next } = await base.query({
-                    ...(checkpoint !== undefined && { checkpoint }),
-                    limit: PAGE_SIZE
-                });
-                const found = documents.find(doc => doc.id === id);
-                if (found) {
-                    return toMasterState(found);
-                }
-                // Reached the end of the feed without finding it: the resource is
-                // genuinely absent (a delete/delete race), so report `null` and let the
-                // conflict assembler synthesize a tombstone.
-                if (next === null || documents.length === 0) {
-                    return null;
-                }
-                checkpoint = next;
+        async get({ id, cache }) {
+            if (cache === undefined) {
+                return walkFeedFor({ base, id });
+            }
+            // Wait out whatever walk this batch already has running -- it pages past
+            // every resource, so it may well answer this read -- then re-check the
+            // memo. Looped because the walk we waited for can be followed by another.
+            while (cache.inFlight !== null) {
+                await cache.inFlight;
+            }
+            const memoized = cache.byId.get(id);
+            if (memoized !== undefined) {
+                return memoized;
             }
-            // The page budget ran out before the feed's end. The feed is keyset-
-            // ordered ascending on `updatedAt`, so a just-conflicted resource sits at
-            // the tail -- the least-reachable position -- and may well be past the
-            // cap. Reporting `null` here would fabricate a false tombstone in the
-            // conflict assembler and drop the winner's payload. Throw instead: RxDB
-            // treats a thrown push-handler error as retryable, so the whole
-            // replication cycle retries rather than diverging.
-            throw new Error(`Feed master re-read for resource "${id}" exhausted its ` +
-                `${MAX_PAGES}-page scan budget without reaching the end of the ` +
-                `changes feed; retrying.`);
+            // Publish this walk for the batch's other rows. Nothing above awaits
+            // between the memo miss and here, so two rows can never both get past it.
+            // The published promise SETTLES either way: a walk that threw is this
+            // row's error to propagate, not a waiting row's.
+            const walk = walkFeedFor({ base, id, cache });
+            const clear = () => {
+                cache.inFlight = null;
+            };
+            cache.inFlight = walk.then(clear, clear);
+            return walk;
         }
     };
 }

package/dist/sync/feedMasterPort.js.map

@@ -1 +1 @@
-{"version":3,"file":"feedMasterPort.js","sourceRoot":"","sources":["../../src/sync/feedMasterPort.ts"],"names":[],"mappings":"AA8BA,gFAAgF;AAChF,oEAAoE;AACpE,MAAM,SAAS,GAAG,EAAE,CAAA;AACpB,MAAM,SAAS,GAAG,GAAG,CAAA;AAErB;;GAEG;AACH,SAAS,aAAa,CAAC,GAAY;IACjC,MAAM,MAAM,GAAgB;QAC1B,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,OAAO,EAAE,GAAG,CAAC,QAAQ;KACtB,CAAA;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,IAAI,GAAG,GAAG,CAAC,IAAY,CAAA;IAChC,CAAC;IACD,IAAI,GAAG,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAClC,MAAM,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,CAAA;IACtC,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,MAAc,CAAA;IACpC,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAqB;IACtD,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5B,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;QACtC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;QAChC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE;YACd,IAAI,UAAsC,CAAA;YAC1C,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC;gBAC5C,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;oBACvD,GAAG,CAAC,UAAU,KAAK,SAAS,IAAI,EAAE,UAAU,EAAE,CAAC;oBAC/C,KAAK,EAAE,SAAS;iBACjB,CAAC,CAAA;gBACF,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAClD,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,aAAa,CAAC,KAAK,CAAC,CAAA;gBAC7B,CAAC;gBACD,kEAAkE;gBAClE,wEAAwE;gBACxE,6CAA6C;gBAC7C,IAAI,IAAI,KAAK,IAAI,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC5C,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,UAAU,GAAG,IAAI,CAAA;YACnB,CAAC;YACD,qEAAqE;YACrE,0EAA0E;YAC1E,uEAAuE;YACvE,sEAAsE;YACtE,wEAAwE;YACxE,gEAAgE;YAChE,mDAAmD;YACnD,MAAM,IAAI,KAAK,CACb,qCAAqC,EAAE,kBAAkB;gBACvD,GAAG,SAAS,oDAAoD;gBAChE,yBAAyB,CAC5B,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"feedMasterPort.js","sourceRoot":"","sources":["../../src/sync/feedMasterPort.ts"],"names":[],"mappings":"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"}

package/dist/sync/index.d.ts

@@ -11,11 +11,12 @@
 export { createWasReplication } from './wasReplication.js';
 export { syncedDocSchema } from './syncedDocSchema.js';
 export { createPullHandler, wireDocToRxDoc } from './changesQuery.js';
-export { createPushHandler, formatEtag, type PushWriteAck } from './pushWrites.js';
-export { WasSyncConflictError, WasSyncAuthError, type Json, type SyncCheckpoint, type WireDoc, type SyncedDoc, type MasterState, type WasSyncBasePort, type WasSyncPort } from './types.js';
-export { createWasSyncPort, errorStatus, errorMessage } from './wasSyncPort.js';
+export { createPushHandler, type PushWriteAck } from './pushWrites.js';
+export { WasSyncConflictError, WasSyncAuthError, type Json, type SyncCheckpoint, type WireDoc, type SyncedDoc, type MasterState, type MasterReadCache, type WasSyncBasePort, type WasSyncPort } from './types.js';
+export { createWasSyncPort, errorMessage } from './wasSyncPort.js';
 export { withFeedMasterRead } from './feedMasterPort.js';
-export { createDocCipher, createPlaintextDocCodec, isEncryptedEnvelope, type DocCipher } from './docCipher.js';
+export { createDocCipher, createPlaintextDocCodec, isUnknownEpochError, type DocCipher } from './docCipher.js';
 export { makeLwwConflictHandler } from './lwwConflictHandler.js';
-export { lwwFields, remotePayloadWins } from './lww.js';
+export { lwwFields, remotePayloadWins, type LwwFields } from './lww.js';
+export { errorStatus, formatEtag, isEncryptedEnvelope } from '@interop/was-client/sync';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;GAMG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EACL,iBAAiB,EACjB,UAAU,EACV,KAAK,YAAY,EAClB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,KAAK,IAAI,EACT,KAAK,cAAc,EACnB,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,WAAW,EACjB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EACL,eAAe,EACf,uBAAuB,EACvB,mBAAmB,EACnB,KAAK,SAAS,EACf,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;GAMG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAA;AACtE,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,KAAK,IAAI,EACT,KAAK,cAAc,EACnB,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,WAAW,EACjB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EACL,eAAe,EACf,uBAAuB,EACvB,mBAAmB,EACnB,KAAK,SAAS,EACf,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,KAAK,SAAS,EAAE,MAAM,UAAU,CAAA;AAGvE,OAAO,EACL,WAAW,EACX,UAAU,EACV,mBAAmB,EACpB,MAAM,0BAA0B,CAAA"}

package/dist/sync/index.js

@@ -11,11 +11,14 @@
 export { createWasReplication } from './wasReplication.js';
 export { syncedDocSchema } from './syncedDocSchema.js';
 export { createPullHandler, wireDocToRxDoc } from './changesQuery.js';
-export { createPushHandler, formatEtag } from './pushWrites.js';
+export { createPushHandler } from './pushWrites.js';
 export { WasSyncConflictError, WasSyncAuthError } from './types.js';
-export { createWasSyncPort, errorStatus, errorMessage } from './wasSyncPort.js';
+export { createWasSyncPort, errorMessage } from './wasSyncPort.js';
 export { withFeedMasterRead } from './feedMasterPort.js';
-export { createDocCipher, createPlaintextDocCodec, isEncryptedEnvelope } from './docCipher.js';
+export { createDocCipher, createPlaintextDocCodec, isUnknownEpochError } from './docCipher.js';
 export { makeLwwConflictHandler } from './lwwConflictHandler.js';
 export { lwwFields, remotePayloadWins } from './lww.js';
+// Owned by the client's sync subpath and re-exported verbatim, so the names this
+// package's consumers already import stay put.
+export { errorStatus, formatEtag, isEncryptedEnvelope } from '@interop/was-client/sync';
 //# sourceMappingURL=index.js.map

package/dist/sync/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;GAMG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EACL,iBAAiB,EACjB,UAAU,EAEX,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAQjB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EACL,eAAe,EACf,uBAAuB,EACvB,mBAAmB,EAEpB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;GAMG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAqB,MAAM,iBAAiB,CAAA;AACtE,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EASjB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EACL,eAAe,EACf,uBAAuB,EACvB,mBAAmB,EAEpB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAkB,MAAM,UAAU,CAAA;AACvE,iFAAiF;AACjF,+CAA+C;AAC/C,OAAO,EACL,WAAW,EACX,UAAU,EACV,mBAAmB,EACpB,MAAM,0BAA0B,CAAA"}

package/dist/sync/lww.d.ts

@@ -6,36 +6,45 @@
  * storage imports -- so both replicas run this identical rule against the same
  * two payloads and converge on the same winner with no coordination.
  *
- * `updatedAt` (an ISO-8601 string, so lexical compare == chronological compare)
- * decides; `clientId` breaks an exact tie deterministically. Both fields live in
+ * `updatedAt` (an ISO-8601 string) decides, compared CHRONOLOGICALLY (parsed to
+ * epoch ms, never lexically -- `updatedAt` is app-owned, so mixed precision like
+ * `...05Z` vs `...05.400Z`, or a `+00:00` offset, must still order by instant);
+ * `clientId` breaks an exact-instant tie deterministically. Both fields live in
  * the payload (never the envelope-level checkpoint `updatedAt`).
  */
+/**
+ * The two fields the last-write-wins rule reads off a payload: the app-owned
+ * ISO-8601 edit stamp and the writing client's id (the exact-instant
+ * tiebreaker). Read off a doc with {@link lwwFields}; compared with
+ * {@link remotePayloadWins}.
+ */
+export interface LwwFields {
+    updatedAt: string;
+    clientId: string;
+}
 /**
  * Whether the remote payload wins over the local one under last-write-wins.
- * Later `updatedAt` wins; on an exact `updatedAt` tie the lexically greater
- * `clientId` wins (an arbitrary but deterministic, replica-independent choice).
+ * The chronologically later `updatedAt` wins; on an exact-instant tie the
+ * lexically greater `clientId` wins (an arbitrary but deterministic,
+ * replica-independent choice).
+ *
+ * Unparseable `updatedAt` values are rejected as losers: a side whose stamp
+ * does not parse loses to one whose stamp does (a replica-independent rule, so
+ * every device converges on the same winner). When neither side parses, the
+ * lexical compare of the raw strings is the deterministic fallback.
  *
- * @param remote {{ updatedAt: string; clientId: string }}
- * @param local {{ updatedAt: string; clientId: string }}
+ * @param remote {LwwFields}
+ * @param local {LwwFields}
  * @returns {boolean}   true if the remote payload should replace the local one
  */
-export declare function remotePayloadWins(remote: {
-    updatedAt: string;
-    clientId: string;
-}, local: {
-    updatedAt: string;
-    clientId: string;
-}): boolean;
+export declare function remotePayloadWins(remote: LwwFields, local: LwwFields): boolean;
 /**
  * Reads the LWW fields off a doc when it carries them. Storage payloads are
  * generic over `{ id: string }`, so docs without `updatedAt`/`clientId` are
  * legal; callers fall back to their own rule for those.
  *
  * @param doc {unknown}
- * @returns {{ updatedAt: string, clientId: string } | null}
+ * @returns {LwwFields | null}
  */
-export declare function lwwFields(doc: unknown): {
-    updatedAt: string;
-    clientId: string;
-} | null;
+export declare function lwwFields(doc: unknown): LwwFields | null;
 //# sourceMappingURL=lww.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"lww.d.ts","sourceRoot":"","sources":["../../src/sync/lww.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;GAQG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAC/C,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC7C,OAAO,CAKT;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CACvB,GAAG,EAAE,OAAO,GACX;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAQhD"}
+{"version":3,"file":"lww.d.ts","sourceRoot":"","sources":["../../src/sync/lww.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;GAUG;AAEH;;;;;GAKG;AACH,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAUD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,SAAS,GACf,OAAO,CAeT;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,CAQxD"}

package/dist/sync/lww.js

@@ -6,21 +6,48 @@
  * storage imports -- so both replicas run this identical rule against the same
  * two payloads and converge on the same winner with no coordination.
  *
- * `updatedAt` (an ISO-8601 string, so lexical compare == chronological compare)
- * decides; `clientId` breaks an exact tie deterministically. Both fields live in
+ * `updatedAt` (an ISO-8601 string) decides, compared CHRONOLOGICALLY (parsed to
+ * epoch ms, never lexically -- `updatedAt` is app-owned, so mixed precision like
+ * `...05Z` vs `...05.400Z`, or a `+00:00` offset, must still order by instant);
+ * `clientId` breaks an exact-instant tie deterministically. Both fields live in
  * the payload (never the envelope-level checkpoint `updatedAt`).
  */
+/**
+ * Parses an ISO-8601 `updatedAt` into epoch ms, or `null` when unparseable.
+ */
+function parseInstant(updatedAt) {
+    const ms = Date.parse(updatedAt);
+    return Number.isNaN(ms) ? null : ms;
+}
 /**
  * Whether the remote payload wins over the local one under last-write-wins.
- * Later `updatedAt` wins; on an exact `updatedAt` tie the lexically greater
- * `clientId` wins (an arbitrary but deterministic, replica-independent choice).
+ * The chronologically later `updatedAt` wins; on an exact-instant tie the
+ * lexically greater `clientId` wins (an arbitrary but deterministic,
+ * replica-independent choice).
  *
- * @param remote {{ updatedAt: string; clientId: string }}
- * @param local {{ updatedAt: string; clientId: string }}
+ * Unparseable `updatedAt` values are rejected as losers: a side whose stamp
+ * does not parse loses to one whose stamp does (a replica-independent rule, so
+ * every device converges on the same winner). When neither side parses, the
+ * lexical compare of the raw strings is the deterministic fallback.
+ *
+ * @param remote {LwwFields}
+ * @param local {LwwFields}
  * @returns {boolean}   true if the remote payload should replace the local one
  */
 export function remotePayloadWins(remote, local) {
-    if (remote.updatedAt !== local.updatedAt) {
+    const remoteMs = parseInstant(remote.updatedAt);
+    const localMs = parseInstant(local.updatedAt);
+    if (remoteMs !== null && localMs !== null) {
+        if (remoteMs !== localMs) {
+            return remoteMs > localMs;
+        }
+    }
+    else if (remoteMs !== null || localMs !== null) {
+        // Exactly one side parses: the parseable stamp wins.
+        return remoteMs !== null;
+    }
+    else if (remote.updatedAt !== local.updatedAt) {
+        // Neither parses: fall back to the deterministic lexical compare.
         return remote.updatedAt > local.updatedAt;
     }
     return remote.clientId > local.clientId;
@@ -31,7 +58,7 @@ export function remotePayloadWins(remote, local) {
  * legal; callers fall back to their own rule for those.
  *
  * @param doc {unknown}
- * @returns {{ updatedAt: string, clientId: string } | null}
+ * @returns {LwwFields | null}
  */
 export function lwwFields(doc) {
     const { updatedAt, clientId } = doc;

package/dist/sync/lww.js.map

@@ -1 +1 @@
-{"version":3,"file":"lww.js","sourceRoot":"","sources":["../../src/sync/lww.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;GAQG;AAEH;;;;;;;;GAQG;AACH,MAAM,UAAU,iBAAiB,CAC/B,MAA+C,EAC/C,KAA8C;IAE9C,IAAI,MAAM,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAA;IAC3C,CAAC;IACD,OAAO,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;AACzC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,SAAS,CACvB,GAAY;IAEZ,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,GAG/B,CAAA;IACD,OAAO,OAAO,SAAS,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ;QAClE,CAAC,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE;QACzB,CAAC,CAAC,IAAI,CAAA;AACV,CAAC"}
+{"version":3,"file":"lww.js","sourceRoot":"","sources":["../../src/sync/lww.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;GAUG;AAaH;;GAEG;AACH,SAAS,YAAY,CAAC,SAAiB;IACrC,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAChC,OAAO,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAA;AACrC,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,iBAAiB,CAC/B,MAAiB,EACjB,KAAgB;IAEhB,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IAC/C,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAC7C,IAAI,QAAQ,KAAK,IAAI,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QAC1C,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACzB,OAAO,QAAQ,GAAG,OAAO,CAAA;QAC3B,CAAC;IACH,CAAC;SAAM,IAAI,QAAQ,KAAK,IAAI,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACjD,qDAAqD;QACrD,OAAO,QAAQ,KAAK,IAAI,CAAA;IAC1B,CAAC;SAAM,IAAI,MAAM,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,EAAE,CAAC;QAChD,kEAAkE;QAClE,OAAO,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAA;IAC3C,CAAC;IACD,OAAO,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;AACzC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,SAAS,CAAC,GAAY;IACpC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,GAG/B,CAAA;IACD,OAAO,OAAO,SAAS,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ;QAClE,CAAC,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE;QACzB,CAAC,CAAC,IAAI,CAAA;AACV,CAAC"}

package/dist/sync/lwwConflictHandler.d.ts

@@ -41,36 +41,38 @@
  *    Without this rule the equal-`data` case would fall through to rule 3, where
  *    the two payloads compare equal and the tie keeps the local (stale) `custom`,
  *    silently clobbering the committed metadata.
- * 3. Both sides carry an LWW payload: pure payload LWW via `payloadWins`.
- * 4. A live local edit vs an incomparable remote (e.g. a remote tombstone):
+ * 3. An UNDECRYPTABLE side (the decrypt threw -- e.g. an envelope written under
+ *    a key epoch this device has not seen) is never scored as the loser: it is
+ *    presumed newer, not absent. An undecryptable master is adopted (never
+ *    re-pushed over with the possibly-older local payload); an undecryptable
+ *    local row is re-asserted (the user's edit is not silently dropped); both
+ *    undecryptable adopts the master (deterministic and convergent). Each case
+ *    is logged -- distinguishable from the intended tombstone/absent-body
+ *    `null` the remaining rules were written for.
+ * 4. Both sides carry an LWW payload: pure payload LWW via `payloadWins`.
+ * 5. A live local edit vs an incomparable remote (e.g. a remote tombstone):
  *    the edit wins and is re-pushed (resurrection).
- * 5. Everything else -- a local tombstone vs a REAL remote content change, or
- *    both sides incomparable: the master wins. Together with rule 4 this makes
+ * 6. Everything else -- a local tombstone vs a REAL remote content change, or
+ *    both sides incomparable: the master wins. Together with rule 5 this makes
  *    the delete-vs-concurrent-edit rule "the edit wins" on every replica: a
  *    tombstone carries no LWW payload of its own, so a genuine racing edit
  *    deterministically survives, whichever write reached the server first.
  */
 import type { WithDeleted } from 'rxdb/plugins/core';
 import type { Json, SyncedDoc } from './types.js';
-/**
- * The LWW fields read out of a decrypted entity payload.
- */
-interface LwwPayload {
-    updatedAt: string;
-    clientId: string;
-}
+import { type LwwFields } from './lww.js';
 /**
  * Builds an RxDB conflict handler that settles content conflicts by payload LWW,
  * decrypting through the supplied per-collection `decrypt`.
  *
  * @param decrypt {(envelope: Json) => Promise<Json>}   this collection's decrypt
- * @param [payloadWins] {(remote: LwwPayload, local: LwwPayload) => boolean}
+ * @param [payloadWins] {(remote: LwwFields, local: LwwFields) => boolean}
  *   the total-order comparator deciding whether the remote payload replaces the
  *   local one; defaults to {@link remotePayloadWins} (later `updatedAt` wins,
  *   `clientId` breaks a tie)
  * @returns {import('rxdb/plugins/core').RxConflictHandler<SyncedDoc>}
  */
-export declare function makeLwwConflictHandler(decrypt: (envelope: Json) => Promise<Json>, payloadWins?: (remote: LwwPayload, local: LwwPayload) => boolean): {
+export declare function makeLwwConflictHandler(decrypt: (envelope: Json) => Promise<Json>, payloadWins?: (remote: LwwFields, local: LwwFields) => boolean): {
     isEqual(a: WithDeleted<SyncedDoc>, b: WithDeleted<SyncedDoc>): boolean;
     resolve({ realMasterState, newDocumentState, assumedMasterState }: {
         realMasterState: WithDeleted<SyncedDoc>;
@@ -78,5 +80,4 @@ export declare function makeLwwConflictHandler(decrypt: (envelope: Json) => Prom
         assumedMasterState?: WithDeleted<SyncedDoc>;
     }): Promise<WithDeleted<SyncedDoc>>;
 };
-export {};
 //# sourceMappingURL=lwwConflictHandler.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"lwwConflictHandler.d.ts","sourceRoot":"","sources":["../../src/sync/lwwConflictHandler.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAGjD;;GAEG;AACH,UAAU,UAAU;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAmCD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,CAAC,QAAQ,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,EAC1C,WAAW,GAAE,CACX,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,UAAU,KACd,OAA2B;eAQnB,WAAW,CAAC,SAAS,CAAC,KAAK,WAAW,CAAC,SAAS,CAAC,GAAG,OAAO;uEAcnE;QACD,eAAe,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;QACvC,gBAAgB,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;QACxC,kBAAkB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;KAC5C,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;EAoDtC"}
+{"version":3,"file":"lwwConflictHandler.d.ts","sourceRoot":"","sources":["../../src/sync/lwwConflictHandler.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEjD,OAAO,EAAgC,KAAK,SAAS,EAAE,MAAM,UAAU,CAAA;AAoCvE;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,CAAC,QAAQ,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,EAC1C,WAAW,GAAE,CACX,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,SAAS,KACb,OAA2B;eAQnB,WAAW,CAAC,SAAS,CAAC,KAAK,WAAW,CAAC,SAAS,CAAC,GAAG,OAAO;uEAcnE;QACD,eAAe,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;QACvC,gBAAgB,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;QACxC,kBAAkB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;KAC5C,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;EAiFtC"}

package/dist/sync/lwwConflictHandler.js

@@ -1,29 +1,20 @@
-import { remotePayloadWins } from './lww.js';
+import { bodiesEqual } from './types.js';
+import { lwwFields, remotePayloadWins } from './lww.js';
 /**
- * Structural equality of two opaque bodies (used for the fast `isEqual`).
- */
-function bodiesEqual(a, b) {
-    return JSON.stringify(a ?? null) === JSON.stringify(b ?? null);
-}
-/**
- * Decrypts one side's envelope into its `{ updatedAt, clientId }`, or `null`
- * when the side has no decryptable payload (a tombstone, or an absent/corrupt
- * body). `null` means "no comparable timestamp", handled by the caller.
+ * Decrypts one side's envelope into its LWW comparability (see {@link LwwSide}).
+ * A payload carrying no LWW stamp reads as `none`, the same as a tombstone or an
+ * absent body: nothing there to compare.
  */
 async function lwwFieldsOf(doc, decrypt) {
     if (doc._deleted || doc.data === undefined) {
-        return null;
+        return { kind: 'none' };
     }
     try {
-        const payload = (await decrypt(doc.data));
-        if (typeof payload.updatedAt === 'string' &&
-            typeof payload.clientId === 'string') {
-            return { updatedAt: payload.updatedAt, clientId: payload.clientId };
-        }
-        return null;
+        const payload = lwwFields(await decrypt(doc.data));
+        return payload === null ? { kind: 'none' } : { kind: 'payload', payload };
     }
-    catch {
-        return null;
+    catch (err) {
+        return { kind: 'undecryptable', err };
     }
 }
 /**
@@ -31,7 +22,7 @@ async function lwwFieldsOf(doc, decrypt) {
  * decrypting through the supplied per-collection `decrypt`.
  *
  * @param decrypt {(envelope: Json) => Promise<Json>}   this collection's decrypt
- * @param [payloadWins] {(remote: LwwPayload, local: LwwPayload) => boolean}
+ * @param [payloadWins] {(remote: LwwFields, local: LwwFields) => boolean}
  *   the total-order comparator deciding whether the remote payload replaces the
  *   local one; defaults to {@link remotePayloadWins} (later `updatedAt` wins,
  *   `clientId` breaks a tie)
@@ -83,16 +74,36 @@ export function makeLwwConflictHandler(decrypt, payloadWins = remotePayloadWins)
                 lwwFieldsOf(realMasterState, decrypt),
                 lwwFieldsOf(newDocumentState, decrypt)
             ]);
-            // Rule 3 -- both sides comparable: pure payload LWW.
-            if (remote && local) {
-                return payloadWins(remote, local) ? realMasterState : newDocumentState;
+            // Rule 3 -- an undecryptable side is never scored as the loser: it is
+            // presumed newer (typically an envelope under an unseen key epoch), not
+            // absent. Logged so it is distinguishable from a genuine tombstone.
+            if (remote.kind === 'undecryptable' || local.kind === 'undecryptable') {
+                if (remote.kind === 'undecryptable' && local.kind !== 'undecryptable') {
+                    console.warn('LWW conflict: the remote master did not decrypt; adopting it ' +
+                        'rather than re-pushing the local payload over it.', remote.err);
+                    return realMasterState;
+                }
+                if (local.kind === 'undecryptable' && remote.kind !== 'undecryptable') {
+                    console.warn('LWW conflict: the local row did not decrypt; re-asserting it ' +
+                        'rather than dropping the local edit for the master.', local.err);
+                    return newDocumentState;
+                }
+                console.warn('LWW conflict: neither side decrypted; adopting the master ' +
+                    '(deterministic and convergent).', remote.kind === 'undecryptable' ? remote.err : undefined);
+                return realMasterState;
+            }
+            // Rule 4 -- both sides comparable: pure payload LWW.
+            if (remote.kind === 'payload' && local.kind === 'payload') {
+                return payloadWins(remote.payload, local.payload)
+                    ? realMasterState
+                    : newDocumentState;
             }
-            // Rule 4 -- a live local edit against a remote tombstone (or otherwise
+            // Rule 5 -- a live local edit against a remote tombstone (or otherwise
             // incomparable remote): keep the edit (resurrect / re-assert the write).
-            if (local && !remote) {
+            if (local.kind === 'payload' && remote.kind === 'none') {
                 return newDocumentState;
             }
-            // Rule 5 -- everything else (a local tombstone racing a REAL remote
+            // Rule 6 -- everything else (a local tombstone racing a REAL remote
             // content change, or both incomparable): the master wins, which is
             // deterministic and convergent across replicas (the edit survives the
             // delete on every device).

package/dist/sync/lwwConflictHandler.js.map

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

package/dist/sync/pushWrites.d.ts

@@ -14,7 +14,9 @@
  * - content changed -> `PUT /:id` (`If-Match: "<version>"`) or, on create,
  *   `PUT /:id` (`If-None-Match: *`); a delete -> `DELETE /:id`.
  * - metadata changed -> `PUT /:id/meta` (`If-Match: "<metaVersion>"`, or
- *   `If-None-Match: *` when the resource has no metadata yet).
+ *   `If-None-Match: *` when the resource has no metadata yet); a metadata
+ *   CLEAR (the new state carries no `custom`) writes the cleared state rather
+ *   than being skipped.
  *
  * Content is written before metadata on a create, because the server rejects a
  * `/meta` write to a resource that does not yet exist.
@@ -43,14 +45,6 @@ export interface PushWriteAck {
     version?: number;
     metaVersion?: number;
 }
-/**
- * Formats a master revision (`version` or `metaVersion`) as the quoted strong
- * ETag the server compares `If-Match` against (revision `3` becomes `"3"`).
- *
- * @param revision {number}
- * @returns {string}
- */
-export declare function formatEtag(revision: number): string;
 /**
  * Builds the RxDB push handler that fans a batch of local changes out to
  * conditional WAS writes and returns the conflicting rows' master states.
@@ -63,6 +57,12 @@ export declare function formatEtag(revision: number): string;
  * caller can write the new `version` / `metaVersion` back into the local row
  * and keep subsequent conditional writes' `If-Match` in step with the server.
  *
+ * Each batch gets one short-lived master-read memo, shared by its rows and
+ * discarded with the batch (never held across batches, where it would go
+ * stale). A conflict re-read walks the changes feed from its origin and so pages
+ * past every other conflicting row's master on the way; without the memo a batch
+ * with k conflicts would run k concurrent full-feed walks.
+ *
  * @param port {WasSyncPort}
  * @param [onWriteAccepted] {(ack: PushWriteAck) => Promise<void>}
  * @returns {(rows: Array<{ newDocumentState: WithDeleted<SyncedDoc>,

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

@@ -1 +1 @@
-{"version":3,"file":"pushWrites.d.ts","sourceRoot":"","sources":["../../src/sync/pushWrites.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAqB,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAG3E;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEnD;AA4KD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,WAAW,EACjB,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,IAGpD,MAAM,KAAK,CAAC;IACV,gBAAgB,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;IACxC,kBAAkB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;CAC5C,CAAC,KACD,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,CAoBrC"}
+{"version":3,"file":"pushWrites.d.ts","sourceRoot":"","sources":["../../src/sync/pushWrites.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD,OAAO,KAAK,EAGV,SAAS,EACT,WAAW,EACZ,MAAM,YAAY,CAAA;AAQnB;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAqND;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,WAAW,EACjB,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,IAGpD,MAAM,KAAK,CAAC;IACV,gBAAgB,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;IACxC,kBAAkB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;CAC5C,CAAC,KACD,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,CAsBrC"}