@orion-js/schema 4.0.0-next.3 → 4.0.0-next.4

package/dist/index.cjs

@@ -34,9 +34,16 @@ __export(index_exports, {
   cleanKey: () => cleanKey_default,
   createEnum: () => createEnum,
   dotGetSchema: () => dotGetSchema_default2,
+  fieldTypes: () => fieldTypes_default,
   getFieldType: () => getFieldType,
+  getSchemaFromAnyOrionForm: () => getSchemaFromAnyOrionForm,
+  getSchemaModelName: () => getSchemaModelName,
+  getSchemaWithMetadataFromAnyOrionForm: () => getSchemaWithMetadataFromAnyOrionForm,
   getValidationErrors: () => getValidationErrors2,
+  isSchemaLike: () => isSchemaLike,
+  isSchemaOrFieldLike: () => isSchemaOrFieldLike,
   isValid: () => isValid,
+  schemaWithName: () => schemaWithName,
   validate: () => validate,
   validateKey: () => validateKey_default
 });
@@ -85,36 +92,13 @@ var ValidationError = class _ValidationError extends Error {
   };
 };
 
-// src/getValidationErrors/convertTypedModel.ts
-function isClass(obj) {
-  const isCtorClass = obj.constructor && obj.constructor.toString().substring(0, 5) === "class";
-  if (obj.prototype === void 0) {
-    return isCtorClass;
-  }
-  const isPrototypeCtorClass = obj.prototype.constructor && obj.prototype.constructor.toString && obj.prototype.constructor.toString().substring(0, 5) === "class";
-  return isCtorClass || isPrototypeCtorClass;
-}
-var convertOnParam = (info, paramName) => {
-  if (!info[paramName]) return;
-  const type = info[paramName].type;
-  if (!type) return;
-  if (typeof type !== "function") return;
-  if (!isClass(type)) return;
-  if (!type.getModel || !type.__schemaId) return;
-  info[paramName].type = type.getModel().getCleanSchema();
-};
-var convertTypedModel = (info) => {
-  convertOnParam(info, "schema");
-  convertOnParam(info, "currentSchema");
-};
-
-// src/getSchemaFromTypedModel.ts
-var getSchemaFromTypedModel = (schema) => {
+// src/getSchemaFromTypedSchema.ts
+Symbol.metadata ?? (Symbol.metadata = Symbol("Symbol.metadata"));
+var getSchemaFromTypedSchema = (schema) => {
   const item = schema;
-  if (typeof item !== "function") return item;
-  if (!isClass(item)) return item;
-  if (!item.getModel || !item.__schemaId) return item;
-  return item.getModel().getCleanSchema();
+  if (!schema[Symbol.metadata]) return item;
+  if (!schema[Symbol.metadata]._isTypedSchema) return item;
+  return schema[Symbol.metadata]._getModel().getSchema();
 };
 
 // src/getValidationErrors/getError/index.ts
@@ -148,7 +132,8 @@ function fieldType(opts) {
     name,
     validate: overwrittenValidate,
     clean: overwrittenClean,
-    _isFieldType: true
+    __isFieldType: true,
+    __tsFieldType: null
   };
 }
 
@@ -223,12 +208,12 @@ var string_default = fieldType({
   name: "string",
   validate(value, { currentSchema }) {
     if (!(0, import_isString.default)(value)) return Errors_default.NOT_A_STRING;
-    if (isFinite(currentSchema.min)) {
+    if (Number.isFinite(currentSchema.min)) {
       if (value.length < currentSchema.min) {
         return Errors_default.STRING_TOO_SHORT;
       }
     }
-    if (isFinite(currentSchema.max)) {
+    if (Number.isFinite(currentSchema.max)) {
       if (value.length > currentSchema.max) {
         return Errors_default.STRING_TOO_LONG;
       }
@@ -269,13 +254,13 @@ var date_default = fieldType({
     if (options.autoConvert) {
       if ((0, import_isString2.default)(value)) {
         const result = new Date(value);
-        if (isNaN(result.getTime())) {
+        if (Number.isNaN(result.getTime())) {
           return value;
         }
         value = result;
       } else if ((0, import_isNumber.default)(value)) {
         const result = new Date(value);
-        if (isNaN(result.getTime())) {
+        if (Number.isNaN(result.getTime())) {
           return value;
         }
         value = result;
@@ -289,18 +274,17 @@ var date_default = fieldType({
 var import_isInteger = __toESM(require("lodash/isInteger"), 1);
 
 // src/fieldTypes/number.ts
-var import_isFinite = __toESM(require("lodash/isFinite"), 1);
 var import_toNumber = __toESM(require("lodash/toNumber"), 1);
 var number_default = fieldType({
   name: "number",
   validate(value, { currentSchema }) {
-    if (!(0, import_isFinite.default)(value)) return Errors_default.NOT_A_NUMBER;
-    if ((0, import_isFinite.default)(currentSchema.min)) {
+    if (!Number.isFinite(value)) return Errors_default.NOT_A_NUMBER;
+    if (Number.isFinite(currentSchema.min)) {
       if (value < currentSchema.min) {
         return Errors_default.NUMBER_TOO_SMALL;
       }
     }
-    if ((0, import_isFinite.default)(currentSchema.max)) {
+    if (Number.isFinite(currentSchema.max)) {
       if (value > currentSchema.max) {
         return Errors_default.NUMBER_TOO_BIG;
       }
@@ -355,10 +339,11 @@ var boolean_default = fieldType({
   clean(value, { options }) {
     if (options.autoConvert) {
       if (typeof value === "string") {
-        if (value === "true") {
+        const stringValue = value;
+        if (stringValue === "true") {
           value = true;
         }
-        if (value === "false") {
+        if (stringValue === "false") {
           value = false;
         }
       }
@@ -407,7 +392,7 @@ var blackbox_default = fieldType({
 // src/fieldTypes/any.ts
 var any_default = fieldType({
   name: "any",
-  validate(value) {
+  validate() {
   }
 });
 
@@ -428,19 +413,19 @@ var fieldTypes_default = {
 
 // src/getValidationErrors/getError/getFieldValidator.ts
 var import_has = __toESM(require("lodash/has"), 1);
-function getFieldValidator_default(type) {
+function getFieldValidator(type) {
   if ((0, import_isPlainObject4.default)(type)) {
-    if (type._isFieldType) return "custom";
+    if (type.__isFieldType) return "custom";
     return "plainObject";
   }
   if ((0, import_isArray3.default)(type)) return "array";
   if (type === String) return "string";
-  if (type === Date) return "date";
+  if (typeof type === "function" && type.name === "Date") return "date";
   if (type === Number) return "number";
   if (type === Boolean) return "boolean";
   if (type === "enum") return "string";
   if (!(0, import_isString5.default)(type)) {
-    throw new Error("Field type is invalid. Pass a string or a custom field type. Got " + type);
+    throw new Error(`Field type is invalid. Pass a string or a custom field type. Got ${type}`);
   }
   const exists = (0, import_has.default)(fieldTypes_default, type);
   if (!exists) {
@@ -458,7 +443,7 @@ async function getValidationErrors(params) {
       return Errors_default.REQUIRED;
     }
   } else {
-    const validatorKey = getFieldValidator_default(currentSchema.type);
+    const validatorKey = getFieldValidator(currentSchema.type);
     const validator = validatorKey === "custom" ? currentSchema.type : fieldTypes_default[validatorKey];
     const error = await validator.validate(value, info, ...args);
     if (error) {
@@ -488,8 +473,22 @@ var import_isArray4 = __toESM(require("lodash/isArray"), 1);
 var import_clone = __toESM(require("lodash/clone"), 1);
 var import_isNil3 = __toESM(require("lodash/isNil"), 1);
 var import_difference2 = __toESM(require("lodash/difference"), 1);
+
+// src/getValidationErrors/convertTypedSchema.ts
+var convertOnParam = (info, paramName) => {
+  if (!info[paramName]) return;
+  const type = info[paramName].type;
+  if (!type) return;
+  info[paramName].type = getSchemaFromTypedSchema(type);
+};
+var convertTypedSchema = (info) => {
+  convertOnParam(info, "schema");
+  convertOnParam(info, "currentSchema");
+};
+
+// src/getValidationErrors/doValidation.ts
 async function doValidation(params) {
-  convertTypedModel(params);
+  convertTypedSchema(params);
   const { schema, doc, currentDoc, value, currentSchema, keys = [], addError, options, args } = params;
   const info = { schema, doc, currentDoc, value, currentSchema, keys, options, args, addError };
   const error = await getValidationErrors(info);
@@ -501,7 +500,7 @@ async function doValidation(params) {
   if ((0, import_isPlainObject5.default)(currentSchema.type)) {
     const type = currentSchema.type;
     if (type) {
-      if (type._isFieldType) {
+      if (type.__isFieldType) {
         return;
       }
       if (typeof type.__skipChildValidation === "function") {
@@ -565,10 +564,10 @@ var defaultOptions = {
   omitRequired: false
 };
 async function getValidationErrors2(schema, doc, passedOptions = {}, ...args) {
-  schema = getSchemaFromTypedModel(schema);
+  schema = getSchemaFromTypedSchema(schema);
   const options = { ...defaultOptions, ...passedOptions };
   const errors = [];
-  const addError = function(keys, code) {
+  const addError = (keys, code) => {
     errors.push({
       key: keys.join("."),
       code
@@ -603,7 +602,7 @@ async function isValid(schema, doc, passedOptions = {}, ...args) {
 
 // src/getValidationErrors/getError/getFieldType.ts
 function getFieldType(type) {
-  const validatorKey = getFieldValidator_default(type);
+  const validatorKey = getFieldValidator(type);
   const validator = validatorKey === "custom" ? type : fieldTypes_default[validatorKey];
   return validator;
 }
@@ -650,11 +649,6 @@ async function cleanType(type, fieldSchema, value, info, ...args) {
       value = defaultValue;
     }
   }
-  const { autoValue } = fieldSchema;
-  if (autoValue) {
-    needReClean = true;
-    value = await autoValue(value, info, ...args);
-  }
   const { clean: clean3 } = fieldSchema;
   if (clean3) {
     needReClean = true;
@@ -668,11 +662,11 @@ async function cleanType(type, fieldSchema, value, info, ...args) {
 
 // src/clean/recursiveClean.ts
 var import_isNil5 = __toESM(require("lodash/isNil"), 1);
-var cleanObjectFields = async function({
+var cleanObjectFields = async ({
   schema,
   value,
   ...other
-}) {
+}) => {
   const keys = Object.keys(schema.type).filter((key) => !key.startsWith("__"));
   const newDoc = {};
   for (const key of keys) {
@@ -693,13 +687,13 @@ var cleanObjectFields = async function({
   }
   return newDoc;
 };
-var cleanArrayItems = async function({
+var cleanArrayItems = async ({
   schema,
   value,
   ...other
-}) {
+}) => {
   const schemaType = schema.type[0];
-  const promises = value.map(async (item, index) => {
+  const promises = value.map(async (item) => {
     const newValue = await clean({
       ...other,
       schema: {
@@ -720,9 +714,9 @@ function getArrayNode(schema, value) {
   }
   return null;
 }
-var clean = async function(info) {
-  convertTypedModel(info);
-  let { schema, args = [], value } = info;
+var clean = async (info) => {
+  convertTypedSchema(info);
+  const { schema, args = [], value } = info;
   const currSchema = schema.type === void 0 ? { type: schema } : schema;
   const objectSchema = getObjectNode(currSchema, value);
   if (objectSchema) {
@@ -762,7 +756,7 @@ var defaultOptions2 = {
 };
 async function clean2(schema, doc, opts = {}, ...args) {
   if (!doc) return doc;
-  schema = getSchemaFromTypedModel(schema);
+  schema = getSchemaFromTypedSchema(schema);
   const options = { ...defaultOptions2, ...opts };
   const params = {
     schema: { type: schema },
@@ -787,7 +781,8 @@ var dotGet = function dotGet2(object, path) {
   const levelObject = object.type;
   if (first === "$" || /^[0-9]+$/.test(first)) {
     return dotGet2({ type: levelObject[0] }, remainingPath);
-  } else if ((0, import_isPlainObject7.default)(levelObject[first])) {
+  }
+  if ((0, import_isPlainObject7.default)(levelObject[first])) {
     return dotGet2(levelObject[first], remainingPath);
   }
   if (levelObject === "blackbox") {
@@ -833,9 +828,8 @@ async function validateKey_default(schema, key, value, passedOptions = {}, ...ar
   if (!keySchema) {
     if (options.filter) {
       return Errors_default.NOT_IN_SCHEMA;
-    } else {
-      return null;
     }
+    return null;
   }
   if (keySchema.isBlackboxChild) {
     return null;
@@ -897,6 +891,75 @@ function createEnum(name, values) {
     })
   };
 }
+
+// src/models.ts
+Symbol.metadata ?? (Symbol.metadata = Symbol("Symbol.metadata"));
+function isSchemaLike(type) {
+  var _a;
+  if (!type) return false;
+  if (objectHasSubObjectWithKey(type, "type")) return true;
+  if ((_a = type == null ? void 0 : type[Symbol.metadata]) == null ? void 0 : _a._getModel) return true;
+  if (type.getModel) return true;
+  if (type.getSchema) return true;
+  if (type.getCleanSchema) return true;
+  if (type.__isModel) return true;
+  if (type.__modelName) return true;
+  return false;
+}
+function isSchemaOrFieldLike(type) {
+  if (Array.isArray(type)) {
+    if (type.length !== 1) return false;
+    return isSchemaOrFieldLike(type[0]);
+  }
+  if (isSchemaLike(type)) return true;
+  try {
+    if (getFieldValidator(type)) return true;
+  } catch {
+    return false;
+  }
+  return false;
+}
+function getSchemaModelName(type) {
+  if (!type) return null;
+  if (type.__modelName) return type.__modelName;
+  if (type.getModel) return type.getModel().name;
+  if (type.getSchema) return type.getSchema().__modelName;
+  return null;
+}
+function getSchemaFromAnyOrionForm(type) {
+  var _a, _b;
+  if ((_a = type == null ? void 0 : type[Symbol.metadata]) == null ? void 0 : _a._getModel) {
+    return (_b = type == null ? void 0 : type[Symbol.metadata]) == null ? void 0 : _b._getModel().getSchema();
+  }
+  if (type == null ? void 0 : type.getModel) return type.getModel().getSchema();
+  if (type.getSchema) {
+    return type.getSchema();
+  }
+  if (type.getSchema) {
+    return type.getSchema();
+  }
+  if (objectHasSubObjectWithKey(type, "type")) return type;
+  return null;
+}
+function objectHasSubObjectWithKey(object, key) {
+  if (!object || typeof object !== "object") return false;
+  for (const key1 in object) {
+    const value = object[key1];
+    if (value && typeof value === "object" && key in value) {
+      return true;
+    }
+  }
+  return false;
+}
+function getSchemaWithMetadataFromAnyOrionForm(type) {
+  return getSchemaFromAnyOrionForm(type);
+}
+
+// src/schemaWithName/index.ts
+function schemaWithName(name, schema) {
+  schema.__modelName = name;
+  return schema;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ValidationError,
@@ -904,9 +967,16 @@ function createEnum(name, values) {
   cleanKey,
   createEnum,
   dotGetSchema,
+  fieldTypes,
   getFieldType,
+  getSchemaFromAnyOrionForm,
+  getSchemaModelName,
+  getSchemaWithMetadataFromAnyOrionForm,
   getValidationErrors,
+  isSchemaLike,
+  isSchemaOrFieldLike,
   isValid,
+  schemaWithName,
   validate,
   validateKey
 });