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

package/with-schemas/index.js

@@ -339,14 +339,12 @@ const getDefinableFunctions = (
       const newRowValue = hasRow(tableId, rowId)
         ? validateRowValue(getRowValue(getCell, rowId))
         : void 0;
-      if (
-        !(
-          oldRowValue === newRowValue ||
-          (isArray(oldRowValue) &&
-            isArray(newRowValue) &&
-            arrayIsEqual(oldRowValue, newRowValue))
-        )
-      ) {
+      if (!(
+        oldRowValue === newRowValue ||
+        (isArray(oldRowValue) &&
+          isArray(newRowValue) &&
+          arrayIsEqual(oldRowValue, newRowValue))
+      )) {
         mapSet(changedRowValues, rowId, [oldRowValue, newRowValue]);
       }
       if (!isUndefined(getSortKey)) {
@@ -1227,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();
@@ -1402,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) => {
@@ -1418,6 +1428,7 @@ const createStore = () => {
       collForEach(valuesDefaulted, (value, valueId) => {
         if (!objHas(values, valueId)) {
           values[valueId] = value;
+          setAdd(defaultedValues, valueId);
         }
       });
       collForEach(valuesNonDefaulted, (valueId) => {
@@ -1821,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(
@@ -2620,9 +2647,11 @@ const createStore = () => {
             changedRowIds,
             changedCellIds,
             changedCells,
+            defaultedCells,
             invalidCells,
             changedValueIds,
             changedValues,
+            defaultedValues,
             invalidValues,
           ],
           collClear,
@@ -3127,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,
@@ -3145,7 +3181,9 @@ const createMergeableStore = (uniqueId, getNow) => {
                   {
                     [cellId]: [
                       newCell,
-                      defaultingContent ? EMPTY_STRING : getNextHlc(),
+                      defaultingContent || defaulted
+                        ? EMPTY_STRING
+                        : getNextHlc(),
                     ],
                   },
                 ],
@@ -3158,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) {
@@ -3170,7 +3208,7 @@ const createMergeableStore = (uniqueId, getNow) => {
           {
             [valueId]: [
               newValue,
-              defaultingContent ? EMPTY_STRING : getNextHlc(),
+              defaultingContent || defaulted ? EMPTY_STRING : getNextHlc(),
             ],
           },
         ],
@@ -3753,9 +3791,9 @@ const PARAMS_TABLE = '_';
 const PARAM_LISTENER_PREFIX = 'p';
 const createQueries = getCreateFunction((store) => {
   const createStore = store._[0];
-  const preStore = createStore();
   const paramStore = createStore();
   const resultStore = createStore();
+  const preStores = mapNew();
   const resultStores = mapNew();
   const redefiningQueryIds = setNew();
   const routedResultListeners = mapNew();
@@ -3798,12 +3836,13 @@ const createQueries = getCreateFunction((store) => {
   );
   const getResultStore = (queryId) =>
     mapEnsure(resultStores, queryId, createStore);
-  const addPreStoreListener = (preStore2, queryId, ...listenerIds) =>
+  const getPreStore = (queryId) => mapEnsure(preStores, queryId, createStore);
+  const addPreStoreListener = (preStore, queryId, ...listenerIds) =>
     arrayForEach(listenerIds, (listenerId) =>
       setAdd(
         mapEnsure(
           mapEnsure(preStoreListenerIds, queryId, mapNew),
-          preStore2,
+          preStore,
           setNew,
         ),
         listenerId,
@@ -3813,16 +3852,17 @@ const createQueries = getCreateFunction((store) => {
     ifNotUndefined(
       mapGet(preStoreListenerIds, queryId),
       (queryPreStoreListenerIds) => {
-        mapForEach(queryPreStoreListenerIds, (preStore2, listenerIds) =>
+        mapForEach(queryPreStoreListenerIds, (preStore, listenerIds) =>
           collForEach(listenerIds, (listenerId) =>
-            preStore2.delListener(listenerId),
+            preStore.delListener(listenerId),
           ),
         );
         collClear(queryPreStoreListenerIds);
       },
     );
-    arrayForEach([getResultStore(queryId), preStore], (store2) =>
-      store2.delTable(queryId),
+    arrayForEach(
+      [getResultStore(queryId), mapGet(preStores, queryId)],
+      (store2) => store2?.delTable(queryId),
     );
   };
   const addSourceStoreListeners = (
@@ -4050,10 +4090,12 @@ const createQueries = getCreateFunction((store) => {
           ),
         );
         const groups = mapNew(groupEntries);
-        let selectJoinWhereStore = preStore;
-        if (collIsEmpty(groups) && arrayIsEmpty(havings)) {
-          selectJoinWhereStore = resultStore2;
-        } else {
+        const hasGroupsOrHavings =
+          !collIsEmpty(groups) || !arrayIsEmpty(havings);
+        const selectJoinWhereStore = hasGroupsOrHavings
+          ? getPreStore(queryId)
+          : resultStore2;
+        if (hasGroupsOrHavings) {
           synchronizeTransactions(queryId, selectJoinWhereStore, resultStore2);
           const groupedSelectedCellIds = mapNew();
           mapForEach(groups, (groupedCellId, [selectedCellId, aggregators]) =>