@trenskow/config 2.0.0 → 2.1.5

package/.vscode/launch.json

@@ -12,7 +12,11 @@
 				"<node_internals>/**"
 			],
 			"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
-			"args": ["--bail"]
+			"args": [
+				"--bail",
+				"--timeout",
+				"0"
+			]
 		}
 	]
-}
+}

package/index.js

@@ -9,7 +9,7 @@ const
 let config = {};
 
 // We first split the env names at `_` and put them into objects.
-Object.keys(process.env)
+Object.keys(process.env).filter((key) => process.env[key])
 	.forEach((key) => {
 
 		// Split and filter.
@@ -35,7 +35,7 @@ Object.keys(process.env)
 
 const fillArray = (value, length) => {
 	let result = [];
-	for (let idx = 0 ; idx < length ; idx++) result.push(value);
+	for (let idx = 0; idx < length; idx++) result.push(value);
 	return result;
 };
 
@@ -45,7 +45,7 @@ const makeArrayIfNecessary = (obj) => {
 	const arrayKeys = fillArray(undefined, keys.length)
 		.map((_, idx) => idx);
 
-	for (let idx = 0 ; idx < keys.length; idx++) {
+	for (let idx = 0; idx < keys.length; idx++) {
 		if (keys[idx] != arrayKeys[idx]) return obj;
 	}
 
@@ -57,12 +57,12 @@ const makeArrayIfNecessary = (obj) => {
 const cleanIt = (obj, expanded = [], keyPath = []) => {
 
 	if (typeof obj === 'undefined') return;
-	
+
 	if (!Array.isArray(expanded)) expanded = expanded.split(/, ?/);
 
 	// If the object is a string we just return it.
 	if (typeof obj === 'string') return obj;
-	
+
 	// Now clean all the keys.
 	obj = Object.keys(obj).reduce((res, key) => {
 		res[key.toLowerCase()] = cleanIt(obj[key], expanded, keyPath.concat([key]));
@@ -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];
@@ -96,23 +102,25 @@ module.exports = cleanIt(config);
 
 module.exports.validate = async (schema, options = {}) => {
 
-	module.exports = merge(module.exports, cleanIt(config, isvalid.keyPaths(schema, Object).filter((keyPath) => keyPath)), {
+	schema = isvalid.formalize(schema);
+
+	module.exports = merge(module.exports, cleanIt(config, isvalid.keyPaths(schema).all(Object).filter((keyPath) => keyPath)), {
 		validate: module.exports.validate
 	});
 
 	options = merge({
 		defaults: {
 			unknownKeys: 'allow'
-		},
-		throwDeepKeyOnImplicit: true
+		}
 	}, options);
 
 	try {
 		return module.exports = merge(module.exports, await isvalid(
 			module.exports,
-			merge(schema, {
+			isvalid.merge(schema).with({
 				'validate': {
-					type: 'AsyncFunction'
+					type: 'AsyncFunction',
+					required: true
 				}
 			}),
 			options));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/config",
-  "version": "2.0.0",
+  "version": "2.1.5",
   "description": "Converts `process.env` into a neatly packed object.",
   "main": "index.js",
   "scripts": {
@@ -26,8 +26,8 @@
   "homepage": "https://github.com/trenskow/config#readme",
   "dependencies": {
     "@trenskow/caseit": "^1.0.1",
-    "isvalid": "^2.8.0",
-    "keyd": "^1.4.0",
+    "isvalid": "^2.10.3",
+    "keyd": "^1.4.2",
     "merge": "^2.1.1"
   },
   "devDependencies": {

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'
 };
 
@@ -30,7 +31,7 @@ describe('config', () => {
 		config.validate({
 			'configTest': {
 				'obj': {
-					'string': { type: Number, required: true}
+					'string': { type: Number, required: true }
 				}
 			}
 		}).then(() => {
@@ -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);
+	});
 });