object-merge
Advanced tools
Comparing version 2.4.0 to 2.5.0
@@ -74,5 +74,31 @@ (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){ | ||
* Creates a new options object suitable for use with objectMerge. | ||
* @memberOf objectMerge | ||
* @param {Object} [opts] An object specifying the options. | ||
* @param {Object} [opts.depth = false] Specifies the depth to traverse objects | ||
* during merging. If this is set to false then there will be no depth limit. | ||
* @param {Object} [opts.throwOnCircularRef = true] Set to false to suppress | ||
* errors on circular references. | ||
* @returns {ObjectMergeOptions} Returns an instance of ObjectMergeOptions | ||
* to be used with objectMerge. | ||
* @example | ||
* var opts = objectMerge.createOptions({ | ||
* depth : 2, | ||
* throwOnCircularRef : false | ||
* }); | ||
* var obj1 = { | ||
* a1 : { | ||
* a2 : { | ||
* a3 : {} | ||
* } | ||
* } | ||
* }; | ||
* var obj2 = { | ||
* a1 : { | ||
* a2 : { | ||
* a3 : 'will not be in output' | ||
* }, | ||
* a22 : {} | ||
* } | ||
* }; | ||
* objectMerge(opts, obj1, obj2); | ||
*/ | ||
@@ -89,2 +115,3 @@ function createOptions(opts) { | ||
* Merges JavaScript objects recursively without altering the objects merged. | ||
* @namespace | ||
* @author <a href="mailto:matthewkastor@gmail.com">Matthew Kastor</a> | ||
@@ -199,9 +226,13 @@ * @param {ObjectMergeOptions} [opts] An options object created by | ||
} | ||
function main(shadows) { | ||
function objectMergeRecursor(shadows, currentDepth) { | ||
if (options.depth !== false) { | ||
currentDepth = currentDepth ? currentDepth + 1 : 1; | ||
} else { | ||
currentDepth = 0; | ||
} | ||
if (options.throwOnCircularRef === true) { | ||
circularReferenceCheck(shadows); | ||
} | ||
var out = getOutputObject(shadows); | ||
/*jslint unparam: true */ | ||
// recursor defined below. Dougie removed the intelligent suppression of | ||
// this warning, probably because of functions that reference each other. | ||
// So, you're stuck with making sure this isn't a mistake every time you | ||
// use his linter. | ||
function shadowHandler(val, prop, shadow) { | ||
@@ -212,5 +243,5 @@ if (out[prop]) { | ||
shadow[prop] | ||
]); | ||
], currentDepth); | ||
} else { | ||
out[prop] = objectMergeRecursor([shadow[prop]]); | ||
out[prop] = objectMergeRecursor([shadow[prop]], currentDepth); | ||
} | ||
@@ -224,3 +255,3 @@ } | ||
// anyway. | ||
if (out instanceof Object) { | ||
if (out instanceof Object && currentDepth <= options.depth) { | ||
// only merges trailing objects since primitives would wipe out | ||
@@ -235,8 +266,2 @@ // previous objects, as in merging {a:'a'}, 'a', and {b:'b'} | ||
} | ||
function objectMergeRecursor(shadows) { | ||
if (options.throwOnCircularRef === true) { | ||
circularReferenceCheck(shadows); | ||
} | ||
return main(shadows); | ||
} | ||
// determines whether an options object was passed in and | ||
@@ -257,2 +282,2 @@ // uses it if present | ||
},{"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;AACA;AACA;AACA;AACA;AACA;AACA;;AC7BA;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;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 * @author <a href=\"mailto:matthewkastor@gmail.com\">Matthew Kastor</a>\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, str;\r\n    try {\r\n        str = func.toString();\r\n        if (/\\[native code\\]/.test(str)) {\r\n            out = func;\r\n        } else {\r\n            out = eval('(function(){return ' + str + '}());');\r\n        }\r\n    } catch (e) {\r\n        throw new Error(e.message + '\\r\\n\\r\\n' + str);\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\nfunction ObjectMergeOptions(opts) {\r\n    'use strict';\r\n    opts = opts || {};\r\n    this.depth = opts.depth || false;\r\n    // circular ref check is true unless explicitly set to false\r\n    // ignore the jslint warning here, it's pointless.\r\n    this.throwOnCircularRef = 'throwOnCircularRef' in opts && opts.throwOnCircularRef === false ? false : true;\r\n}\r\n/*jslint unparam:true*/\r\n/**\r\n * Creates a new options object suitable for use with objectMerge.\r\n * @param {Object} [opts] An object specifying the options.\r\n * @returns {ObjectMergeOptions} Returns an instance of ObjectMergeOptions\r\n *  to be used with objectMerge.\r\n */\r\nfunction createOptions(opts) {\r\n    'use strict';\r\n    var argz = Array.prototype.slice.call(arguments, 0);\r\n    argz.unshift(null);\r\n    var F = ObjectMergeOptions.bind.apply(ObjectMergeOptions, argz);\r\n    return new F();\r\n}\r\n/*jslint unparam:false*/\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 {ObjectMergeOptions} [opts] An options object created by \r\n *  objectMerge.createOptions. Options must be specified as the first argument\r\n *  and must be an object created with createOptions or else the object will\r\n *  not be recognized as an options object and will be merged instead.\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\r\n *  overwrites the previous objects descendant properties if the property name\r\n *  matches. If objects properties are objects they will be merged recursively\r\n *  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    // this is the queue of visited objects / properties.\r\n    var visited = [];\r\n    // various merge options\r\n    var options = {};\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            try {\r\n                out = cloneFunction(lastShadow);\r\n            } catch (e) {\r\n                throw new Error(e.message);\r\n            }\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    // checks for circular references\r\n    function circularReferenceCheck(shadows) {\r\n        // if any of the current objects to process exist in the queue\r\n        // then throw an error.\r\n        shadows.forEach(function (item) {\r\n            if (item instanceof Object && visited.indexOf(item) > -1) {\r\n                throw new Error('Circular reference error');\r\n            }\r\n        });\r\n        // if none of the current objects were in the queue\r\n        // then add references to the queue.\r\n        visited = visited.concat(shadows);\r\n    }\r\n    function main(shadows) {\r\n        var out = getOutputObject(shadows);\r\n        /*jslint unparam: true */\r\n        // recursor defined below. Dougie removed the intelligent suppression of\r\n        // this warning, probably because of functions that reference each other.\r\n        // So, you're stuck with making sure this isn't a mistake every time you\r\n        // use his linter.\r\n        function shadowHandler(val, prop, shadow) {\r\n            if (out[prop]) {\r\n                out[prop] = objectMergeRecursor([\r\n                    out[prop],\r\n                    shadow[prop]\r\n                ]);\r\n            } else {\r\n                out[prop] = objectMergeRecursor([shadow[prop]]);\r\n            }\r\n        }\r\n        /*jslint unparam:false */\r\n        function shadowMerger(shadow) {\r\n            objectForeach(shadow, shadowHandler);\r\n        }\r\n        // short circuits case where output would be a primitive value\r\n        // anyway.\r\n        if (out instanceof Object) {\r\n            // only merges trailing objects since primitives would wipe out\r\n            // previous objects, as in merging {a:'a'}, 'a', and {b:'b'}\r\n            // would result in {b:'b'} so the first two arguments\r\n            // 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    function objectMergeRecursor(shadows) {\r\n        if (options.throwOnCircularRef === true) {\r\n            circularReferenceCheck(shadows);\r\n        }\r\n        return main(shadows);\r\n    }\r\n    // determines whether an options object was passed in and\r\n    // uses it if present\r\n    // ignore the jslint warning here too.\r\n    if (arguments[0] instanceof ObjectMergeOptions) {\r\n        options = arguments[0];\r\n        shadows = Array.prototype.slice.call(arguments, 1);\r\n    } else {\r\n        options = createOptions();\r\n        shadows = Array.prototype.slice.call(arguments, 0);\r\n    }\r\n    return objectMergeRecursor(shadows);\r\n}\r\nobjectMerge.createOptions = createOptions;\r\nmodule.exports = objectMerge;"]} | ||
//@ 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;AACA;AACA;AACA;AACA;AACA;AACA;;AC7BA;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;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 * @author <a href=\"mailto:matthewkastor@gmail.com\">Matthew Kastor</a>\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, str;\r\n    try {\r\n        str = func.toString();\r\n        if (/\\[native code\\]/.test(str)) {\r\n            out = func;\r\n        } else {\r\n            out = eval('(function(){return ' + str + '}());');\r\n        }\r\n    } catch (e) {\r\n        throw new Error(e.message + '\\r\\n\\r\\n' + str);\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\nfunction ObjectMergeOptions(opts) {\r\n    'use strict';\r\n    opts = opts || {};\r\n    this.depth = opts.depth || false;\r\n    // circular ref check is true unless explicitly set to false\r\n    // ignore the jslint warning here, it's pointless.\r\n    this.throwOnCircularRef = 'throwOnCircularRef' in opts && opts.throwOnCircularRef === false ? false : true;\r\n}\r\n/*jslint unparam:true*/\r\n/**\r\n * Creates a new options object suitable for use with objectMerge.\r\n * @memberOf objectMerge\r\n * @param {Object} [opts] An object specifying the options.\r\n * @param {Object} [opts.depth = false] Specifies the depth to traverse objects\r\n *  during merging. If this is set to false then there will be no depth limit.\r\n * @param {Object} [opts.throwOnCircularRef = true] Set to false to suppress\r\n *  errors on circular references.\r\n * @returns {ObjectMergeOptions} Returns an instance of ObjectMergeOptions\r\n *  to be used with objectMerge.\r\n * @example\r\n *  var opts = objectMerge.createOptions({\r\n *      depth : 2,\r\n *      throwOnCircularRef : false\r\n *  });\r\n *  var obj1 = {\r\n *      a1 : {\r\n *          a2 : {\r\n *              a3 : {}\r\n *          }\r\n *      }\r\n *  };\r\n *  var obj2 = {\r\n *      a1 : {\r\n *          a2 : {\r\n *              a3 : 'will not be in output'\r\n *          },\r\n *          a22 : {}\r\n *      }\r\n *  };\r\n *  objectMerge(opts, obj1, obj2);\r\n */\r\nfunction createOptions(opts) {\r\n    'use strict';\r\n    var argz = Array.prototype.slice.call(arguments, 0);\r\n    argz.unshift(null);\r\n    var F = ObjectMergeOptions.bind.apply(ObjectMergeOptions, argz);\r\n    return new F();\r\n}\r\n/*jslint unparam:false*/\r\n/**\r\n * Merges JavaScript objects recursively without altering the objects merged.\r\n * @namespace\r\n * @author <a href=\"mailto:matthewkastor@gmail.com\">Matthew Kastor</a>\r\n * @param {ObjectMergeOptions} [opts] An options object created by \r\n *  objectMerge.createOptions. Options must be specified as the first argument\r\n *  and must be an object created with createOptions or else the object will\r\n *  not be recognized as an options object and will be merged instead.\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\r\n *  overwrites the previous objects descendant properties if the property name\r\n *  matches. If objects properties are objects they will be merged recursively\r\n *  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    // this is the queue of visited objects / properties.\r\n    var visited = [];\r\n    // various merge options\r\n    var options = {};\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            try {\r\n                out = cloneFunction(lastShadow);\r\n            } catch (e) {\r\n                throw new Error(e.message);\r\n            }\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    // checks for circular references\r\n    function circularReferenceCheck(shadows) {\r\n        // if any of the current objects to process exist in the queue\r\n        // then throw an error.\r\n        shadows.forEach(function (item) {\r\n            if (item instanceof Object && visited.indexOf(item) > -1) {\r\n                throw new Error('Circular reference error');\r\n            }\r\n        });\r\n        // if none of the current objects were in the queue\r\n        // then add references to the queue.\r\n        visited = visited.concat(shadows);\r\n    }\r\n    function objectMergeRecursor(shadows, currentDepth) {\r\n        if (options.depth !== false) {\r\n            currentDepth = currentDepth ? currentDepth + 1 : 1;\r\n        } else {\r\n            currentDepth = 0;\r\n        }\r\n        if (options.throwOnCircularRef === true) {\r\n            circularReferenceCheck(shadows);\r\n        }\r\n        var out = getOutputObject(shadows);\r\n        /*jslint unparam: true */\r\n        function shadowHandler(val, prop, shadow) {\r\n            if (out[prop]) {\r\n                out[prop] = objectMergeRecursor([\r\n                    out[prop],\r\n                    shadow[prop]\r\n                ], currentDepth);\r\n            } else {\r\n                out[prop] = objectMergeRecursor([shadow[prop]], currentDepth);\r\n            }\r\n        }\r\n        /*jslint unparam:false */\r\n        function shadowMerger(shadow) {\r\n            objectForeach(shadow, shadowHandler);\r\n        }\r\n        // short circuits case where output would be a primitive value\r\n        // anyway.\r\n        if (out instanceof Object && currentDepth <= options.depth) {\r\n            // only merges trailing objects since primitives would wipe out\r\n            // previous objects, as in merging {a:'a'}, 'a', and {b:'b'}\r\n            // would result in {b:'b'} so the first two arguments\r\n            // 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    // determines whether an options object was passed in and\r\n    // uses it if present\r\n    // ignore the jslint warning here too.\r\n    if (arguments[0] instanceof ObjectMergeOptions) {\r\n        options = arguments[0];\r\n        shadows = Array.prototype.slice.call(arguments, 1);\r\n    } else {\r\n        options = createOptions();\r\n        shadows = Array.prototype.slice.call(arguments, 0);\r\n    }\r\n    return objectMergeRecursor(shadows);\r\n}\r\nobjectMerge.createOptions = createOptions;\r\nmodule.exports = objectMerge;"]} |
@@ -305,7 +305,17 @@ /* | ||
}; | ||
var b = { | ||
'b1' : { | ||
'b2' : { | ||
'b3' : {} | ||
} | ||
} | ||
}; | ||
var opts = objectMerge.createOptions({depth : 2}); | ||
var res = objectMerge(opts, a); | ||
var res = objectMerge(opts, a, b); | ||
expect(res).toEqual({ | ||
'a1' : { | ||
'a2' : {} | ||
}, | ||
'b1' : { | ||
'b2' : {} | ||
} | ||
@@ -312,0 +322,0 @@ }); |
{ | ||
"name": "object-merge", | ||
"version": "2.4.0", | ||
"version": "2.5.0", | ||
"description": "Merges JavaScript objects recursively without altering the objects merged.", | ||
@@ -5,0 +5,0 @@ "main": "./src/object-merge.js", |
@@ -20,5 +20,31 @@ /* | ||
* Creates a new options object suitable for use with objectMerge. | ||
* @memberOf objectMerge | ||
* @param {Object} [opts] An object specifying the options. | ||
* @param {Object} [opts.depth = false] Specifies the depth to traverse objects | ||
* during merging. If this is set to false then there will be no depth limit. | ||
* @param {Object} [opts.throwOnCircularRef = true] Set to false to suppress | ||
* errors on circular references. | ||
* @returns {ObjectMergeOptions} Returns an instance of ObjectMergeOptions | ||
* to be used with objectMerge. | ||
* @example | ||
* var opts = objectMerge.createOptions({ | ||
* depth : 2, | ||
* throwOnCircularRef : false | ||
* }); | ||
* var obj1 = { | ||
* a1 : { | ||
* a2 : { | ||
* a3 : {} | ||
* } | ||
* } | ||
* }; | ||
* var obj2 = { | ||
* a1 : { | ||
* a2 : { | ||
* a3 : 'will not be in output' | ||
* }, | ||
* a22 : {} | ||
* } | ||
* }; | ||
* objectMerge(opts, obj1, obj2); | ||
*/ | ||
@@ -35,2 +61,3 @@ function createOptions(opts) { | ||
* Merges JavaScript objects recursively without altering the objects merged. | ||
* @namespace Merges JavaScript objects recursively without altering the objects merged. | ||
* @author <a href="mailto:matthewkastor@gmail.com">Matthew Kastor</a> | ||
@@ -145,9 +172,13 @@ * @param {ObjectMergeOptions} [opts] An options object created by | ||
} | ||
function main(shadows) { | ||
function objectMergeRecursor(shadows, currentDepth) { | ||
if (options.depth !== false) { | ||
currentDepth = currentDepth ? currentDepth + 1 : 1; | ||
} else { | ||
currentDepth = 0; | ||
} | ||
if (options.throwOnCircularRef === true) { | ||
circularReferenceCheck(shadows); | ||
} | ||
var out = getOutputObject(shadows); | ||
/*jslint unparam: true */ | ||
// recursor defined below. Dougie removed the intelligent suppression of | ||
// this warning, probably because of functions that reference each other. | ||
// So, you're stuck with making sure this isn't a mistake every time you | ||
// use his linter. | ||
function shadowHandler(val, prop, shadow) { | ||
@@ -158,5 +189,5 @@ if (out[prop]) { | ||
shadow[prop] | ||
]); | ||
], currentDepth); | ||
} else { | ||
out[prop] = objectMergeRecursor([shadow[prop]]); | ||
out[prop] = objectMergeRecursor([shadow[prop]], currentDepth); | ||
} | ||
@@ -170,3 +201,3 @@ } | ||
// anyway. | ||
if (out instanceof Object) { | ||
if (out instanceof Object && currentDepth <= options.depth) { | ||
// only merges trailing objects since primitives would wipe out | ||
@@ -181,8 +212,2 @@ // previous objects, as in merging {a:'a'}, 'a', and {b:'b'} | ||
} | ||
function objectMergeRecursor(shadows) { | ||
if (options.throwOnCircularRef === true) { | ||
circularReferenceCheck(shadows); | ||
} | ||
return main(shadows); | ||
} | ||
// determines whether an options object was passed in and | ||
@@ -189,0 +214,0 @@ // uses it if present |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
245950
22
3813