tinybase 9.4.0 → 9.5.0-beta.1

package/schematizers/index.js

@@ -6,21 +6,31 @@ 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 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 arrayEvery = (array, cb) => array.every(cb);
 const arrayForEach = (array, cb) => array.forEach(cb);
 
 const object = Object;
@@ -57,6 +67,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,
@@ -66,16 +103,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;
     });

package/schematizers/schematizer-arktype/index.js

@@ -6,8 +6,10 @@ 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 _VALUE = 'value';
 const DOMAIN = 'domain';
 const KEY = 'key';
@@ -15,12 +17,15 @@ const OPTIONAL = 'optional';
 const REQUIRED = 'required';
 const UNIT = 'unit';
 const SEQUENCE = 'sequence';
+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;
@@ -28,12 +33,16 @@ const isTrue = (thing) => thing === true;
 const isFalse = (thing) => thing === false;
 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 arrayMap = (array, cb) => array.map(cb);
+const arrayFilter = (array, cb) => array.filter(cb);
 const arrayFind = (array, cb) => array.find(cb);
 
 const object = Object;
@@ -70,6 +79,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,
@@ -79,16 +126,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;
     });
@@ -138,6 +196,12 @@ const createCustomSchematizer = (
   });
 };
 
+const getSimpleType = (schema) =>
+  !isUndefined(schema?.[UNIT])
+    ? getCellOrValueType(schema[UNIT])
+    : !isUndefined(schema?.[SEQUENCE])
+      ? ARRAY
+      : schema?.[DOMAIN] || schema;
 const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
   const schemaData = schema?.json ?? schema;
   if (isArray(schemaData)) {
@@ -152,24 +216,40 @@ const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
     ) {
       return [{[TYPE]: BOOLEAN}, defaultValue, allowNull ?? false, required];
     }
-    if (arrayEvery(schemaData, (item) => isString(item?.[UNIT] ?? item))) {
-      return [{[TYPE]: STRING}, defaultValue, allowNull ?? false, required];
-    }
-    if (hasNull) {
-      const nonNullItem = arrayFind(
-        schemaData,
-        (item) => !isNull(item?.[UNIT]) && !isNull(item) && item !== '=',
-      );
-      if (nonNullItem) {
-        return unwrapSchema(nonNullItem, defaultValue, true, required);
-      }
+    const enumItems = arrayFilter(
+      schemaData,
+      (item) => !isNull(item?.[UNIT]) && !isNull(item) && item !== '=',
+    );
+    if (
+      size(enumItems) > 0 &&
+      arrayEvery(enumItems, (item) => !isUndefined(item?.[UNIT]))
+    ) {
+      return [
+        {[ENUM]: arrayMap(enumItems, (item) => item[UNIT])},
+        defaultValue,
+        hasNull || allowNull || false,
+        required,
+      ];
     }
+    return [
+      {
+        [TYPE]: getTypeOrTypeUnion(arrayMap(enumItems, getSimpleType)),
+      },
+      defaultValue,
+      hasNull || allowNull || false,
+      required,
+    ];
   }
   if (!isArray(schemaData) && !isUndefined(schemaData?.[SEQUENCE])) {
     return [{[TYPE]: ARRAY}, defaultValue, allowNull ?? false, required];
   }
-  if (!isArray(schemaData) && isString(schemaData?.[UNIT])) {
-    return [{[TYPE]: STRING}, defaultValue, allowNull ?? false, required];
+  if (!isArray(schemaData) && !isUndefined(schemaData?.[UNIT])) {
+    return [
+      {[ENUM]: [schemaData[UNIT]]},
+      defaultValue,
+      allowNull ?? false,
+      required,
+    ];
   }
   return [
     {[TYPE]: schemaData?.[DOMAIN] || schemaData},

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

@@ -6,8 +6,10 @@ 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 _VALUE = 'value';
 const DOMAIN = 'domain';
 const KEY = 'key';
@@ -15,12 +17,15 @@ const OPTIONAL = 'optional';
 const REQUIRED = 'required';
 const UNIT = 'unit';
 const SEQUENCE = 'sequence';
+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;
@@ -28,12 +33,16 @@ const isTrue = (thing) => thing === true;
 const isFalse = (thing) => thing === false;
 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 arrayMap = (array, cb) => array.map(cb);
+const arrayFilter = (array, cb) => array.filter(cb);
 const arrayFind = (array, cb) => array.find(cb);
 
 const object = Object;
@@ -70,6 +79,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,
@@ -79,16 +126,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;
     });
@@ -138,6 +196,12 @@ const createCustomSchematizer = (
   });
 };
 
+const getSimpleType = (schema) =>
+  !isUndefined(schema?.[UNIT])
+    ? getCellOrValueType(schema[UNIT])
+    : !isUndefined(schema?.[SEQUENCE])
+      ? ARRAY
+      : schema?.[DOMAIN] || schema;
 const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
   const schemaData = schema?.json ?? schema;
   if (isArray(schemaData)) {
@@ -152,24 +216,40 @@ const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
     ) {
       return [{[TYPE]: BOOLEAN}, defaultValue, allowNull ?? false, required];
     }
-    if (arrayEvery(schemaData, (item) => isString(item?.[UNIT] ?? item))) {
-      return [{[TYPE]: STRING}, defaultValue, allowNull ?? false, required];
-    }
-    if (hasNull) {
-      const nonNullItem = arrayFind(
-        schemaData,
-        (item) => !isNull(item?.[UNIT]) && !isNull(item) && item !== '=',
-      );
-      if (nonNullItem) {
-        return unwrapSchema(nonNullItem, defaultValue, true, required);
-      }
+    const enumItems = arrayFilter(
+      schemaData,
+      (item) => !isNull(item?.[UNIT]) && !isNull(item) && item !== '=',
+    );
+    if (
+      size(enumItems) > 0 &&
+      arrayEvery(enumItems, (item) => !isUndefined(item?.[UNIT]))
+    ) {
+      return [
+        {[ENUM]: arrayMap(enumItems, (item) => item[UNIT])},
+        defaultValue,
+        hasNull || allowNull || false,
+        required,
+      ];
     }
+    return [
+      {
+        [TYPE]: getTypeOrTypeUnion(arrayMap(enumItems, getSimpleType)),
+      },
+      defaultValue,
+      hasNull || allowNull || false,
+      required,
+    ];
   }
   if (!isArray(schemaData) && !isUndefined(schemaData?.[SEQUENCE])) {
     return [{[TYPE]: ARRAY}, defaultValue, allowNull ?? false, required];
   }
-  if (!isArray(schemaData) && isString(schemaData?.[UNIT])) {
-    return [{[TYPE]: STRING}, defaultValue, allowNull ?? false, required];
+  if (!isArray(schemaData) && !isUndefined(schemaData?.[UNIT])) {
+    return [
+      {[ENUM]: [schemaData[UNIT]]},
+      defaultValue,
+      allowNull ?? false,
+      required,
+    ];
   }
   return [
     {[TYPE]: schemaData?.[DOMAIN] || schemaData},

package/schematizers/schematizer-effect/index.js

@@ -6,8 +6,10 @@ 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 REQUIRED = 'required';
 const LITERAL = 'Literal';
 const PROPERTY_SIGNATURES = 'propertySignatures';
@@ -17,20 +19,30 @@ const BOOLEAN_KEYWORD = 'BooleanKeyword';
 const TUPLE_TYPE = 'TupleType';
 const TYPE_LITERAL = 'TypeLiteral';
 const UNION = 'Union';
+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 arrayMap = (array, cb) => array.map(cb);
+const arrayFilter = (array, cb) => array.filter(cb);
 const arrayFind = (array, cb) => array.find(cb);
 
 const object = Object;
@@ -67,6 +79,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,
@@ -76,16 +126,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;
     });
@@ -135,6 +196,7 @@ const createCustomSchematizer = (
   });
 };
 
+const UNDEFINED_KEYWORD = 'UndefinedKeyword';
 const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
   const ast = schema.ast || schema;
   const typeAst = ast.type || ast;
@@ -142,15 +204,43 @@ const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
   const type = typeAst._tag;
   if (type === UNION) {
     const types = typeAst.types;
-    const nonNullType = arrayFind(
+    const nonNullTypes = arrayFilter(
       types,
-      (t) => !(t._tag === LITERAL && isNull(t.literal)),
+      (t) =>
+        !(t._tag === LITERAL && isNull(t.literal)) &&
+        t._tag !== UNDEFINED_KEYWORD,
     );
+    const hasNull = !!arrayFind(
+      types,
+      (t) => t._tag === LITERAL && isNull(t.literal),
+    );
+    if (
+      arrayEvery(
+        nonNullTypes,
+        (t) => t._tag === LITERAL && getSimpleType(t) !== EMPTY_STRING,
+      )
+    ) {
+      return [
+        {[ENUM]: arrayMap(nonNullTypes, (t) => t.literal)},
+        defaultValue,
+        allowNull || hasNull,
+        required,
+      ];
+    }
+    return [
+      {
+        [TYPE]: getTypeOrTypeUnion(arrayMap(nonNullTypes, getSimpleType)),
+      },
+      defaultValue,
+      allowNull || hasNull,
+      required,
+    ];
+  }
+  if (type === LITERAL && getSimpleType(typeAst) !== EMPTY_STRING) {
     return [
-      {[TYPE]: getSimpleType(nonNullType)},
+      {[ENUM]: [typeAst.literal]},
       defaultValue,
-      allowNull ||
-        !!arrayFind(types, (t) => t._tag === LITERAL && isNull(t.literal)),
+      allowNull || false,
       required,
     ];
   }