tinybase 9.1.0 → 9.1.1

package/schematizers/with-schemas/index.js

@@ -8,6 +8,7 @@ const ARRAY = 'array';
 const TYPE = 'type';
 const DEFAULT = 'default';
 const ALLOW_NULL = 'allowNull';
+const REQUIRED = 'required';
 
 const getIfNotFunction = (predicate) => (value, then, otherwise) =>
   predicate(value)
@@ -44,9 +45,14 @@ const objForEach = (obj, cb) =>
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
-const createCustomSchematizer = (unwrapSchema, getProperties) => {
-  const toCellOrValueSchema = (schema) => {
-    const [unwrapped, defaultValue, allowNull] = unwrapSchema(schema);
+const createCustomSchematizer = (
+  unwrapSchema,
+  getProperties,
+  getPropertyRequired,
+) => {
+  const toCellOrValueSchema = (schema, required) => {
+    const [unwrapped, defaultValue, allowNull, unwrappedRequired = required] =
+      unwrapSchema(schema, void 0, void 0, required);
     const type = unwrapped?.type;
     if (
       type !== STRING &&
@@ -64,6 +70,9 @@ const createCustomSchematizer = (unwrapSchema, getProperties) => {
     if (allowNull) {
       cellOrValueSchema[ALLOW_NULL] = true;
     }
+    if (unwrappedRequired && isUndefined(defaultValue)) {
+      cellOrValueSchema[REQUIRED] = true;
+    }
     return cellOrValueSchema;
   };
   const toTablesSchema = (schemas) => {
@@ -72,9 +81,15 @@ const createCustomSchematizer = (unwrapSchema, getProperties) => {
       const tableSchema = objNew();
       ifNotUndefined(getProperties(schema), (properties) =>
         objForEach(properties, (cellSchema, cellId) =>
-          ifNotUndefined(toCellOrValueSchema(cellSchema), (cellSchema2) => {
-            tableSchema[cellId] = cellSchema2;
-          }),
+          ifNotUndefined(
+            toCellOrValueSchema(
+              cellSchema,
+              getPropertyRequired?.(schema, cellId, cellSchema),
+            ),
+            (cellSchema2) => {
+              tableSchema[cellId] = cellSchema2;
+            },
+          ),
         ),
       );
       if (!objIsEmpty(tableSchema)) {