@orion-js/models 3.0.28 → 3.0.37

package/lib/createModel/index.js

@@ -20,6 +20,12 @@ const createModel = modelOptions => {
             return resolvedSchema;
         const schema = (0, resolveParam_1.default)(modelOptions.schema);
         resolvedSchema = (0, modelToSchema_1.modelToSchemaWithModel)(schema, model);
+        if (modelOptions.clean) {
+            resolvedSchema.__clean = modelOptions.clean;
+        }
+        if (modelOptions.validate) {
+            resolvedSchema.__clean = modelOptions.validate;
+        }
         return resolvedSchema;
     };
     const getCleanSchema = () => {
@@ -28,7 +34,13 @@ const createModel = modelOptions => {
         if (resolvedCleanSchema)
             return resolvedCleanSchema;
         const schema = (0, resolveParam_1.default)(modelOptions.schema);
-        resolvedCleanSchema = (0, modelToSchema_1.modelToSchema)(schema);
+        resolvedCleanSchema = (0, modelToSchema_1.modelToSchemaClean)(schema);
+        if (modelOptions.clean) {
+            resolvedCleanSchema.__clean = modelOptions.clean;
+        }
+        if (modelOptions.validate) {
+            resolvedCleanSchema.__clean = modelOptions.validate;
+        }
         return resolvedCleanSchema;
     };
     const getResolvers = () => {
@@ -52,16 +64,12 @@ const createModel = modelOptions => {
         getResolvers,
         initItem: modelInitItem,
         validate: async (doc) => {
-            const schema = getCleanSchema();
-            if (modelOptions.validate) {
-                await modelOptions.validate(doc);
-            }
+            const schema = getSchema();
             return await (0, schema_1.validate)(schema, doc);
         },
         clean: async (doc) => {
-            const schema = getCleanSchema();
-            const cleanedDoc = modelOptions.clean ? await modelOptions.clean(doc) : doc;
-            return await (0, schema_1.clean)(schema, cleanedDoc);
+            const schema = getSchema();
+            return await (0, schema_1.clean)(schema, doc);
         },
         clone: (cloneOptions) => {
             return (0, clone_1.default)({

package/lib/createModel/modelToSchema.d.ts

@@ -5,5 +5,5 @@ export declare function modelToSchema(modelSchema: ModelSchema, { cleanSchema }?
 }): Schema;
 export declare function modelToSchemaWithModel(modelSchema: ModelSchema, model?: Model): Schema | {
     __model: Model;
-    __clean: (item: any) => Promise<any>;
 };
+export declare function modelToSchemaClean(modelSchema: ModelSchema): Schema;

package/lib/createModel/modelToSchema.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.modelToSchemaWithModel = exports.modelToSchema = void 0;
+exports.modelToSchemaClean = exports.modelToSchemaWithModel = exports.modelToSchema = void 0;
 const isArray_1 = __importDefault(require("lodash/isArray"));
 function isModelSchema(type) {
     return type && typeof type === 'object' && '__isModel' in type;
@@ -14,6 +14,8 @@ function isModelArraySchema(type) {
 function modelToSchema(modelSchema, { cleanSchema = true } = {}) {
     const compiledSchema = {};
     for (const key in modelSchema) {
+        if (key.startsWith('__'))
+            continue;
         const fieldSchema = modelSchema[key];
         let currNode;
         if (isModelSchema(fieldSchema.type)) {
@@ -44,8 +46,12 @@ function modelToSchemaWithModel(modelSchema, model) {
         return schema;
     return {
         ...schema,
-        __model: model,
-        __clean: model.clean
+        __model: model
     };
 }
 exports.modelToSchemaWithModel = modelToSchemaWithModel;
+function modelToSchemaClean(modelSchema) {
+    const schema = modelToSchema(modelSchema, { cleanSchema: true });
+    return schema;
+}
+exports.modelToSchemaClean = modelToSchemaClean;

package/lib/createModel/modelToSchema.test.js

@@ -47,3 +47,16 @@ it('can clean a schema with nested models', async () => {
         primitive: 'Primitive'
     });
 });
+it('Should return a schema with __clean if clean param is passed to model', async () => {
+    const clean = () => ({ name: 'hello' });
+    const model = (0, _1.default)({
+        name: 'test',
+        schema: {
+            name: { type: String },
+            age: { type: Number }
+        },
+        clean
+    });
+    const schema = model.getSchema();
+    expect(await schema.__clean()).toEqual(await clean());
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/models",
-  "version": "3.0.28",
+  "version": "3.0.37",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -17,15 +17,15 @@
     "upgrade-interactive": "yarn upgrade-interactive"
   },
   "dependencies": {
-    "@orion-js/helpers": "^3.0.17",
-    "@orion-js/resolvers": "^3.0.24",
-    "@orion-js/schema": "^3.0.17"
+    "@orion-js/helpers": "^3.0.36",
+    "@orion-js/resolvers": "^3.0.37",
+    "@orion-js/schema": "^3.0.37"
   },
   "peerDependencies": {
     "@orion-js/cache": "^3.0.0-alpha.10"
   },
   "devDependencies": {
-    "@orion-js/cache": "^3.0.17",
+    "@orion-js/cache": "^3.0.36",
     "@shelf/jest-mongodb": "^2.1.0",
     "@types/jest": "^27.0.2",
     "@types/lodash": "4.14.176",
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a1d1623ecf7eefbacb87451255c6fa778e748f6a"
+  "gitHead": "741691d7603f3d42e6e3e8fa9dc0f9de51a29424"
 }