mhz-helpers 1.2.16 → 1.2.18

package/dist/index.js

@@ -2349,18 +2349,18 @@ var ir = class {
   #e;
   #t;
   #n;
-  #r;
   #s;
+  #r;
   #o;
   #a;
   constructor(t) {
-    super(), this.#a = !1, this.#o = t.defaultOptions, this.setOptions(t.options), this.observers = [], this.#r = t.client, this.#n = this.#r.getQueryCache(), this.queryKey = t.queryKey, this.queryHash = t.queryHash, this.#e = un(this.options), this.state = t.state ?? this.#e, this.scheduleGc();
+    super(), this.#a = !1, this.#o = t.defaultOptions, this.setOptions(t.options), this.observers = [], this.#s = t.client, this.#n = this.#s.getQueryCache(), this.queryKey = t.queryKey, this.queryHash = t.queryHash, this.#e = un(this.options), this.state = t.state ?? this.#e, this.scheduleGc();
   }
   get meta() {
     return this.options.meta;
   }
   get promise() {
-    return this.#s?.promise;
+    return this.#r?.promise;
   }
   setOptions(t) {
     if (this.options = { ...this.#o, ...t }, this.updateGcTime(this.options.gcTime), this.state && this.state.data === void 0) {
@@ -2387,8 +2387,8 @@ var ir = class {
     this.#i({ type: "setState", state: t, setStateOptions: e });
   }
   cancel(t) {
-    const e = this.#s?.promise;
-    return this.#s?.cancel(t), e ? e.then(B).catch(B) : Promise.resolve();
+    const e = this.#r?.promise;
+    return this.#r?.cancel(t), e ? e.then(B).catch(B) : Promise.resolve();
   }
   destroy() {
     super.destroy(), this.cancel({ silent: !0 });
@@ -2418,16 +2418,16 @@ var ir = class {
     return this.state.data === void 0 ? !0 : t === "static" ? !1 : this.state.isInvalidated ? !0 : !tr(this.state.dataUpdatedAt, t);
   }
   onFocus() {
-    this.observers.find((e) => e.shouldFetchOnWindowFocus())?.refetch({ cancelRefetch: !1 }), this.#s?.continue();
+    this.observers.find((e) => e.shouldFetchOnWindowFocus())?.refetch({ cancelRefetch: !1 }), this.#r?.continue();
   }
   onOnline() {
-    this.observers.find((e) => e.shouldFetchOnReconnect())?.refetch({ cancelRefetch: !1 }), this.#s?.continue();
+    this.observers.find((e) => e.shouldFetchOnReconnect())?.refetch({ cancelRefetch: !1 }), this.#r?.continue();
   }
   addObserver(t) {
     this.observers.includes(t) || (this.observers.push(t), this.clearGcTimeout(), this.#n.notify({ type: "observerAdded", query: this, observer: t }));
   }
   removeObserver(t) {
-    this.observers.includes(t) && (this.observers = this.observers.filter((e) => e !== t), this.observers.length || (this.#s && (this.#a ? this.#s.cancel({ revert: !0 }) : this.#s.cancelRetry()), this.scheduleGc()), this.#n.notify({ type: "observerRemoved", query: this, observer: t }));
+    this.observers.includes(t) && (this.observers = this.observers.filter((e) => e !== t), this.observers.length || (this.#r && (this.#a ? this.#r.cancel({ revert: !0 }) : this.#r.cancelRetry()), this.scheduleGc()), this.#n.notify({ type: "observerRemoved", query: this, observer: t }));
   }
   getObserversCount() {
     return this.observers.length;
@@ -2439,11 +2439,11 @@ var ir = class {
     if (this.state.fetchStatus !== "idle" && // If the promise in the retyer is already rejected, we have to definitely
     // re-start the fetch; there is a chance that the query is still in a
     // pending state when that happens
-    this.#s?.status() !== "rejected") {
+    this.#r?.status() !== "rejected") {
       if (this.state.data !== void 0 && e?.cancelRefetch)
         this.cancel({ silent: !0 });
-      else if (this.#s)
-        return this.#s.continueRetry(), this.#s.promise;
+      else if (this.#r)
+        return this.#r.continueRetry(), this.#r.promise;
     }
     if (t && this.setOptions(t), !this.options.queryFn) {
       const a = this.observers.find((u) => u.options.queryFn);
@@ -2460,7 +2460,7 @@ var ir = class {
     }, s = () => {
       const a = nr(this.options, e), l = (() => {
         const c = {
-          client: this.#r,
+          client: this.#s,
           queryKey: this.queryKey,
           meta: this.meta
         };
@@ -2476,13 +2476,13 @@ var ir = class {
         fetchOptions: e,
         options: this.options,
         queryKey: this.queryKey,
-        client: this.#r,
+        client: this.#s,
         state: this.state,
         fetchFn: s
       };
       return r(a), a;
     })();
-    this.options.behavior?.onFetch(o, this), this.#t = this.state, (this.state.fetchStatus === "idle" || this.state.fetchMeta !== o.fetchOptions?.meta) && this.#i({ type: "fetch", meta: o.fetchOptions?.meta }), this.#s = sr({
+    this.options.behavior?.onFetch(o, this), this.#t = this.state, (this.state.fetchStatus === "idle" || this.state.fetchMeta !== o.fetchOptions?.meta) && this.#i({ type: "fetch", meta: o.fetchOptions?.meta }), this.#r = sr({
       initialPromise: e?.initialPromise,
       fn: o.fetchFn,
       onCancel: (a) => {
@@ -2506,7 +2506,7 @@ var ir = class {
       canRun: () => !0
     });
     try {
-      const a = await this.#s.start();
+      const a = await this.#r.start();
       if (a === void 0)
         throw process.env.NODE_ENV !== "production" && console.error(
           `Query data cannot be undefined. Please make sure to return a value other than undefined from your query function. Affected query key: ${this.queryHash}`
@@ -2519,7 +2519,7 @@ var ir = class {
     } catch (a) {
       if (a instanceof mt) {
         if (a.silent)
-          return this.#s.promise;
+          return this.#r.promise;
         if (a.revert) {
           if (this.state.data === void 0)
             throw a;
@@ -2648,8 +2648,8 @@ var Si = class extends we {
   #e;
   #t = void 0;
   #n = void 0;
-  #r = void 0;
-  #s;
+  #s = void 0;
+  #r;
   #o;
   #a;
   #i;
@@ -2711,10 +2711,10 @@ var Si = class extends we {
   }
   getOptimisticResult(t) {
     const e = this.#e.getQueryCache().build(this.#e, t), n = this.createResult(e, t);
-    return Ai(this, n) && (this.#r = n, this.#o = this.options, this.#s = this.#t.state), n;
+    return Ai(this, n) && (this.#s = n, this.#o = this.options, this.#r = this.#t.state), n;
   }
   getCurrentResult() {
-    return this.#r;
+    return this.#s;
   }
   trackResult(t, e) {
     return new Proxy(t, {
@@ -2744,7 +2744,7 @@ var Si = class extends we {
     return this.#f({
       ...t,
       cancelRefetch: t.cancelRefetch ?? !0
-    }).then(() => (this.updateResult(), this.#r));
+    }).then(() => (this.updateResult(), this.#s));
   }
   #f(t) {
     this.#E();
@@ -2760,11 +2760,11 @@ var Si = class extends we {
       this.options.staleTime,
       this.#t
     );
-    if (ce || this.#r.isStale || !lt(t))
+    if (ce || this.#s.isStale || !lt(t))
       return;
-    const n = tr(this.#r.dataUpdatedAt, t) + 1;
+    const n = tr(this.#s.dataUpdatedAt, t) + 1;
     this.#c = se.setTimeout(() => {
-      this.#r.isStale || this.updateResult();
+      this.#s.isStale || this.updateResult();
     }, n);
   }
   #g() {
@@ -2785,7 +2785,7 @@ var Si = class extends we {
     this.#l && (se.clearInterval(this.#l), this.#l = void 0);
   }
   createResult(t, e) {
-    const n = this.#t, r = this.options, s = this.#r, i = this.#s, o = this.#o, u = t !== n ? t.state : this.#n, { state: l } = t;
+    const n = this.#t, r = this.options, s = this.#s, i = this.#r, o = this.#o, u = t !== n ? t.state : this.#n, { state: l } = t;
     let c = { ...l }, f = !1, g;
     if (e._optimisticResults) {
       const P = this.hasListeners(), I = !P && cn(t, e), j = P && ln(t, n, e, r);
@@ -2868,10 +2868,10 @@ var Si = class extends we {
     return T;
   }
   updateResult() {
-    const t = this.#r, e = this.createResult(this.#t, this.options);
-    if (this.#s = this.#t.state, this.#o = this.options, this.#s.data !== void 0 && (this.#h = this.#t), Qe(e, t))
+    const t = this.#s, e = this.createResult(this.#t, this.options);
+    if (this.#r = this.#t.state, this.#o = this.options, this.#r.data !== void 0 && (this.#h = this.#t), Qe(e, t))
       return;
-    this.#r = e;
+    this.#s = e;
     const n = () => {
       if (!t)
         return !0;
@@ -2881,9 +2881,9 @@ var Si = class extends we {
       const i = new Set(
         s ?? this.#p
       );
-      return this.options.throwOnError && i.add("error"), Object.keys(this.#r).some((o) => {
+      return this.options.throwOnError && i.add("error"), Object.keys(this.#s).some((o) => {
         const a = o;
-        return this.#r[a] !== t[a] && i.has(a);
+        return this.#s[a] !== t[a] && i.has(a);
       });
     };
     this.#S({ listeners: n() });
@@ -2901,7 +2901,7 @@ var Si = class extends we {
   #S(t) {
     q.batch(() => {
       t.listeners && this.listeners.forEach((e) => {
-        e(this.#r);
+        e(this.#s);
       }), this.#e.getQueryCache().notify({
         query: this.#t,
         type: "observerResultsUpdated"
@@ -3011,8 +3011,9 @@ var Ci = class extends ir {
   #e;
   #t;
   #n;
+  #s;
   constructor(t) {
-    super(), this.mutationId = t.mutationId, this.#t = t.mutationCache, this.#e = [], this.state = t.state || ar(), this.setOptions(t.options), this.scheduleGc();
+    super(), this.#e = t.client, this.mutationId = t.mutationId, this.#n = t.mutationCache, this.#t = [], this.state = t.state || ar(), this.setOptions(t.options), this.scheduleGc();
   }
   setOptions(t) {
     this.options = t, this.updateGcTime(this.options.gcTime);
@@ -3021,34 +3022,38 @@ var Ci = class extends ir {
     return this.options.meta;
   }
   addObserver(t) {
-    this.#e.includes(t) || (this.#e.push(t), this.clearGcTimeout(), this.#t.notify({
+    this.#t.includes(t) || (this.#t.push(t), this.clearGcTimeout(), this.#n.notify({
       type: "observerAdded",
       mutation: this,
       observer: t
     }));
   }
   removeObserver(t) {
-    this.#e = this.#e.filter((e) => e !== t), this.scheduleGc(), this.#t.notify({
+    this.#t = this.#t.filter((e) => e !== t), this.scheduleGc(), this.#n.notify({
       type: "observerRemoved",
       mutation: this,
       observer: t
     });
   }
   optionalRemove() {
-    this.#e.length || (this.state.status === "pending" ? this.scheduleGc() : this.#t.remove(this));
+    this.#t.length || (this.state.status === "pending" ? this.scheduleGc() : this.#n.remove(this));
   }
   continue() {
-    return this.#n?.continue() ?? // continuing a mutation assumes that variables are set, mutation must have been dehydrated before
+    return this.#s?.continue() ?? // continuing a mutation assumes that variables are set, mutation must have been dehydrated before
     this.execute(this.state.variables);
   }
   async execute(t) {
     const e = () => {
       this.#r({ type: "continue" });
+    }, n = {
+      client: this.#e,
+      meta: this.options.meta,
+      mutationKey: this.options.mutationKey
     };
-    this.#n = sr({
-      fn: () => this.options.mutationFn ? this.options.mutationFn(t) : Promise.reject(new Error("No mutationFn found")),
-      onFail: (s, i) => {
-        this.#r({ type: "failed", failureCount: s, error: i });
+    this.#s = sr({
+      fn: () => this.options.mutationFn ? this.options.mutationFn(t, n) : Promise.reject(new Error("No mutationFn found")),
+      onFail: (i, o) => {
+        this.#r({ type: "failed", failureCount: i, error: o });
       },
       onPause: () => {
         this.#r({ type: "pause" });
@@ -3057,66 +3062,87 @@ var Ci = class extends ir {
       retry: this.options.retry ?? 0,
       retryDelay: this.options.retryDelay,
       networkMode: this.options.networkMode,
-      canRun: () => this.#t.canRun(this)
+      canRun: () => this.#n.canRun(this)
     });
-    const n = this.state.status === "pending", r = !this.#n.canStart();
+    const r = this.state.status === "pending", s = !this.#s.canStart();
     try {
-      if (n)
+      if (r)
         e();
       else {
-        this.#r({ type: "pending", variables: t, isPaused: r }), await this.#t.config.onMutate?.(
+        this.#r({ type: "pending", variables: t, isPaused: s }), await this.#n.config.onMutate?.(
           t,
-          this
+          this,
+          n
+        );
+        const o = await this.options.onMutate?.(
+          t,
+          n
         );
-        const i = await this.options.onMutate?.(t);
-        i !== this.state.context && this.#r({
+        o !== this.state.context && this.#r({
           type: "pending",
-          context: i,
+          context: o,
           variables: t,
-          isPaused: r
+          isPaused: s
         });
       }
-      const s = await this.#n.start();
-      return await this.#t.config.onSuccess?.(
-        s,
+      const i = await this.#s.start();
+      return await this.#n.config.onSuccess?.(
+        i,
         t,
         this.state.context,
-        this
-      ), await this.options.onSuccess?.(s, t, this.state.context), await this.#t.config.onSettled?.(
-        s,
+        this,
+        n
+      ), await this.options.onSuccess?.(
+        i,
+        t,
+        this.state.context,
+        n
+      ), await this.#n.config.onSettled?.(
+        i,
         null,
         this.state.variables,
         this.state.context,
-        this
-      ), await this.options.onSettled?.(s, null, t, this.state.context), this.#r({ type: "success", data: s }), s;
-    } catch (s) {
+        this,
+        n
+      ), await this.options.onSettled?.(
+        i,
+        null,
+        t,
+        this.state.context,
+        n
+      ), this.#r({ type: "success", data: i }), i;
+    } catch (i) {
       try {
-        throw await this.#t.config.onError?.(
-          s,
+        throw await this.#n.config.onError?.(
+          i,
           t,
           this.state.context,
-          this
+          this,
+          n
         ), await this.options.onError?.(
-          s,
+          i,
           t,
-          this.state.context
-        ), await this.#t.config.onSettled?.(
+          this.state.context,
+          n
+        ), await this.#n.config.onSettled?.(
           void 0,
-          s,
+          i,
           this.state.variables,
           this.state.context,
-          this
+          this,
+          n
         ), await this.options.onSettled?.(
           void 0,
-          s,
+          i,
           t,
-          this.state.context
-        ), s;
+          this.state.context,
+          n
+        ), i;
       } finally {
-        this.#r({ type: "error", error: s });
+        this.#r({ type: "error", error: i });
       }
     } finally {
-      this.#t.runNext(this);
+      this.#n.runNext(this);
     }
   }
   #r(t) {
@@ -3174,9 +3200,9 @@ var Ci = class extends ir {
       }
     };
     this.state = e(this.state), q.batch(() => {
-      this.#e.forEach((n) => {
+      this.#t.forEach((n) => {
         n.onMutationUpdate(t);
-      }), this.#t.notify({
+      }), this.#n.notify({
         mutation: this,
         type: "updated",
         action: t
@@ -3206,6 +3232,7 @@ var ur = class extends we {
   #n;
   build(e, n, r) {
     const s = new Ci({
+      client: e,
       mutationCache: this,
       mutationId: ++this.#n,
       options: e.defaultMutationOptions(n),
@@ -3292,9 +3319,9 @@ var Pi = class extends we {
   #e;
   #t = void 0;
   #n;
-  #r;
+  #s;
   constructor(t, e) {
-    super(), this.#e = t, this.setOptions(e), this.bindMethods(), this.#s();
+    super(), this.#e = t, this.setOptions(e), this.bindMethods(), this.#r();
   }
   bindMethods() {
     this.mutate = this.mutate.bind(this), this.reset = this.reset.bind(this);
@@ -3311,18 +3338,18 @@ var Pi = class extends we {
     this.hasListeners() || this.#n?.removeObserver(this);
   }
   onMutationUpdate(t) {
-    this.#s(), this.#o(t);
+    this.#r(), this.#o(t);
   }
   getCurrentResult() {
     return this.#t;
   }
   reset() {
-    this.#n?.removeObserver(this), this.#n = void 0, this.#s(), this.#o();
+    this.#n?.removeObserver(this), this.#n = void 0, this.#r(), this.#o();
   }
   mutate(t, e) {
-    return this.#r = e, this.#n?.removeObserver(this), this.#n = this.#e.getMutationCache().build(this.#e, this.options), this.#n.addObserver(this), this.#n.execute(t);
+    return this.#s = e, this.#n?.removeObserver(this), this.#n = this.#e.getMutationCache().build(this.#e, this.options), this.#n.addObserver(this), this.#n.execute(t);
   }
-  #s() {
+  #r() {
     const t = this.#n?.state ?? ar();
     this.#t = {
       ...t,
@@ -3336,13 +3363,34 @@ var Pi = class extends we {
   }
   #o(t) {
     q.batch(() => {
-      if (this.#r && this.hasListeners()) {
-        const e = this.#t.variables, n = this.#t.context;
-        t?.type === "success" ? (this.#r.onSuccess?.(t.data, e, n), this.#r.onSettled?.(t.data, null, e, n)) : t?.type === "error" && (this.#r.onError?.(t.error, e, n), this.#r.onSettled?.(
+      if (this.#s && this.hasListeners()) {
+        const e = this.#t.variables, n = this.#t.context, r = {
+          client: this.#e,
+          meta: this.options.meta,
+          mutationKey: this.options.mutationKey
+        };
+        t?.type === "success" ? (this.#s.onSuccess?.(
+          t.data,
+          e,
+          n,
+          r
+        ), this.#s.onSettled?.(
+          t.data,
+          null,
+          e,
+          n,
+          r
+        )) : t?.type === "error" && (this.#s.onError?.(
+          t.error,
+          e,
+          n,
+          r
+        ), this.#s.onSettled?.(
           void 0,
           t.error,
           e,
-          n
+          n,
+          r
         ));
       }
       this.listeners.forEach((e) => {
@@ -3425,13 +3473,13 @@ var Pi = class extends we {
   #e;
   #t;
   #n;
-  #r;
   #s;
+  #r;
   #o;
   #a;
   #i;
   constructor(e = {}) {
-    this.#e = e.queryCache || new cr(), this.#t = e.mutationCache || new ur(), this.#n = e.defaultOptions || {}, this.#r = /* @__PURE__ */ new Map(), this.#s = /* @__PURE__ */ new Map(), this.#o = 0;
+    this.#e = e.queryCache || new cr(), this.#t = e.mutationCache || new ur(), this.#n = e.defaultOptions || {}, this.#s = /* @__PURE__ */ new Map(), this.#r = /* @__PURE__ */ new Map(), this.#o = 0;
   }
   mount() {
     this.#o++, this.#o === 1 && (this.#a = _t.subscribe(async (e) => {
@@ -3576,25 +3624,25 @@ var Pi = class extends we {
     this.#n = e;
   }
   setQueryDefaults(e, n) {
-    this.#r.set(le(e), {
+    this.#s.set(le(e), {
       queryKey: e,
       defaultOptions: n
     });
   }
   getQueryDefaults(e) {
-    const n = [...this.#r.values()], r = {};
+    const n = [...this.#s.values()], r = {};
     return n.forEach((s) => {
       Re(e, s.queryKey) && Object.assign(r, s.defaultOptions);
     }), r;
   }
   setMutationDefaults(e, n) {
-    this.#s.set(le(e), {
+    this.#r.set(le(e), {
       mutationKey: e,
       defaultOptions: n
     });
   }
   getMutationDefaults(e) {
-    const n = [...this.#s.values()], r = {};
+    const n = [...this.#r.values()], r = {};
     return n.forEach((s) => {
       Re(e, s.mutationKey) && Object.assign(r, s.defaultOptions);
     }), r;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mhz-helpers",
   "description": "Mhz helpers and composables",
-  "version": "1.2.16",
+  "version": "1.2.18",
   "author": "Alexandr Dergunov <dergunovs@mail.ru> (https://github.com/dergunovs)",
   "license": "MIT",
   "type": "module",
@@ -24,27 +24,27 @@
     "test:cov": "vitest run --coverage"
   },
   "dependencies": {
-    "@tanstack/vue-query": "5.87.4",
+    "@tanstack/vue-query": "5.90.2",
     "@vueuse/core": "13.9.0",
     "@vueuse/integrations": "13.9.0",
     "async-validator": "4.2.5",
     "axios": "1.12.2",
-    "vue": "3.5.21",
+    "vue": "3.5.22",
     "vue-router": "4.5.1"
   },
   "devDependencies": {
-    "@eslint/js": "9.35.0",
-    "@types/node": "24.4.0",
+    "@eslint/js": "9.36.0",
+    "@types/node": "24.5.2",
     "@vitejs/plugin-vue": "6.0.1",
     "@vitest/coverage-istanbul": "3.2.4",
-    "eslint": "9.35.0",
+    "eslint": "9.36.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-import-resolver-typescript": "4.4.4",
     "eslint-plugin-import-x": "4.16.1",
     "eslint-plugin-sonarjs": "3.0.5",
     "eslint-plugin-prettier": "5.5.4",
     "eslint-plugin-unicorn": "61.0.2",
-    "eslint-plugin-vue": "10.4.0",
+    "eslint-plugin-vue": "10.5.0",
     "globals": "16.4.0",
     "happy-dom": "18.0.1",
     "postcss-html": "1.8.0",
@@ -56,16 +56,16 @@
     "stylelint-order": "7.0.0",
     "stylelint-prettier": "5.0.3",
     "typescript": "5.9.2",
-    "typescript-eslint": "8.43.0",
-    "vite": "7.1.5",
+    "typescript-eslint": "8.44.1",
+    "vite": "7.1.7",
     "vite-plugin-dts": "4.5.4",
     "vitest": "3.2.4",
     "vue-eslint-parser": "10.2.0",
     "vue-linters-config": "0.5.4",
-    "vue-tsc": "3.0.7"
+    "vue-tsc": "3.0.8"
   },
   "peerDependencies": {
-    "vue": "3.5.21",
+    "vue": "3.5.22",
     "vue-router": "4.5.1"
   },
   "engines": {