Comparing version 0.1.4 to 0.1.5
@@ -7,5 +7,10 @@ "use strict"; | ||
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; | ||
function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } } | ||
var ConfigMerger = exports.ConfigMerger = function ConfigMerger(Obj1, Obj2) { | ||
var ConfigMerger = exports.ConfigMerger = function ConfigMerger() { | ||
var Obj1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; | ||
var Obj2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; | ||
var cache = Obj1; | ||
@@ -15,3 +20,3 @@ Object.keys(Obj2).forEach(function (key) { | ||
cache[key] = Array.from(new Set([].concat(_toConsumableArray(Obj1[key] || []), _toConsumableArray(Obj2[key])))); | ||
} else if (typeof Obj2[key] === "obj") { | ||
} else if (_typeof(Obj2[key]) === "object") { | ||
cache[key] = ConfigMerger(Obj1[key], Obj2[key]); | ||
@@ -18,0 +23,0 @@ } else { |
{ | ||
"name": "menhera", | ||
"version": "0.1.4", | ||
"version": "0.1.5", | ||
"main": "dist", | ||
@@ -5,0 +5,0 @@ "files": [ |
10535
203