effect 4.0.0-beta.30 → 4.0.0-beta.32

package/src/unstable/cli/Prompt.ts

@@ -710,7 +710,7 @@ export const date = (options: DateOptions): Prompt<Date> => {
     typed: "",
     cursor: initialCursorPosition,
     value: opts.initial,
-    error: undefined
+    error: Option.none()
   }
   return custom(initialState, {
     render: handleDateRender(opts),
@@ -727,7 +727,7 @@ export const file = (options: FileOptions = {}): Prompt<string> => {
   const opts: FileOptionsReq = {
     type: options.type ?? "file",
     message: options.message ?? `Choose a file`,
-    startingPath: options.startingPath,
+    startingPath: Option.fromUndefinedOr(options.startingPath),
     maxPerPage: options.maxPerPage ?? 10,
     filter: options.filter ?? (() => Effect.succeed(true))
   }
@@ -736,10 +736,10 @@ export const file = (options: FileOptions = {}): Prompt<string> => {
     never,
     Environment
   > = Effect.gen(function*() {
-    const currentPath = yield* resolveCurrentPath(undefined, opts)
+    const currentPath = yield* resolveCurrentPath(Option.none(), opts)
     const files = yield* getFileList(currentPath, opts)
     const confirm = Confirm.Hide()
-    return { cursor: 0, files, path: undefined, confirm }
+    return { cursor: 0, files, path: Option.none(), confirm }
   })
   return custom(initialState, {
     render: handleFileRender(opts),
@@ -799,7 +799,7 @@ export const float = (options: FloatOptions): Prompt<number> => {
   const initialState: NumberState = {
     cursor: 0,
     value: "",
-    error: undefined
+    error: Option.none()
   }
   return custom(initialState, {
     render: handleRenderFloat(opts),
@@ -839,7 +839,7 @@ export const integer = (options: IntegerOptions): Prompt<number> => {
   const initialState: NumberState = {
     cursor: 0,
     value: "",
-    error: undefined
+    error: Option.none()
   }
   return custom(initialState, {
     render: handleRenderInteger(opts),
@@ -1009,7 +1009,7 @@ export const multiSelect = <const A>(
       initialSelected.add(i)
     }
   }
-  const initialState: MultiSelectState = { index: 0, selectedIndices: initialSelected, error: undefined }
+  const initialState: MultiSelectState = { index: 0, selectedIndices: initialSelected, error: Option.none() }
   return custom(initialState, {
     render: handleMultiSelectRender(opts),
     process: handleMultiSelectProcess(opts),
@@ -1289,7 +1289,7 @@ const TRUE_VALUE_REGEXP = /^y|t$/
 const FALSE_VALUE_REGEXP = /^n|f$/
 
 const handleConfirmProcess = (input: Terminal.UserInput, defaultValue: boolean) => {
-  const value = input.input ?? ""
+  const value = Option.getOrElse(input.input, () => "")
   if (input.key.name === "enter" || input.key.name === "return") {
     return Effect.succeed(Action.Submit({ value: defaultValue }))
   }
@@ -1309,7 +1309,7 @@ interface DateState {
   readonly cursor: number
   readonly value: globalThis.Date
   readonly dateParts: ReadonlyArray<DatePart>
-  readonly error: string | undefined
+  readonly error: Option.Option<string>
 }
 
 const handleDateClear = (options: DateOptionsReq) => {
@@ -1320,8 +1320,8 @@ const handleDateClear = (options: DateOptionsReq) => {
     const resetCurrentLine = Ansi.eraseLine + Ansi.cursorLeft
     const parts = Arr.reduce(state.dateParts, "", (doc, part) => doc + part.toString())
     const promptText = renderDateOutput("?", figures.pointerSmall, parts, options, { plain: true })
-    const errorText = state.error !== undefined
-      ? Arr.match(state.error.split(NEWLINE_REGEXP), {
+    const errorText = Option.isSome(state.error)
+      ? Arr.match(state.error.value.split(NEWLINE_REGEXP), {
         onEmpty: () => "",
         onNonEmpty: (errorLines) => `${figures.pointerSmall} ${errorLines.join("\n")}`
       })
@@ -1332,8 +1332,8 @@ const handleDateClear = (options: DateOptionsReq) => {
 }
 
 const renderDateError = (state: DateState, pointer: string): string => {
-  if (state.error !== undefined) {
-    const errorLines = state.error.split(NEWLINE_REGEXP)
+  if (Option.isSome(state.error)) {
+    const errorLines = state.error.value.split(NEWLINE_REGEXP)
     if (Arr.isReadonlyArrayNonEmpty(errorLines)) {
       const prefix = Ansi.annotate(pointer, Ansi.red) + " "
       const lines = Arr.map(errorLines, (str) => annotateErrorLine(str))
@@ -1401,12 +1401,12 @@ const processDown = (state: DateState) => {
 
 const processDateCursorLeft = (state: DateState) => {
   const previous = state.dateParts[state.cursor].previousPart()
-  if (previous !== undefined) {
+  if (Option.isSome(previous)) {
     return Action.NextFrame({
       state: {
         ...state,
         typed: "",
-        cursor: state.dateParts.indexOf(previous)
+        cursor: state.dateParts.indexOf(previous.value)
       }
     })
   }
@@ -1415,12 +1415,12 @@ const processDateCursorLeft = (state: DateState) => {
 
 const processDateCursorRight = (state: DateState) => {
   const next = state.dateParts[state.cursor].nextPart()
-  if (next !== undefined) {
+  if (Option.isSome(next)) {
     return Action.NextFrame({
       state: {
         ...state,
         typed: "",
-        cursor: state.dateParts.indexOf(next)
+        cursor: state.dateParts.indexOf(next.value)
       }
     })
   }
@@ -1429,9 +1429,10 @@ const processDateCursorRight = (state: DateState) => {
 
 const processDateNext = (state: DateState) => {
   const next = state.dateParts[state.cursor].nextPart()
-  const cursor = next !== undefined
-    ? state.dateParts.indexOf(next)
-    : state.dateParts.findIndex((part) => !part.isToken())
+  const cursor = Option.match(next, {
+    onNone: () => state.dateParts.findIndex((part) => !part.isToken()),
+    onSome: (next) => state.dateParts.indexOf(next)
+  })
   return Action.NextFrame({
     state: { ...state, cursor }
   })
@@ -1505,14 +1506,14 @@ const handleDateProcess = (options: DateOptionsReq) => {
             Action.NextFrame({
               state: {
                 ...state,
-                error
+                error: Option.some(error)
               }
             }),
           onSuccess: (value) => Action.Submit({ value })
         })
       }
       default: {
-        return Effect.succeed(defaultDateProcessor(input.input ?? "", state))
+        return Effect.succeed(defaultDateProcessor(Option.getOrElse(input.input, () => ""), state))
       }
     }
   }
@@ -1609,23 +1610,20 @@ abstract class DatePart {
   /**
    * Retrieves the next date part in the list of parts.
    */
-  nextPart(): DatePart | undefined {
-    const currentPartIndex = Arr.findFirstIndex(this.parts, (part) => part === this) ?? 0
-    return Option.getOrUndefined(
-      Arr.findFirst(this.parts.slice(currentPartIndex + 1), (part) => !part.isToken())
-    )
+  nextPart(): Option.Option<DatePart> {
+    const currentPartIndex = Option.getOrElse(Arr.findFirstIndex(this.parts, (part) => part === this), () => 0)
+    return Arr.findFirst(this.parts.slice(currentPartIndex + 1), (part) => !part.isToken())
   }
 
   /**
    * Retrieves the previous date part in the list of parts.
    */
-  previousPart(): DatePart | undefined {
+  previousPart(): Option.Option<DatePart> {
     const currentPartIndex = Arr.findFirstIndex(this.parts, (part) => part === this)
-    if (currentPartIndex !== undefined) {
-      return Option.getOrUndefined(
-        Arr.findLast(this.parts.slice(0, currentPartIndex), (part) => !part.isToken())
-      )
+    if (Option.isSome(currentPartIndex)) {
+      return Arr.findLast(this.parts.slice(0, currentPartIndex.value), (part) => !part.isToken())
     }
+    return Option.none()
   }
 
   toString() {
@@ -1851,13 +1849,13 @@ class Meridiem extends DatePart {
 }
 
 interface FileOptionsReq extends Required<Omit<FileOptions, "startingPath">> {
-  readonly startingPath: string | undefined
+  readonly startingPath: Option.Option<string>
 }
 
 interface FileState {
   readonly cursor: number
   readonly files: ReadonlyArray<string>
-  readonly path: string | undefined
+  readonly path: Option.Option<string>
   readonly confirm: Confirm
 }
 
@@ -1871,14 +1869,14 @@ const Confirm = Data.taggedEnum<Confirm>()
 const showConfirmation = Confirm.$is("Show")
 
 const resolveCurrentPath = (
-  path: string | undefined,
+  path: Option.Option<string>,
   options: FileOptionsReq
 ): Effect.Effect<string, never, FileSystem.FileSystem> => {
-  if (path !== undefined) {
-    return Effect.succeed(path)
+  if (Option.isSome(path)) {
+    return Effect.succeed(path.value)
   }
-  const startingPath = options.startingPath
-  if (startingPath !== undefined) {
+  if (Option.isSome(options.startingPath)) {
+    const startingPath = options.startingPath.value
     return Effect.flatMap(FileSystem.FileSystem.asEffect(), (fs) =>
       // Ensure the user provided starting path exists
       Effect.orDie(fs.exists(startingPath)).pipe(
@@ -2099,7 +2097,7 @@ const processSelection = Effect.fnUntraced(function*(state: FileState, options:
       state: {
         cursor: 0,
         files,
-        path: resolvedPath,
+        path: Option.some(resolvedPath),
         confirm: Confirm.Hide()
       }
     })
@@ -2135,7 +2133,7 @@ const handleFileProcess = (options: FileOptionsReq) => {
             state: {
               cursor: 0,
               files,
-              path: resolvedPath,
+              path: Option.some(resolvedPath),
               confirm: Confirm.Hide()
             }
           })
@@ -2166,7 +2164,7 @@ interface MultiSelectOptionsReq extends MultiSelectOptions {}
 type MultiSelectState = {
   index: number
   selectedIndices: Set<number>
-  error: string | undefined
+  error: Option.Option<string>
 }
 
 const renderMultiSelectError = (
@@ -2174,8 +2172,8 @@ const renderMultiSelectError = (
   pointer: string,
   renderOptions?: RenderOptions | undefined
 ): string => {
-  if (state.error !== undefined) {
-    return Arr.match(state.error.split(NEWLINE_REGEXP), {
+  if (Option.isSome(state.error)) {
+    return Arr.match(state.error.value.split(NEWLINE_REGEXP), {
       onEmpty: () => "",
       onNonEmpty: (errorLines) => {
         if (renderOptions?.plain === true) {
@@ -2347,12 +2345,12 @@ const handleMultiSelectProcess = <A>(options: SelectOptionsReq<A> & MultiSelectO
     switch (input.key.name) {
       case "k":
       case "up": {
-        return processMultiSelectCursorUp({ ...state, error: undefined }, totalChoices)
+        return processMultiSelectCursorUp({ ...state, error: Option.none() }, totalChoices)
       }
       case "j":
       case "down":
       case "tab": {
-        return processMultiSelectCursorDown({ ...state, error: undefined }, totalChoices)
+        return processMultiSelectCursorDown({ ...state, error: Option.none() }, totalChoices)
       }
       case "space": {
         return processSpace(state, options)
@@ -2362,12 +2360,12 @@ const handleMultiSelectProcess = <A>(options: SelectOptionsReq<A> & MultiSelectO
         const selectedCount = state.selectedIndices.size
         if (options.min !== undefined && selectedCount < options.min) {
           return Effect.succeed(
-            Action.NextFrame({ state: { ...state, error: `At least ${options.min} are required` } })
+            Action.NextFrame({ state: { ...state, error: Option.some(`At least ${options.min} are required`) } })
           )
         }
         if (options.max !== undefined && selectedCount > options.max) {
           return Effect.succeed(
-            Action.NextFrame({ state: { ...state, error: `At most ${options.max} choices are allowed` } })
+            Action.NextFrame({ state: { ...state, error: Option.some(`At most ${options.max} choices are allowed`) } })
           )
         }
         const selectedValues = Array.from(state.selectedIndices).sort(EffectNumber.Order).map((index) =>
@@ -2398,7 +2396,7 @@ interface FloatOptionsReq extends Required<FloatOptions> {}
 interface NumberState {
   readonly cursor: number
   readonly value: string
-  readonly error: string | undefined
+  readonly error: Option.Option<string>
 }
 
 const handleNumberClear = (options: IntegerOptionsReq) => {
@@ -2423,7 +2421,7 @@ const renderNumberInput = (
   if (submitted || renderOptions?.plain === true) {
     return value
   }
-  const annotation = state.error !== undefined ?
+  const annotation = Option.isSome(state.error) ?
     Ansi.red :
     Ansi.combine(Ansi.underlined, Ansi.cyanBright)
   return Ansi.annotate(value, annotation)
@@ -2434,8 +2432,8 @@ const renderNumberError = (
   pointer: string,
   renderOptions?: RenderOptions | undefined
 ) => {
-  if (state.error !== undefined) {
-    return Arr.match(state.error.split(NEWLINE_REGEXP), {
+  if (Option.isSome(state.error)) {
+    return Arr.match(state.error.value.split(NEWLINE_REGEXP), {
       onEmpty: () => "",
       onNonEmpty: (errorLines) => {
         if (renderOptions?.plain === true) {
@@ -2485,19 +2483,19 @@ const processNumberBackspace = (state: NumberState) => {
   }
   const value = state.value.slice(0, state.value.length - 1)
   return Effect.succeed(Action.NextFrame({
-    state: { ...state, value, error: undefined }
+    state: { ...state, value, error: Option.none() }
   }))
 }
 
 const processNumberClear = (state: NumberState) =>
   Effect.succeed(Action.NextFrame({
-    state: { ...state, cursor: 0, value: "", error: undefined }
+    state: { ...state, cursor: 0, value: "", error: Option.none() }
   }))
 
 const defaultIntProcessor = (input: string, state: NumberState) => {
   if (state.value.length === 0 && input === "-") {
     return Effect.succeed(Action.NextFrame({
-      state: { ...state, value: "-", error: undefined }
+      state: { ...state, value: "-", error: Option.none() }
     }))
   }
 
@@ -2506,7 +2504,7 @@ const defaultIntProcessor = (input: string, state: NumberState) => {
     return Effect.succeed(Action.Beep())
   } else {
     return Effect.succeed(Action.NextFrame({
-      state: { ...state, value: `${parsed}`, error: undefined }
+      state: { ...state, value: `${parsed}`, error: Option.none() }
     }))
   }
 }
@@ -2517,7 +2515,7 @@ const defaultFloatProcessor = (input: string, state: NumberState) => {
   }
   if (state.value.length === 0 && input === "-") {
     return Effect.succeed(Action.NextFrame({
-      state: { ...state, value: "-", error: undefined }
+      state: { ...state, value: "-", error: Option.none() }
     }))
   }
 
@@ -2529,7 +2527,7 @@ const defaultFloatProcessor = (input: string, state: NumberState) => {
       state: {
         ...state,
         value: input === "." ? `${parsed}.` : `${parsed}`,
-        error: undefined
+        error: Option.none()
       }
     }))
   }
@@ -2562,7 +2560,7 @@ const handleProcessInteger = (options: IntegerOptionsReq) => {
             value: state.value === "" || state.value === "-"
               ? `${options.incrementBy}`
               : `${Number.parseInt(state.value) + options.incrementBy}`,
-            error: undefined
+            error: Option.none()
           }
         }))
       }
@@ -2574,7 +2572,7 @@ const handleProcessInteger = (options: IntegerOptionsReq) => {
             value: state.value === "" || state.value === "-"
               ? `-${options.decrementBy}`
               : `${Number.parseInt(state.value) - options.decrementBy}`,
-            error: undefined
+            error: Option.none()
           }
         }))
       }
@@ -2585,7 +2583,7 @@ const handleProcessInteger = (options: IntegerOptionsReq) => {
           return Effect.succeed(Action.NextFrame({
             state: {
               ...state,
-              error: "Must provide an integer value"
+              error: Option.some("Must provide an integer value")
             }
           }))
         } else {
@@ -2594,7 +2592,7 @@ const handleProcessInteger = (options: IntegerOptionsReq) => {
               Action.NextFrame({
                 state: {
                   ...state,
-                  error
+                  error: Option.some(error)
                 }
               }),
             onSuccess: (value) => Action.Submit({ value })
@@ -2602,7 +2600,7 @@ const handleProcessInteger = (options: IntegerOptionsReq) => {
         }
       }
       default: {
-        return defaultIntProcessor(input.input ?? "", state)
+        return defaultIntProcessor(Option.getOrElse(input.input, () => ""), state)
       }
     }
   }
@@ -2635,7 +2633,7 @@ const handleProcessFloat = (options: FloatOptionsReq) => {
             value: state.value === "" || state.value === "-"
               ? `${options.incrementBy}`
               : `${Number.parseFloat(state.value) + options.incrementBy}`,
-            error: undefined
+            error: Option.none()
           }
         }))
       }
@@ -2647,7 +2645,7 @@ const handleProcessFloat = (options: FloatOptionsReq) => {
             value: state.value === "" || state.value === "-"
               ? `-${options.decrementBy}`
               : `${Number.parseFloat(state.value) - options.decrementBy}`,
-            error: undefined
+            error: Option.none()
           }
         }))
       }
@@ -2658,7 +2656,7 @@ const handleProcessFloat = (options: FloatOptionsReq) => {
           return Effect.succeed(Action.NextFrame({
             state: {
               ...state,
-              error: "Must provide a floating point value"
+              error: Option.some("Must provide a floating point value")
             }
           }))
         } else {
@@ -2670,7 +2668,7 @@ const handleProcessFloat = (options: FloatOptionsReq) => {
                   Action.NextFrame({
                     state: {
                       ...state,
-                      error
+                      error: Option.some(error)
                     }
                   }),
                 onSuccess: (value) => Action.Submit({ value })
@@ -2679,7 +2677,7 @@ const handleProcessFloat = (options: FloatOptionsReq) => {
         }
       }
       default: {
-        return defaultFloatProcessor(input.input ?? "", state)
+        return defaultFloatProcessor(Option.getOrElse(input.input, () => ""), state)
       }
     }
   }
@@ -2723,7 +2721,7 @@ const updateAutoCompleteState = <A>(
 }
 
 const autoCompleteCursor = (state: AutoCompleteState) =>
-  Arr.findFirstIndex(state.filtered, (index) => index === state.index) ?? 0
+  Option.getOrElse(Arr.findFirstIndex(state.filtered, (index) => index === state.index), () => 0)
 
 const renderSelectOutput = <A>(
   leadingSymbol: string,
@@ -3089,7 +3087,7 @@ const handleAutoCompleteProcess = <A>(options: AutoCompleteOptionsReq<A>) => {
         return Effect.succeed(Action.Submit({ value: selected.value }))
       }
       default: {
-        return processAutoCompleteInput(input.input ?? "", state, options)
+        return processAutoCompleteInput(Option.getOrElse(input.input, () => ""), state, options)
       }
     }
   }
@@ -3105,7 +3103,7 @@ interface TextOptionsReq extends Required<TextOptions> {
 interface TextState {
   readonly cursor: number
   readonly value: string
-  readonly error: string | undefined
+  readonly error: Option.Option<string>
 }
 
 const renderClearScreen = Effect.fnUntraced(function*(state: TextState, options: TextOptionsReq) {
@@ -3143,7 +3141,7 @@ const renderTextInput = (
     }
   }
 
-  const annotation = nextState.error !== undefined ?
+  const annotation = Option.isSome(nextState.error) ?
     Ansi.red
     : submitted ?
     Ansi.white
@@ -3169,8 +3167,8 @@ const renderTextError = (
   pointer: string,
   renderOptions?: RenderOptions | undefined
 ): string => {
-  if (nextState.error !== undefined) {
-    return Arr.match(nextState.error.split(NEWLINE_REGEXP), {
+  if (Option.isSome(nextState.error)) {
+    return Arr.match(nextState.error.value.split(NEWLINE_REGEXP), {
       onEmpty: () => "",
       onNonEmpty: (errorLines) => {
         if (renderOptions?.plain === true) {
@@ -3225,7 +3223,7 @@ const processTextBackspace = (state: TextState) => {
   const value = `${beforeCursor}${afterCursor}`
   return Effect.succeed(
     Action.NextFrame({
-      state: { ...state, cursor, value, error: undefined }
+      state: { ...state, cursor, value, error: Option.none() }
     })
   )
 }
@@ -3233,7 +3231,7 @@ const processTextBackspace = (state: TextState) => {
 const processTextClear = (state: TextState) =>
   Effect.succeed(
     Action.NextFrame({
-      state: { ...state, cursor: 0, value: "", error: undefined }
+      state: { ...state, cursor: 0, value: "", error: Option.none() }
     })
   )
 
@@ -3244,7 +3242,7 @@ const processTextCursorLeft = (state: TextState) => {
   const cursor = state.cursor - 1
   return Effect.succeed(
     Action.NextFrame({
-      state: { ...state, cursor, error: undefined }
+      state: { ...state, cursor, error: Option.none() }
     })
   )
 }
@@ -3256,7 +3254,7 @@ const processTextCursorRight = (state: TextState) => {
   const cursor = Math.min(state.cursor + 1, state.value.length)
   return Effect.succeed(
     Action.NextFrame({
-      state: { ...state, cursor, error: undefined }
+      state: { ...state, cursor, error: Option.none() }
     })
   )
 }
@@ -3268,7 +3266,7 @@ const processTab = (state: TextState, options: TextOptionsReq) => {
   const value = state.value.length === 0 ? options.default : state.value
   return Effect.succeed(
     Action.NextFrame({
-      state: { ...state, value, cursor: value.length, error: undefined }
+      state: { ...state, value, cursor: value.length, error: Option.none() }
     })
   )
 }
@@ -3280,7 +3278,7 @@ const defaultTextProcessor = (input: string, state: TextState) => {
   const cursor = state.cursor + input.length
   return Effect.succeed(
     Action.NextFrame({
-      state: { ...state, cursor, value, error: undefined }
+      state: { ...state, cursor, value, error: Option.none() }
     })
   )
 }
@@ -3316,7 +3314,7 @@ const handleTextProcess = (options: TextOptionsReq) => {
         return Effect.match(options.validate(value), {
           onFailure: (error) =>
             Action.NextFrame({
-              state: { ...state, value, error }
+              state: { ...state, value, error: Option.some(error) }
             }),
           onSuccess: (value) => Action.Submit({ value })
         })
@@ -3325,7 +3323,7 @@ const handleTextProcess = (options: TextOptionsReq) => {
         return processTab(state, options)
       }
       default: {
-        return defaultTextProcessor(input.input ?? "", state)
+        return defaultTextProcessor(Option.getOrElse(input.input, () => ""), state)
       }
     }
   }
@@ -3351,7 +3349,7 @@ const basePrompt = (
   const initialState: TextState = {
     cursor: opts.default.length,
     value: opts.default,
-    error: undefined
+    error: Option.none()
   }
   return custom(initialState, {
     render: handleTextRender(opts),

package/src/unstable/cli/index.ts

@@ -24,6 +24,11 @@ export * as CliOutput from "./CliOutput.ts"
  */
 export * as Command from "./Command.ts"
 
+/**
+ * @since 4.0.0
+ */
+export * as Completions from "./Completions.ts"
+
 /**
  * @since 4.0.0
  */

package/src/unstable/cli/internal/completions/CommandDescriptor.ts

@@ -4,6 +4,7 @@
  *
  * @internal
  */
+import * as Option from "../../../../Option.ts"
 import type { Command } from "../../Command.ts"
 import * as Param from "../../Param.ts"
 import * as Primitive from "../../Primitive.ts"
@@ -135,7 +136,7 @@ export const fromCommand = (cmd: Command.Any): CommandDescriptor => {
       flags.push({
         name: single.name,
         aliases: single.aliases,
-        description: single.description,
+        description: Option.getOrUndefined(single.description),
         type: toFlagType(single as Param.Single<"flag", unknown>)
       })
     }
@@ -149,7 +150,7 @@ export const fromCommand = (cmd: Command.Any): CommandDescriptor => {
       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 as Param.Single<"argument", unknown>)

package/src/unstable/cli/internal/parser.ts

@@ -25,6 +25,7 @@
  * - Errors accumulate rather than throwing exceptions
  */
 import * as Effect from "../../../Effect.ts"
+import * as Option from "../../../Option.ts"
 import * as CliError from "../CliError.ts"
 import type { Command, ParsedTokens } from "../Command.ts"
 import * as Param from "../Param.ts"
@@ -39,9 +40,10 @@ import type { LexResult, Token } from "./lexer.ts"
 
 /** @internal */
 export const getCommandPath = (parsedInput: ParsedTokens): ReadonlyArray<string> =>
-  parsedInput.subcommand
-    ? [parsedInput.subcommand.name, ...getCommandPath(parsedInput.subcommand.parsedInput)]
-    : []
+  Option.match(parsedInput.subcommand, {
+    onNone: () => [],
+    onSome: (subcommand) => [subcommand.name, ...getCommandPath(subcommand.parsedInput)]
+  })
 
 /** @internal */
 export const parseArgs = (
@@ -77,6 +79,7 @@ export const parseArgs = (
       return {
         flags: result.flags,
         arguments: [...result.arguments, ...afterEndOfOptions],
+        subcommand: Option.none(),
         ...(result.errors.length > 0 && { errors: result.errors })
       }
     }
@@ -92,7 +95,7 @@ export const parseArgs = (
     return {
       flags: result.flags,
       arguments: afterEndOfOptions,
-      subcommand: { name: result.sub.name, parsedInput: subParsed },
+      subcommand: Option.some({ name: result.sub.name, parsedInput: subParsed }),
       ...(allErrors.length > 0 && { errors: allErrors })
     }
   })