tinybase 9.1.0-beta.0 → 9.1.0-beta.2

package/index.js

@@ -35,6 +35,7 @@ const VALUE = 'Value';
 const VALUES = VALUE + 's';
 const VALUE_IDS = VALUE + IDS;
 const TRANSACTION = 'Transaction';
+const REQUIRED = 'required';
 const JSON_PREFIX = '\uFFFD';
 const id = (key) => EMPTY_STRING + key;
 const strStartsWith = (str, prefix) => str.startsWith(prefix);
@@ -929,7 +930,9 @@ const defaultSorter = (sortKey1, sortKey2) =>
   (sortKey1 ?? 0) < (sortKey2 ?? 0) ? -1 : 1;
 
 const createIndexes = getCreateFunction((store) => {
+  const hasIndexListeners = mapNew();
   const sliceIdsListeners = mapNew();
+  const hasSliceListeners = mapNew();
   const sliceRowIdsListeners = mapNew();
   const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
     () => indexes,
@@ -968,6 +971,7 @@ const createIndexes = getCreateFunction((store) => {
     sliceIdSorter,
     rowIdSorter = defaultSorter,
   ) => {
+    const hadIndex = hasIndex(indexId);
     const sliceIdArraySorter = isUndefined(sliceIdSorter)
       ? void 0
       : ([id1], [id2]) => sliceIdSorter(id1, id2);
@@ -984,8 +988,14 @@ const createIndexes = getCreateFunction((store) => {
       ) => {
         let sliceIdsChanged = 0;
         const changedSlices = setNew();
+        const hadSlices = mapNew();
         const unsortedSlices = setNew();
         const index = getIndex(indexId);
+        const setHadSlice = (sliceId) => {
+          if (!collHas(hadSlices, sliceId)) {
+            mapSet(hadSlices, sliceId, collHas(index, sliceId));
+          }
+        };
         collForEach(
           changedSliceIds,
           ([oldSliceIdOrIds, newSliceIdOrIds], rowId) => {
@@ -997,6 +1007,7 @@ const createIndexes = getCreateFunction((store) => {
                 : 0,
             );
             collForEach(oldSliceIds, (oldSliceId) => {
+              setHadSlice(oldSliceId);
               setAdd(changedSlices, oldSliceId);
               ifNotUndefined(mapGet(index, oldSliceId), (oldSlice) => {
                 collDel(oldSlice, rowId);
@@ -1007,6 +1018,7 @@ const createIndexes = getCreateFunction((store) => {
               });
             });
             collForEach(newSliceIds, (newSliceId) => {
+              setHadSlice(newSliceId);
               setAdd(changedSlices, newSliceId);
               if (!collHas(index, newSliceId)) {
                 mapSet(index, newSliceId, setNew());
@@ -1068,6 +1080,12 @@ const createIndexes = getCreateFunction((store) => {
         if (sliceIdsChanged) {
           callListeners(sliceIdsListeners, [indexId]);
         }
+        mapForEach(hadSlices, (sliceId, hadSlice) => {
+          const hasSliceNow = collHas(index, sliceId);
+          if (hadSlice != hasSliceNow) {
+            callListeners(hasSliceListeners, [indexId, sliceId], hasSliceNow);
+          }
+        });
         collForEach(changedSlices, (sliceId) =>
           callListeners(sliceRowIdsListeners, [indexId, sliceId]),
         );
@@ -1075,6 +1093,9 @@ const createIndexes = getCreateFunction((store) => {
       getRowCellFunction(getSliceIdOrIds),
       ifNotUndefined(getSortKey, getRowCellFunction),
     );
+    if (!hadIndex) {
+      callListeners(hasIndexListeners, [indexId], true);
+    }
     return indexes;
   };
   const forEachIndex = (indexCallback) =>
@@ -1098,7 +1119,20 @@ const createIndexes = getCreateFunction((store) => {
     );
   };
   const delIndexDefinition = (indexId) => {
+    const index = getIndex(indexId);
+    const hadIndex = hasIndex(indexId);
+    const sliceIds = hadIndex ? mapKeys(index) : [];
     delDefinition(indexId);
+    if (hadIndex) {
+      callListeners(hasIndexListeners, [indexId], false);
+      if (sliceIds.length > 0) {
+        callListeners(sliceIdsListeners, [indexId]);
+        arrayForEach(sliceIds, (sliceId) => {
+          callListeners(hasSliceListeners, [indexId, sliceId], false);
+          callListeners(sliceRowIdsListeners, [indexId, sliceId]);
+        });
+      }
+    }
     return indexes;
   };
   const getSliceIds = (indexId) => mapKeys(getIndex(indexId));
@@ -1106,6 +1140,10 @@ const createIndexes = getCreateFunction((store) => {
     collValues(mapGet(getIndex(indexId), sliceId));
   const addSliceIdsListener = (indexId, listener) =>
     addListener(listener, sliceIdsListeners, [indexId]);
+  const addHasIndexListener = (indexId, listener) =>
+    addListener(listener, hasIndexListeners, [indexId]);
+  const addHasSliceListener = (indexId, sliceId, listener) =>
+    addListener(listener, hasSliceListeners, [indexId, sliceId]);
   const addSliceRowIdsListener = (indexId, sliceId, listener) =>
     addListener(listener, sliceRowIdsListeners, [indexId, sliceId]);
   const delListener = (listenerId) => {
@@ -1129,7 +1167,9 @@ const createIndexes = getCreateFunction((store) => {
     getSliceIds,
     getSliceRowIds,
     addIndexIdsListener,
+    addHasIndexListener,
     addSliceIdsListener,
+    addHasSliceListener,
     addSliceRowIdsListener,
     delListener,
     destroy,
@@ -1236,6 +1276,7 @@ const createStore = () => {
   const valuesSchemaMap = mapNew();
   const valuesDefaulted = mapNew();
   const valuesNonDefaulted = setNew();
+  const valuesRequiredNonDefaulted = setNew();
   const tablePoolFunctions = mapNew();
   const tableCellIds = mapNew();
   const tablesMap = mapNew();
@@ -1288,7 +1329,7 @@ const createStore = () => {
   const validateCellOrValueSchema = (schema) => {
     if (
       !objValidate(schema, (_child, id2) =>
-        arrayHas([TYPE, DEFAULT, ALLOW_NULL], id2),
+        arrayHas([TYPE, DEFAULT, ALLOW_NULL, REQUIRED], id2),
       )
     ) {
       return false;
@@ -1323,20 +1364,32 @@ const createStore = () => {
       (row, rowId) => validateRow(tableId, rowId, row),
       () => cellInvalid(tableId),
     );
-  const validateRow = (tableId, rowId, row, skipDefaults) =>
-    objValidate(
-      skipDefaults ? row : addDefaultsToRow(row, tableId, rowId),
-      (cell, cellId) =>
-        ifNotUndefined(
-          getValidatedCell(tableId, rowId, cellId, cell),
-          (validCell) => {
-            row[cellId] = validCell;
-            return true;
-          },
-          () => false,
-        ),
-      () => cellInvalid(tableId, rowId),
+  const validateRow = (tableId, rowId, row, skipDefaults) => {
+    const rowWithDefaults = skipDefaults
+      ? row
+      : addDefaultsToRow(row, tableId, rowId);
+    return (
+      objValidate(
+        rowWithDefaults,
+        (cell, cellId) =>
+          ifNotUndefined(
+            getValidatedCell(tableId, rowId, cellId, cell),
+            (validCell) => {
+              row[cellId] = validCell;
+              return true;
+            },
+            () => false,
+          ),
+        () => cellInvalid(tableId, rowId),
+      ) &&
+      (skipDefaults
+        ? true
+        : arrayEvery(
+            collValues(mapGet(tablesSchemaRowCache, tableId)?.[2]),
+            (cellId) => objHas(rowWithDefaults, cellId),
+          ))
     );
+  };
   const getValidatedCell = (tableId, rowId, cellId, cell) =>
     hasTablesSchema
       ? ifNotUndefined(
@@ -1362,20 +1415,31 @@ const createStore = () => {
       : isUndefined(getCellOrValueType(cell))
         ? cellInvalid(tableId, rowId, cellId, cell)
         : encodeIfJson(cell);
-  const validateValues = (values, skipDefaults) =>
-    objValidate(
-      skipDefaults ? values : addDefaultsToValues(values),
-      (value, valueId) =>
-        ifNotUndefined(
-          getValidatedValue(valueId, value),
-          (validValue) => {
-            values[valueId] = validValue;
-            return true;
-          },
-          () => false,
-        ),
-      () => valueInvalid(),
+  const validateValues = (values, skipDefaults) => {
+    const valuesWithDefaults = skipDefaults
+      ? values
+      : addDefaultsToValues(values);
+    return (
+      objValidate(
+        valuesWithDefaults,
+        (value, valueId) =>
+          ifNotUndefined(
+            getValidatedValue(valueId, value),
+            (validValue) => {
+              values[valueId] = validValue;
+              return true;
+            },
+            () => false,
+          ),
+        () => valueInvalid(),
+      ) &&
+      (skipDefaults
+        ? true
+        : arrayEvery(collValues(valuesRequiredNonDefaulted), (valueId) =>
+            objHas(valuesWithDefaults, valueId),
+          ))
     );
+  };
   const getValidatedValue = (valueId, value) =>
     hasValuesSchema
       ? ifNotUndefined(
@@ -1446,6 +1510,7 @@ const createStore = () => {
       (_tablesSchema, tableId, tableSchema) => {
         const rowDefaulted = mapNew();
         const rowNonDefaulted = setNew();
+        const rowRequiredNonDefaulted = setNew();
         mapMatch(
           mapEnsure(tablesSchemaMap, tableId, mapNew),
           tableSchema,
@@ -1453,12 +1518,23 @@ const createStore = () => {
             mapSet(tableSchemaMap, cellId, cellSchema);
             ifNotUndefined(
               cellSchema[DEFAULT],
-              (def) => mapSet(rowDefaulted, cellId, def),
-              () => setAdd(rowNonDefaulted, cellId),
+              (defaultCell) => {
+                mapSet(rowDefaulted, cellId, defaultCell);
+              },
+              () => {
+                setAdd(rowNonDefaulted, cellId);
+                if (cellSchema[REQUIRED] === true) {
+                  setAdd(rowRequiredNonDefaulted, cellId);
+                }
+              },
             );
           },
         );
-        mapSet(tablesSchemaRowCache, tableId, [rowDefaulted, rowNonDefaulted]);
+        mapSet(tablesSchemaRowCache, tableId, [
+          rowDefaulted,
+          rowNonDefaulted,
+          rowRequiredNonDefaulted,
+        ]);
       },
       (_tablesSchema, tableId) => {
         mapSet(tablesSchemaMap, tableId);
@@ -1473,14 +1549,27 @@ const createStore = () => {
         mapSet(valuesSchemaMap, valueId, valueSchema);
         ifNotUndefined(
           valueSchema[DEFAULT],
-          (def) => mapSet(valuesDefaulted, valueId, def),
-          () => setAdd(valuesNonDefaulted, valueId),
+          (defaultValue) => {
+            mapSet(valuesDefaulted, valueId, defaultValue);
+            collDel(valuesNonDefaulted, valueId);
+            collDel(valuesRequiredNonDefaulted, valueId);
+          },
+          () => {
+            mapSet(valuesDefaulted, valueId);
+            setAdd(valuesNonDefaulted, valueId);
+            if (valueSchema[REQUIRED] === true) {
+              setAdd(valuesRequiredNonDefaulted, valueId);
+            } else {
+              collDel(valuesRequiredNonDefaulted, valueId);
+            }
+          },
         );
       },
       (_valuesSchema, valueId) => {
         mapSet(valuesSchemaMap, valueId);
         mapSet(valuesDefaulted, valueId);
         collDel(valuesNonDefaulted, valueId);
+        collDel(valuesRequiredNonDefaulted, valueId);
       },
     );
   const setOrDelTables = (tables) =>
@@ -2153,13 +2242,36 @@ const createStore = () => {
     listener,
     mutator,
   ) => {
-    let sortedRowIds = getSortedRowIds(tableId, cellId, ...otherArgs);
+    const [descending, offset, limit, sorter] = otherArgs;
+    let sortedRowIds = getSortedRowIds(
+      tableId,
+      cellId,
+      descending,
+      offset,
+      limit,
+      sorter,
+    );
     return addListener(
       () => {
-        const newSortedRowIds = getSortedRowIds(tableId, cellId, ...otherArgs);
+        const newSortedRowIds = getSortedRowIds(
+          tableId,
+          cellId,
+          descending,
+          offset,
+          limit,
+          sorter,
+        );
         if (!arrayIsEqual(newSortedRowIds, sortedRowIds)) {
           sortedRowIds = newSortedRowIds;
-          listener(store, tableId, cellId, ...otherArgs, sortedRowIds);
+          listener(
+            store,
+            tableId,
+            cellId,
+            descending,
+            offset,
+            limit,
+            sortedRowIds,
+          );
         }
       },
       sortedRowIdsListeners[mutator ? 1 : 0],
@@ -2213,6 +2325,7 @@ const createStore = () => {
     descending,
     offset = 0,
     limit,
+    sorter = defaultSorter,
   ) =>
     isObject(tableIdOrArgs)
       ? getSortedRowIds(
@@ -2221,16 +2334,19 @@ const createStore = () => {
           tableIdOrArgs.descending,
           tableIdOrArgs.offset,
           tableIdOrArgs.limit,
+          tableIdOrArgs.sorter,
         )
       : arrayMap(
           slice(
             arraySort(
               mapMap(mapGet(tablesMap, id(tableIdOrArgs)), (row, rowId) => [
-                isUndefined(cellId) ? rowId : mapGet(row, id(cellId)),
+                isUndefined(cellId)
+                  ? rowId
+                  : decodeIfJson(mapGet(row, id(cellId))),
                 rowId,
               ]),
               ([cell1], [cell2]) =>
-                defaultSorter(cell1, cell2) * (descending ? -1 : 1),
+                sorter(cell1, cell2) * (descending ? -1 : 1),
             ),
             offset,
             isUndefined(limit) ? limit : offset + limit,
@@ -2708,6 +2824,7 @@ const createStore = () => {
             tableIdOrArgs.descending ?? false,
             tableIdOrArgs.offset ?? 0,
             tableIdOrArgs.limit,
+            tableIdOrArgs.sorter,
           ],
           cellIdOrListener,
           descendingOrMutator,
@@ -2715,7 +2832,7 @@ const createStore = () => {
       : addSortedRowIdsListenerImpl(
           tableIdOrArgs,
           cellIdOrListener,
-          [descendingOrMutator, offset, limit],
+          [descendingOrMutator, offset, limit, void 0],
           listener,
           mutator,
         );

package/indexes/index.js

@@ -339,7 +339,9 @@ const getListenerFunctions = (getThing) => {
 };
 
 const createIndexes = getCreateFunction((store) => {
+  const hasIndexListeners = mapNew();
   const sliceIdsListeners = mapNew();
+  const hasSliceListeners = mapNew();
   const sliceRowIdsListeners = mapNew();
   const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
     () => indexes,
@@ -378,6 +380,7 @@ const createIndexes = getCreateFunction((store) => {
     sliceIdSorter,
     rowIdSorter = defaultSorter,
   ) => {
+    const hadIndex = hasIndex(indexId);
     const sliceIdArraySorter = isUndefined(sliceIdSorter)
       ? void 0
       : ([id1], [id2]) => sliceIdSorter(id1, id2);
@@ -394,8 +397,14 @@ const createIndexes = getCreateFunction((store) => {
       ) => {
         let sliceIdsChanged = 0;
         const changedSlices = setNew();
+        const hadSlices = mapNew();
         const unsortedSlices = setNew();
         const index = getIndex(indexId);
+        const setHadSlice = (sliceId) => {
+          if (!collHas(hadSlices, sliceId)) {
+            mapSet(hadSlices, sliceId, collHas(index, sliceId));
+          }
+        };
         collForEach(
           changedSliceIds,
           ([oldSliceIdOrIds, newSliceIdOrIds], rowId) => {
@@ -407,6 +416,7 @@ const createIndexes = getCreateFunction((store) => {
                 : 0,
             );
             collForEach(oldSliceIds, (oldSliceId) => {
+              setHadSlice(oldSliceId);
               setAdd(changedSlices, oldSliceId);
               ifNotUndefined(mapGet(index, oldSliceId), (oldSlice) => {
                 collDel(oldSlice, rowId);
@@ -417,6 +427,7 @@ const createIndexes = getCreateFunction((store) => {
               });
             });
             collForEach(newSliceIds, (newSliceId) => {
+              setHadSlice(newSliceId);
               setAdd(changedSlices, newSliceId);
               if (!collHas(index, newSliceId)) {
                 mapSet(index, newSliceId, setNew());
@@ -478,6 +489,12 @@ const createIndexes = getCreateFunction((store) => {
         if (sliceIdsChanged) {
           callListeners(sliceIdsListeners, [indexId]);
         }
+        mapForEach(hadSlices, (sliceId, hadSlice) => {
+          const hasSliceNow = collHas(index, sliceId);
+          if (hadSlice != hasSliceNow) {
+            callListeners(hasSliceListeners, [indexId, sliceId], hasSliceNow);
+          }
+        });
         collForEach(changedSlices, (sliceId) =>
           callListeners(sliceRowIdsListeners, [indexId, sliceId]),
         );
@@ -485,6 +502,9 @@ const createIndexes = getCreateFunction((store) => {
       getRowCellFunction(getSliceIdOrIds),
       ifNotUndefined(getSortKey, getRowCellFunction),
     );
+    if (!hadIndex) {
+      callListeners(hasIndexListeners, [indexId], true);
+    }
     return indexes;
   };
   const forEachIndex = (indexCallback) =>
@@ -508,7 +528,20 @@ const createIndexes = getCreateFunction((store) => {
     );
   };
   const delIndexDefinition = (indexId) => {
+    const index = getIndex(indexId);
+    const hadIndex = hasIndex(indexId);
+    const sliceIds = hadIndex ? mapKeys(index) : [];
     delDefinition(indexId);
+    if (hadIndex) {
+      callListeners(hasIndexListeners, [indexId], false);
+      if (sliceIds.length > 0) {
+        callListeners(sliceIdsListeners, [indexId]);
+        arrayForEach(sliceIds, (sliceId) => {
+          callListeners(hasSliceListeners, [indexId, sliceId], false);
+          callListeners(sliceRowIdsListeners, [indexId, sliceId]);
+        });
+      }
+    }
     return indexes;
   };
   const getSliceIds = (indexId) => mapKeys(getIndex(indexId));
@@ -516,6 +549,10 @@ const createIndexes = getCreateFunction((store) => {
     collValues(mapGet(getIndex(indexId), sliceId));
   const addSliceIdsListener = (indexId, listener) =>
     addListener(listener, sliceIdsListeners, [indexId]);
+  const addHasIndexListener = (indexId, listener) =>
+    addListener(listener, hasIndexListeners, [indexId]);
+  const addHasSliceListener = (indexId, sliceId, listener) =>
+    addListener(listener, hasSliceListeners, [indexId, sliceId]);
   const addSliceRowIdsListener = (indexId, sliceId, listener) =>
     addListener(listener, sliceRowIdsListeners, [indexId, sliceId]);
   const delListener = (listenerId) => {
@@ -539,7 +576,9 @@ const createIndexes = getCreateFunction((store) => {
     getSliceIds,
     getSliceRowIds,
     addIndexIdsListener,
+    addHasIndexListener,
     addSliceIdsListener,
+    addHasSliceListener,
     addSliceRowIdsListener,
     delListener,
     destroy,

package/indexes/with-schemas/index.js

@@ -339,7 +339,9 @@ const getListenerFunctions = (getThing) => {
 };
 
 const createIndexes = getCreateFunction((store) => {
+  const hasIndexListeners = mapNew();
   const sliceIdsListeners = mapNew();
+  const hasSliceListeners = mapNew();
   const sliceRowIdsListeners = mapNew();
   const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
     () => indexes,
@@ -378,6 +380,7 @@ const createIndexes = getCreateFunction((store) => {
     sliceIdSorter,
     rowIdSorter = defaultSorter,
   ) => {
+    const hadIndex = hasIndex(indexId);
     const sliceIdArraySorter = isUndefined(sliceIdSorter)
       ? void 0
       : ([id1], [id2]) => sliceIdSorter(id1, id2);
@@ -394,8 +397,14 @@ const createIndexes = getCreateFunction((store) => {
       ) => {
         let sliceIdsChanged = 0;
         const changedSlices = setNew();
+        const hadSlices = mapNew();
         const unsortedSlices = setNew();
         const index = getIndex(indexId);
+        const setHadSlice = (sliceId) => {
+          if (!collHas(hadSlices, sliceId)) {
+            mapSet(hadSlices, sliceId, collHas(index, sliceId));
+          }
+        };
         collForEach(
           changedSliceIds,
           ([oldSliceIdOrIds, newSliceIdOrIds], rowId) => {
@@ -407,6 +416,7 @@ const createIndexes = getCreateFunction((store) => {
                 : 0,
             );
             collForEach(oldSliceIds, (oldSliceId) => {
+              setHadSlice(oldSliceId);
               setAdd(changedSlices, oldSliceId);
               ifNotUndefined(mapGet(index, oldSliceId), (oldSlice) => {
                 collDel(oldSlice, rowId);
@@ -417,6 +427,7 @@ const createIndexes = getCreateFunction((store) => {
               });
             });
             collForEach(newSliceIds, (newSliceId) => {
+              setHadSlice(newSliceId);
               setAdd(changedSlices, newSliceId);
               if (!collHas(index, newSliceId)) {
                 mapSet(index, newSliceId, setNew());
@@ -478,6 +489,12 @@ const createIndexes = getCreateFunction((store) => {
         if (sliceIdsChanged) {
           callListeners(sliceIdsListeners, [indexId]);
         }
+        mapForEach(hadSlices, (sliceId, hadSlice) => {
+          const hasSliceNow = collHas(index, sliceId);
+          if (hadSlice != hasSliceNow) {
+            callListeners(hasSliceListeners, [indexId, sliceId], hasSliceNow);
+          }
+        });
         collForEach(changedSlices, (sliceId) =>
           callListeners(sliceRowIdsListeners, [indexId, sliceId]),
         );
@@ -485,6 +502,9 @@ const createIndexes = getCreateFunction((store) => {
       getRowCellFunction(getSliceIdOrIds),
       ifNotUndefined(getSortKey, getRowCellFunction),
     );
+    if (!hadIndex) {
+      callListeners(hasIndexListeners, [indexId], true);
+    }
     return indexes;
   };
   const forEachIndex = (indexCallback) =>
@@ -508,7 +528,20 @@ const createIndexes = getCreateFunction((store) => {
     );
   };
   const delIndexDefinition = (indexId) => {
+    const index = getIndex(indexId);
+    const hadIndex = hasIndex(indexId);
+    const sliceIds = hadIndex ? mapKeys(index) : [];
     delDefinition(indexId);
+    if (hadIndex) {
+      callListeners(hasIndexListeners, [indexId], false);
+      if (sliceIds.length > 0) {
+        callListeners(sliceIdsListeners, [indexId]);
+        arrayForEach(sliceIds, (sliceId) => {
+          callListeners(hasSliceListeners, [indexId, sliceId], false);
+          callListeners(sliceRowIdsListeners, [indexId, sliceId]);
+        });
+      }
+    }
     return indexes;
   };
   const getSliceIds = (indexId) => mapKeys(getIndex(indexId));
@@ -516,6 +549,10 @@ const createIndexes = getCreateFunction((store) => {
     collValues(mapGet(getIndex(indexId), sliceId));
   const addSliceIdsListener = (indexId, listener) =>
     addListener(listener, sliceIdsListeners, [indexId]);
+  const addHasIndexListener = (indexId, listener) =>
+    addListener(listener, hasIndexListeners, [indexId]);
+  const addHasSliceListener = (indexId, sliceId, listener) =>
+    addListener(listener, hasSliceListeners, [indexId, sliceId]);
   const addSliceRowIdsListener = (indexId, sliceId, listener) =>
     addListener(listener, sliceRowIdsListeners, [indexId, sliceId]);
   const delListener = (listenerId) => {
@@ -539,7 +576,9 @@ const createIndexes = getCreateFunction((store) => {
     getSliceIds,
     getSliceRowIds,
     addIndexIdsListener,
+    addHasIndexListener,
     addSliceIdsListener,
+    addHasSliceListener,
     addSliceRowIdsListener,
     delListener,
     destroy,