tinybase 7.0.0-beta.2 → 7.0.0-beta.3

package/omni/index.js

@@ -18,6 +18,7 @@ const FUNCTION$1 = getTypeOf(getTypeOf);
 const TRUE = 'true';
 const TYPE = 'type';
 const DEFAULT = 'default';
+const ALLOW_NULL = 'allowNull';
 const UTF8 = 'utf8';
 const SUM = 'sum';
 const AVG = 'avg';
@@ -76,6 +77,10 @@ const strReplace = (str, searchValue, replaceValue) =>
   str.replace(searchValue, replaceValue);
 
 const promise = Promise;
+const getIfNotFunction =
+  (predicate = isNullish) =>
+  (value, then, otherwise) =>
+    predicate(value) ? otherwise?.() : then(value);
 const GLOBAL = globalThis;
 const WINDOW = GLOBAL.window;
 const THOUSAND = 1e3;
@@ -91,9 +96,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$1;
@@ -145,13 +152,16 @@ const arrayShift = (array) => array.shift();
 const arrayWith = (array, index, value) => array.with(index, value);
 
 const getCellOrValueType = (cellOrValue) => {
+  if (isNull(cellOrValue)) {
+    return 'null';
+  }
   const type = getTypeOf(cellOrValue);
   return isTypeStringOrBoolean(type) ||
     (type == NUMBER && isFiniteNumber(cellOrValue))
     ? type
     : void 0;
 };
-const isCellOrValueOrNullOrUndefined = (cellOrValue) =>
+const isCellOrValueOrUndefined = (cellOrValue) =>
   isUndefined(cellOrValue) || !isUndefined(getCellOrValueType(cellOrValue));
 const setOrDelCell = (store, tableId, rowId, cellId, cell) =>
   isUndefined(cell)
@@ -186,12 +196,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,
@@ -236,7 +246,7 @@ const objEnsure = (obj, id, getDefaultValue) => {
 };
 const objValidate = (obj, validateChild, onInvalidObj, emptyIsValid = 0) => {
   if (
-    isUndefined(obj) ||
+    isNullish(obj) ||
     !isObject(obj) ||
     (!emptyIsValid && objIsEmpty(obj)) ||
     objFrozen(obj)
@@ -260,7 +270,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());
@@ -581,7 +591,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),
             );
@@ -734,7 +744,7 @@ const createCheckpoints = getCreateFunction(
         ? goBackwardImpl
         : arrayHas(forwardIds, checkpointId)
           ? goForwardImpl
-          : null;
+          : void 0;
       while (!isUndefined(action) && checkpointId != currentId) {
         action();
       }
@@ -1318,14 +1328,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;
@@ -1362,9 +1380,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))
@@ -1389,9 +1417,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))
@@ -1634,7 +1666,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),
@@ -2643,7 +2675,7 @@ const validateMergeableContent = (mergeableContent) =>
                 objValidate(
                   cellStamps,
                   (cellStamp) =>
-                    stampValidate(cellStamp, isCellOrValueOrNullOrUndefined),
+                    stampValidate(cellStamp, isCellOrValueOrUndefined),
                   void 0,
                   1,
                 ),
@@ -2659,7 +2691,7 @@ const validateMergeableContent = (mergeableContent) =>
   stampValidate(mergeableContent[1], (values) =>
     objValidate(
       values,
-      (value) => stampValidate(value, isCellOrValueOrNullOrUndefined),
+      (value) => stampValidate(value, isCellOrValueOrUndefined),
       void 0,
       1,
     ),
@@ -3608,7 +3640,7 @@ const getDefaultedTabularConfigMap = (
       0,
       objSize(defaultObj),
     );
-    if (!isUndefined(defaultedConfig[0]) && !exclude(id, defaultedConfig[0])) {
+    if (!isNull(defaultedConfig[0]) && !exclude(id, defaultedConfig[0])) {
       then(id, defaultedConfig[0]);
       mapSet(configMap, id, defaultedConfig);
     }
@@ -4335,7 +4367,7 @@ const createCustomSqlitePersister = (
                 ` ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
             );
             if (d != dataVersion || s != schemaVersion || c != totalChanges) {
-              if (dataVersion != null) {
+              if (!isNullish(dataVersion)) {
                 listener();
               }
               dataVersion = d;
@@ -5483,8 +5515,8 @@ const createRemotePersister = (
       const response = await fetch(loadUrl, {method: 'HEAD'});
       const currentEtag = getETag(response);
       if (
-        !isUndefined(lastEtag) &&
-        !isUndefined(currentEtag) &&
+        !isNull(lastEtag) &&
+        !isNull(currentEtag) &&
         currentEtag != lastEtag
       ) {
         lastEtag = currentEtag;
@@ -5611,7 +5643,8 @@ const getChangesFromYDoc = (yContent, events) => {
                 mapForEach(
                   keys,
                   (cellId, {action}) =>
-                    (row[cellId] = action == DELETE ? null : yRow.get(cellId)),
+                    (row[cellId] =
+                      action == DELETE ? void 0 : yRow.get(cellId)),
                 );
               },
               () =>
@@ -5619,7 +5652,7 @@ const getChangesFromYDoc = (yContent, events) => {
                   keys,
                   (rowId, {action}) =>
                     (table[rowId] =
-                      action == DELETE ? null : yTable.get(rowId)?.toJSON()),
+                      action == DELETE ? void 0 : yTable.get(rowId)?.toJSON()),
                 ),
             );
           },
@@ -5628,13 +5661,14 @@ const getChangesFromYDoc = (yContent, events) => {
               keys,
               (tableId, {action}) =>
                 (tables[tableId] =
-                  action == DELETE ? null : yTables.get(tableId)?.toJSON()),
+                  action == DELETE ? void 0 : yTables.get(tableId)?.toJSON()),
             ),
         )
       : mapForEach(
           keys,
           (valueId, {action}) =>
-            (values[valueId] = action == DELETE ? null : yValues.get(valueId)),
+            (values[valueId] =
+              action == DELETE ? void 0 : yValues.get(valueId)),
         ),
   );
   return [tables, values, 1];
@@ -5832,7 +5866,7 @@ const createQueries = getCreateFunction((store) => {
     setDefinition(queryId, tableId);
     resetPreStores(queryId);
     const selectEntries = [];
-    const joinEntries = [[null, [tableId, null, null, [], mapNew()]]];
+    const joinEntries = [[void 0, [tableId, void 0, void 0, [], mapNew()]]];
     const wheres = [];
     const groupEntries = [];
     const havings = [];
@@ -5848,7 +5882,7 @@ const createQueries = getCreateFunction((store) => {
     };
     const join = (joinedTableId, arg1, arg2) => {
       const fromIntermediateJoinedTableId =
-        isUndefined(arg2) || isFunction(arg1) ? null : arg1;
+        isUndefined(arg2) || isFunction(arg1) ? void 0 : arg1;
       const onArg = isUndefined(fromIntermediateJoinedTableId) ? arg1 : arg2;
       const joinEntry = [
         joinedTableId,
@@ -5968,7 +6002,7 @@ const createQueries = getCreateFunction((store) => {
                       groupRow[groupedCellId] = isUndefined(
                         getCellOrValueType(aggregateValue),
                       )
-                        ? null
+                        ? void 0
                         : aggregateValue;
                     },
                   );
@@ -6097,20 +6131,20 @@ const createQueries = getCreateFunction((store) => {
     const listenToTable = (rootRowId, tableId2, rowId, joinedTableIds2) => {
       const getCell = (cellId) => store.getCell(tableId2, rowId, cellId);
       arrayForEach(joinedTableIds2, (remoteAsTableId) => {
-        const [realJoinedTableId, , on, nextJoinedTableIds, remoteIdPair] =
+        const [realJoinedTableId, , on, nextJoinedTableIds, remoteIdPairs] =
           mapGet(joins, remoteAsTableId);
         const remoteRowId = on?.(getCell, rootRowId);
         const [previousRemoteRowId, previousRemoteListenerId] =
-          mapGet(remoteIdPair, rootRowId) ?? [];
+          mapGet(remoteIdPairs, rootRowId) ?? [];
         if (remoteRowId != previousRemoteRowId) {
           if (!isUndefined(previousRemoteListenerId)) {
             delStoreListeners(queryId, previousRemoteListenerId);
           }
           mapSet(
-            remoteIdPair,
+            remoteIdPairs,
             rootRowId,
             isUndefined(remoteRowId)
-              ? null
+              ? void 0
               : [
                   remoteRowId,
                   ...addStoreListeners(
@@ -6131,7 +6165,7 @@ const createQueries = getCreateFunction((store) => {
       });
       writeSelectRow(rootRowId);
     };
-    const {3: joinedTableIds} = mapGet(joins, null);
+    const {3: joinedTableIds} = mapGet(joins, void 0);
     selectJoinWhereStore.transaction(() =>
       addStoreListeners(
         queryId,
@@ -6595,7 +6629,7 @@ const createCustomSynchronizer = (
       ifNotUndefined(
         mapGet(pendingRequests, transactionOrRequestId),
         ([toClientId, handleResponse]) =>
-          isUndefined(toClientId) || toClientId == fromClientId
+          isNull(toClientId) || toClientId == fromClientId
             ? handleResponse(body, fromClientId)
             : /* istanbul ignore next */
               0,
@@ -6655,7 +6689,7 @@ const createBroadcastChannelSynchronizer = (
     channel.onmessage = ({
       data: [fromClientId, toClientId, requestId, message, body],
     }) =>
-      isUndefined(toClientId) || toClientId == clientId
+      isNull(toClientId) || toClientId == clientId
         ? receive(fromClientId, requestId, message, body)
         : 0;
   };
@@ -6680,7 +6714,7 @@ const createLocalSynchronizer = (store, onSend, onReceive, onIgnoredError) => {
   const clientId = getUniqueId$1();
   const send = (toClientId, requestId, message, body) =>
     startTimeout(() =>
-      isUndefined(toClientId)
+      isNull(toClientId)
         ? mapForEach(clients, (otherClientId, receive) =>
             otherClientId != clientId
               ? receive(clientId, requestId, message, body)
@@ -9525,7 +9559,7 @@ const RelationshipInHtmlRow = ({
               ? localRowId
               : tableId === remoteTableId
                 ? remoteRowId
-                : null;
+                : void 0;
           return isUndefined(rowId)
             ? null
             : /* @__PURE__ */ jsx(
@@ -10268,11 +10302,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();
         }
@@ -10281,7 +10315,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: [