@ebbjs/storage 0.2.0 → 1.0.0

package/dist/indexeddb/index.d.ts

@@ -229,7 +229,8 @@ interface CursorStore {
  * `conflicted` is a terminal-until-resolved hold: a catch-up pass
  * classified the Action as a loser, so it is structurally excluded from
  * `pending()` and never submitted. The application resolves it by
- * retrying (back to `pending`) or discarding (removed).
+ * sending the Action unchanged (back to `pending`) or clearing it
+ * (removed).
  */
 type OutboxStatus = "pending" | "acknowledged" | "error" | "conflicted";
 /**
@@ -267,6 +268,12 @@ interface ConflictSlot {
     /** The value the server holds at the position after the missed window. */
     readonly remote: ConflictSide;
 }
+/** One missed Action that out-dated a buffered write and made it a conflict. */
+interface ConflictRemoteAction {
+    readonly actorId: string;
+    readonly actionId: string;
+    readonly gsn: number;
+}
 /**
  * The before/after entity rows for one losing subject. `before` is the
  * row as the client had it immediately before the catch-up window was
@@ -305,6 +312,18 @@ interface OutboxConflict {
      * application reads that as "nothing of mine would be lost".
      */
     readonly slots: readonly ConflictSlot[];
+    /**
+     * The looser of the losing subjects' declared scopes: `"entity"` when
+     * any losing subject declared entity scope, else `"field"`. The union is
+     * spelled inline so storage stays independent of the schema package.
+     */
+    readonly scope: "field" | "component" | "entity";
+    /**
+     * The concurrent missed Actions that touched the losing subjects,
+     * deduped by action id, in window order. The remote half of the
+     * report an application builds a policy from.
+     */
+    readonly remoteActions: readonly ConflictRemoteAction[];
     /** The catch-up pass that produced this entry. */
     readonly catchUpId: string;
     /**
@@ -353,10 +372,9 @@ interface OutboxEntry {
 interface OutboxStore {
     put(entry: OutboxEntry): Promise<void>;
     /**
-     * Persist `entry` and delete `deleteId` in one durable operation. Used
-     * to resolve a conflict by retrying: the fresh re-assert must never
-     * exist without the conflicted row being gone, nor the row be gone
-     * without the re-assert persisted.
+     * Persist `entry` and delete `deleteId` in one durable operation: the
+     * replacement must never exist without the replaced row being gone,
+     * nor the row be gone without the replacement persisted.
      */
     putAndDelete(entry: OutboxEntry, deleteId: string): Promise<void>;
     list(): Promise<readonly OutboxEntry[]>;

package/dist/indexeddb/index.js

@@ -1,113 +1,117 @@
-import { unwrap as _, openDB as b } from "idb";
-import { m as k, a as O, i as T, c as v } from "../cursor-record-D39emd6R.js";
-import { c as N, l as P, f as R, a as C, b as B, j as M, k as H, n as F, q as G, s as L, M as j, m as K, p as I, r as U, i as Y } from "../replica-record-D3lkFACh.js";
-import { compare as V } from "@ebbjs/core";
-const z = 8, m = "actionPosition", A = "replica", Q = (t, e, a, n) => {
+import { unwrap as h, openDB as D } from "idb";
+import { m as _, a as T, i as O, c as v } from "../cursor-record-D39emd6R.js";
+import { c as R, l as b, f as k, a as N, b as P, j as C, k as B, q as M, t as F, u as H, M as g, m as L, s as x, r as G, i as K } from "../replica-record-D5gGEoVQ.js";
+import { compare as U } from "@ebbjs/core";
+const Y = 10, V = 9, w = "actionPosition", j = "replica", z = (t, e, a, o) => {
+  const s = e > 0 && e < V;
+  if (s)
+    for (const r of Array.from(t.objectStoreNames))
+      t.deleteObjectStore(r);
   if (t.objectStoreNames.contains("actions"))
-    n.objectStore("actions").indexNames.contains("position") || n.objectStore("actions").createIndex("position", "position");
+    o.objectStore("actions").indexNames.contains("position") || o.objectStore("actions").createIndex("position", "position");
   else {
-    const s = t.createObjectStore("actions", { keyPath: "id" });
-    s.createIndex("subject_id", "subject_ids", { multiEntry: !0 }), s.createIndex("position", "position");
+    const r = t.createObjectStore("actions", { keyPath: "id" });
+    r.createIndex("subject_id", "subject_ids", { multiEntry: !0 }), r.createIndex("position", "position");
   }
   if (!t.objectStoreNames.contains("entities")) {
-    const s = t.createObjectStore("entities", { keyPath: "id" });
-    s.indexNames.contains("type") || s.createIndex("type", "type");
+    const r = t.createObjectStore("entities", { keyPath: "id" });
+    r.indexNames.contains("type") || r.createIndex("type", "type");
   }
   if (t.objectStoreNames.contains("relationships") || t.createObjectStore("relationships", { keyPath: "key" }), !t.objectStoreNames.contains("dirty")) {
-    const s = t.createObjectStore("dirty", { keyPath: "entityId" });
-    s.indexNames.contains("entityType") || s.createIndex("entityType", "entityType");
+    const r = t.createObjectStore("dirty", { keyPath: "entityId" });
+    r.indexNames.contains("entityType") || r.createIndex("entityType", "entityType");
   }
-  t.objectStoreNames.contains("cursors") || t.createObjectStore("cursors", { keyPath: "groupId" }), t.objectStoreNames.contains("outbox") || t.createObjectStore("outbox", { keyPath: "action.id" }), t.objectStoreNames.contains("sequence") || t.createObjectStore("sequence", { keyPath: "id" }), t.objectStoreNames.contains("replica") || t.createObjectStore("replica", { keyPath: ["type", "id"] }), t.objectStoreNames.contains("replicaCursor") || t.createObjectStore("replicaCursor", { keyPath: "id" }), e < 8 && J(n);
-}, J = (t) => {
-  const e = _(t.objectStore("actions")), a = t.objectStore("sequence");
-  let n = 0;
+  t.objectStoreNames.contains("cursors") || t.createObjectStore("cursors", { keyPath: "groupId" }), t.objectStoreNames.contains("outbox") || t.createObjectStore("outbox", { keyPath: "action.id" }), t.objectStoreNames.contains("sequence") || t.createObjectStore("sequence", { keyPath: "id" }), t.objectStoreNames.contains("replica") || t.createObjectStore("replica", { keyPath: ["type", "id"] }), t.objectStoreNames.contains("replicaCursor") || t.createObjectStore("replicaCursor", { keyPath: "id" }), s ? o.objectStore("sequence").put({ id: w, value: 0 }) : e < 8 && Q(o);
+}, Q = (t) => {
+  const e = h(t.objectStore("actions")), a = t.objectStore("sequence");
+  let o = 0;
   const s = e.openCursor();
   s.onsuccess = () => {
-    const c = s.result;
-    if (c === null) {
-      a.put({ id: m, value: n });
+    const r = s.result;
+    if (r === null) {
+      a.put({ id: w, value: o });
       return;
     }
-    n += 1, c.update({ ...c.value, position: n }), c.continue();
+    o += 1, r.update({ ...r.value, position: o }), r.continue();
   };
-}, W = (t) => {
+}, X = (t) => {
   const e = /* @__PURE__ */ new Set();
   for (const a of t.updates)
     e.add(a.subject_id);
   return Array.from(e);
-}, x = (t) => {
-  const { subject_ids: e, position: a, ...n } = t;
-  return n;
-}, h = async (t, e) => {
-  const a = t.objectStore("actions"), n = await a.get(e.id), s = await t.objectStore("sequence").get(m), c = n === void 0, l = c ? (s?.value ?? 0) + 1 : n.position, p = n === void 0 ? e : { ...e, updates: k(n.updates, e.updates) }, y = O(n?.updates ?? [], e.updates);
-  return await a.put({ ...p, position: l, subject_ids: W(p) }), c && await t.objectStore("sequence").put({ id: m, value: l }), { action: p, position: l, added: y };
-}, X = (t) => ({
+}, S = (t) => {
+  const { subject_ids: e, position: a, ...o } = t;
+  return o;
+}, I = async (t, e) => {
+  const a = t.objectStore("actions"), o = await a.get(e.id), s = await t.objectStore("sequence").get(w), r = o === void 0, l = r ? (s?.value ?? 0) + 1 : o.position, p = o === void 0 ? e : { ...e, updates: _(o.updates, e.updates) }, y = T(o?.updates ?? [], e.updates);
+  return await a.put({ ...p, position: l, subject_ids: X(p) }), r && await t.objectStore("sequence").put({ id: w, value: l }), { action: p, position: l, added: y };
+}, J = (t) => ({
   async append(e) {
-    const a = t.transaction(["actions", "sequence"], "readwrite"), n = await h(a, e);
-    return await a.done, n;
+    const a = t.transaction(["actions", "sequence"], "readwrite"), o = await I(a, e);
+    return await a.done, o;
   },
   async appendMany(e) {
-    const a = t.transaction(["actions", "sequence"], "readwrite"), n = [];
+    const a = t.transaction(["actions", "sequence"], "readwrite"), o = [];
     for (const s of e)
-      n.push(await h(a, s));
-    return await a.done, n;
+      o.push(await I(a, s));
+    return await a.done, o;
   },
   async readTail(e) {
-    const a = t.transaction("actions", "readonly"), n = await a.store.index("position").getAll(IDBKeyRange.lowerBound(e, !0));
-    return await a.done, n.map((s) => ({
-      action: x(s),
+    const a = t.transaction("actions", "readonly"), o = await a.store.index("position").getAll(IDBKeyRange.lowerBound(e, !0));
+    return await a.done, o.map((s) => ({
+      action: S(s),
       position: s.position,
       added: s.updates
     }));
   },
   async lastPosition() {
-    return (await t.get("sequence", m))?.value ?? 0;
+    return (await t.get("sequence", w))?.value ?? 0;
   },
   async getAll() {
-    return (await t.getAll("actions")).map(x);
+    return (await t.getAll("actions")).map(S);
   },
   async getForEntity(e) {
-    const a = t.transaction("actions", "readonly"), n = await a.store.index("subject_id").getAll(e);
-    return await a.done, n.map(x).sort((c, l) => c.gsn - l.gsn);
+    const a = t.transaction("actions", "readonly"), o = await a.store.index("subject_id").getAll(e);
+    return await a.done, o.map(S).sort((r, l) => r.gsn - l.gsn);
   },
   async clear() {
     const e = t.transaction(["actions", "sequence"], "readwrite");
-    await e.objectStore("actions").clear(), await e.objectStore("sequence").put({ id: m, value: 0 }), await e.done;
+    await e.objectStore("actions").clear(), await e.objectStore("sequence").put({ id: w, value: 0 }), await e.done;
   }
-}), q = (t) => t === void 0 ? null : v(t), Z = (t) => {
-  const e = async (a) => q(await t.get("cursors", a));
+}), A = (t) => t === void 0 ? null : v(t), W = (t) => {
+  const e = async (a) => A(await t.get("cursors", a));
   return {
     async get(a) {
       return (await t.get("cursors", a))?.cursor ?? null;
     },
-    async set(a, n) {
+    async set(a, o) {
       const s = await e(a);
-      await t.put("cursors", { groupId: a, ...s, cursor: n });
+      await t.put("cursors", { groupId: a, ...s, cursor: o });
     },
     async getRecord(a) {
       return e(a);
     },
-    async setRecord(a, n) {
-      if (T(n)) {
+    async setRecord(a, o) {
+      if (O(o)) {
         await t.delete("cursors", a);
         return;
       }
       await t.put("cursors", {
         groupId: a,
-        ...v(n)
+        ...v(o)
       });
     },
     async records() {
-      const a = await t.getAll("cursors"), n = /* @__PURE__ */ new Map();
+      const a = await t.getAll("cursors"), o = /* @__PURE__ */ new Map();
       for (const s of a)
-        n.set(s.groupId, q(s) ?? {});
-      return n;
+        o.set(s.groupId, A(s) ?? {});
+      return o;
     },
     async clear() {
       await t.clear("cursors");
     }
   };
-}, $ = (t) => ({
+}, Z = (t) => ({
   async mark(e, a) {
     await t.get("dirty", e) || await t.put("dirty", { entityId: e, entityType: a });
   },
@@ -115,7 +119,7 @@ const z = 8, m = "actionPosition", A = "replica", Q = (t, e, a, n) => {
     return await t.get("dirty", e) !== void 0;
   },
   async getDirtyForType(e) {
-    return (await t.getAllFromIndex("dirty", "entityType", e)).map((n) => n.entityId);
+    return (await t.getAllFromIndex("dirty", "entityType", e)).map((o) => o.entityId);
   },
   async clear(e) {
     await t.delete("dirty", e);
@@ -123,85 +127,86 @@ const z = 8, m = "actionPosition", A = "replica", Q = (t, e, a, n) => {
   async clearAll() {
     await t.clear("dirty");
   }
-}), tt = (t, e, a) => {
-  const n = (o) => structuredClone(o), s = async (o, r) => {
-    r === null ? await t.delete("relationships", o) : await t.put("relationships", { key: o, rows: r });
-  }, c = async (o) => {
-    const r = await t.get("relationships", o.key);
-    await s(o.key, L(r?.rows, o));
-  }, l = async (o) => {
-    const r = await t.get("relationships", o.key);
-    await s(o.key, G(r?.rows, o));
-  }, p = async (o, r) => {
-    for (const u of [M(o, r), H(o, r)])
-      u.remove !== null && await l(u.remove), u.add !== null && await c(u.add);
-  }, y = async (o) => {
-    if (!await a.isDirty(o)) return;
-    const u = await e.getForEntity(o);
+}), $ = (t, e, a) => {
+  const o = (n) => structuredClone(n), s = async (n, i) => {
+    i === null ? await t.delete("relationships", n) : await t.put("relationships", { key: n, rows: i });
+  }, r = async (n) => {
+    const i = await t.get("relationships", n.key);
+    await s(n.key, H(i?.rows, n));
+  }, l = async (n) => {
+    const i = await t.get("relationships", n.key);
+    await s(n.key, F(i?.rows, n));
+  }, p = async (n, i) => {
+    for (const u of [C(n, i), B(n, i)])
+      u.remove !== null && await l(u.remove), u.add !== null && await r(u.add);
+  }, y = async (n) => {
+    if (!await a.isDirty(n)) return;
+    const u = await e.getForEntity(n);
     if (u.length === 0) return;
-    let w = null;
-    for (const g of u)
-      for (const S of g.updates)
-        S.subject_id === o && (w = F(w, S, g.gsn, g.hlc));
-    if (w === null) return;
-    const D = await t.get("entities", o);
-    await t.put("entities", n(w)), await p(D, w), await a.clear(o);
-  }, i = async (o) => {
-    for (const r of await a.getDirtyForType(o))
-      await y(r);
-  }, d = async (o) => {
-    const r = await t.get("relationships", o);
-    return B(r?.rows);
+    const m = M(u, n);
+    if (m === null) return;
+    const q = await t.get("entities", n);
+    await t.put("entities", o(m)), await p(q, m), await a.clear(n);
+  }, c = async (n) => {
+    for (const i of await a.getDirtyForType(n))
+      await y(i);
+  }, d = async (n) => {
+    const i = await t.get("relationships", n);
+    return P(i?.rows);
   };
   return {
-    async get(o) {
-      await y(o);
-      const r = await t.get("entities", o);
-      return r ? n(r) : null;
+    async get(n) {
+      await y(n);
+      const i = await t.get("entities", n);
+      return i ? o(i) : null;
     },
-    async set(o) {
-      const r = await t.get("entities", o.id);
-      await t.put("entities", n(o)), await p(r, o);
+    async set(n) {
+      const i = await t.get("entities", n.id);
+      await t.put("entities", o(n)), await p(i, n);
     },
-    async query(o) {
-      return await i(o), (await t.getAllFromIndex("entities", "type", o)).map(n);
+    async query(n) {
+      return await c(n), (await t.getAllFromIndex("entities", "type", n)).map(o);
     },
     async queryByRelationship({
-      as: o,
-      type: r,
+      as: n,
+      type: i,
       targetId: u
     }) {
-      return await i(I), d(U(o, r, u));
+      return await c(x), d(G(n, i, u));
     },
     async queryByRelationshipSource({
-      as: o,
-      type: r,
+      as: n,
+      type: i,
       sourceId: u
     }) {
-      await i(I);
-      const w = await t.get("relationships", R(o, r, u));
-      return C(w?.rows);
+      await c(x);
+      const m = await t.get("relationships", k(n, i, u));
+      return N(m?.rows);
     },
-    async queryByMembership(o) {
-      return await i(j), d(K(o));
+    async queryByMembership(n) {
+      return await c(g), d(L(n));
     },
-    async queryByMembershipEntity(o) {
-      await i(j);
-      const r = await t.get("relationships", N(o));
-      return P(r?.rows);
+    async queryByMembershipEntity(n) {
+      await c(g);
+      const i = await t.get("relationships", R(n));
+      return b(i?.rows);
     },
     async reset() {
       await t.clear("relationships"), await t.clear("entities");
     }
   };
-}, E = (t) => ({
+}, tt = (t) => ({
+  ...t,
+  scope: t.scope ?? "field",
+  remoteActions: t.remoteActions ?? []
+}), E = (t) => ({
   action: t.action,
   status: t.status,
   enqueuedAtHlc: t.enqueuedAtHlc,
   // A row predating the field reads as "always concurrent", never
   // silently dropped.
   basedOnGsn: t.basedOnGsn ?? 0,
-  conflict: t.conflict
+  conflict: t.conflict === void 0 ? void 0 : tt(t.conflict)
 }), et = (t) => ({
   async put(e) {
     await t.put("outbox", {
@@ -213,17 +218,17 @@ const z = 8, m = "actionPosition", A = "replica", Q = (t, e, a, n) => {
     });
   },
   async putAndDelete(e, a) {
-    const n = t.transaction("outbox", "readwrite");
-    n.store.put({
+    const o = t.transaction("outbox", "readwrite");
+    o.store.put({
       action: e.action,
       status: e.status,
       enqueuedAtHlc: e.enqueuedAtHlc,
       basedOnGsn: e.basedOnGsn,
       conflict: e.conflict
-    }), n.store.delete(a), await n.done;
+    }), o.store.delete(a), await o.done;
   },
   async list() {
-    return (await t.getAll("outbox")).map(E).sort((a, n) => V(a.enqueuedAtHlc, n.enqueuedAtHlc));
+    return (await t.getAll("outbox")).map(E).sort((a, o) => U(a.enqueuedAtHlc, o.enqueuedAtHlc));
   },
   async get(e) {
     const a = await t.get("outbox", e);
@@ -237,26 +242,26 @@ const z = 8, m = "actionPosition", A = "replica", Q = (t, e, a, n) => {
   }
 }), at = (t) => ({
   async load() {
-    const e = t.transaction(["replica", "replicaCursor"], "readonly"), a = await e.objectStore("replicaCursor").get(A);
+    const e = t.transaction(["replica", "replicaCursor"], "readonly"), a = await e.objectStore("replicaCursor").get(j);
     if (a === void 0)
       return await e.done, null;
-    const n = await e.objectStore("replica").getAll();
+    const o = await e.objectStore("replica").getAll();
     await e.done;
     const s = {
       format: a.format,
       position: a.position,
       revision: a.revision,
-      entities: n
+      entities: o
     };
-    return Y(s) ? s : null;
+    return K(s) ? s : null;
   },
   async save(e) {
-    const a = t.transaction(["replica", "replicaCursor"], "readwrite"), n = a.objectStore("replica");
-    await n.clear();
+    const a = t.transaction(["replica", "replicaCursor"], "readwrite"), o = a.objectStore("replica");
+    await o.clear();
     for (const s of e.entities)
-      await n.put(s);
+      await o.put(s);
     await a.objectStore("replicaCursor").put({
-      id: A,
+      id: j,
       format: e.format,
       position: e.position,
       revision: e.revision
@@ -267,53 +272,53 @@ const z = 8, m = "actionPosition", A = "replica", Q = (t, e, a, n) => {
     await e.objectStore("replica").clear(), await e.objectStore("replicaCursor").clear(), await e.done;
   }
 }), it = async (t = {}) => {
-  const e = t.dbName ?? "ebb-storage", a = await b(e, z, {
-    upgrade: Q
-  }), n = X(a), s = $(a), c = tt(a, n, s), l = Z(a), p = et(a), y = at(a);
+  const e = t.dbName ?? "ebb-storage", a = await D(e, Y, {
+    upgrade: z
+  }), o = J(a), s = Z(a), r = $(a, o, s), l = W(a), p = et(a), y = at(a);
   return {
     actions: {
-      async append(i) {
-        const d = await n.append(i);
-        for (const f of i.updates)
+      async append(c) {
+        const d = await o.append(c);
+        for (const f of c.updates)
           await s.mark(f.subject_id, f.subject_type);
         return d;
       },
-      async appendMany(i) {
-        const d = await n.appendMany(i);
-        for (const f of i)
-          for (const o of f.updates)
-            await s.mark(o.subject_id, o.subject_type);
+      async appendMany(c) {
+        const d = await o.appendMany(c);
+        for (const f of c)
+          for (const n of f.updates)
+            await s.mark(n.subject_id, n.subject_type);
         return d;
       },
-      async readTail(i) {
-        return n.readTail(i);
+      async readTail(c) {
+        return o.readTail(c);
       },
       async lastPosition() {
-        return n.lastPosition();
+        return o.lastPosition();
       },
       async getAll() {
-        return n.getAll();
+        return o.getAll();
       },
-      async getForEntity(i) {
-        return n.getForEntity(i);
+      async getForEntity(c) {
+        return o.getForEntity(c);
       },
       async clear() {
-        await n.clear(), await s.clearAll(), await c.reset(), await y.clear();
+        await o.clear(), await s.clearAll(), await r.reset(), await y.clear();
       }
     },
-    entities: c,
+    entities: r,
     dirtyTracker: {
-      async mark(i, d) {
-        await s.mark(i, d);
+      async mark(c, d) {
+        await s.mark(c, d);
       },
-      async isDirty(i) {
-        return s.isDirty(i);
+      async isDirty(c) {
+        return s.isDirty(c);
       },
-      async getDirtyForType(i) {
-        return s.getDirtyForType(i);
+      async getDirtyForType(c) {
+        return s.getDirtyForType(c);
       },
-      async clear(i) {
-        await s.clear(i);
+      async clear(c) {
+        await s.clear(c);
       },
       async clearAll() {
         await s.clearAll();
@@ -322,11 +327,11 @@ const z = 8, m = "actionPosition", A = "replica", Q = (t, e, a, n) => {
     cursors: l,
     outbox: p,
     replica: y,
-    async isDirty(i) {
-      return s.isDirty(i);
+    async isDirty(c) {
+      return s.isDirty(c);
     },
     async reset() {
-      await n.clear(), await s.clearAll(), await c.reset(), await y.clear(), await l.clear();
+      await o.clear(), await s.clearAll(), await r.reset(), await y.clear(), await l.clear();
     }
   };
 };

package/dist/memory/index.d.ts

@@ -229,7 +229,8 @@ interface CursorStore {
  * `conflicted` is a terminal-until-resolved hold: a catch-up pass
  * classified the Action as a loser, so it is structurally excluded from
  * `pending()` and never submitted. The application resolves it by
- * retrying (back to `pending`) or discarding (removed).
+ * sending the Action unchanged (back to `pending`) or clearing it
+ * (removed).
  */
 type OutboxStatus = "pending" | "acknowledged" | "error" | "conflicted";
 /**
@@ -267,6 +268,12 @@ interface ConflictSlot {
     /** The value the server holds at the position after the missed window. */
     readonly remote: ConflictSide;
 }
+/** One missed Action that out-dated a buffered write and made it a conflict. */
+interface ConflictRemoteAction {
+    readonly actorId: string;
+    readonly actionId: string;
+    readonly gsn: number;
+}
 /**
  * The before/after entity rows for one losing subject. `before` is the
  * row as the client had it immediately before the catch-up window was
@@ -305,6 +312,18 @@ interface OutboxConflict {
      * application reads that as "nothing of mine would be lost".
      */
     readonly slots: readonly ConflictSlot[];
+    /**
+     * The looser of the losing subjects' declared scopes: `"entity"` when
+     * any losing subject declared entity scope, else `"field"`. The union is
+     * spelled inline so storage stays independent of the schema package.
+     */
+    readonly scope: "field" | "component" | "entity";
+    /**
+     * The concurrent missed Actions that touched the losing subjects,
+     * deduped by action id, in window order. The remote half of the
+     * report an application builds a policy from.
+     */
+    readonly remoteActions: readonly ConflictRemoteAction[];
     /** The catch-up pass that produced this entry. */
     readonly catchUpId: string;
     /**
@@ -353,10 +372,9 @@ interface OutboxEntry {
 interface OutboxStore {
     put(entry: OutboxEntry): Promise<void>;
     /**
-     * Persist `entry` and delete `deleteId` in one durable operation. Used
-     * to resolve a conflict by retrying: the fresh re-assert must never
-     * exist without the conflicted row being gone, nor the row be gone
-     * without the re-assert persisted.
+     * Persist `entry` and delete `deleteId` in one durable operation: the
+     * replacement must never exist without the replaced row being gone,
+     * nor the row be gone without the replacement persisted.
      */
     putAndDelete(entry: OutboxEntry, deleteId: string): Promise<void>;
     list(): Promise<readonly OutboxEntry[]>;