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

package/store/index.js

@@ -25,6 +25,7 @@ const CELL_IDS = CELL + IDS;
 const VALUE = 'Value';
 const VALUES = VALUE + 's';
 const VALUE_IDS = VALUE + IDS;
+const REQUIRED = 'required';
 const JSON_PREFIX = '\uFFFD';
 const id = (key) => EMPTY_STRING + key;
 
@@ -397,6 +398,7 @@ const createStore = () => {
   const valuesSchemaMap = mapNew();
   const valuesDefaulted = mapNew();
   const valuesNonDefaulted = setNew();
+  const valuesRequiredNonDefaulted = setNew();
   const tablePoolFunctions = mapNew();
   const tableCellIds = mapNew();
   const tablesMap = mapNew();
@@ -449,7 +451,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;
@@ -484,20 +486,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(
@@ -523,20 +537,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(
@@ -607,6 +632,7 @@ const createStore = () => {
       (_tablesSchema, tableId, tableSchema) => {
         const rowDefaulted = mapNew();
         const rowNonDefaulted = setNew();
+        const rowRequiredNonDefaulted = setNew();
         mapMatch(
           mapEnsure(tablesSchemaMap, tableId, mapNew),
           tableSchema,
@@ -614,12 +640,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);
@@ -634,14 +671,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) =>
@@ -1314,13 +1364,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],
@@ -1374,6 +1447,7 @@ const createStore = () => {
     descending,
     offset = 0,
     limit,
+    sorter = defaultSorter,
   ) =>
     isObject(tableIdOrArgs)
       ? getSortedRowIds(
@@ -1382,16 +1456,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,
@@ -1869,6 +1946,7 @@ const createStore = () => {
             tableIdOrArgs.descending ?? false,
             tableIdOrArgs.offset ?? 0,
             tableIdOrArgs.limit,
+            tableIdOrArgs.sorter,
           ],
           cellIdOrListener,
           descendingOrMutator,
@@ -1876,7 +1954,7 @@ const createStore = () => {
       : addSortedRowIdsListenerImpl(
           tableIdOrArgs,
           cellIdOrListener,
-          [descendingOrMutator, offset, limit],
+          [descendingOrMutator, offset, limit, void 0],
           listener,
           mutator,
         );

package/store/with-schemas/index.js

@@ -25,6 +25,7 @@ const CELL_IDS = CELL + IDS;
 const VALUE = 'Value';
 const VALUES = VALUE + 's';
 const VALUE_IDS = VALUE + IDS;
+const REQUIRED = 'required';
 const JSON_PREFIX = '\uFFFD';
 const id = (key) => EMPTY_STRING + key;
 
@@ -397,6 +398,7 @@ const createStore = () => {
   const valuesSchemaMap = mapNew();
   const valuesDefaulted = mapNew();
   const valuesNonDefaulted = setNew();
+  const valuesRequiredNonDefaulted = setNew();
   const tablePoolFunctions = mapNew();
   const tableCellIds = mapNew();
   const tablesMap = mapNew();
@@ -449,7 +451,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;
@@ -484,20 +486,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(
@@ -523,20 +537,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(
@@ -607,6 +632,7 @@ const createStore = () => {
       (_tablesSchema, tableId, tableSchema) => {
         const rowDefaulted = mapNew();
         const rowNonDefaulted = setNew();
+        const rowRequiredNonDefaulted = setNew();
         mapMatch(
           mapEnsure(tablesSchemaMap, tableId, mapNew),
           tableSchema,
@@ -614,12 +640,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);
@@ -634,14 +671,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) =>
@@ -1314,13 +1364,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],
@@ -1374,6 +1447,7 @@ const createStore = () => {
     descending,
     offset = 0,
     limit,
+    sorter = defaultSorter,
   ) =>
     isObject(tableIdOrArgs)
       ? getSortedRowIds(
@@ -1382,16 +1456,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,
@@ -1869,6 +1946,7 @@ const createStore = () => {
             tableIdOrArgs.descending ?? false,
             tableIdOrArgs.offset ?? 0,
             tableIdOrArgs.limit,
+            tableIdOrArgs.sorter,
           ],
           cellIdOrListener,
           descendingOrMutator,
@@ -1876,7 +1954,7 @@ const createStore = () => {
       : addSortedRowIdsListenerImpl(
           tableIdOrArgs,
           cellIdOrListener,
-          [descendingOrMutator, offset, limit],
+          [descendingOrMutator, offset, limit, void 0],
           listener,
           mutator,
         );

package/ui-react/index.js

@@ -536,33 +536,56 @@ const useSortedRowIdsImpl = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
-) =>
-  useListenable(
+) => {
+  const sortedRowIdsArgs = useMemo(
+    () => ({
+      tableId,
+      cellId,
+      descending: descending ?? false,
+      offset: offset ?? 0,
+      limit,
+      sorter,
+    }),
+    [tableId, cellId, descending, offset, limit, sorter],
+  );
+  return useListenable(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     1 /* Array */,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [sortedRowIdsArgs],
   );
+};
 const useSortedRowIdsListenerImpl = (
   tableId,
   cellId,
   descending,
   offset,
   limit,
+  sorter,
   listener,
   listenerDeps,
   mutator,
   storeOrStoreId,
-) =>
+) => {
+  const sortedRowIdsArgs = useMemo(
+    () => ({tableId, cellId, descending, offset, limit, sorter}),
+    [tableId, cellId, descending, offset, limit, sorter],
+  );
   useListener(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     listener,
     listenerDeps,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [sortedRowIdsArgs],
     mutator,
   );
+};
 const useCreateStore = (create, createDeps = EMPTY_ARRAY) =>
   useMemo(create, createDeps);
 const useStoreIds = () => useThingIds(OFFSET_STORE);
@@ -632,6 +655,7 @@ const useSortedRowIds = (
   descending,
   offset,
   limit,
+  sorterOrStoreOrStoreId,
   storeOrStoreId,
 ) =>
   useSortedRowIdsImpl(
@@ -642,6 +666,7 @@ const useSortedRowIds = (
           tableIdOrArgs.descending ?? false,
           tableIdOrArgs.offset ?? 0,
           tableIdOrArgs.limit,
+          tableIdOrArgs.sorter,
           cellIdOrStoreOrStoreId,
         ]
       : [
@@ -650,7 +675,10 @@ const useSortedRowIds = (
           descending,
           offset,
           limit,
-          storeOrStoreId,
+          isFunction(sorterOrStoreOrStoreId) ? sorterOrStoreOrStoreId : void 0,
+          isFunction(sorterOrStoreOrStoreId)
+            ? storeOrStoreId
+            : sorterOrStoreOrStoreId,
         ]),
   );
 const useHasRow = (tableId, rowId, storeOrStoreId) =>
@@ -1057,6 +1085,7 @@ const useSortedRowIdsListener = (
           tableIdOrArgs.descending ?? false,
           tableIdOrArgs.offset ?? 0,
           tableIdOrArgs.limit,
+          tableIdOrArgs.sorter,
           cellIdOrListener,
           descendingOrListenerDeps,
           offsetOrMutator,
@@ -1068,6 +1097,7 @@ const useSortedRowIdsListener = (
           descendingOrListenerDeps,
           offsetOrMutator,
           limitOrStoreOrStoreId,
+          void 0,
           listener,
           listenerDeps,
           mutator,
@@ -1302,6 +1332,13 @@ const useIndexIds = (indexesOrIndexesId) =>
     useIndexesOrIndexesById(indexesOrIndexesId),
     1 /* Array */,
   );
+const useHasIndex = (indexId, indexesOrIndexesId) =>
+  useListenable(
+    INDEX,
+    useIndexesOrIndexesById(indexesOrIndexesId),
+    6 /* Boolean */,
+    [indexId],
+  );
 const useSliceRowIds = (indexId, sliceId, indexesOrIndexesId) =>
   useListenable(
     SLICE + ROW_IDS,
@@ -1309,6 +1346,13 @@ const useSliceRowIds = (indexId, sliceId, indexesOrIndexesId) =>
     1 /* Array */,
     [indexId, sliceId],
   );
+const useHasSlice = (indexId, sliceId, indexesOrIndexesId) =>
+  useListenable(
+    SLICE,
+    useIndexesOrIndexesById(indexesOrIndexesId),
+    6 /* Boolean */,
+    [indexId, sliceId],
+  );
 const useSliceIdsListener = (
   indexId,
   listener,
@@ -2431,8 +2475,10 @@ export {
   useGoToCallback,
   useHasCell,
   useHasCellListener,
+  useHasIndex,
   useHasRow,
   useHasRowListener,
+  useHasSlice,
   useHasTable,
   useHasTableCell,
   useHasTableCellListener,