tinybase 9.4.0 → 9.5.0-beta.1

package/index.js

@@ -8,6 +8,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';
@@ -226,6 +227,14 @@ const getCellOrValueType = (cellOrValue) => {
 const isCellOrValueOrUndefined = (cellOrValue) =>
   isUndefined(cellOrValue) || !isUndefined(getCellOrValueType(cellOrValue));
 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;
@@ -1512,13 +1521,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];
@@ -1527,7 +1552,12 @@ const createStore = () => {
     }
     if (!isNull(defaultValue)) {
       if (
-        getCellOrValueType(defaultValue) != type ||
+        (isUndefined(enumValues)
+          ? !cellOrValueSchemaTypeIncludes(
+              type,
+              getCellOrValueType(defaultValue),
+            )
+          : !arrayHas(enumValues, defaultValue)) ||
         isReservedString(defaultValue)
       ) {
         objDel(schema, DEFAULT);
@@ -1554,13 +1584,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;
@@ -1613,7 +1645,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,
@@ -1622,23 +1655,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)) ||
@@ -1683,14 +1729,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)) ||

package/mergeable-store/index.js

@@ -8,6 +8,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';
@@ -199,6 +200,14 @@ const getCellOrValueType = (cellOrValue) => {
 const isCellOrValueOrUndefined = (cellOrValue) =>
   isUndefined(cellOrValue) || !isUndefined(getCellOrValueType(cellOrValue));
 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;
@@ -756,13 +765,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];
@@ -771,7 +796,12 @@ const createStore = () => {
     }
     if (!isNull(defaultValue)) {
       if (
-        getCellOrValueType(defaultValue) != type ||
+        (isUndefined(enumValues)
+          ? !cellOrValueSchemaTypeIncludes(
+              type,
+              getCellOrValueType(defaultValue),
+            )
+          : !arrayHas(enumValues, defaultValue)) ||
         isReservedString(defaultValue)
       ) {
         objDel(schema, DEFAULT);
@@ -798,13 +828,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;
@@ -857,7 +889,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,
@@ -866,23 +899,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)) ||
@@ -927,14 +973,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)) ||

package/mergeable-store/with-schemas/index.js

@@ -8,6 +8,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';
@@ -199,6 +200,14 @@ const getCellOrValueType = (cellOrValue) => {
 const isCellOrValueOrUndefined = (cellOrValue) =>
   isUndefined(cellOrValue) || !isUndefined(getCellOrValueType(cellOrValue));
 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;
@@ -756,13 +765,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];
@@ -771,7 +796,12 @@ const createStore = () => {
     }
     if (!isNull(defaultValue)) {
       if (
-        getCellOrValueType(defaultValue) != type ||
+        (isUndefined(enumValues)
+          ? !cellOrValueSchemaTypeIncludes(
+              type,
+              getCellOrValueType(defaultValue),
+            )
+          : !arrayHas(enumValues, defaultValue)) ||
         isReservedString(defaultValue)
       ) {
         objDel(schema, DEFAULT);
@@ -798,13 +828,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;
@@ -857,7 +889,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,
@@ -866,23 +899,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)) ||
@@ -927,14 +973,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)) ||