tinybase 3.2.0-beta.0 → 4.0.0-beta.1

package/lib/debug/persisters.js

@@ -1,7 +1,4 @@
-import {promises, watch} from 'fs';
-
 const EMPTY_STRING = '';
-const UTF8 = 'utf8';
 
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
@@ -14,14 +11,15 @@ const createCustomPersister = (
   store,
   getPersisted,
   setPersisted,
-  startListeningToPersisted,
-  stopListeningToPersisted,
+  addPersisterListener,
+  delPersisterListener,
 ) => {
-  let tablesListenerId;
-  let valuesListenerId;
+  let listenerId;
   let loadSave = 0;
   let loads = 0;
   let saves = 0;
+  let listening = false;
+  let listeningHandle;
   const persister = {
     load: async (initialTables, initialValues) => {
       /* istanbul ignore else */
@@ -34,9 +32,7 @@ const createCustomPersister = (
         if (!isUndefined(body) && body != EMPTY_STRING) {
           store.setJson(body);
         } else {
-          store.transaction(() =>
-            store.setTables(initialTables).setValues(initialValues),
-          );
+          store.setContent([initialTables, initialValues]);
         }
         loadSave = 0;
       }
@@ -45,11 +41,30 @@ const createCustomPersister = (
     startAutoLoad: async (initialTables, initialValues) => {
       persister.stopAutoLoad();
       await persister.load(initialTables, initialValues);
-      startListeningToPersisted(persister.load);
+      listening = true;
+      listeningHandle = addPersisterListener(async (content) => {
+        if (isUndefined(content)) {
+          await persister.load();
+        } else {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            {
+              loads++;
+            }
+            store.setContent(content);
+            loadSave = 0;
+          }
+        }
+      });
       return persister;
     },
     stopAutoLoad: () => {
-      stopListeningToPersisted();
+      if (listening) {
+        delPersisterListener(listeningHandle);
+        listeningHandle = void 0;
+        listening = false;
+      }
       return persister;
     },
     save: async () => {
@@ -59,20 +74,18 @@ const createCustomPersister = (
         {
           saves++;
         }
-        await setPersisted(store.getJson());
+        await setPersisted(store.getContent);
         loadSave = 0;
       }
       return persister;
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
-      tablesListenerId = store.addTablesListener(persister.save);
-      valuesListenerId = store.addValuesListener(persister.save);
+      listenerId = store.addDidFinishTransactionListener(persister.save);
       return persister;
     },
     stopAutoSave: () => {
-      ifNotUndefined(tablesListenerId, store.delListener);
-      ifNotUndefined(valuesListenerId, store.delListener);
+      ifNotUndefined(listenerId, store.delListener);
       return persister;
     },
     getStore: () => store,
@@ -82,116 +95,4 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-const STORAGE = 'storage';
-const WINDOW = globalThis.window;
-const getStoragePersister = (store, storageName, storage) => {
-  let listener;
-  const getPersisted = async () => storage.getItem(storageName);
-  const setPersisted = async (json) => storage.setItem(storageName, json);
-  const startListeningToPersisted = (didChange) => {
-    listener = (event) => {
-      if (event.storageArea === storage && event.key === storageName) {
-        didChange();
-      }
-    };
-    WINDOW.addEventListener(STORAGE, listener);
-  };
-  const stopListeningToPersisted = () => {
-    WINDOW.removeEventListener(STORAGE, listener);
-    listener = void 0;
-  };
-  return createCustomPersister(
-    store,
-    getPersisted,
-    setPersisted,
-    startListeningToPersisted,
-    stopListeningToPersisted,
-  );
-};
-const createLocalPersister = (store, storageName) =>
-  getStoragePersister(store, storageName, localStorage);
-const createSessionPersister = (store, storageName) =>
-  getStoragePersister(store, storageName, sessionStorage);
-
-const createFilePersister = (store, filePath) => {
-  let watcher;
-  const getPersisted = async () => {
-    try {
-      return await promises.readFile(filePath, UTF8);
-    } catch {}
-  };
-  const setPersisted = async (json) => {
-    try {
-      await promises.writeFile(filePath, json, UTF8);
-    } catch {}
-  };
-  const startListeningToPersisted = (didChange) => {
-    watcher = watch(filePath, didChange);
-  };
-  const stopListeningToPersisted = () => {
-    watcher?.close();
-    watcher = void 0;
-  };
-  return createCustomPersister(
-    store,
-    getPersisted,
-    setPersisted,
-    startListeningToPersisted,
-    stopListeningToPersisted,
-  );
-};
-
-const getETag = (response) => response.headers.get('ETag');
-const createRemotePersister = (
-  store,
-  loadUrl,
-  saveUrl,
-  autoLoadIntervalSeconds,
-) => {
-  let interval;
-  let lastEtag;
-  const getPersisted = async () => {
-    const response = await fetch(loadUrl);
-    lastEtag = getETag(response);
-    return response.text();
-  };
-  const setPersisted = async (json) =>
-    await fetch(saveUrl, {
-      method: 'POST',
-      headers: {'Content-Type': 'application/json'},
-      body: json,
-    });
-  const startListeningToPersisted = (didChange) => {
-    interval = setInterval(async () => {
-      const response = await fetch(loadUrl, {method: 'HEAD'});
-      const currentEtag = getETag(response);
-      if (
-        !isUndefined(lastEtag) &&
-        !isUndefined(currentEtag) &&
-        currentEtag != lastEtag
-      ) {
-        lastEtag = currentEtag;
-        didChange();
-      }
-    }, autoLoadIntervalSeconds * 1e3);
-  };
-  const stopListeningToPersisted = () => {
-    ifNotUndefined(interval, clearInterval);
-    interval = void 0;
-  };
-  return createCustomPersister(
-    store,
-    getPersisted,
-    setPersisted,
-    startListeningToPersisted,
-    stopListeningToPersisted,
-  );
-};
-
-export {
-  createCustomPersister,
-  createFilePersister,
-  createLocalPersister,
-  createRemotePersister,
-  createSessionPersister,
-};
+export {createCustomPersister};

package/lib/debug/relationships.js

@@ -238,7 +238,7 @@ const getPoolFunctions = () => {
   const pool = [];
   let nextId = 0;
   return [
-    () => arrayShift(pool) ?? EMPTY_STRING + nextId++,
+    (reuse) => (reuse ? arrayShift(pool) : null) ?? EMPTY_STRING + nextId++,
     (id) => {
       if (test(INTEGER, id) && arrayLength(pool) < 1e3) {
         arrayPush(pool, id);
@@ -270,7 +270,7 @@ const getListenerFunctions = (getThing) => {
     extraArgsGetter = () => [],
   ) => {
     thing ??= getThing();
-    const id = getId();
+    const id = getId(1);
     mapSet(allListeners, id, [
       listener,
       idSetNode,

package/lib/debug/store.js

@@ -141,7 +141,7 @@ const getPoolFunctions = () => {
   const pool = [];
   let nextId = 0;
   return [
-    () => arrayShift(pool) ?? EMPTY_STRING + nextId++,
+    (reuse) => (reuse ? arrayShift(pool) : null) ?? EMPTY_STRING + nextId++,
     (id) => {
       if (test(INTEGER, id) && arrayLength(pool) < 1e3) {
         arrayPush(pool, id);
@@ -173,7 +173,7 @@ const getListenerFunctions = (getThing) => {
     extraArgsGetter = () => [],
   ) => {
     thing ??= getThing();
-    const id = getId();
+    const id = getId(1);
     mapSet(allListeners, id, [
       listener,
       idSetNode,
@@ -548,13 +548,13 @@ const createStore = () => {
       mapSet(valuesMap, valueId, value);
     }
   };
-  const getNewRowId = (tableId) => {
+  const getNewRowId = (tableId, reuse) => {
     const [getId] = mapEnsure(tablePoolFunctions, tableId, getPoolFunctions);
-    const rowId = getId();
+    const rowId = getId(reuse);
     if (!collHas(mapGet(tablesMap, tableId), rowId)) {
       return rowId;
     }
-    return getNewRowId(tableId);
+    return getNewRowId(tableId, reuse);
   };
   const getOrCreateTable = (tableId) =>
     mapGet(tablesMap, tableId) ?? setValidTable(tableId, {});
@@ -822,6 +822,7 @@ const createStore = () => {
     transaction(() => actions(...arrayMap(args, id)));
     return store;
   };
+  const getContent = () => [getTables(), getValues()];
   const getTables = () =>
     mapToObj(tablesMap, (table) => mapToObj(table, mapToObj));
   const getTableIds = () => mapKeys(tablesMap);
@@ -867,6 +868,11 @@ const createStore = () => {
   const getTablesSchemaJson = () => jsonString(tablesSchemaMap);
   const getValuesSchemaJson = () => jsonString(valuesSchemaMap);
   const getSchemaJson = () => jsonString([tablesSchemaMap, valuesSchemaMap]);
+  const setContent = ([tables, values]) =>
+    fluentTransaction(() => {
+      setTables(tables);
+      setValues(values);
+    });
   const setTables = (tables) =>
     fluentTransaction(() =>
       validateTables(tables) ? setValidTables(tables) : 0,
@@ -886,7 +892,7 @@ const createStore = () => {
       tableId,
       rowId,
     );
-  const addRow = (tableId, row) =>
+  const addRow = (tableId, row, reuseRowIds = true) =>
     transaction(() => {
       let rowId = void 0;
       if (validateRow(tableId, rowId, row)) {
@@ -894,7 +900,7 @@ const createStore = () => {
         setValidRow(
           tableId,
           getOrCreateTable(tableId),
-          (rowId = getNewRowId(tableId)),
+          (rowId = getNewRowId(tableId, reuseRowIds ? 1 : 0)),
           row,
         );
       }
@@ -1099,32 +1105,36 @@ const createStore = () => {
           callKeyedValuesListenersForChanges(1);
         }
         transactions = -1;
-        if (
-          doRollback?.(
-            mapToObj(
-              changedCells,
-              (table) =>
+        let transactionChanges =
+          doRollback ||
+          !collIsEmpty(finishTransactionListeners[0]) ||
+          !collIsEmpty(finishTransactionListeners[1])
+            ? [
                 mapToObj(
-                  table,
-                  (row) =>
+                  changedCells,
+                  (table) =>
                     mapToObj(
-                      row,
-                      (cells) => [...cells],
-                      ([oldCell, newCell]) => oldCell === newCell,
+                      table,
+                      (row) =>
+                        mapToObj(
+                          row,
+                          (cells) => [...cells],
+                          ([oldCell, newCell]) => oldCell === newCell,
+                        ),
+                      objIsEmpty,
                     ),
                   objIsEmpty,
                 ),
-              objIsEmpty,
-            ),
-            mapToObj(invalidCells, (map) => mapToObj(map, mapToObj)),
-            mapToObj(
-              changedValues,
-              (values) => [...values],
-              ([oldValue, newValue]) => oldValue === newValue,
-            ),
-            mapToObj(invalidValues),
-          )
-        ) {
+                mapToObj(invalidCells, (map) => mapToObj(map, mapToObj)),
+                mapToObj(
+                  changedValues,
+                  (values) => [...values],
+                  ([oldValue, newValue]) => oldValue === newValue,
+                ),
+                mapToObj(invalidValues),
+              ]
+            : [{}, {}, {}, {}];
+        if (doRollback?.(...transactionChanges)) {
           transactions = 1;
           collForEach(changedCells, (table, tableId) =>
             collForEach(table, (row, rowId) =>
@@ -1138,12 +1148,14 @@ const createStore = () => {
           );
           transactions = -1;
           cellsTouched = valuesTouched = false;
+          transactionChanges = [{}, {}, {}, {}];
         }
         callListeners(
           finishTransactionListeners[0],
           void 0,
           cellsTouched,
           valuesTouched,
+          ...transactionChanges,
         );
         callInvalidCellListeners(0);
         if (cellsTouched) {
@@ -1158,6 +1170,7 @@ const createStore = () => {
           void 0,
           cellsTouched,
           valuesTouched,
+          ...transactionChanges,
         );
         transactions = 0;
         arrayForEach(
@@ -1266,6 +1279,7 @@ const createStore = () => {
     transaction: pairCollSize2(finishTransactionListeners),
   });
   const store = {
+    getContent,
     getTables,
     getTableIds,
     getTable,
@@ -1289,6 +1303,7 @@ const createStore = () => {
     getTablesSchemaJson,
     getValuesSchemaJson,
     getSchemaJson,
+    setContent,
     setTables,
     setTable,
     setRow,