@ebbjs/storage 0.3.0 → 1.0.0

package/dist/{replica-record-D3lkFACh.js → replica-record-D5gGEoVQ.js}

@@ -1,10 +1,10 @@
 import { isFieldMap as u, mergeFieldValue as m, latestHlc as P, isFieldLeaf as D } from "@ebbjs/core";
-const L = 500, M = 64, I = /* @__PURE__ */ new WeakMap(), N = (e) => {
+const L = 500, E = 64, I = /* @__PURE__ */ new WeakMap(), N = (e) => {
   let r = 2166136261;
   for (let t = 0; t < e.length; t += 1)
     r ^= e.charCodeAt(t), r = Math.imul(r, 16777619) >>> 0;
   return r >>> 0;
-}, E = (e) => N(e) % M, C = () => Array.from({ length: M }, () => ({})), R = (e, r) => {
+}, M = (e) => N(e) % E, C = () => Array.from({ length: E }, () => ({})), R = (e, r) => {
   let t = r;
   const n = {
     get map() {
@@ -24,9 +24,9 @@ const L = 500, M = 64, I = /* @__PURE__ */ new WeakMap(), N = (e) => {
 }, V = (e) => e.map, W = (e) => {
   const r = C(), t = {};
   for (const [n, s] of Object.entries(e))
-    r[E(n)][n] = s, t[n] = s;
+    r[M(n)][n] = s, t[n] = s;
   return R(r, t);
-}, b = (e) => !u(e) || _(e) ? e : Object.keys(e.map).length >= L ? W(e.map) : e, k = (e) => {
+}, b = (e) => !u(e) || _(e) ? e : Object.keys(e.map).length >= L ? W(e.map) : e, y = (e) => {
   let r;
   for (const [t, n] of Object.entries(e)) {
     const s = b(n);
@@ -41,7 +41,7 @@ const L = 500, M = 64, I = /* @__PURE__ */ new WeakMap(), N = (e) => {
 }, Y = (e, r) => {
   const t = H(e), n = [...t], s = /* @__PURE__ */ new Map();
   for (const [o, d] of Object.entries(r.map)) {
-    const a = E(o), c = (s.get(a) ?? t[a])[o], F = m(c, d);
+    const a = M(o), c = (s.get(a) ?? t[a])[o], F = m(c, d);
     if (F === c) continue;
     let i = s.get(a);
     i === void 0 && (i = { ...t[a] }, s.set(a, i)), i[o] = F;
@@ -54,7 +54,7 @@ const L = 500, M = 64, I = /* @__PURE__ */ new WeakMap(), N = (e) => {
     return u(r) ? Y(e, r) : r;
   const t = m(e, r);
   return t === e ? t : b(t);
-}, h = (e) => e.data?.fields ?? {}, de = { residentMapFields: !0 }, B = (e, r, t) => {
+}, h = (e) => e.data?.fields ?? {}, ce = { residentMapFields: !0 }, B = (e, r, t) => {
   const n = h(r), s = t?.residentMapFields ? $ : m;
   let o;
   for (const [d, a] of Object.entries(n)) {
@@ -62,17 +62,17 @@ const L = 500, M = 64, I = /* @__PURE__ */ new WeakMap(), N = (e) => {
     c !== p && (o === void 0 && (o = { ...e.fields }), o[d] = c);
   }
   return o === void 0 ? e : { fields: o };
-}, y = (e, r) => {
+}, k = (e, r) => {
   const t = r(e.data.fields);
   return t === e.data.fields ? e : { ...e, data: { ...e.data, fields: t } };
-}, ae = (e) => y(e, k), ce = (e) => y(e, K), ue = (e, r, t, n, s) => {
+}, ue = (e) => k(e, y), ie = (e) => k(e, K), U = (e, r, t, n, s) => {
   switch (r.method) {
     case "put":
       return {
         id: r.subject_id,
         type: r.subject_type,
         data: {
-          fields: s?.residentMapFields ? k(h(r)) : h(r)
+          fields: s?.residentMapFields ? y(h(r)) : h(r)
         },
         created_hlc: n,
         updated_hlc: n,
@@ -94,74 +94,86 @@ const L = 500, M = 64, I = /* @__PURE__ */ new WeakMap(), N = (e) => {
         last_gsn: Math.max(e.last_gsn, t)
       } : null;
   }
-}, S = "relationship", f = "entityGroup", O = "groups", v = (e, r, t) => `${e}\0${r}\0${t}`, j = (e, r, t) => `
${v(e, r, t)}`, U = (e) => v(O, f, e), q = (e) => j(O, f, e), l = (e, r) => {
+}, q = (e, r, t) => {
+  let n = e;
+  for (const s of t.updates)
+    s.subject_id === r && (n = U(n, s, t.gsn, t.hlc));
+  return n;
+}, fe = (e, r) => {
+  let t = null;
+  for (const n of e)
+    t = q(t, r, n);
+  return t;
+}, S = "relationship", f = "entityGroup", j = "groups", v = (e, r, t) => `${e}\0${r}\0${t}`, O = (e, r, t) => `
${v(e, r, t)}`, z = (e) => v(j, f, e), G = (e) => O(j, f, e), l = (e, r) => {
   const t = e.data?.fields?.[r];
   if (t === void 0 || !D(t)) return null;
   const n = t.value;
   return typeof n == "string" ? n : null;
-}, z = (e) => {
+}, J = (e) => {
   if (e.type !== S || e.deleted_hlc !== null) return null;
   const r = l(e, "field"), t = l(e, "type"), n = l(e, "target_id"), s = l(e, "source_id");
   return r === null || t === null || n === null || s === null ? null : { key: v(r, t, n), rowId: e.id, value: s };
-}, G = (e) => {
+}, Q = (e) => {
   if (e.type !== S || e.deleted_hlc !== null) return null;
   const r = l(e, "field"), t = l(e, "type"), n = l(e, "source_id"), s = l(e, "target_id");
-  return r === null || t === null || n === null || s === null ? null : { key: j(r, t, n), rowId: e.id, value: s };
-}, J = (e) => {
+  return r === null || t === null || n === null || s === null ? null : { key: O(r, t, n), rowId: e.id, value: s };
+}, X = (e) => {
   if (e.type !== f || e.deleted_hlc !== null) return null;
   const r = l(e, "group_id"), t = l(e, "entity_id");
-  return r === null || t === null ? null : { key: U(r), rowId: e.id, value: t };
-}, Q = (e) => {
+  return r === null || t === null ? null : { key: z(r), rowId: e.id, value: t };
+}, Z = (e) => {
   if (e.type !== f || e.deleted_hlc !== null) return null;
   const r = l(e, "group_id"), t = l(e, "entity_id");
-  return r === null || t === null ? null : { key: q(t), rowId: e.id, value: r };
-}, X = (e) => z(e) ?? J(e), Z = (e) => G(e) ?? Q(e), ee = (e) => [...e].sort(), ie = (e) => ee(new Set(Object.values(e ?? {}))), x = (e) => Object.entries(e ?? {}).map(([r, t]) => ({ rowId: r, value: t })).sort(
+  return r === null || t === null ? null : { key: G(t), rowId: e.id, value: r };
+}, ee = (e) => J(e) ?? X(e), re = (e) => Q(e) ?? Z(e), te = (e) => [...e].sort(), pe = (e) => te(new Set(Object.values(e ?? {}))), x = (e) => Object.entries(e ?? {}).map(([r, t]) => ({ rowId: r, value: t })).sort(
   (r, t) => r.value === t.value ? r.rowId.localeCompare(t.rowId) : r.value.localeCompare(t.value)
-), fe = (e) => x(e).map(({ rowId: r, value: t }) => ({ relationshipId: r, targetId: t })), pe = (e) => x(e).map(({ rowId: r, value: t }) => ({ membershipId: r, groupId: t })), A = (e, r, t) => {
+), he = (e) => x(e).map(({ rowId: r, value: t }) => ({ relationshipId: r, targetId: t })), me = (e) => x(e).map(({ rowId: r, value: t }) => ({ membershipId: r, groupId: t })), A = (e, r, t) => {
   const n = { ...e };
   return t ? n[r.rowId] = r.value : delete n[r.rowId], n;
-}, re = (e, r) => A(e, r, !0), te = (e, r) => {
+}, ne = (e, r) => A(e, r, !0), se = (e, r) => {
   const t = A(e, r, !1);
   return Object.keys(t).length === 0 ? null : t;
-}, ne = (e, r) => e?.key === r?.key && e?.rowId === r?.rowId && e?.value === r?.value, T = (e) => (r, t) => {
+}, oe = (e, r) => e?.key === r?.key && e?.rowId === r?.rowId && e?.value === r?.value, T = (e) => (r, t) => {
   const n = r === void 0 ? null : e(r), s = t === void 0 ? null : e(t);
-  return ne(n, s) ? { remove: null, add: null } : { remove: n, add: s };
-}, he = T(X), me = T(Z), w = (e, r, t) => {
+  return oe(n, s) ? { remove: null, add: null } : { remove: n, add: s };
+}, Ie = T(ee), _e = T(re), w = (e, r, t) => {
   if (t === null) {
     const n = { ...e };
     return delete n[r.key], n;
   }
   return { ...e, [r.key]: t };
-}, Ie = (e, r) => {
+}, ve = (e, r) => {
   if (r.remove === null && r.add === null) return e;
   let t = e;
-  return r.remove !== null && (t = w(t, r.remove, te(t[r.remove.key], r.remove))), r.add !== null && (t = w(t, r.add, re(t[r.add.key], r.add))), t;
-}, se = 1, g = (e) => typeof e == "number" && Number.isInteger(e) && e >= 0, oe = (e) => typeof e == "object" && e !== null && typeof e.id == "string" && typeof e.type == "string", _e = (e) => {
+  return r.remove !== null && (t = w(t, r.remove, se(t[r.remove.key], r.remove))), r.add !== null && (t = w(t, r.add, ne(t[r.add.key], r.add))), t;
+}, le = 1, g = (e) => typeof e == "number" && Number.isInteger(e) && e >= 0, de = (e) => typeof e == "object" && e !== null && typeof e.id == "string" && typeof e.type == "string", Fe = (e) => {
   if (typeof e != "object" || e === null) return !1;
   const r = e;
-  return r.format !== se || !g(r.position) || !g(r.revision) || !Array.isArray(r.entities) ? !1 : r.entities.every(oe);
+  return r.format !== le || !g(r.position) || !g(r.revision) || !Array.isArray(r.entities) ? !1 : r.entities.every(de);
 };
 export {
   f as M,
-  se as R,
-  fe as a,
-  ie as b,
-  q as c,
-  ae as d,
-  X as e,
-  j as f,
-  Z as g,
-  Ie as h,
-  _e as i,
-  he as j,
-  me as k,
-  pe as l,
-  U as m,
-  ue as n,
-  de as o,
-  S as p,
-  te as q,
+  le as R,
+  he as a,
+  pe as b,
+  G as c,
+  ue as d,
+  ee as e,
+  O as f,
+  re as g,
+  ve as h,
+  Fe as i,
+  Ie as j,
+  _e as k,
+  me as l,
+  z as m,
+  U as n,
+  ce as o,
+  q as p,
+  fe as q,
   v as r,
-  re as s,
-  ce as w
+  S as s,
+  se as t,
+  ne as u,
+  ie as w
 };

package/dist/types/index.d.ts

@@ -445,7 +445,8 @@ interface Replica {
  * `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";
 /**
@@ -483,6 +484,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
@@ -521,6 +528,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;
     /**
@@ -532,6 +551,16 @@ interface OutboxConflict {
     /** Client HLC stamped at detection. The conflict view's ordering key. */
     readonly detectedAtHlc: string;
 }
+/**
+ * The conflict payload as a row written before IndexedDB schema v10
+ * persisted it: `scope` and `remoteActions` were added at v10. The store's
+ * read path fills both in; a legacy row is still a field-scope conflict
+ * with no recorded remote context.
+ */
+interface StoredOutboxConflict extends Omit<OutboxConflict, "scope" | "remoteActions"> {
+    readonly scope?: "field" | "component" | "entity";
+    readonly remoteActions?: readonly ConflictRemoteAction[];
+}
 /**
  * One locally-authored Action awaiting acknowledgement, plus the HLC at
  * which it entered the outbox. A `conflicted` entry carries its
@@ -557,6 +586,13 @@ interface OutboxEntry {
     /** Present iff `status === "conflicted"`. */
     readonly conflict?: OutboxConflict;
 }
+/**
+ * The persisted form of an outbox entry. Identical to {@link OutboxEntry}
+ * except that a conflict payload may predate the v10 fields.
+ */
+interface StoredOutboxEntry extends Omit<OutboxEntry, "conflict"> {
+    readonly conflict?: StoredOutboxConflict;
+}
 /**
  * OutboxStore — durable buffer of pending local Actions.
  *
@@ -569,10 +605,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[]>;
@@ -618,4 +653,4 @@ interface StorageAdapter {
     reset(): Promise<void>;
 }
 
-export type { ActionLog, ConflictSide, ConflictSlot, ConflictSubjectState, CursorRecord, CursorStore, DirtyTracker, EntityStore, LoggedAction, MaterializationPolicy, MembershipLink, MembershipQuery, OutboxConflict, OutboxEntry, OutboxStatus, OutboxStore, RelationshipIndexQuery, RelationshipLink, RelationshipQuery, RelationshipSourceQuery, Replica, ReplicaChange, ReplicaOptions, ReplicaRecord, ReplicaStats, ReplicaStore, Revision, SeedMarker, StorageAdapter };
+export type { ActionLog, ConflictRemoteAction, ConflictSide, ConflictSlot, ConflictSubjectState, CursorRecord, CursorStore, DirtyTracker, EntityStore, LoggedAction, MaterializationPolicy, MembershipLink, MembershipQuery, OutboxConflict, OutboxEntry, OutboxStatus, OutboxStore, RelationshipIndexQuery, RelationshipLink, RelationshipQuery, RelationshipSourceQuery, Replica, ReplicaChange, ReplicaOptions, ReplicaRecord, ReplicaStats, ReplicaStore, Revision, SeedMarker, StorageAdapter, StoredOutboxConflict, StoredOutboxEntry };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebbjs/storage",
-  "version": "0.3.0",
+  "version": "1.0.0",
   "private": false,
   "description": "Storage components for ebbjs",
   "homepage": "https://ebbjs.com",
@@ -44,7 +44,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@ebbjs/core": "^0.3.0"
+    "@ebbjs/core": "^1.0.0"
   },
   "devDependencies": {
     "fake-indexeddb": "^6.2.5",