@orion-js/schema 4.0.0-next.7 → 4.0.1

package/dist/index.js

@@ -80,15 +80,6 @@ var ValidationError = class _ValidationError extends Error {
   };
 };
 
-// src/getSchemaFromTypedSchema.ts
-Symbol.metadata ?? (Symbol.metadata = Symbol("Symbol.metadata"));
-var getSchemaFromTypedSchema = (schema) => {
-  const item = schema;
-  if (!schema[Symbol.metadata]) return item;
-  if (!schema[Symbol.metadata]._isTypedSchema) return item;
-  return schema[Symbol.metadata]._getModel().getSchema();
-};
-
 // src/fieldType.ts
 function fieldType(opts) {
   const { name, validate: validate2, clean: clean3, ...otherFields } = opts;
@@ -387,15 +378,80 @@ function getFieldValidator(type2) {
   }
   const exists = fieldTypes_default[type2];
   if (!exists) {
-    throw new Error("Field type does not exist");
+    throw new Error(`Field type does not exist. Got ${type2}`);
   }
   return type2;
 }
 
+// src/models.ts
+Symbol.metadata ?? (Symbol.metadata = Symbol("Symbol.metadata"));
+function isSchemaLike(type2) {
+  var _a;
+  if (!type2) return false;
+  if (objectHasSubObjectWithKey(type2, "type")) return true;
+  if ((_a = type2 == null ? void 0 : type2[Symbol.metadata]) == null ? void 0 : _a._getModel) return true;
+  if (type2.getModel) return true;
+  if (type2.getSchema) return true;
+  if (type2.getCleanSchema) return true;
+  if (type2.__isModel) return true;
+  if (type2.__modelName) return true;
+  return false;
+}
+function isStrictSchemaLike(type2) {
+  if (isSchemaLike(type2)) return true;
+  return false;
+}
+function isSchemaOrFieldLike(type2) {
+  if (Array.isArray(type2)) {
+    if (type2.length !== 1) return false;
+    return isSchemaOrFieldLike(type2[0]);
+  }
+  if (isSchemaLike(type2)) return true;
+  try {
+    if (getFieldValidator(type2)) return true;
+  } catch {
+    return false;
+  }
+  return false;
+}
+function getSchemaModelName(type2) {
+  if (!type2) return null;
+  if (type2.__modelName) return type2.__modelName;
+  if (type2.getModel) return type2.getModel().name;
+  if (type2.getSchema) return type2.getSchema().__modelName;
+  return null;
+}
+function getSchemaFromAnyOrionForm(type2) {
+  var _a, _b;
+  if (!type2) return type2;
+  if ((_a = type2 == null ? void 0 : type2[Symbol.metadata]) == null ? void 0 : _a._getModel) {
+    return (_b = type2 == null ? void 0 : type2[Symbol.metadata]) == null ? void 0 : _b._getModel().getSchema();
+  }
+  if (type2 == null ? void 0 : type2.getModel) return type2.getModel().getSchema();
+  if (type2.getSchema) {
+    return type2.getSchema();
+  }
+  if (objectHasSubObjectWithKey(type2, "type")) return type2;
+  return type2;
+}
+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(type2) {
+  return getSchemaFromAnyOrionForm(type2);
+}
+
 // src/getValidationErrors/getError/index.ts
 async function getValidationErrors(params) {
-  const { schema, doc, currentDoc, value, currentSchema, keys, options = {}, args = [] } = params;
-  const info = { schema, doc, currentDoc, keys, currentSchema, options };
+  const { schema: schema2, doc, currentDoc, value, currentSchema, keys, options = {}, args = [] } = params;
+  const info = { schema: schema2, doc, currentDoc, keys, currentSchema, options };
   if (isNil(value)) {
     if (!currentSchema.optional && !options.omitRequired) {
       return Errors_default.REQUIRED;
@@ -425,6 +481,15 @@ async function getValidationErrors(params) {
   return null;
 }
 
+// src/getSchemaFromTypedSchema.ts
+Symbol.metadata ?? (Symbol.metadata = Symbol("Symbol.metadata"));
+var getSchemaFromTypedSchema = (schema2) => {
+  const item = schema2;
+  if (!schema2[Symbol.metadata]) return item;
+  if (!schema2[Symbol.metadata]._isTypedSchema) return item;
+  return schema2[Symbol.metadata]._getModel().getSchema();
+};
+
 // src/getValidationErrors/convertTypedSchema.ts
 var convertOnParam = (info, paramName) => {
   if (!info[paramName]) return;
@@ -451,8 +516,18 @@ function clone2(value) {
 // src/getValidationErrors/doValidation.ts
 async function doValidation(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 { schema: schema2, doc, currentDoc, value, currentSchema, keys = [], addError, options, args } = params;
+  const info = {
+    schema: schema2,
+    doc,
+    currentDoc,
+    value,
+    currentSchema,
+    keys,
+    options,
+    args,
+    addError
+  };
   const error = await getValidationErrors(info);
   if (error) {
     addError(keys, error);
@@ -525,8 +600,8 @@ function getValidationErrorsObject(validationErrors) {
 var defaultOptions = {
   omitRequired: false
 };
-async function getValidationErrors2(schema, doc, passedOptions = {}, ...args) {
-  schema = getSchemaFromTypedSchema(schema);
+async function getValidationErrors2(schema2, doc, passedOptions = {}, ...args) {
+  schema2 = getSchemaFromAnyOrionForm(schema2);
   const options = { ...defaultOptions, ...passedOptions };
   const errors = [];
   const addError = (keys, code) => {
@@ -536,11 +611,11 @@ async function getValidationErrors2(schema, doc, passedOptions = {}, ...args) {
     });
   };
   await doValidation({
-    schema,
+    schema: schema2,
     doc,
     currentDoc: doc,
     value: doc,
-    currentSchema: { type: schema },
+    currentSchema: { type: schema2 },
     addError,
     options,
     args
@@ -549,16 +624,16 @@ async function getValidationErrors2(schema, doc, passedOptions = {}, ...args) {
 }
 
 // src/validate.ts
-async function validate(schema, doc, passedOptions = {}, ...args) {
-  const validationErrors = await getValidationErrors2(schema, doc, passedOptions, ...args);
+async function validate(schema2, doc, passedOptions = {}, ...args) {
+  const validationErrors = await getValidationErrors2(schema2, doc, passedOptions, ...args);
   if (validationErrors) {
     throw new ValidationError(validationErrors);
   }
 }
 
 // src/isValid.ts
-async function isValid(schema, doc, passedOptions = {}, ...args) {
-  const validationErrors = await getValidationErrors2(schema, doc, passedOptions, ...args);
+async function isValid(schema2, doc, passedOptions = {}, ...args) {
+  const validationErrors = await getValidationErrors2(schema2, doc, passedOptions, ...args);
   return !validationErrors;
 }
 
@@ -570,9 +645,9 @@ function getFieldType(type2) {
 }
 
 // src/clean/getObjectNode.ts
-function getObjectNode(schema, value) {
-  if (type(schema.type) === "Object" && type(value) === "Object") {
-    const result = schema;
+function getObjectNode(schema2, value) {
+  if (type(schema2.type) === "Object" && type(value) === "Object") {
+    const result = schema2;
     return result;
   }
   return null;
@@ -616,17 +691,17 @@ async function cleanType(type2, fieldSchema, value, info, ...args) {
 
 // src/clean/recursiveClean.ts
 var cleanObjectFields = async ({
-  schema,
+  schema: schema2,
   value,
   ...other
 }) => {
-  const keys = Object.keys(schema.type).filter((key) => !key.startsWith("__"));
+  const keys = Object.keys(schema2.type).filter((key) => !key.startsWith("__"));
   const newDoc = {};
   for (const key of keys) {
     try {
       const cleanOptions = {
         ...other,
-        schema: schema.type[key],
+        schema: schema2.type[key],
         value: value[key],
         currentDoc: value
       };
@@ -641,11 +716,11 @@ var cleanObjectFields = async ({
   return newDoc;
 };
 var cleanArrayItems = async ({
-  schema,
+  schema: schema2,
   value,
   ...other
 }) => {
-  const schemaType = schema.type[0];
+  const schemaType = schema2.type[0];
   const promises = value.map(async (item) => {
     const newValue = await clean({
       ...other,
@@ -660,17 +735,17 @@ var cleanArrayItems = async ({
   const result = await Promise.all(promises);
   return result.filter((value2) => value2 !== void 0);
 };
-function getArrayNode(schema, value) {
-  if (Array.isArray(schema.type) && !isNil(value)) {
-    const result = schema;
+function getArrayNode(schema2, value) {
+  if (Array.isArray(schema2.type) && !isNil(value)) {
+    const result = schema2;
     return result;
   }
   return null;
 }
 var clean = async (info) => {
   convertTypedSchema(info);
-  const { schema, args = [], value } = info;
-  const currSchema = schema.type === void 0 ? { type: schema } : schema;
+  const { schema: schema2, args = [], value } = info;
+  const currSchema = schema2.type === void 0 ? { type: schema2 } : schema2;
   const objectSchema = getObjectNode(currSchema, value);
   if (objectSchema) {
     const newDoc = await cleanObjectFields({
@@ -707,12 +782,12 @@ var defaultOptions2 = {
   trimStrings: true,
   removeEmptyStrings: false
 };
-async function clean2(schema, doc, opts = {}, ...args) {
+async function clean2(schema2, doc, opts = {}, ...args) {
   if (!doc) return doc;
-  schema = getSchemaFromTypedSchema(schema);
+  schema2 = getSchemaFromAnyOrionForm(schema2);
   const options = { ...defaultOptions2, ...opts };
   const params = {
-    schema: { type: schema },
+    schema: { type: schema2 },
     value: doc,
     doc: options.forceDoc || doc,
     currentDoc: doc,
@@ -741,11 +816,11 @@ var dotGet = function dotGet2(object, path) {
   }
   return null;
 };
-function dotGetSchema_default(schema, path) {
-  if (isNil(schema)) {
+function dotGetSchema_default(schema2, path) {
+  if (isNil(schema2)) {
     throw new Error("You need to pass a schema");
   }
-  return dotGet({ type: schema }, path);
+  return dotGet({ type: schema2 }, path);
 }
 
 // src/dotGetSchema.ts
@@ -755,9 +830,9 @@ var dotGetSchema_default2 = dotGetSchema_default;
 var defaultOptions3 = {
   filter: true
 };
-async function cleanKey_default(schema, key, value, passedOptions = {}, ...args) {
+async function cleanKey_default(schema2, key, value, passedOptions = {}, ...args) {
   const options = { ...defaultOptions3, ...passedOptions };
-  const keySchema = dotGetSchema_default2(schema, key);
+  const keySchema = dotGetSchema_default2(schema2, key);
   if (!keySchema) {
     if (options.filter) {
       return;
@@ -773,9 +848,9 @@ async function cleanKey_default(schema, key, value, passedOptions = {}, ...args)
 var defaultOptions4 = {
   filter: false
 };
-async function validateKey_default(schema, key, value, passedOptions = {}, ...args) {
+async function validateKey_default(schema2, key, value, passedOptions = {}, ...args) {
   const options = { ...defaultOptions4, ...passedOptions };
-  const keySchema = dotGetSchema_default(schema, key);
+  const keySchema = dotGetSchema_default(schema2, key);
   if (!keySchema) {
     if (options.filter) {
       return Errors_default.NOT_IN_SCHEMA;
@@ -797,121 +872,101 @@ async function validateKey_default(schema, key, value, passedOptions = {}, ...ar
 
 // src/fieldTypes/enum.ts
 function createEnum(name, values) {
-  return {
-    type: values[0],
-    ...fieldType({
-      name: "enum",
-      meta: {
-        enumName: name,
-        enumValues: values
-      },
-      toGraphQLType: (GraphQL) => {
-        global.GraphQLEnums = global.GraphQLEnums || {};
-        global.GraphQLEnums[name] = global.GraphQLEnums[name] || new GraphQL.GraphQLEnumType({
-          name,
-          values: values.reduce((result, value) => {
-            result[value] = { value };
-            return result;
-          }, {})
-        });
-        return global.GraphQLEnums[name];
-      },
-      validate(value, { currentSchema }) {
-        if (typeof value !== "string") return Errors_default.NOT_A_STRING;
-        if (!values.includes(value)) {
-          return Errors_default.NOT_AN_ALLOWED_VALUE;
-        }
-        if (value === "" && !currentSchema.optional) {
-          return Errors_default.REQUIRED;
-        }
-      },
-      clean(value, { options: { autoConvert, trimStrings, removeEmptyStrings } }) {
-        if (autoConvert) {
-          value = String(value);
-        }
-        if (trimStrings) {
-          value = value.trim();
-        }
-        if (removeEmptyStrings && value === "") {
-          return void 0;
-        }
-        return value;
+  return fieldType({
+    name: "enum",
+    meta: {
+      enumName: name,
+      enumValues: values
+    },
+    toGraphQLType: (GraphQL) => {
+      global.GraphQLEnums = global.GraphQLEnums || {};
+      global.GraphQLEnums[name] = global.GraphQLEnums[name] || new GraphQL.GraphQLEnumType({
+        name,
+        values: values.reduce((result, value) => {
+          result[value] = { value };
+          return result;
+        }, {})
+      });
+      return global.GraphQLEnums[name];
+    },
+    validate(value, { currentSchema }) {
+      if (typeof value !== "string") return Errors_default.NOT_A_STRING;
+      if (!values.includes(value)) {
+        return Errors_default.NOT_AN_ALLOWED_VALUE;
       }
-    })
-  };
+      if (value === "" && !currentSchema.optional) {
+        return Errors_default.REQUIRED;
+      }
+    },
+    clean(value, { options: { autoConvert, trimStrings, removeEmptyStrings } }) {
+      if (autoConvert) {
+        value = String(value);
+      }
+      if (trimStrings) {
+        value = value.trim();
+      }
+      if (removeEmptyStrings && value === "") {
+        return void 0;
+      }
+      return value;
+    }
+  });
 }
 
-// src/models.ts
-Symbol.metadata ?? (Symbol.metadata = Symbol("Symbol.metadata"));
-function isSchemaLike(type2) {
-  var _a;
-  if (!type2) return false;
-  if (objectHasSubObjectWithKey(type2, "type")) return true;
-  if ((_a = type2 == null ? void 0 : type2[Symbol.metadata]) == null ? void 0 : _a._getModel) return true;
-  if (type2.getModel) return true;
-  if (type2.getSchema) return true;
-  if (type2.getCleanSchema) return true;
-  if (type2.__isModel) return true;
-  if (type2.__modelName) return true;
-  return false;
-}
-function isSchemaOrFieldLike(type2) {
-  if (Array.isArray(type2)) {
-    if (type2.length !== 1) return false;
-    return isSchemaOrFieldLike(type2[0]);
-  }
-  if (isSchemaLike(type2)) return true;
-  try {
-    if (getFieldValidator(type2)) return true;
-  } catch {
-    return false;
-  }
-  return false;
-}
-function getSchemaModelName(type2) {
-  if (!type2) return null;
-  if (type2.__modelName) return type2.__modelName;
-  if (type2.getModel) return type2.getModel().name;
-  if (type2.getSchema) return type2.getSchema().__modelName;
-  return null;
-}
-function getSchemaFromAnyOrionForm(type2) {
-  var _a, _b;
-  if ((_a = type2 == null ? void 0 : type2[Symbol.metadata]) == null ? void 0 : _a._getModel) {
-    return (_b = type2 == null ? void 0 : type2[Symbol.metadata]) == null ? void 0 : _b._getModel().getSchema();
+// src/types/fields.ts
+var subSchema = {
+  name: {
+    type: String
   }
-  if (type2 == null ? void 0 : type2.getModel) return type2.getModel().getSchema();
-  if (type2.getSchema) {
-    return type2.getSchema();
-  }
-  if (type2.getSchema) {
-    return type2.getSchema();
-  }
-  if (objectHasSubObjectWithKey(type2, "type")) return type2;
-  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;
-    }
+};
+var schema = {
+  filter: {
+    type: String
+  },
+  sub: {
+    type: subSchema
+  },
+  gender: {
+    type: createEnum("gender", ["male", "female"])
+  },
+  page: {
+    type: "integer",
+    defaultValue: 1,
+    min: 1
+  },
+  limit: {
+    type: "integer",
+    defaultValue: 0,
+    min: 0,
+    max: 200
+  },
+  sortBy: {
+    type: String,
+    optional: true
+  },
+  sortType: {
+    type: String,
+    allowedValues: ["asc", "desc"],
+    optional: true
   }
-  return false;
-}
-function getSchemaWithMetadataFromAnyOrionForm(type2) {
-  return getSchemaFromAnyOrionForm(type2);
+};
+
+// src/cleanAndValidate.ts
+async function cleanAndValidate(schema2, doc) {
+  const cleaned = await clean2(schema2, doc);
+  await validate(schema2, cleaned);
+  return cleaned;
 }
 
 // src/schemaWithName/index.ts
-function schemaWithName(name, schema) {
-  schema.__modelName = name;
-  return schema;
+function schemaWithName(name, schema2) {
+  schema2.__modelName = name;
+  return schema2;
 }
 export {
   ValidationError,
   clean2 as clean,
+  cleanAndValidate,
   cleanKey_default as cleanKey,
   createEnum,
   dotGetSchema_default2 as dotGetSchema,
@@ -923,6 +978,7 @@ export {
   getValidationErrors2 as getValidationErrors,
   isSchemaLike,
   isSchemaOrFieldLike,
+  isStrictSchemaLike,
   isValid,
   schemaWithName,
   validate,