tinybase 9.4.0 → 9.5.0-beta.1

package/schematizers/schematizer-zod/index.js

@@ -6,27 +6,38 @@ 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 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);
@@ -59,9 +70,48 @@ const objNew = (entries = []) => {
 };
 const objForEach = (obj, cb) =>
   arrayForEach(objIds(obj), (id) => cb(obj[id], id));
+const objValues = (obj) => object.values(obj);
 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,
@@ -71,16 +121,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;
     });
@@ -130,8 +191,8 @@ const createCustomSchematizer = (
   });
 };
 
-const ENUM = 'enum';
 const LITERAL = 'literal';
+const ZOD_UNION = 'union';
 const getDef = (schema) => schema?.def ?? schema?._zod?.def;
 const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
   const def = getDef(schema);
@@ -144,11 +205,69 @@ const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
         ? unwrapSchema(def.innerType, def.defaultValue, allowNull, false)
         : type === RECORD
           ? [{type: OBJECT}, defaultValue, allowNull ?? false, required]
-          : type === ENUM
-            ? [{[TYPE]: STRING}, defaultValue, allowNull ?? false, required]
-            : type === LITERAL && arrayEvery(def.values, isString)
-              ? [{[TYPE]: STRING}, defaultValue, allowNull ?? false, required]
-              : [schema, defaultValue, allowNull ?? false, required];
+          : type === ZOD_UNION
+            ? unwrapUnion(def, defaultValue, allowNull, required)
+            : type === ENUM
+              ? [
+                  {[ENUM]: objValues(def.entries)},
+                  defaultValue,
+                  allowNull ?? false,
+                  required,
+                ]
+              : type === LITERAL
+                ? [
+                    {[ENUM]: def.values},
+                    defaultValue,
+                    allowNull ?? false,
+                    required,
+                  ]
+                : [schema, defaultValue, allowNull ?? false, required];
+};
+const unwrapUnion = (def, defaultValue, allowNull, required = true) => {
+  const nonNullOptions = arrayFilter(
+    def.options,
+    (option) => getDef(option)?.type !== NULL,
+  );
+  const hasNull = nonNullOptions.length !== def.options.length;
+  const enumValues = [];
+  const allEnums = arrayEvery(nonNullOptions, (option) => {
+    const optionDef = getDef(option);
+    const values =
+      optionDef?.type === LITERAL
+        ? optionDef.values
+        : optionDef?.type === ENUM
+          ? objValues(optionDef.entries)
+          : void 0;
+    if (isUndefined(values)) {
+      return false;
+    }
+    arrayForEach(values, (value) => arrayPush(enumValues, value));
+    return true;
+  });
+  const types = [];
+  if (!allEnums) {
+    arrayForEach(nonNullOptions, (option) => {
+      const optionDef = getDef(option);
+      const optionType = optionDef?.type;
+      if (optionType === LITERAL) {
+        arrayForEach(optionDef.values, (value) =>
+          arrayPush(types, getCellOrValueType(value)),
+        );
+      } else if (optionType === ENUM) {
+        arrayForEach(objValues(optionDef.entries), (value) =>
+          arrayPush(types, getCellOrValueType(value)),
+        );
+      } else {
+        arrayPush(types, optionType === RECORD ? OBJECT : optionType);
+      }
+    });
+  }
+  return [
+    allEnums ? {[ENUM]: enumValues} : {type: getTypeOrTypeUnion(types)},
+    defaultValue,
+    allowNull || hasNull,
+    required,
+  ];
 };
 const getProperties = (schema) => getDef(schema)?.shape;
 const createZodSchematizer = () =>

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

@@ -6,27 +6,38 @@ 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 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);
@@ -59,9 +70,48 @@ const objNew = (entries = []) => {
 };
 const objForEach = (obj, cb) =>
   arrayForEach(objIds(obj), (id) => cb(obj[id], id));
+const objValues = (obj) => object.values(obj);
 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,
@@ -71,16 +121,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;
     });
@@ -130,8 +191,8 @@ const createCustomSchematizer = (
   });
 };
 
-const ENUM = 'enum';
 const LITERAL = 'literal';
+const ZOD_UNION = 'union';
 const getDef = (schema) => schema?.def ?? schema?._zod?.def;
 const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
   const def = getDef(schema);
@@ -144,11 +205,69 @@ const unwrapSchema = (schema, defaultValue, allowNull, required = true) => {
         ? unwrapSchema(def.innerType, def.defaultValue, allowNull, false)
         : type === RECORD
           ? [{type: OBJECT}, defaultValue, allowNull ?? false, required]
-          : type === ENUM
-            ? [{[TYPE]: STRING}, defaultValue, allowNull ?? false, required]
-            : type === LITERAL && arrayEvery(def.values, isString)
-              ? [{[TYPE]: STRING}, defaultValue, allowNull ?? false, required]
-              : [schema, defaultValue, allowNull ?? false, required];
+          : type === ZOD_UNION
+            ? unwrapUnion(def, defaultValue, allowNull, required)
+            : type === ENUM
+              ? [
+                  {[ENUM]: objValues(def.entries)},
+                  defaultValue,
+                  allowNull ?? false,
+                  required,
+                ]
+              : type === LITERAL
+                ? [
+                    {[ENUM]: def.values},
+                    defaultValue,
+                    allowNull ?? false,
+                    required,
+                  ]
+                : [schema, defaultValue, allowNull ?? false, required];
+};
+const unwrapUnion = (def, defaultValue, allowNull, required = true) => {
+  const nonNullOptions = arrayFilter(
+    def.options,
+    (option) => getDef(option)?.type !== NULL,
+  );
+  const hasNull = nonNullOptions.length !== def.options.length;
+  const enumValues = [];
+  const allEnums = arrayEvery(nonNullOptions, (option) => {
+    const optionDef = getDef(option);
+    const values =
+      optionDef?.type === LITERAL
+        ? optionDef.values
+        : optionDef?.type === ENUM
+          ? objValues(optionDef.entries)
+          : void 0;
+    if (isUndefined(values)) {
+      return false;
+    }
+    arrayForEach(values, (value) => arrayPush(enumValues, value));
+    return true;
+  });
+  const types = [];
+  if (!allEnums) {
+    arrayForEach(nonNullOptions, (option) => {
+      const optionDef = getDef(option);
+      const optionType = optionDef?.type;
+      if (optionType === LITERAL) {
+        arrayForEach(optionDef.values, (value) =>
+          arrayPush(types, getCellOrValueType(value)),
+        );
+      } else if (optionType === ENUM) {
+        arrayForEach(objValues(optionDef.entries), (value) =>
+          arrayPush(types, getCellOrValueType(value)),
+        );
+      } else {
+        arrayPush(types, optionType === RECORD ? OBJECT : optionType);
+      }
+    });
+  }
+  return [
+    allEnums ? {[ENUM]: enumValues} : {type: getTypeOrTypeUnion(types)},
+    defaultValue,
+    allowNull || hasNull,
+    required,
+  ];
 };
 const getProperties = (schema) => getDef(schema)?.shape;
 const createZodSchematizer = () =>

package/schematizers/with-schemas/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/store/index.js

@@ -7,6 +7,7 @@ const FUNCTION = getTypeOf(getTypeOf);
 const OBJECT = 'object';
 const ARRAY = 'array';
 const TYPE = 'type';
+const ENUM = 'enum';
 const DEFAULT = 'default';
 const ALLOW_NULL = 'allowNull';
 const NULL = 'null';
@@ -173,6 +174,14 @@ const getCellOrValueType = (cellOrValue) => {
     : 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 cellOrValueSchemaTypeIncludes = (types, type) =>
+  isArray(types) ? arrayHas(types, type) : types == type;
 const encodeIfJson = (value) =>
   isObject(value) || isArray(value) ? JSON_PREFIX + jsonString(value) : value;
 const isEncodedJson = (value) => isString(value) && value[0] == JSON_PREFIX;
@@ -560,13 +569,29 @@ const createStore = () => {
   const validateCellOrValueSchema = (schema) => {
     if (
       !objValidate(schema, (_child, id2) =>
-        arrayHas([TYPE, DEFAULT, ALLOW_NULL, REQUIRED], id2),
+        arrayHas([TYPE, ENUM, DEFAULT, ALLOW_NULL, REQUIRED], id2),
       )
     ) {
       return false;
     }
     const type = schema[TYPE];
-    if (!isTypeStringOrBoolean(type) && type != NUMBER && !isJsonType(type)) {
+    const enumValues = schema[ENUM];
+    if (
+      isUndefined(enumValues)
+        ? !isCellOrValueSchemaTypes(type)
+        : !isUndefined(type) ||
+          !isArray(enumValues) ||
+          isUndefined(enumValues[0]) ||
+          !arrayEvery(enumValues, (enumValue) => {
+            const enumType = getCellOrValueType(enumValue);
+            return (
+              !isNull(enumValue) &&
+              !isUndefined(enumType) &&
+              !isJsonType(enumType) &&
+              !isReservedString(enumValue)
+            );
+          })
+    ) {
       return false;
     }
     const defaultValue = schema[DEFAULT];
@@ -575,7 +600,12 @@ const createStore = () => {
     }
     if (!isNull(defaultValue)) {
       if (
-        getCellOrValueType(defaultValue) != type ||
+        (isUndefined(enumValues)
+          ? !cellOrValueSchemaTypeIncludes(
+              type,
+              getCellOrValueType(defaultValue),
+            )
+          : !arrayHas(enumValues, defaultValue)) ||
         isReservedString(defaultValue)
       ) {
         objDel(schema, DEFAULT);
@@ -602,13 +632,15 @@ const createStore = () => {
     isObject(tables) ? objMap(tables, cloneTable) : tables;
   const cloneValues = (values) =>
     isObject(values) ? objMap(values, getArg) : values;
-  const isValidEncodedJson = (cellOrValue, type) =>
+  const isValidEncodedJson = (cellOrValue, types) =>
     acceptingEncodedData == 1 &&
     isEncodedJson(cellOrValue) &&
     tryReturn(() => {
       const encodedType = getCellOrValueType(decodeIfJson(cellOrValue));
       return (
-        isJsonType(encodedType) && (isUndefined(type) || type == encodedType)
+        isJsonType(encodedType) &&
+        (isUndefined(types) ||
+          cellOrValueSchemaTypeIncludes(types, encodedType))
       );
     }, false) == true;
   const validateContent = isArray;
@@ -661,7 +693,8 @@ const createStore = () => {
               : isReservedString(cell, acceptingEncodedData)
                 ? cellInvalid(tableId, rowId, cellId, cell, cellSchema[DEFAULT])
                 : isEncodedJson(cell)
-                  ? isValidEncodedJson(cell, cellSchema[TYPE])
+                  ? isUndefined(cellSchema[ENUM]) &&
+                    isValidEncodedJson(cell, cellSchema[TYPE])
                     ? cell
                     : cellInvalid(
                         tableId,
@@ -670,23 +703,36 @@ const createStore = () => {
                         cell,
                         cellSchema[DEFAULT],
                       )
-                  : getCellOrValueType(cell) === cellSchema[TYPE]
-                    ? encodeValid(cell, () =>
-                        cellInvalid(
+                  : isUndefined(cellSchema[ENUM])
+                    ? cellOrValueSchemaTypeIncludes(
+                        cellSchema[TYPE],
+                        getCellOrValueType(cell),
+                      )
+                      ? encodeValid(cell, () =>
+                          cellInvalid(
+                            tableId,
+                            rowId,
+                            cellId,
+                            cell,
+                            cellSchema[DEFAULT],
+                          ),
+                        )
+                      : cellInvalid(
+                          tableId,
+                          rowId,
+                          cellId,
+                          cell,
+                          cellSchema[DEFAULT],
+                        )
+                    : arrayHas(cellSchema[ENUM], cell)
+                      ? cell
+                      : cellInvalid(
                           tableId,
                           rowId,
                           cellId,
                           cell,
                           cellSchema[DEFAULT],
                         ),
-                      )
-                    : cellInvalid(
-                        tableId,
-                        rowId,
-                        cellId,
-                        cell,
-                        cellSchema[DEFAULT],
-                      ),
           () => cellInvalid(tableId, rowId, cellId, cell),
         )
       : isUndefined(getCellOrValueType(cell)) ||
@@ -731,14 +777,22 @@ const createStore = () => {
               : isReservedString(value, acceptingEncodedData)
                 ? valueInvalid(valueId, value, valueSchema[DEFAULT])
                 : isEncodedJson(value)
-                  ? isValidEncodedJson(value, valueSchema[TYPE])
+                  ? isUndefined(valueSchema[ENUM]) &&
+                    isValidEncodedJson(value, valueSchema[TYPE])
                     ? value
                     : valueInvalid(valueId, value, valueSchema[DEFAULT])
-                  : getCellOrValueType(value) === valueSchema[TYPE]
-                    ? encodeValid(value, () =>
-                        valueInvalid(valueId, value, valueSchema[DEFAULT]),
+                  : isUndefined(valueSchema[ENUM])
+                    ? cellOrValueSchemaTypeIncludes(
+                        valueSchema[TYPE],
+                        getCellOrValueType(value),
                       )
-                    : valueInvalid(valueId, value, valueSchema[DEFAULT]),
+                      ? encodeValid(value, () =>
+                          valueInvalid(valueId, value, valueSchema[DEFAULT]),
+                        )
+                      : valueInvalid(valueId, value, valueSchema[DEFAULT])
+                    : arrayHas(valueSchema[ENUM], value)
+                      ? value
+                      : valueInvalid(valueId, value, valueSchema[DEFAULT]),
           () => valueInvalid(valueId, value),
         )
       : isUndefined(getCellOrValueType(value)) ||