args-tokens 0.17.1 → 0.19.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-COGeGqd3.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-DuUwC6Fy.js";
+import { ArgResolveError, resolveArgs } from "./resolver-Df1uPA8Z.js";
 
 //#region src/parse.ts
 const DEFAULT_OPTIONS = {

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

@@ -5,27 +5,25 @@ 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.
+* - `type` is not only 'string' and 'boolean', but also 'number', 'enum', 'positional', 'custom' too.
 * - `default` property type, not support multiple types
 */
 /**
 * 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.
+* - `type` is not only 'string' and 'boolean', but also 'number', 'enum', 'positional', 'custom' too.
 * - `default` property type, not support multiple types
 */
 interface ArgSchema {
   /**
   * Type of argument.
   */
-  type: "string" | "boolean" | "number" | "enum" | "positional";
+  type: "string" | "boolean" | "number" | "enum" | "positional" | "custom";
   /**
-  * A single character alias for the option.
+  * A single character alias for the argument.
   */
   short?: string;
   /**
@@ -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;
@@ -49,6 +51,19 @@ interface ArgSchema {
   * if the type is 'enum', the default value must be one of the allowed values.
   */
   default?: string | boolean | number;
+  /**
+  * Whether to convert the argument name to kebab-case.
+  */
+  toKebab?: true;
+  /**
+  * A function to parse the value of the argument. if the type is 'custom', this function is required.
+  * If argument value will be invalid, this function have to throw an error.
+  * @param value
+  * @returns Parsed value
+  * @throws An Error, If the value is invalid. Error type should be `Error` or extends it
+  */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  parse?: (value: string) => any;
 }
 /**
 * An object that contains {@link ArgSchema | argument schema}.
@@ -60,12 +75,15 @@ 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;
 };
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type IsFunction<T> = T extends ((...args: any[]) => any) ? true : false;
 /**
 * @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 : A["type"] extends "custom" ? IsFunction<A["parse"]> extends true ? ResolveOptionValue<A, ReturnType<NonNullable<A["parse"]>>> : never : ResolveOptionValue<A, string | boolean | number>;
+type ResolveOptionValue<A extends ArgSchema, T> = A["multiple"] extends true ? T[] : T;
 /**
 * @internal
 */
@@ -79,16 +97,21 @@ type FilterArgs<A extends Args, V extends Record<keyof A, unknown>, K extends ke
 */
 interface ResolveArgs {
   /**
-  * Whether to group short options.
+  * Whether to group short arguments.
   * @default false
   * @see guideline 5 in https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/V1_chap12.html
   */
-  optionGrouping?: boolean;
+  shortGrouping?: boolean;
   /**
   * Skip positional arguments index.
   * @default -1
   */
   skipPositional?: number;
+  /**
+  * Whether to convert the argument name to kebab-case. This option is applied to all arguments as `toKebab: true`, if set to `true`.
+  * @default false
+  */
+  toKebab?: boolean;
 }
 /**
 * Resolve command line arguments.
@@ -98,8 +121,9 @@ interface ResolveArgs {
 * @returns An object that contains the values of the arguments, positional arguments, rest arguments, and {@link AggregateError | validation errors}.
 */
 declare function resolveArgs<A extends Args>(args: A, tokens: ArgToken[], {
-  optionGrouping,
-  skipPositional
+  shortGrouping,
+  skipPositional,
+  toKebab
 }?: ResolveArgs): {
   values: ArgValues<A>;
   positionals: string[];

package/lib/{resolver-DuUwC6Fy.js → resolver-Df1uPA8Z.js}

@@ -2,6 +2,9 @@ import { hasLongOptionPrefix, isShortOption } from "./parser-Dr4iAGaX.js";
 
 //#region src/resolver.ts
 const SKIP_POSITIONAL_DEFAULT = -1;
+function kebabnize(str) {
+	return str.replace(/[A-Z]/g, (match, offset) => (offset > 0 ? "-" : "") + match.toLowerCase());
+}
 /**
 * Resolve command line arguments.
 * @param args - An arguments that contains {@link ArgSchema | arguments schema}.
@@ -9,11 +12,10 @@ const SKIP_POSITIONAL_DEFAULT = -1;
 * @param resolveArgs - An arguments that contains {@link ResolveArgs | resolve arguments}.
 * @returns An object that contains the values of the arguments, positional arguments, rest arguments, and {@link AggregateError | validation errors}.
 */
-function resolveArgs(args, tokens, { optionGrouping = false, skipPositional = SKIP_POSITIONAL_DEFAULT } = {}) {
+function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKIP_POSITIONAL_DEFAULT, toKebab = false } = {}) {
 	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 +31,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 +67,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) {
+				if (currentShortOption.index === token.index) if (shortGrouping) {
 					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 +89,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();
@@ -116,63 +118,43 @@ function resolveArgs(args, tokens, { optionGrouping = false, skipPositional = SK
 		return Math.min(skipPositionalIndex, positionalItemCount);
 	}
 	let positionalsCount = 0;
-	for (const [option, schema] of Object.entries(args)) {
+	for (const [rawArg, schema] of Object.entries(args)) {
+		const arg = toKebab || schema.toKebab ? kebabnize(rawArg) : rawArg;
 		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 === arg;
+			});
 			if (!found) {
-				errors.push(createRequireError(option, schema));
+				errors.push(createRequireError(arg, schema));
 				continue;
 			}
 		}
 		if (schema.type === "positional") {
 			if (skipPositionalIndex > SKIP_POSITIONAL_DEFAULT) while (positionalsCount <= getPositionalSkipIndex()) positionalsCount++;
 			const positional = positionalTokens[positionalsCount];
-			if (positional != null) values[option] = positional.value;
-			else errors.push(createRequireError(option, schema));
+			if (positional != null) values[rawArg] = positional.value;
+			else errors.push(createRequireError(arg, schema));
 			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)) {
-				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);
-				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);
+		for (let i = 0; i < optionTokens.length; i++) {
+			const token = optionTokens[i];
+			if (checkTokenName(arg, schema, token) && token.rawName != void 0 && hasLongOptionPrefix(token.rawName) || schema.short === token.name && token.rawName != void 0 && isShortOption(token.rawName)) {
+				const invalid = validateRequire(token, arg, 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);
-				continue;
+				const [parsedValue, error] = parse(token, arg, schema);
+				if (error) errors.push(error);
+				else if (schema.multiple) {
+					values[rawArg] ||= [];
+					values[rawArg].push(parsedValue);
+				} else values[rawArg] = parsedValue;
 			}
 		}
-		if (values[option] == null && schema.default != null) values[option] = schema.default;
+		if (values[rawArg] == null && schema.default != null) values[rawArg] = schema.default;
 	}
 	return {
 		values,
@@ -181,6 +163,29 @@ function resolveArgs(args, tokens, { optionGrouping = false, skipPositional = SK
 		error: errors.length > 0 ? new AggregateError(errors) : void 0
 	};
 }
+function parse(token, option, schema) {
+	switch (schema.type) {
+		case "string": return typeof token.value === "string" ? [token.value || schema.default, void 0] : [void 0, createTypeError(option, schema)];
+		case "boolean": return token.value ? [token.value || schema.default, void 0] : [!(schema.negatable && token.name.startsWith("no-")), void 0];
+		case "number": {
+			if (!isNumeric(token.value)) return [void 0, createTypeError(option, schema)];
+			return token.value ? [+token.value, void 0] : [+(schema.default || ""), void 0];
+		}
+		case "enum": {
+			if (schema.choices && !schema.choices.includes(token.value)) return [void 0, 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)];
+			return [token.value || schema.default, void 0];
+		}
+		case "custom": {
+			if (typeof schema.parse !== "function") throw new TypeError(`argument '${option}' should have a 'parse' function`);
+			try {
+				return [schema.parse(token.value || String(schema.default || "")), void 0];
+			} catch (error) {
+				return [void 0, error];
+			}
+		}
+		default: throw new Error(`Unsupported argument type '${schema.type}' for option '${option}'`);
+	}
+}
 function createRequireError(option, schema) {
 	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);
@@ -203,33 +208,12 @@ var ArgResolveError = class extends Error {
 function validateRequire(token, option, schema) {
 	if (schema.required && schema.type !== "boolean" && !token.value) return createRequireError(option, schema);
 }
-function validateValue(token, option, schema) {
-	switch (schema.type) {
-		case "number": {
-			if (!isNumeric(token.value)) return createTypeError(option, schema);
-			break;
-		}
-		case "string": {
-			if (typeof token.value !== "string") return createTypeError(option, schema);
-			break;
-		}
-		case "enum": {
-			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;
-		}
-	}
-}
 function isNumeric(str) {
 	return str.trim() !== "" && !isNaN(str);
 }
 function createTypeError(option, 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;
-	if (schema.type === "boolean") return schema.negatable && token.name.startsWith("no-") ? false : true;
-	return schema.type === "number" ? +(schema.default || "") : schema.default;
-}
 
 //#endregion
 export { ArgResolveError, resolveArgs };

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-COGeGqd3.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-DuUwC6Fy.js";
+import { ArgResolveError, resolveArgs } from "./resolver-Df1uPA8Z.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.1",
+  "version": "0.19.0",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -68,29 +68,31 @@
     "@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.20250525.1",
+    "@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",
+    "zod": "^3.25.28"
   },
   "prettier": "@kazupon/prettier-config",
   "lint-staged": {
@@ -123,9 +125,9 @@
     "lint:knip": "knip",
     "lint:prettier": "prettier . --check",
     "release": "bumpp --commit \"release: v%s\" --all --push --tag",
-    "test": "vitest run",
+    "test": "vitest run --typecheck",
     "typecheck": "pnpm run --parallel --color \"/^typecheck:/\"",
     "typecheck:deno": "deno check src",
-    "typecheck:tsc": "tsc --noEmit"
+    "typecheck:tsc": "tsgo --noEmit"
   }
 }