@gunshi/bone 0.37.0 → 0.37.2

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/parser-DT7Ztcch.d.ts
+//#region ../../node_modules/.pnpm/args-tokens@0.28.2/node_modules/args-tokens/lib/parser-DT7Ztcch.d.ts
 //#region src/parser.d.ts
 /**
  * Entry point of argument parser.
@@ -55,7 +55,7 @@ interface ArgToken {
  * Parser Options.
  */
 //#endregion
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/resolver.d.ts
+//#region ../../node_modules/.pnpm/args-tokens@0.28.2/node_modules/args-tokens/lib/resolver.d.ts
 //#region src/resolver.d.ts
 /**
  * An argument schema definition for command-line argument parsing.
@@ -548,7 +548,7 @@ type ResolveOptionValue<A extends ArgSchema, T> = A['multiple'] extends true ? T
  *
  * @internal
  */
-type ResolveArgValues<A extends Args, V extends Record<keyof A, unknown>> = { -readonly [Arg in keyof A]?: V[Arg] } & FilterArgs<A, V, 'default'> & FilterArgs<A, V, 'required'> & FilterPositionalArgs<A, V> extends infer P ? { [K in keyof P]: P[K] } : never;
+type ResolveArgValues<A extends Args, V extends Record<keyof A, unknown>> = { -readonly [Arg in keyof A]?: V[Arg] } & FilterArgs<A, V, 'default'> & FilterArgs<A, V, 'required'> & FilterPositionalArgs<A, V> extends (infer P) ? { [K in keyof P]: P[K] } : never;
 /**
  * Filters the arguments based on their default values.
  *

package/lib/index.js

@@ -1,4 +1,4 @@
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/parser.js
+//#region ../../node_modules/.pnpm/args-tokens@0.28.2/node_modules/args-tokens/lib/parser.js
 /**
 * forked from `nodejs/node` (`pkgjs/parseargs`)
 * repository url: https://github.com/nodejs/node (https://github.com/pkgjs/parseargs)
@@ -203,7 +203,7 @@ function hasOptionValue(value) {
 	return !(value == null) && value.codePointAt(0) !== HYPHEN_CODE;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/utils.js
+//#region ../../node_modules/.pnpm/args-tokens@0.28.2/node_modules/args-tokens/lib/utils.js
 /**
 * Entry point of utils.
 *
@@ -234,7 +234,7 @@ function formatChoices(choices) {
 	return choices.map((value) => JSON.stringify(value)).join(", ");
 }
 //#endregion
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/resolver.js
+//#region ../../node_modules/.pnpm/args-tokens@0.28.2/node_modules/args-tokens/lib/resolver.js
 /**
 * Entry point of argument options resolver.
 *
@@ -336,9 +336,17 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 	const rest = [];
 	const optionTokens = [];
 	const positionalTokens = [];
+	const argEntries = Object.entries(args);
 	let currentLongOption;
 	let currentShortOption;
 	const expandableShortOptions = [];
+	function getOptionName(rawArg, schema) {
+		return toKebab || schema.toKebab ? kebabnize(rawArg) : rawArg;
+	}
+	function checkLongTokenName(option, schema, token) {
+		if (token.rawName == void 0 || !hasLongOptionPrefix(token.rawName)) return false;
+		return token.name === option || schema.type === "boolean" && schema.negatable === true && token.name === `no-${option}`;
+	}
 	function toShortValue() {
 		if (expandableShortOptions.length === 0) return;
 		else {
@@ -366,6 +374,13 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 	* separate tokens into positionals, long and short options, after that resolve values
 	*/
 	const schemas = Object.values(args);
+	const booleanLongOptionNames = /* @__PURE__ */ new Set();
+	for (const [rawArg, schema] of Object.entries(args)) {
+		if (schema.type !== "boolean") continue;
+		const arg = toKebab || schema.toKebab ? kebabnize(rawArg) : rawArg;
+		booleanLongOptionNames.add(arg);
+		if (schema.negatable === true) booleanLongOptionNames.add(`no-${arg}`);
+	}
 	let terminated = false;
 	for (let i = 0; i < tokens.length; i++) {
 		const token = tokens[i];
@@ -374,46 +389,52 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 				rest.push(token.value);
 				continue;
 			}
-			if (currentShortOption) if (schemas.find((schema) => schema.short === currentShortOption.name && schema.type === "boolean")) {
-				positionalTokens.push({ ...token });
-				applyShortOptionValue();
-			} else applyShortOptionValue(token.value);
-			else if (currentLongOption) if (args[currentLongOption.name]?.type === "boolean") {
-				positionalTokens.push({ ...token });
-				applyLongOptionValue();
-			} else applyLongOptionValue(token.value);
-			else positionalTokens.push({ ...token });
-		} else if (token.kind === "option") if (token.rawName) {
-			if (hasLongOptionPrefix(token.rawName)) {
-				applyLongOptionValue();
-				if (token.inlineValue) optionTokens.push({ ...token });
-				else currentLongOption = { ...token };
-				applyShortOptionValue();
-			} else if (isShortOption(token.rawName)) if (currentShortOption) {
-				if (currentShortOption.index === token.index) if (shortGrouping) {
+			if (currentShortOption) {
+				if (schemas.find((schema) => schema.short === currentShortOption.name && schema.type === "boolean")) {
+					positionalTokens.push({ ...token });
+					applyShortOptionValue();
+				} else applyShortOptionValue(token.value);
+			} else if (currentLongOption) {
+				if (booleanLongOptionNames.has(currentLongOption.name)) {
+					positionalTokens.push({ ...token });
+					applyLongOptionValue();
+				} else applyLongOptionValue(token.value);
+			} else positionalTokens.push({ ...token });
+		} else if (token.kind === "option") {
+			if (token.rawName) {
+				if (hasLongOptionPrefix(token.rawName)) {
+					applyLongOptionValue();
+					if (token.inlineValue) optionTokens.push({ ...token });
+					else currentLongOption = { ...token };
+					applyShortOptionValue();
+				} else if (isShortOption(token.rawName)) {
+					if (currentShortOption) {
+						if (currentShortOption.index === token.index) {
+							if (shortGrouping) {
+								currentShortOption.value = token.value;
+								optionTokens.push({ ...currentShortOption });
+								currentShortOption = { ...token };
+							} else expandableShortOptions.push({ ...token });
+						} else {
+							currentShortOption.value = toShortValue();
+							optionTokens.push({ ...currentShortOption });
+							currentShortOption = { ...token };
+						}
+						applyLongOptionValue();
+					} else {
+						currentShortOption = { ...token };
+						applyLongOptionValue();
+					}
+				}
+			} else {
+				if (currentShortOption && currentShortOption.index == token.index && token.inlineValue) {
 					currentShortOption.value = token.value;
 					optionTokens.push({ ...currentShortOption });
-					currentShortOption = { ...token };
-				} else expandableShortOptions.push({ ...token });
-				else {
-					currentShortOption.value = toShortValue();
-					optionTokens.push({ ...currentShortOption });
-					currentShortOption = { ...token };
+					currentShortOption = void 0;
 				}
 				applyLongOptionValue();
-			} else {
-				currentShortOption = { ...token };
-				applyLongOptionValue();
 			}
 		} else {
-			if (currentShortOption && currentShortOption.index == token.index && token.inlineValue) {
-				currentShortOption.value = token.value;
-				optionTokens.push({ ...currentShortOption });
-				currentShortOption = void 0;
-			}
-			applyLongOptionValue();
-		}
-		else {
 			if (token.kind === "option-terminator") terminated = true;
 			applyLongOptionValue();
 			applyShortOptionValue();
@@ -431,11 +452,7 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 	const errors = [];
 	const explicit = Object.create(null);
 	const actualInputNames = /* @__PURE__ */ new Map();
-	const argEntries = Object.entries(args);
 	let requiredPositionalsAfter;
-	function checkTokenName(option, schema, token) {
-		return token.name === (schema.type === "boolean" ? schema.negatable && token.name?.startsWith("no-") ? `no-${option}` : option : option);
-	}
 	const positionalItemCount = tokens.filter((token) => token.kind === "positional").length;
 	function getPositionalSkipIndex() {
 		return Math.min(skipPositionalIndex, positionalItemCount);
@@ -446,7 +463,7 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 	}
 	let positionalsCount = 0;
 	for (const [rawArg, schema] of argEntries) {
-		const arg = toKebab || schema.toKebab ? kebabnize(rawArg) : rawArg;
+		const arg = getOptionName(rawArg, schema);
 		explicit[rawArg] = false;
 		if (schema.type === "positional") {
 			if (skipPositionalIndex > SKIP_POSITIONAL_DEFAULT) while (positionalsCount <= getPositionalSkipIndex()) positionalsCount++;
@@ -500,7 +517,7 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 		}
 		if (schema.required) {
 			if (!optionTokens.find((token) => {
-				return schema.short && token.name === schema.short || token.rawName && hasLongOptionPrefix(token.rawName) && token.name === arg;
+				return schema.short && token.name === schema.short && token.rawName != void 0 && isShortOption(token.rawName) || checkLongTokenName(arg, schema, token);
 			})) {
 				errors.push(createRequireError(rawArg, arg, schema));
 				continue;
@@ -508,14 +525,15 @@ function resolveArgs(args, tokens, { shortGrouping = false, skipPositional = SKI
 		}
 		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)) {
+			if (checkLongTokenName(arg, schema, token) || schema.short === token.name && token.rawName != void 0 && isShortOption(token.rawName)) {
 				const invalid = validateRequire(token, rawArg, arg, schema);
 				if (invalid) {
 					errors.push(invalid);
 					continue;
 				}
 				explicit[rawArg] = true;
-				const actualInputName = isShortOption(token.rawName) ? `-${token.name}` : `--${arg}`;
+				const rawName = token.rawName;
+				const actualInputName = isShortOption(rawName) ? `-${token.name}` : rawName;
 				actualInputNames.set(rawArg, actualInputName);
 				const [parsedValue, error] = parse(token, rawArg, arg, schema);
 				if (error) errors.push(error);
@@ -708,7 +726,7 @@ function checkConflicts(args, explicit, toKebab, actualInputNames) {
 	return [];
 }
 //#endregion
-//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/index.js
+//#region ../../node_modules/.pnpm/args-tokens@0.28.2/node_modules/args-tokens/lib/index.js
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)
 * @license MIT
@@ -1354,27 +1372,28 @@ function getPositionalTokens(tokens) {
 function resolveCommandTree(tokens, entry, options) {
 	const positionals = getPositionalTokens(tokens);
 	function resolveAsEntry() {
-		if (typeof entry === "function") if ("commandName" in entry && entry.commandName) return {
-			commandName: entry.commandName,
-			command: entry,
-			callMode: "entry",
-			commandPath: [],
-			depth: 0,
-			omitted: options.subCommands.size > 0 && !positionals[0],
-			levelSubCommands: options.subCommands.size > 0 ? options.subCommands : void 0
-		};
-		else return {
-			command: {
-				run: entry,
-				entry: true
-			},
-			callMode: "entry",
-			commandPath: [],
-			depth: 0,
-			omitted: options.subCommands.size > 0 && !positionals[0],
-			levelSubCommands: options.subCommands.size > 0 ? options.subCommands : void 0
-		};
-		else if (typeof entry === "object") return {
+		if (typeof entry === "function") {
+			if ("commandName" in entry && entry.commandName) return {
+				commandName: entry.commandName,
+				command: entry,
+				callMode: "entry",
+				commandPath: [],
+				depth: 0,
+				omitted: options.subCommands.size > 0 && !positionals[0],
+				levelSubCommands: options.subCommands.size > 0 ? options.subCommands : void 0
+			};
+			else return {
+				command: {
+					run: entry,
+					entry: true
+				},
+				callMode: "entry",
+				commandPath: [],
+				depth: 0,
+				omitted: options.subCommands.size > 0 && !positionals[0],
+				levelSubCommands: options.subCommands.size > 0 ? options.subCommands : void 0
+			};
+		} else if (typeof entry === "object") return {
 			commandName: resolveEntryName(entry),
 			command: entry,
 			callMode: "entry",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gunshi/bone",
   "description": "gunshi minimum",
-  "version": "0.37.0",
+  "version": "0.37.2",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -56,10 +56,10 @@
     "jsr-exports-lint": "^0.4.2",
     "publint": "^0.3.20",
     "tsdown": "0.21.0",
-    "@gunshi/definition": "0.37.0",
-    "@gunshi/plugin-global": "0.37.0",
-    "@gunshi/plugin-renderer": "0.37.0",
-    "gunshi": "0.37.0"
+    "@gunshi/plugin-global": "0.37.2",
+    "@gunshi/definition": "0.37.2",
+    "@gunshi/plugin-renderer": "0.37.2",
+    "gunshi": "0.37.2"
   },
   "scripts": {
     "build": "tsdown",