tinybase 9.0.0-beta.0 → 9.0.0-beta.1

package/ui-svelte-inspector/with-schemas/index.js

@@ -907,13 +907,13 @@ const createCustomPersister = (
             const content = await getPersisted();
             if (isArray(content)) {
               setContentOrChanges(content);
-            } else if (initialContent) {
+            } else if (isUndefined(content) && initialContent) {
               setDefaultContent(initialContent);
-            } else {
+            } else if (!isUndefined(content)) {
               errorNew(`Content is not an array: ${content}`);
             }
           },
-          () => {
+          (error) => {
             if (initialContent) {
               setDefaultContent(initialContent);
             }
@@ -1166,8 +1166,10 @@ const createStore = () => {
   const changedRowIds = mapNew();
   const changedCellIds = mapNew();
   const changedCells = mapNew();
+  const defaultedCells = mapNew();
   const changedValueIds = mapNew();
   const changedValues = mapNew();
+  const defaultedValues = setNew();
   const invalidCells = mapNew();
   const invalidValues = mapNew();
   const tablesSchemaMap = mapNew();
@@ -1341,6 +1343,16 @@ const createStore = () => {
         collForEach(rowDefaulted, (cell, cellId) => {
           if (!objHas(row, cellId)) {
             row[cellId] = cell;
+            ifNotUndefined(rowId, (rowId2) =>
+              setAdd(
+                mapEnsure(
+                  mapEnsure(defaultedCells, tableId, mapNew),
+                  rowId2,
+                  setNew,
+                ),
+                cellId,
+              ),
+            );
           }
         });
         collForEach(rowNonDefaulted, (cellId) => {
@@ -1357,6 +1369,7 @@ const createStore = () => {
       collForEach(valuesDefaulted, (value, valueId) => {
         if (!objHas(values, valueId)) {
           values[valueId] = value;
+          setAdd(defaultedValues, valueId);
         }
       });
       collForEach(valuesNonDefaulted, (valueId) => {
@@ -1760,18 +1773,34 @@ const createStore = () => {
     );
   };
   const cellChanged = (tableId, rowId, cellId, oldCell, newCell) => {
+    const defaulted =
+      collHas(mapGet(mapGet(defaultedCells, tableId), rowId), cellId) &&
+      isUndefined(oldCell)
+        ? 1
+        : 0;
     mapEnsure(
       mapEnsure(mapEnsure(changedCells, tableId, mapNew), rowId, mapNew),
       cellId,
       () => [oldCell, 0],
     )[1] = newCell;
-    internalListeners[3]?.(tableId, rowId, cellId, newCell, mutating);
+    internalListeners[3]?.(
+      tableId,
+      rowId,
+      cellId,
+      newCell,
+      mutating,
+      defaulted,
+    );
+    collDel(mapGet(mapGet(defaultedCells, tableId), rowId), cellId);
   };
   const valueIdsChanged = (valueId, addedOrRemoved) =>
     idsChanged(changedValueIds, valueId, addedOrRemoved);
   const valueChanged = (valueId, oldValue, newValue) => {
+    const defaulted =
+      collHas(defaultedValues, valueId) && isUndefined(oldValue) ? 1 : 0;
     mapEnsure(changedValues, valueId, () => [oldValue, 0])[1] = newValue;
-    internalListeners[4]?.(valueId, newValue, mutating);
+    internalListeners[4]?.(valueId, newValue, mutating, defaulted);
+    collDel(defaultedValues, valueId);
   };
   const cellInvalid = (tableId, rowId, cellId, invalidCell, defaultedCell) => {
     arrayPush(
@@ -2559,9 +2588,11 @@ const createStore = () => {
             changedRowIds,
             changedCellIds,
             changedCells,
+            defaultedCells,
             invalidCells,
             changedValueIds,
             changedValues,
+            defaultedValues,
             invalidValues,
           ],
           collClear,

package/with-schemas/index.js

@@ -1225,8 +1225,10 @@ const createStore = () => {
   const changedRowIds = mapNew();
   const changedCellIds = mapNew();
   const changedCells = mapNew();
+  const defaultedCells = mapNew();
   const changedValueIds = mapNew();
   const changedValues = mapNew();
+  const defaultedValues = setNew();
   const invalidCells = mapNew();
   const invalidValues = mapNew();
   const tablesSchemaMap = mapNew();
@@ -1400,6 +1402,16 @@ const createStore = () => {
         collForEach(rowDefaulted, (cell, cellId) => {
           if (!objHas(row, cellId)) {
             row[cellId] = cell;
+            ifNotUndefined(rowId, (rowId2) =>
+              setAdd(
+                mapEnsure(
+                  mapEnsure(defaultedCells, tableId, mapNew),
+                  rowId2,
+                  setNew,
+                ),
+                cellId,
+              ),
+            );
           }
         });
         collForEach(rowNonDefaulted, (cellId) => {
@@ -1416,6 +1428,7 @@ const createStore = () => {
       collForEach(valuesDefaulted, (value, valueId) => {
         if (!objHas(values, valueId)) {
           values[valueId] = value;
+          setAdd(defaultedValues, valueId);
         }
       });
       collForEach(valuesNonDefaulted, (valueId) => {
@@ -1819,18 +1832,34 @@ const createStore = () => {
     );
   };
   const cellChanged = (tableId, rowId, cellId, oldCell, newCell) => {
+    const defaulted =
+      collHas(mapGet(mapGet(defaultedCells, tableId), rowId), cellId) &&
+      isUndefined(oldCell)
+        ? 1
+        : 0;
     mapEnsure(
       mapEnsure(mapEnsure(changedCells, tableId, mapNew), rowId, mapNew),
       cellId,
       () => [oldCell, 0],
     )[1] = newCell;
-    internalListeners[3]?.(tableId, rowId, cellId, newCell, mutating);
+    internalListeners[3]?.(
+      tableId,
+      rowId,
+      cellId,
+      newCell,
+      mutating,
+      defaulted,
+    );
+    collDel(mapGet(mapGet(defaultedCells, tableId), rowId), cellId);
   };
   const valueIdsChanged = (valueId, addedOrRemoved) =>
     idsChanged(changedValueIds, valueId, addedOrRemoved);
   const valueChanged = (valueId, oldValue, newValue) => {
+    const defaulted =
+      collHas(defaultedValues, valueId) && isUndefined(oldValue) ? 1 : 0;
     mapEnsure(changedValues, valueId, () => [oldValue, 0])[1] = newValue;
-    internalListeners[4]?.(valueId, newValue, mutating);
+    internalListeners[4]?.(valueId, newValue, mutating, defaulted);
+    collDel(defaultedValues, valueId);
   };
   const cellInvalid = (tableId, rowId, cellId, invalidCell, defaultedCell) => {
     arrayPush(
@@ -2618,9 +2647,11 @@ const createStore = () => {
             changedRowIds,
             changedCellIds,
             changedCells,
+            defaultedCells,
             invalidCells,
             changedValueIds,
             changedValues,
+            defaultedValues,
             invalidValues,
           ],
           collClear,
@@ -3125,7 +3156,14 @@ const createMergeableStore = (uniqueId, getNow) => {
     collClear(touchedCells);
     collClear(touchedValues);
   };
-  const cellChanged = (tableId, rowId, cellId, newCell, mutating) => {
+  const cellChanged = (
+    tableId,
+    rowId,
+    cellId,
+    newCell,
+    mutating,
+    defaulted,
+  ) => {
     setAdd(
       mapEnsure(mapEnsure(touchedCells, tableId, mapNew), rowId, setNew),
       cellId,
@@ -3143,7 +3181,9 @@ const createMergeableStore = (uniqueId, getNow) => {
                   {
                     [cellId]: [
                       newCell,
-                      defaultingContent ? EMPTY_STRING : getNextHlc(),
+                      defaultingContent || defaulted
+                        ? EMPTY_STRING
+                        : getNextHlc(),
                     ],
                   },
                 ],
@@ -3156,7 +3196,7 @@ const createMergeableStore = (uniqueId, getNow) => {
       ]);
     }
   };
-  const valueChanged = (valueId, newValue, mutating) => {
+  const valueChanged = (valueId, newValue, mutating, defaulted) => {
     setAdd(touchedValues, valueId);
     if (listeningToRawStoreChanges || mutating) {
       if (mutating) {
@@ -3168,7 +3208,7 @@ const createMergeableStore = (uniqueId, getNow) => {
           {
             [valueId]: [
               newValue,
-              defaultingContent ? EMPTY_STRING : getNextHlc(),
+              defaultingContent || defaulted ? EMPTY_STRING : getNextHlc(),
             ],
           },
         ],