@trenskow/arguments-parser 0.3.141 → 0.3.142

package/lib/autocomplete/index.js

@@ -202,10 +202,7 @@ const autocomplete = () => {
 				return (async () => {
 
 					const {
-						variadic,
-						autocomplete = () => [{
-							type: 'files'
-						}]
+						variadic
 					} = options.validationOptions;
 
 					if (args
@@ -272,8 +269,17 @@ const autocomplete = () => {
 							}]);
 						}
 
+						let autocomplete = [];
+
+						if (typeof schemas[autocompleteIndex].autocomplete !== 'undefined') {
+							autocomplete = schemas[autocompleteIndex].autocomplete;
+							if (typeof autocomplete === 'function') {
+								autocomplete = await autocomplete(current);
+							}
+						}
+
 						output(
-							await schemas[autocompleteIndex].autocomplete?.(current) || []);
+							autocomplete);
 
 					} else {
 

package/lib/plugins/autocomplete.js

@@ -15,9 +15,41 @@ 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];
+
+		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.141",
+	"version": "0.3.142",
 	"description": "Yet another arguments parser.",
 	"main": "index.js",
 	"type": "module",