@orion-js/models 3.7.4 → 3.9.0

package/lib/createModel/index.js

@@ -71,6 +71,12 @@ function createModel(modelOptions) {
             const schema = getSchema();
             return await (0, schema_1.clean)(schema, doc);
         },
+        cleanAndValidate: async (doc) => {
+            const schema = getSchema();
+            const cleaned = await (0, schema_1.clean)(schema, doc);
+            await (0, schema_1.validate)(schema, cleaned);
+            return cleaned;
+        },
         clone: (cloneOptions) => {
             return (0, clone_1.default)({
                 createModel,

package/lib/createModel/modelToSchema.test.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const __1 = require("..");
 const _1 = __importDefault(require("."));
 const schema_1 = require("@orion-js/schema");
 it('should add the __model field when converting to schema', async () => {
@@ -18,30 +17,33 @@ it('should add the __model field when converting to schema', async () => {
     expect(schema.__model.name).toEqual('test');
 });
 it('can clean a schema with nested models', async () => {
-    const modelSchema = {
-        name: {
-            type: String,
-            clean: () => 'Model Schema'
-        }
-    };
     const model = (0, _1.default)({
         name: 'AModel',
-        schema: modelSchema
-    });
-    const schema = {
-        subModel: {
-            type: model
-        },
-        subModelArray: {
-            type: [model]
+        schema: {
+            name: {
+                type: String
+            }
         },
-        primitive: {
-            type: String,
-            clean: () => 'Primitive'
+        clean: () => ({ name: 'Model Schema' })
+    });
+    const finalModel = (0, _1.default)({
+        name: 'Test',
+        schema: {
+            subModel: {
+                type: model
+            },
+            subModelArray: {
+                type: [model]
+            },
+            primitive: {
+                type: String,
+                clean: () => 'Primitive'
+            }
         }
-    };
+    });
     const doc = { subModel: { name: 'Joaquin' }, subModelArray: [{ name: 'Roberto' }], primitive: 'hello' };
-    expect(await (0, schema_1.clean)((0, __1.modelToSchema)(schema), doc)).toEqual({
+    const schema = finalModel.getSchema();
+    expect(await (0, schema_1.clean)(schema, doc)).toEqual({
         subModel: { name: 'Model Schema' },
         subModelArray: [{ name: 'Model Schema' }],
         primitive: 'Primitive'

package/lib/types/index.d.ts

@@ -82,7 +82,11 @@ export interface Model<TSchema = any> {
     /**
      * Cleans an item using @orion-js/schema
      */
-    clean: (item: any) => Promise<any>;
+    clean: (item: any) => Promise<TSchema>;
+    /**
+     * Cleans and validates an item using @orion-js/schema
+     */
+    cleanAndValidate: (item: any) => Promise<TSchema>;
     /**
      * Creates a new model using this one as a base
      */

package/package.json

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