tinybase 7.0.0-beta.2 → 7.0.0

package/synchronizers/with-schemas/index.js

@@ -4,15 +4,19 @@ const strSplit = (str, separator = EMPTY_STRING, limit) =>
   str.split(separator, limit);
 
 const promise = Promise;
+const getIfNotFunction = (predicate) => (value, then, otherwise) =>
+  predicate(value) ? otherwise?.() : then(value);
 const GLOBAL = globalThis;
 const THOUSAND = 1e3;
 const startTimeout = (callback, sec = 0) =>
   setTimeout(callback, sec * THOUSAND);
 const math = Math;
 const mathFloor = math.floor;
-const isUndefined = (thing) => thing == void 0;
-const ifNotUndefined = (value, then, otherwise) =>
-  isUndefined(value) ? otherwise?.() : then(value);
+const isNullish = (thing) => thing == null;
+const isUndefined = (thing) => thing === void 0;
+const isNull = (thing) => thing === null;
+const ifNotNullish = getIfNotFunction(isNullish);
+const ifNotUndefined = getIfNotFunction(isUndefined);
 const isArray = (thing) => Array.isArray(thing);
 const size = (arrayOrString) => arrayOrString.length;
 const test = (regex, subject) => regex.test(subject);
@@ -46,12 +50,12 @@ const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
 const isObject = (obj) =>
-  !isUndefined(obj) &&
-  ifNotUndefined(
+  !isNullish(obj) &&
+  ifNotNullish(
     getPrototypeOf(obj),
     (objPrototype) =>
       objPrototype == object.prototype ||
-      isUndefined(getPrototypeOf(objPrototype)),
+      isNullish(getPrototypeOf(objPrototype)),
 
     /* istanbul ignore next */
     () => true,
@@ -74,7 +78,7 @@ const objEnsure = (obj, id, getDefaultValue) => {
 const mapNew = (entries) => new Map(entries);
 const mapGet = (map, key) => map?.get(key);
 const mapSet = (map, key, value) =>
-  isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
+  value === void 0 ? (collDel(map, key), map) : map?.set(key, value);
 const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
@@ -207,7 +211,7 @@ const getListenerFunctions = (getThing) => {
           const index = size(ids);
           if (index == size(path)) {
             listener(thing, ...ids, ...extraArgsGetter(ids));
-          } else if (isUndefined(path[index])) {
+          } else if (isNull(path[index])) {
             arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
               callWithIds(...ids, id2),
             );
@@ -644,7 +648,7 @@ const createCustomSynchronizer = (
       ifNotUndefined(
         mapGet(pendingRequests, transactionOrRequestId),
         ([toClientId, handleResponse]) =>
-          isUndefined(toClientId) || toClientId == fromClientId
+          isNull(toClientId) || toClientId == fromClientId
             ? handleResponse(body, fromClientId)
             : /* istanbul ignore next */
               0,

package/ui-react/index.js

@@ -41,10 +41,13 @@ const LINKED = 'Linked';
 const QUERY = 'Query';
 const CHECKPOINT = 'Checkpoint';
 
+const getIfNotFunction = (predicate) => (value, then, otherwise) =>
+  predicate(value) ? otherwise?.() : then(value);
 const GLOBAL = globalThis;
-const isUndefined = (thing) => thing == void 0;
-const ifNotUndefined = (value, then, otherwise) =>
-  isUndefined(value) ? otherwise?.() : then(value);
+const isNullish = (thing) => thing == null;
+const isUndefined = (thing) => thing === void 0;
+const ifNotNullish = getIfNotFunction(isNullish);
+const ifNotUndefined = getIfNotFunction(isUndefined);
 const isString = (thing) => getTypeOf(thing) == STRING;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
 const isArray = (thing) => Array.isArray(thing);
@@ -66,12 +69,12 @@ const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
 const isObject = (obj) =>
-  !isUndefined(obj) &&
-  ifNotUndefined(
+  !isNullish(obj) &&
+  ifNotNullish(
     getPrototypeOf(obj),
     (objPrototype) =>
       objPrototype == object.prototype ||
-      isUndefined(getPrototypeOf(objPrototype)),
+      isNullish(getPrototypeOf(objPrototype)),
 
     /* istanbul ignore next */
     () => true,

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

@@ -41,10 +41,13 @@ const LINKED = 'Linked';
 const QUERY = 'Query';
 const CHECKPOINT = 'Checkpoint';
 
+const getIfNotFunction = (predicate) => (value, then, otherwise) =>
+  predicate(value) ? otherwise?.() : then(value);
 const GLOBAL = globalThis;
-const isUndefined = (thing) => thing == void 0;
-const ifNotUndefined = (value, then, otherwise) =>
-  isUndefined(value) ? otherwise?.() : then(value);
+const isNullish = (thing) => thing == null;
+const isUndefined = (thing) => thing === void 0;
+const ifNotNullish = getIfNotFunction(isNullish);
+const ifNotUndefined = getIfNotFunction(isUndefined);
 const isString = (thing) => getTypeOf(thing) == STRING;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
 const isArray = (thing) => Array.isArray(thing);
@@ -66,12 +69,12 @@ const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
 const isObject = (obj) =>
-  !isUndefined(obj) &&
-  ifNotUndefined(
+  !isNullish(obj) &&
+  ifNotNullish(
     getPrototypeOf(obj),
     (objPrototype) =>
       objPrototype == object.prototype ||
-      isUndefined(getPrototypeOf(objPrototype)),
+      isNullish(getPrototypeOf(objPrototype)),
 
     /* istanbul ignore next */
     () => true,

package/ui-react-dom/index.js

@@ -35,13 +35,17 @@ const EXTRA = 'extra';
 const strSplit = (str, separator = EMPTY_STRING, limit) =>
   str.split(separator, limit);
 
+const getIfNotFunction = (predicate) => (value, then, otherwise) =>
+  predicate(value) ? otherwise?.() : then(value);
 const GLOBAL = globalThis;
 const math = Math;
 const mathMin = math.min;
 const isFiniteNumber = isFinite;
-const isUndefined = (thing) => thing == void 0;
-const ifNotUndefined = (value, then, otherwise) =>
-  isUndefined(value) ? otherwise?.() : then(value);
+const isNullish = (thing) => thing == null;
+const isUndefined = (thing) => thing === void 0;
+const isNull = (thing) => thing === null;
+const ifNotNullish = getIfNotFunction(isNullish);
+const ifNotUndefined = getIfNotFunction(isUndefined);
 const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
 const isString = (thing) => getTypeOf(thing) == STRING;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
@@ -60,12 +64,12 @@ const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
 const isObject = (obj) =>
-  !isUndefined(obj) &&
-  ifNotUndefined(
+  !isNullish(obj) &&
+  ifNotNullish(
     getPrototypeOf(obj),
     (objPrototype) =>
       objPrototype == object.prototype ||
-      isUndefined(getPrototypeOf(objPrototype)),
+      isNullish(getPrototypeOf(objPrototype)),
 
     /* istanbul ignore next */
     () => true,
@@ -395,6 +399,9 @@ const useResultSortedRowIds = (
   );
 
 const getCellOrValueType = (cellOrValue) => {
+  if (isNull(cellOrValue)) {
+    return 'null';
+  }
   const type = getTypeOf(cellOrValue);
   return isTypeStringOrBoolean(type) ||
     (type == NUMBER && isFiniteNumber(cellOrValue))
@@ -766,7 +773,7 @@ const RelationshipInHtmlRow = ({
               ? localRowId
               : tableId === remoteTableId
                 ? remoteRowId
-                : null;
+                : void 0;
           return isUndefined(rowId)
             ? null
             : /* @__PURE__ */ jsx(

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

@@ -35,13 +35,17 @@ const EXTRA = 'extra';
 const strSplit = (str, separator = EMPTY_STRING, limit) =>
   str.split(separator, limit);
 
+const getIfNotFunction = (predicate) => (value, then, otherwise) =>
+  predicate(value) ? otherwise?.() : then(value);
 const GLOBAL = globalThis;
 const math = Math;
 const mathMin = math.min;
 const isFiniteNumber = isFinite;
-const isUndefined = (thing) => thing == void 0;
-const ifNotUndefined = (value, then, otherwise) =>
-  isUndefined(value) ? otherwise?.() : then(value);
+const isNullish = (thing) => thing == null;
+const isUndefined = (thing) => thing === void 0;
+const isNull = (thing) => thing === null;
+const ifNotNullish = getIfNotFunction(isNullish);
+const ifNotUndefined = getIfNotFunction(isUndefined);
 const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
 const isString = (thing) => getTypeOf(thing) == STRING;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
@@ -60,12 +64,12 @@ const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
 const isObject = (obj) =>
-  !isUndefined(obj) &&
-  ifNotUndefined(
+  !isNullish(obj) &&
+  ifNotNullish(
     getPrototypeOf(obj),
     (objPrototype) =>
       objPrototype == object.prototype ||
-      isUndefined(getPrototypeOf(objPrototype)),
+      isNullish(getPrototypeOf(objPrototype)),
 
     /* istanbul ignore next */
     () => true,
@@ -395,6 +399,9 @@ const useResultSortedRowIds = (
   );
 
 const getCellOrValueType = (cellOrValue) => {
+  if (isNull(cellOrValue)) {
+    return 'null';
+  }
   const type = getTypeOf(cellOrValue);
   return isTypeStringOrBoolean(type) ||
     (type == NUMBER && isFiniteNumber(cellOrValue))
@@ -766,7 +773,7 @@ const RelationshipInHtmlRow = ({
               ? localRowId
               : tableId === remoteTableId
                 ? remoteRowId
-                : null;
+                : void 0;
           return isUndefined(rowId)
             ? null
             : /* @__PURE__ */ jsx(

package/ui-react-inspector/index.js

@@ -43,6 +43,7 @@ const NUMBER = getTypeOf(0);
 const FUNCTION = getTypeOf(getTypeOf);
 const TYPE = 'type';
 const DEFAULT = 'default';
+const ALLOW_NULL = 'allowNull';
 const LISTENER = 'Listener';
 const RESULT = 'Result';
 const GET = 'get';
@@ -74,6 +75,8 @@ const id = (key) => EMPTY_STRING + key;
 const strSplit = (str, separator = EMPTY_STRING, limit) =>
   str.split(separator, limit);
 
+const getIfNotFunction = (predicate) => (value, then, otherwise) =>
+  predicate(value) ? otherwise?.() : then(value);
 const GLOBAL = globalThis;
 const WINDOW = GLOBAL.window;
 const math = Math;
@@ -81,9 +84,11 @@ const mathMin = math.min;
 const mathFloor = math.floor;
 const isFiniteNumber = isFinite;
 const isInstanceOf = (thing, cls) => thing instanceof cls;
-const isUndefined = (thing) => thing == void 0;
-const ifNotUndefined = (value, then, otherwise) =>
-  isUndefined(value) ? otherwise?.() : then(value);
+const isNullish = (thing) => thing == null;
+const isUndefined = (thing) => thing === void 0;
+const isNull = (thing) => thing === null;
+const ifNotNullish = getIfNotFunction(isNullish);
+const ifNotUndefined = getIfNotFunction(isUndefined);
 const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
 const isString = (thing) => getTypeOf(thing) == STRING;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
@@ -125,12 +130,12 @@ const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objFrozen = object.isFrozen;
 const objEntries = object.entries;
 const isObject = (obj) =>
-  !isUndefined(obj) &&
-  ifNotUndefined(
+  !isNullish(obj) &&
+  ifNotNullish(
     getPrototypeOf(obj),
     (objPrototype) =>
       objPrototype == object.prototype ||
-      isUndefined(getPrototypeOf(objPrototype)),
+      isNullish(getPrototypeOf(objPrototype)),
 
     /* istanbul ignore next */
     () => true,
@@ -167,7 +172,7 @@ const objIsEqual = (obj1, obj2) => {
 };
 const objValidate = (obj, validateChild, onInvalidObj, emptyIsValid = 0) => {
   if (
-    isUndefined(obj) ||
+    isNullish(obj) ||
     !isObject(obj) ||
     (!emptyIsValid && objIsEmpty(obj)) ||
     objFrozen(obj)
@@ -215,7 +220,7 @@ const mapForEach = (map, cb) =>
 const mapMap = (coll, cb) =>
   arrayMap([...(coll?.entries() ?? [])], ([key, value]) => cb(value, key));
 const mapSet = (map, key, value) =>
-  isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
+  value === void 0 ? (collDel(map, key), map) : map?.set(key, value);
 const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
@@ -364,7 +369,7 @@ const getListenerFunctions = (getThing) => {
           const index = size(ids);
           if (index == size(path)) {
             listener(thing, ...ids, ...extraArgsGetter(ids));
-          } else if (isUndefined(path[index])) {
+          } else if (isNull(path[index])) {
             arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
               callWithIds(...ids, id2),
             );
@@ -657,6 +662,9 @@ const createSessionPersister = (store, storageName, onIgnoredError) =>
   createStoragePersister(store, storageName, sessionStorage, onIgnoredError);
 
 const getCellOrValueType = (cellOrValue) => {
+  if (isNull(cellOrValue)) {
+    return 'null';
+  }
   const type = getTypeOf(cellOrValue);
   return isTypeStringOrBoolean(type) ||
     (type == NUMBER && isFiniteNumber(cellOrValue))
@@ -752,14 +760,22 @@ const createStore = () => {
   const validateValuesSchema = (valuesSchema) =>
     objValidate(valuesSchema, validateCellOrValueSchema);
   const validateCellOrValueSchema = (schema) => {
-    if (!objValidate(schema, (_child, id2) => arrayHas([TYPE, DEFAULT], id2))) {
+    if (
+      !objValidate(schema, (_child, id2) =>
+        arrayHas([TYPE, DEFAULT, ALLOW_NULL], id2),
+      )
+    ) {
       return false;
     }
     const type = schema[TYPE];
     if (!isTypeStringOrBoolean(type) && type != NUMBER) {
       return false;
     }
-    if (getCellOrValueType(schema[DEFAULT]) != type) {
+    const defaultValue = schema[DEFAULT];
+    if (isNull(defaultValue) && !schema[ALLOW_NULL]) {
+      return false;
+    }
+    if (!isNull(defaultValue) && getCellOrValueType(defaultValue) != type) {
       objDel(schema, DEFAULT);
     }
     return true;
@@ -796,9 +812,19 @@ const createStore = () => {
       ? ifNotUndefined(
           mapGet(mapGet(tablesSchemaMap, tableId), cellId),
           (cellSchema) =>
-            getCellOrValueType(cell) != cellSchema[TYPE]
-              ? cellInvalid(tableId, rowId, cellId, cell, cellSchema[DEFAULT])
-              : cell,
+            isNull(cell)
+              ? cellSchema[ALLOW_NULL]
+                ? cell
+                : cellInvalid(tableId, rowId, cellId, cell, cellSchema[DEFAULT])
+              : getCellOrValueType(cell) == cellSchema[TYPE]
+                ? cell
+                : cellInvalid(
+                    tableId,
+                    rowId,
+                    cellId,
+                    cell,
+                    cellSchema[DEFAULT],
+                  ),
           () => cellInvalid(tableId, rowId, cellId, cell),
         )
       : isUndefined(getCellOrValueType(cell))
@@ -823,9 +849,13 @@ const createStore = () => {
       ? ifNotUndefined(
           mapGet(valuesSchemaMap, valueId),
           (valueSchema) =>
-            getCellOrValueType(value) != valueSchema[TYPE]
-              ? valueInvalid(valueId, value, valueSchema[DEFAULT])
-              : value,
+            isNull(value)
+              ? valueSchema[ALLOW_NULL]
+                ? value
+                : valueInvalid(valueId, value, valueSchema[DEFAULT])
+              : getCellOrValueType(value) == valueSchema[TYPE]
+                ? value
+                : valueInvalid(valueId, value, valueSchema[DEFAULT]),
           () => valueInvalid(valueId, value),
         )
       : isUndefined(getCellOrValueType(value))
@@ -1068,7 +1098,7 @@ const createStore = () => {
     mapSet(
       cellIds,
       cellId,
-      count != -addedOrRemoved ? count + addedOrRemoved : null,
+      count != -addedOrRemoved ? count + addedOrRemoved : void 0,
     );
     idsChanged(
       mapEnsure(mapEnsure(changedCellIds, tableId, mapNew), rowId, mapNew),
@@ -2819,7 +2849,7 @@ const RelationshipInHtmlRow = ({
               ? localRowId
               : tableId === remoteTableId
                 ? remoteRowId
-                : null;
+                : void 0;
           return isUndefined(rowId)
             ? null
             : /* @__PURE__ */ jsx(
@@ -3481,11 +3511,11 @@ const getNewIdFromSuggestedId = (suggestedId, has) => {
 };
 const ConfirmableActions = ({actions, ...props}) => {
   const [confirming, setConfirming] = useState();
-  const handleDone = useCallback(() => setConfirming(null), []);
+  const handleDone = useCallback(() => setConfirming(void 0), []);
   useEffect(() => {
-    if (confirming != null) {
+    if (!isUndefined(confirming)) {
       const handleKeyDown = (e) => {
-        if (confirming != null && e.key === 'Escape') {
+        if (!isUndefined(confirming) && e.key === 'Escape') {
           e.preventDefault();
           handleDone();
         }
@@ -3494,7 +3524,7 @@ const ConfirmableActions = ({actions, ...props}) => {
       return () => document.removeEventListener('keydown', handleKeyDown);
     }
   }, [confirming, handleDone]);
-  if (confirming != null) {
+  if (!isUndefined(confirming)) {
     const [, , Component] = actions[confirming];
     return /* @__PURE__ */ jsxs(Fragment, {
       children: [

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

@@ -43,6 +43,7 @@ const NUMBER = getTypeOf(0);
 const FUNCTION = getTypeOf(getTypeOf);
 const TYPE = 'type';
 const DEFAULT = 'default';
+const ALLOW_NULL = 'allowNull';
 const LISTENER = 'Listener';
 const RESULT = 'Result';
 const GET = 'get';
@@ -74,6 +75,8 @@ const id = (key) => EMPTY_STRING + key;
 const strSplit = (str, separator = EMPTY_STRING, limit) =>
   str.split(separator, limit);
 
+const getIfNotFunction = (predicate) => (value, then, otherwise) =>
+  predicate(value) ? otherwise?.() : then(value);
 const GLOBAL = globalThis;
 const WINDOW = GLOBAL.window;
 const math = Math;
@@ -81,9 +84,11 @@ const mathMin = math.min;
 const mathFloor = math.floor;
 const isFiniteNumber = isFinite;
 const isInstanceOf = (thing, cls) => thing instanceof cls;
-const isUndefined = (thing) => thing == void 0;
-const ifNotUndefined = (value, then, otherwise) =>
-  isUndefined(value) ? otherwise?.() : then(value);
+const isNullish = (thing) => thing == null;
+const isUndefined = (thing) => thing === void 0;
+const isNull = (thing) => thing === null;
+const ifNotNullish = getIfNotFunction(isNullish);
+const ifNotUndefined = getIfNotFunction(isUndefined);
 const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
 const isString = (thing) => getTypeOf(thing) == STRING;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
@@ -125,12 +130,12 @@ const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objFrozen = object.isFrozen;
 const objEntries = object.entries;
 const isObject = (obj) =>
-  !isUndefined(obj) &&
-  ifNotUndefined(
+  !isNullish(obj) &&
+  ifNotNullish(
     getPrototypeOf(obj),
     (objPrototype) =>
       objPrototype == object.prototype ||
-      isUndefined(getPrototypeOf(objPrototype)),
+      isNullish(getPrototypeOf(objPrototype)),
 
     /* istanbul ignore next */
     () => true,
@@ -167,7 +172,7 @@ const objIsEqual = (obj1, obj2) => {
 };
 const objValidate = (obj, validateChild, onInvalidObj, emptyIsValid = 0) => {
   if (
-    isUndefined(obj) ||
+    isNullish(obj) ||
     !isObject(obj) ||
     (!emptyIsValid && objIsEmpty(obj)) ||
     objFrozen(obj)
@@ -215,7 +220,7 @@ const mapForEach = (map, cb) =>
 const mapMap = (coll, cb) =>
   arrayMap([...(coll?.entries() ?? [])], ([key, value]) => cb(value, key));
 const mapSet = (map, key, value) =>
-  isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
+  value === void 0 ? (collDel(map, key), map) : map?.set(key, value);
 const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
@@ -364,7 +369,7 @@ const getListenerFunctions = (getThing) => {
           const index = size(ids);
           if (index == size(path)) {
             listener(thing, ...ids, ...extraArgsGetter(ids));
-          } else if (isUndefined(path[index])) {
+          } else if (isNull(path[index])) {
             arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
               callWithIds(...ids, id2),
             );
@@ -657,6 +662,9 @@ const createSessionPersister = (store, storageName, onIgnoredError) =>
   createStoragePersister(store, storageName, sessionStorage, onIgnoredError);
 
 const getCellOrValueType = (cellOrValue) => {
+  if (isNull(cellOrValue)) {
+    return 'null';
+  }
   const type = getTypeOf(cellOrValue);
   return isTypeStringOrBoolean(type) ||
     (type == NUMBER && isFiniteNumber(cellOrValue))
@@ -752,14 +760,22 @@ const createStore = () => {
   const validateValuesSchema = (valuesSchema) =>
     objValidate(valuesSchema, validateCellOrValueSchema);
   const validateCellOrValueSchema = (schema) => {
-    if (!objValidate(schema, (_child, id2) => arrayHas([TYPE, DEFAULT], id2))) {
+    if (
+      !objValidate(schema, (_child, id2) =>
+        arrayHas([TYPE, DEFAULT, ALLOW_NULL], id2),
+      )
+    ) {
       return false;
     }
     const type = schema[TYPE];
     if (!isTypeStringOrBoolean(type) && type != NUMBER) {
       return false;
     }
-    if (getCellOrValueType(schema[DEFAULT]) != type) {
+    const defaultValue = schema[DEFAULT];
+    if (isNull(defaultValue) && !schema[ALLOW_NULL]) {
+      return false;
+    }
+    if (!isNull(defaultValue) && getCellOrValueType(defaultValue) != type) {
       objDel(schema, DEFAULT);
     }
     return true;
@@ -796,9 +812,19 @@ const createStore = () => {
       ? ifNotUndefined(
           mapGet(mapGet(tablesSchemaMap, tableId), cellId),
           (cellSchema) =>
-            getCellOrValueType(cell) != cellSchema[TYPE]
-              ? cellInvalid(tableId, rowId, cellId, cell, cellSchema[DEFAULT])
-              : cell,
+            isNull(cell)
+              ? cellSchema[ALLOW_NULL]
+                ? cell
+                : cellInvalid(tableId, rowId, cellId, cell, cellSchema[DEFAULT])
+              : getCellOrValueType(cell) == cellSchema[TYPE]
+                ? cell
+                : cellInvalid(
+                    tableId,
+                    rowId,
+                    cellId,
+                    cell,
+                    cellSchema[DEFAULT],
+                  ),
           () => cellInvalid(tableId, rowId, cellId, cell),
         )
       : isUndefined(getCellOrValueType(cell))
@@ -823,9 +849,13 @@ const createStore = () => {
       ? ifNotUndefined(
           mapGet(valuesSchemaMap, valueId),
           (valueSchema) =>
-            getCellOrValueType(value) != valueSchema[TYPE]
-              ? valueInvalid(valueId, value, valueSchema[DEFAULT])
-              : value,
+            isNull(value)
+              ? valueSchema[ALLOW_NULL]
+                ? value
+                : valueInvalid(valueId, value, valueSchema[DEFAULT])
+              : getCellOrValueType(value) == valueSchema[TYPE]
+                ? value
+                : valueInvalid(valueId, value, valueSchema[DEFAULT]),
           () => valueInvalid(valueId, value),
         )
       : isUndefined(getCellOrValueType(value))
@@ -1068,7 +1098,7 @@ const createStore = () => {
     mapSet(
       cellIds,
       cellId,
-      count != -addedOrRemoved ? count + addedOrRemoved : null,
+      count != -addedOrRemoved ? count + addedOrRemoved : void 0,
     );
     idsChanged(
       mapEnsure(mapEnsure(changedCellIds, tableId, mapNew), rowId, mapNew),
@@ -2819,7 +2849,7 @@ const RelationshipInHtmlRow = ({
               ? localRowId
               : tableId === remoteTableId
                 ? remoteRowId
-                : null;
+                : void 0;
           return isUndefined(rowId)
             ? null
             : /* @__PURE__ */ jsx(
@@ -3481,11 +3511,11 @@ const getNewIdFromSuggestedId = (suggestedId, has) => {
 };
 const ConfirmableActions = ({actions, ...props}) => {
   const [confirming, setConfirming] = useState();
-  const handleDone = useCallback(() => setConfirming(null), []);
+  const handleDone = useCallback(() => setConfirming(void 0), []);
   useEffect(() => {
-    if (confirming != null) {
+    if (!isUndefined(confirming)) {
       const handleKeyDown = (e) => {
-        if (confirming != null && e.key === 'Escape') {
+        if (!isUndefined(confirming) && e.key === 'Escape') {
           e.preventDefault();
           handleDone();
         }
@@ -3494,7 +3524,7 @@ const ConfirmableActions = ({actions, ...props}) => {
       return () => document.removeEventListener('keydown', handleKeyDown);
     }
   }, [confirming, handleDone]);
-  if (confirming != null) {
+  if (!isUndefined(confirming)) {
     const [, , Component] = actions[confirming];
     return /* @__PURE__ */ jsxs(Fragment, {
       children: [