@effect-app/vue 2.66.0 → 2.67.1

package/src/mutate.ts

@@ -7,13 +7,13 @@ import { tuple } from "effect-app/Function"
 import { computed, type ComputedRef, shallowRef } from "vue"
 import { makeQueryKey } from "./lib.js"
 
-export const getQueryKey = (h: { name: string }) => {
+export const getQueryKey = (h: { id: string }) => {
   const key = makeQueryKey(h)
   const ns = key.filter((_) => _.startsWith("$"))
   // we invalidate the parent namespace e.g $project/$configuration.get, we invalidate $project
   // for $project/$configuration/$something.get, we invalidate $project/$configuration
   const k = ns.length ? ns.length > 1 ? ns.slice(0, ns.length - 1) : ns : undefined
-  if (!k) throw new Error("empty query key for: " + h.name)
+  if (!k) throw new Error("empty query key for: " + h.id)
   return k
 }
 
@@ -147,20 +147,20 @@ export const makeMutation = () => {
      * Pass a function that returns an Effect, e.g from a client action
      * Executes query cache invalidation based on default rules or provided option.
      */
-    <I, E, A, R, Request extends TaggedRequestClassAny, Name extends string>(
-      self: RequestHandlerWithInput<I, A, E, R, Request, Name>,
+    <I, E, A, R, Request extends TaggedRequestClassAny, Id extends string>(
+      self: RequestHandlerWithInput<I, A, E, R, Request, Id>,
       options?: MutationOptionsBase
-    ): (i: I) => Effect.Effect<A, E, R>
+    ): ((i: I) => Effect.Effect<A, E, R>) & { readonly id: Id }
     /**
      * Pass an Effect, e.g from a client action
      * Executes query cache invalidation based on default rules or provided option.
      */
-    <E, A, R, Request extends TaggedRequestClassAny, Name extends string>(
-      self: RequestHandler<A, E, R, Request, Name>,
+    <E, A, R, Request extends TaggedRequestClassAny, Id extends string>(
+      self: RequestHandler<A, E, R, Request, Id>,
       options?: MutationOptionsBase
-    ): Effect.Effect<A, E, R>
-  } = <I, E, A, R, Request extends TaggedRequestClassAny, Name extends string>(
-    self: RequestHandlerWithInput<I, A, E, R, Request, Name> | RequestHandler<A, E, R, Request, Name>,
+    ): Effect.Effect<A, E, R> & { readonly id: Id }
+  } = <I, E, A, R, Request extends TaggedRequestClassAny, Id extends string>(
+    self: RequestHandlerWithInput<I, A, E, R, Request, Id> | RequestHandler<A, E, R, Request, Id>,
     options?: MutationOptionsBase
   ) => {
     const queryClient = useQueryClient()
@@ -180,7 +180,7 @@ export const makeMutation = () => {
       const queryKey = getQueryKey(self)
 
       if (options?.queryInvalidation) {
-        const opts = options.queryInvalidation(queryKey, self.name)
+        const opts = options.queryInvalidation(queryKey, self.id)
         if (!opts.length) {
           return Effect.void
         }
@@ -208,7 +208,7 @@ export const makeMutation = () => {
     const handler = self.handler
     const r = Effect.isEffect(handler) ? handle(handler) : (i: I) => handle(handler(i))
 
-    return r as any
+    return Object.assign(r, { id: self.id }) as any
   }
   return useMutation
 }

package/src/query.ts

@@ -75,7 +75,7 @@ export const makeQuery = <R>(getRuntime: () => Runtime.Runtime<R>) => {
               handler
                 .pipe(
                   Effect.tapDefect(reportRuntimeError),
-                  Effect.withSpan(`query ${q.name}`, { captureStackTrace: false }),
+                  Effect.withSpan(`query ${q.id}`, { captureStackTrace: false }),
                   meta?.["span"] ? Effect.withParentSpan(meta["span"] as Span) : (_) => _
                 ),
               { signal }
@@ -100,7 +100,7 @@ export const makeQuery = <R>(getRuntime: () => Runtime.Runtime<R>) => {
               handler(req.value)
                 .pipe(
                   Effect.tapDefect(reportRuntimeError),
-                  Effect.withSpan(`query ${q.name}`, { captureStackTrace: false }),
+                  Effect.withSpan(`query ${q.id}`, { captureStackTrace: false }),
                   meta?.["span"] ? Effect.withParentSpan(meta["span"] as Span) : (_) => _
                 ),
               { signal }

package/test/Mutation.test.ts

@@ -23,9 +23,31 @@ describe("alt2", () => {
         let executed = false
 
         const someMutation = {
-          name: "Test Action",
-          mutate: (() => {}) as unknown as (a: number, b: string) => Effect.Effect<string, number, boolean>
-        }
+          id: "Test Action",
+          mutate: (() => {}) as unknown as (a: number, b: string) => Effect.Effect<string, number, CommandContext>
+        } as const
+        const someMutation2 = Object.assign(
+          (() => {}) as unknown as (a: number, b: string) => Effect.Effect<string, number, CommandContext>,
+          {
+            id: "Test Action"
+          } as const
+        )
+        const command1 = Command.alt2(someMutation2)((fn) =>
+          fn(
+            function*() {
+              expect(typeof fn.mutate).toBe("function")
+              expect(fn.id).toBe("Test Action")
+              expect(fn.namespace).toBe("action.Test Action")
+              expect(fn.namespaced("a")).toBe("action.Test Action.a")
+            }
+          )
+        )
+        yield* unwrap(command1.handle())
+        expect(command1.action).toBe("Test Action")
+        expect(command1.id).toBe("Test Action")
+        expect(command1.namespace).toBe("action.Test Action")
+        expect(command1.namespaced("a")).toBe("action.Test Action.a")
+
         const command = Command.alt2(someMutation)((fn) =>
           fn(
             function*() {
@@ -55,7 +77,7 @@ describe("alt2", () => {
             Effect.tap(() => executed = true)
           )
         )
-        console.log(command)
+
         expect(command.action).toBe("Test Action")
         expect(command.id).toBe("Test Action")
         expect(command.namespace).toBe("action.Test Action")

package/test/dist/stubs.d.ts

@@ -13,12 +13,16 @@ export declare const useExperimental: (options?: {
     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<unknown>, A_1, E_1, R_2>(mutation: {
         mutate: (...args: Args) => Effect.Effect<A_1, E_1, R_2>;
-        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>;
+        id: Id;
+    } | (((...args: Args) => Effect.Effect<A_1, E_1, R_2>) & {
+        id: 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>;
     alt2: <const Id extends string, MutArgs extends Array<unknown>, MutA, MutE, MutR>(id: Id | {
-        name: Id;
+        id: Id;
         mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
-    }) => <Args_1 extends Array<unknown>, A_2, E_2, R_3 extends Toast.Toast | WithToast | import("../src/experimental/commander.js").CommandContext>(handler: (ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id> & {
+    } | (((...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>) & {
+        id: Id;
+    })) => <Args_1 extends Array<unknown>, A_2, E_2, R_3 extends Toast.Toast | WithToast | import("../src/experimental/commander.js").CommandContext>(handler: (ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id> & {
         mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
     }) => (...args: Args_1) => Effect.Effect<A_2, E_2, R_3>) => Commander.CommandOut<Args_1, A_2, E_2, R_3, Id>;
     takeOver: <Args_1 extends any[], A_3, E_3, R_4, const Id extends string>(command: Commander.CommandOut<Args_1, A_3, E_3, R_4, Id>) => (...args: Args_1) => Effect.Effect<A_3, E_3, import("../src/experimental/commander.js").CommandContext | Exclude<Exclude<R_4, import("../src/experimental/commander.js").CommandContext>, import("effect/Tracer").ParentSpan>>;

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;;;;;;;;;;;;;2IAtC5E,GAAG;gCAO1B,CAAF;qBAMW,CAAC;oFAOV,GAAI,6EAGJ,GAAI;iJASgB,GAAI,qEACE,GAAI,gEAIL,CAAC,4BACN,GAAI,8FAEpB,GAAI;;;;mFAE6E,CAAC,4BACrE,GAAI,8DAClB,GAAI;4EAEoB,CAAC;qBAAyB,CAAC,2BAA0B,GAAI;iBAE5C,CAAC,6BAA4B,GAAI;iBAAiF,CAAC,qCAAoC,GAAI;2DAA0H,GAAI;;CADtU,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;;;;;;;;;;;;;;;;;2IAjC9F,GAAE;gCAUD,CAAC;qBAIuF,CAAC;oFAK3D,GAAG,6EAG7B,GAChB;iJAUoB,GAAI,qEAAoE,GAAI,gEAEjD,CAAC,4BAC9B,GAAI,8FACoC,GAAI;;;;mFAEgB,CAAC,4BAEtD,GAAI,8DAA6D,GAAI;4EAEG,CAAC;qBAAyB,CAAC,2BAA0B,GAAI;iBAAsD,CAAC,6BAA4B,GAAI;iBAAiF,CAAC,qCAAoC,GAAI;2DAA0H,GAAI;;CADxe,CAAA"}