@effect-app/vue 2.62.1 → 2.63.1

package/src/experimental/commander.ts

@@ -42,7 +42,7 @@ export const DefaultIntl = {
 
 export class CommandContext extends Effect.Tag("CommandContext")<
   CommandContext,
-  { action: string; baseName: string; namespace: string; namespaced: (key: string) => string }
+  { id: string; action: string; namespace: string; namespaced: (key: string) => string }
 >() {}
 
 export type EmitWithCallback<A, Event extends string> = (event: Event, value: A, onDone: () => void) => void
@@ -68,14 +68,18 @@ export const wrapEmitSubmit = <A>(
 }
 
 export declare namespace Commander {
-  export interface CommandProps<A, E, Name extends string> {
-    name: Name
+  export interface CommandProps<A, E, Id extends string> {
+    id: Id
+    namespace: `action.${Id}`
+    namespaced: <K extends string>(k: K) => `action.${Id}.${K}`
     action: string
     result: Result<A, E>
     waiting: boolean
   }
 
-  export interface CommandOut<Args extends Array<any>, A, E, R, Name extends string> extends CommandProps<A, E, Name> {
+  export interface CommandOut<Args extends Array<any>, A, E, R, Id extends string> extends CommandProps<A, E, Id> {
+    new(): {}
+
     /** click handlers */
     handle: (...args: Args) => RuntimeFiber<Exit.Exit<A, E>, never>
 
@@ -95,16 +99,16 @@ export declare namespace Commander {
     exec: (...args: Args) => Effect.Effect<Exit.Exit<A, E>, never, Exclude<R, CommandContext>>
   }
 
-  type CommandOutHelper<Args extends Array<any>, Eff extends Effect.Effect<any, any, any>, Name extends string> =
+  type CommandOutHelper<Args extends Array<any>, Eff extends Effect.Effect<any, any, any>, Id extends string> =
     CommandOut<
       Args,
       Effect.Effect.Success<Eff>,
       Effect.Effect.Error<Eff>,
       Effect.Effect.Context<Eff>,
-      Name
+      Id
     >
 
-  export type Gen<RT, Name extends string> = {
+  export type Gen<RT, Id extends string> = {
     <Eff extends YieldWrap<Effect.Effect<any, any, RT | CommandContext>>, AEff, Args extends Array<any>>(
       body: (...args: Args) => Generator<Eff, AEff, never>
     ): CommandOut<
@@ -116,7 +120,7 @@ export declare namespace Commander {
       [Eff] extends [never] ? never
         : [Eff] extends [YieldWrap<Effect.Effect<infer _A, infer _E, infer R>>] ? R
         : never,
-      Name
+      Id
     >
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
@@ -137,7 +141,7 @@ export declare namespace Commander {
         >,
         ...args: NoInfer<Args>
       ) => A
-    ): CommandOutHelper<Args, A, Name>
+    ): CommandOutHelper<Args, A, Id>
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
@@ -159,7 +163,7 @@ export declare namespace Commander {
         ...args: NoInfer<Args>
       ) => A,
       b: (_: A, ...args: NoInfer<Args>) => B
-    ): CommandOutHelper<Args, B, Name>
+    ): CommandOutHelper<Args, B, Id>
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
@@ -183,7 +187,7 @@ export declare namespace Commander {
       ) => A,
       b: (_: A, ...args: NoInfer<Args>) => B,
       c: (_: B, ...args: NoInfer<Args>) => C
-    ): CommandOutHelper<Args, C, Name>
+    ): CommandOutHelper<Args, C, Id>
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
@@ -209,7 +213,7 @@ export declare namespace Commander {
       b: (_: A, ...args: NoInfer<Args>) => B,
       c: (_: B, ...args: NoInfer<Args>) => C,
       d: (_: C, ...args: NoInfer<Args>) => D
-    ): CommandOutHelper<Args, D, Name>
+    ): CommandOutHelper<Args, D, Id>
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
@@ -237,7 +241,7 @@ export declare namespace Commander {
       c: (_: B, ...args: NoInfer<Args>) => C,
       d: (_: C, ...args: NoInfer<Args>) => D,
       e: (_: D, ...args: NoInfer<Args>) => E
-    ): CommandOutHelper<Args, E, Name>
+    ): CommandOutHelper<Args, E, Id>
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
@@ -267,7 +271,7 @@ export declare namespace Commander {
       d: (_: C, ...args: NoInfer<Args>) => D,
       e: (_: D, ...args: NoInfer<Args>) => E,
       f: (_: E, ...args: NoInfer<Args>) => F
-    ): CommandOutHelper<Args, F, Name>
+    ): CommandOutHelper<Args, F, Id>
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
@@ -299,7 +303,7 @@ export declare namespace Commander {
       e: (_: D, ...args: NoInfer<Args>) => E,
       f: (_: E, ...args: NoInfer<Args>) => F,
       g: (_: F, ...args: NoInfer<Args>) => G
-    ): CommandOutHelper<Args, G, Name>
+    ): CommandOutHelper<Args, G, Id>
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
@@ -333,7 +337,7 @@ export declare namespace Commander {
       f: (_: E, ...args: NoInfer<Args>) => F,
       g: (_: F, ...args: NoInfer<Args>) => G,
       h: (_: G, ...args: NoInfer<Args>) => H
-    ): CommandOutHelper<Args, H, Name>
+    ): CommandOutHelper<Args, H, Id>
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
@@ -369,35 +373,35 @@ export declare namespace Commander {
       g: (_: F, ...args: NoInfer<Args>) => G,
       h: (_: G, ...args: NoInfer<Args>) => H,
       i: (_: H, ...args: NoInfer<Args>) => I
-    ): CommandOutHelper<Args, I, Name>
+    ): CommandOutHelper<Args, I, Id>
   }
 
-  export type NonGen<RT, Name extends string> = {
+  export type NonGen<RT, Id extends string> = {
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, Args extends Array<any>>(
       body: (...args: Args) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, Args extends Array<any>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, Args extends Array<any>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, Args extends Array<any>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => C,
       c: (_: C, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, Args extends Array<any>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => C,
       c: (_: C, ...args: NoInfer<Args>) => D,
       d: (_: D, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, Args extends Array<any>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
@@ -405,7 +409,7 @@ export declare namespace Commander {
       c: (_: C, ...args: NoInfer<Args>) => D,
       d: (_: D, ...args: NoInfer<Args>) => E,
       e: (_: E, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, F, Args extends Array<any>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
@@ -414,7 +418,7 @@ export declare namespace Commander {
       d: (_: D, ...args: NoInfer<Args>) => E,
       e: (_: E, ...args: NoInfer<Args>) => F,
       f: (_: F, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, F, G, Args extends Array<any>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
@@ -424,7 +428,7 @@ export declare namespace Commander {
       e: (_: E, ...args: NoInfer<Args>) => F,
       f: (_: F, ...args: NoInfer<Args>) => G,
       g: (_: G, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, F, G, H, Args extends Array<any>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
@@ -435,7 +439,7 @@ export declare namespace Commander {
       f: (_: F, ...args: NoInfer<Args>) => G,
       g: (_: G, ...args: NoInfer<Args>) => H,
       h: (_: H, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, F, G, H, I, Args extends Array<any>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
@@ -447,16 +451,16 @@ export declare namespace Commander {
       g: (_: G, ...args: NoInfer<Args>) => H,
       h: (_: H, ...args: NoInfer<Args>) => I,
       i: (_: H, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
   }
 
-  export type GenWrap<RT, Name extends string, Args extends Array<any>, AEff, EEff, REff> = {
+  export type GenWrap<RT, Id extends string, Args extends Array<any>, AEff, EEff, REff> = {
     (): CommandOut<
       Args,
       AEff,
       EEff,
       REff, // TODO: only allowed to be RT | CommandContext
-      Name
+      Id
     >
     <
       A extends Effect.Effect<any, any, RT | CommandContext>
@@ -469,7 +473,7 @@ export declare namespace Commander {
         >,
         ...args: NoInfer<Args>
       ) => A
-    ): CommandOutHelper<Args, A, Name>
+    ): CommandOutHelper<Args, A, Id>
     <
       A,
       B extends Effect.Effect<any, any, RT | CommandContext>
@@ -483,7 +487,7 @@ export declare namespace Commander {
         ...args: NoInfer<Args>
       ) => A,
       b: (_: A, ...args: NoInfer<Args>) => B
-    ): CommandOutHelper<Args, B, Name>
+    ): CommandOutHelper<Args, B, Id>
     <
       A,
       B,
@@ -499,7 +503,7 @@ export declare namespace Commander {
       ) => A,
       b: (_: A, ...args: NoInfer<Args>) => B,
       c: (_: B, ...args: NoInfer<Args>) => C
-    ): CommandOutHelper<Args, C, Name>
+    ): CommandOutHelper<Args, C, Id>
     <
       A,
       B,
@@ -517,7 +521,7 @@ export declare namespace Commander {
       b: (_: A, ...args: NoInfer<Args>) => B,
       c: (_: B, ...args: NoInfer<Args>) => C,
       d: (_: C, ...args: NoInfer<Args>) => D
-    ): CommandOutHelper<Args, D, Name>
+    ): CommandOutHelper<Args, D, Id>
     <
       A,
       B,
@@ -537,7 +541,7 @@ export declare namespace Commander {
       c: (_: B, ...args: NoInfer<Args>) => C,
       d: (_: C, ...args: NoInfer<Args>) => D,
       e: (_: D, ...args: NoInfer<Args>) => E
-    ): CommandOutHelper<Args, E, Name>
+    ): CommandOutHelper<Args, E, Id>
     <
       A,
       B,
@@ -559,7 +563,7 @@ export declare namespace Commander {
       d: (_: C, ...args: NoInfer<Args>) => D,
       e: (_: D, ...args: NoInfer<Args>) => E,
       f: (_: E, ...args: NoInfer<Args>) => F
-    ): CommandOutHelper<Args, F, Name>
+    ): CommandOutHelper<Args, F, Id>
     <
       A,
       B,
@@ -583,7 +587,7 @@ export declare namespace Commander {
       e: (_: D, ...args: NoInfer<Args>) => E,
       f: (_: E, ...args: NoInfer<Args>) => F,
       g: (_: F, ...args: NoInfer<Args>) => G
-    ): CommandOutHelper<Args, G, Name>
+    ): CommandOutHelper<Args, G, Id>
     <A, B, C, D, E, F, G, H extends Effect.Effect<any, any, RT | CommandContext>>(
       a: (
         _: Effect.Effect<
@@ -600,7 +604,7 @@ export declare namespace Commander {
       f: (_: E, ...args: NoInfer<Args>) => F,
       g: (_: F, ...args: NoInfer<Args>) => G,
       h: (_: G, ...args: NoInfer<Args>) => H
-    ): CommandOutHelper<Args, H, Name>
+    ): CommandOutHelper<Args, H, Id>
     <A, B, C, D, E, F, G, H, I extends Effect.Effect<any, any, RT | CommandContext>>(
       a: (
         _: Effect.Effect<
@@ -618,11 +622,11 @@ export declare namespace Commander {
       g: (_: F, ...args: NoInfer<Args>) => G,
       h: (_: G, ...args: NoInfer<Args>) => H,
       i: (_: H, ...args: NoInfer<Args>) => I
-    ): CommandOutHelper<Args, I, Name>
+    ): CommandOutHelper<Args, I, Id>
   }
 
-  export type NonGenWrap<RT, Name extends string, Args extends Array<any>, AEff, EEff, REff> = {
-    (): CommandOutHelper<Args, Effect.Effect<AEff, EEff, REff>, Name>
+  export type NonGenWrap<RT, Id extends string, Args extends Array<any>, AEff, EEff, REff> = {
+    (): CommandOutHelper<Args, Effect.Effect<AEff, EEff, REff>, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, Args extends Array<any>>(
       a: (
         _: Effect.Effect<
@@ -632,7 +636,7 @@ export declare namespace Commander {
         >,
         ...args: NoInfer<Args>
       ) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, Args extends Array<any>>(
       a: (
         _: Effect.Effect<
@@ -643,7 +647,7 @@ export declare namespace Commander {
         ...args: NoInfer<Args>
       ) => B,
       b: (_: B, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, Args extends Array<any>>(
       a: (
         _: Effect.Effect<
@@ -655,7 +659,7 @@ export declare namespace Commander {
       ) => B,
       b: (_: B, ...args: NoInfer<Args>) => C,
       c: (_: C, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, Args extends Array<any>>(
       a: (
         _: Effect.Effect<
@@ -668,7 +672,7 @@ export declare namespace Commander {
       b: (_: B, ...args: NoInfer<Args>) => C,
       c: (_: C, ...args: NoInfer<Args>) => D,
       d: (_: D, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, Args extends Array<any>>(
       a: (
         _: Effect.Effect<
@@ -682,7 +686,7 @@ export declare namespace Commander {
       c: (_: C, ...args: NoInfer<Args>) => D,
       d: (_: D, ...args: NoInfer<Args>) => E,
       e: (_: E, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, F, Args extends Array<any>>(
       a: (
         _: Effect.Effect<
@@ -697,7 +701,7 @@ export declare namespace Commander {
       d: (_: D, ...args: NoInfer<Args>) => E,
       e: (_: E, ...args: NoInfer<Args>) => F,
       f: (_: F, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, F, G, Args extends Array<any>>(
       a: (
         _: Effect.Effect<
@@ -713,7 +717,7 @@ export declare namespace Commander {
       e: (_: E, ...args: NoInfer<Args>) => F,
       f: (_: F, ...args: NoInfer<Args>) => G,
       g: (_: G, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, F, G, H, Args extends Array<any>>(
       a: (
         _: Effect.Effect<
@@ -730,7 +734,7 @@ export declare namespace Commander {
       f: (_: F, ...args: NoInfer<Args>) => G,
       g: (_: G, ...args: NoInfer<Args>) => H,
       h: (_: H, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
     <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, F, G, H, I, Args extends Array<any>>(
       a: (
         _: Effect.Effect<
@@ -748,7 +752,7 @@ export declare namespace Commander {
       g: (_: G, ...args: NoInfer<Args>) => H,
       h: (_: H, ...args: NoInfer<Args>) => I,
       i: (_: H, ...args: NoInfer<Args>) => Eff
-    ): CommandOutHelper<Args, Eff, Name>
+    ): CommandOutHelper<Args, Eff, Id>
   }
 }
 
@@ -764,7 +768,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
 
     const makeCommand = <RT>(runtime: Runtime.Runtime<RT>) => {
       const runFork = Runtime.runFork(runtime)
-      return (actionName: string, errorDef?: Error) =>
+      return <const Id extends string>(id: Id, errorDef?: Error) =>
       <Args extends ReadonlyArray<any>, A, E, R extends RT | CommandContext>(
         handler: (...args: Args) => Effect.Effect<A, E, R>
       ) => {
@@ -777,20 +781,25 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
           errorDef = localErrorDef
         }
 
-        const namespace = `action.${actionName}`
+        const namespace = `action.${id}` as const
 
         const action = intl.formatMessage({
           id: namespace,
-          defaultMessage: actionName
+          defaultMessage: id
         })
-        const context = { action, baseName: actionName, namespace, namespaced: (k: string) => `${namespace}.${k}` }
+        const context = {
+          action,
+          id,
+          namespace,
+          namespaced: <const K extends string>(k: K) => `${namespace}.${k}` as const
+        }
 
         const errorReporter = <A, E, R>(self: Effect.Effect<A, E, R>) =>
           self.pipe(
             Effect.tapErrorCause(
               Effect.fnUntraced(function*(cause) {
                 if (Cause.isInterruptedOnly(cause)) {
-                  console.info(`Interrupted while trying to ${actionName}`)
+                  console.info(`Interrupted while trying to ${id}`)
                   return
                 }
 
@@ -803,9 +812,9 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
                   //   )
                   //   return
                   // }
-                  const message = `Failure trying to ${actionName}`
+                  const message = `Failure trying to ${id}`
                   yield* reportMessage(message, {
-                    action: actionName,
+                    action: id,
                     error: fail.value
                   })
                   return
@@ -813,7 +822,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
 
                 const extra = {
                   action,
-                  message: `Unexpected Error trying to ${actionName}`
+                  message: `Unexpected Error trying to ${id}`
                 }
                 yield* reportRuntimeError(cause, extra)
               }, Effect.uninterruptible)
@@ -865,7 +874,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
 
           const command = Effect.withSpan(
             exec(...args),
-            actionName,
+            id,
             { captureStackTrace }
           )
 
@@ -905,7 +914,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
 
           const command = Effect.withSpan(
             exec(...args),
-            actionName,
+            id,
             { captureStackTrace }
           )
 
@@ -950,7 +959,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
 
           const command = Effect.withSpan(
             exec(...args),
-            actionName,
+            id,
             { captureStackTrace }
           )
 
@@ -990,7 +999,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
 
           const command = Effect.withSpan(
             exec(...args).pipe(Effect.flatten),
-            actionName,
+            id,
             { captureStackTrace }
           )
 
@@ -998,7 +1007,9 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
         }, { action })
 
         return reactive({
-          name: actionName,
+          id,
+          namespaced: context.namespaced,
+          namespace: context.namespace,
           result,
           waiting,
           action,
@@ -1077,7 +1088,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
     return {
       /** @experimental */
       takeOver:
-        <Args extends any[], A, E, R, const Name extends string>(command: Commander.CommandOut<Args, A, E, R, Name>) =>
+        <Args extends any[], A, E, R, const Id extends string>(command: Commander.CommandOut<Args, A, E, R, Id>) =>
         (...args: Args) => {
           // we capture the call site stack here
           const limit = Error.stackTraceLimit
@@ -1153,7 +1164,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
         )
       }),
       updateAction:
-        <Args extends Array<any>>(update: (currentActionName: string, ...args: Args) => string) =>
+        <Args extends Array<any>>(update: (currentActionId: string, ...args: Args) => string) =>
         <A, E, R>(_: Effect.Effect<A, E, R>, ...input: Args) =>
           Effect.updateService(
             _,
@@ -1196,8 +1207,8 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
       /**
        * Define a Command for handling user actions with built-in error reporting and state management.
        *
-       * @param actionName The internal identifier for the action. Used as a tracing span and to lookup
-       *                   the user-facing name via internationalization (`action.${actionName}`).
+       * @param id The internal identifier for the action. Used as a tracing span and to lookup
+       *                   the user-facing name via internationalization (`action.${id}`).
        * @returns A function that executes the command when called (e.g., directly in `@click` handlers).
        *          Built-in error reporting handles failures automatically.
        *
@@ -1215,7 +1226,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
        */
       fn: <RT>(runtime: Runtime.Runtime<RT>) => {
         const make = makeCommand(runtime)
-        return <const Name extends string>(actionName: Name): Commander.Gen<RT, Name> & Commander.NonGen<RT, Name> =>
+        return <const Id extends string>(id: Id): Commander.Gen<RT, Id> & Commander.NonGen<RT, Id> =>
         (
           fn: any,
           ...combinators: any[]
@@ -1226,7 +1237,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
           const errorDef = new Error()
           Error.stackTraceLimit = limit
 
-          return make(actionName, errorDef)(
+          return make(id, errorDef)(
             Effect.fnUntraced(
               // fnUntraced only supports generators as first arg, so we convert to generator if needed
               isGeneratorFunction(fn) ? fn : function*(...args) {
@@ -1239,18 +1250,18 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
       },
 
       /** @experimental */
-      alt: makeCommand as unknown as <RT>(runtime: Runtime.Runtime<RT>) => <const Name extends string>(
-        actionName: Name
+      alt: makeCommand as unknown as <RT>(runtime: Runtime.Runtime<RT>) => <const Id extends string>(
+        id: Id
       ) => <Args extends Array<any>, A, E, R extends RT | CommandContext>(
         handler: (...args: Args) => Effect.Effect<A, E, R>
-      ) => Commander.CommandOut<Args, A, E, R, Name>,
+      ) => Commander.CommandOut<Args, A, E, R, Id>,
 
       /** @experimental */
       wrap: <RT>(runtime: Runtime.Runtime<RT>) => {
         const make = makeCommand(runtime)
-        return <const Name extends string, Args extends Array<any>, A, E, R>(
-          mutation: { mutate: (...args: Args) => Effect.Effect<A, E, R>; name: Name }
-        ): Commander.GenWrap<RT, Name, Args, A, E, R> & Commander.NonGenWrap<RT, Name, Args, A, E, R> =>
+        return <const Id extends string, Args extends Array<any>, A, E, R>(
+          mutation: { mutate: (...args: Args) => Effect.Effect<A, E, R>; name: Id }
+        ): Commander.GenWrap<RT, Id, Args, A, E, R> & Commander.NonGenWrap<RT, Id, Args, A, E, R> =>
         (
           ...combinators: any[]
         ): any => {

package/test/Mutation.test.ts

@@ -23,10 +23,14 @@ it.live("works", () =>
 
       const command = Command.fn("Test Action")(
         function*() {
+          expect(command.id).toBe("Test Action")
+          expect(command.namespace).toBe("action.Test Action")
+          expect(command.namespaced("a")).toBe("action.Test Action.a")
+
           expect(yield* Effect.currentSpan.pipe(Effect.map((_) => _.name))).toBe("Test Action")
           expect(command.waiting).toBe(true)
 
-          expect(yield* CommandContext).toEqual({ action: "Test Action", name: "Test Action" })
+          expect(yield* CommandContext).toMatchObject({ action: "Test Action", id: "Test Action" })
 
           expect(toasts.length).toBe(0)
 
@@ -41,6 +45,9 @@ it.live("works", () =>
         Effect.tap(() => executed = true)
       )
       expect(command.action).toBe("Test Action")
+      expect(command.id).toBe("Test Action")
+      expect(command.namespace).toBe("action.Test Action")
+      expect(command.namespaced("a")).toBe("action.Test Action.a")
 
       const r = yield* unwrap(command.handle())
       expect(command.waiting).toBe(false)
@@ -72,7 +79,7 @@ it.live("works non-gen", () =>
               expect(yield* Effect.currentSpan.pipe(Effect.map((_) => _.name))).toBe("Test Action")
               expect(command.waiting).toBe(true)
 
-              expect(yield* CommandContext).toEqual({ action: "Test Action", name: "Test Action" })
+              expect(yield* CommandContext).toMatchObject({ action: "Test Action", id: "Test Action" })
 
               expect(toasts.length).toBe(0)
 
@@ -115,7 +122,7 @@ it.live("has custom action name", () =>
         function*() {
           expect(yield* Effect.currentSpan.pipe(Effect.map((_) => _.name))).toBe("Test Action")
 
-          expect(yield* CommandContext).toEqual({ action: "Test Action Translated", name: "Test Action" })
+          expect(yield* CommandContext).toMatchObject({ action: "Test Action Translated", id: "Test Action" })
           return "test-value"
         },
         Effect.tap(() => executed = true)
@@ -229,6 +236,7 @@ it.live("with toasts", () =>
         //   onSuccess: () => Effect.map(CommandContext, (_) => _.action),
         //   onWaiting: null
         // }),
+        Command.withDefaultToast(),
         Effect.tap(() => executed = true)
       )
 
@@ -365,7 +373,7 @@ it.live("works with alt", () =>
             expect(yield* Effect.currentSpan.pipe(Effect.map((_) => _.name))).toBe("Test Action")
             expect(command.waiting).toBe(true)
 
-            expect(yield* CommandContext).toEqual({ action: "Test Action", name: "Test Action" })
+            expect(yield* CommandContext).toMatchObject({ action: "Test Action", id: "Test Action" })
 
             expect(toasts.length).toBe(0)
 
@@ -409,7 +417,7 @@ it.live("has custom action name with alt", () =>
           function*() {
             expect(yield* Effect.currentSpan.pipe(Effect.map((_) => _.name))).toBe("Test Action")
 
-            expect(yield* CommandContext).toEqual({ action: "Test Action Translated", name: "Test Action" })
+            expect(yield* CommandContext).toMatchObject({ action: "Test Action Translated", id: "Test Action" })
             return "test-value"
           },
           Effect.tap(() => executed = true)

package/test/dist/stubs.d.ts

@@ -9,16 +9,16 @@ export declare const useExperimental: (options?: {
     messages?: Record<string, string> | Record<string, MessageFormatElement[]>;
     toasts: any[];
 }) => {
-    alt: <const Name extends string>(actionName: Name) => <Args extends Array<any>, A, E, R_1 extends Toast.Toast | WithToast | import("../src/experimental/commander.js").CommandContext>(handler: (...args: Args) => Effect.Effect<A, E, R_1>) => Commander.CommandOut<Args, A, E, R_1, Name>;
-    fn: <const Name extends string>(actionName: Name) => Commander.Gen<Toast.Toast | WithToast, Name> & Commander.NonGen<Toast.Toast | WithToast, Name>;
-    wrap: <const Name extends string, Args extends Array<any>, A_1, E_1, R_2>(mutation: {
+    alt: <const Id extends string>(id: Id) => <Args extends Array<any>, A, E, R_1 extends Toast.Toast | WithToast | import("../src/experimental/commander.js").CommandContext>(handler: (...args: Args) => Effect.Effect<A, E, R_1>) => Commander.CommandOut<Args, A, E, R_1, Id>;
+    fn: <const Id extends string>(id: Id) => Commander.Gen<Toast.Toast | WithToast, Id> & Commander.NonGen<Toast.Toast | WithToast, Id>;
+    wrap: <const Id extends string, Args extends Array<any>, A_1, E_1, R_2>(mutation: {
         mutate: (...args: Args) => Effect.Effect<A_1, E_1, R_2>;
-        name: Name;
-    }) => Commander.GenWrap<Toast.Toast | WithToast, Name, Args, A_1, E_1, R_2> & Commander.NonGenWrap<Toast.Toast | WithToast, Name, Args, A_1, E_1, R_2>;
-    takeOver: <Args_1 extends any[], A_2, E_2, R_3, const Name extends string>(command: Commander.CommandOut<Args_1, A_2, E_2, R_3, Name>) => (...args: Args_1) => Effect.Effect<A_2, E_2, import("../src/experimental/commander.js").CommandContext | Exclude<Exclude<R_3, import("../src/experimental/commander.js").CommandContext>, import("effect/Tracer").ParentSpan>>;
+        name: Id;
+    }) => Commander.GenWrap<Toast.Toast | WithToast, Id, Args, A_1, E_1, R_2> & Commander.NonGenWrap<Toast.Toast | WithToast, Id, Args, A_1, E_1, R_2>;
+    takeOver: <Args_1 extends any[], A_2, E_2, R_3, const Id extends string>(command: Commander.CommandOut<Args_1, A_2, E_2, R_3, Id>) => (...args: Args_1) => Effect.Effect<A_2, E_2, import("../src/experimental/commander.js").CommandContext | Exclude<Exclude<R_3, import("../src/experimental/commander.js").CommandContext>, import("effect/Tracer").ParentSpan>>;
     confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, import("../src/experimental/commander.js").CommandContext>;
     confirm: (message?: string | undefined) => Effect.Effect<boolean, never, import("../src/experimental/commander.js").CommandContext>;
-    updateAction: <Args_1 extends Array<any>>(update: (currentActionName: string, ...args: Args_1) => string) => <A_3, E_3, R_4>(_: Effect.Effect<A_3, E_3, R_4>, ...input: Args_1) => Effect.Effect<A_3, E_3, import("../src/experimental/commander.js").CommandContext | R_4>;
+    updateAction: <Args_1 extends Array<any>>(update: (currentActionId: string, ...args: Args_1) => string) => <A_3, E_3, R_4>(_: Effect.Effect<A_3, E_3, R_4>, ...input: Args_1) => Effect.Effect<A_3, E_3, import("../src/experimental/commander.js").CommandContext | R_4>;
     defaultFailureMessageHandler: <E_4, Args_1 extends readonly any[]>(action: string, errorRenderer?: ((e: E_4, action: string, ...args: Args_1) => string | undefined) | undefined) => (o: import("effect/Option").Option<E_4>, ...args: Args_1) => string | {
         level: "warn";
         message: string;

package/test/dist/stubs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stubs.d.ts","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAE9E,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAElD,OAAO,KAAK,KAAK,MAAM,8BAA8B,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AA4C5D,eAAO,MAAM,aAAa,GAAI,WAAU,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAM,oCAgBzG,CAAA;AAEH,eAAO,MAAM,eAAe,GAC1B,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAA;CAAE;;;;;;;+IAlD5F,GAAG;gCAIW,CAAC;qBAGG,CAAC;kFAKrB,GAAG,6EAEwB,GAAI;oGAQjC,CAAC,4BACG,GAAI,8FAIN,GACV;;;;mFAMK,CAAL,4BAA2B,GAAI,8DAE1B,GAAI;oFAGI,CAAC;qBAGP,CAAH,2BAEG,GAAH;iBAAsD,CAAC,6BACtC,GAAI;iBAKrB,CAAC,qCAAoC,GAAI;2DAES,GACrD;;CAMD,CAAA"}
+{"version":3,"file":"stubs.d.ts","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAE9E,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAElD,OAAO,KAAK,KAAK,MAAM,8BAA8B,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AA4C5D,eAAO,MAAM,aAAa,GAAI,WAAU,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAM,oCAgBzG,CAAA;AAEH,eAAO,MAAM,eAAe,GAC1B,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAA;CAAE;;;;;;;2IArD1F,GAAG;gCAKwB,CAAC;qBAIhC,CAAC;gFAI+B,GACzC,6EAEO,GAAI;oGAKS,CAAC,4BAGnB,GAAD,8FAIa,GAAI;;;;mFAM0F,CAAA,4BAEtG,GAAI,8DAEH,GAAI;oFAEI,CAAC;qBACL,CAAC,2BAGR,GAAA;iBAGS,CAAC,6BAA4B,GAAI;iBAG9C,CAAF,qCAE+B,GAC7B;2DAES,GAAI;;CAOd,CAAA"}