Fixed extending types from extends plugin

.eslintrc.json

@@ -138,6 +138,7 @@
         ],
         "no-confusing-arrow": "off",
         "no-continue": "error",
+        "no-console": "off",
         "no-div-regex": "error",
         "no-duplicate-imports": "error",
         "no-else-return": "off",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perfect-schema/base",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Model and schema validation done perfectly.",
   "author": "Yanick Rochon <yanick.rochon@gmail.com>",
   "license": "MIT",
@@ -31,19 +31,19 @@
     "var-validator": "0.0.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
+    "@babel/core": "^7.2.2",
+    "@babel/preset-env": "^7.2.0",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^23.6.0",
-    "eslint": "^5.4.0",
-    "eslint-config-standard": "^11.0.0",
+    "eslint": "^5.10.0",
+    "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-node": "^7.0.1",
-    "eslint-plugin-promise": "^4.0.0",
-    "eslint-plugin-standard": "^3.1.0",
+    "eslint-plugin-node": "^8.0.0",
+    "eslint-plugin-promise": "^4.0.1",
+    "eslint-plugin-standard": "^4.0.0",
     "gulp": "^4.0.0",
     "gulp-babel": "^8.0.0",
-    "jest": "^23.5.0"
+    "jest": "^23.6.0"
   },
   "babel": {
     "presets": [

src/schema.js

@@ -253,12 +253,12 @@ function normalizeField(field, fieldName) {
 
   if (field.type instanceof PerfectSchema) {
     field.type = field.type._type;
-  } else {
+  } else if (!types.isType(field.type)) {
     field.type = types.getType(field.type);
+  }
 
-    if (!field.type) {
-      throw new TypeError('Invalid field specification' + (fieldName ? (' for ' + fieldName) : ''));
-    }
+  if (!field.type) {
+    throw new TypeError('Invalid field specification' + (fieldName ? (' for ' + fieldName) : ''));
   }
 
   return field;

src/types/types.js

@@ -31,7 +31,7 @@ export default Object.freeze({
   getType(type) {
     if (this.isPrimitive(type)) {
       return primitiveTypes[type];
-    } else if (this.isUserType(type)) {
+    } else if (this.isType(type)) {
       return type;
     } else {
       return undefined;
@@ -54,8 +54,13 @@ export default Object.freeze({
   @param type {mixed}
   @return {Boolean}
   */
+  isType(type) {
+    return type && type.$$type && (typeof type.validatorFactory === 'function') && !Array.isArray(type.$$type) || false;
+  },
+
   isUserType(type) {
-    return type && type.$$type && (typeof type.validatorFactory === 'function') && !Array.isArray(type.$$type);
+    console.warn("Deprecated! Use isType() instead!");
+    return this.isType(type);
   }
 
 });

test/types/types.spec.js

@@ -45,7 +45,7 @@ describe('Testing type registry map', () => {
       validatorFactory: () => {}
     };
 
-    assert.ok( types.isUserType(type) );
+    assert.ok( types.isType(type) );
     assert.ok( types.getType(type) === type );
   });
 
@@ -57,7 +57,25 @@ describe('Testing type registry map', () => {
       { $$type: 'test' },
       { validatorFactory: () => {} }
     ].forEach(type => assert.ok( types.getType(type) === undefined ));
+  });
+
+
+  it('should warn about deprecation (2.4.2)', () => {
+    const type = {
+      $$type: 'test',
+      validatorFactory: () => {}
+    };
+    const warn = console.warn;
+    let warned = false;
+
+    console.warn = () => warned = true;
 
+    assert.strictEqual( types.isUserType(type), true );
+    assert.strictEqual( types.isUserType(null), false );
+    assert.ok( warned );
+
+    console.warn = warn;
   });
 
+
 });