effect 4.0.0-rc.112 → 4.0.0-rc.113

package/src/unstable/cli/Argument.ts

@@ -13,7 +13,7 @@ import type * as Config from "../../Config.ts"
 import type * as Effect from "../../Effect.ts"
 import { dual, type LazyArg } from "../../Function.ts"
 import type * as Option from "../../Option.ts"
-import type * as Redacted from "../../Redacted.ts"
+import type * as Redacted_ from "../../Redacted.ts"
 import type * as Result from "../../Result.ts"
 import type * as Schema from "../../Schema.ts"
 import type * as CliError from "./CliError.ts"
@@ -30,10 +30,7 @@ import type * as Primitive from "./Primitive.ts"
  *
  * **Gotchas**
  *
- * `boolean` is intentionally omitted from Argument constructors. Positional
- * boolean arguments are ambiguous in CLI design since there is no flag name to
- * negate (for example, `--no-verbose`). Use Flag.boolean instead, or use
- * Argument.choice with explicit "true" / "false" strings if needed.
+ * For booleans, use `Flag.Boolean` or `Argument.Literals` with "true" and "false".
  *
  * @category models
  * @since 4.0.0
@@ -52,14 +49,14 @@ export interface Argument<A> extends Param.Param<typeof Param.argumentKind, A> {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const filename = Argument.string("filename")
+ * const filename = Argument.String("filename")
  * filename.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const string = (name: string): Argument<string> => Param.string(Param.argumentKind, name)
+export const String = (name: string): Argument<string> => Param.String(Param.argumentKind, name)
 
 /**
  * Creates a positional integer argument.
@@ -69,14 +66,14 @@ export const string = (name: string): Argument<string> => Param.string(Param.arg
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const count = Argument.integer("count")
+ * const count = Argument.Int("count")
  * count.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const integer = (name: string): Argument<number> => Param.integer(Param.argumentKind, name)
+export const Int = (name: string): Argument<number> => Param.Int(Param.argumentKind, name)
 
 /**
  * Creates a positional file path argument.
@@ -86,17 +83,17 @@ export const integer = (name: string): Argument<number> => Param.integer(Param.a
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const inputFile = Argument.file("input", { mustExist: true }) // Must exist
- * const outputFile = Argument.file("output", { mustExist: false }) // Must not exist
+ * const inputFile = Argument.File("input", { mustExist: true }) // Must exist
+ * const outputFile = Argument.File("output", { mustExist: false }) // Must not exist
  * const kinds = [inputFile.kind, outputFile.kind] // => ["argument", "argument"]
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const file = (name: string, options?: {
+export const File = (name: string, options?: {
   readonly mustExist?: boolean | undefined
-}): Argument<string> => Param.file(Param.argumentKind, name, options)
+}): Argument<string> => Param.File(Param.argumentKind, name, options)
 
 /**
  * Creates a positional directory path argument.
@@ -106,33 +103,33 @@ export const file = (name: string, options?: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const workspace = Argument.directory("workspace", { mustExist: true }) // Must exist
+ * const workspace = Argument.Directory("workspace", { mustExist: true }) // Must exist
  * workspace.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const directory = (name: string, options?: {
+export const Directory = (name: string, options?: {
   readonly mustExist?: boolean | undefined
-}): Argument<string> => Param.directory(Param.argumentKind, name, options)
+}): Argument<string> => Param.Directory(Param.argumentKind, name, options)
 
 /**
- * Creates a positional float argument.
+ * Creates a positional argument that parses finite numbers.
  *
- * **Example** (Creating a float argument)
+ * **Example** (Parsing a finite number)
  *
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const ratio = Argument.float("ratio")
+ * const ratio = Argument.Finite("ratio")
  * ratio.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const float = (name: string): Argument<number> => Param.float(Param.argumentKind, name)
+export const Finite = (name: string): Argument<number> => Param.Finite(Param.argumentKind, name)
 
 /**
  * Creates a positional date argument.
@@ -142,14 +139,14 @@ export const float = (name: string): Argument<number> => Param.float(Param.argum
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const startDate = Argument.date("start-date")
+ * const startDate = Argument.Date("start-date")
  * startDate.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const date = (name: string): Argument<Date> => Param.date(Param.argumentKind, name)
+export const Date = (name: string): Argument<globalThis.Date> => Param.Date(Param.argumentKind, name)
 
 /**
  * Creates a positional choice argument.
@@ -159,17 +156,17 @@ export const date = (name: string): Argument<Date> => Param.date(Param.argumentK
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const environment = Argument.choice("environment", ["dev", "staging", "prod"])
+ * const environment = Argument.Literals("environment", ["dev", "staging", "prod"])
  * environment.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const choice = <const Choices extends ReadonlyArray<string>>(
+export const Literals = <const Choices extends ReadonlyArray<string>>(
   name: string,
   choices: Choices
-): Argument<Choices[number]> => Param.choice(Param.argumentKind, name, choices)
+): Argument<Choices[number]> => Param.Literals(Param.argumentKind, name, choices)
 
 /**
  * Creates a positional path argument.
@@ -179,17 +176,17 @@ export const choice = <const Choices extends ReadonlyArray<string>>(
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const configPath = Argument.path("config")
+ * const configPath = Argument.Path("config")
  * configPath.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const path = (name: string, options?: {
+export const Path = (name: string, options?: {
   pathType?: "file" | "directory" | "either"
   mustExist?: boolean
-}): Argument<string> => Param.path(Param.argumentKind, name, options)
+}): Argument<string> => Param.Path(Param.argumentKind, name, options)
 
 /**
  * Creates a positional redacted argument that obscures its value.
@@ -199,14 +196,14 @@ export const path = (name: string, options?: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const secret = Argument.redacted("secret")
+ * const secret = Argument.Redacted("secret")
  * secret.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const redacted = (name: string): Argument<Redacted.Redacted<string>> => Param.redacted(Param.argumentKind, name)
+export const Redacted = (name: string): Argument<Redacted_.Redacted<string>> => Param.Redacted(Param.argumentKind, name)
 
 /**
  * Creates a positional argument that reads file content as a string.
@@ -216,14 +213,14 @@ export const redacted = (name: string): Argument<Redacted.Redacted<string>> => P
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const config = Argument.fileText("config-file")
+ * const config = Argument.FileText("config-file")
  * config.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const fileText = (name: string): Argument<string> => Param.fileText(Param.argumentKind, name)
+export const FileText = (name: string): Argument<string> => Param.FileText(Param.argumentKind, name)
 
 /**
  * Creates a positional argument that reads a file and parses its content.
@@ -239,17 +236,17 @@ export const fileText = (name: string): Argument<string> => Param.fileText(Param
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const config = Argument.fileParse("config", { format: "json" })
+ * const config = Argument.FileParse("config", { format: "json" })
  * config.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const fileParse = (
+export const FileParse = (
   name: string,
   options?: Primitive.FileParseOptions | undefined
-): Argument<unknown> => Param.fileParse(Param.argumentKind, name, options)
+): Argument<unknown> => Param.FileParse(Param.argumentKind, name, options)
 
 /**
  * Creates a positional argument that reads and validates file content using a schema.
@@ -265,36 +262,35 @@ export const fileParse = (
  *   host: Schema.String
  * })
  *
- * const config = Argument.fileSchema("config", ConfigSchema)
+ * const config = Argument.FileSchema("config", ConfigSchema)
  * config.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const fileSchema = <A>(
+export const FileSchema = <A>(
   name: string,
   schema: Schema.ConstraintDecoder<A, Environment>,
   options?: Primitive.FileSchemaOptions | undefined
-): Argument<A> => Param.fileSchema(Param.argumentKind, name, schema, options)
+): Argument<A> => Param.FileSchema(Param.argumentKind, name, schema, options)
 
 /**
- * Creates an empty sentinel argument that always fails to parse.
+ * An argument that always fails to parse.
  *
  * **Example** (Creating a sentinel argument)
  *
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * // Used as a placeholder or default in combinators
- * const noArg = Argument.none
+ * const noArg = Argument.Never
  * noArg.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const none: Argument<never> = Param.none(Param.argumentKind)
+export const Never: Argument<never> = Param.Never(Param.argumentKind)
 
 // -------------------------------------------------------------------------------------
 // combinators
@@ -308,7 +304,7 @@ export const none: Argument<never> = Param.none(Param.argumentKind)
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const optionalVersion = Argument.string("version").pipe(Argument.optional)
+ * const optionalVersion = Argument.String("version").pipe(Argument.optional)
  * optionalVersion.kind // => "argument"
  * ```
  *
@@ -325,7 +321,7 @@ export const optional = <A>(arg: Argument<A>): Argument<Option.Option<A>> => Par
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const filename = Argument.string("filename").pipe(
+ * const filename = Argument.String("filename").pipe(
  *   Argument.withDescription("The input file to process")
  * )
  * filename.kind // => "argument"
@@ -343,7 +339,7 @@ export const withDescription: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const filename = Argument.string("filename").pipe(
+   * const filename = Argument.String("filename").pipe(
    *   Argument.withDescription("The input file to process")
    * )
    * filename.kind // => "argument"
@@ -361,7 +357,7 @@ export const withDescription: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const filename = Argument.string("filename").pipe(
+   * const filename = Argument.String("filename").pipe(
    *   Argument.withDescription("The input file to process")
    * )
    * filename.kind // => "argument"
@@ -381,7 +377,7 @@ export const withDescription: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const port = Argument.integer("port").pipe(Argument.withDefault(8080))
+ * const port = Argument.Int("port").pipe(Argument.withDefault(8080))
  * port.kind // => "argument"
  * ```
  *
@@ -397,7 +393,7 @@ export const withDefault: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const port = Argument.integer("port").pipe(Argument.withDefault(8080))
+   * const port = Argument.Int("port").pipe(Argument.withDefault(8080))
    * port.kind // => "argument"
    * ```
    *
@@ -413,7 +409,7 @@ export const withDefault: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const port = Argument.integer("port").pipe(Argument.withDefault(8080))
+   * const port = Argument.Int("port").pipe(Argument.withDefault(8080))
    * port.kind // => "argument"
    * ```
    *
@@ -435,8 +431,8 @@ export const withDefault: {
  * import { Config } from "effect"
  * import { Argument } from "effect/unstable/cli"
  *
- * const repository = Argument.string("repository").pipe(
- *   Argument.withFallbackConfig(Config.string("REPOSITORY"))
+ * const repository = Argument.String("repository").pipe(
+ *   Argument.withFallbackConfig(Config.String("REPOSITORY"))
  * )
  * repository.kind // => "argument"
  * ```
@@ -454,8 +450,8 @@ export const withFallbackConfig: {
    * import { Config } from "effect"
    * import { Argument } from "effect/unstable/cli"
    *
-   * const repository = Argument.string("repository").pipe(
-   *   Argument.withFallbackConfig(Config.string("REPOSITORY"))
+   * const repository = Argument.String("repository").pipe(
+   *   Argument.withFallbackConfig(Config.String("REPOSITORY"))
    * )
    * repository.kind // => "argument"
    * ```
@@ -473,8 +469,8 @@ export const withFallbackConfig: {
    * import { Config } from "effect"
    * import { Argument } from "effect/unstable/cli"
    *
-   * const repository = Argument.string("repository").pipe(
-   *   Argument.withFallbackConfig(Config.string("REPOSITORY"))
+   * const repository = Argument.String("repository").pipe(
+   *   Argument.withFallbackConfig(Config.String("REPOSITORY"))
    * )
    * repository.kind // => "argument"
    * ```
@@ -493,8 +489,8 @@ export const withFallbackConfig: {
  * ```ts import.meta.vitest
  * import { Argument, Prompt } from "effect/unstable/cli"
  *
- * const filename = Argument.string("filename").pipe(
- *   Argument.withFallbackPrompt(Prompt.text({ message: "Filename" }))
+ * const filename = Argument.String("filename").pipe(
+ *   Argument.withFallbackPrompt(Prompt.String({ message: "Filename" }))
  * )
  * filename.kind // => "argument"
  * ```
@@ -511,8 +507,8 @@ export const withFallbackPrompt: {
    * ```ts import.meta.vitest
    * import { Argument, Prompt } from "effect/unstable/cli"
    *
-   * const filename = Argument.string("filename").pipe(
-   *   Argument.withFallbackPrompt(Prompt.text({ message: "Filename" }))
+   * const filename = Argument.String("filename").pipe(
+   *   Argument.withFallbackPrompt(Prompt.String({ message: "Filename" }))
    * )
    * filename.kind // => "argument"
    * ```
@@ -529,8 +525,8 @@ export const withFallbackPrompt: {
    * ```ts import.meta.vitest
    * import { Argument, Prompt } from "effect/unstable/cli"
    *
-   * const filename = Argument.string("filename").pipe(
-   *   Argument.withFallbackPrompt(Prompt.text({ message: "Filename" }))
+   * const filename = Argument.String("filename").pipe(
+   *   Argument.withFallbackPrompt(Prompt.String({ message: "Filename" }))
    * )
    * filename.kind // => "argument"
    * ```
@@ -550,15 +546,15 @@ export const withFallbackPrompt: {
  * import { Argument } from "effect/unstable/cli"
  *
  * // Accept any number of files
- * const anyFiles = Argument.string("files").pipe(Argument.variadic)
+ * const anyFiles = Argument.String("files").pipe(Argument.variadic)
  *
  * // Accept at least 1 file
- * const atLeastOneFile = Argument.string("files").pipe(
+ * const atLeastOneFile = Argument.String("files").pipe(
  *   Argument.variadic({ min: 1 })
  * )
  *
  * // Accept between 1 and 5 files
- * const limitedFiles = Argument.string("files").pipe(
+ * const limitedFiles = Argument.String("files").pipe(
  *   Argument.variadic({ min: 1, max: 5 })
  * )
  *
@@ -578,15 +574,15 @@ export const variadic: {
    * import { Argument } from "effect/unstable/cli"
    *
    * // Accept any number of files
-   * const anyFiles = Argument.string("files").pipe(Argument.variadic)
+   * const anyFiles = Argument.String("files").pipe(Argument.variadic)
    *
    * // Accept at least 1 file
-   * const atLeastOneFile = Argument.string("files").pipe(
+   * const atLeastOneFile = Argument.String("files").pipe(
    *   Argument.variadic({ min: 1 })
    * )
    *
    * // Accept between 1 and 5 files
-   * const limitedFiles = Argument.string("files").pipe(
+   * const limitedFiles = Argument.String("files").pipe(
    *   Argument.variadic({ min: 1, max: 5 })
    * )
    *
@@ -606,15 +602,15 @@ export const variadic: {
    * import { Argument } from "effect/unstable/cli"
    *
    * // Accept any number of files
-   * const anyFiles = Argument.string("files").pipe(Argument.variadic)
+   * const anyFiles = Argument.String("files").pipe(Argument.variadic)
    *
    * // Accept at least 1 file
-   * const atLeastOneFile = Argument.string("files").pipe(
+   * const atLeastOneFile = Argument.String("files").pipe(
    *   Argument.variadic({ min: 1 })
    * )
    *
    * // Accept between 1 and 5 files
-   * const limitedFiles = Argument.string("files").pipe(
+   * const limitedFiles = Argument.String("files").pipe(
    *   Argument.variadic({ min: 1, max: 5 })
    * )
    *
@@ -638,7 +634,7 @@ export const variadic: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const port = Argument.integer("port").pipe(
+ * const port = Argument.Int("port").pipe(
  *   Argument.map((p) => ({ port: p, url: `http://localhost:${p}` }))
  * )
  * port.kind // => "argument"
@@ -656,7 +652,7 @@ export const map: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const port = Argument.integer("port").pipe(
+   * const port = Argument.Int("port").pipe(
    *   Argument.map((p) => ({ port: p, url: `http://localhost:${p}` }))
    * )
    * port.kind // => "argument"
@@ -674,7 +670,7 @@ export const map: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const port = Argument.integer("port").pipe(
+   * const port = Argument.Int("port").pipe(
    *   Argument.map((p) => ({ port: p, url: `http://localhost:${p}` }))
    * )
    * port.kind // => "argument"
@@ -713,7 +709,7 @@ export const map: {
  *   )
  * )
  *
- * const files = Argument.string("files").pipe(
+ * const files = Argument.String("files").pipe(
  *   Argument.mapEffect((file) =>
  *     file.endsWith(".txt")
  *       ? Effect.succeed(file)
@@ -763,7 +759,7 @@ export const mapEffect: {
    *   )
    * )
    *
-   * const files = Argument.string("files").pipe(
+   * const files = Argument.String("files").pipe(
    *   Argument.mapEffect((file) =>
    *     file.endsWith(".txt")
    *       ? Effect.succeed(file)
@@ -813,7 +809,7 @@ export const mapEffect: {
    *   )
    * )
    *
-   * const files = Argument.string("files").pipe(
+   * const files = Argument.String("files").pipe(
    *   Argument.mapEffect((file) =>
    *     file.endsWith(".txt")
    *       ? Effect.succeed(file)
@@ -871,7 +867,7 @@ export const mapEffect: {
  *   )
  * )
  *
- * const json = Argument.string("data").pipe(
+ * const json = Argument.String("data").pipe(
  *   Argument.mapTryCatch(
  *     (str) => JSON.parse(str),
  *     (error) =>
@@ -916,7 +912,7 @@ export const mapTryCatch: {
    *   )
    * )
    *
-   * const json = Argument.string("data").pipe(
+   * const json = Argument.String("data").pipe(
    *   Argument.mapTryCatch(
    *     (str) => JSON.parse(str),
    *     (error) =>
@@ -961,7 +957,7 @@ export const mapTryCatch: {
    *   )
    * )
    *
-   * const json = Argument.string("data").pipe(
+   * const json = Argument.String("data").pipe(
    *   Argument.mapTryCatch(
    *     (str) => JSON.parse(str),
    *     (error) =>
@@ -993,7 +989,7 @@ export const mapTryCatch: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const files = Argument.string("files").pipe(Argument.atLeast(1))
+ * const files = Argument.String("files").pipe(Argument.atLeast(1))
  * files.kind // => "argument"
  * ```
  *
@@ -1009,7 +1005,7 @@ export const atLeast: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const files = Argument.string("files").pipe(Argument.atLeast(1))
+   * const files = Argument.String("files").pipe(Argument.atLeast(1))
    * files.kind // => "argument"
    * ```
    *
@@ -1025,7 +1021,7 @@ export const atLeast: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const files = Argument.string("files").pipe(Argument.atLeast(1))
+   * const files = Argument.String("files").pipe(Argument.atLeast(1))
    * files.kind // => "argument"
    * ```
    *
@@ -1043,7 +1039,7 @@ export const atLeast: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const files = Argument.string("files").pipe(Argument.atMost(5))
+ * const files = Argument.String("files").pipe(Argument.atMost(5))
  * files.kind // => "argument"
  * ```
  *
@@ -1059,7 +1055,7 @@ export const atMost: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const files = Argument.string("files").pipe(Argument.atMost(5))
+   * const files = Argument.String("files").pipe(Argument.atMost(5))
    * files.kind // => "argument"
    * ```
    *
@@ -1075,7 +1071,7 @@ export const atMost: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const files = Argument.string("files").pipe(Argument.atMost(5))
+   * const files = Argument.String("files").pipe(Argument.atMost(5))
    * files.kind // => "argument"
    * ```
    *
@@ -1093,7 +1089,7 @@ export const atMost: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const files = Argument.string("files").pipe(Argument.between(1, 5))
+ * const files = Argument.String("files").pipe(Argument.between(1, 5))
  * files.kind // => "argument"
  * ```
  *
@@ -1109,7 +1105,7 @@ export const between: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const files = Argument.string("files").pipe(Argument.between(1, 5))
+   * const files = Argument.String("files").pipe(Argument.between(1, 5))
    * files.kind // => "argument"
    * ```
    *
@@ -1125,7 +1121,7 @@ export const between: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const files = Argument.string("files").pipe(Argument.between(1, 5))
+   * const files = Argument.String("files").pipe(Argument.between(1, 5))
    * files.kind // => "argument"
    * ```
    *
@@ -1144,7 +1140,7 @@ export const between: {
  * import { Schema } from "effect"
  * import { Argument } from "effect/unstable/cli"
  *
- * const input = Argument.string("input").pipe(
+ * const input = Argument.String("input").pipe(
  *   Argument.withSchema(Schema.NonEmptyString)
  * )
  * input.kind // => "argument"
@@ -1163,7 +1159,7 @@ export const withSchema: {
    * import { Schema } from "effect"
    * import { Argument } from "effect/unstable/cli"
    *
-   * const input = Argument.string("input").pipe(
+   * const input = Argument.String("input").pipe(
    *   Argument.withSchema(Schema.NonEmptyString)
    * )
    * input.kind // => "argument"
@@ -1182,7 +1178,7 @@ export const withSchema: {
    * import { Schema } from "effect"
    * import { Argument } from "effect/unstable/cli"
    *
-   * const input = Argument.string("input").pipe(
+   * const input = Argument.String("input").pipe(
    *   Argument.withSchema(Schema.NonEmptyString)
    * )
    * input.kind // => "argument"
@@ -1209,7 +1205,7 @@ export const withSchema: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const logLevel = Argument.choiceWithValue("level", [
+ * const logLevel = Argument.ChoiceWithValue("level", [
  *   ["debug", 0],
  *   ["info", 1],
  *   ["warn", 2],
@@ -1221,10 +1217,10 @@ export const withSchema: {
  * @category constructors
  * @since 4.0.0
  */
-export const choiceWithValue = <const Choices extends ReadonlyArray<readonly [string, any]>>(
+export const ChoiceWithValue = <const Choices extends ReadonlyArray<readonly [string, any]>>(
   name: string,
   choices: Choices
-): Argument<Choices[number][1]> => Param.choiceWithValue(Param.argumentKind, name, choices)
+): Argument<Choices[number][1]> => Param.ChoiceWithValue(Param.argumentKind, name, choices)
 
 // -------------------------------------------------------------------------------------
 // metadata
@@ -1243,7 +1239,7 @@ export const choiceWithValue = <const Choices extends ReadonlyArray<readonly [st
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const port = Argument.integer("port").pipe(
+ * const port = Argument.Int("port").pipe(
  *   Argument.withMetavar("PORT")
  * )
  * port.kind // => "argument"
@@ -1270,7 +1266,7 @@ export const withMetavar: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const port = Argument.integer("port").pipe(
+   * const port = Argument.Int("port").pipe(
    *   Argument.withMetavar("PORT")
    * )
    * port.kind // => "argument"
@@ -1297,7 +1293,7 @@ export const withMetavar: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const port = Argument.integer("port").pipe(
+   * const port = Argument.Int("port").pipe(
    *   Argument.withMetavar("PORT")
    * )
    * port.kind // => "argument"
@@ -1317,7 +1313,7 @@ export const withMetavar: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const positiveInt = Argument.integer("count").pipe(
+ * const positiveInt = Argument.Int("count").pipe(
  *   Argument.filter(
  *     (n) => n > 0,
  *     (n) => `Expected positive integer, got ${n}`
@@ -1338,7 +1334,7 @@ export const filter: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const positiveInt = Argument.integer("count").pipe(
+   * const positiveInt = Argument.Int("count").pipe(
    *   Argument.filter(
    *     (n) => n > 0,
    *     (n) => `Expected positive integer, got ${n}`
@@ -1359,7 +1355,7 @@ export const filter: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const positiveInt = Argument.integer("count").pipe(
+   * const positiveInt = Argument.Int("count").pipe(
    *   Argument.filter(
    *     (n) => n > 0,
    *     (n) => `Expected positive integer, got ${n}`
@@ -1388,7 +1384,7 @@ export const filter: {
  * import { Option } from "effect"
  * import { Argument } from "effect/unstable/cli"
  *
- * const positiveInt = Argument.integer("count").pipe(
+ * const positiveInt = Argument.Int("count").pipe(
  *   Argument.filterMap(
  *     (n) => n > 0 ? Option.some(n) : Option.none(),
  *     (n) => `Expected positive integer, got ${n}`
@@ -1411,7 +1407,7 @@ export const filterMap: {
    * import { Option } from "effect"
    * import { Argument } from "effect/unstable/cli"
    *
-   * const positiveInt = Argument.integer("count").pipe(
+   * const positiveInt = Argument.Int("count").pipe(
    *   Argument.filterMap(
    *     (n) => n > 0 ? Option.some(n) : Option.none(),
    *     (n) => `Expected positive integer, got ${n}`
@@ -1434,7 +1430,7 @@ export const filterMap: {
    * import { Option } from "effect"
    * import { Argument } from "effect/unstable/cli"
    *
-   * const positiveInt = Argument.integer("count").pipe(
+   * const positiveInt = Argument.Int("count").pipe(
    *   Argument.filterMap(
    *     (n) => n > 0 ? Option.some(n) : Option.none(),
    *     (n) => `Expected positive integer, got ${n}`
@@ -1461,8 +1457,8 @@ export const filterMap: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const value = Argument.integer("value").pipe(
- *   Argument.orElse(() => Argument.string("value"))
+ * const value = Argument.Int("value").pipe(
+ *   Argument.orElse(() => Argument.String("value"))
  * )
  * value.kind // => "argument"
  * ```
@@ -1479,8 +1475,8 @@ export const orElse: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const value = Argument.integer("value").pipe(
-   *   Argument.orElse(() => Argument.string("value"))
+   * const value = Argument.Int("value").pipe(
+   *   Argument.orElse(() => Argument.String("value"))
    * )
    * value.kind // => "argument"
    * ```
@@ -1497,8 +1493,8 @@ export const orElse: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const value = Argument.integer("value").pipe(
-   *   Argument.orElse(() => Argument.string("value"))
+   * const value = Argument.Int("value").pipe(
+   *   Argument.orElse(() => Argument.String("value"))
    * )
    * value.kind // => "argument"
    * ```
@@ -1517,8 +1513,8 @@ export const orElse: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const source = Argument.file("source").pipe(
- *   Argument.orElseResult(() => Argument.string("url"))
+ * const source = Argument.File("source").pipe(
+ *   Argument.orElseResult(() => Argument.String("url"))
  * )
  * // Returns Result<string, string>
  * source.kind // => "argument"
@@ -1536,8 +1532,8 @@ export const orElseResult: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const source = Argument.file("source").pipe(
-   *   Argument.orElseResult(() => Argument.string("url"))
+   * const source = Argument.File("source").pipe(
+   *   Argument.orElseResult(() => Argument.String("url"))
    * )
    * // Returns Result<string, string>
    * source.kind // => "argument"
@@ -1555,8 +1551,8 @@ export const orElseResult: {
    * ```ts import.meta.vitest
    * import { Argument } from "effect/unstable/cli"
    *
-   * const source = Argument.file("source").pipe(
-   *   Argument.orElseResult(() => Argument.string("url"))
+   * const source = Argument.File("source").pipe(
+   *   Argument.orElseResult(() => Argument.String("url"))
    * )
    * // Returns Result<string, string>
    * source.kind // => "argument"