tinybase 9.4.0 → 9.5.0-beta.1

package/schematizers/schematizer-valibot/index.js

@@ -6,29 +6,40 @@ const NUMBER = getTypeOf(0);
 const OBJECT = 'object';
 const ARRAY = 'array';
 const TYPE = 'type';
+const ENUM = 'enum';
 const DEFAULT = 'default';
 const ALLOW_NULL = 'allowNull';
+const NULL = 'null';
 const FALLBACK = 'fallback';
 const NULLABLE = 'nullable';
 const OPTIONAL = 'optional';
 const REQUIRED = 'required';
 const WRAPPED = 'wrapped';
 const RECORD = 'record';
+const UNDEFINED = '\uFFFC';
+const JSON_PREFIX = '\uFFFD';
 
 const getIfNotFunction = (predicate) => (value, then, otherwise) =>
   predicate(value)
     ? /* istanbul ignore next */
       otherwise?.()
     : then(value);
+const isFiniteNumber = isFinite;
 const isNullish = (thing) => thing == null;
 const isUndefined = (thing) => thing === void 0;
+const isNull = (thing) => thing === null;
 const ifNotNullish = getIfNotFunction(isNullish);
 const ifNotUndefined = getIfNotFunction(isUndefined);
+const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
 const isString = (thing) => getTypeOf(thing) == STRING;
+const isArray = (thing) => Array.isArray(thing);
 const size = (thing) => thing.length;
 
+const arrayIndexOf = (array, value) => array.indexOf(value);
 const arrayEvery = (array, cb) => array.every(cb);
 const arrayForEach = (array, cb) => array.forEach(cb);
+const arrayFilter = (array, cb) => array.filter(cb);
+const arrayPush = (array, ...values) => array.push(...values);
 
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
@@ -64,6 +75,44 @@ const objForEach = (obj, cb) =>
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const getCellOrValueType = (cellOrValue) => {
+  if (isNull(cellOrValue)) {
+    return NULL;
+  }
+  if (isArray(cellOrValue)) {
+    return ARRAY;
+  }
+  if (isObject(cellOrValue)) {
+    return OBJECT;
+  }
+  const type = getTypeOf(cellOrValue);
+  return isTypeStringOrBoolean(type) ||
+    (type == NUMBER && isFiniteNumber(cellOrValue))
+    ? type
+    : void 0;
+};
+const isJsonType = (type) => type == OBJECT || type == ARRAY;
+const isCellOrValueSchemaType = (type) =>
+  isTypeStringOrBoolean(type) || type == NUMBER || isJsonType(type);
+const isCellOrValueSchemaTypes = (types) =>
+  isArray(types)
+    ? !isUndefined(types[0]) && arrayEvery(types, isCellOrValueSchemaType)
+    : isCellOrValueSchemaType(types);
+const isEncodedJson = (value) => isString(value) && value[0] == JSON_PREFIX;
+const isReservedString = (value, encoded = 0) =>
+  value === UNDEFINED || (!encoded && isEncodedJson(value));
+
+const getTypeOrTypeUnion = (types) => {
+  if (!arrayEvery(types, isCellOrValueSchemaType)) {
+    return;
+  }
+  const uniqueTypes = arrayFilter(
+    types,
+    (type, index) => arrayIndexOf(types, type) == index,
+  );
+  return uniqueTypes[1] ? uniqueTypes : uniqueTypes[0];
+};
+
 const createCustomSchematizer = (
   unwrapSchema,
   getProperties,
@@ -73,16 +122,27 @@ const createCustomSchematizer = (
     const [unwrapped, defaultValue, allowNull, unwrappedRequired = required] =
       unwrapSchema(schema, void 0, void 0, required);
     const type = unwrapped?.type;
+    const enumValues = unwrapped?.[ENUM];
+    const isEnum =
+      isUndefined(type) &&
+      isArray(enumValues) &&
+      !isUndefined(enumValues[0]) &&
+      arrayEvery(enumValues, (enumValue) => {
+        const enumType = getCellOrValueType(enumValue);
+        return (
+          !isNull(enumValue) &&
+          !isUndefined(enumType) &&
+          !isJsonType(enumType) &&
+          !isReservedString(enumValue)
+        );
+      });
     if (
-      type !== STRING &&
-      type !== NUMBER &&
-      type !== BOOLEAN &&
-      type !== OBJECT &&
-      type !== ARRAY
+      !isEnum &&
+      (!isUndefined(enumValues) || !isCellOrValueSchemaTypes(type))
     ) {
       return void 0;
     }
-    const cellOrValueSchema = {[TYPE]: type};
+    const cellOrValueSchema = isEnum ? {[ENUM]: enumValues} : {[TYPE]: type};
     ifNotUndefined(defaultValue, (defaultValue2) => {
       cellOrValueSchema[DEFAULT] = defaultValue2;
     });
@@ -134,6 +194,7 @@ const createCustomSchematizer = (
 
 const LITERAL = 'literal';
 const PICKLIST = 'picklist';
+const VALIBOT_UNION = 'union';
 const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
   const type = schema?.type;
   return type === OPTIONAL
@@ -152,26 +213,69 @@ const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
             allowNull ?? false,
             required,
           ]
-        : type === PICKLIST && arrayEvery(schema.options, isString)
+        : type === PICKLIST
           ? [
-              {[TYPE]: STRING},
+              {[ENUM]: schema.options},
               defaultValue ?? schema?.[FALLBACK],
               allowNull ?? false,
               required,
             ]
-          : type === LITERAL && isString(schema.literal)
-            ? [
-                {[TYPE]: STRING},
-                defaultValue ?? schema?.[FALLBACK],
-                allowNull ?? false,
-                required,
-              ]
-            : [
-                schema,
-                defaultValue ?? schema?.[FALLBACK],
-                allowNull ?? false,
-                required,
-              ];
+          : type === VALIBOT_UNION
+            ? unwrapUnion(schema, defaultValue, allowNull, required)
+            : type === LITERAL
+              ? [
+                  {[ENUM]: [schema.literal]},
+                  defaultValue ?? schema?.[FALLBACK],
+                  allowNull ?? false,
+                  required,
+                ]
+              : [
+                  schema,
+                  defaultValue ?? schema?.[FALLBACK],
+                  allowNull ?? false,
+                  required,
+                ];
+};
+const unwrapUnion = (schema, defaultValue, allowNull, required = true) => {
+  const nonNullOptions = arrayFilter(
+    schema.options,
+    (option) => option.type !== NULL,
+  );
+  const hasNull = nonNullOptions.length !== schema.options.length;
+  const enumValues = [];
+  const allEnums = arrayEvery(nonNullOptions, (option) => {
+    const values =
+      option.type === LITERAL
+        ? [option.literal]
+        : option.type === PICKLIST
+          ? option.options
+          : void 0;
+    if (isUndefined(values)) {
+      return false;
+    }
+    arrayForEach(values, (value) => arrayPush(enumValues, value));
+    return true;
+  });
+  const types = [];
+  if (!allEnums) {
+    arrayForEach(nonNullOptions, (option) => {
+      if (option.type === LITERAL) {
+        arrayPush(types, getCellOrValueType(option.literal));
+      } else if (option.type === PICKLIST) {
+        arrayForEach(option.options, (value) =>
+          arrayPush(types, getCellOrValueType(value)),
+        );
+      } else {
+        arrayPush(types, option.type === RECORD ? OBJECT : option.type);
+      }
+    });
+  }
+  return [
+    allEnums ? {[ENUM]: enumValues} : {type: getTypeOrTypeUnion(types)},
+    defaultValue ?? schema?.[FALLBACK],
+    allowNull || hasNull,
+    required,
+  ];
 };
 const getProperties = (schema) => schema?.entries;
 const createValibotSchematizer = () =>

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

@@ -6,29 +6,40 @@ const NUMBER = getTypeOf(0);
 const OBJECT = 'object';
 const ARRAY = 'array';
 const TYPE = 'type';
+const ENUM = 'enum';
 const DEFAULT = 'default';
 const ALLOW_NULL = 'allowNull';
+const NULL = 'null';
 const FALLBACK = 'fallback';
 const NULLABLE = 'nullable';
 const OPTIONAL = 'optional';
 const REQUIRED = 'required';
 const WRAPPED = 'wrapped';
 const RECORD = 'record';
+const UNDEFINED = '\uFFFC';
+const JSON_PREFIX = '\uFFFD';
 
 const getIfNotFunction = (predicate) => (value, then, otherwise) =>
   predicate(value)
     ? /* istanbul ignore next */
       otherwise?.()
     : then(value);
+const isFiniteNumber = isFinite;
 const isNullish = (thing) => thing == null;
 const isUndefined = (thing) => thing === void 0;
+const isNull = (thing) => thing === null;
 const ifNotNullish = getIfNotFunction(isNullish);
 const ifNotUndefined = getIfNotFunction(isUndefined);
+const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
 const isString = (thing) => getTypeOf(thing) == STRING;
+const isArray = (thing) => Array.isArray(thing);
 const size = (thing) => thing.length;
 
+const arrayIndexOf = (array, value) => array.indexOf(value);
 const arrayEvery = (array, cb) => array.every(cb);
 const arrayForEach = (array, cb) => array.forEach(cb);
+const arrayFilter = (array, cb) => array.filter(cb);
+const arrayPush = (array, ...values) => array.push(...values);
 
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
@@ -64,6 +75,44 @@ const objForEach = (obj, cb) =>
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const getCellOrValueType = (cellOrValue) => {
+  if (isNull(cellOrValue)) {
+    return NULL;
+  }
+  if (isArray(cellOrValue)) {
+    return ARRAY;
+  }
+  if (isObject(cellOrValue)) {
+    return OBJECT;
+  }
+  const type = getTypeOf(cellOrValue);
+  return isTypeStringOrBoolean(type) ||
+    (type == NUMBER && isFiniteNumber(cellOrValue))
+    ? type
+    : void 0;
+};
+const isJsonType = (type) => type == OBJECT || type == ARRAY;
+const isCellOrValueSchemaType = (type) =>
+  isTypeStringOrBoolean(type) || type == NUMBER || isJsonType(type);
+const isCellOrValueSchemaTypes = (types) =>
+  isArray(types)
+    ? !isUndefined(types[0]) && arrayEvery(types, isCellOrValueSchemaType)
+    : isCellOrValueSchemaType(types);
+const isEncodedJson = (value) => isString(value) && value[0] == JSON_PREFIX;
+const isReservedString = (value, encoded = 0) =>
+  value === UNDEFINED || (!encoded && isEncodedJson(value));
+
+const getTypeOrTypeUnion = (types) => {
+  if (!arrayEvery(types, isCellOrValueSchemaType)) {
+    return;
+  }
+  const uniqueTypes = arrayFilter(
+    types,
+    (type, index) => arrayIndexOf(types, type) == index,
+  );
+  return uniqueTypes[1] ? uniqueTypes : uniqueTypes[0];
+};
+
 const createCustomSchematizer = (
   unwrapSchema,
   getProperties,
@@ -73,16 +122,27 @@ const createCustomSchematizer = (
     const [unwrapped, defaultValue, allowNull, unwrappedRequired = required] =
       unwrapSchema(schema, void 0, void 0, required);
     const type = unwrapped?.type;
+    const enumValues = unwrapped?.[ENUM];
+    const isEnum =
+      isUndefined(type) &&
+      isArray(enumValues) &&
+      !isUndefined(enumValues[0]) &&
+      arrayEvery(enumValues, (enumValue) => {
+        const enumType = getCellOrValueType(enumValue);
+        return (
+          !isNull(enumValue) &&
+          !isUndefined(enumType) &&
+          !isJsonType(enumType) &&
+          !isReservedString(enumValue)
+        );
+      });
     if (
-      type !== STRING &&
-      type !== NUMBER &&
-      type !== BOOLEAN &&
-      type !== OBJECT &&
-      type !== ARRAY
+      !isEnum &&
+      (!isUndefined(enumValues) || !isCellOrValueSchemaTypes(type))
     ) {
       return void 0;
     }
-    const cellOrValueSchema = {[TYPE]: type};
+    const cellOrValueSchema = isEnum ? {[ENUM]: enumValues} : {[TYPE]: type};
     ifNotUndefined(defaultValue, (defaultValue2) => {
       cellOrValueSchema[DEFAULT] = defaultValue2;
     });
@@ -134,6 +194,7 @@ const createCustomSchematizer = (
 
 const LITERAL = 'literal';
 const PICKLIST = 'picklist';
+const VALIBOT_UNION = 'union';
 const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
   const type = schema?.type;
   return type === OPTIONAL
@@ -152,26 +213,69 @@ const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
             allowNull ?? false,
             required,
           ]
-        : type === PICKLIST && arrayEvery(schema.options, isString)
+        : type === PICKLIST
           ? [
-              {[TYPE]: STRING},
+              {[ENUM]: schema.options},
               defaultValue ?? schema?.[FALLBACK],
               allowNull ?? false,
               required,
             ]
-          : type === LITERAL && isString(schema.literal)
-            ? [
-                {[TYPE]: STRING},
-                defaultValue ?? schema?.[FALLBACK],
-                allowNull ?? false,
-                required,
-              ]
-            : [
-                schema,
-                defaultValue ?? schema?.[FALLBACK],
-                allowNull ?? false,
-                required,
-              ];
+          : type === VALIBOT_UNION
+            ? unwrapUnion(schema, defaultValue, allowNull, required)
+            : type === LITERAL
+              ? [
+                  {[ENUM]: [schema.literal]},
+                  defaultValue ?? schema?.[FALLBACK],
+                  allowNull ?? false,
+                  required,
+                ]
+              : [
+                  schema,
+                  defaultValue ?? schema?.[FALLBACK],
+                  allowNull ?? false,
+                  required,
+                ];
+};
+const unwrapUnion = (schema, defaultValue, allowNull, required = true) => {
+  const nonNullOptions = arrayFilter(
+    schema.options,
+    (option) => option.type !== NULL,
+  );
+  const hasNull = nonNullOptions.length !== schema.options.length;
+  const enumValues = [];
+  const allEnums = arrayEvery(nonNullOptions, (option) => {
+    const values =
+      option.type === LITERAL
+        ? [option.literal]
+        : option.type === PICKLIST
+          ? option.options
+          : void 0;
+    if (isUndefined(values)) {
+      return false;
+    }
+    arrayForEach(values, (value) => arrayPush(enumValues, value));
+    return true;
+  });
+  const types = [];
+  if (!allEnums) {
+    arrayForEach(nonNullOptions, (option) => {
+      if (option.type === LITERAL) {
+        arrayPush(types, getCellOrValueType(option.literal));
+      } else if (option.type === PICKLIST) {
+        arrayForEach(option.options, (value) =>
+          arrayPush(types, getCellOrValueType(value)),
+        );
+      } else {
+        arrayPush(types, option.type === RECORD ? OBJECT : option.type);
+      }
+    });
+  }
+  return [
+    allEnums ? {[ENUM]: enumValues} : {type: getTypeOrTypeUnion(types)},
+    defaultValue ?? schema?.[FALLBACK],
+    allowNull || hasNull,
+    required,
+  ];
 };
 const getProperties = (schema) => schema?.entries;
 const createValibotSchematizer = () =>

package/schematizers/schematizer-yup/index.js

@@ -6,27 +6,37 @@ const NUMBER = getTypeOf(0);
 const OBJECT = 'object';
 const ARRAY = 'array';
 const TYPE = 'type';
+const ENUM = 'enum';
 const DEFAULT = 'default';
 const ALLOW_NULL = 'allowNull';
+const NULL = 'null';
 const NULLABLE = 'nullable';
 const OPTIONAL = 'optional';
 const REQUIRED = 'required';
+const UNDEFINED = '\uFFFC';
+const JSON_PREFIX = '\uFFFD';
 
 const getIfNotFunction = (predicate) => (value, then, otherwise) =>
   predicate(value)
     ? /* istanbul ignore next */
       otherwise?.()
     : then(value);
+const isFiniteNumber = isFinite;
 const isNullish = (thing) => thing == null;
 const isUndefined = (thing) => thing === void 0;
+const isNull = (thing) => thing === null;
 const ifNotNullish = getIfNotFunction(isNullish);
 const ifNotUndefined = getIfNotFunction(isUndefined);
+const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
 const isString = (thing) => getTypeOf(thing) == STRING;
+const isArray = (thing) => Array.isArray(thing);
 const size = (thing) => thing.length;
 const isEmpty = (thing) => size(thing) == 0;
 
 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 collValues = (coll) => [...(coll?.values() ?? [])];
 
@@ -64,6 +74,33 @@ const objForEach = (obj, cb) =>
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const getCellOrValueType = (cellOrValue) => {
+  if (isNull(cellOrValue)) {
+    return NULL;
+  }
+  if (isArray(cellOrValue)) {
+    return ARRAY;
+  }
+  if (isObject(cellOrValue)) {
+    return OBJECT;
+  }
+  const type = getTypeOf(cellOrValue);
+  return isTypeStringOrBoolean(type) ||
+    (type == NUMBER && isFiniteNumber(cellOrValue))
+    ? type
+    : void 0;
+};
+const isJsonType = (type) => type == OBJECT || type == ARRAY;
+const isCellOrValueSchemaType = (type) =>
+  isTypeStringOrBoolean(type) || type == NUMBER || isJsonType(type);
+const isCellOrValueSchemaTypes = (types) =>
+  isArray(types)
+    ? !isUndefined(types[0]) && arrayEvery(types, isCellOrValueSchemaType)
+    : isCellOrValueSchemaType(types);
+const isEncodedJson = (value) => isString(value) && value[0] == JSON_PREFIX;
+const isReservedString = (value, encoded = 0) =>
+  value === UNDEFINED || (!encoded && isEncodedJson(value));
+
 const createCustomSchematizer = (
   unwrapSchema,
   getProperties,
@@ -73,16 +110,27 @@ const createCustomSchematizer = (
     const [unwrapped, defaultValue, allowNull, unwrappedRequired = required] =
       unwrapSchema(schema, void 0, void 0, required);
     const type = unwrapped?.type;
+    const enumValues = unwrapped?.[ENUM];
+    const isEnum =
+      isUndefined(type) &&
+      isArray(enumValues) &&
+      !isUndefined(enumValues[0]) &&
+      arrayEvery(enumValues, (enumValue) => {
+        const enumType = getCellOrValueType(enumValue);
+        return (
+          !isNull(enumValue) &&
+          !isUndefined(enumType) &&
+          !isJsonType(enumType) &&
+          !isReservedString(enumValue)
+        );
+      });
     if (
-      type !== STRING &&
-      type !== NUMBER &&
-      type !== BOOLEAN &&
-      type !== OBJECT &&
-      type !== ARRAY
+      !isEnum &&
+      (!isUndefined(enumValues) || !isCellOrValueSchemaTypes(type))
     ) {
       return void 0;
     }
-    const cellOrValueSchema = {[TYPE]: type};
+    const cellOrValueSchema = isEnum ? {[ENUM]: enumValues} : {[TYPE]: type};
     ifNotUndefined(defaultValue, (defaultValue2) => {
       cellOrValueSchema[DEFAULT] = defaultValue2;
     });
@@ -132,7 +180,6 @@ const createCustomSchematizer = (
   });
 };
 
-const MIXED = 'mixed';
 const unwrapSchema = (
   schema,
   defaultValue,
@@ -140,15 +187,12 @@ const unwrapSchema = (
   required = schema?.spec?.[OPTIONAL] === false,
 ) => {
   const oneOf = collValues(schema?._whitelist);
+  const enumValues = arrayFilter(oneOf, (value) => !isNull(value));
+  const hasNull = !isUndefined(arrayFind(oneOf, isNull));
   return [
-    {
-      [TYPE]:
-        schema?.type === MIXED && !isEmpty(oneOf) && arrayEvery(oneOf, isString)
-          ? STRING
-          : schema?.type,
-    },
+    !isEmpty(enumValues) ? {[ENUM]: enumValues} : {[TYPE]: schema?.type},
     defaultValue ?? schema?.spec?.[DEFAULT],
-    allowNull || schema?.spec?.[NULLABLE] || false,
+    allowNull || schema?.spec?.[NULLABLE] || hasNull || false,
     required,
   ];
 };

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

@@ -6,27 +6,37 @@ const NUMBER = getTypeOf(0);
 const OBJECT = 'object';
 const ARRAY = 'array';
 const TYPE = 'type';
+const ENUM = 'enum';
 const DEFAULT = 'default';
 const ALLOW_NULL = 'allowNull';
+const NULL = 'null';
 const NULLABLE = 'nullable';
 const OPTIONAL = 'optional';
 const REQUIRED = 'required';
+const UNDEFINED = '\uFFFC';
+const JSON_PREFIX = '\uFFFD';
 
 const getIfNotFunction = (predicate) => (value, then, otherwise) =>
   predicate(value)
     ? /* istanbul ignore next */
       otherwise?.()
     : then(value);
+const isFiniteNumber = isFinite;
 const isNullish = (thing) => thing == null;
 const isUndefined = (thing) => thing === void 0;
+const isNull = (thing) => thing === null;
 const ifNotNullish = getIfNotFunction(isNullish);
 const ifNotUndefined = getIfNotFunction(isUndefined);
+const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
 const isString = (thing) => getTypeOf(thing) == STRING;
+const isArray = (thing) => Array.isArray(thing);
 const size = (thing) => thing.length;
 const isEmpty = (thing) => size(thing) == 0;
 
 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 collValues = (coll) => [...(coll?.values() ?? [])];
 
@@ -64,6 +74,33 @@ const objForEach = (obj, cb) =>
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const getCellOrValueType = (cellOrValue) => {
+  if (isNull(cellOrValue)) {
+    return NULL;
+  }
+  if (isArray(cellOrValue)) {
+    return ARRAY;
+  }
+  if (isObject(cellOrValue)) {
+    return OBJECT;
+  }
+  const type = getTypeOf(cellOrValue);
+  return isTypeStringOrBoolean(type) ||
+    (type == NUMBER && isFiniteNumber(cellOrValue))
+    ? type
+    : void 0;
+};
+const isJsonType = (type) => type == OBJECT || type == ARRAY;
+const isCellOrValueSchemaType = (type) =>
+  isTypeStringOrBoolean(type) || type == NUMBER || isJsonType(type);
+const isCellOrValueSchemaTypes = (types) =>
+  isArray(types)
+    ? !isUndefined(types[0]) && arrayEvery(types, isCellOrValueSchemaType)
+    : isCellOrValueSchemaType(types);
+const isEncodedJson = (value) => isString(value) && value[0] == JSON_PREFIX;
+const isReservedString = (value, encoded = 0) =>
+  value === UNDEFINED || (!encoded && isEncodedJson(value));
+
 const createCustomSchematizer = (
   unwrapSchema,
   getProperties,
@@ -73,16 +110,27 @@ const createCustomSchematizer = (
     const [unwrapped, defaultValue, allowNull, unwrappedRequired = required] =
       unwrapSchema(schema, void 0, void 0, required);
     const type = unwrapped?.type;
+    const enumValues = unwrapped?.[ENUM];
+    const isEnum =
+      isUndefined(type) &&
+      isArray(enumValues) &&
+      !isUndefined(enumValues[0]) &&
+      arrayEvery(enumValues, (enumValue) => {
+        const enumType = getCellOrValueType(enumValue);
+        return (
+          !isNull(enumValue) &&
+          !isUndefined(enumType) &&
+          !isJsonType(enumType) &&
+          !isReservedString(enumValue)
+        );
+      });
     if (
-      type !== STRING &&
-      type !== NUMBER &&
-      type !== BOOLEAN &&
-      type !== OBJECT &&
-      type !== ARRAY
+      !isEnum &&
+      (!isUndefined(enumValues) || !isCellOrValueSchemaTypes(type))
     ) {
       return void 0;
     }
-    const cellOrValueSchema = {[TYPE]: type};
+    const cellOrValueSchema = isEnum ? {[ENUM]: enumValues} : {[TYPE]: type};
     ifNotUndefined(defaultValue, (defaultValue2) => {
       cellOrValueSchema[DEFAULT] = defaultValue2;
     });
@@ -132,7 +180,6 @@ const createCustomSchematizer = (
   });
 };
 
-const MIXED = 'mixed';
 const unwrapSchema = (
   schema,
   defaultValue,
@@ -140,15 +187,12 @@ const unwrapSchema = (
   required = schema?.spec?.[OPTIONAL] === false,
 ) => {
   const oneOf = collValues(schema?._whitelist);
+  const enumValues = arrayFilter(oneOf, (value) => !isNull(value));
+  const hasNull = !isUndefined(arrayFind(oneOf, isNull));
   return [
-    {
-      [TYPE]:
-        schema?.type === MIXED && !isEmpty(oneOf) && arrayEvery(oneOf, isString)
-          ? STRING
-          : schema?.type,
-    },
+    !isEmpty(enumValues) ? {[ENUM]: enumValues} : {[TYPE]: schema?.type},
     defaultValue ?? schema?.spec?.[DEFAULT],
-    allowNull || schema?.spec?.[NULLABLE] || false,
+    allowNull || schema?.spec?.[NULLABLE] || hasNull || false,
     required,
   ];
 };