easy-configuration - npm Package Compare versions

Comparing version 1.6.1 to 1.6.2

lib/EasyConfiguration.js

@@ -12,2 +12,4 @@ // Generated by CoffeeScript 1.6.3
   EasyConfiguration = (function() {
+    EasyConfiguration.PARAMETER_REGEXP = /%([a-zA-Z.-_]+)%/g;
+
     EasyConfiguration.prototype.fileName = null;
@@ -140,4 +142,4 @@
           case '[object String]':
-            return parameters[name] = param.replace(/%([a-zA-Z.-_]+)%/g, function(match, variable) {
-              return _this.getParameter(variable);
+            return parameters[name] = param.replace(EasyConfiguration.PARAMETER_REGEXP, function(match, variable) {
+              return _this._getParameter(variable, [name]);
             });
@@ -171,4 +173,8 @@ case '[object Object]':
 
-    EasyConfiguration.prototype.getParameter = function(parameter) {
-      var actual, part, parts, _i, _len;
+    EasyConfiguration.prototype._getParameter = function(parameter, previous) {
+      var actual, part, parts, s, _i, _len,
+        _this = this;
+      if (previous == null) {
+        previous = [];
+      }
       parts = parameter.split('.');
@@ -183,5 +189,18 @@ actual = this._parameters;
       }
+      if (Helpers.arrayIndexOf(previous, parameter) !== -1) {
+        s = previous.length === 1 ? '' : 's';
+        previous = previous.join(', ');
+        throw new Error("Found circular reference in parameter" + s + " " + previous + ".");
+      }
+      previous.push(parameter);
+      actual = actual.replace(EasyConfiguration.PARAMETER_REGEXP, function(match, param) {
+        return _this._getParameter(param, previous);
+      });
       return actual;
     };
 
+    EasyConfiguration.prototype.getParameter = function(parameter) {
+      return this._getParameter(parameter);
+    };
+
     EasyConfiguration.prototype.merge = function(left, right) {
@@ -188,0 +207,0 @@ right = Helpers.clone(right, false);

package.json

 {
 	"name": "easy-configuration",
 	"description": "Simply extensible loader for json config files",
-	"version": "1.6.1",
+	"version": "1.6.2",
 	"author": {
@@ -6,0 +6,0 @@ "name": "David Kudera",

README.md

@@ -203,2 +203,5 @@ # Easy Configuration
 
+* 1.6.2
+	+ Throwing error if there is some circular reference
+
 * 1.6.1
@@ -205,0 +208,0 @@ + Removed dependency on clone module

test/browser/application.js

@@ -405,2 +405,4 @@ /** Generated by SimQ **/
 	  EasyConfiguration = (function() {
+	    EasyConfiguration.PARAMETER_REGEXP = /%([a-zA-Z.-_]+)%/g;
+	
 	    EasyConfiguration.prototype.fileName = null;
@@ -533,4 +535,4 @@
 	          case '[object String]':
-	            return parameters[name] = param.replace(/%([a-zA-Z.-_]+)%/g, function(match, variable) {
-	              return _this.getParameter(variable);
+	            return parameters[name] = param.replace(EasyConfiguration.PARAMETER_REGEXP, function(match, variable) {
+	              return _this._getParameter(variable, [name]);
 	            });
@@ -564,4 +566,8 @@ case '[object Object]':
 	
-	    EasyConfiguration.prototype.getParameter = function(parameter) {
-	      var actual, part, parts, _i, _len;
+	    EasyConfiguration.prototype._getParameter = function(parameter, previous) {
+	      var actual, part, parts, s, _i, _len,
+	        _this = this;
+	      if (previous == null) {
+	        previous = [];
+	      }
 	      parts = parameter.split('.');
@@ -576,5 +582,18 @@ actual = this._parameters;
 	      }
+	      if (Helpers.arrayIndexOf(previous, parameter) !== -1) {
+	        s = previous.length === 1 ? '' : 's';
+	        previous = previous.join(', ');
+	        throw new Error("Found circular reference in parameter" + s + " " + previous + ".");
+	      }
+	      previous.push(parameter);
+	      actual = actual.replace(EasyConfiguration.PARAMETER_REGEXP, function(match, param) {
+	        return _this._getParameter(param, previous);
+	      });
 	      return actual;
 	    };
 	
+	    EasyConfiguration.prototype.getParameter = function(parameter) {
+	      return this._getParameter(parameter);
+	    };
+	
 	    EasyConfiguration.prototype.merge = function(left, right) {
@@ -622,5 +641,11 @@ right = Helpers.clone(right, false);
 	    describe('#load()', function() {
-	      return it('should return loaded configuration without parameters', function() {
+	      it('should return loaded configuration without parameters', function() {
 	        return expect(configuration.load()).to.be.eql({});
 	      });
+	      return it('should throw an error with information about circular reference', function() {
+	        configuration = new EasyConfiguration("" + dir + "/circular.json");
+	        return expect(function() {
+	          return configuration.load();
+	        }).to["throw"](Error, 'Found circular reference in parameters first, second, third, other.inner.fourth.');
+	      });
 	    });
@@ -841,2 +866,30 @@ describe('#addSection()', function() {
 
+}, '/test/data/circular.json': function(exports, module) {
+
+	/** node globals **/
+	var require = function(name) {return window.require(name, '/test/data/circular.json');};
+	require.resolve = function(name, parent) {if (parent === null) {parent = '/test/data/circular.json';} return window.require.resolve(name, parent);};
+	require.define = function(bundle) {window.require.define(bundle);};
+	require.cache = window.require.cache;
+	var __filename = '/test/data/circular.json';
+	var __dirname = '/test/data';
+	var process = {cwd: function() {return '/';}, argv: ['node', '/test/data/circular.json'], env: {}};
+
+	/** code **/
+	module.exports = (function() {
+	return {
+		"parameters": {
+			"first": "%second%",
+			"second": "%third%",
+			"third": "%other.inner.fourth%",
+			"other": {
+				"inner": {
+					"fourth": "%first%"
+				}
+			}
+		}
+	}
+	}).call(this);
+	
+
 }, '/test/data/config.json': function(exports, module) {
@@ -1030,3 +1083,3 @@
 });
-require.__setStats({"recursive-merge/lib/Merge.js":{"atime":1385285416000,"mtime":1375346181000,"ctime":1385285362000},"/lib/Extension.js":{"atime":1385299545000,"mtime":1385299528000,"ctime":1385299528000},"/lib/Helpers.js":{"atime":1385300268000,"mtime":1385300070000,"ctime":1385300070000},"/lib/EasyConfiguration.js":{"atime":1385302067000,"mtime":1385302046000,"ctime":1385302046000},"/test/browser/tests/EasyConfiguration.coffee":{"atime":1385286543000,"mtime":1385286541000,"ctime":1385286541000},"/test/browser/tests/Helpers.coffee":{"atime":1385301964000,"mtime":1385301962000,"ctime":1385301962000},"/test/data/advanced.json":{"atime":1385285413000,"mtime":1385285347000,"ctime":1385285347000},"/test/data/config.json":{"atime":1385285413000,"mtime":1385285347000,"ctime":1385285347000},"/test/data/other.json":{"atime":1385285413000,"mtime":1385285347000,"ctime":1385285347000},"/test/data/unknownSection.json":{"atime":1385285413000,"mtime":1385285347000,"ctime":1385285347000},"/package.json":{"atime":1385302108000,"mtime":1385302079000,"ctime":1385302079000},"recursive-merge/package.json":{"atime":1385285416000,"mtime":1385285362000,"ctime":1385285362000}});
+require.__setStats({"recursive-merge/lib/Merge.js":{"atime":1385285416000,"mtime":1375346181000,"ctime":1385285362000},"/lib/Extension.js":{"atime":1385299545000,"mtime":1385299528000,"ctime":1385299528000},"/lib/Helpers.js":{"atime":1385300268000,"mtime":1385300070000,"ctime":1385300070000},"/lib/EasyConfiguration.js":{"atime":1385308594000,"mtime":1385308588000,"ctime":1385308588000},"/test/browser/tests/EasyConfiguration.coffee":{"atime":1385308830000,"mtime":1385308821000,"ctime":1385308821000},"/test/browser/tests/Helpers.coffee":{"atime":1385301964000,"mtime":1385301962000,"ctime":1385301962000},"/test/data/advanced.json":{"atime":1385285413000,"mtime":1385285347000,"ctime":1385285347000},"/test/data/circular.json":{"atime":1385308755000,"mtime":1385308754000,"ctime":1385308754000},"/test/data/config.json":{"atime":1385285413000,"mtime":1385285347000,"ctime":1385285347000},"/test/data/other.json":{"atime":1385285413000,"mtime":1385285347000,"ctime":1385285347000},"/test/data/unknownSection.json":{"atime":1385285413000,"mtime":1385285347000,"ctime":1385285347000},"/package.json":{"atime":1385308830000,"mtime":1385308828000,"ctime":1385308828000},"recursive-merge/package.json":{"atime":1385285416000,"mtime":1385285362000,"ctime":1385285362000}});
 require.version = '5.1.2';
@@ -1033,0 +1086,0 @@

test/node/EasyConfiguration.js

@@ -22,5 +22,11 @@ // Generated by CoffeeScript 1.6.3
     describe('#load()', function() {
-      return it('should return loaded configuration without parameters', function() {
+      it('should return loaded configuration without parameters', function() {
         return expect(configuration.load()).to.be.eql({});
       });
+      return it('should throw an error with information about circular reference', function() {
+        configuration = new EasyConfiguration("" + dir + "/circular.json");
+        return expect(function() {
+          return configuration.load();
+        }).to["throw"](Error, 'Found circular reference in parameters first, second, third, other.inner.fourth.');
+      });
     });
@@ -27,0 +33,0 @@ describe('#addSection()', function() {

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

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

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

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

80837

increased by5.87%

Number of package files

28

increased by3.7%

Lines of code

1529

increased by5.59%

Number of lines in readme file

294

increased by1.03%

No dependency changes