@gunshi/definition 0.31.0 → 0.33.0

package/lib/index.d.ts

@@ -581,15 +581,6 @@ type ArgExplicitlyProvided<A extends Args> = { [K in keyof A]: boolean };
  */
 //#endregion
 //#region ../gunshi/src/plugin/context.d.ts
-/**
- * Type helper to create GunshiParams from extracted args and extensions
- *
- * @internal
- */
-type ExtractedParams<G extends GunshiParamsConstraint, L extends Record<string, unknown> = {}> = {
-  args: ExtractArgs<G>;
-  extensions: ExtractExtensions$1<G> & L;
-};
 /**
  * Gunshi plugin context interface.
  *
@@ -638,7 +629,7 @@ interface PluginContext<G extends GunshiParamsConstraint = DefaultGunshiParams>
    *
    * @param decorator - A decorator function that wraps the base header renderer.
    */
-  decorateHeaderRenderer<L extends Record<string, unknown> = DefaultGunshiParams['extensions']>(decorator: (baseRenderer: (ctx: Readonly<CommandContext<ExtractedParams<G, L>>>) => Promise<string>, ctx: Readonly<CommandContext<ExtractedParams<G, L>>>) => Promise<string>): void;
+  decorateHeaderRenderer<L extends Record<string, unknown> = DefaultGunshiParams['extensions']>(decorator: (baseRenderer: (ctx: Readonly<CommandContext<MergeGunshiExtensions<G, L>>>) => Promise<string>, ctx: Readonly<CommandContext<MergeGunshiExtensions<G, L>>>) => Promise<string>): void;
   /**
    * Decorate the usage renderer.
    *
@@ -646,7 +637,7 @@ interface PluginContext<G extends GunshiParamsConstraint = DefaultGunshiParams>
    *
    * @param decorator - A decorator function that wraps the base usage renderer.
    */
-  decorateUsageRenderer<L extends Record<string, unknown> = DefaultGunshiParams['extensions']>(decorator: (baseRenderer: (ctx: Readonly<CommandContext<ExtractedParams<G, L>>>) => Promise<string>, ctx: Readonly<CommandContext<ExtractedParams<G, L>>>) => Promise<string>): void;
+  decorateUsageRenderer<L extends Record<string, unknown> = DefaultGunshiParams['extensions']>(decorator: (baseRenderer: (ctx: Readonly<CommandContext<MergeGunshiExtensions<G, L>>>) => Promise<string>, ctx: Readonly<CommandContext<MergeGunshiExtensions<G, L>>>) => Promise<string>): void;
   /**
    * Decorate the validation errors renderer.
    *
@@ -654,7 +645,7 @@ interface PluginContext<G extends GunshiParamsConstraint = DefaultGunshiParams>
    *
    * @param decorator - A decorator function that wraps the base validation errors renderer.
    */
-  decorateValidationErrorsRenderer<L extends Record<string, unknown> = DefaultGunshiParams['extensions']>(decorator: (baseRenderer: (ctx: Readonly<CommandContext<ExtractedParams<G, L>>>, error: AggregateError) => Promise<string>, ctx: Readonly<CommandContext<ExtractedParams<G, L>>>, error: AggregateError) => Promise<string>): void;
+  decorateValidationErrorsRenderer<L extends Record<string, unknown> = DefaultGunshiParams['extensions']>(decorator: (baseRenderer: (ctx: Readonly<CommandContext<MergeGunshiExtensions<G, L>>>, error: AggregateError) => Promise<string>, ctx: Readonly<CommandContext<MergeGunshiExtensions<G, L>>>, error: AggregateError) => Promise<string>): void;
   /**
    * Decorate the command execution.
    *
@@ -664,7 +655,7 @@ interface PluginContext<G extends GunshiParamsConstraint = DefaultGunshiParams>
    *
    * @param decorator - A decorator function that wraps the command runner
    */
-  decorateCommand<L extends Record<string, unknown> = DefaultGunshiParams['extensions']>(decorator: (baseRunner: (ctx: Readonly<CommandContext<ExtractedParams<G, L>>>) => Awaitable<void | string>) => (ctx: Readonly<CommandContext<ExtractedParams<G, L>>>) => Awaitable<void | string>): void;
+  decorateCommand<L extends Record<string, unknown> = DefaultGunshiParams['extensions']>(decorator: (baseRunner: (ctx: Readonly<CommandContext<MergeGunshiExtensions<G, L>>>) => Awaitable<void | string>) => (ctx: Readonly<CommandContext<MergeGunshiExtensions<G, L>>>) => Awaitable<void | string>): void;
 }
 //#endregion
 //#region ../gunshi/src/plugin/core.d.ts
@@ -798,9 +789,46 @@ type ExtractArgExplicitlyProvided<G> = ArgExplicitlyProvided<ExtractArgs<G>>;
  *
  * @internal
  */
-type ExtractExtensions$1<G> = G extends GunshiParams<any> ? G['extensions'] : G extends {
+type ExtractExtensions<G> = G extends GunshiParams<any> ? G['extensions'] : G extends {
   extensions: infer E;
 } ? E : {};
+/**
+ * Type helper to normalize G to GunshiParams
+ *
+ * @internal
+ */
+type NormalizeToGunshiParams<G> = G extends GunshiParams<any> ? G : G extends {
+  args: infer A extends Args;
+  extensions: infer E extends ExtendContext;
+} ? GunshiParams<{
+  args: A;
+  extensions: E;
+}> : G extends {
+  args: infer A extends Args;
+} ? GunshiParams<{
+  args: A;
+  extensions: {};
+}> : G extends {
+  extensions: infer E extends ExtendContext;
+} ? GunshiParams<{
+  args: Args;
+  extensions: E;
+}> : DefaultGunshiParams;
+/**
+ * Type helper to merge command context extensions into G
+ *
+ * @internal
+ */
+type MergeGunshiExtensions<G extends GunshiParamsConstraint, E extends ExtendContext> = GunshiParams<{
+  /**
+   * Command argument definitions.
+   */
+  args: ExtractArgs<G>;
+  /**
+   * Merged command context extensions.
+   */
+  extensions: ExtractExtensions<G> & E;
+}>;
 /**
  * Command environment.
  *
@@ -1106,7 +1134,7 @@ interface CommandContext<G extends GunshiParamsConstraint = DefaultGunshiParams>
    *
    * @since v0.27.0
    */
-  extensions: keyof ExtractExtensions$1<G> extends never ? any : ExtractExtensions$1<G>;
+  extensions: keyof ExtractExtensions<G> extends never ? any : ExtractExtensions<G>;
   /**
    * Validation error from argument parsing.
    * This will be set if argument validation fails during CLI execution.
@@ -1114,7 +1142,7 @@ interface CommandContext<G extends GunshiParamsConstraint = DefaultGunshiParams>
   validationError?: AggregateError;
 }
 /**
- * CommandContextCore type (base type without extensions)
+ * Readonly command context available to a command context extension factory.
  *
  * @typeParam G - A type extending {@linkcode GunshiParams} to specify the shape of command context.
  *
@@ -1355,7 +1383,16 @@ type CommandLoader<G extends GunshiParamsConstraint = DefaultGunshiParams> = ()
  *
  * @internal
  */
-type ExtractExtensions<E extends Record<string, CommandContextExtension>> = { [K in keyof E]: E[K] extends CommandContextExtension<infer T> ? T : never };
+type ExtractExtensionValues<E extends Record<string, CommandContextExtension>> = { [K in keyof E]: E[K] extends CommandContextExtension<infer T> ? T : never };
+/**
+ * Return type of {@link createCommandContext}
+ *
+ * @internal
+ */
+type CommandContextResult<G extends GunshiParamsConstraint, E extends Record<string, CommandContextExtension>> = {} extends ExtractExtensionValues<E> ? Readonly<CommandContext<G>> : Readonly<CommandContext<GunshiParams<{
+  args: ExtractArgs<G>;
+  extensions: ExtractExtensionValues<E>;
+}>>>;
 /**
  * Parameters of {@link createCommandContext}
  */
@@ -1442,24 +1479,27 @@ declare function createCommandContext<G extends GunshiParamsConstraint = Default
   commandPath,
   omitted,
   validationError
-}: CommandContextParams<G, V, C, E>): Promise<{} extends ExtractExtensions<E> ? Readonly<CommandContext<G>> : Readonly<CommandContext<GunshiParams<{
-  args: ExtractArgs<G>;
-  extensions: ExtractExtensions<E>;
-}>>>>;
+}: CommandContextParams<G, V, C, E>): Promise<CommandContextResult<G, E>>;
 //#endregion
 //#region ../gunshi/src/definition.d.ts
 /**
- * Infer command properties excluding for {@link define} function
+ * The result type of the {@link define} function
  *
  * @internal
  */
-type InferCommandProps<G extends GunshiParamsConstraint = DefaultGunshiParams> = Pick<Command<G>, Exclude<keyof Command<G>, keyof Command<G>>>;
+type CommandDefinitionResult<G extends GunshiParamsConstraint = DefaultGunshiParams, C = {}> = Prettify<Pick<C, keyof C> & Partial<Pick<Command<G>, Exclude<keyof Command<G>, keyof C>>>>;
 /**
- * The result type of the {@link define} function
+ * The command definition accepted by {@link define} helpers.
  *
  * @internal
  */
-type CommandDefinitionResult<G extends GunshiParamsConstraint = DefaultGunshiParams, C extends Command<G> = Command<G>> = Prettify<Pick<C, keyof C> & Partial<Pick<Command<G>, Exclude<keyof Command<G>, keyof C>>>>;
+type CommandDefinition<A extends Args, E extends ExtendContext, C extends Partial<Command<{
+  args: A;
+  extensions: E;
+}>>> = C & Command<{
+  args: A;
+  extensions: E;
+}>;
 /**
  * Define a {@link Command | command}.
  *
@@ -1490,10 +1530,10 @@ type CommandDefinitionResult<G extends GunshiParamsConstraint = DefaultGunshiPar
  * @param definition - A {@link Command | command} definition
  * @returns A defined {@link Command | command}
  */
-declare function define<G extends GunshiParamsConstraint = DefaultGunshiParams, A extends Args = ExtractArgs<G>, C extends InferCommandProps<G> = InferCommandProps<G>>(definition: C & Command<{
+declare function define<G extends GunshiParamsConstraint = DefaultGunshiParams, A extends Args = ExtractArgs<G>, C extends Partial<Command<{
   args: A;
-  extensions: ExtractExtensions$1<G>;
-}>): CommandDefinitionResult<G, C>;
+  extensions: ExtractExtensions<G>;
+}>> = {}>(definition: CommandDefinition<A, ExtractExtensions<G>, C>): CommandDefinitionResult<G, C>;
 /**
  * Return type for defineWithTypes
  *
@@ -1504,10 +1544,7 @@ declare function define<G extends GunshiParamsConstraint = DefaultGunshiParams,
 type DefineWithTypesReturn<DefaultExtensions extends ExtendContext, DefaultArgs extends Args> = <A extends DefaultArgs = DefaultArgs, C extends Partial<Command<{
   args: A;
   extensions: DefaultExtensions;
-}>> = {}>(definition: C & Command<{
-  args: A;
-  extensions: DefaultExtensions;
-}>) => CommandDefinitionResult<{
+}>> = {}>(definition: CommandDefinition<A, DefaultExtensions, C>) => CommandDefinitionResult<{
   args: A;
   extensions: DefaultExtensions;
 }, C>;
@@ -1540,7 +1577,7 @@ type DefineWithTypesReturn<DefaultExtensions extends ExtendContext, DefaultArgs
  *
  * @since v0.27.0
  */
-declare function defineWithTypes<G extends GunshiParamsConstraint>(): DefineWithTypesReturn<ExtractExtensions$1<G>, ExtractArgs<G>>;
+declare function defineWithTypes<G extends GunshiParamsConstraint>(): DefineWithTypesReturn<ExtractExtensions<G>, ExtractArgs<G>>;
 /**
  * Define a {@link LazyCommand | lazy command}.
  *
@@ -1610,30 +1647,6 @@ declare function lazy<G extends GunshiParamsConstraint = DefaultGunshiParams, A
   args: A;
   extensions: {};
 }, D>;
-/**
- * Normalize G to a full GunshiParams type
- *
- * @typeParam G - A {@link GunshiParamsConstraint} type
- *
- * @internal
- */
-type NormalizeGunshiParams<G extends GunshiParamsConstraint> = G extends GunshiParams<any> ? G : G extends {
-  args: infer A;
-  extensions: infer E;
-} ? {
-  args: A;
-  extensions: E;
-} : G extends {
-  args: infer A;
-} ? {
-  args: A;
-  extensions: {};
-} : G extends {
-  extensions: infer E;
-} ? {
-  args: Args;
-  extensions: E;
-} : DefaultGunshiParams;
 /**
  * Return type for lazyWithTypes
  *
@@ -1676,7 +1689,7 @@ type LazyWithTypesReturn<FullG extends GunshiParamsConstraint> = <D extends Part
  *
  * @since v0.27.0
  */
-declare function lazyWithTypes<G extends GunshiParamsConstraint>(): LazyWithTypesReturn<NormalizeGunshiParams<G>>;
+declare function lazyWithTypes<G extends GunshiParamsConstraint>(): LazyWithTypesReturn<NormalizeToGunshiParams<G>>;
 //#endregion
 //#region src/index.d.ts
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gunshi/definition",
   "description": "utilities for gunshi command definition",
-  "version": "0.31.0",
+  "version": "0.33.0",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -57,7 +57,7 @@
     "jsr-exports-lint": "^0.4.2",
     "publint": "^0.3.20",
     "tsdown": "0.21.0",
-    "gunshi": "0.31.0"
+    "gunshi": "0.33.0"
   },
   "scripts": {
     "build": "tsdown",