args-tokens 0.17.0 → 0.18.0

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 import { ArgToken, ParserOptions, parseArgs$1 as parseArgs } from "./parser-Bx112mWZ.js";
-import { ArgResolveError$1 as ArgResolveError, ArgResolveErrorType, ArgSchema, ArgValues, Args, ResolveArgs, resolveArgs$1 as resolveArgs } from "./resolver--lXziDSy.js";
+import { ArgResolveError$1 as ArgResolveError, ArgResolveErrorType, ArgSchema, ArgValues, Args, ResolveArgs, resolveArgs$1 as resolveArgs } from "./resolver-D_oOCXlX.js";
 
 //#region src/parse.d.ts
 /**

package/lib/index.js

@@ -1,5 +1,5 @@
 import { parseArgs } from "./parser-Dr4iAGaX.js";
-import { ArgResolveError, resolveArgs } from "./resolver-pmWK3ioa.js";
+import { ArgResolveError, resolveArgs } from "./resolver-_BCsM-y_.js";
 
 //#region src/parse.ts
 const DEFAULT_OPTIONS = {

package/lib/{resolver--lXziDSy.d.ts → resolver-D_oOCXlX.d.ts}

@@ -5,7 +5,6 @@ import { ArgToken } from "./parser-Bx112mWZ.js";
 * An argument schema
 * This schema is similar to the schema of the `node:utils`.
 * difference is that:
-* - `multiple` property is not supported
 * - `required` property and `description` property are added
 * - `type` is not only 'string' and 'boolean', but also 'number', 'enum' and 'positional' too.
 * - `default` property type, not support multiple types
@@ -14,7 +13,6 @@ import { ArgToken } from "./parser-Bx112mWZ.js";
 * An argument schema
 * This schema is similar to the schema of the `node:utils`.
 * difference is that:
-* - `multiple` property is not supported
 * - `required` property and `description` property are added
 * - `type` is not only 'string' and 'boolean', but also 'number', 'enum' and 'positional' too.
 * - `default` property type, not support multiple types
@@ -37,6 +35,10 @@ interface ArgSchema {
   */
   required?: true;
   /**
+  * Whether the argument allow multiple values or not.
+  */
+  multiple?: true;
+  /**
   * Whether the negatable option for `boolean` type
   */
   negatable?: boolean;
@@ -60,12 +62,13 @@ interface Args {
 * An object that contains the values of the arguments.
 */
 type ArgValues<T> = T extends Args ? ResolveArgValues<T, { [Arg in keyof T]: ExtractOptionValue<T[Arg]> }> : {
-  [option: string]: string | boolean | number | undefined;
+  [option: string]: string | boolean | number | (string | boolean | number)[] | undefined;
 };
 /**
 * @internal
 */
-type ExtractOptionValue<A extends ArgSchema> = A["type"] extends "string" ? string : A["type"] extends "boolean" ? boolean : A["type"] extends "number" ? number : A["type"] extends "positional" ? string : A["type"] extends "enum" ? A["choices"] extends string[] | readonly string[] ? A["choices"][number] : never : string | boolean | number;
+type ExtractOptionValue<A extends ArgSchema> = A["type"] extends "string" ? ResolveOptionValue<A, string> : A["type"] extends "boolean" ? ResolveOptionValue<A, boolean> : A["type"] extends "number" ? ResolveOptionValue<A, number> : A["type"] extends "positional" ? ResolveOptionValue<A, string> : A["type"] extends "enum" ? A["choices"] extends string[] | readonly string[] ? ResolveOptionValue<A, A["choices"][number]> : never : ResolveOptionValue<A, string | boolean | number>;
+type ResolveOptionValue<A extends ArgSchema, T> = A["multiple"] extends true ? T[] : T;
 /**
 * @internal
 */

package/lib/{resolver-pmWK3ioa.js → resolver-_BCsM-y_.js}

@@ -12,8 +12,7 @@ const SKIP_POSITIONAL_DEFAULT = -1;
 function resolveArgs(args, tokens, { optionGrouping = false, skipPositional = SKIP_POSITIONAL_DEFAULT } = {}) {
 	const skipPositionalIndex = typeof skipPositional === "number" ? Math.max(skipPositional, SKIP_POSITIONAL_DEFAULT) : SKIP_POSITIONAL_DEFAULT;
 	const rest = [];
-	const longOptionTokens = [];
-	const shortOptionTokens = [];
+	const optionTokens = [];
 	const positionalTokens = [];
 	let currentLongOption;
 	let currentShortOption;
@@ -29,14 +28,14 @@ function resolveArgs(args, tokens, { optionGrouping = false, skipPositional = SK
 	function applyLongOptionValue(value = void 0) {
 		if (currentLongOption) {
 			currentLongOption.value = value;
-			longOptionTokens.push({ ...currentLongOption });
+			optionTokens.push({ ...currentLongOption });
 			currentLongOption = void 0;
 		}
 	}
 	function applyShortOptionValue(value = void 0) {
 		if (currentShortOption) {
 			currentShortOption.value = value || toShortValue();
-			shortOptionTokens.push({ ...currentShortOption });
+			optionTokens.push({ ...currentShortOption });
 			currentShortOption = void 0;
 		}
 	}
@@ -65,18 +64,18 @@ function resolveArgs(args, tokens, { optionGrouping = false, skipPositional = SK
 		} else if (token.kind === "option") if (token.rawName) {
 			if (hasLongOptionPrefix(token.rawName)) {
 				applyLongOptionValue();
-				if (token.inlineValue) longOptionTokens.push({ ...token });
+				if (token.inlineValue) optionTokens.push({ ...token });
 				else currentLongOption = { ...token };
 				applyShortOptionValue();
 			} else if (isShortOption(token.rawName)) if (currentShortOption) {
 				if (currentShortOption.index === token.index) if (optionGrouping) {
 					currentShortOption.value = token.value;
-					shortOptionTokens.push({ ...currentShortOption });
+					optionTokens.push({ ...currentShortOption });
 					currentShortOption = { ...token };
 				} else expandableShortOptions.push({ ...token });
 				else {
 					currentShortOption.value = toShortValue();
-					shortOptionTokens.push({ ...currentShortOption });
+					optionTokens.push({ ...currentShortOption });
 					currentShortOption = { ...token };
 				}
 				applyLongOptionValue();
@@ -87,7 +86,7 @@ function resolveArgs(args, tokens, { optionGrouping = false, skipPositional = SK
 		} else {
 			if (currentShortOption && currentShortOption.index == token.index && token.inlineValue) {
 				currentShortOption.value = token.value;
-				shortOptionTokens.push({ ...currentShortOption });
+				optionTokens.push({ ...currentShortOption });
 				currentShortOption = void 0;
 			}
 			applyLongOptionValue();
@@ -118,7 +117,9 @@ function resolveArgs(args, tokens, { optionGrouping = false, skipPositional = SK
 	let positionalsCount = 0;
 	for (const [option, schema] of Object.entries(args)) {
 		if (schema.required) {
-			const found = longOptionTokens.find((token) => token.name === option) || schema.short && shortOptionTokens.find((token) => token.name === schema.short);
+			const found = optionTokens.find((token) => {
+				return schema.short && token.name === schema.short || token.rawName && hasLongOptionPrefix(token.rawName) && token.name === option;
+			});
 			if (!found) {
 				errors.push(createRequireError(option, schema));
 				continue;
@@ -132,9 +133,9 @@ function resolveArgs(args, tokens, { optionGrouping = false, skipPositional = SK
 			positionalsCount++;
 			continue;
 		}
-		for (let i = 0; i < longOptionTokens.length; i++) {
-			const token = longOptionTokens[i];
-			if (checkTokenName(option, schema, token) && token.rawName != void 0 && hasLongOptionPrefix(token.rawName)) {
+		for (let i = 0; i < optionTokens.length; i++) {
+			const token = optionTokens[i];
+			if (checkTokenName(option, schema, token) && token.rawName != void 0 && hasLongOptionPrefix(token.rawName) || schema.short === token.name && token.rawName != void 0 && isShortOption(token.rawName)) {
 				const invalid = validateRequire(token, option, schema);
 				if (invalid) {
 					errors.push(invalid);
@@ -148,27 +149,10 @@ function resolveArgs(args, tokens, { optionGrouping = false, skipPositional = SK
 						continue;
 					}
 				}
-				values[option] = resolveArgumentValue(token, schema);
-				continue;
-			}
-		}
-		for (let i = 0; i < shortOptionTokens.length; i++) {
-			const token = shortOptionTokens[i];
-			if (schema.short === token.name && token.rawName != null && isShortOption(token.rawName)) {
-				const invalid = validateRequire(token, option, schema);
-				if (invalid) {
-					errors.push(invalid);
-					continue;
-				}
-				if (schema.type === "boolean") token.value = void 0;
-				else {
-					const invalid$1 = validateValue(token, option, schema);
-					if (invalid$1) {
-						errors.push(invalid$1);
-						continue;
-					}
-				}
-				values[option] = resolveArgumentValue(token, schema);
+				if (schema.multiple) {
+					values[option] ||= [];
+					values[option].push(resolveArgumentValue(token, schema));
+				} else values[option] = resolveArgumentValue(token, schema);
 				continue;
 			}
 		}
@@ -182,7 +166,7 @@ function resolveArgs(args, tokens, { optionGrouping = false, skipPositional = SK
 	};
 }
 function createRequireError(option, schema) {
-	const message = schema.type === "positional" ? `Positional argument '${option}' is required` : `Option '--${option}' ${schema.short ? `or '-${schema.short}' ` : ""}is required`;
+	const message = schema.type === "positional" ? `Positional argument '${option}' is required` : `Optional argument '--${option}' ${schema.short ? `or '-${schema.short}' ` : ""}is required`;
 	return new ArgResolveError(message, option, "required", schema);
 }
 /**
@@ -214,7 +198,7 @@ function validateValue(token, option, schema) {
 			break;
 		}
 		case "enum": {
-			if (schema.choices && !schema.choices.includes(token.value)) return new ArgResolveError(`Option '--${option}' ${schema.short ? `or '-${schema.short}' ` : ""}should be chosen from '${schema.type}' [${schema.choices.map((c) => JSON.stringify(c)).join(", ")}] values`, option, "type", schema);
+			if (schema.choices && !schema.choices.includes(token.value)) return new ArgResolveError(`Optional argument '--${option}' ${schema.short ? `or '-${schema.short}' ` : ""}should be chosen from '${schema.type}' [${schema.choices.map((c) => JSON.stringify(c)).join(", ")}] values`, option, "type", schema);
 			break;
 		}
 	}
@@ -223,7 +207,7 @@ function isNumeric(str) {
 	return str.trim() !== "" && !isNaN(str);
 }
 function createTypeError(option, schema) {
-	return new ArgResolveError(`Option '--${option}' ${schema.short ? `or '-${schema.short}' ` : ""}should be '${schema.type}'`, option, "type", schema);
+	return new ArgResolveError(`Optional argument '--${option}' ${schema.short ? `or '-${schema.short}' ` : ""}should be '${schema.type}'`, option, "type", schema);
 }
 function resolveArgumentValue(token, schema) {
 	if (token.value) return schema.type === "number" ? +token.value : token.value;

package/lib/resolver.d.ts

@@ -1,3 +1,3 @@
 import "./parser-Bx112mWZ.js";
-import { ArgResolveError$1 as ArgResolveError, ArgResolveErrorType, ArgSchema, ArgValues, Args, ExtractOptionValue, FilterArgs, ResolveArgValues, ResolveArgs, resolveArgs$1 as resolveArgs } from "./resolver--lXziDSy.js";
+import { ArgResolveError$1 as ArgResolveError, ArgResolveErrorType, ArgSchema, ArgValues, Args, ExtractOptionValue, FilterArgs, ResolveArgValues, ResolveArgs, resolveArgs$1 as resolveArgs } from "./resolver-D_oOCXlX.js";
 export { ArgResolveError, ArgResolveErrorType, ArgSchema, ArgValues, Args, ExtractOptionValue, FilterArgs, ResolveArgValues, ResolveArgs, resolveArgs };

package/lib/resolver.js

@@ -1,4 +1,4 @@
 import "./parser-Dr4iAGaX.js";
-import { ArgResolveError, resolveArgs } from "./resolver-pmWK3ioa.js";
+import { ArgResolveError, resolveArgs } from "./resolver-_BCsM-y_.js";
 
 export { ArgResolveError, resolveArgs };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "args-tokens",
   "description": "parseArgs tokens compatibility and more high-performance parser",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -68,29 +68,30 @@
     "@eslint/markdown": "^6.4.0",
     "@kazupon/eslint-config": "^0.29.0",
     "@kazupon/prettier-config": "^0.1.1",
-    "@types/node": "^22.15.3",
-    "@vitest/eslint-plugin": "^1.1.44",
-    "bumpp": "^10.1.0",
-    "deno": "^2.3.1",
-    "eslint": "^9.26.0",
-    "eslint-config-prettier": "^10.1.2",
-    "eslint-plugin-jsonc": "^2.20.0",
+    "@types/node": "^22.15.21",
+    "@typescript/native-preview": "7.0.0-dev.20250522.2",
+    "@vitest/eslint-plugin": "^1.2.0",
+    "bumpp": "^10.1.1",
+    "deno": "^2.3.3",
+    "eslint": "^9.27.0",
+    "eslint-config-prettier": "^10.1.5",
+    "eslint-plugin-jsonc": "^2.20.1",
     "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-regexp": "^2.7.0",
-    "eslint-plugin-unicorn": "^59.0.0",
+    "eslint-plugin-unicorn": "^59.0.1",
     "eslint-plugin-yml": "^1.18.0",
     "gh-changelogen": "^0.2.8",
     "jsr": "^0.13.4",
-    "jsr-exports-lint": "^0.2.0",
-    "knip": "^5.52.0",
-    "lint-staged": "^15.5.1",
+    "jsr-exports-lint": "^0.4.0",
+    "knip": "^5.57.1",
+    "lint-staged": "^15.5.2",
     "mitata": "^1.0.34",
-    "pkg-pr-new": "^0.0.43",
+    "pkg-pr-new": "^0.0.50",
     "prettier": "^3.5.3",
-    "tsdown": "^0.10.2",
+    "tsdown": "^0.12.1",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.31.1",
-    "vitest": "^3.1.2"
+    "typescript-eslint": "^8.32.1",
+    "vitest": "^3.1.4"
   },
   "prettier": "@kazupon/prettier-config",
   "lint-staged": {
@@ -126,6 +127,6 @@
     "test": "vitest run",
     "typecheck": "pnpm run --parallel --color \"/^typecheck:/\"",
     "typecheck:deno": "deno check src",
-    "typecheck:tsc": "tsc --noEmit"
+    "typecheck:tsc": "tsgo --noEmit"
   }
 }