@effect-app/vue 4.0.0-beta.120 → 4.0.0-beta.122

package/src/makeClient.ts

@@ -74,9 +74,6 @@ export interface MutationExtensions<RT, Id extends string, I, A, E, R> {
    * The Mutation function will be taken as the first member of the Command, the Command required input will be the Mutation input.
    * see Command.wrap for details */
   wrap: Commander.CommanderWrap<RT, Id, Id, undefined, I, A, E, R>
-  /** Defines a Command based on this mutation, taking the `id` of the mutation as the `id` of the Command.
-   * see Command.fn for details */
-  fn: Commander.CommanderFn<RT, Id, Id, undefined>
 }
 
 /** my other doc */
@@ -87,7 +84,7 @@ export interface MutationExtWithInput<
   A,
   E,
   R
-> extends Commander.CommandContextLocal<Id, Id>, MutationExtensions<RT, Id, I, A, E, R> {
+> extends MutationExtensions<RT, Id, I, A, E, R> {
   /**
    * Call the endpoint with input
    * Invalidate queries based on namespace of this mutation.
@@ -107,12 +104,7 @@ export interface MutationExt<
   A,
   E,
   R
-> extends
-  Commander.CommandContextLocal<Id, Id>,
-  Commander.CommanderWrap<RT, Id, Id, undefined, void, A, E, R>,
-  MutationExtensions<RT, Id, void, A, E, R>,
-  Effect.Effect<A, E, R>
-{
+> extends MutationExtensions<RT, Id, void, A, E, R>, Effect.Effect<A, E, R> {
 }
 
 export type MutationWithExtensions<RT, Req> = Req extends
@@ -444,13 +436,8 @@ export const makeClient = <RT_, RTHooks>(
     const mutations = Struct.keys(client).reduce(
       (acc, key) => {
         const mut: any = mutation(client[key] as any)
-        const fn = Command.fn(client[key].id)
         const wrap = Command.wrap({ mutate: Effect.isEffect(mut) ? () => mut : mut, id: client[key].id })
-        ;(acc as any)[camelCase(key) + "Mutation"] = Object.assign(
-          mut,
-          fn, // to get the i18n key etc.
-          { wrap, fn }
-        )
+        ;(acc as any)[camelCase(key) + "Mutation"] = Object.assign(mut, { wrap })
         return acc
       },
       {} as {
@@ -485,10 +472,8 @@ export const makeClient = <RT_, RTHooks>(
           (mutate) =>
             Object.assign(
               mutate,
-              fn, // to get the i18n key etc.
               {
-                wrap: Command.wrap({ mutate: Effect.isEffect(mutate) ? () => mutate : mutate, id: client[key].id }),
-                fn
+                wrap: Command.wrap({ mutate: Effect.isEffect(mutate) ? () => mutate : mutate, id: client[key].id })
               }
             )
         )

package/src/runtime.ts

@@ -3,24 +3,22 @@ import { Effect, Layer, Logger } from "effect-app"
 import { CauseException } from "effect-app/client/errors"
 import { type Context } from "effect-app/Context"
 
-export function makeAppRuntime<A, E>(layer: Layer.Layer<A, E>) {
-  return Effect.gen(function*() {
-    const l = layer.pipe(
-      Layer.provide(Logger.layer([Logger.consolePretty()]))
-    ) as Layer.Layer<A, never>
-    const mrt = ManagedRuntime.make(l)
-    yield* mrt.contextEffect
-    return Object.assign(mrt, {
-      [Symbol.dispose]() {
-        return Effect.runSync(mrt.disposeEffect)
-      },
+export const makeAppRuntime = Effect.fnUntraced(function*<A, E>(layer: Layer.Layer<A, E>) {
+  const l = layer.pipe(
+    Layer.provide(Logger.layer([Logger.consolePretty()]))
+  ) as Layer.Layer<A, never>
+  const mrt = ManagedRuntime.make(l)
+  yield* mrt.contextEffect
+  return Object.assign(mrt, {
+    [Symbol.dispose]() {
+      return Effect.runSync(mrt.disposeEffect)
+    },
 
-      [Symbol.asyncDispose]() {
-        return mrt.dispose()
-      }
-    }) // as we initialise here, there is no more error left.
-  })
-}
+    [Symbol.asyncDispose]() {
+      return mrt.dispose()
+    }
+  }) // as we initialise here, there is no more error left.
+})
 
 export function initializeSync<A, E>(layer: Layer.Layer<A, E, never>) {
   const runtime = Effect.runSync(makeAppRuntime(layer))

package/test/dist/stubs.d.ts

@@ -12,7 +12,7 @@ export declare const fakeIntlLayer: (messages?: Record<string, string> | Record<
 export declare const useExperimental: (options?: {
     messages?: Record<string, string> | Record<string, MessageFormatElement[]>;
     toasts: any[];
-}) => import("../src/makeUseCommand.js").CommanderResolved<Toast.Toast | I18n | WithToast, never>;
+}) => import("../src/makeUseCommand.js").CommanderResolved<I18n | Toast.Toast | WithToast, never>;
 declare const RequestContextMap_base: (new () => {
     readonly config: {};
 }) & {
@@ -361,13 +361,13 @@ export declare const useClient: (options?: {
     messages?: Record<string, string> | Record<string, MessageFormatElement[]>;
     toasts: any[];
 }) => {
-    Command: import("../src/makeUseCommand.js").CommanderResolved<WithToast | (Commander | ApiClientFactory | (Toast.Toast | I18n)), never>;
-    useCommand: () => import("../src/makeUseCommand.js").CommanderResolved<WithToast | (Commander | ApiClientFactory | (Toast.Toast | I18n)), never>;
-    clientFor: <M extends import("effect-app/client").RequestsAny>(m: M, queryInvalidation?: ((client: import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>) => import("../src/makeClient.js").QueryInvalidation<M>) | undefined) => { [Key in keyof import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>]: import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key] & import("../src/makeClient.js").RequestWithExtensions<WithToast | (Commander | ApiClientFactory | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key]> & {
-        mutate: import("../src/makeClient.js").MutationWithExtensions<WithToast | (Commander | ApiClientFactory | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key]>;
+    Command: import("../src/makeUseCommand.js").CommanderResolved<(ApiClientFactory | Commander | (I18n | Toast.Toast)) | WithToast, never>;
+    useCommand: () => import("../src/makeUseCommand.js").CommanderResolved<(ApiClientFactory | Commander | (I18n | Toast.Toast)) | WithToast, never>;
+    clientFor: <M extends import("effect-app/client").RequestsAny>(m: M, queryInvalidation?: ((client: import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>) => import("../src/makeClient.js").QueryInvalidation<M>) | undefined) => { [Key in keyof import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>]: import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key] & import("../src/makeClient.js").RequestWithExtensions<(ApiClientFactory | Commander | (I18n | Toast.Toast)) | WithToast, import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key]> & {
+        mutate: import("../src/makeClient.js").MutationWithExtensions<(ApiClientFactory | Commander | (I18n | Toast.Toast)) | WithToast, import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key]>;
         Input: import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key] extends import("effect-app/client").RequestHandlerWithInput<infer I, any, any, any, any, any> ? I : never;
-    } & import("../src/makeClient.js").Queries<WithToast | (Commander | ApiClientFactory | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key]>; } & {
-        helpers: { [Key_1 in keyof import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>> as `${import("../src/makeClient.js").ToCamel<string & Key_1>}Request`]: import("../src/makeClient.js").RequestWithExtensions<WithToast | (Commander | ApiClientFactory | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key_1]>; } & { [Key_2 in keyof import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>> as `${import("../src/makeClient.js").ToCamel<string & Key_2>}Mutation`]: import("../src/makeClient.js").MutationWithExtensions<WithToast | (Commander | ApiClientFactory | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key_2]>; } & { [Key_3 in keyof import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>> as `${import("../src/makeClient.js").ToCamel<string & Key_3>}Query`]: import("../src/makeClient.js").Queries<WithToast | (Commander | ApiClientFactory | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key_3]>["query"]; } & { [Key_4 in keyof import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>> as `${import("../src/makeClient.js").ToCamel<string & Key_4>}SuspenseQuery`]: import("../src/makeClient.js").Queries<WithToast | (Commander | ApiClientFactory | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key_4]>["suspense"]; };
+    } & import("../src/makeClient.js").Queries<(ApiClientFactory | Commander | (I18n | Toast.Toast)) | WithToast, import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key]>; } & {
+        helpers: { [Key_1 in keyof import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>> as `${import("../src/makeClient.js").ToCamel<string & Key_1>}Request`]: import("../src/makeClient.js").RequestWithExtensions<(ApiClientFactory | Commander | (I18n | Toast.Toast)) | WithToast, import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key_1]>; } & { [Key_2 in keyof import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>> as `${import("../src/makeClient.js").ToCamel<string & Key_2>}Mutation`]: import("../src/makeClient.js").MutationWithExtensions<(ApiClientFactory | Commander | (I18n | Toast.Toast)) | WithToast, import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key_2]>; } & { [Key_3 in keyof import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>> as `${import("../src/makeClient.js").ToCamel<string & Key_3>}Query`]: import("../src/makeClient.js").Queries<(ApiClientFactory | Commander | (I18n | Toast.Toast)) | WithToast, import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key_3]>["query"]; } & { [Key_4 in keyof import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>> as `${import("../src/makeClient.js").ToCamel<string & Key_4>}SuspenseQuery`]: import("../src/makeClient.js").Queries<(ApiClientFactory | Commander | (I18n | Toast.Toast)) | WithToast, import("effect-app/client").RequestHandlers<never, never, M, import("effect-app/client").ExtractModuleName<M>>[Key_4]>["suspense"]; };
     };
 };
 export {};

package/test/makeClient.test.ts

@@ -87,6 +87,7 @@ it.skip("works", () => {
   const f0 = client.GetSomething2WithDependencies.fn(null as any)
 
   const g = client.GetSomething2.mutate.wrap(null as any)
+  // @ts-expect-error mutate no longer exposes fn, use client.GetSomething2.fn
   const h = client.GetSomething2.mutate.fn(null as any)
 
   expect(true).toBe(true)