tinybase 9.1.0-beta.1 → 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) =>

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) =>

package/ui-react/index.js

@@ -1332,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,
@@ -1339,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,
@@ -2461,8 +2475,10 @@ export {
   useGoToCallback,
   useHasCell,
   useHasCellListener,
+  useHasIndex,
   useHasRow,
   useHasRowListener,
+  useHasSlice,
   useHasTable,
   useHasTableCell,
   useHasTableCellListener,

package/ui-react/with-schemas/index.js

@@ -1332,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,
@@ -1339,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,
@@ -2461,8 +2475,10 @@ export {
   useGoToCallback,
   useHasCell,
   useHasCellListener,
+  useHasIndex,
   useHasRow,
   useHasRowListener,
+  useHasSlice,
   useHasTable,
   useHasTableCell,
   useHasTableCellListener,

package/ui-react-inspector/index.js

@@ -73,6 +73,7 @@ const REMOTE_ROW_ID = 'Remote' + ROW + 'Id';
 const CURRENT_TARGET = 'currentTarget';
 const _VALUE = 'value';
 const EXTRA = 'extra';
+const REQUIRED = 'required';
 const UNDEFINED = '\uFFFC';
 const JSON_PREFIX = '\uFFFD';
 const id = (key) => EMPTY_STRING + key;
@@ -1200,6 +1201,7 @@ const createStore = () => {
   const valuesSchemaMap = mapNew();
   const valuesDefaulted = mapNew();
   const valuesNonDefaulted = setNew();
+  const valuesRequiredNonDefaulted = setNew();
   const tablePoolFunctions = mapNew();
   const tableCellIds = mapNew();
   const tablesMap = mapNew();
@@ -1252,7 +1254,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;
@@ -1287,20 +1289,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(
@@ -1326,20 +1340,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(
@@ -1410,6 +1435,7 @@ const createStore = () => {
       (_tablesSchema, tableId, tableSchema) => {
         const rowDefaulted = mapNew();
         const rowNonDefaulted = setNew();
+        const rowRequiredNonDefaulted = setNew();
         mapMatch(
           mapEnsure(tablesSchemaMap, tableId, mapNew),
           tableSchema,
@@ -1417,12 +1443,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);
@@ -1437,14 +1474,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) =>