tinybase 7.0.0-beta.1 → 7.0.0-beta.3

package/persisters/persister-yjs/index.js

@@ -5,9 +5,15 @@ const EMPTY_STRING = '';
 const T = 't';
 const V = 'v';
 
-const isUndefined = (thing) => thing == void 0;
-const ifNotUndefined = (value, then, otherwise) =>
-  isUndefined(value) ? otherwise?.() : then(value);
+const getIfNotFunction =
+  (predicate = isNullish) =>
+  (value, then, otherwise) =>
+    predicate(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);
@@ -40,12 +46,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,
@@ -72,7 +78,7 @@ const mapGet = (map, key) => map?.get(key);
 const mapForEach = (map, cb) =>
   collForEach(map, (value, key) => cb(key, value));
 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());
@@ -183,7 +189,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),
             );
@@ -459,7 +465,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)),
                 );
               },
               () =>
@@ -467,7 +474,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()),
                 ),
             );
           },
@@ -476,13 +483,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];

package/persisters/persister-yjs/with-schemas/index.js

@@ -5,9 +5,15 @@ const EMPTY_STRING = '';
 const T = 't';
 const V = 'v';
 
-const isUndefined = (thing) => thing == void 0;
-const ifNotUndefined = (value, then, otherwise) =>
-  isUndefined(value) ? otherwise?.() : then(value);
+const getIfNotFunction =
+  (predicate = isNullish) =>
+  (value, then, otherwise) =>
+    predicate(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);
@@ -40,12 +46,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,
@@ -72,7 +78,7 @@ const mapGet = (map, key) => map?.get(key);
 const mapForEach = (map, cb) =>
   collForEach(map, (value, key) => cb(key, value));
 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());
@@ -183,7 +189,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),
             );
@@ -459,7 +465,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)),
                 );
               },
               () =>
@@ -467,7 +474,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()),
                 ),
             );
           },
@@ -476,13 +483,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];

package/persisters/with-schemas/index.js

@@ -13,15 +13,21 @@ 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 THOUSAND = 1e3;
 const startInterval = (callback, sec, immediate) => {
   return setInterval(callback, sec * THOUSAND);
 };
 const stopInterval = clearInterval;
-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 isString = (thing) => getTypeOf(thing) == STRING;
 const isArray = (thing) => Array.isArray(thing);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
@@ -61,12 +67,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,
@@ -95,7 +101,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());
@@ -206,7 +212,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),
             );
@@ -579,7 +585,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);
     }
@@ -1306,7 +1312,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;

package/queries/index.js

@@ -21,13 +21,18 @@ const SORTED_ROW_IDS = 'Sorted' + ROW + IDS;
 const CELL = 'Cell';
 const CELL_IDS = CELL + IDS;
 
+const getIfNotFunction =
+  (predicate = isNullish) =>
+  (value, then, otherwise) =>
+    predicate(value) ? otherwise?.() : then(value);
 const math = Math;
 const mathMax = math.max;
 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 ifNotUndefined = getIfNotFunction(isUndefined);
 const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
 const isArray = (thing) => Array.isArray(thing);
@@ -69,7 +74,7 @@ const mapGet = (map, key) => map?.get(key);
 const mapForEach = (map, cb) =>
   collForEach(map, (value, key) => cb(key, value));
 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());
@@ -170,6 +175,9 @@ const getAggregateValue = (
 };
 
 const getCellOrValueType = (cellOrValue) => {
+  if (isNull(cellOrValue)) {
+    return 'null';
+  }
   const type = getTypeOf(cellOrValue);
   return isTypeStringOrBoolean(type) ||
     (type == NUMBER && isFiniteNumber(cellOrValue))
@@ -426,7 +434,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 = [];
@@ -442,7 +450,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,
@@ -562,7 +570,7 @@ const createQueries = getCreateFunction((store) => {
                       groupRow[groupedCellId] = isUndefined(
                         getCellOrValueType(aggregateValue),
                       )
-                        ? null
+                        ? void 0
                         : aggregateValue;
                     },
                   );
@@ -691,20 +699,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(
@@ -725,7 +733,7 @@ const createQueries = getCreateFunction((store) => {
       });
       writeSelectRow(rootRowId);
     };
-    const {3: joinedTableIds} = mapGet(joins, null);
+    const {3: joinedTableIds} = mapGet(joins, void 0);
     selectJoinWhereStore.transaction(() =>
       addStoreListeners(
         queryId,

package/queries/with-schemas/index.js

@@ -21,13 +21,18 @@ const SORTED_ROW_IDS = 'Sorted' + ROW + IDS;
 const CELL = 'Cell';
 const CELL_IDS = CELL + IDS;
 
+const getIfNotFunction =
+  (predicate = isNullish) =>
+  (value, then, otherwise) =>
+    predicate(value) ? otherwise?.() : then(value);
 const math = Math;
 const mathMax = math.max;
 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 ifNotUndefined = getIfNotFunction(isUndefined);
 const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
 const isArray = (thing) => Array.isArray(thing);
@@ -69,7 +74,7 @@ const mapGet = (map, key) => map?.get(key);
 const mapForEach = (map, cb) =>
   collForEach(map, (value, key) => cb(key, value));
 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());
@@ -170,6 +175,9 @@ const getAggregateValue = (
 };
 
 const getCellOrValueType = (cellOrValue) => {
+  if (isNull(cellOrValue)) {
+    return 'null';
+  }
   const type = getTypeOf(cellOrValue);
   return isTypeStringOrBoolean(type) ||
     (type == NUMBER && isFiniteNumber(cellOrValue))
@@ -426,7 +434,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 = [];
@@ -442,7 +450,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,
@@ -562,7 +570,7 @@ const createQueries = getCreateFunction((store) => {
                       groupRow[groupedCellId] = isUndefined(
                         getCellOrValueType(aggregateValue),
                       )
-                        ? null
+                        ? void 0
                         : aggregateValue;
                     },
                   );
@@ -691,20 +699,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(
@@ -725,7 +733,7 @@ const createQueries = getCreateFunction((store) => {
       });
       writeSelectRow(rootRowId);
     };
-    const {3: joinedTableIds} = mapGet(joins, null);
+    const {3: joinedTableIds} = mapGet(joins, void 0);
     selectJoinWhereStore.transaction(() =>
       addStoreListeners(
         queryId,