@ozdao/prometheus-framework 0.2.30 → 0.2.32

package/dist/node_modules/web3-validator/lib/esm/utils.js

@@ -1,25 +1,25 @@
-import { InvalidNumberError as N, InvalidBytesError as W } from "../../../web3-errors/lib/esm/errors/utils_errors.js";
+import { InvalidNumberError as _, InvalidBytesError as x } from "../../../web3-errors/lib/esm/errors/utils_errors.js";
 import "../../../web3-errors/lib/esm/errors/rpc_errors.js";
-import { VALID_ETH_BASE_TYPES as z } from "./constants.js";
-import { isAbiParameterSchema as T } from "./validation/abi.js";
-import { isHexStrict as u } from "./validation/string.js";
-import { Web3ValidatorError as A } from "./errors.js";
-const _ = ["hex", "number", "blockNumber", "blockNumberOrTag", "filter", "bloom"], d = (e) => {
-  let t = e.replace(/ /, ""), s, r = !1, i = [];
-  if (e.includes("[") && (t = t.slice(0, t.indexOf("[")), i = [...e.matchAll(/(?:\[(\d*)\])/g)].map((n) => parseInt(n[1], 10)).map((n) => Number.isNaN(n) ? -1 : n), r = i.length > 0), z.includes(t))
-    return { baseType: t, isArray: r, baseTypeSize: s, arraySizes: i };
+import { VALID_ETH_BASE_TYPES as C } from "./constants.js";
+import { isAbiParameterSchema as w } from "./validation/abi.js";
+import { isHexStrict as b } from "./validation/string.js";
+import { Web3ValidatorError as S } from "./errors.js";
+const B = ["hex", "number", "blockNumber", "blockNumberOrTag", "filter", "bloom"], I = (e) => {
+  let t = e.replace(/ /, ""), i, r = !1, s = [];
+  if (e.includes("[") && (t = t.slice(0, t.indexOf("[")), s = [...e.matchAll(/(?:\[(\d*)\])/g)].map((n) => parseInt(n[1], 10)).map((n) => Number.isNaN(n) ? -1 : n), r = s.length > 0), C.includes(t))
+    return { baseType: t, isArray: r, baseTypeSize: i, arraySizes: s };
   if (t.startsWith("int"))
-    s = parseInt(t.substring(3), 10), t = "int";
+    i = parseInt(t.substring(3), 10), t = "int";
   else if (t.startsWith("uint"))
-    s = parseInt(e.substring(4), 10), t = "uint";
+    i = parseInt(e.substring(4), 10), t = "uint";
   else if (t.startsWith("bytes"))
-    s = parseInt(t.substring(5), 10), t = "bytes";
+    i = parseInt(t.substring(5), 10), t = "bytes";
   else
-    return { baseType: void 0, isArray: !1, baseTypeSize: void 0, arraySizes: i };
-  return { baseType: t, isArray: r, baseTypeSize: s, arraySizes: i };
-}, b = (e, t = {}) => {
+    return { baseType: void 0, isArray: !1, baseTypeSize: void 0, arraySizes: s };
+  return { baseType: t, isArray: r, baseTypeSize: i, arraySizes: s };
+}, d = (e, t = {}) => {
   if (Object.keys(t).includes("type"))
-    throw new A([
+    throw new S([
       {
         keyword: "eth",
         message: 'Either "eth" or "type" can be presented in schema',
@@ -28,9 +28,9 @@ const _ = ["hex", "number", "blockNumber", "blockNumberOrTag", "filter", "bloom"
         schemaPath: ""
       }
     ]);
-  const { baseType: r, baseTypeSize: i } = d(e);
-  if (!r && !_.includes(e))
-    throw new A([
+  const { baseType: r, baseTypeSize: s } = I(e);
+  if (!r && !B.includes(e))
+    throw new S([
       {
         keyword: "eth",
         message: `Eth data type "${e}" is not valid`,
@@ -42,78 +42,78 @@ const _ = ["hex", "number", "blockNumber", "blockNumberOrTag", "filter", "bloom"
   if (r) {
     if (r === "tuple")
       throw new Error('"tuple" type is not implemented directly.');
-    return { format: `${r}${i ?? ""}`, required: !0 };
+    return { format: `${r}${s ?? ""}`, required: !0 };
   }
   return e ? { format: e, required: !0 } : {};
-}, I = (e, t = "/0") => {
-  const s = {
+}, A = (e, t = "/0") => {
+  const i = {
     type: "array",
     items: [],
     maxItems: e.length,
     minItems: e.length
   };
-  for (const [r, i] of e.entries()) {
-    let n, m, c = [];
-    T(i) ? (n = i.type, m = i.name, c = i.components) : typeof i == "string" ? (n = i, m = `${t}/${r}`) : Array.isArray(i) && (i[0] && typeof i[0] == "string" && i[0].startsWith("tuple") && !Array.isArray(i[0]) && i[1] && Array.isArray(i[1]) ? (n = i[0], m = `${t}/${r}`, c = i[1]) : (n = "tuple", m = `${t}/${r}`, c = i));
-    const { baseType: p, isArray: y, arraySizes: h } = d(n);
-    let f, a = s;
-    for (let o = h.length - 1; o > 0; o -= 1)
-      f = {
+  for (const [r, s] of e.entries()) {
+    let n, o, f = [];
+    w(s) ? (n = s.type, o = s.name, f = s.components) : typeof s == "string" ? (n = s, o = `${t}/${r}`) : Array.isArray(s) && (s[0] && typeof s[0] == "string" && s[0].startsWith("tuple") && !Array.isArray(s[0]) && s[1] && Array.isArray(s[1]) ? (n = s[0], o = `${t}/${r}`, f = s[1]) : (n = "tuple", o = `${t}/${r}`, f = s));
+    const { baseType: p, isArray: h, arraySizes: c } = I(n);
+    let l, a = i;
+    for (let m = c.length - 1; m > 0; m -= 1)
+      l = {
         type: "array",
         items: [],
-        maxItems: h[o],
-        minItems: h[o]
-      }, h[o] < 0 && (delete f.maxItems, delete f.minItems), Array.isArray(a.items) ? a.items.length === 0 ? a.items = f : a.items.push(f) : a.items = [a.items, f], a = f;
-    if (p === "tuple" && !y) {
-      const o = I(c, m);
-      o.$id = m, a.items.push(o);
-    } else if (p === "tuple" && y) {
-      const o = h[0], l = {
-        $id: m,
+        maxItems: c[m],
+        minItems: c[m]
+      }, c[m] < 0 && (delete l.maxItems, delete l.minItems), Array.isArray(a.items) ? a.items.length === 0 ? a.items = l : a.items.push(l) : a.items = [a.items, l], a = l;
+    if (p === "tuple" && !h) {
+      const m = A(f, o);
+      m.$id = o, a.items.push(m);
+    } else if (p === "tuple" && h) {
+      const m = c[0], u = {
+        $id: o,
         type: "array",
-        items: I(c, m),
-        maxItems: o,
-        minItems: o
+        items: A(f, o),
+        maxItems: m,
+        minItems: m
       };
-      o < 0 && (delete l.maxItems, delete l.minItems), a.items.push(l);
-    } else if (y) {
-      const o = h[0], l = {
+      m < 0 && (delete u.maxItems, delete u.minItems), a.items.push(u);
+    } else if (h) {
+      const m = c[0], u = {
         type: "array",
-        $id: m,
-        items: b(String(p)),
-        minItems: o,
-        maxItems: o
+        $id: o,
+        items: d(String(p)),
+        minItems: m,
+        maxItems: m
       };
-      o < 0 && (delete l.maxItems, delete l.minItems), a.items.push(l);
+      m < 0 && (delete u.maxItems, delete u.minItems), a.items.push(u);
     } else
-      Array.isArray(a.items) ? a.items.push(Object.assign({ $id: m }, b(n))) : a.items.items.push(Object.assign({ $id: m }, b(n)));
-    a = s;
+      Array.isArray(a.items) ? a.items.push(Object.assign({ $id: o }, d(n))) : a.items.items.push(Object.assign({ $id: o }, d(n)));
+    a = i;
   }
-  return s;
-}, L = (e) => I(e), S = (e, t) => t === 1 ? e : S(e[0], t - 1), g = (e, t, s) => {
+  return i;
+}, H = (e) => A(e), E = (e, t) => t === 1 ? e : E(e[0], t - 1), g = (e, t, i) => {
   const r = [];
-  for (const [i, n] of e.entries()) {
-    let m, c, p = [];
-    T(n) ? (m = n.type, c = n.name, p = n.components) : typeof n == "string" ? m = n : Array.isArray(n) && (n[1] && Array.isArray(n[1]) ? (m = n[0], p = n[1]) : (m = "tuple", p = n));
-    const { baseType: y, isArray: h, arraySizes: f } = d(m), a = Array.isArray(t) ? t[i] : t[c];
-    if (y === "tuple" && !h)
-      r.push(g(p, a, s));
-    else if (y === "tuple" && h) {
-      const o = [];
-      for (const l of a)
-        if (f.length > 1) {
-          const w = S(l, f.length - 1), x = [];
-          for (const E of w)
-            x.push(g(p, E, s));
-          o.push(x);
+  for (const [s, n] of e.entries()) {
+    let o, f, p = [];
+    w(n) ? (o = n.type, f = n.name, p = n.components) : typeof n == "string" ? o = n : Array.isArray(n) && (n[1] && Array.isArray(n[1]) ? (o = n[0], p = n[1]) : (o = "tuple", p = n));
+    const { baseType: h, isArray: c, arraySizes: l } = I(o), a = Array.isArray(t) ? t[s] : t[f];
+    if (h === "tuple" && !c)
+      r.push(g(p, a, i));
+    else if (h === "tuple" && c) {
+      const m = [];
+      for (const u of a)
+        if (l.length > 1) {
+          const z = E(u, l.length - 1), T = [];
+          for (const W of z)
+            T.push(g(p, W, i));
+          m.push(T);
         } else
-          o.push(g(p, l, s));
-      r.push(o);
+          m.push(g(p, u, i));
+      r.push(m);
     } else
       r.push(a);
   }
-  return s = s ?? [], s.push(...r), s;
-}, j = (e) => {
+  return i = i ?? [], i.push(...r), i;
+}, L = (e) => {
   if (e >= 48 && e <= 57)
     return e - 48;
   if (e >= 65 && e <= 70)
@@ -121,58 +121,81 @@ const _ = ["hex", "number", "blockNumber", "blockNumberOrTag", "filter", "bloom"
   if (e >= 97 && e <= 102)
     return e - 87;
   throw new Error(`Invalid code point: ${e}`);
-}, F = (e) => {
-  if (!u(e))
+}, q = (e) => {
+  if (!b(e))
     throw new Error("Invalid hex string");
-  const [t, s] = e.startsWith("-") ? [!0, e.slice(1)] : [!1, e], r = BigInt(s);
+  const [t, i] = e.startsWith("-") ? [!0, e.slice(1)] : [!1, e], r = BigInt(i);
   return r > Number.MAX_SAFE_INTEGER ? t ? -r : r : r < Number.MIN_SAFE_INTEGER ? r : t ? -1 * Number(r) : Number(r);
-}, $ = (e) => {
+}, N = (e) => {
   if ((typeof e == "number" || typeof e == "bigint") && e < 0)
     return `-0x${e.toString(16).slice(1)}`;
   if ((typeof e == "number" || typeof e == "bigint") && e >= 0)
     return `0x${e.toString(16)}`;
-  if (typeof e == "string" && u(e)) {
-    const [t, s] = e.startsWith("-") ? [!0, e.slice(1)] : [!1, e], r = s.split(/^(-)?0(x|X)/).slice(-1)[0];
+  if (typeof e == "string" && b(e)) {
+    const [t, i] = e.startsWith("-") ? [!0, e.slice(1)] : [!1, e], r = i.split(/^(-)?0(x|X)/).slice(-1)[0];
     return `${t ? "-" : ""}0x${r.replace(/^0+/, "").toLowerCase()}`;
   }
-  if (typeof e == "string" && !u(e))
-    return $(BigInt(e));
-  throw new N(e);
-}, J = (e, t, s = "0") => {
-  if (typeof e == "string" && !u(e))
-    return e.padStart(t, s);
-  const r = typeof e == "string" && u(e) ? e : $(e), [i, n] = r.startsWith("-") ? ["-0x", r.slice(3)] : ["0x", r.slice(2)];
-  return `${i}${n.padStart(t, s)}`;
+  if (typeof e == "string" && !b(e))
+    return N(BigInt(e));
+  throw new _(e);
+}, J = (e, t, i = "0") => {
+  if (typeof e == "string" && !b(e))
+    return e.padStart(t, i);
+  const r = typeof e == "string" && b(e) ? e : N(e), [s, n] = r.startsWith("-") ? ["-0x", r.slice(3)] : ["0x", r.slice(2)];
+  return `${s}${n.padStart(t, i)}`;
 };
 function M(e) {
   let t = "0x";
-  for (const s of e) {
-    const r = s.toString(16);
+  for (const i of e) {
+    const r = i.toString(16);
     t += r.length === 1 ? `0${r}` : r;
   }
   return t;
 }
-function q(e) {
-  let t;
-  if (e.toLowerCase().startsWith("0x") ? t = e.slice(2) : t = e, t.length % 2 !== 0)
-    throw new W(`hex string has odd length: ${e}`);
-  const s = new Uint8Array(Math.ceil(t.length / 2));
-  for (let r = 0; r < s.length; r += 1) {
-    const i = parseInt(t.substring(r * 2, r * 2 + 2), 16);
-    s[r] = i;
+const y = {
+  zero: 48,
+  nine: 57,
+  A: 65,
+  F: 70,
+  a: 97,
+  f: 102
+};
+function $(e) {
+  if (e >= y.zero && e <= y.nine)
+    return e - y.zero;
+  if (e >= y.A && e <= y.F)
+    return e - (y.A - 10);
+  if (e >= y.a && e <= y.f)
+    return e - (y.a - 10);
+}
+function R(e) {
+  let t = 0;
+  if (e.startsWith("0") && (e[1] === "x" || e[1] === "X") && (t = 2), e.length % 2 !== 0)
+    throw new x(`hex string has odd length: ${e}`);
+  const i = (e.length - t) / 2, r = new Uint8Array(i);
+  for (let s = 0, n = t; s < i; s += 1) {
+    const o = $(e.charCodeAt(n++)), f = $(e.charCodeAt(n++));
+    if (o === void 0 || f === void 0)
+      throw new x(`Invalid byte sequence ("${e[n - 2]}${e[n - 1]}" in "${e}").`);
+    r[s] = o * 16 + f;
   }
-  return s;
+  return r;
+}
+function X(e) {
+  var t;
+  return !(e instanceof Uint8Array) && ((t = e == null ? void 0 : e.constructor) === null || t === void 0 ? void 0 : t.name) === "Uint8Array" ? Uint8Array.from(e) : e;
 }
 export {
-  I as abiSchemaToJsonSchema,
-  j as codePointToInt,
-  L as ethAbiToJsonSchema,
-  S as fetchArrayElement,
-  F as hexToNumber,
-  q as hexToUint8Array,
-  $ as numberToHex,
+  A as abiSchemaToJsonSchema,
+  L as codePointToInt,
+  X as ensureIfUint8Array,
+  H as ethAbiToJsonSchema,
+  E as fetchArrayElement,
+  q as hexToNumber,
+  R as hexToUint8Array,
+  N as numberToHex,
   J as padLeft,
-  d as parseBaseType,
+  I as parseBaseType,
   g as transformJsonDataToAbiFormat,
   M as uint8ArrayToHexString
 };

package/dist/node_modules/web3-validator/lib/esm/validation/address.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../../../ethereum-cryptography/esm/keccak.cjs"),n=require("../utils.cjs"),f=require("./string.cjs"),a=require("../../../../@noble/hashes/esm/utils.cjs"),o=e=>{if(!/^(0x)?[0-9a-f]{40}$/i.test(e))return!1;const s=e.slice(2),t=a.utf8ToBytes(s.toLowerCase()),i=n.uint8ArrayToHexString(c.keccak256(t)).slice(2);for(let r=0;r<40;r+=1)if(parseInt(i[r],16)>7&&s[r].toUpperCase()!==s[r]||parseInt(i[r],16)<=7&&s[r].toLowerCase()!==s[r])return!1;return!0},u=(e,s=!0)=>{if(typeof e!="string"&&!(e instanceof Uint8Array))return!1;let t;return e instanceof Uint8Array?t=n.uint8ArrayToHexString(e):typeof e=="string"&&!f.isHexStrict(e)?t=e.toLowerCase().startsWith("0x")?e:`0x${e}`:t=e,/^(0x)?[0-9a-f]{40}$/i.test(t)?/^(0x|0X)?[0-9a-f]{40}$/.test(t)||/^(0x|0X)?[0-9A-F]{40}$/.test(t)?!0:s?o(t):!0:!1};exports.checkAddressCheckSum=o;exports.isAddress=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../../../../ethereum-cryptography/esm/keccak.cjs"),i=require("../utils.cjs"),u=require("./string.cjs"),o=require("./bytes.cjs"),a=require("../../../../@noble/hashes/esm/utils.cjs"),c=e=>{if(!/^(0x)?[0-9a-f]{40}$/i.test(e))return!1;const s=e.slice(2),t=a.utf8ToBytes(s.toLowerCase()),n=i.uint8ArrayToHexString(f.keccak256(i.ensureIfUint8Array(t))).slice(2);for(let r=0;r<40;r+=1)if(parseInt(n[r],16)>7&&s[r].toUpperCase()!==s[r]||parseInt(n[r],16)<=7&&s[r].toLowerCase()!==s[r])return!1;return!0},d=(e,s=!0)=>{if(typeof e!="string"&&!o.isUint8Array(e))return!1;let t;return o.isUint8Array(e)?t=i.uint8ArrayToHexString(e):typeof e=="string"&&!u.isHexStrict(e)?t=e.toLowerCase().startsWith("0x")?e:`0x${e}`:t=e,/^(0x)?[0-9a-f]{40}$/i.test(t)?/^(0x|0X)?[0-9a-f]{40}$/.test(t)||/^(0x|0X)?[0-9A-F]{40}$/.test(t)?!0:s?c(t):!0:!1};exports.checkAddressCheckSum=c;exports.isAddress=d;

package/dist/node_modules/web3-validator/lib/esm/validation/address.js

@@ -1,22 +1,23 @@
-import { keccak256 as f } from "../../../../ethereum-cryptography/esm/keccak.js";
-import { uint8ArrayToHexString as i } from "../utils.js";
-import { isHexStrict as n } from "./string.js";
-import { utf8ToBytes as a } from "../../../../@noble/hashes/esm/utils.js";
-const c = (t) => {
+import { keccak256 as n } from "../../../../ethereum-cryptography/esm/keccak.js";
+import { uint8ArrayToHexString as f, ensureIfUint8Array as a } from "../utils.js";
+import { isHexStrict as c } from "./string.js";
+import { isUint8Array as i } from "./bytes.js";
+import { utf8ToBytes as p } from "../../../../@noble/hashes/esm/utils.js";
+const m = (t) => {
   if (!/^(0x)?[0-9a-f]{40}$/i.test(t))
     return !1;
-  const s = t.slice(2), r = a(s.toLowerCase()), o = i(f(r)).slice(2);
+  const s = t.slice(2), r = p(s.toLowerCase()), o = f(n(a(r))).slice(2);
   for (let e = 0; e < 40; e += 1)
     if (parseInt(o[e], 16) > 7 && s[e].toUpperCase() !== s[e] || parseInt(o[e], 16) <= 7 && s[e].toLowerCase() !== s[e])
       return !1;
   return !0;
-}, u = (t, s = !0) => {
-  if (typeof t != "string" && !(t instanceof Uint8Array))
+}, C = (t, s = !0) => {
+  if (typeof t != "string" && !i(t))
     return !1;
   let r;
-  return t instanceof Uint8Array ? r = i(t) : typeof t == "string" && !n(t) ? r = t.toLowerCase().startsWith("0x") ? t : `0x${t}` : r = t, /^(0x)?[0-9a-f]{40}$/i.test(r) ? /^(0x|0X)?[0-9a-f]{40}$/.test(r) || /^(0x|0X)?[0-9A-F]{40}$/.test(r) ? !0 : s ? c(r) : !0 : !1;
+  return i(t) ? r = f(t) : typeof t == "string" && !c(t) ? r = t.toLowerCase().startsWith("0x") ? t : `0x${t}` : r = t, /^(0x)?[0-9a-f]{40}$/i.test(r) ? /^(0x|0X)?[0-9a-f]{40}$/.test(r) || /^(0x|0X)?[0-9A-F]{40}$/.test(r) ? !0 : s ? m(r) : !0 : !1;
 };
 export {
-  c as checkAddressCheckSum,
-  u as isAddress
+  m as checkAddressCheckSum,
+  C as isAddress
 };

package/dist/node_modules/web3-validator/lib/esm/validation/bytes.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../utils.cjs"),n=require("./string.cjs"),y=(r,e={abiType:"bytes"})=>{if(typeof r!="string"&&!Array.isArray(r)&&!(r instanceof Uint8Array)||typeof r=="string"&&n.isHexStrict(r)&&r.startsWith("-")||typeof r=="string"&&!n.isHexStrict(r))return!1;let i;if(typeof r=="string"){if(r.length%2!==0)return!1;i=s.hexToUint8Array(r)}else if(Array.isArray(r)){if(r.some(t=>t<0||t>255||!Number.isInteger(t)))return!1;i=new Uint8Array(r)}else i=r;if(e!=null&&e.abiType){const{baseTypeSize:t}=s.parseBaseType(e.abiType);return t?i.length===t:!0}return e!=null&&e.size?i.length===(e==null?void 0:e.size):!0};exports.isBytes=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../utils.cjs"),n=require("./string.cjs"),y=r=>{var e;return r instanceof Uint8Array||((e=r==null?void 0:r.constructor)===null||e===void 0?void 0:e.name)==="Uint8Array"},f=(r,e={abiType:"bytes"})=>{if(typeof r!="string"&&!Array.isArray(r)&&!y(r)||typeof r=="string"&&n.isHexStrict(r)&&r.startsWith("-")||typeof r=="string"&&!n.isHexStrict(r))return!1;let t;if(typeof r=="string"){if(r.length%2!==0)return!1;t=s.hexToUint8Array(r)}else if(Array.isArray(r)){if(r.some(i=>i<0||i>255||!Number.isInteger(i)))return!1;t=new Uint8Array(r)}else t=r;if(e!=null&&e.abiType){const{baseTypeSize:i}=s.parseBaseType(e.abiType);return i?t.length===i:!0}return e!=null&&e.size?t.length===(e==null?void 0:e.size):!0};exports.isBytes=f;exports.isUint8Array=y;

package/dist/node_modules/web3-validator/lib/esm/validation/bytes.js

@@ -1,27 +1,31 @@
-import { hexToUint8Array as s, parseBaseType as n } from "../utils.js";
-import { isHexStrict as f } from "./string.js";
-const a = (r, e = {
+import { hexToUint8Array as s, parseBaseType as f } from "../utils.js";
+import { isHexStrict as n } from "./string.js";
+const y = (r) => {
+  var e;
+  return r instanceof Uint8Array || ((e = r == null ? void 0 : r.constructor) === null || e === void 0 ? void 0 : e.name) === "Uint8Array";
+}, c = (r, e = {
   abiType: "bytes"
 }) => {
-  if (typeof r != "string" && !Array.isArray(r) && !(r instanceof Uint8Array) || typeof r == "string" && f(r) && r.startsWith("-") || typeof r == "string" && !f(r))
+  if (typeof r != "string" && !Array.isArray(r) && !y(r) || typeof r == "string" && n(r) && r.startsWith("-") || typeof r == "string" && !n(r))
     return !1;
-  let i;
+  let t;
   if (typeof r == "string") {
     if (r.length % 2 !== 0)
       return !1;
-    i = s(r);
+    t = s(r);
   } else if (Array.isArray(r)) {
-    if (r.some((t) => t < 0 || t > 255 || !Number.isInteger(t)))
+    if (r.some((i) => i < 0 || i > 255 || !Number.isInteger(i)))
       return !1;
-    i = new Uint8Array(r);
+    t = new Uint8Array(r);
   } else
-    i = r;
+    t = r;
   if (e != null && e.abiType) {
-    const { baseTypeSize: t } = n(e.abiType);
-    return t ? i.length === t : !0;
+    const { baseTypeSize: i } = f(e.abiType);
+    return i ? t.length === i : !0;
   }
-  return e != null && e.size ? i.length === (e == null ? void 0 : e.size) : !0;
+  return e != null && e.size ? t.length === (e == null ? void 0 : e.size) : !0;
 };
 export {
-  a as isBytes
+  c as isBytes,
+  y as isUint8Array
 };

package/dist/organizations.server.js

@@ -6,8 +6,8 @@ require("bcryptjs");
 require("uuidv4");
 const require$$0 = require("mongoose");
 const require$$5 = require("@googlemaps/google-maps-services-js");
-const addMembersQuantity$1 = require("./addMembersQuantity-7147aa4a.js");
-require("mongodb");
+const addMembersQuantity$1 = require("./addMembersQuantity-fb552ca0.js");
+const require$$0$2 = require("mongodb");
 const controllerFactory$5 = (db) => {
   const Department = db.department;
   const readOne = (req, res) => {
@@ -72,7 +72,7 @@ const controllerFactory$5 = (db) => {
 };
 var departments_controller = controllerFactory$5;
 const jwt = require$$0$1;
-const ObjectId = require$$0.Types.ObjectId;
+const ObjectId$1 = require$$0.Types.ObjectId;
 const { Client } = require$$5;
 const client = new Client({});
 const addUserStatusFields = addMembersQuantity$1.addUserStatusFields_1;
@@ -87,10 +87,10 @@ const controllerFactory$4 = (db) => {
     db.membership;
     db.user;
     db.role;
-    console.log(req);
     const sortParam = req.query.sortParam || "numberOfProducts";
     const sortOrder = req.query.sortOrder || "desc";
     const sort = {
+      "numberOfProducts": -1,
       [sortParam]: sortOrder === "desc" ? -1 : 1,
       "_id": 1
     };
@@ -109,23 +109,30 @@ const controllerFactory$4 = (db) => {
       const [min, max] = priceRange.split("-").map(Number);
       return { "products.price": { $gte: min, $lte: max } };
     });
-    console.log(req.query.postable);
+    let containConditions = [];
+    if (req.query.contain) {
+      containConditions = req.query.contain.map((property) => ({
+        [property]: { $exists: true, $not: { $size: 0 } }
+      }));
+    }
     const matchConditions = [
-      ...req.query._id ? [{ _id: new ObjectId(req.query._id) }] : [],
-      ...req.query.owner ? [{ owner: new ObjectId(req.query.owner) }] : [],
-      ...req.query.member ? [{ "memberships.user": new ObjectId(req.query.member), "memberships.role": { $ne: "subscriber" } }] : [],
-      ...req.query.subscriber ? [{ "memberships.user": new ObjectId(req.query.subscriber), "memberships.role": "subscriber" }] : [],
-      ...req.query.postable ? [{ $or: [{ $and: [{ types: { $elemMatch: { $eq: "public" } } }, { "memberships.user": new ObjectId(req.query.postable) }] }, { $and: [{ types: { $elemMatch: { $in: ["exclusive", "hidden"] } } }, { "memberships.user": new ObjectId(req.query.postable) }, { "memberships.role": { $ne: "subscriber" } }] }] }] : [],
+      ...req.query._id ? [{ _id: new ObjectId$1(req.query._id) }] : [],
+      ...req.query.owner ? [{ owner: new ObjectId$1(req.query.owner) }] : [],
+      ...req.query.member ? [{ "memberships.user": new ObjectId$1(req.query.member), "memberships.role": { $nin: ["subscriber", "owner"] } }] : [],
+      ...req.query.subscriber ? [{ "memberships.user": new ObjectId$1(req.query.subscriber), "memberships.role": "subscriber" }] : [],
+      ...req.query.postable ? [{ $or: [{ $and: [{ types: { $elemMatch: { $eq: "public" } } }, { "memberships.user": new ObjectId$1(req.query.postable) }] }, { $and: [{ types: { $elemMatch: { $in: ["exclusive", "hidden"] } } }, { "memberships.user": new ObjectId$1(req.query.postable) }, { "memberships.role": { $ne: "subscriber" } }] }] }] : [],
       ...req.query.types ? [{ types: { $in: req.query.types } }] : [],
       // Если req.query.types - строка
       // to remove
-      ...req.query.onlyuser ? [{ "memberships.user": new ObjectId(req.query.onlyuser) }] : [],
+      ...req.query.onlyuser ? [{ "memberships.user": new ObjectId$1(req.query.onlyuser) }] : [],
       ...categories.length > 0 ? [{ "products.category": { $in: categories } }] : [],
-      ...delivery.length > 0 ? [{ "departments.delivery": { $all: delivery } }] : [],
-      ...priceConditions.length > 0 ? [{ $or: priceConditions }] : []
+      ...delivery.length > 0 ? [{ "spots.delivery": { $all: delivery } }] : [],
+      ...priceConditions.length > 0 ? [{ $or: priceConditions }] : [],
+      ...req.query.contain ? containConditions : []
     ];
-    let { location, address, city, state, country } = req.query;
-    if (!location && address || city || state || country) {
+    let { location, address, locationRadius, city, state, country } = req.query;
+    let userLocation = { coordinates: [0, 0] };
+    if (!location && (address || city || state || country)) {
       let geoLocation;
       const searchString = [address, city, state, country].filter(Boolean).join(", ");
       try {
@@ -137,6 +144,11 @@ const controllerFactory$4 = (db) => {
         });
         if (geoResponse.data.results && geoResponse.data.results.length > 0) {
           geoLocation = geoResponse.data.results[0].geometry.location;
+          userLocation.coordinates = [
+            geoResponse.data.results[0].geometry.location.lng,
+            geoResponse.data.results[0].geometry.location.lat
+          ];
+          console.log(userLocation);
         } else {
           return res.status(400).send({ message: "Unable to geocode the provided location." });
         }
@@ -144,30 +156,56 @@ const controllerFactory$4 = (db) => {
         console.log(err);
         return res.status(500).send({ message: "Error occurred while geocoding." });
       }
-      const radius = city ? 50 : state ? 100 : 500;
+      const radius = city ? 500 : state ? 1e3 : 5e3;
       matchConditions.push({
-        "departments.location.coordinates": {
+        "spots.location.coordinates": {
           $geoWithin: {
             $centerSphere: [
-              [geoLocation.lng, geoLocation.lat],
+              [parseFloat(geoLocation.lng), parseFloat(geoLocation.lat)],
               radius / 6378.1
             ]
           }
         }
       });
     }
+    const search = req.query.search;
+    if (search) {
+      const parts = search.split(".");
+      let regexPattern = "";
+      if (parts.length === 2) {
+        regexPattern = parts.map((part) => part.substr(0, part.length - 1) + ".{1}").join("\\.");
+      } else {
+        regexPattern = search.substr(0, search.length - 1) + ".{1}";
+      }
+      matchConditions.push({
+        $or: [
+          { "profile.name": { $regex: regexPattern, $options: "i" } },
+          { "products.name": { $regex: regexPattern, $options: "i" } }
+        ]
+      });
+    }
     if (location) {
-      console.log("Location is " + location);
+      console.log(location);
       if (typeof location === "string") {
         location = JSON.parse(location);
       }
-      let [lng, lat] = location.coordinates;
+      let lng;
+      let lat;
+      if (location.lng) {
+        lng = location.lng;
+        lat = location.lat;
+        userLocation.coordinates = [lng, lat];
+      } else {
+        lng = location.coordinates[0];
+        lat = location.coordinates[1];
+        userLocation.coordinates = [lng, lat];
+      }
       matchConditions.push({
-        "departments.location.coordinates": {
+        "spots.location.coordinates": {
           $geoWithin: {
             $centerSphere: [
-              [lng, lat],
-              20 / 6378.1
+              [parseFloat(lng), parseFloat(lat)],
+              (locationRadius || 50) / 6378.1
             ]
           }
         }
@@ -183,6 +221,14 @@ const controllerFactory$4 = (db) => {
           as: "products"
         }
       },
+      {
+        $lookup: {
+          from: "blogposts",
+          localField: "_id",
+          foreignField: "owner.target",
+          as: "blogposts"
+        }
+      },
       {
         $addFields: {
           numberOfProducts: { $size: "$products" }
@@ -204,6 +250,58 @@ const controllerFactory$4 = (db) => {
           as: "spots"
         }
       },
+      {
+        $addFields: {
+          spots: {
+            $map: {
+              input: "$spots",
+              as: "spot",
+              in: {
+                $mergeObjects: [
+                  "$$spot",
+                  {
+                    distance: {
+                      $function: {
+                        body: `function(spotCoords, userCoords, isMiles) {
+                        // The function remains the same
+                        function toRad(x) {
+                          return x * Math.PI / 180;
+                        }
+                        var lon1 = spotCoords[0];
+                        var lat1 = spotCoords[1];
+                        var lon2 = userCoords[0];
+                        var lat2 = userCoords[1];
+                        var R = 6371; // Radius of the Earth in km
+                        if (isMiles) R = 3959; // Radius of the Earth in miles
+                        var x1 = lat2 - lat1;
+                        var dLat = toRad(x1);
+                        var x2 = lon2 - lon1;
+                        var dLon = toRad(x2);
+                        var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+                                Math.cos(toRad(lat1)) * Math.cos(toRad(lat2)) *
+                                Math.sin(dLon / 2) * Math.sin(dLon / 2);
+                        var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+                        var d = R * c;
+                        return d;
+                      }`,
+                        args: ["$$spot.location.coordinates", userLocation.coordinates, false],
+                        // Use actual field names
+                        lang: "js"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      },
+      {
+        $addFields: {
+          distance: { $min: "$spots.distance" }
+          // Add the minDistance field here
+        }
+      },
       {
         $lookup: {
           from: "memberships",
@@ -545,11 +643,12 @@ var department_model = (mongoose) => {
   const Department = mongoose.model("Department", departmentSchema);
   return Department;
 };
+const { ObjectId } = require$$0$2;
 var organization_model = (mongoose) => {
   const OrganizationSchema = new mongoose.Schema({
     // Creator and owner of organizations
     owner: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: ObjectId,
       ref: "User",
       required: true
     },
@@ -586,7 +685,8 @@ var organization_model = (mongoose) => {
       telegram: String,
       twitter: String,
       facebook: String,
-      instagram: String
+      instagram: String,
+      youtube: String
     },
     // departments 
     structure: {