@wp-playground/blueprints 0.6.16 → 0.7.1

package/index.js

@@ -1,13 +1,13 @@
-var Nt = (e, t, r) => {
+var It = (e, t, r) => {
   if (!t.has(e))
     throw TypeError("Cannot " + r);
 };
-var H = (e, t, r) => (Nt(e, t, "read from private field"), r ? r.call(e) : t.get(e)), Q = (e, t, r) => {
+var H = (e, t, r) => (It(e, t, "read from private field"), r ? r.call(e) : t.get(e)), K = (e, t, r) => {
   if (t.has(e))
     throw TypeError("Cannot add the same private member more than once");
   t instanceof WeakSet ? t.add(e) : t.set(e, r);
-}, te = (e, t, r, n) => (Nt(e, t, "write to private field"), n ? n.call(e, r) : t.set(e, r), r);
-var ce = (e, t, r) => (Nt(e, t, "access private method"), r);
+}, ie = (e, t, r, n) => (It(e, t, "write to private field"), n ? n.call(e, r) : t.set(e, r), r);
+var ce = (e, t, r) => (It(e, t, "access private method"), r);
 const currentJsRuntime = function() {
   var e;
   return typeof process < "u" && ((e = process.release) == null ? void 0 : e.name) === "node" ? "NODE" : typeof window < "u" ? "WEB" : (
@@ -97,19 +97,40 @@ const wpContentFilesExcludedFromExport = [
   "themes/twentytwentyfour",
   "themes/twentytwentyfive",
   "themes/twentytwentysix"
-];
+], SleepFinished = Symbol("SleepFinished");
+function sleep(e) {
+  return new Promise((t) => {
+    setTimeout(() => t(SleepFinished), e);
+  });
+}
+class AcquireTimeoutError extends Error {
+  constructor() {
+    super("Acquiring lock timed out");
+  }
+}
 class Semaphore {
-  constructor({ concurrency: t }) {
-    this._running = 0, this.concurrency = t, this.queue = [];
+  constructor({ concurrency: t, timeout: r }) {
+    this._running = 0, this.concurrency = t, this.timeout = r, this.queue = [];
+  }
+  get remaining() {
+    return this.concurrency - this.running;
   }
   get running() {
     return this._running;
   }
   async acquire() {
     for (; ; )
-      if (this._running >= this.concurrency)
-        await new Promise((t) => this.queue.push(t));
-      else {
+      if (this._running >= this.concurrency) {
+        const t = new Promise((r) => {
+          this.queue.push(r);
+        });
+        this.timeout !== void 0 ? await Promise.race([t, sleep(this.timeout)]).then(
+          (r) => {
+            if (r === SleepFinished)
+              throw new AcquireTimeoutError();
+          }
+        ) : await t;
+      } else {
         this._running++;
         let t = !1;
         return () => {
@@ -341,8 +362,6 @@ switch_theme( ${phpVar(t)} );
 	`
   });
   return await rm(e, { path: n }), o;
-}, setPhpIniEntry = async (e, { key: t, value: r }) => {
-  await e.setPhpIniEntry(t, r);
 }, request = async (e, { request: t }) => {
   const r = await e.request(t);
   if (r.httpStatusCode > 399 || r.httpStatusCode < 200)
@@ -858,14 +877,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'], '/');
@@ -1050,13 +1069,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,
@@ -1114,13 +1133,13 @@ async function installAsset(e, {
     });
     u = u.filter((S) => !S.endsWith("/__MACOSX"));
     const p = u.length === 1 && await e.isDir(u[0]);
-    let $, O = "";
-    p ? (O = u[0], $ = u[0].split("/").pop()) : (O = d, $ = i);
-    const C = `${t}/${$}`;
+    let g, O = "";
+    p ? (O = u[0], g = u[0].split("/").pop()) : (O = d, g = i);
+    const C = `${t}/${g}`;
     if (await e.fileExists(C)) {
       if (!await e.isDir(C))
         throw new Error(
-          `Cannot install asset ${$} to ${C} because a file with the same name already exists. Note it's a file, not a directory! Is this by mistake?`
+          `Cannot install asset ${g} to ${C} because a file with the same name already exists. Note it's a file, not a directory! Is this by mistake?`
         );
       if (n === "overwrite")
         await e.rmdir(C, {
@@ -1130,16 +1149,16 @@ async function installAsset(e, {
         if (n === "skip")
           return {
             assetFolderPath: C,
-            assetFolderName: $
+            assetFolderName: g
           };
         throw new Error(
-          `Cannot install asset ${$} to ${t} because it already exists and the ifAlreadyInstalled option was set to ${n}`
+          `Cannot install asset ${g} to ${t} because it already exists and the ifAlreadyInstalled option was set to ${n}`
         );
       }
     }
     return await e.mv(O, C), {
       assetFolderPath: C,
-      assetFolderName: $
+      assetFolderName: g
     };
   } finally {
     await e.rmdir(l, {
@@ -1298,7 +1317,6 @@ const allStepHandlers = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.def
   runPHPWithOptions,
   runSql,
   runWpInstallationWizard,
-  setPhpIniEntry,
   setSiteOptions,
   unzip,
   updateUserMeta,
@@ -1731,96 +1749,7 @@ const SupportedPHPVersions = [
 ], SupportedPHPExtensionBundles = {
   "kitchen-sink": SupportedPHPExtensionsList,
   light: []
-};
-var Ae, Ge;
-class PHPBrowser {
-  /**
-   * @param  server - The PHP server to browse.
-   * @param  config - The browser configuration.
-   */
-  constructor(t, r = {}) {
-    Q(this, Ae, void 0);
-    Q(this, Ge, void 0);
-    this.requestHandler = t, te(this, Ae, {}), te(this, Ge, {
-      handleRedirects: !1,
-      maxRedirects: 4,
-      ...r
-    });
-  }
-  /**
-   * Sends the request to the server.
-   *
-   * When cookies are present in the response, this method stores
-   * them and sends them with any subsequent requests.
-   *
-   * When a redirection is present in the response, this method
-   * follows it by discarding a response and sending a subsequent
-   * request.
-   *
-   * @param  request   - The request.
-   * @param  redirects - Internal. The number of redirects handled so far.
-   * @returns PHPRequestHandler response.
-   */
-  async request(t, r = 0) {
-    const n = await this.requestHandler.request({
-      ...t,
-      headers: {
-        ...t.headers,
-        cookie: this.serializeCookies()
-      }
-    });
-    if (n.headers["set-cookie"] && this.setCookies(n.headers["set-cookie"]), H(this, Ge).handleRedirects && n.headers.location && r < H(this, Ge).maxRedirects) {
-      const s = new URL(
-        n.headers.location[0],
-        this.requestHandler.absoluteUrl
-      );
-      return this.request(
-        {
-          url: s.toString(),
-          method: "GET",
-          headers: {}
-        },
-        r + 1
-      );
-    }
-    return n;
-  }
-  /** @inheritDoc */
-  pathToInternalUrl(t) {
-    return this.requestHandler.pathToInternalUrl(t);
-  }
-  /** @inheritDoc */
-  internalUrlToPath(t) {
-    return this.requestHandler.internalUrlToPath(t);
-  }
-  /** @inheritDoc */
-  get absoluteUrl() {
-    return this.requestHandler.absoluteUrl;
-  }
-  /** @inheritDoc */
-  get documentRoot() {
-    return this.requestHandler.documentRoot;
-  }
-  setCookies(t) {
-    for (const r of t)
-      try {
-        if (!r.includes("="))
-          continue;
-        const n = r.indexOf("="), s = r.substring(0, n), i = r.substring(n + 1).split(";")[0];
-        H(this, Ae)[s] = i;
-      } catch (n) {
-        console.error(n);
-      }
-  }
-  serializeCookies() {
-    const t = [];
-    for (const r in H(this, Ae))
-      t.push(`${r}=${H(this, Ae)[r]}`);
-    return t.join("; ");
-  }
-}
-Ae = new WeakMap(), Ge = new WeakMap();
-const DEFAULT_BASE_URL = "http://example.com";
+}, DEFAULT_BASE_URL = "http://example.com";
 function toRelativeUrl(e) {
   return e.toString().substring(e.origin.length);
 }
@@ -1858,7 +1787,30 @@ function fileToUint8Array(e) {
     }, r.readAsArrayBuffer(e);
   });
 }
-var Pe, Ke, dt, De, Je, ve, Qe, Fe, mt, xt, _t, Wt, $t, Bt;
+class HttpCookieStore {
+  constructor() {
+    this.cookies = {};
+  }
+  rememberCookiesFromResponseHeaders(t) {
+    if (t != null && t["set-cookie"])
+      for (const r of t["set-cookie"])
+        try {
+          if (!r.includes("="))
+            continue;
+          const n = r.indexOf("="), s = r.substring(0, n), i = r.substring(n + 1).split(";")[0];
+          this.cookies[s] = i;
+        } catch (n) {
+          console.error(n);
+        }
+  }
+  getCookieRequestHeader() {
+    const t = [];
+    for (const r in this.cookies)
+      t.push(`${r}=${this.cookies[r]}`);
+    return t.join("; ");
+  }
+}
+var Pe, We, ct, je, Be, ve, Ge, Ae, Ke, ft, Wt, ht, Bt, mt, Gt;
 class PHPRequestHandler {
   /**
    * @param  php    - The PHP instance.
@@ -1871,7 +1823,7 @@ class PHPRequestHandler {
      * @param  fsPath - Absolute path of the static file to serve.
      * @returns The response.
      */
-    Q(this, mt);
+    K(this, ft);
     /**
      * Runs the requested PHP file with all the request and $_SERVER
      * superglobals populated.
@@ -1879,7 +1831,7 @@ class PHPRequestHandler {
      * @param  request - The request.
      * @returns The response.
      */
-    Q(this, _t);
+    K(this, ht);
     /**
      * Resolve the requested path to the filesystem path of the requested PHP file.
      *
@@ -1889,55 +1841,120 @@ class PHPRequestHandler {
      * @throws {Error} If the requested path doesn't exist.
      * @returns The resolved filesystem path.
      */
-    Q(this, $t);
-    Q(this, Pe, void 0);
-    Q(this, Ke, void 0);
-    Q(this, dt, void 0);
-    Q(this, De, void 0);
-    Q(this, Je, void 0);
-    Q(this, ve, void 0);
-    Q(this, Qe, void 0);
-    Q(this, Fe, void 0);
-    te(this, Fe, new Semaphore({ concurrency: 1 }));
+    K(this, mt);
+    K(this, Pe, void 0);
+    K(this, We, void 0);
+    K(this, ct, void 0);
+    K(this, je, void 0);
+    K(this, Be, void 0);
+    K(this, ve, void 0);
+    K(this, Ge, void 0);
+    K(this, Ae, void 0);
+    K(this, Ke, void 0);
+    ie(this, Ae, new Semaphore({ concurrency: 1 }));
     const {
       documentRoot: n = "/www/",
       absoluteUrl: s = typeof location == "object" ? location == null ? void 0 : location.href : "",
       rewriteRules: i = []
     } = r;
-    this.php = t, te(this, Pe, n);
+    this.php = t, ie(this, Ke, new HttpCookieStore()), ie(this, Pe, n);
     const o = new URL(s);
-    te(this, dt, o.hostname), te(this, De, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), te(this, Ke, (o.protocol || "").replace(":", ""));
-    const l = H(this, De) !== 443 && H(this, De) !== 80;
-    te(this, Je, [
-      H(this, dt),
-      l ? `:${H(this, De)}` : ""
-    ].join("")), te(this, ve, o.pathname.replace(/\/+$/, "")), te(this, Qe, [
-      `${H(this, Ke)}://`,
-      H(this, Je),
+    ie(this, ct, o.hostname), ie(this, je, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), ie(this, We, (o.protocol || "").replace(":", ""));
+    const l = H(this, je) !== 443 && H(this, je) !== 80;
+    ie(this, Be, [
+      H(this, ct),
+      l ? `:${H(this, je)}` : ""
+    ].join("")), ie(this, ve, o.pathname.replace(/\/+$/, "")), ie(this, Ge, [
+      `${H(this, We)}://`,
+      H(this, Be),
       H(this, ve)
     ].join("")), this.rewriteRules = i;
   }
-  /** @inheritDoc */
+  /**
+   * Converts a path to an absolute URL based at the PHPRequestHandler
+   * root.
+   *
+   * @param  path The server path to convert to an absolute URL.
+   * @returns The absolute URL.
+   */
   pathToInternalUrl(t) {
     return `${this.absoluteUrl}${t}`;
   }
-  /** @inheritDoc */
+  /**
+   * Converts an absolute URL based at the PHPRequestHandler to a relative path
+   * without the server pathname and scope.
+   *
+   * @param  internalUrl An absolute URL based at the PHPRequestHandler root.
+   * @returns The relative path.
+   */
   internalUrlToPath(t) {
     const r = new URL(t);
     return r.pathname.startsWith(H(this, ve)) && (r.pathname = r.pathname.slice(H(this, ve).length)), toRelativeUrl(r);
   }
   get isRequestRunning() {
-    return H(this, Fe).running > 0;
+    return H(this, Ae).running > 0;
   }
-  /** @inheritDoc */
+  /**
+   * The absolute URL of this PHPRequestHandler instance.
+   */
   get absoluteUrl() {
-    return H(this, Qe);
+    return H(this, Ge);
   }
-  /** @inheritDoc */
+  /**
+   * The directory in the PHP filesystem where the server will look
+   * for the files to serve. Default: `/var/www`.
+   */
   get documentRoot() {
     return H(this, Pe);
   }
-  /** @inheritDoc */
+  /**
+   * Serves the request – either by serving a static file, or by
+   * dispatching it to the PHP runtime.
+   *
+   * The request() method mode behaves like a web server and only works if
+   * the PHP was initialized with a `requestHandler` option (which the online version
+   * of WordPress Playground does by default).
+   *
+   * In the request mode, you pass an object containing the request information
+   * (method, headers, body, etc.) and the path to the PHP file to run:
+   *
+   * ```ts
+   * const php = PHP.load('7.4', {
+   * 	requestHandler: {
+   * 		documentRoot: "/www"
+   * 	}
+   * })
+   * php.writeFile("/www/index.php", `<?php echo file_get_contents("php://input");`);
+   * const result = await php.request({
+   * 	method: "GET",
+   * 	headers: {
+   * 		"Content-Type": "text/plain"
+   * 	},
+   * 	body: "Hello world!",
+   * 	path: "/www/index.php"
+   * });
+   * // result.text === "Hello world!"
+   * ```
+   *
+   * The `request()` method cannot be used in conjunction with `cli()`.
+   *
+   * @example
+   * ```js
+   * const output = await php.request({
+   * 	method: 'GET',
+   * 	url: '/index.php',
+   * 	headers: {
+   * 		'X-foo': 'bar',
+   * 	},
+   * 	body: {
+   * 		foo: 'bar',
+   * 	},
+   * });
+   * console.log(output.stdout); // "Hello world!"
+   * ```
+   *
+   * @param  request - PHP Request data.
+   */
   async request(t) {
     const r = t.url.startsWith("http://") || t.url.startsWith("https://"), n = new URL(
       // Remove the hash part of the URL as it's not meant for the server.
@@ -1950,10 +1967,10 @@ class PHPRequestHandler {
       ),
       this.rewriteRules
     ), i = joinPaths(H(this, Pe), s);
-    return seemsLikeAPHPRequestHandlerPath(i) ? await ce(this, _t, Wt).call(this, t, n) : ce(this, mt, xt).call(this, i);
+    return seemsLikeAPHPRequestHandlerPath(i) ? await ce(this, ht, Bt).call(this, t, n) : ce(this, ft, Wt).call(this, i);
   }
 }
-Pe = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(), Je = new WeakMap(), ve = new WeakMap(), Qe = new WeakMap(), Fe = new WeakMap(), mt = new WeakSet(), xt = function(t) {
+Pe = new WeakMap(), We = new WeakMap(), ct = new WeakMap(), je = new WeakMap(), Be = new WeakMap(), ve = new WeakMap(), Ge = new WeakMap(), Ae = new WeakMap(), Ke = new WeakMap(), ft = new WeakSet(), Wt = function(t) {
   if (!this.php.fileExists(t))
     return new PHPResponse(
       404,
@@ -1978,9 +1995,9 @@ Pe = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
     },
     r
   );
-}, _t = new WeakSet(), Wt = async function(t, r) {
+}, ht = new WeakSet(), Bt = async function(t, r) {
   var s;
-  if (H(this, Fe).running > 0 && ((s = t.headers) == null ? void 0 : s["x-request-issuer"]) === "php")
+  if (H(this, Ae).running > 0 && ((s = t.headers) == null ? void 0 : s["x-request-issuer"]) === "php")
     return console.warn(
       "Possible deadlock: Called request() before the previous request() have finished. PHP likely issued an HTTP call to itself. Normally this would lead to infinite waiting as Request 1 holds the lock that the Request 2 is waiting to acquire. That's not useful, so PHPRequestHandler will return error 502 instead."
     ), new PHPResponse(
@@ -1988,16 +2005,13 @@ Pe = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
       {},
       new TextEncoder().encode("502 Bad Gateway")
     );
-  const n = await H(this, Fe).acquire();
+  const n = await H(this, Ae).acquire();
   try {
-    this.php.addServerGlobalEntry("REMOTE_ADDR", "127.0.0.1"), this.php.addServerGlobalEntry("DOCUMENT_ROOT", H(this, Pe)), this.php.addServerGlobalEntry(
-      "HTTPS",
-      H(this, Qe).startsWith("https://") ? "on" : ""
-    );
     let i = "GET";
     const o = {
-      host: H(this, Je),
-      ...normalizeHeaders(t.headers || {})
+      host: H(this, Be),
+      ...normalizeHeaders(t.headers || {}),
+      cookie: H(this, Ke).getCookieRequestHeader()
     };
     let l = t.body;
     if (typeof l == "object" && !(l instanceof Uint8Array)) {
@@ -2007,7 +2021,7 @@ Pe = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
     }
     let d;
     try {
-      d = ce(this, $t, Bt).call(this, decodeURIComponent(r.pathname));
+      d = ce(this, mt, Gt).call(this, decodeURIComponent(r.pathname));
     } catch {
       return new PHPResponse(
         404,
@@ -2016,17 +2030,25 @@ Pe = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
       );
     }
     try {
-      return await this.php.run({
+      const u = await this.php.run({
         relativeUri: ensurePathPrefix(
           toRelativeUrl(r),
           H(this, ve)
         ),
-        protocol: H(this, Ke),
+        protocol: H(this, We),
         method: t.method || i,
+        $_SERVER: {
+          REMOTE_ADDR: "127.0.0.1",
+          DOCUMENT_ROOT: H(this, Pe),
+          HTTPS: H(this, Ge).startsWith("https://") ? "on" : ""
+        },
         body: l,
         scriptPath: d,
         headers: o
       });
+      return H(this, Ke).rememberCookiesFromResponseHeaders(
+        u.headers
+      ), u;
     } catch (u) {
       const p = u;
       if (p != null && p.response)
@@ -2036,7 +2058,7 @@ Pe = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
   } finally {
     n();
   }
-}, $t = new WeakSet(), Bt = function(t) {
+}, mt = new WeakSet(), Gt = 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}`;
@@ -2080,6 +2102,38 @@ function inferMimeType(e) {
     case "txt":
     case "md":
       return "text/plain";
+    case "pdf":
+      return "application/pdf";
+    case "webp":
+      return "image/webp";
+    case "mp3":
+      return "audio/mpeg";
+    case "mp4":
+      return "video/mp4";
+    case "csv":
+      return "text/csv";
+    case "xls":
+      return "application/vnd.ms-excel";
+    case "xlsx":
+      return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+    case "doc":
+      return "application/msword";
+    case "docx":
+      return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+    case "ppt":
+      return "application/vnd.ms-powerpoint";
+    case "pptx":
+      return "application/vnd.openxmlformats-officedocument.presentationml.presentation";
+    case "zip":
+      return "application/zip";
+    case "rar":
+      return "application/x-rar-compressed";
+    case "tar":
+      return "application/x-tar";
+    case "gz":
+      return "application/gzip";
+    case "7z":
+      return "application/x-7z-compressed";
     default:
       return "application-octet-stream";
   }
@@ -2192,8 +2246,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
           });
         }
@@ -2221,7 +2275,7 @@ class PHPExecutionFailureError extends Error {
     super(t), this.response = r, this.source = n;
   }
 }
-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, Ct, sr;
+var De, Je, Qe, be, Re, Ee, Ye, _t, Kt, gt, Jt, $t, Qt, yt, Yt, vt, Zt, wt, Xt, Pt, er, bt, tr, Et, rr, St, nr, Rt, sr, Tt, ir, kt, or, Ct, ar, Ot, cr;
 class BasePHP {
   /**
    * Initializes a PHP runtime.
@@ -2231,29 +2285,38 @@ 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, yt);
-    Q(this, vt);
-    Q(this, wt);
-    Q(this, Pt);
-    Q(this, bt);
-    Q(this, Et);
-    Q(this, St);
-    Q(this, Rt);
-    Q(this, Tt);
-    Q(this, kt);
-    Q(this, Ct);
-    Q(this, Me, void 0);
-    Q(this, Ze, void 0);
-    Q(this, Ye, void 0);
-    Q(this, be, void 0);
-    Q(this, Re, void 0);
-    Q(this, Te, void 0);
-    Q(this, Ee, void 0);
-    Q(this, Xe, void 0);
-    te(this, Me, []), te(this, be, !1), te(this, Re, null), te(this, Te, {}), te(this, Ee, /* @__PURE__ */ new Map()), te(this, Xe, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPBrowser(
-      new PHPRequestHandler(this, t)
-    ));
+    /**
+     * Prepares the $_SERVER entries for the PHP runtime.
+     *
+     * @param defaults Default entries to include in $_SERVER.
+     * @param headers HTTP headers to include in $_SERVER (as HTTP_ prefixed entries).
+     * @param port HTTP port, used to determine infer $_SERVER['HTTPS'] value if none
+     *             was provided.
+     * @returns Computed $_SERVER entries.
+     */
+    K(this, _t);
+    K(this, gt);
+    K(this, $t);
+    K(this, yt);
+    K(this, vt);
+    K(this, wt);
+    K(this, Pt);
+    K(this, bt);
+    K(this, Et);
+    K(this, St);
+    K(this, Rt);
+    K(this, Tt);
+    K(this, kt);
+    K(this, Ct);
+    K(this, Ot);
+    K(this, De, void 0);
+    K(this, Je, void 0);
+    K(this, Qe, void 0);
+    K(this, be, void 0);
+    K(this, Re, void 0);
+    K(this, Ee, void 0);
+    K(this, Ye, void 0);
+    ie(this, De, []), ie(this, be, !1), ie(this, Re, null), ie(this, Ee, /* @__PURE__ */ new Map()), ie(this, Ye, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPRequestHandler(this, t));
   }
   addEventListener(e, t) {
     H(this, Ee).has(e) || H(this, Ee).set(e, /* @__PURE__ */ new Set()), H(this, Ee).get(e).add(t);
@@ -2270,7 +2333,7 @@ class BasePHP {
   }
   /** @inheritDoc */
   async onMessage(e) {
-    H(this, Xe).push(e);
+    H(this, Ye).push(e);
   }
   /** @inheritDoc */
   async setSpawnHandler(handler) {
@@ -2278,21 +2341,19 @@ class BasePHP {
   }
   /** @inheritDoc */
   get absoluteUrl() {
-    return this.requestHandler.requestHandler.absoluteUrl;
+    return this.requestHandler.absoluteUrl;
   }
   /** @inheritDoc */
   get documentRoot() {
-    return this.requestHandler.requestHandler.documentRoot;
+    return this.requestHandler.documentRoot;
   }
   /** @inheritDoc */
   pathToInternalUrl(e) {
-    return this.requestHandler.requestHandler.pathToInternalUrl(e);
+    return this.requestHandler.pathToInternalUrl(e);
   }
   /** @inheritDoc */
   internalUrlToPath(e) {
-    return this.requestHandler.requestHandler.internalUrlToPath(
-      e
-    );
+    return this.requestHandler.internalUrlToPath(e);
   }
   initializeRuntime(e) {
     if (this[__private__dont__use])
@@ -2301,13 +2362,13 @@ class BasePHP {
     if (!t)
       throw new Error("Invalid PHP runtime id.");
     this[__private__dont__use] = t, t.onMessage = async (r) => {
-      for (const n of H(this, Xe)) {
+      for (const n of H(this, Ye)) {
         const s = await n(r);
         if (s)
           return s;
       }
       return "";
-    }, te(this, Re, improveWASMErrorReporting(t)), this.dispatchEvent({
+    }, ie(this, Re, improveWASMErrorReporting(t)), this.dispatchEvent({
       type: "runtime.initialized"
     });
   }
@@ -2322,13 +2383,13 @@ class BasePHP {
       throw new Error(
         "Could not set SAPI name. This can only be done before the PHP WASM module is initialized.Did you already dispatch any requests?"
       );
-    te(this, Ye, e);
+    ie(this, Qe, e);
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
     if (H(this, be))
       throw new Error("Cannot set PHP ini path after calling run().");
-    te(this, Ze, e), this[__private__dont__use].ccall(
+    ie(this, Je, e), this[__private__dont__use].ccall(
       "wasm_set_phpini_path",
       null,
       ["string"],
@@ -2339,44 +2400,47 @@ class BasePHP {
   setPhpIniEntry(e, t) {
     if (H(this, be))
       throw new Error("Cannot set PHP ini entries after calling run().");
-    H(this, Me).push([e, t]);
+    H(this, De).push([e, t]);
   }
   /** @inheritDoc */
   chdir(e) {
     this[__private__dont__use].FS.chdir(e);
   }
   /** @inheritDoc */
-  async request(e, t) {
+  async request(e) {
     if (!this.requestHandler)
       throw new Error("No request handler available.");
-    return this.requestHandler.request(e, t);
+    return this.requestHandler.request(e);
   }
   /** @inheritDoc */
   async run(e) {
     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, gt, Jt).call(this), ie(this, be, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
         throw new Error(
           `The script path "${e.scriptPath}" does not exist.`
         );
-      ce(this, St, er).call(this, e.scriptPath || ""), ce(this, vt, Jt).call(this, e.relativeUri || ""), ce(this, Pt, Zt).call(this, e.method || "GET");
-      const n = normalizeHeaders(e.headers || {}), s = n.host || "example.com:443";
-      ce(this, wt, Qt).call(this, s, e.protocol || "http"), ce(this, bt, Yt).call(this, n), e.body && (r = ce(this, Et, Xt).call(this, e.body)), typeof e.code == "string" && ce(this, kt, nr).call(this, " ?>" + e.code), ce(this, Rt, tr).call(this);
-      const i = e.env || {};
-      for (const l in i)
-        ce(this, Tt, rr).call(this, l, i[l]);
-      const o = await ce(this, Ct, sr).call(this);
-      if (o.exitCode !== 0) {
-        console.warn("PHP.run() output was:", o.text);
-        const l = new PHPExecutionFailureError(
-          `PHP.run() failed with exit code ${o.exitCode} and the following output: ` + o.errors,
-          o,
+      ce(this, Rt, sr).call(this, e.scriptPath || ""), ce(this, yt, Yt).call(this, e.relativeUri || ""), ce(this, bt, tr).call(this, e.method || "GET");
+      const n = normalizeHeaders(e.headers || {}), s = n.host || "example.com:443", i = ce(this, Pt, er).call(this, s, e.protocol || "http");
+      ce(this, vt, Zt).call(this, s), ce(this, wt, Xt).call(this, i), ce(this, Et, rr).call(this, n), e.body && (r = ce(this, St, nr).call(this, e.body)), typeof e.code == "string" && ce(this, Ct, ar).call(this, " ?>" + e.code);
+      const o = ce(this, _t, Kt).call(this, e.$_SERVER, n, i);
+      for (const u in o)
+        ce(this, Tt, ir).call(this, u, o[u]);
+      const l = e.env || {};
+      for (const u in l)
+        ce(this, kt, or).call(this, u, l[u]);
+      const d = await ce(this, Ot, cr).call(this);
+      if (d.exitCode !== 0) {
+        console.warn("PHP.run() output was:", d.text);
+        const u = new PHPExecutionFailureError(
+          `PHP.run() failed with exit code ${d.exitCode} and the following output: ` + d.errors,
+          d,
           "request"
         );
-        throw console.error(l), l;
+        throw console.error(u), u;
       }
-      return o;
+      return d;
     } catch (n) {
       throw this.dispatchEvent({
         type: "request.error",
@@ -2394,9 +2458,6 @@ class BasePHP {
       }
     }
   }
-  addServerGlobalEntry(e, t) {
-    H(this, Te)[e] = t;
-  }
   defineConstant(e, t) {
     let r = {};
     try {
@@ -2484,17 +2545,18 @@ class BasePHP {
    * interrupting the operations of this PHP instance.
    *
    * @param runtime
+   * @param cwd. Internal, the VFS path to recreate in the new runtime.
+   *             This arg is temporary and will be removed once BasePHP
+   *             is fully decoupled from the request handler and
+   *             accepts a constructor-level cwd argument.
    */
-  hotSwapPHPRuntime(e) {
-    const t = this[__private__dont__use].FS;
+  hotSwapPHPRuntime(e, t) {
+    const r = this[__private__dont__use].FS;
     try {
       this.exit();
     } catch {
     }
-    if (this.initializeRuntime(e), H(this, Ze) && this.setPhpIniPath(H(this, Ze)), H(this, Ye) && this.setSapiName(H(this, Ye)), this.requestHandler) {
-      const r = this.documentRoot;
-      copyFS(t, this[__private__dont__use].FS, r);
-    }
+    this.initializeRuntime(e), H(this, Je) && this.setPhpIniPath(H(this, Je)), H(this, Qe) && this.setSapiName(H(this, Qe)), t && copyFS(r, this[__private__dont__use].FS, t);
   }
   exit(e = 0) {
     this.dispatchEvent({
@@ -2504,10 +2566,20 @@ class BasePHP {
       this[__private__dont__use]._exit(e);
     } catch {
     }
-    te(this, be, !1), te(this, Re, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
+    ie(this, be, !1), ie(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() {
+De = new WeakMap(), Je = new WeakMap(), Qe = new WeakMap(), be = new WeakMap(), Re = new WeakMap(), Ee = new WeakMap(), Ye = new WeakMap(), _t = new WeakSet(), Kt = function(e, t, r) {
+  const n = {
+    ...e || {}
+  };
+  n.HTTPS = n.HTTPS || r === 443 ? "on" : "off";
+  for (const s in t) {
+    let i = "HTTP_";
+    ["content-type", "content-length"].includes(s.toLowerCase()) && (i = ""), n[`${i}${s.toUpperCase().replace(/-/g, "_")}`] = t[s];
+  }
+  return n;
+}, gt = new WeakSet(), Jt = function() {
   if (this.setPhpIniEntry("auto_prepend_file", "/internal/consts.php"), this.fileExists("/internal/consts.php") || this.writeFile(
     "/internal/consts.php",
     `<?php
@@ -2519,8 +2591,8 @@ Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), be = new WeakMap(),
 						}
 					}
 				}`
-  ), H(this, Me).length > 0) {
-    const e = H(this, Me).map(([t, r]) => `${t}=${r}`).join(`
+  ), H(this, De).length > 0) {
+    const e = H(this, De).map(([t, r]) => `${t}=${r}`).join(`
 `) + `
 
 `;
@@ -2532,7 +2604,7 @@ Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), be = new WeakMap(),
     );
   }
   this[__private__dont__use].ccall("php_wasm_init", null, [], []);
-}, yt = new WeakSet(), Kt = function() {
+}, $t = new WeakSet(), Qt = function() {
   const e = "/internal/headers.json";
   if (!this.fileExists(e))
     throw new Error(
@@ -2549,7 +2621,7 @@ Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), be = new WeakMap(),
     headers: r,
     httpStatusCode: t.status
   };
-}, vt = new WeakSet(), Jt = function(e) {
+}, yt = new WeakSet(), Yt = function(e) {
   if (this[__private__dont__use].ccall(
     "wasm_set_request_uri",
     null,
@@ -2564,32 +2636,35 @@ Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), be = new WeakMap(),
       [t]
     );
   }
-}, wt = new WeakSet(), Qt = function(e, t) {
+}, vt = new WeakSet(), Zt = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_request_host",
     null,
     [STRING],
     [e]
   );
+}, wt = new WeakSet(), Xt = function(e) {
+  this[__private__dont__use].ccall(
+    "wasm_set_request_port",
+    null,
+    [NUMBER],
+    [e]
+  );
+}, Pt = new WeakSet(), er = function(e, t) {
   let r;
   try {
     r = parseInt(new URL(e).port, 10);
   } catch {
   }
-  (!r || isNaN(r) || r === 80) && (r = t === "https" ? 443 : 80), this[__private__dont__use].ccall(
-    "wasm_set_request_port",
-    null,
-    [NUMBER],
-    [r]
-  ), (t === "https" || !t && r === 443) && this.addServerGlobalEntry("HTTPS", "on");
-}, Pt = new WeakSet(), Zt = function(e) {
+  return (!r || isNaN(r) || r === 80) && (r = t === "https" ? 443 : 80), r;
+}, bt = new WeakSet(), tr = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_request_method",
     null,
     [STRING],
     [e]
   );
-}, bt = new WeakSet(), Yt = function(e) {
+}, Et = new WeakSet(), rr = function(e) {
   e.cookie && this[__private__dont__use].ccall(
     "wasm_set_cookies",
     null,
@@ -2606,14 +2681,7 @@ Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), be = new WeakMap(),
     [NUMBER],
     [parseInt(e["content-length"], 10)]
   );
-  for (const t in e) {
-    let r = "HTTP_";
-    ["content-type", "content-length"].includes(t.toLowerCase()) && (r = ""), this.addServerGlobalEntry(
-      `${r}${t.toUpperCase().replace(/-/g, "_")}`,
-      e[t]
-    );
-  }
-}, Et = new WeakSet(), Xt = function(e) {
+}, St = new WeakSet(), nr = function(e) {
   let t, r;
   typeof e == "string" ? (console.warn(
     "Passing a string as the request body is deprecated. Please use a Uint8Array instead. See https://github.com/WordPress/wordpress-playground/issues/997 for more details"
@@ -2636,36 +2704,35 @@ Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), be = new WeakMap(),
     [NUMBER],
     [r]
   ), n;
-}, St = new WeakSet(), er = function(e) {
+}, Rt = new WeakSet(), sr = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_path_translated",
     null,
     [STRING],
     [e]
   );
-}, Rt = new WeakSet(), tr = function() {
-  for (const e in H(this, Te))
-    this[__private__dont__use].ccall(
-      "wasm_add_SERVER_entry",
-      null,
-      [STRING, STRING],
-      [e, H(this, Te)[e]]
-    );
-}, Tt = new WeakSet(), rr = function(e, t) {
+}, Tt = new WeakSet(), ir = function(e, t) {
+  this[__private__dont__use].ccall(
+    "wasm_add_SERVER_entry",
+    null,
+    [STRING, STRING],
+    [e, t]
+  );
+}, kt = new WeakSet(), or = function(e, t) {
   this[__private__dont__use].ccall(
     "wasm_add_ENV_entry",
     null,
     [STRING, STRING],
     [e, t]
   );
-}, kt = new WeakSet(), nr = function(e) {
+}, Ct = new WeakSet(), ar = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_php_code",
     null,
     [STRING],
     [e]
   );
-}, Ct = new WeakSet(), sr = async function() {
+}, Ot = new WeakSet(), cr = async function() {
   var s;
   let e, t;
   try {
@@ -2699,9 +2766,9 @@ Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), be = new WeakMap(),
     const o = i, l = "betterMessage" in o ? o.betterMessage : o.message, d = new Error(l);
     throw d.cause = o, console.error(d), d;
   } finally {
-    (s = H(this, Re)) == null || s.removeEventListener("error", t), te(this, Te, {});
+    (s = H(this, Re)) == null || s.removeEventListener("error", t);
   }
-  const { headers: r, httpStatusCode: n } = ce(this, yt, Kt).call(this);
+  const { headers: r, httpStatusCode: n } = ce(this, $t, Qt).call(this);
   return new PHPResponse(
     e === 0 ? n : 500,
     r,
@@ -2865,16 +2932,52 @@ class FetchResource extends Resource {
   }
   /** @inheritDoc */
   async resolve() {
-    var n, s;
-    (n = this.progress) == null || n.setCaption(this.caption);
+    var r, n;
+    (r = this.progress) == null || r.setCaption(this.caption);
     const t = this.getURL();
-    let r = await fetch(t);
-    if (r = await cloneResponseMonitorProgress(
-      r,
-      ((s = this.progress) == null ? void 0 : s.loadingListener) ?? noop
-    ), r.status !== 200)
-      throw new Error(`Could not download "${t}"`);
-    return new File([await r.blob()], this.name);
+    try {
+      let s = await fetch(t);
+      if (!s.ok)
+        throw new Error(`Could not download "${t}"`);
+      if (s = await cloneResponseMonitorProgress(
+        s,
+        ((n = this.progress) == null ? void 0 : n.loadingListener) ?? noop
+      ), s.status !== 200)
+        throw new Error(`Could not download "${t}"`);
+      return new File([await s.blob()], this.name);
+    } catch (s) {
+      throw new Error(
+        `Could not download "${t}".
+				Check if the URL is correct and the server is reachable.
+				If the url is reachable, the server might be blocking the request.
+				Check the console and network for more information.
+
+				## Does the console shows an error about "No 'Access-Control-Allow-Origin' header"?
+
+				This means the server where your file is hosted does not allow requests from other sites
+				(cross-origin requests, or CORS).	You will need to move it to another server that allows
+				cross-origin file downloads. You can learn more about CORS at
+				https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS.
+
+				If you're loading a file from https://github.com/, there's an easy fix – you can load it from
+				raw.githubusercontent.com instead. Here's how to do that:
+
+				1. Start with the original GitHub URL for the file. For example:
+				'''
+				https://github.com/username/repository/blob/branch/filename
+				'''
+				2. Replace 'github.com' with 'raw.githubusercontent.com'.
+				3. Remove the '/blob/' part of the URL.
+
+				The resulting URL should look like this:
+				'''
+				https://raw.githubusercontent.com/username/repository/branch/filename
+				'''
+
+				Error:
+				${s}`
+      );
+    }
   }
   /**
    * Gets the caption for the progress tracker.
@@ -2998,10 +3101,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(g) {
-      if (super(), !e.IDENTIFIER.test(g))
+    constructor($) {
+      if (super(), !e.IDENTIFIER.test($))
         throw new Error("CodeGen: name must be a valid identifier");
-      this.str = g;
+      this.str = $;
     }
     toString() {
       return this.str;
@@ -3015,8 +3118,8 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
   }
   e.Name = r;
   class n extends t {
-    constructor(g) {
-      super(), this._items = typeof g == "string" ? [g] : g;
+    constructor($) {
+      super(), this._items = typeof $ == "string" ? [$] : $;
     }
     toString() {
       return this.str;
@@ -3024,69 +3127,69 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
     emptyStr() {
       if (this._items.length > 1)
         return !1;
-      const g = this._items[0];
-      return g === "" || g === '""';
+      const $ = this._items[0];
+      return $ === "" || $ === '""';
     }
     get str() {
-      var g;
-      return (g = this._str) !== null && g !== void 0 ? g : this._str = this._items.reduce((P, I) => `${P}${I}`, "");
+      var $;
+      return ($ = this._str) !== null && $ !== void 0 ? $ : this._str = this._items.reduce((P, I) => `${P}${I}`, "");
     }
     get names() {
-      var g;
-      return (g = this._names) !== null && g !== void 0 ? g : this._names = this._items.reduce((P, I) => (I instanceof r && (P[I.str] = (P[I.str] || 0) + 1), P), {});
+      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(_, ...g) {
+  function s(_, ...$) {
     const P = [_[0]];
     let I = 0;
-    for (; I < g.length; )
-      l(P, g[I]), P.push(_[++I]);
+    for (; I < $.length; )
+      l(P, $[I]), P.push(_[++I]);
     return new n(P);
   }
   e._ = s;
   const i = new n("+");
-  function o(_, ...g) {
+  function o(_, ...$) {
     const P = [C(_[0])];
     let I = 0;
-    for (; I < g.length; )
-      P.push(i), l(P, g[I]), P.push(i, C(_[++I]));
+    for (; I < $.length; )
+      P.push(i), l(P, $[I]), P.push(i, C(_[++I]));
     return d(P), new n(P);
   }
   e.str = o;
-  function l(_, g) {
-    g instanceof n ? _.push(...g._items) : g instanceof r ? _.push(g) : _.push($(g));
+  function l(_, $) {
+    $ instanceof n ? _.push(...$._items) : $ instanceof r ? _.push($) : _.push(g($));
   }
   e.addCodeArg = l;
   function d(_) {
-    let g = 1;
-    for (; g < _.length - 1; ) {
-      if (_[g] === i) {
-        const P = u(_[g - 1], _[g + 1]);
+    let $ = 1;
+    for (; $ < _.length - 1; ) {
+      if (_[$] === i) {
+        const P = u(_[$ - 1], _[$ + 1]);
         if (P !== void 0) {
-          _.splice(g - 1, 3, P);
+          _.splice($ - 1, 3, P);
           continue;
         }
-        _[g++] = "+";
+        _[$++] = "+";
       }
-      g++;
+      $++;
     }
   }
-  function u(_, g) {
-    if (g === '""')
+  function u(_, $) {
+    if ($ === '""')
       return _;
     if (_ === '""')
-      return g;
+      return $;
     if (typeof _ == "string")
-      return g instanceof r || _[_.length - 1] !== '"' ? void 0 : typeof g != "string" ? `${_.slice(0, -1)}${g}"` : g[0] === '"' ? _.slice(0, -1) + g.slice(1) : void 0;
-    if (typeof g == "string" && g[0] === '"' && !(_ instanceof r))
-      return `"${_}${g.slice(1)}`;
+      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(_, g) {
-    return g.emptyStr() ? _ : _.emptyStr() ? g : o`${_}${g}`;
+  function p(_, $) {
+    return $.emptyStr() ? _ : _.emptyStr() ? $ : o`${_}${$}`;
   }
   e.strConcat = p;
-  function $(_) {
+  function g(_) {
     return typeof _ == "number" || typeof _ == "boolean" || _ === null ? _ : C(Array.isArray(_) ? _.join(",") : _);
   }
   function O(_) {
@@ -3144,8 +3247,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 };
     }
@@ -3155,8 +3258,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;
@@ -3172,15 +3275,15 @@ 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: C } = O, S = ($ = p.key) !== null && $ !== void 0 ? $ : p.ref;
+      const O = this.toName(u), { prefix: C } = O, S = (g = p.key) !== null && g !== void 0 ? g : p.ref;
       let T = this._values[C];
       if (T) {
-        const g = T.get(S);
-        if (g)
-          return g;
+        const $ = T.get(S);
+        if ($)
+          return $;
       } else
         T = this._values[C] = /* @__PURE__ */ new Map();
       T.set(S, O);
@@ -3188,41 +3291,41 @@ var scope = {};
       return y[_] = p.ref, O.setValue(p, { property: C, 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 C = t.nil;
       for (const S in u) {
         const T = u[S];
         if (!T)
           continue;
-        const y = $[S] = $[S] || /* @__PURE__ */ new Map();
+        const y = g[S] = g[S] || /* @__PURE__ */ new Map();
         T.forEach((_) => {
           if (y.has(_))
             return;
           y.set(_, n.Started);
-          let g = p(_);
-          if (g) {
+          let $ = p(_);
+          if ($) {
             const P = this.opts.es5 ? e.varKinds.var : e.varKinds.const;
-            C = (0, t._)`${C}${P} ${_} = ${g};${this.opts._n}`;
-          } else if (g = O == null ? void 0 : O(_))
-            C = (0, t._)`${C}${g}${this.opts._n}`;
+            C = (0, t._)`${C}${P} ${_} = ${$};${this.opts._n}`;
+          } else if ($ = O == null ? void 0 : O(_))
+            C = (0, t._)`${C}${$}${this.opts._n}`;
           else
             throw new r(_);
           y.set(_, n.Completed);
@@ -3339,7 +3442,7 @@ var scope = {};
       return `break${this.label ? ` ${this.label}` : ""};` + a;
     }
   }
-  class $ extends i {
+  class g extends i {
     constructor(a) {
       super(), this.error = a;
     }
@@ -3388,12 +3491,12 @@ var scope = {};
       let M = N.length;
       for (; M--; ) {
         const q = N[M];
-        q.optimizeNames(a, h) || (ke(a, q.names), N.splice(M, 1));
+        q.optimizeNames(a, h) || (Te(a, q.names), N.splice(M, 1));
       }
       return N.length > 0 ? this : void 0;
     }
     get names() {
-      return this.nodes.reduce((a, h) => K(a, h.names), {});
+      return this.nodes.reduce((a, h) => J(a, h.names), {});
     }
   }
   class S extends C {
@@ -3425,7 +3528,7 @@ var scope = {};
         h = this.else = Array.isArray(N) ? new y(N) : N;
       }
       if (h)
-        return a === !1 ? h instanceof _ ? h : h.nodes : this.nodes.length ? this : new _(Ce(a), h instanceof _ ? [h] : h.nodes);
+        return a === !1 ? h instanceof _ ? h : h.nodes : this.nodes.length ? this : new _(ke(a), h instanceof _ ? [h] : h.nodes);
       if (!(a === !1 || !this.nodes.length))
         return this;
     }
@@ -3436,14 +3539,14 @@ var scope = {};
     }
     get names() {
       const a = super.names;
-      return ue(a, this.condition), this.else && K(a, this.else.names), a;
+      return ue(a, this.condition), this.else && J(a, this.else.names), a;
     }
   }
   _.kind = "if";
-  class g extends S {
+  class $ extends S {
   }
-  g.kind = "for";
-  class P extends g {
+  $.kind = "for";
+  class P extends $ {
     constructor(a) {
       super(), this.iteration = a;
     }
@@ -3455,10 +3558,10 @@ var scope = {};
         return this.iteration = oe(this.iteration, a, h), this;
     }
     get names() {
-      return K(super.names, this.iteration.names);
+      return J(super.names, this.iteration.names);
     }
   }
-  class I extends g {
+  class I extends $ {
     constructor(a, h, N, M) {
       super(), this.varKind = a, this.name = h, this.from = N, this.to = M;
     }
@@ -3471,7 +3574,7 @@ var scope = {};
       return ue(a, this.to);
     }
   }
-  class D extends g {
+  class D extends $ {
     constructor(a, h, N, M) {
       super(), this.loop = a, this.varKind = h, this.name = N, this.iterable = M;
     }
@@ -3483,7 +3586,7 @@ var scope = {};
         return this.iterable = oe(this.iterable, a, h), this;
     }
     get names() {
-      return K(super.names, this.iterable.names);
+      return J(super.names, this.iterable.names);
     }
   }
   class w extends S {
@@ -3516,7 +3619,7 @@ var scope = {};
     }
     get names() {
       const a = super.names;
-      return this.catch && K(a, this.catch.names), this.finally && K(a, this.finally.names), a;
+      return this.catch && J(a, this.catch.names), this.finally && J(a, this.finally.names), a;
     }
   }
   class V extends S {
@@ -3534,7 +3637,7 @@ var scope = {};
     }
   }
   x.kind = "finally";
-  class re {
+  class te {
     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 T()];
@@ -3656,7 +3759,7 @@ var scope = {};
     }
     // end `for` loop
     endFor() {
-      return this._endBlockNode(g);
+      return this._endBlockNode($);
     }
     // `label` statement
     label(a) {
@@ -3686,7 +3789,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) {
@@ -3744,14 +3847,14 @@ var scope = {};
       h[h.length - 1] = a;
     }
   }
-  e.CodeGen = re;
-  function K(b, a) {
+  e.CodeGen = te;
+  function J(b, a) {
     for (const h in a)
       b[h] = (b[h] || 0) + (a[h] || 0);
     return b;
   }
   function ue(b, a) {
-    return a instanceof t._CodeOrName ? K(b, a.names) : b;
+    return a instanceof t._CodeOrName ? J(b, a.names) : b;
   }
   function oe(b, a, h) {
     if (b instanceof t.Name)
@@ -3767,22 +3870,22 @@ 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(b, a) {
+  function Te(b, a) {
     for (const h in a)
       b[h] = (b[h] || 0) - (a[h] || 0);
   }
-  function Ce(b) {
+  function ke(b) {
     return typeof b == "boolean" || typeof b == "number" || b === null ? !b : (0, t._)`!${j(b)}`;
   }
-  e.not = Ce;
-  const qe = v(e.operators.AND);
-  function et(...b) {
-    return b.reduce(qe);
+  e.not = ke;
+  const Fe = v(e.operators.AND);
+  function Ze(...b) {
+    return b.reduce(Fe);
   }
-  e.and = et;
-  const Ue = v(e.operators.OR);
+  e.and = Ze;
+  const Me = v(e.operators.OR);
   function F(...b) {
-    return b.reduce(Ue);
+    return b.reduce(Me);
   }
   e.or = F;
   function v(b) {
@@ -3812,8 +3915,8 @@ var util = {};
     if (!A.strictSchema || typeof k == "boolean")
       return;
     const x = V.RULES.keywords;
-    for (const re in k)
-      x[re] || D(w, `unknown keyword: "${re}"`);
+    for (const te in k)
+      x[te] || D(w, `unknown keyword: "${te}"`);
   }
   e.checkUnknownRules = i;
   function o(w, k) {
@@ -3849,13 +3952,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, "~");
   }
@@ -3869,8 +3972,8 @@ var util = {};
   }
   e.eachItem = C;
   function S({ mergeNames: w, mergeToName: k, mergeValues: A, resultToName: V }) {
-    return (x, re, K, ue) => {
-      const oe = K === void 0 ? re : K instanceof t.Name ? (re instanceof t.Name ? w(x, re, K) : k(x, re, K), K) : re instanceof t.Name ? (k(x, K, re), re) : A(re, K);
+    return (x, te, J, ue) => {
+      const oe = J === void 0 ? te : J instanceof t.Name ? (te instanceof t.Name ? w(x, te, J) : k(x, te, J), J) : te instanceof t.Name ? (k(x, J, te), te) : A(te, J);
       return ue === t.Name && !(oe instanceof t.Name) ? V(x, oe) : oe;
     };
   }
@@ -3904,13 +4007,13 @@ var util = {};
   }
   e.setEvaluated = y;
   const _ = {};
-  function g(w, k) {
+  function $(w, k) {
     return w.scopeValue("func", {
       ref: k,
       code: _[k.code] || (_[k.code] = new r._Code(k.code))
     });
   }
-  e.useFunc = g;
+  e.useFunc = $;
   var P;
   (function(w) {
     w[w.Num = 0] = "Num", w[w.Str = 1] = "Str";
@@ -3920,7 +4023,7 @@ var util = {};
       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) {
@@ -3966,13 +4069,13 @@ names$1.default = names;
   }, e.keyword$DataError = {
     message: ({ keyword: y, schemaType: _ }) => _ ? (0, t.str)`"${y}" keyword must be ${_} ($data)` : (0, t.str)`"${y}" keyword is invalid ($data)`
   };
-  function s(y, _ = e.keywordError, g, P) {
-    const { it: I } = y, { gen: D, compositeRule: w, allErrors: k } = I, A = $(y, _, g);
+  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(y, _ = e.keywordError, g) {
-    const { it: P } = y, { gen: I, compositeRule: D, allErrors: w } = P, k = $(y, _, g);
+  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;
@@ -3980,22 +4083,22 @@ names$1.default = names;
     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: y, keyword: _, schemaValue: g, data: P, 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 = 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`, g), y.assign((0, t._)`${w}.data`, P));
+      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(y, _) {
-    const g = y.const("err", _);
-    y.if((0, t._)`${n.default.vErrors} === null`, () => y.assign(n.default.vErrors, (0, t._)`[${g}]`), (0, t._)`${n.default.vErrors}.push(${g})`), y.code((0, t._)`${n.default.errors}++`);
+    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(y, _) {
-    const { gen: g, validateName: P, schemaEnv: I } = y;
-    I.$async ? g.throw((0, t._)`new ${y.ValidationError}(${_})`) : (g.assign((0, t._)`${P}.errors`, _), g.return(!1));
+    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"),
@@ -4006,28 +4109,28 @@ names$1.default = names;
     schema: new t.Name("schema"),
     parentSchema: new t.Name("parentSchema")
   };
-  function $(y, _, g) {
+  function g(y, _, $) {
     const { createErrors: P } = y.it;
-    return P === !1 ? (0, t._)`{}` : O(y, _, g);
+    return P === !1 ? (0, t._)`{}` : O(y, _, $);
   }
-  function O(y, _, g = {}) {
+  function O(y, _, $ = {}) {
     const { gen: P, it: I } = y, D = [
-      C(I, g),
-      S(y, g)
+      C(I, $),
+      S(y, $)
     ];
     return T(y, _, D), P.object(...D);
   }
   function C({ errorPath: y }, { instancePath: _ }) {
-    const g = _ ? (0, t.str)`${y}${(0, r.getErrorPath)(_, r.Type.Str)}` : y;
-    return [n.default.instancePath, (0, t.strConcat)(n.default.instancePath, g)];
+    const $ = _ ? (0, t.str)`${y}${(0, r.getErrorPath)(_, r.Type.Str)}` : y;
+    return [n.default.instancePath, (0, t.strConcat)(n.default.instancePath, $)];
   }
-  function S({ keyword: y, it: { errSchemaPath: _ } }, { schemaPath: g, parentSchema: P }) {
+  function S({ keyword: y, it: { errSchemaPath: _ } }, { schemaPath: $, parentSchema: P }) {
     let I = P ? _ : (0, t.str)`${_}/${y}`;
-    return g && (I = (0, t.str)`${I}${(0, r.getErrorPath)(g, r.Type.Str)}`), [p.schemaPath, I];
+    return $ && (I = (0, t.str)`${I}${(0, r.getErrorPath)($, r.Type.Str)}`), [p.schemaPath, I];
   }
-  function T(y, { params: _, message: g }, 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 g == "function" ? g(y) : g]), A.verbose && P.push([p.schema, w], [p.parentSchema, (0, t._)`${x}${re}`], [n.default.data, D]), V && P.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: te } = 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}${te}`], [n.default.data, D]), V && P.push([p.propertyName, V]);
   }
 })(errors);
 Object.defineProperty(boolSchema, "__esModule", { value: !0 });
@@ -4127,7 +4230,7 @@ applicability.shouldUseRule = shouldUseRule;
   }
   e.getJSONTypes = d;
   function u(P, I) {
-    const { gen: D, data: w, opts: k } = P, A = $(I, k.coerceTypes), V = I.length > 0 && !(A.length === 0 && I.length === 1 && (0, r.schemaHasRulesForType)(P, I[0]));
+    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 = T(I, w, k.strictNumbers, o.Wrong);
       D.if(x, () => {
@@ -4138,19 +4241,19 @@ applicability.shouldUseRule = shouldUseRule;
   }
   e.coerceAndCheckDataType = u;
   const p = /* @__PURE__ */ new Set(["string", "number", "integer", "boolean", "null"]);
-  function $(P, I) {
+  function g(P, I) {
     return I ? P.filter((D) => p.has(D) || I === "array" && D === "array") : [];
   }
   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);
+    for (const J of D)
+      (p.has(J) || J === "array" && A.coerceTypes === "array") && te(J);
     w.else(), _(P), w.endIf(), w.if((0, s._)`${x} !== undefined`, () => {
       w.assign(k, x), C(P, x);
     });
-    function re(K) {
-      switch (K) {
+    function te(J) {
+      switch (J) {
         case "string":
           w.elseIf((0, s._)`${V} == "number" || ${V} == "boolean"`).assign(x, (0, s._)`"" + ${k}`).elseIf((0, s._)`${k} === null`).assign(x, (0, s._)`""`);
           return;
@@ -4225,11 +4328,11 @@ applicability.shouldUseRule = shouldUseRule;
     params: ({ schema: P, schemaValue: I }) => typeof P == "string" ? (0, s._)`{type: ${P}}` : (0, s._)`{type: ${I}}`
   };
   function _(P) {
-    const I = g(P);
+    const I = $(P);
     (0, n.reportError)(I, y);
   }
   e.reportTypeError = _;
-  function g(P) {
+  function $(P) {
     const { gen: I, data: D, schema: w } = P, k = (0, i.schemaRefOrVal)(P, w, "type");
     return {
       gen: I,
@@ -4319,14 +4422,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;
@@ -4396,8 +4499,8 @@ 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)
       T(), t.modifying && modifyData(e), y(() => e.error());
@@ -4408,19 +4511,19 @@ function funcKeywordCode(e, t) {
   }
   function C() {
     const _ = n.let("ruleErrs", null);
-    return n.try(() => T((0, codegen_1$p._)`await `), (g) => n.assign($, !1).if((0, codegen_1$p._)`${g} instanceof ${d.ValidationError}`, () => n.assign(_, (0, codegen_1$p._)`${g}.errors`), () => n.throw(g))), _;
+    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 S() {
     const _ = (0, codegen_1$p._)`${p}.errors`;
     return n.assign(_, null), T(codegen_1$p.nil), _;
   }
   function T(_ = t.async ? (0, codegen_1$p._)`await ` : codegen_1$p.nil) {
-    const g = d.opts.passContext ? names_1$4.default.this : names_1$4.default.self, P = !("compile" in t && !l || t.schema === !1);
-    n.assign($, (0, codegen_1$p._)`${_}${(0, code_1$9.callValidateCode)(e, p, g, P)}`, t.modifying);
+    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 y(_) {
-    var g;
-    n.if((0, codegen_1$p.not)((g = t.valid) !== null && g !== void 0 ? g : $), _);
+    var $;
+    n.if((0, codegen_1$p.not)(($ = t.valid) !== null && $ !== void 0 ? $ : g), _);
   }
 }
 keyword.funcKeywordCode = funcKeywordCode;
@@ -4499,8 +4602,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);
@@ -4605,17 +4708,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 C in $)
-            _traverse(e, t, r, $[C], s + "/" + p + "/" + escapeJsonPtr(C), i, s, p, n, C);
+        if (g && typeof g == "object")
+          for (var C in g)
+            _traverse(e, t, r, g[C], s + "/" + p + "/" + escapeJsonPtr(C), i, s, p, n, C);
       } 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);
   }
@@ -4699,21 +4802,21 @@ 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, C, S) => {
+  return traverse(e, { allKeys: !0 }, (g, O, C, S) => {
     if (S === void 0)
       return;
     const T = o + O;
     let y = i[S];
-    typeof $[r] == "string" && (y = _.call(this, $[r])), g.call(this, $.$anchor), g.call(this, $.$dynamicAnchor), i[O] = y;
+    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 (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($, D.schema, P) : P !== normalizeId(T) && (P[0] === "#" ? (u($, l[P], P), l[P] = $) : this.refs[P] = T), 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 g(P) {
+    function $(P) {
       if (typeof P == "string") {
         if (!ANCHOR.test(P))
           throw new Error(`invalid anchor "${P}"`);
@@ -4721,12 +4824,12 @@ function getSchemaRefs(e, t) {
       }
     }
   }), l;
-  function u($, O, C) {
-    if (O !== void 0 && !equal$2($, O))
+  function u(g, O, C) {
+    if (O !== void 0 && !equal$2(g, O))
       throw p(C);
   }
-  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;
@@ -4843,10 +4946,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}`));
   }
 }
@@ -5109,10 +5212,10 @@ function compileSchema(e) {
   let p;
   try {
     this._compilations.add(e), (0, validate_1$1.validateFunctionCode)(u), o.optimize(this.opts.code.optimize);
-    const $ = o.toString();
-    p = `${o.scopeRefs(names_1$2.default.scope)}return ${$}`, this.opts.code.process && (p = this.opts.code.process(p, e));
+    const g = o.toString();
+    p = `${o.scopeRefs(names_1$2.default.scope)}return ${g}`, this.opts.code.process && (p = this.opts.code.process(p, e));
     const C = new Function(`${names_1$2.default.self}`, `${names_1$2.default.scope}`, p)(this, this.scope.get());
-    if (this.scope.value(d, { ref: C }), C.errors = null, C.schema = e.schema, C.schemaEnv = e, e.$async && (C.$async = !0), this.opts.code.source === !0 && (C.source = { validateName: d, validateCode: $, scopeValues: o._values }), this.opts.unevaluated) {
+    if (this.scope.value(d, { ref: C }), C.errors = null, C.schema = e.schema, C.schemaEnv = e, e.$async && (C.$async = !0), this.opts.code.source === !0 && (C.source = { validateName: d, validateCode: g, scopeValues: o._values }), this.opts.unevaluated) {
       const { props: S, items: T } = u;
       C.evaluated = {
         props: S instanceof codegen_1$m.Name ? void 0 : S,
@@ -5122,8 +5225,8 @@ function compileSchema(e) {
       }, C.source && (C.source.evaluated = (0, codegen_1$m.stringify)(C.evaluated));
     }
     return e.validate = C, 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);
   }
@@ -5270,39 +5373,39 @@ var uri$1 = {}, uri_all = { exports: {} };
       return m;
     }
     function u(f) {
-      var c = "[A-Za-z]", m = "[0-9]", R = n(m, "[A-Fa-f]"), E = s(s("%[EFef]" + R + "%" + R + R + "%" + R + R) + "|" + s("%[89A-Fa-f]" + R + "%" + R + R) + "|" + s("%" + R + R)), 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);
+      var c = "[A-Za-z]", m = "[0-9]", R = n(m, "[A-Fa-f]"), E = s(s("%[EFef]" + R + "%" + R + R + "%" + R + R) + "|" + s("%[89A-Fa-f]" + R + "%" + R + R) + "|" + s("%" + R + R)), U = "[\\:\\/\\?\\#\\[\\]\\@]", L = "[\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=]", Q = n(U, L), Z = f ? "[\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]" : "[]", ne = f ? "[\\uE000-\\uF8FF]" : "[]", B = n(c, m, "[\\-\\.\\_\\~]", Z);
       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(R + "{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 + "|" + E) + "+");
+      var Y = s(s("25[0-5]") + "|" + s("2[0-4]" + m) + "|" + s("1" + m + m) + "|" + s("0?[1-9]" + m) + "|0?0?" + m), se = s(Y + "\\." + Y + "\\." + Y + "\\." + Y), z = s(R + "{1,4}"), X = s(s(z + "\\:" + z) + "|" + se), 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), xe = s(s(s(z + "\\:") + "{0,3}" + z) + "?\\:\\:" + z + "\\:" + X), Ne = 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) + "?\\:\\:"), Ie = s([ae, ee, Se, ge, $e, xe, Ne, fe, ye].join("|")), we = s(s(B + "|" + E) + "+");
       s("[vV]" + R + "+\\." + 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)) + "*"), {
+      var ot = s(E + "|" + n(B, L, "[\\:\\@]"));
+      return s(s(E + "|" + n(B, L, "[\\@]")) + "+"), s(s(ot + "|" + n("[\\/\\?]", ne)) + "*"), {
         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"),
         NOT_PATH_NOSCHEME: new RegExp(n("[^\\%\\/\\@]", B, L), "g"),
-        NOT_QUERY: new RegExp(n("[^\\%]", B, L, "[\\:\\@\\/\\?]", se), "g"),
+        NOT_QUERY: new RegExp(n("[^\\%]", B, L, "[\\:\\@\\/\\?]", ne), "g"),
         NOT_FRAGMENT: new RegExp(n("[^\\%]", B, L, "[\\:\\@\\/\\?]"), "g"),
         ESCAPE: new RegExp(n("[^]", B, L), "g"),
         UNRESERVED: new RegExp(B, "g"),
-        OTHER_CHARS: new RegExp(n("[^\\%]", B, J), "g"),
+        OTHER_CHARS: new RegExp(n("[^\\%]", B, Q), "g"),
         PCT_ENCODED: new RegExp(E, "g"),
-        IPV4ADDRESS: new RegExp("^(" + ie + ")$"),
-        IPV6ADDRESS: new RegExp("^\\[?(" + je + ")" + s(s("\\%25|\\%(?!" + R + "{2})") + "(" + we + ")") + "?\\]?$")
+        IPV4ADDRESS: new RegExp("^(" + se + ")$"),
+        IPV6ADDRESS: new RegExp("^\\[?(" + Ie + ")" + s(s("\\%25|\\%(?!" + R + "{2})") + "(" + we + ")") + "?\\]?$")
         //RFC 6874, with relaxed parsing rules
       };
     }
-    var p = u(!1), $ = u(!0), O = function() {
+    var p = u(!1), g = u(!0), O = function() {
       function f(c, m) {
         var R = [], E = !0, U = !1, L = void 0;
         try {
-          for (var J = c[Symbol.iterator](), Y; !(E = (Y = J.next()).done) && (R.push(Y.value), !(m && R.length === m)); E = !0)
+          for (var Q = c[Symbol.iterator](), Z; !(E = (Z = Q.next()).done) && (R.push(Z.value), !(m && R.length === m)); E = !0)
             ;
-        } catch (se) {
-          U = !0, L = se;
+        } catch (ne) {
+          U = !0, L = ne;
         } finally {
           try {
-            !E && J.return && J.return();
+            !E && Q.return && Q.return();
           } finally {
             if (U)
               throw L;
@@ -5324,26 +5427,26 @@ var uri$1 = {}, uri_all = { exports: {} };
         return m;
       } else
         return Array.from(f);
-    }, S = 2147483647, T = 36, y = 1, _ = 26, g = 38, P = 700, I = 72, D = 128, w = "-", k = /^xn--/, A = /[^\0-\x7E]/, V = /[\x2E\u3002\uFF0E\uFF61]/g, x = {
+    }, S = 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 = T - y, K = Math.floor, ue = String.fromCharCode;
+    }, te = T - y, J = Math.floor, ue = String.fromCharCode;
     function oe(f) {
       throw new RangeError(x[f]);
     }
-    function ke(f, c) {
+    function Te(f, c) {
       for (var m = [], R = f.length; R--; )
         m[R] = c(f[R]);
       return m;
     }
-    function Ce(f, c) {
+    function ke(f, c) {
       var m = f.split("@"), R = "";
       m.length > 1 && (R = m[0] + "@", f = m[1]), f = f.replace(V, ".");
-      var E = f.split("."), U = ke(E, c).join(".");
+      var E = f.split("."), U = Te(E, c).join(".");
       return R + U;
     }
-    function qe(f) {
+    function Fe(f) {
       for (var c = [], m = 0, R = f.length; m < R; ) {
         var E = f.charCodeAt(m++);
         if (E >= 55296 && E <= 56319 && m < R) {
@@ -5354,113 +5457,113 @@ var uri$1 = {}, uri_all = { exports: {} };
       }
       return c;
     }
-    var et = function(c) {
+    var Ze = function(c) {
       return String.fromCodePoint.apply(String, C(c));
-    }, Ue = function(c) {
+    }, Me = function(c) {
       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, R) {
       var E = 0;
       for (
-        c = R ? K(c / P) : c >> 1, c += K(c / m);
+        c = R ? J(c / P) : c >> 1, c += J(c / m);
         /* no initialization */
-        c > re * _ >> 1;
+        c > te * _ >> 1;
         E += T
       )
-        c = K(c / re);
-      return K(E + (re + 1) * c / (c + g));
+        c = J(c / te);
+      return J(E + (te + 1) * c / (c + $));
     }, j = function(c) {
-      var m = [], R = 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"), m.push(c.charCodeAt(Y));
-      for (var se = J > 0 ? J + 1 : 0; se < R; ) {
+      var m = [], R = c.length, E = 0, U = D, L = I, Q = c.lastIndexOf(w);
+      Q < 0 && (Q = 0);
+      for (var Z = 0; Z < Q; ++Z)
+        c.charCodeAt(Z) >= 128 && oe("not-basic"), m.push(c.charCodeAt(Z));
+      for (var ne = Q > 0 ? Q + 1 : 0; ne < R; ) {
         for (
-          var B = E, Z = 1, ie = T;
+          var B = E, Y = 1, se = T;
           ;
           /* no condition */
-          ie += T
+          se += T
         ) {
-          se >= R && oe("invalid-input");
-          var z = Ue(c.charCodeAt(se++));
-          (z >= T || z > K((S - E) / Z)) && oe("overflow"), E += z * Z;
-          var X = ie <= L ? y : ie >= L + _ ? _ : ie - L;
+          ne >= R && oe("invalid-input");
+          var z = Me(c.charCodeAt(ne++));
+          (z >= T || z > J((S - E) / Y)) && oe("overflow"), E += z * Y;
+          var X = se <= L ? y : se >= L + _ ? _ : se - L;
           if (z < X)
             break;
           var ae = T - X;
-          Z > K(S / ae) && oe("overflow"), Z *= ae;
+          Y > J(S / ae) && oe("overflow"), Y *= ae;
         }
         var ee = m.length + 1;
-        L = v(E - B, ee, B == 0), K(E / ee) > S - U && oe("overflow"), U += K(E / ee), E %= ee, m.splice(E++, 0, U);
+        L = v(E - B, ee, B == 0), J(E / ee) > S - U && oe("overflow"), U += J(E / ee), E %= ee, m.splice(E++, 0, U);
       }
       return String.fromCodePoint.apply(String, m);
     }, b = function(c) {
       var m = [];
-      c = qe(c);
-      var R = c.length, E = D, U = 0, L = I, J = !0, Y = !1, se = void 0;
+      c = Fe(c);
+      var R = c.length, E = D, U = 0, L = I, Q = !0, Z = !1, ne = void 0;
       try {
-        for (var B = c[Symbol.iterator](), Z; !(J = (Z = B.next()).done); J = !0) {
-          var ie = Z.value;
-          ie < 128 && m.push(ue(ie));
+        for (var B = c[Symbol.iterator](), Y; !(Q = (Y = B.next()).done); Q = !0) {
+          var se = Y.value;
+          se < 128 && m.push(ue(se));
         }
-      } catch (lt) {
-        Y = !0, se = lt;
+      } catch (at) {
+        Z = !0, ne = at;
       } finally {
         try {
-          !J && B.return && B.return();
+          !Q && B.return && B.return();
         } finally {
-          if (Y)
-            throw se;
+          if (Z)
+            throw ne;
         }
       }
       var z = m.length, X = z;
       for (z && m.push(w); X < R; ) {
-        var ae = S, ee = !0, Se = !1, $e = void 0;
+        var ae = S, ee = !0, Se = !1, ge = void 0;
         try {
-          for (var ge = c[Symbol.iterator](), Be; !(ee = (Be = ge.next()).done); ee = !0) {
-            var Ie = Be.value;
-            Ie >= E && Ie < ae && (ae = Ie);
+          for (var $e = c[Symbol.iterator](), xe; !(ee = (xe = $e.next()).done); ee = !0) {
+            var Ne = xe.value;
+            Ne >= E && Ne < ae && (ae = Ne);
           }
-        } catch (lt) {
-          Se = !0, $e = lt;
+        } catch (at) {
+          Se = !0, ge = at;
         } finally {
           try {
-            !ee && ge.return && ge.return();
+            !ee && $e.return && $e.return();
           } finally {
             if (Se)
-              throw $e;
+              throw ge;
           }
         }
         var fe = X + 1;
-        ae - E > K((S - U) / fe) && oe("overflow"), U += (ae - E) * fe, E = ae;
-        var ye = !0, je = !1, we = void 0;
+        ae - E > J((S - U) / fe) && oe("overflow"), U += (ae - E) * fe, E = ae;
+        var ye = !0, Ie = !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 < E && ++U > S && oe("overflow"), Ht == E) {
+          for (var ot = c[Symbol.iterator](), Ht; !(ye = (Ht = ot.next()).done); ye = !0) {
+            var Vt = Ht.value;
+            if (Vt < E && ++U > S && oe("overflow"), Vt == E) {
               for (
-                var pt = U, ft = T;
+                var dt = U, ut = T;
                 ;
                 /* no condition */
-                ft += T
+                ut += T
               ) {
-                var ht = ft <= L ? y : ft >= L + _ ? _ : ft - L;
-                if (pt < ht)
+                var pt = ut <= L ? y : ut >= L + _ ? _ : ut - L;
+                if (dt < pt)
                   break;
-                var Vt = pt - ht, zt = T - ht;
-                m.push(ue(F(ht + Vt % zt, 0))), pt = K(Vt / zt);
+                var zt = dt - pt, xt = T - pt;
+                m.push(ue(F(pt + zt % xt, 0))), dt = J(zt / xt);
               }
-              m.push(ue(F(pt, 0))), L = v(U, fe, X == z), U = 0, ++X;
+              m.push(ue(F(dt, 0))), L = v(U, fe, X == z), U = 0, ++X;
             }
           }
-        } catch (lt) {
-          je = !0, we = lt;
+        } catch (at) {
+          Ie = !0, we = at;
         } finally {
           try {
-            !ye && ct.return && ct.return();
+            !ye && ot.return && ot.return();
           } finally {
-            if (je)
+            if (Ie)
               throw we;
           }
         }
@@ -5468,11 +5571,11 @@ var uri$1 = {}, uri_all = { exports: {} };
       }
       return m.join("");
     }, a = function(c) {
-      return Ce(c, function(m) {
+      return ke(c, function(m) {
         return k.test(m) ? j(m.slice(4).toLowerCase()) : m;
       });
     }, h = function(c) {
-      return Ce(c, function(m) {
+      return ke(c, function(m) {
         return A.test(m) ? "xn--" + b(m) : m;
       });
     }, N = {
@@ -5490,8 +5593,8 @@ var uri$1 = {}, uri_all = { exports: {} };
        * @type Object
        */
       ucs2: {
-        decode: qe,
-        encode: et
+        decode: Fe,
+        encode: Ze
       },
       decode: j,
       encode: b,
@@ -5516,8 +5619,8 @@ var uri$1 = {}, uri_all = { exports: {} };
           m += 6;
         } else if (E >= 224) {
           if (R - 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);
+            var L = parseInt(f.substr(m + 4, 2), 16), Q = parseInt(f.substr(m + 7, 2), 16);
+            c += String.fromCharCode((E & 15) << 12 | (L & 63) << 6 | Q & 63);
           } else
             c += f.substr(m, 9);
           m += 9;
@@ -5533,44 +5636,44 @@ var uri$1 = {}, uri_all = { exports: {} };
       }
       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) {
+    function re(f) {
       return f.replace(/^0*(.*)/, "$1") || "0";
     }
     function he(f, c) {
       var m = f.match(c.IPV4ADDRESS) || [], R = O(m, 2), E = R[1];
-      return E ? E.split(".").map(ne).join(".") : f;
+      return E ? E.split(".").map(re).join(".") : f;
     }
-    function Le(f, c) {
+    function qe(f, c) {
       var m = f.match(c.IPV6ADDRESS) || [], R = O(m, 3), E = R[1], U = R[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) {
+        for (var L = E.toLowerCase().split("::").reverse(), Q = O(L, 2), Z = Q[0], ne = Q[1], B = ne ? ne.split(":").map(re) : [], Y = Z.split(":").map(re), se = c.IPV4ADDRESS.test(Y[Y.length - 1]), z = se ? 7 : 8, X = Y.length - z, ae = Array(z), ee = 0; ee < z; ++ee)
+          ae[ee] = B[ee] || Y[X + ee] || "";
+        se && (ae[z - 1] = he(ae[z - 1], c));
+        var Se = ae.reduce(function(fe, ye, Ie) {
           if (!ye || ye === "0") {
             var we = fe[fe.length - 1];
-            we && we.index + we.length === je ? we.length++ : fe.push({ index: je, length: 1 });
+            we && we.index + we.length === Ie ? we.length++ : fe.push({ index: Ie, 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 xe = ae.slice(0, ge.index), Ne = ae.slice(ge.index + ge.length);
+          $e = xe.join(":") + "::" + Ne.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;
+    var Xe = /^(?:([^:\/?#]+):)?(?:\/\/((?:([^\/?#@]*)@)?(\[[^\/?#\]]+\]|[^\/?#:]*)(?:\:(\d*))?))?([^?#]*)(?:\?([^#]*))?(?:#((?:.|\n|\r)*))?/i, et = "".match(/(){0}/)[1] === void 0;
     function de(f) {
-      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = {}, R = c.iri !== !1 ? $ : p;
+      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = {}, R = c.iri !== !1 ? g : p;
       c.reference === "suffix" && (f = (c.scheme ? c.scheme + ":" : "") + "//" + f);
-      var E = f.match(tt);
+      var E = f.match(Xe);
       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, R), R)), 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.");
+        et ? (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 = qe(he(m.host, R), R)), 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 (m.host && (c.domainHost || U && U.domainHost))
@@ -5587,25 +5690,25 @@ var uri$1 = {}, uri_all = { exports: {} };
         m.error = m.error || "URI can not be parsed.";
       return m;
     }
-    function nt(f, c) {
-      var m = c.iri !== !1 ? $ : p, R = [];
-      return f.userinfo !== void 0 && (R.push(f.userinfo), R.push("@")), f.host !== void 0 && R.push(Le(he(String(f.host), m), m).replace(m.IPV6ADDRESS, function(E, U, L) {
+    function tt(f, c) {
+      var m = c.iri !== !1 ? g : p, R = [];
+      return f.userinfo !== void 0 && (R.push(f.userinfo), R.push("@")), f.host !== void 0 && R.push(qe(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") && (R.push(":"), R.push(String(f.port))), R.length ? R.join("") : void 0;
     }
-    var He = /^\.\.?\//, Ve = /^\/\.(\/|$)/, ze = /^\/\.\.(\/|$)/, st = /^\/?(?:.|\n)*?(?=\/|$)/;
+    var Ue = /^\.\.?\//, Le = /^\/\.(\/|$)/, He = /^\/\.\.(\/|$)/, rt = /^\/?(?:.|\n)*?(?=\/|$)/;
     function me(f) {
       for (var c = []; f.length; )
-        if (f.match(He))
-          f = f.replace(He, "");
-        else if (f.match(Ve))
-          f = f.replace(Ve, "/");
-        else if (f.match(ze))
-          f = f.replace(ze, "/"), c.pop();
+        if (f.match(Ue))
+          f = f.replace(Ue, "");
+        else if (f.match(Le))
+          f = f.replace(Le, "/");
+        else if (f.match(He))
+          f = f.replace(He, "/"), c.pop();
         else if (f === "." || f === "..")
           f = "";
         else {
-          var m = f.match(st);
+          var m = f.match(rt);
           if (m) {
             var R = m[0];
             f = f.slice(R.length), c.push(R);
@@ -5615,44 +5718,44 @@ var uri$1 = {}, uri_all = { exports: {} };
       return c.join("");
     }
     function le(f) {
-      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = c.iri ? $ : p, R = [], E = M[(c.scheme || f.scheme || "").toLowerCase()];
+      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = c.iri ? g : p, R = [], 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 ? N.toUnicode(f.host) : N.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;
+          } catch (Q) {
+            f.error = f.error || "Host's domain name can not be converted to " + (c.iri ? "Unicode" : "ASCII") + " via punycode: " + Q;
           }
       }
       G(f, m), c.reference !== "suffix" && f.scheme && (R.push(f.scheme), R.push(":"));
-      var U = nt(f, c);
+      var U = tt(f, c);
       if (U !== void 0 && (c.reference !== "suffix" && R.push("//"), R.push(U), f.path && f.path.charAt(0) !== "/" && R.push("/")), f.path !== void 0) {
         var L = f.path;
         !c.absolutePath && (!E || !E.absolutePath) && (L = me(L)), U === void 0 && (L = L.replace(/^\/\//, "/%2F")), R.push(L);
       }
       return f.query !== void 0 && (R.push("?"), R.push(f.query)), f.fragment !== void 0 && (R.push("#"), R.push(f.fragment)), R.join("");
     }
-    function xe(f, c) {
+    function Ve(f, c) {
       var m = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, R = arguments[3], E = {};
       return R || (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, m) {
+    function nt(f, c, m) {
       var R = d({ scheme: "null" }, m);
-      return le(xe(de(f, R), de(c, R), R, !0), R);
+      return le(Ve(de(f, R), de(c, R), R, !0), R);
     }
-    function Oe(f, c) {
+    function Ce(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, m) {
+    function st(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);
+    function lt(f, c) {
+      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 = {
+    var Oe = {
       scheme: "http",
       domainHost: !0,
       parse: function(c, m) {
@@ -5662,50 +5765,50 @@ var uri$1 = {}, uri_all = { exports: {} };
         var R = String(c.scheme).toLowerCase() === "https";
         return (c.port === (R ? 443 : 80) || c.port === "") && (c.port = void 0), c.path || (c.path = "/"), c;
       }
-    }, It = {
+    }, jt = {
       scheme: "https",
-      domainHost: Ne.domainHost,
-      parse: Ne.parse,
-      serialize: Ne.serialize
+      domainHost: Oe.domainHost,
+      parse: Oe.parse,
+      serialize: Oe.serialize
     };
-    function jt(f) {
+    function At(f) {
       return typeof f.secure == "boolean" ? f.secure : String(f.scheme).toLowerCase() === "wss";
     }
-    var at = {
+    var it = {
       scheme: "ws",
       domainHost: !0,
       parse: function(c, m) {
         var R = c;
-        return R.secure = jt(R), R.resourceName = (R.path || "/") + (R.query ? "?" + R.query : ""), R.path = void 0, R.query = void 0, R;
+        return R.secure = At(R), R.resourceName = (R.path || "/") + (R.query ? "?" + R.query : ""), R.path = void 0, R.query = void 0, R;
       },
       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) {
+        if ((c.port === (At(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 R = c.resourceName.split("?"), E = O(R, 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;
       }
-    }, At = {
+    }, Dt = {
       scheme: "wss",
-      domainHost: at.domainHost,
-      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 Ot(f) {
+      domainHost: it.domainHost,
+      parse: it.parse,
+      serialize: it.serialize
+    }, lr = {}, Ft = "[A-Za-z0-9\\-\\.\\_\\~\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]", _e = "[0-9A-Fa-f]", dr = s(s("%[EFef]" + _e + "%" + _e + _e + "%" + _e + _e) + "|" + s("%[89A-Fa-f]" + _e + "%" + _e + _e) + "|" + s("%" + _e + _e)), ur = "[A-Za-z0-9\\!\\$\\%\\'\\*\\+\\-\\^\\_\\`\\{\\|\\}\\~]", pr = "[\\!\\$\\%\\'\\(\\)\\*\\+\\,\\-\\.0-9\\<\\>A-Z\\x5E-\\x7E]", fr = n(pr, '[\\"\\\\]'), hr = "[\\!\\$\\'\\(\\)\\*\\+\\,\\;\\:\\@]", mr = new RegExp(Ft, "g"), ze = new RegExp(dr, "g"), _r = new RegExp(n("[^]", ur, "[\\.]", '[\\"]', fr), "g"), Mt = new RegExp(n("[^]", Ft, hr), "g"), gr = Mt;
+    function Nt(f) {
       var c = W(f);
-      return c.match(ur) ? c : f;
+      return c.match(mr) ? c : f;
     }
-    var Mt = {
+    var qt = {
       scheme: "mailto",
       parse: function(c, m) {
         var R = c, E = R.to = R.path ? R.path.split(",") : [];
         if (R.path = void 0, R.query) {
-          for (var U = !1, L = {}, J = R.query.split("&"), Y = 0, se = J.length; Y < se; ++Y) {
-            var B = J[Y].split("=");
+          for (var U = !1, L = {}, Q = R.query.split("&"), Z = 0, ne = Q.length; Z < ne; ++Z) {
+            var B = Q[Z].split("=");
             switch (B[0]) {
               case "to":
-                for (var Z = B[1].split(","), ie = 0, z = Z.length; ie < z; ++ie)
-                  E.push(Z[ie]);
+                for (var Y = B[1].split(","), se = 0, z = Y.length; se < z; ++se)
+                  E.push(Y[se]);
                 break;
               case "subject":
                 R.subject = pe(B[1], m);
@@ -5739,30 +5842,30 @@ var uri$1 = {}, uri_all = { exports: {} };
         var R = 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);
+            var Q = String(E[U]), Z = Q.lastIndexOf("@"), ne = Q.slice(0, Z).replace(ze, Nt).replace(ze, o).replace(_r, q), B = Q.slice(Z + 1);
             try {
               B = m.iri ? N.toUnicode(B) : N.toASCII(pe(B, m).toLowerCase());
             } catch (X) {
               R.error = R.error || "Email address's domain name can not be converted to " + (m.iri ? "Unicode" : "ASCII") + " via punycode: " + X;
             }
-            E[U] = se + "@" + B;
+            E[U] = ne + "@" + B;
           }
           R.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, Ot).replace(We, o).replace(Ft, q) + "=" + Z[z].replace(We, Ot).replace(We, o).replace(fr, q));
-        return ie.length && (R.query = ie.join("&")), R;
+        var Y = c.headers = c.headers || {};
+        c.subject && (Y.subject = c.subject), c.body && (Y.body = c.body);
+        var se = [];
+        for (var z in Y)
+          Y[z] !== lr[z] && se.push(z.replace(ze, Nt).replace(ze, o).replace(Mt, q) + "=" + Y[z].replace(ze, Nt).replace(ze, o).replace(gr, q));
+        return se.length && (R.query = se.join("&")), R;
       }
-    }, hr = /^([^\:]+)\:(.*)/, qt = {
+    }, $r = /^([^\:]+)\:(.*)/, Ut = {
       scheme: "urn",
       parse: function(c, m) {
-        var R = c.path && c.path.match(hr), E = c;
+        var R = c.path && c.path.match($r), E = c;
         if (R) {
-          var U = m.scheme || E.scheme || "urn", L = R[1].toLowerCase(), J = R[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));
+          var U = m.scheme || E.scheme || "urn", L = R[1].toLowerCase(), Q = R[2], Z = U + ":" + (m.nid || L), ne = M[Z];
+          E.nid = L, E.nss = Q, E.path = void 0, ne && (E = ne.parse(E, m));
         } else
           E.error = E.error || "URN can not be parsed.";
         return E;
@@ -5770,21 +5873,21 @@ var uri$1 = {}, uri_all = { exports: {} };
       serialize: function(c, m) {
         var R = m.scheme || c.scheme || "urn", E = c.nid, U = R + ":" + (m.nid || E), L = M[U];
         L && (c = L.serialize(c, m));
-        var J = c, Y = c.nss;
-        return J.path = (E || m.nid) + ":" + Y, J;
+        var Q = c, Z = c.nss;
+        return Q.path = (E || m.nid) + ":" + Z, Q;
       }
-    }, mr = /^[0-9A-Fa-f]{8}(?:\-[0-9A-Fa-f]{4}){3}\-[0-9A-Fa-f]{12}$/, Ut = {
+    }, yr = /^[0-9A-Fa-f]{8}(?:\-[0-9A-Fa-f]{4}){3}\-[0-9A-Fa-f]{12}$/, Lt = {
       scheme: "urn:uuid",
       parse: function(c, m) {
         var R = c;
-        return R.uuid = R.nss, R.nss = void 0, !m.tolerant && (!R.uuid || !R.uuid.match(mr)) && (R.error = R.error || "UUID is not valid."), R;
+        return R.uuid = R.nss, R.nss = void 0, !m.tolerant && (!R.uuid || !R.uuid.match(yr)) && (R.error = R.error || "UUID is not valid."), R;
       },
       serialize: function(c, m) {
         var R = c;
         return R.nss = (c.uuid || "").toLowerCase(), R;
       }
     };
-    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 });
+    M[Oe.scheme] = Oe, M[jt.scheme] = jt, M[it.scheme] = it, M[Dt.scheme] = Dt, M[qt.scheme] = qt, M[Ut.scheme] = Ut, M[Lt.scheme] = Lt, r.SCHEMES = M, r.pctEncChar = q, r.pctDecChars = W, r.parse = de, r.removeDotSegments = me, r.serialize = le, r.resolveComponents = Ve, r.resolve = nt, r.normalize = Ce, r.equal = st, r.escapeComponent = lt, r.unescapeComponent = pe, Object.defineProperty(r, "__esModule", { value: !0 });
   });
 })(uri_all, uri_all.exports);
 var uri_allExports = uri_all.exports;
@@ -5812,7 +5915,7 @@ uri$1.default = uri;
   } }), Object.defineProperty(e, "CodeGen", { enumerable: !0, get: function() {
     return r.CodeGen;
   } });
-  const n = validation_error, s = ref_error, i = rules, o = compile, l = codegen, d = resolve$1, u = dataType, p = util, $ = require$$9, O = uri$1, C = (F, v) => new RegExp(F, v);
+  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, C = (F, v) => new RegExp(F, v);
   C.code = "new RegExp";
   const S = ["removeAdditional", "useDefaults", "coerceTypes"], T = /* @__PURE__ */ new Set([
     "validate",
@@ -5848,36 +5951,36 @@ uri$1.default = uri;
     ignoreKeywordsWithRef: "",
     jsPropertySyntax: "",
     unicode: '"minLength"/"maxLength" account for unicode characters by default.'
-  }, g = 200;
+  }, $ = 200;
   function P(F) {
-    var v, j, b, a, h, N, 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 : C, Ne = (a = F.uriResolver) !== null && a !== void 0 ? a : O.default;
+    var v, j, b, a, h, N, M, q, W, G, re, he, qe, Xe, et, de, tt, Ue, Le, He, rt, me, le, Ve, nt;
+    const Ce = F.strict, st = (v = F.code) === null || v === void 0 ? void 0 : v.optimize, lt = st === !0 || st === void 0 ? 1 : st || 0, pe = (b = (j = F.code) === null || j === void 0 ? void 0 : j.regExp) !== null && b !== void 0 ? b : C, Oe = (a = F.uriResolver) !== null && a !== void 0 ? a : O.default;
     return {
-      strictSchema: (N = (h = F.strictSchema) !== null && h !== void 0 ? h : Oe) !== null && N !== void 0 ? N : !0,
-      strictNumbers: (q = (M = F.strictNumbers) !== null && M !== void 0 ? M : Oe) !== null && q !== void 0 ? q : !0,
-      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 : g,
-      loopEnum: (de = F.loopEnum) !== null && de !== void 0 ? de : g,
-      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,
-      schemaId: (ze = F.schemaId) !== null && ze !== void 0 ? ze : "$id",
-      addUsedSchema: (st = F.addUsedSchema) !== null && st !== void 0 ? st : !0,
+      strictSchema: (N = (h = F.strictSchema) !== null && h !== void 0 ? h : Ce) !== null && N !== void 0 ? N : !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 = (re = F.strictTuples) !== null && re !== void 0 ? re : Ce) !== null && he !== void 0 ? he : "log",
+      strictRequired: (Xe = (qe = F.strictRequired) !== null && qe !== void 0 ? qe : Ce) !== null && Xe !== void 0 ? Xe : !1,
+      code: F.code ? { ...F.code, optimize: lt, regExp: pe } : { optimize: lt, regExp: pe },
+      loopRequired: (et = F.loopRequired) !== null && et !== void 0 ? et : $,
+      loopEnum: (de = F.loopEnum) !== null && de !== void 0 ? de : $,
+      meta: (tt = F.meta) !== null && tt !== void 0 ? tt : !0,
+      messages: (Ue = F.messages) !== null && Ue !== void 0 ? Ue : !0,
+      inlineRefs: (Le = F.inlineRefs) !== null && Le !== void 0 ? Le : !0,
+      schemaId: (He = F.schemaId) !== null && He !== void 0 ? He : "$id",
+      addUsedSchema: (rt = F.addUsedSchema) !== null && rt !== void 0 ? rt : !0,
       validateSchema: (me = F.validateSchema) !== null && me !== void 0 ? me : !0,
       validateFormats: (le = F.validateFormats) !== null && le !== void 0 ? le : !0,
-      unicodeRegExp: (xe = F.unicodeRegExp) !== null && xe !== void 0 ? xe : !0,
-      int32range: (it = F.int32range) !== null && it !== void 0 ? it : !0,
-      uriResolver: Ne
+      unicodeRegExp: (Ve = F.unicodeRegExp) !== null && Ve !== void 0 ? Ve : !0,
+      int32range: (nt = F.int32range) !== null && nt !== void 0 ? nt : !0,
+      uriResolver: Oe
     };
   }
   class I {
     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);
+      this.scope = new l.ValueScope({ scope: {}, prefixes: T, es5: j, lines: b }), this.logger = J(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;
     }
@@ -5886,8 +5989,8 @@ uri$1.default = uri;
     }
     _addDefaultMetaSchema() {
       const { $data: v, meta: j, schemaId: b } = this.opts;
-      let a = $;
-      b === "id" && (a = { ...$ }, a.id = a.$id, delete a.$id), j && v && this.addMetaSchema(a, a[b], !1);
+      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: v, schemaId: j } = this.opts;
@@ -5912,9 +6015,9 @@ uri$1.default = uri;
         throw new Error("options.loadSchema should be a function");
       const { loadSchema: b } = this.opts;
       return a.call(this, v, j);
-      async function a(G, ne) {
+      async function a(G, re) {
         await h.call(this, G.$schema);
-        const he = this._addSchema(G, ne);
+        const he = this._addSchema(G, re);
         return he.validate || N.call(this, he);
       }
       async function h(G) {
@@ -5923,24 +6026,24 @@ uri$1.default = uri;
       async function N(G) {
         try {
           return this._compileSchemaEnv(G);
-        } catch (ne) {
-          if (!(ne instanceof s.default))
-            throw ne;
-          return M.call(this, ne), await q.call(this, ne.missingSchema), N.call(this, G);
+        } catch (re) {
+          if (!(re instanceof s.default))
+            throw re;
+          return M.call(this, re), await q.call(this, re.missingSchema), N.call(this, G);
         }
       }
-      function M({ missingSchema: G, missingRef: ne }) {
+      function M({ missingSchema: G, missingRef: re }) {
         if (this.refs[G])
-          throw new Error(`AnySchema ${G} is loaded but ${ne} cannot be resolved`);
+          throw new Error(`AnySchema ${G} is loaded but ${re} cannot be resolved`);
       }
       async function q(G) {
-        const ne = await W.call(this, G);
-        this.refs[G] || await h.call(this, ne.$schema), this.refs[G] || this.addSchema(ne, G, j);
+        const re = await W.call(this, G);
+        this.refs[G] || await h.call(this, re.$schema), this.refs[G] || this.addSchema(re, G, j);
       }
       async function W(G) {
-        const ne = this._loading[G];
-        if (ne)
-          return ne;
+        const re = this._loading[G];
+        if (re)
+          return re;
         try {
           return await (this._loading[G] = b(G));
         } finally {
@@ -6041,14 +6144,14 @@ uri$1.default = uri;
       } else
         throw new Error("invalid addKeywords parameters");
       if (oe.call(this, b, j), !j)
-        return (0, p.eachItem)(b, (h) => ke.call(this, h)), this;
-      qe.call(this, j);
+        return (0, p.eachItem)(b, (h) => Te.call(this, h)), this;
+      Fe.call(this, j);
       const a = {
         ...j,
         type: (0, u.getJSONTypes)(j.type),
         schemaType: (0, u.getJSONTypes)(j.schemaType)
       };
-      return (0, p.eachItem)(b, a.type.length === 0 ? (h) => ke.call(this, h, a) : (h) => a.type.forEach((N) => ke.call(this, h, a, N))), this;
+      return (0, p.eachItem)(b, a.type.length === 0 ? (h) => Te.call(this, h, a) : (h) => a.type.forEach((N) => Te.call(this, h, a, N))), this;
     }
     getKeyword(v) {
       const j = this.RULES.all[v];
@@ -6084,7 +6187,7 @@ uri$1.default = uri;
           if (typeof q != "object")
             continue;
           const { $data: W } = q.definition, G = N[M];
-          W && G && (N[M] = Ue(G));
+          W && G && (N[M] = Me(G));
         }
       }
       return v;
@@ -6174,13 +6277,13 @@ uri$1.default = uri;
       delete F[v];
     return F;
   }
-  const re = { log() {
+  const te = { log() {
   }, warn() {
   }, error() {
   } };
-  function K(F) {
+  function J(F) {
     if (F === !1)
-      return re;
+      return te;
     if (F === void 0)
       return console;
     if (F.log && F.warn && F.error)
@@ -6198,7 +6301,7 @@ uri$1.default = uri;
     }), !!v && v.$data && !("code" in v || "validate" in v))
       throw new Error('$data keyword must have "code" or "validate" function');
   }
-  function ke(F, v, j) {
+  function Te(F, v, j) {
     var b;
     const a = v == null ? void 0 : v.post;
     if (j && a)
@@ -6215,21 +6318,21 @@ uri$1.default = uri;
         schemaType: (0, u.getJSONTypes)(v.schemaType)
       }
     };
-    v.before ? Ce.call(this, N, M, v.before) : N.rules.push(M), h.all[F] = M, (b = v.implements) === null || b === void 0 || b.forEach((q) => this.addKeyword(q));
+    v.before ? ke.call(this, N, M, v.before) : N.rules.push(M), h.all[F] = M, (b = v.implements) === null || b === void 0 || b.forEach((q) => this.addKeyword(q));
   }
-  function Ce(F, v, j) {
+  function ke(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) {
+  function Fe(F) {
     let { metaSchema: v } = F;
-    v !== void 0 && (F.$data && this.opts.$data && (v = Ue(v)), F.validateSchema = this.compile(v, !0));
+    v !== void 0 && (F.$data && this.opts.$data && (v = Me(v)), F.validateSchema = this.compile(v, !0));
   }
-  const et = {
+  const Ze = {
     $ref: "https://raw.githubusercontent.com/ajv-validator/ajv/master/lib/refs/data.json#"
   };
-  function Ue(F) {
-    return { anyOf: [F, et] };
+  function Me(F) {
+    return { anyOf: [F, Ze] };
   }
 })(core$2);
 var draft7 = {}, core$1 = {}, id = {};
@@ -6250,14 +6353,14 @@ const ref_error_1 = ref_error, code_1$8 = code, codegen_1$l = codegen, names_1$1
   code(e) {
     const { gen: t, schema: r, it: n } = e, { baseId: s, schemaEnv: i, validateName: o, opts: 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 C(p);
-    function $() {
+    function g() {
       if (i === u)
         return callRef(e, o, i, i.$async);
       const S = t.scopeValue("root", { ref: u });
@@ -6286,7 +6389,7 @@ 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");
@@ -6297,7 +6400,7 @@ function callRef(e, t, r, n) {
       s.if((0, codegen_1$l._)`!(${T} instanceof ${i.ValidationError})`, () => s.throw(T)), O(T), o || s.assign(S, !1);
     }), e.ok(S);
   }
-  function $() {
+  function g() {
     e.result((0, code_1$8.callValidateCode)(e, t, u), () => C(t), () => O(t));
   }
   function O(S) {
@@ -6471,7 +6574,7 @@ const code_1$6 = code, codegen_1$f = codegen, util_1$h = util, error$d = {
     }
     function u() {
       if (d || i)
-        e.block$data(codegen_1$f.nil, $);
+        e.block$data(codegen_1$f.nil, g);
       else
         for (const C of r)
           (0, code_1$6.checkReportMissingProp)(e, C);
@@ -6484,7 +6587,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, C)), (0, code_1$6.reportMissingProp)(e, C), t.else();
     }
-    function $() {
+    function g() {
       t.forOf("prop", n, (C) => {
         e.setParams({ missingProperty: C }), t.if((0, code_1$6.noPropertyInData)(t, s, C, l.ownProperties), () => e.error());
       });
@@ -6542,17 +6645,17 @@ const dataType_1 = dataType, codegen_1$d = codegen, util_1$g = util, equal_1$2 =
     e.block$data(d, p, (0, codegen_1$d._)`${o} === false`), e.ok(d);
     function p() {
       const S = t.let("i", (0, codegen_1$d._)`${r}.length`), T = t.let("j");
-      e.setParams({ i: S, j: T }), t.assign(d, !0), t.if((0, codegen_1$d._)`${S} > 1`, () => ($() ? O : C)(S, T));
+      e.setParams({ i: S, j: T }), t.assign(d, !0), t.if((0, codegen_1$d._)`${S} > 1`, () => (g() ? O : C)(S, T));
     }
-    function $() {
+    function g() {
       return u.length > 0 && !u.some((S) => S === "object" || S === "array");
     }
     function O(S, T) {
-      const y = t.name("item"), _ = (0, dataType_1.checkDataTypes)(u, y, l.opts.strictNumbers, dataType_1.DataType.Wrong), g = t.const("indices", (0, codegen_1$d._)`{}`);
+      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._)`;${S}--;`, () => {
-        t.let(y, (0, codegen_1$d._)`${r}[${S}]`), 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 ${g}[${y}] == "number"`, () => {
-          t.assign(T, (0, codegen_1$d._)`${g}[${y}]`), e.error(), t.assign(d, !1).break();
-        }).code((0, codegen_1$d._)`${g}[${y}] = ${S}`);
+        t.let(y, (0, codegen_1$d._)`${r}[${S}]`), 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}] = ${S}`);
       });
     }
     function C(S, T) {
@@ -6598,7 +6701,7 @@ const codegen_1$b = codegen, util_1$e = util, equal_1 = equal$1, error$9 = {
     const u = () => d ?? (d = (0, util_1$e.useFunc)(t, equal_1.default));
     let p;
     if (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");
@@ -6606,7 +6709,7 @@ const codegen_1$b = codegen, util_1$e = util, equal_1 = equal$1, error$9 = {
       p = (0, codegen_1$b.or)(...s.map((S, T) => O(C, T)));
     }
     e.pass(p);
-    function $() {
+    function g() {
       t.assign(p, !1), t.forOf("v", i, (C) => t.if((0, codegen_1$b._)`${u()}(${r}, ${C})`, () => t.assign(p, !0).break()));
     }
     function O(C, S) {
@@ -6695,15 +6798,15 @@ 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: C } = l, S = r.length, T = S === $.minItems && (S === $.maxItems || $[t] === !1);
+  function p(g) {
+    const { opts: O, errSchemaPath: C } = l, S = r.length, T = S === g.minItems && (S === g.maxItems || g[t] === !1);
     if (O.strictTuples && !T) {
       const y = `"${o}" is ${S}-tuple, but minItems or maxItems/${t} are not specified or different at path "${C}"`;
       (0, util_1$c.checkStrictMode)(l, y, O.strictTuples);
@@ -6770,8 +6873,8 @@ const codegen_1$7 = codegen, util_1$a = util, error$6 = {
       return;
     }
     i.items = !0;
-    const $ = t.name("valid");
-    l === void 0 && o === 1 ? C($, () => 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 ? C(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 T = t.name("_valid"), y = t.let("count", 0);
       C(T, () => t.if(T, () => S(y)));
@@ -6787,7 +6890,7 @@ const codegen_1$7 = codegen, util_1$a = util, error$6 = {
       });
     }
     function S(T) {
-      t.code((0, codegen_1$7._)`${T}++`), l === void 0 ? t.if((0, codegen_1$7._)`${T} >= ${o}`, () => t.assign($, !0).break()) : (t.if((0, codegen_1$7._)`${T} > ${l}`, () => t.assign($, !1).break()), o === 1 ? t.assign($, !0) : t.if((0, codegen_1$7._)`${T} >= ${o}`, () => t.assign($, !0)));
+      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)));
     }
   }
 };
@@ -6798,11 +6901,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
@@ -6819,16 +6922,16 @@ var dependencies = {};
   };
   function i({ schema: d }) {
     const u = {}, p = {};
-    for (const $ in d) {
-      if ($ === "__proto__")
+    for (const g in d) {
+      if (g === "__proto__")
         continue;
-      const 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 C = p.let("missing");
@@ -6836,7 +6939,7 @@ var dependencies = {};
       const T = u[S];
       if (T.length === 0)
         continue;
-      const y = (0, n.propertyInData)(p, $, S, O.opts.ownProperties);
+      const y = (0, n.propertyInData)(p, g, S, O.opts.ownProperties);
       d.setParams({
         property: S,
         depsCount: T.length,
@@ -6849,10 +6952,10 @@ var dependencies = {};
   }
   e.validatePropertyDeps = o;
   function l(d, u = d.schema) {
-    const { gen: p, data: $, keyword: O, it: C } = d, S = p.name("valid");
+    const { gen: p, data: g, keyword: O, it: C } = d, S = p.name("valid");
     for (const T in u)
       (0, r.alwaysValidSchema)(C, u[T]) || (p.if(
-        (0, n.propertyInData)(p, $, T, C.opts.ownProperties),
+        (0, n.propertyInData)(p, g, T, C.opts.ownProperties),
         () => {
           const y = d.subschema({ keyword: O, schemaProp: T }, S);
           d.mergeValidEvaluated(y, S);
@@ -6912,8 +7015,8 @@ 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 $() {
+    g(), e.ok((0, codegen_1$5._)`${i} === ${names_1.default.errors}`);
+    function g() {
       t.forIn("key", s, (y) => {
         !u.length && !p.length ? S(y) : t.if(O(y), () => S(y));
       });
@@ -6921,11 +7024,11 @@ const code_1$3 = code, codegen_1$5 = codegen, names_1 = names$1, util_1$8 = util
     function O(y) {
       let _;
       if (u.length > 8) {
-        const g = (0, util_1$8.schemaRefOrVal)(o, n.properties, "properties");
-        _ = (0, code_1$3.isOwnProperty)(t, g, y);
+        const $ = (0, util_1$8.schemaRefOrVal)(o, n.properties, "properties");
+        _ = (0, code_1$3.isOwnProperty)(t, $, y);
       } else
-        u.length ? _ = (0, codegen_1$5.or)(...u.map((g) => (0, codegen_1$5._)`${y} === ${g}`)) : _ = codegen_1$5.nil;
-      return p.length && (_ = (0, codegen_1$5.or)(_, ...p.map((g) => (0, codegen_1$5._)`${(0, code_1$3.usePattern)(e, g)}.test(${y})`))), (0, codegen_1$5.not)(_);
+        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 C(y) {
       t.code((0, codegen_1$5._)`delete ${s}[${y}]`);
@@ -6946,13 +7049,13 @@ const code_1$3 = code, codegen_1$5 = codegen, names_1 = names$1, util_1$8 = util
         })) : (T(y, _), l || t.if((0, codegen_1$5.not)(_), () => t.break()));
       }
     }
-    function T(y, _, g) {
+    function T(y, _, $) {
       const P = {
         keyword: "additionalProperties",
         dataProp: y,
         dataPropType: util_1$8.Type.Str
       };
-      g === !1 && Object.assign(P, {
+      $ === !1 && Object.assign(P, {
         compositeRule: !0,
         createErrors: !1,
         allErrors: !1
@@ -6971,23 +7074,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);
     }
   }
@@ -7005,7 +7108,7 @@ const code_1$1 = code, codegen_1$4 = codegen, util_1$6 = util, util_2 = util, de
       return;
     const u = o.strictSchema && !o.allowMatchingProperties && s.properties, p = t.name("valid");
     i.props !== !0 && !(i.props instanceof codegen_1$4.Name) && (i.props = (0, util_2.evaluatedPropsToName)(t, i.props));
-    const { props: $ } = i;
+    const { props: g } = i;
     O();
     function O() {
       for (const T of l)
@@ -7024,7 +7127,7 @@ const code_1$1 = code, codegen_1$4 = codegen, util_1$6 = util, util_2 = util, de
             schemaProp: T,
             dataProp: y,
             dataPropType: util_2.Type.Str
-          }, p), i.opts.unevaluated && $ !== !0 ? t.assign((0, codegen_1$4._)`${$}[${y}]`, !0) : !_ && !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());
         });
       });
     }
@@ -7083,14 +7186,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);
         });
       });
     }
@@ -7148,10 +7251,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 });
       };
     }
   }
@@ -7204,17 +7307,17 @@ 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() : C();
     function O() {
       const S = r.scopeValue("formats", {
-        ref: $.formats,
+        ref: g.formats,
         code: d.code.formats
       }), T = r.const("fDef", (0, codegen_1$1._)`${S}[${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)(g(), P()));
-      function g() {
+      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 P() {
@@ -7223,18 +7326,18 @@ const codegen_1$1 = codegen, error$1 = {
       }
     }
     function C() {
-      const S = $.formats[i];
+      const S = g.formats[i];
       if (!S) {
-        g();
+        $();
         return;
       }
       if (S === !0)
         return;
       const [T, y, _] = P(S);
       T === t && e.pass(I());
-      function g() {
+      function $() {
         if (d.strictSchema === !1) {
-          $.logger.warn(D());
+          g.logger.warn(D());
           return;
         }
         throw new Error(D());
@@ -7320,10 +7423,10 @@ const codegen_1 = codegen, types_1 = types, compile_1 = compile, util_1 = util,
       const C = O();
       t.if(!1);
       for (const S in C)
-        t.elseIf((0, codegen_1._)`${u} === ${S}`), t.assign(d, $(C[S]));
+        t.elseIf((0, codegen_1._)`${u} === ${S}`), t.assign(d, g(C[S]));
       t.else(), e.error(!1, { discrError: types_1.DiscrError.Mapping, tag: u, tagName: l }), t.endIf();
     }
-    function $(C) {
+    function g(C) {
       const S = t.name("valid"), T = e.subschema({ keyword: "oneOf", schemaProp: C }, S);
       return e.mergeEvaluated(T, codegen_1.Name), S;
     }
@@ -7337,7 +7440,7 @@ const codegen_1 = codegen, types_1 = types, compile_1 = compile, util_1 = util,
         const w = (C = D == null ? void 0 : D.properties) === null || C === void 0 ? void 0 : C[l];
         if (typeof w != "object")
           throw new Error(`discriminator: oneOf subschemas (or referenced schemas) must have "properties/${l}"`);
-        y = y && (T || _(D)), g(w, I);
+        y = y && (T || _(D)), $(w, I);
       }
       if (!y)
         throw new Error(`discriminator: "${l}" must be required`);
@@ -7345,7 +7448,7 @@ const codegen_1 = codegen, types_1 = types, compile_1 = compile, util_1 = util,
       function _({ required: I }) {
         return Array.isArray(I) && I.includes(l);
       }
-      function g(I, D) {
+      function $(I, D) {
         if (I.const)
           P(I.const, D);
         else if (I.enum)
@@ -7640,9 +7743,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() {
@@ -9248,13 +9351,13 @@ function compileBlueprint(e, {
   onStepCompleted: n = () => {
   }
 } = {}) {
-  var $, O, C, S, T, y, _;
+  var g, O, C, S, T, y, _;
   e = {
     ...e,
-    steps: (e.steps || []).filter(isStepDefinition)
+    steps: (e.steps || []).filter(isStepDefinition).filter(isStepStillSupported)
   };
-  for (const g of e.steps)
-    typeof g == "object" && g.step === "importFile" && (g.step = "importWxr", console.warn(
+  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({
@@ -9264,7 +9367,7 @@ function compileBlueprint(e, {
     step: "setSiteOptions",
     options: e.siteOptions
   }), e.plugins) {
-    const g = e.plugins.map((P) => typeof P == "string" ? P.startsWith("https://") ? {
+    const $ = e.plugins.map((P) => typeof P == "string" ? P.startsWith("https://") ? {
       resource: "url",
       url: P
     } : {
@@ -9274,17 +9377,17 @@ function compileBlueprint(e, {
       step: "installPlugin",
       pluginZipFile: P
     }));
-    e.steps.unshift(...g);
+    e.steps.unshift(...$);
   }
   e.login && e.steps.push({
     step: "login",
     ...e.login === !0 ? { username: "admin", password: "password" } : e.login
   }), e.phpExtensionBundles || (e.phpExtensionBundles = []), e.phpExtensionBundles || (e.phpExtensionBundles = []), e.phpExtensionBundles.length === 0 && e.phpExtensionBundles.push("kitchen-sink");
-  const s = ($ = e.steps) == null ? void 0 : $.findIndex(
-    (g) => typeof g == "object" && (g == null ? void 0 : g.step) === "wp-cli"
+  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.includes("light") && (e.phpExtensionBundles = e.phpExtensionBundles.filter(
-    (g) => g !== "light"
+    ($) => $ !== "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, {
@@ -9306,10 +9409,10 @@ function compileBlueprint(e, {
     path: "/tmp/wp-cli.phar"
   }));
   const i = (C = e.steps) == null ? void 0 : C.findIndex(
-    (g) => typeof g == "object" && (g == null ? void 0 : g.step) === "importWxr"
+    ($) => typeof $ == "object" && ($ == null ? void 0 : $.step) === "importWxr"
   );
   i !== void 0 && i > -1 && (e.phpExtensionBundles.includes("light") && (e.phpExtensionBundles = e.phpExtensionBundles.filter(
-    (g) => g !== "light"
+    ($) => $ !== "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. "
   )), (S = e.steps) == null || S.splice(i, 0, {
@@ -9322,19 +9425,19 @@ function compileBlueprint(e, {
   }));
   const { valid: o, errors: l } = validateBlueprint(e);
   if (!o) {
-    const g = new Error(
+    const $ = new Error(
       `Invalid blueprint: ${l[0].message} at ${l[0].instancePath}`
     );
-    throw g.errors = l, g;
+    throw $.errors = l, $;
   }
   const d = e.steps || [], u = d.reduce(
-    (g, P) => {
+    ($, P) => {
       var I;
-      return g + (((I = P.progress) == null ? void 0 : I.weight) || 1);
+      return $ + (((I = P.progress) == null ? void 0 : I.weight) || 1);
     },
     0
   ), p = d.map(
-    (g) => compileStep(g, {
+    ($) => compileStep($, {
       semaphore: r,
       rootProgressTracker: t,
       totalProgressWeight: u
@@ -9357,14 +9460,14 @@ function compileBlueprint(e, {
       // Disable networking by default
       networking: ((_ = e.features) == null ? void 0 : _.networking) ?? !1
     },
-    run: async (g) => {
+    run: async ($) => {
       try {
         for (const { resources: P } of p)
           for (const I of P)
-            I.setPlayground(g), I.isAsync && I.resolve();
+            I.setPlayground($), I.isAsync && I.resolve();
         for (const [P, { run: I, step: D }] of Object.entries(p))
           try {
-            const w = await I(g);
+            const w = await I($);
             n(w, D);
           } catch (w) {
             throw console.error(w), new Error(
@@ -9376,7 +9479,7 @@ function compileBlueprint(e, {
           }
       } finally {
         try {
-          await g.goTo(
+          await $.goTo(
             e.landingPage || "/"
           );
         } catch {
@@ -9419,6 +9522,11 @@ function compilePHPExtensions(e, t) {
 function isStepDefinition(e) {
   return !!(typeof e == "object" && e);
 }
+function isStepStillSupported(e) {
+  return e.step === "setPhpIniEntry" ? (console.warn(
+    'The "setPhpIniEntry" Blueprint is no longer supported and you can remove it from your Blueprint.'
+  ), !1) : !0;
+}
 function compileStep(e, {
   semaphore: t,
   rootProgressTracker: r,
@@ -9428,17 +9536,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,
@@ -9449,10 +9557,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) {
@@ -9500,7 +9608,6 @@ export {
   runPHPWithOptions,
   runSql,
   runWpInstallationWizard,
-  setPhpIniEntry,
   setPluginProxyURL,
   setSiteOptions,
   unzip,