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

package/@types/mergeable-store/index.d.ts

@@ -1097,19 +1097,19 @@ export interface MergeableStore extends Store {
  *         {
  *           fido: [
  *             {
- *               sold: [false, 'Nn1JUF----2FnHIC', 2603026204],
+ *               sold: [false, '', 3177411910],
  *               species: ['dog', 'Nn1JUF----1FnHIC', 2817056260],
  *             },
  *             '',
- *             2859424112,
+ *             3078067457,
  *           ],
  *         },
  *         '',
- *         1640515891,
+ *         1137907280,
  *       ],
  *     },
  *     '',
- *     2077041985,
+ *     401719767,
  *   ],
  *   [{}, '', 0],
  * ];

package/@types/mergeable-store/with-schemas/index.d.ts

@@ -91,12 +91,14 @@ export type ContentHashes = [tablesHash: Hash, valuesHash: Hash];
 export type TablesStamp<
   Schema extends OptionalTablesSchema,
   Hashed extends boolean = false,
+  WhenSet extends boolean = false,
 > = Stamp<
   {
     [TableId in TableIdFromSchema<Schema>]?: TableStamp<
       Schema,
       TableId,
-      Hashed
+      Hashed,
+      WhenSet
     >;
   },
   Hashed
@@ -146,7 +148,8 @@ export type TableStamp<
   Schema extends OptionalTablesSchema,
   TableId extends TableIdFromSchema<Schema>,
   Hashed extends boolean = false,
-> = Stamp<{[rowId: Id]: RowStamp<Schema, TableId, Hashed>}, Hashed>;
+  WhenSet extends boolean = false,
+> = Stamp<{[rowId: Id]: RowStamp<Schema, TableId, Hashed, WhenSet>}, Hashed>;
 
 /**
  * The RowHashes type is used to quickly compare the content of two sets of Row
@@ -192,13 +195,15 @@ export type RowStamp<
   Schema extends OptionalTablesSchema,
   TableId extends TableIdFromSchema<Schema>,
   Hashed extends boolean = false,
+  WhenSet extends boolean = false,
 > = Stamp<
   {
     [CellId in CellIdFromSchema<Schema, TableId>]?: CellStamp<
       Schema,
       TableId,
       CellId,
-      Hashed
+      Hashed,
+      WhenSet
     >;
   },
   Hashed
@@ -251,7 +256,13 @@ export type CellStamp<
   TableId extends TableIdFromSchema<Schema>,
   CellId extends CellIdFromSchema<Schema, TableId>,
   Hashed extends boolean = false,
-> = Stamp<CellOrUndefined<Schema, TableId, CellId>, Hashed>;
+  WhenSet extends boolean = false,
+> = Stamp<
+  WhenSet extends true
+    ? CellOrUndefined<Schema, TableId, CellId>
+    : CellOrUndefined<Schema, TableId, CellId>,
+  Hashed
+>;
 
 /**
  * The ValuesStamp type is used as metadata to decide how to merge two different
@@ -274,12 +285,14 @@ export type CellStamp<
 export type ValuesStamp<
   Schema extends OptionalValuesSchema,
   Hashed extends boolean = false,
+  WhenSet extends boolean = false,
 > = Stamp<
   {
     [ValueId in ValueIdFromSchema<Schema>]?: ValueStamp<
       Schema,
       ValueId,
-      Hashed
+      Hashed,
+      WhenSet
     >;
   },
   Hashed
@@ -329,7 +342,13 @@ export type ValueStamp<
   Schema extends OptionalValuesSchema,
   ValueId extends ValueIdFromSchema<Schema>,
   Hashed extends boolean = false,
-> = Stamp<ValueOrUndefined<Schema, ValueId>, Hashed>;
+  WhenSet extends boolean = false,
+> = Stamp<
+  WhenSet extends true
+    ? ValueOrUndefined<Schema, ValueId>
+    : ValueOrUndefined<Schema, ValueId>,
+  Hashed
+>;
 
 /**
  * The MergeableContent type represents the content of a MergeableStore and the
@@ -352,9 +371,12 @@ export type ValueStamp<
  * @category Mergeable
  * @since v5.0.0
  */
-export type MergeableContent<Schemas extends OptionalSchemas> = [
-  mergeableTables: TablesStamp<Schemas[0], true>,
-  mergeableValues: ValuesStamp<Schemas[1], true>,
+export type MergeableContent<
+  Schemas extends OptionalSchemas,
+  WhenSet extends boolean = false,
+> = [
+  mergeableTables: TablesStamp<Schemas[0], true, WhenSet>,
+  mergeableValues: ValuesStamp<Schemas[1], true, WhenSet>,
 ];
 
 /**
@@ -384,9 +406,10 @@ export type MergeableContent<Schemas extends OptionalSchemas> = [
 export type MergeableChanges<
   Schemas extends OptionalSchemas,
   Hashed extends boolean = false,
+  WhenSet extends boolean = false,
 > = [
-  mergeableTables: TablesStamp<Schemas[0], Hashed>,
-  mergeableValues: ValuesStamp<Schemas[1], Hashed>,
+  mergeableTables: TablesStamp<Schemas[0], Hashed, WhenSet>,
+  mergeableValues: ValuesStamp<Schemas[1], Hashed, WhenSet>,
   isChanges: 1,
 ];
 
@@ -1017,7 +1040,7 @@ export interface MergeableStore<
    * @since v5.0.0
    */
   setMergeableContent(
-    mergeableContent: MergeableContent<Schemas>,
+    mergeableContent: MergeableContent<Schemas, true>,
   ): MergeableStore<Schemas>;
 
   /**
@@ -1161,7 +1184,8 @@ export interface MergeableStore<
    * @since v5.0.0
    */
   applyMergeableChanges(
-    mergeableChanges: MergeableChanges<Schemas> | MergeableContent<Schemas>,
+    mergeableChanges:
+      MergeableChanges<Schemas, false, true> | MergeableContent<Schemas, true>,
   ): MergeableStore<Schemas>;
 
   /**
@@ -1590,19 +1614,19 @@ export interface MergeableStore<
  *         {
  *           fido: [
  *             {
- *               sold: [false, 'Nn1JUF----2FnHIC', 2603026204],
+ *               sold: [false, '', 3177411910],
  *               species: ['dog', 'Nn1JUF----1FnHIC', 2817056260],
  *             },
  *             '',
- *             2859424112,
+ *             3078067457,
  *           ],
  *         },
  *         '',
- *         1640515891,
+ *         1137907280,
  *       ],
  *     },
  *     '',
- *     2077041985,
+ *     401719767,
  *   ],
  *   [{}, '', 0],
  * ];

package/@types/persisters/index.d.ts

@@ -1760,7 +1760,8 @@ export type DatabaseChangeListener = (tableName: string) => void;
  * `stopListeningToPersisted` has been renamed `delPersisterListener`.
  * @param store The Store to persist.
  * @param getPersisted An asynchronous function which will fetch content from
- * the persistence layer (or `undefined` if not present).
+ * the persistence layer. If it returns `undefined`, the load will use the
+ * provided initial content if present, and otherwise leave the Store unchanged.
  * @param setPersisted An asynchronous function which will send content to the
  * persistence layer. Since v4.0, it receives functions for getting the Store
  * content and information about the changes made during a transaction. Since

package/@types/persisters/with-schemas/index.d.ts

@@ -202,11 +202,12 @@ export type PersistedStore<
 export type PersistedContent<
   Schemas extends OptionalSchemas,
   Persist extends Persists = Persists.StoreOnly,
+  WhenSet extends boolean = false,
 > = Persist extends Persists.StoreOrMergeableStore
-  ? Content<Schemas> | MergeableContent<Schemas>
+  ? Content<Schemas, WhenSet> | MergeableContent<Schemas, WhenSet>
   : Persist extends Persists.MergeableStoreOnly
-    ? MergeableContent<Schemas>
-    : Content<Schemas>;
+    ? MergeableContent<Schemas, WhenSet>
+    : Content<Schemas, WhenSet>;
 
 /**
  * The PersistedChanges type is a generic representation of changes made to the
@@ -235,10 +236,11 @@ export type PersistedContent<
 export type PersistedChanges<
   Schemas extends OptionalSchemas,
   Persist extends Persists = Persists.StoreOnly,
+  WhenSet extends boolean = false,
 > = Persist extends Persists.StoreOrMergeableStore
-  ? Changes<Schemas> | MergeableChanges<Schemas>
+  ? Changes<Schemas> | MergeableChanges<Schemas, false, WhenSet>
   : Persist extends Persists.MergeableStoreOnly
-    ? MergeableChanges<Schemas>
+    ? MergeableChanges<Schemas, false, WhenSet>
     : Changes<Schemas>;
 
 /**
@@ -275,9 +277,10 @@ export type PersistedChanges<
 export type PersisterListener<
   Schemas extends OptionalSchemas,
   Persist extends Persists = Persists.StoreOnly,
+  WhenSet extends boolean = false,
 > = (
-  content?: PersistedContent<Schemas, Persist>,
-  changes?: PersistedChanges<Schemas, Persist>,
+  content?: PersistedContent<Schemas, Persist, WhenSet>,
+  changes?: PersistedChanges<Schemas, Persist, WhenSet>,
 ) => void;
 
 /**
@@ -1916,7 +1919,8 @@ export type DatabaseChangeListener = (tableName: string) => void;
  * `stopListeningToPersisted` has been renamed `delPersisterListener`.
  * @param store The Store to persist.
  * @param getPersisted An asynchronous function which will fetch content from
- * the persistence layer (or `undefined` if not present).
+ * the persistence layer. If it returns `undefined`, the load will use the
+ * provided initial content if present, and otherwise leave the Store unchanged.
  * @param setPersisted An asynchronous function which will send content to the
  * persistence layer. Since v4.0, it receives functions for getting the Store
  * content and information about the changes made during a transaction. Since
@@ -2052,13 +2056,15 @@ export function createCustomPersister<
   Persist extends Persists = Persists.StoreOnly,
 >(
   store: PersistedStore<Schemas, Persist>,
-  getPersisted: () => Promise<PersistedContent<Schemas, Persist> | undefined>,
+  getPersisted: () => Promise<
+    PersistedContent<Schemas, Persist, true> | undefined
+  >,
   setPersisted: (
     getContent: () => PersistedContent<Schemas, Persist>,
     changes?: PersistedChanges<Schemas, Persist>,
   ) => Promise<void>,
   addPersisterListener: (
-    listener: PersisterListener<Schemas, Persist>,
+    listener: PersisterListener<Schemas, Persist, true>,
   ) => ListenerHandle | Promise<ListenerHandle>,
   delPersisterListener: (
     listenerHandle: ListenerHandle,

package/@types/queries/index.d.ts

@@ -855,6 +855,10 @@ export type Param = (paramId: Id) => ParamValue | undefined;
  * The Select function is provided to the third `query` parameter of the
  * setQueryDefinition method. A query definition must call the Select function
  * at least once, otherwise it will be meaningless and return no data.
+ *
+ * A Row will only appear in the ResultTable if at least one Select clause
+ * produces a defined value for it. If all selected Cells or calculated values
+ * resolve to `undefined`, no ResultRow is created for that Row.
  * @example
  * This example shows a query that selects two Cells from the main query Table.
  *

package/@types/queries/with-schemas/index.d.ts

@@ -991,6 +991,10 @@ export type Param = (paramId: Id) => ParamValue | undefined;
  * The Select function is provided to the third `query` parameter of the
  * setQueryDefinition method. A query definition must call the Select function
  * at least once, otherwise it will be meaningless and return no data.
+ *
+ * A Row will only appear in the ResultTable if at least one Select clause
+ * produces a defined value for it. If all selected Cells or calculated values
+ * resolve to `undefined`, no ResultRow is created for that Row.
  * @example
  * This example shows a query that selects two Cells from the main query Table.
  *

package/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(),
             ],
           },
         ],

package/mergeable-store/index.js

@@ -557,8 +557,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();
@@ -732,6 +734,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) => {
@@ -748,6 +760,7 @@ const createStore = () => {
       collForEach(valuesDefaulted, (value, valueId) => {
         if (!objHas(values, valueId)) {
           values[valueId] = value;
+          setAdd(defaultedValues, valueId);
         }
       });
       collForEach(valuesNonDefaulted, (valueId) => {
@@ -1151,18 +1164,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(
@@ -1950,9 +1979,11 @@ const createStore = () => {
             changedRowIds,
             changedCellIds,
             changedCells,
+            defaultedCells,
             invalidCells,
             changedValueIds,
             changedValues,
+            defaultedValues,
             invalidValues,
           ],
           collClear,
@@ -2457,7 +2488,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,
@@ -2475,7 +2513,9 @@ const createMergeableStore = (uniqueId, getNow) => {
                   {
                     [cellId]: [
                       newCell,
-                      defaultingContent ? EMPTY_STRING : getNextHlc(),
+                      defaultingContent || defaulted
+                        ? EMPTY_STRING
+                        : getNextHlc(),
                     ],
                   },
                 ],
@@ -2488,7 +2528,7 @@ const createMergeableStore = (uniqueId, getNow) => {
       ]);
     }
   };
-  const valueChanged = (valueId, newValue, mutating) => {
+  const valueChanged = (valueId, newValue, mutating, defaulted) => {
     setAdd(touchedValues, valueId);
     if (listeningToRawStoreChanges || mutating) {
       if (mutating) {
@@ -2500,7 +2540,7 @@ const createMergeableStore = (uniqueId, getNow) => {
           {
             [valueId]: [
               newValue,
-              defaultingContent ? EMPTY_STRING : getNextHlc(),
+              defaultingContent || defaulted ? EMPTY_STRING : getNextHlc(),
             ],
           },
         ],

package/mergeable-store/with-schemas/index.js

@@ -557,8 +557,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();
@@ -732,6 +734,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) => {
@@ -748,6 +760,7 @@ const createStore = () => {
       collForEach(valuesDefaulted, (value, valueId) => {
         if (!objHas(values, valueId)) {
           values[valueId] = value;
+          setAdd(defaultedValues, valueId);
         }
       });
       collForEach(valuesNonDefaulted, (valueId) => {
@@ -1151,18 +1164,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(
@@ -1950,9 +1979,11 @@ const createStore = () => {
             changedRowIds,
             changedCellIds,
             changedCells,
+            defaultedCells,
             invalidCells,
             changedValueIds,
             changedValues,
+            defaultedValues,
             invalidValues,
           ],
           collClear,
@@ -2457,7 +2488,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,
@@ -2475,7 +2513,9 @@ const createMergeableStore = (uniqueId, getNow) => {
                   {
                     [cellId]: [
                       newCell,
-                      defaultingContent ? EMPTY_STRING : getNextHlc(),
+                      defaultingContent || defaulted
+                        ? EMPTY_STRING
+                        : getNextHlc(),
                     ],
                   },
                 ],
@@ -2488,7 +2528,7 @@ const createMergeableStore = (uniqueId, getNow) => {
       ]);
     }
   };
-  const valueChanged = (valueId, newValue, mutating) => {
+  const valueChanged = (valueId, newValue, mutating, defaulted) => {
     setAdd(touchedValues, valueId);
     if (listeningToRawStoreChanges || mutating) {
       if (mutating) {
@@ -2500,7 +2540,7 @@ const createMergeableStore = (uniqueId, getNow) => {
           {
             [valueId]: [
               newValue,
-              defaultingContent ? EMPTY_STRING : getNextHlc(),
+              defaultingContent || defaulted ? EMPTY_STRING : getNextHlc(),
             ],
           },
         ],