@trenskow/arguments-parser 0.3.91 → 0.3.93

package/lib/index.js

@@ -166,7 +166,8 @@ const argumentsParser = (
 					strings,
 					options,
 					parameters
-				})
+				}),
+				parameters
 			});
 
 		} catch (error) {
@@ -189,8 +190,16 @@ const argumentsParser = (
 				print(strings?.commands?.help?.available || 'Available commands:');
 				print();
 
-				const tools = Object.keys(commands).map((key) => ({
-					name: caseit(key, 'kebab'),
+				const tools = Object.entries(commands).map(([key, command]) => ({
+					name: `${
+						caseit(key, 'kebab')
+					}${
+						Array.isArray(command.parameters) ? ` ${
+							command.parameters
+								.map((parameter) => `${opening}${caseit(parameter, 'kebab')}${closing}`)
+								.join(' ')
+						}` : ''
+					}`,
 					description: commands[key].description
 				}));
 
@@ -279,8 +288,8 @@ const argumentsParser = (
 				validationOptions);
 
 			options.schema = merge(
-				options.schema)
-				.with(schema);
+				schema)
+				.with(options.schema);
 
 			return result;
 
@@ -291,8 +300,6 @@ const argumentsParser = (
 		then: (...resultArguments) => {
 			return (async () => {
 
-				checkHelp();
-
 				let nonOptions;
 				let nonOptionsIndex = args.indexOf('--');
 
@@ -350,10 +357,11 @@ const argumentsParser = (
 								const keyPathSchema = keyPaths(options.schema).get(keyPath);
 
 								let optionKeys = [`--${caseit(keyPath, 'kebab')}`];
+
 								let description = [keyPathSchema.description || strings?.commands?.help?.noDescription || 'No description'];
 
-								if (shortOptions[keyPath]) {
-									optionKeys.push(`-${shortOptions[keyPath]}`);
+								if (keyPathSchema.short) {
+									optionKeys.push(`-${keyPathSchema.short}`);
 								}
 
 								if (typeof keyPathSchema.enum !== 'undefined') {
@@ -402,10 +410,14 @@ const argumentsParser = (
 					};
 				}
 
+				checkHelp();
+
 				let rest = [];
 
 				let idx;
 
+				checkHelp();
+
 				for (idx = 0 ; idx < args.length ; idx++) {
 
 					if (args[idx].slice(0, 1) !== '-') {
@@ -467,7 +479,7 @@ const argumentsParser = (
 					}
 				}
 
-				if (args.length > 0) {
+				if (args.length - idx > 0) {
 					printHelp(
 						new Error(
 							(strings?.empty?.help?.errors?.unexpected || 'Unexpected argument: <argument>.')
@@ -484,7 +496,7 @@ const argumentsParser = (
 					printHelp(error);
 				}
 
-				return Object.assign({}, parameters, data, {
+				return Object.assign({}, data, {
 					onError: (error) => {
 						print.err(error.message);
 						process.exit(1);

package/package.json

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