@trenskow/config 2.1.2 → 2.1.6

package/index.js

@@ -73,8 +73,14 @@ const cleanIt = (obj, expanded = [], keyPath = []) => {
 	obj = Object.keys(obj).reduce((res, key) => {
 
 		const keys = obj[key] ? Object.keys(obj[key]) : [];
-		const fullKeyPath = keyd.append(keyd.join(keyPath.map((key) => key.toLowerCase())), key);
-		const isLocked = expanded.some((keyPath) => keyd.within(fullKeyPath, keyPath));
+
+		let fullKeyPath = keyd.join(keyPath.map((key) => key.toLowerCase()));
+
+		if (key !== '$') fullKeyPath = keyd.append(fullKeyPath, key);
+
+		const isLocked = expanded.some((keyPath) => {
+			return keyPath.split(/(?=[A-Z])|\./).map((key) => caseit(key)).join('.') == fullKeyPath;
+		});
 
 		if (Array.isArray(obj[key]) || isLocked || typeof obj[key] === 'undefined' || typeof obj[key] === 'string' || typeof obj[key] === 'number' || keys.length > 1) {
 			res[key] = obj[key];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/config",
-  "version": "2.1.2",
+  "version": "2.1.6",
   "description": "Converts `process.env` into a neatly packed object.",
   "main": "index.js",
   "scripts": {
@@ -25,13 +25,13 @@
   },
   "homepage": "https://github.com/trenskow/config#readme",
   "dependencies": {
-    "@trenskow/caseit": "^1.0.1",
-    "isvalid": "^2.10.2",
-    "keyd": "^1.4.0",
+    "@trenskow/caseit": "^1.1.4",
+    "isvalid": "^3.0.2",
+    "keyd": "^1.5.6",
     "merge": "^2.1.1"
   },
   "devDependencies": {
-    "chai": "^4.3.4",
-    "mocha": "^9.0.3"
+    "chai": "^4.3.6",
+    "mocha": "^9.2.2"
   }
 }

package/test/index.js

@@ -13,6 +13,7 @@ process.env = {
 	CONFIG_TEST_ARRAY_1: '1',
 	CONFIG_TEST_ARRAY_2: '2',
 	CONFIG_TEST_ARRAY_3: '3',
+	CONFIG_TEST_THIS_IS_A_DEEPLY_NESTED_KEY: 'true',
 	config_test_small_array_0: '0'
 };
 
@@ -93,4 +94,25 @@ describe('config', () => {
 			done();
 		}).catch(done);
 	});
+	it ('must validate a deeply nested key.', (done) => {
+		config.validate({
+			'configTest': {
+				'this': {
+					'is': {
+						'a': {
+							'deeply': {
+								'nested': {
+									'key': { type: Boolean }
+								}
+							}
+						}
+					}
+				}
+			}
+		}).then(() => {
+			const result = require('../');
+			expect(result.configTest.this.is.a.deeply.nested.key).to.equal(true);
+			done();
+		}).catch(done);
+	});
 });