@effect-app/vue 2.67.0 → 2.67.2

package/src/mutate.ts

@@ -17,6 +17,10 @@ export const getQueryKey = (h: { id: string }) => {
   return k
 }
 
+export const getQueryKeyInt = (id: string) => {
+  return getQueryKey({ id })
+}
+
 export function mutationResultToVue<A, E>(
   mutationResult: Result.Result<A, E>
 ): Res<A, E> {
@@ -141,74 +145,79 @@ export const asResult: {
   return tuple(computed(() => state.value), act) as any
 }
 
+export const useInvalidateQueries = (id: string, options?: MutationOptionsBase["queryInvalidation"]) => {
+  const queryClient = useQueryClient()
+
+  const invalidateQueries = (
+    filters?: InvalidateQueryFilters,
+    options?: InvalidateOptions
+  ) =>
+    Effect.currentSpan.pipe(
+      Effect.orElseSucceed(() => null),
+      Effect.flatMap((span) =>
+        Effect.promise(() => queryClient.invalidateQueries(filters, { ...options, updateMeta: { span } }))
+      )
+    )
+
+  const invalidateCache = Effect.suspend(() => {
+    const queryKey = getQueryKeyInt(id)
+
+    if (options) {
+      const opts = options(queryKey, id)
+      if (!opts.length) {
+        return Effect.void
+      }
+      return Effect
+        .andThen(
+          Effect.annotateCurrentSpan({ queryKey, opts }),
+          Effect.forEach(opts, (_) => invalidateQueries(_.filters, _.options), { concurrency: "inherit" })
+        )
+        .pipe(Effect.withSpan("client.query.invalidation", { captureStackTrace: false }))
+    }
+
+    if (!queryKey) return Effect.void
+
+    return Effect
+      .andThen(
+        Effect.annotateCurrentSpan({ queryKey }),
+        invalidateQueries({ queryKey })
+      )
+      .pipe(Effect.withSpan("client.query.invalidation", { captureStackTrace: false }))
+  })
+
+  const handle = <A, E, R>(self: Effect.Effect<A, E, R>) =>
+    Effect.tapBoth(self, { onFailure: () => invalidateCache, onSuccess: () => invalidateCache })
+
+  return handle
+}
+
 export const makeMutation = () => {
   const useMutation: {
     /**
      * 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()
-
-    const invalidateQueries = (
-      filters?: InvalidateQueryFilters,
-      options?: InvalidateOptions
-    ) =>
-      Effect.currentSpan.pipe(
-        Effect.orElseSucceed(() => null),
-        Effect.flatMap((span) =>
-          Effect.promise(() => queryClient.invalidateQueries(filters, { ...options, updateMeta: { span } }))
-        )
-      )
-
-    const invalidateCache = Effect.suspend(() => {
-      const queryKey = getQueryKey(self)
-
-      if (options?.queryInvalidation) {
-        const opts = options.queryInvalidation(queryKey, self.id)
-        if (!opts.length) {
-          return Effect.void
-        }
-        return Effect
-          .andThen(
-            Effect.annotateCurrentSpan({ queryKey, opts }),
-            Effect.forEach(opts, (_) => invalidateQueries(_.filters, _.options), { concurrency: "inherit" })
-          )
-          .pipe(Effect.withSpan("client.query.invalidation", { captureStackTrace: false }))
-      }
-
-      if (!queryKey) return Effect.void
-
-      return Effect
-        .andThen(
-          Effect.annotateCurrentSpan({ queryKey }),
-          invalidateQueries({ queryKey })
-        )
-        .pipe(Effect.withSpan("client.query.invalidation", { captureStackTrace: false }))
-    })
-
-    const handle = (self: Effect.Effect<A, E, R>) =>
-      Effect.tapBoth(self, { onFailure: () => invalidateCache, onSuccess: () => invalidateCache })
-
+    const handle = useInvalidateQueries(self.id, options?.queryInvalidation)
     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/test/dist/stubs.d.ts

@@ -9,22 +9,22 @@ export declare const useExperimental: (options?: {
     messages?: Record<string, string> | Record<string, MessageFormatElement[]>;
     toasts: any[];
 }) => {
-    alt: <const Id extends string>(id: Id) => <Args extends Array<unknown>, 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>;
+    alt: <const Id extends string>(id: Id) => Commander.CommandContextLocal<Id> & (<Args extends Array<unknown>, 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<unknown>, A_1, E_1, R_2>(mutation: {
         mutate: (...args: Args) => Effect.Effect<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>;
+    })) => Commander.CommandContextLocal<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 | {
         id: Id;
         mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
     } | (((...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> & {
+    })) => Commander.CommandContextLocal<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>;
+    }) => (...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>>;
     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>;

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;;;;;;;;;;;;;;;;;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"}
+{"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;;;;;;;;;;;;;;;;;2IA3BnG,GAAC;gCAQyF,CAAC;qBAI9E,CAAC;oFAOR,GACZ,6EAC8D,GAC9D;iJAOmB,GAAI,qEACW,GAAI,gEACO,CAAC,4BAA2B,GAAI,8FACH,GAAI;;;;mFAKnE,CAAC,4BAA2B,GAAI,8DAA6D,GAAI;4EAAqG,CAAC;qBAAyB,CAAC,2BAA0B,GAAI;iBAAsD,CAAC,6BAA4B,GAAI;iBAAiF,CAAC,qCAAoC,GAAI;2DAA0H,GAAI;;CADxlB,CAAA"}