effect 4.0.0-beta.12 → 4.0.0-beta.14

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

@@ -0,0 +1,65 @@
+/**
+ * Help Documentation
+ * ================
+ *
+ * Internal helpers for generating help documentation.
+ * Extracted from command.ts to avoid circular dependencies.
+ */
+import * as Effect from "../../../Effect.ts"
+import type * as ServiceMap from "../../../ServiceMap.ts"
+import type { Command } from "../Command.ts"
+import type { GlobalFlag } from "../GlobalFlag.ts"
+import type { FlagDoc, HelpDoc } from "../HelpDoc.ts"
+import * as Param from "../Param.ts"
+import * as Primitive from "../Primitive.ts"
+import { toImpl } from "./command.ts"
+
+/**
+ * Helper function to get help documentation for a specific command path.
+ * Navigates through the command hierarchy to find the right command.
+ * Reads global flags from the registry and includes them in the help doc.
+ */
+export const getHelpForCommandPath = <Name extends string, Input, E, R>(
+  command: Command<Name, Input, E, R>,
+  commandPath: ReadonlyArray<string>,
+  registry: ServiceMap.Reference<Set<GlobalFlag<unknown>>>
+): Effect.Effect<HelpDoc, never, never> =>
+  Effect.gen(function*() {
+    let currentCommand: Command.Any = command
+
+    for (let i = 1; i < commandPath.length; i++) {
+      const subcommandName = commandPath[i]
+      let subcommand: Command.Any | undefined = undefined
+
+      for (const group of currentCommand.subcommands) {
+        subcommand = group.commands.find((sub) => sub.name === subcommandName)
+        if (subcommand) {
+          break
+        }
+      }
+
+      if (subcommand) {
+        currentCommand = subcommand
+      }
+    }
+
+    const baseDoc = toImpl(currentCommand).buildHelpDoc(commandPath)
+
+    const flags = yield* registry
+    const globalFlagDocs: Array<FlagDoc> = []
+    for (const flag of flags) {
+      const singles = Param.extractSingleParams(flag.flag)
+      for (const single of singles) {
+        const formattedAliases = single.aliases.map((alias) => alias.length === 1 ? `-${alias}` : `--${alias}`)
+        globalFlagDocs.push({
+          name: single.name,
+          aliases: formattedAliases,
+          type: single.typeName ?? Primitive.getTypeName(single.primitiveType),
+          description: single.description,
+          required: false
+        })
+      }
+    }
+
+    return { ...baseDoc, globalFlags: globalFlagDocs }
+  })

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

@@ -25,14 +25,11 @@
  * - Errors accumulate rather than throwing exceptions
  */
 import * as Effect from "../../../Effect.ts"
-import type { LogLevel } from "../../../LogLevel.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"
 import * as Primitive from "../Primitive.ts"
 import { suggest } from "./auto-suggest.ts"
-import { completionsFlag, helpFlag, logLevelFlag, versionFlag } from "./builtInFlags.ts"
 import { toImpl } from "./command.ts"
 import type { LexResult, Token } from "./lexer.ts"
 
@@ -46,36 +43,6 @@ export const getCommandPath = (parsedInput: ParsedTokens): ReadonlyArray<string>
     ? [parsedInput.subcommand.name, ...getCommandPath(parsedInput.subcommand.parsedInput)]
     : []
 
-/** @internal */
-export const extractBuiltInOptions = (
-  tokens: ReadonlyArray<Token>
-): Effect.Effect<
-  {
-    help: boolean
-    logLevel: LogLevel | undefined
-    version: boolean
-    completions: "bash" | "zsh" | "fish" | undefined
-    remainder: ReadonlyArray<Token>
-  },
-  CliError.CliError,
-  Param.Environment
-> =>
-  Effect.gen(function*() {
-    const { flagMap, remainder } = consumeKnownFlags(tokens, builtInFlagRegistry)
-    const emptyArgs: Param.ParsedArgs = { flags: flagMap, arguments: [] }
-    const [, help] = yield* helpFlag.parse(emptyArgs)
-    const [, logLevel] = yield* logLevelFlag.parse(emptyArgs)
-    const [, version] = yield* versionFlag.parse(emptyArgs)
-    const [, completions] = yield* completionsFlag.parse(emptyArgs)
-    return {
-      help,
-      logLevel: Option.getOrUndefined(logLevel),
-      version,
-      completions: Option.getOrUndefined(completions),
-      remainder
-    }
-  })
-
 /** @internal */
 export const parseArgs = (
   lexResult: LexResult,
@@ -249,8 +216,9 @@ const makeCursor = (tokens: ReadonlyArray<Token>): TokenCursor => {
 /**
  * Creates a registry for O(1) flag lookup by name or alias.
  * @throws Error if duplicate names or aliases are detected (developer error)
+ * @internal
  */
-const createFlagRegistry = (params: ReadonlyArray<FlagParam>): FlagRegistry => {
+export const createFlagRegistry = (params: ReadonlyArray<FlagParam>): FlagRegistry => {
   const index = new Map<string, FlagParam>()
 
   for (const param of params) {
@@ -276,9 +244,22 @@ const buildSubcommandIndex = (
   subcommands: Command.Any["subcommands"]
 ): Map<string, Command<string, unknown, unknown, unknown>> => {
   const index = new Map<string, Command<string, unknown, unknown, unknown>>()
+  const setKey = (key: string, command: Command<string, unknown, unknown, unknown>) => {
+    const existing = index.get(key)
+    if (existing && existing !== command) {
+      throw new Error(
+        `Duplicate subcommand name/alias "${key}" in command definition (conflicts with "${existing.name}")`
+      )
+    }
+    index.set(key, command)
+  }
+
   for (const group of subcommands) {
     for (const subcommand of group.commands) {
-      index.set(subcommand.name, subcommand)
+      setKey(subcommand.name, subcommand)
+      if (subcommand.alias && subcommand.alias !== subcommand.name) {
+        setKey(subcommand.alias, subcommand)
+      }
     }
   }
   return index
@@ -288,8 +269,10 @@ const buildSubcommandIndex = (
 /* Flag Accumulator                                                           */
 /* ========================================================================== */
 
-/** Creates an empty flag map with all known flag names initialized to []. */
-const createEmptyFlagMap = (params: ReadonlyArray<FlagParam>): FlagMap =>
+/** Creates an empty flag map with all known flag names initialized to [].
+ * @internal
+ */
+export const createEmptyFlagMap = (params: ReadonlyArray<FlagParam>): FlagMap =>
   Object.fromEntries(params.map((p) => [p.name, []]))
 
 /**
@@ -378,9 +361,10 @@ const consumeFlagValue = (
 /**
  * Consumes known flags from a token stream.
  * Unrecognized tokens are passed through to remainder.
- * Used for both built-in extraction and npm-style parent flag collection.
+ * Used for both global flag extraction and npm-style parent flag collection.
+ * @internal
  */
-const consumeKnownFlags = (
+export const consumeKnownFlags = (
   tokens: ReadonlyArray<Token>,
   registry: FlagRegistry
 ): { flagMap: FlagMap; remainder: ReadonlyArray<Token> } => {
@@ -409,19 +393,6 @@ const consumeKnownFlags = (
   return { flagMap, remainder }
 }
 
-/* ========================================================================== */
-/* Built-in Flags                                                             */
-/* ========================================================================== */
-
-const builtInFlagParams: ReadonlyArray<FlagParam> = [
-  ...Param.extractSingleParams(logLevelFlag),
-  ...Param.extractSingleParams(helpFlag),
-  ...Param.extractSingleParams(versionFlag),
-  ...Param.extractSingleParams(completionsFlag)
-]
-
-const builtInFlagRegistry = createFlagRegistry(builtInFlagParams)
-
 /* ========================================================================== */
 /* Error Creation                                                             */
 /* ========================================================================== */

package/src/unstable/httpapi/OpenApi.ts

@@ -351,10 +351,9 @@ export function fromApi<Id extends string, Groups extends HttpApiGroup.Any>(
                   ast: toEncodingAST(ast, encoding),
                   path: ["paths", path, method, "responses", String(status), "content", contentType, "schema"]
                 })
-                op.responses[status].content = {
-                  [contentType]: {
-                    schema: {}
-                  }
+                op.responses[status].content ??= {}
+                op.responses[status].content[contentType] = {
+                  schema: {}
                 }
               })
             })

package/src/unstable/reactivity/Atom.ts

@@ -417,7 +417,7 @@ export const make: {
     options?: {
       readonly initialValue?: A
     }
-  ): Atom<AsyncResult.AsyncResult<A, E>>
+  ): Atom<AsyncResult.AsyncResult<A, E | Cause.NoSuchElementError>>
   // -----------------------------------------------------------------------------
   // constructors
   // -----------------------------------------------------------------------------
@@ -431,7 +431,7 @@ export const make: {
     options?: {
       readonly initialValue?: A
     }
-  ): Atom<AsyncResult.AsyncResult<A, E>>
+  ): Atom<AsyncResult.AsyncResult<A, E | Cause.NoSuchElementError>>
   // -----------------------------------------------------------------------------
   // constructors
   // -----------------------------------------------------------------------------
@@ -477,11 +477,11 @@ const makeRead: {
   <A, E>(stream: Stream.Stream<A, E, AtomRegistry>, options?: {
     readonly initialValue?: A
     readonly uninterruptible?: boolean | undefined
-  }): (get: Context, services?: ServiceMap.ServiceMap<any>) => AsyncResult.AsyncResult<A, E>
+  }): (get: Context, services?: ServiceMap.ServiceMap<any>) => AsyncResult.AsyncResult<A, E | Cause.NoSuchElementError>
   <A, E>(create: (get: Context) => Stream.Stream<A, E, AtomRegistry>, options?: {
     readonly initialValue?: A
     readonly uninterruptible?: boolean | undefined
-  }): (get: Context, services?: ServiceMap.ServiceMap<any>) => AsyncResult.AsyncResult<A, E>
+  }): (get: Context, services?: ServiceMap.ServiceMap<any>) => AsyncResult.AsyncResult<A, E | Cause.NoSuchElementError>
   <A>(create: (get: Context) => A): (get: Context, services?: ServiceMap.ServiceMap<any>) => A
   <A>(initialValue: A): Writable<A>
 } = <A, E>(
@@ -653,10 +653,10 @@ export interface AtomRuntime<R, ER = never> extends Atom<AsyncResult.AsyncResult
     }): Atom<AsyncResult.AsyncResult<A, E | ER>>
     <A, E>(create: (get: Context) => Stream.Stream<A, E, AtomRegistry | Reactivity.Reactivity | R>, options?: {
       readonly initialValue?: A
-    }): Atom<AsyncResult.AsyncResult<A, E | ER>>
+    }): Atom<AsyncResult.AsyncResult<A, E | ER | Cause.NoSuchElementError>>
     <A, E>(stream: Stream.Stream<A, E, AtomRegistry | Reactivity.Reactivity | R>, options?: {
       readonly initialValue?: A
-    }): Atom<AsyncResult.AsyncResult<A, E | ER>>
+    }): Atom<AsyncResult.AsyncResult<A, E | ER | Cause.NoSuchElementError>>
   }
 
   readonly fn: {

package/src/unstable/rpc/Rpc.ts

@@ -521,7 +521,7 @@ export type ExtractProvides<R extends Any, Tag extends string> = R extends Rpc<
   infer _Error,
   infer _Middleware,
   infer _Requires
-> ? RpcMiddleware.Provides<_Middleware> :
+> ? RpcMiddleware.Provides<_Middleware["Identifier"]> :
   never
 
 /**

package/src/unstable/schema/VariantSchema.ts

@@ -301,12 +301,12 @@ export const make = <
     config: A & { readonly [K in Exclude<keyof A, Variants[number]>]: never }
   ) => Field<A>
   readonly FieldOnly: <const Keys extends ReadonlyArray<Variants[number]>>(
-    ...keys: Keys
+    keys: Keys
   ) => <S extends Schema.Top>(
     schema: S
   ) => Field<{ readonly [K in Keys[number]]: S }>
   readonly FieldExcept: <const Keys extends ReadonlyArray<Variants[number]>>(
-    ...keys: Keys
+    keys: Keys
   ) => <S extends Schema.Top>(
     schema: S
   ) => Field<{ readonly [K in Exclude<Variants[number], Keys[number]>]: S }>
@@ -364,7 +364,7 @@ export const make = <
         readonly [V in Variants[number]]: Extract<V, Struct<Fields>>
       }
   readonly Union: <const Members extends ReadonlyArray<Struct<any>>>(
-    ...members: Members
+    members: Members
   ) => Union<Members> & Union.Variants<Members, Variants[number]>
   readonly extract: {
     <V extends Variants[number]>(
@@ -403,7 +403,7 @@ export const make = <
       return Base
     }
   }
-  function FieldOnly<Keys extends Variants>(...keys: Keys) {
+  function FieldOnly<const Keys extends ReadonlyArray<Variants[number]>>(keys: Keys) {
     return function<S extends Schema.Top>(schema: S) {
       const obj: Record<string, S> = {}
       for (const key of keys) {
@@ -412,7 +412,7 @@ export const make = <
       return Field(obj)
     }
   }
-  function FieldExcept<Keys extends Variants>(...keys: Keys) {
+  function FieldExcept<const Keys extends ReadonlyArray<Variants[number]>>(keys: Keys) {
     return function<S extends Schema.Top>(schema: S) {
       const obj: Record<string, S> = {}
       for (const variant of options.variants) {
@@ -423,7 +423,7 @@ export const make = <
       return Field(obj)
     }
   }
-  function UnionVariants(...members: ReadonlyArray<Struct<any>>) {
+  function UnionVariants(members: ReadonlyArray<Struct<any>>) {
     return Union(members, options.variants)
   }
   const fieldEvolve = dual(

package/src/unstable/sql/SqlError.ts

@@ -1,17 +1,17 @@
 /**
  * @since 4.0.0
  */
-import * as Data from "../../Data.ts"
+import * as Schema from "../../Schema.ts"
 
 const TypeId = "~effect/sql/SqlError"
 
 /**
  * @since 4.0.0
  */
-export class SqlError extends Data.TaggedError("SqlError")<{
-  cause: unknown
-  message?: string
-}> {
+export class SqlError extends Schema.TaggedErrorClass<SqlError>("effect/sql/SqlError")("SqlError", {
+  cause: Schema.Defect,
+  message: Schema.optional(Schema.String)
+}) {
   /**
    * @since 4.0.0
    */
@@ -21,10 +21,12 @@ export class SqlError extends Data.TaggedError("SqlError")<{
 /**
  * @since 4.0.0
  */
-export class ResultLengthMismatch extends Data.TaggedError("ResultLengthMismatch")<{
-  readonly expected: number
-  readonly actual: number
-}> {
+export class ResultLengthMismatch
+  extends Schema.TaggedErrorClass<ResultLengthMismatch>("effect/sql/ResultLengthMismatch")("ResultLengthMismatch", {
+    expected: Schema.Number,
+    actual: Schema.Number
+  })
+{
   /**
    * @since 4.0.0
    */

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

@@ -1,7 +0,0 @@
-/**
- * Built-in options that are automatically available for CLI commands.
- * @since 4.0.0
- * @internal
- */
-export {};
-//# sourceMappingURL=builtInFlags.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"builtInFlags.d.ts","sourceRoot":"","sources":["../../../../src/unstable/cli/internal/builtInFlags.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

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

@@ -1,44 +0,0 @@
-/**
- * Built-in options that are automatically available for CLI commands.
- * @since 4.0.0
- * @internal
- */
-import * as Option from "../../../Option.js";
-import * as Flag from "../Flag.js";
-/**
- * Built-in --log-level option with all Effect LogLevel values.
- * Maps CLI strings to proper LogLevel constants.
- *
- * @since 4.0.0
- * @internal
- */
-export const logLevelFlag = /*#__PURE__*/Flag.choiceWithValue("log-level", [["all", "All"], ["trace", "Trace"], ["debug", "Debug"], ["info", "Info"], ["warn", "Warn"], ["warning", "Warn"],
-// alias
-["error", "Error"], ["fatal", "Fatal"], ["none", "None"]]).pipe(Flag.optional, /*#__PURE__*/Flag.withDescription("Sets the minimum log level for the command"));
-/**
- * Built-in --help/-h option.
- *
- * @since 4.0.0
- * @internal
- */
-export const helpFlag = /*#__PURE__*/Flag.boolean("help").pipe(/*#__PURE__*/Flag.withAlias("h"), /*#__PURE__*/Flag.withDescription("Show help information"));
-/**
- * Built-in --version option.
- *
- * @since 4.0.0
- * @internal
- */
-export const versionFlag = /*#__PURE__*/Flag.boolean("version").pipe(/*#__PURE__*/Flag.withDescription("Show version information"));
-/**
- * Built-in --completions option to print shell completion scripts.
- * Generates a dynamic completion shim that calls the CLI at runtime.
- * Accepts one of: bash | zsh | fish | sh (alias of bash).
- *
- * @since 4.0.0
- * @internal
- */
-export const completionsFlag = /*#__PURE__*/Flag.choice("completions", ["bash", "zsh", "fish", "sh"]).pipe(Flag.optional,
-/*#__PURE__*/
-// Map "sh" to "bash" while preserving Option-ness
-Flag.map(v => Option.map(v, s => s === "sh" ? "bash" : s)), /*#__PURE__*/Flag.withDescription("Print shell completion script for the given shell"));
-//# sourceMappingURL=builtInFlags.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"builtInFlags.js","names":["Option","Flag","logLevelFlag","choiceWithValue","pipe","optional","withDescription","helpFlag","boolean","withAlias","versionFlag","completionsFlag","choice","map","v","s"],"sources":["../../../../src/unstable/cli/internal/builtInFlags.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;AAOA,OAAO,KAAKA,MAAM,MAAM,oBAAoB;AAC5C,OAAO,KAAKC,IAAI,MAAM,YAAY;AAElC;;;;;;;AAOA,OAAO,MAAMC,YAAY,gBAAuCD,IAAI,CACjEE,eAAe,CACd,WAAW,EACX,CACE,CAAC,KAAK,EAAE,KAAK,CAAC,EACd,CAAC,OAAO,EAAE,OAAO,CAAC,EAClB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClB,CAAC,MAAM,EAAE,MAAM,CAAC,EAChB,CAAC,MAAM,EAAE,MAAM,CAAC,EAChB,CAAC,SAAS,EAAE,MAAM,CAAC;AAAE;AACrB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CACR,CACX,CACAC,IAAI,CACHH,IAAI,CAACI,QAAQ,eACbJ,IAAI,CAACK,eAAe,CAAC,4CAA4C,CAAC,CACnE;AAEH;;;;;;AAMA,OAAO,MAAMC,QAAQ,gBAAuBN,IAAI,CAC7CO,OAAO,CAAC,MAAM,CAAC,CACfJ,IAAI,cACHH,IAAI,CAACQ,SAAS,CAAC,GAAG,CAAC,eACnBR,IAAI,CAACK,eAAe,CAAC,uBAAuB,CAAC,CAC9C;AAEH;;;;;;AAMA,OAAO,MAAMI,WAAW,gBAAuBT,IAAI,CAChDO,OAAO,CAAC,SAAS,CAAC,CAClBJ,IAAI,cACHH,IAAI,CAACK,eAAe,CAAC,0BAA0B,CAAC,CACjD;AAEH;;;;;;;;AAQA,OAAO,MAAMK,eAAe,gBAAsDV,IAAI,CACnFW,MAAM,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAU,CAAC,CAC7DR,IAAI,CACHH,IAAI,CAACI,QAAQ;AAAA;AACb;AACAJ,IAAI,CAACY,GAAG,CAAEC,CAAC,IAAKd,MAAM,CAACa,GAAG,CAACC,CAAC,EAAGC,CAAC,IAAMA,CAAC,KAAK,IAAI,GAAG,MAAM,GAAGA,CAAE,CAAC,CAAC,eAChEd,IAAI,CAACK,eAAe,CAAC,mDAAmD,CAAC,CAC1E","ignoreList":[]}

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

@@ -1,78 +0,0 @@
-/**
- * Built-in options that are automatically available for CLI commands.
- * @since 4.0.0
- * @internal
- */
-
-import type { LogLevel } from "../../../LogLevel.ts"
-import * as Option from "../../../Option.ts"
-import * as Flag from "../Flag.ts"
-
-/**
- * Built-in --log-level option with all Effect LogLevel values.
- * Maps CLI strings to proper LogLevel constants.
- *
- * @since 4.0.0
- * @internal
- */
-export const logLevelFlag: Flag.Flag<Option.Option<LogLevel>> = Flag
-  .choiceWithValue(
-    "log-level",
-    [
-      ["all", "All"],
-      ["trace", "Trace"],
-      ["debug", "Debug"],
-      ["info", "Info"],
-      ["warn", "Warn"],
-      ["warning", "Warn"], // alias
-      ["error", "Error"],
-      ["fatal", "Fatal"],
-      ["none", "None"]
-    ] as const
-  )
-  .pipe(
-    Flag.optional,
-    Flag.withDescription("Sets the minimum log level for the command")
-  )
-
-/**
- * Built-in --help/-h option.
- *
- * @since 4.0.0
- * @internal
- */
-export const helpFlag: Flag.Flag<boolean> = Flag
-  .boolean("help")
-  .pipe(
-    Flag.withAlias("h"),
-    Flag.withDescription("Show help information")
-  )
-
-/**
- * Built-in --version option.
- *
- * @since 4.0.0
- * @internal
- */
-export const versionFlag: Flag.Flag<boolean> = Flag
-  .boolean("version")
-  .pipe(
-    Flag.withDescription("Show version information")
-  )
-
-/**
- * Built-in --completions option to print shell completion scripts.
- * Generates a dynamic completion shim that calls the CLI at runtime.
- * Accepts one of: bash | zsh | fish | sh (alias of bash).
- *
- * @since 4.0.0
- * @internal
- */
-export const completionsFlag: Flag.Flag<Option.Option<"bash" | "zsh" | "fish">> = Flag
-  .choice("completions", ["bash", "zsh", "fish", "sh"] as const)
-  .pipe(
-    Flag.optional,
-    // Map "sh" to "bash" while preserving Option-ness
-    Flag.map((v) => Option.map(v, (s) => (s === "sh" ? "bash" : s))),
-    Flag.withDescription("Print shell completion script for the given shell")
-  )