verdnatura-mirror
/
loopback-boot
mirror of https://github.com/strongloop/loopback-boot.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified mergeArrays function to accept arrays of different length. 

Modified mergeArrays function to accept arrays of different length and merge the content of arrays.
This commit is contained in:
RameshChoudhary 2016-03-15 16:50:47 +05:30
parent 058e0e2f56
commit 6b4fdb8fff
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/config-loader.js
View File

@ -2,7 +2,7 @@ var fs = require('fs');
var path = require('path'); var path = require('path');
var debug = require('debug')('loopback:boot:config-loader'); var debug = require('debug')('loopback:boot:config-loader');
var assert = require('assert'); var assert = require('assert');
var _=require('lodash');
var ConfigLoader = exports; var ConfigLoader = exports;
/** /**
@ -276,8 +276,7 @@ function mergeSingleItemOrProperty(target, config, key, fullKey) {
function mergeArrays(target, config, keyPrefix) { function mergeArrays(target, config, keyPrefix) {
if (target.length !== config.length) { if (target.length !== config.length) {
return 'Cannot merge array values of different length' + return mergeArraysDiffLength(target, config);
' for the option `' + keyPrefix + '`.';
} }
// Use for(;;) to iterate over undefined items, for(in) would skip them. // Use for(;;) to iterate over undefined items, for(in) would skip them.
@ -290,6 +289,12 @@ function mergeArrays(target, config, keyPrefix) {
return null; // no error return null; // no error
} }
function mergeArraysDiffLength(target, config) {
var newTarget = _.cloneDeep(target, true);
Array.prototype.splice.apply(target, [0, target.length].concat(_.union(newTarget, config)));
}
function hasCompatibleType(origValue, newValue) { function hasCompatibleType(origValue, newValue) {
if (origValue === null || origValue === undefined) if (origValue === null || origValue === undefined)
return true; return true;