effect 4.0.0-beta.1 → 4.0.0-beta.11

package/dist/unstable/cli/HelpDoc.d.ts

@@ -1,6 +1,8 @@
 /**
  * @since 4.0.0
  */
+import type { NonEmptyReadonlyArray } from "../../Array.ts";
+import type * as ServiceMap from "../../ServiceMap.ts";
 /**
  * Structured representation of help documentation for a command.
  * This data structure is independent of formatting, allowing for
@@ -8,11 +10,13 @@
  *
  * @example
  * ```ts
+ * import { ServiceMap } from "effect"
  * import type * as HelpDoc from "effect/unstable/cli/HelpDoc"
  *
  * const deployCommandHelp: HelpDoc.HelpDoc = {
  *   description: "Deploy your application to the cloud",
  *   usage: "myapp deploy [options] <target>",
+ *   annotations: ServiceMap.empty(),
  *   flags: [
  *     {
  *       name: "verbose",
@@ -58,6 +62,10 @@ export interface HelpDoc {
      * List of available flags/options for this command
      */
     readonly flags: ReadonlyArray<FlagDoc>;
+    /**
+     * Custom command annotations.
+     */
+    readonly annotations: ServiceMap.ServiceMap<never>;
     /**
      * List of positional arguments for this command
      */
@@ -65,7 +73,27 @@ export interface HelpDoc {
     /**
      * Optional list of subcommands if this is a parent command
      */
-    readonly subcommands?: ReadonlyArray<SubcommandDoc>;
+    readonly subcommands?: ReadonlyArray<SubcommandGroupDoc>;
+    /**
+     * Optional concrete usage examples for the command
+     */
+    readonly examples?: ReadonlyArray<ExampleDoc>;
+}
+/**
+ * Documentation for a command usage example
+ *
+ * @since 4.0.0
+ * @category models
+ */
+export interface ExampleDoc {
+    /**
+     * Command line invocation example
+     */
+    readonly command: string;
+    /**
+     * Optional explanation for the example
+     */
+    readonly description?: string | undefined;
 }
 /**
  * Documentation for a single command-line flag/option
@@ -121,15 +149,18 @@ export interface FlagDoc {
  *
  * @example
  * ```ts
+ * import { ServiceMap } from "effect"
  * import type { HelpDoc } from "effect/unstable/cli"
  *
  * const deploySubcommand: HelpDoc.SubcommandDoc = {
  *   name: "deploy",
+ *   shortDescription: "Deploy app",
  *   description: "Deploy the application to the cloud"
  * }
  *
  * const buildSubcommand: HelpDoc.SubcommandDoc = {
  *   name: "build",
+ *   shortDescription: undefined,
  *   description: "Build the application for production"
  * }
  *
@@ -137,8 +168,12 @@ export interface FlagDoc {
  * const mainCommandHelp: HelpDoc.HelpDoc = {
  *   description: "Cloud deployment tool",
  *   usage: "myapp <command> [options]",
+ *   annotations: ServiceMap.empty(),
  *   flags: [],
- *   subcommands: [deploySubcommand, buildSubcommand]
+ *   subcommands: [{
+ *     group: undefined,
+ *     commands: [deploySubcommand, buildSubcommand]
+ *   }]
  * }
  * ```
  *
@@ -150,16 +185,38 @@ export interface SubcommandDoc {
      * Name of the subcommand
      */
     readonly name: string;
+    /**
+     * Optional short description of what the subcommand does.
+     */
+    readonly shortDescription: string | undefined;
     /**
      * Brief description of what the subcommand does
      */
     readonly description: string;
 }
+/**
+ * Documentation for a grouped subcommand listing
+ *
+ * @since 4.0.0
+ * @category models
+ */
+export interface SubcommandGroupDoc {
+    /**
+     * Group name used in help output.
+     * Undefined means the default ungrouped section.
+     */
+    readonly group: string | undefined;
+    /**
+     * Subcommands in this group.
+     */
+    readonly commands: NonEmptyReadonlyArray<SubcommandDoc>;
+}
 /**
  * Documentation for a positional argument
  *
  * @example
  * ```ts
+ * import { ServiceMap } from "effect"
  * import type { HelpDoc } from "effect/unstable/cli"
  *
  * const sourceArg: HelpDoc.ArgDoc = {
@@ -182,6 +239,7 @@ export interface SubcommandDoc {
  * const copyCommandHelp: HelpDoc.HelpDoc = {
  *   description: "Copy files from source to destination",
  *   usage: "copy <source> [files...]",
+ *   annotations: ServiceMap.empty(),
  *   flags: [],
  *   args: [sourceArg, filesArg]
  * }

package/dist/unstable/cli/HelpDoc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HelpDoc.d.ts","sourceRoot":"","sources":["../../../src/unstable/cli/HelpDoc.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,MAAM,WAAW,OAAO;IACtB;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAE5B;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IAEtB;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAA;IAEtC;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IAErC;;OAEG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,aAAa,CAAC,aAAa,CAAC,CAAA;CACpD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,WAAW,OAAO;IACtB;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IAEvC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAExC;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;CAC3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,WAAW,MAAM;IACrB;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAExC;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAE1B;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;CAC3B"}
+{"version":3,"file":"HelpDoc.d.ts","sourceRoot":"","sources":["../../../src/unstable/cli/HelpDoc.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAC3D,OAAO,KAAK,KAAK,UAAU,MAAM,qBAAqB,CAAA;AAEtD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,MAAM,WAAW,OAAO;IACtB;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAE5B;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IAEtB;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAA;IAEtC;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IAElD;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IAErC;;OAEG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,aAAa,CAAC,kBAAkB,CAAC,CAAA;IAExD;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAA;CAC9C;AAED;;;;;GAKG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IAExB;;OAEG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,WAAW,OAAO;IACtB;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IAEvC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAExC;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;CAC3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;IAE7C;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAC7B;AAED;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAElC;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,qBAAqB,CAAC,aAAa,CAAC,CAAA;CACxD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,MAAM,WAAW,MAAM;IACrB;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAExC;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAE1B;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;CAC3B"}

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

@@ -5,12 +5,17 @@
  * 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 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, unknown, unknown>>;
+}
 /**
  * Internal implementation interface with all the machinery.
  * Use toImpl() to access from internal code.
@@ -18,6 +23,7 @@ import type { Command, CommandContext, Environment, ParsedTokens } from "../Comm
 export interface CommandInternal<Name extends string, Input, E, R> extends Command<Name, Input, E, R> {
     readonly config: ConfigInternal;
     readonly service: ServiceMap.Service<CommandContext<Name>, Input>;
+    readonly annotations: ServiceMap.ServiceMap<never>;
     readonly parse: (input: ParsedTokens) => Effect.Effect<Input, CliError.CliError, Environment>;
     readonly handle: (input: Input, commandPath: ReadonlyArray<string>) => Effect.Effect<void, E | CliError.CliError, R | Environment>;
     readonly buildHelpDoc: (commandPath: ReadonlyArray<string>) => HelpDoc;
@@ -40,8 +46,11 @@ export declare const makeCommand: <const Name extends string, Input, E, R>(optio
     readonly name: Name;
     readonly config: ConfigInternal;
     readonly service?: ServiceMap.Service<CommandContext<Name>, Input> | undefined;
+    readonly annotations?: ServiceMap.ServiceMap<never> | undefined;
     readonly description?: string | undefined;
-    readonly subcommands?: ReadonlyArray<Command<any, unknown, unknown, unknown>> | undefined;
+    readonly shortDescription?: 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 handle?: ((input: Input, commandPath: ReadonlyArray<string>) => Effect.Effect<void, E, R | Environment>) | undefined;
 }) => Command<Name, Input, E, R>;
@@ -54,4 +63,5 @@ export declare const checkForDuplicateFlags: <Name extends string, Input>(parent
  * Navigates through the command hierarchy to find the right command.
  */
 export declare const getHelpForCommandPath: <Name extends string, Input, E, R>(command: Command<Name, Input, E, R>, commandPath: ReadonlyArray<string>) => HelpDoc;
+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";
@@ -47,6 +48,8 @@ export const Proto = {
 export const makeCommand = options => {
   const service = options.service ?? ServiceMap.Service(`${TypeId}/${options.name}`);
   const config = options.config;
+  const annotations = options.annotations ?? ServiceMap.empty();
+  const subcommands = options.subcommands ?? [];
   const handle = (input, commandPath) => Predicate.isNotUndefined(options.handle) ? options.handle(input, commandPath) : Effect.fail(new CliError.ShowHelp({
     commandPath
   }));
@@ -75,8 +78,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]";
@@ -97,26 +99,40 @@ export const makeCommand = options => {
         });
       }
     }
-    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,
+          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,
+    subcommands,
     config,
     service,
     parse,
@@ -124,6 +140,9 @@ export const makeCommand = options => {
     buildHelpDoc,
     ...(Predicate.isNotUndefined(options.description) ? {
       description: options.description
+    } : {}),
+    ...(Predicate.isNotUndefined(options.shortDescription) ? {
+      shortDescription: options.shortDescription
     } : {})
   });
 };
@@ -187,7 +206,13 @@ export const getHelpForCommandPath = (command, commandPath) => {
   // 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);
+    let subcommand = undefined;
+    for (const group of currentCommand.subcommands) {
+      subcommand = group.commands.find(sub => sub.name === subcommandName);
+      if (subcommand) {
+        break;
+      }
+    }
     if (subcommand) {
       currentCommand = subcommand;
     }

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","reconstructTree","TypeId","toImpl","self","Proto","pipe","arguments","asEffect","service","makeCommand","options","Service","name","config","annotations","empty","subcommands","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","some","group","commands","argName","option","formattedAliases","aliases","map","alias","_tag","subcommandDocs","subcommand","shortDescription","examples","Object","assign","create","params","results","currentArguments","remainingArguments","parsed","checkForDuplicateFlags","parent","parentImpl","parentOptionNames","Set","extractNames","add","subImpl","has","DuplicateOption","parentCommand","childCommand","getHelpForCommandPath","command","currentCommand","i","subcommandName","undefined","find","sub"],"sources":["../../../../src/unstable/cli/internal/command.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

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

@@ -119,10 +119,15 @@ export const fromCommand = cmd => {
       });
     }
   }
-  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":["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","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/parser.js

@@ -137,7 +137,15 @@ const createFlagRegistry = params => {
     index
   };
 };
-const buildSubcommandIndex = subcommands => new Map(subcommands.map(sub => [sub.name, sub]));
+const buildSubcommandIndex = subcommands => {
+  const index = new Map();
+  for (const group of subcommands) {
+    for (const subcommand of group.commands) {
+      index.set(subcommand.name, subcommand);
+    }
+  }
+  return index;
+};
 /* ========================================================================== */
 /* Flag Accumulator                                                           */
 /* ========================================================================== */
@@ -313,7 +321,7 @@ const resolveFirstValue = (value, cursor, context, state) => {
   // Not a subcommand. Check if this looks like a typo.
   const expectsArgs = toImpl(command).config.arguments.length > 0;
   if (!expectsArgs && subIndex.size > 0) {
-    const suggestions = suggest(value, command.subcommands.map(s => s.name));
+    const suggestions = suggest(value, Array.from(subIndex.keys()));
     state.errors.push(new CliError.UnknownSubcommand({
       subcommand: value,
       parent: commandPath,

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

@@ -1 +1 @@
-{"version":3,"file":"parser.js","names":["Effect","Option","CliError","Param","Primitive","suggest","completionsFlag","helpFlag","logLevelFlag","versionFlag","toImpl","getCommandPath","parsedInput","subcommand","name","extractBuiltInOptions","tokens","gen","flagMap","remainder","consumeKnownFlags","builtInFlagRegistry","emptyArgs","flags","arguments","help","parse","logLevel","version","completions","getOrUndefined","parseArgs","lexResult","command","commandPath","trailingOperands","afterEndOfOptions","newCommandPath","commandImpl","singles","config","flatMap","extractSingleParams","flagParams","filter","isFlagParam","flagRegistry","createFlagRegistry","context","result","scanCommandLevel","_tag","errors","length","subLex","childTokens","subParsed","sub","allErrors","makeCursor","i","peek","take","rest","slice","params","index","Map","param","has","Error","set","alias","aliases","get","buildSubcommandIndex","subcommands","map","createEmptyFlagMap","Object","fromEntries","p","createFlagAccumulator","add","raw","undefined","push","merge","from","key","values","snapshot","isFlagToken","t","getFlagName","flag","asBooleanLiteral","token","isTrueValue","value","isFalseValue","consumeFlagValue","cursor","spec","isBoolean","primitiveType","literal","next","registry","builtInFlagParams","createUnrecognizedFlagError","printable","validNames","suggestions","n","UnrecognizedOption","option","createParseState","mode","toLeafResult","state","resolveFirstValue","subIndex","tail","expectsArgs","size","s","UnknownSubcommand","parent","processFlag","processValue","subResult"],"sources":["../../../../src/unstable/cli/internal/parser.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;AA0BA,OAAO,KAAKA,MAAM,MAAM,oBAAoB;AAE5C,OAAO,KAAKC,MAAM,MAAM,oBAAoB;AAC5C,OAAO,KAAKC,QAAQ,MAAM,gBAAgB;AAE1C,OAAO,KAAKC,KAAK,MAAM,aAAa;AACpC,OAAO,KAAKC,SAAS,MAAM,iBAAiB;AAC5C,SAASC,OAAO,QAAQ,mBAAmB;AAC3C,SAASC,eAAe,EAAEC,QAAQ,EAAEC,YAAY,EAAEC,WAAW,QAAQ,mBAAmB;AACxF,SAASC,MAAM,QAAQ,cAAc;AAGrC;AACA;AACA;AAEA;AACA,OAAO,MAAMC,cAAc,GAAIC,WAAyB,IACtDA,WAAW,CAACC,UAAU,GAClB,CAACD,WAAW,CAACC,UAAU,CAACC,IAAI,EAAE,GAAGH,cAAc,CAACC,WAAW,CAACC,UAAU,CAACD,WAAW,CAAC,CAAC,GACpF,EAAE;AAER;AACA,OAAO,MAAMG,qBAAqB,GAChCC,MAA4B,IAY5BhB,MAAM,CAACiB,GAAG,CAAC,aAAS;EAClB,MAAM;IAAEC,OAAO;IAAEC;EAAS,CAAE,GAAGC,iBAAiB,CAACJ,MAAM,EAAEK,mBAAmB,CAAC;EAC7E,MAAMC,SAAS,GAAqB;IAAEC,KAAK,EAAEL,OAAO;IAAEM,SAAS,EAAE;EAAE,CAAE;EACrE,MAAM,GAAGC,IAAI,CAAC,GAAG,OAAOlB,QAAQ,CAACmB,KAAK,CAACJ,SAAS,CAAC;EACjD,MAAM,GAAGK,QAAQ,CAAC,GAAG,OAAOnB,YAAY,CAACkB,KAAK,CAACJ,SAAS,CAAC;EACzD,MAAM,GAAGM,OAAO,CAAC,GAAG,OAAOnB,WAAW,CAACiB,KAAK,CAACJ,SAAS,CAAC;EACvD,MAAM,GAAGO,WAAW,CAAC,GAAG,OAAOvB,eAAe,CAACoB,KAAK,CAACJ,SAAS,CAAC;EAC/D,OAAO;IACLG,IAAI;IACJE,QAAQ,EAAE1B,MAAM,CAAC6B,cAAc,CAACH,QAAQ,CAAC;IACzCC,OAAO;IACPC,WAAW,EAAE5B,MAAM,CAAC6B,cAAc,CAACD,WAAW,CAAC;IAC/CV;GACD;AACH,CAAC,CAAC;AAEJ;AACA,OAAO,MAAMY,SAAS,GAAGA,CACvBC,SAAoB,EACpBC,OAAoB,EACpBC,WAAA,GAAqC,EAAE,KAEvClC,MAAM,CAACiB,GAAG,CAAC,aAAS;EAClB,MAAM;IAAED,MAAM;IAAEmB,gBAAgB,EAAEC;EAAiB,CAAE,GAAGJ,SAAS;EACjE,MAAMK,cAAc,GAAG,CAAC,GAAGH,WAAW,EAAED,OAAO,CAACnB,IAAI,CAAC;EAErD,MAAMwB,WAAW,GAAG5B,MAAM,CAACuB,OAAO,CAAC;EACnC,MAAMM,OAAO,GAAGD,WAAW,CAACE,MAAM,CAACjB,KAAK,CAACkB,OAAO,CAACtC,KAAK,CAACuC,mBAAmB,CAAC;EAC3E,MAAMC,UAAU,GAAGJ,OAAO,CAACK,MAAM,CAACzC,KAAK,CAAC0C,WAAW,CAAC;EACpD,MAAMC,YAAY,GAAGC,kBAAkB,CAACJ,UAAU,CAAC;EAEnD,MAAMK,OAAO,GAAmB;IAC9Bf,OAAO;IACPC,WAAW,EAAEG,cAAc;IAC3BS;GACD;EAED,MAAMG,MAAM,GAAGC,gBAAgB,CAAClC,MAAM,EAAEgC,OAAO,CAAC;EAEhD,IAAIC,MAAM,CAACE,IAAI,KAAK,MAAM,EAAE;IAC1B,OAAO;MACL5B,KAAK,EAAE0B,MAAM,CAAC1B,KAAK;MACnBC,SAAS,EAAE,CAAC,GAAGyB,MAAM,CAACzB,SAAS,EAAE,GAAGY,iBAAiB,CAAC;MACtD,IAAIa,MAAM,CAACG,MAAM,CAACC,MAAM,GAAG,CAAC,IAAI;QAAED,MAAM,EAAEH,MAAM,CAACG;MAAM,CAAE;KAC1D;EACH;EAEA,MAAME,MAAM,GAAc;IAAEtC,MAAM,EAAEiC,MAAM,CAACM,WAAW;IAAEpB,gBAAgB,EAAE;EAAE,CAAE;EAC9E,MAAMqB,SAAS,GAAG,OAAOzB,SAAS,CAChCuB,MAAM,EACNL,MAAM,CAACQ,GAAG,EACVpB,cAAc,CACf;EAED,MAAMqB,SAAS,GAAG,CAAC,GAAGT,MAAM,CAACG,MAAM,EAAE,IAAII,SAAS,CAACJ,MAAM,IAAI,EAAE,CAAC,CAAC;EACjE,OAAO;IACL7B,KAAK,EAAE0B,MAAM,CAAC1B,KAAK;IACnBC,SAAS,EAAEY,iBAAiB;IAC5BvB,UAAU,EAAE;MAAEC,IAAI,EAAEmC,MAAM,CAACQ,GAAG,CAAC3C,IAAI;MAAEF,WAAW,EAAE4C;IAAS,CAAE;IAC7D,IAAIE,SAAS,CAACL,MAAM,GAAG,CAAC,IAAI;MAAED,MAAM,EAAEM;IAAS,CAAE;GAClD;AACH,CAAC,CAAC;AAgHJ,MAAMC,UAAU,GAAI3C,MAA4B,IAAiB;EAC/D,IAAI4C,CAAC,GAAG,CAAC;EACT,OAAO;IACLC,IAAI,EAAEA,CAAA,KAAM7C,MAAM,CAAC4C,CAAC,CAAC;IACrBE,IAAI,EAAEA,CAAA,KAAM9C,MAAM,CAAC4C,CAAC,EAAE,CAAC;IACvBG,IAAI,EAAEA,CAAA,KAAM/C,MAAM,CAACgD,KAAK,CAACJ,CAAC;GAC3B;AACH,CAAC;AAED;AACA;AACA;AAEA;;;;AAIA,MAAMb,kBAAkB,GAAIkB,MAAgC,IAAkB;EAC5E,MAAMC,KAAK,GAAG,IAAIC,GAAG,EAAqB;EAE1C,KAAK,MAAMC,KAAK,IAAIH,MAAM,EAAE;IAC1B,IAAIC,KAAK,CAACG,GAAG,CAACD,KAAK,CAACtD,IAAI,CAAC,EAAE;MACzB,MAAM,IAAIwD,KAAK,CAAC,wBAAwBF,KAAK,CAACtD,IAAI,yBAAyB,CAAC;IAC9E;IACAoD,KAAK,CAACK,GAAG,CAACH,KAAK,CAACtD,IAAI,EAAEsD,KAAK,CAAC;IAE5B,KAAK,MAAMI,KAAK,IAAIJ,KAAK,CAACK,OAAO,EAAE;MACjC,IAAIP,KAAK,CAACG,GAAG,CAACG,KAAK,CAAC,EAAE;QACpB,MAAM,IAAIF,KAAK,CACb,yBAAyBE,KAAK,4CAA4CN,KAAK,CAACQ,GAAG,CAACF,KAAK,CAAE,CAAC1D,IAAI,IAAI,CACrG;MACH;MACAoD,KAAK,CAACK,GAAG,CAACC,KAAK,EAAEJ,KAAK,CAAC;IACzB;EACF;EAEA,OAAO;IAAEH,MAAM;IAAEC;EAAK,CAAE;AAC1B,CAAC;AAED,MAAMS,oBAAoB,GACxBC,WAAsE,IACV,IAAIT,GAAG,CAACS,WAAW,CAACC,GAAG,CAAEpB,GAAG,IAAK,CAACA,GAAG,CAAC3C,IAAI,EAAE2C,GAAG,CAAC,CAAC,CAAC;AAEhH;AACA;AACA;AAEA;AACA,MAAMqB,kBAAkB,GAAIb,MAAgC,IAC1Dc,MAAM,CAACC,WAAW,CAACf,MAAM,CAACY,GAAG,CAAEI,CAAC,IAAK,CAACA,CAAC,CAACnE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;AAErD;;;;AAIA,MAAMoE,qBAAqB,GAAIjB,MAAgC,IAAqB;EAClF,MAAMY,GAAG,GAAGC,kBAAkB,CAACb,MAAM,CAAC;EAEtC,OAAO;IACLkB,GAAG,EAAEA,CAACrE,IAAI,EAAEsE,GAAG,KAAI;MACjB,IAAIA,GAAG,KAAKC,SAAS,EAAER,GAAG,CAAC/D,IAAI,CAAC,CAACwE,IAAI,CAACF,GAAG,CAAC;IAC5C,CAAC;IACDG,KAAK,EAAGC,IAAI,IAAI;MACd,KAAK,MAAMC,GAAG,IAAID,IAAI,EAAE;QACtB,MAAME,MAAM,GAAGF,IAAI,CAACC,GAAG,CAAC;QACxB,IAAIC,MAAM,EAAErC,MAAM,EAAE;UAClB,KAAK,IAAIO,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAG8B,MAAM,CAACrC,MAAM,EAAEO,CAAC,EAAE,EAAE;YACtCiB,GAAG,CAACY,GAAG,CAAC,CAACH,IAAI,CAACI,MAAM,CAAC9B,CAAC,CAAC,CAAC;UAC1B;QACF;MACF;IACF,CAAC;IACD+B,QAAQ,EAAEA,CAAA,KAAMd;GACjB;AACH,CAAC;AAQD,MAAMe,WAAW,GAAIC,CAAQ,IAAqBA,CAAC,CAAC1C,IAAI,KAAK,YAAY,IAAI0C,CAAC,CAAC1C,IAAI,KAAK,aAAa;AAErG,MAAM2C,WAAW,GAAID,CAAY,IAAaA,CAAC,CAAC1C,IAAI,KAAK,YAAY,GAAG0C,CAAC,CAAC/E,IAAI,GAAG+E,CAAC,CAACE,IAAI;AAEvF;;;;AAIA,MAAMC,gBAAgB,GAAIC,KAAwB,IAChDA,KAAK,EAAE9C,IAAI,KAAK,OAAO,KAAK/C,SAAS,CAAC8F,WAAW,CAACD,KAAK,CAACE,KAAK,CAAC,IAAI/F,SAAS,CAACgG,YAAY,CAACH,KAAK,CAACE,KAAK,CAAC,CAAC,GAClGF,KAAK,CAACE,KAAK,GACXd,SAAS;AAEf;AACA;AACA;AAEA;;;;;;;;AAQA,MAAMgB,gBAAgB,GAAGA,CACvBC,MAAmB,EACnBL,KAAgB,EAChBM,IAAe,KACO;EACtB;EACA,IAAIN,KAAK,CAACE,KAAK,KAAKd,SAAS,EAAE;IAC7B,OAAOY,KAAK,CAACE,KAAK;EACpB;EAEA;EACA,IAAI/F,SAAS,CAACoG,SAAS,CAACD,IAAI,CAACE,aAAa,CAAC,EAAE;IAC3C,MAAMC,OAAO,GAAGV,gBAAgB,CAACM,MAAM,CAACzC,IAAI,EAAE,CAAC;IAC/C,IAAI6C,OAAO,KAAKrB,SAAS,EAAEiB,MAAM,CAACxC,IAAI,EAAE;IACxC,OAAO4C,OAAO,IAAI,MAAM;EAC1B;EAEA;EACA,MAAMC,IAAI,GAAGL,MAAM,CAACzC,IAAI,EAAE;EAC1B,IAAI8C,IAAI,EAAExD,IAAI,KAAK,OAAO,EAAE;IAC1BmD,MAAM,CAACxC,IAAI,EAAE;IACb,OAAO6C,IAAI,CAACR,KAAK;EACnB;EAEA,OAAOd,SAAS;AAClB,CAAC;AAED;;;;;AAKA,MAAMjE,iBAAiB,GAAGA,CACxBJ,MAA4B,EAC5B4F,QAAsB,KACmC;EACzD,MAAM1F,OAAO,GAAG4D,kBAAkB,CAAC8B,QAAQ,CAAC3C,MAAM,CAAC;EACnD,MAAM9C,SAAS,GAAiB,EAAE;EAClC,MAAMmF,MAAM,GAAG3C,UAAU,CAAC3C,MAAM,CAAC;EAEjC,KAAK,IAAI6E,CAAC,GAAGS,MAAM,CAACxC,IAAI,EAAE,EAAE+B,CAAC,EAAEA,CAAC,GAAGS,MAAM,CAACxC,IAAI,EAAE,EAAE;IAChD,IAAI,CAAC8B,WAAW,CAACC,CAAC,CAAC,EAAE;MACnB1E,SAAS,CAACmE,IAAI,CAACO,CAAC,CAAC;MACjB;IACF;IAEA,MAAMzB,KAAK,GAAGwC,QAAQ,CAAC1C,KAAK,CAACQ,GAAG,CAACoB,WAAW,CAACD,CAAC,CAAC,CAAC;IAChD,IAAI,CAACzB,KAAK,EAAE;MACVjD,SAAS,CAACmE,IAAI,CAACO,CAAC,CAAC;MACjB;IACF;IAEA,MAAMM,KAAK,GAAGE,gBAAgB,CAACC,MAAM,EAAET,CAAC,EAAEzB,KAAK,CAAC;IAChD,IAAI+B,KAAK,KAAKd,SAAS,EAAE;MACvBnE,OAAO,CAACkD,KAAK,CAACtD,IAAI,CAAC,CAACwE,IAAI,CAACa,KAAK,CAAC;IACjC;EACF;EAEA,OAAO;IAAEjF,OAAO;IAAEC;EAAS,CAAE;AAC/B,CAAC;AAED;AACA;AACA;AAEA,MAAM0F,iBAAiB,GAA6B,CAClD,iBAAG1G,KAAK,CAACuC,mBAAmB,CAAClC,YAAY,CAAC,EAC1C,iBAAGL,KAAK,CAACuC,mBAAmB,CAACnC,QAAQ,CAAC,EACtC,iBAAGJ,KAAK,CAACuC,mBAAmB,CAACjC,WAAW,CAAC,EACzC,iBAAGN,KAAK,CAACuC,mBAAmB,CAACpC,eAAe,CAAC,CAC9C;AAED,MAAMe,mBAAmB,gBAAG0B,kBAAkB,CAAC8D,iBAAiB,CAAC;AAEjE;AACA;AACA;AAEA,MAAMC,2BAA2B,GAAGA,CAClCb,KAAgB,EAChBhC,MAAgC,EAChC/B,WAAkC,KACH;EAC/B,MAAM6E,SAAS,GAAGd,KAAK,CAAC9C,IAAI,KAAK,YAAY,GAAG,KAAK8C,KAAK,CAACnF,IAAI,EAAE,GAAG,IAAImF,KAAK,CAACF,IAAI,EAAE;EACpF,MAAMiB,UAAU,GAAkB,EAAE;EAEpC,KAAK,MAAM/B,CAAC,IAAIhB,MAAM,EAAE;IACtB+C,UAAU,CAAC1B,IAAI,CAACL,CAAC,CAACnE,IAAI,CAAC;IACvB,KAAK,MAAM0D,KAAK,IAAIS,CAAC,CAACR,OAAO,EAAE;MAC7BuC,UAAU,CAAC1B,IAAI,CAACd,KAAK,CAAC;IACxB;EACF;EAEA,MAAMyC,WAAW,GAAG5G,OAAO,CAACyF,WAAW,CAACG,KAAK,CAAC,EAAEe,UAAU,CAAC,CACxDnC,GAAG,CAAEqC,CAAC,IAAMA,CAAC,CAAC7D,MAAM,KAAK,CAAC,GAAG,IAAI6D,CAAC,EAAE,GAAG,KAAKA,CAAC,EAAG,CAAC;EAEpD,OAAO,IAAIhH,QAAQ,CAACiH,kBAAkB,CAAC;IACrCC,MAAM,EAAEL,SAAS;IACjBE,WAAW;IACXhF,OAAO,EAAEC;GACV,CAAC;AACJ,CAAC;AAED;AACA;AACA;AAEA,MAAMmF,gBAAgB,GAAIT,QAAsB,KAAkB;EAChErF,KAAK,EAAE2D,qBAAqB,CAAC0B,QAAQ,CAAC3C,MAAM,CAAC;EAC7CzC,SAAS,EAAE,EAAE;EACb4B,MAAM,EAAE,EAAE;EACVkE,IAAI,EAAE;IAAEnE,IAAI,EAAE;EAAoB;CACnC,CAAC;AAEF,MAAMoE,YAAY,GAAIC,KAAiB,KAAkB;EACvDrE,IAAI,EAAE,MAAM;EACZ5B,KAAK,EAAEiG,KAAK,CAACjG,KAAK,CAACoE,QAAQ,EAAE;EAC7BnE,SAAS,EAAEgG,KAAK,CAAChG,SAAS;EAC1B4B,MAAM,EAAEoE,KAAK,CAACpE;CACf,CAAC;AAEF;AACA;AACA;AAEA;;;;;;;;;;;AAWA,MAAMqE,iBAAiB,GAAGA,CACxBtB,KAAa,EACbG,MAAmB,EACnBtD,OAAuB,EACvBwE,KAAiB,KACG;EACpB,MAAM;IAAEvF,OAAO;IAAEC,WAAW;IAAEY;EAAY,CAAE,GAAGE,OAAO;EACtD,MAAM0E,QAAQ,GAAG/C,oBAAoB,CAAC1C,OAAO,CAAC2C,WAAW,CAAC;EAC1D,MAAMnB,GAAG,GAAGiE,QAAQ,CAAChD,GAAG,CAACyB,KAAK,CAAC;EAE/B,IAAI1C,GAAG,EAAE;IACP;IACA,MAAMkE,IAAI,GAAGvG,iBAAiB,CAACkF,MAAM,CAACvC,IAAI,EAAE,EAAEjB,YAAY,CAAC;IAC3D0E,KAAK,CAACjG,KAAK,CAACgE,KAAK,CAACoC,IAAI,CAACzG,OAAO,CAAC;IAE/B,OAAO;MACLiC,IAAI,EAAE,YAAY;MAClBF,MAAM,EAAE;QACNE,IAAI,EAAE,KAAK;QACX5B,KAAK,EAAEiG,KAAK,CAACjG,KAAK,CAACoE,QAAQ,EAAE;QAC7BlC,GAAG;QACHF,WAAW,EAAEoE,IAAI,CAACxG,SAAS;QAC3BiC,MAAM,EAAEoE,KAAK,CAACpE;;KAEjB;EACH;EAEA;EACA,MAAMwE,WAAW,GAAGlH,MAAM,CAACuB,OAAO,CAAC,CAACO,MAAM,CAAChB,SAAS,CAAC6B,MAAM,GAAG,CAAC;EAC/D,IAAI,CAACuE,WAAW,IAAIF,QAAQ,CAACG,IAAI,GAAG,CAAC,EAAE;IACrC,MAAMZ,WAAW,GAAG5G,OAAO,CAAC8F,KAAK,EAAElE,OAAO,CAAC2C,WAAW,CAACC,GAAG,CAAEiD,CAAC,IAAKA,CAAC,CAAChH,IAAI,CAAC,CAAC;IAC1E0G,KAAK,CAACpE,MAAM,CAACkC,IAAI,CACf,IAAIpF,QAAQ,CAAC6H,iBAAiB,CAAC;MAC7BlH,UAAU,EAAEsF,KAAK;MACjB6B,MAAM,EAAE9F,WAAW;MACnB+E;KACD,CAAC,CACH;EACH;EAEA,OAAO;IAAE9D,IAAI,EAAE;EAAU,CAAE;AAC7B,CAAC;AAED;AACA;AACA;AAEA;;;;AAIA,MAAM8E,WAAW,GAAGA,CAClBhC,KAAgB,EAChBK,MAAmB,EACnBtD,OAAuB,EACvBwE,KAAiB,KACT;EACR,MAAM;IAAEtF,WAAW;IAAEY;EAAY,CAAE,GAAGE,OAAO;EAC7C,MAAMlC,IAAI,GAAGgF,WAAW,CAACG,KAAK,CAAC;EAC/B,MAAMM,IAAI,GAAGzD,YAAY,CAACoB,KAAK,CAACQ,GAAG,CAAC5D,IAAI,CAAC;EAEzC,IAAI,CAACyF,IAAI,EAAE;IACTiB,KAAK,CAACpE,MAAM,CAACkC,IAAI,CAACwB,2BAA2B,CAACb,KAAK,EAAEnD,YAAY,CAACmB,MAAM,EAAE/B,WAAW,CAAC,CAAC;IACvF;EACF;EAEAsF,KAAK,CAACjG,KAAK,CAAC4D,GAAG,CAACoB,IAAI,CAACzF,IAAI,EAAEuF,gBAAgB,CAACC,MAAM,EAAEL,KAAK,EAAEM,IAAI,CAAC,CAAC;AACnE,CAAC;AAED;;;;;;;;;;;AAWA,MAAM2B,YAAY,GAAGA,CACnB/B,KAAa,EACbG,MAAmB,EACnBtD,OAAuB,EACvBwE,KAAiB,KACe;EAChC,IAAIA,KAAK,CAACF,IAAI,CAACnE,IAAI,KAAK,oBAAoB,EAAE;IAC5C,MAAMF,MAAM,GAAGwE,iBAAiB,CAACtB,KAAK,EAAEG,MAAM,EAAEtD,OAAO,EAAEwE,KAAK,CAAC;IAE/D,IAAIvE,MAAM,CAACE,IAAI,KAAK,YAAY,EAAE;MAChC,OAAOF,MAAM,CAACA,MAAM;IACtB;IAEAuE,KAAK,CAACF,IAAI,GAAG;MAAEnE,IAAI,EAAE;IAAqB,CAAE;EAC9C;EAEAqE,KAAK,CAAChG,SAAS,CAAC8D,IAAI,CAACa,KAAK,CAAC;EAC3B,OAAOd,SAAS;AAClB,CAAC;AAED;AACA;AACA;AAEA;;;;;;;;;AASA,MAAMnC,gBAAgB,GAAGA,CACvBlC,MAA4B,EAC5BgC,OAAuB,KACR;EACf,MAAMsD,MAAM,GAAG3C,UAAU,CAAC3C,MAAM,CAAC;EACjC,MAAMwG,KAAK,GAAGH,gBAAgB,CAACrE,OAAO,CAACF,YAAY,CAAC;EAEpD,KAAK,IAAImD,KAAK,GAAGK,MAAM,CAACxC,IAAI,EAAE,EAAEmC,KAAK,EAAEA,KAAK,GAAGK,MAAM,CAACxC,IAAI,EAAE,EAAE;IAC5D,IAAI8B,WAAW,CAACK,KAAK,CAAC,EAAE;MACtBgC,WAAW,CAAChC,KAAK,EAAEK,MAAM,EAAEtD,OAAO,EAAEwE,KAAK,CAAC;MAC1C;IACF;IAEA,IAAIvB,KAAK,CAAC9C,IAAI,KAAK,OAAO,EAAE;MAC1B,MAAMgF,SAAS,GAAGD,YAAY,CAACjC,KAAK,CAACE,KAAK,EAAEG,MAAM,EAAEtD,OAAO,EAAEwE,KAAK,CAAC;MACnE,IAAIW,SAAS,EAAE,OAAOA,SAAS;IACjC;EACF;EAEA,OAAOZ,YAAY,CAACC,KAAK,CAAC;AAC5B,CAAC","ignoreList":[]}
+{"version":3,"file":"parser.js","names":["Effect","Option","CliError","Param","Primitive","suggest","completionsFlag","helpFlag","logLevelFlag","versionFlag","toImpl","getCommandPath","parsedInput","subcommand","name","extractBuiltInOptions","tokens","gen","flagMap","remainder","consumeKnownFlags","builtInFlagRegistry","emptyArgs","flags","arguments","help","parse","logLevel","version","completions","getOrUndefined","parseArgs","lexResult","command","commandPath","trailingOperands","afterEndOfOptions","newCommandPath","commandImpl","singles","config","flatMap","extractSingleParams","flagParams","filter","isFlagParam","flagRegistry","createFlagRegistry","context","result","scanCommandLevel","_tag","errors","length","subLex","childTokens","subParsed","sub","allErrors","makeCursor","i","peek","take","rest","slice","params","index","Map","param","has","Error","set","alias","aliases","get","buildSubcommandIndex","subcommands","group","commands","createEmptyFlagMap","Object","fromEntries","map","p","createFlagAccumulator","add","raw","undefined","push","merge","from","key","values","snapshot","isFlagToken","t","getFlagName","flag","asBooleanLiteral","token","isTrueValue","value","isFalseValue","consumeFlagValue","cursor","spec","isBoolean","primitiveType","literal","next","registry","builtInFlagParams","createUnrecognizedFlagError","printable","validNames","suggestions","n","UnrecognizedOption","option","createParseState","mode","toLeafResult","state","resolveFirstValue","subIndex","tail","expectsArgs","size","Array","keys","UnknownSubcommand","parent","processFlag","processValue","subResult"],"sources":["../../../../src/unstable/cli/internal/parser.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;AA0BA,OAAO,KAAKA,MAAM,MAAM,oBAAoB;AAE5C,OAAO,KAAKC,MAAM,MAAM,oBAAoB;AAC5C,OAAO,KAAKC,QAAQ,MAAM,gBAAgB;AAE1C,OAAO,KAAKC,KAAK,MAAM,aAAa;AACpC,OAAO,KAAKC,SAAS,MAAM,iBAAiB;AAC5C,SAASC,OAAO,QAAQ,mBAAmB;AAC3C,SAASC,eAAe,EAAEC,QAAQ,EAAEC,YAAY,EAAEC,WAAW,QAAQ,mBAAmB;AACxF,SAASC,MAAM,QAAQ,cAAc;AAGrC;AACA;AACA;AAEA;AACA,OAAO,MAAMC,cAAc,GAAIC,WAAyB,IACtDA,WAAW,CAACC,UAAU,GAClB,CAACD,WAAW,CAACC,UAAU,CAACC,IAAI,EAAE,GAAGH,cAAc,CAACC,WAAW,CAACC,UAAU,CAACD,WAAW,CAAC,CAAC,GACpF,EAAE;AAER;AACA,OAAO,MAAMG,qBAAqB,GAChCC,MAA4B,IAY5BhB,MAAM,CAACiB,GAAG,CAAC,aAAS;EAClB,MAAM;IAAEC,OAAO;IAAEC;EAAS,CAAE,GAAGC,iBAAiB,CAACJ,MAAM,EAAEK,mBAAmB,CAAC;EAC7E,MAAMC,SAAS,GAAqB;IAAEC,KAAK,EAAEL,OAAO;IAAEM,SAAS,EAAE;EAAE,CAAE;EACrE,MAAM,GAAGC,IAAI,CAAC,GAAG,OAAOlB,QAAQ,CAACmB,KAAK,CAACJ,SAAS,CAAC;EACjD,MAAM,GAAGK,QAAQ,CAAC,GAAG,OAAOnB,YAAY,CAACkB,KAAK,CAACJ,SAAS,CAAC;EACzD,MAAM,GAAGM,OAAO,CAAC,GAAG,OAAOnB,WAAW,CAACiB,KAAK,CAACJ,SAAS,CAAC;EACvD,MAAM,GAAGO,WAAW,CAAC,GAAG,OAAOvB,eAAe,CAACoB,KAAK,CAACJ,SAAS,CAAC;EAC/D,OAAO;IACLG,IAAI;IACJE,QAAQ,EAAE1B,MAAM,CAAC6B,cAAc,CAACH,QAAQ,CAAC;IACzCC,OAAO;IACPC,WAAW,EAAE5B,MAAM,CAAC6B,cAAc,CAACD,WAAW,CAAC;IAC/CV;GACD;AACH,CAAC,CAAC;AAEJ;AACA,OAAO,MAAMY,SAAS,GAAGA,CACvBC,SAAoB,EACpBC,OAAoB,EACpBC,WAAA,GAAqC,EAAE,KAEvClC,MAAM,CAACiB,GAAG,CAAC,aAAS;EAClB,MAAM;IAAED,MAAM;IAAEmB,gBAAgB,EAAEC;EAAiB,CAAE,GAAGJ,SAAS;EACjE,MAAMK,cAAc,GAAG,CAAC,GAAGH,WAAW,EAAED,OAAO,CAACnB,IAAI,CAAC;EAErD,MAAMwB,WAAW,GAAG5B,MAAM,CAACuB,OAAO,CAAC;EACnC,MAAMM,OAAO,GAAGD,WAAW,CAACE,MAAM,CAACjB,KAAK,CAACkB,OAAO,CAACtC,KAAK,CAACuC,mBAAmB,CAAC;EAC3E,MAAMC,UAAU,GAAGJ,OAAO,CAACK,MAAM,CAACzC,KAAK,CAAC0C,WAAW,CAAC;EACpD,MAAMC,YAAY,GAAGC,kBAAkB,CAACJ,UAAU,CAAC;EAEnD,MAAMK,OAAO,GAAmB;IAC9Bf,OAAO;IACPC,WAAW,EAAEG,cAAc;IAC3BS;GACD;EAED,MAAMG,MAAM,GAAGC,gBAAgB,CAAClC,MAAM,EAAEgC,OAAO,CAAC;EAEhD,IAAIC,MAAM,CAACE,IAAI,KAAK,MAAM,EAAE;IAC1B,OAAO;MACL5B,KAAK,EAAE0B,MAAM,CAAC1B,KAAK;MACnBC,SAAS,EAAE,CAAC,GAAGyB,MAAM,CAACzB,SAAS,EAAE,GAAGY,iBAAiB,CAAC;MACtD,IAAIa,MAAM,CAACG,MAAM,CAACC,MAAM,GAAG,CAAC,IAAI;QAAED,MAAM,EAAEH,MAAM,CAACG;MAAM,CAAE;KAC1D;EACH;EAEA,MAAME,MAAM,GAAc;IAAEtC,MAAM,EAAEiC,MAAM,CAACM,WAAW;IAAEpB,gBAAgB,EAAE;EAAE,CAAE;EAC9E,MAAMqB,SAAS,GAAG,OAAOzB,SAAS,CAChCuB,MAAM,EACNL,MAAM,CAACQ,GAAG,EACVpB,cAAc,CACf;EAED,MAAMqB,SAAS,GAAG,CAAC,GAAGT,MAAM,CAACG,MAAM,EAAE,IAAII,SAAS,CAACJ,MAAM,IAAI,EAAE,CAAC,CAAC;EACjE,OAAO;IACL7B,KAAK,EAAE0B,MAAM,CAAC1B,KAAK;IACnBC,SAAS,EAAEY,iBAAiB;IAC5BvB,UAAU,EAAE;MAAEC,IAAI,EAAEmC,MAAM,CAACQ,GAAG,CAAC3C,IAAI;MAAEF,WAAW,EAAE4C;IAAS,CAAE;IAC7D,IAAIE,SAAS,CAACL,MAAM,GAAG,CAAC,IAAI;MAAED,MAAM,EAAEM;IAAS,CAAE;GAClD;AACH,CAAC,CAAC;AAgHJ,MAAMC,UAAU,GAAI3C,MAA4B,IAAiB;EAC/D,IAAI4C,CAAC,GAAG,CAAC;EACT,OAAO;IACLC,IAAI,EAAEA,CAAA,KAAM7C,MAAM,CAAC4C,CAAC,CAAC;IACrBE,IAAI,EAAEA,CAAA,KAAM9C,MAAM,CAAC4C,CAAC,EAAE,CAAC;IACvBG,IAAI,EAAEA,CAAA,KAAM/C,MAAM,CAACgD,KAAK,CAACJ,CAAC;GAC3B;AACH,CAAC;AAED;AACA;AACA;AAEA;;;;AAIA,MAAMb,kBAAkB,GAAIkB,MAAgC,IAAkB;EAC5E,MAAMC,KAAK,GAAG,IAAIC,GAAG,EAAqB;EAE1C,KAAK,MAAMC,KAAK,IAAIH,MAAM,EAAE;IAC1B,IAAIC,KAAK,CAACG,GAAG,CAACD,KAAK,CAACtD,IAAI,CAAC,EAAE;MACzB,MAAM,IAAIwD,KAAK,CAAC,wBAAwBF,KAAK,CAACtD,IAAI,yBAAyB,CAAC;IAC9E;IACAoD,KAAK,CAACK,GAAG,CAACH,KAAK,CAACtD,IAAI,EAAEsD,KAAK,CAAC;IAE5B,KAAK,MAAMI,KAAK,IAAIJ,KAAK,CAACK,OAAO,EAAE;MACjC,IAAIP,KAAK,CAACG,GAAG,CAACG,KAAK,CAAC,EAAE;QACpB,MAAM,IAAIF,KAAK,CACb,yBAAyBE,KAAK,4CAA4CN,KAAK,CAACQ,GAAG,CAACF,KAAK,CAAE,CAAC1D,IAAI,IAAI,CACrG;MACH;MACAoD,KAAK,CAACK,GAAG,CAACC,KAAK,EAAEJ,KAAK,CAAC;IACzB;EACF;EAEA,OAAO;IAAEH,MAAM;IAAEC;EAAK,CAAE;AAC1B,CAAC;AAED,MAAMS,oBAAoB,GACxBC,WAAuC,IACoB;EAC3D,MAAMV,KAAK,GAAG,IAAIC,GAAG,EAAsD;EAC3E,KAAK,MAAMU,KAAK,IAAID,WAAW,EAAE;IAC/B,KAAK,MAAM/D,UAAU,IAAIgE,KAAK,CAACC,QAAQ,EAAE;MACvCZ,KAAK,CAACK,GAAG,CAAC1D,UAAU,CAACC,IAAI,EAAED,UAAU,CAAC;IACxC;EACF;EACA,OAAOqD,KAAK;AACd,CAAC;AAED;AACA;AACA;AAEA;AACA,MAAMa,kBAAkB,GAAId,MAAgC,IAC1De,MAAM,CAACC,WAAW,CAAChB,MAAM,CAACiB,GAAG,CAAEC,CAAC,IAAK,CAACA,CAAC,CAACrE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;AAErD;;;;AAIA,MAAMsE,qBAAqB,GAAInB,MAAgC,IAAqB;EAClF,MAAMiB,GAAG,GAAGH,kBAAkB,CAACd,MAAM,CAAC;EAEtC,OAAO;IACLoB,GAAG,EAAEA,CAACvE,IAAI,EAAEwE,GAAG,KAAI;MACjB,IAAIA,GAAG,KAAKC,SAAS,EAAEL,GAAG,CAACpE,IAAI,CAAC,CAAC0E,IAAI,CAACF,GAAG,CAAC;IAC5C,CAAC;IACDG,KAAK,EAAGC,IAAI,IAAI;MACd,KAAK,MAAMC,GAAG,IAAID,IAAI,EAAE;QACtB,MAAME,MAAM,GAAGF,IAAI,CAACC,GAAG,CAAC;QACxB,IAAIC,MAAM,EAAEvC,MAAM,EAAE;UAClB,KAAK,IAAIO,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGgC,MAAM,CAACvC,MAAM,EAAEO,CAAC,EAAE,EAAE;YACtCsB,GAAG,CAACS,GAAG,CAAC,CAACH,IAAI,CAACI,MAAM,CAAChC,CAAC,CAAC,CAAC;UAC1B;QACF;MACF;IACF,CAAC;IACDiC,QAAQ,EAAEA,CAAA,KAAMX;GACjB;AACH,CAAC;AAQD,MAAMY,WAAW,GAAIC,CAAQ,IAAqBA,CAAC,CAAC5C,IAAI,KAAK,YAAY,IAAI4C,CAAC,CAAC5C,IAAI,KAAK,aAAa;AAErG,MAAM6C,WAAW,GAAID,CAAY,IAAaA,CAAC,CAAC5C,IAAI,KAAK,YAAY,GAAG4C,CAAC,CAACjF,IAAI,GAAGiF,CAAC,CAACE,IAAI;AAEvF;;;;AAIA,MAAMC,gBAAgB,GAAIC,KAAwB,IAChDA,KAAK,EAAEhD,IAAI,KAAK,OAAO,KAAK/C,SAAS,CAACgG,WAAW,CAACD,KAAK,CAACE,KAAK,CAAC,IAAIjG,SAAS,CAACkG,YAAY,CAACH,KAAK,CAACE,KAAK,CAAC,CAAC,GAClGF,KAAK,CAACE,KAAK,GACXd,SAAS;AAEf;AACA;AACA;AAEA;;;;;;;;AAQA,MAAMgB,gBAAgB,GAAGA,CACvBC,MAAmB,EACnBL,KAAgB,EAChBM,IAAe,KACO;EACtB;EACA,IAAIN,KAAK,CAACE,KAAK,KAAKd,SAAS,EAAE;IAC7B,OAAOY,KAAK,CAACE,KAAK;EACpB;EAEA;EACA,IAAIjG,SAAS,CAACsG,SAAS,CAACD,IAAI,CAACE,aAAa,CAAC,EAAE;IAC3C,MAAMC,OAAO,GAAGV,gBAAgB,CAACM,MAAM,CAAC3C,IAAI,EAAE,CAAC;IAC/C,IAAI+C,OAAO,KAAKrB,SAAS,EAAEiB,MAAM,CAAC1C,IAAI,EAAE;IACxC,OAAO8C,OAAO,IAAI,MAAM;EAC1B;EAEA;EACA,MAAMC,IAAI,GAAGL,MAAM,CAAC3C,IAAI,EAAE;EAC1B,IAAIgD,IAAI,EAAE1D,IAAI,KAAK,OAAO,EAAE;IAC1BqD,MAAM,CAAC1C,IAAI,EAAE;IACb,OAAO+C,IAAI,CAACR,KAAK;EACnB;EAEA,OAAOd,SAAS;AAClB,CAAC;AAED;;;;;AAKA,MAAMnE,iBAAiB,GAAGA,CACxBJ,MAA4B,EAC5B8F,QAAsB,KACmC;EACzD,MAAM5F,OAAO,GAAG6D,kBAAkB,CAAC+B,QAAQ,CAAC7C,MAAM,CAAC;EACnD,MAAM9C,SAAS,GAAiB,EAAE;EAClC,MAAMqF,MAAM,GAAG7C,UAAU,CAAC3C,MAAM,CAAC;EAEjC,KAAK,IAAI+E,CAAC,GAAGS,MAAM,CAAC1C,IAAI,EAAE,EAAEiC,CAAC,EAAEA,CAAC,GAAGS,MAAM,CAAC1C,IAAI,EAAE,EAAE;IAChD,IAAI,CAACgC,WAAW,CAACC,CAAC,CAAC,EAAE;MACnB5E,SAAS,CAACqE,IAAI,CAACO,CAAC,CAAC;MACjB;IACF;IAEA,MAAM3B,KAAK,GAAG0C,QAAQ,CAAC5C,KAAK,CAACQ,GAAG,CAACsB,WAAW,CAACD,CAAC,CAAC,CAAC;IAChD,IAAI,CAAC3B,KAAK,EAAE;MACVjD,SAAS,CAACqE,IAAI,CAACO,CAAC,CAAC;MACjB;IACF;IAEA,MAAMM,KAAK,GAAGE,gBAAgB,CAACC,MAAM,EAAET,CAAC,EAAE3B,KAAK,CAAC;IAChD,IAAIiC,KAAK,KAAKd,SAAS,EAAE;MACvBrE,OAAO,CAACkD,KAAK,CAACtD,IAAI,CAAC,CAAC0E,IAAI,CAACa,KAAK,CAAC;IACjC;EACF;EAEA,OAAO;IAAEnF,OAAO;IAAEC;EAAS,CAAE;AAC/B,CAAC;AAED;AACA;AACA;AAEA,MAAM4F,iBAAiB,GAA6B,CAClD,iBAAG5G,KAAK,CAACuC,mBAAmB,CAAClC,YAAY,CAAC,EAC1C,iBAAGL,KAAK,CAACuC,mBAAmB,CAACnC,QAAQ,CAAC,EACtC,iBAAGJ,KAAK,CAACuC,mBAAmB,CAACjC,WAAW,CAAC,EACzC,iBAAGN,KAAK,CAACuC,mBAAmB,CAACpC,eAAe,CAAC,CAC9C;AAED,MAAMe,mBAAmB,gBAAG0B,kBAAkB,CAACgE,iBAAiB,CAAC;AAEjE;AACA;AACA;AAEA,MAAMC,2BAA2B,GAAGA,CAClCb,KAAgB,EAChBlC,MAAgC,EAChC/B,WAAkC,KACH;EAC/B,MAAM+E,SAAS,GAAGd,KAAK,CAAChD,IAAI,KAAK,YAAY,GAAG,KAAKgD,KAAK,CAACrF,IAAI,EAAE,GAAG,IAAIqF,KAAK,CAACF,IAAI,EAAE;EACpF,MAAMiB,UAAU,GAAkB,EAAE;EAEpC,KAAK,MAAM/B,CAAC,IAAIlB,MAAM,EAAE;IACtBiD,UAAU,CAAC1B,IAAI,CAACL,CAAC,CAACrE,IAAI,CAAC;IACvB,KAAK,MAAM0D,KAAK,IAAIW,CAAC,CAACV,OAAO,EAAE;MAC7ByC,UAAU,CAAC1B,IAAI,CAAChB,KAAK,CAAC;IACxB;EACF;EAEA,MAAM2C,WAAW,GAAG9G,OAAO,CAAC2F,WAAW,CAACG,KAAK,CAAC,EAAEe,UAAU,CAAC,CACxDhC,GAAG,CAAEkC,CAAC,IAAMA,CAAC,CAAC/D,MAAM,KAAK,CAAC,GAAG,IAAI+D,CAAC,EAAE,GAAG,KAAKA,CAAC,EAAG,CAAC;EAEpD,OAAO,IAAIlH,QAAQ,CAACmH,kBAAkB,CAAC;IACrCC,MAAM,EAAEL,SAAS;IACjBE,WAAW;IACXlF,OAAO,EAAEC;GACV,CAAC;AACJ,CAAC;AAED;AACA;AACA;AAEA,MAAMqF,gBAAgB,GAAIT,QAAsB,KAAkB;EAChEvF,KAAK,EAAE6D,qBAAqB,CAAC0B,QAAQ,CAAC7C,MAAM,CAAC;EAC7CzC,SAAS,EAAE,EAAE;EACb4B,MAAM,EAAE,EAAE;EACVoE,IAAI,EAAE;IAAErE,IAAI,EAAE;EAAoB;CACnC,CAAC;AAEF,MAAMsE,YAAY,GAAIC,KAAiB,KAAkB;EACvDvE,IAAI,EAAE,MAAM;EACZ5B,KAAK,EAAEmG,KAAK,CAACnG,KAAK,CAACsE,QAAQ,EAAE;EAC7BrE,SAAS,EAAEkG,KAAK,CAAClG,SAAS;EAC1B4B,MAAM,EAAEsE,KAAK,CAACtE;CACf,CAAC;AAEF;AACA;AACA;AAEA;;;;;;;;;;;AAWA,MAAMuE,iBAAiB,GAAGA,CACxBtB,KAAa,EACbG,MAAmB,EACnBxD,OAAuB,EACvB0E,KAAiB,KACG;EACpB,MAAM;IAAEzF,OAAO;IAAEC,WAAW;IAAEY;EAAY,CAAE,GAAGE,OAAO;EACtD,MAAM4E,QAAQ,GAAGjD,oBAAoB,CAAC1C,OAAO,CAAC2C,WAAW,CAAC;EAC1D,MAAMnB,GAAG,GAAGmE,QAAQ,CAAClD,GAAG,CAAC2B,KAAK,CAAC;EAE/B,IAAI5C,GAAG,EAAE;IACP;IACA,MAAMoE,IAAI,GAAGzG,iBAAiB,CAACoF,MAAM,CAACzC,IAAI,EAAE,EAAEjB,YAAY,CAAC;IAC3D4E,KAAK,CAACnG,KAAK,CAACkE,KAAK,CAACoC,IAAI,CAAC3G,OAAO,CAAC;IAE/B,OAAO;MACLiC,IAAI,EAAE,YAAY;MAClBF,MAAM,EAAE;QACNE,IAAI,EAAE,KAAK;QACX5B,KAAK,EAAEmG,KAAK,CAACnG,KAAK,CAACsE,QAAQ,EAAE;QAC7BpC,GAAG;QACHF,WAAW,EAAEsE,IAAI,CAAC1G,SAAS;QAC3BiC,MAAM,EAAEsE,KAAK,CAACtE;;KAEjB;EACH;EAEA;EACA,MAAM0E,WAAW,GAAGpH,MAAM,CAACuB,OAAO,CAAC,CAACO,MAAM,CAAChB,SAAS,CAAC6B,MAAM,GAAG,CAAC;EAC/D,IAAI,CAACyE,WAAW,IAAIF,QAAQ,CAACG,IAAI,GAAG,CAAC,EAAE;IACrC,MAAMZ,WAAW,GAAG9G,OAAO,CAACgG,KAAK,EAAE2B,KAAK,CAACtC,IAAI,CAACkC,QAAQ,CAACK,IAAI,EAAE,CAAC,CAAC;IAC/DP,KAAK,CAACtE,MAAM,CAACoC,IAAI,CACf,IAAItF,QAAQ,CAACgI,iBAAiB,CAAC;MAC7BrH,UAAU,EAAEwF,KAAK;MACjB8B,MAAM,EAAEjG,WAAW;MACnBiF;KACD,CAAC,CACH;EACH;EAEA,OAAO;IAAEhE,IAAI,EAAE;EAAU,CAAE;AAC7B,CAAC;AAED;AACA;AACA;AAEA;;;;AAIA,MAAMiF,WAAW,GAAGA,CAClBjC,KAAgB,EAChBK,MAAmB,EACnBxD,OAAuB,EACvB0E,KAAiB,KACT;EACR,MAAM;IAAExF,WAAW;IAAEY;EAAY,CAAE,GAAGE,OAAO;EAC7C,MAAMlC,IAAI,GAAGkF,WAAW,CAACG,KAAK,CAAC;EAC/B,MAAMM,IAAI,GAAG3D,YAAY,CAACoB,KAAK,CAACQ,GAAG,CAAC5D,IAAI,CAAC;EAEzC,IAAI,CAAC2F,IAAI,EAAE;IACTiB,KAAK,CAACtE,MAAM,CAACoC,IAAI,CAACwB,2BAA2B,CAACb,KAAK,EAAErD,YAAY,CAACmB,MAAM,EAAE/B,WAAW,CAAC,CAAC;IACvF;EACF;EAEAwF,KAAK,CAACnG,KAAK,CAAC8D,GAAG,CAACoB,IAAI,CAAC3F,IAAI,EAAEyF,gBAAgB,CAACC,MAAM,EAAEL,KAAK,EAAEM,IAAI,CAAC,CAAC;AACnE,CAAC;AAED;;;;;;;;;;;AAWA,MAAM4B,YAAY,GAAGA,CACnBhC,KAAa,EACbG,MAAmB,EACnBxD,OAAuB,EACvB0E,KAAiB,KACe;EAChC,IAAIA,KAAK,CAACF,IAAI,CAACrE,IAAI,KAAK,oBAAoB,EAAE;IAC5C,MAAMF,MAAM,GAAG0E,iBAAiB,CAACtB,KAAK,EAAEG,MAAM,EAAExD,OAAO,EAAE0E,KAAK,CAAC;IAE/D,IAAIzE,MAAM,CAACE,IAAI,KAAK,YAAY,EAAE;MAChC,OAAOF,MAAM,CAACA,MAAM;IACtB;IAEAyE,KAAK,CAACF,IAAI,GAAG;MAAErE,IAAI,EAAE;IAAqB,CAAE;EAC9C;EAEAuE,KAAK,CAAClG,SAAS,CAACgE,IAAI,CAACa,KAAK,CAAC;EAC3B,OAAOd,SAAS;AAClB,CAAC;AAED;AACA;AACA;AAEA;;;;;;;;;AASA,MAAMrC,gBAAgB,GAAGA,CACvBlC,MAA4B,EAC5BgC,OAAuB,KACR;EACf,MAAMwD,MAAM,GAAG7C,UAAU,CAAC3C,MAAM,CAAC;EACjC,MAAM0G,KAAK,GAAGH,gBAAgB,CAACvE,OAAO,CAACF,YAAY,CAAC;EAEpD,KAAK,IAAIqD,KAAK,GAAGK,MAAM,CAAC1C,IAAI,EAAE,EAAEqC,KAAK,EAAEA,KAAK,GAAGK,MAAM,CAAC1C,IAAI,EAAE,EAAE;IAC5D,IAAIgC,WAAW,CAACK,KAAK,CAAC,EAAE;MACtBiC,WAAW,CAACjC,KAAK,EAAEK,MAAM,EAAExD,OAAO,EAAE0E,KAAK,CAAC;MAC1C;IACF;IAEA,IAAIvB,KAAK,CAAChD,IAAI,KAAK,OAAO,EAAE;MAC1B,MAAMmF,SAAS,GAAGD,YAAY,CAAClC,KAAK,CAACE,KAAK,EAAEG,MAAM,EAAExD,OAAO,EAAE0E,KAAK,CAAC;MACnE,IAAIY,SAAS,EAAE,OAAOA,SAAS;IACjC;EACF;EAEA,OAAOb,YAAY,CAACC,KAAK,CAAC;AAC5B,CAAC","ignoreList":[]}

package/dist/unstable/cluster/ClusterCron.d.ts

@@ -35,6 +35,6 @@ export declare const make: <E, R>(options: {
      *
      * Defaults to "1 day".
      */
-    readonly skipIfOlderThan?: Duration.DurationInput | undefined;
+    readonly skipIfOlderThan?: Duration.Input | undefined;
 }) => Layer.Layer<never, never, Sharding | Exclude<R, Scope>>;
 //# sourceMappingURL=ClusterCron.d.ts.map

package/dist/unstable/cluster/ClusterCron.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClusterCron.d.ts","sourceRoot":"","sources":["../../../src/unstable/cluster/ClusterCron.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,IAAI,MAAM,eAAe,CAAA;AAErC,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AAEzC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AAKvC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAM3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAG7C;;;GAGG;AACH,eAAO,MAAM,IAAI,GAAI,CAAC,EAAE,CAAC,EAAE,SAAS;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAA;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IAE3C;;OAEG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAExC;;;;;OAKG;IACH,QAAQ,CAAC,4BAA4B,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAE3D;;;;;;;;OAQG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;CAC9D,KAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,EAAE,KAAK,CAAC,CAuEzD,CAAA"}
+{"version":3,"file":"ClusterCron.d.ts","sourceRoot":"","sources":["../../../src/unstable/cluster/ClusterCron.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,IAAI,MAAM,eAAe,CAAA;AAErC,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AAEzC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AAKvC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAM3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAG7C;;;GAGG;AACH,eAAO,MAAM,IAAI,GAAI,CAAC,EAAE,CAAC,EAAE,SAAS;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAA;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IAE3C;;OAEG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAExC;;;;;OAKG;IACH,QAAQ,CAAC,4BAA4B,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAE3D;;;;;;;;OAQG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAA;CACtD,KAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,EAAE,KAAK,CAAC,CAuEzD,CAAA"}

package/dist/unstable/cluster/ClusterCron.js

@@ -38,7 +38,7 @@ export const make = options => {
   }), {
     shardGroup: options.shardGroup
   });
-  const skipIfOlderThan = Option.fromUndefinedOr(options.skipIfOlderThan).pipe(Option.map(Duration.fromDurationInputUnsafe), Option.getOrElse(() => Duration.days(1)));
+  const skipIfOlderThan = Option.fromUndefinedOr(options.skipIfOlderThan).pipe(Option.map(Duration.fromInputUnsafe), Option.getOrElse(() => Duration.days(1)));
   const effect = Effect.fnUntraced(function* (dateTime) {
     const now = yield* DateTime.now;
     if (DateTime.isLessThan(dateTime, DateTime.subtractDuration(now, skipIfOlderThan))) {

package/dist/unstable/cluster/ClusterCron.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClusterCron.js","names":["Cron","DateTime","Duration","Effect","Exit","Layer","Option","PrimaryKey","Schedule","Schema","Rpc","ClusterSchema","Persisted","Uninterruptible","DeliverAt","Entity","Singleton","make","options","CronEntity","name","payload","CronPayload","annotate","ShardGroup","shardGroup","ClientTracingEnabled","InitialRun","gen","now","next","fromDateUnsafe","cron","entityId","calculateNextRunFromPrevious","formatIso","client","run","dateTime","discard","skipIfOlderThan","fromUndefinedOr","pipe","map","fromDurationInputUnsafe","getOrElse","days","effect","fnUntraced","isLessThan","subtractDuration","execute","orDie","EntityLayer","toLayer","makeClient","request","onExitPrimitive","exit","isFailure","logWarning","cause","tapCause","sandbox","retry","retryPolicy","annotateLogs","module","merge","exponential","either","spaced","Class","DateTimeUtc","symbol"],"sources":["../../../src/unstable/cluster/ClusterCron.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ClusterCron.js","names":["Cron","DateTime","Duration","Effect","Exit","Layer","Option","PrimaryKey","Schedule","Schema","Rpc","ClusterSchema","Persisted","Uninterruptible","DeliverAt","Entity","Singleton","make","options","CronEntity","name","payload","CronPayload","annotate","ShardGroup","shardGroup","ClientTracingEnabled","InitialRun","gen","now","next","fromDateUnsafe","cron","entityId","calculateNextRunFromPrevious","formatIso","client","run","dateTime","discard","skipIfOlderThan","fromUndefinedOr","pipe","map","fromInputUnsafe","getOrElse","days","effect","fnUntraced","isLessThan","subtractDuration","execute","orDie","EntityLayer","toLayer","makeClient","request","onExitPrimitive","exit","isFailure","logWarning","cause","tapCause","sandbox","retry","retryPolicy","annotateLogs","module","merge","exponential","either","spaced","Class","DateTimeUtc","symbol"],"sources":["../../../src/unstable/cluster/ClusterCron.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/unstable/cluster/ClusterWorkflowEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClusterWorkflowEngine.d.ts","sourceRoot":"","sources":["../../../src/unstable/cluster/ClusterWorkflowEngine.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,IAAI,MAAM,eAAe,CAAA;AAErC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AAIvC,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,KAAK,KAAK,MAAM,gBAAgB,CAAA;AAI5C,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAA;AACnD,OAAO,KAAK,YAAY,MAAM,6BAA6B,CAAA;AAC3D,OAAO,KAAK,eAAe,MAAM,gCAAgC,CAAA;AACjE,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAA;AACnD,OAAO,KAAK,cAAc,MAAM,+BAA+B,CAAA;AAO/D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAGpD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAGzC;;;GAGG;AACH,eAAO,MAAM,IAAI;;;;;wBAiBe,CAAC;uCAIzB,CAAN;;;;;;;;;;;;;;;;;2DAicA,CAAA;AA0HF;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAC7B,cAAc,CAAC,cAAc,EAC7B,KAAK,EACL,QAAQ,CAAC,QAAQ,GAAG,cAAc,CAGnC,CAAA"}
+{"version":3,"file":"ClusterWorkflowEngine.d.ts","sourceRoot":"","sources":["../../../src/unstable/cluster/ClusterWorkflowEngine.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,IAAI,MAAM,eAAe,CAAA;AAGrC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AAIvC,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,KAAK,KAAK,MAAM,gBAAgB,CAAA;AAI5C,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAA;AACnD,OAAO,KAAK,YAAY,MAAM,6BAA6B,CAAA;AAC3D,OAAO,KAAK,eAAe,MAAM,gCAAgC,CAAA;AACjE,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAA;AACnD,OAAO,KAAK,cAAc,MAAM,+BAA+B,CAAA;AAO/D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAGpD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAGzC;;;GAGG;AACH,eAAO,MAAM,IAAI;;;;;wBAuBX,CAAD;uCACqD,CAAC;;;;;;;;;;;;;;;;;2DA8bzD,CAAA;AA0HF;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAC7B,cAAc,CAAC,cAAc,EAC7B,KAAK,EACL,QAAQ,CAAC,QAAQ,GAAG,cAAc,CAGnC,CAAA"}

package/dist/unstable/cluster/ClusterWorkflowEngine.js

@@ -6,6 +6,7 @@ import * as Duration from "../../Duration.js";
 import * as Effect from "../../Effect.js";
 import * as Exit from "../../Exit.js";
 import * as Fiber from "../../Fiber.js";
+import * as Latch from "../../Latch.js";
 import * as Layer from "../../Layer.js";
 import * as PrimaryKey from "../../PrimaryKey.js";
 import * as RcMap from "../../RcMap.js";
@@ -199,7 +200,7 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
           return Effect.gen(function* () {
             let entry = activities.get(activityId);
             while (!entry) {
-              const latch = Effect.makeLatchUnsafe();
+              const latch = Latch.makeUnsafe();
               activityLatches.set(activityId, latch);
               yield* latch.await;
               entry = activities.get(activityId);