effect 4.0.0-beta.4 → 4.0.0-beta.41

package/dist/unstable/cli/internal/command.d.ts

@@ -5,20 +5,31 @@
  * Internal implementation details for CLI commands.
  * Public API is in ../Command.ts
  */
+import * as Arr from "../../../Array.ts";
 import * as Effect from "../../../Effect.ts";
 import * as ServiceMap from "../../../ServiceMap.ts";
 import * as CliError from "../CliError.ts";
-import type { HelpDoc } from "../HelpDoc.ts";
+import type * as GlobalFlag from "../GlobalFlag.ts";
+import type { FlagDoc, HelpDoc } from "../HelpDoc.ts";
+import * as Param from "../Param.ts";
 import { type ConfigInternal } from "./config.ts";
 import type { Command, CommandContext, Environment, ParsedTokens } from "../Command.ts";
+interface SubcommandGroup {
+    readonly group: string | undefined;
+    readonly commands: Arr.NonEmptyReadonlyArray<Command<any, unknown, any, unknown, unknown>>;
+}
 /**
  * Internal implementation interface with all the machinery.
  * Use toImpl() to access from internal code.
  */
-export interface CommandInternal<Name extends string, Input, E, R> extends Command<Name, Input, E, R> {
+export interface CommandInternal<Name extends string, Input, E, R, ContextInput> extends Command<Name, Input, ContextInput, E, R> {
     readonly config: ConfigInternal;
-    readonly service: ServiceMap.Service<CommandContext<Name>, Input>;
+    readonly contextConfig: ConfigInternal;
+    readonly service: ServiceMap.Key<CommandContext<Name>, ContextInput>;
+    readonly annotations: ServiceMap.ServiceMap<never>;
+    readonly globalFlags: ReadonlyArray<GlobalFlag.GlobalFlag<any>>;
     readonly parse: (input: ParsedTokens) => Effect.Effect<Input, CliError.CliError, Environment>;
+    readonly parseContext: (input: ParsedTokens) => Effect.Effect<ContextInput, CliError.CliError, Environment>;
     readonly handle: (input: Input, commandPath: ReadonlyArray<string>) => Effect.Effect<void, E | CliError.CliError, R | Environment>;
     readonly buildHelpDoc: (commandPath: ReadonlyArray<string>) => HelpDoc;
 }
@@ -27,31 +38,46 @@ export declare const TypeId: "~effect/cli/Command";
  * Casts a Command to its internal implementation.
  * For use by internal modules that need access to config, parse, handle, etc.
  */
-export declare const toImpl: <Name extends string, Input, E, R>(self: Command<Name, Input, E, R>) => CommandInternal<Name, Input, E, R>;
+export declare const toImpl: <Name extends string, Input, E, R, ContextInput = {}>(self: Command<Name, Input, ContextInput, E, R>) => CommandInternal<Name, Input, E, R, ContextInput>;
 export declare const Proto: {
     pipe(): unknown;
-    asEffect(this: Command<any, any, any, any>): Effect.Effect<any, never, CommandContext<any>>;
+    asEffect(this: Command<any, any, any, any, any>): Effect.Effect<any, never, CommandContext<any>>;
     [Symbol.iterator](): any;
 };
 /**
  * Internal command constructor. Only accepts already-parsed ConfigInternal.
  */
-export declare const makeCommand: <const Name extends string, Input, E, R>(options: {
+export declare const makeCommand: <const Name extends string, Input, E, R, ContextInput = {}>(options: {
     readonly name: Name;
     readonly config: ConfigInternal;
-    readonly service?: ServiceMap.Service<CommandContext<Name>, Input> | undefined;
+    readonly contextConfig?: ConfigInternal | undefined;
+    readonly service?: ServiceMap.Key<CommandContext<Name>, ContextInput> | undefined;
+    readonly annotations?: ServiceMap.ServiceMap<never> | undefined;
+    readonly globalFlags?: ReadonlyArray<GlobalFlag.GlobalFlag<any>> | undefined;
     readonly description?: string | undefined;
-    readonly subcommands?: ReadonlyArray<Command<any, unknown, unknown, unknown>> | undefined;
+    readonly shortDescription?: string | undefined;
+    readonly alias?: string | undefined;
+    readonly examples?: ReadonlyArray<Command.Example> | undefined;
+    readonly subcommands?: ReadonlyArray<SubcommandGroup> | undefined;
     readonly parse?: ((input: ParsedTokens) => Effect.Effect<Input, CliError.CliError, Environment>) | undefined;
+    readonly parseContext?: ((input: ParsedTokens) => Effect.Effect<ContextInput, CliError.CliError, Environment>) | undefined;
     readonly handle?: ((input: Input, commandPath: ReadonlyArray<string>) => Effect.Effect<void, E, R | Environment>) | undefined;
-}) => Command<Name, Input, E, R>;
+}) => Command<Name, Input, ContextInput, E, R>;
 /**
- * Checks for duplicate flag names between parent and child commands.
+ * Converts a single flag param into a FlagDoc for help display.
  */
-export declare const checkForDuplicateFlags: <Name extends string, Input>(parent: Command<Name, Input, unknown, unknown>, subcommands: ReadonlyArray<Command<any, unknown, unknown, unknown>>) => void;
+export declare const toFlagDoc: (single: Param.Single<typeof Param.flagKind, unknown>) => FlagDoc;
 /**
- * Helper function to get help documentation for a specific command path.
- * Navigates through the command hierarchy to find the right command.
+ * Creates a parser for a given config. Used as the default for both `parse`
+ * and `parseContext`, and also by `withSharedFlags` to avoid constructing a
+ * full throwaway command.
+ */
+export declare const makeParser: (cfg: ConfigInternal) => (input: ParsedTokens) => Effect.Effect<Record<string, any>, CliError.CliError, Environment>;
+/**
+ * Checks for duplicate flag names between parent and child commands.
  */
-export declare const getHelpForCommandPath: <Name extends string, Input, E, R>(command: Command<Name, Input, E, R>, commandPath: ReadonlyArray<string>) => HelpDoc;
+export declare const checkForDuplicateFlags: <Name extends string, Input, ContextInput>(parent: Command<Name, Input, ContextInput, unknown, unknown>, subcommands: ReadonlyArray<Command<any, unknown, any, unknown, unknown>>, options?: {
+    readonly contextConfig?: ConfigInternal | undefined;
+} | undefined) => void;
+export {};
 //# sourceMappingURL=command.d.ts.map

package/dist/unstable/cli/internal/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/unstable/cli/internal/command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/unstable/cli/internal/command.ts"],"names":[],"mappings":"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"}

package/dist/unstable/cli/internal/command.js

@@ -5,6 +5,7 @@
  * Internal implementation details for CLI commands.
  * Public API is in ../Command.ts
  */
+import * as Arr from "../../../Array.js";
 import * as Effect from "../../../Effect.js";
 import { YieldableProto } from "../../../internal/core.js";
 import { pipeArguments } from "../../../Pipeable.js";
@@ -13,7 +14,7 @@ import * as ServiceMap from "../../../ServiceMap.js";
 import * as CliError from "../CliError.js";
 import * as Param from "../Param.js";
 import * as Primitive from "../Primitive.js";
-import { reconstructTree } from "./config.js";
+import { emptyConfig, reconstructTree } from "./config.js";
 /* ========================================================================== */
 /* Type ID                                                                    */
 /* ========================================================================== */
@@ -45,19 +46,18 @@ export const Proto = {
  * Internal command constructor. Only accepts already-parsed ConfigInternal.
  */
 export const makeCommand = options => {
-  const service = options.service ?? ServiceMap.Service(`${TypeId}/${options.name}`);
   const config = options.config;
+  const contextConfig = options.contextConfig ?? emptyConfig;
+  const service = options.service ?? ServiceMap.Service(`${TypeId}/${options.name}`);
+  const annotations = options.annotations ?? ServiceMap.empty();
+  const globalFlags = options.globalFlags ?? [];
+  const subcommands = options.subcommands ?? [];
   const handle = (input, commandPath) => Predicate.isNotUndefined(options.handle) ? options.handle(input, commandPath) : Effect.fail(new CliError.ShowHelp({
-    commandPath
+    commandPath,
+    errors: []
   }));
-  const parse = options.parse ?? Effect.fnUntraced(function* (input) {
-    const parsedArgs = {
-      flags: input.flags,
-      arguments: input.arguments
-    };
-    const values = yield* parseParams(parsedArgs, config.orderedParams);
-    return reconstructTree(config.tree, values);
-  });
+  const parse = options.parse ?? makeParser(config);
+  const parseContext = options.parseContext ?? makeParser(contextConfig);
   const buildHelpDoc = commandPath => {
     const args = [];
     const flags = [];
@@ -75,8 +75,7 @@ export const makeCommand = options => {
       }
     }
     let usage = commandPath.length > 0 ? commandPath.join(" ") : options.name;
-    const subcommands = options.subcommands ?? [];
-    if (subcommands.length > 0) {
+    if (subcommands.some(group => group.commands.length > 0)) {
       usage += " <subcommand>";
     }
     usage += " [flags]";
@@ -87,49 +86,92 @@ export const makeCommand = options => {
     for (const option of config.flags) {
       const singles = Param.extractSingleParams(option);
       for (const single of singles) {
-        const formattedAliases = single.aliases.map(alias => alias.length === 1 ? `-${alias}` : `--${alias}`);
-        flags.push({
-          name: single.name,
-          aliases: formattedAliases,
-          type: single.typeName ?? Primitive.getTypeName(single.primitiveType),
-          description: single.description,
-          required: single.primitiveType._tag !== "Boolean"
-        });
+        flags.push(toFlagDoc(single));
       }
     }
-    const subcommandDocs = subcommands.map(sub => ({
-      name: sub.name,
-      description: sub.description ?? ""
-    }));
+    const subcommandDocs = [];
+    for (const group of subcommands) {
+      subcommandDocs.push({
+        group: group.group,
+        commands: Arr.map(group.commands, subcommand => ({
+          name: subcommand.name,
+          alias: subcommand.alias,
+          shortDescription: subcommand.shortDescription,
+          description: subcommand.description ?? ""
+        }))
+      });
+    }
+    const examples = options.examples ?? [];
     return {
       description: options.description ?? "",
       usage,
       flags,
+      annotations,
       ...(args.length > 0 && {
         args
       }),
       ...(subcommandDocs.length > 0 && {
         subcommands: subcommandDocs
+      }),
+      ...(examples.length > 0 && {
+        examples
       })
     };
   };
   return Object.assign(Object.create(Proto), {
     [TypeId]: TypeId,
     name: options.name,
-    subcommands: options.subcommands ?? [],
+    examples: options.examples ?? [],
+    annotations,
+    globalFlags,
+    subcommands,
     config,
+    contextConfig,
     service,
     parse,
+    parseContext,
     handle,
     buildHelpDoc,
     ...(Predicate.isNotUndefined(options.description) ? {
       description: options.description
+    } : {}),
+    ...(Predicate.isNotUndefined(options.shortDescription) ? {
+      shortDescription: options.shortDescription
+    } : {}),
+    ...(Predicate.isNotUndefined(options.alias) ? {
+      alias: options.alias
     } : {})
   });
 };
 /* ========================================================================== */
 /* Helpers                                                                    */
 /* ========================================================================== */
+/**
+ * Converts a single flag param into a FlagDoc for help display.
+ */
+export const toFlagDoc = single => {
+  const formattedAliases = single.aliases.map(alias => alias.length === 1 ? `-${alias}` : `--${alias}`);
+  return {
+    name: single.name,
+    aliases: formattedAliases,
+    type: single.typeName ?? Primitive.getTypeName(single.primitiveType),
+    description: single.description,
+    required: single.primitiveType._tag !== "Boolean"
+  };
+};
+/**
+ * Creates a parser for a given config. Used as the default for both `parse`
+ * and `parseContext`, and also by `withSharedFlags` to avoid constructing a
+ * full throwaway command.
+ */
+export const makeParser = cfg => Effect.fnUntraced(function* (input) {
+  const parsedArgs = {
+    flags: input.flags,
+    arguments: input.arguments
+  };
+  const values = yield* parseParams(parsedArgs, cfg.orderedParams);
+  return reconstructTree(cfg.tree, values);
+});
 /**
  * Parses param values from parsed command arguments into their typed
  * representations.
@@ -150,18 +192,18 @@ const parseParams = /*#__PURE__*/Effect.fnUntraced(function* (parsedArgs, params
 /**
  * Checks for duplicate flag names between parent and child commands.
  */
-export const checkForDuplicateFlags = (parent, subcommands) => {
+export const checkForDuplicateFlags = (parent, subcommands, options) => {
   const parentImpl = toImpl(parent);
   const parentOptionNames = new Set();
-  const extractNames = options => {
-    for (const option of options) {
+  const extractNames = flags => {
+    for (const option of flags) {
       const singles = Param.extractSingleParams(option);
       for (const single of singles) {
         parentOptionNames.add(single.name);
       }
     }
   };
-  extractNames(parentImpl.config.flags);
+  extractNames((options?.contextConfig ?? parentImpl.contextConfig).flags);
   for (const subcommand of subcommands) {
     const subImpl = toImpl(subcommand);
     for (const option of subImpl.config.flags) {
@@ -178,20 +220,4 @@ export const checkForDuplicateFlags = (parent, subcommands) => {
     }
   }
 };
-/**
- * Helper function to get help documentation for a specific command path.
- * Navigates through the command hierarchy to find the right command.
- */
-export const getHelpForCommandPath = (command, commandPath) => {
-  let currentCommand = command;
-  // Navigate through the command path to find the target command
-  for (let i = 1; i < commandPath.length; i++) {
-    const subcommandName = commandPath[i];
-    const subcommand = currentCommand.subcommands.find(sub => sub.name === subcommandName);
-    if (subcommand) {
-      currentCommand = subcommand;
-    }
-  }
-  return toImpl(currentCommand).buildHelpDoc(commandPath);
-};
 //# sourceMappingURL=command.js.map

package/dist/unstable/cli/internal/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","names":["Effect","YieldableProto","pipeArguments","Predicate","ServiceMap","CliError","Param","Primitive","reconstructTree","TypeId","toImpl","self","Proto","pipe","arguments","asEffect","service","makeCommand","options","Service","name","config","handle","input","commandPath","isNotUndefined","fail","ShowHelp","parse","fnUntraced","parsedArgs","flags","values","parseParams","orderedParams","tree","buildHelpDoc","args","arg","singles","extractSingleParams","metadata","getParamMetadata","single","push","type","typeName","getTypeName","primitiveType","description","required","isOptional","variadic","isVariadic","usage","length","join","subcommands","argName","option","formattedAliases","aliases","map","alias","_tag","subcommandDocs","sub","Object","assign","create","params","results","currentArguments","remainingArguments","parsed","checkForDuplicateFlags","parent","parentImpl","parentOptionNames","Set","extractNames","add","subcommand","subImpl","has","DuplicateOption","parentCommand","childCommand","getHelpForCommandPath","command","currentCommand","i","subcommandName","find"],"sources":["../../../../src/unstable/cli/internal/command.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"command.js","names":["Arr","Effect","YieldableProto","pipeArguments","Predicate","ServiceMap","CliError","Param","Primitive","emptyConfig","reconstructTree","TypeId","toImpl","self","Proto","pipe","arguments","asEffect","service","makeCommand","options","config","contextConfig","Service","name","annotations","empty","globalFlags","subcommands","handle","input","commandPath","isNotUndefined","fail","ShowHelp","errors","parse","makeParser","parseContext","buildHelpDoc","args","flags","arg","singles","extractSingleParams","metadata","getParamMetadata","single","push","type","typeName","getTypeName","primitiveType","description","required","isOptional","variadic","isVariadic","usage","length","join","some","group","commands","argName","option","toFlagDoc","subcommandDocs","map","subcommand","alias","shortDescription","examples","Object","assign","create","formattedAliases","aliases","_tag","cfg","fnUntraced","parsedArgs","values","parseParams","orderedParams","tree","params","results","currentArguments","remainingArguments","parsed","checkForDuplicateFlags","parent","parentImpl","parentOptionNames","Set","extractNames","add","subImpl","has","DuplicateOption","parentCommand","childCommand"],"sources":["../../../../src/unstable/cli/internal/command.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/unstable/cli/internal/completions/CommandDescriptor.js

@@ -1,3 +1,10 @@
+/**
+ * CommandDescriptor — pure-data representation of a command tree for
+ * shell completion generation.
+ *
+ * @internal
+ */
+import * as Option from "../../../../Option.js";
 import * as Param from "../../Param.js";
 import * as Primitive from "../../Primitive.js";
 import { toImpl } from "../command.js";
@@ -99,7 +106,7 @@ export const fromCommand = cmd => {
       flags.push({
         name: single.name,
         aliases: single.aliases,
-        description: single.description,
+        description: Option.getOrUndefined(single.description),
         type: toFlagType(single)
       });
     }
@@ -112,17 +119,22 @@ export const fromCommand = cmd => {
       if (single.kind !== "argument") continue;
       args.push({
         name: single.name,
-        description: single.description,
+        description: Option.getOrUndefined(single.description),
         required: !metadata.isOptional,
         variadic: metadata.isVariadic,
         type: toArgumentType(single)
       });
     }
   }
-  const subcommands = cmd.subcommands.map(fromCommand);
+  const subcommands = [];
+  for (const group of cmd.subcommands) {
+    for (const subcommand of group.commands) {
+      subcommands.push(fromCommand(subcommand));
+    }
+  }
   return {
     name: cmd.name,
-    description: cmd.description,
+    description: cmd.shortDescription ?? cmd.description,
     flags,
     arguments: args,
     subcommands

package/dist/unstable/cli/internal/completions/CommandDescriptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommandDescriptor.js","names":["Param","Primitive","toImpl","toFlagType","single","tag","primitiveType","_tag","keys","getChoiceKeys","values","typeName","pathType","toArgumentType","fromCommand","cmd","impl","config","flags","flag","singles","extractSingleParams","kind","push","name","aliases","description","type","args","arg","arguments","metadata","getParamMetadata","required","isOptional","variadic","isVariadic","subcommands","map"],"sources":["../../../../../src/unstable/cli/internal/completions/CommandDescriptor.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"CommandDescriptor.js","names":["Option","Param","Primitive","toImpl","toFlagType","single","tag","primitiveType","_tag","keys","getChoiceKeys","values","typeName","pathType","toArgumentType","fromCommand","cmd","impl","config","flags","flag","singles","extractSingleParams","kind","push","name","aliases","description","getOrUndefined","type","args","arg","arguments","metadata","getParamMetadata","required","isOptional","variadic","isVariadic","subcommands","group","subcommand","commands","shortDescription"],"sources":["../../../../../src/unstable/cli/internal/completions/CommandDescriptor.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/unstable/cli/internal/config.js

@@ -111,6 +111,48 @@ export const parseConfig = config => {
     tree: parse(config)
   };
 };
+/** @internal */
+export const emptyConfig = /*#__PURE__*/parseConfig({});
+const shiftNodeIndexes = (node, offset) => {
+  switch (node._tag) {
+    case "Param":
+      return {
+        _tag: "Param",
+        index: node.index + offset
+      };
+    case "Array":
+      return {
+        _tag: "Array",
+        children: node.children.map(child => shiftNodeIndexes(child, offset))
+      };
+    case "Nested":
+      return {
+        _tag: "Nested",
+        tree: shiftTreeIndexes(node.tree, offset)
+      };
+  }
+};
+const shiftTreeIndexes = (tree, offset) => {
+  const output = {};
+  for (const key in tree) {
+    output[key] = shiftNodeIndexes(tree[key], offset);
+  }
+  return output;
+};
+/** @internal */
+export const mergeConfig = (left, right) => {
+  const offset = left.orderedParams.length;
+  return {
+    [ConfigInternalTypeId]: ConfigInternalTypeId,
+    flags: [...left.flags, ...right.flags],
+    arguments: [...left.arguments, ...right.arguments],
+    orderedParams: [...left.orderedParams, ...right.orderedParams],
+    tree: {
+      ...left.tree,
+      ...shiftTreeIndexes(right.tree, offset)
+    }
+  };
+};
 /* ========================================================================== */
 /* Reconstruction                                                             */
 /* ========================================================================== */

package/dist/unstable/cli/internal/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","names":["Predicate","Param","ConfigInternalTypeId","isConfigInternal","u","hasProperty","parseConfig","config","orderedParams","flags","args","parse","tree","key","parseValue","value","Array","isArray","_tag","children","map","v","isParam","index","length","push","kind","arguments","reconstructTree","results","output","nodeValue","node","child"],"sources":["../../../../src/unstable/cli/internal/config.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgDA,OAAO,KAAKA,SAAS,MAAM,uBAAuB;AAClD,OAAO,KAAKC,KAAK,MAAM,aAAa;AAEpC;AACA;AACA;AAEA,MAAMC,oBAAoB,GAAG,qCAA8C;AAiD3E;AACA;AACA;AAEA;AACA,OAAO,MAAMC,gBAAgB,GAAIC,CAAU,IAA0BJ,SAAS,CAACK,WAAW,CAACD,CAAC,EAAEF,oBAAoB,CAAC;AAiBnH;;;;;;;;;;AAUA,OAAO,MAAMI,WAAW,GAAIC,MAAc,IAAoB;EAC5D,MAAMC,aAAa,GAAqB,EAAE;EAC1C,MAAMC,KAAK,GAAyB,EAAE;EACtC,MAAMC,IAAI,GAA6B,EAAE;EAEzC,SAASC,KAAKA,CAACJ,MAAc;IAC3B,MAAMK,IAAI,GAAwB,EAAE;IACpC,KAAK,MAAMC,GAAG,IAAIN,MAAM,EAAE;MACxBK,IAAI,CAACC,GAAG,CAAC,GAAGC,UAAU,CAACP,MAAM,CAACM,GAAG,CAAC,CAAC;IACrC;IACA,OAAOD,IAAI;EACb;EAEA,SAASE,UAAUA,CACjBC,KAA6D;IAE7D,IAAIC,KAAK,CAACC,OAAO,CAACF,KAAK,CAAC,EAAE;MACxB,OAAO;QACLG,IAAI,EAAE,OAAO;QACbC,QAAQ,EAAGJ,KAAoB,CAACK,GAAG,CAAEC,CAAC,IAAKP,UAAU,CAACO,CAAC,CAAC;OACzD;IACH,CAAC,MAAM,IAAIpB,KAAK,CAACqB,OAAO,CAACP,KAAK,CAAC,EAAE;MAC/B,MAAMQ,KAAK,GAAGf,aAAa,CAACgB,MAAM;MAClChB,aAAa,CAACiB,IAAI,CAACV,KAAK,CAAC;MAEzB,IAAIA,KAAK,CAACW,IAAI,KAAK,UAAU,EAAE;QAC7BhB,IAAI,CAACe,IAAI,CAACV,KAA0B,CAAC;MACvC,CAAC,MAAM;QACLN,KAAK,CAACgB,IAAI,CAACV,KAAsB,CAAC;MACpC;MAEA,OAAO;QAAEG,IAAI,EAAE,OAAO;QAAEK;MAAK,CAAE;IACjC,CAAC,MAAM;MACL,OAAO;QACLL,IAAI,EAAE,QAAQ;QACdN,IAAI,EAAED,KAAK,CAACI,KAAe;OAC5B;IACH;EACF;EAEA,OAAO;IACL,CAACb,oBAAoB,GAAGA,oBAAoB;IAC5CO,KAAK;IACLkB,SAAS,EAAEjB,IAAI;IACfF,aAAa;IACbI,IAAI,EAAED,KAAK,CAACJ,MAAM;GACnB;AACH,CAAC;AAED;AACA;AACA;AAEA;;;;;;;;AAQA,OAAO,MAAMqB,eAAe,GAAGA,CAC7BhB,IAAyB,EACzBiB,OAA2B,KACJ;EACvB,MAAMC,MAAM,GAAwB,EAAE;EAEtC,KAAK,MAAMjB,GAAG,IAAID,IAAI,EAAE;IACtBkB,MAAM,CAACjB,GAAG,CAAC,GAAGkB,SAAS,CAACnB,IAAI,CAACC,GAAG,CAAC,CAAC;EACpC;EAEA,OAAOiB,MAAM;EAEb,SAASC,SAASA,CAACC,IAAyB;IAC1C,QAAQA,IAAI,CAACd,IAAI;MACf,KAAK,OAAO;QACV,OAAOW,OAAO,CAACG,IAAI,CAACT,KAAK,CAAC;MAC5B,KAAK,OAAO;QACV,OAAOS,IAAI,CAACb,QAAQ,CAACC,GAAG,CAAEa,KAAK,IAAKF,SAAS,CAACE,KAAK,CAAC,CAAC;MACvD,KAAK,QAAQ;QACX,OAAOL,eAAe,CAACI,IAAI,CAACpB,IAAI,EAAEiB,OAAO,CAAC;IAC9C;EACF;AACF,CAAC","ignoreList":[]}
+{"version":3,"file":"config.js","names":["Predicate","Param","ConfigInternalTypeId","isConfigInternal","u","hasProperty","parseConfig","config","orderedParams","flags","args","parse","tree","key","parseValue","value","Array","isArray","_tag","children","map","v","isParam","index","length","push","kind","arguments","emptyConfig","shiftNodeIndexes","node","offset","child","shiftTreeIndexes","output","mergeConfig","left","right","reconstructTree","results","nodeValue"],"sources":["../../../../src/unstable/cli/internal/config.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/unstable/cli/internal/help.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Help Documentation
+ * ================
+ *
+ * Internal helpers for generating help documentation.
+ * Extracted from command.ts to avoid circular dependencies.
+ */
+import * as Effect from "../../../Effect.ts";
+import type { Command } from "../Command.ts";
+import type * as GlobalFlag from "../GlobalFlag.ts";
+import type { HelpDoc } from "../HelpDoc.ts";
+/**
+ * Returns the resolved command lineage for the provided path.
+ * Includes the root command as the first element.
+ */
+export declare const getCommandsForCommandPath: <Name extends string, Input, E, R, ContextInput>(command: Command<Name, Input, ContextInput, E, R>, commandPath: ReadonlyArray<string>) => ReadonlyArray<Command.Any>;
+/**
+ * Returns active global flags for a command path.
+ * Built-ins are prepended and declarations are collected root -> leaf.
+ */
+export declare const getGlobalFlagsForCommandPath: <Name extends string, Input, E, R, ContextInput>(command: Command<Name, Input, ContextInput, E, R>, commandPath: ReadonlyArray<string>, builtIns: ReadonlyArray<GlobalFlag.GlobalFlag<any>>) => ReadonlyArray<GlobalFlag.GlobalFlag<any>>;
+/**
+ * Returns all global flags declared in a command tree.
+ * Built-ins are prepended and command declarations are deduplicated by identity.
+ */
+export declare const getGlobalFlagsForCommandTree: <Name extends string, Input, E, R, ContextInput>(command: Command<Name, Input, ContextInput, E, R>, builtIns: ReadonlyArray<GlobalFlag.GlobalFlag<any>>) => ReadonlyArray<GlobalFlag.GlobalFlag<any>>;
+/**
+ * Helper function to get help documentation for a specific command path.
+ * Navigates through the command hierarchy to find the right command.
+ * Reads active global flags for the path and includes them in the help doc.
+ */
+export declare const getHelpForCommandPath: <Name extends string, Input, E, R, ContextInput>(command: Command<Name, Input, ContextInput, E, R>, commandPath: ReadonlyArray<string>, builtIns: ReadonlyArray<GlobalFlag.GlobalFlag<any>>) => Effect.Effect<HelpDoc, never, never>;
+//# sourceMappingURL=help.d.ts.map

package/dist/unstable/cli/internal/help.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../../../src/unstable/cli/internal/help.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAA;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,KAAK,UAAU,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAW,OAAO,EAAE,MAAM,eAAe,CAAA;AAmBrD;;;GAGG;AACH,eAAO,MAAM,yBAAyB,GAAI,IAAI,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,EACtF,SAAS,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,EACjD,aAAa,aAAa,CAAC,MAAM,CAAC,KACjC,aAAa,CAAC,OAAO,CAAC,GAAG,CAwB3B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,4BAA4B,GAAI,IAAI,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,EACzF,SAAS,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,EACjD,aAAa,aAAa,CAAC,MAAM,CAAC,EAClC,UAAU,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAClD,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAO1C,CAAA;AAiDD;;;GAGG;AACH,eAAO,MAAM,4BAA4B,GAAI,IAAI,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,EACzF,SAAS,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,EACjD,UAAU,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAClD,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAIvC,CAAA;AAEJ;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAAI,IAAI,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,EAClF,SAAS,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,EACjD,aAAa,aAAa,CAAC,MAAM,CAAC,EAClC,UAAU,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAClD,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAsBlC,CAAA"}