tinybase 9.1.0-beta.2 → 9.1.1

package/schematizers/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)) {

package/schematizers/schematizer-arktype/index.js

@@ -58,9 +58,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 &&
@@ -78,6 +83,9 @@ const createCustomSchematizer = (unwrapSchema, getProperties) => {
     if (allowNull) {
       cellOrValueSchema[ALLOW_NULL] = true;
     }
+    if (unwrappedRequired && isUndefined(defaultValue)) {
+      cellOrValueSchema[REQUIRED] = true;
+    }
     return cellOrValueSchema;
   };
   const toTablesSchema = (schemas) => {
@@ -86,9 +94,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)) {
@@ -112,7 +126,7 @@ const createCustomSchematizer = (unwrapSchema, getProperties) => {
   });
 };
 
-const unwrapSchema = (schema, defaultValue, allowNull) => {
+const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
   const schemaData = schema?.json ?? schema;
   if (isArray(schemaData)) {
     const hasNull = !arrayEvery(
@@ -124,10 +138,10 @@ const unwrapSchema = (schema, defaultValue, allowNull) => {
       isFalse(schemaData[0]?.[UNIT]) &&
       isTrue(schemaData[1]?.[UNIT])
     ) {
-      return [{[TYPE]: BOOLEAN}, defaultValue, allowNull ?? false];
+      return [{[TYPE]: BOOLEAN}, defaultValue, allowNull ?? false, required];
     }
     if (arrayEvery(schemaData, (item) => isString(item?.[UNIT] ?? item))) {
-      return [{[TYPE]: STRING}, defaultValue, allowNull ?? false];
+      return [{[TYPE]: STRING}, defaultValue, allowNull ?? false, required];
     }
     if (hasNull) {
       const nonNullItem = arrayFind(
@@ -135,20 +149,21 @@ const unwrapSchema = (schema, defaultValue, allowNull) => {
         (item) => !isNull(item?.[UNIT]) && !isNull(item) && item !== '=',
       );
       if (nonNullItem) {
-        return unwrapSchema(nonNullItem, defaultValue, true);
+        return unwrapSchema(nonNullItem, defaultValue, true, required);
       }
     }
   }
   if (!isArray(schemaData) && !isUndefined(schemaData?.[SEQUENCE])) {
-    return [{[TYPE]: ARRAY}, defaultValue, allowNull ?? false];
+    return [{[TYPE]: ARRAY}, defaultValue, allowNull ?? false, required];
   }
   if (!isArray(schemaData) && isString(schemaData?.[UNIT])) {
-    return [{[TYPE]: STRING}, defaultValue, allowNull ?? false];
+    return [{[TYPE]: STRING}, defaultValue, allowNull ?? false, required];
   }
   return [
     {[TYPE]: schemaData?.[DOMAIN] || schemaData},
     defaultValue,
     allowNull ?? false,
+    required,
   ];
 };
 const getProperties = (schema) => {
@@ -170,17 +185,37 @@ const getProperties = (schema) => {
   }
   return objIsEmpty(properties) ? void 0 : properties;
 };
-const unwrapSchemaWithDefaults = (schema, defaultValue, allowNull) => {
+const getPropertyRequired = (schema, fieldId) => {
+  const schemaData = schema?.json ?? schema;
+  return isArray(schemaData?.[REQUIRED]) || isArray(schemaData?.[OPTIONAL])
+    ? !isUndefined(
+        arrayFind(
+          schemaData?.[REQUIRED] ?? [],
+          (field) => field[KEY] === fieldId,
+        ),
+      )
+    : void 0;
+};
+const unwrapSchemaWithDefaults = (
+  schema,
+  defaultValue,
+  allowNull,
+  required = true,
+) => {
   if (isArray(schema) && size(schema) === 3 && schema[1] === '=') {
     const schemaValue = schema[0]?.json ?? schema[0];
-    return unwrapSchema(schemaValue, schema[2], allowNull);
+    return unwrapSchema(schemaValue, schema[2], allowNull, false);
   }
   if (schema?.[_VALUE] && !isUndefined(schema?.[DEFAULT])) {
-    return unwrapSchema(schema[_VALUE], schema[DEFAULT], allowNull);
+    return unwrapSchema(schema[_VALUE], schema[DEFAULT], allowNull, false);
   }
-  return unwrapSchema(schema, defaultValue, allowNull);
+  return unwrapSchema(schema, defaultValue, allowNull, required);
 };
 const createArkTypeSchematizer = () =>
-  createCustomSchematizer(unwrapSchemaWithDefaults, getProperties);
+  createCustomSchematizer(
+    unwrapSchemaWithDefaults,
+    getProperties,
+    getPropertyRequired,
+  );
 
 export {createArkTypeSchematizer};

package/schematizers/schematizer-arktype/with-schemas/index.js

@@ -58,9 +58,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 &&
@@ -78,6 +83,9 @@ const createCustomSchematizer = (unwrapSchema, getProperties) => {
     if (allowNull) {
       cellOrValueSchema[ALLOW_NULL] = true;
     }
+    if (unwrappedRequired && isUndefined(defaultValue)) {
+      cellOrValueSchema[REQUIRED] = true;
+    }
     return cellOrValueSchema;
   };
   const toTablesSchema = (schemas) => {
@@ -86,9 +94,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)) {
@@ -112,7 +126,7 @@ const createCustomSchematizer = (unwrapSchema, getProperties) => {
   });
 };
 
-const unwrapSchema = (schema, defaultValue, allowNull) => {
+const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
   const schemaData = schema?.json ?? schema;
   if (isArray(schemaData)) {
     const hasNull = !arrayEvery(
@@ -124,10 +138,10 @@ const unwrapSchema = (schema, defaultValue, allowNull) => {
       isFalse(schemaData[0]?.[UNIT]) &&
       isTrue(schemaData[1]?.[UNIT])
     ) {
-      return [{[TYPE]: BOOLEAN}, defaultValue, allowNull ?? false];
+      return [{[TYPE]: BOOLEAN}, defaultValue, allowNull ?? false, required];
     }
     if (arrayEvery(schemaData, (item) => isString(item?.[UNIT] ?? item))) {
-      return [{[TYPE]: STRING}, defaultValue, allowNull ?? false];
+      return [{[TYPE]: STRING}, defaultValue, allowNull ?? false, required];
     }
     if (hasNull) {
       const nonNullItem = arrayFind(
@@ -135,20 +149,21 @@ const unwrapSchema = (schema, defaultValue, allowNull) => {
         (item) => !isNull(item?.[UNIT]) && !isNull(item) && item !== '=',
       );
       if (nonNullItem) {
-        return unwrapSchema(nonNullItem, defaultValue, true);
+        return unwrapSchema(nonNullItem, defaultValue, true, required);
       }
     }
   }
   if (!isArray(schemaData) && !isUndefined(schemaData?.[SEQUENCE])) {
-    return [{[TYPE]: ARRAY}, defaultValue, allowNull ?? false];
+    return [{[TYPE]: ARRAY}, defaultValue, allowNull ?? false, required];
   }
   if (!isArray(schemaData) && isString(schemaData?.[UNIT])) {
-    return [{[TYPE]: STRING}, defaultValue, allowNull ?? false];
+    return [{[TYPE]: STRING}, defaultValue, allowNull ?? false, required];
   }
   return [
     {[TYPE]: schemaData?.[DOMAIN] || schemaData},
     defaultValue,
     allowNull ?? false,
+    required,
   ];
 };
 const getProperties = (schema) => {
@@ -170,17 +185,37 @@ const getProperties = (schema) => {
   }
   return objIsEmpty(properties) ? void 0 : properties;
 };
-const unwrapSchemaWithDefaults = (schema, defaultValue, allowNull) => {
+const getPropertyRequired = (schema, fieldId) => {
+  const schemaData = schema?.json ?? schema;
+  return isArray(schemaData?.[REQUIRED]) || isArray(schemaData?.[OPTIONAL])
+    ? !isUndefined(
+        arrayFind(
+          schemaData?.[REQUIRED] ?? [],
+          (field) => field[KEY] === fieldId,
+        ),
+      )
+    : void 0;
+};
+const unwrapSchemaWithDefaults = (
+  schema,
+  defaultValue,
+  allowNull,
+  required = true,
+) => {
   if (isArray(schema) && size(schema) === 3 && schema[1] === '=') {
     const schemaValue = schema[0]?.json ?? schema[0];
-    return unwrapSchema(schemaValue, schema[2], allowNull);
+    return unwrapSchema(schemaValue, schema[2], allowNull, false);
   }
   if (schema?.[_VALUE] && !isUndefined(schema?.[DEFAULT])) {
-    return unwrapSchema(schema[_VALUE], schema[DEFAULT], allowNull);
+    return unwrapSchema(schema[_VALUE], schema[DEFAULT], allowNull, false);
   }
-  return unwrapSchema(schema, defaultValue, allowNull);
+  return unwrapSchema(schema, defaultValue, allowNull, required);
 };
 const createArkTypeSchematizer = () =>
-  createCustomSchematizer(unwrapSchemaWithDefaults, getProperties);
+  createCustomSchematizer(
+    unwrapSchemaWithDefaults,
+    getProperties,
+    getPropertyRequired,
+  );
 
 export {createArkTypeSchematizer};

package/schematizers/schematizer-effect/index.js

@@ -8,6 +8,7 @@ const ARRAY = 'array';
 const TYPE = 'type';
 const DEFAULT = 'default';
 const ALLOW_NULL = 'allowNull';
+const REQUIRED = 'required';
 const LITERAL = 'Literal';
 const PROPERTY_SIGNATURES = 'propertySignatures';
 const STRING_KEYWORD = 'StringKeyword';
@@ -54,9 +55,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 &&
@@ -74,6 +80,9 @@ const createCustomSchematizer = (unwrapSchema, getProperties) => {
     if (allowNull) {
       cellOrValueSchema[ALLOW_NULL] = true;
     }
+    if (unwrappedRequired && isUndefined(defaultValue)) {
+      cellOrValueSchema[REQUIRED] = true;
+    }
     return cellOrValueSchema;
   };
   const toTablesSchema = (schemas) => {
@@ -82,9 +91,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)) {
@@ -108,11 +123,13 @@ const createCustomSchematizer = (unwrapSchema, getProperties) => {
   });
 };
 
-const unwrapSchema = (schema, defaultValue, allowNull) => {
+const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
   const ast = schema.ast || schema;
-  const type = ast._tag;
+  const typeAst = ast.type || ast;
+  required = required && !ast.isOptional;
+  const type = typeAst._tag;
   if (type === UNION) {
-    const types = ast.types;
+    const types = typeAst.types;
     const nonNullType = arrayFind(
       types,
       (t) => !(t._tag === LITERAL && isNull(t.literal)),
@@ -122,9 +139,15 @@ const unwrapSchema = (schema, defaultValue, allowNull) => {
       defaultValue,
       allowNull ||
         !!arrayFind(types, (t) => t._tag === LITERAL && isNull(t.literal)),
+      required,
     ];
   }
-  return [{[TYPE]: getSimpleType(ast)}, defaultValue, allowNull || false];
+  return [
+    {[TYPE]: getSimpleType(typeAst)},
+    defaultValue,
+    allowNull || false,
+    required,
+  ];
 };
 const getSimpleType = (ast) => {
   const tag = ast?._tag;
@@ -160,7 +183,14 @@ const getProperties = (schema) => {
     }
   }
 };
+const getPropertyRequired = (schema, propertyId) => {
+  const signatures = schema.ast?.[PROPERTY_SIGNATURES];
+  const signature = signatures
+    ? arrayFind(signatures, (sig) => sig.name === propertyId)
+    : void 0;
+  return signature ? !signature.isOptional : void 0;
+};
 const createEffectSchematizer = () =>
-  createCustomSchematizer(unwrapSchema, getProperties);
+  createCustomSchematizer(unwrapSchema, getProperties, getPropertyRequired);
 
 export {createEffectSchematizer};

package/schematizers/schematizer-effect/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 LITERAL = 'Literal';
 const PROPERTY_SIGNATURES = 'propertySignatures';
 const STRING_KEYWORD = 'StringKeyword';
@@ -54,9 +55,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 &&
@@ -74,6 +80,9 @@ const createCustomSchematizer = (unwrapSchema, getProperties) => {
     if (allowNull) {
       cellOrValueSchema[ALLOW_NULL] = true;
     }
+    if (unwrappedRequired && isUndefined(defaultValue)) {
+      cellOrValueSchema[REQUIRED] = true;
+    }
     return cellOrValueSchema;
   };
   const toTablesSchema = (schemas) => {
@@ -82,9 +91,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)) {
@@ -108,11 +123,13 @@ const createCustomSchematizer = (unwrapSchema, getProperties) => {
   });
 };
 
-const unwrapSchema = (schema, defaultValue, allowNull) => {
+const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
   const ast = schema.ast || schema;
-  const type = ast._tag;
+  const typeAst = ast.type || ast;
+  required = required && !ast.isOptional;
+  const type = typeAst._tag;
   if (type === UNION) {
-    const types = ast.types;
+    const types = typeAst.types;
     const nonNullType = arrayFind(
       types,
       (t) => !(t._tag === LITERAL && isNull(t.literal)),
@@ -122,9 +139,15 @@ const unwrapSchema = (schema, defaultValue, allowNull) => {
       defaultValue,
       allowNull ||
         !!arrayFind(types, (t) => t._tag === LITERAL && isNull(t.literal)),
+      required,
     ];
   }
-  return [{[TYPE]: getSimpleType(ast)}, defaultValue, allowNull || false];
+  return [
+    {[TYPE]: getSimpleType(typeAst)},
+    defaultValue,
+    allowNull || false,
+    required,
+  ];
 };
 const getSimpleType = (ast) => {
   const tag = ast?._tag;
@@ -160,7 +183,14 @@ const getProperties = (schema) => {
     }
   }
 };
+const getPropertyRequired = (schema, propertyId) => {
+  const signatures = schema.ast?.[PROPERTY_SIGNATURES];
+  const signature = signatures
+    ? arrayFind(signatures, (sig) => sig.name === propertyId)
+    : void 0;
+  return signature ? !signature.isOptional : void 0;
+};
 const createEffectSchematizer = () =>
-  createCustomSchematizer(unwrapSchema, getProperties);
+  createCustomSchematizer(unwrapSchema, getProperties, getPropertyRequired);
 
 export {createEffectSchematizer};

package/schematizers/schematizer-typebox/index.js

@@ -10,6 +10,7 @@ const DEFAULT = 'default';
 const ALLOW_NULL = 'allowNull';
 const NULL = 'null';
 const ANY_OF = 'anyOf';
+const REQUIRED = 'required';
 
 const getIfNotFunction = (predicate) => (value, then, otherwise) =>
   predicate(value)
@@ -22,9 +23,11 @@ const ifNotNullish = getIfNotFunction(isNullish);
 const ifNotUndefined = getIfNotFunction(isUndefined);
 const size = (arrayOrString) => arrayOrString.length;
 
+const arrayHas = (array, value) => array.includes(value);
 const arrayEvery = (array, cb) => array.every(cb);
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayFilter = (array, cb) => array.filter(cb);
+const arrayFind = (array, cb) => array.find(cb);
 
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
@@ -48,9 +51,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 &&
@@ -68,6 +76,9 @@ const createCustomSchematizer = (unwrapSchema, getProperties) => {
     if (allowNull) {
       cellOrValueSchema[ALLOW_NULL] = true;
     }
+    if (unwrappedRequired && isUndefined(defaultValue)) {
+      cellOrValueSchema[REQUIRED] = true;
+    }
     return cellOrValueSchema;
   };
   const toTablesSchema = (schemas) => {
@@ -76,9 +87,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)) {
@@ -102,7 +119,20 @@ const createCustomSchematizer = (unwrapSchema, getProperties) => {
   });
 };
 
-const unwrapSchema = (schema, defaultValue, allowNull) => {
+const TYPEBOX_OPTIONAL = 'Symbol(TypeBox.Optional)';
+const isTypeBoxOptional = (schema) =>
+  !isUndefined(
+    arrayFind(
+      Object.getOwnPropertySymbols(schema ?? {}),
+      (symbol) => String(symbol) == TYPEBOX_OPTIONAL,
+    ),
+  );
+const unwrapSchema = (
+  schema,
+  defaultValue,
+  allowNull,
+  required = !isTypeBoxOptional(schema),
+) => {
   if (schema?.[ANY_OF]) {
     const types = schema[ANY_OF];
     const hasNull = types.some((t) => t?.type === NULL);
@@ -116,13 +146,23 @@ const unwrapSchema = (schema, defaultValue, allowNull) => {
         firstNonNullType,
         defaultValue ?? schema?.[DEFAULT],
         hasNull || allowNull,
+        required,
       );
     }
   }
-  return [schema, defaultValue ?? schema?.[DEFAULT], allowNull ?? false];
+  return [
+    schema,
+    defaultValue ?? schema?.[DEFAULT],
+    allowNull ?? false,
+    required,
+  ];
 };
 const getProperties = (schema) => schema?.properties;
+const getPropertyRequired = (schema, propertyId) =>
+  isUndefined(schema?.properties)
+    ? void 0
+    : arrayHas(schema?.[REQUIRED] ?? [], propertyId);
 const createTypeBoxSchematizer = () =>
-  createCustomSchematizer(unwrapSchema, getProperties);
+  createCustomSchematizer(unwrapSchema, getProperties, getPropertyRequired);
 
 export {createTypeBoxSchematizer};