@trenskow/arguments-parser 0.3.141 → 0.3.143

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) {
@@ -203,9 +243,7 @@ const autocomplete = () => {
 
 					const {
 						variadic,
-						autocomplete = () => [{
-							type: 'files'
-						}]
+						autocomplete: variadicAutocomplete
 					} = options.validationOptions;
 
 					if (args
@@ -273,7 +311,9 @@ const autocomplete = () => {
 						}
 
 						output(
-							await schemas[autocompleteIndex].autocomplete?.(current) || []);
+							await resolveExternal(
+								schemas[autocompleteIndex].autocomplete,
+								current));
 
 					} else {
 
@@ -281,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

@@ -15,9 +15,7 @@ export default () => ({
 	validate: (data) => data,
 	formalize: (data) => {
 
-		if (!(Array.isArray(data) && data.every((data) => typeof data === 'string')) && typeof data !== 'function') {
-			throw new Error('Must be a string or a function.');
-		}
+		if (!Array.isArray(data)) data = [data];
 
 		return data;
 

package/package.json

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