@authhero/cloudflare-adapter 2.19.3 → 2.20.0

package/dist/cloudflare-adapter.mjs

@@ -4,61 +4,61 @@ function mt(t, e) {
   var n = {};
   for (var s in t) Object.prototype.hasOwnProperty.call(t, s) && e.indexOf(s) < 0 && (n[s] = t[s]);
   if (t != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var a = 0, s = Object.getOwnPropertySymbols(t); a < s.length; a++)
-      e.indexOf(s[a]) < 0 && Object.prototype.propertyIsEnumerable.call(t, s[a]) && (n[s[a]] = t[s[a]]);
+    for (var r = 0, s = Object.getOwnPropertySymbols(t); r < s.length; r++)
+      e.indexOf(s[r]) < 0 && Object.prototype.propertyIsEnumerable.call(t, s[r]) && (n[s[r]] = t[s[r]]);
   return n;
 }
-function yt(t, e) {
+function _t(t, e) {
   var n;
   return ((n = t?._def) === null || n === void 0 ? void 0 : n.typeName) === e;
 }
-function re(t, e) {
+function ae(t, e) {
   const n = t.ZodType.prototype[e];
   t.ZodType.prototype[e] = function(...s) {
-    const a = n.apply(this, s);
-    return a._def.openapi = this._def.openapi, a;
+    const r = n.apply(this, s);
+    return r._def.openapi = this._def.openapi, r;
   };
 }
-function _t(t) {
+function yt(t) {
   if (typeof t.ZodType.prototype.openapi < "u")
     return;
-  t.ZodType.prototype.openapi = function(a, r) {
+  t.ZodType.prototype.openapi = function(r, a) {
     var i, o, c, u, p, k;
-    const T = typeof a == "string" ? r : a, S = T ?? {}, { param: E } = S, q = mt(S, ["param"]), x = Object.assign(Object.assign({}, (i = this._def.openapi) === null || i === void 0 ? void 0 : i._internal), typeof a == "string" ? { refId: a } : void 0), L = Object.assign(Object.assign(Object.assign({}, (o = this._def.openapi) === null || o === void 0 ? void 0 : o.metadata), q), !((u = (c = this._def.openapi) === null || c === void 0 ? void 0 : c.metadata) === null || u === void 0) && u.param || E ? {
+    const T = typeof r == "string" ? a : r, S = T ?? {}, { param: E } = S, q = mt(S, ["param"]), x = Object.assign(Object.assign({}, (i = this._def.openapi) === null || i === void 0 ? void 0 : i._internal), typeof r == "string" ? { refId: r } : void 0), L = Object.assign(Object.assign(Object.assign({}, (o = this._def.openapi) === null || o === void 0 ? void 0 : o.metadata), q), !((u = (c = this._def.openapi) === null || c === void 0 ? void 0 : c.metadata) === null || u === void 0) && u.param || E ? {
       param: Object.assign(Object.assign({}, (k = (p = this._def.openapi) === null || p === void 0 ? void 0 : p.metadata) === null || k === void 0 ? void 0 : k.param), E)
     } : void 0), O = new this.constructor(Object.assign(Object.assign({}, this._def), { openapi: Object.assign(Object.assign({}, Object.keys(x).length > 0 ? { _internal: x } : void 0), Object.keys(L).length > 0 ? { metadata: L } : void 0) }));
-    if (yt(this, "ZodObject")) {
+    if (_t(this, "ZodObject")) {
       const j = this.extend;
       O.extend = function(...W) {
-        var Q, ae, we, Se, Te, Ce, Ee;
+        var Q, re, we, Se, Te, Ce, Ee;
         const Oe = j.apply(this, W);
         return Oe._def.openapi = {
           _internal: {
-            extendedFrom: !((ae = (Q = this._def.openapi) === null || Q === void 0 ? void 0 : Q._internal) === null || ae === void 0) && ae.refId ? { refId: (Se = (we = this._def.openapi) === null || we === void 0 ? void 0 : we._internal) === null || Se === void 0 ? void 0 : Se.refId, schema: this } : (Ce = (Te = this._def.openapi) === null || Te === void 0 ? void 0 : Te._internal) === null || Ce === void 0 ? void 0 : Ce.extendedFrom
+            extendedFrom: !((re = (Q = this._def.openapi) === null || Q === void 0 ? void 0 : Q._internal) === null || re === void 0) && re.refId ? { refId: (Se = (we = this._def.openapi) === null || we === void 0 ? void 0 : we._internal) === null || Se === void 0 ? void 0 : Se.refId, schema: this } : (Ce = (Te = this._def.openapi) === null || Te === void 0 ? void 0 : Te._internal) === null || Ce === void 0 ? void 0 : Ce.extendedFrom
           },
           metadata: (Ee = Oe._def.openapi) === null || Ee === void 0 ? void 0 : Ee.metadata
         }, Oe;
       };
     }
     return O;
-  }, re(t, "optional"), re(t, "nullable"), re(t, "default"), re(t, "transform"), re(t, "refine");
+  }, ae(t, "optional"), ae(t, "nullable"), ae(t, "default"), ae(t, "transform"), ae(t, "refine");
   const e = t.ZodObject.prototype.deepPartial;
   t.ZodObject.prototype.deepPartial = function() {
-    const a = this._def.shape(), r = e.apply(this), i = r._def.shape();
+    const r = this._def.shape(), a = e.apply(this), i = a._def.shape();
     return Object.entries(i).forEach(([o, c]) => {
       var u, p;
-      c._def.openapi = (p = (u = a[o]) === null || u === void 0 ? void 0 : u._def) === null || p === void 0 ? void 0 : p.openapi;
-    }), r._def.openapi = void 0, r;
+      c._def.openapi = (p = (u = r[o]) === null || u === void 0 ? void 0 : u._def) === null || p === void 0 ? void 0 : p.openapi;
+    }), a._def.openapi = void 0, a;
   };
   const n = t.ZodObject.prototype.pick;
-  t.ZodObject.prototype.pick = function(...a) {
-    const r = n.apply(this, a);
-    return r._def.openapi = void 0, r;
+  t.ZodObject.prototype.pick = function(...r) {
+    const a = n.apply(this, r);
+    return a._def.openapi = void 0, a;
   };
   const s = t.ZodObject.prototype.omit;
-  t.ZodObject.prototype.omit = function(...a) {
-    const r = s.apply(this, a);
-    return r._def.openapi = void 0, r;
+  t.ZodObject.prototype.omit = function(...r) {
+    const a = s.apply(this, r);
+    return a._def.openapi = void 0, a;
   };
 }
 var X = class extends Error {
@@ -89,40 +89,40 @@ var X = class extends Error {
 new Set(".\\+*[^]$()");
 var b;
 (function(t) {
-  t.assertEqual = (a) => {
+  t.assertEqual = (r) => {
   };
-  function e(a) {
+  function e(r) {
   }
   t.assertIs = e;
-  function n(a) {
+  function n(r) {
     throw new Error();
   }
-  t.assertNever = n, t.arrayToEnum = (a) => {
-    const r = {};
-    for (const i of a)
-      r[i] = i;
-    return r;
-  }, t.getValidEnumValues = (a) => {
-    const r = t.objectKeys(a).filter((o) => typeof a[a[o]] != "number"), i = {};
-    for (const o of r)
-      i[o] = a[o];
+  t.assertNever = n, t.arrayToEnum = (r) => {
+    const a = {};
+    for (const i of r)
+      a[i] = i;
+    return a;
+  }, t.getValidEnumValues = (r) => {
+    const a = t.objectKeys(r).filter((o) => typeof r[r[o]] != "number"), i = {};
+    for (const o of a)
+      i[o] = r[o];
     return t.objectValues(i);
-  }, t.objectValues = (a) => t.objectKeys(a).map(function(r) {
-    return a[r];
-  }), t.objectKeys = typeof Object.keys == "function" ? (a) => Object.keys(a) : (a) => {
-    const r = [];
-    for (const i in a)
-      Object.prototype.hasOwnProperty.call(a, i) && r.push(i);
-    return r;
-  }, t.find = (a, r) => {
-    for (const i of a)
-      if (r(i))
+  }, t.objectValues = (r) => t.objectKeys(r).map(function(a) {
+    return r[a];
+  }), t.objectKeys = typeof Object.keys == "function" ? (r) => Object.keys(r) : (r) => {
+    const a = [];
+    for (const i in r)
+      Object.prototype.hasOwnProperty.call(r, i) && a.push(i);
+    return a;
+  }, t.find = (r, a) => {
+    for (const i of r)
+      if (a(i))
         return i;
-  }, t.isInteger = typeof Number.isInteger == "function" ? (a) => Number.isInteger(a) : (a) => typeof a == "number" && Number.isFinite(a) && Math.floor(a) === a;
-  function s(a, r = " | ") {
-    return a.map((i) => typeof i == "string" ? `'${i}'` : i).join(r);
+  }, t.isInteger = typeof Number.isInteger == "function" ? (r) => Number.isInteger(r) : (r) => typeof r == "number" && Number.isFinite(r) && Math.floor(r) === r;
+  function s(r, a = " | ") {
+    return r.map((i) => typeof i == "string" ? `'${i}'` : i).join(a);
   }
-  t.joinValues = s, t.jsonStringifyReplacer = (a, r) => typeof r == "bigint" ? r.toString() : r;
+  t.joinValues = s, t.jsonStringifyReplacer = (r, a) => typeof a == "bigint" ? a.toString() : a;
 })(b || (b = {}));
 var Re;
 (function(t) {
@@ -206,16 +206,16 @@ class Z extends Error {
     Object.setPrototypeOf ? Object.setPrototypeOf(this, n) : this.__proto__ = n, this.name = "ZodError", this.issues = e;
   }
   format(e) {
-    const n = e || function(r) {
-      return r.message;
-    }, s = { _errors: [] }, a = (r) => {
-      for (const i of r.issues)
+    const n = e || function(a) {
+      return a.message;
+    }, s = { _errors: [] }, r = (a) => {
+      for (const i of a.issues)
         if (i.code === "invalid_union")
-          i.unionErrors.map(a);
+          i.unionErrors.map(r);
         else if (i.code === "invalid_return_type")
-          a(i.returnTypeError);
+          r(i.returnTypeError);
         else if (i.code === "invalid_arguments")
-          a(i.argumentsError);
+          r(i.argumentsError);
         else if (i.path.length === 0)
           s._errors.push(n(i));
         else {
@@ -226,7 +226,7 @@ class Z extends Error {
           }
         }
     };
-    return a(this), s;
+    return r(this), s;
   }
   static assert(e) {
     if (!(e instanceof Z))
@@ -243,12 +243,12 @@ class Z extends Error {
   }
   flatten(e = (n) => n.message) {
     const n = {}, s = [];
-    for (const a of this.issues)
-      if (a.path.length > 0) {
-        const r = a.path[0];
-        n[r] = n[r] || [], n[r].push(e(a));
+    for (const r of this.issues)
+      if (r.path.length > 0) {
+        const a = r.path[0];
+        n[a] = n[a] || [], n[a].push(e(r));
       } else
-        s.push(e(a));
+        s.push(e(r));
     return { formErrors: s, fieldErrors: n };
   }
   get formErrors() {
@@ -317,23 +317,23 @@ function Xe() {
   return gt;
 }
 const et = (t) => {
-  const { data: e, path: n, errorMaps: s, issueData: a } = t, r = [...n, ...a.path || []], i = {
-    ...a,
-    path: r
+  const { data: e, path: n, errorMaps: s, issueData: r } = t, a = [...n, ...r.path || []], i = {
+    ...r,
+    path: a
   };
-  if (a.message !== void 0)
+  if (r.message !== void 0)
     return {
-      ...a,
-      path: r,
-      message: a.message
+      ...r,
+      path: a,
+      message: r.message
     };
   let o = "";
   const c = s.filter((u) => !!u).slice().reverse();
   for (const u of c)
     o = u(i, { data: e, defaultError: o }).message;
   return {
-    ...a,
-    path: r,
+    ...r,
+    path: a,
     message: o
   };
 };
@@ -351,7 +351,7 @@ function l(t, e) {
       // then global override map
       n === pe ? void 0 : pe
       // then global default map
-    ].filter((a) => !!a)
+    ].filter((r) => !!r)
   });
   t.common.issues.push(s);
 }
@@ -367,19 +367,19 @@ class C {
   }
   static mergeArray(e, n) {
     const s = [];
-    for (const a of n) {
-      if (a.status === "aborted")
-        return y;
-      a.status === "dirty" && e.dirty(), s.push(a.value);
+    for (const r of n) {
+      if (r.status === "aborted")
+        return _;
+      r.status === "dirty" && e.dirty(), s.push(r.value);
     }
     return { status: e.value, value: s };
   }
   static async mergeObjectAsync(e, n) {
     const s = [];
-    for (const a of n) {
-      const r = await a.key, i = await a.value;
+    for (const r of n) {
+      const a = await r.key, i = await r.value;
       s.push({
-        key: r,
+        key: a,
         value: i
       });
     }
@@ -387,16 +387,16 @@ class C {
   }
   static mergeObjectSync(e, n) {
     const s = {};
-    for (const a of n) {
-      const { key: r, value: i } = a;
-      if (r.status === "aborted" || i.status === "aborted")
-        return y;
-      r.status === "dirty" && e.dirty(), i.status === "dirty" && e.dirty(), r.value !== "__proto__" && (typeof i.value < "u" || a.alwaysSet) && (s[r.value] = i.value);
+    for (const r of n) {
+      const { key: a, value: i } = r;
+      if (a.status === "aborted" || i.status === "aborted")
+        return _;
+      a.status === "dirty" && e.dirty(), i.status === "dirty" && e.dirty(), a.value !== "__proto__" && (typeof i.value < "u" || r.alwaysSet) && (s[a.value] = i.value);
     }
     return { status: e.value, value: s };
   }
 }
-const y = Object.freeze({
+const _ = Object.freeze({
   status: "aborted"
 }), te = (t) => ({ status: "dirty", value: t }), N = (t) => ({ status: "valid", value: t }), $e = (t) => t.status === "aborted", je = (t) => t.status === "dirty", J = (t) => t.status === "valid", oe = (t) => typeof Promise < "u" && t instanceof Promise;
 var f;
@@ -404,8 +404,8 @@ var f;
   t.errToObj = (e) => typeof e == "string" ? { message: e } : e || {}, t.toString = (e) => typeof e == "string" ? e : e?.message;
 })(f || (f = {}));
 class D {
-  constructor(e, n, s, a) {
-    this._cachedPath = [], this.parent = e, this.data = n, this._path = s, this._key = a;
+  constructor(e, n, s, r) {
+    this._cachedPath = [], this.parent = e, this.data = n, this._path = s, this._key = r;
   }
   get path() {
     return this._cachedPath.length || (Array.isArray(this._key) ? this._cachedPath.push(...this._path, ...this._key) : this._cachedPath.push(...this._path, this._key)), this._cachedPath;
@@ -429,13 +429,13 @@ const He = (t, e) => {
 function g(t) {
   if (!t)
     return {};
-  const { errorMap: e, invalid_type_error: n, required_error: s, description: a } = t;
+  const { errorMap: e, invalid_type_error: n, required_error: s, description: r } = t;
   if (e && (n || s))
     throw new Error(`Can't use "invalid_type_error" or "required_error" in conjunction with custom error map.`);
-  return e ? { errorMap: e, description: a } : { errorMap: (i, o) => {
+  return e ? { errorMap: e, description: r } : { errorMap: (i, o) => {
     const { message: c } = t;
     return i.code === "invalid_enum_value" ? { message: c ?? o.defaultError } : typeof o.data > "u" ? { message: c ?? s ?? o.defaultError } : i.code !== "invalid_type" ? { message: o.defaultError } : { message: c ?? n ?? o.defaultError };
-  }, description: a };
+  }, description: r };
 }
 class v {
   get description() {
@@ -495,8 +495,8 @@ class v {
       parent: null,
       data: e,
       parsedType: P(e)
-    }, a = this._parseSync({ data: e, path: s.path, parent: s });
-    return He(s, a);
+    }, r = this._parseSync({ data: e, path: s.path, parent: s });
+    return He(s, r);
   }
   "~validate"(e) {
     const n = {
@@ -548,21 +548,21 @@ class v {
       parent: null,
       data: e,
       parsedType: P(e)
-    }, a = this._parse({ data: e, path: s.path, parent: s }), r = await (oe(a) ? a : Promise.resolve(a));
-    return He(s, r);
+    }, r = this._parse({ data: e, path: s.path, parent: s }), a = await (oe(r) ? r : Promise.resolve(r));
+    return He(s, a);
   }
   refine(e, n) {
-    const s = (a) => typeof n == "string" || typeof n > "u" ? { message: n } : typeof n == "function" ? n(a) : n;
-    return this._refinement((a, r) => {
-      const i = e(a), o = () => r.addIssue({
+    const s = (r) => typeof n == "string" || typeof n > "u" ? { message: n } : typeof n == "function" ? n(r) : n;
+    return this._refinement((r, a) => {
+      const i = e(r), o = () => a.addIssue({
         code: d.custom,
-        ...s(a)
+        ...s(r)
       });
       return typeof Promise < "u" && i instanceof Promise ? i.then((c) => c ? !0 : (o(), !1)) : i ? !0 : (o(), !1);
     });
   }
   refinement(e, n) {
-    return this._refinement((s, a) => e(s) ? !0 : (a.addIssue(typeof n == "function" ? n(s, a) : n), !1));
+    return this._refinement((s, r) => e(s) ? !0 : (r.addIssue(typeof n == "function" ? n(s, r) : n), !1));
   }
   _refinement(e) {
     return new U({
@@ -612,7 +612,7 @@ class v {
   }
   default(e) {
     const n = typeof e == "function" ? e : () => e;
-    return new ye({
+    return new _e({
       ...g(this._def),
       innerType: this,
       defaultValue: n,
@@ -620,7 +620,7 @@ class v {
     });
   }
   brand() {
-    return new rt({
+    return new at({
       typeName: m.ZodBranded,
       type: this,
       ...g(this._def)
@@ -628,7 +628,7 @@ class v {
   }
   catch(e) {
     const n = typeof e == "function" ? e : () => e;
-    return new _e({
+    return new ye({
       ...g(this._def),
       innerType: this,
       catchValue: n,
@@ -682,8 +682,8 @@ function Lt(t, e) {
     const [n] = t.split(".");
     if (!n)
       return !1;
-    const s = n.replace(/-/g, "+").replace(/_/g, "/").padEnd(n.length + (4 - n.length % 4) % 4, "="), a = JSON.parse(atob(s));
-    return !(typeof a != "object" || a === null || "typ" in a && a?.typ !== "JWT" || !a.alg || e && a.alg !== e);
+    const s = n.replace(/-/g, "+").replace(/_/g, "/").padEnd(n.length + (4 - n.length % 4) % 4, "="), r = JSON.parse(atob(s));
+    return !(typeof r != "object" || r === null || "typ" in r && r?.typ !== "JWT" || !r.alg || e && r.alg !== e);
   } catch {
     return !1;
   }
@@ -694,160 +694,160 @@ function Pt(t, e) {
 class I extends v {
   _parse(e) {
     if (this._def.coerce && (e.data = String(e.data)), this._getType(e) !== h.string) {
-      const r = this._getOrReturnCtx(e);
-      return l(r, {
+      const a = this._getOrReturnCtx(e);
+      return l(a, {
         code: d.invalid_type,
         expected: h.string,
-        received: r.parsedType
-      }), y;
+        received: a.parsedType
+      }), _;
     }
     const s = new C();
-    let a;
-    for (const r of this._def.checks)
-      if (r.kind === "min")
-        e.data.length < r.value && (a = this._getOrReturnCtx(e, a), l(a, {
+    let r;
+    for (const a of this._def.checks)
+      if (a.kind === "min")
+        e.data.length < a.value && (r = this._getOrReturnCtx(e, r), l(r, {
           code: d.too_small,
-          minimum: r.value,
+          minimum: a.value,
           type: "string",
           inclusive: !0,
           exact: !1,
-          message: r.message
+          message: a.message
         }), s.dirty());
-      else if (r.kind === "max")
-        e.data.length > r.value && (a = this._getOrReturnCtx(e, a), l(a, {
+      else if (a.kind === "max")
+        e.data.length > a.value && (r = this._getOrReturnCtx(e, r), l(r, {
           code: d.too_big,
-          maximum: r.value,
+          maximum: a.value,
           type: "string",
           inclusive: !0,
           exact: !1,
-          message: r.message
+          message: a.message
         }), s.dirty());
-      else if (r.kind === "length") {
-        const i = e.data.length > r.value, o = e.data.length < r.value;
-        (i || o) && (a = this._getOrReturnCtx(e, a), i ? l(a, {
+      else if (a.kind === "length") {
+        const i = e.data.length > a.value, o = e.data.length < a.value;
+        (i || o) && (r = this._getOrReturnCtx(e, r), i ? l(r, {
           code: d.too_big,
-          maximum: r.value,
+          maximum: a.value,
           type: "string",
           inclusive: !0,
           exact: !0,
-          message: r.message
-        }) : o && l(a, {
+          message: a.message
+        }) : o && l(r, {
           code: d.too_small,
-          minimum: r.value,
+          minimum: a.value,
           type: "string",
           inclusive: !0,
           exact: !0,
-          message: r.message
+          message: a.message
         }), s.dirty());
-      } else if (r.kind === "email")
-        Ct.test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+      } else if (a.kind === "email")
+        Ct.test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
           validation: "email",
           code: d.invalid_string,
-          message: r.message
+          message: a.message
         }), s.dirty());
-      else if (r.kind === "emoji")
-        Ae || (Ae = new RegExp(Et, "u")), Ae.test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+      else if (a.kind === "emoji")
+        Ae || (Ae = new RegExp(Et, "u")), Ae.test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
           validation: "emoji",
           code: d.invalid_string,
-          message: r.message
+          message: a.message
         }), s.dirty());
-      else if (r.kind === "uuid")
-        kt.test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+      else if (a.kind === "uuid")
+        kt.test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
           validation: "uuid",
           code: d.invalid_string,
-          message: r.message
+          message: a.message
         }), s.dirty());
-      else if (r.kind === "nanoid")
-        wt.test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+      else if (a.kind === "nanoid")
+        wt.test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
           validation: "nanoid",
           code: d.invalid_string,
-          message: r.message
+          message: a.message
         }), s.dirty());
-      else if (r.kind === "cuid")
-        vt.test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+      else if (a.kind === "cuid")
+        vt.test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
           validation: "cuid",
           code: d.invalid_string,
-          message: r.message
+          message: a.message
         }), s.dirty());
-      else if (r.kind === "cuid2")
-        bt.test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+      else if (a.kind === "cuid2")
+        bt.test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
           validation: "cuid2",
           code: d.invalid_string,
-          message: r.message
+          message: a.message
         }), s.dirty());
-      else if (r.kind === "ulid")
-        xt.test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+      else if (a.kind === "ulid")
+        xt.test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
           validation: "ulid",
           code: d.invalid_string,
-          message: r.message
+          message: a.message
         }), s.dirty());
-      else if (r.kind === "url")
+      else if (a.kind === "url")
         try {
           new URL(e.data);
         } catch {
-          a = this._getOrReturnCtx(e, a), l(a, {
+          r = this._getOrReturnCtx(e, r), l(r, {
             validation: "url",
             code: d.invalid_string,
-            message: r.message
+            message: a.message
           }), s.dirty();
         }
-      else r.kind === "regex" ? (r.regex.lastIndex = 0, r.regex.test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+      else a.kind === "regex" ? (a.regex.lastIndex = 0, a.regex.test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
         validation: "regex",
         code: d.invalid_string,
-        message: r.message
-      }), s.dirty())) : r.kind === "trim" ? e.data = e.data.trim() : r.kind === "includes" ? e.data.includes(r.value, r.position) || (a = this._getOrReturnCtx(e, a), l(a, {
+        message: a.message
+      }), s.dirty())) : a.kind === "trim" ? e.data = e.data.trim() : a.kind === "includes" ? e.data.includes(a.value, a.position) || (r = this._getOrReturnCtx(e, r), l(r, {
         code: d.invalid_string,
-        validation: { includes: r.value, position: r.position },
-        message: r.message
-      }), s.dirty()) : r.kind === "toLowerCase" ? e.data = e.data.toLowerCase() : r.kind === "toUpperCase" ? e.data = e.data.toUpperCase() : r.kind === "startsWith" ? e.data.startsWith(r.value) || (a = this._getOrReturnCtx(e, a), l(a, {
+        validation: { includes: a.value, position: a.position },
+        message: a.message
+      }), s.dirty()) : a.kind === "toLowerCase" ? e.data = e.data.toLowerCase() : a.kind === "toUpperCase" ? e.data = e.data.toUpperCase() : a.kind === "startsWith" ? e.data.startsWith(a.value) || (r = this._getOrReturnCtx(e, r), l(r, {
         code: d.invalid_string,
-        validation: { startsWith: r.value },
-        message: r.message
-      }), s.dirty()) : r.kind === "endsWith" ? e.data.endsWith(r.value) || (a = this._getOrReturnCtx(e, a), l(a, {
+        validation: { startsWith: a.value },
+        message: a.message
+      }), s.dirty()) : a.kind === "endsWith" ? e.data.endsWith(a.value) || (r = this._getOrReturnCtx(e, r), l(r, {
         code: d.invalid_string,
-        validation: { endsWith: r.value },
-        message: r.message
-      }), s.dirty()) : r.kind === "datetime" ? st(r).test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+        validation: { endsWith: a.value },
+        message: a.message
+      }), s.dirty()) : a.kind === "datetime" ? st(a).test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
         code: d.invalid_string,
         validation: "datetime",
-        message: r.message
-      }), s.dirty()) : r.kind === "date" ? It.test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+        message: a.message
+      }), s.dirty()) : a.kind === "date" ? It.test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
         code: d.invalid_string,
         validation: "date",
-        message: r.message
-      }), s.dirty()) : r.kind === "time" ? Zt(r).test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+        message: a.message
+      }), s.dirty()) : a.kind === "time" ? Zt(a).test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
         code: d.invalid_string,
         validation: "time",
-        message: r.message
-      }), s.dirty()) : r.kind === "duration" ? Tt.test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+        message: a.message
+      }), s.dirty()) : a.kind === "duration" ? Tt.test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
         validation: "duration",
         code: d.invalid_string,
-        message: r.message
-      }), s.dirty()) : r.kind === "ip" ? Dt(e.data, r.version) || (a = this._getOrReturnCtx(e, a), l(a, {
+        message: a.message
+      }), s.dirty()) : a.kind === "ip" ? Dt(e.data, a.version) || (r = this._getOrReturnCtx(e, r), l(r, {
         validation: "ip",
         code: d.invalid_string,
-        message: r.message
-      }), s.dirty()) : r.kind === "jwt" ? Lt(e.data, r.alg) || (a = this._getOrReturnCtx(e, a), l(a, {
+        message: a.message
+      }), s.dirty()) : a.kind === "jwt" ? Lt(e.data, a.alg) || (r = this._getOrReturnCtx(e, r), l(r, {
         validation: "jwt",
         code: d.invalid_string,
-        message: r.message
-      }), s.dirty()) : r.kind === "cidr" ? Pt(e.data, r.version) || (a = this._getOrReturnCtx(e, a), l(a, {
+        message: a.message
+      }), s.dirty()) : a.kind === "cidr" ? Pt(e.data, a.version) || (r = this._getOrReturnCtx(e, r), l(r, {
         validation: "cidr",
         code: d.invalid_string,
-        message: r.message
-      }), s.dirty()) : r.kind === "base64" ? $t.test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+        message: a.message
+      }), s.dirty()) : a.kind === "base64" ? $t.test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
         validation: "base64",
         code: d.invalid_string,
-        message: r.message
-      }), s.dirty()) : r.kind === "base64url" ? jt.test(e.data) || (a = this._getOrReturnCtx(e, a), l(a, {
+        message: a.message
+      }), s.dirty()) : a.kind === "base64url" ? jt.test(e.data) || (r = this._getOrReturnCtx(e, r), l(r, {
         validation: "base64url",
         code: d.invalid_string,
-        message: r.message
-      }), s.dirty()) : b.assertNever(r);
+        message: a.message
+      }), s.dirty()) : b.assertNever(a);
     return { status: s.value, value: e.data };
   }
   _regex(e, n, s) {
-    return this.refinement((a) => e.test(a), {
+    return this.refinement((r) => e.test(r), {
       validation: n,
       code: d.invalid_string,
       ...f.errToObj(s)
@@ -1075,8 +1075,8 @@ I.create = (t) => new I({
   ...g(t)
 });
 function Mt(t, e) {
-  const n = (t.toString().split(".")[1] || "").length, s = (e.toString().split(".")[1] || "").length, a = n > s ? n : s, r = Number.parseInt(t.toFixed(a).replace(".", "")), i = Number.parseInt(e.toFixed(a).replace(".", ""));
-  return r % i / 10 ** a;
+  const n = (t.toString().split(".")[1] || "").length, s = (e.toString().split(".")[1] || "").length, r = n > s ? n : s, a = Number.parseInt(t.toFixed(r).replace(".", "")), i = Number.parseInt(e.toFixed(r).replace(".", ""));
+  return a % i / 10 ** r;
 }
 class Y extends v {
   constructor() {
@@ -1084,44 +1084,44 @@ class Y extends v {
   }
   _parse(e) {
     if (this._def.coerce && (e.data = Number(e.data)), this._getType(e) !== h.number) {
-      const r = this._getOrReturnCtx(e);
-      return l(r, {
+      const a = this._getOrReturnCtx(e);
+      return l(a, {
         code: d.invalid_type,
         expected: h.number,
-        received: r.parsedType
-      }), y;
+        received: a.parsedType
+      }), _;
     }
     let s;
-    const a = new C();
-    for (const r of this._def.checks)
-      r.kind === "int" ? b.isInteger(e.data) || (s = this._getOrReturnCtx(e, s), l(s, {
+    const r = new C();
+    for (const a of this._def.checks)
+      a.kind === "int" ? b.isInteger(e.data) || (s = this._getOrReturnCtx(e, s), l(s, {
         code: d.invalid_type,
         expected: "integer",
         received: "float",
-        message: r.message
-      }), a.dirty()) : r.kind === "min" ? (r.inclusive ? e.data < r.value : e.data <= r.value) && (s = this._getOrReturnCtx(e, s), l(s, {
+        message: a.message
+      }), r.dirty()) : a.kind === "min" ? (a.inclusive ? e.data < a.value : e.data <= a.value) && (s = this._getOrReturnCtx(e, s), l(s, {
         code: d.too_small,
-        minimum: r.value,
+        minimum: a.value,
         type: "number",
-        inclusive: r.inclusive,
+        inclusive: a.inclusive,
         exact: !1,
-        message: r.message
-      }), a.dirty()) : r.kind === "max" ? (r.inclusive ? e.data > r.value : e.data >= r.value) && (s = this._getOrReturnCtx(e, s), l(s, {
+        message: a.message
+      }), r.dirty()) : a.kind === "max" ? (a.inclusive ? e.data > a.value : e.data >= a.value) && (s = this._getOrReturnCtx(e, s), l(s, {
         code: d.too_big,
-        maximum: r.value,
+        maximum: a.value,
         type: "number",
-        inclusive: r.inclusive,
+        inclusive: a.inclusive,
         exact: !1,
-        message: r.message
-      }), a.dirty()) : r.kind === "multipleOf" ? Mt(e.data, r.value) !== 0 && (s = this._getOrReturnCtx(e, s), l(s, {
+        message: a.message
+      }), r.dirty()) : a.kind === "multipleOf" ? Mt(e.data, a.value) !== 0 && (s = this._getOrReturnCtx(e, s), l(s, {
         code: d.not_multiple_of,
-        multipleOf: r.value,
-        message: r.message
-      }), a.dirty()) : r.kind === "finite" ? Number.isFinite(e.data) || (s = this._getOrReturnCtx(e, s), l(s, {
+        multipleOf: a.value,
+        message: a.message
+      }), r.dirty()) : a.kind === "finite" ? Number.isFinite(e.data) || (s = this._getOrReturnCtx(e, s), l(s, {
         code: d.not_finite,
-        message: r.message
-      }), a.dirty()) : b.assertNever(r);
-    return { status: a.value, value: e.data };
+        message: a.message
+      }), r.dirty()) : b.assertNever(a);
+    return { status: r.value, value: e.data };
   }
   gte(e, n) {
     return this.setLimit("min", e, !0, f.toString(n));
@@ -1135,7 +1135,7 @@ class Y extends v {
   lt(e, n) {
     return this.setLimit("max", e, !1, f.toString(n));
   }
-  setLimit(e, n, s, a) {
+  setLimit(e, n, s, r) {
     return new Y({
       ...this._def,
       checks: [
@@ -1144,7 +1144,7 @@ class Y extends v {
           kind: e,
           value: n,
           inclusive: s,
-          message: f.toString(a)
+          message: f.toString(r)
         }
       ]
     });
@@ -1264,26 +1264,26 @@ class ne extends v {
     if (this._getType(e) !== h.bigint)
       return this._getInvalidInput(e);
     let s;
-    const a = new C();
-    for (const r of this._def.checks)
-      r.kind === "min" ? (r.inclusive ? e.data < r.value : e.data <= r.value) && (s = this._getOrReturnCtx(e, s), l(s, {
+    const r = new C();
+    for (const a of this._def.checks)
+      a.kind === "min" ? (a.inclusive ? e.data < a.value : e.data <= a.value) && (s = this._getOrReturnCtx(e, s), l(s, {
         code: d.too_small,
         type: "bigint",
-        minimum: r.value,
-        inclusive: r.inclusive,
-        message: r.message
-      }), a.dirty()) : r.kind === "max" ? (r.inclusive ? e.data > r.value : e.data >= r.value) && (s = this._getOrReturnCtx(e, s), l(s, {
+        minimum: a.value,
+        inclusive: a.inclusive,
+        message: a.message
+      }), r.dirty()) : a.kind === "max" ? (a.inclusive ? e.data > a.value : e.data >= a.value) && (s = this._getOrReturnCtx(e, s), l(s, {
         code: d.too_big,
         type: "bigint",
-        maximum: r.value,
-        inclusive: r.inclusive,
-        message: r.message
-      }), a.dirty()) : r.kind === "multipleOf" ? e.data % r.value !== BigInt(0) && (s = this._getOrReturnCtx(e, s), l(s, {
+        maximum: a.value,
+        inclusive: a.inclusive,
+        message: a.message
+      }), r.dirty()) : a.kind === "multipleOf" ? e.data % a.value !== BigInt(0) && (s = this._getOrReturnCtx(e, s), l(s, {
         code: d.not_multiple_of,
-        multipleOf: r.value,
-        message: r.message
-      }), a.dirty()) : b.assertNever(r);
-    return { status: a.value, value: e.data };
+        multipleOf: a.value,
+        message: a.message
+      }), r.dirty()) : b.assertNever(a);
+    return { status: r.value, value: e.data };
   }
   _getInvalidInput(e) {
     const n = this._getOrReturnCtx(e);
@@ -1291,7 +1291,7 @@ class ne extends v {
       code: d.invalid_type,
       expected: h.bigint,
       received: n.parsedType
-    }), y;
+    }), _;
   }
   gte(e, n) {
     return this.setLimit("min", e, !0, f.toString(n));
@@ -1305,7 +1305,7 @@ class ne extends v {
   lt(e, n) {
     return this.setLimit("max", e, !1, f.toString(n));
   }
-  setLimit(e, n, s, a) {
+  setLimit(e, n, s, r) {
     return new ne({
       ...this._def,
       checks: [
@@ -1314,7 +1314,7 @@ class ne extends v {
           kind: e,
           value: n,
           inclusive: s,
-          message: f.toString(a)
+          message: f.toString(r)
         }
       ]
     });
@@ -1391,7 +1391,7 @@ class me extends v {
         code: d.invalid_type,
         expected: h.boolean,
         received: s.parsedType
-      }), y;
+      }), _;
     }
     return N(e.data);
   }
@@ -1404,37 +1404,37 @@ me.create = (t) => new me({
 class ce extends v {
   _parse(e) {
     if (this._def.coerce && (e.data = new Date(e.data)), this._getType(e) !== h.date) {
-      const r = this._getOrReturnCtx(e);
-      return l(r, {
+      const a = this._getOrReturnCtx(e);
+      return l(a, {
         code: d.invalid_type,
         expected: h.date,
-        received: r.parsedType
-      }), y;
+        received: a.parsedType
+      }), _;
     }
     if (Number.isNaN(e.data.getTime())) {
-      const r = this._getOrReturnCtx(e);
-      return l(r, {
+      const a = this._getOrReturnCtx(e);
+      return l(a, {
         code: d.invalid_date
-      }), y;
+      }), _;
     }
     const s = new C();
-    let a;
-    for (const r of this._def.checks)
-      r.kind === "min" ? e.data.getTime() < r.value && (a = this._getOrReturnCtx(e, a), l(a, {
+    let r;
+    for (const a of this._def.checks)
+      a.kind === "min" ? e.data.getTime() < a.value && (r = this._getOrReturnCtx(e, r), l(r, {
         code: d.too_small,
-        message: r.message,
+        message: a.message,
         inclusive: !0,
         exact: !1,
-        minimum: r.value,
+        minimum: a.value,
         type: "date"
-      }), s.dirty()) : r.kind === "max" ? e.data.getTime() > r.value && (a = this._getOrReturnCtx(e, a), l(a, {
+      }), s.dirty()) : a.kind === "max" ? e.data.getTime() > a.value && (r = this._getOrReturnCtx(e, r), l(r, {
         code: d.too_big,
-        message: r.message,
+        message: a.message,
         inclusive: !0,
         exact: !1,
-        maximum: r.value,
+        maximum: a.value,
         type: "date"
-      }), s.dirty()) : b.assertNever(r);
+      }), s.dirty()) : b.assertNever(a);
     return {
       status: s.value,
       value: new Date(e.data.getTime())
@@ -1487,7 +1487,7 @@ class Ie extends v {
         code: d.invalid_type,
         expected: h.symbol,
         received: s.parsedType
-      }), y;
+      }), _;
     }
     return N(e.data);
   }
@@ -1504,7 +1504,7 @@ class Ze extends v {
         code: d.invalid_type,
         expected: h.undefined,
         received: s.parsedType
-      }), y;
+      }), _;
     }
     return N(e.data);
   }
@@ -1521,7 +1521,7 @@ class De extends v {
         code: d.invalid_type,
         expected: h.null,
         received: s.parsedType
-      }), y;
+      }), _;
     }
     return N(e.data);
   }
@@ -1561,7 +1561,7 @@ class B extends v {
       code: d.invalid_type,
       expected: h.never,
       received: n.parsedType
-    }), y;
+    }), _;
   }
 }
 B.create = (t) => new B({
@@ -1576,7 +1576,7 @@ class Me extends v {
         code: d.invalid_type,
         expected: h.void,
         received: s.parsedType
-      }), y;
+      }), _;
     }
     return N(e.data);
   }
@@ -1587,43 +1587,43 @@ Me.create = (t) => new Me({
 });
 class R extends v {
   _parse(e) {
-    const { ctx: n, status: s } = this._processInputParams(e), a = this._def;
+    const { ctx: n, status: s } = this._processInputParams(e), r = this._def;
     if (n.parsedType !== h.array)
       return l(n, {
         code: d.invalid_type,
         expected: h.array,
         received: n.parsedType
-      }), y;
-    if (a.exactLength !== null) {
-      const i = n.data.length > a.exactLength.value, o = n.data.length < a.exactLength.value;
+      }), _;
+    if (r.exactLength !== null) {
+      const i = n.data.length > r.exactLength.value, o = n.data.length < r.exactLength.value;
       (i || o) && (l(n, {
         code: i ? d.too_big : d.too_small,
-        minimum: o ? a.exactLength.value : void 0,
-        maximum: i ? a.exactLength.value : void 0,
+        minimum: o ? r.exactLength.value : void 0,
+        maximum: i ? r.exactLength.value : void 0,
         type: "array",
         inclusive: !0,
         exact: !0,
-        message: a.exactLength.message
+        message: r.exactLength.message
       }), s.dirty());
     }
-    if (a.minLength !== null && n.data.length < a.minLength.value && (l(n, {
+    if (r.minLength !== null && n.data.length < r.minLength.value && (l(n, {
       code: d.too_small,
-      minimum: a.minLength.value,
+      minimum: r.minLength.value,
       type: "array",
       inclusive: !0,
       exact: !1,
-      message: a.minLength.message
-    }), s.dirty()), a.maxLength !== null && n.data.length > a.maxLength.value && (l(n, {
+      message: r.minLength.message
+    }), s.dirty()), r.maxLength !== null && n.data.length > r.maxLength.value && (l(n, {
       code: d.too_big,
-      maximum: a.maxLength.value,
+      maximum: r.maxLength.value,
       type: "array",
       inclusive: !0,
       exact: !1,
-      message: a.maxLength.message
+      message: r.maxLength.message
     }), s.dirty()), n.common.async)
-      return Promise.all([...n.data].map((i, o) => a.type._parseAsync(new D(n, i, n.path, o)))).then((i) => C.mergeArray(s, i));
-    const r = [...n.data].map((i, o) => a.type._parseSync(new D(n, i, n.path, o)));
-    return C.mergeArray(s, r);
+      return Promise.all([...n.data].map((i, o) => r.type._parseAsync(new D(n, i, n.path, o)))).then((i) => C.mergeArray(s, i));
+    const a = [...n.data].map((i, o) => r.type._parseSync(new D(n, i, n.path, o)));
+    return C.mergeArray(s, a);
   }
   get element() {
     return this._def.type;
@@ -1691,19 +1691,19 @@ class w extends v {
         code: d.invalid_type,
         expected: h.object,
         received: u.parsedType
-      }), y;
+      }), _;
     }
-    const { status: s, ctx: a } = this._processInputParams(e), { shape: r, keys: i } = this._getCached(), o = [];
+    const { status: s, ctx: r } = this._processInputParams(e), { shape: a, keys: i } = this._getCached(), o = [];
     if (!(this._def.catchall instanceof B && this._def.unknownKeys === "strip"))
-      for (const u in a.data)
+      for (const u in r.data)
         i.includes(u) || o.push(u);
     const c = [];
     for (const u of i) {
-      const p = r[u], k = a.data[u];
+      const p = a[u], k = r.data[u];
       c.push({
         key: { status: "valid", value: u },
-        value: p._parse(new D(a, k, a.path, u)),
-        alwaysSet: u in a.data
+        value: p._parse(new D(r, k, r.path, u)),
+        alwaysSet: u in r.data
       });
     }
     if (this._def.catchall instanceof B) {
@@ -1712,10 +1712,10 @@ class w extends v {
         for (const p of o)
           c.push({
             key: { status: "valid", value: p },
-            value: { status: "valid", value: a.data[p] }
+            value: { status: "valid", value: r.data[p] }
           });
       else if (u === "strict")
-        o.length > 0 && (l(a, {
+        o.length > 0 && (l(r, {
           code: d.unrecognized_keys,
           keys: o
         }), s.dirty());
@@ -1723,18 +1723,18 @@ class w extends v {
     } else {
       const u = this._def.catchall;
       for (const p of o) {
-        const k = a.data[p];
+        const k = r.data[p];
         c.push({
           key: { status: "valid", value: p },
           value: u._parse(
-            new D(a, k, a.path, p)
+            new D(r, k, r.path, p)
             //, ctx.child(key), value, getParsedType(value)
           ),
-          alwaysSet: p in a.data
+          alwaysSet: p in r.data
         });
       }
     }
-    return a.common.async ? Promise.resolve().then(async () => {
+    return r.common.async ? Promise.resolve().then(async () => {
       const u = [];
       for (const p of c) {
         const k = await p.key, T = await p.value;
@@ -1756,11 +1756,11 @@ class w extends v {
       unknownKeys: "strict",
       ...e !== void 0 ? {
         errorMap: (n, s) => {
-          const a = this._def.errorMap?.(n, s).message ?? s.defaultError;
+          const r = this._def.errorMap?.(n, s).message ?? s.defaultError;
           return n.code === "unrecognized_keys" ? {
-            message: f.errToObj(e).message ?? a
+            message: f.errToObj(e).message ?? r
           } : {
-            message: a
+            message: r
           };
         }
       } : {}
@@ -1912,8 +1912,8 @@ class w extends v {
   partial(e) {
     const n = {};
     for (const s of b.objectKeys(this.shape)) {
-      const a = this.shape[s];
-      e && !e[s] ? n[s] = a : n[s] = a.optional();
+      const r = this.shape[s];
+      e && !e[s] ? n[s] = r : n[s] = r.optional();
     }
     return new w({
       ...this._def,
@@ -1926,10 +1926,10 @@ class w extends v {
       if (e && !e[s])
         n[s] = this.shape[s];
       else {
-        let r = this.shape[s];
-        for (; r instanceof V; )
-          r = r._def.innerType;
-        n[s] = r;
+        let a = this.shape[s];
+        for (; a instanceof V; )
+          a = a._def.innerType;
+        n[s] = a;
       }
     return new w({
       ...this._def,
@@ -1937,7 +1937,7 @@ class w extends v {
     });
   }
   keyof() {
-    return at(b.objectKeys(this.shape));
+    return rt(b.objectKeys(this.shape));
   }
 }
 w.create = (t, e) => new w({
@@ -1964,21 +1964,21 @@ w.lazycreate = (t, e) => new w({
 class de extends v {
   _parse(e) {
     const { ctx: n } = this._processInputParams(e), s = this._def.options;
-    function a(r) {
-      for (const o of r)
+    function r(a) {
+      for (const o of a)
         if (o.result.status === "valid")
           return o.result;
-      for (const o of r)
+      for (const o of a)
         if (o.result.status === "dirty")
           return n.common.issues.push(...o.ctx.common.issues), o.result;
-      const i = r.map((o) => new Z(o.ctx.common.issues));
+      const i = a.map((o) => new Z(o.ctx.common.issues));
       return l(n, {
         code: d.invalid_union,
         unionErrors: i
-      }), y;
+      }), _;
     }
     if (n.common.async)
-      return Promise.all(s.map(async (r) => {
+      return Promise.all(s.map(async (a) => {
         const i = {
           ...n,
           common: {
@@ -1988,16 +1988,16 @@ class de extends v {
           parent: null
         };
         return {
-          result: await r._parseAsync({
+          result: await a._parseAsync({
             data: n.data,
             path: n.path,
             parent: i
           }),
           ctx: i
         };
-      })).then(a);
+      })).then(r);
     {
-      let r;
+      let a;
       const i = [];
       for (const c of s) {
         const u = {
@@ -2014,15 +2014,15 @@ class de extends v {
         });
         if (p.status === "valid")
           return p;
-        p.status === "dirty" && !r && (r = { result: p, ctx: u }), u.common.issues.length && i.push(u.common.issues);
+        p.status === "dirty" && !a && (a = { result: p, ctx: u }), u.common.issues.length && i.push(u.common.issues);
       }
-      if (r)
-        return n.common.issues.push(...r.ctx.common.issues), r.result;
+      if (a)
+        return n.common.issues.push(...a.ctx.common.issues), a.result;
       const o = i.map((c) => new Z(c));
       return l(n, {
         code: d.invalid_union,
         unionErrors: o
-      }), y;
+      }), _;
     }
   }
   get options() {
@@ -2039,8 +2039,8 @@ function Ve(t, e) {
   if (t === e)
     return { valid: !0, data: t };
   if (n === h.object && s === h.object) {
-    const a = b.objectKeys(e), r = b.objectKeys(t).filter((o) => a.indexOf(o) !== -1), i = { ...t, ...e };
-    for (const o of r) {
+    const r = b.objectKeys(e), a = b.objectKeys(t).filter((o) => r.indexOf(o) !== -1), i = { ...t, ...e };
+    for (const o of a) {
       const c = Ve(t[o], e[o]);
       if (!c.valid)
         return { valid: !1 };
@@ -2050,25 +2050,25 @@ function Ve(t, e) {
   } else if (n === h.array && s === h.array) {
     if (t.length !== e.length)
       return { valid: !1 };
-    const a = [];
-    for (let r = 0; r < t.length; r++) {
-      const i = t[r], o = e[r], c = Ve(i, o);
+    const r = [];
+    for (let a = 0; a < t.length; a++) {
+      const i = t[a], o = e[a], c = Ve(i, o);
       if (!c.valid)
         return { valid: !1 };
-      a.push(c.data);
+      r.push(c.data);
     }
-    return { valid: !0, data: a };
+    return { valid: !0, data: r };
   } else return n === h.date && s === h.date && +t == +e ? { valid: !0, data: t } : { valid: !1 };
 }
 class ue extends v {
   _parse(e) {
-    const { status: n, ctx: s } = this._processInputParams(e), a = (r, i) => {
-      if ($e(r) || $e(i))
-        return y;
-      const o = Ve(r.value, i.value);
-      return o.valid ? ((je(r) || je(i)) && n.dirty(), { status: n.value, value: o.data }) : (l(s, {
+    const { status: n, ctx: s } = this._processInputParams(e), r = (a, i) => {
+      if ($e(a) || $e(i))
+        return _;
+      const o = Ve(a.value, i.value);
+      return o.valid ? ((je(a) || je(i)) && n.dirty(), { status: n.value, value: o.data }) : (l(s, {
         code: d.invalid_intersection_types
-      }), y);
+      }), _);
     };
     return s.common.async ? Promise.all([
       this._def.left._parseAsync({
@@ -2081,7 +2081,7 @@ class ue extends v {
         path: s.path,
         parent: s
       })
-    ]).then(([r, i]) => a(r, i)) : a(this._def.left._parseSync({
+    ]).then(([a, i]) => r(a, i)) : r(this._def.left._parseSync({
       data: s.data,
       path: s.path,
       parent: s
@@ -2106,7 +2106,7 @@ class F extends v {
         code: d.invalid_type,
         expected: h.array,
         received: s.parsedType
-      }), y;
+      }), _;
     if (s.data.length < this._def.items.length)
       return l(s, {
         code: d.too_small,
@@ -2114,7 +2114,7 @@ class F extends v {
         inclusive: !0,
         exact: !1,
         type: "array"
-      }), y;
+      }), _;
     !this._def.rest && s.data.length > this._def.items.length && (l(s, {
       code: d.too_big,
       maximum: this._def.items.length,
@@ -2122,11 +2122,11 @@ class F extends v {
       exact: !1,
       type: "array"
     }), n.dirty());
-    const r = [...s.data].map((i, o) => {
+    const a = [...s.data].map((i, o) => {
       const c = this._def.items[o] || this._def.rest;
       return c ? c._parse(new D(s, i, s.path, o)) : null;
     }).filter((i) => !!i);
-    return s.common.async ? Promise.all(r).then((i) => C.mergeArray(n, i)) : C.mergeArray(n, r);
+    return s.common.async ? Promise.all(a).then((i) => C.mergeArray(n, i)) : C.mergeArray(n, a);
   }
   get items() {
     return this._def.items;
@@ -2162,15 +2162,15 @@ class le extends v {
         code: d.invalid_type,
         expected: h.object,
         received: s.parsedType
-      }), y;
-    const a = [], r = this._def.keyType, i = this._def.valueType;
+      }), _;
+    const r = [], a = this._def.keyType, i = this._def.valueType;
     for (const o in s.data)
-      a.push({
-        key: r._parse(new D(s, o, s.path, o)),
+      r.push({
+        key: a._parse(new D(s, o, s.path, o)),
         value: i._parse(new D(s, s.data[o], s.path, o)),
         alwaysSet: o in s.data
       });
-    return s.common.async ? C.mergeObjectAsync(n, a) : C.mergeObjectSync(n, a);
+    return s.common.async ? C.mergeObjectAsync(n, r) : C.mergeObjectSync(n, r);
   }
   get element() {
     return this._def.valueType;
@@ -2203,10 +2203,10 @@ class Be extends v {
         code: d.invalid_type,
         expected: h.map,
         received: s.parsedType
-      }), y;
-    const a = this._def.keyType, r = this._def.valueType, i = [...s.data.entries()].map(([o, c], u) => ({
-      key: a._parse(new D(s, o, s.path, [u, "key"])),
-      value: r._parse(new D(s, c, s.path, [u, "value"]))
+      }), _;
+    const r = this._def.keyType, a = this._def.valueType, i = [...s.data.entries()].map(([o, c], u) => ({
+      key: r._parse(new D(s, o, s.path, [u, "key"])),
+      value: a._parse(new D(s, c, s.path, [u, "value"]))
     }));
     if (s.common.async) {
       const o = /* @__PURE__ */ new Map();
@@ -2214,7 +2214,7 @@ class Be extends v {
         for (const c of i) {
           const u = await c.key, p = await c.value;
           if (u.status === "aborted" || p.status === "aborted")
-            return y;
+            return _;
           (u.status === "dirty" || p.status === "dirty") && n.dirty(), o.set(u.value, p.value);
         }
         return { status: n.value, value: o };
@@ -2224,7 +2224,7 @@ class Be extends v {
       for (const c of i) {
         const u = c.key, p = c.value;
         if (u.status === "aborted" || p.status === "aborted")
-          return y;
+          return _;
         (u.status === "dirty" || p.status === "dirty") && n.dirty(), o.set(u.value, p.value);
       }
       return { status: n.value, value: o };
@@ -2245,34 +2245,34 @@ class se extends v {
         code: d.invalid_type,
         expected: h.set,
         received: s.parsedType
-      }), y;
-    const a = this._def;
-    a.minSize !== null && s.data.size < a.minSize.value && (l(s, {
+      }), _;
+    const r = this._def;
+    r.minSize !== null && s.data.size < r.minSize.value && (l(s, {
       code: d.too_small,
-      minimum: a.minSize.value,
+      minimum: r.minSize.value,
       type: "set",
       inclusive: !0,
       exact: !1,
-      message: a.minSize.message
-    }), n.dirty()), a.maxSize !== null && s.data.size > a.maxSize.value && (l(s, {
+      message: r.minSize.message
+    }), n.dirty()), r.maxSize !== null && s.data.size > r.maxSize.value && (l(s, {
       code: d.too_big,
-      maximum: a.maxSize.value,
+      maximum: r.maxSize.value,
       type: "set",
       inclusive: !0,
       exact: !1,
-      message: a.maxSize.message
+      message: r.maxSize.message
     }), n.dirty());
-    const r = this._def.valueType;
+    const a = this._def.valueType;
     function i(c) {
       const u = /* @__PURE__ */ new Set();
       for (const p of c) {
         if (p.status === "aborted")
-          return y;
+          return _;
         p.status === "dirty" && n.dirty(), u.add(p.value);
       }
       return { status: n.value, value: u };
     }
-    const o = [...s.data.values()].map((c, u) => r._parse(new D(s, c, s.path, u)));
+    const o = [...s.data.values()].map((c, u) => a._parse(new D(s, c, s.path, u)));
     return s.common.async ? Promise.all(o).then((c) => i(c)) : i(o);
   }
   min(e, n) {
@@ -2323,7 +2323,7 @@ class Fe extends v {
         received: n.data,
         code: d.invalid_literal,
         expected: this._def.value
-      }), y;
+      }), _;
     }
     return { status: "valid", value: e.data };
   }
@@ -2336,7 +2336,7 @@ Fe.create = (t, e) => new Fe({
   typeName: m.ZodLiteral,
   ...g(e)
 });
-function at(t, e) {
+function rt(t, e) {
   return new K({
     values: t,
     typeName: m.ZodEnum,
@@ -2351,7 +2351,7 @@ class K extends v {
         expected: b.joinValues(s),
         received: n.parsedType,
         code: d.invalid_type
-      }), y;
+      }), _;
     }
     if (this._cache || (this._cache = new Set(this._def.values)), !this._cache.has(e.data)) {
       const n = this._getOrReturnCtx(e), s = this._def.values;
@@ -2359,7 +2359,7 @@ class K extends v {
         received: n.data,
         code: d.invalid_enum_value,
         options: s
-      }), y;
+      }), _;
     }
     return N(e.data);
   }
@@ -2397,25 +2397,25 @@ class K extends v {
     });
   }
 }
-K.create = at;
+K.create = rt;
 class Ue extends v {
   _parse(e) {
     const n = b.getValidEnumValues(this._def.values), s = this._getOrReturnCtx(e);
     if (s.parsedType !== h.string && s.parsedType !== h.number) {
-      const a = b.objectValues(n);
+      const r = b.objectValues(n);
       return l(s, {
-        expected: b.joinValues(a),
+        expected: b.joinValues(r),
         received: s.parsedType,
         code: d.invalid_type
-      }), y;
+      }), _;
     }
     if (this._cache || (this._cache = new Set(b.getValidEnumValues(this._def.values))), !this._cache.has(e.data)) {
-      const a = b.objectValues(n);
+      const r = b.objectValues(n);
       return l(s, {
         received: s.data,
         code: d.invalid_enum_value,
-        options: a
-      }), y;
+        options: r
+      }), _;
     }
     return N(e.data);
   }
@@ -2439,9 +2439,9 @@ class he extends v {
         code: d.invalid_type,
         expected: h.promise,
         received: n.parsedType
-      }), y;
+      }), _;
     const s = n.parsedType === h.promise ? n.data : Promise.resolve(n.data);
-    return N(s.then((a) => this._def.type.parseAsync(a, {
+    return N(s.then((r) => this._def.type.parseAsync(r, {
       path: n.path,
       errorMap: n.common.contextualErrorMap
     })));
@@ -2460,7 +2460,7 @@ class U extends v {
     return this._def.schema._def.typeName === m.ZodEffects ? this._def.schema.sourceType() : this._def.schema;
   }
   _parse(e) {
-    const { status: n, ctx: s } = this._processInputParams(e), a = this._def.effect || null, r = {
+    const { status: n, ctx: s } = this._processInputParams(e), r = this._def.effect || null, a = {
       addIssue: (i) => {
         l(s, i), i.fatal ? n.abort() : n.dirty();
       },
@@ -2468,33 +2468,33 @@ class U extends v {
         return s.path;
       }
     };
-    if (r.addIssue = r.addIssue.bind(r), a.type === "preprocess") {
-      const i = a.transform(s.data, r);
+    if (a.addIssue = a.addIssue.bind(a), r.type === "preprocess") {
+      const i = r.transform(s.data, a);
       if (s.common.async)
         return Promise.resolve(i).then(async (o) => {
           if (n.value === "aborted")
-            return y;
+            return _;
           const c = await this._def.schema._parseAsync({
             data: o,
             path: s.path,
             parent: s
           });
-          return c.status === "aborted" ? y : c.status === "dirty" || n.value === "dirty" ? te(c.value) : c;
+          return c.status === "aborted" ? _ : c.status === "dirty" || n.value === "dirty" ? te(c.value) : c;
         });
       {
         if (n.value === "aborted")
-          return y;
+          return _;
         const o = this._def.schema._parseSync({
           data: i,
           path: s.path,
           parent: s
         });
-        return o.status === "aborted" ? y : o.status === "dirty" || n.value === "dirty" ? te(o.value) : o;
+        return o.status === "aborted" ? _ : o.status === "dirty" || n.value === "dirty" ? te(o.value) : o;
       }
     }
-    if (a.type === "refinement") {
+    if (r.type === "refinement") {
       const i = (o) => {
-        const c = a.refinement(o, r);
+        const c = r.refinement(o, a);
         if (s.common.async)
           return Promise.resolve(c);
         if (c instanceof Promise)
@@ -2507,11 +2507,11 @@ class U extends v {
           path: s.path,
           parent: s
         });
-        return o.status === "aborted" ? y : (o.status === "dirty" && n.dirty(), i(o.value), { status: n.value, value: o.value });
+        return o.status === "aborted" ? _ : (o.status === "dirty" && n.dirty(), i(o.value), { status: n.value, value: o.value });
       } else
-        return this._def.schema._parseAsync({ data: s.data, path: s.path, parent: s }).then((o) => o.status === "aborted" ? y : (o.status === "dirty" && n.dirty(), i(o.value).then(() => ({ status: n.value, value: o.value }))));
+        return this._def.schema._parseAsync({ data: s.data, path: s.path, parent: s }).then((o) => o.status === "aborted" ? _ : (o.status === "dirty" && n.dirty(), i(o.value).then(() => ({ status: n.value, value: o.value }))));
     }
-    if (a.type === "transform")
+    if (r.type === "transform")
       if (s.common.async === !1) {
         const i = this._def.schema._parseSync({
           data: s.data,
@@ -2519,17 +2519,17 @@ class U extends v {
           parent: s
         });
         if (!J(i))
-          return y;
-        const o = a.transform(i.value, r);
+          return _;
+        const o = r.transform(i.value, a);
         if (o instanceof Promise)
           throw new Error("Asynchronous transform encountered during synchronous parse operation. Use .parseAsync instead.");
         return { status: n.value, value: o };
       } else
-        return this._def.schema._parseAsync({ data: s.data, path: s.path, parent: s }).then((i) => J(i) ? Promise.resolve(a.transform(i.value, r)).then((o) => ({
+        return this._def.schema._parseAsync({ data: s.data, path: s.path, parent: s }).then((i) => J(i) ? Promise.resolve(r.transform(i.value, a)).then((o) => ({
           status: n.value,
           value: o
-        })) : y);
-    b.assertNever(a);
+        })) : _);
+    b.assertNever(r);
   }
 }
 U.create = (t, e, n) => new U({
@@ -2570,7 +2570,7 @@ G.create = (t, e) => new G({
   typeName: m.ZodNullable,
   ...g(e)
 });
-class ye extends v {
+class _e extends v {
   _parse(e) {
     const { ctx: n } = this._processInputParams(e);
     let s = n.data;
@@ -2584,13 +2584,13 @@ class ye extends v {
     return this._def.innerType;
   }
 }
-ye.create = (t, e) => new ye({
+_e.create = (t, e) => new _e({
   innerType: t,
   typeName: m.ZodDefault,
   defaultValue: typeof e.default == "function" ? e.default : () => e.default,
   ...g(e)
 });
-class _e extends v {
+class ye extends v {
   _parse(e) {
     const { ctx: n } = this._processInputParams(e), s = {
       ...n,
@@ -2598,16 +2598,16 @@ class _e extends v {
         ...n.common,
         issues: []
       }
-    }, a = this._def.innerType._parse({
+    }, r = this._def.innerType._parse({
       data: s.data,
       path: s.path,
       parent: {
         ...s
       }
     });
-    return oe(a) ? a.then((r) => ({
+    return oe(r) ? r.then((a) => ({
       status: "valid",
-      value: r.status === "valid" ? r.value : this._def.catchValue({
+      value: a.status === "valid" ? a.value : this._def.catchValue({
         get error() {
           return new Z(s.common.issues);
         },
@@ -2615,7 +2615,7 @@ class _e extends v {
       })
     })) : {
       status: "valid",
-      value: a.status === "valid" ? a.value : this._def.catchValue({
+      value: r.status === "valid" ? r.value : this._def.catchValue({
         get error() {
           return new Z(s.common.issues);
         },
@@ -2627,7 +2627,7 @@ class _e extends v {
     return this._def.innerType;
   }
 }
-_e.create = (t, e) => new _e({
+ye.create = (t, e) => new ye({
   innerType: t,
   typeName: m.ZodCatch,
   catchValue: typeof e.catch == "function" ? e.catch : () => e.catch,
@@ -2641,7 +2641,7 @@ class qe extends v {
         code: d.invalid_type,
         expected: h.nan,
         received: s.parsedType
-      }), y;
+      }), _;
     }
     return { status: "valid", value: e.data };
   }
@@ -2650,7 +2650,7 @@ qe.create = (t) => new qe({
   typeName: m.ZodNaN,
   ...g(t)
 });
-class rt extends v {
+class at extends v {
   _parse(e) {
     const { ctx: n } = this._processInputParams(e), s = n.data;
     return this._def.type._parse({
@@ -2668,28 +2668,28 @@ class xe extends v {
     const { status: n, ctx: s } = this._processInputParams(e);
     if (s.common.async)
       return (async () => {
-        const r = await this._def.in._parseAsync({
+        const a = await this._def.in._parseAsync({
           data: s.data,
           path: s.path,
           parent: s
         });
-        return r.status === "aborted" ? y : r.status === "dirty" ? (n.dirty(), te(r.value)) : this._def.out._parseAsync({
-          data: r.value,
+        return a.status === "aborted" ? _ : a.status === "dirty" ? (n.dirty(), te(a.value)) : this._def.out._parseAsync({
+          data: a.value,
           path: s.path,
           parent: s
         });
       })();
     {
-      const a = this._def.in._parseSync({
+      const r = this._def.in._parseSync({
         data: s.data,
         path: s.path,
         parent: s
       });
-      return a.status === "aborted" ? y : a.status === "dirty" ? (n.dirty(), {
+      return r.status === "aborted" ? _ : r.status === "dirty" ? (n.dirty(), {
         status: "dirty",
-        value: a.value
+        value: r.value
       }) : this._def.out._parseSync({
-        data: a.value,
+        data: r.value,
         path: s.path,
         parent: s
       });
@@ -2705,8 +2705,8 @@ class xe extends v {
 }
 class ge extends v {
   _parse(e) {
-    const n = this._def.innerType._parse(e), s = (a) => (J(a) && (a.value = Object.freeze(a.value)), a);
-    return oe(n) ? n.then((a) => s(a)) : s(n);
+    const n = this._def.innerType._parse(e), s = (r) => (J(r) && (r.value = Object.freeze(r.value)), r);
+    return oe(n) ? n.then((r) => s(r)) : s(n);
   }
   unwrap() {
     return this._def.innerType;
@@ -2721,7 +2721,7 @@ var m;
 (function(t) {
   t.ZodString = "ZodString", t.ZodNumber = "ZodNumber", t.ZodNaN = "ZodNaN", t.ZodBigInt = "ZodBigInt", t.ZodBoolean = "ZodBoolean", t.ZodDate = "ZodDate", t.ZodSymbol = "ZodSymbol", t.ZodUndefined = "ZodUndefined", t.ZodNull = "ZodNull", t.ZodAny = "ZodAny", t.ZodUnknown = "ZodUnknown", t.ZodNever = "ZodNever", t.ZodVoid = "ZodVoid", t.ZodArray = "ZodArray", t.ZodObject = "ZodObject", t.ZodUnion = "ZodUnion", t.ZodDiscriminatedUnion = "ZodDiscriminatedUnion", t.ZodIntersection = "ZodIntersection", t.ZodTuple = "ZodTuple", t.ZodRecord = "ZodRecord", t.ZodMap = "ZodMap", t.ZodSet = "ZodSet", t.ZodFunction = "ZodFunction", t.ZodLazy = "ZodLazy", t.ZodLiteral = "ZodLiteral", t.ZodEnum = "ZodEnum", t.ZodEffects = "ZodEffects", t.ZodNativeEnum = "ZodNativeEnum", t.ZodOptional = "ZodOptional", t.ZodNullable = "ZodNullable", t.ZodDefault = "ZodDefault", t.ZodCatch = "ZodCatch", t.ZodPromise = "ZodPromise", t.ZodBranded = "ZodBranded", t.ZodPipeline = "ZodPipeline", t.ZodReadonly = "ZodReadonly";
 })(m || (m = {}));
-const _ = I.create, it = Y.create, ke = me.create;
+const y = I.create, it = Y.create, ke = me.create;
 B.create;
 const A = R.create, $ = w.create;
 de.create;
@@ -2735,7 +2735,7 @@ G.create;
 const Vt = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   DIRTY: te,
-  INVALID: y,
+  INVALID: _,
   OK: N,
   ParseStatus: C,
   Schema: v,
@@ -2743,10 +2743,10 @@ const Vt = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   ZodArray: R,
   ZodBigInt: ne,
   ZodBoolean: me,
-  ZodBranded: rt,
-  ZodCatch: _e,
+  ZodBranded: at,
+  ZodCatch: ye,
   ZodDate: ce,
-  ZodDefault: ye,
+  ZodDefault: _e,
   ZodEffects: U,
   ZodEnum: K,
   ZodError: Z,
@@ -2800,18 +2800,18 @@ const Vt = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     return Re;
   },
   record: ot,
-  string: _,
+  string: y,
   get util() {
     return b;
   }
 }, Symbol.toStringTag, { value: "Module" }));
-_t(Vt);
+yt(Vt);
 const Bt = (t, e) => e.skipDedupe || e.method !== "GET", zt = (t, e) => e.method + "@" + t, Ft = (t) => t.clone(), Ut = ({ skip: t = Bt, key: e = zt, resolver: n = Ft } = {}) => {
   const s = /* @__PURE__ */ new Map();
-  return (a) => (r, i) => {
-    if (t(r, i))
-      return a(r, i);
-    const o = e(r, i);
+  return (r) => (a, i) => {
+    if (t(a, i))
+      return r(a, i);
+    const o = e(a, i);
     if (!s.has(o))
       s.set(o, []);
     else
@@ -2819,21 +2819,21 @@ const Bt = (t, e) => e.skipDedupe || e.method !== "GET", zt = (t, e) => e.method
         s.get(o).push([c, u]);
       });
     try {
-      return a(r, i).then((c) => (s.get(o).forEach(([u]) => u(n(c))), s.delete(o), c)).catch((c) => {
+      return r(a, i).then((c) => (s.get(o).forEach(([u]) => u(n(c))), s.delete(o), c)).catch((c) => {
         throw s.get(o).forEach(([, u]) => u(c)), s.delete(o), c;
       });
     } catch (c) {
       return s.delete(o), Promise.reject(c);
     }
   };
-}, qt = (t, e) => t * e, Wt = (t) => t && (t.ok || t.status >= 400 && t.status < 500), Qt = ({ delayTimer: t = 500, delayRamp: e = qt, maxAttempts: n = 10, until: s = Wt, onRetry: a = null, retryOnNetworkError: r = !1, resolveWithLatestResponse: i = !1, skip: o } = {}) => (c) => (u, p) => {
+}, qt = (t, e) => t * e, Wt = (t) => t && (t.ok || t.status >= 400 && t.status < 500), Qt = ({ delayTimer: t = 500, delayRamp: e = qt, maxAttempts: n = 10, until: s = Wt, onRetry: r = null, retryOnNetworkError: a = !1, resolveWithLatestResponse: i = !1, skip: o } = {}) => (c) => (u, p) => {
   let k = 0;
   if (o && o(u, p))
     return c(u, p);
   const T = (S, E) => Promise.resolve(s(S, E)).then((q) => q ? S && i ? S : E ? Promise.reject(E) : S : (k++, !n || k <= n ? new Promise((x) => {
     const L = e(t, k);
     setTimeout(() => {
-      typeof a == "function" ? Promise.resolve(a({
+      typeof r == "function" ? Promise.resolve(r({
         response: S,
         error: E,
         url: u,
@@ -2845,70 +2845,70 @@ const Bt = (t, e) => e.skipDedupe || e.method !== "GET", zt = (t, e) => e.method
       }) : x(c(u, p));
     }, L);
   }).then(T).catch((x) => {
-    if (!r)
+    if (!a)
       throw x;
     return T(null, x);
   }) : S && i ? S : Promise.reject(E || new Error("Number of attempts exceeded."))));
   return c(u, p).then(T).catch((S) => {
-    if (!r)
+    if (!a)
       throw S;
     return T(null, S);
   });
 }, ve = $({
   code: it(),
-  message: _()
+  message: y()
 }), Ht = $({
-  message: _()
+  message: y()
 }), Jt = $({
-  emails: A(_()).optional(),
-  http_body: _().optional(),
-  http_url: _().optional(),
-  txt_name: _().optional(),
-  txt_value: _().optional()
+  emails: A(y()).optional(),
+  http_body: y().optional(),
+  http_url: y().optional(),
+  txt_name: y().optional(),
+  txt_value: y().optional()
 }), Yt = $({
-  ciphers: A(_()).optional(),
-  early_hints: _().optional(),
-  http2: _().optional(),
-  min_tls_version: _().optional(),
-  tls_1_3: _().optional()
+  ciphers: A(y()).optional(),
+  early_hints: y().optional(),
+  http2: y().optional(),
+  min_tls_version: y().optional(),
+  tls_1_3: y().optional()
 }), Kt = $({
-  id: _(),
-  bundle_method: _().optional(),
-  certificate_authority: _(),
-  custom_certificate: _().optional(),
-  custom_csr_id: _().optional(),
-  custom_key: _().optional(),
-  expires_on: _().optional(),
-  hosts: A(_()).optional(),
-  issuer: _().optional(),
-  method: _(),
-  serial_number: _().optional(),
+  id: y(),
+  bundle_method: y().optional(),
+  certificate_authority: y(),
+  custom_certificate: y().optional(),
+  custom_csr_id: y().optional(),
+  custom_key: y().optional(),
+  expires_on: y().optional(),
+  hosts: A(y()).optional(),
+  issuer: y().optional(),
+  method: y(),
+  serial_number: y().optional(),
   settings: Yt.optional(),
-  signature: _().optional(),
-  type: _(),
-  uploaded_on: _().optional(),
+  signature: y().optional(),
+  type: y(),
+  uploaded_on: y().optional(),
   validation_errors: A(Ht).optional(),
   validation_records: A(Jt).optional(),
   wildcard: ke()
 }), Gt = $({
-  name: _(),
-  type: _(),
-  value: _()
+  name: y(),
+  type: y(),
+  value: y()
 }), Xt = $({
-  http_body: _().optional(),
-  http_url: _().optional()
+  http_body: y().optional(),
+  http_url: y().optional()
 }), ct = $({
-  id: _(),
+  id: y(),
   ssl: Kt,
-  hostname: _(),
-  custom_metadata: ot(_()).optional(),
-  custom_origin_server: _().optional(),
-  custom_origin_sni: _().optional(),
+  hostname: y(),
+  custom_metadata: ot(y()).optional(),
+  custom_origin_server: y().optional(),
+  custom_origin_sni: y().optional(),
   ownership_verification: Gt.optional(),
   ownership_verification_http: Xt.optional(),
-  status: _(),
-  verification_errors: A(_()).optional(),
-  created_at: _()
+  status: y(),
+  verification_errors: A(y()).optional(),
+  created_at: y()
 }), ie = $({
   errors: A(ve),
   messages: A(ve),
@@ -2931,8 +2931,8 @@ function H(t) {
 function Je(t) {
   const e = {}, n = {};
   if (!t) return { sslOverrides: e, rest: n };
-  for (const [s, a] of Object.entries(t))
-    s.startsWith("ssl.") ? e[s.slice(4)] = a : n[s] = a;
+  for (const [s, r] of Object.entries(t))
+    s.startsWith("ssl.") ? e[s.slice(4)] = r : n[s] = r;
   return { sslOverrides: e, rest: n };
 }
 function Ne(t) {
@@ -2944,11 +2944,21 @@ function Ne(t) {
         record: s.txt_value,
         domain: s.txt_name
       });
-  t.ownership_verification && e.push({
+  if (t.ownership_verification && e.push({
     name: "txt",
     record: t.ownership_verification.value,
     domain: t.ownership_verification.name
-  });
+  }), t.ownership_verification_http?.http_body && t.ownership_verification_http?.http_url && e.push({
+    name: "http",
+    http_body: t.ownership_verification_http.http_body,
+    http_url: t.ownership_verification_http.http_url
+  }), t.ssl.validation_records)
+    for (const s of t.ssl.validation_records)
+      s.http_body && s.http_url && e.push({
+        name: "http",
+        http_body: s.http_body,
+        http_url: s.http_url
+      });
   const n = {
     ...t.domain_metadata || {},
     "ssl.method": t.ssl.method,
@@ -2970,9 +2980,9 @@ function Ne(t) {
 function en(t) {
   return {
     create: async (e, n) => {
-      const { sslOverrides: s, rest: a } = Je(
+      const { sslOverrides: s, rest: r } = Je(
         n.domain_metadata
-      ), { result: r, errors: i, success: o } = ie.parse(
+      ), { result: a, errors: i, success: o } = ie.parse(
         await H(t).post(
           {
             hostname: n.domain,
@@ -2991,9 +3001,9 @@ function en(t) {
       if (!o)
         throw new Error(JSON.stringify(i));
       const c = Ne({
-        ...r,
+        ...a,
         primary: !1,
-        domain_metadata: a
+        domain_metadata: r
       });
       return await t.customDomainAdapter.create(e, {
         custom_domain_id: c.custom_domain_id,
@@ -3009,65 +3019,65 @@ function en(t) {
       );
       if (!s)
         throw new X(404);
-      const a = await H(t).get(`/custom_hostnames/${encodeURIComponent(n)}`).json(), { result: r, errors: i, success: o } = ie.parse(a);
+      const r = await H(t).get(`/custom_hostnames/${encodeURIComponent(n)}`).json(), { result: a, errors: i, success: o } = ie.parse(r);
       if (!o)
         throw new X(503, {
           message: JSON.stringify(i)
         });
-      if (t.enterprise && r.custom_metadata?.tenant_id !== e)
+      if (t.enterprise && a.custom_metadata?.tenant_id !== e)
         throw new X(404);
-      return Ne({ ...s, ...r });
+      return Ne({ ...s, ...a });
     },
     getByDomain: async (e) => t.customDomainAdapter.getByDomain(e),
     list: async (e) => {
       const n = await t.customDomainAdapter.list(e);
       return (await Promise.all(
-        n.map(async (a) => {
+        n.map(async (r) => {
           try {
-            const r = await H(t).get(
-              `/custom_hostnames/${encodeURIComponent(a.custom_domain_id)}`
-            ).json(), { result: i, success: o } = ie.parse(r);
+            const a = await H(t).get(
+              `/custom_hostnames/${encodeURIComponent(r.custom_domain_id)}`
+            ).json(), { result: i, success: o } = ie.parse(a);
             return !o || t.enterprise && i.custom_metadata?.tenant_id !== e ? null : Ne({
-              ...a,
+              ...r,
               ...i
             });
           } catch {
             return null;
           }
         })
-      )).filter((a) => a !== null);
+      )).filter((r) => r !== null);
     },
     remove: async (e, n) => {
       if (t.enterprise) {
-        const { result: a, success: r } = ie.parse(
+        const { result: r, success: a } = ie.parse(
           await H(t).get(`/custom_hostnames/${encodeURIComponent(n)}`).json()
         );
-        if (!r || a.custom_metadata?.tenant_id !== e)
+        if (!a || r.custom_metadata?.tenant_id !== e)
           throw new X(404);
       }
       const s = await H(t).delete(`/custom_hostnames/${encodeURIComponent(n)}`).res();
       return s.ok && await t.customDomainAdapter.remove(e, n), s.ok;
     },
     update: async (e, n, s) => {
-      const { sslOverrides: a } = Je(
+      const { sslOverrides: r } = Je(
         s.domain_metadata
-      ), r = {};
-      if (Object.keys(a).length > 0) {
+      ), a = {};
+      if (Object.keys(r).length > 0) {
         const i = await H(t).get(`/custom_hostnames/${encodeURIComponent(n)}`).json(), { result: o, success: c } = ie.parse(i);
         if (!c)
           throw new X(503, {
             message: "Failed to fetch current custom hostname state"
           });
-        r.ssl = {
+        a.ssl = {
           method: o.ssl.method,
           type: o.ssl.type,
           certificate_authority: o.ssl.certificate_authority,
-          ...a
+          ...r
         };
       }
-      if (Object.keys(r).length > 0) {
+      if (Object.keys(a).length > 0) {
         const i = await H(t).patch(
-          r,
+          a,
           `/custom_hostnames/${encodeURIComponent(n)}`
         ).res();
         if (!i.ok)
@@ -3105,18 +3115,18 @@ class tn {
   }
   async get(e) {
     try {
-      const n = await this.getCache(), s = this.createRequest(e), a = await n.match(s);
-      if (!a)
+      const n = await this.getCache(), s = this.createRequest(e), r = await n.match(s);
+      if (!r)
         return null;
-      const r = await a.json();
-      return r.expiresAt && new Date(r.expiresAt) < /* @__PURE__ */ new Date() ? (await this.delete(e), null) : r.value;
+      const a = await r.json();
+      return a.expiresAt && new Date(a.expiresAt) < /* @__PURE__ */ new Date() ? (await this.delete(e), null) : a.value;
     } catch (n) {
       return console.error(`CloudflareCache: get error for key ${e}:`, n), null;
     }
   }
   async set(e, n, s) {
     try {
-      const a = await this.getCache(), r = s ?? this.config.defaultTtlSeconds, i = r !== void 0, o = i ? Math.max(0, r) : 0, c = {
+      const r = await this.getCache(), a = s ?? this.config.defaultTtlSeconds, i = a !== void 0, o = i ? Math.max(0, a) : 0, c = {
         value: n,
         expiresAt: i ? new Date(Date.now() + (o > 0 ? o * 1e3 : -1)).toISOString() : void 0,
         cachedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -3127,9 +3137,9 @@ class tn {
       const k = new Response(JSON.stringify(c), {
         headers: p
       });
-      await a.put(u, k);
-    } catch (a) {
-      console.error(`CloudflareCache: set error for key ${e}:`, a);
+      await r.put(u, k);
+    } catch (r) {
+      console.error(`CloudflareCache: set error for key ${e}:`, r);
     }
   }
   async delete(e) {
@@ -3170,9 +3180,9 @@ let dt = (t = 21) => {
   return e;
 };
 async function We(t, e) {
-  const n = t.timeout || 3e4, s = new AbortController(), a = setTimeout(() => s.abort(), n);
+  const n = t.timeout || 3e4, s = new AbortController(), r = setTimeout(() => s.abort(), n);
   try {
-    const r = `https://api.sql.cloudflarestorage.com/api/v1/accounts/${t.accountId}/r2-sql/query/${t.warehouseName}`, i = await fetch(r, {
+    const a = `https://api.sql.cloudflarestorage.com/api/v1/accounts/${t.accountId}/r2-sql/query/${t.warehouseName}`, i = await fetch(a, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -3193,7 +3203,7 @@ async function We(t, e) {
       throw new Error(`R2 SQL error: ${o.errors.join(", ")}`);
     return o.data || o.result?.data || [];
   } finally {
-    clearTimeout(a);
+    clearTimeout(r);
   }
 }
 function be(t) {
@@ -3244,17 +3254,17 @@ function ut(t) {
     } : void 0
   };
 }
-function an(t) {
+function rn(t) {
   return async (e, n) => {
-    const s = n.log_id || dt(), a = {
+    const s = n.log_id || dt(), r = {
       ...n,
       log_id: s
     };
-    return await rn(t, e, a), a;
+    return await an(t, e, r), r;
   };
 }
-async function rn(t, e, n) {
-  const s = (r) => r ? JSON.stringify(r) : void 0, a = {
+async function an(t, e, n) {
+  const s = (a) => a ? JSON.stringify(a) : void 0, r = {
     id: n.log_id,
     tenant_id: e,
     type: n.type,
@@ -3287,16 +3297,16 @@ async function rn(t, e, n) {
   };
   try {
     if (t.pipelineBinding)
-      await t.pipelineBinding.send([a]);
+      await t.pipelineBinding.send([r]);
     else if (t.pipelineEndpoint) {
-      const r = t.timeout || 3e4, i = new AbortController(), o = setTimeout(() => i.abort(), r);
+      const a = t.timeout || 3e4, i = new AbortController(), o = setTimeout(() => i.abort(), a);
       try {
         const c = await fetch(t.pipelineEndpoint, {
           method: "POST",
           headers: {
             "Content-Type": "application/json"
           },
-          body: JSON.stringify([a]),
+          body: JSON.stringify([r]),
           // Pipelines accept array of records
           signal: i.signal
         });
@@ -3311,18 +3321,18 @@ async function rn(t, e, n) {
       throw new Error(
         "Either pipelineEndpoint or pipelineBinding must be configured"
       );
-  } catch (r) {
-    throw console.error("Failed to send log to Pipeline:", r), r;
+  } catch (a) {
+    throw console.error("Failed to send log to Pipeline:", a), a;
   }
 }
 function on(t) {
   return async (e, n) => {
-    const s = t.namespace || "default", a = t.tableName || "logs", r = `
-      SELECT * FROM ${z(s)}.${z(a)}
+    const s = t.namespace || "default", r = t.tableName || "logs", a = `
+      SELECT * FROM ${z(s)}.${z(r)}
       WHERE tenant_id = ${be(e)}
         AND id = ${be(n)}
       LIMIT 1
-    `, i = await We(t, r);
+    `, i = await We(t, a);
     if (i.length === 0)
       return null;
     const o = i[0];
@@ -3332,23 +3342,23 @@ function on(t) {
 function cn(t) {
   const e = {};
   return (t.match(/(\w+):(\S+)/g) || []).forEach((s) => {
-    const [a, r] = s.split(":");
-    a && r && (e[a] = r);
+    const [r, a] = s.split(":");
+    r && a && (e[r] = a);
   }), e;
 }
 function dn(t) {
   const e = [];
   for (const [n, s] of Object.entries(t)) {
-    const a = n.replace(/[^a-zA-Z0-9_]/g, "");
-    a && s && e.push(
-      `${z(a)} = ${be(s)}`
+    const r = n.replace(/[^a-zA-Z0-9_]/g, "");
+    r && s && e.push(
+      `${z(r)} = ${be(s)}`
     );
   }
   return e;
 }
 function un(t) {
   return async (e, n = {}) => {
-    const { page: s = 0, per_page: a = 50, include_totals: r = !1, sort: i, q: o } = n, c = t.namespace || "default", u = t.tableName || "logs", p = [
+    const { page: s = 0, per_page: r = 50, include_totals: a = !1, sort: i, q: o } = n, c = t.namespace || "default", u = t.tableName || "logs", p = [
       `tenant_id = ${be(e)}`
     ];
     if (o) {
@@ -3358,16 +3368,16 @@ function un(t) {
     const k = p.join(" AND ");
     let T = "ORDER BY date DESC";
     if (i && i.sort_by) {
-      const Q = i.sort_by.replace(/[^a-zA-Z0-9_]/g, ""), ae = i.sort_order === "asc" ? "ASC" : "DESC";
-      T = `ORDER BY ${z(Q)} ${ae}`;
+      const Q = i.sort_by.replace(/[^a-zA-Z0-9_]/g, ""), re = i.sort_order === "asc" ? "ASC" : "DESC";
+      T = `ORDER BY ${z(Q)} ${re}`;
     }
-    const S = s * a, E = `LIMIT ${a} OFFSET ${S}`, q = `
+    const S = s * r, E = `LIMIT ${r} OFFSET ${S}`, q = `
       SELECT * FROM ${z(c)}.${z(u)}
       WHERE ${k}
       ${T}
       ${E}
     `, L = (await We(t, q)).map(ut);
-    if (!r)
+    if (!a)
       return {
         logs: L,
         start: 0,
@@ -3381,7 +3391,7 @@ function un(t) {
     return {
       logs: L,
       start: S,
-      limit: a,
+      limit: r,
       length: Number(W)
     };
   };
@@ -3413,15 +3423,15 @@ function ln(t) {
       'R2 SQL logs adapter requires "warehouseName" configuration'
     );
   return {
-    create: an(t),
+    create: rn(t),
     list: un(t),
     get: on(t)
   };
 }
 async function fe(t, e) {
-  const n = t.timeout || 3e4, s = new AbortController(), a = setTimeout(() => s.abort(), n);
+  const n = t.timeout || 3e4, s = new AbortController(), r = setTimeout(() => s.abort(), n);
   try {
-    const r = `https://api.cloudflare.com/client/v4/accounts/${t.accountId}/analytics_engine/sql`, i = await fetch(r, {
+    const a = `https://api.cloudflare.com/client/v4/accounts/${t.accountId}/analytics_engine/sql`, i = await fetch(a, {
       method: "POST",
       headers: {
         "Content-Type": "text/plain",
@@ -3443,7 +3453,7 @@ async function fe(t, e) {
       );
     return o.data || [];
   } finally {
-    clearTimeout(a);
+    clearTimeout(r);
   }
 }
 function M(t) {
@@ -3453,10 +3463,10 @@ function Qe(t) {
   return `"${t.replace(/"/g, '""')}"`;
 }
 function lt(t) {
-  const e = (a) => {
-    if (a)
+  const e = (r) => {
+    if (r)
       try {
-        return JSON.parse(a);
+        return JSON.parse(r);
       } catch {
         return;
       }
@@ -3487,11 +3497,11 @@ function lt(t) {
 }
 function hn(t) {
   return async (e, n) => {
-    const s = n.log_id || dt(), a = {
+    const s = n.log_id || dt(), r = {
       ...n,
       log_id: s
     };
-    return fn(t, e, a), a;
+    return fn(t, e, r), r;
   };
 }
 function fn(t, e, n) {
@@ -3499,49 +3509,49 @@ function fn(t, e, n) {
     console.error("Analytics Engine binding not configured");
     return;
   }
-  const s = (r) => r == null ? "" : typeof r == "string" ? r : JSON.stringify(r), a = (r, i = 1024) => r.substring(0, i);
+  const s = (a) => a == null ? "" : typeof a == "string" ? a : JSON.stringify(a), r = (a, i = 1024) => a.substring(0, i);
   try {
     t.analyticsEngineBinding.writeDataPoint({
       blobs: [
-        a(n.log_id),
+        r(n.log_id),
         // blob1: log_id
-        a(e),
+        r(e),
         // blob2: tenant_id
-        a(n.type || ""),
+        r(n.type || ""),
         // blob3: type
-        a(n.description || ""),
+        r(n.description || ""),
         // blob4: description
-        a(n.ip || ""),
+        r(n.ip || ""),
         // blob5: ip
-        a(n.user_agent || ""),
+        r(n.user_agent || ""),
         // blob6: user_agent
-        a(n.user_id || ""),
+        r(n.user_id || ""),
         // blob7: user_id
-        a(n.user_name || ""),
+        r(n.user_name || ""),
         // blob8: user_name
-        a(n.connection || ""),
+        r(n.connection || ""),
         // blob9: connection
-        a(n.connection_id || ""),
+        r(n.connection_id || ""),
         // blob10: connection_id
-        a(n.client_id || ""),
+        r(n.client_id || ""),
         // blob11: client_id
-        a(n.client_name || ""),
+        r(n.client_name || ""),
         // blob12: client_name
-        a(n.audience || ""),
+        r(n.audience || ""),
         // blob13: audience
-        a(n.scope || ""),
+        r(n.scope || ""),
         // blob14: scope
-        a(n.strategy || ""),
+        r(n.strategy || ""),
         // blob15: strategy
-        a(n.strategy_type || ""),
+        r(n.strategy_type || ""),
         // blob16: strategy_type
-        a(n.hostname || ""),
+        r(n.hostname || ""),
         // blob17: hostname
-        a(s(n.details)),
+        r(s(n.details)),
         // blob18: details (JSON)
-        a(s(n.auth0_client)),
+        r(s(n.auth0_client)),
         // blob19: auth0_client (JSON)
-        a(s(n.location_info))
+        r(s(n.location_info))
         // blob20: location_info (JSON)
       ],
       doubles: [
@@ -3553,27 +3563,27 @@ function fn(t, e, n) {
       indexes: [e.substring(0, 96)]
       // index1: tenant_id
     });
-  } catch (r) {
-    console.error("Failed to write log to Analytics Engine:", r);
+  } catch (a) {
+    console.error("Failed to write log to Analytics Engine:", a);
   }
 }
 function pn(t) {
   return async (e, n) => {
-    const s = t.dataset || "authhero_logs", a = `
+    const s = t.dataset || "authhero_logs", r = `
       SELECT *
       FROM ${Qe(s)}
       WHERE index1 = ${M(e)}
         AND blob1 = ${M(n)}
       LIMIT 1
-    `, r = await fe(t, a);
-    return r.length === 0 || !r[0] ? null : lt(r[0]);
+    `, a = await fe(t, r);
+    return a.length === 0 || !a[0] ? null : lt(a[0]);
   };
 }
 function mn(t) {
   const e = {};
   return (t.match(/(\w+):(\S+)/g) || []).forEach((s) => {
-    const a = s.indexOf(":"), r = s.substring(0, a), i = s.substring(a + 1);
-    r && i && (e[r] = i);
+    const r = s.indexOf(":"), a = s.substring(0, r), i = s.substring(r + 1);
+    a && i && (e[a] = i);
   }), e;
 }
 function ht(t) {
@@ -3597,15 +3607,15 @@ function ht(t) {
     hostname: "blob17"
   }[t] || null;
 }
-function yn(t) {
+function _n(t) {
   const e = [];
   for (const [n, s] of Object.entries(t)) {
-    const a = ht(n);
-    a && s && e.push(`${a} = ${M(s)}`);
+    const r = ht(n);
+    r && s && e.push(`${r} = ${M(s)}`);
   }
   return e;
 }
-function _n(t) {
+function yn(t) {
   if (t === "date")
     return "double2";
   const e = ht(t);
@@ -3613,25 +3623,25 @@ function _n(t) {
 }
 function gn(t) {
   return async (e, n = {}) => {
-    const { page: s = 0, per_page: a = 50, include_totals: r = !1, sort: i, q: o } = n, c = t.dataset || "authhero_logs", u = [`index1 = ${M(e)}`];
+    const { page: s = 0, per_page: r = 50, include_totals: a = !1, sort: i, q: o } = n, c = t.dataset || "authhero_logs", u = [`index1 = ${M(e)}`];
     if (o) {
       const O = mn(o);
-      u.push(...yn(O));
+      u.push(..._n(O));
     }
     const p = u.join(" AND ");
     let k = "ORDER BY timestamp DESC";
     if (i && i.sort_by) {
-      const O = _n(i.sort_by), j = i.sort_order === "asc" ? "ASC" : "DESC";
+      const O = yn(i.sort_by), j = i.sort_order === "asc" ? "ASC" : "DESC";
       k = `ORDER BY ${O} ${j}`;
     }
-    const T = s * a, S = `LIMIT ${a} OFFSET ${T}`, E = `
+    const T = s * r, S = `LIMIT ${r} OFFSET ${T}`, E = `
       SELECT *
       FROM ${Qe(c)}
       WHERE ${p}
       ${k}
       ${S}
     `, x = (await fe(t, E)).map(lt);
-    if (!r)
+    if (!a)
       return {
         logs: x,
         start: 0,
@@ -3648,14 +3658,14 @@ function gn(t) {
       return {
         logs: x,
         start: T,
-        limit: a,
+        limit: r,
         length: Number(j)
       };
     } catch {
       return {
         logs: x,
         start: T,
-        limit: a,
+        limit: r,
         length: x.length
       };
     }
@@ -3689,9 +3699,9 @@ function Tn(t) {
   const e = t.dataset || "authhero_logs";
   return {
     async getDaily(n, s = {}) {
-      const { from: a, to: r } = s, i = /* @__PURE__ */ new Date(), o = new Date(i);
+      const { from: r, to: a } = s, i = /* @__PURE__ */ new Date(), o = new Date(i);
       o.setDate(o.getDate() - 30);
-      const c = a ? Ke(a) : Ge(o), u = r ? Ke(r) : Ge(i), p = (/* @__PURE__ */ new Date(`${c}T00:00:00Z`)).getTime(), k = (/* @__PURE__ */ new Date(`${u}T23:59:59.999Z`)).getTime(), T = Ye.map((x) => M(x)).join(", "), S = vn.map(
+      const c = r ? Ke(r) : Ge(o), u = a ? Ke(a) : Ge(i), p = (/* @__PURE__ */ new Date(`${c}T00:00:00Z`)).getTime(), k = (/* @__PURE__ */ new Date(`${u}T23:59:59.999Z`)).getTime(), T = Ye.map((x) => M(x)).join(", "), S = vn.map(
         (x) => M(x)
       ).join(", "), E = `
         SELECT
@@ -3720,12 +3730,12 @@ function Tn(t) {
     async getActiveUsers(n) {
       const s = /* @__PURE__ */ new Date();
       s.setDate(s.getDate() - 30);
-      const a = s.getTime(), r = Ye.map((u) => M(u)).join(", "), i = `
+      const r = s.getTime(), a = Ye.map((u) => M(u)).join(", "), i = `
         SELECT COUNT(DISTINCT blob7) AS count
         FROM "${e}"
         WHERE index1 = ${M(n)}
-          AND double2 >= ${a}
-          AND blob3 IN (${r})
+          AND double2 >= ${r}
+          AND blob3 IN (${a})
           AND blob7 IS NOT NULL
           AND blob7 != ''
       `, c = (await fe(t, i))[0];
@@ -3748,13 +3758,13 @@ function xn() {
   return {
     async getGeoInfo(t) {
       try {
-        const e = t["cf-ipcountry"], n = t["cf-ipcity"], s = t["cf-iplatitude"], a = t["cf-iplongitude"], r = t["cf-timezone"], i = t["cf-ipcontinent"];
+        const e = t["cf-ipcountry"], n = t["cf-ipcity"], s = t["cf-iplatitude"], r = t["cf-iplongitude"], a = t["cf-timezone"], i = t["cf-ipcontinent"];
         return e ? {
           country_code: e,
           city_name: n || "",
           latitude: s || "",
-          longitude: a || "",
-          time_zone: r || "",
+          longitude: r || "",
+          time_zone: a || "",
           continent_code: i || ""
         } : null;
       } catch (e) {