mhz-helpers 1.0.41 → 1.0.43

package/dist/index.js

@@ -2504,7 +2504,7 @@ function vn(t, e) {
   return e;
 }
 function ve(t, e) {
-  if (t && !e || e && !t)
+  if (!e || Object.keys(t).length !== Object.keys(e).length)
     return !1;
   for (const n in t)
     if (t[n] !== e[n])
@@ -2746,9 +2746,6 @@ var T = Zs(), En = class {
     this.#e && (clearTimeout(this.#e), this.#e = void 0);
   }
 }, ei = class extends En {
-  constructor(t) {
-    super(), this.#u = !1, this.#o = t.defaultOptions, this.#c(t.options), this.#i = [], this.#n = t.cache, this.queryKey = t.queryKey, this.queryHash = t.queryHash, this.#e = t.state || ti(this.options), this.state = this.#e, this.scheduleGc();
-  }
   #e;
   #t;
   #n;
@@ -2757,6 +2754,9 @@ var T = Zs(), En = class {
   #i;
   #o;
   #u;
+  constructor(t) {
+    super(), this.#u = !1, this.#o = t.defaultOptions, this.#c(t.options), this.#i = [], this.#n = t.cache, this.queryKey = t.queryKey, this.queryHash = t.queryHash, this.#e = t.state || ti(this.options), this.state = this.#e, this.scheduleGc();
+  }
   get meta() {
     return this.options.meta;
   }
@@ -3073,13 +3073,13 @@ var Sn = class extends re {
     });
   }
 }, ni = class extends En {
-  constructor(t) {
-    super(), this.mutationId = t.mutationId, this.#t = t.defaultOptions, this.#n = t.mutationCache, this.#e = [], this.state = t.state || An(), this.setOptions(t.options), this.scheduleGc();
-  }
   #e;
   #t;
   #n;
   #r;
+  constructor(t) {
+    super(), this.mutationId = t.mutationId, this.#t = t.defaultOptions, this.#n = t.mutationCache, this.#e = [], this.state = t.state || An(), this.setOptions(t.options), this.scheduleGc();
+  }
   setOptions(t) {
     this.options = { ...this.#t, ...t }, this.updateGcTime(this.options.gcTime);
   }
@@ -3432,7 +3432,8 @@ var ii = class {
     return this.#t.findAll({ ...e, status: "pending" }).length;
   }
   getQueryData(e) {
-    return this.#e.find({ queryKey: e })?.state.data;
+    const n = this.defaultQueryOptions({ queryKey: e });
+    return this.#e.get(n.queryHash)?.state.data;
   }
   ensureQueryData(e) {
     const n = this.getQueryData(e.queryKey);
@@ -3445,11 +3446,11 @@ var ii = class {
     });
   }
   setQueryData(e, n, r) {
-    const i = this.#e.find({ queryKey: e })?.state.data, o = Ks(n, i);
-    if (typeof o > "u")
-      return;
-    const a = this.defaultQueryOptions({ queryKey: e });
-    return this.#e.build(this, a).setData(o, { ...r, manual: !0 });
+    const s = this.defaultQueryOptions({ queryKey: e }), o = this.#e.get(
+      s.queryHash
+    )?.state.data, a = Ks(n, o);
+    if (!(typeof a > "u"))
+      return this.#e.build(this, s).setData(a, { ...r, manual: !0 });
   }
   setQueriesData(e, n, r) {
     return T.batch(
@@ -3460,7 +3461,8 @@ var ii = class {
     );
   }
   getQueryState(e) {
-    return this.#e.find({ queryKey: e })?.state;
+    const n = this.defaultQueryOptions({ queryKey: e });
+    return this.#e.get(n.queryHash)?.state;
   }
   removeQueries(e) {
     const n = this.#e;
@@ -3567,11 +3569,11 @@ var ii = class {
     }), r;
   }
   defaultQueryOptions(e) {
-    if (e?._defaulted)
+    if (e._defaulted)
       return e;
     const n = {
       ...this.#n.queries,
-      ...e?.queryKey && this.getQueryDefaults(e.queryKey),
+      ...this.getQueryDefaults(e.queryKey),
       ...e,
       _defaulted: !0
     };
@@ -3639,13 +3641,13 @@ var ii = class {
   }
   setOptions(t, e) {
     const n = this.options, r = this.#t;
-    if (this.options = this.#e.defaultQueryOptions(t), ve(n, this.options) || this.#e.getQueryCache().notify({
+    if (this.options = this.#e.defaultQueryOptions(t), typeof this.options.enabled < "u" && typeof this.options.enabled != "boolean")
+      throw new Error("Expected enabled to be a boolean");
+    this.#w(), ve(this.options, n) || this.#e.getQueryCache().notify({
       type: "observerOptionsUpdated",
       query: this.#t,
       observer: this
-    }), typeof this.options.enabled < "u" && typeof this.options.enabled != "boolean")
-      throw new Error("Expected enabled to be a boolean");
-    this.options.queryKey || (this.options.queryKey = n.queryKey), this.#w();
+    });
     const s = this.hasListeners();
     s && Nt(
       this.#t,
@@ -3858,23 +3860,23 @@ function ui(t, e) {
   return !ve(t.getCurrentResult(), e);
 }
 var ci = class extends re {
-  constructor(t, e) {
-    super(), this.#t = void 0, this.#e = t, this.setOptions(e), this.bindMethods(), this.#s();
-  }
   #e;
-  #t;
+  #t = void 0;
   #n;
   #r;
+  constructor(t, e) {
+    super(), this.#e = t, this.setOptions(e), this.bindMethods(), this.#s();
+  }
   bindMethods() {
     this.mutate = this.mutate.bind(this), this.reset = this.reset.bind(this);
   }
   setOptions(t) {
     const e = this.options;
-    this.options = this.#e.defaultMutationOptions(t), ve(e, this.options) || this.#e.getMutationCache().notify({
+    this.options = this.#e.defaultMutationOptions(t), ve(this.options, e) || this.#e.getMutationCache().notify({
       type: "observerOptionsUpdated",
       mutation: this.#n,
       observer: this
-    }), this.#n?.setOptions(this.options), e?.mutationKey && this.options.mutationKey && G(e.mutationKey) !== G(this.options.mutationKey) && this.reset();
+    }), e?.mutationKey && this.options.mutationKey && G(e.mutationKey) !== G(this.options.mutationKey) ? this.reset() : this.#n?.setOptions(this.options);
   }
   onUnsubscribe() {
     this.hasListeners() || this.#n?.removeObserver(this);
@@ -4088,13 +4090,13 @@ function di() {
   return qn().__VUE_DEVTOOLS_GLOBAL_HOOK__;
 }
 function qn() {
-  return typeof navigator < "u" && typeof window < "u" ? window : typeof global < "u" ? global : {};
+  return typeof navigator < "u" && typeof window < "u" ? window : typeof globalThis < "u" ? globalThis : {};
 }
 const pi = typeof Proxy == "function", yi = "devtools-plugin:setup", mi = "plugin:settings:set";
 let X, Ze;
 function gi() {
   var t;
-  return X !== void 0 || (typeof window < "u" && window.performance ? (X = !0, Ze = window.performance) : typeof global < "u" && (!((t = global.perf_hooks) === null || t === void 0) && t.performance) ? (X = !0, Ze = global.perf_hooks.performance) : X = !1), X;
+  return X !== void 0 || (typeof window < "u" && window.performance ? (X = !0, Ze = window.performance) : typeof globalThis < "u" && (!((t = globalThis.perf_hooks) === null || t === void 0) && t.performance) ? (X = !0, Ze = globalThis.perf_hooks.performance) : X = !1), X;
 }
 function bi() {
   return gi() ? Ze.now() : Date.now();
@@ -4961,7 +4963,7 @@ var so = {
 };
 function Ni(t, e, n) {
   process.env.NODE_ENV === "development" && (kt() || console.warn(
-    'vue-query composables like "useQuery()" should only be used inside a "setup()" function or a running effect scope. They might otherwise lead to memory leaks.'
+    'vue-query composable like "useQuery()" should only be used inside a "setup()" function or a running effect scope. They might otherwise lead to memory leaks.'
   ));
   const r = n || Pn(), s = $(() => {
     const p = E(e);
@@ -5022,7 +5024,7 @@ function io(t, e) {
 }
 function oo(t, e) {
   process.env.NODE_ENV === "development" && (kt() || console.warn(
-    'vue-query composables like "useQuery()" should only be used inside a "setup()" function or a running effect scope. They might otherwise lead to memory leaks.'
+    'vue-query composable like "useQuery()" should only be used inside a "setup()" function or a running effect scope. They might otherwise lead to memory leaks.'
   ));
   const n = e || Pn(), r = $(() => n.defaultMutationOptions(E(t))), s = new ci(n, r.value), i = Bt(s.getCurrentResult()), o = s.subscribe((f) => {
     Xe(i, f);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mhz-helpers",
   "description": "9000 Mhz frontend helpers and composables",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "author": "Alexandr Dergunov <dergunovs@mail.ru> (https://github.com/dergunovs)",
   "license": "MIT",
   "type": "module",
@@ -22,41 +22,41 @@
     "ts": "vue-tsc --noEmit"
   },
   "dependencies": {
-    "@tanstack/vue-query": "5.17.19",
-    "@vueuse/core": "10.7.2",
-    "@vueuse/integrations": "10.7.2",
+    "@tanstack/vue-query": "5.24.1",
+    "@vueuse/core": "10.9.0",
+    "@vueuse/integrations": "10.9.0",
     "async-validator": "4.2.5",
     "axios": "1.6.7",
-    "vue": "3.4.15",
-    "vue-router": "4.2.5"
+    "vue": "3.4.21",
+    "vue-router": "4.3.0"
   },
   "devDependencies": {
-    "@types/node": "20.11.9",
-    "@typescript-eslint/eslint-plugin": "6.19.1",
-    "@typescript-eslint/parser": "6.19.1",
-    "@vitejs/plugin-vue": "5.0.3",
-    "eslint": "8.56.0",
+    "@types/node": "20.11.24",
+    "@typescript-eslint/eslint-plugin": "7.1.0",
+    "@typescript-eslint/parser": "7.1.0",
+    "@vitejs/plugin-vue": "5.0.4",
+    "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-import-resolver-typescript": "3.6.1",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-vue": "9.20.1",
+    "eslint-plugin-vue": "9.22.0",
     "postcss-html": "1.6.0",
-    "prettier": "3.2.4",
-    "stylelint": "16.2.0",
-    "stylelint-config-recess-order": "4.4.0",
+    "prettier": "3.2.5",
+    "stylelint": "16.2.1",
+    "stylelint-config-recess-order": "4.6.0",
     "stylelint-config-recommended-scss": "14.0.0",
     "stylelint-config-recommended-vue": "1.5.0",
     "stylelint-prettier": "5.0.0",
     "typescript": "5.3.3",
-    "vite": "5.0.12",
-    "vite-plugin-dts": "3.7.2",
+    "vite": "5.1.4",
+    "vite-plugin-dts": "3.7.3",
     "vue-linters-config": "0.1.13",
-    "vue-tsc": "1.8.27"
+    "vue-tsc": "2.0.2"
   },
   "peerDependencies": {
-    "vue": "3.4.15",
-    "vue-router": "4.2.5"
+    "vue": "3.4.21",
+    "vue-router": "4.3.0"
   },
   "engines": {
     "npm": ">=10.2.3",