mhz-helpers 1.0.4 → 1.0.5

package/dist/index.js

@@ -1,4 +1,4 @@
-import { computed as V, ref as j, watch as W, unref as ce, toRef as de, readonly as ie, customRef as le, isRef as pe, shallowRef as ye, toRaw as me } from "vue";
+import { computed as V, ref as _, watch as W, unref as ce, toRef as de, readonly as ie, customRef as le, isRef as pe, shallowRef as ye, toRaw as me } from "vue";
 import { useRouter as ae, useRoute as he } from "vue-router";
 function ir(n) {
   const e = V(() => n.value?.data), r = V(() => n.value?.total);
@@ -8,7 +8,7 @@ function ir(n) {
   return { data: e, total: r, setPage: t };
 }
 function ar(n) {
-  const e = ae(), r = he(), t = j({
+  const e = ae(), r = he(), t = _({
     page: Number(r.query.page || 1),
     sort: {
       value: r.query.sort?.toString(),
@@ -38,7 +38,7 @@ function ar(n) {
   ), { query: t, resetQuery: i, setQueryPage: a };
 }
 function fr() {
-  const n = j(1), e = j([]);
+  const n = _(1), e = _([]);
   function r(i) {
     e.value = [...e.value, ...i];
   }
@@ -61,16 +61,16 @@ function ve(...n) {
   if (n.length !== 1)
     return de(...n);
   const e = n[0];
-  return typeof e == "function" ? ie(le(() => ({ get: e, set: ge }))) : j(e);
+  return typeof e == "function" ? ie(le(() => ({ get: e, set: ge }))) : _(e);
 }
 function Z(n, e = !1) {
   function r(d, { flush: m = "sync", deep: w = !1, timeout: q, throwOnTimeout: c } = {}) {
-    let y = null;
-    const O = [new Promise((l) => {
-      y = W(
+    let l = null;
+    const O = [new Promise((p) => {
+      l = W(
         n,
         (h) => {
-          d(h) !== e && (y?.(), l(h));
+          d(h) !== e && (l?.(), p(h));
         },
         {
           flush: m,
@@ -80,15 +80,15 @@ function Z(n, e = !1) {
       );
     })];
     return q != null && O.push(
-      H(q, c).then(() => D(n)).finally(() => y?.())
+      H(q, c).then(() => D(n)).finally(() => l?.())
     ), Promise.race(O);
   }
   function t(d, m) {
     if (!pe(d))
       return r((h) => h === d, m);
-    const { flush: w = "sync", deep: q = !1, timeout: c, throwOnTimeout: y } = m ?? {};
+    const { flush: w = "sync", deep: q = !1, timeout: c, throwOnTimeout: l } = m ?? {};
     let o = null;
-    const l = [new Promise((h) => {
+    const p = [new Promise((h) => {
       o = W(
         [n, d],
         ([b, x]) => {
@@ -101,9 +101,9 @@ function Z(n, e = !1) {
         }
       );
     })];
-    return c != null && l.push(
-      H(c, y).then(() => D(n)).finally(() => (o?.(), D(n)))
-    ), Promise.race(l);
+    return c != null && p.push(
+      H(c, l).then(() => D(n)).finally(() => (o?.(), D(n)))
+    ), Promise.race(p);
   }
   function i(d) {
     return r((m) => !!m, d);
@@ -328,13 +328,13 @@ function Pe(n, e, r, t, i) {
     }), a;
   }
   var f = e.firstFields === !0 ? Object.keys(n) : e.firstFields || [], s = Object.keys(n), u = s.length, v = 0, g = [], d = new Promise(function(m, w) {
-    var q = function(y) {
-      if (g.push.apply(g, y), v++, v === u)
+    var q = function(l) {
+      if (g.push.apply(g, l), v++, v === u)
         return t(g), g.length ? w(new ee(g, Y(g))) : m(i);
     };
     s.length || (t(g), m(i)), s.forEach(function(c) {
-      var y = n[c];
-      f.indexOf(c) !== -1 ? X(y, r, q) : Ae(y, r, q);
+      var l = n[c];
+      f.indexOf(c) !== -1 ? X(l, r, q) : Ae(l, r, q);
     });
   });
   return d.catch(function(m) {
@@ -344,7 +344,7 @@ function Pe(n, e, r, t, i) {
 function Re(n) {
   return !!(n && n.message !== void 0);
 }
-function je(n, e) {
+function _e(n, e) {
   for (var r = n, t = 0; t < e.length; t++) {
     if (r == null)
       return r;
@@ -355,7 +355,7 @@ function je(n, e) {
 function re(n, e) {
   return function(r) {
     var t;
-    return n.fullFields ? t = je(e, n.fullFields) : t = e[r.field || n.fullField], Re(r) ? (r.field = r.field || n.fullField, r.fieldValue = t, r) : {
+    return n.fullFields ? t = _e(e, n.fullFields) : t = e[r.field || n.fullField], Re(r) ? (r.field = r.field || n.fullField, r.fieldValue = t, r) : {
       message: typeof r == "function" ? r() : r,
       fieldValue: t,
       field: r.field || n.fullField
@@ -374,7 +374,7 @@ function te(n, e) {
 }
 var se = function(e, r, t, i, a, f) {
   e.required && (!t.hasOwnProperty(e.field) || F(r, f || e.type)) && i.push(A(a.messages.required, e.fullField));
-}, _e = function(e, r, t, i, a) {
+}, je = function(e, r, t, i, a) {
   (/^\s+$/.test(r) || r === "") && i.push(A(a.messages.whitespace, e.fullField));
 }, U, Te = function() {
   if (U)
@@ -395,12 +395,12 @@ var se = function(e, r, t, i, a, f) {
 `).replace(/\s*\/\/.*$/gm, "").replace(/\n/g, "").trim(), a = new RegExp("(?:^" + r + "$)|(?:^" + i + "$)"), f = new RegExp("^" + r + "$"), s = new RegExp("^" + i + "$"), u = function(h) {
     return h && h.exact ? a : new RegExp("(?:" + e(h) + r + e(h) + ")|(?:" + e(h) + i + e(h) + ")", "g");
   };
-  u.v4 = function(l) {
-    return l && l.exact ? f : new RegExp("" + e(l) + r + e(l), "g");
-  }, u.v6 = function(l) {
-    return l && l.exact ? s : new RegExp("" + e(l) + i + e(l), "g");
+  u.v4 = function(p) {
+    return p && p.exact ? f : new RegExp("" + e(p) + r + e(p), "g");
+  }, u.v6 = function(p) {
+    return p && p.exact ? s : new RegExp("" + e(p) + i + e(p), "g");
   };
-  var v = "(?:(?:[a-z]+:)?//)", g = "(?:\\S+(?::\\S*)?@)?", d = u.v4().source, m = u.v6().source, w = "(?:(?:[a-z\\u00a1-\\uffff0-9][-_]*)*[a-z\\u00a1-\\uffff0-9]+)", q = "(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*", c = "(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))", y = "(?::\\d{2,5})?", o = '(?:[/?#][^\\s"]*)?', O = "(?:" + v + "|www\\.)" + g + "(?:localhost|" + d + "|" + m + "|" + w + q + c + ")" + y + o;
+  var v = "(?:(?:[a-z]+:)?//)", g = "(?:\\S+(?::\\S*)?@)?", d = u.v4().source, m = u.v6().source, w = "(?:(?:[a-z\\u00a1-\\uffff0-9][-_]*)*[a-z\\u00a1-\\uffff0-9]+)", q = "(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*", c = "(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))", l = "(?::\\d{2,5})?", o = '(?:[/?#][^\\s"]*)?', O = "(?:" + v + "|www\\.)" + g + "(?:localhost|" + d + "|" + m + "|" + w + q + c + ")" + l + o;
   return U = new RegExp("(?:^" + O + "$)", "i"), U;
 }, ne = {
   // http://emailregex.com/
@@ -473,9 +473,9 @@ var se = function(e, r, t, i, a, f) {
       f.test(r) || i.push(A(a.messages.pattern.mismatch, e.fullField, r, e.pattern));
     }
   }
-}, p = {
+}, y = {
   required: se,
-  whitespace: _e,
+  whitespace: je,
   type: Ne,
   range: De,
   enum: Ve,
@@ -485,7 +485,7 @@ var se = function(e, r, t, i, a, f) {
   if (s) {
     if (F(r, "string") && !e.required)
       return t();
-    p.required(e, r, i, f, a, "string"), F(r, "string") || (p.type(e, r, i, f, a), p.range(e, r, i, f, a), p.pattern(e, r, i, f, a), e.whitespace === !0 && p.whitespace(e, r, i, f, a));
+    y.required(e, r, i, f, a, "string"), F(r, "string") || (y.type(e, r, i, f, a), y.range(e, r, i, f, a), y.pattern(e, r, i, f, a), e.whitespace === !0 && y.whitespace(e, r, i, f, a));
   }
   t(f);
 }, Me = function(e, r, t, i, a) {
@@ -493,7 +493,7 @@ var se = function(e, r, t, i, a, f) {
   if (s) {
     if (F(r) && !e.required)
       return t();
-    p.required(e, r, i, f, a), r !== void 0 && p.type(e, r, i, f, a);
+    y.required(e, r, i, f, a), r !== void 0 && y.type(e, r, i, f, a);
   }
   t(f);
 }, Be = function(e, r, t, i, a) {
@@ -501,7 +501,7 @@ var se = function(e, r, t, i, a, f) {
   if (s) {
     if (r === "" && (r = void 0), F(r) && !e.required)
       return t();
-    p.required(e, r, i, f, a), r !== void 0 && (p.type(e, r, i, f, a), p.range(e, r, i, f, a));
+    y.required(e, r, i, f, a), r !== void 0 && (y.type(e, r, i, f, a), y.range(e, r, i, f, a));
   }
   t(f);
 }, Ie = function(e, r, t, i, a) {
@@ -509,7 +509,7 @@ var se = function(e, r, t, i, a, f) {
   if (s) {
     if (F(r) && !e.required)
       return t();
-    p.required(e, r, i, f, a), r !== void 0 && p.type(e, r, i, f, a);
+    y.required(e, r, i, f, a), r !== void 0 && y.type(e, r, i, f, a);
   }
   t(f);
 }, Ue = function(e, r, t, i, a) {
@@ -517,7 +517,7 @@ var se = function(e, r, t, i, a, f) {
   if (s) {
     if (F(r) && !e.required)
       return t();
-    p.required(e, r, i, f, a), F(r) || p.type(e, r, i, f, a);
+    y.required(e, r, i, f, a), F(r) || y.type(e, r, i, f, a);
   }
   t(f);
 }, Le = function(e, r, t, i, a) {
@@ -525,7 +525,7 @@ var se = function(e, r, t, i, a, f) {
   if (s) {
     if (F(r) && !e.required)
       return t();
-    p.required(e, r, i, f, a), r !== void 0 && (p.type(e, r, i, f, a), p.range(e, r, i, f, a));
+    y.required(e, r, i, f, a), r !== void 0 && (y.type(e, r, i, f, a), y.range(e, r, i, f, a));
   }
   t(f);
 }, We = function(e, r, t, i, a) {
@@ -533,7 +533,7 @@ var se = function(e, r, t, i, a, f) {
   if (s) {
     if (F(r) && !e.required)
       return t();
-    p.required(e, r, i, f, a), r !== void 0 && (p.type(e, r, i, f, a), p.range(e, r, i, f, a));
+    y.required(e, r, i, f, a), r !== void 0 && (y.type(e, r, i, f, a), y.range(e, r, i, f, a));
   }
   t(f);
 }, Je = function(e, r, t, i, a) {
@@ -541,7 +541,7 @@ var se = function(e, r, t, i, a, f) {
   if (s) {
     if (r == null && !e.required)
       return t();
-    p.required(e, r, i, f, a, "array"), r != null && (p.type(e, r, i, f, a), p.range(e, r, i, f, a));
+    y.required(e, r, i, f, a, "array"), r != null && (y.type(e, r, i, f, a), y.range(e, r, i, f, a));
   }
   t(f);
 }, Ze = function(e, r, t, i, a) {
@@ -549,7 +549,7 @@ var se = function(e, r, t, i, a, f) {
   if (s) {
     if (F(r) && !e.required)
       return t();
-    p.required(e, r, i, f, a), r !== void 0 && p.type(e, r, i, f, a);
+    y.required(e, r, i, f, a), r !== void 0 && y.type(e, r, i, f, a);
   }
   t(f);
 }, Ce = "enum", Qe = function(e, r, t, i, a) {
@@ -557,7 +557,7 @@ var se = function(e, r, t, i, a, f) {
   if (s) {
     if (F(r) && !e.required)
       return t();
-    p.required(e, r, i, f, a), r !== void 0 && p[Ce](e, r, i, f, a);
+    y.required(e, r, i, f, a), r !== void 0 && y[Ce](e, r, i, f, a);
   }
   t(f);
 }, Ye = function(e, r, t, i, a) {
@@ -565,7 +565,7 @@ var se = function(e, r, t, i, a, f) {
   if (s) {
     if (F(r, "string") && !e.required)
       return t();
-    p.required(e, r, i, f, a), F(r, "string") || p.pattern(e, r, i, f, a);
+    y.required(e, r, i, f, a), F(r, "string") || y.pattern(e, r, i, f, a);
   }
   t(f);
 }, ze = function(e, r, t, i, a) {
@@ -573,21 +573,21 @@ var se = function(e, r, t, i, a, f) {
   if (s) {
     if (F(r, "date") && !e.required)
       return t();
-    if (p.required(e, r, i, f, a), !F(r, "date")) {
+    if (y.required(e, r, i, f, a), !F(r, "date")) {
       var u;
-      r instanceof Date ? u = r : u = new Date(r), p.type(e, u, i, f, a), u && p.range(e, u.getTime(), i, f, a);
+      r instanceof Date ? u = r : u = new Date(r), y.type(e, u, i, f, a), u && y.range(e, u.getTime(), i, f, a);
     }
   }
   t(f);
 }, Ge = function(e, r, t, i, a) {
   var f = [], s = Array.isArray(r) ? "array" : typeof r;
-  p.required(e, r, i, f, a, s), t(f);
+  y.required(e, r, i, f, a, s), t(f);
 }, J = function(e, r, t, i, a) {
   var f = e.type, s = [], u = e.required || !e.required && i.hasOwnProperty(e.field);
   if (u) {
     if (F(r, f) && !e.required)
       return t();
-    p.required(e, r, i, s, a, f), F(r, f) || p.type(e, r, i, s, a);
+    y.required(e, r, i, s, a, f), F(r, f) || y.type(e, r, i, s, a);
   }
   t(s);
 }, Ke = function(e, r, t, i, a) {
@@ -595,7 +595,7 @@ var se = function(e, r, t, i, a, f) {
   if (s) {
     if (F(r) && !e.required)
       return t();
-    p.required(e, r, i, f, a);
+    y.required(e, r, i, f, a);
   }
   t(f);
 }, B = {
@@ -695,17 +695,17 @@ var G = z(), $ = /* @__PURE__ */ function() {
     if (typeof u == "function" && (v = u, u = {}), !this.rules || Object.keys(this.rules).length === 0)
       return v && v(null, s), Promise.resolve(s);
     function g(c) {
-      var y = [], o = {};
+      var l = [], o = {};
       function O(h) {
         if (Array.isArray(h)) {
           var b;
-          y = (b = y).concat.apply(b, h);
+          l = (b = l).concat.apply(b, h);
         } else
-          y.push(h);
+          l.push(h);
       }
-      for (var l = 0; l < c.length; l++)
-        O(c[l]);
-      y.length ? (o = Y(y), v(y, o)) : v(null, s);
+      for (var p = 0; p < c.length; p++)
+        O(c[p]);
+      l.length ? (o = Y(l), v(l, o)) : v(null, s);
     }
     if (u.messages) {
       var d = this.messages();
@@ -714,13 +714,13 @@ var G = z(), $ = /* @__PURE__ */ function() {
       u.messages = this.messages();
     var m = {}, w = u.keys || Object.keys(this.rules);
     w.forEach(function(c) {
-      var y = f.rules[c], o = s[c];
-      y.forEach(function(O) {
-        var l = O;
-        typeof l.transform == "function" && (s === t && (s = T({}, s)), o = s[c] = l.transform(o)), typeof l == "function" ? l = {
-          validator: l
-        } : l = T({}, l), l.validator = f.getValidationMethod(l), l.validator && (l.field = c, l.fullField = l.fullField || c, l.type = f.getType(l), m[c] = m[c] || [], m[c].push({
-          rule: l,
+      var l = f.rules[c], o = s[c];
+      l.forEach(function(O) {
+        var p = O;
+        typeof p.transform == "function" && (s === t && (s = T({}, s)), o = s[c] = p.transform(o)), typeof p == "function" ? p = {
+          validator: p
+        } : p = T({}, p), p.validator = f.getValidationMethod(p), p.validator && (p.field = c, p.fullField = p.fullField || c, p.type = f.getType(p), m[c] = m[c] || [], m[c].push({
+          rule: p,
           value: o,
           source: s,
           field: c
@@ -728,27 +728,27 @@ var G = z(), $ = /* @__PURE__ */ function() {
       });
     });
     var q = {};
-    return Pe(m, u, function(c, y) {
+    return Pe(m, u, function(c, l) {
       var o = c.rule, O = (o.type === "object" || o.type === "array") && (typeof o.fields == "object" || typeof o.defaultField == "object");
       O = O && (o.required || !o.required && c.value), o.field = c.field;
-      function l(x, _) {
-        return T({}, _, {
+      function p(x, j) {
+        return T({}, j, {
           fullField: o.fullField + "." + x,
           fullFields: o.fullFields ? [].concat(o.fullFields, [x]) : [x]
         });
       }
       function h(x) {
         x === void 0 && (x = []);
-        var _ = Array.isArray(x) ? x : [x];
-        !u.suppressWarning && _.length && n.warning("async-validator:", _), _.length && o.message !== void 0 && (_ = [].concat(o.message));
-        var P = _.map(re(o, s));
+        var j = Array.isArray(x) ? x : [x];
+        !u.suppressWarning && j.length && n.warning("async-validator:", j), j.length && o.message !== void 0 && (j = [].concat(o.message));
+        var P = j.map(re(o, s));
         if (u.first && P.length)
-          return q[o.field] = 1, y(P);
+          return q[o.field] = 1, l(P);
         if (!O)
-          y(P);
+          l(P);
         else {
           if (o.required && !c.value)
-            return o.message !== void 0 ? P = [].concat(o.message).map(re(o, s)) : u.error && (P = [u.error(o, A(u.messages.required, o.field))]), y(P);
+            return o.message !== void 0 ? P = [].concat(o.message).map(re(o, s)) : u.error && (P = [u.error(o, A(u.messages.required, o.field))]), l(P);
           var S = {};
           o.defaultField && Object.keys(c.value).map(function(R) {
             S[R] = o.defaultField;
@@ -756,12 +756,12 @@ var G = z(), $ = /* @__PURE__ */ function() {
           var K = {};
           Object.keys(S).forEach(function(R) {
             var E = S[R], ue = Array.isArray(E) ? E : [E];
-            K[R] = ue.map(l.bind(null, R));
+            K[R] = ue.map(p.bind(null, R));
           });
           var k = new n(K);
           k.messages(u.messages), c.rule.options && (c.rule.options.messages = u.messages, c.rule.options.error = u.error), k.validate(c.value, c.rule.options || u, function(R) {
             var E = [];
-            P && P.length && E.push.apply(E, P), R && R.length && E.push.apply(E, R), y(E.length ? E : null);
+            P && P.length && E.push.apply(E, P), R && R.length && E.push.apply(E, R), l(E.length ? E : null);
           });
         }
       }
@@ -811,12 +811,18 @@ function He(n, e, r = {}) {
     validateOption: t = {},
     immediate: i = !0,
     manual: a = !1
-  } = r, f = ve(n), s = ye(null), u = j(!0), v = j(!i || a), g = V(() => s.value?.errors || []), d = V(() => s.value?.fields || {}), m = V(() => new ke(D(e))), w = async () => {
+  } = r, f = ve(n), s = ye(null), u = _(!0), v = _(!i || a), g = V(() => {
+    var l;
+    return ((l = s.value) == null ? void 0 : l.errors) || [];
+  }), d = V(() => {
+    var l;
+    return ((l = s.value) == null ? void 0 : l.fields) || {};
+  }), m = V(() => new ke(D(e))), w = async () => {
     u.value = !1, v.value = !1;
     try {
       await m.value.validate(f.value, t), v.value = !0, s.value = null;
-    } catch (y) {
-      s.value = y;
+    } catch (l) {
+      s.value = l;
     } finally {
       u.value = !0;
     }
@@ -841,21 +847,21 @@ function He(n, e, r = {}) {
     execute: w
   };
   function c() {
-    return new Promise((y, o) => {
-      we(u).toBe(!0).then(() => y(q)).catch((O) => o(O));
+    return new Promise((l, o) => {
+      we(u).toBe(!0).then(() => l(q)).catch((O) => o(O));
     });
   }
   return {
     ...q,
-    then(y, o) {
-      return c().then(y, o);
+    then(l, o) {
+      return c().then(l, o);
     }
   };
 }
 function sr(n, e) {
   const { errorFields: r, isFinished: t, pass: i } = He(n, e, {
     validateOption: { suppressWarning: !0 }
-  }), a = j(0);
+  }), a = _(0);
   function f() {
     return a.value++, i.value && t.value;
   }
@@ -869,7 +875,7 @@ function sr(n, e) {
     isValid: f
   };
 }
-const oe = j(!1), or = ie(oe);
+const oe = _(!1), or = ie(oe);
 function Xe(n) {
   oe.value = n;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mhz-helpers",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "mhz-helpers",
   "author": "dergunov.com",
   "type": "module",
@@ -16,14 +16,14 @@
     "ts": "vue-tsc --noEmit"
   },
   "dependencies": {
-    "@vueuse/core": "10.4.0",
-    "@vueuse/integrations": "10.4.0",
+    "@vueuse/core": "10.4.1",
+    "@vueuse/integrations": "10.4.1",
     "async-validator": "4.2.5",
     "vue": "3.3.4",
     "vue-router": "4.2.4"
   },
   "devDependencies": {
-    "@types/node": "20.5.6",
+    "@types/node": "20.5.7",
     "@typescript-eslint/eslint-plugin": "6.4.1",
     "@typescript-eslint/parser": "6.4.1",
     "@vitejs/plugin-vue": "4.3.3",