@wp-playground/blueprints 0.6.10 → 0.6.13

package/index.js

@@ -858,14 +858,14 @@ echo json_encode($deactivated_plugins);
       PATH_CURRENT_SITE: r
     }
   });
-  const p = new URL(await e.absoluteUrl), g = isURLScoped(p) ? "scope:" + getURLScope(p) : null;
+  const p = new URL(await e.absoluteUrl), $ = 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(g)};
+	$folder = ${phpVar($)};
 	if ($folder && strpos($_SERVER['REQUEST_URI'],"/$folder") === false) {
 		$_SERVER['HTTP_HOST'] = ${phpVar(p.hostname)};
 		$_SERVER['REQUEST_URI'] = "/$folder/" . ltrim($_SERVER['REQUEST_URI'], '/');
@@ -912,6 +912,7 @@ const cp = async (e, { fromPath: t, toPath: r }) => {
   await e.run({
     code: `<?php
 		require ${phpVar(n)} . '/wp-load.php';
+		kses_remove_filters();
 		$admin_id = get_users(array('role' => 'Administrator') )[0];
 		$importer = new WXR_Importer( array(
 			'fetch_attachments' => true,
@@ -919,6 +920,12 @@ const cp = async (e, { fromPath: t, toPath: r }) => {
 		) );
 		$logger = new WP_Importer_Logger_CLI();
 		$importer->set_logger( $logger );
+
+		// Slashes from the imported content are lost if we don't call wp_slash here.
+		add_action( 'wp_insert_post_data', function( $data ) {
+			return wp_slash($data);
+		});
+
 		$result = $importer->import( '/tmp/import.wxr' );
 		`
   });
@@ -1043,13 +1050,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 g = joinPaths(
+    const $ = joinPaths(
       i,
       p
     );
-    await removePath(e, g);
+    await removePath(e, $);
     const O = joinPaths(o, p);
-    await e.fileExists(O) && (await e.mkdir(dirname(g)), await e.mv(O, g));
+    await e.fileExists(O) && (await e.mkdir(dirname($)), await e.mv(O, $));
   }
   const l = joinPaths(
     s,
@@ -1103,10 +1110,10 @@ async function installAsset(e, { targetPath: t, zipFile: r }) {
     });
     d = d.filter((N) => !N.endsWith("/__MACOSX"));
     const u = d.length === 1 && await e.isDir(d[0]);
-    let p, g = "";
-    u ? (g = d[0], p = d[0].split("/").pop()) : (g = l, p = s);
+    let p, $ = "";
+    u ? ($ = d[0], p = d[0].split("/").pop()) : ($ = l, p = s);
     const O = `${t}/${p}`;
-    return await e.mv(g, O), {
+    return await e.mv($, O), {
       assetFolderPath: O,
       assetFolderName: p
     };
@@ -1825,7 +1832,7 @@ function fileToUint8Array(e) {
     }, r.readAsArrayBuffer(e);
   });
 }
-var Pe, Ke, dt, De, Je, ve, Qe, Fe, mt, xt, _t, Wt, gt, Bt;
+var Pe, Ke, dt, De, Je, ve, Qe, Fe, mt, xt, _t, Wt, $t, Bt;
 class PHPRequestHandler {
   /**
    * @param  php    - The PHP instance.
@@ -1856,7 +1863,7 @@ class PHPRequestHandler {
      * @throws {Error} If the requested path doesn't exist.
      * @returns The resolved filesystem path.
      */
-    Q(this, gt);
+    Q(this, $t);
     Q(this, Pe, void 0);
     Q(this, Ke, void 0);
     Q(this, dt, void 0);
@@ -1971,7 +1978,7 @@ Pe = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
     }
     let d;
     try {
-      d = ce(this, gt, Bt).call(this, r.pathname);
+      d = ce(this, $t, Bt).call(this, r.pathname);
     } catch {
       return new PHPResponse(
         404,
@@ -1993,7 +2000,7 @@ Pe = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
   } finally {
     n();
   }
-}, gt = new WeakSet(), Bt = function(t) {
+}, $t = new WeakSet(), Bt = function(t) {
   let r = removePathPrefix(t, H(this, ve));
   r = applyRewriteRules(r, this.rewriteRules), r.includes(".php") ? r = r.split(".php")[0] + ".php" : this.php.isDir(`${H(this, Pe)}${r}`) ? (r.endsWith("/") || (r = `${r}/`), r = `${r}index.php`) : r = "/index.php";
   const n = `${H(this, Pe)}${r}`;
@@ -2149,8 +2156,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, g = p !== null ? e.replaceAll("{path}", p) : e;
-          throw new Error(`${g}: ${u}`, {
+          const u = FileErrorCodes[d], p = typeof o[0] == "string" ? o[0] : null, $ = p !== null ? e.replaceAll("{path}", p) : e;
+          throw new Error(`${$}: ${u}`, {
             cause: l
           });
         }
@@ -2173,7 +2180,7 @@ var __defProp = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyD
   return n && s && __defProp(t, r, s), s;
 };
 const STRING = "string", NUMBER = "number", __private__dont__use = Symbol("__private__dont__use");
-var Me, Ze, Ye, be, Re, Te, Ee, Xe, $t, Gt, yt, Kt, vt, Jt, wt, Qt, Pt, Zt, bt, Yt, Et, Xt, St, er, Rt, tr, Tt, rr, kt, nr, Ct, sr;
+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;
 class BasePHP {
   /**
    * Initializes a PHP runtime.
@@ -2183,7 +2190,7 @@ class BasePHP {
    * @param  serverOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(e, t) {
-    Q(this, $t);
+    Q(this, gt);
     Q(this, yt);
     Q(this, vt);
     Q(this, wt);
@@ -2308,7 +2315,7 @@ class BasePHP {
     const t = await this.semaphore.acquire();
     let r;
     try {
-      if (H(this, be) || (ce(this, $t, Gt).call(this), te(this, be, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
+      if (H(this, be) || (ce(this, gt, Gt).call(this), te(this, be, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
         throw new Error(
           `The script path "${e.scriptPath}" does not exist.`
         );
@@ -2461,7 +2468,7 @@ class BasePHP {
     te(this, be, !1), te(this, Re, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
   }
 }
-Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), be = new WeakMap(), Re = new WeakMap(), Te = new WeakMap(), Ee = new WeakMap(), Xe = new WeakMap(), $t = new WeakSet(), Gt = function() {
+Me = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), be = new WeakMap(), Re = new WeakMap(), Te = new WeakMap(), Ee = new WeakMap(), Xe = new WeakMap(), gt = new WeakSet(), Gt = function() {
   if (this.setPhpIniEntry("auto_prepend_file", "/internal/consts.php"), this.fileExists("/internal/consts.php") || this.writeFile(
     "/internal/consts.php",
     `<?php
@@ -2952,10 +2959,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($) {
-      if (super(), !e.IDENTIFIER.test($))
+    constructor(g) {
+      if (super(), !e.IDENTIFIER.test(g))
         throw new Error("CodeGen: name must be a valid identifier");
-      this.str = $;
+      this.str = g;
     }
     toString() {
       return this.str;
@@ -2969,8 +2976,8 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
   }
   e.Name = r;
   class n extends t {
-    constructor($) {
-      super(), this._items = typeof $ == "string" ? [$] : $;
+    constructor(g) {
+      super(), this._items = typeof g == "string" ? [g] : g;
     }
     toString() {
       return this.str;
@@ -2978,69 +2985,69 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
     emptyStr() {
       if (this._items.length > 1)
         return !1;
-      const $ = this._items[0];
-      return $ === "" || $ === '""';
+      const g = this._items[0];
+      return g === "" || g === '""';
     }
     get str() {
-      var $;
-      return ($ = this._str) !== null && $ !== void 0 ? $ : this._str = this._items.reduce((P, I) => `${P}${I}`, "");
+      var g;
+      return (g = this._str) !== null && g !== void 0 ? g : this._str = this._items.reduce((P, I) => `${P}${I}`, "");
     }
     get names() {
-      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), {});
+      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), {});
     }
   }
   e._Code = n, e.nil = new n("");
-  function s(_, ...$) {
+  function s(_, ...g) {
     const P = [_[0]];
     let I = 0;
-    for (; I < $.length; )
-      l(P, $[I]), P.push(_[++I]);
+    for (; I < g.length; )
+      l(P, g[I]), P.push(_[++I]);
     return new n(P);
   }
   e._ = s;
   const i = new n("+");
-  function o(_, ...$) {
+  function o(_, ...g) {
     const P = [N(_[0])];
     let I = 0;
-    for (; I < $.length; )
-      P.push(i), l(P, $[I]), P.push(i, N(_[++I]));
+    for (; I < g.length; )
+      P.push(i), l(P, g[I]), P.push(i, N(_[++I]));
     return d(P), new n(P);
   }
   e.str = o;
-  function l(_, $) {
-    $ instanceof n ? _.push(...$._items) : $ instanceof r ? _.push($) : _.push(g($));
+  function l(_, g) {
+    g instanceof n ? _.push(...g._items) : g instanceof r ? _.push(g) : _.push($(g));
   }
   e.addCodeArg = l;
   function d(_) {
-    let $ = 1;
-    for (; $ < _.length - 1; ) {
-      if (_[$] === i) {
-        const P = u(_[$ - 1], _[$ + 1]);
+    let g = 1;
+    for (; g < _.length - 1; ) {
+      if (_[g] === i) {
+        const P = u(_[g - 1], _[g + 1]);
         if (P !== void 0) {
-          _.splice($ - 1, 3, P);
+          _.splice(g - 1, 3, P);
           continue;
         }
-        _[$++] = "+";
+        _[g++] = "+";
       }
-      $++;
+      g++;
     }
   }
-  function u(_, $) {
-    if ($ === '""')
+  function u(_, g) {
+    if (g === '""')
       return _;
     if (_ === '""')
-      return $;
+      return g;
     if (typeof _ == "string")
-      return $ instanceof r || _[_.length - 1] !== '"' ? void 0 : typeof $ != "string" ? `${_.slice(0, -1)}${$}"` : $[0] === '"' ? _.slice(0, -1) + $.slice(1) : void 0;
-    if (typeof $ == "string" && $[0] === '"' && !(_ instanceof r))
-      return `"${_}${$.slice(1)}`;
+      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)}`;
   }
-  function p(_, $) {
-    return $.emptyStr() ? _ : _.emptyStr() ? $ : o`${_}${$}`;
+  function p(_, g) {
+    return g.emptyStr() ? _ : _.emptyStr() ? g : o`${_}${g}`;
   }
   e.strConcat = p;
-  function g(_) {
+  function $(_) {
     return typeof _ == "number" || typeof _ == "boolean" || _ === null ? _ : N(Array.isArray(_) ? _.join(",") : _);
   }
   function O(_) {
@@ -3098,8 +3105,8 @@ var scope = {};
       return `${u}${p.index++}`;
     }
     _nameGroup(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))
+      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))
         throw new Error(`CodeGen: prefix "${u}" is not allowed in this scope`);
       return this._names[u] = { prefix: u, index: 0 };
     }
@@ -3109,8 +3116,8 @@ var scope = {};
     constructor(u, p) {
       super(p), this.prefix = u;
     }
-    setValue(u, { property: p, itemIndex: g }) {
-      this.value = u, this.scopePath = (0, t._)`.${new t.Name(p)}[${g}]`;
+    setValue(u, { property: p, itemIndex: $ }) {
+      this.value = u, this.scopePath = (0, t._)`.${new t.Name(p)}[${$}]`;
     }
   }
   e.ValueScopeName = i;
@@ -3126,15 +3133,15 @@ var scope = {};
       return new i(u, this._newName(u));
     }
     value(u, p) {
-      var g;
+      var $;
       if (p.ref === void 0)
         throw new Error("CodeGen: ref must be passed in value");
-      const O = this.toName(u), { prefix: N } = O, R = (g = p.key) !== null && g !== void 0 ? g : p.ref;
+      const O = this.toName(u), { prefix: N } = O, R = ($ = p.key) !== null && $ !== void 0 ? $ : p.ref;
       let T = this._values[N];
       if (T) {
-        const $ = T.get(R);
-        if ($)
-          return $;
+        const g = T.get(R);
+        if (g)
+          return g;
       } else
         T = this._values[N] = /* @__PURE__ */ new Map();
       T.set(R, O);
@@ -3142,41 +3149,41 @@ var scope = {};
       return y[_] = p.ref, O.setValue(p, { property: N, itemIndex: _ }), O;
     }
     getValue(u, p) {
-      const g = this._values[u];
-      if (g)
-        return g.get(p);
+      const $ = this._values[u];
+      if ($)
+        return $.get(p);
     }
     scopeRefs(u, p = this._values) {
-      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}`;
+      return this._reduceValues(p, ($) => {
+        if ($.scopePath === void 0)
+          throw new Error(`CodeGen: name "${$}" has no value`);
+        return (0, t._)`${u}${$.scopePath}`;
       });
     }
-    scopeCode(u = this._values, p, g) {
+    scopeCode(u = this._values, p, $) {
       return this._reduceValues(u, (O) => {
         if (O.value === void 0)
           throw new Error(`CodeGen: name "${O}" has no value`);
         return O.value.code;
-      }, p, g);
+      }, p, $);
     }
-    _reduceValues(u, p, g = {}, O) {
+    _reduceValues(u, p, $ = {}, O) {
       let N = t.nil;
       for (const R in u) {
         const T = u[R];
         if (!T)
           continue;
-        const y = g[R] = g[R] || /* @__PURE__ */ new Map();
+        const y = $[R] = $[R] || /* @__PURE__ */ new Map();
         T.forEach((_) => {
           if (y.has(_))
             return;
           y.set(_, n.Started);
-          let $ = p(_);
-          if ($) {
+          let g = p(_);
+          if (g) {
             const P = this.opts.es5 ? e.varKinds.var : e.varKinds.const;
-            N = (0, t._)`${N}${P} ${_} = ${$};${this.opts._n}`;
-          } else if ($ = O == null ? void 0 : O(_))
-            N = (0, t._)`${N}${$}${this.opts._n}`;
+            N = (0, t._)`${N}${P} ${_} = ${g};${this.opts._n}`;
+          } else if (g = O == null ? void 0 : O(_))
+            N = (0, t._)`${N}${g}${this.opts._n}`;
           else
             throw new r(_);
           y.set(_, n.Completed);
@@ -3293,7 +3300,7 @@ var scope = {};
       return `break${this.label ? ` ${this.label}` : ""};` + a;
     }
   }
-  class g extends i {
+  class $ extends i {
     constructor(a) {
       super(), this.error = a;
     }
@@ -3394,10 +3401,10 @@ var scope = {};
     }
   }
   _.kind = "if";
-  class $ extends R {
+  class g extends R {
   }
-  $.kind = "for";
-  class P extends $ {
+  g.kind = "for";
+  class P extends g {
     constructor(a) {
       super(), this.iteration = a;
     }
@@ -3412,7 +3419,7 @@ var scope = {};
       return K(super.names, this.iteration.names);
     }
   }
-  class I extends $ {
+  class I extends g {
     constructor(a, h, C, M) {
       super(), this.varKind = a, this.name = h, this.from = C, this.to = M;
     }
@@ -3425,7 +3432,7 @@ var scope = {};
       return ue(a, this.to);
     }
   }
-  class D extends $ {
+  class D extends g {
     constructor(a, h, C, M) {
       super(), this.loop = a, this.varKind = h, this.name = C, this.iterable = M;
     }
@@ -3610,7 +3617,7 @@ var scope = {};
     }
     // end `for` loop
     endFor() {
-      return this._endBlockNode($);
+      return this._endBlockNode(g);
     }
     // `label` statement
     label(a) {
@@ -3640,7 +3647,7 @@ var scope = {};
     }
     // `throw` statement
     throw(a) {
-      return this._leafNode(new g(a));
+      return this._leafNode(new $(a));
     }
     // start self-balancing block
     block(a, h) {
@@ -3803,13 +3810,13 @@ var util = {};
   }
   e.unescapeFragment = u;
   function p(w) {
-    return encodeURIComponent(g(w));
+    return encodeURIComponent($(w));
   }
   e.escapeFragment = p;
-  function g(w) {
+  function $(w) {
     return typeof w == "number" ? `${w}` : w.replace(/~/g, "~0").replace(/\//g, "~1");
   }
-  e.escapeJsonPointer = g;
+  e.escapeJsonPointer = $;
   function O(w) {
     return w.replace(/~1/g, "/").replace(/~0/g, "~");
   }
@@ -3858,13 +3865,13 @@ var util = {};
   }
   e.setEvaluated = y;
   const _ = {};
-  function $(w, k) {
+  function g(w, k) {
     return w.scopeValue("func", {
       ref: k,
       code: _[k.code] || (_[k.code] = new r._Code(k.code))
     });
   }
-  e.useFunc = $;
+  e.useFunc = g;
   var P;
   (function(w) {
     w[w.Num = 0] = "Num", w[w.Str = 1] = "Str";
@@ -3874,7 +3881,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() : "/" + g(w);
+    return A ? (0, t.getProperty)(w).toString() : "/" + $(w);
   }
   e.getErrorPath = I;
   function D(w, k, A = w.opts.strictSchema) {
@@ -3920,13 +3927,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, $, P) {
-    const { it: I } = y, { gen: D, compositeRule: w, allErrors: k } = I, A = g(y, _, $);
+  function s(y, _ = e.keywordError, g, P) {
+    const { it: I } = y, { gen: D, compositeRule: w, allErrors: k } = I, A = $(y, _, g);
     P ?? (w || k) ? d(D, A) : u(I, (0, t._)`[${A}]`);
   }
   e.reportError = s;
-  function i(y, _ = e.keywordError, $) {
-    const { it: P } = y, { gen: I, compositeRule: D, allErrors: w } = P, k = g(y, _, $);
+  function i(y, _ = e.keywordError, g) {
+    const { it: P } = y, { gen: I, compositeRule: D, allErrors: w } = P, k = $(y, _, g);
     d(I, k), D || w || u(P, n.default.vErrors);
   }
   e.reportExtraError = i;
@@ -3934,22 +3941,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: $, data: P, errsCount: I, it: D }) {
+  function l({ gen: y, keyword: _, schemaValue: g, 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`, $), 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`, g), y.assign((0, t._)`${w}.data`, P));
     });
   }
   e.extendErrors = l;
   function d(y, _) {
-    const $ = y.const("err", _);
-    y.if((0, t._)`${n.default.vErrors} === null`, () => y.assign(n.default.vErrors, (0, t._)`[${$}]`), (0, t._)`${n.default.vErrors}.push(${$})`), y.code((0, t._)`${n.default.errors}++`);
+    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}++`);
   }
   function u(y, _) {
-    const { gen: $, validateName: P, schemaEnv: I } = y;
-    I.$async ? $.throw((0, t._)`new ${y.ValidationError}(${_})`) : ($.assign((0, t._)`${P}.errors`, _), $.return(!1));
+    const { 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 p = {
     keyword: new t.Name("keyword"),
@@ -3960,28 +3967,28 @@ names$1.default = names;
     schema: new t.Name("schema"),
     parentSchema: new t.Name("parentSchema")
   };
-  function g(y, _, $) {
+  function $(y, _, g) {
     const { createErrors: P } = y.it;
-    return P === !1 ? (0, t._)`{}` : O(y, _, $);
+    return P === !1 ? (0, t._)`{}` : O(y, _, g);
   }
-  function O(y, _, $ = {}) {
+  function O(y, _, g = {}) {
     const { gen: P, it: I } = y, D = [
-      N(I, $),
-      R(y, $)
+      N(I, g),
+      R(y, g)
     ];
     return T(y, _, D), P.object(...D);
   }
   function N({ errorPath: y }, { instancePath: _ }) {
-    const $ = _ ? (0, t.str)`${y}${(0, r.getErrorPath)(_, r.Type.Str)}` : y;
-    return [n.default.instancePath, (0, t.strConcat)(n.default.instancePath, $)];
+    const g = _ ? (0, t.str)`${y}${(0, r.getErrorPath)(_, r.Type.Str)}` : y;
+    return [n.default.instancePath, (0, t.strConcat)(n.default.instancePath, g)];
   }
-  function R({ keyword: y, it: { errSchemaPath: _ } }, { schemaPath: $, parentSchema: P }) {
+  function R({ keyword: y, it: { errSchemaPath: _ } }, { schemaPath: g, parentSchema: P }) {
     let I = P ? _ : (0, t.str)`${_}/${y}`;
-    return $ && (I = (0, t.str)`${I}${(0, r.getErrorPath)($, r.Type.Str)}`), [p.schemaPath, I];
+    return g && (I = (0, t.str)`${I}${(0, r.getErrorPath)(g, r.Type.Str)}`), [p.schemaPath, I];
   }
-  function T(y, { params: _, message: $ }, P) {
+  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 $ == "function" ? $(y) : $]), A.verbose && P.push([p.schema, w], [p.parentSchema, (0, t._)`${x}${re}`], [n.default.data, D]), V && P.push([p.propertyName, V]);
+    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]);
   }
 })(errors);
 Object.defineProperty(boolSchema, "__esModule", { value: !0 });
@@ -4081,7 +4088,7 @@ applicability.shouldUseRule = shouldUseRule;
   }
   e.getJSONTypes = d;
   function u(P, I) {
-    const { gen: D, data: w, opts: k } = P, A = g(I, k.coerceTypes), V = I.length > 0 && !(A.length === 0 && I.length === 1 && (0, r.schemaHasRulesForType)(P, I[0]));
+    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]));
     if (V) {
       const x = T(I, w, k.strictNumbers, o.Wrong);
       D.if(x, () => {
@@ -4092,7 +4099,7 @@ applicability.shouldUseRule = shouldUseRule;
   }
   e.coerceAndCheckDataType = u;
   const p = /* @__PURE__ */ new Set(["string", "number", "integer", "boolean", "null"]);
-  function g(P, I) {
+  function $(P, I) {
     return I ? P.filter((D) => p.has(D) || I === "array" && D === "array") : [];
   }
   function O(P, I, D) {
@@ -4179,11 +4186,11 @@ applicability.shouldUseRule = shouldUseRule;
     params: ({ schema: P, schemaValue: I }) => typeof P == "string" ? (0, s._)`{type: ${P}}` : (0, s._)`{type: ${I}}`
   };
   function _(P) {
-    const I = $(P);
+    const I = g(P);
     (0, n.reportError)(I, y);
   }
   e.reportTypeError = _;
-  function $(P) {
+  function g(P) {
     const { gen: I, data: D, schema: w } = P, k = (0, i.schemaRefOrVal)(P, w, "type");
     return {
       gen: I,
@@ -4273,14 +4280,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, g = [
+  const p = u ? (0, codegen_1$q._)`${e}, ${t}, ${n}${s}` : t, $ = [
     [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 && g.push([names_1$5.default.dynamicAnchors, names_1$5.default.dynamicAnchors]);
-  const O = (0, codegen_1$q._)`${p}, ${r.object(...g)}`;
+  o.opts.dynamicRef && $.push([names_1$5.default.dynamicAnchors, names_1$5.default.dynamicAnchors]);
+  const O = (0, codegen_1$q._)`${p}, ${r.object(...$)}`;
   return d !== codegen_1$q.nil ? (0, codegen_1$q._)`${l}.call(${d}, ${O})` : (0, codegen_1$q._)`${l}(${O})`;
 }
 code.callValidateCode = callValidateCode;
@@ -4350,8 +4357,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), g = n.let("valid");
-  e.block$data(g, O), e.ok((r = t.valid) !== null && r !== void 0 ? r : g);
+  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 : $);
   function O() {
     if (t.errors === !1)
       T(), t.modifying && modifyData(e), y(() => e.error());
@@ -4362,19 +4369,19 @@ function funcKeywordCode(e, t) {
   }
   function N() {
     const _ = n.let("ruleErrs", null);
-    return n.try(() => T((0, codegen_1$p._)`await `), ($) => n.assign(g, !1).if((0, codegen_1$p._)`${$} instanceof ${d.ValidationError}`, () => n.assign(_, (0, codegen_1$p._)`${$}.errors`), () => n.throw($))), _;
+    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))), _;
   }
   function R() {
     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 $ = 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);
+    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);
   }
   function y(_) {
-    var $;
-    n.if((0, codegen_1$p.not)(($ = t.valid) !== null && $ !== void 0 ? $ : g), _);
+    var g;
+    n.if((0, codegen_1$p.not)((g = t.valid) !== null && g !== void 0 ? g : $), _);
   }
 }
 keyword.funcKeywordCode = funcKeywordCode;
@@ -4453,8 +4460,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: 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];
+    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];
   }
   if (s !== void 0) {
     const u = s instanceof codegen_1$o.Name ? s : l.let("data", s, !0);
@@ -4559,17 +4566,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 g = n[p];
-      if (Array.isArray(g)) {
+      var $ = n[p];
+      if (Array.isArray($)) {
         if (p in traverse$1.arrayKeywords)
-          for (var O = 0; O < g.length; O++)
-            _traverse(e, t, r, g[O], s + "/" + p + "/" + O, i, s, p, n, O);
+          for (var O = 0; O < $.length; O++)
+            _traverse(e, t, r, $[O], s + "/" + p + "/" + O, i, s, p, n, O);
       } else if (p in traverse$1.propsKeywords) {
-        if (g && typeof g == "object")
-          for (var N in g)
-            _traverse(e, t, r, g[N], s + "/" + p + "/" + escapeJsonPtr(N), i, s, p, n, N);
+        if ($ && typeof $ == "object")
+          for (var N in $)
+            _traverse(e, t, r, $[N], s + "/" + p + "/" + escapeJsonPtr(N), i, s, p, n, N);
       } else
-        (p in traverse$1.keywords || e.allKeys && !(p in traverse$1.skipKeywords)) && _traverse(e, t, r, g, s + "/" + p, i, s, p, n);
+        (p in traverse$1.keywords || e.allKeys && !(p in traverse$1.skipKeywords)) && _traverse(e, t, r, $, s + "/" + p, i, s, p, n);
     }
     r(n, s, i, o, l, d, u);
   }
@@ -4653,21 +4660,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 }, (g, O, N, R) => {
+  return traverse(e, { allKeys: !0 }, ($, O, N, R) => {
     if (R === void 0)
       return;
     const T = o + O;
     let y = i[R];
-    typeof g[r] == "string" && (y = _.call(this, g[r])), $.call(this, g.$anchor), $.call(this, g.$dynamicAnchor), i[O] = y;
+    typeof $[r] == "string" && (y = _.call(this, $[r])), g.call(this, $.$anchor), g.call(this, $.$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(g, D.schema, P) : P !== normalizeId(T) && (P[0] === "#" ? (u(g, l[P], P), l[P] = g) : this.refs[P] = T), 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;
     }
-    function $(P) {
+    function g(P) {
       if (typeof P == "string") {
         if (!ANCHOR.test(P))
           throw new Error(`invalid anchor "${P}"`);
@@ -4675,12 +4682,12 @@ function getSchemaRefs(e, t) {
       }
     }
   }), l;
-  function u(g, O, N) {
-    if (O !== void 0 && !equal$2(g, O))
+  function u($, O, N) {
+    if (O !== void 0 && !equal$2($, O))
       throw p(N);
   }
-  function p(g) {
-    return new Error(`reference "${g}" resolves to more than one schema`);
+  function p($) {
+    return new Error(`reference "${$}" resolves to more than one schema`);
   }
 }
 resolve$1.getSchemaRefs = getSchemaRefs;
@@ -4797,10 +4804,10 @@ function schemaKeywords(e, t, r, n) {
   }
   d.jtd || checkStrictTypes(e, t), s.block(() => {
     for (const O of p.rules)
-      g(O);
-    g(p.post);
+      $(O);
+    $(p.post);
   });
-  function g(O) {
+  function $(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}`));
   }
 }
@@ -5063,10 +5070,10 @@ function compileSchema(e) {
   let p;
   try {
     this._compilations.add(e), (0, validate_1$1.validateFunctionCode)(u), o.optimize(this.opts.code.optimize);
-    const g = o.toString();
-    p = `${o.scopeRefs(names_1$2.default.scope)}return ${g}`, this.opts.code.process && (p = this.opts.code.process(p, e));
+    const $ = o.toString();
+    p = `${o.scopeRefs(names_1$2.default.scope)}return ${$}`, this.opts.code.process && (p = this.opts.code.process(p, e));
     const N = new Function(`${names_1$2.default.self}`, `${names_1$2.default.scope}`, p)(this, this.scope.get());
-    if (this.scope.value(d, { ref: N }), N.errors = null, N.schema = e.schema, N.schemaEnv = e, e.$async && (N.$async = !0), this.opts.code.source === !0 && (N.source = { validateName: d, validateCode: g, scopeValues: o._values }), this.opts.unevaluated) {
+    if (this.scope.value(d, { ref: N }), N.errors = null, N.schema = e.schema, N.schemaEnv = e, e.$async && (N.$async = !0), this.opts.code.source === !0 && (N.source = { validateName: d, validateCode: $, scopeValues: o._values }), this.opts.unevaluated) {
       const { props: R, items: T } = u;
       N.evaluated = {
         props: R instanceof codegen_1$m.Name ? void 0 : R,
@@ -5076,8 +5083,8 @@ function compileSchema(e) {
       }, N.source && (N.source.evaluated = (0, codegen_1$m.stringify)(N.evaluated));
     }
     return e.validate = N, e;
-  } catch (g) {
-    throw delete e.validate, delete e.validateName, p && this.logger.error("Error compiling schema, function code:", p), g;
+  } catch ($) {
+    throw delete e.validate, delete e.validateName, p && this.logger.error("Error compiling schema, function code:", p), $;
   } finally {
     this._compilations.delete(e);
   }
@@ -5226,7 +5233,7 @@ var uri$1 = {}, uri_all = { exports: {} };
     function u(f) {
       var c = "[A-Za-z]", m = "[0-9]", S = n(m, "[A-Fa-f]"), E = s(s("%[EFef]" + S + "%" + S + S + "%" + S + S) + "|" + s("%[89A-Fa-f]" + S + "%" + S + S) + "|" + s("%" + S + S)), U = "[\\:\\/\\?\\#\\[\\]\\@]", L = "[\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=]", J = n(U, L), Y = f ? "[\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]" : "[]", se = f ? "[\\uE000-\\uF8FF]" : "[]", B = n(c, m, "[\\-\\.\\_\\~]", Y);
       s(c + n(c, m, "[\\+\\-\\.]") + "*"), s(s(E + "|" + n(B, L, "[\\:]")) + "*");
-      var Z = s(s("25[0-5]") + "|" + s("2[0-4]" + m) + "|" + s("1" + m + m) + "|" + s("0?[1-9]" + m) + "|0?0?" + m), ie = s(Z + "\\." + Z + "\\." + Z + "\\." + Z), z = s(S + "{1,4}"), X = s(s(z + "\\:" + z) + "|" + ie), ae = s(s(z + "\\:") + "{6}" + X), ee = s("\\:\\:" + s(z + "\\:") + "{5}" + X), Se = s(s(z) + "?\\:\\:" + s(z + "\\:") + "{4}" + X), ge = s(s(s(z + "\\:") + "{0,1}" + z) + "?\\:\\:" + s(z + "\\:") + "{3}" + X), $e = s(s(s(z + "\\:") + "{0,2}" + z) + "?\\:\\:" + s(z + "\\:") + "{2}" + X), Be = s(s(s(z + "\\:") + "{0,3}" + z) + "?\\:\\:" + z + "\\:" + X), Ie = s(s(s(z + "\\:") + "{0,4}" + z) + "?\\:\\:" + X), fe = s(s(s(z + "\\:") + "{0,5}" + z) + "?\\:\\:" + z), ye = s(s(s(z + "\\:") + "{0,6}" + z) + "?\\:\\:"), je = s([ae, ee, Se, ge, $e, Be, Ie, fe, ye].join("|")), we = s(s(B + "|" + E) + "+");
+      var Z = s(s("25[0-5]") + "|" + s("2[0-4]" + m) + "|" + s("1" + m + m) + "|" + s("0?[1-9]" + m) + "|0?0?" + m), ie = s(Z + "\\." + Z + "\\." + Z + "\\." + Z), z = s(S + "{1,4}"), X = s(s(z + "\\:" + z) + "|" + ie), ae = s(s(z + "\\:") + "{6}" + X), ee = s("\\:\\:" + s(z + "\\:") + "{5}" + X), Se = s(s(z) + "?\\:\\:" + s(z + "\\:") + "{4}" + X), $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) + "+");
       s("[vV]" + S + "+\\." + n(B, L, "[\\:]") + "+"), s(s(E + "|" + n(B, L)) + "*");
       var ct = s(E + "|" + n(B, L, "[\\:\\@]"));
       return s(s(E + "|" + n(B, L, "[\\@]")) + "+"), s(s(ct + "|" + n("[\\/\\?]", se)) + "*"), {
@@ -5246,7 +5253,7 @@ var uri$1 = {}, uri_all = { exports: {} };
         //RFC 6874, with relaxed parsing rules
       };
     }
-    var p = u(!1), g = u(!0), O = function() {
+    var p = u(!1), $ = u(!0), O = function() {
       function f(c, m) {
         var S = [], E = !0, U = !1, L = void 0;
         try {
@@ -5278,7 +5285,7 @@ var uri$1 = {}, uri_all = { exports: {} };
         return m;
       } else
         return Array.from(f);
-    }, R = 2147483647, T = 36, y = 1, _ = 26, $ = 38, P = 700, I = 72, D = 128, w = "-", k = /^xn--/, A = /[^\0-\x7E]/, V = /[\x2E\u3002\uFF0E\uFF61]/g, x = {
+    }, R = 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 = {
       overflow: "Overflow: input needs wider integers to process",
       "not-basic": "Illegal input >= 0x80 (not a basic code point)",
       "invalid-input": "Invalid input"
@@ -5323,7 +5330,7 @@ var uri$1 = {}, uri_all = { exports: {} };
         E += T
       )
         c = K(c / re);
-      return K(E + (re + 1) * c / (c + $));
+      return K(E + (re + 1) * c / (c + g));
     }, j = function(c) {
       var m = [], S = c.length, E = 0, U = D, L = I, J = c.lastIndexOf(w);
       J < 0 && (J = 0);
@@ -5370,20 +5377,20 @@ var uri$1 = {}, uri_all = { exports: {} };
       }
       var z = m.length, X = z;
       for (z && m.push(w); X < S; ) {
-        var ae = R, ee = !0, Se = !1, ge = void 0;
+        var ae = R, ee = !0, Se = !1, $e = void 0;
         try {
-          for (var $e = c[Symbol.iterator](), Be; !(ee = (Be = $e.next()).done); ee = !0) {
+          for (var ge = c[Symbol.iterator](), Be; !(ee = (Be = ge.next()).done); ee = !0) {
             var Ie = Be.value;
             Ie >= E && Ie < ae && (ae = Ie);
           }
         } catch (lt) {
-          Se = !0, ge = lt;
+          Se = !0, $e = lt;
         } finally {
           try {
-            !ee && $e.return && $e.return();
+            !ee && ge.return && ge.return();
           } finally {
             if (Se)
-              throw ge;
+              throw $e;
           }
         }
         var fe = X + 1;
@@ -5506,21 +5513,21 @@ var uri$1 = {}, uri_all = { exports: {} };
             we && we.index + we.length === je ? we.length++ : fe.push({ index: je, length: 1 });
           }
           return fe;
-        }, []), ge = Se.sort(function(fe, ye) {
+        }, []), $e = Se.sort(function(fe, ye) {
           return ye.length - fe.length;
-        })[0], $e = void 0;
-        if (ge && ge.length > 1) {
-          var Be = ae.slice(0, ge.index), Ie = ae.slice(ge.index + ge.length);
-          $e = Be.join(":") + "::" + Ie.join(":");
+        })[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(":");
         } else
-          $e = ae.join(":");
-        return U && ($e += "%" + U), $e;
+          ge = ae.join(":");
+        return U && (ge += "%" + U), ge;
       } else
         return f;
     }
     var tt = /^(?:([^:\/?#]+):)?(?:\/\/((?:([^\/?#@]*)@)?(\[[^\/?#\]]+\]|[^\/?#:]*)(?:\:(\d*))?))?([^?#]*)(?:\?([^#]*))?(?:#((?:.|\n|\r)*))?/i, rt = "".match(/(){0}/)[1] === void 0;
     function de(f) {
-      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = {}, S = c.iri !== !1 ? g : p;
+      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = {}, S = c.iri !== !1 ? $ : p;
       c.reference === "suffix" && (f = (c.scheme ? c.scheme + ":" : "") + "//" + f);
       var E = f.match(tt);
       if (E) {
@@ -5542,7 +5549,7 @@ var uri$1 = {}, uri_all = { exports: {} };
       return m;
     }
     function nt(f, c) {
-      var m = c.iri !== !1 ? g : p, S = [];
+      var m = c.iri !== !1 ? $ : p, S = [];
       return f.userinfo !== void 0 && (S.push(f.userinfo), S.push("@")), f.host !== void 0 && S.push(Le(he(String(f.host), m), m).replace(m.IPV6ADDRESS, function(E, U, L) {
         return "[" + U + (L ? "%25" + L : "") + "]";
       })), (typeof f.port == "number" || typeof f.port == "string") && (S.push(":"), S.push(String(f.port))), S.length ? S.join("") : void 0;
@@ -5569,7 +5576,7 @@ 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 ? g : p, S = [], E = M[(c.scheme || f.scheme || "").toLowerCase()];
+      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = c.iri ? $ : p, S = [], E = M[(c.scheme || f.scheme || "").toLowerCase()];
       if (E && E.serialize && E.serialize(f, c), f.host && !m.IPV6ADDRESS.test(f.host)) {
         if (c.domainHost || E && E.domainHost)
           try {
@@ -5601,10 +5608,10 @@ var uri$1 = {}, uri_all = { exports: {} };
       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 : g.ESCAPE, q);
+      return f && f.toString().replace(!c || !c.iri ? p.ESCAPE : $.ESCAPE, q);
     }
     function pe(f, c) {
-      return f && f.toString().replace(!c || !c.iri ? p.PCT_ENCODED : g.PCT_ENCODED, W);
+      return f && f.toString().replace(!c || !c.iri ? p.PCT_ENCODED : $.PCT_ENCODED, W);
     }
     var Ne = {
       scheme: "http",
@@ -5766,7 +5773,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, g = require$$9, O = uri$1, N = (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, $ = require$$9, O = uri$1, N = (F, v) => new RegExp(F, v);
   N.code = "new RegExp";
   const R = ["removeAdditional", "useDefaults", "coerceTypes"], T = /* @__PURE__ */ new Set([
     "validate",
@@ -5802,7 +5809,7 @@ uri$1.default = uri;
     ignoreKeywordsWithRef: "",
     jsPropertySyntax: "",
     unicode: '"minLength"/"maxLength" account for unicode characters by default.'
-  }, $ = 200;
+  }, g = 200;
   function P(F) {
     var v, j, b, a, h, C, M, q, W, G, ne, he, Le, tt, rt, de, nt, He, Ve, ze, st, me, le, xe, it;
     const Oe = F.strict, ot = (v = F.code) === null || v === void 0 ? void 0 : v.optimize, ut = ot === !0 || ot === void 0 ? 1 : ot || 0, pe = (b = (j = F.code) === null || j === void 0 ? void 0 : j.regExp) !== null && b !== void 0 ? b : N, Ne = (a = F.uriResolver) !== null && a !== void 0 ? a : O.default;
@@ -5813,8 +5820,8 @@ uri$1.default = uri;
       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 : $,
-      loopEnum: (de = F.loopEnum) !== null && de !== void 0 ? de : $,
+      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,
@@ -5840,8 +5847,8 @@ uri$1.default = uri;
     }
     _addDefaultMetaSchema() {
       const { $data: v, meta: j, schemaId: b } = this.opts;
-      let a = g;
-      b === "id" && (a = { ...g }, a.id = a.$id, delete a.$id), j && v && this.addMetaSchema(a, a[b], !1);
+      let a = $;
+      b === "id" && (a = { ...$ }, a.id = a.$id, delete a.$id), j && v && this.addMetaSchema(a, a[b], !1);
     }
     defaultMeta() {
       const { meta: v, schemaId: j } = this.opts;
@@ -6204,14 +6211,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 g();
+      return $();
     const p = compile_1$1.resolveRef.call(d, u, s, r);
     if (p === void 0)
       throw new ref_error_1.default(n.opts.uriResolver, s, r);
     if (p instanceof compile_1$1.SchemaEnv)
       return O(p);
     return N(p);
-    function g() {
+    function $() {
       if (i === u)
         return callRef(e, o, i, i.$async);
       const R = t.scopeValue("root", { ref: u });
@@ -6240,7 +6247,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() : g();
+  n ? p() : $();
   function p() {
     if (!l.$async)
       throw new Error("async schema referenced by sync schema");
@@ -6251,7 +6258,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(R, !1);
     }), e.ok(R);
   }
-  function g() {
+  function $() {
     e.result((0, code_1$8.callValidateCode)(e, t, u), () => N(t), () => O(t));
   }
   function O(R) {
@@ -6425,7 +6432,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, g);
+        e.block$data(codegen_1$f.nil, $);
       else
         for (const N of r)
           (0, code_1$6.checkReportMissingProp)(e, N);
@@ -6438,7 +6445,7 @@ const code_1$6 = code, codegen_1$f = codegen, util_1$h = util, error$d = {
       } else
         t.if((0, code_1$6.checkMissingProp)(e, r, N)), (0, code_1$6.reportMissingProp)(e, N), t.else();
     }
-    function g() {
+    function $() {
       t.forOf("prop", n, (N) => {
         e.setParams({ missingProperty: N }), t.if((0, code_1$6.noPropertyInData)(t, s, N, l.ownProperties), () => e.error());
       });
@@ -6496,17 +6503,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 R = t.let("i", (0, codegen_1$d._)`${r}.length`), T = t.let("j");
-      e.setParams({ i: R, j: T }), t.assign(d, !0), t.if((0, codegen_1$d._)`${R} > 1`, () => (g() ? O : N)(R, T));
+      e.setParams({ i: R, j: T }), t.assign(d, !0), t.if((0, codegen_1$d._)`${R} > 1`, () => ($() ? O : N)(R, T));
     }
-    function g() {
+    function $() {
       return u.length > 0 && !u.some((R) => R === "object" || R === "array");
     }
     function O(R, T) {
-      const y = t.name("item"), _ = (0, dataType_1.checkDataTypes)(u, y, l.opts.strictNumbers, dataType_1.DataType.Wrong), $ = t.const("indices", (0, codegen_1$d._)`{}`);
+      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._)`{}`);
       t.for((0, codegen_1$d._)`;${R}--;`, () => {
-        t.let(y, (0, codegen_1$d._)`${r}[${R}]`), t.if(_, (0, codegen_1$d._)`continue`), u.length > 1 && t.if((0, codegen_1$d._)`typeof ${y} == "string"`, (0, codegen_1$d._)`${y} += "_"`), t.if((0, codegen_1$d._)`typeof ${$}[${y}] == "number"`, () => {
-          t.assign(T, (0, codegen_1$d._)`${$}[${y}]`), e.error(), t.assign(d, !1).break();
-        }).code((0, codegen_1$d._)`${$}[${y}] = ${R}`);
+        t.let(y, (0, codegen_1$d._)`${r}[${R}]`), t.if(_, (0, codegen_1$d._)`continue`), u.length > 1 && t.if((0, codegen_1$d._)`typeof ${y} == "string"`, (0, codegen_1$d._)`${y} += "_"`), t.if((0, codegen_1$d._)`typeof ${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}] = ${R}`);
       });
     }
     function N(R, T) {
@@ -6552,7 +6559,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, g);
+      p = t.let("valid"), e.block$data(p, $);
     else {
       if (!Array.isArray(s))
         throw new Error("ajv implementation error");
@@ -6560,7 +6567,7 @@ const codegen_1$b = codegen, util_1$e = util, equal_1 = equal$1, error$9 = {
       p = (0, codegen_1$b.or)(...s.map((R, T) => O(N, T)));
     }
     e.pass(p);
-    function g() {
+    function $() {
       t.assign(p, !1), t.forOf("v", i, (N) => t.if((0, codegen_1$b._)`${u()}(${r}, ${N})`, () => t.assign(p, !0).break()));
     }
     function O(N, R) {
@@ -6649,15 +6656,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((g, O) => {
-    (0, util_1$c.alwaysValidSchema)(l, g) || (n.if((0, codegen_1$9._)`${u} > ${O}`, () => e.subschema({
+  r.forEach(($, O) => {
+    (0, util_1$c.alwaysValidSchema)(l, $) || (n.if((0, codegen_1$9._)`${u} > ${O}`, () => e.subschema({
       keyword: o,
       schemaProp: O,
       dataProp: O
     }, d)), e.ok(d));
   });
-  function p(g) {
-    const { opts: O, errSchemaPath: N } = l, R = r.length, T = R === g.minItems && (R === g.maxItems || g[t] === !1);
+  function p($) {
+    const { opts: O, errSchemaPath: N } = l, R = r.length, T = R === $.minItems && (R === $.maxItems || $[t] === !1);
     if (O.strictTuples && !T) {
       const y = `"${o}" is ${R}-tuple, but minItems or maxItems/${t} are not specified or different at path "${N}"`;
       (0, util_1$c.checkStrictMode)(l, y, O.strictTuples);
@@ -6724,8 +6731,8 @@ const codegen_1$7 = codegen, util_1$a = util, error$6 = {
       return;
     }
     i.items = !0;
-    const g = t.name("valid");
-    l === void 0 && o === 1 ? N(g, () => t.if(g, () => t.break())) : o === 0 ? (t.let(g, !0), l !== void 0 && t.if((0, codegen_1$7._)`${s}.length > 0`, O)) : (t.let(g, !1), O()), e.result(g, () => e.reset());
+    const $ = t.name("valid");
+    l === void 0 && o === 1 ? N($, () => t.if($, () => t.break())) : o === 0 ? (t.let($, !0), l !== void 0 && t.if((0, codegen_1$7._)`${s}.length > 0`, O)) : (t.let($, !1), O()), e.result($, () => e.reset());
     function O() {
       const T = t.name("_valid"), y = t.let("count", 0);
       N(T, () => t.if(T, () => R(y)));
@@ -6741,7 +6748,7 @@ const codegen_1$7 = codegen, util_1$a = util, error$6 = {
       });
     }
     function R(T) {
-      t.code((0, codegen_1$7._)`${T}++`), l === void 0 ? t.if((0, codegen_1$7._)`${T} >= ${o}`, () => t.assign(g, !0).break()) : (t.if((0, codegen_1$7._)`${T} > ${l}`, () => t.assign(g, !1).break()), o === 1 ? t.assign(g, !0) : t.if((0, codegen_1$7._)`${T} >= ${o}`, () => t.assign(g, !0)));
+      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)));
     }
   }
 };
@@ -6752,11 +6759,11 @@ var dependencies = {};
   const t = codegen, r = util, n = code;
   e.error = {
     message: ({ params: { property: d, depsCount: u, deps: p } }) => {
-      const g = u === 1 ? "property" : "properties";
-      return (0, t.str)`must have ${g} ${p} when property ${d} is present`;
+      const $ = u === 1 ? "property" : "properties";
+      return (0, t.str)`must have ${$} ${p} when property ${d} is present`;
     },
-    params: ({ params: { property: d, depsCount: u, deps: p, missingProperty: g } }) => (0, t._)`{property: ${d},
-    missingProperty: ${g},
+    params: ({ params: { property: d, depsCount: u, deps: p, missingProperty: $ } }) => (0, t._)`{property: ${d},
+    missingProperty: ${$},
     depsCount: ${u},
     deps: ${p}}`
     // TODO change to reference
@@ -6773,16 +6780,16 @@ var dependencies = {};
   };
   function i({ schema: d }) {
     const u = {}, p = {};
-    for (const g in d) {
-      if (g === "__proto__")
+    for (const $ in d) {
+      if ($ === "__proto__")
         continue;
-      const O = Array.isArray(d[g]) ? u : p;
-      O[g] = d[g];
+      const O = Array.isArray(d[$]) ? u : p;
+      O[$] = d[$];
     }
     return [u, p];
   }
   function o(d, u = d.schema) {
-    const { gen: p, data: g, it: O } = d;
+    const { gen: p, data: $, it: O } = d;
     if (Object.keys(u).length === 0)
       return;
     const N = p.let("missing");
@@ -6790,7 +6797,7 @@ var dependencies = {};
       const T = u[R];
       if (T.length === 0)
         continue;
-      const y = (0, n.propertyInData)(p, g, R, O.opts.ownProperties);
+      const y = (0, n.propertyInData)(p, $, R, O.opts.ownProperties);
       d.setParams({
         property: R,
         depsCount: T.length,
@@ -6803,10 +6810,10 @@ var dependencies = {};
   }
   e.validatePropertyDeps = o;
   function l(d, u = d.schema) {
-    const { gen: p, data: g, keyword: O, it: N } = d, R = p.name("valid");
+    const { gen: p, data: $, keyword: O, it: N } = d, R = p.name("valid");
     for (const T in u)
       (0, r.alwaysValidSchema)(N, u[T]) || (p.if(
-        (0, n.propertyInData)(p, g, T, N.opts.ownProperties),
+        (0, n.propertyInData)(p, $, T, N.opts.ownProperties),
         () => {
           const y = d.subschema({ keyword: O, schemaProp: T }, R);
           d.mergeValidEvaluated(y, R);
@@ -6866,8 +6873,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);
-    g(), 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 $() {
       t.forIn("key", s, (y) => {
         !u.length && !p.length ? R(y) : t.if(O(y), () => R(y));
       });
@@ -6875,11 +6882,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 $ = (0, util_1$8.schemaRefOrVal)(o, n.properties, "properties");
-        _ = (0, code_1$3.isOwnProperty)(t, $, y);
+        const g = (0, util_1$8.schemaRefOrVal)(o, n.properties, "properties");
+        _ = (0, code_1$3.isOwnProperty)(t, g, y);
       } else
-        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)(_);
+        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)(_);
     }
     function N(y) {
       t.code((0, codegen_1$5._)`delete ${s}[${y}]`);
@@ -6900,13 +6907,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, _, $) {
+    function T(y, _, g) {
       const P = {
         keyword: "additionalProperties",
         dataProp: y,
         dataPropType: util_1$8.Type.Str
       };
-      $ === !1 && Object.assign(P, {
+      g === !1 && Object.assign(P, {
         compositeRule: !0,
         createErrors: !1,
         allErrors: !1
@@ -6925,23 +6932,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 g of o)
-      i.definedProperties.add(g);
+    for (const $ of o)
+      i.definedProperties.add($);
     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((g) => !(0, util_1$7.alwaysValidSchema)(i, r[g]));
+    const l = o.filter(($) => !(0, util_1$7.alwaysValidSchema)(i, r[$]));
     if (l.length === 0)
       return;
     const d = t.name("valid");
-    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;
+    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;
     }
-    function p(g) {
+    function p($) {
       e.subschema({
         keyword: "properties",
-        schemaProp: g,
-        dataProp: g
+        schemaProp: $,
+        dataProp: $
       }, d);
     }
   }
@@ -6959,7 +6966,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: g } = i;
+    const { props: $ } = i;
     O();
     function O() {
       for (const T of l)
@@ -6978,7 +6985,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 && g !== !0 ? t.assign((0, codegen_1$4._)`${g}[${y}]`, !0) : !_ && !i.allErrors && t.if((0, codegen_1$4.not)(p), () => t.break());
+          }, 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());
         });
       });
     }
@@ -7037,14 +7044,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, g) => {
+      i.forEach((p, $) => {
         let O;
         (0, util_1$4.alwaysValidSchema)(s, p) ? t.var(d, !0) : O = e.subschema({
           keyword: "oneOf",
-          schemaProp: g,
+          schemaProp: $,
           compositeRule: !0
-        }, 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);
+        }, 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);
         });
       });
     }
@@ -7102,10 +7109,10 @@ const codegen_1$2 = codegen, util_1$2 = util, error$2 = {
       }, l);
       e.mergeEvaluated(p);
     }
-    function u(p, g) {
+    function u(p, $) {
       return () => {
         const O = e.subschema({ keyword: p }, l);
-        t.assign(o, l), e.mergeValidEvaluated(O, o), g ? t.assign(g, (0, codegen_1$2._)`${p}`) : e.setParams({ ifClause: p });
+        t.assign(o, l), e.mergeValidEvaluated(O, o), $ ? t.assign($, (0, codegen_1$2._)`${p}`) : e.setParams({ ifClause: p });
       };
     }
   }
@@ -7158,17 +7165,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: g } = l;
+    const { gen: r, data: n, $data: s, schema: i, schemaCode: o, it: l } = e, { opts: d, errSchemaPath: u, schemaEnv: p, self: $ } = l;
     if (!d.validateFormats)
       return;
     s ? O() : N();
     function O() {
       const R = r.scopeValue("formats", {
-        ref: g.formats,
+        ref: $.formats,
         code: d.code.formats
       }), T = r.const("fDef", (0, codegen_1$1._)`${R}[${o}]`), y = r.let("fType"), _ = r.let("format");
-      r.if((0, codegen_1$1._)`typeof ${T} == "object" && !(${T} instanceof RegExp)`, () => r.assign(y, (0, codegen_1$1._)`${T}.type || "string"`).assign(_, (0, codegen_1$1._)`${T}.validate`), () => r.assign(y, (0, codegen_1$1._)`"string"`).assign(_, T)), e.fail$data((0, codegen_1$1.or)($(), P()));
-      function $() {
+      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() {
         return d.strictSchema === !1 ? codegen_1$1.nil : (0, codegen_1$1._)`${o} && !${_}`;
       }
       function P() {
@@ -7177,18 +7184,18 @@ const codegen_1$1 = codegen, error$1 = {
       }
     }
     function N() {
-      const R = g.formats[i];
+      const R = $.formats[i];
       if (!R) {
-        $();
+        g();
         return;
       }
       if (R === !0)
         return;
       const [T, y, _] = P(R);
       T === t && e.pass(I());
-      function $() {
+      function g() {
         if (d.strictSchema === !1) {
-          g.logger.warn(D());
+          $.logger.warn(D());
           return;
         }
         throw new Error(D());
@@ -7274,10 +7281,10 @@ const codegen_1 = codegen, types_1 = types, compile_1 = compile, util_1 = util,
       const N = O();
       t.if(!1);
       for (const R in N)
-        t.elseIf((0, codegen_1._)`${u} === ${R}`), t.assign(d, g(N[R]));
+        t.elseIf((0, codegen_1._)`${u} === ${R}`), t.assign(d, $(N[R]));
       t.else(), e.error(!1, { discrError: types_1.DiscrError.Mapping, tag: u, tagName: l }), t.endIf();
     }
-    function g(N) {
+    function $(N) {
       const R = t.name("valid"), T = e.subschema({ keyword: "oneOf", schemaProp: N }, R);
       return e.mergeEvaluated(T, codegen_1.Name), R;
     }
@@ -7291,7 +7298,7 @@ const codegen_1 = codegen, types_1 = types, compile_1 = compile, util_1 = util,
         const w = (N = D == null ? void 0 : D.properties) === null || N === void 0 ? void 0 : N[l];
         if (typeof w != "object")
           throw new Error(`discriminator: oneOf subschemas (or referenced schemas) must have "properties/${l}"`);
-        y = y && (T || _(D)), $(w, I);
+        y = y && (T || _(D)), g(w, I);
       }
       if (!y)
         throw new Error(`discriminator: "${l}" must be required`);
@@ -7299,7 +7306,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 $(I, D) {
+      function g(I, D) {
         if (I.const)
           P(I.const, D);
         else if (I.enum)
@@ -7594,9 +7601,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 g = validation_error;
+  var $ = validation_error;
   Object.defineProperty(t, "ValidationError", { enumerable: !0, get: function() {
-    return g.default;
+    return $.default;
   } });
   var O = ref_error;
   Object.defineProperty(t, "MissingRefError", { enumerable: !0, get: function() {
@@ -9214,13 +9221,13 @@ function compileBlueprint(e, {
   onStepCompleted: n = () => {
   }
 } = {}) {
-  var g, O, N, R, T, y, _;
+  var $, O, N, R, T, y, _;
   e = {
     ...e,
     steps: (e.steps || []).filter(isStepDefinition)
   };
-  for (const $ of e.steps)
-    typeof $ == "object" && $.step === "importFile" && ($.step = "importWxr", console.warn(
+  for (const g of e.steps)
+    typeof g == "object" && g.step === "importFile" && (g.step = "importWxr", console.warn(
       'The "importFile" step is deprecated. Use "importWxr" instead.'
     ));
   if (e.constants && e.steps.unshift({
@@ -9230,7 +9237,7 @@ function compileBlueprint(e, {
     step: "setSiteOptions",
     options: e.siteOptions
   }), e.plugins) {
-    const $ = e.plugins.map((P) => typeof P == "string" ? P.startsWith("https://") ? {
+    const g = e.plugins.map((P) => typeof P == "string" ? P.startsWith("https://") ? {
       resource: "url",
       url: P
     } : {
@@ -9240,17 +9247,17 @@ function compileBlueprint(e, {
       step: "installPlugin",
       pluginZipFile: P
     }));
-    e.steps.unshift(...$);
+    e.steps.unshift(...g);
   }
   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 = (g = e.steps) == null ? void 0 : g.findIndex(
-    ($) => typeof $ == "object" && ($ == null ? void 0 : $.step) === "wp-cli"
+  const s = ($ = e.steps) == null ? void 0 : $.findIndex(
+    (g) => typeof g == "object" && (g == null ? void 0 : g.step) === "wp-cli"
   );
   s !== void 0 && s > -1 && (e.phpExtensionBundles.includes("light") && (e.phpExtensionBundles = e.phpExtensionBundles.filter(
-    ($) => $ !== "light"
+    (g) => g !== "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, {
@@ -9272,10 +9279,10 @@ function compileBlueprint(e, {
     path: "/tmp/wp-cli.phar"
   }));
   const i = (N = e.steps) == null ? void 0 : N.findIndex(
-    ($) => typeof $ == "object" && ($ == null ? void 0 : $.step) === "importWxr"
+    (g) => typeof g == "object" && (g == null ? void 0 : g.step) === "importWxr"
   );
   i !== void 0 && i > -1 && (e.phpExtensionBundles.includes("light") && (e.phpExtensionBundles = e.phpExtensionBundles.filter(
-    ($) => $ !== "light"
+    (g) => g !== "light"
   ), console.warn(
     "The importWxr step used in your Blueprint requires the iconv and mbstring PHP extensions. However, you did not specify the kitchen-sink extension bundle. Playground will override your choice and load the kitchen-sink PHP extensions bundle to prevent the WP-CLI step from failing. "
   )), (R = e.steps) == null || R.splice(i, 0, {
@@ -9288,19 +9295,19 @@ function compileBlueprint(e, {
   }));
   const { valid: o, errors: l } = validateBlueprint(e);
   if (!o) {
-    const $ = new Error(
+    const g = new Error(
       `Invalid blueprint: ${l[0].message} at ${l[0].instancePath}`
     );
-    throw $.errors = l, $;
+    throw g.errors = l, g;
   }
   const d = e.steps || [], u = d.reduce(
-    ($, P) => {
+    (g, P) => {
       var I;
-      return $ + (((I = P.progress) == null ? void 0 : I.weight) || 1);
+      return g + (((I = P.progress) == null ? void 0 : I.weight) || 1);
     },
     0
   ), p = d.map(
-    ($) => compileStep($, {
+    (g) => compileStep(g, {
       semaphore: r,
       rootProgressTracker: t,
       totalProgressWeight: u
@@ -9323,14 +9330,14 @@ function compileBlueprint(e, {
       // Disable networking by default
       networking: ((_ = e.features) == null ? void 0 : _.networking) ?? !1
     },
-    run: async ($) => {
+    run: async (g) => {
       try {
         for (const { resources: P } of p)
           for (const I of P)
-            I.setPlayground($), I.isAsync && I.resolve();
+            I.setPlayground(g), I.isAsync && I.resolve();
         for (const [P, { run: I, step: D }] of Object.entries(p))
           try {
-            const w = await I($);
+            const w = await I(g);
             n(w, D);
           } catch (w) {
             throw console.error(w), new Error(
@@ -9342,7 +9349,7 @@ function compileBlueprint(e, {
           }
       } finally {
         try {
-          await $.goTo(
+          await g.goTo(
             e.landingPage || "/"
           );
         } catch {
@@ -9394,17 +9401,17 @@ function compileStep(e, {
   const s = r.stage(
     (((p = e.progress) == null ? void 0 : p.weight) || 1) / n
   ), i = {};
-  for (const g of Object.keys(e)) {
-    let O = e[g];
+  for (const $ of Object.keys(e)) {
+    let O = e[$];
     isFileReference(O) && (O = Resource.create(O, {
       semaphore: t
-    })), i[g] = O;
+    })), i[$] = O;
   }
-  const o = async (g) => {
+  const o = async ($) => {
     var O;
     try {
       return s.fillSlowly(), await keyedStepHandlers[e.step](
-        g,
+        $,
         await resolveArguments(i),
         {
           tracker: s,
@@ -9415,10 +9422,10 @@ function compileStep(e, {
       s.finish();
     }
   }, l = getResources(i), d = getResources(i).filter(
-    (g) => g.isAsync
+    ($) => $.isAsync
   ), u = 1 / (d.length + 1);
-  for (const g of d)
-    g.progress = s.stage(u);
+  for (const $ of d)
+    $.progress = s.stage(u);
   return { run: o, step: e, resources: l };
 }
 function getResources(e) {