@trenskow/config 1.2.5 → 2.1.2

package/.vscode/launch.json

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

package/.vscode/settings.json

@@ -1,6 +1,7 @@
 {
 	"cSpell.words": [
+		"caseit",
 		"isvalid",
 		"keyd"
 	]
-}
+}

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]));
@@ -94,32 +94,27 @@ const cleanIt = (obj, expanded = [], keyPath = []) => {
 // Give it back.
 module.exports = cleanIt(config);
 
-module.exports.expand = (keyPaths) => {
-	module.exports = merge(module.exports, cleanIt(config, keyPaths), {
-		validate: module.exports.validate,
-		expand: module.exports.expand
-	});
-	return module.exports;
-};
-
 module.exports.validate = async (schema, options = {}) => {
 
+	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'
-				},
-				'expand': {
-					type: 'Function'
+					type: 'AsyncFunction',
+					required: true
 				}
 			}),
 			options));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/config",
-  "version": "1.2.5",
+  "version": "2.1.2",
   "description": "Converts `process.env` into a neatly packed object.",
   "main": "index.js",
   "scripts": {
@@ -26,12 +26,12 @@
   "homepage": "https://github.com/trenskow/config#readme",
   "dependencies": {
     "@trenskow/caseit": "^1.0.1",
-    "isvalid": "^2.7.21",
-    "keyd": "^1.3.4",
+    "isvalid": "^2.10.2",
+    "keyd": "^1.4.0",
     "merge": "^2.1.1"
   },
   "devDependencies": {
-    "chai": "^4.3.0",
-    "mocha": "^7.2.0"
+    "chai": "^4.3.4",
+    "mocha": "^9.0.3"
   }
 }

package/test/index.js

@@ -30,7 +30,7 @@ describe('config', () => {
 		config.validate({
 			'configTest': {
 				'obj': {
-					'string': { type: Number, required: true}
+					'string': { type: Number, required: true }
 				}
 			}
 		}).then(() => {
@@ -61,6 +61,20 @@ describe('config', () => {
 			done();
 		}).catch(done);
 	});
+	it ('should convert arrays into arrays.', () => {
+		const result = require('../');
+		expect(result)
+			.to.have.property('configTest')
+			.to.have.property('array')
+			.to.eql(['0', '1', '2', '3']);
+	});
+	it ('should convert even small arrays.', () => {
+		const result = require('../');
+		expect(result)
+			.to.have.property('configTest')
+			.to.have.property('smallArray')
+			.to.eql(['0']);
+	});
 	it ('not remove validate method when unknown keys are set to be removed', (done) => {
 		config.validate({
 			'configTest': {
@@ -79,28 +93,4 @@ describe('config', () => {
 			done();
 		}).catch(done);
 	});
-	it ('should not collapse when set to expand.', () => {
-		expect(config.expand('config.test.some.objects'))
-			.to.have.property('config')
-			.to.have.property('test')
-			.to.have.property('some')
-			.to.have.property('objects')
-			.to.have.property('key', 'value');
-	});
-	it ('should convert arrays into arrays.', () => {
-		const result = require('../');
-		expect(result)
-			.to.have.property('config')
-			.to.have.property('test')
-			.to.have.property('array')
-			.to.eql(['0', '1', '2', '3']);
-	});
-	it ('should convert even small arrays.', () => {
-		const result = require('../');
-		expect(result)
-			.to.have.property('config')
-			.to.have.property('test')
-			.to.have.property('smallArray')
-			.to.eql(['0']);
-	});
 });