@orion-js/models 3.0.37 → 3.0.38

package/lib/createModel/clone.d.ts

@@ -1,8 +1,9 @@
-import { CreateModel, CloneOptions } from '../types';
+import { CreateModel, CloneOptions, CreateModelOptions } from '../types';
 interface CloneInfo {
     createModel: CreateModel;
     getSchema: () => any;
     getResolvers: () => any;
+    modelOptions: CreateModelOptions;
 }
 declare const clone: (cloneInfo: CloneInfo, options: CloneOptions) => import("../types").Model;
 export default clone;

package/lib/createModel/clone.js

@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const includes_1 = __importDefault(require("lodash/includes"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const clone = (cloneInfo, options) => {
-    const { createModel, getSchema, getResolvers } = cloneInfo;
+    const { createModel, getSchema, getResolvers, modelOptions } = cloneInfo;
     return createModel({
         name: options.name,
+        clean: modelOptions.clean,
+        validate: modelOptions.validate,
         resolvers: () => {
             if (!options.extendResolvers)
                 return getResolvers();

package/lib/createModel/clone.test.js

@@ -4,27 +4,46 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_1 = __importDefault(require("./index"));
-it('cloned model should pick fields correctly', async () => {
-    const type = {
-        type: String
-    };
-    const model1 = (0, index_1.default)({
-        name: 'AModel',
-        schema: {
-            a: type,
-            b: type,
-            c: type
-        }
+describe('Cloning models', () => {
+    it('cloned model should pick fields correctly', async () => {
+        const type = {
+            type: String
+        };
+        const model1 = (0, index_1.default)({
+            name: 'AModel',
+            schema: {
+                a: type,
+                b: type,
+                c: type
+            }
+        });
+        const model2 = model1.clone({
+            name: 'Cloned2',
+            pickFields: ['a', 'b']
+        });
+        const model3 = model2.clone({
+            name: 'Cloned3',
+            omitFields: ['b']
+        });
+        const schema = model3.getSchema();
+        const keys = Object.keys(schema).filter(key => !key.startsWith('__'));
+        expect(keys).toEqual(['a']);
     });
-    const model2 = model1.clone({
-        name: 'Cloned2',
-        pickFields: ['a', 'b']
+    it('should pass __clean and __validate to the cloned model schema', () => {
+        const clean = name => `clean ${name}`;
+        const model1 = (0, index_1.default)({
+            name: 'Model1',
+            schema: {
+                name: { type: String }
+            },
+            clean
+        });
+        const model2 = model1.clone({
+            name: 'Model2'
+        });
+        const schema1 = model1.getSchema();
+        const schema2 = model2.getSchema();
+        expect(schema1.__clean).toBe(clean);
+        expect(schema2.__clean).toBe(clean);
     });
-    const model3 = model2.clone({
-        name: 'Cloned3',
-        omitFields: ['b']
-    });
-    const schema = model3.getSchema();
-    const keys = Object.keys(schema).filter(key => !key.startsWith('__'));
-    expect(keys).toEqual(['a']);
 });

package/lib/createModel/index.js

@@ -75,7 +75,8 @@ const createModel = modelOptions => {
             return (0, clone_1.default)({
                 createModel,
                 getSchema,
-                getResolvers
+                getResolvers,
+                modelOptions
             }, cloneOptions);
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/models",
-  "version": "3.0.37",
+  "version": "3.0.38",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "741691d7603f3d42e6e3e8fa9dc0f9de51a29424"
+  "gitHead": "00903f1488b72e13b7d5031a916eb897d0d80e0c"
 }