npm - @wp-playground/blueprints - Versions diffs - 0.6.8 → 0.6.10 - Mend

@wp-playground/blueprints 0.6.8 → 0.6.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/blueprint-schema.json +28 -5
package/index.cjs +33 -23
package/index.d.ts +11 -25
package/index.js +1021 -1002
package/lib/steps/handlers.d.ts +1 -2
package/lib/steps/import-wxr.d.ts +27 -0
package/lib/steps/index.d.ts +3 -3
package/lib/steps/wp-cli.d.ts +1 -1
package/package.json +2 -2
package/schema-readme.md +1 -1
package/lib/steps/export-wxz.d.ts +0 -9
package/lib/steps/import-file.d.ts +0 -29

package/index.js CHANGED Viewed

@@ -84,7 +84,6 @@ const wpContentFilesExcludedFromExport = [
   "plugins/wordpress-importer",
   "mu-plugins/sqlite-database-integration",
   "mu-plugins/playground-includes",
-  "mu-plugins/export-wxz.php",
   "mu-plugins/0-playground.php",
   /*
    * Listing core themes like that here isn't ideal, especially since
@@ -269,7 +268,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 +299,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 +309,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 +709,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 +741,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 +753,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 +788,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 +858,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'], '/');
@@ -909,47 +902,27 @@ const cp = async (e, { fromPath: t, toPath: r }) => {
       WP_SITEURL: t
     }
   });
-}, importFile = async (e, { file: t }, r) => {
-  var u, p;
-  (u = r == null ? void 0 : r.tracker) == null || u.setCaption("Importing content");
-  const n = await e.request({
-    url: "/wp-admin/admin.php?import=wordpress"
-  }), s = (p = DOM(n).getElementById("import-upload-form")) == null ? void 0 : p.getAttribute("action"), i = await e.request({
-    url: `/wp-admin/${s}`,
-    method: "POST",
-    body: { import: t }
-  }), o = DOM(i).querySelector(
-    "#wpbody-content form"
-  );
-  if (!o)
-    throw console.log(i.text), new Error(
-      "Could not find an importer form in response. See the response text above for details."
-    );
-  const l = getFormData(o);
-  l.fetch_attachments = "1";
-  for (const $ in l)
-    if ($.startsWith("user_map[")) {
-      const O = "user_new[" + $.slice(9, -1) + "]";
-      l[O] = "1";
-    }
-  const d = await e.request({
-    url: o.action,
-    method: "POST",
-    body: l
+}, importWxr = async (e, { file: t }, r) => {
+  var s;
+  (s = r == null ? void 0 : r.tracker) == null || s.setCaption("Importing content"), await writeFile(e, {
+    path: "/tmp/import.wxr",
+    data: t
   });
-  if (!d.text.includes("All done."))
-    throw console.warn("WordPress response was: ", {
-      text: d.text,
-      errors: d.errors
-    }), new Error("Import failed, see console for details.");
-};
-function DOM(e) {
-  return new DOMParser().parseFromString(e.text, "text/html");
-}
-function getFormData(e) {
-  return Object.fromEntries(new FormData(e).entries());
-}
-const zipFunctions = `<?php
+  const n = await e.documentRoot;
+  await e.run({
+    code: `<?php
+		require ${phpVar(n)} . '/wp-load.php';
+		$admin_id = get_users(array('role' => 'Administrator') )[0];
+		$importer = new WXR_Importer( array(
+			'fetch_attachments' => true,
+			'default_author' => $admin_id
+		) );
+		$logger = new WP_Importer_Logger_CLI();
+		$importer->set_logger( $logger );
+		$result = $importer->import( '/tmp/import.wxr' );
+		`
+  });
+}, zipFunctions = `<?php
 function zipDir($root, $output, $options = array())
 {
@@ -1035,7 +1008,6 @@ function delTree($dir)
 `;
 async function runPhpWithZipFunctions(e, t) {
   return await e.run({
-    throwOnError: !0,
     code: zipFunctions + t
   });
 }
@@ -1071,13 +1043,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 O = joinPaths(o, p);
-    await e.fileExists(O) && (await e.mkdir(dirname($)), await e.mv(O, $));
+    await e.fileExists(O) && (await e.mkdir(dirname(g)), await e.mv(O, g));
   }
   const l = joinPaths(
     s,
@@ -1101,7 +1073,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};
@@ -1117,12 +1088,6 @@ async function exportWXR(e) {
   });
   return new File([t.bytes], "export.xml");
 }
-async function exportWXZ(e) {
-  const t = await e.request({
-    url: "/wp-admin/export.php?download=true&content=all&export_wxz=1"
-  });
-  return new File([t.bytes], "export.wxz");
-}
 async function installAsset(e, { targetPath: t, zipFile: r }) {
   const s = r.name.replace(/\.zip$/, ""), i = joinPaths(await e.documentRoot, "wp-content"), o = joinPaths(i, randomString()), l = joinPaths(o, "assets", s);
   await e.fileExists(l) && await e.rmdir(o, {
@@ -1138,10 +1103,10 @@ async function installAsset(e, { targetPath: t, zipFile: r }) {
     });
     d = d.filter((N) => !N.endsWith("/__MACOSX"));
     const u = d.length === 1 && await e.isDir(d[0]);
-    let p, $ = "";
-    u ? ($ = d[0], p = d[0].split("/").pop()) : ($ = l, p = s);
+    let p, g = "";
+    u ? (g = d[0], p = d[0].split("/").pop()) : (g = l, p = s);
     const O = `${t}/${p}`;
-    return await e.mv($, O), {
+    return await e.mv(g, O), {
       assetFolderPath: O,
       assetFolderName: p
     };
@@ -1286,9 +1251,8 @@ const allStepHandlers = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.def
   defineWpConfigConsts,
   enableMultisite,
   exportWXR,
-  exportWXZ,
-  importFile,
   importWordPressFiles,
+  importWxr,
   installPlugin,
   installTheme,
   login,
@@ -1732,7 +1696,8 @@ const SupportedPHPVersions = [
   "xml-bundle",
   "gd"
 ], SupportedPHPExtensionBundles = {
-  "kitchen-sink": SupportedPHPExtensionsList
+  "kitchen-sink": SupportedPHPExtensionsList,
+  light: []
 };
 var Ae, Ge;
 class PHPBrowser {
@@ -1860,7 +1825,7 @@ function fileToUint8Array(e) {
     }, r.readAsArrayBuffer(e);
   });
 }
-var Pe, Ke, dt, De, Je, ve, Qe, Fe, mt, xt, _t, Wt, $t, Bt;
+var Pe, Ke, dt, De, Je, ve, Qe, Fe, mt, xt, _t, Wt, gt, Bt;
 class PHPRequestHandler {
   /**
    * @param  php    - The PHP instance.
@@ -1891,7 +1856,7 @@ class PHPRequestHandler {
      * @throws {Error} If the requested path doesn't exist.
      * @returns The resolved filesystem path.
      */
-    Q(this, $t);
+    Q(this, gt);
     Q(this, Pe, void 0);
     Q(this, Ke, void 0);
     Q(this, dt, void 0);
@@ -1942,7 +1907,8 @@ 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 = applyRewriteRules(
       removePathPrefix(n.pathname, H(this, ve)),
@@ -2005,7 +1971,7 @@ Pe = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
     }
     let d;
     try {
-      d = ce(this, $t, Bt).call(this, r.pathname);
+      d = ce(this, gt, Bt).call(this, r.pathname);
     } catch {
       return new PHPResponse(
         404,
@@ -2027,7 +1993,7 @@ Pe = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
   } finally {
     n();
   }
-}, $t = new WeakSet(), Bt = function(t) {
+}, gt = new WeakSet(), Bt = function(t) {
   let r = removePathPrefix(t, H(this, ve));
   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}`;
@@ -2183,8 +2149,8 @@ function rethrowFileSystemError(e = "") {
       } catch (l) {
         const d = typeof l == "object" ? l == null ? void 0 : l.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: l
           });
         }
@@ -2207,7 +2173,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, be, Re, Te, Ee, Xe, gt, Gt, yt, Kt, vt, Jt, wt, Qt, Pt, Zt, bt, Yt, Et, Xt, St, er, Rt, tr, Tt, rr, kt, nr, Ot, sr;
+var Me, Ze, Ye, be, Re, Te, Ee, Xe, $t, Gt, yt, 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.
@@ -2217,7 +2183,7 @@ class BasePHP {
    * @param  serverOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(e, t) {
-    Q(this, gt);
+    Q(this, $t);
     Q(this, yt);
     Q(this, vt);
     Q(this, wt);
@@ -2228,7 +2194,7 @@ class BasePHP {
     Q(this, Rt);
     Q(this, Tt);
     Q(this, kt);
-    Q(this, Ot);
+    Q(this, Ct);
     Q(this, Me, void 0);
     Q(this, Ze, void 0);
     Q(this, Ye, void 0);
@@ -2342,7 +2308,7 @@ class BasePHP {
     const t = await this.semaphore.acquire();
     let r;
     try {
-      if (H(this, be) || (ce(this, gt, Gt).call(this), te(this, be, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
+      if (H(this, be) || (ce(this, $t, Gt).call(this), te(this, be, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
         throw new Error(
           `The script path "${e.scriptPath}" does not exist.`
         );
@@ -2352,8 +2318,8 @@ class BasePHP {
       const i = e.env || {};
       for (const l in i)
         ce(this, Tt, rr).call(this, l, i[l]);
-      const o = await ce(this, Ot, sr).call(this);
-      if (e.throwOnError && o.exitCode !== 0) {
+      const o = await ce(this, Ct, sr).call(this);
+      if (o.exitCode !== 0) {
         const l = {
           stdout: o.text,
           stderr: o.errors
@@ -2362,13 +2328,15 @@ class BasePHP {
         const d = new Error(
           `PHP.run() failed with exit code ${o.exitCode} and the following output: ` + o.errors
         );
-        throw d.output = l, console.error(d), d;
+        throw d.output = l, d.source = "request", console.error(d), d;
       }
       return o;
     } catch (n) {
       throw this.dispatchEvent({
         type: "request.error",
-        error: n
+        error: n,
+        // Distinguish between PHP request and PHP-wasm errors
+        source: n.source ?? "php-wasm"
       }), n;
     } finally {
       try {
@@ -2493,7 +2461,7 @@ class BasePHP {
     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(), be = new WeakMap(), Re = new WeakMap(), Te = new WeakMap(), Ee = new WeakMap(), Xe = new WeakMap(), gt = 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(), $t = new WeakSet(), Gt = function() {
   if (this.setPhpIniEntry("auto_prepend_file", "/internal/consts.php"), this.fileExists("/internal/consts.php") || this.writeFile(
     "/internal/consts.php",
     `<?php
@@ -2651,7 +2619,7 @@ Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), be = new WeakMap(),
     [STRING],
     [e]
   );
-}, Ot = new WeakSet(), sr = async function() {
+}, Ct = new WeakSet(), sr = async function() {
   var s;
   let e, t;
   try {
@@ -2984,10 +2952,10 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
   }
   e._CodeOrName = t, e.IDENTIFIER = /^[a-z$_][a-z$_0-9]*$/i;
   class r extends t {
-    constructor(T) {
-      if (super(), !e.IDENTIFIER.test(T))
+    constructor($) {
+      if (super(), !e.IDENTIFIER.test($))
         throw new Error("CodeGen: name must be a valid identifier");
-      this.str = T;
+      this.str = $;
     }
     toString() {
       return this.str;
@@ -3001,8 +2969,8 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
   }
   e.Name = r;
   class n extends t {
-    constructor(T) {
-      super(), this._items = typeof T == "string" ? [T] : T;
+    constructor($) {
+      super(), this._items = typeof $ == "string" ? [$] : $;
     }
     toString() {
       return this.str;
@@ -3010,93 +2978,93 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
     emptyStr() {
       if (this._items.length > 1)
         return !1;
-      const T = this._items[0];
-      return T === "" || T === '""';
+      const $ = this._items[0];
+      return $ === "" || $ === '""';
     }
     get str() {
-      var T;
-      return (T = this._str) !== null && T !== void 0 ? T : this._str = this._items.reduce((S, I) => `${S}${I}`, "");
+      var $;
+      return ($ = this._str) !== null && $ !== void 0 ? $ : this._str = this._items.reduce((P, I) => `${P}${I}`, "");
     }
     get names() {
-      var T;
-      return (T = this._names) !== null && T !== void 0 ? T : this._names = this._items.reduce((S, I) => (I instanceof r && (S[I.str] = (S[I.str] || 0) + 1), S), {});
+      var $;
+      return ($ = this._names) !== null && $ !== void 0 ? $ : this._names = this._items.reduce((P, I) => (I instanceof r && (P[I.str] = (P[I.str] || 0) + 1), P), {});
     }
   }
   e._Code = n, e.nil = new n("");
-  function s(m, ...T) {
-    const S = [m[0]];
+  function s(_, ...$) {
+    const P = [_[0]];
     let I = 0;
-    for (; I < T.length; )
-      l(S, T[I]), S.push(m[++I]);
-    return new n(S);
+    for (; I < $.length; )
+      l(P, $[I]), P.push(_[++I]);
+    return new n(P);
   }
   e._ = s;
   const i = new n("+");
-  function o(m, ...T) {
-    const S = [N(m[0])];
+  function o(_, ...$) {
+    const P = [N(_[0])];
     let I = 0;
-    for (; I < T.length; )
-      S.push(i), l(S, T[I]), S.push(i, N(m[++I]));
-    return d(S), new n(S);
+    for (; I < $.length; )
+      P.push(i), l(P, $[I]), P.push(i, N(_[++I]));
+    return d(P), new n(P);
   }
   e.str = o;
-  function l(m, T) {
-    T instanceof n ? m.push(...T._items) : T instanceof r ? m.push(T) : m.push($(T));
+  function l(_, $) {
+    $ instanceof n ? _.push(...$._items) : $ instanceof r ? _.push($) : _.push(g($));
   }
   e.addCodeArg = l;
-  function d(m) {
-    let T = 1;
-    for (; T < m.length - 1; ) {
-      if (m[T] === i) {
-        const S = u(m[T - 1], m[T + 1]);
-        if (S !== void 0) {
-          m.splice(T - 1, 3, S);
+  function d(_) {
+    let $ = 1;
+    for (; $ < _.length - 1; ) {
+      if (_[$] === i) {
+        const P = u(_[$ - 1], _[$ + 1]);
+        if (P !== void 0) {
+          _.splice($ - 1, 3, P);
           continue;
         }
-        m[T++] = "+";
+        _[$++] = "+";
       }
-      T++;
+      $++;
     }
   }
-  function u(m, T) {
-    if (T === '""')
-      return m;
-    if (m === '""')
-      return T;
-    if (typeof m == "string")
-      return T instanceof r || m[m.length - 1] !== '"' ? void 0 : typeof T != "string" ? `${m.slice(0, -1)}${T}"` : T[0] === '"' ? m.slice(0, -1) + T.slice(1) : void 0;
-    if (typeof T == "string" && T[0] === '"' && !(m instanceof r))
-      return `"${m}${T.slice(1)}`;
+  function u(_, $) {
+    if ($ === '""')
+      return _;
+    if (_ === '""')
+      return $;
+    if (typeof _ == "string")
+      return $ instanceof r || _[_.length - 1] !== '"' ? void 0 : typeof $ != "string" ? `${_.slice(0, -1)}${$}"` : $[0] === '"' ? _.slice(0, -1) + $.slice(1) : void 0;
+    if (typeof $ == "string" && $[0] === '"' && !(_ instanceof r))
+      return `"${_}${$.slice(1)}`;
   }
-  function p(m, T) {
-    return T.emptyStr() ? m : m.emptyStr() ? T : o`${m}${T}`;
+  function p(_, $) {
+    return $.emptyStr() ? _ : _.emptyStr() ? $ : o`${_}${$}`;
   }
   e.strConcat = p;
-  function $(m) {
-    return typeof m == "number" || typeof m == "boolean" || m === null ? m : N(Array.isArray(m) ? m.join(",") : m);
+  function g(_) {
+    return typeof _ == "number" || typeof _ == "boolean" || _ === null ? _ : N(Array.isArray(_) ? _.join(",") : _);
   }
-  function O(m) {
-    return new n(N(m));
+  function O(_) {
+    return new n(N(_));
   }
   e.stringify = O;
-  function N(m) {
-    return JSON.stringify(m).replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
+  function N(_) {
+    return JSON.stringify(_).replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
   }
   e.safeStringify = N;
-  function R(m) {
-    return typeof m == "string" && e.IDENTIFIER.test(m) ? new n(`.${m}`) : s`[${m}]`;
+  function R(_) {
+    return typeof _ == "string" && e.IDENTIFIER.test(_) ? new n(`.${_}`) : s`[${_}]`;
   }
   e.getProperty = R;
-  function v(m) {
-    if (typeof m == "string" && e.IDENTIFIER.test(m))
-      return new n(`${m}`);
-    throw new Error(`CodeGen: invalid export name: ${m}, use explicit $id name mapping`);
+  function T(_) {
+    if (typeof _ == "string" && e.IDENTIFIER.test(_))
+      return new n(`${_}`);
+    throw new Error(`CodeGen: invalid export name: ${_}, use explicit $id name mapping`);
   }
-  e.getEsmExportName = v;
-  function g(m) {
-    return new n(m.toString());
+  e.getEsmExportName = T;
+  function y(_) {
+    return new n(_.toString());
   }
-  e.regexpCode = g;
+  e.regexpCode = y;
 })(code$1);
 var scope = {};
 (function(e) {
@@ -3130,8 +3098,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 };
     }
@@ -3141,8 +3109,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;
@@ -3158,60 +3126,60 @@ 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 O = this.toName(u), { prefix: N } = O, R = ($ = p.key) !== null && $ !== void 0 ? $ : p.ref;
-      let v = this._values[N];
-      if (v) {
-        const T = v.get(R);
-        if (T)
-          return T;
+      const O = this.toName(u), { prefix: N } = O, R = (g = p.key) !== null && g !== void 0 ? g : p.ref;
+      let T = this._values[N];
+      if (T) {
+        const $ = T.get(R);
+        if ($)
+          return $;
       } else
-        v = this._values[N] = /* @__PURE__ */ new Map();
-      v.set(R, O);
-      const g = this._scope[N] || (this._scope[N] = []), m = g.length;
-      return g[m] = p.ref, O.setValue(p, { property: N, itemIndex: m }), O;
+        T = this._values[N] = /* @__PURE__ */ new Map();
+      T.set(R, O);
+      const y = this._scope[N] || (this._scope[N] = []), _ = y.length;
+      return y[_] = p.ref, O.setValue(p, { property: N, itemIndex: _ }), O;
     }
     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, (O) => {
         if (O.value === void 0)
           throw new Error(`CodeGen: name "${O}" has no value`);
         return O.value.code;
-      }, p, $);
+      }, p, g);
     }
-    _reduceValues(u, p, $ = {}, O) {
+    _reduceValues(u, p, g = {}, O) {
       let N = t.nil;
       for (const R in u) {
-        const v = u[R];
-        if (!v)
+        const T = u[R];
+        if (!T)
           continue;
-        const g = $[R] = $[R] || /* @__PURE__ */ new Map();
-        v.forEach((m) => {
-          if (g.has(m))
+        const y = g[R] = g[R] || /* @__PURE__ */ new Map();
+        T.forEach((_) => {
+          if (y.has(_))
             return;
-          g.set(m, n.Started);
-          let T = p(m);
-          if (T) {
-            const S = this.opts.es5 ? e.varKinds.var : e.varKinds.const;
-            N = (0, t._)`${N}${S} ${m} = ${T};${this.opts._n}`;
-          } else if (T = O == null ? void 0 : O(m))
-            N = (0, t._)`${N}${T}${this.opts._n}`;
+          y.set(_, n.Started);
+          let $ = p(_);
+          if ($) {
+            const P = this.opts.es5 ? e.varKinds.var : e.varKinds.const;
+            N = (0, t._)`${N}${P} ${_} = ${$};${this.opts._n}`;
+          } else if ($ = O == null ? void 0 : O(_))
+            N = (0, t._)`${N}${$}${this.opts._n}`;
           else
-            throw new r(m);
-          g.set(m, n.Completed);
+            throw new r(_);
+          y.set(_, n.Completed);
         });
       }
       return N;
@@ -3325,7 +3293,7 @@ var scope = {};
       return `break${this.label ? ` ${this.label}` : ""};` + a;
     }
   }
-  class $ extends i {
+  class g extends i {
     constructor(a) {
       super(), this.error = a;
     }
@@ -3387,12 +3355,12 @@ var scope = {};
       return "{" + a._n + super.render(a) + "}" + a._n;
     }
   }
-  class v extends N {
+  class T extends N {
   }
-  class g extends R {
+  class y extends R {
   }
-  g.kind = "else";
-  class m extends R {
+  y.kind = "else";
+  class _ extends R {
     constructor(a, h) {
       super(h), this.condition = a;
     }
@@ -3408,10 +3376,10 @@ var scope = {};
       let h = this.else;
       if (h) {
         const C = h.optimizeNodes();
-        h = this.else = Array.isArray(C) ? new g(C) : C;
+        h = this.else = Array.isArray(C) ? new y(C) : C;
       }
       if (h)
-        return a === !1 ? h instanceof m ? h : h.nodes : this.nodes.length ? this : new m(Oe(a), h instanceof m ? [h] : h.nodes);
+        return a === !1 ? h instanceof _ ? h : h.nodes : this.nodes.length ? this : new _(Ce(a), h instanceof _ ? [h] : h.nodes);
       if (!(a === !1 || !this.nodes.length))
         return this;
     }
@@ -3425,11 +3393,11 @@ var scope = {};
       return ue(a, this.condition), this.else && K(a, this.else.names), a;
     }
   }
-  m.kind = "if";
-  class T extends R {
+  _.kind = "if";
+  class $ extends R {
   }
-  T.kind = "for";
-  class S extends T {
+  $.kind = "for";
+  class P extends $ {
     constructor(a) {
       super(), this.iteration = a;
     }
@@ -3444,7 +3412,7 @@ var scope = {};
       return K(super.names, this.iteration.names);
     }
   }
-  class I extends T {
+  class I extends $ {
     constructor(a, h, C, M) {
       super(), this.varKind = a, this.name = h, this.from = C, this.to = M;
     }
@@ -3457,7 +3425,7 @@ var scope = {};
       return ue(a, this.to);
     }
   }
-  class D extends T {
+  class D extends $ {
     constructor(a, h, C, M) {
       super(), this.loop = a, this.varKind = h, this.name = C, this.iterable = M;
     }
@@ -3523,7 +3491,7 @@ var scope = {};
   class re {
     constructor(a, h = {}) {
       this._values = {}, this._blockStarts = [], this._constants = {}, this.opts = { ...h, _n: h.lines ? `
-` : "" }, this._extScope = a, this._scope = new r.Scope({ parent: a }), this._nodes = [new v()];
+` : "" }, this._extScope = a, this._scope = new r.Scope({ parent: a }), this._nodes = [new T()];
     }
     toString() {
       return this._root.render(this.opts);
@@ -3589,7 +3557,7 @@ var scope = {};
     }
     // `if` clause (or statement if `thenBody` and, optionally, `elseBody` are passed)
     if(a, h, C) {
-      if (this._blockNode(new m(a)), h && C)
+      if (this._blockNode(new _(a)), h && C)
         this.code(h).else().code(C).endIf();
       else if (h)
         this.code(h).endIf();
@@ -3599,22 +3567,22 @@ var scope = {};
     }
     // `else if` clause - invalid without `if` or after `else` clauses
     elseIf(a) {
-      return this._elseNode(new m(a));
+      return this._elseNode(new _(a));
     }
     // `else` clause - only valid after `if` or `else if` clauses
     else() {
-      return this._elseNode(new g());
+      return this._elseNode(new y());
     }
     // end `if` statement (needed if gen.if was used only with condition)
     endIf() {
-      return this._endBlockNode(m, g);
+      return this._endBlockNode(_, y);
     }
     _for(a, h) {
       return this._blockNode(a), h && this.code(h).endFor(), this;
     }
     // a generic `for` clause (or statement if `forBody` is passed)
     for(a, h) {
-      return this._for(new S(a), h);
+      return this._for(new P(a), h);
     }
     // `for` statement for a range of values
     forRange(a, h, C, M, q = this.opts.es5 ? r.varKinds.var : r.varKinds.let) {
@@ -3642,7 +3610,7 @@ var scope = {};
     }
     // end `for` loop
     endFor() {
-      return this._endBlockNode(T);
+      return this._endBlockNode($);
     }
     // `label` statement
     label(a) {
@@ -3672,7 +3640,7 @@ var scope = {};
     }
     // `throw` statement
     throw(a) {
-      return this._leafNode(new $(a));
+      return this._leafNode(new g(a));
     }
     // start self-balancing block
     block(a, h) {
@@ -3714,7 +3682,7 @@ var scope = {};
     }
     _elseNode(a) {
       const h = this._currNode;
-      if (!(h instanceof m))
+      if (!(h instanceof _))
         throw new Error('CodeGen: "else" without "if"');
       return this._currNode = h.else = a, this;
     }
@@ -3731,20 +3699,20 @@ var scope = {};
     }
   }
   e.CodeGen = re;
-  function K(P, a) {
+  function K(b, a) {
     for (const h in a)
-      P[h] = (P[h] || 0) + (a[h] || 0);
-    return P;
-  }
-  function ue(P, a) {
-    return a instanceof t._CodeOrName ? K(P, a.names) : P;
-  }
-  function oe(P, a, h) {
-    if (P instanceof t.Name)
-      return C(P);
-    if (!M(P))
-      return P;
-    return new t._Code(P._items.reduce((q, W) => (W instanceof t.Name && (W = C(W)), W instanceof t._Code ? q.push(...W._items) : q.push(W), q), []));
+      b[h] = (b[h] || 0) + (a[h] || 0);
+    return b;
+  }
+  function ue(b, a) {
+    return a instanceof t._CodeOrName ? K(b, a.names) : b;
+  }
+  function oe(b, a, h) {
+    if (b instanceof t.Name)
+      return C(b);
+    if (!M(b))
+      return b;
+    return new t._Code(b._items.reduce((q, W) => (W instanceof t.Name && (W = C(W)), W instanceof t._Code ? q.push(...W._items) : q.push(W), q), []));
     function C(q) {
       const W = h[q.str];
       return W === void 0 || a[q.str] !== 1 ? q : (delete a[q.str], W);
@@ -3753,29 +3721,29 @@ var scope = {};
       return q instanceof t._Code && q._items.some((W) => W instanceof t.Name && a[W.str] === 1 && h[W.str] !== void 0);
     }
   }
-  function ke(P, a) {
+  function ke(b, a) {
     for (const h in a)
-      P[h] = (P[h] || 0) - (a[h] || 0);
+      b[h] = (b[h] || 0) - (a[h] || 0);
   }
-  function Oe(P) {
-    return typeof P == "boolean" || typeof P == "number" || P === null ? !P : (0, t._)`!${j(P)}`;
+  function Ce(b) {
+    return typeof b == "boolean" || typeof b == "number" || b === null ? !b : (0, t._)`!${j(b)}`;
   }
-  e.not = Oe;
-  const qe = y(e.operators.AND);
-  function et(...P) {
-    return P.reduce(qe);
+  e.not = Ce;
+  const qe = v(e.operators.AND);
+  function et(...b) {
+    return b.reduce(qe);
   }
   e.and = et;
-  const Ue = y(e.operators.OR);
-  function F(...P) {
-    return P.reduce(Ue);
+  const Ue = v(e.operators.OR);
+  function F(...b) {
+    return b.reduce(Ue);
   }
   e.or = F;
-  function y(P) {
-    return (a, h) => a === t.nil ? h : h === t.nil ? a : (0, t._)`${j(a)} ${P} ${j(h)}`;
+  function v(b) {
+    return (a, h) => a === t.nil ? h : h === t.nil ? a : (0, t._)`${j(a)} ${b} ${j(h)}`;
   }
-  function j(P) {
-    return P instanceof t.Name ? P : (0, t._)`(${P})`;
+  function j(b) {
+    return b instanceof t.Name ? b : (0, t._)`(${b})`;
   }
 })(codegen);
 var util = {};
@@ -3835,13 +3803,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 O(w) {
     return w.replace(/~1/g, "/").replace(/~0/g, "~");
   }
@@ -3866,10 +3834,10 @@ var util = {};
         w.if((0, t._)`${k} === true`, () => w.assign(A, !0), () => w.assign(A, (0, t._)`${A} || {}`).code((0, t._)`Object.assign(${A}, ${k})`));
       }),
       mergeToName: (w, k, A) => w.if((0, t._)`${A} !== true`, () => {
-        k === !0 ? w.assign(A, !0) : (w.assign(A, (0, t._)`${A} || {}`), g(w, A, k));
+        k === !0 ? w.assign(A, !0) : (w.assign(A, (0, t._)`${A} || {}`), y(w, A, k));
       }),
       mergeValues: (w, k) => w === !0 ? !0 : { ...w, ...k },
-      resultToName: v
+      resultToName: T
     }),
     items: R({
       mergeNames: (w, k, A) => w.if((0, t._)`${A} !== true && ${k} !== undefined`, () => w.assign(A, (0, t._)`${k} === true ? true : ${A} > ${k} ? ${A} : ${k}`)),
@@ -3878,35 +3846,35 @@ var util = {};
       resultToName: (w, k) => w.var("items", k)
     })
   };
-  function v(w, k) {
+  function T(w, k) {
     if (k === !0)
       return w.var("props", !0);
     const A = w.var("props", (0, t._)`{}`);
-    return k !== void 0 && g(w, A, k), A;
+    return k !== void 0 && y(w, A, k), A;
   }
-  e.evaluatedPropsToName = v;
-  function g(w, k, A) {
+  e.evaluatedPropsToName = T;
+  function y(w, k, A) {
     Object.keys(A).forEach((V) => w.assign((0, t._)`${k}${(0, t.getProperty)(V)}`, !0));
   }
-  e.setEvaluated = g;
-  const m = {};
-  function T(w, k) {
+  e.setEvaluated = y;
+  const _ = {};
+  function $(w, k) {
     return w.scopeValue("func", {
       ref: k,
-      code: m[k.code] || (m[k.code] = new r._Code(k.code))
+      code: _[k.code] || (_[k.code] = new r._Code(k.code))
     });
   }
-  e.useFunc = T;
-  var S;
+  e.useFunc = $;
+  var P;
   (function(w) {
     w[w.Num = 0] = "Num", w[w.Str = 1] = "Str";
-  })(S = e.Type || (e.Type = {}));
+  })(P = e.Type || (e.Type = {}));
   function I(w, k, A) {
     if (w instanceof t.Name) {
-      const V = k === S.Num;
+      const V = k === P.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, k, A = w.opts.strictSchema) {
@@ -3948,40 +3916,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: g }) => (0, t.str)`must pass "${g}" keyword validation`
+    message: ({ keyword: y }) => (0, t.str)`must pass "${y}" keyword validation`
   }, e.keyword$DataError = {
-    message: ({ keyword: g, schemaType: m }) => m ? (0, t.str)`"${g}" keyword must be ${m} ($data)` : (0, t.str)`"${g}" keyword is invalid ($data)`
+    message: ({ keyword: y, schemaType: _ }) => _ ? (0, t.str)`"${y}" keyword must be ${_} ($data)` : (0, t.str)`"${y}" keyword is invalid ($data)`
   };
-  function s(g, m = e.keywordError, T, S) {
-    const { it: I } = g, { gen: D, compositeRule: w, allErrors: k } = I, A = $(g, m, T);
-    S ?? (w || k) ? d(D, A) : u(I, (0, t._)`[${A}]`);
+  function s(y, _ = e.keywordError, $, P) {
+    const { it: I } = y, { gen: D, compositeRule: w, allErrors: k } = I, A = g(y, _, $);
+    P ?? (w || k) ? d(D, A) : u(I, (0, t._)`[${A}]`);
   }
   e.reportError = s;
-  function i(g, m = e.keywordError, T) {
-    const { it: S } = g, { gen: I, compositeRule: D, allErrors: w } = S, k = $(g, m, T);
-    d(I, k), D || w || u(S, n.default.vErrors);
+  function i(y, _ = e.keywordError, $) {
+    const { it: P } = y, { gen: I, compositeRule: D, allErrors: w } = P, k = g(y, _, $);
+    d(I, k), D || w || u(P, n.default.vErrors);
   }
   e.reportExtraError = i;
-  function o(g, m) {
-    g.assign(n.default.errors, m), g.if((0, t._)`${n.default.vErrors} !== null`, () => g.if(m, () => g.assign((0, t._)`${n.default.vErrors}.length`, m), () => g.assign(n.default.vErrors, null)));
+  function o(y, _) {
+    y.assign(n.default.errors, _), y.if((0, t._)`${n.default.vErrors} !== null`, () => y.if(_, () => y.assign((0, t._)`${n.default.vErrors}.length`, _), () => y.assign(n.default.vErrors, null)));
   }
   e.resetErrorsCount = o;
-  function l({ gen: g, keyword: m, schemaValue: T, data: S, errsCount: I, it: D }) {
+  function l({ gen: y, keyword: _, schemaValue: $, data: P, errsCount: I, it: D }) {
     if (I === void 0)
       throw new Error("ajv implementation error");
-    const w = g.name("err");
-    g.forRange("i", I, n.default.errors, (k) => {
-      g.const(w, (0, t._)`${n.default.vErrors}[${k}]`), g.if((0, t._)`${w}.instancePath === undefined`, () => g.assign((0, t._)`${w}.instancePath`, (0, t.strConcat)(n.default.instancePath, D.errorPath))), g.assign((0, t._)`${w}.schemaPath`, (0, t.str)`${D.errSchemaPath}/${m}`), D.opts.verbose && (g.assign((0, t._)`${w}.schema`, T), g.assign((0, t._)`${w}.data`, S));
+    const w = y.name("err");
+    y.forRange("i", I, n.default.errors, (k) => {
+      y.const(w, (0, t._)`${n.default.vErrors}[${k}]`), 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}/${_}`), D.opts.verbose && (y.assign((0, t._)`${w}.schema`, $), y.assign((0, t._)`${w}.data`, P));
     });
   }
   e.extendErrors = l;
-  function d(g, m) {
-    const T = g.const("err", m);
-    g.if((0, t._)`${n.default.vErrors} === null`, () => g.assign(n.default.vErrors, (0, t._)`[${T}]`), (0, t._)`${n.default.vErrors}.push(${T})`), g.code((0, t._)`${n.default.errors}++`);
+  function d(y, _) {
+    const $ = y.const("err", _);
+    y.if((0, t._)`${n.default.vErrors} === null`, () => y.assign(n.default.vErrors, (0, t._)`[${$}]`), (0, t._)`${n.default.vErrors}.push(${$})`), y.code((0, t._)`${n.default.errors}++`);
   }
-  function u(g, m) {
-    const { gen: T, validateName: S, schemaEnv: I } = g;
-    I.$async ? T.throw((0, t._)`new ${g.ValidationError}(${m})`) : (T.assign((0, t._)`${S}.errors`, m), T.return(!1));
+  function u(y, _) {
+    const { gen: $, validateName: P, schemaEnv: I } = y;
+    I.$async ? $.throw((0, t._)`new ${y.ValidationError}(${_})`) : ($.assign((0, t._)`${P}.errors`, _), $.return(!1));
   }
   const p = {
     keyword: new t.Name("keyword"),
@@ -3992,28 +3960,28 @@ names$1.default = names;
     schema: new t.Name("schema"),
     parentSchema: new t.Name("parentSchema")
   };
-  function $(g, m, T) {
-    const { createErrors: S } = g.it;
-    return S === !1 ? (0, t._)`{}` : O(g, m, T);
-  }
-  function O(g, m, T = {}) {
-    const { gen: S, it: I } = g, D = [
-      N(I, T),
-      R(g, T)
+  function g(y, _, $) {
+    const { createErrors: P } = y.it;
+    return P === !1 ? (0, t._)`{}` : O(y, _, $);
+  }
+  function O(y, _, $ = {}) {
+    const { gen: P, it: I } = y, D = [
+      N(I, $),
+      R(y, $)
     ];
-    return v(g, m, D), S.object(...D);
+    return T(y, _, D), P.object(...D);
   }
-  function N({ errorPath: g }, { instancePath: m }) {
-    const T = m ? (0, t.str)`${g}${(0, r.getErrorPath)(m, r.Type.Str)}` : g;
-    return [n.default.instancePath, (0, t.strConcat)(n.default.instancePath, T)];
+  function N({ errorPath: y }, { instancePath: _ }) {
+    const $ = _ ? (0, t.str)`${y}${(0, r.getErrorPath)(_, r.Type.Str)}` : y;
+    return [n.default.instancePath, (0, t.strConcat)(n.default.instancePath, $)];
   }
-  function R({ keyword: g, it: { errSchemaPath: m } }, { schemaPath: T, parentSchema: S }) {
-    let I = S ? m : (0, t.str)`${m}/${g}`;
-    return T && (I = (0, t.str)`${I}${(0, r.getErrorPath)(T, r.Type.Str)}`), [p.schemaPath, I];
+  function R({ keyword: y, it: { errSchemaPath: _ } }, { schemaPath: $, parentSchema: P }) {
+    let I = P ? _ : (0, t.str)`${_}/${y}`;
+    return $ && (I = (0, t.str)`${I}${(0, r.getErrorPath)($, r.Type.Str)}`), [p.schemaPath, I];
   }
-  function v(g, { params: m, message: T }, S) {
-    const { keyword: I, data: D, schemaValue: w, it: k } = g, { opts: A, propertyName: V, topSchemaRef: x, schemaPath: re } = k;
-    S.push([p.keyword, I], [p.params, typeof m == "function" ? m(g) : m || (0, t._)`{}`]), A.messages && S.push([p.message, typeof T == "function" ? T(g) : T]), A.verbose && S.push([p.schema, w], [p.parentSchema, (0, t._)`${x}${re}`], [n.default.data, D]), V && S.push([p.propertyName, V]);
+  function T(y, { params: _, message: $ }, P) {
+    const { keyword: I, data: D, schemaValue: w, it: k } = y, { opts: A, propertyName: V, topSchemaRef: x, schemaPath: re } = k;
+    P.push([p.keyword, I], [p.params, typeof _ == "function" ? _(y) : _ || (0, t._)`{}`]), A.messages && P.push([p.message, typeof $ == "function" ? $(y) : $]), A.verbose && P.push([p.schema, w], [p.parentSchema, (0, t._)`${x}${re}`], [n.default.data, D]), V && P.push([p.propertyName, V]);
   }
 })(errors);
 Object.defineProperty(boolSchema, "__esModule", { value: !0 });
@@ -4089,51 +4057,51 @@ applicability.shouldUseRule = shouldUseRule;
   Object.defineProperty(e, "__esModule", { value: !0 }), e.reportTypeError = e.checkDataTypes = e.checkDataType = e.coerceAndCheckDataType = e.getJSONTypes = e.getSchemaTypes = e.DataType = void 0;
   const t = rules, r = applicability, n = errors, s = codegen, i = util;
   var o;
-  (function(S) {
-    S[S.Correct = 0] = "Correct", S[S.Wrong = 1] = "Wrong";
+  (function(P) {
+    P[P.Correct = 0] = "Correct", P[P.Wrong = 1] = "Wrong";
   })(o = e.DataType || (e.DataType = {}));
-  function l(S) {
-    const I = d(S.type);
+  function l(P) {
+    const I = d(P.type);
     if (I.includes("null")) {
-      if (S.nullable === !1)
+      if (P.nullable === !1)
         throw new Error("type: null contradicts nullable: false");
     } else {
-      if (!I.length && S.nullable !== void 0)
+      if (!I.length && P.nullable !== void 0)
         throw new Error('"nullable" cannot be used without "type"');
-      S.nullable === !0 && I.push("null");
+      P.nullable === !0 && I.push("null");
     }
     return I;
   }
   e.getSchemaTypes = l;
-  function d(S) {
-    const I = Array.isArray(S) ? S : S ? [S] : [];
+  function d(P) {
+    const I = Array.isArray(P) ? P : P ? [P] : [];
     if (I.every(t.isJSONType))
       return I;
     throw new Error("type must be JSONType or JSONType[]: " + I.join(","));
   }
   e.getJSONTypes = d;
-  function u(S, I) {
-    const { gen: D, data: w, opts: k } = S, A = $(I, k.coerceTypes), V = I.length > 0 && !(A.length === 0 && I.length === 1 && (0, r.schemaHasRulesForType)(S, I[0]));
+  function u(P, I) {
+    const { gen: D, data: w, opts: k } = P, A = g(I, k.coerceTypes), V = I.length > 0 && !(A.length === 0 && I.length === 1 && (0, r.schemaHasRulesForType)(P, I[0]));
     if (V) {
-      const x = v(I, w, k.strictNumbers, o.Wrong);
+      const x = T(I, w, k.strictNumbers, o.Wrong);
       D.if(x, () => {
-        A.length ? O(S, I, A) : m(S);
+        A.length ? O(P, I, A) : _(P);
       });
     }
     return V;
   }
   e.coerceAndCheckDataType = u;
   const p = /* @__PURE__ */ new Set(["string", "number", "integer", "boolean", "null"]);
-  function $(S, I) {
-    return I ? S.filter((D) => p.has(D) || I === "array" && D === "array") : [];
+  function g(P, I) {
+    return I ? P.filter((D) => p.has(D) || I === "array" && D === "array") : [];
   }
-  function O(S, I, D) {
-    const { gen: w, data: k, opts: A } = S, V = w.let("dataType", (0, s._)`typeof ${k}`), x = w.let("coerced", (0, s._)`undefined`);
-    A.coerceTypes === "array" && w.if((0, s._)`${V} == 'object' && Array.isArray(${k}) && ${k}.length == 1`, () => w.assign(k, (0, s._)`${k}[0]`).assign(V, (0, s._)`typeof ${k}`).if(v(I, k, A.strictNumbers), () => w.assign(x, k))), w.if((0, s._)`${x} !== undefined`);
+  function O(P, I, D) {
+    const { gen: w, data: k, opts: A } = P, V = w.let("dataType", (0, s._)`typeof ${k}`), x = w.let("coerced", (0, s._)`undefined`);
+    A.coerceTypes === "array" && w.if((0, s._)`${V} == 'object' && Array.isArray(${k}) && ${k}.length == 1`, () => w.assign(k, (0, s._)`${k}[0]`).assign(V, (0, s._)`typeof ${k}`).if(T(I, k, A.strictNumbers), () => w.assign(x, k))), w.if((0, s._)`${x} !== undefined`);
     for (const K of D)
       (p.has(K) || K === "array" && A.coerceTypes === "array") && re(K);
-    w.else(), m(S), w.endIf(), w.if((0, s._)`${x} !== undefined`, () => {
-      w.assign(k, x), N(S, x);
+    w.else(), _(P), w.endIf(), w.if((0, s._)`${x} !== undefined`, () => {
+      w.assign(k, x), N(P, x);
     });
     function re(K) {
       switch (K) {
@@ -4160,13 +4128,13 @@ applicability.shouldUseRule = shouldUseRule;
       }
     }
   }
-  function N({ gen: S, parentData: I, parentDataProperty: D }, w) {
-    S.if((0, s._)`${I} !== undefined`, () => S.assign((0, s._)`${I}[${D}]`, w));
+  function N({ gen: P, parentData: I, parentDataProperty: D }, w) {
+    P.if((0, s._)`${I} !== undefined`, () => P.assign((0, s._)`${I}[${D}]`, w));
   }
-  function R(S, I, D, w = o.Correct) {
+  function R(P, I, D, w = o.Correct) {
     const k = w === o.Correct ? s.operators.EQ : s.operators.NEQ;
     let A;
-    switch (S) {
+    switch (P) {
       case "null":
         return (0, s._)`${I} ${k} null`;
       case "array":
@@ -4182,7 +4150,7 @@ applicability.shouldUseRule = shouldUseRule;
         A = V();
         break;
       default:
-        return (0, s._)`typeof ${I} ${k} ${S}`;
+        return (0, s._)`typeof ${I} ${k} ${P}`;
     }
     return w === o.Correct ? A : (0, s.not)(A);
     function V(x = s.nil) {
@@ -4190,11 +4158,11 @@ applicability.shouldUseRule = shouldUseRule;
     }
   }
   e.checkDataType = R;
-  function v(S, I, D, w) {
-    if (S.length === 1)
-      return R(S[0], I, D, w);
+  function T(P, I, D, w) {
+    if (P.length === 1)
+      return R(P[0], I, D, w);
     let k;
-    const A = (0, i.toHash)(S);
+    const A = (0, i.toHash)(P);
     if (A.array && A.object) {
       const V = (0, s._)`typeof ${I} != "object"`;
       k = A.null ? V : (0, s._)`!${I} || ${V}`, delete A.null, delete A.array, delete A.object;
@@ -4205,18 +4173,18 @@ applicability.shouldUseRule = shouldUseRule;
       k = (0, s.and)(k, R(V, I, D, w));
     return k;
   }
-  e.checkDataTypes = v;
-  const g = {
-    message: ({ schema: S }) => `must be ${S}`,
-    params: ({ schema: S, schemaValue: I }) => typeof S == "string" ? (0, s._)`{type: ${S}}` : (0, s._)`{type: ${I}}`
+  e.checkDataTypes = T;
+  const y = {
+    message: ({ schema: P }) => `must be ${P}`,
+    params: ({ schema: P, schemaValue: I }) => typeof P == "string" ? (0, s._)`{type: ${P}}` : (0, s._)`{type: ${I}}`
   };
-  function m(S) {
-    const I = T(S);
-    (0, n.reportError)(I, g);
+  function _(P) {
+    const I = $(P);
+    (0, n.reportError)(I, y);
   }
-  e.reportTypeError = m;
-  function T(S) {
-    const { gen: I, data: D, schema: w } = S, k = (0, i.schemaRefOrVal)(S, w, "type");
+  e.reportTypeError = _;
+  function $(P) {
+    const { gen: I, data: D, schema: w } = P, k = (0, i.schemaRefOrVal)(P, w, "type");
     return {
       gen: I,
       keyword: "type",
@@ -4226,7 +4194,7 @@ applicability.shouldUseRule = shouldUseRule;
       schemaValue: k,
       parentSchema: w,
       params: {},
-      it: S
+      it: P
     };
   }
 })(dataType);
@@ -4305,14 +4273,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 }, l, 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 O = (0, codegen_1$q._)`${p}, ${r.object(...$)}`;
+  o.opts.dynamicRef && g.push([names_1$5.default.dynamicAnchors, names_1$5.default.dynamicAnchors]);
+  const O = (0, codegen_1$q._)`${p}, ${r.object(...g)}`;
   return d !== codegen_1$q.nil ? (0, codegen_1$q._)`${l}.call(${d}, ${O})` : (0, codegen_1$q._)`${l}(${O})`;
 }
 code.callValidateCode = callValidateCode;
@@ -4382,31 +4350,31 @@ function funcKeywordCode(e, t) {
   var r;
   const { gen: n, keyword: s, schema: i, parentSchema: o, $data: l, it: d } = e;
   checkAsyncKeyword(d, t);
-  const u = !l && t.compile ? t.compile.call(d.self, i, o, d) : t.validate, p = useKeyword(n, s, u), $ = n.let("valid");
-  e.block$data($, O), e.ok((r = t.valid) !== null && r !== void 0 ? r : $);
+  const u = !l && 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, O), e.ok((r = t.valid) !== null && r !== void 0 ? r : g);
   function O() {
     if (t.errors === !1)
-      v(), t.modifying && modifyData(e), g(() => e.error());
+      T(), t.modifying && modifyData(e), y(() => e.error());
     else {
-      const m = t.async ? N() : R();
-      t.modifying && modifyData(e), g(() => addErrs(e, m));
+      const _ = t.async ? N() : R();
+      t.modifying && modifyData(e), y(() => addErrs(e, _));
     }
   }
   function N() {
-    const m = n.let("ruleErrs", null);
-    return n.try(() => v((0, codegen_1$p._)`await `), (T) => n.assign($, !1).if((0, codegen_1$p._)`${T} instanceof ${d.ValidationError}`, () => n.assign(m, (0, codegen_1$p._)`${T}.errors`), () => n.throw(T))), m;
+    const _ = n.let("ruleErrs", null);
+    return n.try(() => T((0, codegen_1$p._)`await `), ($) => n.assign(g, !1).if((0, codegen_1$p._)`${$} instanceof ${d.ValidationError}`, () => n.assign(_, (0, codegen_1$p._)`${$}.errors`), () => n.throw($))), _;
   }
   function R() {
-    const m = (0, codegen_1$p._)`${p}.errors`;
-    return n.assign(m, null), v(codegen_1$p.nil), m;
+    const _ = (0, codegen_1$p._)`${p}.errors`;
+    return n.assign(_, null), T(codegen_1$p.nil), _;
   }
-  function v(m = t.async ? (0, codegen_1$p._)`await ` : codegen_1$p.nil) {
-    const T = d.opts.passContext ? names_1$4.default.this : names_1$4.default.self, S = !("compile" in t && !l || t.schema === !1);
-    n.assign($, (0, codegen_1$p._)`${m}${(0, code_1$9.callValidateCode)(e, p, T, S)}`, t.modifying);
+  function T(_ = t.async ? (0, codegen_1$p._)`await ` : codegen_1$p.nil) {
+    const $ = d.opts.passContext ? names_1$4.default.this : names_1$4.default.self, P = !("compile" in t && !l || t.schema === !1);
+    n.assign(g, (0, codegen_1$p._)`${_}${(0, code_1$9.callValidateCode)(e, p, $, P)}`, t.modifying);
   }
-  function g(m) {
-    var T;
-    n.if((0, codegen_1$p.not)((T = t.valid) !== null && T !== void 0 ? T : $), m);
+  function y(_) {
+    var $;
+    n.if((0, codegen_1$p.not)(($ = t.valid) !== null && $ !== void 0 ? $ : g), _);
   }
 }
 keyword.funcKeywordCode = funcKeywordCode;
@@ -4485,8 +4453,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: l } = t;
   if (r !== void 0) {
-    const { errorPath: u, dataPathArr: p, opts: $ } = t, O = l.let("data", (0, codegen_1$o._)`${t.data}${(0, codegen_1$o.getProperty)(r)}`, !0);
-    d(O), 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, O = l.let("data", (0, codegen_1$o._)`${t.data}${(0, codegen_1$o.getProperty)(r)}`, !0);
+    d(O), 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 : l.let("data", s, !0);
@@ -4591,17 +4559,17 @@ function _traverse(e, t, r, n, s, i, o, l, d, u) {
   if (n && typeof n == "object" && !Array.isArray(n)) {
     t(n, s, i, o, l, 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 O = 0; O < $.length; O++)
-            _traverse(e, t, r, $[O], s + "/" + p + "/" + O, i, s, p, n, O);
+          for (var O = 0; O < g.length; O++)
+            _traverse(e, t, r, g[O], s + "/" + p + "/" + O, i, s, p, n, O);
       } else if (p in traverse$1.propsKeywords) {
-        if ($ && typeof $ == "object")
-          for (var N in $)
-            _traverse(e, t, r, $[N], s + "/" + p + "/" + escapeJsonPtr(N), i, s, p, n, N);
+        if (g && typeof g == "object")
+          for (var N in g)
+            _traverse(e, t, r, g[N], s + "/" + p + "/" + escapeJsonPtr(N), i, s, p, n, N);
       } 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, l, d, u);
   }
@@ -4685,34 +4653,34 @@ 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), l = {}, d = /* @__PURE__ */ new Set();
-  return traverse(e, { allKeys: !0 }, ($, O, N, R) => {
+  return traverse(e, { allKeys: !0 }, (g, O, N, R) => {
     if (R === void 0)
       return;
-    const v = o + O;
-    let g = i[R];
-    typeof $[r] == "string" && (g = m.call(this, $[r])), T.call(this, $.$anchor), T.call(this, $.$dynamicAnchor), i[O] = g;
-    function m(S) {
+    const T = o + O;
+    let y = i[R];
+    typeof g[r] == "string" && (y = _.call(this, g[r])), $.call(this, g.$anchor), $.call(this, g.$dynamicAnchor), i[O] = y;
+    function _(P) {
       const I = this.opts.uriResolver.resolve;
-      if (S = normalizeId(g ? I(g, 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($, l[S], S), l[S] = $) : this.refs[S] = v), S;
-    }
-    function T(S) {
-      if (typeof S == "string") {
-        if (!ANCHOR.test(S))
-          throw new Error(`invalid anchor "${S}"`);
-        m.call(this, `#${S}`);
+      if (P = normalizeId(y ? I(y, P) : P), d.has(P))
+        throw p(P);
+      d.add(P);
+      let D = this.refs[P];
+      return typeof D == "string" && (D = this.refs[D]), typeof D == "object" ? u(g, D.schema, P) : P !== normalizeId(T) && (P[0] === "#" ? (u(g, l[P], P), l[P] = g) : this.refs[P] = T), P;
+    }
+    function $(P) {
+      if (typeof P == "string") {
+        if (!ANCHOR.test(P))
+          throw new Error(`invalid anchor "${P}"`);
+        _.call(this, `#${P}`);
       }
     }
   }), l;
-  function u($, O, N) {
-    if (O !== void 0 && !equal$2($, O))
+  function u(g, O, N) {
+    if (O !== void 0 && !equal$2(g, O))
       throw p(N);
   }
-  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;
@@ -4829,10 +4797,10 @@ function schemaKeywords(e, t, r, n) {
   }
   d.jtd || checkStrictTypes(e, t), s.block(() => {
     for (const O of p.rules)
-      $(O);
-    $(p.post);
+      g(O);
+    g(p.post);
   });
-  function $(O) {
+  function g(O) {
     (0, applicability_1.shouldUseGroup)(i, O) && (O.type ? (s.if((0, dataType_2.checkDataType)(O.type, o, d.strictNumbers)), iterateKeywords(e, O), t.length === 1 && t[0] === O.type && r && (s.else(), (0, dataType_2.reportTypeError)(e)), s.endIf()) : iterateKeywords(e, O), l || s.if((0, codegen_1$n._)`${names_1$3.default.errors} === ${n || 0}`));
   }
 }
@@ -5095,21 +5063,21 @@ 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 N = new Function(`${names_1$2.default.self}`, `${names_1$2.default.scope}`, p)(this, this.scope.get());
-    if (this.scope.value(d, { ref: N }), N.errors = null, N.schema = e.schema, N.schemaEnv = e, e.$async && (N.$async = !0), this.opts.code.source === !0 && (N.source = { validateName: d, validateCode: $, scopeValues: o._values }), this.opts.unevaluated) {
-      const { props: R, items: v } = u;
+    if (this.scope.value(d, { ref: N }), N.errors = null, N.schema = e.schema, N.schemaEnv = e, e.$async && (N.$async = !0), this.opts.code.source === !0 && (N.source = { validateName: d, validateCode: g, scopeValues: o._values }), this.opts.unevaluated) {
+      const { props: R, items: T } = u;
       N.evaluated = {
         props: R instanceof codegen_1$m.Name ? void 0 : R,
-        items: v instanceof codegen_1$m.Name ? void 0 : v,
+        items: T instanceof codegen_1$m.Name ? void 0 : T,
         dynamicProps: R instanceof codegen_1$m.Name,
-        dynamicItems: v instanceof codegen_1$m.Name
+        dynamicItems: T instanceof codegen_1$m.Name
       }, N.source && (N.source.evaluated = (0, codegen_1$m.stringify)(N.evaluated));
     }
     return e.validate = N, 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);
   }
@@ -5226,13 +5194,13 @@ var uri$1 = {}, uri_all = { exports: {} };
     n(t);
   })(commonjsGlobal, function(r) {
     function n() {
-      for (var f = arguments.length, c = Array(f), _ = 0; _ < f; _++)
-        c[_] = arguments[_];
+      for (var f = arguments.length, c = Array(f), m = 0; m < f; m++)
+        c[m] = arguments[m];
       if (c.length > 1) {
         c[0] = c[0].slice(0, -1);
-        for (var E = c.length - 1, b = 1; b < E; ++b)
-          c[b] = c[b].slice(1, -1);
-        return c[E] = c[E].slice(1), c.join("");
+        for (var S = c.length - 1, E = 1; E < S; ++E)
+          c[E] = c[E].slice(1, -1);
+        return c[S] = c[S].slice(1), c.join("");
       } else
         return c[0];
     }
@@ -5249,20 +5217,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, c) {
-      var _ = f;
+      var m = f;
       if (c)
-        for (var E in c)
-          _[E] = c[E];
-      return _;
+        for (var S in c)
+          m[S] = c[S];
+      return m;
     }
     function u(f) {
-      var c = "[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)), U = "[\\:\\/\\?\\#\\[\\]\\@]", L = "[\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=]", J = n(U, L), Y = f ? "[\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]" : "[]", se = f ? "[\\uE000-\\uF8FF]" : "[]", B = n(c, _, "[\\-\\.\\_\\~]", Y);
-      s(c + n(c, _, "[\\+\\-\\.]") + "*"), s(s(b + "|" + n(B, L, "[\\:]")) + "*");
-      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), z = s(E + "{1,4}"), X = s(s(z + "\\:" + z) + "|" + ie), ae = s(s(z + "\\:") + "{6}" + X), ee = s("\\:\\:" + s(z + "\\:") + "{5}" + X), Se = s(s(z) + "?\\:\\:" + s(z + "\\:") + "{4}" + X), $e = s(s(s(z + "\\:") + "{0,1}" + z) + "?\\:\\:" + s(z + "\\:") + "{3}" + X), ge = s(s(s(z + "\\:") + "{0,2}" + z) + "?\\:\\:" + s(z + "\\:") + "{2}" + X), Be = s(s(s(z + "\\:") + "{0,3}" + z) + "?\\:\\:" + z + "\\:" + X), Ie = s(s(s(z + "\\:") + "{0,4}" + z) + "?\\:\\:" + X), fe = s(s(s(z + "\\:") + "{0,5}" + z) + "?\\:\\:" + z), ye = s(s(s(z + "\\:") + "{0,6}" + z) + "?\\:\\:"), je = s([ae, ee, Se, $e, ge, Be, Ie, fe, ye].join("|")), we = s(s(B + "|" + b) + "+");
-      s("[vV]" + E + "+\\." + n(B, L, "[\\:]") + "+"), s(s(b + "|" + n(B, L)) + "*");
-      var ct = s(b + "|" + n(B, L, "[\\:\\@]"));
-      return s(s(b + "|" + n(B, L, "[\\@]")) + "+"), s(s(ct + "|" + n("[\\/\\?]", se)) + "*"), {
-        NOT_SCHEME: new RegExp(n("[^]", c, _, "[\\+\\-\\.]"), "g"),
+      var c = "[A-Za-z]", m = "[0-9]", S = n(m, "[A-Fa-f]"), E = s(s("%[EFef]" + S + "%" + S + S + "%" + S + S) + "|" + s("%[89A-Fa-f]" + S + "%" + S + S) + "|" + s("%" + S + S)), U = "[\\:\\/\\?\\#\\[\\]\\@]", L = "[\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=]", J = n(U, L), Y = f ? "[\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]" : "[]", se = f ? "[\\uE000-\\uF8FF]" : "[]", B = n(c, m, "[\\-\\.\\_\\~]", Y);
+      s(c + n(c, m, "[\\+\\-\\.]") + "*"), s(s(E + "|" + n(B, L, "[\\:]")) + "*");
+      var Z = s(s("25[0-5]") + "|" + s("2[0-4]" + m) + "|" + s("1" + m + m) + "|" + s("0?[1-9]" + m) + "|0?0?" + m), ie = s(Z + "\\." + Z + "\\." + Z + "\\." + Z), z = s(S + "{1,4}"), X = s(s(z + "\\:" + z) + "|" + ie), ae = s(s(z + "\\:") + "{6}" + X), ee = s("\\:\\:" + s(z + "\\:") + "{5}" + X), Se = s(s(z) + "?\\:\\:" + s(z + "\\:") + "{4}" + X), ge = s(s(s(z + "\\:") + "{0,1}" + z) + "?\\:\\:" + s(z + "\\:") + "{3}" + X), $e = s(s(s(z + "\\:") + "{0,2}" + z) + "?\\:\\:" + s(z + "\\:") + "{2}" + X), Be = s(s(s(z + "\\:") + "{0,3}" + z) + "?\\:\\:" + z + "\\:" + X), Ie = s(s(s(z + "\\:") + "{0,4}" + z) + "?\\:\\:" + X), fe = s(s(s(z + "\\:") + "{0,5}" + z) + "?\\:\\:" + z), ye = s(s(s(z + "\\:") + "{0,6}" + z) + "?\\:\\:"), je = s([ae, ee, Se, ge, $e, Be, Ie, fe, ye].join("|")), we = s(s(B + "|" + E) + "+");
+      s("[vV]" + S + "+\\." + n(B, L, "[\\:]") + "+"), s(s(E + "|" + n(B, L)) + "*");
+      var ct = s(E + "|" + n(B, L, "[\\:\\@]"));
+      return s(s(E + "|" + n(B, L, "[\\@]")) + "+"), s(s(ct + "|" + n("[\\/\\?]", se)) + "*"), {
+        NOT_SCHEME: new RegExp(n("[^]", c, m, "[\\+\\-\\.]"), "g"),
         NOT_USERINFO: new RegExp(n("[^\\%\\:]", B, L), "g"),
         NOT_HOST: new RegExp(n("[^\\%\\[\\]\\:]", B, L), "g"),
         NOT_PATH: new RegExp(n("[^\\%\\/\\:\\@]", B, L), "g"),
@@ -5272,123 +5240,123 @@ var uri$1 = {}, uri_all = { exports: {} };
         ESCAPE: new RegExp(n("[^]", B, L), "g"),
         UNRESERVED: new RegExp(B, "g"),
         OTHER_CHARS: new RegExp(n("[^\\%]", B, J), "g"),
-        PCT_ENCODED: new RegExp(b, "g"),
+        PCT_ENCODED: new RegExp(E, "g"),
         IPV4ADDRESS: new RegExp("^(" + ie + ")$"),
-        IPV6ADDRESS: new RegExp("^\\[?(" + je + ")" + s(s("\\%25|\\%(?!" + E + "{2})") + "(" + we + ")") + "?\\]?$")
+        IPV6ADDRESS: new RegExp("^\\[?(" + je + ")" + s(s("\\%25|\\%(?!" + S + "{2})") + "(" + we + ")") + "?\\]?$")
         //RFC 6874, with relaxed parsing rules
       };
     }
-    var p = u(!1), $ = u(!0), O = function() {
-      function f(c, _) {
-        var E = [], b = !0, U = !1, L = void 0;
+    var p = u(!1), g = u(!0), O = function() {
+      function f(c, m) {
+        var S = [], E = !0, U = !1, L = void 0;
         try {
-          for (var J = c[Symbol.iterator](), Y; !(b = (Y = J.next()).done) && (E.push(Y.value), !(_ && E.length === _)); b = !0)
+          for (var J = c[Symbol.iterator](), Y; !(E = (Y = J.next()).done) && (S.push(Y.value), !(m && S.length === m)); E = !0)
             ;
         } catch (se) {
           U = !0, L = se;
         } finally {
           try {
-            !b && J.return && J.return();
+            !E && J.return && J.return();
           } finally {
             if (U)
               throw L;
           }
         }
-        return E;
+        return S;
       }
-      return function(c, _) {
+      return function(c, m) {
         if (Array.isArray(c))
           return c;
         if (Symbol.iterator in Object(c))
-          return f(c, _);
+          return f(c, m);
         throw new TypeError("Invalid attempt to destructure non-iterable instance");
       };
     }(), N = function(f) {
       if (Array.isArray(f)) {
-        for (var c = 0, _ = Array(f.length); c < f.length; c++)
-          _[c] = f[c];
-        return _;
+        for (var c = 0, m = Array(f.length); c < f.length; c++)
+          m[c] = f[c];
+        return m;
       } else
         return Array.from(f);
-    }, R = 2147483647, v = 36, g = 1, m = 26, T = 38, S = 700, I = 72, D = 128, w = "-", k = /^xn--/, A = /[^\0-\x7E]/, V = /[\x2E\u3002\uFF0E\uFF61]/g, x = {
+    }, R = 2147483647, T = 36, y = 1, _ = 26, $ = 38, P = 700, I = 72, D = 128, w = "-", k = /^xn--/, A = /[^\0-\x7E]/, V = /[\x2E\u3002\uFF0E\uFF61]/g, x = {
       overflow: "Overflow: input needs wider integers to process",
       "not-basic": "Illegal input >= 0x80 (not a basic code point)",
       "invalid-input": "Invalid input"
-    }, re = v - g, K = Math.floor, ue = String.fromCharCode;
+    }, re = T - y, K = Math.floor, ue = String.fromCharCode;
     function oe(f) {
       throw new RangeError(x[f]);
     }
     function ke(f, c) {
-      for (var _ = [], E = f.length; E--; )
-        _[E] = c(f[E]);
-      return _;
+      for (var m = [], S = f.length; S--; )
+        m[S] = c(f[S]);
+      return m;
     }
-    function Oe(f, c) {
-      var _ = f.split("@"), E = "";
-      _.length > 1 && (E = _[0] + "@", f = _[1]), f = f.replace(V, ".");
-      var b = f.split("."), U = ke(b, c).join(".");
-      return E + U;
+    function Ce(f, c) {
+      var m = f.split("@"), S = "";
+      m.length > 1 && (S = m[0] + "@", f = m[1]), f = f.replace(V, ".");
+      var E = f.split("."), U = ke(E, c).join(".");
+      return S + U;
     }
     function qe(f) {
-      for (var c = [], _ = 0, E = f.length; _ < E; ) {
-        var b = f.charCodeAt(_++);
-        if (b >= 55296 && b <= 56319 && _ < E) {
-          var U = f.charCodeAt(_++);
-          (U & 64512) == 56320 ? c.push(((b & 1023) << 10) + (U & 1023) + 65536) : (c.push(b), _--);
+      for (var c = [], m = 0, S = f.length; m < S; ) {
+        var E = f.charCodeAt(m++);
+        if (E >= 55296 && E <= 56319 && m < S) {
+          var U = f.charCodeAt(m++);
+          (U & 64512) == 56320 ? c.push(((E & 1023) << 10) + (U & 1023) + 65536) : (c.push(E), m--);
         } else
-          c.push(b);
+          c.push(E);
       }
       return c;
     }
     var et = function(c) {
       return String.fromCodePoint.apply(String, N(c));
     }, Ue = function(c) {
-      return c - 48 < 10 ? c - 22 : c - 65 < 26 ? c - 65 : c - 97 < 26 ? c - 97 : v;
-    }, F = function(c, _) {
-      return c + 22 + 75 * (c < 26) - ((_ != 0) << 5);
-    }, y = function(c, _, E) {
-      var b = 0;
+      return c - 48 < 10 ? c - 22 : c - 65 < 26 ? c - 65 : c - 97 < 26 ? c - 97 : T;
+    }, F = function(c, m) {
+      return c + 22 + 75 * (c < 26) - ((m != 0) << 5);
+    }, v = function(c, m, S) {
+      var E = 0;
       for (
-        c = E ? K(c / S) : c >> 1, c += K(c / _);
+        c = S ? K(c / P) : c >> 1, c += K(c / m);
         /* no initialization */
-        c > re * m >> 1;
-        b += v
+        c > re * _ >> 1;
+        E += T
       )
         c = K(c / re);
-      return K(b + (re + 1) * c / (c + T));
+      return K(E + (re + 1) * c / (c + $));
     }, j = function(c) {
-      var _ = [], E = c.length, b = 0, U = D, L = I, J = c.lastIndexOf(w);
+      var m = [], S = c.length, E = 0, U = D, L = I, J = c.lastIndexOf(w);
       J < 0 && (J = 0);
       for (var Y = 0; Y < J; ++Y)
-        c.charCodeAt(Y) >= 128 && oe("not-basic"), _.push(c.charCodeAt(Y));
-      for (var se = J > 0 ? J + 1 : 0; se < E; ) {
+        c.charCodeAt(Y) >= 128 && oe("not-basic"), m.push(c.charCodeAt(Y));
+      for (var se = J > 0 ? J + 1 : 0; se < S; ) {
         for (
-          var B = b, Z = 1, ie = v;
+          var B = E, Z = 1, ie = T;
           ;
           /* no condition */
-          ie += v
+          ie += T
         ) {
-          se >= E && oe("invalid-input");
+          se >= S && oe("invalid-input");
           var z = Ue(c.charCodeAt(se++));
-          (z >= v || z > K((R - b) / Z)) && oe("overflow"), b += z * Z;
-          var X = ie <= L ? g : ie >= L + m ? m : ie - L;
+          (z >= T || z > K((R - E) / Z)) && oe("overflow"), E += z * Z;
+          var X = ie <= L ? y : ie >= L + _ ? _ : ie - L;
           if (z < X)
             break;
-          var ae = v - X;
+          var ae = T - X;
           Z > K(R / ae) && oe("overflow"), Z *= ae;
         }
-        var ee = _.length + 1;
-        L = y(b - B, ee, B == 0), K(b / ee) > R - U && oe("overflow"), U += K(b / ee), b %= ee, _.splice(b++, 0, U);
+        var ee = m.length + 1;
+        L = v(E - B, ee, B == 0), K(E / ee) > R - U && oe("overflow"), U += K(E / ee), E %= ee, m.splice(E++, 0, U);
       }
-      return String.fromCodePoint.apply(String, _);
-    }, P = function(c) {
-      var _ = [];
+      return String.fromCodePoint.apply(String, m);
+    }, b = function(c) {
+      var m = [];
       c = qe(c);
-      var E = c.length, b = D, U = 0, L = I, J = !0, Y = !1, se = void 0;
+      var S = c.length, E = D, U = 0, L = I, J = !0, Y = !1, se = void 0;
       try {
         for (var B = c[Symbol.iterator](), Z; !(J = (Z = B.next()).done); J = !0) {
           var ie = Z.value;
-          ie < 128 && _.push(ue(ie));
+          ie < 128 && m.push(ue(ie));
         }
       } catch (lt) {
         Y = !0, se = lt;
@@ -5400,44 +5368,44 @@ var uri$1 = {}, uri_all = { exports: {} };
             throw se;
         }
       }
-      var z = _.length, X = z;
-      for (z && _.push(w); X < E; ) {
-        var ae = R, ee = !0, Se = !1, $e = void 0;
+      var z = m.length, X = z;
+      for (z && m.push(w); X < S; ) {
+        var ae = R, ee = !0, Se = !1, ge = void 0;
         try {
-          for (var ge = c[Symbol.iterator](), Be; !(ee = (Be = ge.next()).done); ee = !0) {
+          for (var $e = c[Symbol.iterator](), Be; !(ee = (Be = $e.next()).done); ee = !0) {
             var Ie = Be.value;
-            Ie >= b && Ie < ae && (ae = Ie);
+            Ie >= E && Ie < ae && (ae = Ie);
           }
         } catch (lt) {
-          Se = !0, $e = lt;
+          Se = !0, ge = lt;
         } finally {
           try {
-            !ee && ge.return && ge.return();
+            !ee && $e.return && $e.return();
           } finally {
             if (Se)
-              throw $e;
+              throw ge;
           }
         }
         var fe = X + 1;
-        ae - b > K((R - U) / fe) && oe("overflow"), U += (ae - b) * fe, b = ae;
+        ae - E > K((R - U) / fe) && oe("overflow"), U += (ae - E) * fe, E = ae;
         var ye = !0, je = !1, we = void 0;
         try {
           for (var ct = c[Symbol.iterator](), Lt; !(ye = (Lt = ct.next()).done); ye = !0) {
             var Ht = Lt.value;
-            if (Ht < b && ++U > R && oe("overflow"), Ht == b) {
+            if (Ht < E && ++U > R && oe("overflow"), Ht == E) {
               for (
-                var pt = U, ft = v;
+                var pt = U, ft = T;
                 ;
                 /* no condition */
-                ft += v
+                ft += T
               ) {
-                var ht = ft <= L ? g : ft >= L + m ? m : ft - L;
+                var ht = ft <= L ? y : ft >= L + _ ? _ : ft - L;
                 if (pt < ht)
                   break;
-                var Vt = pt - ht, zt = v - ht;
-                _.push(ue(F(ht + Vt % zt, 0))), pt = K(Vt / zt);
+                var Vt = pt - ht, zt = T - ht;
+                m.push(ue(F(ht + Vt % zt, 0))), pt = K(Vt / zt);
               }
-              _.push(ue(F(pt, 0))), L = y(U, fe, X == z), U = 0, ++X;
+              m.push(ue(F(pt, 0))), L = v(U, fe, X == z), U = 0, ++X;
             }
           }
         } catch (lt) {
@@ -5450,16 +5418,16 @@ var uri$1 = {}, uri_all = { exports: {} };
               throw we;
           }
         }
-        ++U, ++b;
+        ++U, ++E;
       }
-      return _.join("");
+      return m.join("");
     }, a = function(c) {
-      return Oe(c, function(_) {
-        return k.test(_) ? j(_.slice(4).toLowerCase()) : _;
+      return Ce(c, function(m) {
+        return k.test(m) ? j(m.slice(4).toLowerCase()) : m;
       });
     }, h = function(c) {
-      return Oe(c, function(_) {
-        return A.test(_) ? "xn--" + P(_) : _;
+      return Ce(c, function(m) {
+        return A.test(m) ? "xn--" + b(m) : m;
       });
     }, C = {
       /**
@@ -5480,56 +5448,56 @@ var uri$1 = {}, uri_all = { exports: {} };
         encode: et
       },
       decode: j,
-      encode: P,
+      encode: b,
       toASCII: h,
       toUnicode: a
     }, M = {};
     function q(f) {
-      var c = f.charCodeAt(0), _ = void 0;
-      return c < 16 ? _ = "%0" + c.toString(16).toUpperCase() : c < 128 ? _ = "%" + c.toString(16).toUpperCase() : c < 2048 ? _ = "%" + (c >> 6 | 192).toString(16).toUpperCase() + "%" + (c & 63 | 128).toString(16).toUpperCase() : _ = "%" + (c >> 12 | 224).toString(16).toUpperCase() + "%" + (c >> 6 & 63 | 128).toString(16).toUpperCase() + "%" + (c & 63 | 128).toString(16).toUpperCase(), _;
+      var c = f.charCodeAt(0), m = void 0;
+      return c < 16 ? m = "%0" + c.toString(16).toUpperCase() : c < 128 ? m = "%" + c.toString(16).toUpperCase() : c < 2048 ? m = "%" + (c >> 6 | 192).toString(16).toUpperCase() + "%" + (c & 63 | 128).toString(16).toUpperCase() : m = "%" + (c >> 12 | 224).toString(16).toUpperCase() + "%" + (c >> 6 & 63 | 128).toString(16).toUpperCase() + "%" + (c & 63 | 128).toString(16).toUpperCase(), m;
     }
     function W(f) {
-      for (var c = "", _ = 0, E = f.length; _ < E; ) {
-        var b = parseInt(f.substr(_ + 1, 2), 16);
-        if (b < 128)
-          c += String.fromCharCode(b), _ += 3;
-        else if (b >= 194 && b < 224) {
-          if (E - _ >= 6) {
-            var U = parseInt(f.substr(_ + 4, 2), 16);
-            c += String.fromCharCode((b & 31) << 6 | U & 63);
+      for (var c = "", m = 0, S = f.length; m < S; ) {
+        var E = parseInt(f.substr(m + 1, 2), 16);
+        if (E < 128)
+          c += String.fromCharCode(E), m += 3;
+        else if (E >= 194 && E < 224) {
+          if (S - m >= 6) {
+            var U = parseInt(f.substr(m + 4, 2), 16);
+            c += String.fromCharCode((E & 31) << 6 | U & 63);
           } else
-            c += f.substr(_, 6);
-          _ += 6;
-        } else if (b >= 224) {
-          if (E - _ >= 9) {
-            var L = parseInt(f.substr(_ + 4, 2), 16), J = parseInt(f.substr(_ + 7, 2), 16);
-            c += String.fromCharCode((b & 15) << 12 | (L & 63) << 6 | J & 63);
+            c += f.substr(m, 6);
+          m += 6;
+        } else if (E >= 224) {
+          if (S - m >= 9) {
+            var L = parseInt(f.substr(m + 4, 2), 16), J = parseInt(f.substr(m + 7, 2), 16);
+            c += String.fromCharCode((E & 15) << 12 | (L & 63) << 6 | J & 63);
           } else
-            c += f.substr(_, 9);
-          _ += 9;
+            c += f.substr(m, 9);
+          m += 9;
         } else
-          c += f.substr(_, 3), _ += 3;
+          c += f.substr(m, 3), m += 3;
       }
       return c;
     }
     function G(f, c) {
-      function _(E) {
-        var b = W(E);
-        return b.match(c.UNRESERVED) ? b : E;
+      function m(S) {
+        var E = W(S);
+        return E.match(c.UNRESERVED) ? E : S;
       }
-      return f.scheme && (f.scheme = String(f.scheme).replace(c.PCT_ENCODED, _).toLowerCase().replace(c.NOT_SCHEME, "")), f.userinfo !== void 0 && (f.userinfo = String(f.userinfo).replace(c.PCT_ENCODED, _).replace(c.NOT_USERINFO, q).replace(c.PCT_ENCODED, o)), f.host !== void 0 && (f.host = String(f.host).replace(c.PCT_ENCODED, _).toLowerCase().replace(c.NOT_HOST, q).replace(c.PCT_ENCODED, o)), f.path !== void 0 && (f.path = String(f.path).replace(c.PCT_ENCODED, _).replace(f.scheme ? c.NOT_PATH : c.NOT_PATH_NOSCHEME, q).replace(c.PCT_ENCODED, o)), f.query !== void 0 && (f.query = String(f.query).replace(c.PCT_ENCODED, _).replace(c.NOT_QUERY, q).replace(c.PCT_ENCODED, o)), f.fragment !== void 0 && (f.fragment = String(f.fragment).replace(c.PCT_ENCODED, _).replace(c.NOT_FRAGMENT, q).replace(c.PCT_ENCODED, o)), f;
+      return f.scheme && (f.scheme = String(f.scheme).replace(c.PCT_ENCODED, m).toLowerCase().replace(c.NOT_SCHEME, "")), f.userinfo !== void 0 && (f.userinfo = String(f.userinfo).replace(c.PCT_ENCODED, m).replace(c.NOT_USERINFO, q).replace(c.PCT_ENCODED, o)), f.host !== void 0 && (f.host = String(f.host).replace(c.PCT_ENCODED, m).toLowerCase().replace(c.NOT_HOST, q).replace(c.PCT_ENCODED, o)), f.path !== void 0 && (f.path = String(f.path).replace(c.PCT_ENCODED, m).replace(f.scheme ? c.NOT_PATH : c.NOT_PATH_NOSCHEME, q).replace(c.PCT_ENCODED, o)), f.query !== void 0 && (f.query = String(f.query).replace(c.PCT_ENCODED, m).replace(c.NOT_QUERY, q).replace(c.PCT_ENCODED, o)), f.fragment !== void 0 && (f.fragment = String(f.fragment).replace(c.PCT_ENCODED, m).replace(c.NOT_FRAGMENT, q).replace(c.PCT_ENCODED, o)), f;
     }
     function ne(f) {
       return f.replace(/^0*(.*)/, "$1") || "0";
     }
     function he(f, c) {
-      var _ = f.match(c.IPV4ADDRESS) || [], E = O(_, 2), b = E[1];
-      return b ? b.split(".").map(ne).join(".") : f;
+      var m = f.match(c.IPV4ADDRESS) || [], S = O(m, 2), E = S[1];
+      return E ? E.split(".").map(ne).join(".") : f;
     }
     function Le(f, c) {
-      var _ = f.match(c.IPV6ADDRESS) || [], E = O(_, 3), b = E[1], U = E[2];
-      if (b) {
-        for (var L = b.toLowerCase().split("::").reverse(), J = O(L, 2), Y = J[0], se = J[1], B = se ? se.split(":").map(ne) : [], Z = Y.split(":").map(ne), ie = c.IPV4ADDRESS.test(Z[Z.length - 1]), z = ie ? 7 : 8, X = Z.length - z, ae = Array(z), ee = 0; ee < z; ++ee)
+      var m = f.match(c.IPV6ADDRESS) || [], S = O(m, 3), E = S[1], U = S[2];
+      if (E) {
+        for (var L = E.toLowerCase().split("::").reverse(), J = O(L, 2), Y = J[0], se = J[1], B = se ? se.split(":").map(ne) : [], Z = Y.split(":").map(ne), ie = c.IPV4ADDRESS.test(Z[Z.length - 1]), z = ie ? 7 : 8, X = Z.length - z, ae = Array(z), ee = 0; ee < z; ++ee)
           ae[ee] = B[ee] || Z[X + ee] || "";
         ie && (ae[z - 1] = he(ae[z - 1], c));
         var Se = ae.reduce(function(fe, ye, je) {
@@ -5538,46 +5506,46 @@ var uri$1 = {}, uri_all = { exports: {} };
             we && we.index + we.length === je ? we.length++ : fe.push({ index: je, length: 1 });
           }
           return fe;
-        }, []), $e = Se.sort(function(fe, ye) {
+        }, []), ge = Se.sort(function(fe, ye) {
           return ye.length - fe.length;
-        })[0], ge = void 0;
-        if ($e && $e.length > 1) {
-          var Be = ae.slice(0, $e.index), Ie = ae.slice($e.index + $e.length);
-          ge = Be.join(":") + "::" + Ie.join(":");
+        })[0], $e = 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(":");
         } else
-          ge = ae.join(":");
-        return U && (ge += "%" + U), ge;
+          $e = ae.join(":");
+        return U && ($e += "%" + U), $e;
       } else
         return f;
     }
     var tt = /^(?:([^:\/?#]+):)?(?:\/\/((?:([^\/?#@]*)@)?(\[[^\/?#\]]+\]|[^\/?#:]*)(?:\:(\d*))?))?([^?#]*)(?:\?([^#]*))?(?:#((?:.|\n|\r)*))?/i, rt = "".match(/(){0}/)[1] === void 0;
     function de(f) {
-      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, _ = {}, E = c.iri !== !1 ? $ : p;
+      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = {}, S = c.iri !== !1 ? g : p;
       c.reference === "suffix" && (f = (c.scheme ? c.scheme + ":" : "") + "//" + f);
-      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 = Le(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", c.reference && c.reference !== "suffix" && c.reference !== _.reference && (_.error = _.error || "URI is not a " + c.reference + " reference.");
-        var U = M[(c.scheme || _.scheme || "").toLowerCase()];
+      var E = f.match(tt);
+      if (E) {
+        rt ? (m.scheme = E[1], m.userinfo = E[3], m.host = E[4], m.port = parseInt(E[5], 10), m.path = E[6] || "", m.query = E[7], m.fragment = E[8], isNaN(m.port) && (m.port = E[5])) : (m.scheme = E[1] || void 0, m.userinfo = f.indexOf("@") !== -1 ? E[3] : void 0, m.host = f.indexOf("//") !== -1 ? E[4] : void 0, m.port = parseInt(E[5], 10), m.path = E[6] || "", m.query = f.indexOf("?") !== -1 ? E[7] : void 0, m.fragment = f.indexOf("#") !== -1 ? E[8] : void 0, isNaN(m.port) && (m.port = f.match(/\/\/(?:.|\n)*\:(?:\/|\?|\#|$)/) ? E[4] : void 0)), m.host && (m.host = Le(he(m.host, S), S)), m.scheme === void 0 && m.userinfo === void 0 && m.host === void 0 && m.port === void 0 && !m.path && m.query === void 0 ? m.reference = "same-document" : m.scheme === void 0 ? m.reference = "relative" : m.fragment === void 0 ? m.reference = "absolute" : m.reference = "uri", c.reference && c.reference !== "suffix" && c.reference !== m.reference && (m.error = m.error || "URI is not a " + c.reference + " reference.");
+        var U = M[(c.scheme || m.scheme || "").toLowerCase()];
         if (!c.unicodeSupport && (!U || !U.unicodeSupport)) {
-          if (_.host && (c.domainHost || U && U.domainHost))
+          if (m.host && (c.domainHost || U && U.domainHost))
             try {
-              _.host = C.toASCII(_.host.replace(E.PCT_ENCODED, W).toLowerCase());
+              m.host = C.toASCII(m.host.replace(S.PCT_ENCODED, W).toLowerCase());
             } catch (L) {
-              _.error = _.error || "Host's domain name can not be converted to ASCII via punycode: " + L;
+              m.error = m.error || "Host's domain name can not be converted to ASCII via punycode: " + L;
             }
-          G(_, p);
+          G(m, p);
         } else
-          G(_, E);
-        U && U.parse && U.parse(_, c);
+          G(m, S);
+        U && U.parse && U.parse(m, c);
       } else
-        _.error = _.error || "URI can not be parsed.";
-      return _;
+        m.error = m.error || "URI can not be parsed.";
+      return m;
     }
     function nt(f, c) {
-      var _ = c.iri !== !1 ? $ : p, E = [];
-      return f.userinfo !== void 0 && (E.push(f.userinfo), E.push("@")), f.host !== void 0 && E.push(Le(he(String(f.host), _), _).replace(_.IPV6ADDRESS, function(b, U, L) {
+      var m = c.iri !== !1 ? g : p, S = [];
+      return f.userinfo !== void 0 && (S.push(f.userinfo), S.push("@")), f.host !== void 0 && S.push(Le(he(String(f.host), m), m).replace(m.IPV6ADDRESS, function(E, U, L) {
         return "[" + U + (L ? "%25" + L : "") + "]";
-      })), (typeof f.port == "number" || typeof f.port == "string") && (E.push(":"), E.push(String(f.port))), E.length ? E.join("") : void 0;
+      })), (typeof f.port == "number" || typeof f.port == "string") && (S.push(":"), S.push(String(f.port))), S.length ? S.join("") : void 0;
     }
     var He = /^\.\.?\//, Ve = /^\/\.(\/|$)/, ze = /^\/\.\.(\/|$)/, st = /^\/?(?:.|\n)*?(?=\/|$)/;
     function me(f) {
@@ -5591,62 +5559,62 @@ var uri$1 = {}, uri_all = { exports: {} };
         else if (f === "." || f === "..")
           f = "";
         else {
-          var _ = f.match(st);
-          if (_) {
-            var E = _[0];
-            f = f.slice(E.length), c.push(E);
+          var m = f.match(st);
+          if (m) {
+            var S = m[0];
+            f = f.slice(S.length), c.push(S);
           } else
             throw new Error("Unexpected dot segment condition");
         }
       return c.join("");
     }
     function le(f) {
-      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, _ = c.iri ? $ : p, E = [], b = M[(c.scheme || f.scheme || "").toLowerCase()];
-      if (b && b.serialize && b.serialize(f, c), f.host && !_.IPV6ADDRESS.test(f.host)) {
-        if (c.domainHost || b && b.domainHost)
+      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = c.iri ? g : p, S = [], E = M[(c.scheme || f.scheme || "").toLowerCase()];
+      if (E && E.serialize && E.serialize(f, c), f.host && !m.IPV6ADDRESS.test(f.host)) {
+        if (c.domainHost || E && E.domainHost)
           try {
-            f.host = c.iri ? C.toUnicode(f.host) : C.toASCII(f.host.replace(_.PCT_ENCODED, W).toLowerCase());
+            f.host = c.iri ? C.toUnicode(f.host) : C.toASCII(f.host.replace(m.PCT_ENCODED, W).toLowerCase());
           } catch (J) {
             f.error = f.error || "Host's domain name can not be converted to " + (c.iri ? "Unicode" : "ASCII") + " via punycode: " + J;
           }
       }
-      G(f, _), c.reference !== "suffix" && f.scheme && (E.push(f.scheme), E.push(":"));
+      G(f, m), c.reference !== "suffix" && f.scheme && (S.push(f.scheme), S.push(":"));
       var U = nt(f, c);
-      if (U !== void 0 && (c.reference !== "suffix" && E.push("//"), E.push(U), f.path && f.path.charAt(0) !== "/" && E.push("/")), f.path !== void 0) {
+      if (U !== void 0 && (c.reference !== "suffix" && S.push("//"), S.push(U), f.path && f.path.charAt(0) !== "/" && S.push("/")), f.path !== void 0) {
         var L = f.path;
-        !c.absolutePath && (!b || !b.absolutePath) && (L = me(L)), U === void 0 && (L = L.replace(/^\/\//, "/%2F")), E.push(L);
+        !c.absolutePath && (!E || !E.absolutePath) && (L = me(L)), U === void 0 && (L = L.replace(/^\/\//, "/%2F")), S.push(L);
       }
-      return f.query !== void 0 && (E.push("?"), E.push(f.query)), f.fragment !== void 0 && (E.push("#"), E.push(f.fragment)), E.join("");
+      return f.query !== void 0 && (S.push("?"), S.push(f.query)), f.fragment !== void 0 && (S.push("#"), S.push(f.fragment)), S.join("");
     }
     function xe(f, c) {
-      var _ = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, E = arguments[3], b = {};
-      return E || (f = de(le(f, _), _), c = de(le(c, _), _)), _ = _ || {}, !_.tolerant && c.scheme ? (b.scheme = c.scheme, b.userinfo = c.userinfo, b.host = c.host, b.port = c.port, b.path = me(c.path || ""), b.query = c.query) : (c.userinfo !== void 0 || c.host !== void 0 || c.port !== void 0 ? (b.userinfo = c.userinfo, b.host = c.host, b.port = c.port, b.path = me(c.path || ""), b.query = c.query) : (c.path ? (c.path.charAt(0) === "/" ? b.path = me(c.path) : ((f.userinfo !== void 0 || f.host !== void 0 || f.port !== void 0) && !f.path ? b.path = "/" + c.path : f.path ? b.path = f.path.slice(0, f.path.lastIndexOf("/") + 1) + c.path : b.path = c.path, b.path = me(b.path)), b.query = c.query) : (b.path = f.path, c.query !== void 0 ? b.query = c.query : b.query = f.query), b.userinfo = f.userinfo, b.host = f.host, b.port = f.port), b.scheme = f.scheme), b.fragment = c.fragment, b;
+      var m = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, S = arguments[3], E = {};
+      return S || (f = de(le(f, m), m), c = de(le(c, m), m)), m = m || {}, !m.tolerant && c.scheme ? (E.scheme = c.scheme, E.userinfo = c.userinfo, E.host = c.host, E.port = c.port, E.path = me(c.path || ""), E.query = c.query) : (c.userinfo !== void 0 || c.host !== void 0 || c.port !== void 0 ? (E.userinfo = c.userinfo, E.host = c.host, E.port = c.port, E.path = me(c.path || ""), E.query = c.query) : (c.path ? (c.path.charAt(0) === "/" ? E.path = me(c.path) : ((f.userinfo !== void 0 || f.host !== void 0 || f.port !== void 0) && !f.path ? E.path = "/" + c.path : f.path ? E.path = f.path.slice(0, f.path.lastIndexOf("/") + 1) + c.path : E.path = c.path, E.path = me(E.path)), E.query = c.query) : (E.path = f.path, c.query !== void 0 ? E.query = c.query : E.query = f.query), E.userinfo = f.userinfo, E.host = f.host, E.port = f.port), E.scheme = f.scheme), E.fragment = c.fragment, E;
     }
-    function it(f, c, _) {
-      var E = d({ scheme: "null" }, _);
-      return le(xe(de(f, E), de(c, E), E, !0), E);
+    function it(f, c, m) {
+      var S = d({ scheme: "null" }, m);
+      return le(xe(de(f, S), de(c, S), S, !0), S);
     }
-    function Ce(f, c) {
+    function Oe(f, c) {
       return typeof f == "string" ? f = le(de(f, c), c) : i(f) === "object" && (f = de(le(f, c), c)), f;
     }
-    function ot(f, c, _) {
-      return typeof f == "string" ? f = le(de(f, _), _) : i(f) === "object" && (f = le(f, _)), typeof c == "string" ? c = le(de(c, _), _) : i(c) === "object" && (c = le(c, _)), f === c;
+    function ot(f, c, m) {
+      return typeof f == "string" ? f = le(de(f, m), m) : i(f) === "object" && (f = le(f, m)), typeof c == "string" ? c = le(de(c, m), m) : i(c) === "object" && (c = le(c, m)), f === c;
     }
     function ut(f, c) {
-      return f && f.toString().replace(!c || !c.iri ? p.ESCAPE : $.ESCAPE, q);
+      return f && f.toString().replace(!c || !c.iri ? p.ESCAPE : g.ESCAPE, q);
     }
     function pe(f, c) {
-      return f && f.toString().replace(!c || !c.iri ? p.PCT_ENCODED : $.PCT_ENCODED, W);
+      return f && f.toString().replace(!c || !c.iri ? p.PCT_ENCODED : g.PCT_ENCODED, W);
     }
     var Ne = {
       scheme: "http",
       domainHost: !0,
-      parse: function(c, _) {
+      parse: function(c, m) {
         return c.host || (c.error = c.error || "HTTP URIs must have a host."), c;
       },
-      serialize: function(c, _) {
-        var E = String(c.scheme).toLowerCase() === "https";
-        return (c.port === (E ? 443 : 80) || c.port === "") && (c.port = void 0), c.path || (c.path = "/"), c;
+      serialize: function(c, m) {
+        var S = String(c.scheme).toLowerCase() === "https";
+        return (c.port === (S ? 443 : 80) || c.port === "") && (c.port = void 0), c.path || (c.path = "/"), c;
       }
     }, It = {
       scheme: "https",
@@ -5660,13 +5628,13 @@ var uri$1 = {}, uri_all = { exports: {} };
     var at = {
       scheme: "ws",
       domainHost: !0,
-      parse: function(c, _) {
-        var E = c;
-        return E.secure = jt(E), E.resourceName = (E.path || "/") + (E.query ? "?" + E.query : ""), E.path = void 0, E.query = void 0, E;
+      parse: function(c, m) {
+        var S = c;
+        return S.secure = jt(S), S.resourceName = (S.path || "/") + (S.query ? "?" + S.query : ""), S.path = void 0, S.query = void 0, S;
       },
-      serialize: function(c, _) {
+      serialize: function(c, m) {
         if ((c.port === (jt(c) ? 443 : 80) || c.port === "") && (c.port = void 0), typeof c.secure == "boolean" && (c.scheme = c.secure ? "wss" : "ws", c.secure = void 0), c.resourceName) {
-          var E = c.resourceName.split("?"), b = O(E, 2), U = b[0], L = b[1];
+          var S = c.resourceName.split("?"), E = O(S, 2), U = E[0], L = E[1];
           c.path = U && U !== "/" ? U : void 0, c.query = L, c.resourceName = void 0;
         }
         return c.fragment = void 0, c;
@@ -5677,100 +5645,100 @@ var uri$1 = {}, uri_all = { exports: {} };
       parse: at.parse,
       serialize: at.serialize
     }, ir = {}, Dt = "[A-Za-z0-9\\-\\.\\_\\~\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]", _e = "[0-9A-Fa-f]", or = s(s("%[EFef]" + _e + "%" + _e + _e + "%" + _e + _e) + "|" + s("%[89A-Fa-f]" + _e + "%" + _e + _e) + "|" + s("%" + _e + _e)), ar = "[A-Za-z0-9\\!\\$\\%\\'\\*\\+\\-\\^\\_\\`\\{\\|\\}\\~]", cr = "[\\!\\$\\%\\'\\(\\)\\*\\+\\,\\-\\.0-9\\<\\>A-Z\\x5E-\\x7E]", lr = n(cr, '[\\"\\\\]'), dr = "[\\!\\$\\'\\(\\)\\*\\+\\,\\;\\:\\@]", ur = new RegExp(Dt, "g"), We = new RegExp(or, "g"), pr = new RegExp(n("[^]", ar, "[\\.]", '[\\"]', lr), "g"), Ft = new RegExp(n("[^]", Dt, dr), "g"), fr = Ft;
-    function Ct(f) {
+    function Ot(f) {
       var c = W(f);
       return c.match(ur) ? c : f;
     }
     var Mt = {
       scheme: "mailto",
-      parse: function(c, _) {
-        var E = c, b = E.to = E.path ? E.path.split(",") : [];
-        if (E.path = void 0, E.query) {
-          for (var U = !1, L = {}, J = E.query.split("&"), Y = 0, se = J.length; Y < se; ++Y) {
+      parse: function(c, m) {
+        var S = c, E = S.to = S.path ? S.path.split(",") : [];
+        if (S.path = void 0, S.query) {
+          for (var U = !1, L = {}, J = S.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, z = Z.length; ie < z; ++ie)
-                  b.push(Z[ie]);
+                  E.push(Z[ie]);
                 break;
               case "subject":
-                E.subject = pe(B[1], _);
+                S.subject = pe(B[1], m);
                 break;
               case "body":
-                E.body = pe(B[1], _);
+                S.body = pe(B[1], m);
                 break;
               default:
-                U = !0, L[pe(B[0], _)] = pe(B[1], _);
+                U = !0, L[pe(B[0], m)] = pe(B[1], m);
                 break;
             }
           }
-          U && (E.headers = L);
+          U && (S.headers = L);
         }
-        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();
+        S.query = void 0;
+        for (var X = 0, ae = E.length; X < ae; ++X) {
+          var ee = E[X].split("@");
+          if (ee[0] = pe(ee[0]), m.unicodeSupport)
+            ee[1] = pe(ee[1], m).toLowerCase();
           else
             try {
-              ee[1] = C.toASCII(pe(ee[1], _).toLowerCase());
+              ee[1] = C.toASCII(pe(ee[1], m).toLowerCase());
             } catch (Se) {
-              E.error = E.error || "Email address's domain name can not be converted to ASCII via punycode: " + Se;
+              S.error = S.error || "Email address's domain name can not be converted to ASCII via punycode: " + Se;
             }
-          b[X] = ee.join("@");
+          E[X] = ee.join("@");
         }
-        return E;
+        return S;
       },
-      serialize: function(c, _) {
-        var E = c, b = l(c.to);
-        if (b) {
-          for (var U = 0, L = b.length; U < L; ++U) {
-            var J = String(b[U]), Y = J.lastIndexOf("@"), se = J.slice(0, Y).replace(We, Ct).replace(We, o).replace(pr, q), B = J.slice(Y + 1);
+      serialize: function(c, m) {
+        var S = c, E = l(c.to);
+        if (E) {
+          for (var U = 0, L = E.length; U < L; ++U) {
+            var J = String(E[U]), Y = J.lastIndexOf("@"), se = J.slice(0, Y).replace(We, Ot).replace(We, o).replace(pr, q), B = J.slice(Y + 1);
             try {
-              B = _.iri ? C.toUnicode(B) : C.toASCII(pe(B, _).toLowerCase());
+              B = m.iri ? C.toUnicode(B) : C.toASCII(pe(B, m).toLowerCase());
             } catch (X) {
-              E.error = E.error || "Email address's domain name can not be converted to " + (_.iri ? "Unicode" : "ASCII") + " via punycode: " + X;
+              S.error = S.error || "Email address's domain name can not be converted to " + (m.iri ? "Unicode" : "ASCII") + " via punycode: " + X;
             }
-            b[U] = se + "@" + B;
+            E[U] = se + "@" + B;
           }
-          E.path = b.join(",");
+          S.path = E.join(",");
         }
         var Z = c.headers = c.headers || {};
         c.subject && (Z.subject = c.subject), c.body && (Z.body = c.body);
         var ie = [];
         for (var z in Z)
-          Z[z] !== ir[z] && ie.push(z.replace(We, Ct).replace(We, o).replace(Ft, q) + "=" + Z[z].replace(We, Ct).replace(We, o).replace(fr, q));
-        return ie.length && (E.query = ie.join("&")), E;
+          Z[z] !== ir[z] && ie.push(z.replace(We, Ot).replace(We, o).replace(Ft, q) + "=" + Z[z].replace(We, Ot).replace(We, o).replace(fr, q));
+        return ie.length && (S.query = ie.join("&")), S;
       }
     }, hr = /^([^\:]+)\:(.*)/, qt = {
       scheme: "urn",
-      parse: function(c, _) {
-        var E = c.path && c.path.match(hr), b = c;
-        if (E) {
-          var U = _.scheme || b.scheme || "urn", L = E[1].toLowerCase(), J = E[2], Y = U + ":" + (_.nid || L), se = M[Y];
-          b.nid = L, b.nss = J, b.path = void 0, se && (b = se.parse(b, _));
+      parse: function(c, m) {
+        var S = c.path && c.path.match(hr), E = c;
+        if (S) {
+          var U = m.scheme || E.scheme || "urn", L = S[1].toLowerCase(), J = S[2], Y = U + ":" + (m.nid || L), se = M[Y];
+          E.nid = L, E.nss = J, E.path = void 0, se && (E = se.parse(E, m));
         } else
-          b.error = b.error || "URN can not be parsed.";
-        return b;
+          E.error = E.error || "URN can not be parsed.";
+        return E;
       },
-      serialize: function(c, _) {
-        var E = _.scheme || c.scheme || "urn", b = c.nid, U = E + ":" + (_.nid || b), L = M[U];
-        L && (c = L.serialize(c, _));
+      serialize: function(c, m) {
+        var S = m.scheme || c.scheme || "urn", E = c.nid, U = S + ":" + (m.nid || E), L = M[U];
+        L && (c = L.serialize(c, m));
         var J = c, Y = c.nss;
-        return J.path = (b || _.nid) + ":" + Y, J;
+        return J.path = (E || m.nid) + ":" + Y, J;
       }
     }, mr = /^[0-9A-Fa-f]{8}(?:\-[0-9A-Fa-f]{4}){3}\-[0-9A-Fa-f]{12}$/, Ut = {
       scheme: "urn:uuid",
-      parse: function(c, _) {
-        var E = c;
-        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;
+      parse: function(c, m) {
+        var S = c;
+        return S.uuid = S.nss, S.nss = void 0, !m.tolerant && (!S.uuid || !S.uuid.match(mr)) && (S.error = S.error || "UUID is not valid."), S;
       },
-      serialize: function(c, _) {
-        var E = c;
-        return E.nss = (c.uuid || "").toLowerCase(), E;
+      serialize: function(c, m) {
+        var S = c;
+        return S.nss = (c.uuid || "").toLowerCase(), S;
       }
     };
-    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[Ut.scheme] = Ut, r.SCHEMES = M, r.pctEncChar = q, r.pctDecChars = W, r.parse = de, r.removeDotSegments = me, r.serialize = le, r.resolveComponents = xe, r.resolve = it, r.normalize = Ce, 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[qt.scheme] = qt, M[Ut.scheme] = Ut, r.SCHEMES = M, r.pctEncChar = q, r.pctDecChars = W, r.parse = de, r.removeDotSegments = me, r.serialize = le, r.resolveComponents = xe, 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;
@@ -5798,9 +5766,9 @@ 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, l = codegen, d = resolve$1, u = dataType, p = util, $ = require$$9, O = uri$1, N = (F, y) => new RegExp(F, y);
+  const n = validation_error, s = ref_error, i = rules, o = compile, l = codegen, d = resolve$1, u = dataType, p = util, g = require$$9, O = uri$1, N = (F, v) => new RegExp(F, v);
   N.code = "new RegExp";
-  const R = ["removeAdditional", "useDefaults", "coerceTypes"], v = /* @__PURE__ */ new Set([
+  const R = ["removeAdditional", "useDefaults", "coerceTypes"], T = /* @__PURE__ */ new Set([
     "validate",
     "serialize",
     "parse",
@@ -5814,7 +5782,7 @@ uri$1.default = uri;
     "func",
     "obj",
     "Error"
-  ]), g = {
+  ]), y = {
     errorDataPath: "",
     format: "`validateFormats: false` can be used instead.",
     nullable: '"nullable" keyword is supported by default.',
@@ -5830,23 +5798,23 @@ uri$1.default = uri;
     cache: "Map is used as cache, schema object as key.",
     serialize: "Map is used as cache, schema object as key.",
     ajvErrors: "It is default now."
-  }, m = {
+  }, _ = {
     ignoreKeywordsWithRef: "",
     jsPropertySyntax: "",
     unicode: '"minLength"/"maxLength" account for unicode characters by default.'
-  }, T = 200;
-  function S(F) {
-    var y, j, P, a, h, C, M, q, W, G, ne, he, Le, tt, rt, de, nt, He, Ve, ze, st, me, le, xe, it;
-    const Ce = 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 : N, Ne = (a = F.uriResolver) !== null && a !== void 0 ? a : O.default;
+  }, $ = 200;
+  function P(F) {
+    var v, j, b, a, h, C, M, q, W, G, ne, he, Le, tt, rt, de, nt, He, Ve, ze, st, me, le, xe, it;
+    const Oe = F.strict, ot = (v = F.code) === null || v === void 0 ? void 0 : v.optimize, ut = ot === !0 || ot === void 0 ? 1 : ot || 0, pe = (b = (j = F.code) === null || j === void 0 ? void 0 : j.regExp) !== null && b !== void 0 ? b : N, Ne = (a = F.uriResolver) !== null && a !== void 0 ? a : O.default;
     return {
-      strictSchema: (C = (h = F.strictSchema) !== null && h !== void 0 ? h : Ce) !== null && C !== void 0 ? C : !0,
-      strictNumbers: (q = (M = F.strictNumbers) !== null && M !== void 0 ? M : Ce) !== null && q !== void 0 ? q : !0,
-      strictTypes: (G = (W = F.strictTypes) !== null && W !== void 0 ? W : Ce) !== null && G !== void 0 ? G : "log",
-      strictTuples: (he = (ne = F.strictTuples) !== null && ne !== void 0 ? ne : Ce) !== null && he !== void 0 ? he : "log",
-      strictRequired: (tt = (Le = F.strictRequired) !== null && Le !== void 0 ? Le : Ce) !== null && tt !== void 0 ? tt : !1,
+      strictSchema: (C = (h = F.strictSchema) !== null && h !== void 0 ? h : Oe) !== null && C !== void 0 ? C : !0,
+      strictNumbers: (q = (M = F.strictNumbers) !== null && M !== void 0 ? M : Oe) !== null && q !== void 0 ? q : !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 = (Le = F.strictRequired) !== null && Le !== void 0 ? Le : Oe) !== null && tt !== void 0 ? tt : !1,
       code: F.code ? { ...F.code, optimize: ut, regExp: pe } : { optimize: ut, regExp: pe },
-      loopRequired: (rt = F.loopRequired) !== null && rt !== void 0 ? rt : T,
-      loopEnum: (de = F.loopEnum) !== null && de !== void 0 ? de : T,
+      loopRequired: (rt = F.loopRequired) !== null && rt !== void 0 ? rt : $,
+      loopEnum: (de = F.loopEnum) !== null && de !== void 0 ? de : $,
       meta: (nt = F.meta) !== null && nt !== void 0 ? nt : !0,
       messages: (He = F.messages) !== null && He !== void 0 ? He : !0,
       inlineRefs: (Ve = F.inlineRefs) !== null && Ve !== void 0 ? Ve : !0,
@@ -5860,44 +5828,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) };
-      const { es5: j, lines: P } = this.opts.code;
-      this.scope = new l.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, g, y, "NOT SUPPORTED"), D.call(this, m, y, "DEPRECATED", "warn"), this._metaOpts = x.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), k.call(this), y.validateFormats = a;
+    constructor(v = {}) {
+      this.schemas = {}, this.refs = {}, this.formats = {}, this._compilations = /* @__PURE__ */ new Set(), this._loading = {}, this._cache = /* @__PURE__ */ new Map(), v = this.opts = { ...v, ...P(v) };
+      const { es5: j, lines: b } = this.opts.code;
+      this.scope = new l.ValueScope({ scope: {}, prefixes: T, es5: j, lines: b }), this.logger = K(v.logger);
+      const a = v.validateFormats;
+      v.validateFormats = !1, this.RULES = (0, i.getRules)(), D.call(this, y, v, "NOT SUPPORTED"), D.call(this, _, v, "DEPRECATED", "warn"), this._metaOpts = x.call(this), v.formats && A.call(this), this._addVocabularies(), this._addDefaultMetaSchema(), v.keywords && V.call(this, v.keywords), typeof v.meta == "object" && this.addMetaSchema(v.meta), k.call(this), v.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: v, meta: j, schemaId: b } = this.opts;
+      let a = g;
+      b === "id" && (a = { ...g }, a.id = a.$id, delete a.$id), j && v && this.addMetaSchema(a, a[b], !1);
     }
     defaultMeta() {
-      const { meta: y, schemaId: j } = this.opts;
-      return this.opts.defaultMeta = typeof y == "object" ? y[j] || y : void 0;
-    }
-    validate(y, j) {
-      let P;
-      if (typeof y == "string") {
-        if (P = this.getSchema(y), !P)
-          throw new Error(`no schema with key or ref "${y}"`);
+      const { meta: v, schemaId: j } = this.opts;
+      return this.opts.defaultMeta = typeof v == "object" ? v[j] || v : void 0;
+    }
+    validate(v, j) {
+      let b;
+      if (typeof v == "string") {
+        if (b = this.getSchema(v), !b)
+          throw new Error(`no schema with key or ref "${v}"`);
       } else
-        P = this.compile(y);
-      const a = P(j);
-      return "$async" in P || (this.errors = P.errors), a;
+        b = this.compile(v);
+      const a = b(j);
+      return "$async" in b || (this.errors = b.errors), a;
     }
-    compile(y, j) {
-      const P = this._addSchema(y, j);
-      return P.validate || this._compileSchemaEnv(P);
+    compile(v, j) {
+      const b = this._addSchema(v, j);
+      return b.validate || this._compileSchemaEnv(b);
     }
-    compileAsync(y, j) {
+    compileAsync(v, 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);
+      const { loadSchema: b } = this.opts;
+      return a.call(this, v, j);
       async function a(G, ne) {
         await h.call(this, G.$schema);
         const he = this._addSchema(G, ne);
@@ -5928,42 +5896,42 @@ uri$1.default = uri;
         if (ne)
           return ne;
         try {
-          return await (this._loading[G] = P(G));
+          return await (this._loading[G] = b(G));
         } finally {
           delete this._loading[G];
         }
       }
     }
     // Adds schema to the instance
-    addSchema(y, j, P, a = this.opts.validateSchema) {
-      if (Array.isArray(y)) {
-        for (const C of y)
-          this.addSchema(C, void 0, P, a);
+    addSchema(v, j, b, a = this.opts.validateSchema) {
+      if (Array.isArray(v)) {
+        for (const C of v)
+          this.addSchema(C, void 0, b, a);
         return this;
       }
       let h;
-      if (typeof y == "object") {
+      if (typeof v == "object") {
         const { schemaId: C } = this.opts;
-        if (h = y[C], h !== void 0 && typeof h != "string")
+        if (h = v[C], h !== void 0 && typeof h != "string")
           throw new Error(`schema ${C} 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(v, b, 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(v, j, b = this.opts.validateSchema) {
+      return this.addSchema(v, j, !0, b), this;
     }
     //  Validate schema against its meta-schema
-    validateSchema(y, j) {
-      if (typeof y == "boolean")
+    validateSchema(v, j) {
+      if (typeof v == "boolean")
         return !0;
-      let P;
-      if (P = y.$schema, P !== void 0 && typeof P != "string")
+      let b;
+      if (b = v.$schema, b !== void 0 && typeof b != "string")
         throw new Error("$schema must be a string");
-      if (P = P || this.opts.defaultMeta || this.defaultMeta(), !P)
+      if (b = b || this.opts.defaultMeta || this.defaultMeta(), !b)
         return this.logger.warn("meta-schema not available"), this.errors = null, !0;
-      const a = this.validate(P, y);
+      const a = this.validate(b, v);
       if (!a && j) {
         const h = "schema is invalid: " + this.errorsText();
         if (this.opts.validateSchema === "log")
@@ -5975,15 +5943,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(v) {
       let j;
-      for (; typeof (j = w.call(this, y)) == "string"; )
-        y = j;
+      for (; typeof (j = w.call(this, v)) == "string"; )
+        v = 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)
+        const { schemaId: b } = this.opts, a = new o.SchemaEnv({ schema: {}, schemaId: b });
+        if (j = o.resolveSchema.call(this, a, v), !j)
           return;
-        this.refs[y] = j;
+        this.refs[v] = j;
       }
       return j.validate || this._compileSchemaEnv(j);
     }
@@ -5991,138 +5959,138 @@ 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(v) {
+      if (v instanceof RegExp)
+        return this._removeAllSchemas(this.schemas, v), this._removeAllSchemas(this.refs, v), this;
+      switch (typeof v) {
         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, v);
+          return typeof j == "object" && this._cache.delete(j.schema), delete this.schemas[v], delete this.refs[v], this;
         }
         case "object": {
-          const j = y;
+          const j = v;
           this._cache.delete(j);
-          let P = y[this.opts.schemaId];
-          return P && (P = (0, d.normalizeId)(P), delete this.schemas[P], delete this.refs[P]), this;
+          let b = v[this.opts.schemaId];
+          return b && (b = (0, d.normalizeId)(b), delete this.schemas[b], delete this.refs[b]), this;
         }
         default:
           throw new Error("ajv.removeSchema: invalid parameter");
       }
     }
     // add "vocabulary" - a collection of keywords
-    addVocabulary(y) {
-      for (const j of y)
+    addVocabulary(v) {
+      for (const j of v)
         this.addKeyword(j);
       return this;
     }
-    addKeyword(y, 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)
+    addKeyword(v, j) {
+      let b;
+      if (typeof v == "string")
+        b = v, typeof j == "object" && (this.logger.warn("these parameters are deprecated, see docs for addKeyword"), j.keyword = b);
+      else if (typeof v == "object" && j === void 0) {
+        if (j = v, b = j.keyword, Array.isArray(b) && !b.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;
+      if (oe.call(this, b, j), !j)
+        return (0, p.eachItem)(b, (h) => ke.call(this, h)), this;
       qe.call(this, j);
       const a = {
         ...j,
         type: (0, u.getJSONTypes)(j.type),
         schemaType: (0, u.getJSONTypes)(j.schemaType)
       };
-      return (0, p.eachItem)(P, a.type.length === 0 ? (h) => ke.call(this, h, a) : (h) => a.type.forEach((C) => ke.call(this, h, a, C))), this;
+      return (0, p.eachItem)(b, a.type.length === 0 ? (h) => ke.call(this, h, a) : (h) => a.type.forEach((C) => ke.call(this, h, a, C))), this;
     }
-    getKeyword(y) {
-      const j = this.RULES.all[y];
+    getKeyword(v) {
+      const j = this.RULES.all[v];
       return typeof j == "object" ? j.definition : !!j;
     }
     // Remove keyword
-    removeKeyword(y) {
+    removeKeyword(v) {
       const { RULES: j } = this;
-      delete j.keywords[y], delete j.all[y];
-      for (const P of j.rules) {
-        const a = P.rules.findIndex((h) => h.keyword === y);
-        a >= 0 && P.rules.splice(a, 1);
+      delete j.keywords[v], delete j.all[v];
+      for (const b of j.rules) {
+        const a = b.rules.findIndex((h) => h.keyword === v);
+        a >= 0 && b.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(v, j) {
+      return typeof j == "string" && (j = new RegExp(j)), this.formats[v] = 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(v = this.errors, { separator: j = ", ", dataVar: b = "data" } = {}) {
+      return !v || v.length === 0 ? "No errors" : v.map((a) => `${b}${a.instancePath} ${a.message}`).reduce((a, h) => a + j + h);
     }
-    $dataMetaSchema(y, j) {
-      const P = this.RULES.all;
-      y = JSON.parse(JSON.stringify(y));
+    $dataMetaSchema(v, j) {
+      const b = this.RULES.all;
+      v = JSON.parse(JSON.stringify(v));
       for (const a of j) {
         const h = a.split("/").slice(1);
-        let C = y;
+        let C = v;
         for (const M of h)
           C = C[M];
-        for (const M in P) {
-          const q = P[M];
+        for (const M in b) {
+          const q = b[M];
           if (typeof q != "object")
             continue;
           const { $data: W } = q.definition, G = C[M];
           W && G && (C[M] = Ue(G));
         }
       }
-      return y;
+      return v;
     }
-    _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(v, j) {
+      for (const b in v) {
+        const a = v[b];
+        (!j || j.test(b)) && (typeof a == "string" ? delete v[b] : a && !a.meta && (this._cache.delete(a.schema), delete v[b]));
       }
     }
-    _addSchema(y, j, P, a = this.opts.validateSchema, h = this.opts.addUsedSchema) {
+    _addSchema(v, j, b, a = this.opts.validateSchema, h = this.opts.addUsedSchema) {
       let C;
       const { schemaId: M } = this.opts;
-      if (typeof y == "object")
-        C = y[M];
+      if (typeof v == "object")
+        C = v[M];
       else {
         if (this.opts.jtd)
           throw new Error("schema must be object");
-        if (typeof y != "boolean")
+        if (typeof v != "boolean")
           throw new Error("schema must be object or boolean");
       }
-      let q = this._cache.get(y);
+      let q = this._cache.get(v);
       if (q !== void 0)
         return q;
-      P = (0, d.normalizeId)(C || 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;
+      b = (0, d.normalizeId)(C || b);
+      const W = d.getSchemaRefs.call(this, v, b);
+      return q = new o.SchemaEnv({ schema: v, schemaId: M, meta: j, baseId: b, localRefs: W }), this._cache.set(q.schema, q), h && !b.startsWith("#") && (b && this._checkUnique(b), this.refs[b] = q), a && this.validateSchema(v, !0), q;
     }
-    _checkUnique(y) {
-      if (this.schemas[y] || this.refs[y])
-        throw new Error(`schema with key or id "${y}" already exists`);
+    _checkUnique(v) {
+      if (this.schemas[v] || this.refs[v])
+        throw new Error(`schema with key or id "${v}" already exists`);
     }
-    _compileSchemaEnv(y) {
-      if (y.meta ? this._compileMetaSchema(y) : o.compileSchema.call(this, y), !y.validate)
+    _compileSchemaEnv(v) {
+      if (v.meta ? this._compileMetaSchema(v) : o.compileSchema.call(this, v), !v.validate)
         throw new Error("ajv implementation error");
-      return y.validate;
+      return v.validate;
     }
-    _compileMetaSchema(y) {
+    _compileMetaSchema(v) {
       const j = this.opts;
       this.opts = this._metaOpts;
       try {
-        o.compileSchema.call(this, y);
+        o.compileSchema.call(this, v);
       } 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, v, j, b = "error") {
     for (const a in F) {
       const h = a;
-      h in y && this.logger[P](`${j}: option ${a}. ${F[h]}`);
+      h in v && this.logger[b](`${j}: option ${a}. ${F[h]}`);
     }
   }
   function w(F) {
@@ -6134,13 +6102,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 v in F)
+          this.addSchema(F[v], v);
   }
   function A() {
     for (const F in this.opts.formats) {
-      const y = this.opts.formats[F];
-      y && this.addFormat(F, y);
+      const v = this.opts.formats[F];
+      v && this.addFormat(F, v);
     }
   }
   function V(F) {
@@ -6149,15 +6117,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 v in F) {
+      const j = F[v];
+      j.keyword || (j.keyword = v), this.addKeyword(j);
     }
   }
   function x() {
     const F = { ...this.opts };
-    for (const y of R)
-      delete F[y];
+    for (const v of R)
+      delete F[v];
     return F;
   }
   const re = { log() {
@@ -6174,42 +6142,42 @@ 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, v) {
     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))
+    if ((0, p.eachItem)(F, (b) => {
+      if (j.keywords[b])
+        throw new Error(`Keyword ${b} is already defined`);
+      if (!ue.test(b))
+        throw new Error(`Keyword ${b} has invalid name`);
+    }), !!v && v.$data && !("code" in v || "validate" in v))
       throw new Error('$data keyword must have "code" or "validate" function');
   }
-  function ke(F, y, j) {
-    var P;
-    const a = y == null ? void 0 : y.post;
+  function ke(F, v, j) {
+    var b;
+    const a = v == null ? void 0 : v.post;
     if (j && a)
       throw new Error('keyword with "post" flag cannot have "type"');
     const { RULES: h } = this;
     let C = a ? h.post : h.rules.find(({ type: q }) => q === j);
-    if (C || (C = { type: j, rules: [] }, h.rules.push(C)), h.keywords[F] = !0, !y)
+    if (C || (C = { type: j, rules: [] }, h.rules.push(C)), h.keywords[F] = !0, !v)
       return;
     const M = {
       keyword: F,
       definition: {
-        ...y,
-        type: (0, u.getJSONTypes)(y.type),
-        schemaType: (0, u.getJSONTypes)(y.schemaType)
+        ...v,
+        type: (0, u.getJSONTypes)(v.type),
+        schemaType: (0, u.getJSONTypes)(v.schemaType)
       }
     };
-    y.before ? Oe.call(this, C, M, y.before) : C.rules.push(M), h.all[F] = M, (P = y.implements) === null || P === void 0 || P.forEach((q) => this.addKeyword(q));
+    v.before ? Ce.call(this, C, M, v.before) : C.rules.push(M), h.all[F] = M, (b = v.implements) === null || b === void 0 || b.forEach((q) => this.addKeyword(q));
   }
-  function Oe(F, y, 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`));
+  function Ce(F, v, j) {
+    const b = F.rules.findIndex((a) => a.keyword === j);
+    b >= 0 ? F.rules.splice(b, 0, v) : (F.rules.push(v), this.logger.warn(`rule ${j} is not defined`));
   }
   function qe(F) {
-    let { metaSchema: y } = F;
-    y !== void 0 && (F.$data && this.opts.$data && (y = Ue(y)), F.validateSchema = this.compile(y, !0));
+    let { metaSchema: v } = F;
+    v !== void 0 && (F.$data && this.opts.$data && (v = Ue(v)), F.validateSchema = this.compile(v, !0));
   }
   const et = {
     $ref: "https://raw.githubusercontent.com/ajv-validator/ajv/master/lib/refs/data.json#"
@@ -6236,32 +6204,32 @@ 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: l, 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 O(p);
     return N(p);
-    function $() {
+    function g() {
       if (i === u)
         return callRef(e, o, i, i.$async);
       const R = t.scopeValue("root", { ref: u });
       return callRef(e, (0, codegen_1$l._)`${R}.validate`, u, u.$async);
     }
     function O(R) {
-      const v = getValidate(e, R);
-      callRef(e, v, R, R.$async);
+      const T = getValidate(e, R);
+      callRef(e, T, R, R.$async);
     }
     function N(R) {
-      const v = t.scopeValue("schema", l.code.source === !0 ? { ref: R, code: (0, codegen_1$l.stringify)(R) } : { ref: R }), g = t.name("valid"), m = e.subschema({
+      const T = t.scopeValue("schema", l.code.source === !0 ? { ref: R, code: (0, codegen_1$l.stringify)(R) } : { ref: R }), y = t.name("valid"), _ = e.subschema({
         schema: R,
         dataTypes: [],
         schemaPath: codegen_1$l.nil,
-        topSchemaRef: v,
+        topSchemaRef: T,
         errSchemaPath: r
-      }, g);
-      e.mergeEvaluated(m), e.ok(g);
+      }, y);
+      e.mergeEvaluated(_), e.ok(y);
     }
   }
 };
@@ -6272,42 +6240,42 @@ function getValidate(e, t) {
 ref.getValidate = getValidate;
 function callRef(e, t, r, n) {
   const { gen: s, it: i } = e, { allErrors: o, schemaEnv: l, opts: d } = i, u = d.passContext ? names_1$1.default.this : codegen_1$l.nil;
-  n ? p() : $();
+  n ? p() : g();
   function p() {
     if (!l.$async)
       throw new Error("async schema referenced by sync schema");
     const R = s.let("valid");
     s.try(() => {
       s.code((0, codegen_1$l._)`await ${(0, code_1$8.callValidateCode)(e, t, u)}`), N(t), o || s.assign(R, !0);
-    }, (v) => {
-      s.if((0, codegen_1$l._)`!(${v} instanceof ${i.ValidationError})`, () => s.throw(v)), O(v), o || s.assign(R, !1);
+    }, (T) => {
+      s.if((0, codegen_1$l._)`!(${T} instanceof ${i.ValidationError})`, () => s.throw(T)), O(T), o || s.assign(R, !1);
     }), e.ok(R);
   }
-  function $() {
+  function g() {
     e.result((0, code_1$8.callValidateCode)(e, t, u), () => N(t), () => O(t));
   }
   function O(R) {
-    const v = (0, codegen_1$l._)`${R}.errors`;
-    s.assign(names_1$1.default.vErrors, (0, codegen_1$l._)`${names_1$1.default.vErrors} === null ? ${v} : ${names_1$1.default.vErrors}.concat(${v})`), s.assign(names_1$1.default.errors, (0, codegen_1$l._)`${names_1$1.default.vErrors}.length`);
+    const T = (0, codegen_1$l._)`${R}.errors`;
+    s.assign(names_1$1.default.vErrors, (0, codegen_1$l._)`${names_1$1.default.vErrors} === null ? ${T} : ${names_1$1.default.vErrors}.concat(${T})`), s.assign(names_1$1.default.errors, (0, codegen_1$l._)`${names_1$1.default.vErrors}.length`);
   }
   function N(R) {
-    var v;
+    var T;
     if (!i.opts.unevaluated)
       return;
-    const g = (v = r == null ? void 0 : r.validate) === null || v === void 0 ? void 0 : v.evaluated;
+    const y = (T = r == null ? void 0 : r.validate) === null || T === void 0 ? void 0 : T.evaluated;
     if (i.props !== !0)
-      if (g && !g.dynamicProps)
-        g.props !== void 0 && (i.props = util_1$j.mergeEvaluated.props(s, g.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._)`${R}.evaluated.props`);
-        i.props = util_1$j.mergeEvaluated.props(s, m, i.props, codegen_1$l.Name);
+        const _ = s.var("props", (0, codegen_1$l._)`${R}.evaluated.props`);
+        i.props = util_1$j.mergeEvaluated.props(s, _, i.props, codegen_1$l.Name);
       }
     if (i.items !== !0)
-      if (g && !g.dynamicItems)
-        g.items !== void 0 && (i.items = util_1$j.mergeEvaluated.items(s, g.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._)`${R}.evaluated.items`);
-        i.items = util_1$j.mergeEvaluated.items(s, m, i.items, codegen_1$l.Name);
+        const _ = s.var("items", (0, codegen_1$l._)`${R}.evaluated.items`);
+        i.items = util_1$j.mergeEvaluated.items(s, _, i.items, codegen_1$l.Name);
       }
   }
 }
@@ -6449,15 +6417,15 @@ const code_1$6 = code, codegen_1$f = codegen, util_1$h = util, error$d = {
     const d = r.length >= l.loopRequired;
     if (o.allErrors ? u() : p(), l.strictRequired) {
       const N = e.parentSchema.properties, { definedProperties: R } = e.it;
-      for (const v of r)
-        if ((N == null ? void 0 : N[v]) === void 0 && !R.has(v)) {
-          const g = o.schemaEnv.baseId + o.errSchemaPath, m = `required property "${v}" is not defined at "${g}" (strictRequired)`;
-          (0, util_1$h.checkStrictMode)(o, m, o.opts.strictRequired);
+      for (const T of r)
+        if ((N == null ? void 0 : N[T]) === void 0 && !R.has(T)) {
+          const y = o.schemaEnv.baseId + o.errSchemaPath, _ = `required property "${T}" is not defined at "${y}" (strictRequired)`;
+          (0, util_1$h.checkStrictMode)(o, _, 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 N of r)
           (0, code_1$6.checkReportMissingProp)(e, N);
@@ -6470,7 +6438,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, N)), (0, code_1$6.reportMissingProp)(e, N), t.else();
     }
-    function $() {
+    function g() {
       t.forOf("prop", n, (N) => {
         e.setParams({ missingProperty: N }), t.if((0, code_1$6.noPropertyInData)(t, s, N, l.ownProperties), () => e.error());
       });
@@ -6527,24 +6495,24 @@ const dataType_1 = dataType, codegen_1$d = codegen, util_1$g = util, equal_1$2 =
     const d = t.let("valid"), u = i.items ? (0, dataType_1.getSchemaTypes)(i.items) : [];
     e.block$data(d, p, (0, codegen_1$d._)`${o} === false`), e.ok(d);
     function p() {
-      const R = t.let("i", (0, codegen_1$d._)`${r}.length`), v = t.let("j");
-      e.setParams({ i: R, j: v }), t.assign(d, !0), t.if((0, codegen_1$d._)`${R} > 1`, () => ($() ? O : N)(R, v));
+      const R = t.let("i", (0, codegen_1$d._)`${r}.length`), T = t.let("j");
+      e.setParams({ i: R, j: T }), t.assign(d, !0), t.if((0, codegen_1$d._)`${R} > 1`, () => (g() ? O : N)(R, T));
     }
-    function $() {
+    function g() {
       return u.length > 0 && !u.some((R) => R === "object" || R === "array");
     }
-    function O(R, v) {
-      const g = t.name("item"), m = (0, dataType_1.checkDataTypes)(u, g, l.opts.strictNumbers, dataType_1.DataType.Wrong), T = t.const("indices", (0, codegen_1$d._)`{}`);
+    function O(R, T) {
+      const y = t.name("item"), _ = (0, dataType_1.checkDataTypes)(u, y, l.opts.strictNumbers, dataType_1.DataType.Wrong), $ = t.const("indices", (0, codegen_1$d._)`{}`);
       t.for((0, codegen_1$d._)`;${R}--;`, () => {
-        t.let(g, (0, codegen_1$d._)`${r}[${R}]`), t.if(m, (0, codegen_1$d._)`continue`), u.length > 1 && t.if((0, codegen_1$d._)`typeof ${g} == "string"`, (0, codegen_1$d._)`${g} += "_"`), t.if((0, codegen_1$d._)`typeof ${T}[${g}] == "number"`, () => {
-          t.assign(v, (0, codegen_1$d._)`${T}[${g}]`), e.error(), t.assign(d, !1).break();
-        }).code((0, codegen_1$d._)`${T}[${g}] = ${R}`);
+        t.let(y, (0, codegen_1$d._)`${r}[${R}]`), t.if(_, (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 ${$}[${y}] == "number"`, () => {
+          t.assign(T, (0, codegen_1$d._)`${$}[${y}]`), e.error(), t.assign(d, !1).break();
+        }).code((0, codegen_1$d._)`${$}[${y}] = ${R}`);
       });
     }
-    function N(R, v) {
-      const g = (0, util_1$g.useFunc)(t, equal_1$2.default), m = t.name("outer");
-      t.label(m).for((0, codegen_1$d._)`;${R}--;`, () => t.for((0, codegen_1$d._)`${v} = ${R}; ${v}--;`, () => t.if((0, codegen_1$d._)`${g}(${r}[${R}], ${r}[${v}])`, () => {
-        e.error(), t.assign(d, !1).break(m);
+    function N(R, T) {
+      const y = (0, util_1$g.useFunc)(t, equal_1$2.default), _ = t.name("outer");
+      t.label(_).for((0, codegen_1$d._)`;${R}--;`, () => t.for((0, codegen_1$d._)`${T} = ${R}; ${T}--;`, () => t.if((0, codegen_1$d._)`${y}(${r}[${R}], ${r}[${T}])`, () => {
+        e.error(), t.assign(d, !1).break(_);
       })));
     }
   }
@@ -6584,20 +6552,20 @@ 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 (l || 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");
       const N = t.const("vSchema", i);
-      p = (0, codegen_1$b.or)(...s.map((R, v) => O(N, v)));
+      p = (0, codegen_1$b.or)(...s.map((R, T) => O(N, T)));
     }
     e.pass(p);
-    function $() {
+    function g() {
       t.assign(p, !1), t.forOf("v", i, (N) => t.if((0, codegen_1$b._)`${u()}(${r}, ${N})`, () => t.assign(p, !0).break()));
     }
     function O(N, R) {
-      const v = s[R];
-      return typeof v == "object" && v !== null ? (0, codegen_1$b._)`${u()}(${r}, ${N}[${R}])` : (0, codegen_1$b._)`${r} === ${v}`;
+      const T = s[R];
+      return typeof T == "object" && T !== null ? (0, codegen_1$b._)`${u()}(${r}, ${N}[${R}])` : (0, codegen_1$b._)`${r} === ${T}`;
     }
   }
 };
@@ -6681,18 +6649,18 @@ function validateTuple(e, t, r = e.schema) {
   const { gen: n, parentSchema: s, data: i, keyword: o, it: l } = e;
   p(s), l.opts.unevaluated && r.length && l.items !== !0 && (l.items = util_1$c.mergeEvaluated.items(n, r.length, l.items));
   const d = n.name("valid"), u = n.const("len", (0, codegen_1$9._)`${i}.length`);
-  r.forEach(($, O) => {
-    (0, util_1$c.alwaysValidSchema)(l, $) || (n.if((0, codegen_1$9._)`${u} > ${O}`, () => e.subschema({
+  r.forEach((g, O) => {
+    (0, util_1$c.alwaysValidSchema)(l, g) || (n.if((0, codegen_1$9._)`${u} > ${O}`, () => e.subschema({
       keyword: o,
       schemaProp: O,
       dataProp: O
     }, d)), e.ok(d));
   });
-  function p($) {
-    const { opts: O, errSchemaPath: N } = l, R = r.length, v = R === $.minItems && (R === $.maxItems || $[t] === !1);
-    if (O.strictTuples && !v) {
-      const g = `"${o}" is ${R}-tuple, but minItems or maxItems/${t} are not specified or different at path "${N}"`;
-      (0, util_1$c.checkStrictMode)(l, g, O.strictTuples);
+  function p(g) {
+    const { opts: O, errSchemaPath: N } = l, R = r.length, T = R === g.minItems && (R === g.maxItems || g[t] === !1);
+    if (O.strictTuples && !T) {
+      const y = `"${o}" is ${R}-tuple, but minItems or maxItems/${t} are not specified or different at path "${N}"`;
+      (0, util_1$c.checkStrictMode)(l, y, O.strictTuples);
     }
   }
 }
@@ -6751,29 +6719,29 @@ const codegen_1$7 = codegen, util_1$a = util, error$6 = {
       return;
     }
     if ((0, util_1$a.alwaysValidSchema)(i, r)) {
-      let v = (0, codegen_1$7._)`${p} >= ${o}`;
-      l !== void 0 && (v = (0, codegen_1$7._)`${v} && ${p} <= ${l}`), e.pass(v);
+      let T = (0, codegen_1$7._)`${p} >= ${o}`;
+      l !== void 0 && (T = (0, codegen_1$7._)`${T} && ${p} <= ${l}`), e.pass(T);
       return;
     }
     i.items = !0;
-    const $ = t.name("valid");
-    l === void 0 && o === 1 ? N($, () => t.if($, () => t.break())) : o === 0 ? (t.let($, !0), l !== void 0 && t.if((0, codegen_1$7._)`${s}.length > 0`, O)) : (t.let($, !1), O()), e.result($, () => e.reset());
+    const g = t.name("valid");
+    l === void 0 && o === 1 ? N(g, () => t.if(g, () => t.break())) : o === 0 ? (t.let(g, !0), l !== void 0 && t.if((0, codegen_1$7._)`${s}.length > 0`, O)) : (t.let(g, !1), O()), e.result(g, () => e.reset());
     function O() {
-      const v = t.name("_valid"), g = t.let("count", 0);
-      N(v, () => t.if(v, () => R(g)));
+      const T = t.name("_valid"), y = t.let("count", 0);
+      N(T, () => t.if(T, () => R(y)));
     }
-    function N(v, g) {
-      t.forRange("i", 0, p, (m) => {
+    function N(T, y) {
+      t.forRange("i", 0, p, (_) => {
         e.subschema({
           keyword: "contains",
-          dataProp: m,
+          dataProp: _,
           dataPropType: util_1$a.Type.Num,
           compositeRule: !0
-        }, v), g();
+        }, T), y();
       });
     }
-    function R(v) {
-      t.code((0, codegen_1$7._)`${v}++`), l === void 0 ? t.if((0, codegen_1$7._)`${v} >= ${o}`, () => t.assign($, !0).break()) : (t.if((0, codegen_1$7._)`${v} > ${l}`, () => t.assign($, !1).break()), o === 1 ? t.assign($, !0) : t.if((0, codegen_1$7._)`${v} >= ${o}`, () => t.assign($, !0)));
+    function R(T) {
+      t.code((0, codegen_1$7._)`${T}++`), l === void 0 ? t.if((0, codegen_1$7._)`${T} >= ${o}`, () => t.assign(g, !0).break()) : (t.if((0, codegen_1$7._)`${T} > ${l}`, () => t.assign(g, !1).break()), o === 1 ? t.assign(g, !0) : t.if((0, codegen_1$7._)`${T} >= ${o}`, () => t.assign(g, !0)));
     }
   }
 };
@@ -6784,11 +6752,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
@@ -6805,43 +6773,43 @@ 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 O = Array.isArray(d[$]) ? u : p;
-      O[$] = d[$];
+      const O = Array.isArray(d[g]) ? u : p;
+      O[g] = d[g];
     }
     return [u, p];
   }
   function o(d, u = d.schema) {
-    const { gen: p, data: $, it: O } = d;
+    const { gen: p, data: g, it: O } = d;
     if (Object.keys(u).length === 0)
       return;
     const N = p.let("missing");
     for (const R in u) {
-      const v = u[R];
-      if (v.length === 0)
+      const T = u[R];
+      if (T.length === 0)
         continue;
-      const g = (0, n.propertyInData)(p, $, R, O.opts.ownProperties);
+      const y = (0, n.propertyInData)(p, g, R, O.opts.ownProperties);
       d.setParams({
         property: R,
-        depsCount: v.length,
-        deps: v.join(", ")
-      }), O.allErrors ? p.if(g, () => {
-        for (const m of v)
-          (0, n.checkReportMissingProp)(d, m);
-      }) : (p.if((0, t._)`${g} && (${(0, n.checkMissingProp)(d, v, N)})`), (0, n.reportMissingProp)(d, N), p.else());
+        depsCount: T.length,
+        deps: T.join(", ")
+      }), O.allErrors ? p.if(y, () => {
+        for (const _ of T)
+          (0, n.checkReportMissingProp)(d, _);
+      }) : (p.if((0, t._)`${y} && (${(0, n.checkMissingProp)(d, T, N)})`), (0, n.reportMissingProp)(d, N), p.else());
     }
   }
   e.validatePropertyDeps = o;
   function l(d, u = d.schema) {
-    const { gen: p, data: $, keyword: O, it: N } = d, R = p.name("valid");
-    for (const v in u)
-      (0, r.alwaysValidSchema)(N, u[v]) || (p.if(
-        (0, n.propertyInData)(p, $, v, N.opts.ownProperties),
+    const { gen: p, data: g, keyword: O, it: N } = d, R = p.name("valid");
+    for (const T in u)
+      (0, r.alwaysValidSchema)(N, u[T]) || (p.if(
+        (0, n.propertyInData)(p, g, T, N.opts.ownProperties),
         () => {
-          const g = d.subschema({ keyword: O, schemaProp: v }, R);
-          d.mergeValidEvaluated(g, R);
+          const y = d.subschema({ keyword: O, schemaProp: T }, R);
+          d.mergeValidEvaluated(y, R);
         },
         () => p.var(R, !0)
         // TODO var
@@ -6898,51 +6866,51 @@ 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, (g) => {
-        !u.length && !p.length ? R(g) : t.if(O(g), () => R(g));
+    g(), e.ok((0, codegen_1$5._)`${i} === ${names_1.default.errors}`);
+    function g() {
+      t.forIn("key", s, (y) => {
+        !u.length && !p.length ? R(y) : t.if(O(y), () => R(y));
       });
     }
-    function O(g) {
-      let m;
+    function O(y) {
+      let _;
       if (u.length > 8) {
-        const T = (0, util_1$8.schemaRefOrVal)(o, n.properties, "properties");
-        m = (0, code_1$3.isOwnProperty)(t, T, g);
+        const $ = (0, util_1$8.schemaRefOrVal)(o, n.properties, "properties");
+        _ = (0, code_1$3.isOwnProperty)(t, $, y);
       } else
-        u.length ? m = (0, codegen_1$5.or)(...u.map((T) => (0, codegen_1$5._)`${g} === ${T}`)) : m = codegen_1$5.nil;
-      return p.length && (m = (0, codegen_1$5.or)(m, ...p.map((T) => (0, codegen_1$5._)`${(0, code_1$3.usePattern)(e, T)}.test(${g})`))), (0, codegen_1$5.not)(m);
+        u.length ? _ = (0, codegen_1$5.or)(...u.map(($) => (0, codegen_1$5._)`${y} === ${$}`)) : _ = codegen_1$5.nil;
+      return p.length && (_ = (0, codegen_1$5.or)(_, ...p.map(($) => (0, codegen_1$5._)`${(0, code_1$3.usePattern)(e, $)}.test(${y})`))), (0, codegen_1$5.not)(_);
     }
-    function N(g) {
-      t.code((0, codegen_1$5._)`delete ${s}[${g}]`);
+    function N(y) {
+      t.code((0, codegen_1$5._)`delete ${s}[${y}]`);
     }
-    function R(g) {
+    function R(y) {
       if (d.removeAdditional === "all" || d.removeAdditional && r === !1) {
-        N(g);
+        N(y);
         return;
       }
       if (r === !1) {
-        e.setParams({ additionalProperty: g }), e.error(), l || t.break();
+        e.setParams({ additionalProperty: y }), e.error(), l || t.break();
         return;
       }
       if (typeof r == "object" && !(0, util_1$8.alwaysValidSchema)(o, r)) {
-        const m = t.name("valid");
-        d.removeAdditional === "failing" ? (v(g, m, !1), t.if((0, codegen_1$5.not)(m), () => {
-          e.reset(), N(g);
-        })) : (v(g, m), l || t.if((0, codegen_1$5.not)(m), () => t.break()));
+        const _ = t.name("valid");
+        d.removeAdditional === "failing" ? (T(y, _, !1), t.if((0, codegen_1$5.not)(_), () => {
+          e.reset(), N(y);
+        })) : (T(y, _), l || t.if((0, codegen_1$5.not)(_), () => t.break()));
       }
     }
-    function v(g, m, T) {
-      const S = {
+    function T(y, _, $) {
+      const P = {
         keyword: "additionalProperties",
-        dataProp: g,
+        dataProp: y,
         dataPropType: util_1$8.Type.Str
       };
-      T === !1 && Object.assign(S, {
+      $ === !1 && Object.assign(P, {
         compositeRule: !0,
         createErrors: !1,
         allErrors: !1
-      }), e.subschema(S, m);
+      }), e.subschema(P, _);
     }
   }
 };
@@ -6957,23 +6925,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 l = o.filter(($) => !(0, util_1$7.alwaysValidSchema)(i, r[$]));
+    const l = o.filter((g) => !(0, util_1$7.alwaysValidSchema)(i, r[g]));
     if (l.length === 0)
       return;
     const d = t.name("valid");
-    for (const $ of l)
-      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 l)
+      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);
     }
   }
@@ -6986,31 +6954,31 @@ const code_1$1 = code, codegen_1$4 = codegen, util_1$6 = util, util_2 = util, de
   type: "object",
   schemaType: "object",
   code(e) {
-    const { gen: t, schema: r, data: n, parentSchema: s, it: i } = e, { opts: o } = i, l = (0, code_1$1.allSchemaProperties)(r), d = l.filter((v) => (0, util_1$6.alwaysValidSchema)(i, r[v]));
+    const { gen: t, schema: r, data: n, parentSchema: s, it: i } = e, { opts: o } = i, l = (0, code_1$1.allSchemaProperties)(r), d = l.filter((T) => (0, util_1$6.alwaysValidSchema)(i, r[T]));
     if (l.length === 0 || d.length === l.length && (!i.opts.unevaluated || i.props === !0))
       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;
     O();
     function O() {
-      for (const v of l)
-        u && N(v), i.allErrors ? R(v) : (t.var(p, !0), R(v), t.if(p));
-    }
-    function N(v) {
-      for (const g in u)
-        new RegExp(v).test(g) && (0, util_1$6.checkStrictMode)(i, `property ${g} matches pattern ${v} (use allowMatchingProperties)`);
-    }
-    function R(v) {
-      t.forIn("key", n, (g) => {
-        t.if((0, codegen_1$4._)`${(0, code_1$1.usePattern)(e, v)}.test(${g})`, () => {
-          const m = d.includes(v);
-          m || e.subschema({
+      for (const T of l)
+        u && N(T), i.allErrors ? R(T) : (t.var(p, !0), R(T), t.if(p));
+    }
+    function N(T) {
+      for (const y in u)
+        new RegExp(T).test(y) && (0, util_1$6.checkStrictMode)(i, `property ${y} matches pattern ${T} (use allowMatchingProperties)`);
+    }
+    function R(T) {
+      t.forIn("key", n, (y) => {
+        t.if((0, codegen_1$4._)`${(0, code_1$1.usePattern)(e, T)}.test(${y})`, () => {
+          const _ = d.includes(T);
+          _ || e.subschema({
             keyword: "patternProperties",
-            schemaProp: v,
-            dataProp: g,
+            schemaProp: T,
+            dataProp: y,
             dataPropType: util_2.Type.Str
-          }, p), i.opts.unevaluated && $ !== !0 ? t.assign((0, codegen_1$4._)`${$}[${g}]`, !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) : !_ && !i.allErrors && t.if((0, codegen_1$4.not)(p), () => t.break());
         });
       });
     }
@@ -7069,14 +7037,14 @@ const codegen_1$3 = codegen, util_1$4 = util, error$3 = {
     const i = r, o = t.let("valid", !1), l = t.let("passing", null), d = t.name("_valid");
     e.setParams({ passing: l }), t.block(u), e.result(o, () => e.reset(), () => e.error(!0));
     function u() {
-      i.forEach((p, $) => {
+      i.forEach((p, g) => {
         let O;
         (0, util_1$4.alwaysValidSchema)(s, p) ? t.var(d, !0) : O = e.subschema({
           keyword: "oneOf",
-          schemaProp: $,
+          schemaProp: g,
           compositeRule: !0
-        }, d), $ > 0 && t.if((0, codegen_1$3._)`${d} && ${o}`).assign(o, !1).assign(l, (0, codegen_1$3._)`[${l}, ${$}]`).else(), t.if(d, () => {
-          t.assign(o, !0), t.assign(l, $), O && e.mergeEvaluated(O, codegen_1$3.Name);
+        }, d), g > 0 && t.if((0, codegen_1$3._)`${d} && ${o}`).assign(o, !1).assign(l, (0, codegen_1$3._)`[${l}, ${g}]`).else(), t.if(d, () => {
+          t.assign(o, !0), t.assign(l, g), O && e.mergeEvaluated(O, codegen_1$3.Name);
         });
       });
     }
@@ -7134,10 +7102,10 @@ const codegen_1$2 = codegen, util_1$2 = util, error$2 = {
       }, l);
       e.mergeEvaluated(p);
     }
-    function u(p, $) {
+    function u(p, g) {
       return () => {
         const O = e.subschema({ keyword: p }, l);
-        t.assign(o, l), e.mergeValidEvaluated(O, o), $ ? t.assign($, (0, codegen_1$2._)`${p}`) : e.setParams({ ifClause: p });
+        t.assign(o, l), e.mergeValidEvaluated(O, o), g ? t.assign(g, (0, codegen_1$2._)`${p}`) : e.setParams({ ifClause: p });
       };
     }
   }
@@ -7190,37 +7158,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: l } = e, { opts: d, errSchemaPath: u, schemaEnv: p, self: $ } = l;
+    const { gen: r, data: n, $data: s, schema: i, schemaCode: o, it: l } = e, { opts: d, errSchemaPath: u, schemaEnv: p, self: g } = l;
     if (!d.validateFormats)
       return;
     s ? O() : N();
     function O() {
       const R = r.scopeValue("formats", {
-        ref: $.formats,
+        ref: g.formats,
         code: d.code.formats
-      }), v = r.const("fDef", (0, codegen_1$1._)`${R}[${o}]`), g = r.let("fType"), m = r.let("format");
-      r.if((0, codegen_1$1._)`typeof ${v} == "object" && !(${v} instanceof RegExp)`, () => r.assign(g, (0, codegen_1$1._)`${v}.type || "string"`).assign(m, (0, codegen_1$1._)`${v}.validate`), () => r.assign(g, (0, codegen_1$1._)`"string"`).assign(m, v)), e.fail$data((0, codegen_1$1.or)(T(), S()));
-      function T() {
-        return d.strictSchema === !1 ? codegen_1$1.nil : (0, codegen_1$1._)`${o} && !${m}`;
+      }), T = r.const("fDef", (0, codegen_1$1._)`${R}[${o}]`), y = r.let("fType"), _ = r.let("format");
+      r.if((0, codegen_1$1._)`typeof ${T} == "object" && !(${T} instanceof RegExp)`, () => r.assign(y, (0, codegen_1$1._)`${T}.type || "string"`).assign(_, (0, codegen_1$1._)`${T}.validate`), () => r.assign(y, (0, codegen_1$1._)`"string"`).assign(_, T)), e.fail$data((0, codegen_1$1.or)($(), P()));
+      function $() {
+        return d.strictSchema === !1 ? codegen_1$1.nil : (0, codegen_1$1._)`${o} && !${_}`;
       }
-      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 && ${g} === ${t} && !${D}`;
+      function P() {
+        const I = p.$async ? (0, codegen_1$1._)`(${T}.async ? await ${_}(${n}) : ${_}(${n}))` : (0, codegen_1$1._)`${_}(${n})`, D = (0, codegen_1$1._)`(typeof ${_} == "function" ? ${I} : ${_}.test(${n}))`;
+        return (0, codegen_1$1._)`${_} && ${_} !== true && ${y} === ${t} && !${D}`;
       }
     }
     function N() {
-      const R = $.formats[i];
+      const R = g.formats[i];
       if (!R) {
-        T();
+        $();
         return;
       }
       if (R === !0)
         return;
-      const [v, g, m] = S(R);
-      v === t && e.pass(I());
-      function T() {
+      const [T, y, _] = P(R);
+      T === t && e.pass(I());
+      function $() {
         if (d.strictSchema === !1) {
-          $.logger.warn(D());
+          g.logger.warn(D());
           return;
         }
         throw new Error(D());
@@ -7228,7 +7196,7 @@ const codegen_1$1 = codegen, error$1 = {
           return `unknown format "${i}" ignored in schema at path "${u}"`;
         }
       }
-      function S(D) {
+      function P(D) {
         const w = D instanceof RegExp ? (0, codegen_1$1.regexpCode)(D) : d.code.formats ? (0, codegen_1$1._)`${d.code.formats}${(0, codegen_1$1.getProperty)(i)}` : void 0, k = r.scopeValue("formats", { key: i, ref: D, code: w });
         return typeof D == "object" && !(D instanceof RegExp) ? [D.type || "string", D.validate, (0, codegen_1$1._)`${k}.validate`] : ["string", D, k];
       }
@@ -7236,9 +7204,9 @@ const codegen_1$1 = codegen, error$1 = {
         if (typeof R == "object" && !(R instanceof RegExp) && R.async) {
           if (!p.$async)
             throw new Error("async format in sync schema");
-          return (0, codegen_1$1._)`await ${m}(${n})`;
+          return (0, codegen_1$1._)`await ${_}(${n})`;
         }
-        return typeof g == "function" ? (0, codegen_1$1._)`${m}(${n})` : (0, codegen_1$1._)`${m}.test(${n})`;
+        return typeof y == "function" ? (0, codegen_1$1._)`${_}(${n})` : (0, codegen_1$1._)`${_}.test(${n})`;
       }
     }
   }
@@ -7306,41 +7274,41 @@ const codegen_1 = codegen, types_1 = types, compile_1 = compile, util_1 = util,
       const N = O();
       t.if(!1);
       for (const R in N)
-        t.elseIf((0, codegen_1._)`${u} === ${R}`), t.assign(d, $(N[R]));
+        t.elseIf((0, codegen_1._)`${u} === ${R}`), t.assign(d, g(N[R]));
       t.else(), e.error(!1, { discrError: types_1.DiscrError.Mapping, tag: u, tagName: l }), t.endIf();
     }
-    function $(N) {
-      const R = t.name("valid"), v = e.subschema({ keyword: "oneOf", schemaProp: N }, R);
-      return e.mergeEvaluated(v, codegen_1.Name), R;
+    function g(N) {
+      const R = t.name("valid"), T = e.subschema({ keyword: "oneOf", schemaProp: N }, R);
+      return e.mergeEvaluated(T, codegen_1.Name), R;
     }
     function O() {
       var N;
-      const R = {}, v = m(s);
-      let g = !0;
+      const R = {}, T = _(s);
+      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 = (N = D == null ? void 0 : D.properties) === null || N === void 0 ? void 0 : N[l];
         if (typeof w != "object")
           throw new Error(`discriminator: oneOf subschemas (or referenced schemas) must have "properties/${l}"`);
-        g = g && (v || m(D)), T(w, I);
+        y = y && (T || _(D)), $(w, I);
       }
-      if (!g)
+      if (!y)
         throw new Error(`discriminator: "${l}" must be required`);
       return R;
-      function m({ required: I }) {
+      function _({ required: I }) {
         return Array.isArray(I) && I.includes(l);
       }
-      function T(I, D) {
+      function $(I, D) {
         if (I.const)
-          S(I.const, D);
+          P(I.const, D);
         else if (I.enum)
           for (const w of I.enum)
-            S(w, D);
+            P(w, D);
         else
           throw new Error(`discriminator: "properties/${l}" must have "const" or "enum"`);
       }
-      function S(I, D) {
+      function P(I, D) {
         if (typeof I != "string" || I in R)
           throw new Error(`discriminator: "${l}" values must be unique strings`);
         R[I] = D;
@@ -7626,9 +7594,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 O = ref_error;
   Object.defineProperty(t, "MissingRefError", { enumerable: !0, get: function() {
@@ -7996,7 +7964,10 @@ const Ajv = /* @__PURE__ */ getDefaultExportFromCjs(ajvExports), $schema = "http
   },
   SupportedPHPExtensionBundle: {
     type: "string",
-    const: "kitchen-sink"
+    enum: [
+      "kitchen-sink",
+      "light"
+    ]
   },
   StepDefinition: {
     type: "object",
@@ -8209,6 +8180,36 @@ for existing apps using this option.`
           "step"
         ]
       },
+      {
+        type: "object",
+        additionalProperties: !1,
+        properties: {
+          progress: {
+            type: "object",
+            properties: {
+              weight: {
+                type: "number"
+              },
+              caption: {
+                type: "string"
+              }
+            },
+            additionalProperties: !1
+          },
+          step: {
+            type: "string",
+            const: "importWxr"
+          },
+          file: {
+            $ref: "#/definitions/FileReference",
+            description: "The file to import"
+          }
+        },
+        required: [
+          "file",
+          "step"
+        ]
+      },
       {
         type: "object",
         additionalProperties: !1,
@@ -9182,10 +9183,6 @@ for existing apps using this option.`
       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
@@ -9208,7 +9205,8 @@ for existing apps using this option.`
   definitions
 }, { wpCLI, ...otherStepHandlers } = allStepHandlers, keyedStepHandlers = {
   ...otherStepHandlers,
-  "wp-cli": wpCLI
+  "wp-cli": wpCLI,
+  importFile: otherStepHandlers.importWxr
 };
 function compileBlueprint(e, {
   progress: t = new ProgressTracker(),
@@ -9216,39 +9214,46 @@ function compileBlueprint(e, {
   onStepCompleted: n = () => {
   }
 } = {}) {
-  var p, $, O, N, R;
-  if (e = {
+  var g, O, N, R, T, y, _;
+  e = {
     ...e,
     steps: (e.steps || []).filter(isStepDefinition)
-  }, e.constants && e.steps.unshift({
+  };
+  for (const $ of e.steps)
+    typeof $ == "object" && $.step === "importFile" && ($.step = "importWxr", console.warn(
+      'The "importFile" step is deprecated. Use "importWxr" instead.'
+    ));
+  if (e.constants && e.steps.unshift({
     step: "defineWpConfigConsts",
     consts: e.constants
   }), e.siteOptions && e.steps.unshift({
     step: "setSiteOptions",
     options: e.siteOptions
   }), e.plugins) {
-    const v = e.plugins.map((g) => typeof g == "string" ? g.startsWith("https://") ? {
+    const $ = e.plugins.map((P) => typeof P == "string" ? P.startsWith("https://") ? {
       resource: "url",
-      url: g
+      url: P
     } : {
       resource: "wordpress.org/plugins",
-      slug: g
-    } : g).map((g) => ({
+      slug: P
+    } : P).map((P) => ({
       step: "installPlugin",
-      pluginZipFile: g
+      pluginZipFile: P
     }));
-    e.steps.unshift(...v);
+    e.steps.unshift(...$);
   }
   e.login && e.steps.push({
     step: "login",
     ...e.login === !0 ? { username: "admin", password: "password" } : e.login
-  });
-  const s = (p = e.steps) == null ? void 0 : p.findIndex(
-    (v) => typeof v == "object" && (v == null ? void 0 : v.step) === "wp-cli"
+  }), e.phpExtensionBundles || (e.phpExtensionBundles = []), e.phpExtensionBundles || (e.phpExtensionBundles = []), e.phpExtensionBundles.length === 0 && e.phpExtensionBundles.push("kitchen-sink");
+  const s = (g = e.steps) == null ? void 0 : g.findIndex(
+    ($) => typeof $ == "object" && ($ == null ? void 0 : $.step) === "wp-cli"
   );
-  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, {
+  s !== void 0 && s > -1 && (e.phpExtensionBundles.includes("light") && (e.phpExtensionBundles = e.phpExtensionBundles.filter(
+    ($) => $ !== "light"
+  ), console.warn(
+    "The wpCli 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. "
+  )), (O = e.steps) == null || O.splice(s, 0, {
     step: "writeFile",
     data: {
       resource: "url",
@@ -9266,34 +9271,49 @@ function compileBlueprint(e, {
     },
     path: "/tmp/wp-cli.phar"
   }));
-  const { valid: i, errors: o } = validateBlueprint(e);
-  if (!i) {
-    const v = new Error(
-      `Invalid blueprint: ${o[0].message} at ${o[0].instancePath}`
+  const i = (N = e.steps) == null ? void 0 : N.findIndex(
+    ($) => typeof $ == "object" && ($ == null ? void 0 : $.step) === "importWxr"
+  );
+  i !== void 0 && i > -1 && (e.phpExtensionBundles.includes("light") && (e.phpExtensionBundles = e.phpExtensionBundles.filter(
+    ($) => $ !== "light"
+  ), console.warn(
+    "The importWxr 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. "
+  )), (R = e.steps) == null || R.splice(i, 0, {
+    step: "installPlugin",
+    pluginZipFile: {
+      resource: "url",
+      url: "https://playground.wordpress.net/wordpress-importer.zip",
+      caption: "Downloading the WordPress Importer plugin"
+    }
+  }));
+  const { valid: o, errors: l } = validateBlueprint(e);
+  if (!o) {
+    const $ = new Error(
+      `Invalid blueprint: ${l[0].message} at ${l[0].instancePath}`
     );
-    throw v.errors = o, v;
+    throw $.errors = l, $;
   }
-  const l = e.steps || [], d = l.reduce(
-    (v, g) => {
-      var m;
-      return v + (((m = g.progress) == null ? void 0 : m.weight) || 1);
+  const d = e.steps || [], u = d.reduce(
+    ($, P) => {
+      var I;
+      return $ + (((I = P.progress) == null ? void 0 : I.weight) || 1);
     },
     0
-  ), u = l.map(
-    (v) => compileStep(v, {
+  ), p = d.map(
+    ($) => compileStep($, {
       semaphore: r,
       rootProgressTracker: t,
-      totalProgressWeight: d
+      totalProgressWeight: u
     })
   );
   return {
     versions: {
       php: compileVersion(
-        (O = e.preferredVersions) == null ? void 0 : O.php,
+        (T = e.preferredVersions) == null ? void 0 : T.php,
         SupportedPHPVersions,
         LatestSupportedPHPVersion
       ),
-      wp: ((N = e.preferredVersions) == null ? void 0 : N.wp) || "latest"
+      wp: ((y = e.preferredVersions) == null ? void 0 : y.wp) || "latest"
     },
     phpExtensions: compilePHPExtensions(
       [],
@@ -9301,28 +9321,28 @@ function compileBlueprint(e, {
     ),
     features: {
       // Disable networking by default
-      networking: ((R = e.features) == null ? void 0 : R.networking) ?? !1
+      networking: ((_ = e.features) == null ? void 0 : _.networking) ?? !1
     },
-    run: async (v) => {
+    run: async ($) => {
       try {
-        for (const { resources: g } of u)
-          for (const m of g)
-            m.setPlayground(v), m.isAsync && m.resolve();
-        for (const [g, { run: m, step: T }] of Object.entries(u))
+        for (const { resources: P } of p)
+          for (const I of P)
+            I.setPlayground($), I.isAsync && I.resolve();
+        for (const [P, { run: I, step: D }] of Object.entries(p))
           try {
-            const S = await m(v);
-            n(S, T);
-          } catch (S) {
-            throw console.error(S), new Error(
-              `Error when executing the blueprint step #${g} (${JSON.stringify(
-                T
-              )}) ${S instanceof Error ? `: ${S.message}` : S}`,
-              { cause: S }
+            const w = await I($);
+            n(w, D);
+          } catch (w) {
+            throw console.error(w), new Error(
+              `Error when executing the blueprint step #${P} (${JSON.stringify(
+                D
+              )}) ${w instanceof Error ? `: ${w.message}` : w}`,
+              { cause: w }
             );
           }
       } finally {
         try {
-          await v.goTo(
+          await $.goTo(
             e.landingPage || "/"
           );
         } catch {
@@ -9374,17 +9394,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 O = e[$];
+  for (const g of Object.keys(e)) {
+    let O = e[g];
     isFileReference(O) && (O = Resource.create(O, {
       semaphore: t
-    })), i[$] = O;
+    })), i[g] = O;
   }
-  const o = async ($) => {
+  const o = async (g) => {
     var O;
     try {
       return s.fillSlowly(), await keyedStepHandlers[e.step](
-        $,
+        g,
         await resolveArguments(i),
         {
           tracker: s,
@@ -9395,10 +9415,10 @@ function compileStep(e, {
       s.finish();
     }
   }, l = 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: l };
 }
 function getResources(e) {
@@ -9431,9 +9451,8 @@ export {
   defineWpConfigConsts,
   enableMultisite,
   exportWXR,
-  exportWXZ,
-  importFile,
   importWordPressFiles,
+  importWxr,
   installPlugin,
   installTheme,
   login,