tinybase 3.0.0-beta.0 → 3.0.0

package/bin/cli.js

@@ -1,2 +1,2 @@
 #! /usr/bin/env node
-import{resolve as t,dirname as e}from"path";import{writeFileSync as r,readFileSync as s}from"fs";import{createStore as o}from"tinybase";import{createTools as a}from"tinybase/tools";import{fileURLToPath as i}from"url";const n=JSON.parse,m=Object,p=(...t)=>{return e=t=>process.stdout.write(t+"\n"),t.forEach(e);var e},c=t=>n(s(t,"utf8")),f=()=>{var t,e;p("","tinybase <command>","","Usage:",""),t=u,e=([,t,e],r)=>p(` tinybase ${r} ${t}`," - "+e,""),((t,e)=>{t.map(e)})(m.entries(t),(([t,r])=>e(r,t)))},u={help:[f,"","print this message"],version:[()=>p(c(t(e(i(import.meta.url)),"../package.json")).version),"","get the current TinyBase version"],getStoreApi:[async(e,s,i)=>{try{const n=a(o().setSchema(c(e))),[m,f]=await n.getPrettyStoreApi(s),u=t(i,s+".d.ts"),h=t(i,s+".ts");r(u,m,"utf8"),r(h,f,"utf8"),p("    Definition: "+u,"Implementation: "+h)}catch{process.stderr.write("ERROR: provide a valid schemaFile, storeName, and outputDir\n")}},"<schemaFile> <storeName> <outputDir>","generate .d.ts and .ts files from a schema file"]};(()=>{const[,,t,...e]=process.argv;(u[t]?.[0]??f)(...e)})();
+import{resolve as e,dirname as t}from"path";import{writeFileSync as r,readFileSync as s}from"fs";import{createStore as o}from"tinybase";import{createTools as a}from"tinybase/tools";import{fileURLToPath as i}from"url";const n=JSON.parse,m=Object,p=(...e)=>{return t=e=>process.stdout.write(e+"\n"),e.forEach(t);var t},c=e=>n(s(e,"utf8")),f=()=>{var e,t;p("","tinybase <command>","","Usage:",""),e=l,t=([,e,t],r)=>p(` tinybase ${r} ${e}`," - "+t,""),((e,t)=>{e.map(t)})(m.entries(e),(([e,r])=>t(r,e))),p("See also http://tinybase.org/guides/developer-tools/command-line/","")},l={help:[f,"","print this message"],version:[()=>p(c(e(t(i(import.meta.url)),"../package.json")).version),"","get the current TinyBase version"],getStoreApi:[async(t,s,i)=>{try{const m=c(t),f=a(o().setSchema(...(n=m,Array.isArray(n)?m:[m]))),[l,u]=await f.getPrettyStoreApi(s),d=e(i,s+".d.ts"),h=e(i,s+".ts");r(d,l,"utf8"),r(h,u,"utf8"),p("    Definition: "+d,"Implementation: "+h)}catch{process.stderr.write("ERROR: provide a valid schemaFile, storeName, and outputDir\n")}var n},"<schemaFile> <storeName> <outputDir>","generate .d.ts and .ts files from a schema file"]};(()=>{const[,,e,...t]=process.argv;(l[e]?.[0]??f)(...t)})();

package/lib/checkpoints.d.ts

@@ -115,6 +115,8 @@ export type CheckpointsListenerStats = {
  * method), and add listeners for when the list checkpoints changes (with the
  * addCheckpointIdsListener method).
  *
+ * Checkpoints work for both changes to tabular data and to keyed value data.
+ *
  * Every checkpoint can be given a label which can be used to describe the
  * actions that changed the Store before this checkpoint. This can be useful for
  * interfaces that let users 'Undo [last action]'.
@@ -127,7 +129,9 @@ export type CheckpointsListenerStats = {
  * registering and removing a listener for them.
  *
  * ```js
- * const store = createStore().setTables({pets: {fido: {sold: false}}});
+ * const store = createStore()
+ *   .setTables({pets: {fido: {sold: false}}})
+ *   .setValue('open', true);
  *
  * const checkpoints = createCheckpoints(store);
  * checkpoints.setSize(200);
@@ -145,14 +149,25 @@ export type CheckpointsListenerStats = {
  * console.log(checkpoints.getCheckpointIds());
  * // -> [[], '0', ['1']]
  *
+ * store.setValue('open', false);
+ * checkpoints.addCheckpoint('closed');
+ * console.log(checkpoints.getCheckpointIds());
+ * // -> [['0'], '2', []]
+ *
+ * checkpoints.goBackward();
+ * console.log(store.getValue('open'));
+ * // -> true
+ * console.log(checkpoints.getCheckpointIds());
+ * // -> [[], '0', ['2']]
+ *
  * const listenerId = checkpoints.addCheckpointIdsListener(() => {
  *   console.log(checkpoints.getCheckpointIds());
  * });
  * store.setCell('pets', 'fido', 'species', 'dog');
  * // -> [['0'], undefined, []]
  * checkpoints.addCheckpoint();
- * // -> [['0'], '2', []]
- * // Previous redo of checkpoint '1' is now not possible.
+ * // -> [['0'], '3', []]
+ * // Previous redo of checkpoints '1' and '2' are now not possible.
  *
  * checkpoints.delListener(listenerId);
  * checkpoints.destroy();

package/lib/checkpoints.js

@@ -1 +1 @@
-const e=(e,t)=>e.includes(t),t=(e,t)=>e.forEach(t),n=e=>e.length,r=e=>0==n(e),s=(e,...t)=>e.push(...t),o=e=>e.pop(),l=e=>e.shift(),c=e=>null==e,i=(e,t,n)=>c(e)?n?.():t(e),a=(e,t)=>e?.has(t)??!1,d=e=>c(e)||0==(e=>e.size)(e),u=(e,t)=>e?.forEach(t),h=(e,t)=>e?.delete(t),p=e=>new Map(e),C=(e,t)=>e?.get(t),g=(e,t,n)=>c(n)?(h(e,t),e):e?.set(t,n),k=(e,t,n)=>(a(e,t)||g(e,t,n()),C(e,t)),f=(e,t,r,s,o=0)=>i((r?k:C)(e,t[o],o>n(t)-2?r:p),(l=>{if(o>n(t)-2)return s?.(l)&&g(e,t[o]),l;const c=f(l,t,r,s,o+1);return d(l)&&g(e,t[o]),c})),v=e=>new Set(Array.isArray(e)||c(e)?e:[e]),L=/^\d+$/,w=Object.freeze,S=(S=>{const y=new WeakMap;return S=>(y.has(S)||y.set(S,(S=>{let y,z,E,A=100,I=p(),M=1;const b=p(),j=p(),[x,B,F]=(e=>{let r;const[o,a]=(()=>{const e=[];let t=0;return[()=>l(e)??""+t++,t=>{L.test(t)&&n(e)<1e3&&s(e,t)}]})(),k=p();return[(e,t,n)=>{r??=V;const s=o();var l;return g(k,s,[e,t,n]),l=s,f(t,n??[""],v)?.add(l),s},(e,o,...l)=>t(((e,r=[""])=>{const o=[],l=(e,c)=>c==n(r)?s(o,e):null===r[c]?u(e,(e=>l(e,c+1))):t([r[c],null],(t=>l(C(e,t),c+1)));return l(e,0),o})(e,o),(e=>u(e,(e=>C(k,e)[0](r,...o??[],...l))))),e=>i(C(k,e),(([,t,n])=>(f(t,n??[""],void 0,(t=>(h(t,e),d(t)?1:0))),g(k,e),a(e),n))),(e,s,o)=>i(C(k,e),(([e,,l=[]])=>{const i=(...a)=>{const d=n(a);d==n(l)?e(r,...a,...o(a)):c(l[d])?t(s[d](...a),(e=>i(...a,e))):i(...a,l[d])};i()}))]})(),O=p(),T=p(),W=[],$=[],m=(e,t)=>{M=0,S.transaction((()=>u(C(O,t),((t,n)=>u(t,((t,r)=>u(t,((t,s)=>((e,t,n,r,s)=>c(s)?e.delCell(t,n,r,!0):e.setCell(t,n,r,s))(S,n,r,s,t[e]))))))))),M=1},q=e=>{g(O,e),g(T,e),B(j,[e])},D=(e,r)=>t(((e,t)=>e.splice(0,t))(e,r??n(e)),q),G=()=>D(W,n(W)-A),H=S.addCellListener(null,null,null,((e,t,n,r,l,c)=>{if(M){i(y,(()=>{s(W,y),G(),D($),y=void 0,E=1}));const e=k(I,t,p),a=k(e,n,p),u=k(a,r,(()=>[c,void 0]));u[1]=l,u[0]===l&&d(g(a,r))&&d(g(e,n))&&d(g(I,t))&&(y=o(W),E=1),P()}})),J=(e="")=>(c(y)&&(y=""+z++,g(O,y,I),R(y,e),I=p(),E=1),y),K=()=>{r(W)||(((e,...t)=>{e.unshift(...t)})($,J()),m(0,y),y=o(W),E=1)},N=()=>{r($)||(s(W,y),y=l($),m(1,y),E=1)},P=()=>{E&&(B(b),E=0)},Q=e=>{const t=J(e);return P(),t},R=(e,t)=>(U(e)&&C(T,e)!==t&&(g(T,e,t),B(j,[e])),V),U=e=>a(O,e),V={setSize:e=>(A=e,G(),V),addCheckpoint:Q,setCheckpoint:R,getStore:()=>S,getCheckpointIds:()=>[[...W],y,[...$]],forEachCheckpoint:e=>{return t=e,u(T,((e,n)=>t(n,e)));var t},hasCheckpoint:U,getCheckpoint:e=>C(T,e),goBackward:()=>(K(),P(),V),goForward:()=>(N(),P(),V),goTo:t=>{const n=e(W,t)?K:e($,t)?N:null;for(;!c(n)&&t!=y;)n();return P(),V},addCheckpointIdsListener:e=>x(e,b),addCheckpointListener:(e,t)=>x(t,j,[e]),delListener:e=>(F(e),V),clear:()=>(D(W),D($),c(y)||q(y),y=void 0,z=0,Q(),V),destroy:()=>{S.delListener(H)},getListenerStats:()=>({})};return w(V.clear())})(S)),y.get(S))})();export{S as createCheckpoints};
+const e=(e,t)=>e.includes(t),t=(e,t)=>e.forEach(t),n=e=>e.length,r=e=>0==n(e),s=(e,...t)=>e.push(...t),o=e=>e.pop(),l=e=>e.shift(),c=e=>null==e,i=(e,t,n)=>c(e)?n?.():t(e),a=(e,t)=>e?.has(t)??!1,d=e=>c(e)||0==(e=>e.size)(e),u=(e,t)=>e?.forEach(t),h=(e,t)=>e?.delete(t),p=e=>new Map(e),C=(e,t)=>e?.get(t),f=(e,t,n)=>c(n)?(h(e,t),e):e?.set(t,n),g=(e,t,n)=>(a(e,t)||f(e,t,n()),C(e,t)),k=(e,t,r,s,o=0)=>i((r?g:C)(e,t[o],o>n(t)-2?r:p),(l=>{if(o>n(t)-2)return s?.(l)&&f(e,t[o]),l;const c=k(l,t,r,s,o+1);return d(l)&&f(e,t[o]),c})),L=e=>new Set(Array.isArray(e)||c(e)?e:[e]),v=/^\d+$/,w=Object.freeze,S=(S=>{const y=new WeakMap;return S=>(y.has(S)||y.set(S,(S=>{let y,z,E,V=100,A=p(),I=p(),M=1;const b=p(),j=p(),[x,B,F]=(e=>{let r;const[o,a]=(()=>{const e=[];let t=0;return[()=>l(e)??""+t++,t=>{v.test(t)&&n(e)<1e3&&s(e,t)}]})(),g=p();return[(e,t,n,s=[],l=(()=>[]))=>{r??=_;const c=o();var i;return f(g,c,[e,t,n,s,l]),i=c,k(t,n??[""],L)?.add(i),c},(e,o,...l)=>t(((e,r=[""])=>{const o=[],l=(e,c)=>c==n(r)?s(o,e):null===r[c]?u(e,(e=>l(e,c+1))):t([r[c],null],(t=>l(C(e,t),c+1)));return l(e,0),o})(e,o),(e=>u(e,(e=>C(g,e)[0](r,...o??[],...l))))),e=>i(C(g,e),(([,t,n])=>(k(t,n??[""],void 0,(t=>(h(t,e),d(t)?1:0))),f(g,e),a(e),n))),e=>i(C(g,e),(([e,,s=[],o,l])=>{const i=(...a)=>{const d=n(a);d==n(s)?e(r,...a,...l(a)):c(s[d])?t(o[d]?.(...a)??[],(e=>i(...a,e))):i(...a,s[d])};i()}))]})(),O=p(),T=p(),W=[],$=[],m=(e,t)=>{M=0,S.transaction((()=>{const[n,r]=C(O,t);u(n,((t,n)=>u(t,((t,r)=>u(t,((t,s)=>((e,t,n,r,s)=>c(s)?e.delCell(t,n,r,!0):e.setCell(t,n,r,s))(S,n,r,s,t[e]))))))),u(r,((t,n)=>((e,t,n)=>c(n)?e.delValue(t):e.setValue(t,n))(S,n,t[e])))})),M=1},q=e=>{f(O,e),f(T,e),B(j,[e])},D=(e,r)=>t(((e,t)=>e.splice(0,t))(e,r??n(e)),q),G=()=>D(W,n(W)-V),H=()=>i(y,(()=>{s(W,y),G(),D($),y=void 0,E=1})),J=()=>{y=o(W),E=1},K=S.addCellListener(null,null,null,((e,t,n,r,s,o)=>{if(M){H();const e=g(A,t,p),l=g(e,n,p),c=g(l,r,(()=>[o,void 0]));c[1]=s,c[0]===s&&d(f(l,r))&&d(f(e,n))&&d(f(A,t))&&J(),U()}})),N=S.addValueListener(null,((e,t,n,r)=>{if(M){H();const e=g(I,t,(()=>[r,void 0]));e[1]=n,e[0]===n&&d(f(I,t))&&J(),U()}})),P=(e="")=>(c(y)&&(y=""+z++,f(O,y,[A,I]),Y(y,e),A=p(),I=p(),E=1),y),Q=()=>{r(W)||(((e,...t)=>{e.unshift(...t)})($,P()),m(0,y),y=o(W),E=1)},R=()=>{r($)||(s(W,y),y=l($),m(1,y),E=1)},U=()=>{E&&(B(b),E=0)},X=e=>{const t=P(e);return U(),t},Y=(e,t)=>(Z(e)&&C(T,e)!==t&&(f(T,e,t),B(j,[e])),_),Z=e=>a(O,e),_={setSize:e=>(V=e,G(),_),addCheckpoint:X,setCheckpoint:Y,getStore:()=>S,getCheckpointIds:()=>[[...W],y,[...$]],forEachCheckpoint:e=>{return t=e,u(T,((e,n)=>t(n,e)));var t},hasCheckpoint:Z,getCheckpoint:e=>C(T,e),goBackward:()=>(Q(),U(),_),goForward:()=>(R(),U(),_),goTo:t=>{const n=e(W,t)?Q:e($,t)?R:null;for(;!c(n)&&t!=y;)n();return U(),_},addCheckpointIdsListener:e=>x(e,b),addCheckpointListener:(e,t)=>x(t,j,[e]),delListener:e=>(F(e),_),clear:()=>(D(W),D($),c(y)||q(y),y=void 0,z=0,X(),_),destroy:()=>{S.delListener(K),S.delListener(N)},getListenerStats:()=>({})};return w(_.clear())})(S)),y.get(S))})();export{S as createCheckpoints};

package/lib/debug/checkpoints.d.ts

@@ -115,6 +115,8 @@ export type CheckpointsListenerStats = {
  * method), and add listeners for when the list checkpoints changes (with the
  * addCheckpointIdsListener method).
  *
+ * Checkpoints work for both changes to tabular data and to keyed value data.
+ *
  * Every checkpoint can be given a label which can be used to describe the
  * actions that changed the Store before this checkpoint. This can be useful for
  * interfaces that let users 'Undo [last action]'.
@@ -127,7 +129,9 @@ export type CheckpointsListenerStats = {
  * registering and removing a listener for them.
  *
  * ```js
- * const store = createStore().setTables({pets: {fido: {sold: false}}});
+ * const store = createStore()
+ *   .setTables({pets: {fido: {sold: false}}})
+ *   .setValue('open', true);
  *
  * const checkpoints = createCheckpoints(store);
  * checkpoints.setSize(200);
@@ -145,14 +149,25 @@ export type CheckpointsListenerStats = {
  * console.log(checkpoints.getCheckpointIds());
  * // -> [[], '0', ['1']]
  *
+ * store.setValue('open', false);
+ * checkpoints.addCheckpoint('closed');
+ * console.log(checkpoints.getCheckpointIds());
+ * // -> [['0'], '2', []]
+ *
+ * checkpoints.goBackward();
+ * console.log(store.getValue('open'));
+ * // -> true
+ * console.log(checkpoints.getCheckpointIds());
+ * // -> [[], '0', ['2']]
+ *
  * const listenerId = checkpoints.addCheckpointIdsListener(() => {
  *   console.log(checkpoints.getCheckpointIds());
  * });
  * store.setCell('pets', 'fido', 'species', 'dog');
  * // -> [['0'], undefined, []]
  * checkpoints.addCheckpoint();
- * // -> [['0'], '2', []]
- * // Previous redo of checkpoint '1' is now not possible.
+ * // -> [['0'], '3', []]
+ * // Previous redo of checkpoints '1' and '2' are now not possible.
  *
  * checkpoints.delListener(listenerId);
  * checkpoints.destroy();

package/lib/debug/checkpoints.js

@@ -61,6 +61,13 @@ const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
     },
   );
 
+const setOrDelCell = (store, tableId, rowId, cellId, cell) =>
+  isUndefined(cell)
+    ? store.delCell(tableId, rowId, cellId, true)
+    : store.setCell(tableId, rowId, cellId, cell);
+const setOrDelValue = (store, valueId, value) =>
+  isUndefined(value) ? store.delValue(valueId) : store.setValue(valueId, value);
+
 const setNew = (entryOrEntries) =>
   new Set(
     isArray(entryOrEntries) || isUndefined(entryOrEntries)
@@ -108,10 +115,22 @@ const getListenerFunctions = (getThing) => {
   let thing;
   const [getId, releaseId] = getPoolFunctions();
   const allListeners = mapNew();
-  const addListener = (listener, idSetNode, path) => {
+  const addListener = (
+    listener,
+    idSetNode,
+    path,
+    pathGetters = [],
+    extraArgsGetter = () => [],
+  ) => {
     thing ??= getThing();
     const id = getId();
-    mapSet(allListeners, id, [listener, idSetNode, path]);
+    mapSet(allListeners, id, [
+      listener,
+      idSetNode,
+      path,
+      pathGetters,
+      extraArgsGetter,
+    ]);
     setAdd(visitTree(idSetNode, path ?? [EMPTY_STRING], setNew), id);
     return id;
   };
@@ -131,35 +150,34 @@ const getListenerFunctions = (getThing) => {
       releaseId(id);
       return idOrNulls;
     });
-  const callListener = (id, idNullGetters, extraArgsGetter) =>
-    ifNotUndefined(mapGet(allListeners, id), ([listener, , idOrNulls = []]) => {
-      const callWithIds = (...ids) => {
-        const index = arrayLength(ids);
-        index == arrayLength(idOrNulls)
-          ? listener(thing, ...ids, ...extraArgsGetter(ids))
-          : isUndefined(idOrNulls[index])
-          ? arrayForEach(idNullGetters[index](...ids), (id2) =>
-              callWithIds(...ids, id2),
-            )
-          : callWithIds(...ids, idOrNulls[index]);
-      };
-      callWithIds();
-    });
+  const callListener = (id) =>
+    ifNotUndefined(
+      mapGet(allListeners, id),
+      ([listener, , path = [], pathGetters, extraArgsGetter]) => {
+        const callWithIds = (...ids) => {
+          const index = arrayLength(ids);
+          index == arrayLength(path)
+            ? listener(thing, ...ids, ...extraArgsGetter(ids))
+            : isUndefined(path[index])
+            ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
+                callWithIds(...ids, id2),
+              )
+            : callWithIds(...ids, path[index]);
+        };
+        callWithIds();
+      },
+    );
   return [addListener, callListeners, delListener, callListener];
 };
 
 const object = Object;
 const objFreeze = object.freeze;
 
-const setOrDelCell = (store, tableId, rowId, cellId, cell) =>
-  isUndefined(cell)
-    ? store.delCell(tableId, rowId, cellId, true)
-    : store.setCell(tableId, rowId, cellId, cell);
-
 const createCheckpoints = getCreateFunction((store) => {
   let backwardIdsSize = 100;
   let currentId;
-  let delta = mapNew();
+  let cellsDelta = mapNew();
+  let valuesDelta = mapNew();
   let listening = 1;
   let nextCheckpointId;
   let checkpointsChanged;
@@ -174,15 +192,19 @@ const createCheckpoints = getCreateFunction((store) => {
   const forwardIds = [];
   const updateStore = (oldOrNew, checkpointId) => {
     listening = 0;
-    store.transaction(() =>
-      collForEach(mapGet(deltas, checkpointId), (table, tableId) =>
+    store.transaction(() => {
+      const [cellsDelta2, valuesDelta2] = mapGet(deltas, checkpointId);
+      collForEach(cellsDelta2, (table, tableId) =>
         collForEach(table, (row, rowId) =>
           collForEach(row, (oldNew, cellId) =>
             setOrDelCell(store, tableId, rowId, cellId, oldNew[oldOrNew]),
           ),
         ),
-      ),
-    );
+      );
+      collForEach(valuesDelta2, (oldNew, valueId) =>
+        setOrDelValue(store, valueId, oldNew[oldOrNew]),
+      );
+    });
     listening = 1;
   };
   const clearCheckpointId = (checkpointId) => {
@@ -197,32 +219,56 @@ const createCheckpoints = getCreateFunction((store) => {
     );
   const trimBackwardsIds = () =>
     clearCheckpointIds(backwardIds, arrayLength(backwardIds) - backwardIdsSize);
-  const listenerId = store.addCellListener(
+  const storeChanged = () =>
+    ifNotUndefined(currentId, () => {
+      arrayPush(backwardIds, currentId);
+      trimBackwardsIds();
+      clearCheckpointIds(forwardIds);
+      currentId = void 0;
+      checkpointsChanged = 1;
+    });
+  const storeUnchanged = () => {
+    currentId = arrayPop(backwardIds);
+    checkpointsChanged = 1;
+  };
+  const cellListenerId = store.addCellListener(
     null,
     null,
     null,
     (_store, tableId, rowId, cellId, newCell, oldCell) => {
       if (listening) {
-        ifNotUndefined(currentId, () => {
-          arrayPush(backwardIds, currentId);
-          trimBackwardsIds();
-          clearCheckpointIds(forwardIds);
-          currentId = void 0;
-          checkpointsChanged = 1;
-        });
-        const table = mapEnsure(delta, tableId, mapNew);
+        storeChanged();
+        const table = mapEnsure(cellsDelta, tableId, mapNew);
         const row = mapEnsure(table, rowId, mapNew);
         const oldNew = mapEnsure(row, cellId, () => [oldCell, void 0]);
         oldNew[1] = newCell;
-        if (oldNew[0] === newCell) {
-          if (collIsEmpty(mapSet(row, cellId))) {
-            if (collIsEmpty(mapSet(table, rowId))) {
-              if (collIsEmpty(mapSet(delta, tableId))) {
-                currentId = arrayPop(backwardIds);
-                checkpointsChanged = 1;
-              }
-            }
-          }
+        if (
+          oldNew[0] === newCell &&
+          collIsEmpty(mapSet(row, cellId)) &&
+          collIsEmpty(mapSet(table, rowId)) &&
+          collIsEmpty(mapSet(cellsDelta, tableId))
+        ) {
+          storeUnchanged();
+        }
+        callListenersIfChanged();
+      }
+    },
+  );
+  const valueListenerId = store.addValueListener(
+    null,
+    (_store, valueId, newValue, oldValue) => {
+      if (listening) {
+        storeChanged();
+        const oldNew = mapEnsure(valuesDelta, valueId, () => [
+          oldValue,
+          void 0,
+        ]);
+        oldNew[1] = newValue;
+        if (
+          oldNew[0] === newValue &&
+          collIsEmpty(mapSet(valuesDelta, valueId))
+        ) {
+          storeUnchanged();
         }
         callListenersIfChanged();
       }
@@ -231,9 +277,10 @@ const createCheckpoints = getCreateFunction((store) => {
   const addCheckpointImpl = (label = EMPTY_STRING) => {
     if (isUndefined(currentId)) {
       currentId = EMPTY_STRING + nextCheckpointId++;
-      mapSet(deltas, currentId, delta);
+      mapSet(deltas, currentId, [cellsDelta, valuesDelta]);
       setCheckpoint(currentId, label);
-      delta = mapNew();
+      cellsDelta = mapNew();
+      valuesDelta = mapNew();
       checkpointsChanged = 1;
     }
     return currentId;
@@ -309,8 +356,8 @@ const createCheckpoints = getCreateFunction((store) => {
     addListener(listener, checkpointIdsListeners);
   const addCheckpointListener = (checkpointId, listener) =>
     addListener(listener, checkpointListeners, [checkpointId]);
-  const delListener = (listenerId2) => {
-    delListenerImpl(listenerId2);
+  const delListener = (listenerId) => {
+    delListenerImpl(listenerId);
     return checkpoints;
   };
   const clear = () => {
@@ -325,7 +372,8 @@ const createCheckpoints = getCreateFunction((store) => {
     return checkpoints;
   };
   const destroy = () => {
-    store.delListener(listenerId);
+    store.delListener(cellListenerId);
+    store.delListener(valueListenerId);
   };
   const getListenerStats = () => ({
     checkpointIds: collSize2(checkpointIdsListeners),

package/lib/debug/indexes.js

@@ -272,10 +272,22 @@ const getListenerFunctions = (getThing) => {
   let thing;
   const [getId, releaseId] = getPoolFunctions();
   const allListeners = mapNew();
-  const addListener = (listener, idSetNode, path) => {
+  const addListener = (
+    listener,
+    idSetNode,
+    path,
+    pathGetters = [],
+    extraArgsGetter = () => [],
+  ) => {
     thing ??= getThing();
     const id = getId();
-    mapSet(allListeners, id, [listener, idSetNode, path]);
+    mapSet(allListeners, id, [
+      listener,
+      idSetNode,
+      path,
+      pathGetters,
+      extraArgsGetter,
+    ]);
     setAdd(visitTree(idSetNode, path ?? [EMPTY_STRING], setNew), id);
     return id;
   };
@@ -295,20 +307,23 @@ const getListenerFunctions = (getThing) => {
       releaseId(id);
       return idOrNulls;
     });
-  const callListener = (id, idNullGetters, extraArgsGetter) =>
-    ifNotUndefined(mapGet(allListeners, id), ([listener, , idOrNulls = []]) => {
-      const callWithIds = (...ids) => {
-        const index = arrayLength(ids);
-        index == arrayLength(idOrNulls)
-          ? listener(thing, ...ids, ...extraArgsGetter(ids))
-          : isUndefined(idOrNulls[index])
-          ? arrayForEach(idNullGetters[index](...ids), (id2) =>
-              callWithIds(...ids, id2),
-            )
-          : callWithIds(...ids, idOrNulls[index]);
-      };
-      callWithIds();
-    });
+  const callListener = (id) =>
+    ifNotUndefined(
+      mapGet(allListeners, id),
+      ([listener, , path = [], pathGetters, extraArgsGetter]) => {
+        const callWithIds = (...ids) => {
+          const index = arrayLength(ids);
+          index == arrayLength(path)
+            ? listener(thing, ...ids, ...extraArgsGetter(ids))
+            : isUndefined(path[index])
+            ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
+                callWithIds(...ids, id2),
+              )
+            : callWithIds(...ids, path[index]);
+        };
+        callWithIds();
+      },
+    );
   return [addListener, callListeners, delListener, callListener];
 };
 

package/lib/debug/metrics.js

@@ -341,10 +341,22 @@ const getListenerFunctions = (getThing) => {
   let thing;
   const [getId, releaseId] = getPoolFunctions();
   const allListeners = mapNew();
-  const addListener = (listener, idSetNode, path) => {
+  const addListener = (
+    listener,
+    idSetNode,
+    path,
+    pathGetters = [],
+    extraArgsGetter = () => [],
+  ) => {
     thing ??= getThing();
     const id = getId();
-    mapSet(allListeners, id, [listener, idSetNode, path]);
+    mapSet(allListeners, id, [
+      listener,
+      idSetNode,
+      path,
+      pathGetters,
+      extraArgsGetter,
+    ]);
     setAdd(visitTree(idSetNode, path ?? [EMPTY_STRING], setNew), id);
     return id;
   };
@@ -364,20 +376,23 @@ const getListenerFunctions = (getThing) => {
       releaseId(id);
       return idOrNulls;
     });
-  const callListener = (id, idNullGetters, extraArgsGetter) =>
-    ifNotUndefined(mapGet(allListeners, id), ([listener, , idOrNulls = []]) => {
-      const callWithIds = (...ids) => {
-        const index = arrayLength(ids);
-        index == arrayLength(idOrNulls)
-          ? listener(thing, ...ids, ...extraArgsGetter(ids))
-          : isUndefined(idOrNulls[index])
-          ? arrayForEach(idNullGetters[index](...ids), (id2) =>
-              callWithIds(...ids, id2),
-            )
-          : callWithIds(...ids, idOrNulls[index]);
-      };
-      callWithIds();
-    });
+  const callListener = (id) =>
+    ifNotUndefined(
+      mapGet(allListeners, id),
+      ([listener, , path = [], pathGetters, extraArgsGetter]) => {
+        const callWithIds = (...ids) => {
+          const index = arrayLength(ids);
+          index == arrayLength(path)
+            ? listener(thing, ...ids, ...extraArgsGetter(ids))
+            : isUndefined(path[index])
+            ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
+                callWithIds(...ids, id2),
+              )
+            : callWithIds(...ids, path[index]);
+        };
+        callWithIds();
+      },
+    );
   return [addListener, callListeners, delListener, callListener];
 };