@trenskow/arguments-parser 0.3.142 → 0.3.144

package/lib/autocomplete/index.js

@@ -89,10 +89,50 @@ const autocomplete = () => {
 					};
 				}
 
+				if (typeof item?.type !== 'string') {
+					throw new Error('Autocomplete item must have a type.');
+				}
+
+				if (!['command', 'option', 'files'].includes(item.type)) {
+					throw new Error('Autocomplete item type must be one of: `command`, `option`, `files`.');
+				}
+
+				if (item.type !== 'files') {
+
+					if (typeof item?.argument !== 'string') {
+						throw new Error('Autocomplete item must have an argument.');
+					}
+
+					if (typeof item?.description !== 'undefined' && typeof item?.description !== 'string') {
+						throw new Error('Autocomplete item description must be a string.');
+					}
+
+				}
+
 				return item;
 
 			});
 
+		const resolveExternal = async (external, current) => {
+
+			let autocomplete = [{
+				type: 'files'
+			}];
+
+			if (typeof external !== 'undefined') {
+
+				autocomplete = external;
+
+				if (typeof autocomplete === 'function') {
+					autocomplete = await autocomplete(current);
+				}
+
+			}
+
+			return autocomplete;
+
+		};
+
 		const filter = (items) => normalize(items)
 			.filter((item) => {
 				switch (item.type) {
@@ -202,7 +242,8 @@ const autocomplete = () => {
 				return (async () => {
 
 					const {
-						variadic
+						variadic,
+						autocomplete: variadicAutocomplete
 					} = options.validationOptions;
 
 					if (args
@@ -269,17 +310,10 @@ const autocomplete = () => {
 							}]);
 						}
 
-						let autocomplete = [];
-
-						if (typeof schemas[autocompleteIndex].autocomplete !== 'undefined') {
-							autocomplete = schemas[autocompleteIndex].autocomplete;
-							if (typeof autocomplete === 'function') {
-								autocomplete = await autocomplete(current);
-							}
-						}
-
 						output(
-							autocomplete);
+							await resolveExternal(
+								schemas[autocompleteIndex].autocomplete,
+								current));
 
 					} else {
 
@@ -287,7 +321,9 @@ const autocomplete = () => {
 
 						if (variadic === 'allow') {
 							items = items.concat(
-								await autocomplete?.(current) || []);
+								await resolveExternal(
+									variadicAutocomplete,
+									current));
 						}
 
 						if (!current.startsWith('--')) {

package/lib/plugins/autocomplete.js

@@ -17,40 +17,6 @@ export default () => ({
 
 		if (!Array.isArray(data)) data = [data];
 
-		data
-			.forEach((item) => {
-
-				if (typeof item === 'string') {
-					item = {
-						type: 'option',
-						argument: item
-					};
-				}
-
-				if (typeof item?.type !== 'string') {
-					throw new Error('Autocomplete item must have a type.');
-				}
-
-				if (!['command', 'option', 'files'].includes(item.type)) {
-					throw new Error('Autocomplete item type must be one of: command, option, files.');
-				}
-
-				if (item.type !== 'files') {
-
-					if (typeof item?.argument !== 'string') {
-						throw new Error('Autocomplete item must have an argument.');
-					}
-
-					if (typeof item?.description !== 'undefined' && typeof item?.description !== 'string') {
-						throw new Error('Autocomplete item description must be a string.');
-					}
-
-				}
-
-				return item;
-
-			});
-
 		return data;
 
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@trenskow/arguments-parser",
-	"version": "0.3.142",
+	"version": "0.3.144",
 	"description": "Yet another arguments parser.",
 	"main": "index.js",
 	"type": "module",
@@ -30,9 +30,9 @@
 		"isvalid": "^5.0.21"
 	},
 	"devDependencies": {
-		"@eslint/eslintrc": "^3.3.6",
+		"@eslint/eslintrc": "^3.3.7",
 		"@eslint/js": "^10.0.1",
-		"eslint": "^10.8.0",
-		"globals": "^17.9.0"
+		"eslint": "^10.10.0",
+		"globals": "^17.12.0"
 	}
 }