@trenskow/arguments-parser 0.2.2 → 0.2.4

package/lib/index.js

@@ -9,10 +9,21 @@
 import { basename } from 'path';
 
 import caseit from '@trenskow/caseit';
-import { default as isvalid, keyPaths, formalize } from 'isvalid';
+import { default as isvalid, keyPaths, formalize, plugins } from 'isvalid';
 import print from '@trenskow/print';
 
-const argumentsParser = ({ args = process.argv.slice(2), argvLevel = 0, placeholder = '<>' } = {}) => {
+plugins.use(() => ({
+	phase: 'pre',
+	supportsType: () => true,
+	validatorsForType: () => ({
+		description: ['string'],
+		defaultDescription: ['string']
+	}),
+	validate: (data) => data,
+	formalize: (schema) => schema
+}));
+
+const argumentsParser = ({ args = process.argv.slice(2), argvLevel = 0, placeholder = '<>', command } = {}) => {
 
 	const [ opening, closing ] = placeholder.split('');
 
@@ -75,10 +86,15 @@ const argumentsParser = ({ args = process.argv.slice(2), argvLevel = 0, placehol
 
 			try {
 
-				args = args.slice(1);
-				argvLevel++;
-
-				return await commands[tool]({ args, argumentsParser: argumentsParser({ args, argvLevel, placeholder }) });
+				return await commands[tool]({
+					args: args.slice(1),
+					argumentsParser: argumentsParser({
+						args: args.slice(1),
+						argvLevel: argvLevel + 1,
+						placeholder,
+						command: commands[tool]
+					})
+				});
 
 			} catch (error) {
 				print.err(`${error.stack}`);
@@ -86,20 +102,11 @@ const argumentsParser = ({ args = process.argv.slice(2), argvLevel = 0, placehol
 			}
 
 		},
-		options: async (schema, options = {}) => {
-
-			schema = formalize(schema, {
-				plugins: [() => ({
-					phase: 'pre',
-					supportsType: () => true,
-					validatorsForType: () => ({
-						description: ['string'],
-						defaultDescription: ['string']
-					}),
-					validate: (data) => data,
-					formalize: (schema) => schema
-				})]
-			});
+		options: async (schema, options = { }) => {
+
+			options.command = options.command || command;
+
+			schema = formalize(schema);
 
 			let nonOptions;
 			let nonOptionsIndex = args.indexOf('--');
@@ -115,9 +122,9 @@ const argumentsParser = ({ args = process.argv.slice(2), argvLevel = 0, placehol
 
 			const printHelp = (error) => {
 
-				if (typeof options?.cmd?.description === 'string') {
+				if (typeof options?.command?.description === 'string') {
 					print();
-					print(options.cmd.description);
+					print(options.command.description);
 				}
 
 				print();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@trenskow/arguments-parser",
-	"version": "0.2.2",
+	"version": "0.2.4",
 	"description": "Yet another arguments parser.",
 	"main": "index.js",
 	"type": "module",