@wp-playground/client 0.6.0 → 0.6.1

package/index.js

@@ -2,7 +2,7 @@ var Nt = (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) => (Nt(e, t, "read from private field"), r ? r.call(e) : t.get(e)), Z = (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);
@@ -67,6 +67,9 @@ if (typeof CustomEvent > "u") {
   }
   globalThis.CustomEvent = e;
 }
+typeof crypto > "u" && import("./__vite-browser-external-2447137e.js").then((e) => {
+  global.crypto = e;
+});
 const wpContentFilesExcludedFromExport = [
   "db.php",
   "plugins/akismet",
@@ -267,6 +270,47 @@ set_current_user( get_users(array('role' => 'Administrator') )[0] );
 switch_theme( ${phpVar(t)} );
 `
   });
+}, runPHP = async (e, { code: t }) => await e.run({ code: t, throwOnError: !0 }), runPHPWithOptions = async (e, { options: t }) => await e.run(t), rm = async (e, { path: t }) => {
+  await e.unlink(t);
+}, runSql = async (e, { sql: t }, r) => {
+  r == null || r.tracker.setCaption("Executing SQL Queries");
+  const n = `/tmp/${crypto.randomUUID()}.sql`;
+  await e.writeFile(
+    n,
+    new Uint8Array(await t.arrayBuffer())
+  );
+  const s = await e.documentRoot, o = phpVars({ docroot: s, sqlFilename: n }), i = await e.run({
+    code: `<?php
+		require_once ${o.docroot} . '/wp-load.php';
+
+		$handle = fopen(${o.sqlFilename}, 'r');
+		$buffer = '';
+
+		global $wpdb;
+
+		while ($bytes = fgets($handle)) {
+			$buffer .= $bytes;
+
+			if (!feof($handle) && substr($buffer, -1, 1) !== "
+") {
+				continue;
+			}
+
+			$wpdb->query($buffer);
+			$buffer = '';
+		}
+	`
+  });
+  return await rm(e, { path: n }), i;
+}, 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)
+    throw console.warn("WordPress response was", { response: r }), new Error(
+      `Request failed with status ${r.httpStatusCode}`
+    );
+  return r;
 }, rewriteWpConfigToDefineConstants = `<?php
 
 /**
@@ -635,522 +679,7 @@ async function rewriteDefineCalls(e, t, r) {
 	`
   }), await e.readFileAsText("/tmp/code.php");
 }
-const transportFetch = `<?php
-
-/**
- * This transport delegates PHP HTTP requests to JavaScript synchronous XHR.
- *
- * This file isn't actually used. It's just here for reference and development. The actual
- * PHP code used in WordPress is hardcoded copy residing in wordpress.mjs in the _patchWordPressCode
- * function.
- * 
- * The reason for calling it Wp_Http_Fetch and not something more natural like
- * Requests_Transport_Fetch is the _get_first_available_transport(). It checks for
- * a class named "Wp_Http_" . $transport_name – which means we must adhere to this
- * hardcoded pattern.
- */
-class Wp_Http_Fetch_Base
-{
-	public $headers = '';
-
-	public function __construct()
-	{
-	}
-
-	public function __destruct()
-	{
-	}
-
-	/**
-	 * Delegates PHP HTTP requests to JavaScript synchronous XHR.
-	 *
-	 * @TODO Implement handling for more $options such as cookies, filename, auth, etc.
-	 *
-	 * @param $url
-	 * @param $headers
-	 * @param $data
-	 * @param $options
-	 *
-	 * @return false|string
-	 */
-	public function request($url, $headers = array(), $data = array(), $options = array())
-	{
-		// Disable wp-cron requests that are extremely slow in node.js runtime environment.
-		// @TODO: Make wp-cron requests faster.
-		if (str_contains($url, '/wp-cron.php')) {
-			return false;
-		}
-
-		if (!empty($data)) {
-			$data_format = $options['data_format'];
-			if ($data_format === 'query') {
-				$url = self::format_get($url, $data);
-				$data = '';
-			} elseif (!is_string($data)) {
-				$data = http_build_query($data, null, '&');
-			}
-		}
-
-		$request = json_encode(
-			array(
-				'type' => 'request',
-				'data' => [
-					'headers' => $headers,
-					'data' => $data,
-					'url' => $url,
-					'method' => $options['type'],
-				]
-			)
-		);
-
-		$this->headers = post_message_to_js($request);
-
-		// Store a file if the request specifies it.
-		// Are we sure that \`$this->headers\` includes the body of the response?
-		$before_response_body = strpos($this->headers, "\\r\\n\\r\\n");
-		if (isset($options['filename']) && $options['filename'] && false !== $before_response_body) {
-			$response_body = substr($this->headers, $before_response_body + 4);
-			$this->headers = substr($this->headers, 0, $before_response_body);
-			file_put_contents($options['filename'], $response_body);
-		}
-
-		return $this->headers;
-	}
-
-	public function request_multiple($requests, $options)
-	{
-		$responses = array();
-		$class = get_class($this);
-		foreach ($requests as $id => $request) {
-			try {
-				$handler = new $class();
-				$responses[$id] = $handler->request($request['url'], $request['headers'], $request['data'], $request['options']);
-				$request['options']['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$id], $request));
-			} catch (Requests_Exception $e) {
-				$responses[$id] = $e;
-			}
-			if (!is_string($responses[$id])) {
-				$request['options']['hooks']->dispatch('multiple.request.complete', array(&$responses[$id], $id));
-			}
-		}
-
-		return $responses;
-	}
-
-	protected static function format_get($url, $data)
-	{
-		if (!empty($data)) {
-			$query = '';
-			$url_parts = parse_url($url);
-			if (empty($url_parts['query'])) {
-				$url_parts['query'] = '';
-			} else {
-				$query = $url_parts['query'];
-			}
-			$query .= '&' . http_build_query($data, null, '&');
-			$query = trim($query, '&');
-			if (empty($url_parts['query'])) {
-				$url .= '?' . $query;
-			} else {
-				$url = str_replace($url_parts['query'], $query, $url);
-			}
-		}
-
-		return $url;
-	}
-
-	public static function test($capabilities = array())
-	{
-		if (!function_exists('post_message_to_js')) {
-			return false;
-		}
-
-		return true;
-	}
-}
-
-if (class_exists('\\WpOrg\\Requests\\Requests')) {
-	class Wp_Http_Fetch extends Wp_Http_Fetch_Base implements \\WpOrg\\Requests\\Transport
-	{
-
-	}
-} else {
-	class Wp_Http_Fetch extends Wp_Http_Fetch_Base implements Requests_Transport
-	{
-
-	}
-}
-`, transportDummy = `<?php
-
-/**
- * This transport does not perform any HTTP requests and only exists
- * to prevent the Requests class from complaining about not having any
- * transports.
- */
-class Requests_Transport_Dummy_Base
-{
-	public $headers = '';
-
-	public function __construct()
-	{
-	}
-
-	public function __destruct()
-	{
-	}
-
-	public function request($url, $headers = array(), $data = array(), $options = array())
-	{
-		return false;
-	}
-
-	public function request_multiple($requests, $options)
-	{
-		$responses = array();
-		foreach ($requests as $id => $request) {
-			$responses[] = false;
-		}
-		return $responses;
-	}
-
-	protected static function format_get($url, $data)
-	{
-		return $url;
-	}
-
-	public static function test($capabilities = array())
-	{
-		return true;
-	}
-}
-
-if (class_exists('\\WpOrg\\Requests\\Requests')) {
-	class Requests_Transport_Dummy extends Requests_Transport_Dummy_Base implements \\WpOrg\\Requests\\Transport
-	{
-
-	}
-} else {
-	class Requests_Transport_Dummy extends Requests_Transport_Dummy_Base implements Requests_Transport
-	{
-
-	}
-}
-`, playgroundMuPlugin = `<?php
-/**
- * Add a notice to wp-login.php offering the username and password.
- */
-add_action(
-	'login_message',
-	function () {
-		return <<<EOT
-<div class="message info">
-	<strong>username:</strong> <code>admin</code><br><strong>password</strong>: <code>password</code>
-</div>
-EOT;
-	}
-);
-
-/**
- * Because the in-browser Playground doesn't have access to the internet, 
- * network-dependent features like directories don't work. Normally, you'll 
- * see a confusing message like "An unexpected error occurred." This mu-plugin
- * makes it more clear that the feature is not yet supported.
- * 
- * https://github.com/WordPress/wordpress-playground/issues/498
- * 
- * Added styling to hide the Popular tags section of the Plugins page
- * and the nonfunctional Try Again button (both Plugins and Themes) that's
- * appended when the message is displayed.
- * 
- * https://github.com/WordPress/wordpress-playground/issues/927
- * 
- */
-
- add_action('admin_head', function () {
-  echo '<style>
-					:is(.plugins-popular-tags-wrapper:has(div.networking_err_msg),
-					button.button.try-again) {
-							display: none;
-					}
-  			</style>';
-});
-
-add_action('init', 'networking_disabled');
-function networking_disabled() {
-	$networking_err_msg = '<div class="networking_err_msg">Network access is an <a href="https://github.com/WordPress/wordpress-playground/issues/85">experimental, opt-in feature</a>, which means you need to enable it to allow Playground to access the Plugins/Themes directories.
-	<p>There are two alternative methods to enable global networking support:</p>
-	<ol>
-	<li>Using the <a href="https://wordpress.github.io/wordpress-playground/query-api">Query API</a>: for example, https://playground.wordpress.net/<em>?networking=yes</em>; <strong>or</strong>
-	<li> Using the <a href="https://wordpress.github.io/wordpress-playground/blueprints-api/data-format/#features">Blueprint API</a>: add <code>"features": { "networking": true }</code> to the JSON file.
-	</li></ol>
-	<p>
-	When browsing Playground as a standalone instance, you can enable networking via the settings panel: select the option "Network access (e.g. for browsing plugins)" and hit the "Apply changes" button.<p>
-	<strong>Please note:</strong> This option is hidden when browsing Playground as an embedded iframe.</p></div>';
-	return $networking_err_msg;
-}
-
-add_filter('plugins_api_result', function ($res) {
-	if ($res instanceof WP_Error) {
-		$res = new WP_Error(
-			'plugins_api_failed',
-			networking_disabled()
-    );
-	}
-	return $res;
-});
-
-add_filter('gettext', function ($translation) {
-	if( $GLOBALS['pagenow'] === 'theme-install.php') {
-		if ($translation === 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.') {
-		return networking_disabled();
-		}
-	}
-	return $translation;
-});
-
-/**
- * Links with target="top" don't work in the playground iframe because of
- * the sandbox attribute. What they really should be targeting is the
- * playground iframe itself (name="playground"). This mu-plugin rewrites
- * all target="_top" links to target="playground" instead.
- * 
- * https://github.com/WordPress/wordpress-playground/issues/266
- */
-add_action('admin_print_scripts', function () {
-	?>
-	<script>
-		document.addEventListener('click', function (event) {
-			if (event.target.tagName === 'A' && ['_parent', '_top'].includes(event.target.target)) {
-				event.target.target = 'wordpress-playground';
-			}
-		});
-	<\/script>
-	<?php
-});
-
-/**
- * Supports URL rewriting to remove \`index.php\` from permalinks.
- */
-add_filter('got_url_rewrite', '__return_true');
-
-/**
- * The default WordPress requests transports have been disabled
- * at this point. However, the Requests class requires at least
- * one working transport or else it throws warnings and acts up.
- * 
- * This mu-plugin provides that transport. It's one of the two:
- * 
- * * WP_Http_Fetch – Sends requests using browser's fetch() function.
- *                   Only enabled when PHP was compiled with the VRZNO
- * 					 extension.
- * * Requests_Transport_Dummy – Does not send any requests and only exists to keep
- * 								the Requests class happy.
- */
-$__requests_class = class_exists( '\\WpOrg\\Requests\\Requests' ) ? '\\WpOrg\\Requests\\Requests' : 'Requests';
-if (defined('USE_FETCH_FOR_REQUESTS') && USE_FETCH_FOR_REQUESTS) {
-	require(__DIR__ . '/playground-includes/wp_http_fetch.php');
-	$__requests_class::add_transport('WP_Http_Fetch');
-
-	/**
-	 * Add Fetch transport to the list of transports that WordPress
-	 * will test for in the _get_first_available_transport() function.
-	 */
-	add_filter('http_api_transports', function ($transports) {
-		$transports[] = 'Fetch';
-		return $transports;
-	});
-	/**
-	 * Disable signature verification as it doesn't seem to work with
-	 * fetch requests:
-	 * 
-	 * https://downloads.wordpress.org/plugin/classic-editor.zip returns no signature header.
-	 * https://downloads.wordpress.org/plugin/classic-editor.zip.sig returns 404.
-	 * 
-	 * @TODO Investigate why.
-	 */
-	add_filter('wp_signature_hosts', function ($hosts) {
-		return [];
-	});
-
-	add_filter('http_request_host_is_external', function ($arg) {
-		return true;
-	});
-} else {
-	require(__DIR__ . '/playground-includes/requests_transport_dummy.php');
-	$__requests_class::add_transport('Requests_Transport_Dummy');
-}
-`;
-async function updateFile(e, t, r) {
-  let n = "";
-  await e.fileExists(t) && (n = await e.readFileAsText(t)), await e.writeFile(t, r(n));
-}
-const applyWordPressPatches = async (e, t) => {
-  const r = new WordPressPatcher(
-    e,
-    t.wordpressPath || "/wordpress",
-    t.siteUrl
-  );
-  t.addPhpInfo === !0 && await r.addPhpInfo(), t.siteUrl && await r.patchSiteUrl(), t.patchSecrets === !0 && await r.patchSecrets(), t.disableSiteHealth === !0 && await r.disableSiteHealth(), t.disableWpNewBlogNotification === !0 && await r.disableWpNewBlogNotification(), t.prepareForRunningInsideWebBrowser === !0 && await r.prepareForRunningInsideWebBrowser(), t.addFetchNetworkTransport === !0 && await r.addFetchNetworkTransport();
-};
-class WordPressPatcher {
-  constructor(t, r, n) {
-    this.php = t, this.scopedSiteUrl = n, this.wordpressPath = r;
-  }
-  async addPhpInfo() {
-    await this.php.writeFile(
-      joinPaths(this.wordpressPath, "phpinfo.php"),
-      "<?php phpinfo(); "
-    );
-  }
-  async patchSiteUrl() {
-    await defineWpConfigConsts(this.php, {
-      consts: {
-        WP_HOME: this.scopedSiteUrl,
-        WP_SITEURL: this.scopedSiteUrl
-      }
-    });
-  }
-  async patchSecrets() {
-    await defineWpConfigConsts(this.php, {
-      consts: {
-        AUTH_KEY: randomString(40),
-        SECURE_AUTH_KEY: randomString(40),
-        LOGGED_IN_KEY: randomString(40),
-        NONCE_KEY: randomString(40),
-        AUTH_SALT: randomString(40),
-        SECURE_AUTH_SALT: randomString(40),
-        LOGGED_IN_SALT: randomString(40),
-        NONCE_SALT: randomString(40)
-      }
-    });
-  }
-  async disableSiteHealth() {
-    await updateFile(
-      this.php,
-      joinPaths(this.wordpressPath, "wp-includes/default-filters.php"),
-      (t) => t.replace(
-        /add_filter[^;]+wp_maybe_grant_site_health_caps[^;]+;/i,
-        ""
-      )
-    );
-  }
-  async disableWpNewBlogNotification() {
-    await updateFile(
-      this.php,
-      joinPaths(this.wordpressPath, "wp-config.php"),
-      // The original version of this function crashes WASM PHP, let's define an empty one instead.
-      (t) => `${t} function wp_new_blog_notification(...$args){} `
-    );
-  }
-  async prepareForRunningInsideWebBrowser() {
-    await this.php.mkdir(
-      joinPaths(this.wordpressPath, "wp-content/mu-plugins")
-    ), await this.php.writeFile(
-      joinPaths(
-        this.wordpressPath,
-        "/wp-content/mu-plugins/0-playground.php"
-      ),
-      playgroundMuPlugin
-    ), await this.php.mkdir(
-      joinPaths(
-        this.wordpressPath,
-        "/wp-content/mu-plugins/playground-includes"
-      )
-    ), await this.php.writeFile(
-      joinPaths(
-        this.wordpressPath,
-        "/wp-content/mu-plugins/playground-includes/requests_transport_dummy.php"
-      ),
-      transportDummy
-    );
-  }
-  async addFetchNetworkTransport() {
-    await defineWpConfigConsts(this.php, {
-      consts: {
-        USE_FETCH_FOR_REQUESTS: !0
-      }
-    });
-    const t = [
-      joinPaths(
-        this.wordpressPath,
-        "/wp-includes/Requests/Transport/fsockopen.php"
-      ),
-      joinPaths(
-        this.wordpressPath,
-        "/wp-includes/Requests/Transport/cURL.php"
-      ),
-      joinPaths(
-        this.wordpressPath,
-        "/wp-includes/Requests/src/Transport/Fsockopen.php"
-      ),
-      joinPaths(
-        this.wordpressPath,
-        "/wp-includes/Requests/src/Transport/Curl.php"
-      )
-    ];
-    for (const r of t)
-      await this.php.fileExists(r) && await updateFile(this.php, r, (n) => n.includes("public static function test2") ? n : n.replace(
-        "public static function test",
-        "public static function test( $capabilities = array() ) { return false; } public static function test2"
-      ));
-    await this.php.writeFile(
-      joinPaths(
-        this.wordpressPath,
-        "wp-content/mu-plugins/playground-includes/wp_http_fetch.php"
-      ),
-      transportFetch
-    ), await this.php.mkdir(`${this.wordpressPath}/wp-content/fonts`);
-  }
-}
-function randomString(e) {
-  const t = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()_+=-[]/.,<>?";
-  let r = "";
-  for (let n = e; n > 0; --n)
-    r += t[Math.floor(Math.random() * t.length)];
-  return r;
-}
-const runPHP = async (e, { code: t }) => await e.run({ code: t, throwOnError: !0 }), runPHPWithOptions = async (e, { options: t }) => await e.run(t), rm = async (e, { path: t }) => {
-  await e.unlink(t);
-}, runSql = async (e, { sql: t }, r) => {
-  r == null || r.tracker.setCaption("Executing SQL Queries");
-  const n = `/tmp/${crypto.randomUUID()}.sql`;
-  await e.writeFile(
-    n,
-    new Uint8Array(await t.arrayBuffer())
-  );
-  const s = await e.documentRoot, o = phpVars({ docroot: s, sqlFilename: n }), i = await e.run({
-    code: `<?php
-		require_once ${o.docroot} . '/wp-load.php';
-
-		$handle = fopen(${o.sqlFilename}, 'r');
-		$buffer = '';
-
-		global $wpdb;
-
-		while ($bytes = fgets($handle)) {
-			$buffer .= $bytes;
-
-			if (!feof($handle) && substr($buffer, -1, 1) !== "
-") {
-				continue;
-			}
-
-			$wpdb->query($buffer);
-			$buffer = '';
-		}
-	`
-  });
-  return await rm(e, { path: n }), i;
-}, 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)
-    throw console.warn("WordPress response was", { response: r }), new Error(
-      `Request failed with status ${r.httpStatusCode}`
-    );
-  return r;
-}, login = async (e, { username: t = "admin", password: r = "password" } = {}, n) => {
+const login = async (e, { username: t = "admin", password: r = "password" } = {}, n) => {
   var o, i, l;
   n == null || n.tracker.setCaption((n == null ? void 0 : n.initialCaption) || "Logging in"), await e.request({
     url: "/wp-login.php"
@@ -1204,7 +733,7 @@ function getURLScope(e) {
   return isURLScoped(e) ? e.pathname.split("/")[1].split(":")[1] : null;
 }
 const enableMultisite = async (e) => {
-  var w;
+  var v;
   await defineWpConfigConsts(e, {
     consts: {
       WP_ALLOW_MULTISITE: 1
@@ -1212,8 +741,8 @@ const enableMultisite = async (e) => {
   });
   const t = new URL(await e.absoluteUrl);
   if (t.port !== "") {
-    let R = `The current host is ${t.host}, but WordPress multisites do not support custom ports.`;
-    throw t.hostname === "localhost" && (R += " For development, you can set up a playground.test domain using the instructions at https://wordpress.github.io/wordpress-playground/contributing/code."), new Error(R);
+    let w = `The current host is ${t.host}, but WordPress multisites do not support custom ports.`;
+    throw t.hostname === "localhost" && (w += " For development, you can set up a playground.test domain using the instructions at https://wordpress.github.io/wordpress-playground/contributing/code."), new Error(w);
   }
   const r = t.pathname.replace(/\/$/, "") + "/", n = `${t.protocol}//${t.hostname}${r}`;
   await setSiteOptions(e, {
@@ -1253,13 +782,13 @@ foreach($plugins as $plugin_path) {
 }
 echo json_encode($deactivated_plugins);
 `
-  })).json, p = (w = (await request(e, {
+  })).json, p = (v = (await request(e, {
     request: {
       url: "/wp-admin/network.php"
     }
   })).text.match(
     /name="_wpnonce"\s+value="([^"]+)"/
-  )) == null ? void 0 : w[1], d = await request(e, {
+  )) == null ? void 0 : v[1], d = await request(e, {
     request: {
       url: "/wp-admin/network.php",
       method: "POST",
@@ -1294,23 +823,23 @@ echo json_encode($deactivated_plugins);
       PATH_CURRENT_SITE: r
     }
   });
-  const u = new URL(await e.absoluteUrl), m = isURLScoped(u) ? "scope:" + getURLScope(u) : null;
+  const u = new URL(await e.absoluteUrl), _ = isURLScoped(u) ? "scope:" + getURLScope(u) : 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(m)};
+	$folder = ${phpVar(_)};
 	if ($folder && strpos($_SERVER['REQUEST_URI'],"/$folder") === false) {
 		$_SERVER['HTTP_HOST'] = ${phpVar(u.hostname)};
 		$_SERVER['REQUEST_URI'] = "/$folder/" . ltrim($_SERVER['REQUEST_URI'], '/');
 	}
 `
   ), await login(e, {});
-  for (const R of i)
+  for (const w of i)
     await activatePlugin(e, {
-      pluginPath: R
+      pluginPath: w
     });
 };
 function jsonToUrlEncoded(e) {
@@ -1494,13 +1023,13 @@ const tmpPath = "/tmp/file.zip", unzip = async (e, { zipFile: t, zipPath: r, ext
   }), s = joinPaths(s, r);
   const o = joinPaths(s, "wp-content"), i = joinPaths(n, "wp-content");
   for (const u of wpContentFilesExcludedFromExport) {
-    const m = joinPaths(
+    const _ = joinPaths(
       o,
       u
     );
-    await removePath(e, m);
-    const w = joinPaths(i, u);
-    await e.fileExists(w) && (await e.mkdir(dirname(m)), await e.mv(w, m));
+    await removePath(e, _);
+    const v = joinPaths(i, u);
+    await e.fileExists(v) && (await e.mkdir(dirname(_)), await e.mv(v, _));
   }
   const l = joinPaths(
     s,
@@ -1517,7 +1046,9 @@ const tmpPath = "/tmp/file.zip", unzip = async (e, { zipFile: t, zipPath: r, ext
       joinPaths(s, u),
       joinPaths(n, u)
     );
-  await e.rmdir(s);
+  await e.rmdir(s), await defineSiteUrl(e, {
+    siteUrl: await e.absoluteUrl
+  });
   const d = phpVar(
     joinPaths(n, "wp-admin", "upgrade.php")
   );
@@ -1557,13 +1088,13 @@ async function installAsset(e, { targetPath: t, zipFile: r }) {
     let p = await e.listFiles(l, {
       prependPath: !0
     });
-    p = p.filter((R) => !R.endsWith("/__MACOSX"));
+    p = p.filter((w) => !w.endsWith("/__MACOSX"));
     const d = p.length === 1 && await e.isDir(p[0]);
-    let u, m = "";
-    d ? (m = p[0], u = p[0].split("/").pop()) : (m = l, u = s);
-    const w = `${t}/${u}`;
-    return await e.mv(m, w), {
-      assetFolderPath: w,
+    let u, _ = "";
+    d ? (_ = p[0], u = p[0].split("/").pop()) : (_ = l, u = s);
+    const v = `${t}/${u}`;
+    return await e.mv(_, v), {
+      assetFolderPath: v,
       assetFolderName: u
     };
   } finally {
@@ -1653,7 +1184,6 @@ const installPlugin = async (e, { pluginZipFile: t, options: r = {} }, n) => {
   __proto__: null,
   activatePlugin,
   activateTheme,
-  applyWordPressPatches,
   cp,
   defineSiteUrl,
   defineWpConfigConsts,
@@ -2106,16 +1636,16 @@ const SupportedPHPVersions = [
 ], SupportedPHPExtensionBundles = {
   "kitchen-sink": SupportedPHPExtensionsList
 };
-var Ae, Be;
+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, Be, void 0);
-    this.requestHandler = t, te(this, Ae, {}), te(this, Be, {
+    Z(this, Ae, void 0);
+    Z(this, Ge, void 0);
+    this.requestHandler = t, te(this, Ae, {}), te(this, Ge, {
       handleRedirects: !1,
       maxRedirects: 4,
       ...r
@@ -2143,7 +1673,7 @@ class PHPBrowser {
         cookie: this.serializeCookies()
       }
     });
-    if (n.headers["set-cookie"] && this.setCookies(n.headers["set-cookie"]), H(this, Be).handleRedirects && n.headers.location && r < H(this, Be).maxRedirects) {
+    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
@@ -2193,7 +1723,7 @@ class PHPBrowser {
     return t.join("; ");
   }
 }
-Ae = new WeakMap(), Be = new WeakMap();
+Ae = new WeakMap(), Ge = new WeakMap();
 const DEFAULT_BASE_URL = "http://example.com";
 function toRelativeUrl(e) {
   return e.toString().substring(e.origin.length);
@@ -2204,7 +1734,7 @@ function removePathPrefix(e, t) {
 function ensurePathPrefix(e, t) {
   return !t || e.startsWith(t) ? e : t + e;
 }
-var Se, Ge, dt, De, Ke, we, Je, Qe, mt, zt, _t, Wt, gt, Bt;
+var Se, Ke, dt, De, Je, ve, Ze, Fe, mt, xt, _t, Wt, gt, Bt;
 class PHPRequestHandler {
   /**
    * @param  php    - The PHP instance.
@@ -2217,7 +1747,7 @@ class PHPRequestHandler {
      * @param  fsPath - Absolute path of the static file to serve.
      * @returns The response.
      */
-    Q(this, mt);
+    Z(this, mt);
     /**
      * Runs the requested PHP file with all the request and $_SERVER
      * superglobals populated.
@@ -2225,7 +1755,7 @@ class PHPRequestHandler {
      * @param  request - The request.
      * @returns The response.
      */
-    Q(this, _t);
+    Z(this, _t);
     /**
      * Resolve the requested path to the filesystem path of the requested PHP file.
      *
@@ -2235,31 +1765,31 @@ class PHPRequestHandler {
      * @throws {Error} If the requested path doesn't exist.
      * @returns The resolved filesystem path.
      */
-    Q(this, gt);
-    Q(this, Se, void 0);
-    Q(this, Ge, void 0);
-    Q(this, dt, void 0);
-    Q(this, De, void 0);
-    Q(this, Ke, void 0);
-    Q(this, we, void 0);
-    Q(this, Je, void 0);
-    Q(this, Qe, void 0);
-    te(this, Qe, new Semaphore({ concurrency: 1 }));
+    Z(this, gt);
+    Z(this, Se, void 0);
+    Z(this, Ke, void 0);
+    Z(this, dt, void 0);
+    Z(this, De, void 0);
+    Z(this, Je, void 0);
+    Z(this, ve, void 0);
+    Z(this, Ze, void 0);
+    Z(this, Fe, void 0);
+    te(this, Fe, new Semaphore({ concurrency: 1 }));
     const {
       documentRoot: n = "/www/",
       absoluteUrl: s = typeof location == "object" ? location == null ? void 0 : location.href : ""
     } = r;
     this.php = t, te(this, Se, 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, Ge, (o.protocol || "").replace(":", ""));
+    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 i = H(this, De) !== 443 && H(this, De) !== 80;
-    te(this, Ke, [
+    te(this, Je, [
       H(this, dt),
       i ? `:${H(this, De)}` : ""
-    ].join("")), te(this, we, o.pathname.replace(/\/+$/, "")), te(this, Je, [
-      `${H(this, Ge)}://`,
-      H(this, Ke),
-      H(this, we)
+    ].join("")), te(this, ve, o.pathname.replace(/\/+$/, "")), te(this, Ze, [
+      `${H(this, Ke)}://`,
+      H(this, Je),
+      H(this, ve)
     ].join(""));
   }
   /** @inheritDoc */
@@ -2269,14 +1799,14 @@ class PHPRequestHandler {
   /** @inheritDoc */
   internalUrlToPath(t) {
     const r = new URL(t);
-    return r.pathname.startsWith(H(this, we)) && (r.pathname = r.pathname.slice(H(this, we).length)), toRelativeUrl(r);
+    return r.pathname.startsWith(H(this, ve)) && (r.pathname = r.pathname.slice(H(this, ve).length)), toRelativeUrl(r);
   }
   get isRequestRunning() {
-    return H(this, Qe).running > 0;
+    return H(this, Fe).running > 0;
   }
   /** @inheritDoc */
   get absoluteUrl() {
-    return H(this, Je);
+    return H(this, Ze);
   }
   /** @inheritDoc */
   get documentRoot() {
@@ -2289,12 +1819,12 @@ class PHPRequestHandler {
       r ? void 0 : DEFAULT_BASE_URL
     ), s = removePathPrefix(
       n.pathname,
-      H(this, we)
+      H(this, ve)
     ), o = `${H(this, Se)}${s}`;
-    return seemsLikeAPHPRequestHandlerPath(o) ? await ce(this, _t, Wt).call(this, t, n) : ce(this, mt, zt).call(this, o);
+    return seemsLikeAPHPRequestHandlerPath(o) ? await ce(this, _t, Wt).call(this, t, n) : ce(this, mt, xt).call(this, o);
   }
 }
-Se = new WeakMap(), Ge = new WeakMap(), dt = new WeakMap(), De = new WeakMap(), Ke = new WeakMap(), we = new WeakMap(), Je = new WeakMap(), Qe = new WeakMap(), mt = new WeakSet(), zt = function(t) {
+Se = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), De = new WeakMap(), Je = new WeakMap(), ve = new WeakMap(), Ze = new WeakMap(), Fe = new WeakMap(), mt = new WeakSet(), xt = function(t) {
   if (!this.php.fileExists(t))
     return new PHPResponse(
       404,
@@ -2320,48 +1850,56 @@ Se = new WeakMap(), Ge = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
     r
   );
 }, _t = new WeakSet(), Wt = async function(t, r) {
-  var s, o;
-  const n = await H(this, Qe).acquire();
+  var s, o, i;
+  if (H(this, Fe).running > 0 && ((s = t.headers) == null ? void 0 : s["x-request-issuer"]) === "php")
+    return console.warn(
+      "Possible deadlock: Called request() before the previous request() have finished. PHP likely issued an HTTP call to itself. Normally this would lead to infinite waiting as Request 1 holds the lock that the Request 2 is waiting to acquire. That's not useful, so PHPRequestHandler will return error 502 instead."
+    ), new PHPResponse(
+      502,
+      {},
+      new TextEncoder().encode("502 Bad Gateway")
+    );
+  const n = await H(this, Fe).acquire();
   try {
     this.php.addServerGlobalEntry("REMOTE_ADDR", "127.0.0.1"), this.php.addServerGlobalEntry("DOCUMENT_ROOT", H(this, Se)), this.php.addServerGlobalEntry(
       "HTTPS",
-      H(this, Je).startsWith("https://") ? "on" : ""
+      H(this, Ze).startsWith("https://") ? "on" : ""
     );
-    let i = "GET";
-    const l = {
-      host: H(this, Ke),
+    let l = "GET";
+    const p = {
+      host: H(this, Je),
       ...normalizeHeaders(t.headers || {})
-    }, p = [];
+    }, d = [];
     if (t.files && Object.keys(t.files).length) {
-      i = "POST";
-      for (const m in t.files) {
-        const w = t.files[m];
-        p.push({
-          key: m,
+      l = "POST";
+      for (const v in t.files) {
+        const w = t.files[v];
+        d.push({
+          key: v,
           name: w.name,
           type: w.type,
           data: new Uint8Array(await w.arrayBuffer())
         });
       }
-      (s = l["content-type"]) != null && s.startsWith("multipart/form-data") && (t.formData = parseMultipartFormDataString(
+      (o = p["content-type"]) != null && o.startsWith("multipart/form-data") && (t.formData = parseMultipartFormDataString(
         t.body || ""
-      ), l["content-type"] = "application/x-www-form-urlencoded", delete t.body);
+      ), p["content-type"] = "application/x-www-form-urlencoded", delete t.body);
     }
-    let d;
-    t.formData !== void 0 ? (i = "POST", l["content-type"] = l["content-type"] || "application/x-www-form-urlencoded", d = new URLSearchParams(
-      t.formData
-    ).toString()) : d = t.body;
     let u;
+    t.formData !== void 0 ? (l = "POST", p["content-type"] = p["content-type"] || "application/x-www-form-urlencoded", u = new URLSearchParams(
+      t.formData
+    ).toString()) : u = t.body;
+    let _;
     try {
-      let m = r.pathname;
-      if ((o = t.headers) != null && o["x-rewrite-url"])
+      let v = r.pathname;
+      if ((i = t.headers) != null && i["x-rewrite-url"])
         try {
-          m = new URL(
+          v = new URL(
             t.headers["x-rewrite-url"]
           ).pathname;
         } catch {
         }
-      u = ce(this, gt, Bt).call(this, m);
+      _ = ce(this, gt, Bt).call(this, v);
     } catch {
       return new PHPResponse(
         404,
@@ -2372,20 +1910,20 @@ Se = new WeakMap(), Ge = new WeakMap(), dt = new WeakMap(), De = new WeakMap(),
     return await this.php.run({
       relativeUri: ensurePathPrefix(
         toRelativeUrl(r),
-        H(this, we)
+        H(this, ve)
       ),
-      protocol: H(this, Ge),
-      method: t.method || i,
-      body: d,
-      fileInfos: p,
-      scriptPath: u,
-      headers: l
+      protocol: H(this, Ke),
+      method: t.method || l,
+      body: u,
+      fileInfos: d,
+      scriptPath: _,
+      headers: p
     });
   } finally {
     n();
   }
 }, gt = new WeakSet(), Bt = function(t) {
-  let r = removePathPrefix(t, H(this, we));
+  let r = removePathPrefix(t, H(this, ve));
   r.includes(".php") ? r = r.split(".php")[0] + ".php" : (r.endsWith("/") || (r += "/"), r.endsWith("index.php") || (r += "index.php"));
   const n = `${H(this, Se)}${r}`;
   if (this.php.fileExists(n))
@@ -2549,8 +2087,8 @@ function rethrowFileSystemError(e = "") {
       } catch (l) {
         const p = typeof l == "object" ? l == null ? void 0 : l.errno : null;
         if (p in FileErrorCodes) {
-          const d = FileErrorCodes[p], u = typeof i[0] == "string" ? i[0] : null, m = u !== null ? e.replaceAll("{path}", u) : e;
-          throw new Error(`${m}: ${d}`, {
+          const d = FileErrorCodes[p], u = typeof i[0] == "string" ? i[0] : null, _ = u !== null ? e.replaceAll("{path}", u) : e;
+          throw new Error(`${_}: ${d}`, {
             cause: l
           });
         }
@@ -2573,7 +2111,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 Fe, Ze, Ye, Pe, Re, Te, be, Xe, $t, Gt, yt, Kt, wt, Jt, vt, Qt, Pt, Zt, bt, Yt, Et, Xt, St, er, Rt, tr, Tt, rr, kt, nr, Ct, sr;
+var Me, Qe, Ye, Pe, Re, Te, be, Xe, $t, Gt, yt, Kt, vt, Jt, wt, Zt, Pt, Qt, bt, Yt, Et, Xt, St, er, Rt, tr, Tt, rr, kt, nr, Ct, sr;
 class BasePHP {
   /**
    * Initializes a PHP runtime.
@@ -2583,15 +2121,15 @@ class BasePHP {
    * @param  serverOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(e, t) {
-    Q(this, $t);
-    Q(this, yt);
-    Q(this, wt);
-    Q(this, vt);
-    Q(this, Pt);
-    Q(this, bt);
-    Q(this, Et);
-    Q(this, St);
-    Q(this, Rt);
+    Z(this, $t);
+    Z(this, yt);
+    Z(this, vt);
+    Z(this, wt);
+    Z(this, Pt);
+    Z(this, bt);
+    Z(this, Et);
+    Z(this, St);
+    Z(this, Rt);
     /**
      * Adds file information to $_FILES superglobal in PHP.
      *
@@ -2601,18 +2139,18 @@ class BasePHP {
      *
      * @param  fileInfo - File details
      */
-    Q(this, Tt);
-    Q(this, kt);
-    Q(this, Ct);
-    Q(this, Fe, void 0);
-    Q(this, Ze, void 0);
-    Q(this, Ye, void 0);
-    Q(this, Pe, void 0);
-    Q(this, Re, void 0);
-    Q(this, Te, void 0);
-    Q(this, be, void 0);
-    Q(this, Xe, void 0);
-    te(this, Fe, []), te(this, Pe, !1), te(this, Re, null), te(this, Te, {}), te(this, be, /* @__PURE__ */ new Map()), te(this, Xe, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPBrowser(
+    Z(this, Tt);
+    Z(this, kt);
+    Z(this, Ct);
+    Z(this, Me, void 0);
+    Z(this, Qe, void 0);
+    Z(this, Ye, void 0);
+    Z(this, Pe, void 0);
+    Z(this, Re, void 0);
+    Z(this, Te, void 0);
+    Z(this, be, void 0);
+    Z(this, Xe, void 0);
+    te(this, Me, []), te(this, Pe, !1), te(this, Re, null), te(this, Te, {}), te(this, be, /* @__PURE__ */ new Map()), te(this, Xe, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPBrowser(
       new PHPRequestHandler(this, t)
     ));
   }
@@ -2689,7 +2227,7 @@ class BasePHP {
   setPhpIniPath(e) {
     if (H(this, Pe))
       throw new Error("Cannot set PHP ini path after calling run().");
-    te(this, Ze, e), this[__private__dont__use].ccall(
+    te(this, Qe, e), this[__private__dont__use].ccall(
       "wasm_set_phpini_path",
       null,
       ["string"],
@@ -2700,7 +2238,7 @@ class BasePHP {
   setPhpIniEntry(e, t) {
     if (H(this, Pe))
       throw new Error("Cannot set PHP ini entries after calling run().");
-    H(this, Fe).push([e, t]);
+    H(this, Me).push([e, t]);
   }
   /** @inheritDoc */
   chdir(e) {
@@ -2717,9 +2255,9 @@ class BasePHP {
     const t = await this.semaphore.acquire();
     let r;
     try {
-      H(this, Pe) || (ce(this, $t, Gt).call(this), te(this, Pe, !0)), ce(this, St, er).call(this, e.scriptPath || ""), ce(this, wt, Jt).call(this, e.relativeUri || ""), ce(this, Pt, Zt).call(this, e.method || "GET");
+      H(this, Pe) || (ce(this, $t, Gt).call(this), te(this, Pe, !0)), ce(this, St, er).call(this, e.scriptPath || ""), ce(this, vt, Jt).call(this, e.relativeUri || ""), ce(this, Pt, Qt).call(this, e.method || "GET");
       const n = normalizeHeaders(e.headers || {}), s = n.host || "example.com:443";
-      if (ce(this, vt, 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)), e.fileInfos)
+      if (ce(this, wt, Zt).call(this, s, e.protocol || "http"), ce(this, bt, Yt).call(this, n), e.body && (r = ce(this, Et, Xt).call(this, e.body)), e.fileInfos)
         for (const i of e.fileInfos)
           ce(this, Tt, rr).call(this, i);
       typeof e.code == "string" && ce(this, kt, nr).call(this, " ?>" + e.code), ce(this, Rt, tr).call(this);
@@ -2843,7 +2381,7 @@ class BasePHP {
       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) {
+    if (this.initializeRuntime(e), H(this, Qe) && this.setPhpIniPath(H(this, Qe)), H(this, Ye) && this.setSapiName(H(this, Ye)), this.requestHandler) {
       const r = this.documentRoot;
       recreateMemFS(this[__private__dont__use].FS, t, r);
     }
@@ -2859,7 +2397,7 @@ class BasePHP {
     te(this, Pe, !1), te(this, Re, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
   }
 }
-Fe = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), Pe = new WeakMap(), Re = new WeakMap(), Te = new WeakMap(), be = new WeakMap(), Xe = new WeakMap(), $t = new WeakSet(), Gt = function() {
+Me = new WeakMap(), Qe = new WeakMap(), Ye = new WeakMap(), Pe = new WeakMap(), Re = new WeakMap(), Te = new WeakMap(), be = new WeakMap(), Xe = new WeakMap(), $t = new WeakSet(), Gt = function() {
   if (this.setPhpIniEntry("auto_prepend_file", "/tmp/consts.php"), this.fileExists("/tmp/consts.php") || this.writeFile(
     "/tmp/consts.php",
     `<?php
@@ -2871,8 +2409,8 @@ Fe = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), Pe = new WeakMap(),
 						}
 					}
 				}`
-  ), H(this, Fe).length > 0) {
-    const e = H(this, Fe).map(([t, r]) => `${t}=${r}`).join(`
+  ), H(this, Me).length > 0) {
+    const e = H(this, Me).map(([t, r]) => `${t}=${r}`).join(`
 `) + `
 
 `;
@@ -2901,7 +2439,7 @@ Fe = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), Pe = new WeakMap(),
     headers: r,
     httpStatusCode: t.status
   };
-}, wt = new WeakSet(), Jt = function(e) {
+}, vt = new WeakSet(), Jt = function(e) {
   if (this[__private__dont__use].ccall(
     "wasm_set_request_uri",
     null,
@@ -2916,7 +2454,7 @@ Fe = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), Pe = new WeakMap(),
       [t]
     );
   }
-}, vt = new WeakSet(), Qt = function(e, t) {
+}, wt = new WeakSet(), Zt = function(e, t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_host",
     null,
@@ -2934,7 +2472,7 @@ Fe = new WeakMap(), Ze = new WeakMap(), Ye = new WeakMap(), Pe = new WeakMap(),
     [NUMBER],
     [r]
   ), (t === "https" || !t && r === 443) && this.addServerGlobalEntry("HTTPS", "on");
-}, Pt = new WeakSet(), Zt = function(e) {
+}, Pt = new WeakSet(), Qt = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_request_method",
     null,
@@ -3402,15 +2940,15 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
   e._ = s;
   const o = new n("+");
   function i(g, ...k) {
-    const C = [R(g[0])];
+    const C = [w(g[0])];
     let I = 0;
     for (; I < k.length; )
-      C.push(o), l(C, k[I]), C.push(o, R(g[++I]));
+      C.push(o), l(C, k[I]), C.push(o, w(g[++I]));
     return p(C), new n(C);
   }
   e.str = i;
   function l(g, k) {
-    k instanceof n ? g.push(...k._items) : k instanceof r ? g.push(k) : g.push(m(k));
+    k instanceof n ? g.push(...k._items) : k instanceof r ? g.push(k) : g.push(_(k));
   }
   e.addCodeArg = l;
   function p(g) {
@@ -3441,21 +2979,21 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
     return k.emptyStr() ? g : g.emptyStr() ? k : i`${g}${k}`;
   }
   e.strConcat = u;
-  function m(g) {
-    return typeof g == "number" || typeof g == "boolean" || g === null ? g : R(Array.isArray(g) ? g.join(",") : g);
+  function _(g) {
+    return typeof g == "number" || typeof g == "boolean" || g === null ? g : w(Array.isArray(g) ? g.join(",") : g);
   }
-  function w(g) {
-    return new n(R(g));
+  function v(g) {
+    return new n(w(g));
   }
-  e.stringify = w;
-  function R(g) {
+  e.stringify = v;
+  function w(g) {
     return JSON.stringify(g).replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
   }
-  e.safeStringify = R;
-  function v(g) {
+  e.safeStringify = w;
+  function P(g) {
     return typeof g == "string" && e.IDENTIFIER.test(g) ? new n(`.${g}`) : s`[${g}]`;
   }
-  e.getProperty = v;
+  e.getProperty = P;
   function T(g) {
     if (typeof g == "string" && e.IDENTIFIER.test(g))
       return new n(`${g}`);
@@ -3499,8 +3037,8 @@ var scope = {};
       return `${d}${u.index++}`;
     }
     _nameGroup(d) {
-      var u, m;
-      if (!((m = (u = this._parent) === null || u === void 0 ? void 0 : u._prefixes) === null || m === void 0) && m.has(d) || this._prefixes && !this._prefixes.has(d))
+      var u, _;
+      if (!((_ = (u = this._parent) === null || u === void 0 ? void 0 : u._prefixes) === null || _ === void 0) && _.has(d) || this._prefixes && !this._prefixes.has(d))
         throw new Error(`CodeGen: prefix "${d}" is not allowed in this scope`);
       return this._names[d] = { prefix: d, index: 0 };
     }
@@ -3510,8 +3048,8 @@ var scope = {};
     constructor(d, u) {
       super(u), this.prefix = d;
     }
-    setValue(d, { property: u, itemIndex: m }) {
-      this.value = d, this.scopePath = (0, t._)`.${new t.Name(u)}[${m}]`;
+    setValue(d, { property: u, itemIndex: _ }) {
+      this.value = d, this.scopePath = (0, t._)`.${new t.Name(u)}[${_}]`;
     }
   }
   e.ValueScopeName = o;
@@ -3527,47 +3065,47 @@ var scope = {};
       return new o(d, this._newName(d));
     }
     value(d, u) {
-      var m;
+      var _;
       if (u.ref === void 0)
         throw new Error("CodeGen: ref must be passed in value");
-      const w = this.toName(d), { prefix: R } = w, v = (m = u.key) !== null && m !== void 0 ? m : u.ref;
-      let T = this._values[R];
+      const v = this.toName(d), { prefix: w } = v, P = (_ = u.key) !== null && _ !== void 0 ? _ : u.ref;
+      let T = this._values[w];
       if (T) {
-        const k = T.get(v);
+        const k = T.get(P);
         if (k)
           return k;
       } else
-        T = this._values[R] = /* @__PURE__ */ new Map();
-      T.set(v, w);
-      const $ = this._scope[R] || (this._scope[R] = []), g = $.length;
-      return $[g] = u.ref, w.setValue(u, { property: R, itemIndex: g }), w;
+        T = this._values[w] = /* @__PURE__ */ new Map();
+      T.set(P, v);
+      const $ = this._scope[w] || (this._scope[w] = []), g = $.length;
+      return $[g] = u.ref, v.setValue(u, { property: w, itemIndex: g }), v;
     }
     getValue(d, u) {
-      const m = this._values[d];
-      if (m)
-        return m.get(u);
+      const _ = this._values[d];
+      if (_)
+        return _.get(u);
     }
     scopeRefs(d, u = this._values) {
-      return this._reduceValues(u, (m) => {
-        if (m.scopePath === void 0)
-          throw new Error(`CodeGen: name "${m}" has no value`);
-        return (0, t._)`${d}${m.scopePath}`;
+      return this._reduceValues(u, (_) => {
+        if (_.scopePath === void 0)
+          throw new Error(`CodeGen: name "${_}" has no value`);
+        return (0, t._)`${d}${_.scopePath}`;
       });
     }
-    scopeCode(d = this._values, u, m) {
-      return this._reduceValues(d, (w) => {
-        if (w.value === void 0)
-          throw new Error(`CodeGen: name "${w}" has no value`);
-        return w.value.code;
-      }, u, m);
-    }
-    _reduceValues(d, u, m = {}, w) {
-      let R = t.nil;
-      for (const v in d) {
-        const T = d[v];
+    scopeCode(d = this._values, u, _) {
+      return this._reduceValues(d, (v) => {
+        if (v.value === void 0)
+          throw new Error(`CodeGen: name "${v}" has no value`);
+        return v.value.code;
+      }, u, _);
+    }
+    _reduceValues(d, u, _ = {}, v) {
+      let w = t.nil;
+      for (const P in d) {
+        const T = d[P];
         if (!T)
           continue;
-        const $ = m[v] = m[v] || /* @__PURE__ */ new Map();
+        const $ = _[P] = _[P] || /* @__PURE__ */ new Map();
         T.forEach((g) => {
           if ($.has(g))
             return;
@@ -3575,15 +3113,15 @@ var scope = {};
           let k = u(g);
           if (k) {
             const C = this.opts.es5 ? e.varKinds.var : e.varKinds.const;
-            R = (0, t._)`${R}${C} ${g} = ${k};${this.opts._n}`;
-          } else if (k = w == null ? void 0 : w(g))
-            R = (0, t._)`${R}${k}${this.opts._n}`;
+            w = (0, t._)`${w}${C} ${g} = ${k};${this.opts._n}`;
+          } else if (k = v == null ? void 0 : v(g))
+            w = (0, t._)`${w}${k}${this.opts._n}`;
           else
             throw new r(g);
           $.set(g, n.Completed);
         });
       }
-      return R;
+      return w;
     }
   }
   e.ValueScope = l;
@@ -3643,8 +3181,8 @@ var scope = {};
       super(), this.varKind = a, this.name = h, this.rhs = N;
     }
     render({ es5: a, _n: h }) {
-      const N = a ? r.varKinds.var : this.varKind, q = this.rhs === void 0 ? "" : ` = ${this.rhs}`;
-      return `${N} ${this.name}${q};` + h;
+      const N = a ? r.varKinds.var : this.varKind, M = this.rhs === void 0 ? "" : ` = ${this.rhs}`;
+      return `${N} ${this.name}${M};` + h;
     }
     optimizeNames(a, h) {
       if (a[this.name.str])
@@ -3671,8 +3209,8 @@ var scope = {};
     }
   }
   class p extends l {
-    constructor(a, h, N, q) {
-      super(a, N, q), this.op = h;
+    constructor(a, h, N, M) {
+      super(a, N, M), this.op = h;
     }
     render({ _n: a }) {
       return `${this.lhs} ${this.op}= ${this.rhs};` + a;
@@ -3694,7 +3232,7 @@ var scope = {};
       return `break${this.label ? ` ${this.label}` : ""};` + a;
     }
   }
-  class m extends o {
+  class _ extends o {
     constructor(a) {
       super(), this.error = a;
     }
@@ -3705,7 +3243,7 @@ var scope = {};
       return this.error.names;
     }
   }
-  class w extends o {
+  class v extends o {
     constructor(a) {
       super(), this.code = a;
     }
@@ -3722,7 +3260,7 @@ var scope = {};
       return this.code instanceof t._CodeOrName ? this.code.names : {};
     }
   }
-  class R extends o {
+  class w extends o {
     constructor(a = []) {
       super(), this.nodes = a;
     }
@@ -3740,10 +3278,10 @@ var scope = {};
     }
     optimizeNames(a, h) {
       const { nodes: N } = this;
-      let q = N.length;
-      for (; q--; ) {
-        const M = N[q];
-        M.optimizeNames(a, h) || (ke(a, M.names), N.splice(q, 1));
+      let M = N.length;
+      for (; M--; ) {
+        const q = N[M];
+        q.optimizeNames(a, h) || (ke(a, q.names), N.splice(M, 1));
       }
       return N.length > 0 ? this : void 0;
     }
@@ -3751,17 +3289,17 @@ var scope = {};
       return this.nodes.reduce((a, h) => K(a, h.names), {});
     }
   }
-  class v extends R {
+  class P extends w {
     render(a) {
       return "{" + a._n + super.render(a) + "}" + a._n;
     }
   }
-  class T extends R {
+  class T extends w {
   }
-  class $ extends v {
+  class $ extends P {
   }
   $.kind = "else";
-  class g extends v {
+  class g extends P {
     constructor(a, h) {
       super(h), this.condition = a;
     }
@@ -3795,7 +3333,7 @@ var scope = {};
     }
   }
   g.kind = "if";
-  class k extends v {
+  class k extends P {
   }
   k.kind = "for";
   class C extends k {
@@ -3814,12 +3352,12 @@ var scope = {};
     }
   }
   class I extends k {
-    constructor(a, h, N, q) {
-      super(), this.varKind = a, this.name = h, this.from = N, this.to = q;
+    constructor(a, h, N, M) {
+      super(), this.varKind = a, this.name = h, this.from = N, this.to = M;
     }
     render(a) {
-      const h = a.es5 ? r.varKinds.var : this.varKind, { name: N, from: q, to: M } = this;
-      return `for(${h} ${N}=${q}; ${N}<${M}; ${N}++)` + super.render(a);
+      const h = a.es5 ? r.varKinds.var : this.varKind, { name: N, from: M, to: q } = this;
+      return `for(${h} ${N}=${M}; ${N}<${q}; ${N}++)` + super.render(a);
     }
     get names() {
       const a = ue(super.names, this.from);
@@ -3827,8 +3365,8 @@ var scope = {};
     }
   }
   class D extends k {
-    constructor(a, h, N, q) {
-      super(), this.loop = a, this.varKind = h, this.name = N, this.iterable = q;
+    constructor(a, h, N, M) {
+      super(), this.loop = a, this.varKind = h, this.name = N, this.iterable = M;
     }
     render(a) {
       return `for(${this.varKind} ${this.name} ${this.loop} ${this.iterable})` + super.render(a);
@@ -3841,7 +3379,7 @@ var scope = {};
       return K(super.names, this.iterable.names);
     }
   }
-  class P extends v {
+  class b extends P {
     constructor(a, h, N) {
       super(), this.name = a, this.args = h, this.async = N;
     }
@@ -3849,14 +3387,14 @@ var scope = {};
       return `${this.async ? "async " : ""}function ${this.name}(${this.args})` + super.render(a);
     }
   }
-  P.kind = "func";
-  class O extends R {
+  b.kind = "func";
+  class O extends w {
     render(a) {
       return "return " + super.render(a);
     }
   }
   O.kind = "return";
-  class A extends v {
+  class A extends P {
     render(a) {
       let h = "try" + super.render(a);
       return this.catch && (h += this.catch.render(a)), this.finally && (h += this.finally.render(a)), h;
@@ -3866,15 +3404,15 @@ var scope = {};
       return super.optimizeNodes(), (a = this.catch) === null || a === void 0 || a.optimizeNodes(), (h = this.finally) === null || h === void 0 || h.optimizeNodes(), this;
     }
     optimizeNames(a, h) {
-      var N, q;
-      return super.optimizeNames(a, h), (N = this.catch) === null || N === void 0 || N.optimizeNames(a, h), (q = this.finally) === null || q === void 0 || q.optimizeNames(a, h), this;
+      var N, M;
+      return super.optimizeNames(a, h), (N = this.catch) === null || N === void 0 || N.optimizeNames(a, h), (M = this.finally) === null || M === void 0 || M.optimizeNames(a, h), this;
     }
     get names() {
       const a = super.names;
       return this.catch && K(a, this.catch.names), this.finally && K(a, this.finally.names), a;
     }
   }
-  class x extends v {
+  class V extends P {
     constructor(a) {
       super(), this.error = a;
     }
@@ -3882,13 +3420,13 @@ var scope = {};
       return `catch(${this.error})` + super.render(a);
     }
   }
-  x.kind = "catch";
-  class z extends v {
+  V.kind = "catch";
+  class x extends P {
     render(a) {
       return "finally" + super.render(a);
     }
   }
-  z.kind = "finally";
+  x.kind = "finally";
   class re {
     constructor(a, h = {}) {
       this._values = {}, this._blockStarts = [], this._constants = {}, this.opts = { ...h, _n: h.lines ? `
@@ -3921,9 +3459,9 @@ var scope = {};
     scopeCode() {
       return this._extScope.scopeCode(this._values);
     }
-    _def(a, h, N, q) {
-      const M = this._scope.toName(h);
-      return N !== void 0 && q && (this._constants[M.str] = N), this._leafNode(new i(a, M, N)), M;
+    _def(a, h, N, M) {
+      const q = this._scope.toName(h);
+      return N !== void 0 && M && (this._constants[q.str] = N), this._leafNode(new i(a, q, N)), q;
     }
     // `const` declaration (`var` in es5 mode)
     const(a, h, N) {
@@ -3947,13 +3485,13 @@ var scope = {};
     }
     // appends passed SafeExpr to code or executes Block
     code(a) {
-      return typeof a == "function" ? a() : a !== t.nil && this._leafNode(new w(a)), this;
+      return typeof a == "function" ? a() : a !== t.nil && this._leafNode(new v(a)), this;
     }
     // returns code for object literal for the passed argument list of key-value pairs
     object(...a) {
       const h = ["{"];
-      for (const [N, q] of a)
-        h.length > 1 && h.push(","), h.push(N), (N !== q || this.opts.es5) && (h.push(":"), (0, t.addCodeArg)(h, q));
+      for (const [N, M] of a)
+        h.length > 1 && h.push(","), h.push(N), (N !== M || this.opts.es5) && (h.push(":"), (0, t.addCodeArg)(h, M));
       return h.push("}"), new t._Code(h);
     }
     // `if` clause (or statement if `thenBody` and, optionally, `elseBody` are passed)
@@ -3986,28 +3524,28 @@ var scope = {};
       return this._for(new C(a), h);
     }
     // `for` statement for a range of values
-    forRange(a, h, N, q, M = this.opts.es5 ? r.varKinds.var : r.varKinds.let) {
+    forRange(a, h, N, M, q = this.opts.es5 ? r.varKinds.var : r.varKinds.let) {
       const W = this._scope.toName(a);
-      return this._for(new I(M, W, h, N), () => q(W));
+      return this._for(new I(q, W, h, N), () => M(W));
     }
     // `for-of` statement (in es5 mode replace with a normal for loop)
-    forOf(a, h, N, q = r.varKinds.const) {
-      const M = this._scope.toName(a);
+    forOf(a, h, N, M = r.varKinds.const) {
+      const q = this._scope.toName(a);
       if (this.opts.es5) {
         const W = h instanceof t.Name ? h : this.var("_arr", h);
         return this.forRange("_i", 0, (0, t._)`${W}.length`, (G) => {
-          this.var(M, (0, t._)`${W}[${G}]`), N(M);
+          this.var(q, (0, t._)`${W}[${G}]`), N(q);
         });
       }
-      return this._for(new D("of", q, M, h), () => N(M));
+      return this._for(new D("of", M, q, h), () => N(q));
     }
     // `for-in` statement.
     // With option `ownProperties` replaced with a `for-of` loop for object keys
-    forIn(a, h, N, q = this.opts.es5 ? r.varKinds.var : r.varKinds.const) {
+    forIn(a, h, N, M = this.opts.es5 ? r.varKinds.var : r.varKinds.const) {
       if (this.opts.ownProperties)
         return this.forOf(a, (0, t._)`Object.keys(${h})`, N);
-      const M = this._scope.toName(a);
-      return this._for(new D("in", q, M, h), () => N(M));
+      const q = this._scope.toName(a);
+      return this._for(new D("in", M, q, h), () => N(q));
     }
     // end `for` loop
     endFor() {
@@ -4032,16 +3570,16 @@ var scope = {};
     try(a, h, N) {
       if (!h && !N)
         throw new Error('CodeGen: "try" without "catch" and "finally"');
-      const q = new A();
-      if (this._blockNode(q), this.code(a), h) {
-        const M = this.name("e");
-        this._currNode = q.catch = new x(M), h(M);
+      const M = new A();
+      if (this._blockNode(M), this.code(a), h) {
+        const q = this.name("e");
+        this._currNode = M.catch = new V(q), h(q);
       }
-      return N && (this._currNode = q.finally = new z(), this.code(N)), this._endBlockNode(x, z);
+      return N && (this._currNode = M.finally = new x(), this.code(N)), this._endBlockNode(V, x);
     }
     // `throw` statement
     throw(a) {
-      return this._leafNode(new m(a));
+      return this._leafNode(new _(a));
     }
     // start self-balancing block
     block(a, h) {
@@ -4058,12 +3596,12 @@ var scope = {};
       return this._nodes.length = h, this;
     }
     // `function` heading (or definition if funcBody is passed)
-    func(a, h = t.nil, N, q) {
-      return this._blockNode(new P(a, h, N)), q && this.code(q).endFunc(), this;
+    func(a, h = t.nil, N, M) {
+      return this._blockNode(new b(a, h, N)), M && this.code(M).endFunc(), this;
     }
     // end function definition
     endFunc() {
-      return this._endBlockNode(P);
+      return this._endBlockNode(b);
     }
     optimize(a = 1) {
       for (; a-- > 0; )
@@ -4100,189 +3638,189 @@ var scope = {};
     }
   }
   e.CodeGen = re;
-  function K(b, a) {
+  function K(E, a) {
     for (const h in a)
-      b[h] = (b[h] || 0) + (a[h] || 0);
-    return b;
+      E[h] = (E[h] || 0) + (a[h] || 0);
+    return E;
   }
-  function ue(b, a) {
-    return a instanceof t._CodeOrName ? K(b, a.names) : b;
+  function ue(E, a) {
+    return a instanceof t._CodeOrName ? K(E, a.names) : E;
   }
-  function ie(b, a, h) {
-    if (b instanceof t.Name)
-      return N(b);
-    if (!q(b))
-      return b;
-    return new t._Code(b._items.reduce((M, W) => (W instanceof t.Name && (W = N(W)), W instanceof t._Code ? M.push(...W._items) : M.push(W), M), []));
-    function N(M) {
-      const W = h[M.str];
-      return W === void 0 || a[M.str] !== 1 ? M : (delete a[M.str], W);
+  function ie(E, a, h) {
+    if (E instanceof t.Name)
+      return N(E);
+    if (!M(E))
+      return E;
+    return new t._Code(E._items.reduce((q, W) => (W instanceof t.Name && (W = N(W)), W instanceof t._Code ? q.push(...W._items) : q.push(W), q), []));
+    function N(q) {
+      const W = h[q.str];
+      return W === void 0 || a[q.str] !== 1 ? q : (delete a[q.str], W);
     }
-    function q(M) {
-      return M instanceof t._Code && M._items.some((W) => W instanceof t.Name && a[W.str] === 1 && h[W.str] !== void 0);
+    function M(q) {
+      return q instanceof t._Code && q._items.some((W) => W instanceof t.Name && a[W.str] === 1 && h[W.str] !== void 0);
     }
   }
-  function ke(b, a) {
+  function ke(E, a) {
     for (const h in a)
-      b[h] = (b[h] || 0) - (a[h] || 0);
+      E[h] = (E[h] || 0) - (a[h] || 0);
   }
-  function Ce(b) {
-    return typeof b == "boolean" || typeof b == "number" || b === null ? !b : (0, t._)`!${j(b)}`;
+  function Ce(E) {
+    return typeof E == "boolean" || typeof E == "number" || E === null ? !E : (0, t._)`!${j(E)}`;
   }
   e.not = Ce;
   const qe = y(e.operators.AND);
-  function et(...b) {
-    return b.reduce(qe);
+  function et(...E) {
+    return E.reduce(qe);
   }
   e.and = et;
-  const Me = y(e.operators.OR);
-  function F(...b) {
-    return b.reduce(Me);
+  const Ue = y(e.operators.OR);
+  function F(...E) {
+    return E.reduce(Ue);
   }
   e.or = F;
-  function y(b) {
-    return (a, h) => a === t.nil ? h : h === t.nil ? a : (0, t._)`${j(a)} ${b} ${j(h)}`;
+  function y(E) {
+    return (a, h) => a === t.nil ? h : h === t.nil ? a : (0, t._)`${j(a)} ${E} ${j(h)}`;
   }
-  function j(b) {
-    return b instanceof t.Name ? b : (0, t._)`(${b})`;
+  function j(E) {
+    return E instanceof t.Name ? E : (0, t._)`(${E})`;
   }
 })(codegen);
 var util = {};
 (function(e) {
   Object.defineProperty(e, "__esModule", { value: !0 }), e.checkStrictMode = e.getErrorPath = e.Type = e.useFunc = e.setEvaluated = e.evaluatedPropsToName = e.mergeEvaluated = e.eachItem = e.unescapeJsonPointer = e.escapeJsonPointer = e.escapeFragment = e.unescapeFragment = e.schemaRefOrVal = e.schemaHasRulesButRef = e.schemaHasRules = e.checkUnknownRules = e.alwaysValidSchema = e.toHash = void 0;
   const t = codegen, r = code$1;
-  function n(P) {
+  function n(b) {
     const O = {};
-    for (const A of P)
+    for (const A of b)
       O[A] = !0;
     return O;
   }
   e.toHash = n;
-  function s(P, O) {
-    return typeof O == "boolean" ? O : Object.keys(O).length === 0 ? !0 : (o(P, O), !i(O, P.self.RULES.all));
+  function s(b, O) {
+    return typeof O == "boolean" ? O : Object.keys(O).length === 0 ? !0 : (o(b, O), !i(O, b.self.RULES.all));
   }
   e.alwaysValidSchema = s;
-  function o(P, O = P.schema) {
-    const { opts: A, self: x } = P;
+  function o(b, O = b.schema) {
+    const { opts: A, self: V } = b;
     if (!A.strictSchema || typeof O == "boolean")
       return;
-    const z = x.RULES.keywords;
+    const x = V.RULES.keywords;
     for (const re in O)
-      z[re] || D(P, `unknown keyword: "${re}"`);
+      x[re] || D(b, `unknown keyword: "${re}"`);
   }
   e.checkUnknownRules = o;
-  function i(P, O) {
-    if (typeof P == "boolean")
-      return !P;
-    for (const A in P)
+  function i(b, O) {
+    if (typeof b == "boolean")
+      return !b;
+    for (const A in b)
       if (O[A])
         return !0;
     return !1;
   }
   e.schemaHasRules = i;
-  function l(P, O) {
-    if (typeof P == "boolean")
-      return !P;
-    for (const A in P)
+  function l(b, O) {
+    if (typeof b == "boolean")
+      return !b;
+    for (const A in b)
       if (A !== "$ref" && O.all[A])
         return !0;
     return !1;
   }
   e.schemaHasRulesButRef = l;
-  function p({ topSchemaRef: P, schemaPath: O }, A, x, z) {
-    if (!z) {
+  function p({ topSchemaRef: b, schemaPath: O }, A, V, x) {
+    if (!x) {
       if (typeof A == "number" || typeof A == "boolean")
         return A;
       if (typeof A == "string")
         return (0, t._)`${A}`;
     }
-    return (0, t._)`${P}${O}${(0, t.getProperty)(x)}`;
+    return (0, t._)`${b}${O}${(0, t.getProperty)(V)}`;
   }
   e.schemaRefOrVal = p;
-  function d(P) {
-    return w(decodeURIComponent(P));
+  function d(b) {
+    return v(decodeURIComponent(b));
   }
   e.unescapeFragment = d;
-  function u(P) {
-    return encodeURIComponent(m(P));
+  function u(b) {
+    return encodeURIComponent(_(b));
   }
   e.escapeFragment = u;
-  function m(P) {
-    return typeof P == "number" ? `${P}` : P.replace(/~/g, "~0").replace(/\//g, "~1");
+  function _(b) {
+    return typeof b == "number" ? `${b}` : b.replace(/~/g, "~0").replace(/\//g, "~1");
   }
-  e.escapeJsonPointer = m;
-  function w(P) {
-    return P.replace(/~1/g, "/").replace(/~0/g, "~");
+  e.escapeJsonPointer = _;
+  function v(b) {
+    return b.replace(/~1/g, "/").replace(/~0/g, "~");
   }
-  e.unescapeJsonPointer = w;
-  function R(P, O) {
-    if (Array.isArray(P))
-      for (const A of P)
+  e.unescapeJsonPointer = v;
+  function w(b, O) {
+    if (Array.isArray(b))
+      for (const A of b)
         O(A);
     else
-      O(P);
+      O(b);
   }
-  e.eachItem = R;
-  function v({ mergeNames: P, mergeToName: O, mergeValues: A, resultToName: x }) {
-    return (z, re, K, ue) => {
-      const ie = K === void 0 ? re : K instanceof t.Name ? (re instanceof t.Name ? P(z, re, K) : O(z, re, K), K) : re instanceof t.Name ? (O(z, K, re), re) : A(re, K);
-      return ue === t.Name && !(ie instanceof t.Name) ? x(z, ie) : ie;
+  e.eachItem = w;
+  function P({ mergeNames: b, mergeToName: O, mergeValues: A, resultToName: V }) {
+    return (x, re, K, ue) => {
+      const ie = K === void 0 ? re : K instanceof t.Name ? (re instanceof t.Name ? b(x, re, K) : O(x, re, K), K) : re instanceof t.Name ? (O(x, K, re), re) : A(re, K);
+      return ue === t.Name && !(ie instanceof t.Name) ? V(x, ie) : ie;
     };
   }
   e.mergeEvaluated = {
-    props: v({
-      mergeNames: (P, O, A) => P.if((0, t._)`${A} !== true && ${O} !== undefined`, () => {
-        P.if((0, t._)`${O} === true`, () => P.assign(A, !0), () => P.assign(A, (0, t._)`${A} || {}`).code((0, t._)`Object.assign(${A}, ${O})`));
+    props: P({
+      mergeNames: (b, O, A) => b.if((0, t._)`${A} !== true && ${O} !== undefined`, () => {
+        b.if((0, t._)`${O} === true`, () => b.assign(A, !0), () => b.assign(A, (0, t._)`${A} || {}`).code((0, t._)`Object.assign(${A}, ${O})`));
       }),
-      mergeToName: (P, O, A) => P.if((0, t._)`${A} !== true`, () => {
-        O === !0 ? P.assign(A, !0) : (P.assign(A, (0, t._)`${A} || {}`), $(P, A, O));
+      mergeToName: (b, O, A) => b.if((0, t._)`${A} !== true`, () => {
+        O === !0 ? b.assign(A, !0) : (b.assign(A, (0, t._)`${A} || {}`), $(b, A, O));
       }),
-      mergeValues: (P, O) => P === !0 ? !0 : { ...P, ...O },
+      mergeValues: (b, O) => b === !0 ? !0 : { ...b, ...O },
       resultToName: T
     }),
-    items: v({
-      mergeNames: (P, O, A) => P.if((0, t._)`${A} !== true && ${O} !== undefined`, () => P.assign(A, (0, t._)`${O} === true ? true : ${A} > ${O} ? ${A} : ${O}`)),
-      mergeToName: (P, O, A) => P.if((0, t._)`${A} !== true`, () => P.assign(A, O === !0 ? !0 : (0, t._)`${A} > ${O} ? ${A} : ${O}`)),
-      mergeValues: (P, O) => P === !0 ? !0 : Math.max(P, O),
-      resultToName: (P, O) => P.var("items", O)
+    items: P({
+      mergeNames: (b, O, A) => b.if((0, t._)`${A} !== true && ${O} !== undefined`, () => b.assign(A, (0, t._)`${O} === true ? true : ${A} > ${O} ? ${A} : ${O}`)),
+      mergeToName: (b, O, A) => b.if((0, t._)`${A} !== true`, () => b.assign(A, O === !0 ? !0 : (0, t._)`${A} > ${O} ? ${A} : ${O}`)),
+      mergeValues: (b, O) => b === !0 ? !0 : Math.max(b, O),
+      resultToName: (b, O) => b.var("items", O)
     })
   };
-  function T(P, O) {
+  function T(b, O) {
     if (O === !0)
-      return P.var("props", !0);
-    const A = P.var("props", (0, t._)`{}`);
-    return O !== void 0 && $(P, A, O), A;
+      return b.var("props", !0);
+    const A = b.var("props", (0, t._)`{}`);
+    return O !== void 0 && $(b, A, O), A;
   }
   e.evaluatedPropsToName = T;
-  function $(P, O, A) {
-    Object.keys(A).forEach((x) => P.assign((0, t._)`${O}${(0, t.getProperty)(x)}`, !0));
+  function $(b, O, A) {
+    Object.keys(A).forEach((V) => b.assign((0, t._)`${O}${(0, t.getProperty)(V)}`, !0));
   }
   e.setEvaluated = $;
   const g = {};
-  function k(P, O) {
-    return P.scopeValue("func", {
+  function k(b, O) {
+    return b.scopeValue("func", {
       ref: O,
       code: g[O.code] || (g[O.code] = new r._Code(O.code))
     });
   }
   e.useFunc = k;
   var C;
-  (function(P) {
-    P[P.Num = 0] = "Num", P[P.Str = 1] = "Str";
+  (function(b) {
+    b[b.Num = 0] = "Num", b[b.Str = 1] = "Str";
   })(C = e.Type || (e.Type = {}));
-  function I(P, O, A) {
-    if (P instanceof t.Name) {
-      const x = O === C.Num;
-      return A ? x ? (0, t._)`"[" + ${P} + "]"` : (0, t._)`"['" + ${P} + "']"` : x ? (0, t._)`"/" + ${P}` : (0, t._)`"/" + ${P}.replace(/~/g, "~0").replace(/\\//g, "~1")`;
+  function I(b, O, A) {
+    if (b instanceof t.Name) {
+      const V = O === C.Num;
+      return A ? V ? (0, t._)`"[" + ${b} + "]"` : (0, t._)`"['" + ${b} + "']"` : V ? (0, t._)`"/" + ${b}` : (0, t._)`"/" + ${b}.replace(/~/g, "~0").replace(/\\//g, "~1")`;
     }
-    return A ? (0, t.getProperty)(P).toString() : "/" + m(P);
+    return A ? (0, t.getProperty)(b).toString() : "/" + _(b);
   }
   e.getErrorPath = I;
-  function D(P, O, A = P.opts.strictSchema) {
+  function D(b, O, A = b.opts.strictSchema) {
     if (A) {
       if (O = `strict mode: ${O}`, A === !0)
         throw new Error(O);
-      P.self.logger.warn(O);
+      b.self.logger.warn(O);
     }
   }
   e.checkStrictMode = D;
@@ -4322,13 +3860,13 @@ names$1.default = names;
     message: ({ keyword: $, schemaType: g }) => g ? (0, t.str)`"${$}" keyword must be ${g} ($data)` : (0, t.str)`"${$}" keyword is invalid ($data)`
   };
   function s($, g = e.keywordError, k, C) {
-    const { it: I } = $, { gen: D, compositeRule: P, allErrors: O } = I, A = m($, g, k);
-    C ?? (P || O) ? p(D, A) : d(I, (0, t._)`[${A}]`);
+    const { it: I } = $, { gen: D, compositeRule: b, allErrors: O } = I, A = _($, g, k);
+    C ?? (b || O) ? p(D, A) : d(I, (0, t._)`[${A}]`);
   }
   e.reportError = s;
   function o($, g = e.keywordError, k) {
-    const { it: C } = $, { gen: I, compositeRule: D, allErrors: P } = C, O = m($, g, k);
-    p(I, O), D || P || d(C, n.default.vErrors);
+    const { it: C } = $, { gen: I, compositeRule: D, allErrors: b } = C, O = _($, g, k);
+    p(I, O), D || b || d(C, n.default.vErrors);
   }
   e.reportExtraError = o;
   function i($, g) {
@@ -4338,9 +3876,9 @@ names$1.default = names;
   function l({ gen: $, keyword: g, schemaValue: k, data: C, errsCount: I, it: D }) {
     if (I === void 0)
       throw new Error("ajv implementation error");
-    const P = $.name("err");
+    const b = $.name("err");
     $.forRange("i", I, n.default.errors, (O) => {
-      $.const(P, (0, t._)`${n.default.vErrors}[${O}]`), $.if((0, t._)`${P}.instancePath === undefined`, () => $.assign((0, t._)`${P}.instancePath`, (0, t.strConcat)(n.default.instancePath, D.errorPath))), $.assign((0, t._)`${P}.schemaPath`, (0, t.str)`${D.errSchemaPath}/${g}`), D.opts.verbose && ($.assign((0, t._)`${P}.schema`, k), $.assign((0, t._)`${P}.data`, C));
+      $.const(b, (0, t._)`${n.default.vErrors}[${O}]`), $.if((0, t._)`${b}.instancePath === undefined`, () => $.assign((0, t._)`${b}.instancePath`, (0, t.strConcat)(n.default.instancePath, D.errorPath))), $.assign((0, t._)`${b}.schemaPath`, (0, t.str)`${D.errSchemaPath}/${g}`), D.opts.verbose && ($.assign((0, t._)`${b}.schema`, k), $.assign((0, t._)`${b}.data`, C));
     });
   }
   e.extendErrors = l;
@@ -4361,28 +3899,28 @@ names$1.default = names;
     schema: new t.Name("schema"),
     parentSchema: new t.Name("parentSchema")
   };
-  function m($, g, k) {
+  function _($, g, k) {
     const { createErrors: C } = $.it;
-    return C === !1 ? (0, t._)`{}` : w($, g, k);
+    return C === !1 ? (0, t._)`{}` : v($, g, k);
   }
-  function w($, g, k = {}) {
+  function v($, g, k = {}) {
     const { gen: C, it: I } = $, D = [
-      R(I, k),
-      v($, k)
+      w(I, k),
+      P($, k)
     ];
     return T($, g, D), C.object(...D);
   }
-  function R({ errorPath: $ }, { instancePath: g }) {
+  function w({ errorPath: $ }, { instancePath: g }) {
     const k = g ? (0, t.str)`${$}${(0, r.getErrorPath)(g, r.Type.Str)}` : $;
     return [n.default.instancePath, (0, t.strConcat)(n.default.instancePath, k)];
   }
-  function v({ keyword: $, it: { errSchemaPath: g } }, { schemaPath: k, parentSchema: C }) {
+  function P({ keyword: $, it: { errSchemaPath: g } }, { schemaPath: k, parentSchema: C }) {
     let I = C ? g : (0, t.str)`${g}/${$}`;
     return k && (I = (0, t.str)`${I}${(0, r.getErrorPath)(k, r.Type.Str)}`), [u.schemaPath, I];
   }
   function T($, { params: g, message: k }, C) {
-    const { keyword: I, data: D, schemaValue: P, it: O } = $, { opts: A, propertyName: x, topSchemaRef: z, schemaPath: re } = O;
-    C.push([u.keyword, I], [u.params, typeof g == "function" ? g($) : g || (0, t._)`{}`]), A.messages && C.push([u.message, typeof k == "function" ? k($) : k]), A.verbose && C.push([u.schema, P], [u.parentSchema, (0, t._)`${z}${re}`], [n.default.data, D]), x && C.push([u.propertyName, x]);
+    const { keyword: I, data: D, schemaValue: b, it: O } = $, { opts: A, propertyName: V, topSchemaRef: x, schemaPath: re } = O;
+    C.push([u.keyword, I], [u.params, typeof g == "function" ? g($) : g || (0, t._)`{}`]), A.messages && C.push([u.message, typeof k == "function" ? k($) : k]), A.verbose && C.push([u.schema, b], [u.parentSchema, (0, t._)`${x}${re}`], [n.default.data, D]), V && C.push([u.propertyName, V]);
   }
 })(errors);
 Object.defineProperty(boolSchema, "__esModule", { value: !0 });
@@ -4482,58 +4020,58 @@ applicability.shouldUseRule = shouldUseRule;
   }
   e.getJSONTypes = p;
   function d(C, I) {
-    const { gen: D, data: P, opts: O } = C, A = m(I, O.coerceTypes), x = I.length > 0 && !(A.length === 0 && I.length === 1 && (0, r.schemaHasRulesForType)(C, I[0]));
-    if (x) {
-      const z = T(I, P, O.strictNumbers, i.Wrong);
-      D.if(z, () => {
-        A.length ? w(C, I, A) : g(C);
+    const { gen: D, data: b, opts: O } = C, A = _(I, O.coerceTypes), V = I.length > 0 && !(A.length === 0 && I.length === 1 && (0, r.schemaHasRulesForType)(C, I[0]));
+    if (V) {
+      const x = T(I, b, O.strictNumbers, i.Wrong);
+      D.if(x, () => {
+        A.length ? v(C, I, A) : g(C);
       });
     }
-    return x;
+    return V;
   }
   e.coerceAndCheckDataType = d;
   const u = /* @__PURE__ */ new Set(["string", "number", "integer", "boolean", "null"]);
-  function m(C, I) {
+  function _(C, I) {
     return I ? C.filter((D) => u.has(D) || I === "array" && D === "array") : [];
   }
-  function w(C, I, D) {
-    const { gen: P, data: O, opts: A } = C, x = P.let("dataType", (0, s._)`typeof ${O}`), z = P.let("coerced", (0, s._)`undefined`);
-    A.coerceTypes === "array" && P.if((0, s._)`${x} == 'object' && Array.isArray(${O}) && ${O}.length == 1`, () => P.assign(O, (0, s._)`${O}[0]`).assign(x, (0, s._)`typeof ${O}`).if(T(I, O, A.strictNumbers), () => P.assign(z, O))), P.if((0, s._)`${z} !== undefined`);
+  function v(C, I, D) {
+    const { gen: b, data: O, opts: A } = C, V = b.let("dataType", (0, s._)`typeof ${O}`), x = b.let("coerced", (0, s._)`undefined`);
+    A.coerceTypes === "array" && b.if((0, s._)`${V} == 'object' && Array.isArray(${O}) && ${O}.length == 1`, () => b.assign(O, (0, s._)`${O}[0]`).assign(V, (0, s._)`typeof ${O}`).if(T(I, O, A.strictNumbers), () => b.assign(x, O))), b.if((0, s._)`${x} !== undefined`);
     for (const K of D)
       (u.has(K) || K === "array" && A.coerceTypes === "array") && re(K);
-    P.else(), g(C), P.endIf(), P.if((0, s._)`${z} !== undefined`, () => {
-      P.assign(O, z), R(C, z);
+    b.else(), g(C), b.endIf(), b.if((0, s._)`${x} !== undefined`, () => {
+      b.assign(O, x), w(C, x);
     });
     function re(K) {
       switch (K) {
         case "string":
-          P.elseIf((0, s._)`${x} == "number" || ${x} == "boolean"`).assign(z, (0, s._)`"" + ${O}`).elseIf((0, s._)`${O} === null`).assign(z, (0, s._)`""`);
+          b.elseIf((0, s._)`${V} == "number" || ${V} == "boolean"`).assign(x, (0, s._)`"" + ${O}`).elseIf((0, s._)`${O} === null`).assign(x, (0, s._)`""`);
           return;
         case "number":
-          P.elseIf((0, s._)`${x} == "boolean" || ${O} === null
-              || (${x} == "string" && ${O} && ${O} == +${O})`).assign(z, (0, s._)`+${O}`);
+          b.elseIf((0, s._)`${V} == "boolean" || ${O} === null
+              || (${V} == "string" && ${O} && ${O} == +${O})`).assign(x, (0, s._)`+${O}`);
           return;
         case "integer":
-          P.elseIf((0, s._)`${x} === "boolean" || ${O} === null
-              || (${x} === "string" && ${O} && ${O} == +${O} && !(${O} % 1))`).assign(z, (0, s._)`+${O}`);
+          b.elseIf((0, s._)`${V} === "boolean" || ${O} === null
+              || (${V} === "string" && ${O} && ${O} == +${O} && !(${O} % 1))`).assign(x, (0, s._)`+${O}`);
           return;
         case "boolean":
-          P.elseIf((0, s._)`${O} === "false" || ${O} === 0 || ${O} === null`).assign(z, !1).elseIf((0, s._)`${O} === "true" || ${O} === 1`).assign(z, !0);
+          b.elseIf((0, s._)`${O} === "false" || ${O} === 0 || ${O} === null`).assign(x, !1).elseIf((0, s._)`${O} === "true" || ${O} === 1`).assign(x, !0);
           return;
         case "null":
-          P.elseIf((0, s._)`${O} === "" || ${O} === 0 || ${O} === false`), P.assign(z, null);
+          b.elseIf((0, s._)`${O} === "" || ${O} === 0 || ${O} === false`), b.assign(x, null);
           return;
         case "array":
-          P.elseIf((0, s._)`${x} === "string" || ${x} === "number"
-              || ${x} === "boolean" || ${O} === null`).assign(z, (0, s._)`[${O}]`);
+          b.elseIf((0, s._)`${V} === "string" || ${V} === "number"
+              || ${V} === "boolean" || ${O} === null`).assign(x, (0, s._)`[${O}]`);
       }
     }
   }
-  function R({ gen: C, parentData: I, parentDataProperty: D }, P) {
-    C.if((0, s._)`${I} !== undefined`, () => C.assign((0, s._)`${I}[${D}]`, P));
+  function w({ gen: C, parentData: I, parentDataProperty: D }, b) {
+    C.if((0, s._)`${I} !== undefined`, () => C.assign((0, s._)`${I}[${D}]`, b));
   }
-  function v(C, I, D, P = i.Correct) {
-    const O = P === i.Correct ? s.operators.EQ : s.operators.NEQ;
+  function P(C, I, D, b = i.Correct) {
+    const O = b === i.Correct ? s.operators.EQ : s.operators.NEQ;
     let A;
     switch (C) {
       case "null":
@@ -4545,33 +4083,33 @@ applicability.shouldUseRule = shouldUseRule;
         A = (0, s._)`${I} && typeof ${I} == "object" && !Array.isArray(${I})`;
         break;
       case "integer":
-        A = x((0, s._)`!(${I} % 1) && !isNaN(${I})`);
+        A = V((0, s._)`!(${I} % 1) && !isNaN(${I})`);
         break;
       case "number":
-        A = x();
+        A = V();
         break;
       default:
         return (0, s._)`typeof ${I} ${O} ${C}`;
     }
-    return P === i.Correct ? A : (0, s.not)(A);
-    function x(z = s.nil) {
-      return (0, s.and)((0, s._)`typeof ${I} == "number"`, z, D ? (0, s._)`isFinite(${I})` : s.nil);
+    return b === i.Correct ? A : (0, s.not)(A);
+    function V(x = s.nil) {
+      return (0, s.and)((0, s._)`typeof ${I} == "number"`, x, D ? (0, s._)`isFinite(${I})` : s.nil);
     }
   }
-  e.checkDataType = v;
-  function T(C, I, D, P) {
+  e.checkDataType = P;
+  function T(C, I, D, b) {
     if (C.length === 1)
-      return v(C[0], I, D, P);
+      return P(C[0], I, D, b);
     let O;
     const A = (0, o.toHash)(C);
     if (A.array && A.object) {
-      const x = (0, s._)`typeof ${I} != "object"`;
-      O = A.null ? x : (0, s._)`!${I} || ${x}`, delete A.null, delete A.array, delete A.object;
+      const V = (0, s._)`typeof ${I} != "object"`;
+      O = A.null ? V : (0, s._)`!${I} || ${V}`, delete A.null, delete A.array, delete A.object;
     } else
       O = s.nil;
     A.number && delete A.integer;
-    for (const x in A)
-      O = (0, s.and)(O, v(x, I, D, P));
+    for (const V in A)
+      O = (0, s.and)(O, P(V, I, D, b));
     return O;
   }
   e.checkDataTypes = T;
@@ -4585,15 +4123,15 @@ applicability.shouldUseRule = shouldUseRule;
   }
   e.reportTypeError = g;
   function k(C) {
-    const { gen: I, data: D, schema: P } = C, O = (0, o.schemaRefOrVal)(C, P, "type");
+    const { gen: I, data: D, schema: b } = C, O = (0, o.schemaRefOrVal)(C, b, "type");
     return {
       gen: I,
       keyword: "type",
       data: D,
-      schema: P.type,
+      schema: b.type,
       schemaCode: O,
       schemaValue: O,
-      parentSchema: P,
+      parentSchema: b,
       params: {},
       it: C
     };
@@ -4674,15 +4212,15 @@ function schemaProperties(e, t) {
 }
 code.schemaProperties = schemaProperties;
 function callValidateCode({ schemaCode: e, data: t, it: { gen: r, topSchemaRef: n, schemaPath: s, errorPath: o }, it: i }, l, p, d) {
-  const u = d ? (0, codegen_1$q._)`${e}, ${t}, ${n}${s}` : t, m = [
+  const u = d ? (0, codegen_1$q._)`${e}, ${t}, ${n}${s}` : t, _ = [
     [names_1$5.default.instancePath, (0, codegen_1$q.strConcat)(names_1$5.default.instancePath, o)],
     [names_1$5.default.parentData, i.parentData],
     [names_1$5.default.parentDataProperty, i.parentDataProperty],
     [names_1$5.default.rootData, names_1$5.default.rootData]
   ];
-  i.opts.dynamicRef && m.push([names_1$5.default.dynamicAnchors, names_1$5.default.dynamicAnchors]);
-  const w = (0, codegen_1$q._)`${u}, ${r.object(...m)}`;
-  return p !== codegen_1$q.nil ? (0, codegen_1$q._)`${l}.call(${p}, ${w})` : (0, codegen_1$q._)`${l}(${w})`;
+  i.opts.dynamicRef && _.push([names_1$5.default.dynamicAnchors, names_1$5.default.dynamicAnchors]);
+  const v = (0, codegen_1$q._)`${u}, ${r.object(..._)}`;
+  return p !== codegen_1$q.nil ? (0, codegen_1$q._)`${l}.call(${p}, ${v})` : (0, codegen_1$q._)`${l}(${v})`;
 }
 code.callValidateCode = callValidateCode;
 const newRegExp = (0, codegen_1$q._)`new RegExp`;
@@ -4751,31 +4289,31 @@ function funcKeywordCode(e, t) {
   var r;
   const { gen: n, keyword: s, schema: o, parentSchema: i, $data: l, it: p } = e;
   checkAsyncKeyword(p, t);
-  const d = !l && t.compile ? t.compile.call(p.self, o, i, p) : t.validate, u = useKeyword(n, s, d), m = n.let("valid");
-  e.block$data(m, w), e.ok((r = t.valid) !== null && r !== void 0 ? r : m);
-  function w() {
+  const d = !l && t.compile ? t.compile.call(p.self, o, i, p) : t.validate, u = useKeyword(n, s, d), _ = n.let("valid");
+  e.block$data(_, v), e.ok((r = t.valid) !== null && r !== void 0 ? r : _);
+  function v() {
     if (t.errors === !1)
       T(), t.modifying && modifyData(e), $(() => e.error());
     else {
-      const g = t.async ? R() : v();
+      const g = t.async ? w() : P();
       t.modifying && modifyData(e), $(() => addErrs(e, g));
     }
   }
-  function R() {
+  function w() {
     const g = n.let("ruleErrs", null);
-    return n.try(() => T((0, codegen_1$p._)`await `), (k) => n.assign(m, !1).if((0, codegen_1$p._)`${k} instanceof ${p.ValidationError}`, () => n.assign(g, (0, codegen_1$p._)`${k}.errors`), () => n.throw(k))), g;
+    return n.try(() => T((0, codegen_1$p._)`await `), (k) => n.assign(_, !1).if((0, codegen_1$p._)`${k} instanceof ${p.ValidationError}`, () => n.assign(g, (0, codegen_1$p._)`${k}.errors`), () => n.throw(k))), g;
   }
-  function v() {
+  function P() {
     const g = (0, codegen_1$p._)`${u}.errors`;
     return n.assign(g, null), T(codegen_1$p.nil), g;
   }
   function T(g = t.async ? (0, codegen_1$p._)`await ` : codegen_1$p.nil) {
     const k = p.opts.passContext ? names_1$4.default.this : names_1$4.default.self, C = !("compile" in t && !l || t.schema === !1);
-    n.assign(m, (0, codegen_1$p._)`${g}${(0, code_1$9.callValidateCode)(e, u, k, C)}`, t.modifying);
+    n.assign(_, (0, codegen_1$p._)`${g}${(0, code_1$9.callValidateCode)(e, u, k, C)}`, t.modifying);
   }
   function $(g) {
     var k;
-    n.if((0, codegen_1$p.not)((k = t.valid) !== null && k !== void 0 ? k : m), g);
+    n.if((0, codegen_1$p.not)((k = t.valid) !== null && k !== void 0 ? k : _), g);
   }
 }
 keyword.funcKeywordCode = funcKeywordCode;
@@ -4854,8 +4392,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: d, dataPathArr: u, opts: m } = t, w = l.let("data", (0, codegen_1$o._)`${t.data}${(0, codegen_1$o.getProperty)(r)}`, !0);
-    p(w), e.errorPath = (0, codegen_1$o.str)`${d}${(0, util_1$n.getErrorPath)(r, n, m.jsPropertySyntax)}`, e.parentDataProperty = (0, codegen_1$o._)`${r}`, e.dataPathArr = [...u, e.parentDataProperty];
+    const { errorPath: d, dataPathArr: u, opts: _ } = t, v = l.let("data", (0, codegen_1$o._)`${t.data}${(0, codegen_1$o.getProperty)(r)}`, !0);
+    p(v), e.errorPath = (0, codegen_1$o.str)`${d}${(0, util_1$n.getErrorPath)(r, n, _.jsPropertySyntax)}`, e.parentDataProperty = (0, codegen_1$o._)`${r}`, e.dataPathArr = [...u, e.parentDataProperty];
   }
   if (s !== void 0) {
     const d = s instanceof codegen_1$o.Name ? s : l.let("data", s, !0);
@@ -4960,17 +4498,17 @@ function _traverse(e, t, r, n, s, o, i, l, p, d) {
   if (n && typeof n == "object" && !Array.isArray(n)) {
     t(n, s, o, i, l, p, d);
     for (var u in n) {
-      var m = n[u];
-      if (Array.isArray(m)) {
+      var _ = n[u];
+      if (Array.isArray(_)) {
         if (u in traverse$1.arrayKeywords)
-          for (var w = 0; w < m.length; w++)
-            _traverse(e, t, r, m[w], s + "/" + u + "/" + w, o, s, u, n, w);
+          for (var v = 0; v < _.length; v++)
+            _traverse(e, t, r, _[v], s + "/" + u + "/" + v, o, s, u, n, v);
       } else if (u in traverse$1.propsKeywords) {
-        if (m && typeof m == "object")
-          for (var R in m)
-            _traverse(e, t, r, m[R], s + "/" + u + "/" + escapeJsonPtr(R), o, s, u, n, R);
+        if (_ && typeof _ == "object")
+          for (var w in _)
+            _traverse(e, t, r, _[w], s + "/" + u + "/" + escapeJsonPtr(w), o, s, u, n, w);
       } else
-        (u in traverse$1.keywords || e.allKeys && !(u in traverse$1.skipKeywords)) && _traverse(e, t, r, m, s + "/" + u, o, s, u, n);
+        (u in traverse$1.keywords || e.allKeys && !(u in traverse$1.skipKeywords)) && _traverse(e, t, r, _, s + "/" + u, o, s, u, n);
     }
     r(n, s, o, i, l, p, d);
   }
@@ -5054,19 +4592,19 @@ function getSchemaRefs(e, t) {
   if (typeof e == "boolean")
     return {};
   const { schemaId: r, uriResolver: n } = this.opts, s = normalizeId(e[r] || t), o = { "": s }, i = getFullPath(n, s, !1), l = {}, p = /* @__PURE__ */ new Set();
-  return traverse(e, { allKeys: !0 }, (m, w, R, v) => {
-    if (v === void 0)
+  return traverse(e, { allKeys: !0 }, (_, v, w, P) => {
+    if (P === void 0)
       return;
-    const T = i + w;
-    let $ = o[v];
-    typeof m[r] == "string" && ($ = g.call(this, m[r])), k.call(this, m.$anchor), k.call(this, m.$dynamicAnchor), o[w] = $;
+    const T = i + v;
+    let $ = o[P];
+    typeof _[r] == "string" && ($ = g.call(this, _[r])), k.call(this, _.$anchor), k.call(this, _.$dynamicAnchor), o[v] = $;
     function g(C) {
       const I = this.opts.uriResolver.resolve;
       if (C = normalizeId($ ? I($, C) : C), p.has(C))
         throw u(C);
       p.add(C);
       let D = this.refs[C];
-      return typeof D == "string" && (D = this.refs[D]), typeof D == "object" ? d(m, D.schema, C) : C !== normalizeId(T) && (C[0] === "#" ? (d(m, l[C], C), l[C] = m) : this.refs[C] = T), C;
+      return typeof D == "string" && (D = this.refs[D]), typeof D == "object" ? d(_, D.schema, C) : C !== normalizeId(T) && (C[0] === "#" ? (d(_, l[C], C), l[C] = _) : this.refs[C] = T), C;
     }
     function k(C) {
       if (typeof C == "string") {
@@ -5076,12 +4614,12 @@ function getSchemaRefs(e, t) {
       }
     }
   }), l;
-  function d(m, w, R) {
-    if (w !== void 0 && !equal$2(m, w))
-      throw u(R);
+  function d(_, v, w) {
+    if (v !== void 0 && !equal$2(_, v))
+      throw u(w);
   }
-  function u(m) {
-    return new Error(`reference "${m}" resolves to more than one schema`);
+  function u(_) {
+    return new Error(`reference "${_}" resolves to more than one schema`);
   }
 }
 resolve$1.getSchemaRefs = getSchemaRefs;
@@ -5197,12 +4735,12 @@ function schemaKeywords(e, t, r, n) {
     return;
   }
   p.jtd || checkStrictTypes(e, t), s.block(() => {
-    for (const w of u.rules)
-      m(w);
-    m(u.post);
+    for (const v of u.rules)
+      _(v);
+    _(u.post);
   });
-  function m(w) {
-    (0, applicability_1.shouldUseGroup)(o, w) && (w.type ? (s.if((0, dataType_2.checkDataType)(w.type, i, p.strictNumbers)), iterateKeywords(e, w), t.length === 1 && t[0] === w.type && r && (s.else(), (0, dataType_2.reportTypeError)(e)), s.endIf()) : iterateKeywords(e, w), l || s.if((0, codegen_1$n._)`${names_1$3.default.errors} === ${n || 0}`));
+  function _(v) {
+    (0, applicability_1.shouldUseGroup)(o, v) && (v.type ? (s.if((0, dataType_2.checkDataType)(v.type, i, p.strictNumbers)), iterateKeywords(e, v), t.length === 1 && t[0] === v.type && r && (s.else(), (0, dataType_2.reportTypeError)(e)), s.endIf()) : iterateKeywords(e, v), l || s.if((0, codegen_1$n._)`${names_1$3.default.errors} === ${n || 0}`));
   }
 }
 function iterateKeywords(e, t) {
@@ -5464,21 +5002,21 @@ function compileSchema(e) {
   let u;
   try {
     this._compilations.add(e), (0, validate_1$1.validateFunctionCode)(d), i.optimize(this.opts.code.optimize);
-    const m = i.toString();
-    u = `${i.scopeRefs(names_1$2.default.scope)}return ${m}`, this.opts.code.process && (u = this.opts.code.process(u, e));
-    const R = new Function(`${names_1$2.default.self}`, `${names_1$2.default.scope}`, u)(this, this.scope.get());
-    if (this.scope.value(p, { ref: R }), R.errors = null, R.schema = e.schema, R.schemaEnv = e, e.$async && (R.$async = !0), this.opts.code.source === !0 && (R.source = { validateName: p, validateCode: m, scopeValues: i._values }), this.opts.unevaluated) {
-      const { props: v, items: T } = d;
-      R.evaluated = {
-        props: v instanceof codegen_1$m.Name ? void 0 : v,
+    const _ = i.toString();
+    u = `${i.scopeRefs(names_1$2.default.scope)}return ${_}`, this.opts.code.process && (u = this.opts.code.process(u, e));
+    const w = new Function(`${names_1$2.default.self}`, `${names_1$2.default.scope}`, u)(this, this.scope.get());
+    if (this.scope.value(p, { ref: w }), w.errors = null, w.schema = e.schema, w.schemaEnv = e, e.$async && (w.$async = !0), this.opts.code.source === !0 && (w.source = { validateName: p, validateCode: _, scopeValues: i._values }), this.opts.unevaluated) {
+      const { props: P, items: T } = d;
+      w.evaluated = {
+        props: P instanceof codegen_1$m.Name ? void 0 : P,
         items: T instanceof codegen_1$m.Name ? void 0 : T,
-        dynamicProps: v instanceof codegen_1$m.Name,
+        dynamicProps: P instanceof codegen_1$m.Name,
         dynamicItems: T instanceof codegen_1$m.Name
-      }, R.source && (R.source.evaluated = (0, codegen_1$m.stringify)(R.evaluated));
+      }, w.source && (w.source.evaluated = (0, codegen_1$m.stringify)(w.evaluated));
     }
-    return e.validate = R, e;
-  } catch (m) {
-    throw delete e.validate, delete e.validateName, u && this.logger.error("Error compiling schema, function code:", u), m;
+    return e.validate = w, e;
+  } catch (_) {
+    throw delete e.validate, delete e.validateName, u && this.logger.error("Error compiling schema, function code:", u), _;
   } finally {
     this._compilations.delete(e);
   }
@@ -5595,13 +5133,13 @@ var uri$1 = {}, uri_all = { exports: {} };
     n(t);
   })(commonjsGlobal, function(r) {
     function n() {
-      for (var f = arguments.length, c = Array(f), _ = 0; _ < f; _++)
-        c[_] = arguments[_];
+      for (var f = arguments.length, c = Array(f), m = 0; m < f; m++)
+        c[m] = arguments[m];
       if (c.length > 1) {
         c[0] = c[0].slice(0, -1);
-        for (var S = c.length - 1, E = 1; E < S; ++E)
-          c[E] = c[E].slice(1, -1);
-        return c[S] = c[S].slice(1), c.join("");
+        for (var R = c.length - 1, S = 1; S < R; ++S)
+          c[S] = c[S].slice(1, -1);
+        return c[R] = c[R].slice(1), c.join("");
       } else
         return c[0];
     }
@@ -5618,20 +5156,20 @@ var uri$1 = {}, uri_all = { exports: {} };
       return f != null ? f instanceof Array ? f : typeof f.length != "number" || f.split || f.setInterval || f.call ? [f] : Array.prototype.slice.call(f) : [];
     }
     function p(f, c) {
-      var _ = f;
+      var m = f;
       if (c)
-        for (var S in c)
-          _[S] = c[S];
-      return _;
+        for (var R in c)
+          m[R] = c[R];
+      return m;
     }
     function d(f) {
-      var c = "[A-Za-z]", _ = "[0-9]", S = n(_, "[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, _, "[\\-\\.\\_\\~]", Y);
-      s(c + n(c, _, "[\\+\\-\\.]") + "*"), s(s(E + "|" + n(B, L, "[\\:]")) + "*");
-      var Z = s(s("25[0-5]") + "|" + s("2[0-4]" + _) + "|" + s("1" + _ + _) + "|" + s("0?[1-9]" + _) + "|0?0?" + _), oe = s(Z + "\\." + Z + "\\." + Z + "\\." + Z), V = s(S + "{1,4}"), X = s(s(V + "\\:" + V) + "|" + oe), ae = s(s(V + "\\:") + "{6}" + X), ee = s("\\:\\:" + s(V + "\\:") + "{5}" + X), Ee = s(s(V) + "?\\:\\:" + s(V + "\\:") + "{4}" + X), ge = s(s(s(V + "\\:") + "{0,1}" + V) + "?\\:\\:" + s(V + "\\:") + "{3}" + X), $e = s(s(s(V + "\\:") + "{0,2}" + V) + "?\\:\\:" + s(V + "\\:") + "{2}" + X), We = s(s(s(V + "\\:") + "{0,3}" + V) + "?\\:\\:" + V + "\\:" + X), Ie = s(s(s(V + "\\:") + "{0,4}" + V) + "?\\:\\:" + X), fe = s(s(s(V + "\\:") + "{0,5}" + V) + "?\\:\\:" + V), ye = s(s(s(V + "\\:") + "{0,6}" + V) + "?\\:\\:"), je = s([ae, ee, Ee, ge, $e, We, Ie, fe, ye].join("|")), ve = s(s(B + "|" + E) + "+");
-      s("[vV]" + S + "+\\." + n(B, L, "[\\:]") + "+"), s(s(E + "|" + n(B, L)) + "*");
-      var ct = s(E + "|" + n(B, L, "[\\:\\@]"));
-      return s(s(E + "|" + n(B, L, "[\\@]")) + "+"), s(s(ct + "|" + n("[\\/\\?]", se)) + "*"), {
-        NOT_SCHEME: new RegExp(n("[^]", c, _, "[\\+\\-\\.]"), "g"),
+      var c = "[A-Za-z]", m = "[0-9]", R = n(m, "[A-Fa-f]"), S = 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);
+      s(c + n(c, m, "[\\+\\-\\.]") + "*"), s(s(S + "|" + n(B, L, "[\\:]")) + "*");
+      var Q = s(s("25[0-5]") + "|" + s("2[0-4]" + m) + "|" + s("1" + m + m) + "|" + s("0?[1-9]" + m) + "|0?0?" + m), oe = s(Q + "\\." + Q + "\\." + Q + "\\." + Q), z = s(R + "{1,4}"), X = s(s(z + "\\:" + z) + "|" + oe), ae = s(s(z + "\\:") + "{6}" + X), ee = s("\\:\\:" + s(z + "\\:") + "{5}" + X), Ee = 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, Ee, ge, $e, Be, Ie, fe, ye].join("|")), we = s(s(B + "|" + S) + "+");
+      s("[vV]" + R + "+\\." + n(B, L, "[\\:]") + "+"), s(s(S + "|" + n(B, L)) + "*");
+      var ct = s(S + "|" + n(B, L, "[\\:\\@]"));
+      return s(s(S + "|" + n(B, L, "[\\@]")) + "+"), s(s(ct + "|" + n("[\\/\\?]", se)) + "*"), {
+        NOT_SCHEME: new RegExp(n("[^]", c, m, "[\\+\\-\\.]"), "g"),
         NOT_USERINFO: new RegExp(n("[^\\%\\:]", B, L), "g"),
         NOT_HOST: new RegExp(n("[^\\%\\[\\]\\:]", B, L), "g"),
         NOT_PATH: new RegExp(n("[^\\%\\/\\:\\@]", B, L), "g"),
@@ -5641,123 +5179,123 @@ var uri$1 = {}, uri_all = { exports: {} };
         ESCAPE: new RegExp(n("[^]", B, L), "g"),
         UNRESERVED: new RegExp(B, "g"),
         OTHER_CHARS: new RegExp(n("[^\\%]", B, J), "g"),
-        PCT_ENCODED: new RegExp(E, "g"),
+        PCT_ENCODED: new RegExp(S, "g"),
         IPV4ADDRESS: new RegExp("^(" + oe + ")$"),
-        IPV6ADDRESS: new RegExp("^\\[?(" + je + ")" + s(s("\\%25|\\%(?!" + S + "{2})") + "(" + ve + ")") + "?\\]?$")
+        IPV6ADDRESS: new RegExp("^\\[?(" + je + ")" + s(s("\\%25|\\%(?!" + R + "{2})") + "(" + we + ")") + "?\\]?$")
         //RFC 6874, with relaxed parsing rules
       };
     }
-    var u = d(!1), m = d(!0), w = function() {
-      function f(c, _) {
-        var S = [], E = !0, U = !1, L = void 0;
+    var u = d(!1), _ = d(!0), v = function() {
+      function f(c, m) {
+        var R = [], S = !0, U = !1, L = void 0;
         try {
-          for (var J = c[Symbol.iterator](), Y; !(E = (Y = J.next()).done) && (S.push(Y.value), !(_ && S.length === _)); E = !0)
+          for (var J = c[Symbol.iterator](), Y; !(S = (Y = J.next()).done) && (R.push(Y.value), !(m && R.length === m)); S = !0)
             ;
         } catch (se) {
           U = !0, L = se;
         } finally {
           try {
-            !E && J.return && J.return();
+            !S && J.return && J.return();
           } finally {
             if (U)
               throw L;
           }
         }
-        return S;
+        return R;
       }
-      return function(c, _) {
+      return function(c, m) {
         if (Array.isArray(c))
           return c;
         if (Symbol.iterator in Object(c))
-          return f(c, _);
+          return f(c, m);
         throw new TypeError("Invalid attempt to destructure non-iterable instance");
       };
-    }(), R = function(f) {
+    }(), w = function(f) {
       if (Array.isArray(f)) {
-        for (var c = 0, _ = Array(f.length); c < f.length; c++)
-          _[c] = f[c];
-        return _;
+        for (var c = 0, m = Array(f.length); c < f.length; c++)
+          m[c] = f[c];
+        return m;
       } else
         return Array.from(f);
-    }, v = 2147483647, T = 36, $ = 1, g = 26, k = 38, C = 700, I = 72, D = 128, P = "-", O = /^xn--/, A = /[^\0-\x7E]/, x = /[\x2E\u3002\uFF0E\uFF61]/g, z = {
+    }, P = 2147483647, T = 36, $ = 1, g = 26, k = 38, C = 700, I = 72, D = 128, b = "-", O = /^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 - $, K = Math.floor, ue = String.fromCharCode;
     function ie(f) {
-      throw new RangeError(z[f]);
+      throw new RangeError(x[f]);
     }
     function ke(f, c) {
-      for (var _ = [], S = f.length; S--; )
-        _[S] = c(f[S]);
-      return _;
+      for (var m = [], R = f.length; R--; )
+        m[R] = c(f[R]);
+      return m;
     }
     function Ce(f, c) {
-      var _ = f.split("@"), S = "";
-      _.length > 1 && (S = _[0] + "@", f = _[1]), f = f.replace(x, ".");
-      var E = f.split("."), U = ke(E, c).join(".");
-      return S + U;
+      var m = f.split("@"), R = "";
+      m.length > 1 && (R = m[0] + "@", f = m[1]), f = f.replace(V, ".");
+      var S = f.split("."), U = ke(S, c).join(".");
+      return R + U;
     }
     function qe(f) {
-      for (var c = [], _ = 0, S = f.length; _ < S; ) {
-        var E = f.charCodeAt(_++);
-        if (E >= 55296 && E <= 56319 && _ < S) {
-          var U = f.charCodeAt(_++);
-          (U & 64512) == 56320 ? c.push(((E & 1023) << 10) + (U & 1023) + 65536) : (c.push(E), _--);
+      for (var c = [], m = 0, R = f.length; m < R; ) {
+        var S = f.charCodeAt(m++);
+        if (S >= 55296 && S <= 56319 && m < R) {
+          var U = f.charCodeAt(m++);
+          (U & 64512) == 56320 ? c.push(((S & 1023) << 10) + (U & 1023) + 65536) : (c.push(S), m--);
         } else
-          c.push(E);
+          c.push(S);
       }
       return c;
     }
     var et = function(c) {
-      return String.fromCodePoint.apply(String, R(c));
-    }, Me = function(c) {
+      return String.fromCodePoint.apply(String, w(c));
+    }, Ue = function(c) {
       return c - 48 < 10 ? c - 22 : c - 65 < 26 ? c - 65 : c - 97 < 26 ? c - 97 : T;
-    }, F = function(c, _) {
-      return c + 22 + 75 * (c < 26) - ((_ != 0) << 5);
-    }, y = function(c, _, S) {
-      var E = 0;
+    }, F = function(c, m) {
+      return c + 22 + 75 * (c < 26) - ((m != 0) << 5);
+    }, y = function(c, m, R) {
+      var S = 0;
       for (
-        c = S ? K(c / C) : c >> 1, c += K(c / _);
+        c = R ? K(c / C) : c >> 1, c += K(c / m);
         /* no initialization */
         c > re * g >> 1;
-        E += T
+        S += T
       )
         c = K(c / re);
-      return K(E + (re + 1) * c / (c + k));
+      return K(S + (re + 1) * c / (c + k));
     }, j = function(c) {
-      var _ = [], S = c.length, E = 0, U = D, L = I, J = c.lastIndexOf(P);
+      var m = [], R = c.length, S = 0, U = D, L = I, J = c.lastIndexOf(b);
       J < 0 && (J = 0);
       for (var Y = 0; Y < J; ++Y)
-        c.charCodeAt(Y) >= 128 && ie("not-basic"), _.push(c.charCodeAt(Y));
-      for (var se = J > 0 ? J + 1 : 0; se < S; ) {
+        c.charCodeAt(Y) >= 128 && ie("not-basic"), m.push(c.charCodeAt(Y));
+      for (var se = J > 0 ? J + 1 : 0; se < R; ) {
         for (
-          var B = E, Z = 1, oe = T;
+          var B = S, Q = 1, oe = T;
           ;
           /* no condition */
           oe += T
         ) {
-          se >= S && ie("invalid-input");
-          var V = Me(c.charCodeAt(se++));
-          (V >= T || V > K((v - E) / Z)) && ie("overflow"), E += V * Z;
+          se >= R && ie("invalid-input");
+          var z = Ue(c.charCodeAt(se++));
+          (z >= T || z > K((P - S) / Q)) && ie("overflow"), S += z * Q;
           var X = oe <= L ? $ : oe >= L + g ? g : oe - L;
-          if (V < X)
+          if (z < X)
             break;
           var ae = T - X;
-          Z > K(v / ae) && ie("overflow"), Z *= ae;
+          Q > K(P / ae) && ie("overflow"), Q *= ae;
         }
-        var ee = _.length + 1;
-        L = y(E - B, ee, B == 0), K(E / ee) > v - U && ie("overflow"), U += K(E / ee), E %= ee, _.splice(E++, 0, U);
+        var ee = m.length + 1;
+        L = y(S - B, ee, B == 0), K(S / ee) > P - U && ie("overflow"), U += K(S / ee), S %= ee, m.splice(S++, 0, U);
       }
-      return String.fromCodePoint.apply(String, _);
-    }, b = function(c) {
-      var _ = [];
+      return String.fromCodePoint.apply(String, m);
+    }, E = function(c) {
+      var m = [];
       c = qe(c);
-      var S = c.length, E = D, U = 0, L = I, J = !0, Y = !1, se = void 0;
+      var R = c.length, S = D, U = 0, L = I, J = !0, Y = !1, se = void 0;
       try {
-        for (var B = c[Symbol.iterator](), Z; !(J = (Z = B.next()).done); J = !0) {
-          var oe = Z.value;
-          oe < 128 && _.push(ue(oe));
+        for (var B = c[Symbol.iterator](), Q; !(J = (Q = B.next()).done); J = !0) {
+          var oe = Q.value;
+          oe < 128 && m.push(ue(oe));
         }
       } catch (lt) {
         Y = !0, se = lt;
@@ -5769,13 +5307,13 @@ var uri$1 = {}, uri_all = { exports: {} };
             throw se;
         }
       }
-      var V = _.length, X = V;
-      for (V && _.push(P); X < S; ) {
-        var ae = v, ee = !0, Ee = !1, ge = void 0;
+      var z = m.length, X = z;
+      for (z && m.push(b); X < R; ) {
+        var ae = P, ee = !0, Ee = !1, ge = void 0;
         try {
-          for (var $e = c[Symbol.iterator](), We; !(ee = (We = $e.next()).done); ee = !0) {
-            var Ie = We.value;
-            Ie >= E && Ie < ae && (ae = Ie);
+          for (var $e = c[Symbol.iterator](), Be; !(ee = (Be = $e.next()).done); ee = !0) {
+            var Ie = Be.value;
+            Ie >= S && Ie < ae && (ae = Ie);
           }
         } catch (lt) {
           Ee = !0, ge = lt;
@@ -5788,12 +5326,12 @@ var uri$1 = {}, uri_all = { exports: {} };
           }
         }
         var fe = X + 1;
-        ae - E > K((v - U) / fe) && ie("overflow"), U += (ae - E) * fe, E = ae;
-        var ye = !0, je = !1, ve = void 0;
+        ae - S > K((P - U) / fe) && ie("overflow"), U += (ae - S) * fe, S = ae;
+        var ye = !0, je = !1, we = void 0;
         try {
           for (var ct = c[Symbol.iterator](), Lt; !(ye = (Lt = ct.next()).done); ye = !0) {
             var Ht = Lt.value;
-            if (Ht < E && ++U > v && ie("overflow"), Ht == E) {
+            if (Ht < S && ++U > P && ie("overflow"), Ht == S) {
               for (
                 var pt = U, ft = T;
                 ;
@@ -5803,32 +5341,32 @@ var uri$1 = {}, uri_all = { exports: {} };
                 var ht = ft <= L ? $ : ft >= L + g ? g : ft - L;
                 if (pt < ht)
                   break;
-                var xt = pt - ht, Vt = T - ht;
-                _.push(ue(F(ht + xt % Vt, 0))), pt = K(xt / Vt);
+                var Vt = pt - ht, zt = T - ht;
+                m.push(ue(F(ht + Vt % zt, 0))), pt = K(Vt / zt);
               }
-              _.push(ue(F(pt, 0))), L = y(U, fe, X == V), U = 0, ++X;
+              m.push(ue(F(pt, 0))), L = y(U, fe, X == z), U = 0, ++X;
             }
           }
         } catch (lt) {
-          je = !0, ve = lt;
+          je = !0, we = lt;
         } finally {
           try {
             !ye && ct.return && ct.return();
           } finally {
             if (je)
-              throw ve;
+              throw we;
           }
         }
-        ++U, ++E;
+        ++U, ++S;
       }
-      return _.join("");
+      return m.join("");
     }, a = function(c) {
-      return Ce(c, function(_) {
-        return O.test(_) ? j(_.slice(4).toLowerCase()) : _;
+      return Ce(c, function(m) {
+        return O.test(m) ? j(m.slice(4).toLowerCase()) : m;
       });
     }, h = function(c) {
-      return Ce(c, function(_) {
-        return A.test(_) ? "xn--" + b(_) : _;
+      return Ce(c, function(m) {
+        return A.test(m) ? "xn--" + E(m) : m;
       });
     }, N = {
       /**
@@ -5849,70 +5387,70 @@ var uri$1 = {}, uri_all = { exports: {} };
         encode: et
       },
       decode: j,
-      encode: b,
+      encode: E,
       toASCII: h,
       toUnicode: a
-    }, q = {};
-    function M(f) {
-      var c = f.charCodeAt(0), _ = void 0;
-      return c < 16 ? _ = "%0" + c.toString(16).toUpperCase() : c < 128 ? _ = "%" + c.toString(16).toUpperCase() : c < 2048 ? _ = "%" + (c >> 6 | 192).toString(16).toUpperCase() + "%" + (c & 63 | 128).toString(16).toUpperCase() : _ = "%" + (c >> 12 | 224).toString(16).toUpperCase() + "%" + (c >> 6 & 63 | 128).toString(16).toUpperCase() + "%" + (c & 63 | 128).toString(16).toUpperCase(), _;
+    }, M = {};
+    function q(f) {
+      var c = f.charCodeAt(0), m = void 0;
+      return c < 16 ? m = "%0" + c.toString(16).toUpperCase() : c < 128 ? m = "%" + c.toString(16).toUpperCase() : c < 2048 ? m = "%" + (c >> 6 | 192).toString(16).toUpperCase() + "%" + (c & 63 | 128).toString(16).toUpperCase() : m = "%" + (c >> 12 | 224).toString(16).toUpperCase() + "%" + (c >> 6 & 63 | 128).toString(16).toUpperCase() + "%" + (c & 63 | 128).toString(16).toUpperCase(), m;
     }
     function W(f) {
-      for (var c = "", _ = 0, S = f.length; _ < S; ) {
-        var E = parseInt(f.substr(_ + 1, 2), 16);
-        if (E < 128)
-          c += String.fromCharCode(E), _ += 3;
-        else if (E >= 194 && E < 224) {
-          if (S - _ >= 6) {
-            var U = parseInt(f.substr(_ + 4, 2), 16);
-            c += String.fromCharCode((E & 31) << 6 | U & 63);
+      for (var c = "", m = 0, R = f.length; m < R; ) {
+        var S = parseInt(f.substr(m + 1, 2), 16);
+        if (S < 128)
+          c += String.fromCharCode(S), m += 3;
+        else if (S >= 194 && S < 224) {
+          if (R - m >= 6) {
+            var U = parseInt(f.substr(m + 4, 2), 16);
+            c += String.fromCharCode((S & 31) << 6 | U & 63);
           } else
-            c += f.substr(_, 6);
-          _ += 6;
-        } else if (E >= 224) {
-          if (S - _ >= 9) {
-            var L = parseInt(f.substr(_ + 4, 2), 16), J = parseInt(f.substr(_ + 7, 2), 16);
-            c += String.fromCharCode((E & 15) << 12 | (L & 63) << 6 | J & 63);
+            c += f.substr(m, 6);
+          m += 6;
+        } else if (S >= 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((S & 15) << 12 | (L & 63) << 6 | J & 63);
           } else
-            c += f.substr(_, 9);
-          _ += 9;
+            c += f.substr(m, 9);
+          m += 9;
         } else
-          c += f.substr(_, 3), _ += 3;
+          c += f.substr(m, 3), m += 3;
       }
       return c;
     }
     function G(f, c) {
-      function _(S) {
-        var E = W(S);
-        return E.match(c.UNRESERVED) ? E : S;
+      function m(R) {
+        var S = W(R);
+        return S.match(c.UNRESERVED) ? S : R;
       }
-      return f.scheme && (f.scheme = String(f.scheme).replace(c.PCT_ENCODED, _).toLowerCase().replace(c.NOT_SCHEME, "")), f.userinfo !== void 0 && (f.userinfo = String(f.userinfo).replace(c.PCT_ENCODED, _).replace(c.NOT_USERINFO, M).replace(c.PCT_ENCODED, i)), f.host !== void 0 && (f.host = String(f.host).replace(c.PCT_ENCODED, _).toLowerCase().replace(c.NOT_HOST, M).replace(c.PCT_ENCODED, i)), f.path !== void 0 && (f.path = String(f.path).replace(c.PCT_ENCODED, _).replace(f.scheme ? c.NOT_PATH : c.NOT_PATH_NOSCHEME, M).replace(c.PCT_ENCODED, i)), f.query !== void 0 && (f.query = String(f.query).replace(c.PCT_ENCODED, _).replace(c.NOT_QUERY, M).replace(c.PCT_ENCODED, i)), f.fragment !== void 0 && (f.fragment = String(f.fragment).replace(c.PCT_ENCODED, _).replace(c.NOT_FRAGMENT, M).replace(c.PCT_ENCODED, i)), f;
+      return f.scheme && (f.scheme = String(f.scheme).replace(c.PCT_ENCODED, m).toLowerCase().replace(c.NOT_SCHEME, "")), f.userinfo !== void 0 && (f.userinfo = String(f.userinfo).replace(c.PCT_ENCODED, m).replace(c.NOT_USERINFO, q).replace(c.PCT_ENCODED, i)), f.host !== void 0 && (f.host = String(f.host).replace(c.PCT_ENCODED, m).toLowerCase().replace(c.NOT_HOST, q).replace(c.PCT_ENCODED, i)), 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, i)), f.query !== void 0 && (f.query = String(f.query).replace(c.PCT_ENCODED, m).replace(c.NOT_QUERY, q).replace(c.PCT_ENCODED, i)), f.fragment !== void 0 && (f.fragment = String(f.fragment).replace(c.PCT_ENCODED, m).replace(c.NOT_FRAGMENT, q).replace(c.PCT_ENCODED, i)), f;
     }
     function ne(f) {
       return f.replace(/^0*(.*)/, "$1") || "0";
     }
     function he(f, c) {
-      var _ = f.match(c.IPV4ADDRESS) || [], S = w(_, 2), E = S[1];
-      return E ? E.split(".").map(ne).join(".") : f;
-    }
-    function Ue(f, c) {
-      var _ = f.match(c.IPV6ADDRESS) || [], S = w(_, 3), E = S[1], U = S[2];
-      if (E) {
-        for (var L = E.toLowerCase().split("::").reverse(), J = w(L, 2), Y = J[0], se = J[1], B = se ? se.split(":").map(ne) : [], Z = Y.split(":").map(ne), oe = c.IPV4ADDRESS.test(Z[Z.length - 1]), V = oe ? 7 : 8, X = Z.length - V, ae = Array(V), ee = 0; ee < V; ++ee)
-          ae[ee] = B[ee] || Z[X + ee] || "";
-        oe && (ae[V - 1] = he(ae[V - 1], c));
+      var m = f.match(c.IPV4ADDRESS) || [], R = v(m, 2), S = R[1];
+      return S ? S.split(".").map(ne).join(".") : f;
+    }
+    function Le(f, c) {
+      var m = f.match(c.IPV6ADDRESS) || [], R = v(m, 3), S = R[1], U = R[2];
+      if (S) {
+        for (var L = S.toLowerCase().split("::").reverse(), J = v(L, 2), Y = J[0], se = J[1], B = se ? se.split(":").map(ne) : [], Q = Y.split(":").map(ne), oe = c.IPV4ADDRESS.test(Q[Q.length - 1]), z = oe ? 7 : 8, X = Q.length - z, ae = Array(z), ee = 0; ee < z; ++ee)
+          ae[ee] = B[ee] || Q[X + ee] || "";
+        oe && (ae[z - 1] = he(ae[z - 1], c));
         var Ee = ae.reduce(function(fe, ye, je) {
           if (!ye || ye === "0") {
-            var ve = fe[fe.length - 1];
-            ve && ve.index + ve.length === je ? ve.length++ : fe.push({ index: je, length: 1 });
+            var we = fe[fe.length - 1];
+            we && we.index + we.length === je ? we.length++ : fe.push({ index: je, length: 1 });
           }
           return fe;
         }, []), ge = Ee.sort(function(fe, ye) {
           return ye.length - fe.length;
         })[0], $e = void 0;
         if (ge && ge.length > 1) {
-          var We = ae.slice(0, ge.index), Ie = ae.slice(ge.index + ge.length);
-          $e = We.join(":") + "::" + Ie.join(":");
+          var Be = ae.slice(0, ge.index), Ie = ae.slice(ge.index + ge.length);
+          $e = Be.join(":") + "::" + Ie.join(":");
         } else
           $e = ae.join(":");
         return U && ($e += "%" + U), $e;
@@ -5921,101 +5459,101 @@ var uri$1 = {}, uri_all = { exports: {} };
     }
     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] : {}, _ = {}, S = c.iri !== !1 ? m : u;
+      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = {}, R = c.iri !== !1 ? _ : u;
       c.reference === "suffix" && (f = (c.scheme ? c.scheme + ":" : "") + "//" + f);
-      var E = f.match(tt);
-      if (E) {
-        rt ? (_.scheme = E[1], _.userinfo = E[3], _.host = E[4], _.port = parseInt(E[5], 10), _.path = E[6] || "", _.query = E[7], _.fragment = E[8], isNaN(_.port) && (_.port = E[5])) : (_.scheme = E[1] || void 0, _.userinfo = f.indexOf("@") !== -1 ? E[3] : void 0, _.host = f.indexOf("//") !== -1 ? E[4] : void 0, _.port = parseInt(E[5], 10), _.path = E[6] || "", _.query = f.indexOf("?") !== -1 ? E[7] : void 0, _.fragment = f.indexOf("#") !== -1 ? E[8] : void 0, isNaN(_.port) && (_.port = f.match(/\/\/(?:.|\n)*\:(?:\/|\?|\#|$)/) ? E[4] : void 0)), _.host && (_.host = Ue(he(_.host, S), S)), _.scheme === void 0 && _.userinfo === void 0 && _.host === void 0 && _.port === void 0 && !_.path && _.query === void 0 ? _.reference = "same-document" : _.scheme === void 0 ? _.reference = "relative" : _.fragment === void 0 ? _.reference = "absolute" : _.reference = "uri", c.reference && c.reference !== "suffix" && c.reference !== _.reference && (_.error = _.error || "URI is not a " + c.reference + " reference.");
-        var U = q[(c.scheme || _.scheme || "").toLowerCase()];
+      var S = f.match(tt);
+      if (S) {
+        rt ? (m.scheme = S[1], m.userinfo = S[3], m.host = S[4], m.port = parseInt(S[5], 10), m.path = S[6] || "", m.query = S[7], m.fragment = S[8], isNaN(m.port) && (m.port = S[5])) : (m.scheme = S[1] || void 0, m.userinfo = f.indexOf("@") !== -1 ? S[3] : void 0, m.host = f.indexOf("//") !== -1 ? S[4] : void 0, m.port = parseInt(S[5], 10), m.path = S[6] || "", m.query = f.indexOf("?") !== -1 ? S[7] : void 0, m.fragment = f.indexOf("#") !== -1 ? S[8] : void 0, isNaN(m.port) && (m.port = f.match(/\/\/(?:.|\n)*\:(?:\/|\?|\#|$)/) ? S[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.");
+        var U = M[(c.scheme || m.scheme || "").toLowerCase()];
         if (!c.unicodeSupport && (!U || !U.unicodeSupport)) {
-          if (_.host && (c.domainHost || U && U.domainHost))
+          if (m.host && (c.domainHost || U && U.domainHost))
             try {
-              _.host = N.toASCII(_.host.replace(S.PCT_ENCODED, W).toLowerCase());
+              m.host = N.toASCII(m.host.replace(R.PCT_ENCODED, W).toLowerCase());
             } catch (L) {
-              _.error = _.error || "Host's domain name can not be converted to ASCII via punycode: " + L;
+              m.error = m.error || "Host's domain name can not be converted to ASCII via punycode: " + L;
             }
-          G(_, u);
+          G(m, u);
         } else
-          G(_, S);
-        U && U.parse && U.parse(_, c);
+          G(m, R);
+        U && U.parse && U.parse(m, c);
       } else
-        _.error = _.error || "URI can not be parsed.";
-      return _;
+        m.error = m.error || "URI can not be parsed.";
+      return m;
     }
     function nt(f, c) {
-      var _ = c.iri !== !1 ? m : u, S = [];
-      return f.userinfo !== void 0 && (S.push(f.userinfo), S.push("@")), f.host !== void 0 && S.push(Ue(he(String(f.host), _), _).replace(_.IPV6ADDRESS, function(E, U, L) {
+      var m = c.iri !== !1 ? _ : u, 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(S, 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;
+      })), (typeof f.port == "number" || typeof f.port == "string") && (R.push(":"), R.push(String(f.port))), R.length ? R.join("") : void 0;
     }
-    var Le = /^\.\.?\//, He = /^\/\.(\/|$)/, xe = /^\/\.\.(\/|$)/, st = /^\/?(?:.|\n)*?(?=\/|$)/;
+    var He = /^\.\.?\//, Ve = /^\/\.(\/|$)/, ze = /^\/\.\.(\/|$)/, st = /^\/?(?:.|\n)*?(?=\/|$)/;
     function me(f) {
       for (var c = []; f.length; )
-        if (f.match(Le))
-          f = f.replace(Le, "");
-        else if (f.match(He))
-          f = f.replace(He, "/");
-        else if (f.match(xe))
-          f = f.replace(xe, "/"), c.pop();
+        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();
         else if (f === "." || f === "..")
           f = "";
         else {
-          var _ = f.match(st);
-          if (_) {
-            var S = _[0];
-            f = f.slice(S.length), c.push(S);
+          var m = f.match(st);
+          if (m) {
+            var R = m[0];
+            f = f.slice(R.length), c.push(R);
           } else
             throw new Error("Unexpected dot segment condition");
         }
       return c.join("");
     }
     function le(f) {
-      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, _ = c.iri ? m : u, S = [], E = q[(c.scheme || f.scheme || "").toLowerCase()];
-      if (E && E.serialize && E.serialize(f, c), f.host && !_.IPV6ADDRESS.test(f.host)) {
-        if (c.domainHost || E && E.domainHost)
+      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = c.iri ? _ : u, R = [], S = M[(c.scheme || f.scheme || "").toLowerCase()];
+      if (S && S.serialize && S.serialize(f, c), f.host && !m.IPV6ADDRESS.test(f.host)) {
+        if (c.domainHost || S && S.domainHost)
           try {
-            f.host = c.iri ? N.toUnicode(f.host) : N.toASCII(f.host.replace(_.PCT_ENCODED, W).toLowerCase());
+            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;
           }
       }
-      G(f, _), c.reference !== "suffix" && f.scheme && (S.push(f.scheme), S.push(":"));
+      G(f, m), c.reference !== "suffix" && f.scheme && (R.push(f.scheme), R.push(":"));
       var U = nt(f, c);
-      if (U !== void 0 && (c.reference !== "suffix" && S.push("//"), S.push(U), f.path && f.path.charAt(0) !== "/" && S.push("/")), f.path !== void 0) {
+      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")), S.push(L);
+        !c.absolutePath && (!S || !S.absolutePath) && (L = me(L)), U === void 0 && (L = L.replace(/^\/\//, "/%2F")), R.push(L);
       }
-      return f.query !== void 0 && (S.push("?"), S.push(f.query)), f.fragment !== void 0 && (S.push("#"), S.push(f.fragment)), S.join("");
+      return f.query !== void 0 && (R.push("?"), R.push(f.query)), f.fragment !== void 0 && (R.push("#"), R.push(f.fragment)), R.join("");
     }
-    function Ve(f, c) {
-      var _ = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, S = arguments[3], E = {};
-      return S || (f = de(le(f, _), _), c = de(le(c, _), _)), _ = _ || {}, !_.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 xe(f, c) {
+      var m = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, R = arguments[3], S = {};
+      return R || (f = de(le(f, m), m), c = de(le(c, m), m)), m = m || {}, !m.tolerant && c.scheme ? (S.scheme = c.scheme, S.userinfo = c.userinfo, S.host = c.host, S.port = c.port, S.path = me(c.path || ""), S.query = c.query) : (c.userinfo !== void 0 || c.host !== void 0 || c.port !== void 0 ? (S.userinfo = c.userinfo, S.host = c.host, S.port = c.port, S.path = me(c.path || ""), S.query = c.query) : (c.path ? (c.path.charAt(0) === "/" ? S.path = me(c.path) : ((f.userinfo !== void 0 || f.host !== void 0 || f.port !== void 0) && !f.path ? S.path = "/" + c.path : f.path ? S.path = f.path.slice(0, f.path.lastIndexOf("/") + 1) + c.path : S.path = c.path, S.path = me(S.path)), S.query = c.query) : (S.path = f.path, c.query !== void 0 ? S.query = c.query : S.query = f.query), S.userinfo = f.userinfo, S.host = f.host, S.port = f.port), S.scheme = f.scheme), S.fragment = c.fragment, S;
     }
-    function ot(f, c, _) {
-      var S = p({ scheme: "null" }, _);
-      return le(Ve(de(f, S), de(c, S), S, !0), S);
+    function ot(f, c, m) {
+      var R = p({ scheme: "null" }, m);
+      return le(xe(de(f, R), de(c, R), R, !0), R);
     }
     function Oe(f, c) {
       return typeof f == "string" ? f = le(de(f, c), c) : o(f) === "object" && (f = de(le(f, c), c)), f;
     }
-    function it(f, c, _) {
-      return typeof f == "string" ? f = le(de(f, _), _) : o(f) === "object" && (f = le(f, _)), typeof c == "string" ? c = le(de(c, _), _) : o(c) === "object" && (c = le(c, _)), f === c;
+    function it(f, c, m) {
+      return typeof f == "string" ? f = le(de(f, m), m) : o(f) === "object" && (f = le(f, m)), typeof c == "string" ? c = le(de(c, m), m) : o(c) === "object" && (c = le(c, m)), f === c;
     }
     function ut(f, c) {
-      return f && f.toString().replace(!c || !c.iri ? u.ESCAPE : m.ESCAPE, M);
+      return f && f.toString().replace(!c || !c.iri ? u.ESCAPE : _.ESCAPE, q);
     }
     function pe(f, c) {
-      return f && f.toString().replace(!c || !c.iri ? u.PCT_ENCODED : m.PCT_ENCODED, W);
+      return f && f.toString().replace(!c || !c.iri ? u.PCT_ENCODED : _.PCT_ENCODED, W);
     }
     var Ne = {
       scheme: "http",
       domainHost: !0,
-      parse: function(c, _) {
+      parse: function(c, m) {
         return c.host || (c.error = c.error || "HTTP URIs must have a host."), c;
       },
-      serialize: function(c, _) {
-        var S = String(c.scheme).toLowerCase() === "https";
-        return (c.port === (S ? 443 : 80) || c.port === "") && (c.port = void 0), c.path || (c.path = "/"), c;
+      serialize: function(c, m) {
+        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 = {
       scheme: "https",
@@ -6029,13 +5567,13 @@ var uri$1 = {}, uri_all = { exports: {} };
     var at = {
       scheme: "ws",
       domainHost: !0,
-      parse: function(c, _) {
-        var S = c;
-        return S.secure = jt(S), S.resourceName = (S.path || "/") + (S.query ? "?" + S.query : ""), S.path = void 0, S.query = void 0, S;
+      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;
       },
-      serialize: function(c, _) {
+      serialize: function(c, m) {
         if ((c.port === (jt(c) ? 443 : 80) || c.port === "") && (c.port = void 0), typeof c.secure == "boolean" && (c.scheme = c.secure ? "wss" : "ws", c.secure = void 0), c.resourceName) {
-          var S = c.resourceName.split("?"), E = w(S, 2), U = E[0], L = E[1];
+          var R = c.resourceName.split("?"), S = v(R, 2), U = S[0], L = S[1];
           c.path = U && U !== "/" ? U : void 0, c.query = L, c.resourceName = void 0;
         }
         return c.fragment = void 0, c;
@@ -6045,101 +5583,101 @@ var uri$1 = {}, uri_all = { exports: {} };
       domainHost: at.domainHost,
       parse: at.parse,
       serialize: at.serialize
-    }, or = {}, Dt = "[A-Za-z0-9\\-\\.\\_\\~\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]", _e = "[0-9A-Fa-f]", ir = 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"), ze = new RegExp(ir, "g"), pr = new RegExp(n("[^]", ar, "[\\.]", '[\\"]', lr), "g"), Ft = new RegExp(n("[^]", Dt, dr), "g"), fr = Ft;
+    }, or = {}, Dt = "[A-Za-z0-9\\-\\.\\_\\~\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]", _e = "[0-9A-Fa-f]", ir = 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(ir, "g"), pr = new RegExp(n("[^]", ar, "[\\.]", '[\\"]', lr), "g"), Ft = new RegExp(n("[^]", Dt, dr), "g"), fr = Ft;
     function Ot(f) {
       var c = W(f);
       return c.match(ur) ? c : f;
     }
-    var qt = {
+    var Mt = {
       scheme: "mailto",
-      parse: function(c, _) {
-        var S = c, E = S.to = S.path ? S.path.split(",") : [];
-        if (S.path = void 0, S.query) {
-          for (var U = !1, L = {}, J = S.query.split("&"), Y = 0, se = J.length; Y < se; ++Y) {
+      parse: function(c, m) {
+        var R = c, S = 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("=");
             switch (B[0]) {
               case "to":
-                for (var Z = B[1].split(","), oe = 0, V = Z.length; oe < V; ++oe)
-                  E.push(Z[oe]);
+                for (var Q = B[1].split(","), oe = 0, z = Q.length; oe < z; ++oe)
+                  S.push(Q[oe]);
                 break;
               case "subject":
-                S.subject = pe(B[1], _);
+                R.subject = pe(B[1], m);
                 break;
               case "body":
-                S.body = pe(B[1], _);
+                R.body = pe(B[1], m);
                 break;
               default:
-                U = !0, L[pe(B[0], _)] = pe(B[1], _);
+                U = !0, L[pe(B[0], m)] = pe(B[1], m);
                 break;
             }
           }
-          U && (S.headers = L);
+          U && (R.headers = L);
         }
-        S.query = void 0;
-        for (var X = 0, ae = E.length; X < ae; ++X) {
-          var ee = E[X].split("@");
-          if (ee[0] = pe(ee[0]), _.unicodeSupport)
-            ee[1] = pe(ee[1], _).toLowerCase();
+        R.query = void 0;
+        for (var X = 0, ae = S.length; X < ae; ++X) {
+          var ee = S[X].split("@");
+          if (ee[0] = pe(ee[0]), m.unicodeSupport)
+            ee[1] = pe(ee[1], m).toLowerCase();
           else
             try {
-              ee[1] = N.toASCII(pe(ee[1], _).toLowerCase());
+              ee[1] = N.toASCII(pe(ee[1], m).toLowerCase());
             } catch (Ee) {
-              S.error = S.error || "Email address's domain name can not be converted to ASCII via punycode: " + Ee;
+              R.error = R.error || "Email address's domain name can not be converted to ASCII via punycode: " + Ee;
             }
-          E[X] = ee.join("@");
+          S[X] = ee.join("@");
         }
-        return S;
+        return R;
       },
-      serialize: function(c, _) {
-        var S = c, E = l(c.to);
-        if (E) {
-          for (var U = 0, L = E.length; U < L; ++U) {
-            var J = String(E[U]), Y = J.lastIndexOf("@"), se = J.slice(0, Y).replace(ze, Ot).replace(ze, i).replace(pr, M), B = J.slice(Y + 1);
+      serialize: function(c, m) {
+        var R = c, S = l(c.to);
+        if (S) {
+          for (var U = 0, L = S.length; U < L; ++U) {
+            var J = String(S[U]), Y = J.lastIndexOf("@"), se = J.slice(0, Y).replace(We, Ot).replace(We, i).replace(pr, q), B = J.slice(Y + 1);
             try {
-              B = _.iri ? N.toUnicode(B) : N.toASCII(pe(B, _).toLowerCase());
+              B = m.iri ? N.toUnicode(B) : N.toASCII(pe(B, m).toLowerCase());
             } catch (X) {
-              S.error = S.error || "Email address's domain name can not be converted to " + (_.iri ? "Unicode" : "ASCII") + " via punycode: " + 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;
+            S[U] = se + "@" + B;
           }
-          S.path = E.join(",");
+          R.path = S.join(",");
         }
-        var Z = c.headers = c.headers || {};
-        c.subject && (Z.subject = c.subject), c.body && (Z.body = c.body);
+        var Q = c.headers = c.headers || {};
+        c.subject && (Q.subject = c.subject), c.body && (Q.body = c.body);
         var oe = [];
-        for (var V in Z)
-          Z[V] !== or[V] && oe.push(V.replace(ze, Ot).replace(ze, i).replace(Ft, M) + "=" + Z[V].replace(ze, Ot).replace(ze, i).replace(fr, M));
-        return oe.length && (S.query = oe.join("&")), S;
+        for (var z in Q)
+          Q[z] !== or[z] && oe.push(z.replace(We, Ot).replace(We, i).replace(Ft, q) + "=" + Q[z].replace(We, Ot).replace(We, i).replace(fr, q));
+        return oe.length && (R.query = oe.join("&")), R;
       }
-    }, hr = /^([^\:]+)\:(.*)/, Mt = {
+    }, hr = /^([^\:]+)\:(.*)/, qt = {
       scheme: "urn",
-      parse: function(c, _) {
-        var S = c.path && c.path.match(hr), E = c;
-        if (S) {
-          var U = _.scheme || E.scheme || "urn", L = S[1].toLowerCase(), J = S[2], Y = U + ":" + (_.nid || L), se = q[Y];
-          E.nid = L, E.nss = J, E.path = void 0, se && (E = se.parse(E, _));
+      parse: function(c, m) {
+        var R = c.path && c.path.match(hr), S = c;
+        if (R) {
+          var U = m.scheme || S.scheme || "urn", L = R[1].toLowerCase(), J = R[2], Y = U + ":" + (m.nid || L), se = M[Y];
+          S.nid = L, S.nss = J, S.path = void 0, se && (S = se.parse(S, m));
         } else
-          E.error = E.error || "URN can not be parsed.";
-        return E;
+          S.error = S.error || "URN can not be parsed.";
+        return S;
       },
-      serialize: function(c, _) {
-        var S = _.scheme || c.scheme || "urn", E = c.nid, U = S + ":" + (_.nid || E), L = q[U];
-        L && (c = L.serialize(c, _));
+      serialize: function(c, m) {
+        var R = m.scheme || c.scheme || "urn", S = c.nid, U = R + ":" + (m.nid || S), L = M[U];
+        L && (c = L.serialize(c, m));
         var J = c, Y = c.nss;
-        return J.path = (E || _.nid) + ":" + Y, J;
+        return J.path = (S || m.nid) + ":" + Y, J;
       }
     }, mr = /^[0-9A-Fa-f]{8}(?:\-[0-9A-Fa-f]{4}){3}\-[0-9A-Fa-f]{12}$/, Ut = {
       scheme: "urn:uuid",
-      parse: function(c, _) {
-        var S = c;
-        return S.uuid = S.nss, S.nss = void 0, !_.tolerant && (!S.uuid || !S.uuid.match(mr)) && (S.error = S.error || "UUID is not valid."), S;
+      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;
       },
-      serialize: function(c, _) {
-        var S = c;
-        return S.nss = (c.uuid || "").toLowerCase(), S;
+      serialize: function(c, m) {
+        var R = c;
+        return R.nss = (c.uuid || "").toLowerCase(), R;
       }
     };
-    q[Ne.scheme] = Ne, q[It.scheme] = It, q[at.scheme] = at, q[At.scheme] = At, q[qt.scheme] = qt, q[Mt.scheme] = Mt, q[Ut.scheme] = Ut, r.SCHEMES = q, r.pctEncChar = M, r.pctDecChars = W, r.parse = de, r.removeDotSegments = me, r.serialize = le, r.resolveComponents = Ve, r.resolve = ot, r.normalize = Oe, r.equal = it, r.escapeComponent = ut, r.unescapeComponent = pe, Object.defineProperty(r, "__esModule", { value: !0 });
+    M[Ne.scheme] = Ne, M[It.scheme] = It, M[at.scheme] = at, M[At.scheme] = At, M[Mt.scheme] = Mt, M[qt.scheme] = qt, M[Ut.scheme] = Ut, r.SCHEMES = M, r.pctEncChar = q, r.pctDecChars = W, r.parse = de, r.removeDotSegments = me, r.serialize = le, r.resolveComponents = xe, r.resolve = ot, r.normalize = Oe, r.equal = it, r.escapeComponent = ut, r.unescapeComponent = pe, Object.defineProperty(r, "__esModule", { value: !0 });
   });
 })(uri_all, uri_all.exports);
 var uri_allExports = uri_all.exports;
@@ -6167,9 +5705,9 @@ uri$1.default = uri;
   } }), Object.defineProperty(e, "CodeGen", { enumerable: !0, get: function() {
     return r.CodeGen;
   } });
-  const n = validation_error, s = ref_error, o = rules, i = compile, l = codegen, p = resolve$1, d = dataType, u = util, m = require$$9, w = uri$1, R = (F, y) => new RegExp(F, y);
-  R.code = "new RegExp";
-  const v = ["removeAdditional", "useDefaults", "coerceTypes"], T = /* @__PURE__ */ new Set([
+  const n = validation_error, s = ref_error, o = rules, i = compile, l = codegen, p = resolve$1, d = dataType, u = util, _ = require$$9, v = uri$1, w = (F, y) => new RegExp(F, y);
+  w.code = "new RegExp";
+  const P = ["removeAdditional", "useDefaults", "coerceTypes"], T = /* @__PURE__ */ new Set([
     "validate",
     "serialize",
     "parse",
@@ -6205,25 +5743,25 @@ uri$1.default = uri;
     unicode: '"minLength"/"maxLength" account for unicode characters by default.'
   }, k = 200;
   function C(F) {
-    var y, j, b, a, h, N, q, M, W, G, ne, he, Ue, tt, rt, de, nt, Le, He, xe, st, me, le, Ve, ot;
-    const Oe = F.strict, it = (y = F.code) === null || y === void 0 ? void 0 : y.optimize, ut = it === !0 || it === void 0 ? 1 : it || 0, pe = (b = (j = F.code) === null || j === void 0 ? void 0 : j.regExp) !== null && b !== void 0 ? b : R, Ne = (a = F.uriResolver) !== null && a !== void 0 ? a : w.default;
+    var y, j, E, a, h, N, M, q, W, G, ne, he, Le, tt, rt, de, nt, He, Ve, ze, st, me, le, xe, ot;
+    const Oe = F.strict, it = (y = F.code) === null || y === void 0 ? void 0 : y.optimize, ut = it === !0 || it === void 0 ? 1 : it || 0, pe = (E = (j = F.code) === null || j === void 0 ? void 0 : j.regExp) !== null && E !== void 0 ? E : w, Ne = (a = F.uriResolver) !== null && a !== void 0 ? a : v.default;
     return {
       strictSchema: (N = (h = F.strictSchema) !== null && h !== void 0 ? h : Oe) !== null && N !== void 0 ? N : !0,
-      strictNumbers: (M = (q = F.strictNumbers) !== null && q !== void 0 ? q : Oe) !== null && M !== void 0 ? M : !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 = (Ue = F.strictRequired) !== null && Ue !== void 0 ? Ue : Oe) !== null && tt !== void 0 ? tt : !1,
+      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 : k,
       loopEnum: (de = F.loopEnum) !== null && de !== void 0 ? de : k,
       meta: (nt = F.meta) !== null && nt !== void 0 ? nt : !0,
-      messages: (Le = F.messages) !== null && Le !== void 0 ? Le : !0,
-      inlineRefs: (He = F.inlineRefs) !== null && He !== void 0 ? He : !0,
-      schemaId: (xe = F.schemaId) !== null && xe !== void 0 ? xe : "$id",
+      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,
       validateSchema: (me = F.validateSchema) !== null && me !== void 0 ? me : !0,
       validateFormats: (le = F.validateFormats) !== null && le !== void 0 ? le : !0,
-      unicodeRegExp: (Ve = F.unicodeRegExp) !== null && Ve !== void 0 ? Ve : !0,
+      unicodeRegExp: (xe = F.unicodeRegExp) !== null && xe !== void 0 ? xe : !0,
       int32range: (ot = F.int32range) !== null && ot !== void 0 ? ot : !0,
       uriResolver: Ne
     };
@@ -6231,41 +5769,41 @@ uri$1.default = uri;
   class I {
     constructor(y = {}) {
       this.schemas = {}, this.refs = {}, this.formats = {}, this._compilations = /* @__PURE__ */ new Set(), this._loading = {}, this._cache = /* @__PURE__ */ new Map(), y = this.opts = { ...y, ...C(y) };
-      const { es5: j, lines: b } = this.opts.code;
-      this.scope = new l.ValueScope({ scope: {}, prefixes: T, es5: j, lines: b }), this.logger = K(y.logger);
+      const { es5: j, lines: E } = this.opts.code;
+      this.scope = new l.ValueScope({ scope: {}, prefixes: T, es5: j, lines: E }), this.logger = K(y.logger);
       const a = y.validateFormats;
-      y.validateFormats = !1, this.RULES = (0, o.getRules)(), D.call(this, $, y, "NOT SUPPORTED"), D.call(this, g, y, "DEPRECATED", "warn"), this._metaOpts = z.call(this), y.formats && A.call(this), this._addVocabularies(), this._addDefaultMetaSchema(), y.keywords && x.call(this, y.keywords), typeof y.meta == "object" && this.addMetaSchema(y.meta), O.call(this), y.validateFormats = a;
+      y.validateFormats = !1, this.RULES = (0, o.getRules)(), D.call(this, $, y, "NOT SUPPORTED"), D.call(this, g, y, "DEPRECATED", "warn"), this._metaOpts = x.call(this), y.formats && A.call(this), this._addVocabularies(), this._addDefaultMetaSchema(), y.keywords && V.call(this, y.keywords), typeof y.meta == "object" && this.addMetaSchema(y.meta), O.call(this), y.validateFormats = a;
     }
     _addVocabularies() {
       this.addKeyword("$async");
     }
     _addDefaultMetaSchema() {
-      const { $data: y, meta: j, schemaId: b } = this.opts;
-      let a = m;
-      b === "id" && (a = { ...m }, a.id = a.$id, delete a.$id), j && y && this.addMetaSchema(a, a[b], !1);
+      const { $data: y, meta: j, schemaId: E } = this.opts;
+      let a = _;
+      E === "id" && (a = { ..._ }, a.id = a.$id, delete a.$id), j && y && this.addMetaSchema(a, a[E], !1);
     }
     defaultMeta() {
       const { meta: y, schemaId: j } = this.opts;
       return this.opts.defaultMeta = typeof y == "object" ? y[j] || y : void 0;
     }
     validate(y, j) {
-      let b;
+      let E;
       if (typeof y == "string") {
-        if (b = this.getSchema(y), !b)
+        if (E = this.getSchema(y), !E)
           throw new Error(`no schema with key or ref "${y}"`);
       } else
-        b = this.compile(y);
-      const a = b(j);
-      return "$async" in b || (this.errors = b.errors), a;
+        E = this.compile(y);
+      const a = E(j);
+      return "$async" in E || (this.errors = E.errors), a;
     }
     compile(y, j) {
-      const b = this._addSchema(y, j);
-      return b.validate || this._compileSchemaEnv(b);
+      const E = this._addSchema(y, j);
+      return E.validate || this._compileSchemaEnv(E);
     }
     compileAsync(y, j) {
       if (typeof this.opts.loadSchema != "function")
         throw new Error("options.loadSchema should be a function");
-      const { loadSchema: b } = this.opts;
+      const { loadSchema: E } = this.opts;
       return a.call(this, y, j);
       async function a(G, ne) {
         await h.call(this, G.$schema);
@@ -6281,14 +5819,14 @@ uri$1.default = uri;
         } catch (ne) {
           if (!(ne instanceof s.default))
             throw ne;
-          return q.call(this, ne), await M.call(this, ne.missingSchema), N.call(this, G);
+          return M.call(this, ne), await q.call(this, ne.missingSchema), N.call(this, G);
         }
       }
-      function q({ missingSchema: G, missingRef: ne }) {
+      function M({ missingSchema: G, missingRef: ne }) {
         if (this.refs[G])
           throw new Error(`AnySchema ${G} is loaded but ${ne} cannot be resolved`);
       }
-      async function M(G) {
+      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);
       }
@@ -6297,17 +5835,17 @@ uri$1.default = uri;
         if (ne)
           return ne;
         try {
-          return await (this._loading[G] = b(G));
+          return await (this._loading[G] = E(G));
         } finally {
           delete this._loading[G];
         }
       }
     }
     // Adds schema to the instance
-    addSchema(y, j, b, a = this.opts.validateSchema) {
+    addSchema(y, j, E, a = this.opts.validateSchema) {
       if (Array.isArray(y)) {
         for (const N of y)
-          this.addSchema(N, void 0, b, a);
+          this.addSchema(N, void 0, E, a);
         return this;
       }
       let h;
@@ -6316,23 +5854,23 @@ uri$1.default = uri;
         if (h = y[N], h !== void 0 && typeof h != "string")
           throw new Error(`schema ${N} must be string`);
       }
-      return j = (0, p.normalizeId)(j || h), this._checkUnique(j), this.schemas[j] = this._addSchema(y, b, j, a, !0), this;
+      return j = (0, p.normalizeId)(j || h), this._checkUnique(j), this.schemas[j] = this._addSchema(y, E, j, a, !0), this;
     }
     // Add schema that will be used to validate other schemas
     // options in META_IGNORE_OPTIONS are alway set to false
-    addMetaSchema(y, j, b = this.opts.validateSchema) {
-      return this.addSchema(y, j, !0, b), this;
+    addMetaSchema(y, j, E = this.opts.validateSchema) {
+      return this.addSchema(y, j, !0, E), this;
     }
     //  Validate schema against its meta-schema
     validateSchema(y, j) {
       if (typeof y == "boolean")
         return !0;
-      let b;
-      if (b = y.$schema, b !== void 0 && typeof b != "string")
+      let E;
+      if (E = y.$schema, E !== void 0 && typeof E != "string")
         throw new Error("$schema must be a string");
-      if (b = b || this.opts.defaultMeta || this.defaultMeta(), !b)
+      if (E = E || this.opts.defaultMeta || this.defaultMeta(), !E)
         return this.logger.warn("meta-schema not available"), this.errors = null, !0;
-      const a = this.validate(b, y);
+      const a = this.validate(E, y);
       if (!a && j) {
         const h = "schema is invalid: " + this.errorsText();
         if (this.opts.validateSchema === "log")
@@ -6346,10 +5884,10 @@ uri$1.default = uri;
     // (`key` that was passed to `addSchema` or full schema reference - `schema.$id` or resolved id)
     getSchema(y) {
       let j;
-      for (; typeof (j = P.call(this, y)) == "string"; )
+      for (; typeof (j = b.call(this, y)) == "string"; )
         y = j;
       if (j === void 0) {
-        const { schemaId: b } = this.opts, a = new i.SchemaEnv({ schema: {}, schemaId: b });
+        const { schemaId: E } = this.opts, a = new i.SchemaEnv({ schema: {}, schemaId: E });
         if (j = i.resolveSchema.call(this, a, y), !j)
           return;
         this.refs[y] = j;
@@ -6367,14 +5905,14 @@ uri$1.default = uri;
         case "undefined":
           return this._removeAllSchemas(this.schemas), this._removeAllSchemas(this.refs), this._cache.clear(), this;
         case "string": {
-          const j = P.call(this, y);
+          const j = b.call(this, y);
           return typeof j == "object" && this._cache.delete(j.schema), delete this.schemas[y], delete this.refs[y], this;
         }
         case "object": {
           const j = y;
           this._cache.delete(j);
-          let b = y[this.opts.schemaId];
-          return b && (b = (0, p.normalizeId)(b), delete this.schemas[b], delete this.refs[b]), this;
+          let E = y[this.opts.schemaId];
+          return E && (E = (0, p.normalizeId)(E), delete this.schemas[E], delete this.refs[E]), this;
         }
         default:
           throw new Error("ajv.removeSchema: invalid parameter");
@@ -6387,23 +5925,23 @@ uri$1.default = uri;
       return this;
     }
     addKeyword(y, j) {
-      let b;
+      let E;
       if (typeof y == "string")
-        b = y, typeof j == "object" && (this.logger.warn("these parameters are deprecated, see docs for addKeyword"), j.keyword = b);
+        E = y, typeof j == "object" && (this.logger.warn("these parameters are deprecated, see docs for addKeyword"), j.keyword = E);
       else if (typeof y == "object" && j === void 0) {
-        if (j = y, b = j.keyword, Array.isArray(b) && !b.length)
+        if (j = y, E = j.keyword, Array.isArray(E) && !E.length)
           throw new Error("addKeywords: keyword must be string or non-empty array");
       } else
         throw new Error("invalid addKeywords parameters");
-      if (ie.call(this, b, j), !j)
-        return (0, u.eachItem)(b, (h) => ke.call(this, h)), this;
+      if (ie.call(this, E, j), !j)
+        return (0, u.eachItem)(E, (h) => ke.call(this, h)), this;
       qe.call(this, j);
       const a = {
         ...j,
         type: (0, d.getJSONTypes)(j.type),
         schemaType: (0, d.getJSONTypes)(j.schemaType)
       };
-      return (0, u.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, u.eachItem)(E, a.type.length === 0 ? (h) => ke.call(this, h, a) : (h) => a.type.forEach((N) => ke.call(this, h, a, N))), this;
     }
     getKeyword(y) {
       const j = this.RULES.all[y];
@@ -6413,9 +5951,9 @@ uri$1.default = uri;
     removeKeyword(y) {
       const { RULES: j } = this;
       delete j.keywords[y], delete j.all[y];
-      for (const b of j.rules) {
-        const a = b.rules.findIndex((h) => h.keyword === y);
-        a >= 0 && b.rules.splice(a, 1);
+      for (const E of j.rules) {
+        const a = E.rules.findIndex((h) => h.keyword === y);
+        a >= 0 && E.rules.splice(a, 1);
       }
       return this;
     }
@@ -6423,50 +5961,50 @@ uri$1.default = uri;
     addFormat(y, j) {
       return typeof j == "string" && (j = new RegExp(j)), this.formats[y] = j, this;
     }
-    errorsText(y = this.errors, { separator: j = ", ", dataVar: b = "data" } = {}) {
-      return !y || y.length === 0 ? "No errors" : y.map((a) => `${b}${a.instancePath} ${a.message}`).reduce((a, h) => a + j + h);
+    errorsText(y = this.errors, { separator: j = ", ", dataVar: E = "data" } = {}) {
+      return !y || y.length === 0 ? "No errors" : y.map((a) => `${E}${a.instancePath} ${a.message}`).reduce((a, h) => a + j + h);
     }
     $dataMetaSchema(y, j) {
-      const b = this.RULES.all;
+      const E = this.RULES.all;
       y = JSON.parse(JSON.stringify(y));
       for (const a of j) {
         const h = a.split("/").slice(1);
         let N = y;
-        for (const q of h)
-          N = N[q];
-        for (const q in b) {
-          const M = b[q];
-          if (typeof M != "object")
+        for (const M of h)
+          N = N[M];
+        for (const M in E) {
+          const q = E[M];
+          if (typeof q != "object")
             continue;
-          const { $data: W } = M.definition, G = N[q];
-          W && G && (N[q] = Me(G));
+          const { $data: W } = q.definition, G = N[M];
+          W && G && (N[M] = Ue(G));
         }
       }
       return y;
     }
     _removeAllSchemas(y, j) {
-      for (const b in y) {
-        const a = y[b];
-        (!j || j.test(b)) && (typeof a == "string" ? delete y[b] : a && !a.meta && (this._cache.delete(a.schema), delete y[b]));
+      for (const E in y) {
+        const a = y[E];
+        (!j || j.test(E)) && (typeof a == "string" ? delete y[E] : a && !a.meta && (this._cache.delete(a.schema), delete y[E]));
       }
     }
-    _addSchema(y, j, b, a = this.opts.validateSchema, h = this.opts.addUsedSchema) {
+    _addSchema(y, j, E, a = this.opts.validateSchema, h = this.opts.addUsedSchema) {
       let N;
-      const { schemaId: q } = this.opts;
+      const { schemaId: M } = this.opts;
       if (typeof y == "object")
-        N = y[q];
+        N = y[M];
       else {
         if (this.opts.jtd)
           throw new Error("schema must be object");
         if (typeof y != "boolean")
           throw new Error("schema must be object or boolean");
       }
-      let M = this._cache.get(y);
-      if (M !== void 0)
-        return M;
-      b = (0, p.normalizeId)(N || b);
-      const W = p.getSchemaRefs.call(this, y, b);
-      return M = new i.SchemaEnv({ schema: y, schemaId: q, meta: j, baseId: b, localRefs: W }), this._cache.set(M.schema, M), h && !b.startsWith("#") && (b && this._checkUnique(b), this.refs[b] = M), a && this.validateSchema(y, !0), M;
+      let q = this._cache.get(y);
+      if (q !== void 0)
+        return q;
+      E = (0, p.normalizeId)(N || E);
+      const W = p.getSchemaRefs.call(this, y, E);
+      return q = new i.SchemaEnv({ schema: y, schemaId: M, meta: j, baseId: E, localRefs: W }), this._cache.set(q.schema, q), h && !E.startsWith("#") && (E && this._checkUnique(E), this.refs[E] = q), a && this.validateSchema(y, !0), q;
     }
     _checkUnique(y) {
       if (this.schemas[y] || this.refs[y])
@@ -6488,13 +6026,13 @@ uri$1.default = uri;
     }
   }
   e.default = I, I.ValidationError = n.default, I.MissingRefError = s.default;
-  function D(F, y, j, b = "error") {
+  function D(F, y, j, E = "error") {
     for (const a in F) {
       const h = a;
-      h in y && this.logger[b](`${j}: option ${a}. ${F[h]}`);
+      h in y && this.logger[E](`${j}: option ${a}. ${F[h]}`);
     }
   }
-  function P(F) {
+  function b(F) {
     return F = (0, p.normalizeId)(F), this.schemas[F] || this.refs[F];
   }
   function O() {
@@ -6512,7 +6050,7 @@ uri$1.default = uri;
       y && this.addFormat(F, y);
     }
   }
-  function x(F) {
+  function V(F) {
     if (Array.isArray(F)) {
       this.addVocabulary(F);
       return;
@@ -6523,9 +6061,9 @@ uri$1.default = uri;
       j.keyword || (j.keyword = y), this.addKeyword(j);
     }
   }
-  function z() {
+  function x() {
     const F = { ...this.opts };
-    for (const y of v)
+    for (const y of P)
       delete F[y];
     return F;
   }
@@ -6545,24 +6083,24 @@ uri$1.default = uri;
   const ue = /^[a-z_$][a-z0-9_$:-]*$/i;
   function ie(F, y) {
     const { RULES: j } = this;
-    if ((0, u.eachItem)(F, (b) => {
-      if (j.keywords[b])
-        throw new Error(`Keyword ${b} is already defined`);
-      if (!ue.test(b))
-        throw new Error(`Keyword ${b} has invalid name`);
+    if ((0, u.eachItem)(F, (E) => {
+      if (j.keywords[E])
+        throw new Error(`Keyword ${E} is already defined`);
+      if (!ue.test(E))
+        throw new Error(`Keyword ${E} has invalid name`);
     }), !!y && y.$data && !("code" in y || "validate" in y))
       throw new Error('$data keyword must have "code" or "validate" function');
   }
   function ke(F, y, j) {
-    var b;
+    var E;
     const a = y == null ? void 0 : y.post;
     if (j && a)
       throw new Error('keyword with "post" flag cannot have "type"');
     const { RULES: h } = this;
-    let N = a ? h.post : h.rules.find(({ type: M }) => M === j);
+    let N = a ? h.post : h.rules.find(({ type: q }) => q === j);
     if (N || (N = { type: j, rules: [] }, h.rules.push(N)), h.keywords[F] = !0, !y)
       return;
-    const q = {
+    const M = {
       keyword: F,
       definition: {
         ...y,
@@ -6570,20 +6108,20 @@ uri$1.default = uri;
         schemaType: (0, d.getJSONTypes)(y.schemaType)
       }
     };
-    y.before ? Ce.call(this, N, q, y.before) : N.rules.push(q), h.all[F] = q, (b = y.implements) === null || b === void 0 || b.forEach((M) => this.addKeyword(M));
+    y.before ? Ce.call(this, N, M, y.before) : N.rules.push(M), h.all[F] = M, (E = y.implements) === null || E === void 0 || E.forEach((q) => this.addKeyword(q));
   }
   function Ce(F, y, j) {
-    const b = F.rules.findIndex((a) => a.keyword === j);
-    b >= 0 ? F.rules.splice(b, 0, y) : (F.rules.push(y), this.logger.warn(`rule ${j} is not defined`));
+    const E = F.rules.findIndex((a) => a.keyword === j);
+    E >= 0 ? F.rules.splice(E, 0, y) : (F.rules.push(y), this.logger.warn(`rule ${j} is not defined`));
   }
   function qe(F) {
     let { metaSchema: y } = F;
-    y !== void 0 && (F.$data && this.opts.$data && (y = Me(y)), F.validateSchema = this.compile(y, !0));
+    y !== void 0 && (F.$data && this.opts.$data && (y = Ue(y)), F.validateSchema = this.compile(y, !0));
   }
   const et = {
     $ref: "https://raw.githubusercontent.com/ajv-validator/ajv/master/lib/refs/data.json#"
   };
-  function Me(F) {
+  function Ue(F) {
     return { anyOf: [F, et] };
   }
 })(core$2);
@@ -6605,26 +6143,26 @@ 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: o, validateName: i, opts: l, self: p } = n, { root: d } = o;
     if ((r === "#" || r === "#/") && s === d.baseId)
-      return m();
+      return _();
     const u = compile_1$1.resolveRef.call(p, d, s, r);
     if (u === void 0)
       throw new ref_error_1.default(n.opts.uriResolver, s, r);
     if (u instanceof compile_1$1.SchemaEnv)
-      return w(u);
-    return R(u);
-    function m() {
+      return v(u);
+    return w(u);
+    function _() {
       if (o === d)
         return callRef(e, i, o, o.$async);
-      const v = t.scopeValue("root", { ref: d });
-      return callRef(e, (0, codegen_1$l._)`${v}.validate`, d, d.$async);
+      const P = t.scopeValue("root", { ref: d });
+      return callRef(e, (0, codegen_1$l._)`${P}.validate`, d, d.$async);
     }
-    function w(v) {
-      const T = getValidate(e, v);
-      callRef(e, T, v, v.$async);
+    function v(P) {
+      const T = getValidate(e, P);
+      callRef(e, T, P, P.$async);
     }
-    function R(v) {
-      const T = t.scopeValue("schema", l.code.source === !0 ? { ref: v, code: (0, codegen_1$l.stringify)(v) } : { ref: v }), $ = t.name("valid"), g = e.subschema({
-        schema: v,
+    function w(P) {
+      const T = t.scopeValue("schema", l.code.source === !0 ? { ref: P, code: (0, codegen_1$l.stringify)(P) } : { ref: P }), $ = t.name("valid"), g = e.subschema({
+        schema: P,
         dataTypes: [],
         schemaPath: codegen_1$l.nil,
         topSchemaRef: T,
@@ -6641,25 +6179,25 @@ function getValidate(e, t) {
 ref.getValidate = getValidate;
 function callRef(e, t, r, n) {
   const { gen: s, it: o } = e, { allErrors: i, schemaEnv: l, opts: p } = o, d = p.passContext ? names_1$1.default.this : codegen_1$l.nil;
-  n ? u() : m();
+  n ? u() : _();
   function u() {
     if (!l.$async)
       throw new Error("async schema referenced by sync schema");
-    const v = s.let("valid");
+    const P = s.let("valid");
     s.try(() => {
-      s.code((0, codegen_1$l._)`await ${(0, code_1$8.callValidateCode)(e, t, d)}`), R(t), i || s.assign(v, !0);
+      s.code((0, codegen_1$l._)`await ${(0, code_1$8.callValidateCode)(e, t, d)}`), w(t), i || s.assign(P, !0);
     }, (T) => {
-      s.if((0, codegen_1$l._)`!(${T} instanceof ${o.ValidationError})`, () => s.throw(T)), w(T), i || s.assign(v, !1);
-    }), e.ok(v);
+      s.if((0, codegen_1$l._)`!(${T} instanceof ${o.ValidationError})`, () => s.throw(T)), v(T), i || s.assign(P, !1);
+    }), e.ok(P);
   }
-  function m() {
-    e.result((0, code_1$8.callValidateCode)(e, t, d), () => R(t), () => w(t));
+  function _() {
+    e.result((0, code_1$8.callValidateCode)(e, t, d), () => w(t), () => v(t));
   }
-  function w(v) {
-    const T = (0, codegen_1$l._)`${v}.errors`;
+  function v(P) {
+    const T = (0, codegen_1$l._)`${P}.errors`;
     s.assign(names_1$1.default.vErrors, (0, codegen_1$l._)`${names_1$1.default.vErrors} === null ? ${T} : ${names_1$1.default.vErrors}.concat(${T})`), s.assign(names_1$1.default.errors, (0, codegen_1$l._)`${names_1$1.default.vErrors}.length`);
   }
-  function R(v) {
+  function w(P) {
     var T;
     if (!o.opts.unevaluated)
       return;
@@ -6668,14 +6206,14 @@ function callRef(e, t, r, n) {
       if ($ && !$.dynamicProps)
         $.props !== void 0 && (o.props = util_1$j.mergeEvaluated.props(s, $.props, o.props));
       else {
-        const g = s.var("props", (0, codegen_1$l._)`${v}.evaluated.props`);
+        const g = s.var("props", (0, codegen_1$l._)`${P}.evaluated.props`);
         o.props = util_1$j.mergeEvaluated.props(s, g, o.props, codegen_1$l.Name);
       }
     if (o.items !== !0)
       if ($ && !$.dynamicItems)
         $.items !== void 0 && (o.items = util_1$j.mergeEvaluated.items(s, $.items, o.items));
       else {
-        const g = s.var("items", (0, codegen_1$l._)`${v}.evaluated.items`);
+        const g = s.var("items", (0, codegen_1$l._)`${P}.evaluated.items`);
         o.items = util_1$j.mergeEvaluated.items(s, g, o.items, codegen_1$l.Name);
       }
   }
@@ -6817,36 +6355,36 @@ const code_1$6 = code, codegen_1$f = codegen, util_1$h = util, error$d = {
       return;
     const p = r.length >= l.loopRequired;
     if (i.allErrors ? d() : u(), l.strictRequired) {
-      const R = e.parentSchema.properties, { definedProperties: v } = e.it;
+      const w = e.parentSchema.properties, { definedProperties: P } = e.it;
       for (const T of r)
-        if ((R == null ? void 0 : R[T]) === void 0 && !v.has(T)) {
+        if ((w == null ? void 0 : w[T]) === void 0 && !P.has(T)) {
           const $ = i.schemaEnv.baseId + i.errSchemaPath, g = `required property "${T}" is not defined at "${$}" (strictRequired)`;
           (0, util_1$h.checkStrictMode)(i, g, i.opts.strictRequired);
         }
     }
     function d() {
       if (p || o)
-        e.block$data(codegen_1$f.nil, m);
+        e.block$data(codegen_1$f.nil, _);
       else
-        for (const R of r)
-          (0, code_1$6.checkReportMissingProp)(e, R);
+        for (const w of r)
+          (0, code_1$6.checkReportMissingProp)(e, w);
     }
     function u() {
-      const R = t.let("missing");
+      const w = t.let("missing");
       if (p || o) {
-        const v = t.let("valid", !0);
-        e.block$data(v, () => w(R, v)), e.ok(v);
+        const P = t.let("valid", !0);
+        e.block$data(P, () => v(w, P)), e.ok(P);
       } else
-        t.if((0, code_1$6.checkMissingProp)(e, r, R)), (0, code_1$6.reportMissingProp)(e, R), t.else();
+        t.if((0, code_1$6.checkMissingProp)(e, r, w)), (0, code_1$6.reportMissingProp)(e, w), t.else();
     }
-    function m() {
-      t.forOf("prop", n, (R) => {
-        e.setParams({ missingProperty: R }), t.if((0, code_1$6.noPropertyInData)(t, s, R, l.ownProperties), () => e.error());
+    function _() {
+      t.forOf("prop", n, (w) => {
+        e.setParams({ missingProperty: w }), t.if((0, code_1$6.noPropertyInData)(t, s, w, l.ownProperties), () => e.error());
       });
     }
-    function w(R, v) {
-      e.setParams({ missingProperty: R }), t.forOf(R, n, () => {
-        t.assign(v, (0, code_1$6.propertyInData)(t, s, R, l.ownProperties)), t.if((0, codegen_1$f.not)(v), () => {
+    function v(w, P) {
+      e.setParams({ missingProperty: w }), t.forOf(w, n, () => {
+        t.assign(P, (0, code_1$6.propertyInData)(t, s, w, l.ownProperties)), t.if((0, codegen_1$f.not)(P), () => {
           e.error(), t.break();
         });
       }, codegen_1$f.nil);
@@ -6896,23 +6434,23 @@ const dataType_1 = dataType, codegen_1$d = codegen, util_1$g = util, equal_1$2 =
     const p = t.let("valid"), d = o.items ? (0, dataType_1.getSchemaTypes)(o.items) : [];
     e.block$data(p, u, (0, codegen_1$d._)`${i} === false`), e.ok(p);
     function u() {
-      const v = t.let("i", (0, codegen_1$d._)`${r}.length`), T = t.let("j");
-      e.setParams({ i: v, j: T }), t.assign(p, !0), t.if((0, codegen_1$d._)`${v} > 1`, () => (m() ? w : R)(v, T));
+      const P = t.let("i", (0, codegen_1$d._)`${r}.length`), T = t.let("j");
+      e.setParams({ i: P, j: T }), t.assign(p, !0), t.if((0, codegen_1$d._)`${P} > 1`, () => (_() ? v : w)(P, T));
     }
-    function m() {
-      return d.length > 0 && !d.some((v) => v === "object" || v === "array");
+    function _() {
+      return d.length > 0 && !d.some((P) => P === "object" || P === "array");
     }
-    function w(v, T) {
+    function v(P, T) {
       const $ = t.name("item"), g = (0, dataType_1.checkDataTypes)(d, $, l.opts.strictNumbers, dataType_1.DataType.Wrong), k = t.const("indices", (0, codegen_1$d._)`{}`);
-      t.for((0, codegen_1$d._)`;${v}--;`, () => {
-        t.let($, (0, codegen_1$d._)`${r}[${v}]`), t.if(g, (0, codegen_1$d._)`continue`), d.length > 1 && t.if((0, codegen_1$d._)`typeof ${$} == "string"`, (0, codegen_1$d._)`${$} += "_"`), t.if((0, codegen_1$d._)`typeof ${k}[${$}] == "number"`, () => {
+      t.for((0, codegen_1$d._)`;${P}--;`, () => {
+        t.let($, (0, codegen_1$d._)`${r}[${P}]`), t.if(g, (0, codegen_1$d._)`continue`), d.length > 1 && t.if((0, codegen_1$d._)`typeof ${$} == "string"`, (0, codegen_1$d._)`${$} += "_"`), t.if((0, codegen_1$d._)`typeof ${k}[${$}] == "number"`, () => {
           t.assign(T, (0, codegen_1$d._)`${k}[${$}]`), e.error(), t.assign(p, !1).break();
-        }).code((0, codegen_1$d._)`${k}[${$}] = ${v}`);
+        }).code((0, codegen_1$d._)`${k}[${$}] = ${P}`);
       });
     }
-    function R(v, T) {
+    function w(P, T) {
       const $ = (0, util_1$g.useFunc)(t, equal_1$2.default), g = t.name("outer");
-      t.label(g).for((0, codegen_1$d._)`;${v}--;`, () => t.for((0, codegen_1$d._)`${T} = ${v}; ${T}--;`, () => t.if((0, codegen_1$d._)`${$}(${r}[${v}], ${r}[${T}])`, () => {
+      t.label(g).for((0, codegen_1$d._)`;${P}--;`, () => t.for((0, codegen_1$d._)`${T} = ${P}; ${T}--;`, () => t.if((0, codegen_1$d._)`${$}(${r}[${P}], ${r}[${T}])`, () => {
         e.error(), t.assign(p, !1).break(g);
       })));
     }
@@ -6953,20 +6491,20 @@ const codegen_1$b = codegen, util_1$e = util, equal_1 = equal$1, error$9 = {
     const d = () => p ?? (p = (0, util_1$e.useFunc)(t, equal_1.default));
     let u;
     if (l || n)
-      u = t.let("valid"), e.block$data(u, m);
+      u = t.let("valid"), e.block$data(u, _);
     else {
       if (!Array.isArray(s))
         throw new Error("ajv implementation error");
-      const R = t.const("vSchema", o);
-      u = (0, codegen_1$b.or)(...s.map((v, T) => w(R, T)));
+      const w = t.const("vSchema", o);
+      u = (0, codegen_1$b.or)(...s.map((P, T) => v(w, T)));
     }
     e.pass(u);
-    function m() {
-      t.assign(u, !1), t.forOf("v", o, (R) => t.if((0, codegen_1$b._)`${d()}(${r}, ${R})`, () => t.assign(u, !0).break()));
+    function _() {
+      t.assign(u, !1), t.forOf("v", o, (w) => t.if((0, codegen_1$b._)`${d()}(${r}, ${w})`, () => t.assign(u, !0).break()));
     }
-    function w(R, v) {
-      const T = s[v];
-      return typeof T == "object" && T !== null ? (0, codegen_1$b._)`${d()}(${r}, ${R}[${v}])` : (0, codegen_1$b._)`${r} === ${T}`;
+    function v(w, P) {
+      const T = s[P];
+      return typeof T == "object" && T !== null ? (0, codegen_1$b._)`${d()}(${r}, ${w}[${P}])` : (0, codegen_1$b._)`${r} === ${T}`;
     }
   }
 };
@@ -7050,18 +6588,18 @@ function validateTuple(e, t, r = e.schema) {
   const { gen: n, parentSchema: s, data: o, keyword: i, it: l } = e;
   u(s), l.opts.unevaluated && r.length && l.items !== !0 && (l.items = util_1$c.mergeEvaluated.items(n, r.length, l.items));
   const p = n.name("valid"), d = n.const("len", (0, codegen_1$9._)`${o}.length`);
-  r.forEach((m, w) => {
-    (0, util_1$c.alwaysValidSchema)(l, m) || (n.if((0, codegen_1$9._)`${d} > ${w}`, () => e.subschema({
+  r.forEach((_, v) => {
+    (0, util_1$c.alwaysValidSchema)(l, _) || (n.if((0, codegen_1$9._)`${d} > ${v}`, () => e.subschema({
       keyword: i,
-      schemaProp: w,
-      dataProp: w
+      schemaProp: v,
+      dataProp: v
     }, p)), e.ok(p));
   });
-  function u(m) {
-    const { opts: w, errSchemaPath: R } = l, v = r.length, T = v === m.minItems && (v === m.maxItems || m[t] === !1);
-    if (w.strictTuples && !T) {
-      const $ = `"${i}" is ${v}-tuple, but minItems or maxItems/${t} are not specified or different at path "${R}"`;
-      (0, util_1$c.checkStrictMode)(l, $, w.strictTuples);
+  function u(_) {
+    const { opts: v, errSchemaPath: w } = l, P = r.length, T = P === _.minItems && (P === _.maxItems || _[t] === !1);
+    if (v.strictTuples && !T) {
+      const $ = `"${i}" is ${P}-tuple, but minItems or maxItems/${t} are not specified or different at path "${w}"`;
+      (0, util_1$c.checkStrictMode)(l, $, v.strictTuples);
     }
   }
 }
@@ -7125,13 +6663,13 @@ const codegen_1$7 = codegen, util_1$a = util, error$6 = {
       return;
     }
     o.items = !0;
-    const m = t.name("valid");
-    l === void 0 && i === 1 ? R(m, () => t.if(m, () => t.break())) : i === 0 ? (t.let(m, !0), l !== void 0 && t.if((0, codegen_1$7._)`${s}.length > 0`, w)) : (t.let(m, !1), w()), e.result(m, () => e.reset());
-    function w() {
+    const _ = t.name("valid");
+    l === void 0 && i === 1 ? w(_, () => t.if(_, () => t.break())) : i === 0 ? (t.let(_, !0), l !== void 0 && t.if((0, codegen_1$7._)`${s}.length > 0`, v)) : (t.let(_, !1), v()), e.result(_, () => e.reset());
+    function v() {
       const T = t.name("_valid"), $ = t.let("count", 0);
-      R(T, () => t.if(T, () => v($)));
+      w(T, () => t.if(T, () => P($)));
     }
-    function R(T, $) {
+    function w(T, $) {
       t.forRange("i", 0, u, (g) => {
         e.subschema({
           keyword: "contains",
@@ -7141,8 +6679,8 @@ const codegen_1$7 = codegen, util_1$a = util, error$6 = {
         }, T), $();
       });
     }
-    function v(T) {
-      t.code((0, codegen_1$7._)`${T}++`), l === void 0 ? t.if((0, codegen_1$7._)`${T} >= ${i}`, () => t.assign(m, !0).break()) : (t.if((0, codegen_1$7._)`${T} > ${l}`, () => t.assign(m, !1).break()), i === 1 ? t.assign(m, !0) : t.if((0, codegen_1$7._)`${T} >= ${i}`, () => t.assign(m, !0)));
+    function P(T) {
+      t.code((0, codegen_1$7._)`${T}++`), l === void 0 ? t.if((0, codegen_1$7._)`${T} >= ${i}`, () => t.assign(_, !0).break()) : (t.if((0, codegen_1$7._)`${T} > ${l}`, () => t.assign(_, !1).break()), i === 1 ? t.assign(_, !0) : t.if((0, codegen_1$7._)`${T} >= ${i}`, () => t.assign(_, !0)));
     }
   }
 };
@@ -7153,11 +6691,11 @@ var dependencies = {};
   const t = codegen, r = util, n = code;
   e.error = {
     message: ({ params: { property: p, depsCount: d, deps: u } }) => {
-      const m = d === 1 ? "property" : "properties";
-      return (0, t.str)`must have ${m} ${u} when property ${p} is present`;
+      const _ = d === 1 ? "property" : "properties";
+      return (0, t.str)`must have ${_} ${u} when property ${p} is present`;
     },
-    params: ({ params: { property: p, depsCount: d, deps: u, missingProperty: m } }) => (0, t._)`{property: ${p},
-    missingProperty: ${m},
+    params: ({ params: { property: p, depsCount: d, deps: u, missingProperty: _ } }) => (0, t._)`{property: ${p},
+    missingProperty: ${_},
     depsCount: ${d},
     deps: ${u}}`
     // TODO change to reference
@@ -7174,47 +6712,47 @@ var dependencies = {};
   };
   function o({ schema: p }) {
     const d = {}, u = {};
-    for (const m in p) {
-      if (m === "__proto__")
+    for (const _ in p) {
+      if (_ === "__proto__")
         continue;
-      const w = Array.isArray(p[m]) ? d : u;
-      w[m] = p[m];
+      const v = Array.isArray(p[_]) ? d : u;
+      v[_] = p[_];
     }
     return [d, u];
   }
   function i(p, d = p.schema) {
-    const { gen: u, data: m, it: w } = p;
+    const { gen: u, data: _, it: v } = p;
     if (Object.keys(d).length === 0)
       return;
-    const R = u.let("missing");
-    for (const v in d) {
-      const T = d[v];
+    const w = u.let("missing");
+    for (const P in d) {
+      const T = d[P];
       if (T.length === 0)
         continue;
-      const $ = (0, n.propertyInData)(u, m, v, w.opts.ownProperties);
+      const $ = (0, n.propertyInData)(u, _, P, v.opts.ownProperties);
       p.setParams({
-        property: v,
+        property: P,
         depsCount: T.length,
         deps: T.join(", ")
-      }), w.allErrors ? u.if($, () => {
+      }), v.allErrors ? u.if($, () => {
         for (const g of T)
           (0, n.checkReportMissingProp)(p, g);
-      }) : (u.if((0, t._)`${$} && (${(0, n.checkMissingProp)(p, T, R)})`), (0, n.reportMissingProp)(p, R), u.else());
+      }) : (u.if((0, t._)`${$} && (${(0, n.checkMissingProp)(p, T, w)})`), (0, n.reportMissingProp)(p, w), u.else());
     }
   }
   e.validatePropertyDeps = i;
   function l(p, d = p.schema) {
-    const { gen: u, data: m, keyword: w, it: R } = p, v = u.name("valid");
+    const { gen: u, data: _, keyword: v, it: w } = p, P = u.name("valid");
     for (const T in d)
-      (0, r.alwaysValidSchema)(R, d[T]) || (u.if(
-        (0, n.propertyInData)(u, m, T, R.opts.ownProperties),
+      (0, r.alwaysValidSchema)(w, d[T]) || (u.if(
+        (0, n.propertyInData)(u, _, T, w.opts.ownProperties),
         () => {
-          const $ = p.subschema({ keyword: w, schemaProp: T }, v);
-          p.mergeValidEvaluated($, v);
+          const $ = p.subschema({ keyword: v, schemaProp: T }, P);
+          p.mergeValidEvaluated($, P);
         },
-        () => u.var(v, !0)
+        () => u.var(P, !0)
         // TODO var
-      ), p.ok(v));
+      ), p.ok(P));
   }
   e.validateSchemaDeps = l, e.default = s;
 })(dependencies);
@@ -7267,13 +6805,13 @@ const code_1$3 = code, codegen_1$5 = codegen, names_1 = names$1, util_1$8 = util
     if (i.props = !0, p.removeAdditional !== "all" && (0, util_1$8.alwaysValidSchema)(i, r))
       return;
     const d = (0, code_1$3.allSchemaProperties)(n.properties), u = (0, code_1$3.allSchemaProperties)(n.patternProperties);
-    m(), e.ok((0, codegen_1$5._)`${o} === ${names_1.default.errors}`);
-    function m() {
+    _(), e.ok((0, codegen_1$5._)`${o} === ${names_1.default.errors}`);
+    function _() {
       t.forIn("key", s, ($) => {
-        !d.length && !u.length ? v($) : t.if(w($), () => v($));
+        !d.length && !u.length ? P($) : t.if(v($), () => P($));
       });
     }
-    function w($) {
+    function v($) {
       let g;
       if (d.length > 8) {
         const k = (0, util_1$8.schemaRefOrVal)(i, n.properties, "properties");
@@ -7282,12 +6820,12 @@ const code_1$3 = code, codegen_1$5 = codegen, names_1 = names$1, util_1$8 = util
         d.length ? g = (0, codegen_1$5.or)(...d.map((k) => (0, codegen_1$5._)`${$} === ${k}`)) : g = codegen_1$5.nil;
       return u.length && (g = (0, codegen_1$5.or)(g, ...u.map((k) => (0, codegen_1$5._)`${(0, code_1$3.usePattern)(e, k)}.test(${$})`))), (0, codegen_1$5.not)(g);
     }
-    function R($) {
+    function w($) {
       t.code((0, codegen_1$5._)`delete ${s}[${$}]`);
     }
-    function v($) {
+    function P($) {
       if (p.removeAdditional === "all" || p.removeAdditional && r === !1) {
-        R($);
+        w($);
         return;
       }
       if (r === !1) {
@@ -7297,7 +6835,7 @@ const code_1$3 = code, codegen_1$5 = codegen, names_1 = names$1, util_1$8 = util
       if (typeof r == "object" && !(0, util_1$8.alwaysValidSchema)(i, r)) {
         const g = t.name("valid");
         p.removeAdditional === "failing" ? (T($, g, !1), t.if((0, codegen_1$5.not)(g), () => {
-          e.reset(), R($);
+          e.reset(), w($);
         })) : (T($, g), l || t.if((0, codegen_1$5.not)(g), () => t.break()));
       }
     }
@@ -7326,23 +6864,23 @@ const validate_1 = validate, code_1$2 = code, util_1$7 = util, additionalPropert
     const { gen: t, schema: r, parentSchema: n, data: s, it: o } = e;
     o.opts.removeAdditional === "all" && n.additionalProperties === void 0 && additionalProperties_1$1.default.code(new validate_1.KeywordCxt(o, additionalProperties_1$1.default, "additionalProperties"));
     const i = (0, code_1$2.allSchemaProperties)(r);
-    for (const m of i)
-      o.definedProperties.add(m);
+    for (const _ of i)
+      o.definedProperties.add(_);
     o.opts.unevaluated && i.length && o.props !== !0 && (o.props = util_1$7.mergeEvaluated.props(t, (0, util_1$7.toHash)(i), o.props));
-    const l = i.filter((m) => !(0, util_1$7.alwaysValidSchema)(o, r[m]));
+    const l = i.filter((_) => !(0, util_1$7.alwaysValidSchema)(o, r[_]));
     if (l.length === 0)
       return;
     const p = t.name("valid");
-    for (const m of l)
-      d(m) ? u(m) : (t.if((0, code_1$2.propertyInData)(t, s, m, o.opts.ownProperties)), u(m), o.allErrors || t.else().var(p, !0), t.endIf()), e.it.definedProperties.add(m), e.ok(p);
-    function d(m) {
-      return o.opts.useDefaults && !o.compositeRule && r[m].default !== void 0;
+    for (const _ of l)
+      d(_) ? u(_) : (t.if((0, code_1$2.propertyInData)(t, s, _, o.opts.ownProperties)), u(_), o.allErrors || t.else().var(p, !0), t.endIf()), e.it.definedProperties.add(_), e.ok(p);
+    function d(_) {
+      return o.opts.useDefaults && !o.compositeRule && r[_].default !== void 0;
     }
-    function u(m) {
+    function u(_) {
       e.subschema({
         keyword: "properties",
-        schemaProp: m,
-        dataProp: m
+        schemaProp: _,
+        dataProp: _
       }, p);
     }
   }
@@ -7360,17 +6898,17 @@ const code_1$1 = code, codegen_1$4 = codegen, util_1$6 = util, util_2 = util, de
       return;
     const d = i.strictSchema && !i.allowMatchingProperties && s.properties, u = t.name("valid");
     o.props !== !0 && !(o.props instanceof codegen_1$4.Name) && (o.props = (0, util_2.evaluatedPropsToName)(t, o.props));
-    const { props: m } = o;
-    w();
-    function w() {
+    const { props: _ } = o;
+    v();
+    function v() {
       for (const T of l)
-        d && R(T), o.allErrors ? v(T) : (t.var(u, !0), v(T), t.if(u));
+        d && w(T), o.allErrors ? P(T) : (t.var(u, !0), P(T), t.if(u));
     }
-    function R(T) {
+    function w(T) {
       for (const $ in d)
         new RegExp(T).test($) && (0, util_1$6.checkStrictMode)(o, `property ${$} matches pattern ${T} (use allowMatchingProperties)`);
     }
-    function v(T) {
+    function P(T) {
       t.forIn("key", n, ($) => {
         t.if((0, codegen_1$4._)`${(0, code_1$1.usePattern)(e, T)}.test(${$})`, () => {
           const g = p.includes(T);
@@ -7379,7 +6917,7 @@ const code_1$1 = code, codegen_1$4 = codegen, util_1$6 = util, util_2 = util, de
             schemaProp: T,
             dataProp: $,
             dataPropType: util_2.Type.Str
-          }, u), o.opts.unevaluated && m !== !0 ? t.assign((0, codegen_1$4._)`${m}[${$}]`, !0) : !g && !o.allErrors && t.if((0, codegen_1$4.not)(u), () => t.break());
+          }, u), o.opts.unevaluated && _ !== !0 ? t.assign((0, codegen_1$4._)`${_}[${$}]`, !0) : !g && !o.allErrors && t.if((0, codegen_1$4.not)(u), () => t.break());
         });
       });
     }
@@ -7438,14 +6976,14 @@ const codegen_1$3 = codegen, util_1$4 = util, error$3 = {
     const o = r, i = t.let("valid", !1), l = t.let("passing", null), p = t.name("_valid");
     e.setParams({ passing: l }), t.block(d), e.result(i, () => e.reset(), () => e.error(!0));
     function d() {
-      o.forEach((u, m) => {
-        let w;
-        (0, util_1$4.alwaysValidSchema)(s, u) ? t.var(p, !0) : w = e.subschema({
+      o.forEach((u, _) => {
+        let v;
+        (0, util_1$4.alwaysValidSchema)(s, u) ? t.var(p, !0) : v = e.subschema({
           keyword: "oneOf",
-          schemaProp: m,
+          schemaProp: _,
           compositeRule: !0
-        }, p), m > 0 && t.if((0, codegen_1$3._)`${p} && ${i}`).assign(i, !1).assign(l, (0, codegen_1$3._)`[${l}, ${m}]`).else(), t.if(p, () => {
-          t.assign(i, !0), t.assign(l, m), w && e.mergeEvaluated(w, codegen_1$3.Name);
+        }, p), _ > 0 && t.if((0, codegen_1$3._)`${p} && ${i}`).assign(i, !1).assign(l, (0, codegen_1$3._)`[${l}, ${_}]`).else(), t.if(p, () => {
+          t.assign(i, !0), t.assign(l, _), v && e.mergeEvaluated(v, codegen_1$3.Name);
         });
       });
     }
@@ -7503,10 +7041,10 @@ const codegen_1$2 = codegen, util_1$2 = util, error$2 = {
       }, l);
       e.mergeEvaluated(u);
     }
-    function d(u, m) {
+    function d(u, _) {
       return () => {
-        const w = e.subschema({ keyword: u }, l);
-        t.assign(i, l), e.mergeValidEvaluated(w, i), m ? t.assign(m, (0, codegen_1$2._)`${u}`) : e.setParams({ ifClause: u });
+        const v = e.subschema({ keyword: u }, l);
+        t.assign(i, l), e.mergeValidEvaluated(v, i), _ ? t.assign(_, (0, codegen_1$2._)`${u}`) : e.setParams({ ifClause: u });
       };
     }
   }
@@ -7559,15 +7097,15 @@ const codegen_1$1 = codegen, error$1 = {
   $data: !0,
   error: error$1,
   code(e, t) {
-    const { gen: r, data: n, $data: s, schema: o, schemaCode: i, it: l } = e, { opts: p, errSchemaPath: d, schemaEnv: u, self: m } = l;
+    const { gen: r, data: n, $data: s, schema: o, schemaCode: i, it: l } = e, { opts: p, errSchemaPath: d, schemaEnv: u, self: _ } = l;
     if (!p.validateFormats)
       return;
-    s ? w() : R();
-    function w() {
-      const v = r.scopeValue("formats", {
-        ref: m.formats,
+    s ? v() : w();
+    function v() {
+      const P = r.scopeValue("formats", {
+        ref: _.formats,
         code: p.code.formats
-      }), T = r.const("fDef", (0, codegen_1$1._)`${v}[${i}]`), $ = r.let("fType"), g = r.let("format");
+      }), T = r.const("fDef", (0, codegen_1$1._)`${P}[${i}]`), $ = r.let("fType"), g = r.let("format");
       r.if((0, codegen_1$1._)`typeof ${T} == "object" && !(${T} instanceof RegExp)`, () => r.assign($, (0, codegen_1$1._)`${T}.type || "string"`).assign(g, (0, codegen_1$1._)`${T}.validate`), () => r.assign($, (0, codegen_1$1._)`"string"`).assign(g, T)), e.fail$data((0, codegen_1$1.or)(k(), C()));
       function k() {
         return p.strictSchema === !1 ? codegen_1$1.nil : (0, codegen_1$1._)`${i} && !${g}`;
@@ -7577,19 +7115,19 @@ const codegen_1$1 = codegen, error$1 = {
         return (0, codegen_1$1._)`${g} && ${g} !== true && ${$} === ${t} && !${D}`;
       }
     }
-    function R() {
-      const v = m.formats[o];
-      if (!v) {
+    function w() {
+      const P = _.formats[o];
+      if (!P) {
         k();
         return;
       }
-      if (v === !0)
+      if (P === !0)
         return;
-      const [T, $, g] = C(v);
+      const [T, $, g] = C(P);
       T === t && e.pass(I());
       function k() {
         if (p.strictSchema === !1) {
-          m.logger.warn(D());
+          _.logger.warn(D());
           return;
         }
         throw new Error(D());
@@ -7598,11 +7136,11 @@ const codegen_1$1 = codegen, error$1 = {
         }
       }
       function C(D) {
-        const P = D instanceof RegExp ? (0, codegen_1$1.regexpCode)(D) : p.code.formats ? (0, codegen_1$1._)`${p.code.formats}${(0, codegen_1$1.getProperty)(o)}` : void 0, O = r.scopeValue("formats", { key: o, ref: D, code: P });
+        const b = D instanceof RegExp ? (0, codegen_1$1.regexpCode)(D) : p.code.formats ? (0, codegen_1$1._)`${p.code.formats}${(0, codegen_1$1.getProperty)(o)}` : void 0, O = r.scopeValue("formats", { key: o, ref: D, code: b });
         return typeof D == "object" && !(D instanceof RegExp) ? [D.type || "string", D.validate, (0, codegen_1$1._)`${O}.validate`] : ["string", D, O];
       }
       function I() {
-        if (typeof v == "object" && !(v instanceof RegExp) && v.async) {
+        if (typeof P == "object" && !(P instanceof RegExp) && P.async) {
           if (!u.$async)
             throw new Error("async format in sync schema");
           return (0, codegen_1$1._)`await ${g}(${n})`;
@@ -7672,31 +7210,31 @@ const codegen_1 = codegen, types_1 = types, compile_1 = compile, util_1 = util,
     const p = t.let("valid", !1), d = t.const("tag", (0, codegen_1._)`${r}${(0, codegen_1.getProperty)(l)}`);
     t.if((0, codegen_1._)`typeof ${d} == "string"`, () => u(), () => e.error(!1, { discrError: types_1.DiscrError.Tag, tag: d, tagName: l })), e.ok(p);
     function u() {
-      const R = w();
+      const w = v();
       t.if(!1);
-      for (const v in R)
-        t.elseIf((0, codegen_1._)`${d} === ${v}`), t.assign(p, m(R[v]));
+      for (const P in w)
+        t.elseIf((0, codegen_1._)`${d} === ${P}`), t.assign(p, _(w[P]));
       t.else(), e.error(!1, { discrError: types_1.DiscrError.Mapping, tag: d, tagName: l }), t.endIf();
     }
-    function m(R) {
-      const v = t.name("valid"), T = e.subschema({ keyword: "oneOf", schemaProp: R }, v);
-      return e.mergeEvaluated(T, codegen_1.Name), v;
+    function _(w) {
+      const P = t.name("valid"), T = e.subschema({ keyword: "oneOf", schemaProp: w }, P);
+      return e.mergeEvaluated(T, codegen_1.Name), P;
     }
-    function w() {
-      var R;
-      const v = {}, T = g(s);
+    function v() {
+      var w;
+      const P = {}, T = g(s);
       let $ = !0;
       for (let I = 0; I < i.length; I++) {
         let D = i[I];
         D != null && D.$ref && !(0, util_1.schemaHasRulesButRef)(D, o.self.RULES) && (D = compile_1.resolveRef.call(o.self, o.schemaEnv.root, o.baseId, D == null ? void 0 : D.$ref), D instanceof compile_1.SchemaEnv && (D = D.schema));
-        const P = (R = D == null ? void 0 : D.properties) === null || R === void 0 ? void 0 : R[l];
-        if (typeof P != "object")
+        const b = (w = D == null ? void 0 : D.properties) === null || w === void 0 ? void 0 : w[l];
+        if (typeof b != "object")
           throw new Error(`discriminator: oneOf subschemas (or referenced schemas) must have "properties/${l}"`);
-        $ = $ && (T || g(D)), k(P, I);
+        $ = $ && (T || g(D)), k(b, I);
       }
       if (!$)
         throw new Error(`discriminator: "${l}" must be required`);
-      return v;
+      return P;
       function g({ required: I }) {
         return Array.isArray(I) && I.includes(l);
       }
@@ -7704,15 +7242,15 @@ const codegen_1 = codegen, types_1 = types, compile_1 = compile, util_1 = util,
         if (I.const)
           C(I.const, D);
         else if (I.enum)
-          for (const P of I.enum)
-            C(P, D);
+          for (const b of I.enum)
+            C(b, D);
         else
           throw new Error(`discriminator: "properties/${l}" must have "const" or "enum"`);
       }
       function C(I, D) {
-        if (typeof I != "string" || I in v)
+        if (typeof I != "string" || I in P)
           throw new Error(`discriminator: "${l}" values must be unique strings`);
-        v[I] = D;
+        P[I] = D;
       }
     }
   }
@@ -7964,13 +7502,13 @@ const $schema$1 = "http://json-schema.org/draft-07/schema#", $id = "http://json-
   const r = core$2, n = draft7, s = discriminator, o = require$$3, i = ["/properties"], l = "http://json-schema.org/draft-07/schema";
   class p extends r.default {
     _addVocabularies() {
-      super._addVocabularies(), n.default.forEach((v) => this.addVocabulary(v)), this.opts.discriminator && this.addKeyword(s.default);
+      super._addVocabularies(), n.default.forEach((P) => this.addVocabulary(P)), this.opts.discriminator && this.addKeyword(s.default);
     }
     _addDefaultMetaSchema() {
       if (super._addDefaultMetaSchema(), !this.opts.meta)
         return;
-      const v = this.opts.$data ? this.$dataMetaSchema(o, i) : o;
-      this.addMetaSchema(v, l, !1), this.refs["http://json-schema.org/schema"] = l;
+      const P = this.opts.$data ? this.$dataMetaSchema(o, i) : o;
+      this.addMetaSchema(P, l, !1), this.refs["http://json-schema.org/schema"] = l;
     }
     defaultMeta() {
       return this.opts.defaultMeta = super.defaultMeta() || (this.getSchema(l) ? l : void 0);
@@ -7995,13 +7533,13 @@ const $schema$1 = "http://json-schema.org/draft-07/schema#", $id = "http://json-
   } }), Object.defineProperty(t, "CodeGen", { enumerable: !0, get: function() {
     return u.CodeGen;
   } });
-  var m = validation_error;
+  var _ = validation_error;
   Object.defineProperty(t, "ValidationError", { enumerable: !0, get: function() {
-    return m.default;
+    return _.default;
   } });
-  var w = ref_error;
+  var v = ref_error;
   Object.defineProperty(t, "MissingRefError", { enumerable: !0, get: function() {
-    return w.default;
+    return v.default;
   } });
 })(ajv$1, ajv$1.exports);
 var ajvExports = ajv$1.exports;
@@ -8409,55 +7947,6 @@ const Ajv = /* @__PURE__ */ getDefaultExportFromCjs(ajvExports), $schema = "http
           "themeFolderName"
         ]
       },
-      {
-        type: "object",
-        additionalProperties: !1,
-        properties: {
-          progress: {
-            type: "object",
-            properties: {
-              weight: {
-                type: "number"
-              },
-              caption: {
-                type: "string"
-              }
-            },
-            additionalProperties: !1
-          },
-          step: {
-            type: "string",
-            const: "applyWordPressPatches"
-          },
-          siteUrl: {
-            type: "string"
-          },
-          wordpressPath: {
-            type: "string"
-          },
-          addPhpInfo: {
-            type: "boolean"
-          },
-          patchSecrets: {
-            type: "boolean"
-          },
-          disableSiteHealth: {
-            type: "boolean"
-          },
-          disableWpNewBlogNotification: {
-            type: "boolean"
-          },
-          prepareForRunningInsideWebBrowser: {
-            type: "boolean"
-          },
-          addFetchNetworkTransport: {
-            type: "boolean"
-          }
-        },
-        required: [
-          "step"
-        ]
-      },
       {
         type: "object",
         additionalProperties: !1,
@@ -9489,7 +8978,7 @@ function compileBlueprint(e, {
   onStepCompleted: n = () => {
   }
 } = {}) {
-  var d, u, m;
+  var d, u, _;
   if (e = {
     ...e,
     steps: (e.steps || []).filter(isStepDefinition)
@@ -9500,17 +8989,17 @@ function compileBlueprint(e, {
     step: "setSiteOptions",
     options: e.siteOptions
   }), e.plugins) {
-    const w = e.plugins.map((R) => typeof R == "string" ? R.startsWith("https://") ? {
+    const v = e.plugins.map((w) => typeof w == "string" ? w.startsWith("https://") ? {
       resource: "url",
-      url: R
+      url: w
     } : {
       resource: "wordpress.org/plugins",
-      slug: R
-    } : R).map((R) => ({
+      slug: w
+    } : w).map((w) => ({
       step: "installPlugin",
-      pluginZipFile: R
+      pluginZipFile: w
     }));
-    e.steps.unshift(...w);
+    e.steps.unshift(...v);
   }
   e.login && e.steps.push({
     step: "login",
@@ -9518,19 +9007,19 @@ function compileBlueprint(e, {
   });
   const { valid: s, errors: o } = validateBlueprint(e);
   if (!s) {
-    const w = new Error(
+    const v = new Error(
       `Invalid blueprint: ${o[0].message} at ${o[0].instancePath}`
     );
-    throw w.errors = o, w;
+    throw v.errors = o, v;
   }
   const i = e.steps || [], l = i.reduce(
-    (w, R) => {
-      var v;
-      return w + (((v = R.progress) == null ? void 0 : v.weight) || 1);
+    (v, w) => {
+      var P;
+      return v + (((P = w.progress) == null ? void 0 : P.weight) || 1);
     },
     0
   ), p = i.map(
-    (w) => compileStep(w, {
+    (v) => compileStep(v, {
       semaphore: r,
       rootProgressTracker: t,
       totalProgressWeight: l
@@ -9551,20 +9040,20 @@ function compileBlueprint(e, {
     ),
     features: {
       // Disable networking by default
-      networking: ((m = e.features) == null ? void 0 : m.networking) ?? !1
+      networking: ((_ = e.features) == null ? void 0 : _.networking) ?? !1
     },
-    run: async (w) => {
+    run: async (v) => {
       try {
-        for (const { resources: R } of p)
-          for (const v of R)
-            v.setPlayground(w), v.isAsync && v.resolve();
-        for (const [R, { run: v, step: T }] of Object.entries(p))
+        for (const { resources: w } of p)
+          for (const P of w)
+            P.setPlayground(v), P.isAsync && P.resolve();
+        for (const [w, { run: P, step: T }] of Object.entries(p))
           try {
-            const $ = await v(w);
+            const $ = await P(v);
             n($, T);
           } catch ($) {
             throw new Error(
-              `Error when executing the blueprint step #${R} (${JSON.stringify(
+              `Error when executing the blueprint step #${w} (${JSON.stringify(
                 T
               )}). Inspect the cause of this error for more details`,
               {
@@ -9574,7 +9063,7 @@ function compileBlueprint(e, {
           }
       } finally {
         try {
-          await w.goTo(
+          await v.goTo(
             e.landingPage || "/"
           );
         } catch {
@@ -9626,31 +9115,31 @@ function compileStep(e, {
   const s = r.stage(
     (((u = e.progress) == null ? void 0 : u.weight) || 1) / n
   ), o = {};
-  for (const m of Object.keys(e)) {
-    let w = e[m];
-    isFileReference(w) && (w = Resource.create(w, {
+  for (const _ of Object.keys(e)) {
+    let v = e[_];
+    isFileReference(v) && (v = Resource.create(v, {
       semaphore: t
-    })), o[m] = w;
+    })), o[_] = v;
   }
-  const i = async (m) => {
-    var w;
+  const i = async (_) => {
+    var v;
     try {
       return s.fillSlowly(), await stepHandlers[e.step](
-        m,
+        _,
         await resolveArguments(o),
         {
           tracker: s,
-          initialCaption: (w = e.progress) == null ? void 0 : w.caption
+          initialCaption: (v = e.progress) == null ? void 0 : v.caption
         }
       );
     } finally {
       s.finish();
     }
   }, l = getResources(o), p = getResources(o).filter(
-    (m) => m.isAsync
+    (_) => _.isAsync
   ), d = 1 / (p.length + 1);
-  for (const m of p)
-    m.progress = s.stage(d);
+  for (const _ of p)
+    _.progress = s.stage(d);
   return { run: i, step: e, resources: l };
 }
 function getResources(e) {
@@ -9725,27 +9214,27 @@ function expose(e, t = globalThis, r = ["*"]) {
     const { id: o, type: i, path: l } = Object.assign({ path: [] }, s.data), p = (s.data.argumentList || []).map(fromWireValue);
     let d;
     try {
-      const u = l.slice(0, -1).reduce((w, R) => w[R], e), m = l.reduce((w, R) => w[R], e);
+      const u = l.slice(0, -1).reduce((v, w) => v[w], e), _ = l.reduce((v, w) => v[w], e);
       switch (i) {
         case "GET":
-          d = m;
+          d = _;
           break;
         case "SET":
           u[l.slice(-1)[0]] = fromWireValue(s.data.value), d = !0;
           break;
         case "APPLY":
-          d = m.apply(u, p);
+          d = _.apply(u, p);
           break;
         case "CONSTRUCT":
           {
-            const w = new m(...p);
-            d = proxy(w);
+            const v = new _(...p);
+            d = proxy(v);
           }
           break;
         case "ENDPOINT":
           {
-            const { port1: w, port2: R } = new MessageChannel();
-            expose(e, R), d = transfer(w, [w]);
+            const { port1: v, port2: w } = new MessageChannel();
+            expose(e, w), d = transfer(v, [v]);
           }
           break;
         case "RELEASE":
@@ -9758,14 +9247,14 @@ function expose(e, t = globalThis, r = ["*"]) {
       d = { value: u, [throwMarker]: 0 };
     }
     Promise.resolve(d).catch((u) => ({ value: u, [throwMarker]: 0 })).then((u) => {
-      const [m, w] = toWireValue(u);
-      t.postMessage(Object.assign(Object.assign({}, m), { id: o }), w), i === "RELEASE" && (t.removeEventListener("message", n), closeEndPoint(t), finalizer in e && typeof e[finalizer] == "function" && e[finalizer]());
+      const [_, v] = toWireValue(u);
+      t.postMessage(Object.assign(Object.assign({}, _), { id: o }), v), i === "RELEASE" && (t.removeEventListener("message", n), closeEndPoint(t), finalizer in e && typeof e[finalizer] == "function" && e[finalizer]());
     }).catch((u) => {
-      const [m, w] = toWireValue({
+      const [_, v] = toWireValue({
         value: new TypeError("Unserializable return value"),
         [throwMarker]: 0
       });
-      t.postMessage(Object.assign(Object.assign({}, m), { id: o }), w);
+      t.postMessage(Object.assign(Object.assign({}, _), { id: o }), v);
     });
   }), t.start && t.start();
 }
@@ -9841,7 +9330,7 @@ function createProxy(e, t = [], r = function() {
       const [d, u] = processArguments(l);
       return requestResponseMessage(e, {
         type: "APPLY",
-        path: t.map((m) => m.toString()),
+        path: t.map((_) => _.toString()),
         argumentList: d
       }, u).then(fromWireValue);
     },
@@ -10068,7 +9557,6 @@ export {
   SupportedPHPVersionsList,
   activatePlugin,
   activateTheme,
-  applyWordPressPatches,
   compileBlueprint,
   connectPlayground,
   cp,