Adds @jalik/extend package

Author: jalik

package-lock.json

@@ -32,6 +32,9 @@
     "test": "jest",
     "watch": "./node_modules/.bin/gulp watch"
   },
+  "dependencies": {
+    "@jalik/extend": "^1.0.1"
+  },
   "devDependencies": {
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",

package.json

@@ -23,6 +23,7 @@
  */
 
 import utils from "./utils";
+import {extendRecursively} from "@jalik/extend";
 import {Schema} from "./schema";
 import {SchemaError} from "./schema-error";
 
@@ -55,7 +56,7 @@ export class SchemaField {
 
     constructor(fieldName, props) {
         // Default properties
-        props = utils.extend({
+        props = extendRecursively({
             allowed: undefined,
             check: undefined,
             clean: undefined,
@@ -563,7 +564,7 @@ export class SchemaField {
         const props = this.properties;
 
         // Default options
-        options = utils.extend({
+        options = extendRecursively({
             context: {[this.name]: value}
         }, options);
 

src/schema-field.js

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import utils from "./utils";
+import {extendRecursively} from "@jalik/extend";
 import {SchemaError} from "./schema-error";
 import {SchemaField} from "./schema-field";
 
@@ -56,7 +56,7 @@ export class Schema {
      */
     clean(obj, options) {
         // Default options
-        options = utils.extend({
+        options = extendRecursively({
             removeUnknown: true
         }, options);
 
@@ -109,7 +109,7 @@ export class Schema {
                 fieldProperties[fieldName] = schemaFields[fieldName].getProperties();
             }
         }
-        return new Schema(utils.extend({}, fieldProperties, fields));
+        return new Schema(extendRecursively({}, fieldProperties, fields));
     }
 
     /**
@@ -260,7 +260,7 @@ export class Schema {
             if (fields.hasOwnProperty(fieldName)) {
                 const props = fields[fieldName];
                 const field = schemaFields[fieldName].getProperties() || {};
-                this.addField(fieldName, utils.extend({}, field, props));
+                this.addField(fieldName, extendRecursively({}, field, props));
             }
         }
         return this;
@@ -273,7 +273,7 @@ export class Schema {
      */
     validate(obj, options) {
         // Default options
-        options = utils.extend({
+        options = extendRecursively({
             clean: true,
             ignoreMissing: false,
             ignoreUnknown: false,

src/schema.js

@@ -42,40 +42,5 @@ export default {
             }
         }
         return result;
-    },
-
-    /**
-     * Merge objects
-     * @return {*}
-     */
-    extend() {
-        const args = Array.prototype.slice.call(arguments);
-        let recursive = false;
-        let a = args.shift();
-
-        if (typeof a === "boolean") {
-            recursive = a;
-            a = args.shift();
-        }
-
-        for (let i = 0; i < args.length; i += 1) {
-            const b = args[i];
-
-            if (typeof b === "object" && b !== null
-                && typeof a === "object" && a !== null) {
-                for (let key in b) {
-                    if (b.hasOwnProperty(key)) {
-                        if (recursive && typeof b[key] === "object" && b[key] !== null) {
-                            a[key] = this.extend(a[key], b[key]);
-                        } else {
-                            a[key] = b[key];
-                        }
-                    }
-                }
-            } else if (b !== null && typeof b !== "undefined") {
-                a = b;
-            }
-        }
-        return a;
     }
 };