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

package/with-schemas/index.js

@@ -6,6 +6,7 @@ const NUMBER = getTypeOf(0);
 const FUNCTION = getTypeOf(getTypeOf);
 const TYPE = 'type';
 const DEFAULT = 'default';
+const ALLOW_NULL = 'allowNull';
 const SUM = 'sum';
 const AVG = 'avg';
 const MIN = 'min';
@@ -37,6 +38,10 @@ const strEndsWith = (str, suffix) => str.endsWith(suffix);
 const strSplit = (str, separator = EMPTY_STRING, limit) =>
   str.split(separator, limit);
 
+const getIfNotFunction =
+  (predicate = isNullish) =>
+  (value, then, otherwise) =>
+    predicate(value) ? otherwise?.() : then(value);
 const GLOBAL = globalThis;
 const math = Math;
 const mathMax = math.max;
@@ -44,9 +49,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;
@@ -88,13 +95,16 @@ const arrayUnshift = (array, ...values) => array.unshift(...values);
 const arrayShift = (array) => array.shift();
 
 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)
@@ -121,12 +131,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,
@@ -155,7 +165,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)
@@ -179,7 +189,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());
@@ -500,7 +510,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),
             );
@@ -653,7 +663,7 @@ const createCheckpoints = getCreateFunction(
         ? goBackwardImpl
         : arrayHas(forwardIds, checkpointId)
           ? goForwardImpl
-          : null;
+          : void 0;
       while (!isUndefined(action) && checkpointId != currentId) {
         action();
       }
@@ -1233,14 +1243,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;
@@ -1277,9 +1295,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))
@@ -1304,9 +1332,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))
@@ -1549,7 +1581,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),
@@ -2558,7 +2590,7 @@ const validateMergeableContent = (mergeableContent) =>
                 objValidate(
                   cellStamps,
                   (cellStamp) =>
-                    stampValidate(cellStamp, isCellOrValueOrNullOrUndefined),
+                    stampValidate(cellStamp, isCellOrValueOrUndefined),
                   void 0,
                   1,
                 ),
@@ -2574,7 +2606,7 @@ const validateMergeableContent = (mergeableContent) =>
   stampValidate(mergeableContent[1], (values) =>
     objValidate(
       values,
-      (value) => stampValidate(value, isCellOrValueOrNullOrUndefined),
+      (value) => stampValidate(value, isCellOrValueOrUndefined),
       void 0,
       1,
     ),
@@ -3252,7 +3284,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 = [];
@@ -3268,7 +3300,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,
@@ -3388,7 +3420,7 @@ const createQueries = getCreateFunction((store) => {
                       groupRow[groupedCellId] = isUndefined(
                         getCellOrValueType(aggregateValue),
                       )
-                        ? null
+                        ? void 0
                         : aggregateValue;
                     },
                   );
@@ -3517,20 +3549,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(
@@ -3551,7 +3583,7 @@ const createQueries = getCreateFunction((store) => {
       });
       writeSelectRow(rootRowId);
     };
-    const {3: joinedTableIds} = mapGet(joins, null);
+    const {3: joinedTableIds} = mapGet(joins, void 0);
     selectJoinWhereStore.transaction(() =>
       addStoreListeners(
         queryId,