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

package/synchronizers/synchronizer-ws-server-durable-object/index.js

@@ -18,6 +18,7 @@ const GLOBAL = globalThis;
 const THOUSAND = 1e3;
 const startTimeout = (callback, sec = 0) =>
   setTimeout(callback, sec * THOUSAND);
+const stopTimeout = clearTimeout;
 const mathFloor = math.floor;
 const mathRandom = math.random;
 const isNullish = (thing) => thing == null;
@@ -44,6 +45,7 @@ const tryCatch = async (action, then1, then2) => {
 };
 
 const arrayForEach = (array, cb) => array.forEach(cb);
+const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayIsEmpty = (array) => size(array) == 0;
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
@@ -85,38 +87,6 @@ const objEnsure = (obj, id, getDefaultValue) => {
   return obj[id];
 };
 
-const jsonString = JSON.stringify;
-const jsonParse = JSON.parse;
-const jsonStringWithUndefined = (obj) =>
-  jsonString(obj, (_key, value) => (isUndefined(value) ? UNDEFINED : value));
-const jsonParseWithUndefined = (str) =>
-  // JSON.parse reviver removes properties with undefined values
-  replaceUndefinedString(jsonParse(str));
-const replaceUndefinedString = (obj) =>
-  obj === UNDEFINED
-    ? void 0
-    : isArray(obj)
-      ? arrayMap(obj, replaceUndefinedString)
-      : isObject(obj)
-        ? objMap(obj, replaceUndefinedString)
-        : obj;
-
-const MESSAGE_SEPARATOR = '\n';
-const ifPayloadValid = (payload, then) => {
-  const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
-  if (splitAt !== -1) {
-    then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
-  }
-};
-const receivePayload = (payload, receive) =>
-  ifPayloadValid(payload, (fromClientId, remainder) =>
-    receive(fromClientId, ...jsonParseWithUndefined(remainder)),
-  );
-const createPayload = (toClientId, ...args) =>
-  createRawPayload(toClientId ?? EMPTY_STRING, jsonStringWithUndefined(args));
-const createRawPayload = (clientId, remainder) =>
-  clientId + MESSAGE_SEPARATOR + remainder;
-
 const collSize = (coll) => coll?.size ?? 0;
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
 const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
@@ -174,6 +144,105 @@ const getUniqueId = (length = 16) =>
     EMPTY_STRING,
   );
 
+const jsonString = JSON.stringify;
+const jsonParse = JSON.parse;
+const jsonStringWithUndefined = (obj) =>
+  jsonString(obj, (_key, value) => (isUndefined(value) ? UNDEFINED : value));
+const jsonParseWithUndefined = (str) =>
+  // JSON.parse reviver removes properties with undefined values
+  replaceUndefinedString(jsonParse(str));
+const replaceUndefinedString = (obj) =>
+  obj === UNDEFINED
+    ? void 0
+    : isArray(obj)
+      ? arrayMap(obj, replaceUndefinedString)
+      : isObject(obj)
+        ? objMap(obj, replaceUndefinedString)
+        : obj;
+
+const MESSAGE_SEPARATOR = '\n';
+const FRAGMENT = /^(.+)\n(\d+)\n(\d+)\n([\s\S]*)$/;
+const ifPayloadValid = (payload, then) => {
+  const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
+  if (splitAt !== -1) {
+    then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
+  }
+};
+const receivePayloadRemainder = (fromClientId, remainder, receive) =>
+  receive(fromClientId, ...jsonParseWithUndefined(remainder));
+const createPayloadReceiver = (receive, fragmentTimeoutSeconds = 1) => {
+  const buffer = mapNew();
+  const setPendingTimeout = (bufferKey) =>
+    startTimeout(() => collDel(buffer, bufferKey), fragmentTimeoutSeconds);
+  const delPending = (bufferKey, pending) => {
+    stopTimeout(pending[3]);
+    collDel(buffer, bufferKey);
+  };
+  return (payload) =>
+    ifPayloadValid(payload, (fromClientId, remainder) => {
+      const [, messageId, indexStr, totalStr, fragment] =
+        strMatch(remainder, FRAGMENT) ?? [];
+      if (messageId) {
+        const index = parseInt(indexStr);
+        const total = parseInt(totalStr);
+        if (total > 0 && index >= 0 && index < total) {
+          const bufferKey = fromClientId + MESSAGE_SEPARATOR + messageId;
+          const pending = mapEnsure(buffer, bufferKey, () => [
+            [],
+            total,
+            total,
+            setPendingTimeout(bufferKey),
+          ]);
+          const [fragments] = pending;
+          if (total == pending[2] && isUndefined(fragments[index])) {
+            stopTimeout(pending[3]);
+            pending[3] = setPendingTimeout(bufferKey);
+            fragments[index] = fragment;
+            pending[1]--;
+          }
+          if (pending[1] == 0) {
+            delPending(bufferKey, pending);
+            receivePayloadRemainder(
+              fromClientId,
+              arrayJoin(fragments),
+              receive,
+            );
+          }
+        }
+      } else {
+        receivePayloadRemainder(fromClientId, remainder, receive);
+      }
+    });
+};
+const createPayload = (toClientId, ...args) =>
+  createRawPayload(toClientId, jsonStringWithUndefined(args));
+const createRawPayload = (clientId, remainder) =>
+  clientId + MESSAGE_SEPARATOR + remainder;
+const createPayloads = (toClientId, requestId, message, body, fragmentSize) => {
+  const clientId = toClientId ?? EMPTY_STRING;
+  const remainder = jsonStringWithUndefined([requestId, message, body]);
+  const maxFragmentSize = mathFloor(fragmentSize ?? 0);
+  if (
+    isUndefined(fragmentSize) ||
+    maxFragmentSize < 1 ||
+    size(remainder) <= maxFragmentSize
+  ) {
+    return [createRawPayload(clientId, remainder)];
+  }
+  const fragments = strMatch(
+    remainder,
+    new RegExp(`.{1,${maxFragmentSize}}`, 'g'),
+  );
+  const total = size(fragments ?? []);
+  const messageId = getUniqueId();
+  return arrayMap(fragments ?? [], (fragment, index) =>
+    createRawPayload(
+      clientId,
+      arrayJoin([messageId, index, total, fragment], MESSAGE_SEPARATOR),
+    ),
+  );
+};
+
 const stampNew = (value, hlc) => (hlc ? [value, hlc] : [value]);
 const getLatestHlc = (hlc1, hlc2) =>
   /* istanbul ignore next */
@@ -375,13 +444,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);
             }
@@ -759,18 +828,27 @@ class WsServerDurableObject extends DurableObject {
         await ifNotUndefined(
           await this.createPersister(),
           async (persister) => {
+            const requestTimeoutSeconds = this.getRequestTimeoutSeconds();
             const synchronizer = createCustomSynchronizer(
               persister.getStore(),
               (toClientId, requestId, message, body) =>
-                this.#handleMessage(
-                  SERVER_CLIENT_ID,
-                  createPayload(toClientId, requestId, message, body),
+                arrayForEach(
+                  createPayloads(
+                    toClientId,
+                    requestId,
+                    message,
+                    body,
+                    this.getFragmentSize(),
+                  ),
+                  (payload) => this.#handleMessage(SERVER_CLIENT_ID, payload),
                 ),
               (receive) =>
-                (this.#serverClientSend = (payload) =>
-                  receivePayload(payload, receive)),
+                (this.#serverClientSend = createPayloadReceiver(
+                  receive,
+                  requestTimeoutSeconds,
+                )),
               noop,
-              1,
+              requestTimeoutSeconds,
             );
             await persister.load();
             await persister.startAutoSave();
@@ -845,6 +923,12 @@ class WsServerDurableObject extends DurableObject {
       (client) => this.ctx.getTags(client)[0],
     );
   }
+  getFragmentSize() {
+    return void 0;
+  }
+  getRequestTimeoutSeconds() {
+    return 1;
+  }
   onPathId(_pathId, _addedOrRemoved) {}
   onClientId(_pathId, _clientId, _addedOrRemoved) {}
   onMessage(_fromClientId, _toClientId, _remainder) {}

package/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.js

@@ -18,6 +18,7 @@ const GLOBAL = globalThis;
 const THOUSAND = 1e3;
 const startTimeout = (callback, sec = 0) =>
   setTimeout(callback, sec * THOUSAND);
+const stopTimeout = clearTimeout;
 const mathFloor = math.floor;
 const mathRandom = math.random;
 const isNullish = (thing) => thing == null;
@@ -44,6 +45,7 @@ const tryCatch = async (action, then1, then2) => {
 };
 
 const arrayForEach = (array, cb) => array.forEach(cb);
+const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayIsEmpty = (array) => size(array) == 0;
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
@@ -85,38 +87,6 @@ const objEnsure = (obj, id, getDefaultValue) => {
   return obj[id];
 };
 
-const jsonString = JSON.stringify;
-const jsonParse = JSON.parse;
-const jsonStringWithUndefined = (obj) =>
-  jsonString(obj, (_key, value) => (isUndefined(value) ? UNDEFINED : value));
-const jsonParseWithUndefined = (str) =>
-  // JSON.parse reviver removes properties with undefined values
-  replaceUndefinedString(jsonParse(str));
-const replaceUndefinedString = (obj) =>
-  obj === UNDEFINED
-    ? void 0
-    : isArray(obj)
-      ? arrayMap(obj, replaceUndefinedString)
-      : isObject(obj)
-        ? objMap(obj, replaceUndefinedString)
-        : obj;
-
-const MESSAGE_SEPARATOR = '\n';
-const ifPayloadValid = (payload, then) => {
-  const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
-  if (splitAt !== -1) {
-    then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
-  }
-};
-const receivePayload = (payload, receive) =>
-  ifPayloadValid(payload, (fromClientId, remainder) =>
-    receive(fromClientId, ...jsonParseWithUndefined(remainder)),
-  );
-const createPayload = (toClientId, ...args) =>
-  createRawPayload(toClientId ?? EMPTY_STRING, jsonStringWithUndefined(args));
-const createRawPayload = (clientId, remainder) =>
-  clientId + MESSAGE_SEPARATOR + remainder;
-
 const collSize = (coll) => coll?.size ?? 0;
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
 const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
@@ -174,6 +144,105 @@ const getUniqueId = (length = 16) =>
     EMPTY_STRING,
   );
 
+const jsonString = JSON.stringify;
+const jsonParse = JSON.parse;
+const jsonStringWithUndefined = (obj) =>
+  jsonString(obj, (_key, value) => (isUndefined(value) ? UNDEFINED : value));
+const jsonParseWithUndefined = (str) =>
+  // JSON.parse reviver removes properties with undefined values
+  replaceUndefinedString(jsonParse(str));
+const replaceUndefinedString = (obj) =>
+  obj === UNDEFINED
+    ? void 0
+    : isArray(obj)
+      ? arrayMap(obj, replaceUndefinedString)
+      : isObject(obj)
+        ? objMap(obj, replaceUndefinedString)
+        : obj;
+
+const MESSAGE_SEPARATOR = '\n';
+const FRAGMENT = /^(.+)\n(\d+)\n(\d+)\n([\s\S]*)$/;
+const ifPayloadValid = (payload, then) => {
+  const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
+  if (splitAt !== -1) {
+    then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
+  }
+};
+const receivePayloadRemainder = (fromClientId, remainder, receive) =>
+  receive(fromClientId, ...jsonParseWithUndefined(remainder));
+const createPayloadReceiver = (receive, fragmentTimeoutSeconds = 1) => {
+  const buffer = mapNew();
+  const setPendingTimeout = (bufferKey) =>
+    startTimeout(() => collDel(buffer, bufferKey), fragmentTimeoutSeconds);
+  const delPending = (bufferKey, pending) => {
+    stopTimeout(pending[3]);
+    collDel(buffer, bufferKey);
+  };
+  return (payload) =>
+    ifPayloadValid(payload, (fromClientId, remainder) => {
+      const [, messageId, indexStr, totalStr, fragment] =
+        strMatch(remainder, FRAGMENT) ?? [];
+      if (messageId) {
+        const index = parseInt(indexStr);
+        const total = parseInt(totalStr);
+        if (total > 0 && index >= 0 && index < total) {
+          const bufferKey = fromClientId + MESSAGE_SEPARATOR + messageId;
+          const pending = mapEnsure(buffer, bufferKey, () => [
+            [],
+            total,
+            total,
+            setPendingTimeout(bufferKey),
+          ]);
+          const [fragments] = pending;
+          if (total == pending[2] && isUndefined(fragments[index])) {
+            stopTimeout(pending[3]);
+            pending[3] = setPendingTimeout(bufferKey);
+            fragments[index] = fragment;
+            pending[1]--;
+          }
+          if (pending[1] == 0) {
+            delPending(bufferKey, pending);
+            receivePayloadRemainder(
+              fromClientId,
+              arrayJoin(fragments),
+              receive,
+            );
+          }
+        }
+      } else {
+        receivePayloadRemainder(fromClientId, remainder, receive);
+      }
+    });
+};
+const createPayload = (toClientId, ...args) =>
+  createRawPayload(toClientId, jsonStringWithUndefined(args));
+const createRawPayload = (clientId, remainder) =>
+  clientId + MESSAGE_SEPARATOR + remainder;
+const createPayloads = (toClientId, requestId, message, body, fragmentSize) => {
+  const clientId = toClientId ?? EMPTY_STRING;
+  const remainder = jsonStringWithUndefined([requestId, message, body]);
+  const maxFragmentSize = mathFloor(fragmentSize ?? 0);
+  if (
+    isUndefined(fragmentSize) ||
+    maxFragmentSize < 1 ||
+    size(remainder) <= maxFragmentSize
+  ) {
+    return [createRawPayload(clientId, remainder)];
+  }
+  const fragments = strMatch(
+    remainder,
+    new RegExp(`.{1,${maxFragmentSize}}`, 'g'),
+  );
+  const total = size(fragments ?? []);
+  const messageId = getUniqueId();
+  return arrayMap(fragments ?? [], (fragment, index) =>
+    createRawPayload(
+      clientId,
+      arrayJoin([messageId, index, total, fragment], MESSAGE_SEPARATOR),
+    ),
+  );
+};
+
 const stampNew = (value, hlc) => (hlc ? [value, hlc] : [value]);
 const getLatestHlc = (hlc1, hlc2) =>
   /* istanbul ignore next */
@@ -375,13 +444,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);
             }
@@ -759,18 +828,27 @@ class WsServerDurableObject extends DurableObject {
         await ifNotUndefined(
           await this.createPersister(),
           async (persister) => {
+            const requestTimeoutSeconds = this.getRequestTimeoutSeconds();
             const synchronizer = createCustomSynchronizer(
               persister.getStore(),
               (toClientId, requestId, message, body) =>
-                this.#handleMessage(
-                  SERVER_CLIENT_ID,
-                  createPayload(toClientId, requestId, message, body),
+                arrayForEach(
+                  createPayloads(
+                    toClientId,
+                    requestId,
+                    message,
+                    body,
+                    this.getFragmentSize(),
+                  ),
+                  (payload) => this.#handleMessage(SERVER_CLIENT_ID, payload),
                 ),
               (receive) =>
-                (this.#serverClientSend = (payload) =>
-                  receivePayload(payload, receive)),
+                (this.#serverClientSend = createPayloadReceiver(
+                  receive,
+                  requestTimeoutSeconds,
+                )),
               noop,
-              1,
+              requestTimeoutSeconds,
             );
             await persister.load();
             await persister.startAutoSave();
@@ -845,6 +923,12 @@ class WsServerDurableObject extends DurableObject {
       (client) => this.ctx.getTags(client)[0],
     );
   }
+  getFragmentSize() {
+    return void 0;
+  }
+  getRequestTimeoutSeconds() {
+    return 1;
+  }
   onPathId(_pathId, _addedOrRemoved) {}
   onClientId(_pathId, _clientId, _addedOrRemoved) {}
   onMessage(_fromClientId, _toClientId, _remainder) {}

package/synchronizers/with-schemas/index.js

@@ -331,13 +331,14 @@ 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) => {
+            onIgnoredError?.(error);
             if (initialContent) {
               setDefaultContent(initialContent);
             }

package/ui-react-inspector/index.js

@@ -930,13 +930,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);
             }
@@ -1189,8 +1189,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();
@@ -1364,6 +1366,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) => {
@@ -1380,6 +1392,7 @@ const createStore = () => {
       collForEach(valuesDefaulted, (value, valueId) => {
         if (!objHas(values, valueId)) {
           values[valueId] = value;
+          setAdd(defaultedValues, valueId);
         }
       });
       collForEach(valuesNonDefaulted, (valueId) => {
@@ -1783,18 +1796,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(
@@ -2582,9 +2611,11 @@ const createStore = () => {
             changedRowIds,
             changedCellIds,
             changedCells,
+            defaultedCells,
             invalidCells,
             changedValueIds,
             changedValues,
+            defaultedValues,
             invalidValues,
           ],
           collClear,

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

@@ -930,13 +930,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);
             }
@@ -1189,8 +1189,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();
@@ -1364,6 +1366,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) => {
@@ -1380,6 +1392,7 @@ const createStore = () => {
       collForEach(valuesDefaulted, (value, valueId) => {
         if (!objHas(values, valueId)) {
           values[valueId] = value;
+          setAdd(defaultedValues, valueId);
         }
       });
       collForEach(valuesNonDefaulted, (valueId) => {
@@ -1783,18 +1796,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(
@@ -2582,9 +2611,11 @@ const createStore = () => {
             changedRowIds,
             changedCellIds,
             changedCells,
+            defaultedCells,
             invalidCells,
             changedValueIds,
             changedValues,
+            defaultedValues,
             invalidValues,
           ],
           collClear,