@wp-playground/client 0.6.7 → 0.6.9

package/index.js

@@ -269,7 +269,6 @@ const activatePlugin = async (e, { pluginPath: t, pluginName: r }, n) => {
   n == null || n.tracker.setCaption(`Activating ${r || t}`);
   const s = await e.documentRoot;
   await e.run({
-    throwOnError: !0,
     code: `<?php
 define( 'WP_ADMIN', true );
 require_once( ${phpVar(s)}. "/wp-load.php" );
@@ -301,7 +300,6 @@ exit(1);
   r == null || r.tracker.setCaption(`Activating ${t}`);
   const n = await e.documentRoot;
   await e.run({
-    throwOnError: !0,
     code: `<?php
 define( 'WP_ADMIN', true );
 require_once( ${phpVar(n)}. "/wp-load.php" );
@@ -312,7 +310,7 @@ set_current_user( get_users(array('role' => 'Administrator') )[0] );
 switch_theme( ${phpVar(t)} );
 `
   });
-}, runPHP = async (e, { code: t }) => await e.run({ code: t, throwOnError: !0 }), runPHPWithOptions = async (e, { options: t }) => await e.run(t), rm = async (e, { path: t }) => {
+}, runPHP = async (e, { code: t }) => await e.run({ code: t }), runPHPWithOptions = async (e, { options: t }) => await e.run(t), rm = async (e, { path: t }) => {
   await e.unlink(t);
 }, runSql = async (e, { sql: t }, r) => {
   r == null || r.tracker.setCaption("Executing SQL Queries");
@@ -712,7 +710,6 @@ async function rewriteDefineCalls(e, t, r) {
     consts: r
   });
   return await e.run({
-    throwOnError: !0,
     code: `${rewriteWpConfigToDefineConstants}
 	$wp_config_path = '/tmp/code.php';
 	$wp_config = file_get_contents($wp_config_path);
@@ -745,7 +742,6 @@ const login = async (e, { username: t = "admin", password: r = "password" } = {}
 }, setSiteOptions = async (e, { options: t }) => {
   const r = await e.documentRoot;
   await e.run({
-    throwOnError: !0,
     code: `<?php
 		include ${phpVar(r)} . '/wp-load.php';
 		$site_options = ${phpVar(t)};
@@ -758,7 +754,6 @@ const login = async (e, { username: t = "admin", password: r = "password" } = {}
 }, updateUserMeta = async (e, { meta: t, userId: r }) => {
   const n = await e.documentRoot;
   await e.run({
-    throwOnError: !0,
     code: `<?php
 		include ${phpVar(n)} . '/wp-load.php';
 		$meta = ${phpVar(t)};
@@ -794,7 +789,6 @@ const enableMultisite = async (e) => {
     }
   }), await login(e, {});
   const s = await e.documentRoot, o = (await e.run({
-    throwOnError: !0,
     code: `<?php
 define( 'WP_ADMIN', true );
 require_once(${phpVar(s)} . "/wp-load.php");
@@ -865,14 +859,14 @@ echo json_encode($deactivated_plugins);
       PATH_CURRENT_SITE: r
     }
   });
-  const p = new URL(await e.absoluteUrl), _ = isURLScoped(p) ? "scope:" + getURLScope(p) : null;
+  const p = new URL(await e.absoluteUrl), g = isURLScoped(p) ? "scope:" + getURLScope(p) : null;
   await e.writeFile(
     joinPaths(s, "/wp-content/sunrise.php"),
     `<?php
 	if ( !defined( 'BLOG_ID_CURRENT_SITE' ) ) {
 		define( 'BLOG_ID_CURRENT_SITE', 1 );
 	}
-	$folder = ${phpVar(_)};
+	$folder = ${phpVar(g)};
 	if ($folder && strpos($_SERVER['REQUEST_URI'],"/$folder") === false) {
 		$_SERVER['HTTP_HOST'] = ${phpVar(p.hostname)};
 		$_SERVER['REQUEST_URI'] = "/$folder/" . ltrim($_SERVER['REQUEST_URI'], '/');
@@ -927,9 +921,9 @@ const cp = async (e, { fromPath: t, toPath: r }) => {
     );
   const c = getFormData(o);
   c.fetch_attachments = "1";
-  for (const _ in c)
-    if (_.startsWith("user_map[")) {
-      const R = "user_new[" + _.slice(9, -1) + "]";
+  for (const g in c)
+    if (g.startsWith("user_map[")) {
+      const R = "user_new[" + g.slice(9, -1) + "]";
       c[R] = "1";
     }
   const d = await e.request({
@@ -1035,7 +1029,6 @@ function delTree($dir)
 `;
 async function runPhpWithZipFunctions(e, t) {
   return await e.run({
-    throwOnError: !0,
     code: zipFunctions + t
   });
 }
@@ -1071,13 +1064,13 @@ const tmpPath = "/tmp/file.zip", unzip = async (e, { zipFile: t, zipPath: r, ext
   }), s = joinPaths(s, r);
   const i = joinPaths(s, "wp-content"), o = joinPaths(n, "wp-content");
   for (const p of wpContentFilesExcludedFromExport) {
-    const _ = joinPaths(
+    const g = joinPaths(
       i,
       p
     );
-    await removePath(e, _);
+    await removePath(e, g);
     const R = joinPaths(o, p);
-    await e.fileExists(R) && (await e.mkdir(dirname(_)), await e.mv(R, _));
+    await e.fileExists(R) && (await e.mkdir(dirname(g)), await e.mv(R, g));
   }
   const c = joinPaths(
     s,
@@ -1101,7 +1094,6 @@ const tmpPath = "/tmp/file.zip", unzip = async (e, { zipFile: t, zipPath: r, ext
     joinPaths(n, "wp-admin", "upgrade.php")
   );
   await e.run({
-    throwOnError: !0,
     code: `<?php
             $_GET['step'] = 'upgrade_db';
             require ${u};
@@ -1138,10 +1130,10 @@ async function installAsset(e, { targetPath: t, zipFile: r }) {
     });
     d = d.filter((O) => !O.endsWith("/__MACOSX"));
     const u = d.length === 1 && await e.isDir(d[0]);
-    let p, _ = "";
-    u ? (_ = d[0], p = d[0].split("/").pop()) : (_ = c, p = s);
+    let p, g = "";
+    u ? (g = d[0], p = d[0].split("/").pop()) : (g = c, p = s);
     const R = `${t}/${p}`;
-    return await e.mv(_, R), {
+    return await e.mv(g, R), {
       assetFolderPath: R,
       assetFolderName: p
     };
@@ -1903,20 +1895,21 @@ class PHPRequestHandler {
     te(this, Fe, new Semaphore({ concurrency: 1 }));
     const {
       documentRoot: n = "/www/",
-      absoluteUrl: s = typeof location == "object" ? location == null ? void 0 : location.href : ""
+      absoluteUrl: s = typeof location == "object" ? location == null ? void 0 : location.href : "",
+      rewriteRules: i = []
     } = r;
     this.php = t, te(this, Pe, n);
-    const i = new URL(s);
-    te(this, dt, i.hostname), te(this, De, i.port ? Number(i.port) : i.protocol === "https:" ? 443 : 80), te(this, Ke, (i.protocol || "").replace(":", ""));
-    const o = H(this, De) !== 443 && H(this, De) !== 80;
+    const o = new URL(s);
+    te(this, dt, o.hostname), te(this, De, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), te(this, Ke, (o.protocol || "").replace(":", ""));
+    const c = H(this, De) !== 443 && H(this, De) !== 80;
     te(this, Je, [
       H(this, dt),
-      o ? `:${H(this, De)}` : ""
-    ].join("")), te(this, ve, i.pathname.replace(/\/+$/, "")), te(this, Qe, [
+      c ? `:${H(this, De)}` : ""
+    ].join("")), te(this, ve, o.pathname.replace(/\/+$/, "")), te(this, Qe, [
       `${H(this, Ke)}://`,
       H(this, Je),
       H(this, ve)
-    ].join(""));
+    ].join("")), this.rewriteRules = i;
   }
   /** @inheritDoc */
   pathToInternalUrl(t) {
@@ -1941,11 +1934,12 @@ class PHPRequestHandler {
   /** @inheritDoc */
   async request(t) {
     const r = t.url.startsWith("http://") || t.url.startsWith("https://"), n = new URL(
-      t.url,
+      // Remove the hash part of the URL as it's not meant for the server.
+      t.url.split("#")[0],
       r ? void 0 : DEFAULT_BASE_URL
-    ), s = removePathPrefix(
-      n.pathname,
-      H(this, ve)
+    ), s = applyRewriteRules(
+      removePathPrefix(n.pathname, H(this, ve)),
+      this.rewriteRules
     ), i = `${H(this, Pe)}${s}`;
     return seemsLikeAPHPRequestHandlerPath(i) ? await ce(this, _t, Wt).call(this, t, n) : ce(this, mt, zt).call(this, i);
   }
@@ -1976,7 +1970,7 @@ Pe = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
     r
   );
 }, _t = new WeakSet(), Wt = async function(t, r) {
-  var s, i;
+  var s;
   if (H(this, Fe).running > 0 && ((s = t.headers) == null ? void 0 : s["x-request-issuer"]) === "php")
     return console.warn(
       "Possible deadlock: Called request() before the previous request() have finished. PHP likely issued an HTTP call to itself. Normally this would lead to infinite waiting as Request 1 holds the lock that the Request 2 is waiting to acquire. That's not useful, so PHPRequestHandler will return error 502 instead."
@@ -1991,28 +1985,20 @@ Pe = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
       "HTTPS",
       H(this, Qe).startsWith("https://") ? "on" : ""
     );
-    let o = "GET";
-    const c = {
+    let i = "GET";
+    const o = {
       host: H(this, Je),
       ...normalizeHeaders(t.headers || {})
     };
-    let d = t.body;
-    if (typeof d == "object" && !(d instanceof Uint8Array)) {
-      o = "POST";
-      const { bytes: p, contentType: _ } = await encodeAsMultipart(d);
-      d = p, c["content-type"] = _;
+    let c = t.body;
+    if (typeof c == "object" && !(c instanceof Uint8Array)) {
+      i = "POST";
+      const { bytes: u, contentType: p } = await encodeAsMultipart(c);
+      c = u, o["content-type"] = p;
     }
-    let u;
+    let d;
     try {
-      let p = r.pathname;
-      if ((i = t.headers) != null && i["x-rewrite-url"])
-        try {
-          p = new URL(
-            t.headers["x-rewrite-url"]
-          ).pathname;
-        } catch {
-        }
-      u = ce(this, gt, Bt).call(this, p);
+      d = ce(this, gt, Bt).call(this, r.pathname);
     } catch {
       return new PHPResponse(
         404,
@@ -2026,17 +2012,17 @@ Pe = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
         H(this, ve)
       ),
       protocol: H(this, Ke),
-      method: t.method || o,
-      body: d,
-      scriptPath: u,
-      headers: c
+      method: t.method || i,
+      body: c,
+      scriptPath: d,
+      headers: o
     });
   } finally {
     n();
   }
 }, gt = new WeakSet(), Bt = function(t) {
   let r = removePathPrefix(t, H(this, ve));
-  r.includes(".php") ? r = r.split(".php")[0] + ".php" : this.php.isDir(`${H(this, Pe)}${r}`) ? (r.endsWith("/") || (r = `${r}/`), r = `${r}index.php`) : r = "/index.php";
+  r = applyRewriteRules(r, this.rewriteRules), r.includes(".php") ? r = r.split(".php")[0] + ".php" : this.php.isDir(`${H(this, Pe)}${r}`) ? (r.endsWith("/") || (r = `${r}/`), r = `${r}index.php`) : r = "/index.php";
   const n = `${H(this, Pe)}${r}`;
   if (this.php.fileExists(n))
     return n;
@@ -2091,6 +2077,12 @@ function seemsLikeAPHPFile(e) {
 function seemsLikeADirectoryRoot(e) {
   return !e.split("/").pop().includes(".");
 }
+function applyRewriteRules(e, t) {
+  for (const r of t)
+    if (new RegExp(r.match).test(e))
+      return e.replace(r.match, r.replacement);
+  return e;
+}
 const FileErrorCodes = {
   0: "No error occurred. System call completed successfully.",
   1: "Argument list too long.",
@@ -2184,8 +2176,8 @@ function rethrowFileSystemError(e = "") {
       } catch (c) {
         const d = typeof c == "object" ? c == null ? void 0 : c.errno : null;
         if (d in FileErrorCodes) {
-          const u = FileErrorCodes[d], p = typeof o[0] == "string" ? o[0] : null, _ = p !== null ? e.replaceAll("{path}", p) : e;
-          throw new Error(`${_}: ${u}`, {
+          const u = FileErrorCodes[d], p = typeof o[0] == "string" ? o[0] : null, g = p !== null ? e.replaceAll("{path}", p) : e;
+          throw new Error(`${g}: ${u}`, {
             cause: c
           });
         }
@@ -2208,7 +2200,7 @@ var __defProp = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyD
   return n && s && __defProp(t, r, s), s;
 };
 const STRING = "string", NUMBER = "number", __private__dont__use = Symbol("__private__dont__use");
-var Me, Ze, Ye, Ee, Re, Te, be, Xe, $t, Gt, yt, Kt, vt, Jt, wt, Qt, Pt, Zt, Et, Yt, bt, Xt, St, er, Rt, tr, Tt, rr, kt, nr, Ct, sr;
+var Me, Ze, Ye, be, Re, Te, Ee, Xe, yt, Gt, $t, Kt, vt, Jt, wt, Qt, Pt, Zt, bt, Yt, Et, Xt, St, er, Rt, tr, Tt, rr, kt, nr, Ct, sr;
 class BasePHP {
   /**
    * Initializes a PHP runtime.
@@ -2218,13 +2210,13 @@ class BasePHP {
    * @param  serverOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(e, t) {
-    Q(this, $t);
     Q(this, yt);
+    Q(this, $t);
     Q(this, vt);
     Q(this, wt);
     Q(this, Pt);
-    Q(this, Et);
     Q(this, bt);
+    Q(this, Et);
     Q(this, St);
     Q(this, Rt);
     Q(this, Tt);
@@ -2233,24 +2225,24 @@ class BasePHP {
     Q(this, Me, void 0);
     Q(this, Ze, void 0);
     Q(this, Ye, void 0);
-    Q(this, Ee, void 0);
+    Q(this, be, void 0);
     Q(this, Re, void 0);
     Q(this, Te, void 0);
-    Q(this, be, void 0);
+    Q(this, Ee, void 0);
     Q(this, Xe, void 0);
-    te(this, Me, []), te(this, Ee, !1), te(this, Re, null), te(this, Te, {}), te(this, be, /* @__PURE__ */ new Map()), te(this, Xe, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPBrowser(
+    te(this, Me, []), te(this, be, !1), te(this, Re, null), te(this, Te, {}), te(this, Ee, /* @__PURE__ */ new Map()), te(this, Xe, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPBrowser(
       new PHPRequestHandler(this, t)
     ));
   }
   addEventListener(e, t) {
-    H(this, be).has(e) || H(this, be).set(e, /* @__PURE__ */ new Set()), H(this, be).get(e).add(t);
+    H(this, Ee).has(e) || H(this, Ee).set(e, /* @__PURE__ */ new Set()), H(this, Ee).get(e).add(t);
   }
   removeEventListener(e, t) {
     var r;
-    (r = H(this, be).get(e)) == null || r.delete(t);
+    (r = H(this, Ee).get(e)) == null || r.delete(t);
   }
   dispatchEvent(e) {
-    const t = H(this, be).get(e.type);
+    const t = H(this, Ee).get(e.type);
     if (t)
       for (const r of t)
         r(e);
@@ -2313,7 +2305,7 @@ class BasePHP {
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
-    if (H(this, Ee))
+    if (H(this, be))
       throw new Error("Cannot set PHP ini path after calling run().");
     te(this, Ze, e), this[__private__dont__use].ccall(
       "wasm_set_phpini_path",
@@ -2324,7 +2316,7 @@ class BasePHP {
   }
   /** @inheritDoc */
   setPhpIniEntry(e, t) {
-    if (H(this, Ee))
+    if (H(this, be))
       throw new Error("Cannot set PHP ini entries after calling run().");
     H(this, Me).push([e, t]);
   }
@@ -2343,18 +2335,18 @@ class BasePHP {
     const t = await this.semaphore.acquire();
     let r;
     try {
-      if (H(this, Ee) || (ce(this, $t, Gt).call(this), te(this, Ee, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
+      if (H(this, be) || (ce(this, yt, Gt).call(this), te(this, be, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
         throw new Error(
           `The script path "${e.scriptPath}" does not exist.`
         );
       ce(this, St, er).call(this, e.scriptPath || ""), ce(this, vt, Jt).call(this, e.relativeUri || ""), ce(this, Pt, Zt).call(this, e.method || "GET");
       const n = normalizeHeaders(e.headers || {}), s = n.host || "example.com:443";
-      ce(this, wt, Qt).call(this, s, e.protocol || "http"), ce(this, Et, Yt).call(this, n), e.body && (r = ce(this, bt, Xt).call(this, e.body)), typeof e.code == "string" && ce(this, kt, nr).call(this, " ?>" + e.code), ce(this, Rt, tr).call(this);
+      ce(this, wt, Qt).call(this, s, e.protocol || "http"), ce(this, bt, Yt).call(this, n), e.body && (r = ce(this, Et, Xt).call(this, e.body)), typeof e.code == "string" && ce(this, kt, nr).call(this, " ?>" + e.code), ce(this, Rt, tr).call(this);
       const i = e.env || {};
       for (const c in i)
         ce(this, Tt, rr).call(this, c, i[c]);
       const o = await ce(this, Ct, sr).call(this);
-      if (e.throwOnError && o.exitCode !== 0) {
+      if (o.exitCode !== 0) {
         const c = {
           stdout: o.text,
           stderr: o.errors
@@ -2363,9 +2355,16 @@ class BasePHP {
         const d = new Error(
           `PHP.run() failed with exit code ${o.exitCode} and the following output: ` + o.errors
         );
-        throw d.output = c, console.error(d), d;
+        throw d.output = c, d.source = "request", console.error(d), d;
       }
       return o;
+    } catch (n) {
+      throw this.dispatchEvent({
+        type: "request.error",
+        error: n,
+        // Distinguish between PHP request and PHP-wasm errors
+        source: n.source ?? "php-wasm"
+      }), n;
     } finally {
       try {
         r && this[__private__dont__use].free(r);
@@ -2486,10 +2485,10 @@ class BasePHP {
       this[__private__dont__use]._exit(e);
     } catch {
     }
-    te(this, Ee, !1), te(this, Re, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
+    te(this, be, !1), te(this, Re, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
   }
 }
-Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), Ee = new WeakMap(), Re = new WeakMap(), Te = new WeakMap(), be = new WeakMap(), Xe = new WeakMap(), $t = new WeakSet(), Gt = function() {
+Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), be = new WeakMap(), Re = new WeakMap(), Te = new WeakMap(), Ee = new WeakMap(), Xe = new WeakMap(), yt = new WeakSet(), Gt = function() {
   if (this.setPhpIniEntry("auto_prepend_file", "/internal/consts.php"), this.fileExists("/internal/consts.php") || this.writeFile(
     "/internal/consts.php",
     `<?php
@@ -2514,7 +2513,7 @@ Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), Ee = new WeakMap(),
     );
   }
   this[__private__dont__use].ccall("php_wasm_init", null, [], []);
-}, yt = new WeakSet(), Kt = function() {
+}, $t = new WeakSet(), Kt = function() {
   const e = "/internal/headers.json";
   if (!this.fileExists(e))
     throw new Error(
@@ -2571,7 +2570,7 @@ Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), Ee = new WeakMap(),
     [STRING],
     [e]
   );
-}, Et = new WeakSet(), Yt = function(e) {
+}, bt = new WeakSet(), Yt = function(e) {
   e.cookie && this[__private__dont__use].ccall(
     "wasm_set_cookies",
     null,
@@ -2595,7 +2594,7 @@ Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), Ee = new WeakMap(),
       e[t]
     );
   }
-}, bt = new WeakSet(), Xt = function(e) {
+}, Et = new WeakSet(), Xt = function(e) {
   let t, r;
   typeof e == "string" ? (console.warn(
     "Passing a string as the request body is deprecated. Please use a Uint8Array instead. See https://github.com/WordPress/wordpress-playground/issues/997 for more details"
@@ -2683,7 +2682,7 @@ Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), Ee = new WeakMap(),
   } finally {
     (s = H(this, Re)) == null || s.removeEventListener("error", t), te(this, Te, {});
   }
-  const { headers: r, httpStatusCode: n } = ce(this, yt, Kt).call(this);
+  const { headers: r, httpStatusCode: n } = ce(this, $t, Kt).call(this);
   return new PHPResponse(
     n,
     r,
@@ -3037,7 +3036,7 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
   }
   e.str = o;
   function c(m, k) {
-    k instanceof n ? m.push(...k._items) : k instanceof r ? m.push(k) : m.push(_(k));
+    k instanceof n ? m.push(...k._items) : k instanceof r ? m.push(k) : m.push(g(k));
   }
   e.addCodeArg = c;
   function d(m) {
@@ -3068,7 +3067,7 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
     return k.emptyStr() ? m : m.emptyStr() ? k : o`${m}${k}`;
   }
   e.strConcat = p;
-  function _(m) {
+  function g(m) {
     return typeof m == "number" || typeof m == "boolean" || m === null ? m : O(Array.isArray(m) ? m.join(",") : m);
   }
   function R(m) {
@@ -3089,10 +3088,10 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
     throw new Error(`CodeGen: invalid export name: ${m}, use explicit $id name mapping`);
   }
   e.getEsmExportName = v;
-  function $(m) {
+  function y(m) {
     return new n(m.toString());
   }
-  e.regexpCode = $;
+  e.regexpCode = y;
 })(code$1);
 var scope = {};
 (function(e) {
@@ -3126,8 +3125,8 @@ var scope = {};
       return `${u}${p.index++}`;
     }
     _nameGroup(u) {
-      var p, _;
-      if (!((_ = (p = this._parent) === null || p === void 0 ? void 0 : p._prefixes) === null || _ === void 0) && _.has(u) || this._prefixes && !this._prefixes.has(u))
+      var p, g;
+      if (!((g = (p = this._parent) === null || p === void 0 ? void 0 : p._prefixes) === null || g === void 0) && g.has(u) || this._prefixes && !this._prefixes.has(u))
         throw new Error(`CodeGen: prefix "${u}" is not allowed in this scope`);
       return this._names[u] = { prefix: u, index: 0 };
     }
@@ -3137,8 +3136,8 @@ var scope = {};
     constructor(u, p) {
       super(p), this.prefix = u;
     }
-    setValue(u, { property: p, itemIndex: _ }) {
-      this.value = u, this.scopePath = (0, t._)`.${new t.Name(p)}[${_}]`;
+    setValue(u, { property: p, itemIndex: g }) {
+      this.value = u, this.scopePath = (0, t._)`.${new t.Name(p)}[${g}]`;
     }
   }
   e.ValueScopeName = i;
@@ -3154,10 +3153,10 @@ var scope = {};
       return new i(u, this._newName(u));
     }
     value(u, p) {
-      var _;
+      var g;
       if (p.ref === void 0)
         throw new Error("CodeGen: ref must be passed in value");
-      const R = this.toName(u), { prefix: O } = R, T = (_ = p.key) !== null && _ !== void 0 ? _ : p.ref;
+      const R = this.toName(u), { prefix: O } = R, T = (g = p.key) !== null && g !== void 0 ? g : p.ref;
       let v = this._values[O];
       if (v) {
         const k = v.get(T);
@@ -3166,39 +3165,39 @@ var scope = {};
       } else
         v = this._values[O] = /* @__PURE__ */ new Map();
       v.set(T, R);
-      const $ = this._scope[O] || (this._scope[O] = []), m = $.length;
-      return $[m] = p.ref, R.setValue(p, { property: O, itemIndex: m }), R;
+      const y = this._scope[O] || (this._scope[O] = []), m = y.length;
+      return y[m] = p.ref, R.setValue(p, { property: O, itemIndex: m }), R;
     }
     getValue(u, p) {
-      const _ = this._values[u];
-      if (_)
-        return _.get(p);
+      const g = this._values[u];
+      if (g)
+        return g.get(p);
     }
     scopeRefs(u, p = this._values) {
-      return this._reduceValues(p, (_) => {
-        if (_.scopePath === void 0)
-          throw new Error(`CodeGen: name "${_}" has no value`);
-        return (0, t._)`${u}${_.scopePath}`;
+      return this._reduceValues(p, (g) => {
+        if (g.scopePath === void 0)
+          throw new Error(`CodeGen: name "${g}" has no value`);
+        return (0, t._)`${u}${g.scopePath}`;
       });
     }
-    scopeCode(u = this._values, p, _) {
+    scopeCode(u = this._values, p, g) {
       return this._reduceValues(u, (R) => {
         if (R.value === void 0)
           throw new Error(`CodeGen: name "${R}" has no value`);
         return R.value.code;
-      }, p, _);
+      }, p, g);
     }
-    _reduceValues(u, p, _ = {}, R) {
+    _reduceValues(u, p, g = {}, R) {
       let O = t.nil;
       for (const T in u) {
         const v = u[T];
         if (!v)
           continue;
-        const $ = _[T] = _[T] || /* @__PURE__ */ new Map();
+        const y = g[T] = g[T] || /* @__PURE__ */ new Map();
         v.forEach((m) => {
-          if ($.has(m))
+          if (y.has(m))
             return;
-          $.set(m, n.Started);
+          y.set(m, n.Started);
           let k = p(m);
           if (k) {
             const S = this.opts.es5 ? e.varKinds.var : e.varKinds.const;
@@ -3207,7 +3206,7 @@ var scope = {};
             O = (0, t._)`${O}${k}${this.opts._n}`;
           else
             throw new r(m);
-          $.set(m, n.Completed);
+          y.set(m, n.Completed);
         });
       }
       return O;
@@ -3321,7 +3320,7 @@ var scope = {};
       return `break${this.label ? ` ${this.label}` : ""};` + a;
     }
   }
-  class _ extends i {
+  class g extends i {
     constructor(a) {
       super(), this.error = a;
     }
@@ -3369,8 +3368,8 @@ var scope = {};
       const { nodes: N } = this;
       let M = N.length;
       for (; M--; ) {
-        const q = N[M];
-        q.optimizeNames(a, h) || (ke(a, q.names), N.splice(M, 1));
+        const L = N[M];
+        L.optimizeNames(a, h) || (ke(a, L.names), N.splice(M, 1));
       }
       return N.length > 0 ? this : void 0;
     }
@@ -3385,9 +3384,9 @@ var scope = {};
   }
   class v extends O {
   }
-  class $ extends T {
+  class y extends T {
   }
-  $.kind = "else";
+  y.kind = "else";
   class m extends T {
     constructor(a, h) {
       super(h), this.condition = a;
@@ -3404,7 +3403,7 @@ var scope = {};
       let h = this.else;
       if (h) {
         const N = h.optimizeNodes();
-        h = this.else = Array.isArray(N) ? new $(N) : N;
+        h = this.else = Array.isArray(N) ? new y(N) : N;
       }
       if (h)
         return a === !1 ? h instanceof m ? h : h.nodes : this.nodes.length ? this : new m(Ce(a), h instanceof m ? [h] : h.nodes);
@@ -3445,8 +3444,8 @@ var scope = {};
       super(), this.varKind = a, this.name = h, this.from = N, this.to = M;
     }
     render(a) {
-      const h = a.es5 ? r.varKinds.var : this.varKind, { name: N, from: M, to: q } = this;
-      return `for(${h} ${N}=${M}; ${N}<${q}; ${N}++)` + super.render(a);
+      const h = a.es5 ? r.varKinds.var : this.varKind, { name: N, from: M, to: L } = this;
+      return `for(${h} ${N}=${M}; ${N}<${L}; ${N}++)` + super.render(a);
     }
     get names() {
       const a = ue(super.names, this.from);
@@ -3549,8 +3548,8 @@ var scope = {};
       return this._extScope.scopeCode(this._values);
     }
     _def(a, h, N, M) {
-      const q = this._scope.toName(h);
-      return N !== void 0 && M && (this._constants[q.str] = N), this._leafNode(new o(a, q, N)), q;
+      const L = this._scope.toName(h);
+      return N !== void 0 && M && (this._constants[L.str] = N), this._leafNode(new o(a, L, N)), L;
     }
     // `const` declaration (`var` in es5 mode)
     const(a, h, N) {
@@ -3599,11 +3598,11 @@ var scope = {};
     }
     // `else` clause - only valid after `if` or `else if` clauses
     else() {
-      return this._elseNode(new $());
+      return this._elseNode(new y());
     }
     // end `if` statement (needed if gen.if was used only with condition)
     endIf() {
-      return this._endBlockNode(m, $);
+      return this._endBlockNode(m, y);
     }
     _for(a, h) {
       return this._blockNode(a), h && this.code(h).endFor(), this;
@@ -3613,28 +3612,28 @@ var scope = {};
       return this._for(new S(a), h);
     }
     // `for` statement for a range of values
-    forRange(a, h, N, M, q = this.opts.es5 ? r.varKinds.var : r.varKinds.let) {
+    forRange(a, h, N, M, L = this.opts.es5 ? r.varKinds.var : r.varKinds.let) {
       const W = this._scope.toName(a);
-      return this._for(new I(q, W, h, N), () => M(W));
+      return this._for(new I(L, W, h, N), () => M(W));
     }
     // `for-of` statement (in es5 mode replace with a normal for loop)
     forOf(a, h, N, M = r.varKinds.const) {
-      const q = this._scope.toName(a);
+      const L = this._scope.toName(a);
       if (this.opts.es5) {
         const W = h instanceof t.Name ? h : this.var("_arr", h);
         return this.forRange("_i", 0, (0, t._)`${W}.length`, (G) => {
-          this.var(q, (0, t._)`${W}[${G}]`), N(q);
+          this.var(L, (0, t._)`${W}[${G}]`), N(L);
         });
       }
-      return this._for(new D("of", M, q, h), () => N(q));
+      return this._for(new D("of", M, L, h), () => N(L));
     }
     // `for-in` statement.
     // With option `ownProperties` replaced with a `for-of` loop for object keys
     forIn(a, h, N, M = this.opts.es5 ? r.varKinds.var : r.varKinds.const) {
       if (this.opts.ownProperties)
         return this.forOf(a, (0, t._)`Object.keys(${h})`, N);
-      const q = this._scope.toName(a);
-      return this._for(new D("in", M, q, h), () => N(q));
+      const L = this._scope.toName(a);
+      return this._for(new D("in", M, L, h), () => N(L));
     }
     // end `for` loop
     endFor() {
@@ -3661,14 +3660,14 @@ var scope = {};
         throw new Error('CodeGen: "try" without "catch" and "finally"');
       const M = new A();
       if (this._blockNode(M), this.code(a), h) {
-        const q = this.name("e");
-        this._currNode = M.catch = new V(q), h(q);
+        const L = this.name("e");
+        this._currNode = M.catch = new V(L), h(L);
       }
       return N && (this._currNode = M.finally = new z(), this.code(N)), this._endBlockNode(V, z);
     }
     // `throw` statement
     throw(a) {
-      return this._leafNode(new _(a));
+      return this._leafNode(new g(a));
     }
     // start self-balancing block
     block(a, h) {
@@ -3740,13 +3739,13 @@ var scope = {};
       return N(P);
     if (!M(P))
       return P;
-    return new t._Code(P._items.reduce((q, W) => (W instanceof t.Name && (W = N(W)), W instanceof t._Code ? q.push(...W._items) : q.push(W), q), []));
-    function N(q) {
-      const W = h[q.str];
-      return W === void 0 || a[q.str] !== 1 ? q : (delete a[q.str], W);
+    return new t._Code(P._items.reduce((L, W) => (W instanceof t.Name && (W = N(W)), W instanceof t._Code ? L.push(...W._items) : L.push(W), L), []));
+    function N(L) {
+      const W = h[L.str];
+      return W === void 0 || a[L.str] !== 1 ? L : (delete a[L.str], W);
     }
-    function M(q) {
-      return q instanceof t._Code && q._items.some((W) => W instanceof t.Name && a[W.str] === 1 && h[W.str] !== void 0);
+    function M(L) {
+      return L instanceof t._Code && L._items.some((W) => W instanceof t.Name && a[W.str] === 1 && h[W.str] !== void 0);
     }
   }
   function ke(P, a) {
@@ -3757,17 +3756,17 @@ var scope = {};
     return typeof P == "boolean" || typeof P == "number" || P === null ? !P : (0, t._)`!${j(P)}`;
   }
   e.not = Ce;
-  const qe = y(e.operators.AND);
+  const Le = $(e.operators.AND);
   function et(...P) {
-    return P.reduce(qe);
+    return P.reduce(Le);
   }
   e.and = et;
-  const Le = y(e.operators.OR);
+  const qe = $(e.operators.OR);
   function F(...P) {
-    return P.reduce(Le);
+    return P.reduce(qe);
   }
   e.or = F;
-  function y(P) {
+  function $(P) {
     return (a, h) => a === t.nil ? h : h === t.nil ? a : (0, t._)`${j(a)} ${P} ${j(h)}`;
   }
   function j(P) {
@@ -3831,13 +3830,13 @@ var util = {};
   }
   e.unescapeFragment = u;
   function p(w) {
-    return encodeURIComponent(_(w));
+    return encodeURIComponent(g(w));
   }
   e.escapeFragment = p;
-  function _(w) {
+  function g(w) {
     return typeof w == "number" ? `${w}` : w.replace(/~/g, "~0").replace(/\//g, "~1");
   }
-  e.escapeJsonPointer = _;
+  e.escapeJsonPointer = g;
   function R(w) {
     return w.replace(/~1/g, "/").replace(/~0/g, "~");
   }
@@ -3862,7 +3861,7 @@ var util = {};
         w.if((0, t._)`${C} === true`, () => w.assign(A, !0), () => w.assign(A, (0, t._)`${A} || {}`).code((0, t._)`Object.assign(${A}, ${C})`));
       }),
       mergeToName: (w, C, A) => w.if((0, t._)`${A} !== true`, () => {
-        C === !0 ? w.assign(A, !0) : (w.assign(A, (0, t._)`${A} || {}`), $(w, A, C));
+        C === !0 ? w.assign(A, !0) : (w.assign(A, (0, t._)`${A} || {}`), y(w, A, C));
       }),
       mergeValues: (w, C) => w === !0 ? !0 : { ...w, ...C },
       resultToName: v
@@ -3878,13 +3877,13 @@ var util = {};
     if (C === !0)
       return w.var("props", !0);
     const A = w.var("props", (0, t._)`{}`);
-    return C !== void 0 && $(w, A, C), A;
+    return C !== void 0 && y(w, A, C), A;
   }
   e.evaluatedPropsToName = v;
-  function $(w, C, A) {
+  function y(w, C, A) {
     Object.keys(A).forEach((V) => w.assign((0, t._)`${C}${(0, t.getProperty)(V)}`, !0));
   }
-  e.setEvaluated = $;
+  e.setEvaluated = y;
   const m = {};
   function k(w, C) {
     return w.scopeValue("func", {
@@ -3902,7 +3901,7 @@ var util = {};
       const V = C === S.Num;
       return A ? V ? (0, t._)`"[" + ${w} + "]"` : (0, t._)`"['" + ${w} + "']"` : V ? (0, t._)`"/" + ${w}` : (0, t._)`"/" + ${w}.replace(/~/g, "~0").replace(/\\//g, "~1")`;
     }
-    return A ? (0, t.getProperty)(w).toString() : "/" + _(w);
+    return A ? (0, t.getProperty)(w).toString() : "/" + g(w);
   }
   e.getErrorPath = I;
   function D(w, C, A = w.opts.strictSchema) {
@@ -3944,40 +3943,40 @@ names$1.default = names;
   Object.defineProperty(e, "__esModule", { value: !0 }), e.extendErrors = e.resetErrorsCount = e.reportExtraError = e.reportError = e.keyword$DataError = e.keywordError = void 0;
   const t = codegen, r = util, n = names$1;
   e.keywordError = {
-    message: ({ keyword: $ }) => (0, t.str)`must pass "${$}" keyword validation`
+    message: ({ keyword: y }) => (0, t.str)`must pass "${y}" keyword validation`
   }, e.keyword$DataError = {
-    message: ({ keyword: $, schemaType: m }) => m ? (0, t.str)`"${$}" keyword must be ${m} ($data)` : (0, t.str)`"${$}" keyword is invalid ($data)`
+    message: ({ keyword: y, schemaType: m }) => m ? (0, t.str)`"${y}" keyword must be ${m} ($data)` : (0, t.str)`"${y}" keyword is invalid ($data)`
   };
-  function s($, m = e.keywordError, k, S) {
-    const { it: I } = $, { gen: D, compositeRule: w, allErrors: C } = I, A = _($, m, k);
+  function s(y, m = e.keywordError, k, S) {
+    const { it: I } = y, { gen: D, compositeRule: w, allErrors: C } = I, A = g(y, m, k);
     S ?? (w || C) ? d(D, A) : u(I, (0, t._)`[${A}]`);
   }
   e.reportError = s;
-  function i($, m = e.keywordError, k) {
-    const { it: S } = $, { gen: I, compositeRule: D, allErrors: w } = S, C = _($, m, k);
+  function i(y, m = e.keywordError, k) {
+    const { it: S } = y, { gen: I, compositeRule: D, allErrors: w } = S, C = g(y, m, k);
     d(I, C), D || w || u(S, n.default.vErrors);
   }
   e.reportExtraError = i;
-  function o($, m) {
-    $.assign(n.default.errors, m), $.if((0, t._)`${n.default.vErrors} !== null`, () => $.if(m, () => $.assign((0, t._)`${n.default.vErrors}.length`, m), () => $.assign(n.default.vErrors, null)));
+  function o(y, m) {
+    y.assign(n.default.errors, m), y.if((0, t._)`${n.default.vErrors} !== null`, () => y.if(m, () => y.assign((0, t._)`${n.default.vErrors}.length`, m), () => y.assign(n.default.vErrors, null)));
   }
   e.resetErrorsCount = o;
-  function c({ gen: $, keyword: m, schemaValue: k, data: S, errsCount: I, it: D }) {
+  function c({ gen: y, keyword: m, schemaValue: k, data: S, errsCount: I, it: D }) {
     if (I === void 0)
       throw new Error("ajv implementation error");
-    const w = $.name("err");
-    $.forRange("i", I, n.default.errors, (C) => {
-      $.const(w, (0, t._)`${n.default.vErrors}[${C}]`), $.if((0, t._)`${w}.instancePath === undefined`, () => $.assign((0, t._)`${w}.instancePath`, (0, t.strConcat)(n.default.instancePath, D.errorPath))), $.assign((0, t._)`${w}.schemaPath`, (0, t.str)`${D.errSchemaPath}/${m}`), D.opts.verbose && ($.assign((0, t._)`${w}.schema`, k), $.assign((0, t._)`${w}.data`, S));
+    const w = y.name("err");
+    y.forRange("i", I, n.default.errors, (C) => {
+      y.const(w, (0, t._)`${n.default.vErrors}[${C}]`), y.if((0, t._)`${w}.instancePath === undefined`, () => y.assign((0, t._)`${w}.instancePath`, (0, t.strConcat)(n.default.instancePath, D.errorPath))), y.assign((0, t._)`${w}.schemaPath`, (0, t.str)`${D.errSchemaPath}/${m}`), D.opts.verbose && (y.assign((0, t._)`${w}.schema`, k), y.assign((0, t._)`${w}.data`, S));
     });
   }
   e.extendErrors = c;
-  function d($, m) {
-    const k = $.const("err", m);
-    $.if((0, t._)`${n.default.vErrors} === null`, () => $.assign(n.default.vErrors, (0, t._)`[${k}]`), (0, t._)`${n.default.vErrors}.push(${k})`), $.code((0, t._)`${n.default.errors}++`);
+  function d(y, m) {
+    const k = y.const("err", m);
+    y.if((0, t._)`${n.default.vErrors} === null`, () => y.assign(n.default.vErrors, (0, t._)`[${k}]`), (0, t._)`${n.default.vErrors}.push(${k})`), y.code((0, t._)`${n.default.errors}++`);
   }
-  function u($, m) {
-    const { gen: k, validateName: S, schemaEnv: I } = $;
-    I.$async ? k.throw((0, t._)`new ${$.ValidationError}(${m})`) : (k.assign((0, t._)`${S}.errors`, m), k.return(!1));
+  function u(y, m) {
+    const { gen: k, validateName: S, schemaEnv: I } = y;
+    I.$async ? k.throw((0, t._)`new ${y.ValidationError}(${m})`) : (k.assign((0, t._)`${S}.errors`, m), k.return(!1));
   }
   const p = {
     keyword: new t.Name("keyword"),
@@ -3988,28 +3987,28 @@ names$1.default = names;
     schema: new t.Name("schema"),
     parentSchema: new t.Name("parentSchema")
   };
-  function _($, m, k) {
-    const { createErrors: S } = $.it;
-    return S === !1 ? (0, t._)`{}` : R($, m, k);
+  function g(y, m, k) {
+    const { createErrors: S } = y.it;
+    return S === !1 ? (0, t._)`{}` : R(y, m, k);
   }
-  function R($, m, k = {}) {
-    const { gen: S, it: I } = $, D = [
+  function R(y, m, k = {}) {
+    const { gen: S, it: I } = y, D = [
       O(I, k),
-      T($, k)
+      T(y, k)
     ];
-    return v($, m, D), S.object(...D);
+    return v(y, m, D), S.object(...D);
   }
-  function O({ errorPath: $ }, { instancePath: m }) {
-    const k = m ? (0, t.str)`${$}${(0, r.getErrorPath)(m, r.Type.Str)}` : $;
+  function O({ errorPath: y }, { instancePath: m }) {
+    const k = m ? (0, t.str)`${y}${(0, r.getErrorPath)(m, r.Type.Str)}` : y;
     return [n.default.instancePath, (0, t.strConcat)(n.default.instancePath, k)];
   }
-  function T({ keyword: $, it: { errSchemaPath: m } }, { schemaPath: k, parentSchema: S }) {
-    let I = S ? m : (0, t.str)`${m}/${$}`;
+  function T({ keyword: y, it: { errSchemaPath: m } }, { schemaPath: k, parentSchema: S }) {
+    let I = S ? m : (0, t.str)`${m}/${y}`;
     return k && (I = (0, t.str)`${I}${(0, r.getErrorPath)(k, r.Type.Str)}`), [p.schemaPath, I];
   }
-  function v($, { params: m, message: k }, S) {
-    const { keyword: I, data: D, schemaValue: w, it: C } = $, { opts: A, propertyName: V, topSchemaRef: z, schemaPath: re } = C;
-    S.push([p.keyword, I], [p.params, typeof m == "function" ? m($) : m || (0, t._)`{}`]), A.messages && S.push([p.message, typeof k == "function" ? k($) : k]), A.verbose && S.push([p.schema, w], [p.parentSchema, (0, t._)`${z}${re}`], [n.default.data, D]), V && S.push([p.propertyName, V]);
+  function v(y, { params: m, message: k }, S) {
+    const { keyword: I, data: D, schemaValue: w, it: C } = y, { opts: A, propertyName: V, topSchemaRef: z, schemaPath: re } = C;
+    S.push([p.keyword, I], [p.params, typeof m == "function" ? m(y) : m || (0, t._)`{}`]), A.messages && S.push([p.message, typeof k == "function" ? k(y) : k]), A.verbose && S.push([p.schema, w], [p.parentSchema, (0, t._)`${z}${re}`], [n.default.data, D]), V && S.push([p.propertyName, V]);
   }
 })(errors);
 Object.defineProperty(boolSchema, "__esModule", { value: !0 });
@@ -4109,7 +4108,7 @@ applicability.shouldUseRule = shouldUseRule;
   }
   e.getJSONTypes = d;
   function u(S, I) {
-    const { gen: D, data: w, opts: C } = S, A = _(I, C.coerceTypes), V = I.length > 0 && !(A.length === 0 && I.length === 1 && (0, r.schemaHasRulesForType)(S, I[0]));
+    const { gen: D, data: w, opts: C } = S, A = g(I, C.coerceTypes), V = I.length > 0 && !(A.length === 0 && I.length === 1 && (0, r.schemaHasRulesForType)(S, I[0]));
     if (V) {
       const z = v(I, w, C.strictNumbers, o.Wrong);
       D.if(z, () => {
@@ -4120,7 +4119,7 @@ applicability.shouldUseRule = shouldUseRule;
   }
   e.coerceAndCheckDataType = u;
   const p = /* @__PURE__ */ new Set(["string", "number", "integer", "boolean", "null"]);
-  function _(S, I) {
+  function g(S, I) {
     return I ? S.filter((D) => p.has(D) || I === "array" && D === "array") : [];
   }
   function R(S, I, D) {
@@ -4202,13 +4201,13 @@ applicability.shouldUseRule = shouldUseRule;
     return C;
   }
   e.checkDataTypes = v;
-  const $ = {
+  const y = {
     message: ({ schema: S }) => `must be ${S}`,
     params: ({ schema: S, schemaValue: I }) => typeof S == "string" ? (0, s._)`{type: ${S}}` : (0, s._)`{type: ${I}}`
   };
   function m(S) {
     const I = k(S);
-    (0, n.reportError)(I, $);
+    (0, n.reportError)(I, y);
   }
   e.reportTypeError = m;
   function k(S) {
@@ -4301,14 +4300,14 @@ function schemaProperties(e, t) {
 }
 code.schemaProperties = schemaProperties;
 function callValidateCode({ schemaCode: e, data: t, it: { gen: r, topSchemaRef: n, schemaPath: s, errorPath: i }, it: o }, c, d, u) {
-  const p = u ? (0, codegen_1$q._)`${e}, ${t}, ${n}${s}` : t, _ = [
+  const p = u ? (0, codegen_1$q._)`${e}, ${t}, ${n}${s}` : t, g = [
     [names_1$5.default.instancePath, (0, codegen_1$q.strConcat)(names_1$5.default.instancePath, i)],
     [names_1$5.default.parentData, o.parentData],
     [names_1$5.default.parentDataProperty, o.parentDataProperty],
     [names_1$5.default.rootData, names_1$5.default.rootData]
   ];
-  o.opts.dynamicRef && _.push([names_1$5.default.dynamicAnchors, names_1$5.default.dynamicAnchors]);
-  const R = (0, codegen_1$q._)`${p}, ${r.object(..._)}`;
+  o.opts.dynamicRef && g.push([names_1$5.default.dynamicAnchors, names_1$5.default.dynamicAnchors]);
+  const R = (0, codegen_1$q._)`${p}, ${r.object(...g)}`;
   return d !== codegen_1$q.nil ? (0, codegen_1$q._)`${c}.call(${d}, ${R})` : (0, codegen_1$q._)`${c}(${R})`;
 }
 code.callValidateCode = callValidateCode;
@@ -4378,19 +4377,19 @@ function funcKeywordCode(e, t) {
   var r;
   const { gen: n, keyword: s, schema: i, parentSchema: o, $data: c, it: d } = e;
   checkAsyncKeyword(d, t);
-  const u = !c && t.compile ? t.compile.call(d.self, i, o, d) : t.validate, p = useKeyword(n, s, u), _ = n.let("valid");
-  e.block$data(_, R), e.ok((r = t.valid) !== null && r !== void 0 ? r : _);
+  const u = !c && t.compile ? t.compile.call(d.self, i, o, d) : t.validate, p = useKeyword(n, s, u), g = n.let("valid");
+  e.block$data(g, R), e.ok((r = t.valid) !== null && r !== void 0 ? r : g);
   function R() {
     if (t.errors === !1)
-      v(), t.modifying && modifyData(e), $(() => e.error());
+      v(), t.modifying && modifyData(e), y(() => e.error());
     else {
       const m = t.async ? O() : T();
-      t.modifying && modifyData(e), $(() => addErrs(e, m));
+      t.modifying && modifyData(e), y(() => addErrs(e, m));
     }
   }
   function O() {
     const m = n.let("ruleErrs", null);
-    return n.try(() => v((0, codegen_1$p._)`await `), (k) => n.assign(_, !1).if((0, codegen_1$p._)`${k} instanceof ${d.ValidationError}`, () => n.assign(m, (0, codegen_1$p._)`${k}.errors`), () => n.throw(k))), m;
+    return n.try(() => v((0, codegen_1$p._)`await `), (k) => n.assign(g, !1).if((0, codegen_1$p._)`${k} instanceof ${d.ValidationError}`, () => n.assign(m, (0, codegen_1$p._)`${k}.errors`), () => n.throw(k))), m;
   }
   function T() {
     const m = (0, codegen_1$p._)`${p}.errors`;
@@ -4398,11 +4397,11 @@ function funcKeywordCode(e, t) {
   }
   function v(m = t.async ? (0, codegen_1$p._)`await ` : codegen_1$p.nil) {
     const k = d.opts.passContext ? names_1$4.default.this : names_1$4.default.self, S = !("compile" in t && !c || t.schema === !1);
-    n.assign(_, (0, codegen_1$p._)`${m}${(0, code_1$9.callValidateCode)(e, p, k, S)}`, t.modifying);
+    n.assign(g, (0, codegen_1$p._)`${m}${(0, code_1$9.callValidateCode)(e, p, k, S)}`, t.modifying);
   }
-  function $(m) {
+  function y(m) {
     var k;
-    n.if((0, codegen_1$p.not)((k = t.valid) !== null && k !== void 0 ? k : _), m);
+    n.if((0, codegen_1$p.not)((k = t.valid) !== null && k !== void 0 ? k : g), m);
   }
 }
 keyword.funcKeywordCode = funcKeywordCode;
@@ -4481,8 +4480,8 @@ function extendSubschemaData(e, t, { dataProp: r, dataPropType: n, data: s, data
     throw new Error('both "data" and "dataProp" passed, only one allowed');
   const { gen: c } = t;
   if (r !== void 0) {
-    const { errorPath: u, dataPathArr: p, opts: _ } = t, R = c.let("data", (0, codegen_1$o._)`${t.data}${(0, codegen_1$o.getProperty)(r)}`, !0);
-    d(R), e.errorPath = (0, codegen_1$o.str)`${u}${(0, util_1$n.getErrorPath)(r, n, _.jsPropertySyntax)}`, e.parentDataProperty = (0, codegen_1$o._)`${r}`, e.dataPathArr = [...p, e.parentDataProperty];
+    const { errorPath: u, dataPathArr: p, opts: g } = t, R = c.let("data", (0, codegen_1$o._)`${t.data}${(0, codegen_1$o.getProperty)(r)}`, !0);
+    d(R), e.errorPath = (0, codegen_1$o.str)`${u}${(0, util_1$n.getErrorPath)(r, n, g.jsPropertySyntax)}`, e.parentDataProperty = (0, codegen_1$o._)`${r}`, e.dataPathArr = [...p, e.parentDataProperty];
   }
   if (s !== void 0) {
     const u = s instanceof codegen_1$o.Name ? s : c.let("data", s, !0);
@@ -4587,17 +4586,17 @@ function _traverse(e, t, r, n, s, i, o, c, d, u) {
   if (n && typeof n == "object" && !Array.isArray(n)) {
     t(n, s, i, o, c, d, u);
     for (var p in n) {
-      var _ = n[p];
-      if (Array.isArray(_)) {
+      var g = n[p];
+      if (Array.isArray(g)) {
         if (p in traverse$1.arrayKeywords)
-          for (var R = 0; R < _.length; R++)
-            _traverse(e, t, r, _[R], s + "/" + p + "/" + R, i, s, p, n, R);
+          for (var R = 0; R < g.length; R++)
+            _traverse(e, t, r, g[R], s + "/" + p + "/" + R, i, s, p, n, R);
       } else if (p in traverse$1.propsKeywords) {
-        if (_ && typeof _ == "object")
-          for (var O in _)
-            _traverse(e, t, r, _[O], s + "/" + p + "/" + escapeJsonPtr(O), i, s, p, n, O);
+        if (g && typeof g == "object")
+          for (var O in g)
+            _traverse(e, t, r, g[O], s + "/" + p + "/" + escapeJsonPtr(O), i, s, p, n, O);
       } else
-        (p in traverse$1.keywords || e.allKeys && !(p in traverse$1.skipKeywords)) && _traverse(e, t, r, _, s + "/" + p, i, s, p, n);
+        (p in traverse$1.keywords || e.allKeys && !(p in traverse$1.skipKeywords)) && _traverse(e, t, r, g, s + "/" + p, i, s, p, n);
     }
     r(n, s, i, o, c, d, u);
   }
@@ -4681,19 +4680,19 @@ function getSchemaRefs(e, t) {
   if (typeof e == "boolean")
     return {};
   const { schemaId: r, uriResolver: n } = this.opts, s = normalizeId(e[r] || t), i = { "": s }, o = getFullPath(n, s, !1), c = {}, d = /* @__PURE__ */ new Set();
-  return traverse(e, { allKeys: !0 }, (_, R, O, T) => {
+  return traverse(e, { allKeys: !0 }, (g, R, O, T) => {
     if (T === void 0)
       return;
     const v = o + R;
-    let $ = i[T];
-    typeof _[r] == "string" && ($ = m.call(this, _[r])), k.call(this, _.$anchor), k.call(this, _.$dynamicAnchor), i[R] = $;
+    let y = i[T];
+    typeof g[r] == "string" && (y = m.call(this, g[r])), k.call(this, g.$anchor), k.call(this, g.$dynamicAnchor), i[R] = y;
     function m(S) {
       const I = this.opts.uriResolver.resolve;
-      if (S = normalizeId($ ? I($, S) : S), d.has(S))
+      if (S = normalizeId(y ? I(y, S) : S), d.has(S))
         throw p(S);
       d.add(S);
       let D = this.refs[S];
-      return typeof D == "string" && (D = this.refs[D]), typeof D == "object" ? u(_, D.schema, S) : S !== normalizeId(v) && (S[0] === "#" ? (u(_, c[S], S), c[S] = _) : this.refs[S] = v), S;
+      return typeof D == "string" && (D = this.refs[D]), typeof D == "object" ? u(g, D.schema, S) : S !== normalizeId(v) && (S[0] === "#" ? (u(g, c[S], S), c[S] = g) : this.refs[S] = v), S;
     }
     function k(S) {
       if (typeof S == "string") {
@@ -4703,12 +4702,12 @@ function getSchemaRefs(e, t) {
       }
     }
   }), c;
-  function u(_, R, O) {
-    if (R !== void 0 && !equal$2(_, R))
+  function u(g, R, O) {
+    if (R !== void 0 && !equal$2(g, R))
       throw p(O);
   }
-  function p(_) {
-    return new Error(`reference "${_}" resolves to more than one schema`);
+  function p(g) {
+    return new Error(`reference "${g}" resolves to more than one schema`);
   }
 }
 resolve$1.getSchemaRefs = getSchemaRefs;
@@ -4825,10 +4824,10 @@ function schemaKeywords(e, t, r, n) {
   }
   d.jtd || checkStrictTypes(e, t), s.block(() => {
     for (const R of p.rules)
-      _(R);
-    _(p.post);
+      g(R);
+    g(p.post);
   });
-  function _(R) {
+  function g(R) {
     (0, applicability_1.shouldUseGroup)(i, R) && (R.type ? (s.if((0, dataType_2.checkDataType)(R.type, o, d.strictNumbers)), iterateKeywords(e, R), t.length === 1 && t[0] === R.type && r && (s.else(), (0, dataType_2.reportTypeError)(e)), s.endIf()) : iterateKeywords(e, R), c || s.if((0, codegen_1$n._)`${names_1$3.default.errors} === ${n || 0}`));
   }
 }
@@ -5091,10 +5090,10 @@ function compileSchema(e) {
   let p;
   try {
     this._compilations.add(e), (0, validate_1$1.validateFunctionCode)(u), o.optimize(this.opts.code.optimize);
-    const _ = o.toString();
-    p = `${o.scopeRefs(names_1$2.default.scope)}return ${_}`, this.opts.code.process && (p = this.opts.code.process(p, e));
+    const g = o.toString();
+    p = `${o.scopeRefs(names_1$2.default.scope)}return ${g}`, this.opts.code.process && (p = this.opts.code.process(p, e));
     const O = new Function(`${names_1$2.default.self}`, `${names_1$2.default.scope}`, p)(this, this.scope.get());
-    if (this.scope.value(d, { ref: O }), O.errors = null, O.schema = e.schema, O.schemaEnv = e, e.$async && (O.$async = !0), this.opts.code.source === !0 && (O.source = { validateName: d, validateCode: _, scopeValues: o._values }), this.opts.unevaluated) {
+    if (this.scope.value(d, { ref: O }), O.errors = null, O.schema = e.schema, O.schemaEnv = e, e.$async && (O.$async = !0), this.opts.code.source === !0 && (O.source = { validateName: d, validateCode: g, scopeValues: o._values }), this.opts.unevaluated) {
       const { props: T, items: v } = u;
       O.evaluated = {
         props: T instanceof codegen_1$m.Name ? void 0 : T,
@@ -5104,8 +5103,8 @@ function compileSchema(e) {
       }, O.source && (O.source.evaluated = (0, codegen_1$m.stringify)(O.evaluated));
     }
     return e.validate = O, e;
-  } catch (_) {
-    throw delete e.validate, delete e.validateName, p && this.logger.error("Error compiling schema, function code:", p), _;
+  } catch (g) {
+    throw delete e.validate, delete e.validateName, p && this.logger.error("Error compiling schema, function code:", p), g;
   } finally {
     this._compilations.delete(e);
   }
@@ -5222,13 +5221,13 @@ var uri$1 = {}, uri_all = { exports: {} };
     n(t);
   })(commonjsGlobal, function(r) {
     function n() {
-      for (var f = arguments.length, l = Array(f), g = 0; g < f; g++)
-        l[g] = arguments[g];
+      for (var f = arguments.length, l = Array(f), _ = 0; _ < f; _++)
+        l[_] = arguments[_];
       if (l.length > 1) {
         l[0] = l[0].slice(0, -1);
-        for (var b = l.length - 1, E = 1; E < b; ++E)
-          l[E] = l[E].slice(1, -1);
-        return l[b] = l[b].slice(1), l.join("");
+        for (var E = l.length - 1, b = 1; b < E; ++b)
+          l[b] = l[b].slice(1, -1);
+        return l[E] = l[E].slice(1), l.join("");
       } else
         return l[0];
     }
@@ -5245,20 +5244,20 @@ var uri$1 = {}, uri_all = { exports: {} };
       return f != null ? f instanceof Array ? f : typeof f.length != "number" || f.split || f.setInterval || f.call ? [f] : Array.prototype.slice.call(f) : [];
     }
     function d(f, l) {
-      var g = f;
+      var _ = f;
       if (l)
-        for (var b in l)
-          g[b] = l[b];
-      return g;
+        for (var E in l)
+          _[E] = l[E];
+      return _;
     }
     function u(f) {
-      var l = "[A-Za-z]", g = "[0-9]", b = n(g, "[A-Fa-f]"), E = s(s("%[EFef]" + b + "%" + b + b + "%" + b + b) + "|" + s("%[89A-Fa-f]" + b + "%" + b + b) + "|" + s("%" + b + b)), L = "[\\:\\/\\?\\#\\[\\]\\@]", U = "[\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=]", J = n(L, U), Y = f ? "[\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]" : "[]", se = f ? "[\\uE000-\\uF8FF]" : "[]", B = n(l, g, "[\\-\\.\\_\\~]", Y);
-      s(l + n(l, g, "[\\+\\-\\.]") + "*"), s(s(E + "|" + n(B, U, "[\\:]")) + "*");
-      var Z = s(s("25[0-5]") + "|" + s("2[0-4]" + g) + "|" + s("1" + g + g) + "|" + s("0?[1-9]" + g) + "|0?0?" + g), ie = s(Z + "\\." + Z + "\\." + Z + "\\." + Z), x = s(b + "{1,4}"), X = s(s(x + "\\:" + x) + "|" + ie), ae = s(s(x + "\\:") + "{6}" + X), ee = s("\\:\\:" + s(x + "\\:") + "{5}" + X), Se = s(s(x) + "?\\:\\:" + s(x + "\\:") + "{4}" + X), ge = s(s(s(x + "\\:") + "{0,1}" + x) + "?\\:\\:" + s(x + "\\:") + "{3}" + X), $e = s(s(s(x + "\\:") + "{0,2}" + x) + "?\\:\\:" + s(x + "\\:") + "{2}" + X), Be = s(s(s(x + "\\:") + "{0,3}" + x) + "?\\:\\:" + x + "\\:" + X), Ie = s(s(s(x + "\\:") + "{0,4}" + x) + "?\\:\\:" + X), fe = s(s(s(x + "\\:") + "{0,5}" + x) + "?\\:\\:" + x), ye = s(s(s(x + "\\:") + "{0,6}" + x) + "?\\:\\:"), je = s([ae, ee, Se, ge, $e, Be, Ie, fe, ye].join("|")), we = s(s(B + "|" + E) + "+");
-      s("[vV]" + b + "+\\." + n(B, U, "[\\:]") + "+"), s(s(E + "|" + n(B, U)) + "*");
-      var ct = s(E + "|" + n(B, U, "[\\:\\@]"));
-      return s(s(E + "|" + n(B, U, "[\\@]")) + "+"), s(s(ct + "|" + n("[\\/\\?]", se)) + "*"), {
-        NOT_SCHEME: new RegExp(n("[^]", l, g, "[\\+\\-\\.]"), "g"),
+      var l = "[A-Za-z]", _ = "[0-9]", E = n(_, "[A-Fa-f]"), b = s(s("%[EFef]" + E + "%" + E + E + "%" + E + E) + "|" + s("%[89A-Fa-f]" + E + "%" + E + E) + "|" + s("%" + E + E)), q = "[\\:\\/\\?\\#\\[\\]\\@]", U = "[\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=]", J = n(q, U), Y = f ? "[\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]" : "[]", se = f ? "[\\uE000-\\uF8FF]" : "[]", B = n(l, _, "[\\-\\.\\_\\~]", Y);
+      s(l + n(l, _, "[\\+\\-\\.]") + "*"), s(s(b + "|" + n(B, U, "[\\:]")) + "*");
+      var Z = s(s("25[0-5]") + "|" + s("2[0-4]" + _) + "|" + s("1" + _ + _) + "|" + s("0?[1-9]" + _) + "|0?0?" + _), ie = s(Z + "\\." + Z + "\\." + Z + "\\." + Z), x = s(E + "{1,4}"), X = s(s(x + "\\:" + x) + "|" + ie), ae = s(s(x + "\\:") + "{6}" + X), ee = s("\\:\\:" + s(x + "\\:") + "{5}" + X), Se = s(s(x) + "?\\:\\:" + s(x + "\\:") + "{4}" + X), ge = s(s(s(x + "\\:") + "{0,1}" + x) + "?\\:\\:" + s(x + "\\:") + "{3}" + X), ye = s(s(s(x + "\\:") + "{0,2}" + x) + "?\\:\\:" + s(x + "\\:") + "{2}" + X), Be = s(s(s(x + "\\:") + "{0,3}" + x) + "?\\:\\:" + x + "\\:" + X), Ie = s(s(s(x + "\\:") + "{0,4}" + x) + "?\\:\\:" + X), fe = s(s(s(x + "\\:") + "{0,5}" + x) + "?\\:\\:" + x), $e = s(s(s(x + "\\:") + "{0,6}" + x) + "?\\:\\:"), je = s([ae, ee, Se, ge, ye, Be, Ie, fe, $e].join("|")), we = s(s(B + "|" + b) + "+");
+      s("[vV]" + E + "+\\." + n(B, U, "[\\:]") + "+"), s(s(b + "|" + n(B, U)) + "*");
+      var ct = s(b + "|" + n(B, U, "[\\:\\@]"));
+      return s(s(b + "|" + n(B, U, "[\\@]")) + "+"), s(s(ct + "|" + n("[\\/\\?]", se)) + "*"), {
+        NOT_SCHEME: new RegExp(n("[^]", l, _, "[\\+\\-\\.]"), "g"),
         NOT_USERINFO: new RegExp(n("[^\\%\\:]", B, U), "g"),
         NOT_HOST: new RegExp(n("[^\\%\\[\\]\\:]", B, U), "g"),
         NOT_PATH: new RegExp(n("[^\\%\\/\\:\\@]", B, U), "g"),
@@ -5268,123 +5267,123 @@ var uri$1 = {}, uri_all = { exports: {} };
         ESCAPE: new RegExp(n("[^]", B, U), "g"),
         UNRESERVED: new RegExp(B, "g"),
         OTHER_CHARS: new RegExp(n("[^\\%]", B, J), "g"),
-        PCT_ENCODED: new RegExp(E, "g"),
+        PCT_ENCODED: new RegExp(b, "g"),
         IPV4ADDRESS: new RegExp("^(" + ie + ")$"),
-        IPV6ADDRESS: new RegExp("^\\[?(" + je + ")" + s(s("\\%25|\\%(?!" + b + "{2})") + "(" + we + ")") + "?\\]?$")
+        IPV6ADDRESS: new RegExp("^\\[?(" + je + ")" + s(s("\\%25|\\%(?!" + E + "{2})") + "(" + we + ")") + "?\\]?$")
         //RFC 6874, with relaxed parsing rules
       };
     }
-    var p = u(!1), _ = u(!0), R = function() {
-      function f(l, g) {
-        var b = [], E = !0, L = !1, U = void 0;
+    var p = u(!1), g = u(!0), R = function() {
+      function f(l, _) {
+        var E = [], b = !0, q = !1, U = void 0;
         try {
-          for (var J = l[Symbol.iterator](), Y; !(E = (Y = J.next()).done) && (b.push(Y.value), !(g && b.length === g)); E = !0)
+          for (var J = l[Symbol.iterator](), Y; !(b = (Y = J.next()).done) && (E.push(Y.value), !(_ && E.length === _)); b = !0)
             ;
         } catch (se) {
-          L = !0, U = se;
+          q = !0, U = se;
         } finally {
           try {
-            !E && J.return && J.return();
+            !b && J.return && J.return();
           } finally {
-            if (L)
+            if (q)
               throw U;
           }
         }
-        return b;
+        return E;
       }
-      return function(l, g) {
+      return function(l, _) {
         if (Array.isArray(l))
           return l;
         if (Symbol.iterator in Object(l))
-          return f(l, g);
+          return f(l, _);
         throw new TypeError("Invalid attempt to destructure non-iterable instance");
       };
     }(), O = function(f) {
       if (Array.isArray(f)) {
-        for (var l = 0, g = Array(f.length); l < f.length; l++)
-          g[l] = f[l];
-        return g;
+        for (var l = 0, _ = Array(f.length); l < f.length; l++)
+          _[l] = f[l];
+        return _;
       } else
         return Array.from(f);
-    }, T = 2147483647, v = 36, $ = 1, m = 26, k = 38, S = 700, I = 72, D = 128, w = "-", C = /^xn--/, A = /[^\0-\x7E]/, V = /[\x2E\u3002\uFF0E\uFF61]/g, z = {
+    }, T = 2147483647, v = 36, y = 1, m = 26, k = 38, S = 700, I = 72, D = 128, w = "-", C = /^xn--/, A = /[^\0-\x7E]/, V = /[\x2E\u3002\uFF0E\uFF61]/g, z = {
       overflow: "Overflow: input needs wider integers to process",
       "not-basic": "Illegal input >= 0x80 (not a basic code point)",
       "invalid-input": "Invalid input"
-    }, re = v - $, K = Math.floor, ue = String.fromCharCode;
+    }, re = v - y, K = Math.floor, ue = String.fromCharCode;
     function oe(f) {
       throw new RangeError(z[f]);
     }
     function ke(f, l) {
-      for (var g = [], b = f.length; b--; )
-        g[b] = l(f[b]);
-      return g;
+      for (var _ = [], E = f.length; E--; )
+        _[E] = l(f[E]);
+      return _;
     }
     function Ce(f, l) {
-      var g = f.split("@"), b = "";
-      g.length > 1 && (b = g[0] + "@", f = g[1]), f = f.replace(V, ".");
-      var E = f.split("."), L = ke(E, l).join(".");
-      return b + L;
-    }
-    function qe(f) {
-      for (var l = [], g = 0, b = f.length; g < b; ) {
-        var E = f.charCodeAt(g++);
-        if (E >= 55296 && E <= 56319 && g < b) {
-          var L = f.charCodeAt(g++);
-          (L & 64512) == 56320 ? l.push(((E & 1023) << 10) + (L & 1023) + 65536) : (l.push(E), g--);
+      var _ = f.split("@"), E = "";
+      _.length > 1 && (E = _[0] + "@", f = _[1]), f = f.replace(V, ".");
+      var b = f.split("."), q = ke(b, l).join(".");
+      return E + q;
+    }
+    function Le(f) {
+      for (var l = [], _ = 0, E = f.length; _ < E; ) {
+        var b = f.charCodeAt(_++);
+        if (b >= 55296 && b <= 56319 && _ < E) {
+          var q = f.charCodeAt(_++);
+          (q & 64512) == 56320 ? l.push(((b & 1023) << 10) + (q & 1023) + 65536) : (l.push(b), _--);
         } else
-          l.push(E);
+          l.push(b);
       }
       return l;
     }
     var et = function(l) {
       return String.fromCodePoint.apply(String, O(l));
-    }, Le = function(l) {
+    }, qe = function(l) {
       return l - 48 < 10 ? l - 22 : l - 65 < 26 ? l - 65 : l - 97 < 26 ? l - 97 : v;
-    }, F = function(l, g) {
-      return l + 22 + 75 * (l < 26) - ((g != 0) << 5);
-    }, y = function(l, g, b) {
-      var E = 0;
+    }, F = function(l, _) {
+      return l + 22 + 75 * (l < 26) - ((_ != 0) << 5);
+    }, $ = function(l, _, E) {
+      var b = 0;
       for (
-        l = b ? K(l / S) : l >> 1, l += K(l / g);
+        l = E ? K(l / S) : l >> 1, l += K(l / _);
         /* no initialization */
         l > re * m >> 1;
-        E += v
+        b += v
       )
         l = K(l / re);
-      return K(E + (re + 1) * l / (l + k));
+      return K(b + (re + 1) * l / (l + k));
     }, j = function(l) {
-      var g = [], b = l.length, E = 0, L = D, U = I, J = l.lastIndexOf(w);
+      var _ = [], E = l.length, b = 0, q = D, U = I, J = l.lastIndexOf(w);
       J < 0 && (J = 0);
       for (var Y = 0; Y < J; ++Y)
-        l.charCodeAt(Y) >= 128 && oe("not-basic"), g.push(l.charCodeAt(Y));
-      for (var se = J > 0 ? J + 1 : 0; se < b; ) {
+        l.charCodeAt(Y) >= 128 && oe("not-basic"), _.push(l.charCodeAt(Y));
+      for (var se = J > 0 ? J + 1 : 0; se < E; ) {
         for (
-          var B = E, Z = 1, ie = v;
+          var B = b, Z = 1, ie = v;
           ;
           /* no condition */
           ie += v
         ) {
-          se >= b && oe("invalid-input");
-          var x = Le(l.charCodeAt(se++));
-          (x >= v || x > K((T - E) / Z)) && oe("overflow"), E += x * Z;
-          var X = ie <= U ? $ : ie >= U + m ? m : ie - U;
+          se >= E && oe("invalid-input");
+          var x = qe(l.charCodeAt(se++));
+          (x >= v || x > K((T - b) / Z)) && oe("overflow"), b += x * Z;
+          var X = ie <= U ? y : ie >= U + m ? m : ie - U;
           if (x < X)
             break;
           var ae = v - X;
           Z > K(T / ae) && oe("overflow"), Z *= ae;
         }
-        var ee = g.length + 1;
-        U = y(E - B, ee, B == 0), K(E / ee) > T - L && oe("overflow"), L += K(E / ee), E %= ee, g.splice(E++, 0, L);
+        var ee = _.length + 1;
+        U = $(b - B, ee, B == 0), K(b / ee) > T - q && oe("overflow"), q += K(b / ee), b %= ee, _.splice(b++, 0, q);
       }
-      return String.fromCodePoint.apply(String, g);
+      return String.fromCodePoint.apply(String, _);
     }, P = function(l) {
-      var g = [];
-      l = qe(l);
-      var b = l.length, E = D, L = 0, U = I, J = !0, Y = !1, se = void 0;
+      var _ = [];
+      l = Le(l);
+      var E = l.length, b = D, q = 0, U = I, J = !0, Y = !1, se = void 0;
       try {
         for (var B = l[Symbol.iterator](), Z; !(J = (Z = B.next()).done); J = !0) {
           var ie = Z.value;
-          ie < 128 && g.push(ue(ie));
+          ie < 128 && _.push(ue(ie));
         }
       } catch (lt) {
         Y = !0, se = lt;
@@ -5396,66 +5395,66 @@ var uri$1 = {}, uri_all = { exports: {} };
             throw se;
         }
       }
-      var x = g.length, X = x;
-      for (x && g.push(w); X < b; ) {
+      var x = _.length, X = x;
+      for (x && _.push(w); X < E; ) {
         var ae = T, ee = !0, Se = !1, ge = void 0;
         try {
-          for (var $e = l[Symbol.iterator](), Be; !(ee = (Be = $e.next()).done); ee = !0) {
+          for (var ye = l[Symbol.iterator](), Be; !(ee = (Be = ye.next()).done); ee = !0) {
             var Ie = Be.value;
-            Ie >= E && Ie < ae && (ae = Ie);
+            Ie >= b && Ie < ae && (ae = Ie);
           }
         } catch (lt) {
           Se = !0, ge = lt;
         } finally {
           try {
-            !ee && $e.return && $e.return();
+            !ee && ye.return && ye.return();
           } finally {
             if (Se)
               throw ge;
           }
         }
         var fe = X + 1;
-        ae - E > K((T - L) / fe) && oe("overflow"), L += (ae - E) * fe, E = ae;
-        var ye = !0, je = !1, we = void 0;
+        ae - b > K((T - q) / fe) && oe("overflow"), q += (ae - b) * fe, b = ae;
+        var $e = !0, je = !1, we = void 0;
         try {
-          for (var ct = l[Symbol.iterator](), Ut; !(ye = (Ut = ct.next()).done); ye = !0) {
+          for (var ct = l[Symbol.iterator](), Ut; !($e = (Ut = ct.next()).done); $e = !0) {
             var Ht = Ut.value;
-            if (Ht < E && ++L > T && oe("overflow"), Ht == E) {
+            if (Ht < b && ++q > T && oe("overflow"), Ht == b) {
               for (
-                var pt = L, ft = v;
+                var pt = q, ft = v;
                 ;
                 /* no condition */
                 ft += v
               ) {
-                var ht = ft <= U ? $ : ft >= U + m ? m : ft - U;
+                var ht = ft <= U ? y : ft >= U + m ? m : ft - U;
                 if (pt < ht)
                   break;
                 var Vt = pt - ht, xt = v - ht;
-                g.push(ue(F(ht + Vt % xt, 0))), pt = K(Vt / xt);
+                _.push(ue(F(ht + Vt % xt, 0))), pt = K(Vt / xt);
               }
-              g.push(ue(F(pt, 0))), U = y(L, fe, X == x), L = 0, ++X;
+              _.push(ue(F(pt, 0))), U = $(q, fe, X == x), q = 0, ++X;
             }
           }
         } catch (lt) {
           je = !0, we = lt;
         } finally {
           try {
-            !ye && ct.return && ct.return();
+            !$e && ct.return && ct.return();
           } finally {
             if (je)
               throw we;
           }
         }
-        ++L, ++E;
+        ++q, ++b;
       }
-      return g.join("");
+      return _.join("");
     }, a = function(l) {
-      return Ce(l, function(g) {
-        return C.test(g) ? j(g.slice(4).toLowerCase()) : g;
+      return Ce(l, function(_) {
+        return C.test(_) ? j(_.slice(4).toLowerCase()) : _;
       });
     }, h = function(l) {
-      return Ce(l, function(g) {
-        return A.test(g) ? "xn--" + P(g) : g;
+      return Ce(l, function(_) {
+        return A.test(_) ? "xn--" + P(_) : _;
       });
     }, N = {
       /**
@@ -5472,7 +5471,7 @@ var uri$1 = {}, uri_all = { exports: {} };
        * @type Object
        */
       ucs2: {
-        decode: qe,
+        decode: Le,
         encode: et
       },
       decode: j,
@@ -5480,100 +5479,100 @@ var uri$1 = {}, uri_all = { exports: {} };
       toASCII: h,
       toUnicode: a
     }, M = {};
-    function q(f) {
-      var l = f.charCodeAt(0), g = void 0;
-      return l < 16 ? g = "%0" + l.toString(16).toUpperCase() : l < 128 ? g = "%" + l.toString(16).toUpperCase() : l < 2048 ? g = "%" + (l >> 6 | 192).toString(16).toUpperCase() + "%" + (l & 63 | 128).toString(16).toUpperCase() : g = "%" + (l >> 12 | 224).toString(16).toUpperCase() + "%" + (l >> 6 & 63 | 128).toString(16).toUpperCase() + "%" + (l & 63 | 128).toString(16).toUpperCase(), g;
+    function L(f) {
+      var l = f.charCodeAt(0), _ = void 0;
+      return l < 16 ? _ = "%0" + l.toString(16).toUpperCase() : l < 128 ? _ = "%" + l.toString(16).toUpperCase() : l < 2048 ? _ = "%" + (l >> 6 | 192).toString(16).toUpperCase() + "%" + (l & 63 | 128).toString(16).toUpperCase() : _ = "%" + (l >> 12 | 224).toString(16).toUpperCase() + "%" + (l >> 6 & 63 | 128).toString(16).toUpperCase() + "%" + (l & 63 | 128).toString(16).toUpperCase(), _;
     }
     function W(f) {
-      for (var l = "", g = 0, b = f.length; g < b; ) {
-        var E = parseInt(f.substr(g + 1, 2), 16);
-        if (E < 128)
-          l += String.fromCharCode(E), g += 3;
-        else if (E >= 194 && E < 224) {
-          if (b - g >= 6) {
-            var L = parseInt(f.substr(g + 4, 2), 16);
-            l += String.fromCharCode((E & 31) << 6 | L & 63);
+      for (var l = "", _ = 0, E = f.length; _ < E; ) {
+        var b = parseInt(f.substr(_ + 1, 2), 16);
+        if (b < 128)
+          l += String.fromCharCode(b), _ += 3;
+        else if (b >= 194 && b < 224) {
+          if (E - _ >= 6) {
+            var q = parseInt(f.substr(_ + 4, 2), 16);
+            l += String.fromCharCode((b & 31) << 6 | q & 63);
           } else
-            l += f.substr(g, 6);
-          g += 6;
-        } else if (E >= 224) {
-          if (b - g >= 9) {
-            var U = parseInt(f.substr(g + 4, 2), 16), J = parseInt(f.substr(g + 7, 2), 16);
-            l += String.fromCharCode((E & 15) << 12 | (U & 63) << 6 | J & 63);
+            l += f.substr(_, 6);
+          _ += 6;
+        } else if (b >= 224) {
+          if (E - _ >= 9) {
+            var U = parseInt(f.substr(_ + 4, 2), 16), J = parseInt(f.substr(_ + 7, 2), 16);
+            l += String.fromCharCode((b & 15) << 12 | (U & 63) << 6 | J & 63);
           } else
-            l += f.substr(g, 9);
-          g += 9;
+            l += f.substr(_, 9);
+          _ += 9;
         } else
-          l += f.substr(g, 3), g += 3;
+          l += f.substr(_, 3), _ += 3;
       }
       return l;
     }
     function G(f, l) {
-      function g(b) {
-        var E = W(b);
-        return E.match(l.UNRESERVED) ? E : b;
+      function _(E) {
+        var b = W(E);
+        return b.match(l.UNRESERVED) ? b : E;
       }
-      return f.scheme && (f.scheme = String(f.scheme).replace(l.PCT_ENCODED, g).toLowerCase().replace(l.NOT_SCHEME, "")), f.userinfo !== void 0 && (f.userinfo = String(f.userinfo).replace(l.PCT_ENCODED, g).replace(l.NOT_USERINFO, q).replace(l.PCT_ENCODED, o)), f.host !== void 0 && (f.host = String(f.host).replace(l.PCT_ENCODED, g).toLowerCase().replace(l.NOT_HOST, q).replace(l.PCT_ENCODED, o)), f.path !== void 0 && (f.path = String(f.path).replace(l.PCT_ENCODED, g).replace(f.scheme ? l.NOT_PATH : l.NOT_PATH_NOSCHEME, q).replace(l.PCT_ENCODED, o)), f.query !== void 0 && (f.query = String(f.query).replace(l.PCT_ENCODED, g).replace(l.NOT_QUERY, q).replace(l.PCT_ENCODED, o)), f.fragment !== void 0 && (f.fragment = String(f.fragment).replace(l.PCT_ENCODED, g).replace(l.NOT_FRAGMENT, q).replace(l.PCT_ENCODED, o)), f;
+      return f.scheme && (f.scheme = String(f.scheme).replace(l.PCT_ENCODED, _).toLowerCase().replace(l.NOT_SCHEME, "")), f.userinfo !== void 0 && (f.userinfo = String(f.userinfo).replace(l.PCT_ENCODED, _).replace(l.NOT_USERINFO, L).replace(l.PCT_ENCODED, o)), f.host !== void 0 && (f.host = String(f.host).replace(l.PCT_ENCODED, _).toLowerCase().replace(l.NOT_HOST, L).replace(l.PCT_ENCODED, o)), f.path !== void 0 && (f.path = String(f.path).replace(l.PCT_ENCODED, _).replace(f.scheme ? l.NOT_PATH : l.NOT_PATH_NOSCHEME, L).replace(l.PCT_ENCODED, o)), f.query !== void 0 && (f.query = String(f.query).replace(l.PCT_ENCODED, _).replace(l.NOT_QUERY, L).replace(l.PCT_ENCODED, o)), f.fragment !== void 0 && (f.fragment = String(f.fragment).replace(l.PCT_ENCODED, _).replace(l.NOT_FRAGMENT, L).replace(l.PCT_ENCODED, o)), f;
     }
     function ne(f) {
       return f.replace(/^0*(.*)/, "$1") || "0";
     }
     function he(f, l) {
-      var g = f.match(l.IPV4ADDRESS) || [], b = R(g, 2), E = b[1];
-      return E ? E.split(".").map(ne).join(".") : f;
+      var _ = f.match(l.IPV4ADDRESS) || [], E = R(_, 2), b = E[1];
+      return b ? b.split(".").map(ne).join(".") : f;
     }
     function Ue(f, l) {
-      var g = f.match(l.IPV6ADDRESS) || [], b = R(g, 3), E = b[1], L = b[2];
-      if (E) {
-        for (var U = E.toLowerCase().split("::").reverse(), J = R(U, 2), Y = J[0], se = J[1], B = se ? se.split(":").map(ne) : [], Z = Y.split(":").map(ne), ie = l.IPV4ADDRESS.test(Z[Z.length - 1]), x = ie ? 7 : 8, X = Z.length - x, ae = Array(x), ee = 0; ee < x; ++ee)
+      var _ = f.match(l.IPV6ADDRESS) || [], E = R(_, 3), b = E[1], q = E[2];
+      if (b) {
+        for (var U = b.toLowerCase().split("::").reverse(), J = R(U, 2), Y = J[0], se = J[1], B = se ? se.split(":").map(ne) : [], Z = Y.split(":").map(ne), ie = l.IPV4ADDRESS.test(Z[Z.length - 1]), x = ie ? 7 : 8, X = Z.length - x, ae = Array(x), ee = 0; ee < x; ++ee)
           ae[ee] = B[ee] || Z[X + ee] || "";
         ie && (ae[x - 1] = he(ae[x - 1], l));
-        var Se = ae.reduce(function(fe, ye, je) {
-          if (!ye || ye === "0") {
+        var Se = ae.reduce(function(fe, $e, je) {
+          if (!$e || $e === "0") {
             var we = fe[fe.length - 1];
             we && we.index + we.length === je ? we.length++ : fe.push({ index: je, length: 1 });
           }
           return fe;
-        }, []), ge = Se.sort(function(fe, ye) {
-          return ye.length - fe.length;
-        })[0], $e = void 0;
+        }, []), ge = Se.sort(function(fe, $e) {
+          return $e.length - fe.length;
+        })[0], ye = void 0;
         if (ge && ge.length > 1) {
           var Be = ae.slice(0, ge.index), Ie = ae.slice(ge.index + ge.length);
-          $e = Be.join(":") + "::" + Ie.join(":");
+          ye = Be.join(":") + "::" + Ie.join(":");
         } else
-          $e = ae.join(":");
-        return L && ($e += "%" + L), $e;
+          ye = ae.join(":");
+        return q && (ye += "%" + q), ye;
       } else
         return f;
     }
     var tt = /^(?:([^:\/?#]+):)?(?:\/\/((?:([^\/?#@]*)@)?(\[[^\/?#\]]+\]|[^\/?#:]*)(?:\:(\d*))?))?([^?#]*)(?:\?([^#]*))?(?:#((?:.|\n|\r)*))?/i, rt = "".match(/(){0}/)[1] === void 0;
     function de(f) {
-      var l = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, g = {}, b = l.iri !== !1 ? _ : p;
+      var l = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, _ = {}, E = l.iri !== !1 ? g : p;
       l.reference === "suffix" && (f = (l.scheme ? l.scheme + ":" : "") + "//" + f);
-      var E = f.match(tt);
-      if (E) {
-        rt ? (g.scheme = E[1], g.userinfo = E[3], g.host = E[4], g.port = parseInt(E[5], 10), g.path = E[6] || "", g.query = E[7], g.fragment = E[8], isNaN(g.port) && (g.port = E[5])) : (g.scheme = E[1] || void 0, g.userinfo = f.indexOf("@") !== -1 ? E[3] : void 0, g.host = f.indexOf("//") !== -1 ? E[4] : void 0, g.port = parseInt(E[5], 10), g.path = E[6] || "", g.query = f.indexOf("?") !== -1 ? E[7] : void 0, g.fragment = f.indexOf("#") !== -1 ? E[8] : void 0, isNaN(g.port) && (g.port = f.match(/\/\/(?:.|\n)*\:(?:\/|\?|\#|$)/) ? E[4] : void 0)), g.host && (g.host = Ue(he(g.host, b), b)), g.scheme === void 0 && g.userinfo === void 0 && g.host === void 0 && g.port === void 0 && !g.path && g.query === void 0 ? g.reference = "same-document" : g.scheme === void 0 ? g.reference = "relative" : g.fragment === void 0 ? g.reference = "absolute" : g.reference = "uri", l.reference && l.reference !== "suffix" && l.reference !== g.reference && (g.error = g.error || "URI is not a " + l.reference + " reference.");
-        var L = M[(l.scheme || g.scheme || "").toLowerCase()];
-        if (!l.unicodeSupport && (!L || !L.unicodeSupport)) {
-          if (g.host && (l.domainHost || L && L.domainHost))
+      var b = f.match(tt);
+      if (b) {
+        rt ? (_.scheme = b[1], _.userinfo = b[3], _.host = b[4], _.port = parseInt(b[5], 10), _.path = b[6] || "", _.query = b[7], _.fragment = b[8], isNaN(_.port) && (_.port = b[5])) : (_.scheme = b[1] || void 0, _.userinfo = f.indexOf("@") !== -1 ? b[3] : void 0, _.host = f.indexOf("//") !== -1 ? b[4] : void 0, _.port = parseInt(b[5], 10), _.path = b[6] || "", _.query = f.indexOf("?") !== -1 ? b[7] : void 0, _.fragment = f.indexOf("#") !== -1 ? b[8] : void 0, isNaN(_.port) && (_.port = f.match(/\/\/(?:.|\n)*\:(?:\/|\?|\#|$)/) ? b[4] : void 0)), _.host && (_.host = Ue(he(_.host, E), E)), _.scheme === void 0 && _.userinfo === void 0 && _.host === void 0 && _.port === void 0 && !_.path && _.query === void 0 ? _.reference = "same-document" : _.scheme === void 0 ? _.reference = "relative" : _.fragment === void 0 ? _.reference = "absolute" : _.reference = "uri", l.reference && l.reference !== "suffix" && l.reference !== _.reference && (_.error = _.error || "URI is not a " + l.reference + " reference.");
+        var q = M[(l.scheme || _.scheme || "").toLowerCase()];
+        if (!l.unicodeSupport && (!q || !q.unicodeSupport)) {
+          if (_.host && (l.domainHost || q && q.domainHost))
             try {
-              g.host = N.toASCII(g.host.replace(b.PCT_ENCODED, W).toLowerCase());
+              _.host = N.toASCII(_.host.replace(E.PCT_ENCODED, W).toLowerCase());
             } catch (U) {
-              g.error = g.error || "Host's domain name can not be converted to ASCII via punycode: " + U;
+              _.error = _.error || "Host's domain name can not be converted to ASCII via punycode: " + U;
             }
-          G(g, p);
+          G(_, p);
         } else
-          G(g, b);
-        L && L.parse && L.parse(g, l);
+          G(_, E);
+        q && q.parse && q.parse(_, l);
       } else
-        g.error = g.error || "URI can not be parsed.";
-      return g;
+        _.error = _.error || "URI can not be parsed.";
+      return _;
     }
     function nt(f, l) {
-      var g = l.iri !== !1 ? _ : p, b = [];
-      return f.userinfo !== void 0 && (b.push(f.userinfo), b.push("@")), f.host !== void 0 && b.push(Ue(he(String(f.host), g), g).replace(g.IPV6ADDRESS, function(E, L, U) {
-        return "[" + L + (U ? "%25" + U : "") + "]";
-      })), (typeof f.port == "number" || typeof f.port == "string") && (b.push(":"), b.push(String(f.port))), b.length ? b.join("") : void 0;
+      var _ = l.iri !== !1 ? g : p, E = [];
+      return f.userinfo !== void 0 && (E.push(f.userinfo), E.push("@")), f.host !== void 0 && E.push(Ue(he(String(f.host), _), _).replace(_.IPV6ADDRESS, function(b, q, U) {
+        return "[" + q + (U ? "%25" + U : "") + "]";
+      })), (typeof f.port == "number" || typeof f.port == "string") && (E.push(":"), E.push(String(f.port))), E.length ? E.join("") : void 0;
     }
     var He = /^\.\.?\//, Ve = /^\/\.(\/|$)/, xe = /^\/\.\.(\/|$)/, st = /^\/?(?:.|\n)*?(?=\/|$)/;
     function me(f) {
@@ -5587,62 +5586,62 @@ var uri$1 = {}, uri_all = { exports: {} };
         else if (f === "." || f === "..")
           f = "";
         else {
-          var g = f.match(st);
-          if (g) {
-            var b = g[0];
-            f = f.slice(b.length), l.push(b);
+          var _ = f.match(st);
+          if (_) {
+            var E = _[0];
+            f = f.slice(E.length), l.push(E);
           } else
             throw new Error("Unexpected dot segment condition");
         }
       return l.join("");
     }
     function le(f) {
-      var l = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, g = l.iri ? _ : p, b = [], E = M[(l.scheme || f.scheme || "").toLowerCase()];
-      if (E && E.serialize && E.serialize(f, l), f.host && !g.IPV6ADDRESS.test(f.host)) {
-        if (l.domainHost || E && E.domainHost)
+      var l = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, _ = l.iri ? g : p, E = [], b = M[(l.scheme || f.scheme || "").toLowerCase()];
+      if (b && b.serialize && b.serialize(f, l), f.host && !_.IPV6ADDRESS.test(f.host)) {
+        if (l.domainHost || b && b.domainHost)
           try {
-            f.host = l.iri ? N.toUnicode(f.host) : N.toASCII(f.host.replace(g.PCT_ENCODED, W).toLowerCase());
+            f.host = l.iri ? N.toUnicode(f.host) : N.toASCII(f.host.replace(_.PCT_ENCODED, W).toLowerCase());
           } catch (J) {
             f.error = f.error || "Host's domain name can not be converted to " + (l.iri ? "Unicode" : "ASCII") + " via punycode: " + J;
           }
       }
-      G(f, g), l.reference !== "suffix" && f.scheme && (b.push(f.scheme), b.push(":"));
-      var L = nt(f, l);
-      if (L !== void 0 && (l.reference !== "suffix" && b.push("//"), b.push(L), f.path && f.path.charAt(0) !== "/" && b.push("/")), f.path !== void 0) {
+      G(f, _), l.reference !== "suffix" && f.scheme && (E.push(f.scheme), E.push(":"));
+      var q = nt(f, l);
+      if (q !== void 0 && (l.reference !== "suffix" && E.push("//"), E.push(q), f.path && f.path.charAt(0) !== "/" && E.push("/")), f.path !== void 0) {
         var U = f.path;
-        !l.absolutePath && (!E || !E.absolutePath) && (U = me(U)), L === void 0 && (U = U.replace(/^\/\//, "/%2F")), b.push(U);
+        !l.absolutePath && (!b || !b.absolutePath) && (U = me(U)), q === void 0 && (U = U.replace(/^\/\//, "/%2F")), E.push(U);
       }
-      return f.query !== void 0 && (b.push("?"), b.push(f.query)), f.fragment !== void 0 && (b.push("#"), b.push(f.fragment)), b.join("");
+      return f.query !== void 0 && (E.push("?"), E.push(f.query)), f.fragment !== void 0 && (E.push("#"), E.push(f.fragment)), E.join("");
     }
     function ze(f, l) {
-      var g = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, b = arguments[3], E = {};
-      return b || (f = de(le(f, g), g), l = de(le(l, g), g)), g = g || {}, !g.tolerant && l.scheme ? (E.scheme = l.scheme, E.userinfo = l.userinfo, E.host = l.host, E.port = l.port, E.path = me(l.path || ""), E.query = l.query) : (l.userinfo !== void 0 || l.host !== void 0 || l.port !== void 0 ? (E.userinfo = l.userinfo, E.host = l.host, E.port = l.port, E.path = me(l.path || ""), E.query = l.query) : (l.path ? (l.path.charAt(0) === "/" ? E.path = me(l.path) : ((f.userinfo !== void 0 || f.host !== void 0 || f.port !== void 0) && !f.path ? E.path = "/" + l.path : f.path ? E.path = f.path.slice(0, f.path.lastIndexOf("/") + 1) + l.path : E.path = l.path, E.path = me(E.path)), E.query = l.query) : (E.path = f.path, l.query !== void 0 ? E.query = l.query : E.query = f.query), E.userinfo = f.userinfo, E.host = f.host, E.port = f.port), E.scheme = f.scheme), E.fragment = l.fragment, E;
+      var _ = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, E = arguments[3], b = {};
+      return E || (f = de(le(f, _), _), l = de(le(l, _), _)), _ = _ || {}, !_.tolerant && l.scheme ? (b.scheme = l.scheme, b.userinfo = l.userinfo, b.host = l.host, b.port = l.port, b.path = me(l.path || ""), b.query = l.query) : (l.userinfo !== void 0 || l.host !== void 0 || l.port !== void 0 ? (b.userinfo = l.userinfo, b.host = l.host, b.port = l.port, b.path = me(l.path || ""), b.query = l.query) : (l.path ? (l.path.charAt(0) === "/" ? b.path = me(l.path) : ((f.userinfo !== void 0 || f.host !== void 0 || f.port !== void 0) && !f.path ? b.path = "/" + l.path : f.path ? b.path = f.path.slice(0, f.path.lastIndexOf("/") + 1) + l.path : b.path = l.path, b.path = me(b.path)), b.query = l.query) : (b.path = f.path, l.query !== void 0 ? b.query = l.query : b.query = f.query), b.userinfo = f.userinfo, b.host = f.host, b.port = f.port), b.scheme = f.scheme), b.fragment = l.fragment, b;
     }
-    function it(f, l, g) {
-      var b = d({ scheme: "null" }, g);
-      return le(ze(de(f, b), de(l, b), b, !0), b);
+    function it(f, l, _) {
+      var E = d({ scheme: "null" }, _);
+      return le(ze(de(f, E), de(l, E), E, !0), E);
     }
     function Oe(f, l) {
       return typeof f == "string" ? f = le(de(f, l), l) : i(f) === "object" && (f = de(le(f, l), l)), f;
     }
-    function ot(f, l, g) {
-      return typeof f == "string" ? f = le(de(f, g), g) : i(f) === "object" && (f = le(f, g)), typeof l == "string" ? l = le(de(l, g), g) : i(l) === "object" && (l = le(l, g)), f === l;
+    function ot(f, l, _) {
+      return typeof f == "string" ? f = le(de(f, _), _) : i(f) === "object" && (f = le(f, _)), typeof l == "string" ? l = le(de(l, _), _) : i(l) === "object" && (l = le(l, _)), f === l;
     }
     function ut(f, l) {
-      return f && f.toString().replace(!l || !l.iri ? p.ESCAPE : _.ESCAPE, q);
+      return f && f.toString().replace(!l || !l.iri ? p.ESCAPE : g.ESCAPE, L);
     }
     function pe(f, l) {
-      return f && f.toString().replace(!l || !l.iri ? p.PCT_ENCODED : _.PCT_ENCODED, W);
+      return f && f.toString().replace(!l || !l.iri ? p.PCT_ENCODED : g.PCT_ENCODED, W);
     }
     var Ne = {
       scheme: "http",
       domainHost: !0,
-      parse: function(l, g) {
+      parse: function(l, _) {
         return l.host || (l.error = l.error || "HTTP URIs must have a host."), l;
       },
-      serialize: function(l, g) {
-        var b = String(l.scheme).toLowerCase() === "https";
-        return (l.port === (b ? 443 : 80) || l.port === "") && (l.port = void 0), l.path || (l.path = "/"), l;
+      serialize: function(l, _) {
+        var E = String(l.scheme).toLowerCase() === "https";
+        return (l.port === (E ? 443 : 80) || l.port === "") && (l.port = void 0), l.path || (l.path = "/"), l;
       }
     }, It = {
       scheme: "https",
@@ -5656,14 +5655,14 @@ var uri$1 = {}, uri_all = { exports: {} };
     var at = {
       scheme: "ws",
       domainHost: !0,
-      parse: function(l, g) {
-        var b = l;
-        return b.secure = jt(b), b.resourceName = (b.path || "/") + (b.query ? "?" + b.query : ""), b.path = void 0, b.query = void 0, b;
+      parse: function(l, _) {
+        var E = l;
+        return E.secure = jt(E), E.resourceName = (E.path || "/") + (E.query ? "?" + E.query : ""), E.path = void 0, E.query = void 0, E;
       },
-      serialize: function(l, g) {
+      serialize: function(l, _) {
         if ((l.port === (jt(l) ? 443 : 80) || l.port === "") && (l.port = void 0), typeof l.secure == "boolean" && (l.scheme = l.secure ? "wss" : "ws", l.secure = void 0), l.resourceName) {
-          var b = l.resourceName.split("?"), E = R(b, 2), L = E[0], U = E[1];
-          l.path = L && L !== "/" ? L : void 0, l.query = U, l.resourceName = void 0;
+          var E = l.resourceName.split("?"), b = R(E, 2), q = b[0], U = b[1];
+          l.path = q && q !== "/" ? q : void 0, l.query = U, l.resourceName = void 0;
         }
         return l.fragment = void 0, l;
       }
@@ -5679,94 +5678,94 @@ var uri$1 = {}, uri_all = { exports: {} };
     }
     var Mt = {
       scheme: "mailto",
-      parse: function(l, g) {
-        var b = l, E = b.to = b.path ? b.path.split(",") : [];
-        if (b.path = void 0, b.query) {
-          for (var L = !1, U = {}, J = b.query.split("&"), Y = 0, se = J.length; Y < se; ++Y) {
+      parse: function(l, _) {
+        var E = l, b = E.to = E.path ? E.path.split(",") : [];
+        if (E.path = void 0, E.query) {
+          for (var q = !1, U = {}, J = E.query.split("&"), Y = 0, se = J.length; Y < se; ++Y) {
             var B = J[Y].split("=");
             switch (B[0]) {
               case "to":
                 for (var Z = B[1].split(","), ie = 0, x = Z.length; ie < x; ++ie)
-                  E.push(Z[ie]);
+                  b.push(Z[ie]);
                 break;
               case "subject":
-                b.subject = pe(B[1], g);
+                E.subject = pe(B[1], _);
                 break;
               case "body":
-                b.body = pe(B[1], g);
+                E.body = pe(B[1], _);
                 break;
               default:
-                L = !0, U[pe(B[0], g)] = pe(B[1], g);
+                q = !0, U[pe(B[0], _)] = pe(B[1], _);
                 break;
             }
           }
-          L && (b.headers = U);
+          q && (E.headers = U);
         }
-        b.query = void 0;
-        for (var X = 0, ae = E.length; X < ae; ++X) {
-          var ee = E[X].split("@");
-          if (ee[0] = pe(ee[0]), g.unicodeSupport)
-            ee[1] = pe(ee[1], g).toLowerCase();
+        E.query = void 0;
+        for (var X = 0, ae = b.length; X < ae; ++X) {
+          var ee = b[X].split("@");
+          if (ee[0] = pe(ee[0]), _.unicodeSupport)
+            ee[1] = pe(ee[1], _).toLowerCase();
           else
             try {
-              ee[1] = N.toASCII(pe(ee[1], g).toLowerCase());
+              ee[1] = N.toASCII(pe(ee[1], _).toLowerCase());
             } catch (Se) {
-              b.error = b.error || "Email address's domain name can not be converted to ASCII via punycode: " + Se;
+              E.error = E.error || "Email address's domain name can not be converted to ASCII via punycode: " + Se;
             }
-          E[X] = ee.join("@");
+          b[X] = ee.join("@");
         }
-        return b;
+        return E;
       },
-      serialize: function(l, g) {
-        var b = l, E = c(l.to);
-        if (E) {
-          for (var L = 0, U = E.length; L < U; ++L) {
-            var J = String(E[L]), Y = J.lastIndexOf("@"), se = J.slice(0, Y).replace(We, Ot).replace(We, o).replace(pr, q), B = J.slice(Y + 1);
+      serialize: function(l, _) {
+        var E = l, b = c(l.to);
+        if (b) {
+          for (var q = 0, U = b.length; q < U; ++q) {
+            var J = String(b[q]), Y = J.lastIndexOf("@"), se = J.slice(0, Y).replace(We, Ot).replace(We, o).replace(pr, L), B = J.slice(Y + 1);
             try {
-              B = g.iri ? N.toUnicode(B) : N.toASCII(pe(B, g).toLowerCase());
+              B = _.iri ? N.toUnicode(B) : N.toASCII(pe(B, _).toLowerCase());
             } catch (X) {
-              b.error = b.error || "Email address's domain name can not be converted to " + (g.iri ? "Unicode" : "ASCII") + " via punycode: " + X;
+              E.error = E.error || "Email address's domain name can not be converted to " + (_.iri ? "Unicode" : "ASCII") + " via punycode: " + X;
             }
-            E[L] = se + "@" + B;
+            b[q] = se + "@" + B;
           }
-          b.path = E.join(",");
+          E.path = b.join(",");
         }
         var Z = l.headers = l.headers || {};
         l.subject && (Z.subject = l.subject), l.body && (Z.body = l.body);
         var ie = [];
         for (var x in Z)
-          Z[x] !== ir[x] && ie.push(x.replace(We, Ot).replace(We, o).replace(Ft, q) + "=" + Z[x].replace(We, Ot).replace(We, o).replace(fr, q));
-        return ie.length && (b.query = ie.join("&")), b;
+          Z[x] !== ir[x] && ie.push(x.replace(We, Ot).replace(We, o).replace(Ft, L) + "=" + Z[x].replace(We, Ot).replace(We, o).replace(fr, L));
+        return ie.length && (E.query = ie.join("&")), E;
       }
-    }, hr = /^([^\:]+)\:(.*)/, qt = {
+    }, hr = /^([^\:]+)\:(.*)/, Lt = {
       scheme: "urn",
-      parse: function(l, g) {
-        var b = l.path && l.path.match(hr), E = l;
-        if (b) {
-          var L = g.scheme || E.scheme || "urn", U = b[1].toLowerCase(), J = b[2], Y = L + ":" + (g.nid || U), se = M[Y];
-          E.nid = U, E.nss = J, E.path = void 0, se && (E = se.parse(E, g));
+      parse: function(l, _) {
+        var E = l.path && l.path.match(hr), b = l;
+        if (E) {
+          var q = _.scheme || b.scheme || "urn", U = E[1].toLowerCase(), J = E[2], Y = q + ":" + (_.nid || U), se = M[Y];
+          b.nid = U, b.nss = J, b.path = void 0, se && (b = se.parse(b, _));
         } else
-          E.error = E.error || "URN can not be parsed.";
-        return E;
+          b.error = b.error || "URN can not be parsed.";
+        return b;
       },
-      serialize: function(l, g) {
-        var b = g.scheme || l.scheme || "urn", E = l.nid, L = b + ":" + (g.nid || E), U = M[L];
-        U && (l = U.serialize(l, g));
+      serialize: function(l, _) {
+        var E = _.scheme || l.scheme || "urn", b = l.nid, q = E + ":" + (_.nid || b), U = M[q];
+        U && (l = U.serialize(l, _));
         var J = l, Y = l.nss;
-        return J.path = (E || g.nid) + ":" + Y, J;
+        return J.path = (b || _.nid) + ":" + Y, J;
       }
-    }, mr = /^[0-9A-Fa-f]{8}(?:\-[0-9A-Fa-f]{4}){3}\-[0-9A-Fa-f]{12}$/, Lt = {
+    }, mr = /^[0-9A-Fa-f]{8}(?:\-[0-9A-Fa-f]{4}){3}\-[0-9A-Fa-f]{12}$/, qt = {
       scheme: "urn:uuid",
-      parse: function(l, g) {
-        var b = l;
-        return b.uuid = b.nss, b.nss = void 0, !g.tolerant && (!b.uuid || !b.uuid.match(mr)) && (b.error = b.error || "UUID is not valid."), b;
+      parse: function(l, _) {
+        var E = l;
+        return E.uuid = E.nss, E.nss = void 0, !_.tolerant && (!E.uuid || !E.uuid.match(mr)) && (E.error = E.error || "UUID is not valid."), E;
       },
-      serialize: function(l, g) {
-        var b = l;
-        return b.nss = (l.uuid || "").toLowerCase(), b;
+      serialize: function(l, _) {
+        var E = l;
+        return E.nss = (l.uuid || "").toLowerCase(), E;
       }
     };
-    M[Ne.scheme] = Ne, M[It.scheme] = It, M[at.scheme] = at, M[At.scheme] = At, M[Mt.scheme] = Mt, M[qt.scheme] = qt, M[Lt.scheme] = Lt, r.SCHEMES = M, r.pctEncChar = q, r.pctDecChars = W, r.parse = de, r.removeDotSegments = me, r.serialize = le, r.resolveComponents = ze, r.resolve = it, r.normalize = Oe, r.equal = ot, r.escapeComponent = ut, r.unescapeComponent = pe, Object.defineProperty(r, "__esModule", { value: !0 });
+    M[Ne.scheme] = Ne, M[It.scheme] = It, M[at.scheme] = at, M[At.scheme] = At, M[Mt.scheme] = Mt, M[Lt.scheme] = Lt, M[qt.scheme] = qt, r.SCHEMES = M, r.pctEncChar = L, r.pctDecChars = W, r.parse = de, r.removeDotSegments = me, r.serialize = le, r.resolveComponents = ze, r.resolve = it, r.normalize = Oe, r.equal = ot, r.escapeComponent = ut, r.unescapeComponent = pe, Object.defineProperty(r, "__esModule", { value: !0 });
   });
 })(uri_all, uri_all.exports);
 var uri_allExports = uri_all.exports;
@@ -5794,7 +5793,7 @@ uri$1.default = uri;
   } }), Object.defineProperty(e, "CodeGen", { enumerable: !0, get: function() {
     return r.CodeGen;
   } });
-  const n = validation_error, s = ref_error, i = rules, o = compile, c = codegen, d = resolve$1, u = dataType, p = util, _ = require$$9, R = uri$1, O = (F, y) => new RegExp(F, y);
+  const n = validation_error, s = ref_error, i = rules, o = compile, c = codegen, d = resolve$1, u = dataType, p = util, g = require$$9, R = uri$1, O = (F, $) => new RegExp(F, $);
   O.code = "new RegExp";
   const T = ["removeAdditional", "useDefaults", "coerceTypes"], v = /* @__PURE__ */ new Set([
     "validate",
@@ -5810,7 +5809,7 @@ uri$1.default = uri;
     "func",
     "obj",
     "Error"
-  ]), $ = {
+  ]), y = {
     errorDataPath: "",
     format: "`validateFormats: false` can be used instead.",
     nullable: '"nullable" keyword is supported by default.',
@@ -5832,11 +5831,11 @@ uri$1.default = uri;
     unicode: '"minLength"/"maxLength" account for unicode characters by default.'
   }, k = 200;
   function S(F) {
-    var y, j, P, a, h, N, M, q, W, G, ne, he, Ue, tt, rt, de, nt, He, Ve, xe, st, me, le, ze, it;
-    const Oe = F.strict, ot = (y = F.code) === null || y === void 0 ? void 0 : y.optimize, ut = ot === !0 || ot === void 0 ? 1 : ot || 0, pe = (P = (j = F.code) === null || j === void 0 ? void 0 : j.regExp) !== null && P !== void 0 ? P : O, Ne = (a = F.uriResolver) !== null && a !== void 0 ? a : R.default;
+    var $, j, P, a, h, N, M, L, W, G, ne, he, Ue, tt, rt, de, nt, He, Ve, xe, st, me, le, ze, it;
+    const Oe = F.strict, ot = ($ = F.code) === null || $ === void 0 ? void 0 : $.optimize, ut = ot === !0 || ot === void 0 ? 1 : ot || 0, pe = (P = (j = F.code) === null || j === void 0 ? void 0 : j.regExp) !== null && P !== void 0 ? P : O, Ne = (a = F.uriResolver) !== null && a !== void 0 ? a : R.default;
     return {
       strictSchema: (N = (h = F.strictSchema) !== null && h !== void 0 ? h : Oe) !== null && N !== void 0 ? N : !0,
-      strictNumbers: (q = (M = F.strictNumbers) !== null && M !== void 0 ? M : Oe) !== null && q !== void 0 ? q : !0,
+      strictNumbers: (L = (M = F.strictNumbers) !== null && M !== void 0 ? M : Oe) !== null && L !== void 0 ? L : !0,
       strictTypes: (G = (W = F.strictTypes) !== null && W !== void 0 ? W : Oe) !== null && G !== void 0 ? G : "log",
       strictTuples: (he = (ne = F.strictTuples) !== null && ne !== void 0 ? ne : Oe) !== null && he !== void 0 ? he : "log",
       strictRequired: (tt = (Ue = F.strictRequired) !== null && Ue !== void 0 ? Ue : Oe) !== null && tt !== void 0 ? tt : !1,
@@ -5856,44 +5855,44 @@ uri$1.default = uri;
     };
   }
   class I {
-    constructor(y = {}) {
-      this.schemas = {}, this.refs = {}, this.formats = {}, this._compilations = /* @__PURE__ */ new Set(), this._loading = {}, this._cache = /* @__PURE__ */ new Map(), y = this.opts = { ...y, ...S(y) };
+    constructor($ = {}) {
+      this.schemas = {}, this.refs = {}, this.formats = {}, this._compilations = /* @__PURE__ */ new Set(), this._loading = {}, this._cache = /* @__PURE__ */ new Map(), $ = this.opts = { ...$, ...S($) };
       const { es5: j, lines: P } = this.opts.code;
-      this.scope = new c.ValueScope({ scope: {}, prefixes: v, es5: j, lines: P }), this.logger = K(y.logger);
-      const a = y.validateFormats;
-      y.validateFormats = !1, this.RULES = (0, i.getRules)(), D.call(this, $, y, "NOT SUPPORTED"), D.call(this, m, y, "DEPRECATED", "warn"), this._metaOpts = z.call(this), y.formats && A.call(this), this._addVocabularies(), this._addDefaultMetaSchema(), y.keywords && V.call(this, y.keywords), typeof y.meta == "object" && this.addMetaSchema(y.meta), C.call(this), y.validateFormats = a;
+      this.scope = new c.ValueScope({ scope: {}, prefixes: v, es5: j, lines: P }), this.logger = K($.logger);
+      const a = $.validateFormats;
+      $.validateFormats = !1, this.RULES = (0, i.getRules)(), D.call(this, y, $, "NOT SUPPORTED"), D.call(this, m, $, "DEPRECATED", "warn"), this._metaOpts = z.call(this), $.formats && A.call(this), this._addVocabularies(), this._addDefaultMetaSchema(), $.keywords && V.call(this, $.keywords), typeof $.meta == "object" && this.addMetaSchema($.meta), C.call(this), $.validateFormats = a;
     }
     _addVocabularies() {
       this.addKeyword("$async");
     }
     _addDefaultMetaSchema() {
-      const { $data: y, meta: j, schemaId: P } = this.opts;
-      let a = _;
-      P === "id" && (a = { ..._ }, a.id = a.$id, delete a.$id), j && y && this.addMetaSchema(a, a[P], !1);
+      const { $data: $, meta: j, schemaId: P } = this.opts;
+      let a = g;
+      P === "id" && (a = { ...g }, a.id = a.$id, delete a.$id), j && $ && this.addMetaSchema(a, a[P], !1);
     }
     defaultMeta() {
-      const { meta: y, schemaId: j } = this.opts;
-      return this.opts.defaultMeta = typeof y == "object" ? y[j] || y : void 0;
+      const { meta: $, schemaId: j } = this.opts;
+      return this.opts.defaultMeta = typeof $ == "object" ? $[j] || $ : void 0;
     }
-    validate(y, j) {
+    validate($, j) {
       let P;
-      if (typeof y == "string") {
-        if (P = this.getSchema(y), !P)
-          throw new Error(`no schema with key or ref "${y}"`);
+      if (typeof $ == "string") {
+        if (P = this.getSchema($), !P)
+          throw new Error(`no schema with key or ref "${$}"`);
       } else
-        P = this.compile(y);
+        P = this.compile($);
       const a = P(j);
       return "$async" in P || (this.errors = P.errors), a;
     }
-    compile(y, j) {
-      const P = this._addSchema(y, j);
+    compile($, j) {
+      const P = this._addSchema($, j);
       return P.validate || this._compileSchemaEnv(P);
     }
-    compileAsync(y, j) {
+    compileAsync($, j) {
       if (typeof this.opts.loadSchema != "function")
         throw new Error("options.loadSchema should be a function");
       const { loadSchema: P } = this.opts;
-      return a.call(this, y, j);
+      return a.call(this, $, j);
       async function a(G, ne) {
         await h.call(this, G.$schema);
         const he = this._addSchema(G, ne);
@@ -5908,14 +5907,14 @@ uri$1.default = uri;
         } catch (ne) {
           if (!(ne instanceof s.default))
             throw ne;
-          return M.call(this, ne), await q.call(this, ne.missingSchema), N.call(this, G);
+          return M.call(this, ne), await L.call(this, ne.missingSchema), N.call(this, G);
         }
       }
       function M({ missingSchema: G, missingRef: ne }) {
         if (this.refs[G])
           throw new Error(`AnySchema ${G} is loaded but ${ne} cannot be resolved`);
       }
-      async function q(G) {
+      async function L(G) {
         const ne = await W.call(this, G);
         this.refs[G] || await h.call(this, ne.$schema), this.refs[G] || this.addSchema(ne, G, j);
       }
@@ -5931,35 +5930,35 @@ uri$1.default = uri;
       }
     }
     // Adds schema to the instance
-    addSchema(y, j, P, a = this.opts.validateSchema) {
-      if (Array.isArray(y)) {
-        for (const N of y)
+    addSchema($, j, P, a = this.opts.validateSchema) {
+      if (Array.isArray($)) {
+        for (const N of $)
           this.addSchema(N, void 0, P, a);
         return this;
       }
       let h;
-      if (typeof y == "object") {
+      if (typeof $ == "object") {
         const { schemaId: N } = this.opts;
-        if (h = y[N], h !== void 0 && typeof h != "string")
+        if (h = $[N], h !== void 0 && typeof h != "string")
           throw new Error(`schema ${N} must be string`);
       }
-      return j = (0, d.normalizeId)(j || h), this._checkUnique(j), this.schemas[j] = this._addSchema(y, P, j, a, !0), this;
+      return j = (0, d.normalizeId)(j || h), this._checkUnique(j), this.schemas[j] = this._addSchema($, P, j, a, !0), this;
     }
     // Add schema that will be used to validate other schemas
     // options in META_IGNORE_OPTIONS are alway set to false
-    addMetaSchema(y, j, P = this.opts.validateSchema) {
-      return this.addSchema(y, j, !0, P), this;
+    addMetaSchema($, j, P = this.opts.validateSchema) {
+      return this.addSchema($, j, !0, P), this;
     }
     //  Validate schema against its meta-schema
-    validateSchema(y, j) {
-      if (typeof y == "boolean")
+    validateSchema($, j) {
+      if (typeof $ == "boolean")
         return !0;
       let P;
-      if (P = y.$schema, P !== void 0 && typeof P != "string")
+      if (P = $.$schema, P !== void 0 && typeof P != "string")
         throw new Error("$schema must be a string");
       if (P = P || this.opts.defaultMeta || this.defaultMeta(), !P)
         return this.logger.warn("meta-schema not available"), this.errors = null, !0;
-      const a = this.validate(P, y);
+      const a = this.validate(P, $);
       if (!a && j) {
         const h = "schema is invalid: " + this.errorsText();
         if (this.opts.validateSchema === "log")
@@ -5971,15 +5970,15 @@ uri$1.default = uri;
     }
     // Get compiled schema by `key` or `ref`.
     // (`key` that was passed to `addSchema` or full schema reference - `schema.$id` or resolved id)
-    getSchema(y) {
+    getSchema($) {
       let j;
-      for (; typeof (j = w.call(this, y)) == "string"; )
-        y = j;
+      for (; typeof (j = w.call(this, $)) == "string"; )
+        $ = j;
       if (j === void 0) {
         const { schemaId: P } = this.opts, a = new o.SchemaEnv({ schema: {}, schemaId: P });
-        if (j = o.resolveSchema.call(this, a, y), !j)
+        if (j = o.resolveSchema.call(this, a, $), !j)
           return;
-        this.refs[y] = j;
+        this.refs[$] = j;
       }
       return j.validate || this._compileSchemaEnv(j);
     }
@@ -5987,20 +5986,20 @@ uri$1.default = uri;
     // If no parameter is passed all schemas but meta-schemas are removed.
     // If RegExp is passed all schemas with key/id matching pattern but meta-schemas are removed.
     // Even if schema is referenced by other schemas it still can be removed as other schemas have local references.
-    removeSchema(y) {
-      if (y instanceof RegExp)
-        return this._removeAllSchemas(this.schemas, y), this._removeAllSchemas(this.refs, y), this;
-      switch (typeof y) {
+    removeSchema($) {
+      if ($ instanceof RegExp)
+        return this._removeAllSchemas(this.schemas, $), this._removeAllSchemas(this.refs, $), this;
+      switch (typeof $) {
         case "undefined":
           return this._removeAllSchemas(this.schemas), this._removeAllSchemas(this.refs), this._cache.clear(), this;
         case "string": {
-          const j = w.call(this, y);
-          return typeof j == "object" && this._cache.delete(j.schema), delete this.schemas[y], delete this.refs[y], this;
+          const j = w.call(this, $);
+          return typeof j == "object" && this._cache.delete(j.schema), delete this.schemas[$], delete this.refs[$], this;
         }
         case "object": {
-          const j = y;
+          const j = $;
           this._cache.delete(j);
-          let P = y[this.opts.schemaId];
+          let P = $[this.opts.schemaId];
           return P && (P = (0, d.normalizeId)(P), delete this.schemas[P], delete this.refs[P]), this;
         }
         default:
@@ -6008,23 +6007,23 @@ uri$1.default = uri;
       }
     }
     // add "vocabulary" - a collection of keywords
-    addVocabulary(y) {
-      for (const j of y)
+    addVocabulary($) {
+      for (const j of $)
         this.addKeyword(j);
       return this;
     }
-    addKeyword(y, j) {
+    addKeyword($, j) {
       let P;
-      if (typeof y == "string")
-        P = y, typeof j == "object" && (this.logger.warn("these parameters are deprecated, see docs for addKeyword"), j.keyword = P);
-      else if (typeof y == "object" && j === void 0) {
-        if (j = y, P = j.keyword, Array.isArray(P) && !P.length)
+      if (typeof $ == "string")
+        P = $, typeof j == "object" && (this.logger.warn("these parameters are deprecated, see docs for addKeyword"), j.keyword = P);
+      else if (typeof $ == "object" && j === void 0) {
+        if (j = $, P = j.keyword, Array.isArray(P) && !P.length)
           throw new Error("addKeywords: keyword must be string or non-empty array");
       } else
         throw new Error("invalid addKeywords parameters");
       if (oe.call(this, P, j), !j)
         return (0, p.eachItem)(P, (h) => ke.call(this, h)), this;
-      qe.call(this, j);
+      Le.call(this, j);
       const a = {
         ...j,
         type: (0, u.getJSONTypes)(j.type),
@@ -6032,93 +6031,93 @@ uri$1.default = uri;
       };
       return (0, p.eachItem)(P, a.type.length === 0 ? (h) => ke.call(this, h, a) : (h) => a.type.forEach((N) => ke.call(this, h, a, N))), this;
     }
-    getKeyword(y) {
-      const j = this.RULES.all[y];
+    getKeyword($) {
+      const j = this.RULES.all[$];
       return typeof j == "object" ? j.definition : !!j;
     }
     // Remove keyword
-    removeKeyword(y) {
+    removeKeyword($) {
       const { RULES: j } = this;
-      delete j.keywords[y], delete j.all[y];
+      delete j.keywords[$], delete j.all[$];
       for (const P of j.rules) {
-        const a = P.rules.findIndex((h) => h.keyword === y);
+        const a = P.rules.findIndex((h) => h.keyword === $);
         a >= 0 && P.rules.splice(a, 1);
       }
       return this;
     }
     // Add format
-    addFormat(y, j) {
-      return typeof j == "string" && (j = new RegExp(j)), this.formats[y] = j, this;
+    addFormat($, j) {
+      return typeof j == "string" && (j = new RegExp(j)), this.formats[$] = j, this;
     }
-    errorsText(y = this.errors, { separator: j = ", ", dataVar: P = "data" } = {}) {
-      return !y || y.length === 0 ? "No errors" : y.map((a) => `${P}${a.instancePath} ${a.message}`).reduce((a, h) => a + j + h);
+    errorsText($ = this.errors, { separator: j = ", ", dataVar: P = "data" } = {}) {
+      return !$ || $.length === 0 ? "No errors" : $.map((a) => `${P}${a.instancePath} ${a.message}`).reduce((a, h) => a + j + h);
     }
-    $dataMetaSchema(y, j) {
+    $dataMetaSchema($, j) {
       const P = this.RULES.all;
-      y = JSON.parse(JSON.stringify(y));
+      $ = JSON.parse(JSON.stringify($));
       for (const a of j) {
         const h = a.split("/").slice(1);
-        let N = y;
+        let N = $;
         for (const M of h)
           N = N[M];
         for (const M in P) {
-          const q = P[M];
-          if (typeof q != "object")
+          const L = P[M];
+          if (typeof L != "object")
             continue;
-          const { $data: W } = q.definition, G = N[M];
-          W && G && (N[M] = Le(G));
+          const { $data: W } = L.definition, G = N[M];
+          W && G && (N[M] = qe(G));
         }
       }
-      return y;
+      return $;
     }
-    _removeAllSchemas(y, j) {
-      for (const P in y) {
-        const a = y[P];
-        (!j || j.test(P)) && (typeof a == "string" ? delete y[P] : a && !a.meta && (this._cache.delete(a.schema), delete y[P]));
+    _removeAllSchemas($, j) {
+      for (const P in $) {
+        const a = $[P];
+        (!j || j.test(P)) && (typeof a == "string" ? delete $[P] : a && !a.meta && (this._cache.delete(a.schema), delete $[P]));
       }
     }
-    _addSchema(y, j, P, a = this.opts.validateSchema, h = this.opts.addUsedSchema) {
+    _addSchema($, j, P, a = this.opts.validateSchema, h = this.opts.addUsedSchema) {
       let N;
       const { schemaId: M } = this.opts;
-      if (typeof y == "object")
-        N = y[M];
+      if (typeof $ == "object")
+        N = $[M];
       else {
         if (this.opts.jtd)
           throw new Error("schema must be object");
-        if (typeof y != "boolean")
+        if (typeof $ != "boolean")
           throw new Error("schema must be object or boolean");
       }
-      let q = this._cache.get(y);
-      if (q !== void 0)
-        return q;
+      let L = this._cache.get($);
+      if (L !== void 0)
+        return L;
       P = (0, d.normalizeId)(N || P);
-      const W = d.getSchemaRefs.call(this, y, P);
-      return q = new o.SchemaEnv({ schema: y, schemaId: M, meta: j, baseId: P, localRefs: W }), this._cache.set(q.schema, q), h && !P.startsWith("#") && (P && this._checkUnique(P), this.refs[P] = q), a && this.validateSchema(y, !0), q;
+      const W = d.getSchemaRefs.call(this, $, P);
+      return L = new o.SchemaEnv({ schema: $, schemaId: M, meta: j, baseId: P, localRefs: W }), this._cache.set(L.schema, L), h && !P.startsWith("#") && (P && this._checkUnique(P), this.refs[P] = L), a && this.validateSchema($, !0), L;
     }
-    _checkUnique(y) {
-      if (this.schemas[y] || this.refs[y])
-        throw new Error(`schema with key or id "${y}" already exists`);
+    _checkUnique($) {
+      if (this.schemas[$] || this.refs[$])
+        throw new Error(`schema with key or id "${$}" already exists`);
     }
-    _compileSchemaEnv(y) {
-      if (y.meta ? this._compileMetaSchema(y) : o.compileSchema.call(this, y), !y.validate)
+    _compileSchemaEnv($) {
+      if ($.meta ? this._compileMetaSchema($) : o.compileSchema.call(this, $), !$.validate)
         throw new Error("ajv implementation error");
-      return y.validate;
+      return $.validate;
     }
-    _compileMetaSchema(y) {
+    _compileMetaSchema($) {
       const j = this.opts;
       this.opts = this._metaOpts;
       try {
-        o.compileSchema.call(this, y);
+        o.compileSchema.call(this, $);
       } finally {
         this.opts = j;
       }
     }
   }
   e.default = I, I.ValidationError = n.default, I.MissingRefError = s.default;
-  function D(F, y, j, P = "error") {
+  function D(F, $, j, P = "error") {
     for (const a in F) {
       const h = a;
-      h in y && this.logger[P](`${j}: option ${a}. ${F[h]}`);
+      h in $ && this.logger[P](`${j}: option ${a}. ${F[h]}`);
     }
   }
   function w(F) {
@@ -6130,13 +6129,13 @@ uri$1.default = uri;
       if (Array.isArray(F))
         this.addSchema(F);
       else
-        for (const y in F)
-          this.addSchema(F[y], y);
+        for (const $ in F)
+          this.addSchema(F[$], $);
   }
   function A() {
     for (const F in this.opts.formats) {
-      const y = this.opts.formats[F];
-      y && this.addFormat(F, y);
+      const $ = this.opts.formats[F];
+      $ && this.addFormat(F, $);
     }
   }
   function V(F) {
@@ -6145,15 +6144,15 @@ uri$1.default = uri;
       return;
     }
     this.logger.warn("keywords option as map is deprecated, pass array");
-    for (const y in F) {
-      const j = F[y];
-      j.keyword || (j.keyword = y), this.addKeyword(j);
+    for (const $ in F) {
+      const j = F[$];
+      j.keyword || (j.keyword = $), this.addKeyword(j);
     }
   }
   function z() {
     const F = { ...this.opts };
-    for (const y of T)
-      delete F[y];
+    for (const $ of T)
+      delete F[$];
     return F;
   }
   const re = { log() {
@@ -6170,47 +6169,47 @@ uri$1.default = uri;
     throw new Error("logger must implement log, warn and error methods");
   }
   const ue = /^[a-z_$][a-z0-9_$:-]*$/i;
-  function oe(F, y) {
+  function oe(F, $) {
     const { RULES: j } = this;
     if ((0, p.eachItem)(F, (P) => {
       if (j.keywords[P])
         throw new Error(`Keyword ${P} is already defined`);
       if (!ue.test(P))
         throw new Error(`Keyword ${P} has invalid name`);
-    }), !!y && y.$data && !("code" in y || "validate" in y))
+    }), !!$ && $.$data && !("code" in $ || "validate" in $))
       throw new Error('$data keyword must have "code" or "validate" function');
   }
-  function ke(F, y, j) {
+  function ke(F, $, j) {
     var P;
-    const a = y == null ? void 0 : y.post;
+    const a = $ == null ? void 0 : $.post;
     if (j && a)
       throw new Error('keyword with "post" flag cannot have "type"');
     const { RULES: h } = this;
-    let N = a ? h.post : h.rules.find(({ type: q }) => q === j);
-    if (N || (N = { type: j, rules: [] }, h.rules.push(N)), h.keywords[F] = !0, !y)
+    let N = a ? h.post : h.rules.find(({ type: L }) => L === j);
+    if (N || (N = { type: j, rules: [] }, h.rules.push(N)), h.keywords[F] = !0, !$)
       return;
     const M = {
       keyword: F,
       definition: {
-        ...y,
-        type: (0, u.getJSONTypes)(y.type),
-        schemaType: (0, u.getJSONTypes)(y.schemaType)
+        ...$,
+        type: (0, u.getJSONTypes)($.type),
+        schemaType: (0, u.getJSONTypes)($.schemaType)
       }
     };
-    y.before ? Ce.call(this, N, M, y.before) : N.rules.push(M), h.all[F] = M, (P = y.implements) === null || P === void 0 || P.forEach((q) => this.addKeyword(q));
+    $.before ? Ce.call(this, N, M, $.before) : N.rules.push(M), h.all[F] = M, (P = $.implements) === null || P === void 0 || P.forEach((L) => this.addKeyword(L));
   }
-  function Ce(F, y, j) {
+  function Ce(F, $, j) {
     const P = F.rules.findIndex((a) => a.keyword === j);
-    P >= 0 ? F.rules.splice(P, 0, y) : (F.rules.push(y), this.logger.warn(`rule ${j} is not defined`));
+    P >= 0 ? F.rules.splice(P, 0, $) : (F.rules.push($), this.logger.warn(`rule ${j} is not defined`));
   }
-  function qe(F) {
-    let { metaSchema: y } = F;
-    y !== void 0 && (F.$data && this.opts.$data && (y = Le(y)), F.validateSchema = this.compile(y, !0));
+  function Le(F) {
+    let { metaSchema: $ } = F;
+    $ !== void 0 && (F.$data && this.opts.$data && ($ = qe($)), F.validateSchema = this.compile($, !0));
   }
   const et = {
     $ref: "https://raw.githubusercontent.com/ajv-validator/ajv/master/lib/refs/data.json#"
   };
-  function Le(F) {
+  function qe(F) {
     return { anyOf: [F, et] };
   }
 })(core$2);
@@ -6232,14 +6231,14 @@ const ref_error_1 = ref_error, code_1$8 = code, codegen_1$l = codegen, names_1$1
   code(e) {
     const { gen: t, schema: r, it: n } = e, { baseId: s, schemaEnv: i, validateName: o, opts: c, self: d } = n, { root: u } = i;
     if ((r === "#" || r === "#/") && s === u.baseId)
-      return _();
+      return g();
     const p = compile_1$1.resolveRef.call(d, u, s, r);
     if (p === void 0)
       throw new ref_error_1.default(n.opts.uriResolver, s, r);
     if (p instanceof compile_1$1.SchemaEnv)
       return R(p);
     return O(p);
-    function _() {
+    function g() {
       if (i === u)
         return callRef(e, o, i, i.$async);
       const T = t.scopeValue("root", { ref: u });
@@ -6250,14 +6249,14 @@ const ref_error_1 = ref_error, code_1$8 = code, codegen_1$l = codegen, names_1$1
       callRef(e, v, T, T.$async);
     }
     function O(T) {
-      const v = t.scopeValue("schema", c.code.source === !0 ? { ref: T, code: (0, codegen_1$l.stringify)(T) } : { ref: T }), $ = t.name("valid"), m = e.subschema({
+      const v = t.scopeValue("schema", c.code.source === !0 ? { ref: T, code: (0, codegen_1$l.stringify)(T) } : { ref: T }), y = t.name("valid"), m = e.subschema({
         schema: T,
         dataTypes: [],
         schemaPath: codegen_1$l.nil,
         topSchemaRef: v,
         errSchemaPath: r
-      }, $);
-      e.mergeEvaluated(m), e.ok($);
+      }, y);
+      e.mergeEvaluated(m), e.ok(y);
     }
   }
 };
@@ -6268,7 +6267,7 @@ function getValidate(e, t) {
 ref.getValidate = getValidate;
 function callRef(e, t, r, n) {
   const { gen: s, it: i } = e, { allErrors: o, schemaEnv: c, opts: d } = i, u = d.passContext ? names_1$1.default.this : codegen_1$l.nil;
-  n ? p() : _();
+  n ? p() : g();
   function p() {
     if (!c.$async)
       throw new Error("async schema referenced by sync schema");
@@ -6279,7 +6278,7 @@ function callRef(e, t, r, n) {
       s.if((0, codegen_1$l._)`!(${v} instanceof ${i.ValidationError})`, () => s.throw(v)), R(v), o || s.assign(T, !1);
     }), e.ok(T);
   }
-  function _() {
+  function g() {
     e.result((0, code_1$8.callValidateCode)(e, t, u), () => O(t), () => R(t));
   }
   function R(T) {
@@ -6290,17 +6289,17 @@ function callRef(e, t, r, n) {
     var v;
     if (!i.opts.unevaluated)
       return;
-    const $ = (v = r == null ? void 0 : r.validate) === null || v === void 0 ? void 0 : v.evaluated;
+    const y = (v = r == null ? void 0 : r.validate) === null || v === void 0 ? void 0 : v.evaluated;
     if (i.props !== !0)
-      if ($ && !$.dynamicProps)
-        $.props !== void 0 && (i.props = util_1$j.mergeEvaluated.props(s, $.props, i.props));
+      if (y && !y.dynamicProps)
+        y.props !== void 0 && (i.props = util_1$j.mergeEvaluated.props(s, y.props, i.props));
       else {
         const m = s.var("props", (0, codegen_1$l._)`${T}.evaluated.props`);
         i.props = util_1$j.mergeEvaluated.props(s, m, i.props, codegen_1$l.Name);
       }
     if (i.items !== !0)
-      if ($ && !$.dynamicItems)
-        $.items !== void 0 && (i.items = util_1$j.mergeEvaluated.items(s, $.items, i.items));
+      if (y && !y.dynamicItems)
+        y.items !== void 0 && (i.items = util_1$j.mergeEvaluated.items(s, y.items, i.items));
       else {
         const m = s.var("items", (0, codegen_1$l._)`${T}.evaluated.items`);
         i.items = util_1$j.mergeEvaluated.items(s, m, i.items, codegen_1$l.Name);
@@ -6447,13 +6446,13 @@ const code_1$6 = code, codegen_1$f = codegen, util_1$h = util, error$d = {
       const O = e.parentSchema.properties, { definedProperties: T } = e.it;
       for (const v of r)
         if ((O == null ? void 0 : O[v]) === void 0 && !T.has(v)) {
-          const $ = o.schemaEnv.baseId + o.errSchemaPath, m = `required property "${v}" is not defined at "${$}" (strictRequired)`;
+          const y = o.schemaEnv.baseId + o.errSchemaPath, m = `required property "${v}" is not defined at "${y}" (strictRequired)`;
           (0, util_1$h.checkStrictMode)(o, m, o.opts.strictRequired);
         }
     }
     function u() {
       if (d || i)
-        e.block$data(codegen_1$f.nil, _);
+        e.block$data(codegen_1$f.nil, g);
       else
         for (const O of r)
           (0, code_1$6.checkReportMissingProp)(e, O);
@@ -6466,7 +6465,7 @@ const code_1$6 = code, codegen_1$f = codegen, util_1$h = util, error$d = {
       } else
         t.if((0, code_1$6.checkMissingProp)(e, r, O)), (0, code_1$6.reportMissingProp)(e, O), t.else();
     }
-    function _() {
+    function g() {
       t.forOf("prop", n, (O) => {
         e.setParams({ missingProperty: O }), t.if((0, code_1$6.noPropertyInData)(t, s, O, c.ownProperties), () => e.error());
       });
@@ -6524,22 +6523,22 @@ const dataType_1 = dataType, codegen_1$d = codegen, util_1$g = util, equal_1$2 =
     e.block$data(d, p, (0, codegen_1$d._)`${o} === false`), e.ok(d);
     function p() {
       const T = t.let("i", (0, codegen_1$d._)`${r}.length`), v = t.let("j");
-      e.setParams({ i: T, j: v }), t.assign(d, !0), t.if((0, codegen_1$d._)`${T} > 1`, () => (_() ? R : O)(T, v));
+      e.setParams({ i: T, j: v }), t.assign(d, !0), t.if((0, codegen_1$d._)`${T} > 1`, () => (g() ? R : O)(T, v));
     }
-    function _() {
+    function g() {
       return u.length > 0 && !u.some((T) => T === "object" || T === "array");
     }
     function R(T, v) {
-      const $ = t.name("item"), m = (0, dataType_1.checkDataTypes)(u, $, c.opts.strictNumbers, dataType_1.DataType.Wrong), k = t.const("indices", (0, codegen_1$d._)`{}`);
+      const y = t.name("item"), m = (0, dataType_1.checkDataTypes)(u, y, c.opts.strictNumbers, dataType_1.DataType.Wrong), k = t.const("indices", (0, codegen_1$d._)`{}`);
       t.for((0, codegen_1$d._)`;${T}--;`, () => {
-        t.let($, (0, codegen_1$d._)`${r}[${T}]`), t.if(m, (0, codegen_1$d._)`continue`), u.length > 1 && t.if((0, codegen_1$d._)`typeof ${$} == "string"`, (0, codegen_1$d._)`${$} += "_"`), t.if((0, codegen_1$d._)`typeof ${k}[${$}] == "number"`, () => {
-          t.assign(v, (0, codegen_1$d._)`${k}[${$}]`), e.error(), t.assign(d, !1).break();
-        }).code((0, codegen_1$d._)`${k}[${$}] = ${T}`);
+        t.let(y, (0, codegen_1$d._)`${r}[${T}]`), t.if(m, (0, codegen_1$d._)`continue`), u.length > 1 && t.if((0, codegen_1$d._)`typeof ${y} == "string"`, (0, codegen_1$d._)`${y} += "_"`), t.if((0, codegen_1$d._)`typeof ${k}[${y}] == "number"`, () => {
+          t.assign(v, (0, codegen_1$d._)`${k}[${y}]`), e.error(), t.assign(d, !1).break();
+        }).code((0, codegen_1$d._)`${k}[${y}] = ${T}`);
       });
     }
     function O(T, v) {
-      const $ = (0, util_1$g.useFunc)(t, equal_1$2.default), m = t.name("outer");
-      t.label(m).for((0, codegen_1$d._)`;${T}--;`, () => t.for((0, codegen_1$d._)`${v} = ${T}; ${v}--;`, () => t.if((0, codegen_1$d._)`${$}(${r}[${T}], ${r}[${v}])`, () => {
+      const y = (0, util_1$g.useFunc)(t, equal_1$2.default), m = t.name("outer");
+      t.label(m).for((0, codegen_1$d._)`;${T}--;`, () => t.for((0, codegen_1$d._)`${v} = ${T}; ${v}--;`, () => t.if((0, codegen_1$d._)`${y}(${r}[${T}], ${r}[${v}])`, () => {
         e.error(), t.assign(d, !1).break(m);
       })));
     }
@@ -6580,7 +6579,7 @@ const codegen_1$b = codegen, util_1$e = util, equal_1 = equal$1, error$9 = {
     const u = () => d ?? (d = (0, util_1$e.useFunc)(t, equal_1.default));
     let p;
     if (c || n)
-      p = t.let("valid"), e.block$data(p, _);
+      p = t.let("valid"), e.block$data(p, g);
     else {
       if (!Array.isArray(s))
         throw new Error("ajv implementation error");
@@ -6588,7 +6587,7 @@ const codegen_1$b = codegen, util_1$e = util, equal_1 = equal$1, error$9 = {
       p = (0, codegen_1$b.or)(...s.map((T, v) => R(O, v)));
     }
     e.pass(p);
-    function _() {
+    function g() {
       t.assign(p, !1), t.forOf("v", i, (O) => t.if((0, codegen_1$b._)`${u()}(${r}, ${O})`, () => t.assign(p, !0).break()));
     }
     function R(O, T) {
@@ -6677,18 +6676,18 @@ function validateTuple(e, t, r = e.schema) {
   const { gen: n, parentSchema: s, data: i, keyword: o, it: c } = e;
   p(s), c.opts.unevaluated && r.length && c.items !== !0 && (c.items = util_1$c.mergeEvaluated.items(n, r.length, c.items));
   const d = n.name("valid"), u = n.const("len", (0, codegen_1$9._)`${i}.length`);
-  r.forEach((_, R) => {
-    (0, util_1$c.alwaysValidSchema)(c, _) || (n.if((0, codegen_1$9._)`${u} > ${R}`, () => e.subschema({
+  r.forEach((g, R) => {
+    (0, util_1$c.alwaysValidSchema)(c, g) || (n.if((0, codegen_1$9._)`${u} > ${R}`, () => e.subschema({
       keyword: o,
       schemaProp: R,
       dataProp: R
     }, d)), e.ok(d));
   });
-  function p(_) {
-    const { opts: R, errSchemaPath: O } = c, T = r.length, v = T === _.minItems && (T === _.maxItems || _[t] === !1);
+  function p(g) {
+    const { opts: R, errSchemaPath: O } = c, T = r.length, v = T === g.minItems && (T === g.maxItems || g[t] === !1);
     if (R.strictTuples && !v) {
-      const $ = `"${o}" is ${T}-tuple, but minItems or maxItems/${t} are not specified or different at path "${O}"`;
-      (0, util_1$c.checkStrictMode)(c, $, R.strictTuples);
+      const y = `"${o}" is ${T}-tuple, but minItems or maxItems/${t} are not specified or different at path "${O}"`;
+      (0, util_1$c.checkStrictMode)(c, y, R.strictTuples);
     }
   }
 }
@@ -6752,24 +6751,24 @@ const codegen_1$7 = codegen, util_1$a = util, error$6 = {
       return;
     }
     i.items = !0;
-    const _ = t.name("valid");
-    c === void 0 && o === 1 ? O(_, () => t.if(_, () => t.break())) : o === 0 ? (t.let(_, !0), c !== void 0 && t.if((0, codegen_1$7._)`${s}.length > 0`, R)) : (t.let(_, !1), R()), e.result(_, () => e.reset());
+    const g = t.name("valid");
+    c === void 0 && o === 1 ? O(g, () => t.if(g, () => t.break())) : o === 0 ? (t.let(g, !0), c !== void 0 && t.if((0, codegen_1$7._)`${s}.length > 0`, R)) : (t.let(g, !1), R()), e.result(g, () => e.reset());
     function R() {
-      const v = t.name("_valid"), $ = t.let("count", 0);
-      O(v, () => t.if(v, () => T($)));
+      const v = t.name("_valid"), y = t.let("count", 0);
+      O(v, () => t.if(v, () => T(y)));
     }
-    function O(v, $) {
+    function O(v, y) {
       t.forRange("i", 0, p, (m) => {
         e.subschema({
           keyword: "contains",
           dataProp: m,
           dataPropType: util_1$a.Type.Num,
           compositeRule: !0
-        }, v), $();
+        }, v), y();
       });
     }
     function T(v) {
-      t.code((0, codegen_1$7._)`${v}++`), c === void 0 ? t.if((0, codegen_1$7._)`${v} >= ${o}`, () => t.assign(_, !0).break()) : (t.if((0, codegen_1$7._)`${v} > ${c}`, () => t.assign(_, !1).break()), o === 1 ? t.assign(_, !0) : t.if((0, codegen_1$7._)`${v} >= ${o}`, () => t.assign(_, !0)));
+      t.code((0, codegen_1$7._)`${v}++`), c === void 0 ? t.if((0, codegen_1$7._)`${v} >= ${o}`, () => t.assign(g, !0).break()) : (t.if((0, codegen_1$7._)`${v} > ${c}`, () => t.assign(g, !1).break()), o === 1 ? t.assign(g, !0) : t.if((0, codegen_1$7._)`${v} >= ${o}`, () => t.assign(g, !0)));
     }
   }
 };
@@ -6780,11 +6779,11 @@ var dependencies = {};
   const t = codegen, r = util, n = code;
   e.error = {
     message: ({ params: { property: d, depsCount: u, deps: p } }) => {
-      const _ = u === 1 ? "property" : "properties";
-      return (0, t.str)`must have ${_} ${p} when property ${d} is present`;
+      const g = u === 1 ? "property" : "properties";
+      return (0, t.str)`must have ${g} ${p} when property ${d} is present`;
     },
-    params: ({ params: { property: d, depsCount: u, deps: p, missingProperty: _ } }) => (0, t._)`{property: ${d},
-    missingProperty: ${_},
+    params: ({ params: { property: d, depsCount: u, deps: p, missingProperty: g } }) => (0, t._)`{property: ${d},
+    missingProperty: ${g},
     depsCount: ${u},
     deps: ${p}}`
     // TODO change to reference
@@ -6801,16 +6800,16 @@ var dependencies = {};
   };
   function i({ schema: d }) {
     const u = {}, p = {};
-    for (const _ in d) {
-      if (_ === "__proto__")
+    for (const g in d) {
+      if (g === "__proto__")
         continue;
-      const R = Array.isArray(d[_]) ? u : p;
-      R[_] = d[_];
+      const R = Array.isArray(d[g]) ? u : p;
+      R[g] = d[g];
     }
     return [u, p];
   }
   function o(d, u = d.schema) {
-    const { gen: p, data: _, it: R } = d;
+    const { gen: p, data: g, it: R } = d;
     if (Object.keys(u).length === 0)
       return;
     const O = p.let("missing");
@@ -6818,26 +6817,26 @@ var dependencies = {};
       const v = u[T];
       if (v.length === 0)
         continue;
-      const $ = (0, n.propertyInData)(p, _, T, R.opts.ownProperties);
+      const y = (0, n.propertyInData)(p, g, T, R.opts.ownProperties);
       d.setParams({
         property: T,
         depsCount: v.length,
         deps: v.join(", ")
-      }), R.allErrors ? p.if($, () => {
+      }), R.allErrors ? p.if(y, () => {
         for (const m of v)
           (0, n.checkReportMissingProp)(d, m);
-      }) : (p.if((0, t._)`${$} && (${(0, n.checkMissingProp)(d, v, O)})`), (0, n.reportMissingProp)(d, O), p.else());
+      }) : (p.if((0, t._)`${y} && (${(0, n.checkMissingProp)(d, v, O)})`), (0, n.reportMissingProp)(d, O), p.else());
     }
   }
   e.validatePropertyDeps = o;
   function c(d, u = d.schema) {
-    const { gen: p, data: _, keyword: R, it: O } = d, T = p.name("valid");
+    const { gen: p, data: g, keyword: R, it: O } = d, T = p.name("valid");
     for (const v in u)
       (0, r.alwaysValidSchema)(O, u[v]) || (p.if(
-        (0, n.propertyInData)(p, _, v, O.opts.ownProperties),
+        (0, n.propertyInData)(p, g, v, O.opts.ownProperties),
         () => {
-          const $ = d.subschema({ keyword: R, schemaProp: v }, T);
-          d.mergeValidEvaluated($, T);
+          const y = d.subschema({ keyword: R, schemaProp: v }, T);
+          d.mergeValidEvaluated(y, T);
         },
         () => p.var(T, !0)
         // TODO var
@@ -6894,44 +6893,44 @@ const code_1$3 = code, codegen_1$5 = codegen, names_1 = names$1, util_1$8 = util
     if (o.props = !0, d.removeAdditional !== "all" && (0, util_1$8.alwaysValidSchema)(o, r))
       return;
     const u = (0, code_1$3.allSchemaProperties)(n.properties), p = (0, code_1$3.allSchemaProperties)(n.patternProperties);
-    _(), e.ok((0, codegen_1$5._)`${i} === ${names_1.default.errors}`);
-    function _() {
-      t.forIn("key", s, ($) => {
-        !u.length && !p.length ? T($) : t.if(R($), () => T($));
+    g(), e.ok((0, codegen_1$5._)`${i} === ${names_1.default.errors}`);
+    function g() {
+      t.forIn("key", s, (y) => {
+        !u.length && !p.length ? T(y) : t.if(R(y), () => T(y));
       });
     }
-    function R($) {
+    function R(y) {
       let m;
       if (u.length > 8) {
         const k = (0, util_1$8.schemaRefOrVal)(o, n.properties, "properties");
-        m = (0, code_1$3.isOwnProperty)(t, k, $);
+        m = (0, code_1$3.isOwnProperty)(t, k, y);
       } else
-        u.length ? m = (0, codegen_1$5.or)(...u.map((k) => (0, codegen_1$5._)`${$} === ${k}`)) : m = codegen_1$5.nil;
-      return p.length && (m = (0, codegen_1$5.or)(m, ...p.map((k) => (0, codegen_1$5._)`${(0, code_1$3.usePattern)(e, k)}.test(${$})`))), (0, codegen_1$5.not)(m);
+        u.length ? m = (0, codegen_1$5.or)(...u.map((k) => (0, codegen_1$5._)`${y} === ${k}`)) : m = codegen_1$5.nil;
+      return p.length && (m = (0, codegen_1$5.or)(m, ...p.map((k) => (0, codegen_1$5._)`${(0, code_1$3.usePattern)(e, k)}.test(${y})`))), (0, codegen_1$5.not)(m);
     }
-    function O($) {
-      t.code((0, codegen_1$5._)`delete ${s}[${$}]`);
+    function O(y) {
+      t.code((0, codegen_1$5._)`delete ${s}[${y}]`);
     }
-    function T($) {
+    function T(y) {
       if (d.removeAdditional === "all" || d.removeAdditional && r === !1) {
-        O($);
+        O(y);
         return;
       }
       if (r === !1) {
-        e.setParams({ additionalProperty: $ }), e.error(), c || t.break();
+        e.setParams({ additionalProperty: y }), e.error(), c || t.break();
         return;
       }
       if (typeof r == "object" && !(0, util_1$8.alwaysValidSchema)(o, r)) {
         const m = t.name("valid");
-        d.removeAdditional === "failing" ? (v($, m, !1), t.if((0, codegen_1$5.not)(m), () => {
-          e.reset(), O($);
-        })) : (v($, m), c || t.if((0, codegen_1$5.not)(m), () => t.break()));
+        d.removeAdditional === "failing" ? (v(y, m, !1), t.if((0, codegen_1$5.not)(m), () => {
+          e.reset(), O(y);
+        })) : (v(y, m), c || t.if((0, codegen_1$5.not)(m), () => t.break()));
       }
     }
-    function v($, m, k) {
+    function v(y, m, k) {
       const S = {
         keyword: "additionalProperties",
-        dataProp: $,
+        dataProp: y,
         dataPropType: util_1$8.Type.Str
       };
       k === !1 && Object.assign(S, {
@@ -6953,23 +6952,23 @@ const validate_1 = validate, code_1$2 = code, util_1$7 = util, additionalPropert
     const { gen: t, schema: r, parentSchema: n, data: s, it: i } = e;
     i.opts.removeAdditional === "all" && n.additionalProperties === void 0 && additionalProperties_1$1.default.code(new validate_1.KeywordCxt(i, additionalProperties_1$1.default, "additionalProperties"));
     const o = (0, code_1$2.allSchemaProperties)(r);
-    for (const _ of o)
-      i.definedProperties.add(_);
+    for (const g of o)
+      i.definedProperties.add(g);
     i.opts.unevaluated && o.length && i.props !== !0 && (i.props = util_1$7.mergeEvaluated.props(t, (0, util_1$7.toHash)(o), i.props));
-    const c = o.filter((_) => !(0, util_1$7.alwaysValidSchema)(i, r[_]));
+    const c = o.filter((g) => !(0, util_1$7.alwaysValidSchema)(i, r[g]));
     if (c.length === 0)
       return;
     const d = t.name("valid");
-    for (const _ of c)
-      u(_) ? p(_) : (t.if((0, code_1$2.propertyInData)(t, s, _, i.opts.ownProperties)), p(_), i.allErrors || t.else().var(d, !0), t.endIf()), e.it.definedProperties.add(_), e.ok(d);
-    function u(_) {
-      return i.opts.useDefaults && !i.compositeRule && r[_].default !== void 0;
+    for (const g of c)
+      u(g) ? p(g) : (t.if((0, code_1$2.propertyInData)(t, s, g, i.opts.ownProperties)), p(g), i.allErrors || t.else().var(d, !0), t.endIf()), e.it.definedProperties.add(g), e.ok(d);
+    function u(g) {
+      return i.opts.useDefaults && !i.compositeRule && r[g].default !== void 0;
     }
-    function p(_) {
+    function p(g) {
       e.subschema({
         keyword: "properties",
-        schemaProp: _,
-        dataProp: _
+        schemaProp: g,
+        dataProp: g
       }, d);
     }
   }
@@ -6987,26 +6986,26 @@ const code_1$1 = code, codegen_1$4 = codegen, util_1$6 = util, util_2 = util, de
       return;
     const u = o.strictSchema && !o.allowMatchingProperties && s.properties, p = t.name("valid");
     i.props !== !0 && !(i.props instanceof codegen_1$4.Name) && (i.props = (0, util_2.evaluatedPropsToName)(t, i.props));
-    const { props: _ } = i;
+    const { props: g } = i;
     R();
     function R() {
       for (const v of c)
         u && O(v), i.allErrors ? T(v) : (t.var(p, !0), T(v), t.if(p));
     }
     function O(v) {
-      for (const $ in u)
-        new RegExp(v).test($) && (0, util_1$6.checkStrictMode)(i, `property ${$} matches pattern ${v} (use allowMatchingProperties)`);
+      for (const y in u)
+        new RegExp(v).test(y) && (0, util_1$6.checkStrictMode)(i, `property ${y} matches pattern ${v} (use allowMatchingProperties)`);
     }
     function T(v) {
-      t.forIn("key", n, ($) => {
-        t.if((0, codegen_1$4._)`${(0, code_1$1.usePattern)(e, v)}.test(${$})`, () => {
+      t.forIn("key", n, (y) => {
+        t.if((0, codegen_1$4._)`${(0, code_1$1.usePattern)(e, v)}.test(${y})`, () => {
           const m = d.includes(v);
           m || e.subschema({
             keyword: "patternProperties",
             schemaProp: v,
-            dataProp: $,
+            dataProp: y,
             dataPropType: util_2.Type.Str
-          }, p), i.opts.unevaluated && _ !== !0 ? t.assign((0, codegen_1$4._)`${_}[${$}]`, !0) : !m && !i.allErrors && t.if((0, codegen_1$4.not)(p), () => t.break());
+          }, p), i.opts.unevaluated && g !== !0 ? t.assign((0, codegen_1$4._)`${g}[${y}]`, !0) : !m && !i.allErrors && t.if((0, codegen_1$4.not)(p), () => t.break());
         });
       });
     }
@@ -7065,14 +7064,14 @@ const codegen_1$3 = codegen, util_1$4 = util, error$3 = {
     const i = r, o = t.let("valid", !1), c = t.let("passing", null), d = t.name("_valid");
     e.setParams({ passing: c }), t.block(u), e.result(o, () => e.reset(), () => e.error(!0));
     function u() {
-      i.forEach((p, _) => {
+      i.forEach((p, g) => {
         let R;
         (0, util_1$4.alwaysValidSchema)(s, p) ? t.var(d, !0) : R = e.subschema({
           keyword: "oneOf",
-          schemaProp: _,
+          schemaProp: g,
           compositeRule: !0
-        }, d), _ > 0 && t.if((0, codegen_1$3._)`${d} && ${o}`).assign(o, !1).assign(c, (0, codegen_1$3._)`[${c}, ${_}]`).else(), t.if(d, () => {
-          t.assign(o, !0), t.assign(c, _), R && e.mergeEvaluated(R, codegen_1$3.Name);
+        }, d), g > 0 && t.if((0, codegen_1$3._)`${d} && ${o}`).assign(o, !1).assign(c, (0, codegen_1$3._)`[${c}, ${g}]`).else(), t.if(d, () => {
+          t.assign(o, !0), t.assign(c, g), R && e.mergeEvaluated(R, codegen_1$3.Name);
         });
       });
     }
@@ -7130,10 +7129,10 @@ const codegen_1$2 = codegen, util_1$2 = util, error$2 = {
       }, c);
       e.mergeEvaluated(p);
     }
-    function u(p, _) {
+    function u(p, g) {
       return () => {
         const R = e.subschema({ keyword: p }, c);
-        t.assign(o, c), e.mergeValidEvaluated(R, o), _ ? t.assign(_, (0, codegen_1$2._)`${p}`) : e.setParams({ ifClause: p });
+        t.assign(o, c), e.mergeValidEvaluated(R, o), g ? t.assign(g, (0, codegen_1$2._)`${p}`) : e.setParams({ ifClause: p });
       };
     }
   }
@@ -7186,37 +7185,37 @@ const codegen_1$1 = codegen, error$1 = {
   $data: !0,
   error: error$1,
   code(e, t) {
-    const { gen: r, data: n, $data: s, schema: i, schemaCode: o, it: c } = e, { opts: d, errSchemaPath: u, schemaEnv: p, self: _ } = c;
+    const { gen: r, data: n, $data: s, schema: i, schemaCode: o, it: c } = e, { opts: d, errSchemaPath: u, schemaEnv: p, self: g } = c;
     if (!d.validateFormats)
       return;
     s ? R() : O();
     function R() {
       const T = r.scopeValue("formats", {
-        ref: _.formats,
+        ref: g.formats,
         code: d.code.formats
-      }), v = r.const("fDef", (0, codegen_1$1._)`${T}[${o}]`), $ = r.let("fType"), m = r.let("format");
-      r.if((0, codegen_1$1._)`typeof ${v} == "object" && !(${v} instanceof RegExp)`, () => r.assign($, (0, codegen_1$1._)`${v}.type || "string"`).assign(m, (0, codegen_1$1._)`${v}.validate`), () => r.assign($, (0, codegen_1$1._)`"string"`).assign(m, v)), e.fail$data((0, codegen_1$1.or)(k(), S()));
+      }), v = r.const("fDef", (0, codegen_1$1._)`${T}[${o}]`), y = r.let("fType"), m = r.let("format");
+      r.if((0, codegen_1$1._)`typeof ${v} == "object" && !(${v} instanceof RegExp)`, () => r.assign(y, (0, codegen_1$1._)`${v}.type || "string"`).assign(m, (0, codegen_1$1._)`${v}.validate`), () => r.assign(y, (0, codegen_1$1._)`"string"`).assign(m, v)), e.fail$data((0, codegen_1$1.or)(k(), S()));
       function k() {
         return d.strictSchema === !1 ? codegen_1$1.nil : (0, codegen_1$1._)`${o} && !${m}`;
       }
       function S() {
         const I = p.$async ? (0, codegen_1$1._)`(${v}.async ? await ${m}(${n}) : ${m}(${n}))` : (0, codegen_1$1._)`${m}(${n})`, D = (0, codegen_1$1._)`(typeof ${m} == "function" ? ${I} : ${m}.test(${n}))`;
-        return (0, codegen_1$1._)`${m} && ${m} !== true && ${$} === ${t} && !${D}`;
+        return (0, codegen_1$1._)`${m} && ${m} !== true && ${y} === ${t} && !${D}`;
       }
     }
     function O() {
-      const T = _.formats[i];
+      const T = g.formats[i];
       if (!T) {
         k();
         return;
       }
       if (T === !0)
         return;
-      const [v, $, m] = S(T);
+      const [v, y, m] = S(T);
       v === t && e.pass(I());
       function k() {
         if (d.strictSchema === !1) {
-          _.logger.warn(D());
+          g.logger.warn(D());
           return;
         }
         throw new Error(D());
@@ -7234,7 +7233,7 @@ const codegen_1$1 = codegen, error$1 = {
             throw new Error("async format in sync schema");
           return (0, codegen_1$1._)`await ${m}(${n})`;
         }
-        return typeof $ == "function" ? (0, codegen_1$1._)`${m}(${n})` : (0, codegen_1$1._)`${m}.test(${n})`;
+        return typeof y == "function" ? (0, codegen_1$1._)`${m}(${n})` : (0, codegen_1$1._)`${m}.test(${n})`;
       }
     }
   }
@@ -7302,26 +7301,26 @@ const codegen_1 = codegen, types_1 = types, compile_1 = compile, util_1 = util,
       const O = R();
       t.if(!1);
       for (const T in O)
-        t.elseIf((0, codegen_1._)`${u} === ${T}`), t.assign(d, _(O[T]));
+        t.elseIf((0, codegen_1._)`${u} === ${T}`), t.assign(d, g(O[T]));
       t.else(), e.error(!1, { discrError: types_1.DiscrError.Mapping, tag: u, tagName: c }), t.endIf();
     }
-    function _(O) {
+    function g(O) {
       const T = t.name("valid"), v = e.subschema({ keyword: "oneOf", schemaProp: O }, T);
       return e.mergeEvaluated(v, codegen_1.Name), T;
     }
     function R() {
       var O;
       const T = {}, v = m(s);
-      let $ = !0;
+      let y = !0;
       for (let I = 0; I < o.length; I++) {
         let D = o[I];
         D != null && D.$ref && !(0, util_1.schemaHasRulesButRef)(D, i.self.RULES) && (D = compile_1.resolveRef.call(i.self, i.schemaEnv.root, i.baseId, D == null ? void 0 : D.$ref), D instanceof compile_1.SchemaEnv && (D = D.schema));
         const w = (O = D == null ? void 0 : D.properties) === null || O === void 0 ? void 0 : O[c];
         if (typeof w != "object")
           throw new Error(`discriminator: oneOf subschemas (or referenced schemas) must have "properties/${c}"`);
-        $ = $ && (v || m(D)), k(w, I);
+        y = y && (v || m(D)), k(w, I);
       }
-      if (!$)
+      if (!y)
         throw new Error(`discriminator: "${c}" must be required`);
       return T;
       function m({ required: I }) {
@@ -7622,9 +7621,9 @@ const $schema$1 = "http://json-schema.org/draft-07/schema#", $id = "http://json-
   } }), Object.defineProperty(t, "CodeGen", { enumerable: !0, get: function() {
     return p.CodeGen;
   } });
-  var _ = validation_error;
+  var g = validation_error;
   Object.defineProperty(t, "ValidationError", { enumerable: !0, get: function() {
-    return _.default;
+    return g.default;
   } });
   var R = ref_error;
   Object.defineProperty(t, "MissingRefError", { enumerable: !0, get: function() {
@@ -7642,7 +7641,38 @@ const Ajv = /* @__PURE__ */ getDefaultExportFromCjs(ajvExports), $schema = "http
       },
       description: {
         type: "string",
-        description: "Optional description. It doesn't do anything but is exposed as a courtesy to developers who may want to document which blueprint file does what."
+        description: "Optional description. It doesn't do anything but is exposed as a courtesy to developers who may want to document which blueprint file does what.",
+        deprecated: "Use meta.description instead."
+      },
+      meta: {
+        type: "object",
+        properties: {
+          title: {
+            type: "string",
+            description: "A clear and concise name for your Blueprint."
+          },
+          description: {
+            type: "string",
+            description: "A brief explanation of what your Blueprint offers."
+          },
+          author: {
+            type: "string",
+            description: "A GitHub username of the author of this Blueprint."
+          },
+          categories: {
+            type: "array",
+            items: {
+              type: "string"
+            },
+            description: "Relevant categories to help users find your Blueprint in the future Blueprints section on WordPress.org."
+          }
+        },
+        required: [
+          "title",
+          "author"
+        ],
+        additionalProperties: !1,
+        description: "Optional metadata. Used by the Blueprints gallery at https://github.com/WordPress/blueprints"
       },
       preferredVersions: {
         type: "object",
@@ -8919,46 +8949,129 @@ for existing apps using this option.`
         $ref: "#/definitions/PHPRequestHeaders",
         description: "Request headers."
       },
-      files: {
-        type: "object",
-        additionalProperties: {
-          type: "object",
-          properties: {
-            size: {
-              type: "number"
-            },
-            type: {
-              type: "string"
+      body: {
+        anyOf: [
+          {
+            type: "string"
+          },
+          {
+            type: "object",
+            properties: {
+              BYTES_PER_ELEMENT: {
+                type: "number"
+              },
+              buffer: {
+                type: "object",
+                properties: {
+                  byteLength: {
+                    type: "number"
+                  }
+                },
+                required: [
+                  "byteLength"
+                ],
+                additionalProperties: !1
+              },
+              byteLength: {
+                type: "number"
+              },
+              byteOffset: {
+                type: "number"
+              },
+              length: {
+                type: "number"
+              }
             },
-            lastModified: {
+            required: [
+              "BYTES_PER_ELEMENT",
+              "buffer",
+              "byteLength",
+              "byteOffset",
+              "length"
+            ],
+            additionalProperties: {
               type: "number"
-            },
-            name: {
-              type: "string"
-            },
-            webkitRelativePath: {
-              type: "string"
             }
           },
-          required: [
-            "lastModified",
-            "name",
-            "size",
-            "type",
-            "webkitRelativePath"
-          ],
-          additionalProperties: !1
-        },
-        description: "Uploaded files"
-      },
-      body: {
-        type: "string",
-        description: "Request body without the files."
-      },
-      formData: {
-        type: "object",
-        additionalProperties: {},
-        description: "Form data. If set, the request body will be ignored and the content-type header will be set to `application/x-www-form-urlencoded`."
+          {
+            type: "object",
+            additionalProperties: {
+              anyOf: [
+                {
+                  type: "string"
+                },
+                {
+                  type: "object",
+                  properties: {
+                    BYTES_PER_ELEMENT: {
+                      type: "number"
+                    },
+                    buffer: {
+                      type: "object",
+                      properties: {
+                        byteLength: {
+                          type: "number"
+                        }
+                      },
+                      required: [
+                        "byteLength"
+                      ],
+                      additionalProperties: !1
+                    },
+                    byteLength: {
+                      type: "number"
+                    },
+                    byteOffset: {
+                      type: "number"
+                    },
+                    length: {
+                      type: "number"
+                    }
+                  },
+                  required: [
+                    "BYTES_PER_ELEMENT",
+                    "buffer",
+                    "byteLength",
+                    "byteOffset",
+                    "length"
+                  ],
+                  additionalProperties: {
+                    type: "number"
+                  }
+                },
+                {
+                  type: "object",
+                  properties: {
+                    size: {
+                      type: "number"
+                    },
+                    type: {
+                      type: "string"
+                    },
+                    lastModified: {
+                      type: "number"
+                    },
+                    name: {
+                      type: "string"
+                    },
+                    webkitRelativePath: {
+                      type: "string"
+                    }
+                  },
+                  required: [
+                    "lastModified",
+                    "name",
+                    "size",
+                    "type",
+                    "webkitRelativePath"
+                  ],
+                  additionalProperties: !1
+                }
+              ]
+            }
+          }
+        ],
+        description: "Request body. If an object is given, the request will be encoded as multipart and sent with a `multipart/form-data` header."
       }
     },
     required: [
@@ -9008,85 +9121,64 @@ for existing apps using this option.`
         description: "Request headers."
       },
       body: {
-        type: "string",
-        description: "Request body without the files."
-      },
-      fileInfos: {
-        type: "array",
-        items: {
-          $ref: "#/definitions/FileInfo"
-        },
-        description: "Uploaded files."
-      },
-      code: {
-        type: "string",
-        description: "The code snippet to eval instead of a php file."
-      },
-      throwOnError: {
-        type: "boolean",
-        description: "Whether to throw an error if the PHP process exits with a non-zero code or outputs to stderr."
-      }
-    },
-    additionalProperties: !1
-  },
-  FileInfo: {
-    type: "object",
-    properties: {
-      key: {
-        type: "string"
-      },
-      name: {
-        type: "string"
-      },
-      type: {
-        type: "string"
-      },
-      data: {
-        type: "object",
-        properties: {
-          BYTES_PER_ELEMENT: {
-            type: "number"
+        anyOf: [
+          {
+            type: "string"
           },
-          buffer: {
+          {
             type: "object",
             properties: {
+              BYTES_PER_ELEMENT: {
+                type: "number"
+              },
+              buffer: {
+                type: "object",
+                properties: {
+                  byteLength: {
+                    type: "number"
+                  }
+                },
+                required: [
+                  "byteLength"
+                ],
+                additionalProperties: !1
+              },
               byteLength: {
                 type: "number"
+              },
+              byteOffset: {
+                type: "number"
+              },
+              length: {
+                type: "number"
               }
             },
             required: [
-              "byteLength"
+              "BYTES_PER_ELEMENT",
+              "buffer",
+              "byteLength",
+              "byteOffset",
+              "length"
             ],
-            additionalProperties: !1
-          },
-          byteLength: {
-            type: "number"
-          },
-          byteOffset: {
-            type: "number"
-          },
-          length: {
-            type: "number"
+            additionalProperties: {
+              type: "number"
+            }
           }
-        },
-        required: [
-          "BYTES_PER_ELEMENT",
-          "buffer",
-          "byteLength",
-          "byteOffset",
-          "length"
         ],
+        description: "Request body."
+      },
+      env: {
+        type: "object",
         additionalProperties: {
-          type: "number"
-        }
+          type: "string"
+        },
+        description: "Environment variables to set for this run."
+      },
+      code: {
+        type: "string",
+        description: "The code snippet to eval instead of a php file."
       }
     },
-    required: [
-      "key",
-      "name",
-      "type",
-      "data"
-    ],
     additionalProperties: !1
   },
   WordPressInstallationOptions: {
@@ -9115,7 +9207,7 @@ function compileBlueprint(e, {
   onStepCompleted: n = () => {
   }
 } = {}) {
-  var p, _, R, O, T;
+  var p, g, R, O, T;
   if (e = {
     ...e,
     steps: (e.steps || []).filter(isStepDefinition)
@@ -9126,15 +9218,15 @@ function compileBlueprint(e, {
     step: "setSiteOptions",
     options: e.siteOptions
   }), e.plugins) {
-    const v = e.plugins.map(($) => typeof $ == "string" ? $.startsWith("https://") ? {
+    const v = e.plugins.map((y) => typeof y == "string" ? y.startsWith("https://") ? {
       resource: "url",
-      url: $
+      url: y
     } : {
       resource: "wordpress.org/plugins",
-      slug: $
-    } : $).map(($) => ({
+      slug: y
+    } : y).map((y) => ({
       step: "installPlugin",
-      pluginZipFile: $
+      pluginZipFile: y
     }));
     e.steps.unshift(...v);
   }
@@ -9147,7 +9239,7 @@ function compileBlueprint(e, {
   );
   s !== void 0 && s > -1 && (e.phpExtensionBundles || (e.phpExtensionBundles = []), e.phpExtensionBundles.includes("kitchen-sink") || (e.phpExtensionBundles.push("kitchen-sink"), console.warn(
     "The WP-CLI step used in your Blueprint requires the iconv and mbstring PHP extensions. However, you did not specify the kitchen-sink extension bundle. Playground will override your choice and load the kitchen-sink PHP extensions bundle to prevent the WP-CLI step from failing. "
-  )), (_ = e.steps) == null || _.splice(s, 0, {
+  )), (g = e.steps) == null || g.splice(s, 0, {
     step: "writeFile",
     data: {
       resource: "url",
@@ -9173,9 +9265,9 @@ function compileBlueprint(e, {
     throw v.errors = o, v;
   }
   const c = e.steps || [], d = c.reduce(
-    (v, $) => {
+    (v, y) => {
       var m;
-      return v + (((m = $.progress) == null ? void 0 : m.weight) || 1);
+      return v + (((m = y.progress) == null ? void 0 : m.weight) || 1);
     },
     0
   ), u = c.map(
@@ -9204,16 +9296,16 @@ function compileBlueprint(e, {
     },
     run: async (v) => {
       try {
-        for (const { resources: $ } of u)
-          for (const m of $)
+        for (const { resources: y } of u)
+          for (const m of y)
             m.setPlayground(v), m.isAsync && m.resolve();
-        for (const [$, { run: m, step: k }] of Object.entries(u))
+        for (const [y, { run: m, step: k }] of Object.entries(u))
           try {
             const S = await m(v);
             n(S, k);
           } catch (S) {
             throw console.error(S), new Error(
-              `Error when executing the blueprint step #${$} (${JSON.stringify(
+              `Error when executing the blueprint step #${y} (${JSON.stringify(
                 k
               )}) ${S instanceof Error ? `: ${S.message}` : S}`,
               { cause: S }
@@ -9273,17 +9365,17 @@ function compileStep(e, {
   const s = r.stage(
     (((p = e.progress) == null ? void 0 : p.weight) || 1) / n
   ), i = {};
-  for (const _ of Object.keys(e)) {
-    let R = e[_];
+  for (const g of Object.keys(e)) {
+    let R = e[g];
     isFileReference(R) && (R = Resource.create(R, {
       semaphore: t
-    })), i[_] = R;
+    })), i[g] = R;
   }
-  const o = async (_) => {
+  const o = async (g) => {
     var R;
     try {
       return s.fillSlowly(), await keyedStepHandlers[e.step](
-        _,
+        g,
         await resolveArguments(i),
         {
           tracker: s,
@@ -9294,10 +9386,10 @@ function compileStep(e, {
       s.finish();
     }
   }, c = getResources(i), d = getResources(i).filter(
-    (_) => _.isAsync
+    (g) => g.isAsync
   ), u = 1 / (d.length + 1);
-  for (const _ of d)
-    _.progress = s.stage(u);
+  for (const g of d)
+    g.progress = s.stage(u);
   return { run: o, step: e, resources: c };
 }
 function getResources(e) {
@@ -9372,20 +9464,20 @@ function expose(e, t = globalThis, r = ["*"]) {
     const { id: i, type: o, path: c } = Object.assign({ path: [] }, s.data), d = (s.data.argumentList || []).map(fromWireValue);
     let u;
     try {
-      const p = c.slice(0, -1).reduce((R, O) => R[O], e), _ = c.reduce((R, O) => R[O], e);
+      const p = c.slice(0, -1).reduce((R, O) => R[O], e), g = c.reduce((R, O) => R[O], e);
       switch (o) {
         case "GET":
-          u = _;
+          u = g;
           break;
         case "SET":
           p[c.slice(-1)[0]] = fromWireValue(s.data.value), u = !0;
           break;
         case "APPLY":
-          u = _.apply(p, d);
+          u = g.apply(p, d);
           break;
         case "CONSTRUCT":
           {
-            const R = new _(...d);
+            const R = new g(...d);
             u = proxy(R);
           }
           break;
@@ -9405,14 +9497,14 @@ function expose(e, t = globalThis, r = ["*"]) {
       u = { value: p, [throwMarker]: 0 };
     }
     Promise.resolve(u).catch((p) => ({ value: p, [throwMarker]: 0 })).then((p) => {
-      const [_, R] = toWireValue(p);
-      t.postMessage(Object.assign(Object.assign({}, _), { id: i }), R), o === "RELEASE" && (t.removeEventListener("message", n), closeEndPoint(t), finalizer in e && typeof e[finalizer] == "function" && e[finalizer]());
+      const [g, R] = toWireValue(p);
+      t.postMessage(Object.assign(Object.assign({}, g), { id: i }), R), o === "RELEASE" && (t.removeEventListener("message", n), closeEndPoint(t), finalizer in e && typeof e[finalizer] == "function" && e[finalizer]());
     }).catch((p) => {
-      const [_, R] = toWireValue({
+      const [g, R] = toWireValue({
         value: new TypeError("Unserializable return value"),
         [throwMarker]: 0
       });
-      t.postMessage(Object.assign(Object.assign({}, _), { id: i }), R);
+      t.postMessage(Object.assign(Object.assign({}, g), { id: i }), R);
     });
   }), t.start && t.start();
 }
@@ -9488,7 +9580,7 @@ function createProxy(e, t = [], r = function() {
       const [u, p] = processArguments(c);
       return requestResponseMessage(e, {
         type: "APPLY",
-        path: t.map((_) => _.toString()),
+        path: t.map((g) => g.toString()),
         argumentList: u
       }, p).then(fromWireValue);
     },
@@ -9633,9 +9725,9 @@ function proxyClone(e) {
     }
   });
 }
-class Logger {
+class Logger extends EventTarget {
   constructor(t) {
-    this.LOG_PREFIX = "Playground", this.windowConnected = !1, this.lastPHPLogLength = 0, this.errorLogPath = "/wordpress/wp-content/debug.log", t && (this.errorLogPath = t);
+    super(), this.fatalErrorEvent = "playground-fatal-error", this.logs = [], this.windowConnected = !1, this.lastPHPLogLength = 0, this.errorLogPath = "/wordpress/wp-content/debug.log", t && (this.errorLogPath = t);
   }
   /**
    * Read the WordPress debug.log file and return its content.
@@ -9654,7 +9746,7 @@ class Logger {
   logWindowError(t) {
     this.log(
       `${t.message} in ${t.filename} on line ${t.lineno}:${t.colno}`,
-      "fatal"
+      "Error"
     );
   }
   /**
@@ -9663,7 +9755,10 @@ class Logger {
    * @param PromiseRejectionEvent event
    */
   logUnhandledRejection(t) {
-    this.log(`${t.reason.stack}`, "fatal");
+    if (!(t != null && t.reason))
+      return;
+    const r = (t == null ? void 0 : t.reason.stack) ?? t.reason;
+    this.log(r, "Error");
   }
   /**
    * Register a listener for the window error events and log the data.
@@ -9685,6 +9780,19 @@ class Logger {
     t.addEventListener("request.end", async () => {
       const r = await this.getRequestPhpErrorLog(t);
       r.length > this.lastPHPLogLength && (this.logRaw(r.substring(this.lastPHPLogLength)), this.lastPHPLogLength = r.length);
+    }), t.addEventListener("request.error", (r) => {
+      r = r, r.error && (this.log(
+        `${r.error.message} ${r.error.stack}`,
+        "Fatal",
+        "PHP-WASM"
+      ), this.dispatchEvent(
+        new CustomEvent(this.fatalErrorEvent, {
+          detail: {
+            logs: this.getLogs(),
+            source: r.source
+          }
+        })
+      ));
     });
   }
   /**
@@ -9713,26 +9821,39 @@ class Logger {
    * Format log message and severity and log it.
    * @param string message
    * @param LogSeverity severity
+   * @param string prefix
    */
-  formatMessage(t, r) {
-    return `[${this.formatLogDate(/* @__PURE__ */ new Date())}] ${this.LOG_PREFIX} ${r}: ${t}`;
+  formatMessage(t, r, n) {
+    return `[${this.formatLogDate(/* @__PURE__ */ new Date())}] ${n} ${r}: ${t}`;
   }
   /**
    * Log message with severity and timestamp.
    * @param string message
    * @param LogSeverity severity
+   * @param string prefix
    */
-  log(t, r) {
-    r === void 0 && (r = "info");
-    const n = this.formatMessage(t, r);
-    this.logRaw(n);
+  log(t, r, n) {
+    r === void 0 && (r = "Info");
+    const s = this.formatMessage(
+      t,
+      r,
+      n ?? "Playground"
+    );
+    this.logRaw(s);
   }
   /**
    * Log message without severity and timestamp.
    * @param string log
    */
   logRaw(t) {
-    console.debug(t);
+    this.logs.push(t), console.debug(t);
+  }
+  /**
+   * Get all logs.
+   * @returns string[]
+   */
+  getLogs() {
+    return this.logs;
   }
 }
 const logger = new Logger();
@@ -9746,27 +9867,35 @@ async function startPlaygroundWeb({
   progressTracker: n = new ProgressTracker(),
   disableProgressBar: s,
   onBlueprintStepCompleted: i,
-  sapiName: o
+  onClientConnected: o = () => {
+  },
+  sapiName: c
 }) {
   if (assertValidRemote(r), allowStorageAccessByUserActivation(e), r = setQueryParams(r, {
     progressbar: !s
-  }), n.setCaption("Preparing WordPress"), !t)
-    return doStartPlaygroundWeb(e, r, n);
-  const c = compileBlueprint(t, {
+  }), n.setCaption("Preparing WordPress"), !t) {
+    const p = await doStartPlaygroundWeb(
+      e,
+      r,
+      n
+    );
+    return o(p), p;
+  }
+  const d = compileBlueprint(t, {
     progress: n.stage(0.5),
     onStepCompleted: i
-  }), d = await doStartPlaygroundWeb(
+  }), u = await doStartPlaygroundWeb(
     e,
     setQueryParams(r, {
-      php: c.versions.php,
-      wp: c.versions.wp,
-      "sapi-name": o,
-      "php-extension": c.phpExtensions,
-      networking: c.features.networking ? "yes" : "no"
+      php: d.versions.php,
+      wp: d.versions.wp,
+      "sapi-name": c,
+      "php-extension": d.phpExtensions,
+      networking: d.features.networking ? "yes" : "no"
     }),
     n
   );
-  return collectPhpLogs(logger, d), await runBlueprintSteps(c, d), n.finish(), d;
+  return collectPhpLogs(logger, u), o(u), await runBlueprintSteps(d, u), n.finish(), u;
 }
 function allowStorageAccessByUserActivation(e) {
   var t, r;