@effect-app/vue 1.26.0 → 1.26.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @effect-app/vue
 
+## 1.26.1
+
+### Patch Changes
+
+- fix mutation api
+- Updated dependencies
+  - @effect-app/vue@1.26.1
+
 ## 1.26.0
 
 ### Minor Changes

package/_cjs/makeClient2.cjs

@@ -9,7 +9,6 @@ exports.mapHandler = exports.makeClient2 = void 0;
 exports.mutationResultToVue = mutationResultToVue;
 exports.pauseWhileProcessing = pauseWhileProcessing;
 exports.useIntervalPauseWhileProcessing = useIntervalPauseWhileProcessing;
-exports.withSuccessE = exports.withSuccess = void 0;
 var _Function = require("@effect-app/core/Function");
 var _vue = require("@effect-app/vue");
 var Sentry = _interopRequireWildcard(require("@sentry/browser"));
@@ -41,18 +40,6 @@ function useIntervalPauseWhileProcessing(pmf, interval, options) {
     isActive: iv.isActive
   };
 }
-const withSuccess = (self, onSuccess) => ({
-  ...self,
-  handler: typeof self.handler === "function" ? i => (0, _Function.pipe)(self.handler(i), _effectApp.Effect.flatMap(_ => _effectApp.Effect.promise(() => onSuccess(_, i)).pipe(_effectApp.Effect.withSpan("onSuccess")))) : _effectApp.Effect.flatMap(self.handler, _ => _effectApp.Effect.promise(() => onSuccess(_)).pipe(_effectApp.Effect.withSpan("onSuccess")))
-});
-exports.withSuccess = withSuccess;
-const withSuccessE = (self, onSuccessE) => {
-  return {
-    ...self,
-    handler: typeof self.handler === "function" ? i => (0, _Function.pipe)(self.handler(i), _effectApp.Effect.flatMap(_ => onSuccessE(_, i))) : _effectApp.Effect.flatMap(self.handler, _ => onSuccessE(_))
-  };
-};
-exports.withSuccessE = withSuccessE;
 function mutationResultToVue(mutationResult) {
   switch (mutationResult._tag) {
     case "Loading":
@@ -119,27 +106,45 @@ const makeClient2 = (useIntl, useToast, useSafeMutation, messages = {}) => {
       }, {
         action: message
       });
-      return Object.assign((0, _Function.flow)(f, p => p.then(r => r._tag === "Right" ? _effectApp.S.is(_Operations.Failure)(r.right) ? Promise.resolve(toast.warning(warnMessage + r.right.message ? "\n" + r.right.message : "")).then(_ => {}) : Promise.resolve(toast.success(successMessage + (_effectApp.S.is(_Operations.Success)(r.right) && r.right.message ? "\n" + r.right.message : ""))).then(_ => {}) : r.left._tag === "SuppressErrors" ? Promise.resolve(void 0) : Promise.resolve(!options.suppressErrorToast && toast.error(`${errorMessage}:\n` + renderError(r.left))).then(_ => {
-        console.warn(r.left, r.left.toString());
-      }), err => {
-        if (_effectApp.Cause.isInterruptedException(err) || _effectApp.Runtime.isFiberFailure(err) && _effectApp.Cause.isInterruptedOnly(err[_effectApp.Runtime.FiberFailureCauseId])) {
-          return;
-        }
-        const extra = {
-          action,
-          message: `Unexpected Error trying to ${action}`
-        };
-        Sentry.captureException(err, {
-          extra
-        });
-        console.error(err, extra);
-        return toast.error(intl.value.formatMessage({
-          id: "handle.unexpected_error"
-        }, {
-          action: message,
-          error: JSON.stringify(err, undefined, 2)
-        }));
-      })), {
+      return Object.assign((0, _Function.flow)(f, _effectApp.Effect.onExit(_effectApp.Exit.matchEffect({
+        onSuccess: r => _effectApp.Effect.gen(function* () {
+          if (_effectApp.S.is(_Operations.Failure)(r)) {
+            toast.warning(warnMessage + r.message ? "\n" + r.message : "");
+            return;
+          }
+          toast.success(successMessage + (_effectApp.S.is(_Operations.Success)(r) && r.message ? "\n" + r.message : ""));
+        }),
+        onFailure: err => _effectApp.Effect.gen(function* () {
+          if (_effectApp.Cause.isInterruptedOnly(err)) {
+            return;
+          }
+          const fail = _effectApp.Cause.failureOption(err);
+          if (_effectApp.Option.isSome(fail)) {
+            if (fail._tag === "SuppressErrors") {
+              return _effectApp.Effect.succeed(void 0);
+            }
+            if (!options.suppressErrorToast) {
+              toast.error(`${errorMessage}:\n` + renderError(fail.value));
+            }
+            console.warn(fail, fail.toString());
+            return;
+          }
+          const extra = {
+            action,
+            message: `Unexpected Error trying to ${action}`
+          };
+          Sentry.captureException(err, {
+            extra
+          });
+          console.error(err, extra);
+          toast.error(intl.value.formatMessage({
+            id: "handle.unexpected_error"
+          }, {
+            action: message,
+            error: JSON.stringify(err, undefined, 2)
+          }));
+        })
+      }))), {
         action
       });
     }
@@ -210,10 +215,10 @@ const makeClient2 = (useIntl, useToast, useSafeMutation, messages = {}) => {
     }));
     return (0, _Function.tuple)((0, _vue2.computed)(() => mutationResultToVue(a.value)), handleRequestWithToast(b, action, options));
   };
-  function makeUseAndHandleMutation(onSuccess, defaultOptions) {
+  function makeUseAndHandleMutation(defaultOptions) {
     return (self, action, options) => {
       return useAndHandleMutation({
-        handler: typeof self.handler === "function" ? onSuccess ? i => _effectApp.Effect.tap(self.handler(i), () => _effectApp.Effect.promise(onSuccess)) : self.handler : onSuccess ? _effectApp.Effect.tap(self.handler, () => _effectApp.Effect.promise(onSuccess)) : self.handler,
+        handler: self.handler,
         name: self.name
       }, action, {
         ...defaultOptions,

package/_cjs/makeClient2.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"makeClient2.cjs","names":["_Function","require","_vue","Sentry","_interopRequireWildcard","_core","_effectApp","_Operations","_utils","_vue2","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","SuppressErrors","Cause","YieldableError","_tag","exports","pauseWhileProcessing","iv","pmf","Promise","resolve","pause","then","finally","resume","useIntervalPauseWhileProcessing","interval","options","useIntervalFn","immediateCallback","isActive","withSuccess","self","onSuccess","handler","pipe","Effect","flatMap","_","promise","withSpan","withSuccessE","onSuccessE","mutationResultToVue","mutationResult","loading","data","undefined","error","makeClient2","useIntl","useToast","useSafeMutation","messages","useHandleRequestWithToast","toast","intl","handleRequestWithToast","f","action","suppressErrorToast","message","warnMessage","value","formatMessage","id","successMessage","errorMessage","assign","flow","p","S","is","Failure","right","warning","success","Success","left","renderError","console","warn","toString","err","isInterruptedException","Runtime","isFiberFailure","isInterruptedOnly","FiberFailureCauseId","extra","captureException","JSON","stringify","Match","tags","ParseError","orElse","useAndHandleMutation","b","isEffect","annotateCurrentSpan","andThen","args","name","dropUndefinedT","queryInvalidation","tuple","computed","makeUseAndHandleMutation","defaultOptions","tap","useSafeMutationWithState","mapHandler","map","composeQueries","results","renderPreviousOnFailure","values","orPrevious","find","Result","isFailure","initial","Array","findFirst","x","Option","some","none","isInitial","waiting","isRefreshing","entries","reduce","prev","key","result","isSome","previousValue"],"sources":["../src/makeClient2.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;AACA,IAAAA,SAAA,GAAAC,OAAA;AAEA,IAAAC,IAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAC,uBAAA,CAAAH,OAAA;AACA,IAAAI,KAAA,GAAAJ,OAAA;AAEA,IAAAK,UAAA,GAAAL,OAAA;AAEA,IAAAM,WAAA,GAAAN,OAAA;AACA,IAAAO,MAAA,GAAAP,OAAA;AACA,IAAAQ,KAAA,GAAAR,OAAA;AAAgD,SAAAS,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAP,wBAAAO,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAXhD;;AAeA;;;AAGM,MAAOW,cAAe,SAAQC,gBAAK,CAACC,cAAc;EAC7CC,IAAI,GAAG,gBAAgB;;AACjCC,OAAA,CAAAJ,cAAA,GAAAA,cAAA;AAIK,SAAUK,oBAAoBA,CAClCC,EAAY,EACZC,GAA2B;EAE3B,OAAOC,OAAO,CACXC,OAAO,CAACH,EAAE,CAACI,KAAK,EAAE,CAAC,CACnBC,IAAI,CAAC,MAAMJ,GAAG,EAAE,CAAC,CACjBK,OAAO,CAAC,MAAMN,EAAE,CAACO,MAAM,EAAE,CAAC;AAC/B;AAEM,SAAUC,+BAA+BA,CAC7CP,GAA2B,EAC3BQ,QAAmC,EACnCC,OAAyD;EAEzD,MAAMV,EAAE,GAAG,IAAAW,mBAAa,EACtB,MAAMZ,oBAAoB,CAACC,EAAE,EAAEC,GAAG,CAAC,EACnCQ,QAAQ,EACRC,OAAO,GAAG;IAAE,GAAGA,OAAO;IAAEE,iBAAiB,EAAE;EAAK,CAAE,GAAGF,OAAO,CAC7D;EACD,OAAO;IACLG,QAAQ,EAAEb,EAAE,CAACa;GACd;AACH;AAQO,MAAMC,WAAW,GAqBpBA,CAACC,IAAS,EAAEC,SAAc,MAAW;EACvC,GAAGD,IAAI;EACPE,OAAO,EAAE,OAAOF,IAAI,CAACE,OAAO,KAAK,UAAU,GACtCzB,CAAM,IACP,IAAA0B,cAAI,EAEAH,IAAI,CAACE,OAGN,CAACzB,CAAC,CAAC,EACJ2B,iBAAM,CAACC,OAAO,CAAEC,CAAC,IACfF,iBAAM,CAACG,OAAO,CAAC,MAAMN,SAAS,CAACK,CAAC,EAAE7B,CAAC,CAAC,CAAC,CAAC0B,IAAI,CACxCC,iBAAM,CAACI,QAAQ,CAAC,WAAW,CAAC,CAC7B,CACF,CACF,GACDJ,iBAAM,CAACC,OAAO,CAACL,IAAI,CAACE,OAAO,EAAGI,CAAC,IAAKF,iBAAM,CAACG,OAAO,CAAC,MAAMN,SAAS,CAACK,CAAC,CAAC,CAAC,CAACH,IAAI,CAACC,iBAAM,CAACI,QAAQ,CAAC,WAAW,CAAC,CAAC;CAC9G,CAAC;AAAAzB,OAAA,CAAAgB,WAAA,GAAAA,WAAA;AAEK,MAAMU,YAAY,GAqBrBA,CAACT,IAAS,EAAEU,UAAe,KAAS;EACtC,OAAO;IACL,GAAGV,IAAI;IACPE,OAAO,EAAE,OAAOF,IAAI,CAACE,OAAO,KAAK,UAAU,GACtCzB,CAAM,IACP,IAAA0B,cAAI,EACFH,IAAI,CAACE,OAAO,CAACzB,CAAC,CAAC,EACf2B,iBAAM,CAACC,OAAO,CAAEC,CAAC,IAAKI,UAAU,CAACJ,CAAC,EAAE7B,CAAC,CAAC,CAAC,CACxC,GACD2B,iBAAM,CAACC,OAAO,CAACL,IAAI,CAACE,OAAO,EAAGI,CAAC,IAAKI,UAAU,CAACJ,CAAC,CAAC;GACtD;AACH,CAAC;AAAAvB,OAAA,CAAA0B,YAAA,GAAAA,YAAA;AAwBK,SAAUE,mBAAmBA,CACjCC,cAAoC;EAEpC,QAAQA,cAAc,CAAC9B,IAAI;IACzB,KAAK,SAAS;MAAE;QACd,OAAO;UAAE+B,OAAO,EAAE,IAAI;UAAEC,IAAI,EAAEC,SAAS;UAAEC,KAAK,EAAED;QAAS,CAAE;MAC7D;IACA,KAAK,SAAS;MAAE;QACd,OAAO;UACLF,OAAO,EAAE,KAAK;UACdC,IAAI,EAAEF,cAAc,CAACE,IAAI;UACzBE,KAAK,EAAED;SACR;MACH;IACA,KAAK,OAAO;MAAE;QACZ,OAAO;UACLF,OAAO,EAAE,KAAK;UACdC,IAAI,EAAEC,SAAS;UACfC,KAAK,EAAEJ,cAAc,CAACI;SACvB;MACH;IACA,KAAK,SAAS;MAAE;QACd,OAAO;UAAEH,OAAO,EAAE,KAAK;UAAEC,IAAI,EAAEC,SAAS;UAAEC,KAAK,EAAED;QAAS,CAAE;MAC9D;EACF;AACF;AAEO,MAAME,WAAW,GAAGA,CACzBC,OAA0C,EAC1CC,QAIC,EACDC,eAA8B,EAC9BC,QAAA,GAA+C,EAAE,KAC/C;EACF,MAAMC,yBAAyB,GAAGA,CAAA,KAAK;IACrC,MAAMC,KAAK,GAAGJ,QAAQ,EAAE;IACxB,MAAM;MAAEK;IAAI,CAAE,GAAGN,OAAO,EAAE;IAE1B,OAAOO,sBAAsB;IAC7B;;;;IAIA,SAASA,sBAAsBA,CAK7BC,CAA2C,EAC3CC,MAAc,EACdhC,OAAA,GAAmB;MAAEiC,kBAAkB,EAAE;IAAK,CAAE;MAEhD,MAAMC,OAAO,GAAGR,QAAQ,CAACM,MAAM,CAAC,IAAIA,MAAM;MAC1C,MAAMG,WAAW,GAAGN,IAAI,CAACO,KAAK,CAACC,aAAa,CAC1C;QAAEC,EAAE,EAAE;MAAsB,CAAE,EAC9B;QAAEN,MAAM,EAAEE;MAAO,CAAE,CACpB;MACD,MAAMK,cAAc,GAAGV,IAAI,CAACO,KAAK,CAACC,aAAa,CAC7C;QAAEC,EAAE,EAAE;MAAgB,CAAE,EACxB;QAAEN,MAAM,EAAEE;MAAO,CAAE,CACpB;MACD,MAAMM,YAAY,GAAGX,IAAI,CAACO,KAAK,CAACC,aAAa,CAC3C;QAAEC,EAAE,EAAE;MAAoB,CAAE,EAC5B;QAAEN,MAAM,EAAEE;MAAO,CAAE,CACpB;MACD,OAAO1D,MAAM,CAACiE,MAAM,CAClB,IAAAC,cAAI,EAACX,CAAC,EAAGY,CAAC,IACRA,CAAC,CAAChD,IAAI,CACH5B,CAAC,IACAA,CAAC,CAACoB,IAAI,KAAK,OAAO,GACdyD,YAAC,CAACC,EAAE,CAACC,mBAAO,CAAC,CAAC/E,CAAC,CAACgF,KAAK,CAAC,GACpBvD,OAAO,CACNC,OAAO,CACNmC,KAAK,CAACoB,OAAO,CACXb,WAAW,GAAGpE,CAAC,CAACgF,KAAK,CAACb,OAAO,GACzB,IAAI,GAAGnE,CAAC,CAACgF,KAAK,CAACb,OAAO,GACtB,EAAE,CACP,CACF,CACAvC,IAAI,CAAEgB,CAAC,IAAI,CAAE,CAAC,CAAC,GAChBnB,OAAO,CACNC,OAAO,CACNmC,KAAK,CAACqB,OAAO,CACXV,cAAc,IACTK,YAAC,CAACC,EAAE,CAACK,mBAAO,CAAC,CAACnF,CAAC,CAACgF,KAAK,CAAC,IAAIhF,CAAC,CAACgF,KAAK,CAACb,OAAO,GACxC,IAAI,GAAGnE,CAAC,CAACgF,KAAK,CAACb,OAAO,GACtB,EAAE,CAAC,CACV,CACF,CACAvC,IAAI,CAAEgB,CAAC,IAAI,CAAE,CAAC,CAAC,GAClB5C,CAAC,CAACoF,IAAI,CAAChE,IAAI,KAAK,gBAAgB,GAChCK,OAAO,CAACC,OAAO,CAAC,KAAK,CAAC,CAAC,GACvBD,OAAO,CACNC,OAAO,CACN,CAACO,OAAO,CAACiC,kBAAkB,IACtBL,KAAK,CAACP,KAAK,CAAC,GAAGmB,YAAY,KAAK,GAAGY,WAAW,CAACrF,CAAC,CAACoF,IAAI,CAAC,CAAC,CAC7D,CACAxD,IAAI,CAAEgB,CAAC,IAAI;QACV0C,OAAO,CAACC,IAAI,CAACvF,CAAC,CAACoF,IAAI,EAAEpF,CAAC,CAACoF,IAAI,CAACI,QAAQ,EAAE,CAAC;MACzC,CAAC,CAAC,EACPC,GAAG,IAAI;QACN,IACEvE,gBAAK,CAACwE,sBAAsB,CAACD,GAAG,CAAC,IAC7BE,kBAAO,CAACC,cAAc,CAACH,GAAG,CAAC,IAC1BvE,gBAAK,CAAC2E,iBAAiB,CAACJ,GAAG,CAACE,kBAAO,CAACG,mBAAmB,CAAC,CAAE,EAC/D;UACA;QACF;QACA,MAAMC,KAAK,GAAG;UACZ9B,MAAM;UACNE,OAAO,EAAE,8BAA8BF,MAAM;SAC9C;QACD3E,MAAM,CAAC0G,gBAAgB,CAACP,GAAG,EAAE;UAC3BM;SACD,CAAC;QACFT,OAAO,CAAChC,KAAK,CAACmC,GAAG,EAAEM,KAAK,CAAC;QAEzB,OAAOlC,KAAK,CAACP,KAAK,CAChBQ,IAAI,CAACO,KAAK,CAACC,aAAa,CACtB;UAAEC,EAAE,EAAE;QAAyB,CAAE,EACjC;UACEN,MAAM,EAAEE,OAAO;UACfb,KAAK,EAAE2C,IAAI,CAACC,SAAS,CAACT,GAAG,EAAEpC,SAAS,EAAE,CAAC;SACxC,CACF,CACF;MACH,CAAC,CACF,CAAC,EACJ;QAAEY;MAAM,CAAE,CACX;IACH;IAEA,SAASoB,WAAWA,CAACvF,CAAiB;MACpC,OAAOqG,gBAAK,CAAC9B,KAAK,CAACvE,CAAC,CAAC,CAAC2C,IAAI,CACxB0D,gBAAK,CAACC,IAAI,CAAC;QACT;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACAC,UAAU,EAAGvG,CAAC,IAAI;UAChBwF,OAAO,CAACC,IAAI,CAACzF,CAAC,CAAC0F,QAAQ,EAAE,CAAC;UAC1B,OAAO1B,IAAI,CAACO,KAAK,CAACC,aAAa,CAAC;YAAEC,EAAE,EAAE;UAAmB,CAAE,CAAC;QAC9D;OACD,CAAC,EACF4B,gBAAK,CAACG,MAAM,CAAExG,CAAC,IACbgE,IAAI,CAACO,KAAK,CAACC,aAAa,CACtB;QAAEC,EAAE,EAAE;MAAyB,CAAE,EACjC;QACEjB,KAAK,EAAE,GAAGxD,CAAC,CAACqE,OAAO,IAAIrE,CAAC,CAACsB,IAAI,IAAItB,CAAC;OACnC,CACF,CACF,CACF;IACH;EACF,CAAC;EAED;;;;EAIA,MAAMyG,oBAAoB,GAiBtBA,CAACjE,IAAS,EAAE2B,MAAW,EAAEhC,OAAmB,KAAI;IAClD,MAAM8B,sBAAsB,GAAGH,yBAAyB,EAAE;IAC1D,MAAM,CAACpD,CAAC,EAAEgG,CAAC,CAAC,GAAG9C,eAAe,CAC5B;MACElB,OAAO,EAAEE,iBAAM,CAAC+D,QAAQ,CAACnE,IAAI,CAACE,OAAO,CAAC,GACjC,IAAAC,cAAI,EACLC,iBAAM,CAACgE,mBAAmB,CAAC;QAAEzC;MAAM,CAAE,CAAC,EACtCvB,iBAAM,CAACiE,OAAO,CAACrE,IAAI,CAACE,OAAO,CAAC,CACrB,GACP,CAAC,GAAGoE,IAAW,KACf,IAAAnE,cAAI,EACFC,iBAAM,CAACgE,mBAAmB,CAAC;QAAEzC;MAAM,CAAE,CAAC,EACtCvB,iBAAM,CAACiE,OAAO,CAACrE,IAAI,CAACE,OAAO,CAAC,GAAGoE,IAAI,CAAC,CAAC,CACtC;MACLC,IAAI,EAAEvE,IAAI,CAACuE;KACZ,EACD,IAAAC,qBAAc,EAAC;MACbC,iBAAiB,EAAE9E,OAAO,EAAE8E;KAC7B,CAAC,CACH;IAED,OAAO,IAAAC,eAAK,EACV,IAAAC,cAAQ,EAAC,MAAMhE,mBAAmB,CAACzC,CAAC,CAAC6D,KAAK,CAAC,CAAC,EAC5CN,sBAAsB,CAACyC,CAAQ,EAAEvC,MAAM,EAAEhC,OAAO,CAAC,CAClD;EACH,CAAC;EAED,SAASiF,wBAAwBA,CAC/B3E,SAA+B,EAC/B4E,cAA0B;IAE1B,OAAQ,CAAC7E,IAAS,EAAE2B,MAAW,EAAEhC,OAAY,KAAI;MAC/C,OAAOsE,oBAAoB,CACzB;QACE/D,OAAO,EAAE,OAAOF,IAAI,CAACE,OAAO,KAAK,UAAU,GACvCD,SAAS,GACNxB,CAAM,IAAK2B,iBAAM,CAAC0E,GAAG,CAAC9E,IAAI,CAACE,OAAO,CAACzB,CAAC,CAAC,EAAE,MAAM2B,iBAAM,CAACG,OAAO,CAACN,SAAS,CAAC,CAAC,GACxED,IAAI,CAACE,OAAO,GACdD,SAAS,GACRG,iBAAM,CAAC0E,GAAG,CAAC9E,IAAI,CAACE,OAAO,EAAE,MAAME,iBAAM,CAACG,OAAO,CAACN,SAAS,CAAC,CAAS,GAClED,IAAI,CAACE,OAAO;QAChBqE,IAAI,EAAEvE,IAAI,CAACuE;OACZ,EACD5C,MAAM,EACN;QAAE,GAAGkD,cAAc;QAAE,GAAGlF;MAAO,CAAE,CAClC;IACH,CAAC;EAkBH;EAEA,MAAMoF,wBAAwB,GAAa/E,IAG1C,IAAI;IACH,MAAM,CAAC9B,CAAC,EAAEgG,CAAC,CAAC,GAAG9C,eAAe,CAACpB,IAAI,CAAC;IAEpC,OAAO,IAAA0E,eAAK,EACV,IAAAC,cAAQ,EAAC,MAAMhE,mBAAmB,CAACzC,CAAC,CAAC6D,KAAK,CAAC,CAAC,EAC5CmC,CAAC,CACF;EACH,CAAC;EAED,OAAO;IACLa,wBAAwB;IACxBd,oBAAoB;IACpBW,wBAAwB;IACxBtD;GACD;AACH,CAAC;AAAAvC,OAAA,CAAAkC,WAAA,GAAAA,WAAA;AAEM,MAAM+D,UAAU,GAyBnBA,CAAChF,IAAS,EAAEiF,GAAQ,MAAW;EACjC,GAAGjF,IAAI;EACPE,OAAO,EAAE,OAAOF,IAAI,CAACE,OAAO,KAAK,UAAU,GACtCzB,CAAM,IAAKwG,GAAG,CAACxG,CAAC,CAAC,CAAEuB,IAAI,CAACE,OAA6C,CAACzB,CAAC,CAAC,CAAC,GAC1EwG,GAAG,CAACjF,IAAI,CAACE,OAAO;CACrB,CAAC;AAAAnB,OAAA,CAAAiG,UAAA,GAAAA,UAAA;AAEI,SAAUE,cAAcA,CAG5BC,OAAU,EACVC,uBAAiC;EAWjC,MAAMC,MAAM,GAAGD,uBAAuB,GAClCjH,MAAM,CAACkH,MAAM,CAACF,OAAO,CAAC,CAACF,GAAG,CAACK,UAAU,CAAC,GACtCnH,MAAM,CAACkH,MAAM,CAACF,OAAO,CAAC;EAC1B,MAAMnE,KAAK,GAAGqE,MAAM,CAACE,IAAI,CAACC,WAAM,CAACC,SAAS,CAAC;EAC3C,IAAIzE,KAAK,EAAE;IACT,OAAOA,KAAK;EACd;EACA,MAAM0E,OAAO,GAAGC,gBAAK,CAACC,SAAS,CAACP,MAAM,EAAGQ,CAAC,IAAKA,CAAC,CAAC/G,IAAI,KAAK,SAAS,GAAGgH,iBAAM,CAACC,IAAI,CAACF,CAAC,CAAC,GAAGC,iBAAM,CAACE,IAAI,EAAE,CAAC;EACrG,IAAIN,OAAO,CAAC3D,KAAK,KAAKhB,SAAS,EAAE;IAC/B,OAAO2E,OAAO,CAAC3D,KAAK;EACtB;EACA,MAAMlB,OAAO,GAAG8E,gBAAK,CAACC,SAAS,CAACP,MAAM,EAAGQ,CAAC,IAAKL,WAAM,CAACS,SAAS,CAACJ,CAAC,CAAC,IAAIA,CAAC,CAACK,OAAO,GAAGJ,iBAAM,CAACC,IAAI,CAACF,CAAC,CAAC,GAAGC,iBAAM,CAACE,IAAI,EAAE,CAAC;EACjH,IAAInF,OAAO,CAACkB,KAAK,KAAKhB,SAAS,EAAE;IAC/B,OAAOF,OAAO,CAACkB,KAAK;EACtB;EAEA,MAAMoE,YAAY,GAAGd,MAAM,CAACU,IAAI,CAAEF,CAAC,IAAKA,CAAC,CAACK,OAAO,CAAC;EAElD,MAAMxI,CAAC,GAAGS,MAAM,CAACiI,OAAO,CAACjB,OAAO,CAAC,CAACkB,MAAM,CAAC,CAACC,IAAI,EAAE,CAACC,GAAG,EAAExE,KAAK,CAAC,KAAI;IAC9DuE,IAAI,CAACC,GAAG,CAAC,GAAGf,WAAM,CAACzD,KAAK,CAACA,KAAK,CAAC,CAACA,KAAK;IACrC,OAAOuE,IAAI;EACb,CAAC,EAAE,EAAS,CAAC;EACb,OAAOd,WAAM,CAAC5C,OAAO,CAAClF,CAAC,EAAEyI,YAAY,CAAC;AACxC;AAEA,SAASb,UAAUA,CAAOkB,MAA2B;EACnD,OAAOhB,WAAM,CAACC,SAAS,CAACe,MAAM,CAAC,IAAIV,iBAAM,CAACW,MAAM,CAACD,MAAM,CAACE,aAAa,CAAC,GAClElB,WAAM,CAAC5C,OAAO,CAAC4D,MAAM,CAACE,aAAa,CAAC3E,KAAK,EAAEyE,MAAM,CAACN,OAAO,CAAC,GAC1DM,MAAM;AACZ","ignoreList":[]}
+{"version":3,"file":"makeClient2.cjs","names":["_Function","require","_vue","Sentry","_interopRequireWildcard","_core","_effectApp","_Operations","_utils","_vue2","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","SuppressErrors","Cause","YieldableError","_tag","exports","pauseWhileProcessing","iv","pmf","Promise","resolve","pause","then","finally","resume","useIntervalPauseWhileProcessing","interval","options","useIntervalFn","immediateCallback","isActive","mutationResultToVue","mutationResult","loading","data","undefined","error","makeClient2","useIntl","useToast","useSafeMutation","messages","useHandleRequestWithToast","toast","intl","handleRequestWithToast","f","action","suppressErrorToast","message","warnMessage","value","formatMessage","id","successMessage","errorMessage","assign","flow","Effect","onExit","Exit","matchEffect","onSuccess","gen","S","is","Failure","warning","success","Success","onFailure","err","isInterruptedOnly","fail","failureOption","Option","isSome","succeed","renderError","console","warn","toString","extra","captureException","JSON","stringify","Match","pipe","tags","ParseError","orElse","useAndHandleMutation","self","b","handler","isEffect","annotateCurrentSpan","andThen","args","name","dropUndefinedT","queryInvalidation","tuple","computed","makeUseAndHandleMutation","defaultOptions","useSafeMutationWithState","mapHandler","map","composeQueries","results","renderPreviousOnFailure","values","orPrevious","find","Result","isFailure","initial","Array","findFirst","x","some","none","isInitial","waiting","isRefreshing","entries","reduce","prev","key","result","previousValue"],"sources":["../src/makeClient2.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/makeClient2.d.ts

@@ -1,7 +1,6 @@
 import type { MutationResult } from "@effect-app/vue";
 import { Result } from "@effect-app/vue";
 import { type MaybeRefOrGetter, type Pausable, type UseIntervalFnOptions } from "@vueuse/core";
-import type { Either } from "effect-app";
 import { Cause, Effect, S } from "effect-app";
 import { type SupportedErrors } from "effect-app/client";
 import { type ComputedRef } from "vue";
@@ -23,38 +22,6 @@ export interface Opts<A> extends MutationOptions {
     suppressSuccessToast?: boolean;
     successToast?: (a: A) => any;
 }
-export declare const withSuccess: {
-    <I, E extends ResponseErrors, A, X, R>(self: {
-        handler: (i: I) => Effect<A, E, R>;
-        name: string;
-    }, onSuccess: (a: A, i: I) => Promise<X>): {
-        handler: (i: I) => Effect<X, E, R>;
-        name: string;
-    };
-    <E extends ResponseErrors, A, X, R>(self: {
-        handler: Effect<A, E, R>;
-        name: string;
-    }, onSuccess: (_: A) => Promise<X>): {
-        handler: Effect<X, E, R>;
-        name: string;
-    };
-};
-export declare const withSuccessE: {
-    <I, E extends ResponseErrors, A, E2, X, R>(self: {
-        handler: (i: I) => Effect<A, E, R>;
-        name: string;
-    }, onSuccessE: (_: A, i: I) => Effect<X, E2>): {
-        handler: (i: I) => Effect<X, E | E2, R>;
-        name: string;
-    };
-    <E extends ResponseErrors, A, E2, X, R>(self: {
-        handler: Effect<A, E, R>;
-        name: string;
-    }, onSuccessE: (_: A) => Effect<X, E2>): {
-        handler: Effect<X, E | E2, R>;
-        name: string;
-    };
-};
 export interface Res<A, E> {
     readonly loading: boolean;
     readonly data: A | undefined;
@@ -63,13 +30,13 @@ export interface Res<A, E> {
 type WithAction<A> = A & {
     action: string;
 };
-type Resp<I, E, A> = readonly [
+type Resp<I, E, A, R> = readonly [
     ComputedRef<Res<A, E>>,
-    WithAction<(I: I) => Promise<void>>
+    WithAction<(I: I) => Effect<A, E, R>>
 ];
-type ActResp<E, A> = readonly [
+type ActResp<E, A, R> = readonly [
     ComputedRef<Res<A, E>>,
-    WithAction<() => Promise<void>>
+    WithAction<() => Effect<A, E, R>>
 ];
 export declare function mutationResultToVue<A, E>(mutationResult: MutationResult<A, E>): Res<A, E>;
 export declare const makeClient2: <Locale extends string, R>(useIntl: MakeIntlReturn<Locale>["useIntl"], useToast: () => {
@@ -82,26 +49,26 @@ export declare const makeClient2: <Locale extends string, R>(useIntl: MakeIntlRe
         name: string;
     }) => readonly [ComputedRef<Res<A, E>>, (i: I) => Effect<A, E, R>];
     useAndHandleMutation: {
-        <I, E_1 extends ResponseErrors, A_1>(self: {
-            handler: (i: I) => Effect<A_1, E_1, R>;
+        <I, E_1 extends ResponseErrors, A_1, R_1>(self: {
+            handler: (i: I) => Effect<A_1, E_1, R_1>;
             name: string;
-        }, action: string, options?: Opts<A_1>): Resp<I, A_1, E_1>;
-        <E_2 extends ResponseErrors, A_2>(self: {
-            handler: Effect<A_2, E_2, R>;
+        }, action: string, options?: Opts<A_1>): Resp<I, A_1, E_1, R_1>;
+        <E_2 extends ResponseErrors, A_2, R_2>(self: {
+            handler: Effect<A_2, E_2, R_2>;
             name: string;
-        }, action: string, options?: Opts<A_2>): ActResp<E_2, A_2>;
+        }, action: string, options?: Opts<A_2>): ActResp<E_2, A_2, R_2>;
     };
-    makeUseAndHandleMutation: (onSuccess?: () => Promise<void>, defaultOptions?: Opts<any>) => {
-        <I, E_2 extends ResponseErrors, A_3>(self: {
-            handler: (i: I) => Effect<A_3, E_2, R>;
+    makeUseAndHandleMutation: (defaultOptions?: Opts<any>) => {
+        <I, E_2 extends ResponseErrors, A_3, R_3>(self: {
+            handler: (i: I) => Effect<A_3, E_2, R_3>;
             name: string;
-        }, action: string, options?: Opts<A_3>): Resp<I, A_3, E_2>;
+        }, action: string, options?: Opts<A_3>): Resp<I, A_3, E_2, R_3>;
         <E_3 extends ResponseErrors, A_4>(self: {
             handler: Effect<A_4, E_3, R>;
             name: string;
-        }, action: string, options?: Opts<A_4>): ActResp<E_3, A_4>;
+        }, action: string, options?: Opts<A_4>): ActResp<E_3, A_4, R>;
     };
-    useHandleRequestWithToast: () => <E_3 extends ResponseErrors, A_5, Args extends unknown[]>(f: (...args: Args) => Promise<Either<A_5, E_3>>, action: string, options?: Opts<A_5>) => ((...a: Args) => Promise<void>) & {
+    useHandleRequestWithToast: () => <E_3 extends ResponseErrors, A_5, R_4, Args extends unknown[]>(f: (...args: Args) => Effect<A_5, E_3, R_4>, action: string, options?: Opts<A_5>) => ((...a: Args) => Effect.Effect<A_5, E_3, R_4>) & {
         action: string;
     };
 };

package/dist/makeClient2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeClient2.d.ts","sourceRoot":"","sources":["../src/makeClient2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"makeClient2.d.ts","sourceRoot":"","sources":["../src/makeClient2.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAExC,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,QAAQ,EAAiB,KAAK,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAC7G,OAAO,EAAS,KAAK,EAAE,MAAM,EAAuB,CAAC,EAAE,MAAM,YAAY,CAAA;AACzE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAGxD,OAAO,EAAY,KAAK,WAAW,EAAE,MAAM,KAAK,CAAA;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAElE;;GAEG;AACH,qBAAa,cAAe,SAAQ,KAAK,CAAC,cAAc;IACtD,QAAQ,CAAC,IAAI,oBAAmB;CACjC;AAED,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,WAAW,CAAC,UAAU,GAAG,eAAe,GAAG,cAAc,CAAA;AAExF,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,QAAQ,EACZ,GAAG,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,oBAM5B;AAED,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,EAC3B,QAAQ,CAAC,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACnC,OAAO,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,mBAAmB,CAAC;;EAU1D;AAED,MAAM,WAAW,IAAI,CAAC,CAAC,CAAE,SAAQ,eAAe;IAC9C,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG,CAAA;CAC7B;AAED,MAAM,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,SAAS,CAAA;IAC5B,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,CAAA;CAC9B;AAED,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG;IACvB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAID,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,SAAS;IAC/B,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACtB,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;CACtC,CAAA;AAED,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,SAAS;IAC/B,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACtB,UAAU,CAAC,MAAM,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;CAClC,CAAA;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EACtC,cAAc,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,GACnC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAuBX;AAED,eAAO,MAAM,WAAW,GAAI,MAAM,SAAS,MAAM,EAAE,CAAC,WACzC,cAAc,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,YAChC,MAAM;IACd,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAChC,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAClC,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACnC,mBACgB,aAAa,aACpB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;+BA6OV,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ;QAC/C,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;QAClC,IAAI,EAAE,MAAM,CAAA;KACb;;SA9EE,CAAC,cAAY,cAAc,kBACpB;YACJ,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,GAAC,EAAE,GAAC,EAAE,GAAC,CAAC,CAAA;YAClC,IAAI,EAAE,MAAM,CAAA;SACb,UACO,MAAM,YACJ,IAAI,CAAC,GAAC,CAAC,GAChB,IAAI,CAAC,CAAC,EAAE,GAAC,EAAE,GAAC,EAAE,GAAC,CAAC;qBACR,cAAc,kBACjB;YACJ,OAAO,EAAE,MAAM,CAAC,GAAC,EAAE,GAAC,EAAE,GAAC,CAAC,CAAA;YACxB,IAAI,EAAE,MAAM,CAAA;SACb,UACO,MAAM,YACJ,IAAI,CAAC,GAAC,CAAC,GAChB,OAAO,CAAC,GAAC,EAAE,GAAC,EAAE,GAAC,CAAC;;gDA6BF,IAAI,CAAC,GAAG,CAAC,KAWpB;QACJ,CAAC,CAAC,EAAE,GAAwB,SAAd,cAAc,EAAE,GAAC,EAAE,GAAC,EAChC,IAAI,EAAE;YACJ,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,GAAC,EAAE,GAAC,EAAE,GAAC,CAAC,CAAA;YAClC,IAAI,EAAE,MAAM,CAAA;SACb,EACD,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,IAAI,CAAC,GAAC,CAAC,GAChB,IAAI,CAAC,CAAC,EAAE,GAAC,EAAE,GAAC,EAAE,GAAC,CAAC,CAAA;QACnB,CAAC,GAAwB,SAAd,cAAc,EAAE,GAAC,EAC1B,IAAI,EAAE;YACJ,OAAO,EAAE,MAAM,CAAC,GAAC,EAAE,GAAC,EAAE,CAAC,CAAC,CAAA;YACxB,IAAI,EAAE,MAAM,CAAA;SACb,EACD,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,IAAI,CAAC,GAAC,CAAC,GAChB,OAAO,CAAC,GAAC,EAAE,GAAC,EAAE,CAAC,CAAC,CAAA;KACpB;kDA9NW,cAAc,YAGxB,IAAI,SAAS,OAAO,EAAE,KAEnB,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,GAAC,EAAE,GAAC,EAAE,GAAC,CAAC,UAC7B,MAAM,YACL,IAAI,CAAC,GAAC,CAAC;;;CA4OrB,CAAA;AAED,eAAO,MAAM,UAAU,EAAE;IACvB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EACrB,IAAI,EAAE;QACJ,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;QAClC,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAA;KAC1B,EACD,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAC9D;QACD,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;QACrC,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAA;KAC1B,CAAA;IACD,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAClB,IAAI,EAAE;QACJ,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;QACxB,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;KAChB,EACD,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GACpD;QACD,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;QAC3B,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;KAChB,CAAA;CAMD,CAAA;AAEF,wBAAgB,cAAc,CAC5B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAEjD,OAAO,EAAE,CAAC,EACV,uBAAuB,CAAC,EAAE,OAAO,GAChC,MAAM,CAAC,MAAM,CACd;KACG,QAAQ,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,GACtE,KAAK;CACV,EACD;KACG,QAAQ,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GACtE,KAAK;CACV,CAAC,MAAM,CAAC,CAAC,CACX,CAwBA"}

package/dist/makeClient2.js

@@ -3,7 +3,7 @@ import { flow, pipe, tuple } from "@effect-app/core/Function";
 import { Result } from "@effect-app/vue";
 import * as Sentry from "@sentry/browser";
 import { useIntervalFn } from "@vueuse/core";
-import { Array, Cause, Effect, Match, Option, Runtime, S } from "effect-app";
+import { Array, Cause, Effect, Exit, Match, Option, S } from "effect-app";
 import { Failure, Success } from "effect-app/Operations";
 import { dropUndefinedT } from "effect-app/utils";
 import { computed } from "vue";
@@ -25,20 +25,6 @@ export function useIntervalPauseWhileProcessing(pmf, interval, options) {
         isActive: iv.isActive
     };
 }
-export const withSuccess = (self, onSuccess) => ({
-    ...self,
-    handler: typeof self.handler === "function"
-        ? (i) => pipe(self.handler(i), Effect.flatMap((_) => Effect.promise(() => onSuccess(_, i)).pipe(Effect.withSpan("onSuccess"))))
-        : Effect.flatMap(self.handler, (_) => Effect.promise(() => onSuccess(_)).pipe(Effect.withSpan("onSuccess")))
-});
-export const withSuccessE = (self, onSuccessE) => {
-    return {
-        ...self,
-        handler: typeof self.handler === "function"
-            ? (i) => pipe(self.handler(i), Effect.flatMap((_) => onSuccessE(_, i)))
-            : Effect.flatMap(self.handler, (_) => onSuccessE(_))
-    };
-};
 export function mutationResultToVue(mutationResult) {
     switch (mutationResult._tag) {
         case "Loading": {
@@ -77,45 +63,48 @@ export const makeClient2 = (useIntl, useToast, useSafeMutation, messages = {}) =
             const warnMessage = intl.value.formatMessage({ id: "handle.with_warnings" }, { action: message });
             const successMessage = intl.value.formatMessage({ id: "handle.success" }, { action: message });
             const errorMessage = intl.value.formatMessage({ id: "handle.with_errors" }, { action: message });
-            return Object.assign(flow(f, (p) => p.then((r) => r._tag === "Right"
-                ? S.is(Failure)(r.right)
-                    ? Promise
-                        .resolve(toast.warning(warnMessage + r.right.message
-                        ? "\n" + r.right.message
-                        : ""))
-                        .then((_) => { })
-                    : Promise
-                        .resolve(toast.success(successMessage
-                        + (S.is(Success)(r.right) && r.right.message
-                            ? "\n" + r.right.message
-                            : "")))
-                        .then((_) => { })
-                : r.left._tag === "SuppressErrors"
-                    ? Promise.resolve(void 0)
-                    : Promise
-                        .resolve(!options.suppressErrorToast
-                        && toast.error(`${errorMessage}:\n` + renderError(r.left)))
-                        .then((_) => {
-                        console.warn(r.left, r.left.toString());
-                    }), (err) => {
-                if (Cause.isInterruptedException(err)
-                    || (Runtime.isFiberFailure(err)
-                        && Cause.isInterruptedOnly(err[Runtime.FiberFailureCauseId]))) {
-                    return;
-                }
-                const extra = {
-                    action,
-                    message: `Unexpected Error trying to ${action}`
-                };
-                Sentry.captureException(err, {
-                    extra
-                });
-                console.error(err, extra);
-                return toast.error(intl.value.formatMessage({ id: "handle.unexpected_error" }, {
-                    action: message,
-                    error: JSON.stringify(err, undefined, 2)
-                }));
-            })), { action });
+            return Object.assign(flow(f, Effect.onExit(Exit.matchEffect({
+                onSuccess: (r) => Effect.gen(function* () {
+                    if (S.is(Failure)(r)) {
+                        toast.warning(warnMessage + r.message
+                            ? "\n" + r.message
+                            : "");
+                        return;
+                    }
+                    toast.success(successMessage
+                        + (S.is(Success)(r) && r.message
+                            ? "\n" + r.message
+                            : ""));
+                }),
+                onFailure: (err) => Effect.gen(function* () {
+                    if (Cause.isInterruptedOnly(err)) {
+                        return;
+                    }
+                    const fail = Cause.failureOption(err);
+                    if (Option.isSome(fail)) {
+                        if (fail._tag === "SuppressErrors") {
+                            return Effect.succeed(void 0);
+                        }
+                        if (!options.suppressErrorToast) {
+                            toast.error(`${errorMessage}:\n` + renderError(fail.value));
+                        }
+                        console.warn(fail, fail.toString());
+                        return;
+                    }
+                    const extra = {
+                        action,
+                        message: `Unexpected Error trying to ${action}`
+                    };
+                    Sentry.captureException(err, {
+                        extra
+                    });
+                    console.error(err, extra);
+                    toast.error(intl.value.formatMessage({ id: "handle.unexpected_error" }, {
+                        action: message,
+                        error: JSON.stringify(err, undefined, 2)
+                    }));
+                })
+            }))), { action });
         }
         function renderError(e) {
             return Match.value(e).pipe(Match.tags({
@@ -178,16 +167,10 @@ export const makeClient2 = (useIntl, useToast, useSafeMutation, messages = {}) =
         }));
         return tuple(computed(() => mutationResultToVue(a.value)), handleRequestWithToast(b, action, options));
     };
-    function makeUseAndHandleMutation(onSuccess, defaultOptions) {
+    function makeUseAndHandleMutation(defaultOptions) {
         return ((self, action, options) => {
             return useAndHandleMutation({
-                handler: typeof self.handler === "function"
-                    ? onSuccess
-                        ? (i) => Effect.tap(self.handler(i), () => Effect.promise(onSuccess))
-                        : self.handler
-                    : onSuccess
-                        ? Effect.tap(self.handler, () => Effect.promise(onSuccess))
-                        : self.handler,
+                handler: self.handler,
                 name: self.name
             }, action, { ...defaultOptions, ...options });
         });
@@ -237,4 +220,4 @@ function orPrevious(result) {
         ? Result.success(result.previousValue.value, result.waiting)
         : result;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeClient2.js","sourceRoot":"","sources":["../src/makeClient2.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeClient2.js","sourceRoot":"","sources":["../src/makeClient2.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue",
-  "version": "1.26.0",
+  "version": "1.26.1",
   "license": "MIT",
   "type": "module",
   "homepage": "https://github.com/effect-ts-app/libs/tree/main/packages/vue",
@@ -10,7 +10,7 @@
     "@vueuse/core": "^11.1.0",
     "query-string": "^9.1.1",
     "@effect-app/core": "1.17.0",
-    "@effect-app/vue": "1.26.0",
+    "@effect-app/vue": "1.26.1",
     "effect-app": "1.30.0",
     "@effect-app/schema": "1.19.0"
   },

package/src/makeClient2.ts

@@ -4,8 +4,7 @@ import type { MutationResult } from "@effect-app/vue"
 import { Result } from "@effect-app/vue"
 import * as Sentry from "@sentry/browser"
 import { type MaybeRefOrGetter, type Pausable, useIntervalFn, type UseIntervalFnOptions } from "@vueuse/core"
-import type { Either } from "effect-app"
-import { Array, Cause, Effect, Match, Option, Runtime, S } from "effect-app"
+import { Array, Cause, Effect, Exit, Match, Option, S } from "effect-app"
 import { type SupportedErrors } from "effect-app/client"
 import { Failure, Success } from "effect-app/Operations"
 import { dropUndefinedT } from "effect-app/utils"
@@ -53,80 +52,6 @@ export interface Opts<A> extends MutationOptions {
   successToast?: (a: A) => any
 }
 
-export const withSuccess: {
-  <I, E extends ResponseErrors, A, X, R>(
-    self: {
-      handler: (i: I) => Effect<A, E, R>
-      name: string
-    },
-    onSuccess: (a: A, i: I) => Promise<X>
-  ): {
-    handler: (i: I) => Effect<X, E, R>
-    name: string
-  }
-  <E extends ResponseErrors, A, X, R>(
-    self: {
-      handler: Effect<A, E, R>
-      name: string
-    },
-    onSuccess: (_: A) => Promise<X>
-  ): {
-    handler: Effect<X, E, R>
-    name: string
-  }
-} = (self: any, onSuccess: any): any => ({
-  ...self,
-  handler: typeof self.handler === "function"
-    ? (i: any) =>
-      pipe(
-        (
-          self.handler as (
-            i: any
-          ) => Effect<any, any, any>
-        )(i),
-        Effect.flatMap((_) =>
-          Effect.promise(() => onSuccess(_, i)).pipe(
-            Effect.withSpan("onSuccess")
-          )
-        )
-      )
-    : Effect.flatMap(self.handler, (_) => Effect.promise(() => onSuccess(_)).pipe(Effect.withSpan("onSuccess")))
-})
-
-export const withSuccessE: {
-  <I, E extends ResponseErrors, A, E2, X, R>(
-    self: {
-      handler: (i: I) => Effect<A, E, R>
-      name: string
-    },
-    onSuccessE: (_: A, i: I) => Effect<X, E2>
-  ): {
-    handler: (i: I) => Effect<X, E | E2, R>
-    name: string
-  }
-  <E extends ResponseErrors, A, E2, X, R>(
-    self: {
-      handler: Effect<A, E, R>
-      name: string
-    },
-    onSuccessE: (_: A) => Effect<X, E2>
-  ): {
-    handler: Effect<X, E | E2, R>
-    name: string
-  }
-} = (self: any, onSuccessE: any): any => {
-  return {
-    ...self,
-    handler: typeof self.handler === "function"
-      ? (i: any) =>
-        pipe(
-          self.handler(i),
-          Effect.flatMap((_) => onSuccessE(_, i))
-        )
-      : Effect.flatMap(self.handler, (_) => onSuccessE(_))
-  }
-}
-
 export interface Res<A, E> {
   readonly loading: boolean
   readonly data: A | undefined
@@ -139,14 +64,14 @@ type WithAction<A> = A & {
 
 // computed() takes a getter function and returns a readonly reactive ref
 // object for the returned value from the getter.
-type Resp<I, E, A> = readonly [
+type Resp<I, E, A, R> = readonly [
   ComputedRef<Res<A, E>>,
-  WithAction<(I: I) => Promise<void>>
+  WithAction<(I: I) => Effect<A, E, R>>
 ]
 
-type ActResp<E, A> = readonly [
+type ActResp<E, A, R> = readonly [
   ComputedRef<Res<A, E>>,
-  WithAction<() => Promise<void>>
+  WithAction<() => Effect<A, E, R>>
 ]
 
 export function mutationResultToVue<A, E>(
@@ -198,9 +123,10 @@ export const makeClient2 = <Locale extends string, R>(
     function handleRequestWithToast<
       E extends ResponseErrors,
       A,
+      R,
       Args extends unknown[]
     >(
-      f: (...args: Args) => Promise<Either<A, E>>,
+      f: (...args: Args) => Effect<A, E, R>,
       action: string,
       options: Opts<A> = { suppressErrorToast: false }
     ) {
@@ -218,68 +144,70 @@ export const makeClient2 = <Locale extends string, R>(
         { action: message }
       )
       return Object.assign(
-        flow(f, (p) =>
-          p.then(
-            (r) =>
-              r._tag === "Right"
-                ? S.is(Failure)(r.right)
-                  ? Promise
-                    .resolve(
-                      toast.warning(
-                        warnMessage + r.right.message
-                          ? "\n" + r.right.message
-                          : ""
-                      )
+        flow(
+          f,
+          Effect.onExit(
+            Exit.matchEffect({
+              onSuccess: (r) =>
+                Effect.gen(function*() {
+                  if (S.is(Failure)(r)) {
+                    toast.warning(
+                      warnMessage + r.message
+                        ? "\n" + r.message
+                        : ""
                     )
-                    .then((_) => {})
-                  : Promise
-                    .resolve(
-                      toast.success(
-                        successMessage
-                          + (S.is(Success)(r.right) && r.right.message
-                            ? "\n" + r.right.message
-                            : "")
-                      )
-                    )
-                    .then((_) => {})
-                : r.left._tag === "SuppressErrors"
-                ? Promise.resolve(void 0)
-                : Promise
-                  .resolve(
-                    !options.suppressErrorToast
-                      && toast.error(`${errorMessage}:\n` + renderError(r.left))
+                    return
+                  }
+
+                  toast.success(
+                    successMessage
+                      + (S.is(Success)(r) && r.message
+                        ? "\n" + r.message
+                        : "")
                   )
-                  .then((_) => {
-                    console.warn(r.left, r.left.toString())
-                  }),
-            (err) => {
-              if (
-                Cause.isInterruptedException(err)
-                || (Runtime.isFiberFailure(err)
-                  && Cause.isInterruptedOnly(err[Runtime.FiberFailureCauseId]))
-              ) {
-                return
-              }
-              const extra = {
-                action,
-                message: `Unexpected Error trying to ${action}`
-              }
-              Sentry.captureException(err, {
-                extra
-              })
-              console.error(err, extra)
+                }),
+              onFailure: (err) =>
+                Effect.gen(function*() {
+                  if (Cause.isInterruptedOnly(err)) {
+                    return
+                  }
 
-              return toast.error(
-                intl.value.formatMessage(
-                  { id: "handle.unexpected_error" },
-                  {
-                    action: message,
-                    error: JSON.stringify(err, undefined, 2)
+                  const fail = Cause.failureOption(err)
+                  if (Option.isSome(fail)) {
+                    if ((fail as any)._tag === "SuppressErrors") {
+                      return Effect.succeed(void 0)
+                    }
+
+                    if (!options.suppressErrorToast) {
+                      toast.error(`${errorMessage}:\n` + renderError(fail.value))
+                    }
+
+                    console.warn(fail, fail.toString())
+                    return
                   }
-                )
-              )
-            }
-          )),
+
+                  const extra = {
+                    action,
+                    message: `Unexpected Error trying to ${action}`
+                  }
+                  Sentry.captureException(err, {
+                    extra
+                  })
+                  console.error(err, extra)
+
+                  toast.error(
+                    intl.value.formatMessage(
+                      { id: "handle.unexpected_error" },
+                      {
+                        action: message,
+                        error: JSON.stringify(err, undefined, 2)
+                      }
+                    )
+                  )
+                })
+            })
+          )
+        ),
         { action }
       )
     }
@@ -343,22 +271,22 @@ export const makeClient2 = <Locale extends string, R>(
    * Returns a tuple with state ref and execution function which reports errors as Toast.
    */
   const useAndHandleMutation: {
-    <I, E extends ResponseErrors, A>(
+    <I, E extends ResponseErrors, A, R>(
       self: {
         handler: (i: I) => Effect<A, E, R>
         name: string
       },
       action: string,
       options?: Opts<A>
-    ): Resp<I, A, E>
-    <E extends ResponseErrors, A>(
+    ): Resp<I, A, E, R>
+    <E extends ResponseErrors, A, R>(
       self: {
         handler: Effect<A, E, R>
         name: string
       },
       action: string,
       options?: Opts<A>
-    ): ActResp<E, A>
+    ): ActResp<E, A, R>
   } = (self: any, action: any, options?: Opts<any>) => {
     const handleRequestWithToast = useHandleRequestWithToast()
     const [a, b] = useSafeMutation(
@@ -387,33 +315,26 @@ export const makeClient2 = <Locale extends string, R>(
   }
 
   function makeUseAndHandleMutation(
-    onSuccess?: () => Promise<void>,
     defaultOptions?: Opts<any>
   ) {
     return ((self: any, action: any, options: any) => {
       return useAndHandleMutation(
         {
-          handler: typeof self.handler === "function"
-            ? onSuccess
-              ? (i: any) => Effect.tap(self.handler(i), () => Effect.promise(onSuccess))
-              : self.handler
-            : onSuccess
-            ? (Effect.tap(self.handler, () => Effect.promise(onSuccess)) as any)
-            : self.handler,
+          handler: self.handler,
           name: self.name
         },
         action,
         { ...defaultOptions, ...options }
       )
     }) as {
-      <I, E extends ResponseErrors, A>(
+      <I, E extends ResponseErrors, A, R>(
         self: {
           handler: (i: I) => Effect<A, E, R>
           name: string
         },
         action: string,
         options?: Opts<A>
-      ): Resp<I, A, E>
+      ): Resp<I, A, E, R>
       <E extends ResponseErrors, A>(
         self: {
           handler: Effect<A, E, R>
@@ -421,7 +342,7 @@ export const makeClient2 = <Locale extends string, R>(
         },
         action: string,
         options?: Opts<A>
-      ): ActResp<E, A>
+      ): ActResp<E, A, R>
     }
   }