@effect-app/vue 2.77.2 → 2.77.4

package/src/experimental/makeUseCommand.ts

@@ -1,29 +1,24 @@
 import { Effect } from "effect-app"
-import { Commander, CommanderStatic } from "./commander.js"
+import { Commander, type CommanderImpl, CommanderStatic } from "./commander.js"
 
 type X<X> = X
 
-// try to preserve JSDoc..
-export interface CommanderResolved extends X<typeof CommanderStatic> {
-  alt: ReturnType<Commander["alt"]>
-  fn: ReturnType<Commander["fn"]>
-  wrap: ReturnType<Commander["wrap"]>
-  alt2: ReturnType<Commander["alt2"]>
-  withDefaultToast: typeof CommanderStatic.withDefaultToast
+// helps retain JSDoc
+export interface CommanderResolved<RT>
+  extends X<typeof CommanderStatic>, Pick<CommanderImpl<RT>, "fn" | "wrap" | "alt" | "alt2">
+{
 }
 
 export const makeUseCommand = Effect.fnUntraced(function*<R = never>() {
   const cmndr = yield* Commander
   const runtime = yield* Effect.runtime<R>()
 
+  const comm = cmndr(runtime)
+
   const command = {
-    ...cmndr,
-    alt: cmndr.alt(runtime),
-    fn: cmndr.fn(runtime),
-    wrap: cmndr.wrap(runtime),
-    alt2: cmndr.alt2(runtime),
+    ...comm,
     ...CommanderStatic
   }
 
-  return command as CommanderResolved
+  return command as CommanderResolved<R>
 })

package/src/makeClient.ts

@@ -1,7 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as Result from "@effect-atom/atom/Result"
 import { type InitialDataFunction, type InvalidateOptions, type InvalidateQueryFilters, isCancelledError, type QueryObserverResult, type RefetchOptions, type UseQueryReturnType } from "@tanstack/vue-query"
+import { camelCase } from "change-case"
 import { Cause, Effect, Exit, type ManagedRuntime, Match, Option, Runtime, S, Struct } from "effect-app"
+import { type ApiClientFactory } from "effect-app/client"
 import type { RequestHandler, RequestHandlers, RequestHandlerWithInput, Requests, TaggedRequestClassAny } from "effect-app/client/clientFor"
 import { ErrorSilenced, type SupportedErrors } from "effect-app/client/errors"
 import { constant, identity, pipe, tuple } from "effect-app/Function"
@@ -11,17 +13,15 @@ import { dropUndefinedT } from "effect-app/utils"
 import { type RuntimeFiber } from "effect/Fiber"
 import { computed, type ComputedRef, onBeforeUnmount, type Ref, ref, watch, type WatchSource } from "vue"
 import { reportMessage } from "./errorReporter.js"
-import { Commander, CommanderStatic } from "./experimental/commander.js"
+import { type Commander, CommanderStatic } from "./experimental/commander.js"
 import { I18n } from "./experimental/intl.js"
+import { type CommanderResolved, makeUseCommand } from "./experimental/makeUseCommand.js"
 import { Toast } from "./experimental/toast.js"
 import { buildFieldInfoFromFieldsRoot } from "./form.js"
 import { reportRuntimeError } from "./lib.js"
 import { asResult, makeMutation, type MutationOptions, type MutationOptionsBase, mutationResultToVue, type Res, useMakeMutation } from "./mutate.js"
 import { type CustomDefinedInitialQueryOptions, type CustomUndefinedInitialQueryOptions, type KnownFiberFailure, makeQuery } from "./query.js"
 
-import { camelCase } from "change-case"
-import { type ApiClientFactory } from "effect-app/client"
-
 const mapHandler = <A, E, R, I = void, A2 = A, E2 = E, R2 = R>(
   handler: Effect.Effect<A, E, R> | ((i: I) => Effect.Effect<A, E, R>),
   map: (self: Effect.Effect<A, E, R>, i: I) => Effect.Effect<A2, E2, R2>
@@ -1011,18 +1011,10 @@ export const makeClient = <RT>(
   getBaseMrt: () => ManagedRuntime.ManagedRuntime<RT | ApiClientFactory | Commander | LegacyMutation | Base, never>,
   clientFor_: ReturnType<typeof ApiClientFactory["makeFor"]>
 ) => {
-  const getRt = Effect.runtime<RT | ApiClientFactory | Commander | LegacyMutation | Base>()
+  type R = RT | ApiClientFactory | Commander | LegacyMutation | Base
+  const getRt = Effect.runtime<R>()
   const getBaseRt = () => managedRuntimeRt(getBaseMrt())
-  const makeCommand = Effect.gen(function*() {
-    const cmd = yield* Commander
-    const rt = yield* getRt
-    return {
-      fn: cmd.fn(rt),
-      wrap: cmd.wrap(rt),
-      alt: cmd.alt(rt),
-      alt2: cmd.alt2(rt)
-    }
-  })
+  const makeCommand = makeUseCommand<R>()
   const makeMutation = Effect.gen(function*() {
     const mut = yield* LegacyMutation
 
@@ -1300,8 +1292,9 @@ export const makeClient = <RT>(
     useSuspenseQuery
   }
 
-  const Command = {
+  const Command: CommanderResolved<RT> = {
     ...{
+      // delay initialisation until first use...
       fn: (...args: [any]) => useCommand().fn(...args),
       wrap: (...args: [any]) => useCommand().wrap(...args),
       alt: (...args: [any]) => useCommand().alt(...args),

package/test/dist/stubs.d.ts

@@ -1,9 +1,11 @@
 import { type MessageFormatElement } from "@formatjs/icu-messageformat-parser";
 import { Layer } from "effect-app";
 import { I18n } from "../src/experimental/intl.js";
+import * as Toast from "../src/experimental/toast.js";
+import { WithToast } from "../src/experimental/withToast.js";
 export declare const fakeIntlLayer: (messages?: Record<string, string> | Record<string, MessageFormatElement[]>) => Layer.Layer<I18n, never, never>;
 export declare const useExperimental: (options?: {
     messages?: Record<string, string> | Record<string, MessageFormatElement[]>;
     toasts: any[];
-}) => import("../src/experimental/makeUseCommand.js").CommanderResolved;
+}) => import("../src/experimental/makeUseCommand.js").CommanderResolved<Toast.Toast | I18n | WithToast>;
 //# sourceMappingURL=stubs.d.ts.map

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,EAAU,KAAK,EAAE,MAAM,YAAY,CAAA;AAG1C,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AA+ClD,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,sEASxG,CAAA"}
+{"version":3,"file":"stubs.d.ts","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAE9E,OAAO,EAAU,KAAK,EAAE,MAAM,YAAY,CAAA;AAG1C,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,sGASxG,CAAA"}