@gunshi/shared 1.0.0-beta.1 → 1.0.0-beta.2

package/lib/index.d.ts

@@ -1285,19 +1285,6 @@ declare function resolveLazyCommand<G extends GunshiParamsConstraint = DefaultGu
  * @returns A new object with the specified prototype
  */
 declare function create<T>(obj?: object | null): T;
-/**
- * Resolve the arguments of a command, the way gunshi parses and renders them.
- *
- * The global options belong to no command definition, so they are merged into the arguments of the
- * command that runs. An argument of the command shadows the global option of the same name, and it
- * shadows the same way by short name: a global option gives up its short name to an argument of the
- * command that claims the same letter, and keeps its long name.
- *
- * @param globalOptions - The global options that plugins registered with `addGlobalOption`
- * @param args - The arguments that the command declares
- * @returns The merged arguments
- */
-declare function resolveCommandArgs<A extends Args = Args>(globalOptions?: ReadonlyMap<string, ArgSchema>, args?: A): A;
 /**
  * Log a message to the console.
  *
@@ -1591,5 +1578,22 @@ declare function resolveDisplayName(name: string, schema: ArgSchema, toKebab?: b
  * @returns The set of names.
  */
 declare function resolveOptionNames(args: Args, toKebab?: boolean): Set<string>;
+/**
+ * Resolve the arguments of a command, the way gunshi parses and renders them.
+ *
+ * The global options belong to no command definition, so they are merged into the arguments of the
+ * command. An argument of the command shadows the global option of the same name, and it shadows the
+ * same way by short name: a global option gives up its short name to an argument of the command that
+ * claims the same letter, and keeps its long name.
+ *
+ * NOTE(kazupon): a copy of the function that the core of gunshi resolves the arguments with. The
+ * core does not export its own, to keep it out of the public API. `@gunshi/plugin-completion`
+ * completes the arguments with this copy, and the tests pin it to the results of the core.
+ *
+ * @param globalOptions - The global options that plugins registered with `addGlobalOption`.
+ * @param args - The {@linkcode Args | arguments} that the command declares.
+ * @returns The merged arguments.
+ */
+declare function resolveCommandArgs<A extends Args = Args>(globalOptions?: ReadonlyMap<string, ArgSchema>, args?: A): A;
 //#endregion
 export { ARG_ERROR_HINT_RESOURCE_KEYS, ARG_ERROR_RESOURCE_KEYS, ARG_NEGATABLE_PREFIX, ARG_PREFIX, ARG_PREFIX_AND_KEY_SEPARATOR, type ArgErrorHintResourceKeys, type ArgErrorResourceKeys, BUILD_IN_PREFIX_AND_KEY_SEPARATOR, BUILT_IN_KEY_SEPARATOR, BUILT_IN_PREFIX, type BuiltinResource, type BuiltinResourceKeys, COMMAND_BUILTIN_RESOURCE_KEYS, COMMAND_ERROR_RESOURCE_KEYS, COMMON_ARGS, type CommandArgKeys, type CommandBuiltinArgsKeys, type CommandBuiltinKeys, type CommandBuiltinResourceKeys, type CommandErrorResourceKeys, type DeepWriteable, _exports as DefaultResource, ERROR_PREFIX, ERROR_PREFIX_AND_KEY_SEPARATOR, type ErrorResourceKeys, type GenerateNamespacedKey, type KeyOfArgs, Localization, PLUGIN_PREFIX, type RemovedIndex, type ResolveTranslationKeys, SUGGESTION_ERROR_RESOURCE_KEYS, type SuggestionErrorResourceKeys, type Translation, create, deepFreeze, formatResource, getCommandSubCommands, isLazyCommand, kebabnize, localizable, log, makeShortLongOptionPair, namespacedId, resolveArgKey, resolveBuiltInKey, resolveCommandArgs, resolveDisplayName, resolveExamples, resolveKey, resolveLazyCommand, resolveOptionNames };

package/lib/index.js

@@ -101,37 +101,6 @@ function create(obj = null) {
 	return Object.create(obj);
 }
 /**
-* Resolve the arguments of a command, the way gunshi parses and renders them.
-*
-* The global options belong to no command definition, so they are merged into the arguments of the
-* command that runs. An argument of the command shadows the global option of the same name, and it
-* shadows the same way by short name: a global option gives up its short name to an argument of the
-* command that claims the same letter, and keeps its long name.
-*
-* @param globalOptions - The global options that plugins registered with `addGlobalOption`
-* @param args - The arguments that the command declares
-* @returns The merged arguments
-*/
-function resolveCommandArgs(globalOptions, args) {
-	return Object.assign(create(), resolveGlobalOptions(globalOptions, args), args);
-}
-function resolveGlobalOptions(globalOptions, args) {
-	if (!globalOptions) return;
-	const shortNames = /* @__PURE__ */ new Set();
-	for (const schema of Object.values(args || {})) if (schema.type !== "positional" && schema.short) shortNames.add(schema.short);
-	const resolved = create();
-	for (const [name, schema] of globalOptions)
- /**
-	* NOTE(kazupon): a copy, because the schema is the one that the plugin registered, which every
-	* command of the CLI shares. Only this command gives up the short name.
-	*/
-	resolved[name] = schema.short && shortNames.has(schema.short) ? {
-		...schema,
-		short: void 0
-	} : schema;
-	return resolved;
-}
-/**
 * Log a message to the console.
 *
 * @param args - Arguments to log
@@ -376,6 +345,41 @@ function resolveOptionNames(args, toKebab) {
 	for (const [name, schema] of Object.entries(args)) if (schema.type !== "positional") names.add(resolveDisplayName(name, schema, toKebab));
 	return names;
 }
+/**
+* Resolve the arguments of a command, the way gunshi parses and renders them.
+*
+* The global options belong to no command definition, so they are merged into the arguments of the
+* command. An argument of the command shadows the global option of the same name, and it shadows the
+* same way by short name: a global option gives up its short name to an argument of the command that
+* claims the same letter, and keeps its long name.
+*
+* NOTE(kazupon): a copy of the function that the core of gunshi resolves the arguments with. The
+* core does not export its own, to keep it out of the public API. `@gunshi/plugin-completion`
+* completes the arguments with this copy, and the tests pin it to the results of the core.
+*
+* @param globalOptions - The global options that plugins registered with `addGlobalOption`.
+* @param args - The {@linkcode Args | arguments} that the command declares.
+* @returns The merged arguments.
+*/
+function resolveCommandArgs(globalOptions, args) {
+	return Object.assign(create(), resolveGlobalOptions(globalOptions, args), args);
+}
+function resolveGlobalOptions(globalOptions, args) {
+	if (!globalOptions) return;
+	const shortNames = /* @__PURE__ */ new Set();
+	for (const schema of Object.values(args || {})) if (schema.type !== "positional" && schema.short) shortNames.add(schema.short);
+	const resolved = create();
+	for (const [name, schema] of globalOptions)
+ /**
+	* NOTE(kazupon): a copy, because the schema is the one that the plugin registered, which every
+	* command of the CLI shares. Only this command gives up the short name.
+	*/
+	resolved[name] = schema.short && shortNames.has(schema.short) ? {
+		...schema,
+		short: void 0
+	} : schema;
+	return resolved;
+}
 //#endregion
 //#region src/localization.ts
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gunshi/shared",
   "description": "shared utils for gunshi",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -50,9 +50,9 @@
     }
   },
   "devDependencies": {
-    "@gunshi/resources": "1.0.0-beta.1",
+    "@gunshi/resources": "1.0.0-beta.2",
     "deno": "^2.7.14",
-    "gunshi": "1.0.0-beta.1",
+    "gunshi": "1.0.0-beta.2",
     "jsr": "^0.14.3",
     "jsr-exports-lint": "^0.4.2",
     "publint": "^0.3.20",