object-merge - npm Package Compare versions

Comparing version 1.1.1 to 2.1.0

browser/object-merge_web.js

 ;(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 objectMerge = require('../src/object-merge.js');
 
-},{"../src/object-merge.js":3}],2:[function(require,module,exports){
+},{"../src/object-merge.js":4}],2:[function(require,module,exports){
 /*
@@ -30,2 +30,21 @@ License gpl-3.0 http://www.gnu.org/licenses/gpl-3.0-standalone.html
 },{}],3:[function(require,module,exports){
+/**
+ * Executes a function on each of an objects own enumerable properties. The
+ *  callback function will receive three arguments: the value of the current
+ *  property, the name of the property, and the object being processed. This is
+ *  roughly equivalent to the signature for callbacks to
+ *  Array.prototype.forEach.
+ * @param {Object} obj The object to act on.
+ * @param {Function} callback The function to execute.
+ * @returns {Object} Returns the given object.
+ */
+function objectForeach(obj, callback) {
+    "use strict";
+    Object.keys(obj).forEach(function (prop) {
+        callback(obj[prop], prop, obj);
+    });
+    return obj;
+};
+module.exports = objectForeach;
+},{}],4:[function(require,module,exports){
 /*
@@ -94,33 +113,61 @@ License gpl-3.0 http://www.gnu.org/licenses/gpl-3.0-standalone.html
     'use strict';
+    var objectForeach = require('object-foreach');
     var cloneFunction = require('clone-function');
-    var out = Object.create(null);
     shadows = Array.prototype.slice.call(arguments, 0);
-    shadows.forEach(function (shadow) {
-        Object.keys(shadow).forEach(function (prop) {
-            var tmp = Object.create(null);
-            var pBase = out[prop] || tmp;
-            var arr = [];
-            if (shadow[prop] instanceof Array) {
-                pBase = typeof out[prop] === 'object' ? pBase : tmp;
-                tmp = objectMerge(pBase, shadow[prop]);
-                Object.keys(tmp).forEach(function (key) {
-                    arr[key] = tmp[key];
-                });
-                tmp = arr;
-            } else if (shadow[prop] instanceof Function) {
-                tmp = cloneFunction(shadow[prop]);
-            } else if (typeof shadow[prop] === 'object') {
-                pBase = typeof out[prop] === 'object' ? pBase : tmp;
-                tmp = objectMerge(pBase, shadow[prop]);
+    // gets the sequential trailing objects from array.
+    function getShadowObjects(shadows) {
+        var out = shadows.reduce(function (collector, shadow) {
+                if (shadow instanceof Object) {
+                    collector.push(shadow);
+                } else {
+                    collector = [];
+                }
+                return collector;
+            }, []);
+        return out;
+    }
+    // gets either a new object of the proper type or the last primitive value
+    function getOutputObject(shadows) {
+        var out;
+        var lastShadow = shadows[shadows.length - 1];
+        if (lastShadow instanceof Array) {
+            out = [];
+        } else if (lastShadow instanceof Function) {
+            out = cloneFunction(lastShadow);
+        } else if (lastShadow instanceof Object) {
+            out = {};
+        } else {
+            // lastShadow is a primitive value;
+            out = lastShadow;
+        }
+        return out;
+    }
+    function main(shadows) {
+        var out = getOutputObject(shadows);
+        function shadowHandler(val, prop, shadow) {
+            /*jslint unparam:true */
+            if (out[prop]) {
+                out[prop] = objectMerge(out[prop], shadow[prop]);
             } else {
-                tmp = shadow[prop];
+                out[prop] = objectMerge(shadow[prop]);
             }
-            out[prop] = tmp;
-        });
-    });
-    return out;
+        }
+        function shadowMerger(shadow) {
+            objectForeach(shadow, shadowHandler);
+        }
+        // short circuits case where output would be a primitive value anyway.
+        if (out instanceof Object) {
+            // only merges trailing objects since primitives would wipe out previous
+            // objects, as in merging {a:'a'}, 'a', and {b:'b'} would result in
+            // {b:'b'} so the first two arguments can be ignored completely.
+            var relevantShadows = getShadowObjects(shadows);
+            relevantShadows.forEach(shadowMerger);
+        }
+        return out;
+    }
+    return main(shadows);
 }
 module.exports = objectMerge;
-},{"clone-function":2}]},{},[1])
-//@ sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlcyI6WyJDOlxcVXNlcnNcXGthc3RvclxcRG9jdW1lbnRzXFxHaXRIdWJcXG9iamVjdC1tZXJnZVxcZGV2XFxicm93c2VyTWFpbi5qcyIsIkM6XFxVc2Vyc1xca2FzdG9yXFxEb2N1bWVudHNcXEdpdEh1Ylxcb2JqZWN0LW1lcmdlXFxub2RlX21vZHVsZXNcXGNsb25lLWZ1bmN0aW9uXFxzcmNcXGNsb25lLWZ1bmN0aW9uLmpzIiwiQzpcXFVzZXJzXFxrYXN0b3JcXERvY3VtZW50c1xcR2l0SHViXFxvYmplY3QtbWVyZ2VcXHNyY1xcb2JqZWN0LW1lcmdlLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBOztBQ0RBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTs7QUN2QkE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsInNvdXJjZXNDb250ZW50IjpbIm9iamVjdE1lcmdlID0gcmVxdWlyZSgnLi4vc3JjL29iamVjdC1tZXJnZS5qcycpO1xyXG4iLCIvKlxyXG5MaWNlbnNlIGdwbC0zLjAgaHR0cDovL3d3dy5nbnUub3JnL2xpY2Vuc2VzL2dwbC0zLjAtc3RhbmRhbG9uZS5odG1sXHJcbiovXHJcbi8qanNsaW50XHJcbiAgICBldmlsOiB0cnVlLFxyXG4gICAgbm9kZTogdHJ1ZVxyXG4qL1xyXG4ndXNlIHN0cmljdCc7XHJcbi8qKlxyXG4gKiBDbG9uZXMgbm9uIG5hdGl2ZSBKYXZhU2NyaXB0IGZ1bmN0aW9ucywgb3IgcmVmZXJlbmNlcyBuYXRpdmUgZnVuY3Rpb25zLlxyXG4gKiBAcGFyYW0ge0Z1bmN0aW9ufSBmdW5jIFRoZSBmdW5jdGlvbiB0byBjbG9uZS5cclxuICogQHJldHVybnMge0Z1bmN0aW9ufSBSZXR1cm5zIGEgY2xvbmUgb2YgdGhlIG5vbiBuYXRpdmUgZnVuY3Rpb24sIG9yIGFcclxuICogIHJlZmVyZW5jZSB0byB0aGUgbmF0aXZlIGZ1bmN0aW9uLlxyXG4gKi9cclxuZnVuY3Rpb24gY2xvbmVGdW5jdGlvbihmdW5jKSB7XHJcbiAgICB2YXIgb3V0O1xyXG4gICAgaWYgKC9cXFtuYXRpdmUgY29kZVxcXS8udGVzdChmdW5jLnRvU3RyaW5nKCkpKSB7XHJcbiAgICAgICAgb3V0ID0gZnVuYztcclxuICAgIH0gZWxzZSB7XHJcbiAgICAgICAgb3V0ID0gZXZhbCgnKGZ1bmN0aW9uKCl7cmV0dXJuICcgKyBmdW5jLnRvU3RyaW5nKCkgKyAnfSgpKTsnKTtcclxuICAgIH1cclxuICAgIHJldHVybiBvdXQ7XHJcbn1cclxubW9kdWxlLmV4cG9ydHMgPSBjbG9uZUZ1bmN0aW9uOyIsIi8qXHJcbkxpY2Vuc2UgZ3BsLTMuMCBodHRwOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvZ3BsLTMuMC1zdGFuZGFsb25lLmh0bWxcclxuKi9cclxuLypqc2xpbnRcclxuICAgIHdoaXRlOiB0cnVlLFxyXG4gICAgdmFyczogdHJ1ZSxcclxuICAgIG5vZGU6IHRydWVcclxuKi9cclxuLyoqXHJcbiAqIE1lcmdlcyBKYXZhU2NyaXB0IG9iamVjdHMgcmVjdXJzaXZlbHkgd2l0aG91dCBhbHRlcmluZyB0aGUgb2JqZWN0cyBtZXJnZWQuXHJcbiAqIEBhdXRob3IgPGEgaHJlZj1cIm1haWx0bzptYXR0aGV3a2FzdG9yQGdtYWlsLmNvbVwiPk1hdHRoZXcgS2FzdG9yPC9hPlxyXG4gKiBAcGFyYW0ge09iamVjdH0gc2hhZG93cyBbW3NoYWRvd3NdLi4uXSBPbmUgb3IgbW9yZSBvYmplY3RzIHRvIG1lcmdlLiBFYWNoXHJcbiAqICBhcmd1bWVudCBnaXZlbiB3aWxsIGJlIHRyZWF0ZWQgYXMgYW4gb2JqZWN0IHRvIG1lcmdlLiBFYWNoIG9iamVjdCBvdmVyd3JpdGVzXHJcbiAqICB0aGUgcHJldmlvdXMgb2JqZWN0cyBkZXNjZW5kYW50IHByb3BlcnRpZXMgaWYgdGhlIHByb3BlcnR5IG5hbWUgbWF0Y2hlcy4gSWZcclxuICogIG9iamVjdHMgcHJvcGVydGllcyBhcmUgb2JqZWN0cyB0aGV5IHdpbGwgYmUgbWVyZ2VkIHJlY3Vyc2l2ZWx5IGFzIHdlbGwuXHJcbiAqIEByZXR1cm5zIHtPYmplY3R9IFJldHVybnMgYSBzaW5nbGUgbWVyZ2VkIG9iamVjdCBjb21wb3NlZCBmcm9tIGNsb25lcyBvZiB0aGVcclxuICogIGlucHV0IG9iamVjdHMuXHJcbiAqIEBleGFtcGxlXHJcbiAqICB2YXIgb2JqZWN0TWVyZ2UgPSByZXF1aXJlKCdvYmplY3QtbWVyZ2UnKTtcclxuICogIHZhciB4ID0ge1xyXG4gKiAgICAgIGEgOiAnYScsXHJcbiAqICAgICAgYiA6ICdiJyxcclxuICogICAgICBjIDoge1xyXG4gKiAgICAgICAgICBkIDogJ2QnLFxyXG4gKiAgICAgICAgICBlIDogJ2UnLFxyXG4gKiAgICAgICAgICBmIDoge1xyXG4gKiAgICAgICAgICAgICAgZyA6ICdnJ1xyXG4gKiAgICAgICAgICB9XHJcbiAqICAgICAgfVxyXG4gKiAgfTtcclxuICogIHZhciB5ID0ge1xyXG4gKiAgICAgIGEgOiAnYGEnLFxyXG4gKiAgICAgIGIgOiAnYGInLFxyXG4gKiAgICAgIGMgOiB7XHJcbiAqICAgICAgICAgIGQgOiAnYGQnXHJcbiAqICAgICAgfVxyXG4gKiAgfTtcclxuICogIHZhciB6ID0ge1xyXG4gKiAgICAgIGEgOiB7XHJcbiAqICAgICAgICAgIGIgOiAnYGBiJ1xyXG4gKiAgICAgIH0sXHJcbiAqICAgICAgZnVuIDogZnVuY3Rpb24gZm9vICgpIHtcclxuICogICAgICAgICAgcmV0dXJuICdmb28nO1xyXG4gKiAgICAgIH0sXHJcbiAqICAgICAgYXBzIDogQXJyYXkucHJvdG90eXBlLnNsaWNlXHJcbiAqICB9O1xyXG4gKiAgdmFyIG91dCA9IG9iamVjdE1lcmdlKHgsIHksIHopO1xyXG4gKiAgLy8gb3V0LmEgd2lsbCBiZSB7XHJcbiAqICAvLyAgICAgICAgIGIgOiAnYGBiJ1xyXG4gKiAgLy8gICAgIH1cclxuICogIC8vIG91dC5iIHdpbGwgYmUgJ2BiJ1xyXG4gKiAgLy8gb3V0LmMgd2lsbCBiZSB7XHJcbiAqICAvLyAgICAgICAgIGQgOiAnYGQnLFxyXG4gKiAgLy8gICAgICAgICBlIDogJ2UnLFxyXG4gKiAgLy8gICAgICAgICBmIDoge1xyXG4gKiAgLy8gICAgICAgICAgICAgZyA6ICdnJ1xyXG4gKiAgLy8gICAgICAgICB9XHJcbiAqICAvLyAgICAgfVxyXG4gKiAgLy8gb3V0LmZ1biB3aWxsIGJlIGEgY2xvbmUgb2Ygei5mdW5cclxuICogIC8vIG91dC5hcHMgd2lsbCBiZSBlcXVhbCB0byB6LmFwc1xyXG4gKi9cclxuZnVuY3Rpb24gb2JqZWN0TWVyZ2Uoc2hhZG93cykge1xyXG4gICAgJ3VzZSBzdHJpY3QnO1xyXG4gICAgdmFyIGNsb25lRnVuY3Rpb24gPSByZXF1aXJlKCdjbG9uZS1mdW5jdGlvbicpO1xyXG4gICAgdmFyIG91dCA9IE9iamVjdC5jcmVhdGUobnVsbCk7XHJcbiAgICBzaGFkb3dzID0gQXJyYXkucHJvdG90eXBlLnNsaWNlLmNhbGwoYXJndW1lbnRzLCAwKTtcclxuICAgIHNoYWRvd3MuZm9yRWFjaChmdW5jdGlvbiAoc2hhZG93KSB7XHJcbiAgICAgICAgT2JqZWN0LmtleXMoc2hhZG93KS5mb3JFYWNoKGZ1bmN0aW9uIChwcm9wKSB7XHJcbiAgICAgICAgICAgIHZhciB0bXAgPSBPYmplY3QuY3JlYXRlKG51bGwpO1xyXG4gICAgICAgICAgICB2YXIgcEJhc2UgPSBvdXRbcHJvcF0gfHwgdG1wO1xyXG4gICAgICAgICAgICB2YXIgYXJyID0gW107XHJcbiAgICAgICAgICAgIGlmIChzaGFkb3dbcHJvcF0gaW5zdGFuY2VvZiBBcnJheSkge1xyXG4gICAgICAgICAgICAgICAgcEJhc2UgPSB0eXBlb2Ygb3V0W3Byb3BdID09PSAnb2JqZWN0JyA/IHBCYXNlIDogdG1wO1xyXG4gICAgICAgICAgICAgICAgdG1wID0gb2JqZWN0TWVyZ2UocEJhc2UsIHNoYWRvd1twcm9wXSk7XHJcbiAgICAgICAgICAgICAgICBPYmplY3Qua2V5cyh0bXApLmZvckVhY2goZnVuY3Rpb24gKGtleSkge1xyXG4gICAgICAgICAgICAgICAgICAgIGFycltrZXldID0gdG1wW2tleV07XHJcbiAgICAgICAgICAgICAgICB9KTtcclxuICAgICAgICAgICAgICAgIHRtcCA9IGFycjtcclxuICAgICAgICAgICAgfSBlbHNlIGlmIChzaGFkb3dbcHJvcF0gaW5zdGFuY2VvZiBGdW5jdGlvbikge1xyXG4gICAgICAgICAgICAgICAgdG1wID0gY2xvbmVGdW5jdGlvbihzaGFkb3dbcHJvcF0pO1xyXG4gICAgICAgICAgICB9IGVsc2UgaWYgKHR5cGVvZiBzaGFkb3dbcHJvcF0gPT09ICdvYmplY3QnKSB7XHJcbiAgICAgICAgICAgICAgICBwQmFzZSA9IHR5cGVvZiBvdXRbcHJvcF0gPT09ICdvYmplY3QnID8gcEJhc2UgOiB0bXA7XHJcbiAgICAgICAgICAgICAgICB0bXAgPSBvYmplY3RNZXJnZShwQmFzZSwgc2hhZG93W3Byb3BdKTtcclxuICAgICAgICAgICAgfSBlbHNlIHtcclxuICAgICAgICAgICAgICAgIHRtcCA9IHNoYWRvd1twcm9wXTtcclxuICAgICAgICAgICAgfVxyXG4gICAgICAgICAgICBvdXRbcHJvcF0gPSB0bXA7XHJcbiAgICAgICAgfSk7XHJcbiAgICB9KTtcclxuICAgIHJldHVybiBvdXQ7XHJcbn1cclxubW9kdWxlLmV4cG9ydHMgPSBvYmplY3RNZXJnZTsiXX0=
+},{"clone-function":2,"object-foreach":3}]},{},[1])
+//@ sourceMappingURL=data:application/json;base64,{"version":3,"file":"generated.js","sources":["C:\\Users\\kastor\\Documents\\GitHub\\object-merge\\dev\\browserMain.js","C:\\Users\\kastor\\Documents\\GitHub\\object-merge\\node_modules\\clone-function\\src\\clone-function.js","C:\\Users\\kastor\\Documents\\GitHub\\object-merge\\node_modules\\object-foreach\\src\\object-foreach.js","C:\\Users\\kastor\\Documents\\GitHub\\object-merge\\src\\object-merge.js"],"names":[],"mappings":";AAAA;AACA;;ACDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","sourcesContent":["objectMerge = require('../src/object-merge.js');\r\n","/*\r\nLicense gpl-3.0 http://www.gnu.org/licenses/gpl-3.0-standalone.html\r\n*/\r\n/*jslint\r\n    evil: true,\r\n    node: true\r\n*/\r\n'use strict';\r\n/**\r\n * Clones non native JavaScript functions, or references native functions.\r\n * @param {Function} func The function to clone.\r\n * @returns {Function} Returns a clone of the non native function, or a\r\n *  reference to the native function.\r\n */\r\nfunction cloneFunction(func) {\r\n    var out;\r\n    if (/\\[native code\\]/.test(func.toString())) {\r\n        out = func;\r\n    } else {\r\n        out = eval('(function(){return ' + func.toString() + '}());');\r\n    }\r\n    return out;\r\n}\r\nmodule.exports = cloneFunction;","/**\r\n * Executes a function on each of an objects own enumerable properties. The\r\n *  callback function will receive three arguments: the value of the current\r\n *  property, the name of the property, and the object being processed. This is\r\n *  roughly equivalent to the signature for callbacks to\r\n *  Array.prototype.forEach.\r\n * @param {Object} obj The object to act on.\r\n * @param {Function} callback The function to execute.\r\n * @returns {Object} Returns the given object.\r\n */\r\nfunction objectForeach(obj, callback) {\r\n    \"use strict\";\r\n    Object.keys(obj).forEach(function (prop) {\r\n        callback(obj[prop], prop, obj);\r\n    });\r\n    return obj;\r\n};\r\nmodule.exports = objectForeach;","/*\r\nLicense gpl-3.0 http://www.gnu.org/licenses/gpl-3.0-standalone.html\r\n*/\r\n/*jslint\r\n    white: true,\r\n    vars: true,\r\n    node: true\r\n*/\r\n/**\r\n * Merges JavaScript objects recursively without altering the objects merged.\r\n * @author <a href=\"mailto:matthewkastor@gmail.com\">Matthew Kastor</a>\r\n * @param {Object} shadows [[shadows]...] One or more objects to merge. Each\r\n *  argument given will be treated as an object to merge. Each object overwrites\r\n *  the previous objects descendant properties if the property name matches. If\r\n *  objects properties are objects they will be merged recursively as well.\r\n * @returns {Object} Returns a single merged object composed from clones of the\r\n *  input objects.\r\n * @example\r\n *  var objectMerge = require('object-merge');\r\n *  var x = {\r\n *      a : 'a',\r\n *      b : 'b',\r\n *      c : {\r\n *          d : 'd',\r\n *          e : 'e',\r\n *          f : {\r\n *              g : 'g'\r\n *          }\r\n *      }\r\n *  };\r\n *  var y = {\r\n *      a : '`a',\r\n *      b : '`b',\r\n *      c : {\r\n *          d : '`d'\r\n *      }\r\n *  };\r\n *  var z = {\r\n *      a : {\r\n *          b : '``b'\r\n *      },\r\n *      fun : function foo () {\r\n *          return 'foo';\r\n *      },\r\n *      aps : Array.prototype.slice\r\n *  };\r\n *  var out = objectMerge(x, y, z);\r\n *  // out.a will be {\r\n *  //         b : '``b'\r\n *  //     }\r\n *  // out.b will be '`b'\r\n *  // out.c will be {\r\n *  //         d : '`d',\r\n *  //         e : 'e',\r\n *  //         f : {\r\n *  //             g : 'g'\r\n *  //         }\r\n *  //     }\r\n *  // out.fun will be a clone of z.fun\r\n *  // out.aps will be equal to z.aps\r\n */\r\nfunction objectMerge(shadows) {\r\n    'use strict';\r\n    var objectForeach = require('object-foreach');\r\n    var cloneFunction = require('clone-function');\r\n    shadows = Array.prototype.slice.call(arguments, 0);\r\n    // gets the sequential trailing objects from array.\r\n    function getShadowObjects(shadows) {\r\n        var out = shadows.reduce(function (collector, shadow) {\r\n                if (shadow instanceof Object) {\r\n                    collector.push(shadow);\r\n                } else {\r\n                    collector = [];\r\n                }\r\n                return collector;\r\n            }, []);\r\n        return out;\r\n    }\r\n    // gets either a new object of the proper type or the last primitive value\r\n    function getOutputObject(shadows) {\r\n        var out;\r\n        var lastShadow = shadows[shadows.length - 1];\r\n        if (lastShadow instanceof Array) {\r\n            out = [];\r\n        } else if (lastShadow instanceof Function) {\r\n            out = cloneFunction(lastShadow);\r\n        } else if (lastShadow instanceof Object) {\r\n            out = {};\r\n        } else {\r\n            // lastShadow is a primitive value;\r\n            out = lastShadow;\r\n        }\r\n        return out;\r\n    }\r\n    function main(shadows) {\r\n        var out = getOutputObject(shadows);\r\n        function shadowHandler(val, prop, shadow) {\r\n            /*jslint unparam:true */\r\n            if (out[prop]) {\r\n                out[prop] = objectMerge(out[prop], shadow[prop]);\r\n            } else {\r\n                out[prop] = objectMerge(shadow[prop]);\r\n            }\r\n        }\r\n        function shadowMerger(shadow) {\r\n            objectForeach(shadow, shadowHandler);\r\n        }\r\n        // short circuits case where output would be a primitive value anyway.\r\n        if (out instanceof Object) {\r\n            // only merges trailing objects since primitives would wipe out previous\r\n            // objects, as in merging {a:'a'}, 'a', and {b:'b'} would result in\r\n            // {b:'b'} so the first two arguments can be ignored completely.\r\n            var relevantShadows = getShadowObjects(shadows);\r\n            relevantShadows.forEach(shadowMerger);\r\n        }\r\n        return out;\r\n    }\r\n    return main(shadows);\r\n}\r\nmodule.exports = objectMerge;"]}
 ;

browser/tests/object-merge.test.js

@@ -44,2 +44,22 @@ /*
     });
+    it('clones function properties', function () {
+        var func = function () {
+            return null;
+        };
+        var func2 = function () {
+            return 'hello';
+        };
+        func.wohoo = 'wohoo';
+        func.obj = {a:'a'};
+        func2.wee = 'wee';
+        func2.obj2 = {a:'a'};
+        var out = objectMerge(func, func2);
+        expect(out.wohoo).toEqual('wohoo');
+        expect(out.wee).toEqual('wee');
+        expect(out.obj.a).toEqual('a');
+        expect(out.obj2.a).toEqual('a');
+        expect(out.obj === func.obj).toEqual(false);
+        expect(out.obj2 === func2.obj2).toEqual(false);
+        expect(out() === 'hello').toEqual(true);
+    });
     it('references native functions', function () {
@@ -50,2 +70,49 @@ var out = objectMerge(x, y, z);
     });
+    it('preserves array indexes', function () {
+        var arr = [];
+        arr[0] = '0';
+        arr[5] = '5';
+        var obj = {
+            '0' : '1',
+            '1' : '1'
+        };
+        var out = objectMerge(obj, arr);
+        expect(arr.length).toEqual(6);
+        expect(out.length).toEqual(6);
+        expect(arr[0]).toEqual(out[0]);
+        expect(obj[1]).toEqual(out[1]);
+        expect(out[5]).toEqual(arr[5]);
+        expect(out instanceof Array).toEqual(true);
+    });
+    it('clones array properties', function () {
+        var arr = [];
+        arr[0] = '0';
+        var obj = {
+            'wee' : 'wee',
+            'wohoo' : 'wohoo',
+            'obj' : {}
+        };
+        var out = objectMerge(obj, arr);
+        expect(arr.length).toEqual(out.length);
+        expect(arr[0]).toEqual(out[0]);
+        expect(out.wee).toEqual(obj.wee);
+        expect(arr.wee === undefined).toEqual(true);
+        expect(out.wohoo).toEqual(obj.wohoo);
+        expect(out instanceof Array).toEqual(true);
+        expect(out.obj).toEqual({});
+        expect(out.obj === obj.obj).toEqual(false);
+    });
+    it('merges arrays', function () {
+        var arr1 = ['0','1','2'];
+        var arr2 = [];
+        arr2[2] = '`2';
+        arr2[3] = '`3';
+        var out = objectMerge(arr1, arr2);
+        expect(arr1.length).toEqual(3);
+        expect(arr2.length).toEqual(4);
+        expect(out.length).toEqual(4);
+        expect(arr1).toEqual(['0','1','2']);
+        expect(arr2).toEqual([undefined, undefined, '`2','`3']);
+        expect(out).toEqual(['0','1','`2','`3']);
+    });
     it('clones array contents', function () {
@@ -52,0 +119,0 @@ var out = objectMerge(x, w);

package.json

 {
   "name": "object-merge",
-  "version": "1.1.1",
+  "version": "2.1.0",
   "description": "Merges JavaScript objects recursively without altering the objects merged.",
@@ -46,4 +46,5 @@ "main": "./src/object-merge.js",
   "dependencies": {
-    "clone-function": ">=1.0.1"
+    "clone-function": ">=1.0.1",
+    "object-foreach": ">=0.1.2"
   }
 }

src/object-merge.js

@@ -64,30 +64,58 @@ /*
     'use strict';
+    var objectForeach = require('object-foreach');
     var cloneFunction = require('clone-function');
-    var out = Object.create(null);
     shadows = Array.prototype.slice.call(arguments, 0);
-    shadows.forEach(function (shadow) {
-        Object.keys(shadow).forEach(function (prop) {
-            var tmp = Object.create(null);
-            var pBase = out[prop] || tmp;
-            var arr = [];
-            if (shadow[prop] instanceof Array) {
-                pBase = typeof out[prop] === 'object' ? pBase : tmp;
-                tmp = objectMerge(pBase, shadow[prop]);
-                Object.keys(tmp).forEach(function (key) {
-                    arr[key] = tmp[key];
-                });
-                tmp = arr;
-            } else if (shadow[prop] instanceof Function) {
-                tmp = cloneFunction(shadow[prop]);
-            } else if (typeof shadow[prop] === 'object') {
-                pBase = typeof out[prop] === 'object' ? pBase : tmp;
-                tmp = objectMerge(pBase, shadow[prop]);
+    // gets the sequential trailing objects from array.
+    function getShadowObjects(shadows) {
+        var out = shadows.reduce(function (collector, shadow) {
+                if (shadow instanceof Object) {
+                    collector.push(shadow);
+                } else {
+                    collector = [];
+                }
+                return collector;
+            }, []);
+        return out;
+    }
+    // gets either a new object of the proper type or the last primitive value
+    function getOutputObject(shadows) {
+        var out;
+        var lastShadow = shadows[shadows.length - 1];
+        if (lastShadow instanceof Array) {
+            out = [];
+        } else if (lastShadow instanceof Function) {
+            out = cloneFunction(lastShadow);
+        } else if (lastShadow instanceof Object) {
+            out = {};
+        } else {
+            // lastShadow is a primitive value;
+            out = lastShadow;
+        }
+        return out;
+    }
+    function main(shadows) {
+        var out = getOutputObject(shadows);
+        function shadowHandler(val, prop, shadow) {
+            /*jslint unparam:true */
+            if (out[prop]) {
+                out[prop] = objectMerge(out[prop], shadow[prop]);
             } else {
-                tmp = shadow[prop];
+                out[prop] = objectMerge(shadow[prop]);
             }
-            out[prop] = tmp;
-        });
-    });
-    return out;
+        }
+        function shadowMerger(shadow) {
+            objectForeach(shadow, shadowHandler);
+        }
+        // short circuits case where output would be a primitive value anyway.
+        if (out instanceof Object) {
+            // only merges trailing objects since primitives would wipe out previous
+            // objects, as in merging {a:'a'}, 'a', and {b:'b'} would result in
+            // {b:'b'} so the first two arguments can be ignored completely.
+            var relevantShadows = getShadowObjects(shadows);
+            relevantShadows.forEach(shadowMerger);
+        }
+        return out;
+    }
+    return main(shadows);
 }
 module.exports = objectMerge;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

217814

increased by3.87%

Lines of code

3408

increased by4.73%

Worsened metrics

Dependency count

2

increased by100%

Dependency changes

• + Addedobject-foreach@>=0.1.2

• + Addedobject-foreach@0.1.2(transitive)