tinybase 5.0.0-beta.0 → 5.0.0-beta.10

package/lib/debug/checkpoints.js

@@ -36,9 +36,11 @@ const mapForEach = (map, cb) =>
   collForEach(map, (value, key) => cb(key, value));
 const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
-const mapEnsure = (map, key, getDefaultValue) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
@@ -79,13 +81,15 @@ const setNew = (entryOrEntries) =>
   );
 const setAdd = (set, value) => set?.add(value);
 
-const getCreateFunction = (getFunction) => {
-  const getFunctionsByStore = /* @__PURE__ */ new WeakMap();
+const getCreateFunction = (getFunction, initFunction) => {
+  const thingsByStore = /* @__PURE__ */ new WeakMap();
   return (store) => {
-    if (!getFunctionsByStore.has(store)) {
-      getFunctionsByStore.set(store, getFunction(store));
+    if (!thingsByStore.has(store)) {
+      thingsByStore.set(store, getFunction(store));
     }
-    return getFunctionsByStore.get(store);
+    const thing = thingsByStore.get(store);
+    initFunction?.(thing);
+    return thing;
   };
 };
 
@@ -173,240 +177,255 @@ const getListenerFunctions = (getThing) => {
   return [addListener, callListeners, delListener, callListener];
 };
 
-const createCheckpoints = getCreateFunction((store) => {
-  let backwardIdsSize = 100;
-  let currentId;
-  let cellsDelta = mapNew();
-  let valuesDelta = mapNew();
-  let listening = 1;
-  let nextCheckpointId;
-  let checkpointsChanged;
-  const checkpointIdsListeners = mapNew();
-  const checkpointListeners = mapNew();
-  const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
-    () => checkpoints,
-  );
-  const deltas = mapNew();
-  const labels = mapNew();
-  const backwardIds = [];
-  const forwardIds = [];
-  const updateStore = (oldOrNew, checkpointId) => {
-    listening = 0;
-    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]),
+const createCheckpoints = getCreateFunction(
+  (store) => {
+    let backwardIdsSize = 100;
+    let currentId;
+    let cellsDelta = mapNew();
+    let valuesDelta = mapNew();
+    let listening = 1;
+    let nextCheckpointId;
+    let checkpointsChanged;
+    const checkpointIdsListeners = mapNew();
+    const checkpointListeners = mapNew();
+    const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
+      () => checkpoints,
+    );
+    const deltas = mapNew();
+    const labels = mapNew();
+    const backwardIds = [];
+    const forwardIds = [];
+    const updateStore = (oldOrNew, checkpointId) => {
+      listening = 0;
+      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]),
+        );
+        collForEach(valuesDelta2, (oldNew, valueId) =>
+          setOrDelValue(store, valueId, oldNew[oldOrNew]),
+        );
+      });
+      listening = 1;
+    };
+    const clearCheckpointId = (checkpointId) => {
+      mapSet(deltas, checkpointId);
+      mapSet(labels, checkpointId);
+      callListeners(checkpointListeners, [checkpointId]);
+    };
+    const clearCheckpointIds = (checkpointIds, to) =>
+      arrayForEach(
+        arrayClear(checkpointIds, to ?? size(checkpointIds)),
+        clearCheckpointId,
       );
-    });
-    listening = 1;
-  };
-  const clearCheckpointId = (checkpointId) => {
-    mapSet(deltas, checkpointId);
-    mapSet(labels, checkpointId);
-    callListeners(checkpointListeners, [checkpointId]);
-  };
-  const clearCheckpointIds = (checkpointIds, to) =>
-    arrayForEach(
-      arrayClear(checkpointIds, to ?? size(checkpointIds)),
-      clearCheckpointId,
-    );
-  const trimBackwardsIds = () =>
-    clearCheckpointIds(backwardIds, size(backwardIds) - backwardIdsSize);
-  const storeChanged = () =>
-    ifNotUndefined(currentId, () => {
-      arrayPush(backwardIds, currentId);
-      trimBackwardsIds();
-      clearCheckpointIds(forwardIds);
-      currentId = void 0;
+    const trimBackwardsIds = () =>
+      clearCheckpointIds(backwardIds, size(backwardIds) - backwardIdsSize);
+    const storeChanged = () =>
+      ifNotUndefined(currentId, () => {
+        arrayPush(backwardIds, currentId);
+        trimBackwardsIds();
+        clearCheckpointIds(forwardIds);
+        currentId = void 0;
+        checkpointsChanged = 1;
+      });
+    const storeUnchanged = () => {
+      currentId = arrayPop(backwardIds);
       checkpointsChanged = 1;
-    });
-  const storeUnchanged = () => {
-    currentId = arrayPop(backwardIds);
-    checkpointsChanged = 1;
-  };
-  const cellListenerId = store.addCellListener(
-    null,
-    null,
-    null,
-    (_store, tableId, rowId, cellId, newCell, oldCell) => {
-      if (listening) {
-        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 &&
-          collIsEmpty(mapSet(row, cellId)) &&
-          collIsEmpty(mapSet(table, rowId)) &&
-          collIsEmpty(mapSet(cellsDelta, tableId))
-        ) {
-          storeUnchanged();
-        }
-        callListenersIfChanged();
+    };
+    let cellListenerId;
+    let valueListenerId;
+    const addCheckpointImpl = (label = EMPTY_STRING) => {
+      if (isUndefined(currentId)) {
+        currentId = EMPTY_STRING + nextCheckpointId++;
+        mapSet(deltas, currentId, [cellsDelta, valuesDelta]);
+        setCheckpoint(currentId, label);
+        cellsDelta = mapNew();
+        valuesDelta = mapNew();
+        checkpointsChanged = 1;
       }
-    },
-  );
-  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();
+      return currentId;
+    };
+    const goBackwardImpl = () => {
+      if (!arrayIsEmpty(backwardIds)) {
+        arrayUnshift(forwardIds, addCheckpointImpl());
+        updateStore(0, currentId);
+        currentId = arrayPop(backwardIds);
+        checkpointsChanged = 1;
       }
-    },
-  );
-  const addCheckpointImpl = (label = EMPTY_STRING) => {
-    if (isUndefined(currentId)) {
-      currentId = EMPTY_STRING + nextCheckpointId++;
-      mapSet(deltas, currentId, [cellsDelta, valuesDelta]);
-      setCheckpoint(currentId, label);
-      cellsDelta = mapNew();
-      valuesDelta = mapNew();
-      checkpointsChanged = 1;
-    }
-    return currentId;
-  };
-  const goBackwardImpl = () => {
-    if (!arrayIsEmpty(backwardIds)) {
-      arrayUnshift(forwardIds, addCheckpointImpl());
-      updateStore(0, currentId);
-      currentId = arrayPop(backwardIds);
-      checkpointsChanged = 1;
-    }
-  };
-  const goForwardImpl = () => {
-    if (!arrayIsEmpty(forwardIds)) {
-      arrayPush(backwardIds, currentId);
-      currentId = arrayShift(forwardIds);
-      updateStore(1, currentId);
-      checkpointsChanged = 1;
-    }
-  };
-  const callListenersIfChanged = () => {
-    if (checkpointsChanged) {
-      callListeners(checkpointIdsListeners);
-      checkpointsChanged = 0;
-    }
-  };
-  const setSize = (size2) => {
-    backwardIdsSize = size2;
-    trimBackwardsIds();
-    return checkpoints;
-  };
-  const addCheckpoint = (label) => {
-    const id = addCheckpointImpl(label);
-    callListenersIfChanged();
-    return id;
-  };
-  const setCheckpoint = (checkpointId, label) => {
-    if (hasCheckpoint(checkpointId) && mapGet(labels, checkpointId) !== label) {
-      mapSet(labels, checkpointId, label);
-      callListeners(checkpointListeners, [checkpointId]);
-    }
-    return checkpoints;
-  };
-  const getStore = () => store;
-  const getCheckpointIds = () => [[...backwardIds], currentId, [...forwardIds]];
-  const forEachCheckpoint = (checkpointCallback) =>
-    mapForEach(labels, checkpointCallback);
-  const hasCheckpoint = (checkpointId) => collHas(deltas, checkpointId);
-  const getCheckpoint = (checkpointId) => mapGet(labels, checkpointId);
-  const goBackward = () => {
-    goBackwardImpl();
-    callListenersIfChanged();
-    return checkpoints;
-  };
-  const goForward = () => {
-    goForwardImpl();
-    callListenersIfChanged();
-    return checkpoints;
-  };
-  const goTo = (checkpointId) => {
-    const action = arrayHas(backwardIds, checkpointId)
-      ? goBackwardImpl
-      : arrayHas(forwardIds, checkpointId)
-        ? goForwardImpl
-        : null;
-    while (!isUndefined(action) && checkpointId != currentId) {
-      action();
-    }
-    callListenersIfChanged();
-    return checkpoints;
-  };
-  const addCheckpointIdsListener = (listener) =>
-    addListener(listener, checkpointIdsListeners);
-  const addCheckpointListener = (checkpointId, listener) =>
-    addListener(listener, checkpointListeners, [checkpointId]);
-  const delListener = (listenerId) => {
-    delListenerImpl(listenerId);
-    return checkpoints;
-  };
-  const clear = () => {
-    clearCheckpointIds(backwardIds);
-    clearCheckpointIds(forwardIds);
-    if (!isUndefined(currentId)) {
-      clearCheckpointId(currentId);
-    }
-    currentId = void 0;
-    nextCheckpointId = 0;
-    addCheckpoint();
-    return checkpoints;
-  };
-  const clearForward = () => {
-    if (!arrayIsEmpty(forwardIds)) {
+    };
+    const goForwardImpl = () => {
+      if (!arrayIsEmpty(forwardIds)) {
+        arrayPush(backwardIds, currentId);
+        currentId = arrayShift(forwardIds);
+        updateStore(1, currentId);
+        checkpointsChanged = 1;
+      }
+    };
+    const callListenersIfChanged = () => {
+      if (checkpointsChanged) {
+        callListeners(checkpointIdsListeners);
+        checkpointsChanged = 0;
+      }
+    };
+    const setSize = (size2) => {
+      backwardIdsSize = size2;
+      trimBackwardsIds();
+      return checkpoints;
+    };
+    const addCheckpoint = (label) => {
+      const id = addCheckpointImpl(label);
+      callListenersIfChanged();
+      return id;
+    };
+    const setCheckpoint = (checkpointId, label) => {
+      if (
+        hasCheckpoint(checkpointId) &&
+        mapGet(labels, checkpointId) !== label
+      ) {
+        mapSet(labels, checkpointId, label);
+        callListeners(checkpointListeners, [checkpointId]);
+      }
+      return checkpoints;
+    };
+    const getStore = () => store;
+    const getCheckpointIds = () => [
+      [...backwardIds],
+      currentId,
+      [...forwardIds],
+    ];
+    const forEachCheckpoint = (checkpointCallback) =>
+      mapForEach(labels, checkpointCallback);
+    const hasCheckpoint = (checkpointId) => collHas(deltas, checkpointId);
+    const getCheckpoint = (checkpointId) => mapGet(labels, checkpointId);
+    const goBackward = () => {
+      goBackwardImpl();
+      callListenersIfChanged();
+      return checkpoints;
+    };
+    const goForward = () => {
+      goForwardImpl();
+      callListenersIfChanged();
+      return checkpoints;
+    };
+    const goTo = (checkpointId) => {
+      const action = arrayHas(backwardIds, checkpointId)
+        ? goBackwardImpl
+        : arrayHas(forwardIds, checkpointId)
+          ? goForwardImpl
+          : null;
+      while (!isUndefined(action) && checkpointId != currentId) {
+        action();
+      }
+      callListenersIfChanged();
+      return checkpoints;
+    };
+    const addCheckpointIdsListener = (listener) =>
+      addListener(listener, checkpointIdsListeners);
+    const addCheckpointListener = (checkpointId, listener) =>
+      addListener(listener, checkpointListeners, [checkpointId]);
+    const delListener = (listenerId) => {
+      delListenerImpl(listenerId);
+      return checkpoints;
+    };
+    const clear = () => {
+      clearCheckpointIds(backwardIds);
       clearCheckpointIds(forwardIds);
-      callListeners(checkpointIdsListeners);
-    }
-    return checkpoints;
-  };
-  const destroy = () => {
-    store.delListener(cellListenerId);
-    store.delListener(valueListenerId);
-  };
-  const getListenerStats = () => ({
-    checkpointIds: collSize2(checkpointIdsListeners),
-    checkpoint: collSize2(checkpointListeners),
-  });
-  const checkpoints = {
-    setSize,
-    addCheckpoint,
-    setCheckpoint,
-    getStore,
-    getCheckpointIds,
-    forEachCheckpoint,
-    hasCheckpoint,
-    getCheckpoint,
-    goBackward,
-    goForward,
-    goTo,
-    addCheckpointIdsListener,
-    addCheckpointListener,
-    delListener,
-    clear,
-    clearForward,
-    destroy,
-    getListenerStats,
-  };
-  return objFreeze(checkpoints.clear());
-});
+      if (!isUndefined(currentId)) {
+        clearCheckpointId(currentId);
+      }
+      currentId = void 0;
+      nextCheckpointId = 0;
+      addCheckpoint();
+      return checkpoints;
+    };
+    const clearForward = () => {
+      if (!arrayIsEmpty(forwardIds)) {
+        clearCheckpointIds(forwardIds);
+        callListeners(checkpointIdsListeners);
+      }
+      return checkpoints;
+    };
+    const destroy = () => {
+      store.delListener(cellListenerId);
+      store.delListener(valueListenerId);
+    };
+    const getListenerStats = () => ({
+      checkpointIds: collSize2(checkpointIdsListeners),
+      checkpoint: collSize2(checkpointListeners),
+    });
+    const _registerListeners = () => {
+      cellListenerId = store.addCellListener(
+        null,
+        null,
+        null,
+        (_store, tableId, rowId, cellId, newCell, oldCell) => {
+          if (listening) {
+            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 &&
+              collIsEmpty(mapSet(row, cellId)) &&
+              collIsEmpty(mapSet(table, rowId)) &&
+              collIsEmpty(mapSet(cellsDelta, tableId))
+            ) {
+              storeUnchanged();
+            }
+            callListenersIfChanged();
+          }
+        },
+      );
+      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();
+          }
+        },
+      );
+    };
+    const checkpoints = {
+      setSize,
+      addCheckpoint,
+      setCheckpoint,
+      getStore,
+      getCheckpointIds,
+      forEachCheckpoint,
+      hasCheckpoint,
+      getCheckpoint,
+      goBackward,
+      goForward,
+      goTo,
+      addCheckpointIdsListener,
+      addCheckpointListener,
+      delListener,
+      clear,
+      clearForward,
+      destroy,
+      getListenerStats,
+      _registerListeners,
+    };
+    return objFreeze(checkpoints.clear());
+  },
+  (checkpoints) => checkpoints._registerListeners(),
+);
 
 export {createCheckpoints};

package/lib/debug/indexes.js

@@ -50,9 +50,11 @@ const mapForEach = (map, cb) =>
   collForEach(map, (value, key) => cb(key, value));
 const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
-const mapEnsure = (map, key, getDefaultValue) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
@@ -246,13 +248,15 @@ const getRowCellFunction = (getRowCell, defaultCellValue) =>
   isString(getRowCell)
     ? (getCell) => getCell(getRowCell)
     : getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING);
-const getCreateFunction = (getFunction) => {
-  const getFunctionsByStore = /* @__PURE__ */ new WeakMap();
+const getCreateFunction = (getFunction, initFunction) => {
+  const thingsByStore = /* @__PURE__ */ new WeakMap();
   return (store) => {
-    if (!getFunctionsByStore.has(store)) {
-      getFunctionsByStore.set(store, getFunction(store));
+    if (!thingsByStore.has(store)) {
+      thingsByStore.set(store, getFunction(store));
     }
-    return getFunctionsByStore.get(store);
+    const thing = thingsByStore.get(store);
+    initFunction?.(thing);
+    return thing;
   };
 };