Add implemention for opts.number

minimistjs · Jun 27, 2023 · 3419b15 · 3419b15
1 parent d4de1ab
commit 3419b15
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 19 deletions.
diff --git a/index.js b/index.js
@@ -25,7 +25,8 @@ module.exports = function (args, opts) {
 
 	var flags = {
 		bools: {},
-		known: {},
+		// known: {},
+		numbers: {},
 		strings: {},
 		unknownFn: null,
 	};
@@ -65,6 +66,7 @@ module.exports = function (args, opts) {
 		});
 	});
 
+	// populating flags.strings with explicit keys and aliases
 	[].concat(opts.string).filter(Boolean).forEach(function (key) {
 		flags.strings[key] = true;
 		if (aliases[key]) {
@@ -74,19 +76,30 @@ module.exports = function (args, opts) {
 		}
 	});
 
-	[].concat(opts.known).filter(Boolean).forEach(function (key) {
-		flags.known[key] = true;
+	// populating flags.numbers with explicit keys and aliases
+	[].concat(opts.number).filter(Boolean).forEach(function (key) {
+		flags.numbers[key] = true;
+		if (aliases[key]) {
+			[].concat(aliases[key]).forEach(function (k) {
+				flags.numbers[k] = true;
+			});
+		}
 	});
 
+	// [].concat(opts.known).filter(Boolean).forEach(function (key) {
+	// 	flags.known[key] = true;
+	// });
+
 	var defaults = opts.default || {};
 
 	var argv = { _: [] };
 
 	function keyDefined(key) {
 		return flags.strings[key]
+			|| flags.numbers[key]
 			|| flags.bools[key]
-			|| aliases[key]
-			|| flags.known[key];
+			|| aliases[key];
+		// || flags.known[key];
 	}
 
 	function argDefined(key, arg) {
@@ -140,6 +153,9 @@ module.exports = function (args, opts) {
 			if (flags.strings[key] && val === true) {
 				throw new Error('Missing option value for option "' + key + '"');
 			}
+			if (flags.numbers[key] && !isNumber(val)) {
+				throw new Error('Expecting number value for option "' + key + '"');
+			}
 			if (isBooleanKey(key) && typeof val === 'string' && !(/^(true|false)$/).test(val)) {
 				throw new Error('Unexpected option value for option "' + key + '"');
 			}
@@ -150,7 +166,9 @@ module.exports = function (args, opts) {
 
 		// coercion
 		var value = val;
-		if (!flags.strings[key] && isNumber(val)) {
+		if (flags.numbers[key]) {
+			value = Number(val);
+		} else if (!flags.strings[key] && isNumber(val)) {
 			value = Number(val);
 		}
 		if (flags.strings[key] && val === true) {

diff --git a/test/strict.js b/test/strict.js
@@ -131,19 +131,19 @@ test('strict unknown option: opt.alias is known', function (t) {
 	t.end();
 });
 
-test('strict unknown option: opt.known is known (of course!)', function (t) {
-	t.doesNotThrow(function () {
-		// try known as a string and array of strings, with and without option values
-		parse(['--aaa'], { known: 'aaa', strict: true });
-		parse(['--aaa=value'], { known: 'aaa', strict: true });
-		parse(['--aaa', 'value'], { known: 'aaa', strict: true });
-		parse(['--bbb'], { known: ['aaa', 'bbb'], strict: true });
-		parse(['-s'], { known: ['s'], strict: true });
-		parse(['-s=123'], { known: ['s'], strict: true });
-		parse(['-abc'], { known: ['a', 'b', 'c'], strict: true });
-	});
-	t.end();
-});
+// test('strict unknown option: opt.known is known (of course!)', function (t) {
+// 	t.doesNotThrow(function () {
+// 		// try known as a string and array of strings, with and without option values
+// 		parse(['--aaa'], { known: 'aaa', strict: true });
+// 		parse(['--aaa=value'], { known: 'aaa', strict: true });
+// 		parse(['--aaa', 'value'], { known: 'aaa', strict: true });
+// 		parse(['--bbb'], { known: ['aaa', 'bbb'], strict: true });
+// 		parse(['-s'], { known: ['s'], strict: true });
+// 		parse(['-s=123'], { known: ['s'], strict: true });
+// 		parse(['-abc'], { known: ['a', 'b', 'c'], strict: true });
+// 	});
+// 	t.end();
+// });
 
 test('strict unknown option: opts.unknown returns false', function (t) {
 	// Mirror non-strict and skip argument processing if opts.unknown returns false.