@wp-playground/blueprints 0.6.0 → 0.6.1

package/index.js

@@ -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, i = phpVars({ docroot: s, sqlFilename: n }), a = await e.run({
+    code: `<?php
+		require_once ${i.docroot} . '/wp-load.php';
+
+		$handle = fopen(${i.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 }), a;
+}, 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, i = phpVars({ docroot: s, sqlFilename: n }), a = await e.run({
-    code: `<?php
-		require_once ${i.docroot} . '/wp-load.php';
-
-		$handle = fopen(${i.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 }), a;
-}, 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 i, a, 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 S;
+  var E;
   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 T = `The current host is ${t.host}, but WordPress multisites do not support custom ports.`;
-    throw t.hostname === "localhost" && (T += " For development, you can set up a playground.test domain using the instructions at https://wordpress.github.io/wordpress-playground/contributing/code."), new Error(T);
+    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);
   }
   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 = (S = (await request(e, {
+  })).json, p = (E = (await request(e, {
     request: {
       url: "/wp-admin/network.php"
     }
   })).text.match(
     /name="_wpnonce"\s+value="([^"]+)"/
-  )) == null ? void 0 : S[1], d = await request(e, {
+  )) == null ? void 0 : E[1], u = await request(e, {
     request: {
       url: "/wp-admin/network.php",
       method: "POST",
@@ -1275,13 +804,13 @@ echo json_encode($deactivated_plugins);
       })
     }
   });
-  if (d.httpStatusCode !== 200)
+  if (u.httpStatusCode !== 200)
     throw console.warn("WordPress response was", {
-      response: d,
-      text: d.text,
-      headers: d.headers
+      response: u,
+      text: u.text,
+      headers: u.headers
     }), new Error(
-      `Failed to enable multisite. Response code was ${d.httpStatusCode}`
+      `Failed to enable multisite. Response code was ${u.httpStatusCode}`
     );
   await defineWpConfigConsts(e, {
     consts: {
@@ -1294,23 +823,23 @@ echo json_encode($deactivated_plugins);
       PATH_CURRENT_SITE: r
     }
   });
-  const u = new URL(await e.absoluteUrl), g = isURLScoped(u) ? "scope:" + getURLScope(u) : null;
+  const d = new URL(await e.absoluteUrl), $ = isURLScoped(d) ? "scope:" + getURLScope(d) : null;
   await e.writeFile(
     joinPaths(s, "/wp-content/sunrise.php"),
     `<?php
 	if ( !defined( 'BLOG_ID_CURRENT_SITE' ) ) {
 		define( 'BLOG_ID_CURRENT_SITE', 1 );
 	}
-	$folder = ${phpVar(g)};
+	$folder = ${phpVar($)};
 	if ($folder && strpos($_SERVER['REQUEST_URI'],"/$folder") === false) {
-		$_SERVER['HTTP_HOST'] = ${phpVar(u.hostname)};
+		$_SERVER['HTTP_HOST'] = ${phpVar(d.hostname)};
 		$_SERVER['REQUEST_URI'] = "/$folder/" . ltrim($_SERVER['REQUEST_URI'], '/');
 	}
 `
   ), await login(e, {});
-  for (const T of a)
+  for (const R of a)
     await activatePlugin(e, {
-      pluginPath: T
+      pluginPath: R
     });
 };
 function jsonToUrlEncoded(e) {
@@ -1357,8 +886,8 @@ const cp = async (e, { fromPath: t, toPath: r }) => {
   a.fetch_attachments = "1";
   for (const p in a)
     if (p.startsWith("user_map[")) {
-      const d = "user_new[" + p.slice(9, -1) + "]";
-      a[d] = "1";
+      const u = "user_new[" + p.slice(9, -1) + "]";
+      a[u] = "1";
     }
   await e.request({
     url: i.action,
@@ -1493,14 +1022,14 @@ const tmpPath = "/tmp/file.zip", unzip = async (e, { zipFile: t, zipPath: r, ext
     extractToPath: s
   }), s = joinPaths(s, r);
   const i = joinPaths(s, "wp-content"), a = joinPaths(n, "wp-content");
-  for (const u of wpContentFilesExcludedFromExport) {
-    const g = joinPaths(
+  for (const d of wpContentFilesExcludedFromExport) {
+    const $ = joinPaths(
       i,
-      u
+      d
     );
-    await removePath(e, g);
-    const S = joinPaths(a, u);
-    await e.fileExists(S) && (await e.mkdir(dirname(g)), await e.mv(S, g));
+    await removePath(e, $);
+    const E = joinPaths(a, d);
+    await e.fileExists(E) && (await e.mkdir(dirname($)), await e.mv(E, $));
   }
   const l = joinPaths(
     s,
@@ -1512,20 +1041,22 @@ const tmpPath = "/tmp/file.zip", unzip = async (e, { zipFile: t, zipPath: r, ext
     l
   );
   const p = await e.listFiles(s);
-  for (const u of p)
-    await removePath(e, joinPaths(n, u)), await e.mv(
-      joinPaths(s, u),
-      joinPaths(n, u)
+  for (const d of p)
+    await removePath(e, joinPaths(n, d)), await e.mv(
+      joinPaths(s, d),
+      joinPaths(n, d)
     );
-  await e.rmdir(s);
-  const d = phpVar(
+  await e.rmdir(s), await defineSiteUrl(e, {
+    siteUrl: await e.absoluteUrl
+  });
+  const u = phpVar(
     joinPaths(n, "wp-admin", "upgrade.php")
   );
   await e.run({
     throwOnError: !0,
     code: `<?php
             $_GET['step'] = 'upgrade_db';
-            require ${d};
+            require ${u};
             `
   });
 };
@@ -1557,14 +1088,14 @@ async function installAsset(e, { targetPath: t, zipFile: r }) {
     let p = await e.listFiles(l, {
       prependPath: !0
     });
-    p = p.filter((T) => !T.endsWith("/__MACOSX"));
-    const d = p.length === 1 && await e.isDir(p[0]);
-    let u, g = "";
-    d ? (g = p[0], u = p[0].split("/").pop()) : (g = l, u = s);
-    const S = `${t}/${u}`;
-    return await e.mv(g, S), {
-      assetFolderPath: S,
-      assetFolderName: u
+    p = p.filter((R) => !R.endsWith("/__MACOSX"));
+    const u = p.length === 1 && await e.isDir(p[0]);
+    let d, $ = "";
+    u ? ($ = p[0], d = p[0].split("/").pop()) : ($ = l, d = s);
+    const E = `${t}/${d}`;
+    return await e.mv($, E), {
+      assetFolderPath: E,
+      assetFolderName: d
     };
   } finally {
     await e.rmdir(a, {
@@ -1653,7 +1184,6 @@ const installPlugin = async (e, { pluginZipFile: t, options: r = {} }, n) => {
   __proto__: null,
   activatePlugin,
   activateTheme,
-  applyWordPressPatches,
   cp,
   defineSiteUrl,
   defineWpConfigConsts,
@@ -1704,12 +1234,12 @@ function cloneResponseMonitorProgress(e, t) {
         let l = 0;
         for (; ; )
           try {
-            const { done: p, value: d } = await a.read();
-            if (d && (l += d.byteLength), p) {
+            const { done: p, value: u } = await a.read();
+            if (u && (l += u.byteLength), p) {
               s(l, l), i.close();
               break;
             } else
-              s(l, n), i.enqueue(d);
+              s(l, n), i.enqueue(u);
           } catch (p) {
             console.error({ e: p }), i.error(p);
             break;
@@ -2106,7 +1636,7 @@ const SupportedPHPVersions = [
 ], SupportedPHPExtensionBundles = {
   "kitchen-sink": SupportedPHPExtensionsList
 };
-var De, Be;
+var De, Ge;
 class PHPBrowser {
   /**
    * @param  server - The PHP server to browse.
@@ -2114,8 +1644,8 @@ class PHPBrowser {
    */
   constructor(t, r = {}) {
     Z(this, De, void 0);
-    Z(this, Be, void 0);
-    this.requestHandler = t, te(this, De, {}), te(this, Be, {
+    Z(this, Ge, void 0);
+    this.requestHandler = t, te(this, De, {}), 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("; ");
   }
 }
-De = new WeakMap(), Be = new WeakMap();
+De = 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, Ae, Ke, ve, Je, Ze, mt, Wt, _t, xt, gt, Bt;
+var Se, Ke, dt, Ae, Je, ve, Ze, Fe, mt, xt, _t, Wt, $t, Bt;
 class PHPRequestHandler {
   /**
    * @param  php    - The PHP instance.
@@ -2235,30 +1765,30 @@ class PHPRequestHandler {
      * @throws {Error} If the requested path doesn't exist.
      * @returns The resolved filesystem path.
      */
-    Z(this, gt);
+    Z(this, $t);
     Z(this, Se, void 0);
-    Z(this, Ge, void 0);
+    Z(this, Ke, void 0);
     Z(this, dt, void 0);
     Z(this, Ae, void 0);
-    Z(this, Ke, void 0);
-    Z(this, ve, void 0);
     Z(this, Je, void 0);
+    Z(this, ve, void 0);
     Z(this, Ze, void 0);
-    te(this, Ze, new Semaphore({ concurrency: 1 }));
+    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 i = new URL(s);
-    te(this, dt, i.hostname), te(this, Ae, i.port ? Number(i.port) : i.protocol === "https:" ? 443 : 80), te(this, Ge, (i.protocol || "").replace(":", ""));
+    te(this, dt, i.hostname), te(this, Ae, i.port ? Number(i.port) : i.protocol === "https:" ? 443 : 80), te(this, Ke, (i.protocol || "").replace(":", ""));
     const a = H(this, Ae) !== 443 && H(this, Ae) !== 80;
-    te(this, Ke, [
+    te(this, Je, [
       H(this, dt),
       a ? `:${H(this, Ae)}` : ""
-    ].join("")), te(this, ve, i.pathname.replace(/\/+$/, "")), te(this, Je, [
-      `${H(this, Ge)}://`,
-      H(this, Ke),
+    ].join("")), te(this, ve, i.pathname.replace(/\/+$/, "")), te(this, Ze, [
+      `${H(this, Ke)}://`,
+      H(this, Je),
       H(this, ve)
     ].join(""));
   }
@@ -2272,11 +1802,11 @@ class PHPRequestHandler {
     return r.pathname.startsWith(H(this, ve)) && (r.pathname = r.pathname.slice(H(this, ve).length)), toRelativeUrl(r);
   }
   get isRequestRunning() {
-    return H(this, Ze).running > 0;
+    return H(this, Fe).running > 0;
   }
   /** @inheritDoc */
   get absoluteUrl() {
-    return H(this, Je);
+    return H(this, Ze);
   }
   /** @inheritDoc */
   get documentRoot() {
@@ -2291,10 +1821,10 @@ class PHPRequestHandler {
       n.pathname,
       H(this, ve)
     ), i = `${H(this, Se)}${s}`;
-    return seemsLikeAPHPRequestHandlerPath(i) ? await ce(this, _t, xt).call(this, t, n) : ce(this, mt, Wt).call(this, i);
+    return seemsLikeAPHPRequestHandlerPath(i) ? await ce(this, _t, Wt).call(this, t, n) : ce(this, mt, xt).call(this, i);
   }
 }
-Se = new WeakMap(), Ge = new WeakMap(), dt = new WeakMap(), Ae = new WeakMap(), Ke = new WeakMap(), ve = new WeakMap(), Je = new WeakMap(), Ze = new WeakMap(), mt = new WeakSet(), Wt = function(t) {
+Se = new WeakMap(), Ke = new WeakMap(), dt = new WeakMap(), Ae = 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,
@@ -2319,49 +1849,57 @@ Se = new WeakMap(), Ge = new WeakMap(), dt = new WeakMap(), Ae = new WeakMap(),
     },
     r
   );
-}, _t = new WeakSet(), xt = async function(t, r) {
-  var s, i;
-  const n = await H(this, Ze).acquire();
+}, _t = new WeakSet(), Wt = async function(t, r) {
+  var s, i, a;
+  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 a = "GET";
-    const l = {
-      host: H(this, Ke),
+    let l = "GET";
+    const p = {
+      host: H(this, Je),
       ...normalizeHeaders(t.headers || {})
-    }, p = [];
+    }, u = [];
     if (t.files && Object.keys(t.files).length) {
-      a = "POST";
-      for (const g in t.files) {
-        const S = t.files[g];
-        p.push({
-          key: g,
-          name: S.name,
-          type: S.type,
-          data: new Uint8Array(await S.arrayBuffer())
+      l = "POST";
+      for (const E in t.files) {
+        const R = t.files[E];
+        u.push({
+          key: E,
+          name: R.name,
+          type: R.type,
+          data: new Uint8Array(await R.arrayBuffer())
         });
       }
-      (s = l["content-type"]) != null && s.startsWith("multipart/form-data") && (t.formData = parseMultipartFormDataString(
+      (i = p["content-type"]) != null && i.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 ? (a = "POST", l["content-type"] = l["content-type"] || "application/x-www-form-urlencoded", d = new URLSearchParams(
+    t.formData !== void 0 ? (l = "POST", p["content-type"] = p["content-type"] || "application/x-www-form-urlencoded", d = new URLSearchParams(
       t.formData
     ).toString()) : d = t.body;
-    let u;
+    let $;
     try {
-      let g = r.pathname;
-      if ((i = t.headers) != null && i["x-rewrite-url"])
+      let E = r.pathname;
+      if ((a = t.headers) != null && a["x-rewrite-url"])
         try {
-          g = new URL(
+          E = new URL(
             t.headers["x-rewrite-url"]
           ).pathname;
         } catch {
         }
-      u = ce(this, gt, Bt).call(this, g);
+      $ = ce(this, $t, Bt).call(this, E);
     } catch {
       return new PHPResponse(
         404,
@@ -2374,17 +1912,17 @@ Se = new WeakMap(), Ge = new WeakMap(), dt = new WeakMap(), Ae = new WeakMap(),
         toRelativeUrl(r),
         H(this, ve)
       ),
-      protocol: H(this, Ge),
-      method: t.method || a,
+      protocol: H(this, Ke),
+      method: t.method || l,
       body: d,
-      fileInfos: p,
-      scriptPath: u,
-      headers: l
+      fileInfos: u,
+      scriptPath: $,
+      headers: p
     });
   } finally {
     n();
   }
-}, gt = new WeakSet(), Bt = function(t) {
+}, $t = new WeakSet(), Bt = function(t) {
   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}`;
@@ -2400,10 +1938,10 @@ function parseMultipartFormDataString(e) {
   return s.shift(), s.pop(), s.forEach((i) => {
     const a = i.indexOf(`\r
 \r
-`), l = i.substring(0, a).trim(), p = i.substring(a + 4).trim(), d = l.match(/name="([^"]+)"/);
-    if (d) {
-      const u = d[1];
-      t[u] = p;
+`), l = i.substring(0, a).trim(), p = i.substring(a + 4).trim(), u = l.match(/name="([^"]+)"/);
+    if (u) {
+      const d = u[1];
+      t[d] = p;
     }
   }), t;
 }
@@ -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 a[0] == "string" ? a[0] : null, g = u !== null ? e.replaceAll("{path}", u) : e;
-          throw new Error(`${g}: ${d}`, {
+          const u = FileErrorCodes[p], d = typeof a[0] == "string" ? a[0] : null, $ = d !== null ? e.replaceAll("{path}", d) : e;
+          throw new Error(`${$}: ${u}`, {
             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, 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, Ot, sr;
+var Me, Qe, Ye, Pe, Re, Te, be, Xe, gt, 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,7 +2121,7 @@ class BasePHP {
    * @param  serverOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(e, t) {
-    Z(this, $t);
+    Z(this, gt);
     Z(this, yt);
     Z(this, vt);
     Z(this, wt);
@@ -2603,8 +2141,8 @@ class BasePHP {
      */
     Z(this, Tt);
     Z(this, kt);
-    Z(this, Ot);
-    Z(this, Fe, void 0);
+    Z(this, Ct);
+    Z(this, Me, void 0);
     Z(this, Qe, void 0);
     Z(this, Ye, void 0);
     Z(this, Pe, void 0);
@@ -2612,7 +2150,7 @@ class BasePHP {
     Z(this, Te, void 0);
     Z(this, be, void 0);
     Z(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(
+    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)
     ));
   }
@@ -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,13 +2255,13 @@ 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, vt, Jt).call(this, e.relativeUri || ""), ce(this, Pt, Qt).call(this, e.method || "GET");
+      H(this, Pe) || (ce(this, gt, 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, 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 a of e.fileInfos)
           ce(this, Tt, rr).call(this, a);
       typeof e.code == "string" && ce(this, kt, nr).call(this, " ?>" + e.code), ce(this, Rt, tr).call(this);
-      const i = await ce(this, Ot, sr).call(this);
+      const i = await ce(this, Ct, sr).call(this);
       if (e.throwOnError && i.exitCode !== 0) {
         const a = {
           stdout: i.text,
@@ -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(), 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() {
+Me = new WeakMap(), Qe = new WeakMap(), Ye = new WeakMap(), Pe = new WeakMap(), Re = new WeakMap(), Te = new WeakMap(), be = new WeakMap(), Xe = new WeakMap(), gt = 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(), Qe = 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(`
 `) + `
 
 `;
@@ -3016,15 +2554,15 @@ Fe = new WeakMap(), Qe = new WeakMap(), Ye = new WeakMap(), Pe = new WeakMap(),
     [STRING],
     [e]
   );
-}, Ot = new WeakSet(), sr = async function() {
+}, Ct = new WeakSet(), sr = async function() {
   var s;
   let e, t;
   try {
     e = await new Promise((i, a) => {
       var p;
-      t = (d) => {
-        const u = new Error("Rethrown");
-        u.cause = d.error, u.betterMessage = d.message, a(u);
+      t = (u) => {
+        const d = new Error("Rethrown");
+        d.cause = u.error, d.betterMessage = u.message, a(d);
       }, (p = H(this, Re)) == null || p.addEventListener(
         "error",
         t
@@ -3039,8 +2577,8 @@ Fe = new WeakMap(), Qe = new WeakMap(), Ye = new WeakMap(), Pe = new WeakMap(),
       return l instanceof Promise ? l.then(i, a) : i(l);
     });
   } catch (i) {
-    for (const d in this)
-      typeof this[d] == "function" && (this[d] = () => {
+    for (const u in this)
+      typeof this[u] == "function" && (this[u] = () => {
         throw new Error(
           "PHP runtime has crashed – see the earlier error for details."
         );
@@ -3384,42 +2922,42 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
     }
     get str() {
       var k;
-      return (k = this._str) !== null && k !== void 0 ? k : this._str = this._items.reduce((O, I) => `${O}${I}`, "");
+      return (k = this._str) !== null && k !== void 0 ? k : this._str = this._items.reduce((C, I) => `${C}${I}`, "");
     }
     get names() {
       var k;
-      return (k = this._names) !== null && k !== void 0 ? k : this._names = this._items.reduce((O, I) => (I instanceof r && (O[I.str] = (O[I.str] || 0) + 1), O), {});
+      return (k = this._names) !== null && k !== void 0 ? k : this._names = this._items.reduce((C, I) => (I instanceof r && (C[I.str] = (C[I.str] || 0) + 1), C), {});
     }
   }
   e._Code = n, e.nil = new n("");
   function s(_, ...k) {
-    const O = [_[0]];
+    const C = [_[0]];
     let I = 0;
     for (; I < k.length; )
-      l(O, k[I]), O.push(_[++I]);
-    return new n(O);
+      l(C, k[I]), C.push(_[++I]);
+    return new n(C);
   }
   e._ = s;
   const i = new n("+");
   function a(_, ...k) {
-    const O = [T(_[0])];
+    const C = [R(_[0])];
     let I = 0;
     for (; I < k.length; )
-      O.push(i), l(O, k[I]), O.push(i, T(_[++I]));
-    return p(O), new n(O);
+      C.push(i), l(C, k[I]), C.push(i, R(_[++I]));
+    return p(C), new n(C);
   }
   e.str = a;
   function l(_, k) {
-    k instanceof n ? _.push(...k._items) : k instanceof r ? _.push(k) : _.push(g(k));
+    k instanceof n ? _.push(...k._items) : k instanceof r ? _.push(k) : _.push($(k));
   }
   e.addCodeArg = l;
   function p(_) {
     let k = 1;
     for (; k < _.length - 1; ) {
       if (_[k] === i) {
-        const O = d(_[k - 1], _[k + 1]);
-        if (O !== void 0) {
-          _.splice(k - 1, 3, O);
+        const C = u(_[k - 1], _[k + 1]);
+        if (C !== void 0) {
+          _.splice(k - 1, 3, C);
           continue;
         }
         _[k++] = "+";
@@ -3427,7 +2965,7 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
       k++;
     }
   }
-  function d(_, k) {
+  function u(_, k) {
     if (k === '""')
       return _;
     if (_ === '""')
@@ -3437,43 +2975,43 @@ var ajv$1 = { exports: {} }, core$2 = {}, validate = {}, boolSchema = {}, errors
     if (typeof k == "string" && k[0] === '"' && !(_ instanceof r))
       return `"${_}${k.slice(1)}`;
   }
-  function u(_, k) {
+  function d(_, k) {
     return k.emptyStr() ? _ : _.emptyStr() ? k : a`${_}${k}`;
   }
-  e.strConcat = u;
-  function g(_) {
-    return typeof _ == "number" || typeof _ == "boolean" || _ === null ? _ : T(Array.isArray(_) ? _.join(",") : _);
+  e.strConcat = d;
+  function $(_) {
+    return typeof _ == "number" || typeof _ == "boolean" || _ === null ? _ : R(Array.isArray(_) ? _.join(",") : _);
   }
-  function S(_) {
-    return new n(T(_));
+  function E(_) {
+    return new n(R(_));
   }
-  e.stringify = S;
-  function T(_) {
+  e.stringify = E;
+  function R(_) {
     return JSON.stringify(_).replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
   }
-  e.safeStringify = T;
+  e.safeStringify = R;
   function v(_) {
     return typeof _ == "string" && e.IDENTIFIER.test(_) ? new n(`.${_}`) : s`[${_}]`;
   }
   e.getProperty = v;
-  function R(_) {
+  function T(_) {
     if (typeof _ == "string" && e.IDENTIFIER.test(_))
       return new n(`${_}`);
     throw new Error(`CodeGen: invalid export name: ${_}, use explicit $id name mapping`);
   }
-  e.getEsmExportName = R;
-  function $(_) {
+  e.getEsmExportName = T;
+  function g(_) {
     return new n(_.toString());
   }
-  e.regexpCode = $;
+  e.regexpCode = g;
 })(code$1);
 var scope = {};
 (function(e) {
   Object.defineProperty(e, "__esModule", { value: !0 }), e.ValueScope = e.ValueScopeName = e.Scope = e.varKinds = e.UsedValueState = void 0;
   const t = code$1;
   class r extends Error {
-    constructor(d) {
-      super(`CodeGen: "code" for ${d} not defined`), this.value = d.value;
+    constructor(u) {
+      super(`CodeGen: "code" for ${u} not defined`), this.value = u.value;
     }
   }
   var n;
@@ -3485,105 +3023,105 @@ var scope = {};
     var: new t.Name("var")
   };
   class s {
-    constructor({ prefixes: d, parent: u } = {}) {
-      this._names = {}, this._prefixes = d, this._parent = u;
+    constructor({ prefixes: u, parent: d } = {}) {
+      this._names = {}, this._prefixes = u, this._parent = d;
     }
-    toName(d) {
-      return d instanceof t.Name ? d : this.name(d);
+    toName(u) {
+      return u instanceof t.Name ? u : this.name(u);
     }
-    name(d) {
-      return new t.Name(this._newName(d));
+    name(u) {
+      return new t.Name(this._newName(u));
     }
-    _newName(d) {
-      const u = this._names[d] || this._nameGroup(d);
-      return `${d}${u.index++}`;
+    _newName(u) {
+      const d = this._names[u] || this._nameGroup(u);
+      return `${u}${d.index++}`;
     }
-    _nameGroup(d) {
-      var u, g;
-      if (!((g = (u = this._parent) === null || u === void 0 ? void 0 : u._prefixes) === null || g === void 0) && g.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 };
+    _nameGroup(u) {
+      var d, $;
+      if (!(($ = (d = this._parent) === null || d === void 0 ? void 0 : d._prefixes) === null || $ === void 0) && $.has(u) || this._prefixes && !this._prefixes.has(u))
+        throw new Error(`CodeGen: prefix "${u}" is not allowed in this scope`);
+      return this._names[u] = { prefix: u, index: 0 };
     }
   }
   e.Scope = s;
   class i extends t.Name {
-    constructor(d, u) {
-      super(u), this.prefix = d;
+    constructor(u, d) {
+      super(d), this.prefix = u;
     }
-    setValue(d, { property: u, itemIndex: g }) {
-      this.value = d, this.scopePath = (0, t._)`.${new t.Name(u)}[${g}]`;
+    setValue(u, { property: d, itemIndex: $ }) {
+      this.value = u, this.scopePath = (0, t._)`.${new t.Name(d)}[${$}]`;
     }
   }
   e.ValueScopeName = i;
   const a = (0, t._)`\n`;
   class l extends s {
-    constructor(d) {
-      super(d), this._values = {}, this._scope = d.scope, this.opts = { ...d, _n: d.lines ? a : t.nil };
+    constructor(u) {
+      super(u), this._values = {}, this._scope = u.scope, this.opts = { ...u, _n: u.lines ? a : t.nil };
     }
     get() {
       return this._scope;
     }
-    name(d) {
-      return new i(d, this._newName(d));
+    name(u) {
+      return new i(u, this._newName(u));
     }
-    value(d, u) {
-      var g;
-      if (u.ref === void 0)
+    value(u, d) {
+      var $;
+      if (d.ref === void 0)
         throw new Error("CodeGen: ref must be passed in value");
-      const S = this.toName(d), { prefix: T } = S, v = (g = u.key) !== null && g !== void 0 ? g : u.ref;
-      let R = this._values[T];
-      if (R) {
-        const k = R.get(v);
+      const E = this.toName(u), { prefix: R } = E, v = ($ = d.key) !== null && $ !== void 0 ? $ : d.ref;
+      let T = this._values[R];
+      if (T) {
+        const k = T.get(v);
         if (k)
           return k;
       } else
-        R = this._values[T] = /* @__PURE__ */ new Map();
-      R.set(v, S);
-      const $ = this._scope[T] || (this._scope[T] = []), _ = $.length;
-      return $[_] = u.ref, S.setValue(u, { property: T, itemIndex: _ }), S;
-    }
-    getValue(d, u) {
-      const g = this._values[d];
-      if (g)
-        return g.get(u);
-    }
-    scopeRefs(d, u = this._values) {
-      return this._reduceValues(u, (g) => {
-        if (g.scopePath === void 0)
-          throw new Error(`CodeGen: name "${g}" has no value`);
-        return (0, t._)`${d}${g.scopePath}`;
+        T = this._values[R] = /* @__PURE__ */ new Map();
+      T.set(v, E);
+      const g = this._scope[R] || (this._scope[R] = []), _ = g.length;
+      return g[_] = d.ref, E.setValue(d, { property: R, itemIndex: _ }), E;
+    }
+    getValue(u, d) {
+      const $ = this._values[u];
+      if ($)
+        return $.get(d);
+    }
+    scopeRefs(u, d = this._values) {
+      return this._reduceValues(d, ($) => {
+        if ($.scopePath === void 0)
+          throw new Error(`CodeGen: name "${$}" has no value`);
+        return (0, t._)`${u}${$.scopePath}`;
       });
     }
-    scopeCode(d = this._values, u, g) {
-      return this._reduceValues(d, (S) => {
-        if (S.value === void 0)
-          throw new Error(`CodeGen: name "${S}" has no value`);
-        return S.value.code;
-      }, u, g);
-    }
-    _reduceValues(d, u, g = {}, S) {
-      let T = t.nil;
-      for (const v in d) {
-        const R = d[v];
-        if (!R)
+    scopeCode(u = this._values, d, $) {
+      return this._reduceValues(u, (E) => {
+        if (E.value === void 0)
+          throw new Error(`CodeGen: name "${E}" has no value`);
+        return E.value.code;
+      }, d, $);
+    }
+    _reduceValues(u, d, $ = {}, E) {
+      let R = t.nil;
+      for (const v in u) {
+        const T = u[v];
+        if (!T)
           continue;
-        const $ = g[v] = g[v] || /* @__PURE__ */ new Map();
-        R.forEach((_) => {
-          if ($.has(_))
+        const g = $[v] = $[v] || /* @__PURE__ */ new Map();
+        T.forEach((_) => {
+          if (g.has(_))
             return;
-          $.set(_, n.Started);
-          let k = u(_);
+          g.set(_, n.Started);
+          let k = d(_);
           if (k) {
-            const O = this.opts.es5 ? e.varKinds.var : e.varKinds.const;
-            T = (0, t._)`${T}${O} ${_} = ${k};${this.opts._n}`;
-          } else if (k = S == null ? void 0 : S(_))
-            T = (0, t._)`${T}${k}${this.opts._n}`;
+            const C = this.opts.es5 ? e.varKinds.var : e.varKinds.const;
+            R = (0, t._)`${R}${C} ${_} = ${k};${this.opts._n}`;
+          } else if (k = E == null ? void 0 : E(_))
+            R = (0, t._)`${R}${k}${this.opts._n}`;
           else
             throw new r(_);
-          $.set(_, n.Completed);
+          g.set(_, n.Completed);
         });
       }
-      return T;
+      return R;
     }
   }
   e.ValueScope = l;
@@ -3643,8 +3181,8 @@ var scope = {};
       super(), this.varKind = o, this.name = h, this.rhs = N;
     }
     render({ es5: o, _n: h }) {
-      const N = o ? r.varKinds.var : this.varKind, q = this.rhs === void 0 ? "" : ` = ${this.rhs}`;
-      return `${N} ${this.name}${q};` + h;
+      const N = o ? r.varKinds.var : this.varKind, M = this.rhs === void 0 ? "" : ` = ${this.rhs}`;
+      return `${N} ${this.name}${M};` + h;
     }
     optimizeNames(o, h) {
       if (o[this.name.str])
@@ -3671,14 +3209,14 @@ var scope = {};
     }
   }
   class p extends l {
-    constructor(o, h, N, q) {
-      super(o, N, q), this.op = h;
+    constructor(o, h, N, M) {
+      super(o, N, M), this.op = h;
     }
     render({ _n: o }) {
       return `${this.lhs} ${this.op}= ${this.rhs};` + o;
     }
   }
-  class d extends i {
+  class u extends i {
     constructor(o) {
       super(), this.label = o, this.names = {};
     }
@@ -3686,7 +3224,7 @@ var scope = {};
       return `${this.label}:` + o;
     }
   }
-  class u extends i {
+  class d extends i {
     constructor(o) {
       super(), this.label = o, this.names = {};
     }
@@ -3694,7 +3232,7 @@ var scope = {};
       return `break${this.label ? ` ${this.label}` : ""};` + o;
     }
   }
-  class g extends i {
+  class $ extends i {
     constructor(o) {
       super(), this.error = o;
     }
@@ -3705,7 +3243,7 @@ var scope = {};
       return this.error.names;
     }
   }
-  class S extends i {
+  class E extends i {
     constructor(o) {
       super(), this.code = o;
     }
@@ -3722,7 +3260,7 @@ var scope = {};
       return this.code instanceof t._CodeOrName ? this.code.names : {};
     }
   }
-  class T extends i {
+  class R extends i {
     constructor(o = []) {
       super(), this.nodes = o;
     }
@@ -3740,10 +3278,10 @@ var scope = {};
     }
     optimizeNames(o, h) {
       const { nodes: N } = this;
-      let q = N.length;
-      for (; q--; ) {
-        const M = N[q];
-        M.optimizeNames(o, h) || (ke(o, M.names), N.splice(q, 1));
+      let M = N.length;
+      for (; M--; ) {
+        const q = N[M];
+        q.optimizeNames(o, h) || (ke(o, q.names), N.splice(M, 1));
       }
       return N.length > 0 ? this : void 0;
     }
@@ -3751,16 +3289,16 @@ var scope = {};
       return this.nodes.reduce((o, h) => K(o, h.names), {});
     }
   }
-  class v extends T {
+  class v extends R {
     render(o) {
       return "{" + o._n + super.render(o) + "}" + o._n;
     }
   }
-  class R extends T {
+  class T extends R {
   }
-  class $ extends v {
+  class g extends v {
   }
-  $.kind = "else";
+  g.kind = "else";
   class _ extends v {
     constructor(o, h) {
       super(h), this.condition = o;
@@ -3777,10 +3315,10 @@ var scope = {};
       let h = this.else;
       if (h) {
         const N = h.optimizeNodes();
-        h = this.else = Array.isArray(N) ? new $(N) : N;
+        h = this.else = Array.isArray(N) ? new g(N) : N;
       }
       if (h)
-        return o === !1 ? h instanceof _ ? h : h.nodes : this.nodes.length ? this : new _(Oe(o), h instanceof _ ? [h] : h.nodes);
+        return o === !1 ? h instanceof _ ? h : h.nodes : this.nodes.length ? this : new _(Ce(o), h instanceof _ ? [h] : h.nodes);
       if (!(o === !1 || !this.nodes.length))
         return this;
     }
@@ -3798,7 +3336,7 @@ var scope = {};
   class k extends v {
   }
   k.kind = "for";
-  class O extends k {
+  class C extends k {
     constructor(o) {
       super(), this.iteration = o;
     }
@@ -3814,12 +3352,12 @@ var scope = {};
     }
   }
   class I extends k {
-    constructor(o, h, N, q) {
-      super(), this.varKind = o, this.name = h, this.from = N, this.to = q;
+    constructor(o, h, N, M) {
+      super(), this.varKind = o, this.name = h, this.from = N, this.to = M;
     }
     render(o) {
-      const h = o.es5 ? r.varKinds.var : this.varKind, { name: N, from: q, to: M } = this;
-      return `for(${h} ${N}=${q}; ${N}<${M}; ${N}++)` + super.render(o);
+      const h = o.es5 ? r.varKinds.var : this.varKind, { name: N, from: M, to: q } = this;
+      return `for(${h} ${N}=${M}; ${N}<${q}; ${N}++)` + super.render(o);
     }
     get names() {
       const o = ue(super.names, this.from);
@@ -3827,8 +3365,8 @@ var scope = {};
     }
   }
   class A extends k {
-    constructor(o, h, N, q) {
-      super(), this.loop = o, this.varKind = h, this.name = N, this.iterable = q;
+    constructor(o, h, N, M) {
+      super(), this.loop = o, this.varKind = h, this.name = N, this.iterable = M;
     }
     render(o) {
       return `for(${this.varKind} ${this.name} ${this.loop} ${this.iterable})` + super.render(o);
@@ -3850,12 +3388,12 @@ var scope = {};
     }
   }
   w.kind = "func";
-  class C extends T {
+  class O extends R {
     render(o) {
       return "return " + super.render(o);
     }
   }
-  C.kind = "return";
+  O.kind = "return";
   class D extends v {
     render(o) {
       let h = "try" + super.render(o);
@@ -3866,8 +3404,8 @@ var scope = {};
       return super.optimizeNodes(), (o = this.catch) === null || o === void 0 || o.optimizeNodes(), (h = this.finally) === null || h === void 0 || h.optimizeNodes(), this;
     }
     optimizeNames(o, h) {
-      var N, q;
-      return super.optimizeNames(o, h), (N = this.catch) === null || N === void 0 || N.optimizeNames(o, h), (q = this.finally) === null || q === void 0 || q.optimizeNames(o, h), this;
+      var N, M;
+      return super.optimizeNames(o, h), (N = this.catch) === null || N === void 0 || N.optimizeNames(o, h), (M = this.finally) === null || M === void 0 || M.optimizeNames(o, h), this;
     }
     get names() {
       const o = super.names;
@@ -3883,16 +3421,16 @@ var scope = {};
     }
   }
   z.kind = "catch";
-  class W extends v {
+  class x extends v {
     render(o) {
       return "finally" + super.render(o);
     }
   }
-  W.kind = "finally";
+  x.kind = "finally";
   class re {
     constructor(o, h = {}) {
       this._values = {}, this._blockStarts = [], this._constants = {}, this.opts = { ...h, _n: h.lines ? `
-` : "" }, this._extScope = o, this._scope = new r.Scope({ parent: o }), this._nodes = [new R()];
+` : "" }, this._extScope = o, this._scope = new r.Scope({ parent: o }), this._nodes = [new T()];
     }
     toString() {
       return this._root.render(this.opts);
@@ -3921,9 +3459,9 @@ var scope = {};
     scopeCode() {
       return this._extScope.scopeCode(this._values);
     }
-    _def(o, h, N, q) {
-      const M = this._scope.toName(h);
-      return N !== void 0 && q && (this._constants[M.str] = N), this._leafNode(new a(o, M, N)), M;
+    _def(o, h, N, M) {
+      const q = this._scope.toName(h);
+      return N !== void 0 && M && (this._constants[q.str] = N), this._leafNode(new a(o, q, N)), q;
     }
     // `const` declaration (`var` in es5 mode)
     const(o, h, N) {
@@ -3947,13 +3485,13 @@ var scope = {};
     }
     // appends passed SafeExpr to code or executes Block
     code(o) {
-      return typeof o == "function" ? o() : o !== t.nil && this._leafNode(new S(o)), this;
+      return typeof o == "function" ? o() : o !== t.nil && this._leafNode(new E(o)), this;
     }
     // returns code for object literal for the passed argument list of key-value pairs
     object(...o) {
       const h = ["{"];
-      for (const [N, q] of o)
-        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 o)
+        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)
@@ -3972,42 +3510,42 @@ var scope = {};
     }
     // `else` clause - only valid after `if` or `else if` clauses
     else() {
-      return this._elseNode(new $());
+      return this._elseNode(new g());
     }
     // end `if` statement (needed if gen.if was used only with condition)
     endIf() {
-      return this._endBlockNode(_, $);
+      return this._endBlockNode(_, g);
     }
     _for(o, h) {
       return this._blockNode(o), h && this.code(h).endFor(), this;
     }
     // a generic `for` clause (or statement if `forBody` is passed)
     for(o, h) {
-      return this._for(new O(o), h);
+      return this._for(new C(o), h);
     }
     // `for` statement for a range of values
-    forRange(o, h, N, q, M = this.opts.es5 ? r.varKinds.var : r.varKinds.let) {
-      const x = this._scope.toName(o);
-      return this._for(new I(M, x, h, N), () => q(x));
+    forRange(o, h, N, M, q = this.opts.es5 ? r.varKinds.var : r.varKinds.let) {
+      const W = this._scope.toName(o);
+      return this._for(new I(q, W, h, N), () => M(W));
     }
     // `for-of` statement (in es5 mode replace with a normal for loop)
-    forOf(o, h, N, q = r.varKinds.const) {
-      const M = this._scope.toName(o);
+    forOf(o, h, N, M = r.varKinds.const) {
+      const q = this._scope.toName(o);
       if (this.opts.es5) {
-        const x = h instanceof t.Name ? h : this.var("_arr", h);
-        return this.forRange("_i", 0, (0, t._)`${x}.length`, (G) => {
-          this.var(M, (0, t._)`${x}[${G}]`), N(M);
+        const W = h instanceof t.Name ? h : this.var("_arr", h);
+        return this.forRange("_i", 0, (0, t._)`${W}.length`, (G) => {
+          this.var(q, (0, t._)`${W}[${G}]`), N(q);
         });
       }
-      return this._for(new A("of", q, M, h), () => N(M));
+      return this._for(new A("of", M, q, h), () => N(q));
     }
     // `for-in` statement.
     // With option `ownProperties` replaced with a `for-of` loop for object keys
-    forIn(o, h, N, q = this.opts.es5 ? r.varKinds.var : r.varKinds.const) {
+    forIn(o, h, N, M = this.opts.es5 ? r.varKinds.var : r.varKinds.const) {
       if (this.opts.ownProperties)
         return this.forOf(o, (0, t._)`Object.keys(${h})`, N);
-      const M = this._scope.toName(o);
-      return this._for(new A("in", q, M, h), () => N(M));
+      const q = this._scope.toName(o);
+      return this._for(new A("in", M, q, h), () => N(q));
     }
     // end `for` loop
     endFor() {
@@ -4015,33 +3553,33 @@ var scope = {};
     }
     // `label` statement
     label(o) {
-      return this._leafNode(new d(o));
+      return this._leafNode(new u(o));
     }
     // `break` statement
     break(o) {
-      return this._leafNode(new u(o));
+      return this._leafNode(new d(o));
     }
     // `return` statement
     return(o) {
-      const h = new C();
+      const h = new O();
       if (this._blockNode(h), this.code(o), h.nodes.length !== 1)
         throw new Error('CodeGen: "return" should have one node');
-      return this._endBlockNode(C);
+      return this._endBlockNode(O);
     }
     // `try` statement
     try(o, h, N) {
       if (!h && !N)
         throw new Error('CodeGen: "try" without "catch" and "finally"');
-      const q = new D();
-      if (this._blockNode(q), this.code(o), h) {
-        const M = this.name("e");
-        this._currNode = q.catch = new z(M), h(M);
+      const M = new D();
+      if (this._blockNode(M), this.code(o), h) {
+        const q = this.name("e");
+        this._currNode = M.catch = new z(q), h(q);
       }
-      return N && (this._currNode = q.finally = new W(), this.code(N)), this._endBlockNode(z, W);
+      return N && (this._currNode = M.finally = new x(), this.code(N)), this._endBlockNode(z, x);
     }
     // `throw` statement
     throw(o) {
-      return this._leafNode(new g(o));
+      return this._leafNode(new $(o));
     }
     // start self-balancing block
     block(o, h) {
@@ -4058,8 +3596,8 @@ var scope = {};
       return this._nodes.length = h, this;
     }
     // `function` heading (or definition if funcBody is passed)
-    func(o, h = t.nil, N, q) {
-      return this._blockNode(new w(o, h, N)), q && this.code(q).endFunc(), this;
+    func(o, h = t.nil, N, M) {
+      return this._blockNode(new w(o, h, N)), M && this.code(M).endFunc(), this;
     }
     // end function definition
     endFunc() {
@@ -4111,33 +3649,33 @@ var scope = {};
   function oe(P, o, h) {
     if (P instanceof t.Name)
       return N(P);
-    if (!q(P))
+    if (!M(P))
       return P;
-    return new t._Code(P._items.reduce((M, x) => (x instanceof t.Name && (x = N(x)), x instanceof t._Code ? M.push(...x._items) : M.push(x), M), []));
-    function N(M) {
-      const x = h[M.str];
-      return x === void 0 || o[M.str] !== 1 ? M : (delete o[M.str], x);
+    return new t._Code(P._items.reduce((q, W) => (W instanceof t.Name && (W = N(W)), W instanceof t._Code ? q.push(...W._items) : q.push(W), q), []));
+    function N(q) {
+      const W = h[q.str];
+      return W === void 0 || o[q.str] !== 1 ? q : (delete o[q.str], W);
     }
-    function q(M) {
-      return M instanceof t._Code && M._items.some((x) => x instanceof t.Name && o[x.str] === 1 && h[x.str] !== void 0);
+    function M(q) {
+      return q instanceof t._Code && q._items.some((W) => W instanceof t.Name && o[W.str] === 1 && h[W.str] !== void 0);
     }
   }
   function ke(P, o) {
     for (const h in o)
       P[h] = (P[h] || 0) - (o[h] || 0);
   }
-  function Oe(P) {
+  function Ce(P) {
     return typeof P == "boolean" || typeof P == "number" || P === null ? !P : (0, t._)`!${j(P)}`;
   }
-  e.not = Oe;
+  e.not = Ce;
   const qe = y(e.operators.AND);
   function et(...P) {
     return P.reduce(qe);
   }
   e.and = et;
-  const Me = y(e.operators.OR);
+  const Ue = y(e.operators.OR);
   function F(...P) {
-    return P.reduce(Me);
+    return P.reduce(Ue);
   }
   e.or = F;
   function y(P) {
@@ -4152,137 +3690,137 @@ var util = {};
   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(w) {
-    const C = {};
+    const O = {};
     for (const D of w)
-      C[D] = !0;
-    return C;
+      O[D] = !0;
+    return O;
   }
   e.toHash = n;
-  function s(w, C) {
-    return typeof C == "boolean" ? C : Object.keys(C).length === 0 ? !0 : (i(w, C), !a(C, w.self.RULES.all));
+  function s(w, O) {
+    return typeof O == "boolean" ? O : Object.keys(O).length === 0 ? !0 : (i(w, O), !a(O, w.self.RULES.all));
   }
   e.alwaysValidSchema = s;
-  function i(w, C = w.schema) {
+  function i(w, O = w.schema) {
     const { opts: D, self: z } = w;
-    if (!D.strictSchema || typeof C == "boolean")
+    if (!D.strictSchema || typeof O == "boolean")
       return;
-    const W = z.RULES.keywords;
-    for (const re in C)
-      W[re] || A(w, `unknown keyword: "${re}"`);
+    const x = z.RULES.keywords;
+    for (const re in O)
+      x[re] || A(w, `unknown keyword: "${re}"`);
   }
   e.checkUnknownRules = i;
-  function a(w, C) {
+  function a(w, O) {
     if (typeof w == "boolean")
       return !w;
     for (const D in w)
-      if (C[D])
+      if (O[D])
         return !0;
     return !1;
   }
   e.schemaHasRules = a;
-  function l(w, C) {
+  function l(w, O) {
     if (typeof w == "boolean")
       return !w;
     for (const D in w)
-      if (D !== "$ref" && C.all[D])
+      if (D !== "$ref" && O.all[D])
         return !0;
     return !1;
   }
   e.schemaHasRulesButRef = l;
-  function p({ topSchemaRef: w, schemaPath: C }, D, z, W) {
-    if (!W) {
+  function p({ topSchemaRef: w, schemaPath: O }, D, z, x) {
+    if (!x) {
       if (typeof D == "number" || typeof D == "boolean")
         return D;
       if (typeof D == "string")
         return (0, t._)`${D}`;
     }
-    return (0, t._)`${w}${C}${(0, t.getProperty)(z)}`;
+    return (0, t._)`${w}${O}${(0, t.getProperty)(z)}`;
   }
   e.schemaRefOrVal = p;
-  function d(w) {
-    return S(decodeURIComponent(w));
-  }
-  e.unescapeFragment = d;
   function u(w) {
-    return encodeURIComponent(g(w));
+    return E(decodeURIComponent(w));
+  }
+  e.unescapeFragment = u;
+  function d(w) {
+    return encodeURIComponent($(w));
   }
-  e.escapeFragment = u;
-  function g(w) {
+  e.escapeFragment = d;
+  function $(w) {
     return typeof w == "number" ? `${w}` : w.replace(/~/g, "~0").replace(/\//g, "~1");
   }
-  e.escapeJsonPointer = g;
-  function S(w) {
+  e.escapeJsonPointer = $;
+  function E(w) {
     return w.replace(/~1/g, "/").replace(/~0/g, "~");
   }
-  e.unescapeJsonPointer = S;
-  function T(w, C) {
+  e.unescapeJsonPointer = E;
+  function R(w, O) {
     if (Array.isArray(w))
       for (const D of w)
-        C(D);
+        O(D);
     else
-      C(w);
+      O(w);
   }
-  e.eachItem = T;
-  function v({ mergeNames: w, mergeToName: C, mergeValues: D, resultToName: z }) {
-    return (W, re, K, ue) => {
-      const oe = K === void 0 ? re : K instanceof t.Name ? (re instanceof t.Name ? w(W, re, K) : C(W, re, K), K) : re instanceof t.Name ? (C(W, K, re), re) : D(re, K);
-      return ue === t.Name && !(oe instanceof t.Name) ? z(W, oe) : oe;
+  e.eachItem = R;
+  function v({ mergeNames: w, mergeToName: O, mergeValues: D, resultToName: z }) {
+    return (x, re, K, ue) => {
+      const oe = K === void 0 ? re : K instanceof t.Name ? (re instanceof t.Name ? w(x, re, K) : O(x, re, K), K) : re instanceof t.Name ? (O(x, K, re), re) : D(re, K);
+      return ue === t.Name && !(oe instanceof t.Name) ? z(x, oe) : oe;
     };
   }
   e.mergeEvaluated = {
     props: v({
-      mergeNames: (w, C, D) => w.if((0, t._)`${D} !== true && ${C} !== undefined`, () => {
-        w.if((0, t._)`${C} === true`, () => w.assign(D, !0), () => w.assign(D, (0, t._)`${D} || {}`).code((0, t._)`Object.assign(${D}, ${C})`));
+      mergeNames: (w, O, D) => w.if((0, t._)`${D} !== true && ${O} !== undefined`, () => {
+        w.if((0, t._)`${O} === true`, () => w.assign(D, !0), () => w.assign(D, (0, t._)`${D} || {}`).code((0, t._)`Object.assign(${D}, ${O})`));
       }),
-      mergeToName: (w, C, D) => w.if((0, t._)`${D} !== true`, () => {
-        C === !0 ? w.assign(D, !0) : (w.assign(D, (0, t._)`${D} || {}`), $(w, D, C));
+      mergeToName: (w, O, D) => w.if((0, t._)`${D} !== true`, () => {
+        O === !0 ? w.assign(D, !0) : (w.assign(D, (0, t._)`${D} || {}`), g(w, D, O));
       }),
-      mergeValues: (w, C) => w === !0 ? !0 : { ...w, ...C },
-      resultToName: R
+      mergeValues: (w, O) => w === !0 ? !0 : { ...w, ...O },
+      resultToName: T
     }),
     items: v({
-      mergeNames: (w, C, D) => w.if((0, t._)`${D} !== true && ${C} !== undefined`, () => w.assign(D, (0, t._)`${C} === true ? true : ${D} > ${C} ? ${D} : ${C}`)),
-      mergeToName: (w, C, D) => w.if((0, t._)`${D} !== true`, () => w.assign(D, C === !0 ? !0 : (0, t._)`${D} > ${C} ? ${D} : ${C}`)),
-      mergeValues: (w, C) => w === !0 ? !0 : Math.max(w, C),
-      resultToName: (w, C) => w.var("items", C)
+      mergeNames: (w, O, D) => w.if((0, t._)`${D} !== true && ${O} !== undefined`, () => w.assign(D, (0, t._)`${O} === true ? true : ${D} > ${O} ? ${D} : ${O}`)),
+      mergeToName: (w, O, D) => w.if((0, t._)`${D} !== true`, () => w.assign(D, O === !0 ? !0 : (0, t._)`${D} > ${O} ? ${D} : ${O}`)),
+      mergeValues: (w, O) => w === !0 ? !0 : Math.max(w, O),
+      resultToName: (w, O) => w.var("items", O)
     })
   };
-  function R(w, C) {
-    if (C === !0)
+  function T(w, O) {
+    if (O === !0)
       return w.var("props", !0);
     const D = w.var("props", (0, t._)`{}`);
-    return C !== void 0 && $(w, D, C), D;
+    return O !== void 0 && g(w, D, O), D;
   }
-  e.evaluatedPropsToName = R;
-  function $(w, C, D) {
-    Object.keys(D).forEach((z) => w.assign((0, t._)`${C}${(0, t.getProperty)(z)}`, !0));
+  e.evaluatedPropsToName = T;
+  function g(w, O, D) {
+    Object.keys(D).forEach((z) => w.assign((0, t._)`${O}${(0, t.getProperty)(z)}`, !0));
   }
-  e.setEvaluated = $;
+  e.setEvaluated = g;
   const _ = {};
-  function k(w, C) {
+  function k(w, O) {
     return w.scopeValue("func", {
-      ref: C,
-      code: _[C.code] || (_[C.code] = new r._Code(C.code))
+      ref: O,
+      code: _[O.code] || (_[O.code] = new r._Code(O.code))
     });
   }
   e.useFunc = k;
-  var O;
+  var C;
   (function(w) {
     w[w.Num = 0] = "Num", w[w.Str = 1] = "Str";
-  })(O = e.Type || (e.Type = {}));
-  function I(w, C, D) {
+  })(C = e.Type || (e.Type = {}));
+  function I(w, O, D) {
     if (w instanceof t.Name) {
-      const z = C === O.Num;
+      const z = O === C.Num;
       return D ? z ? (0, t._)`"[" + ${w} + "]"` : (0, t._)`"['" + ${w} + "']"` : z ? (0, t._)`"/" + ${w}` : (0, t._)`"/" + ${w}.replace(/~/g, "~0").replace(/\\//g, "~1")`;
     }
-    return D ? (0, t.getProperty)(w).toString() : "/" + g(w);
+    return D ? (0, t.getProperty)(w).toString() : "/" + $(w);
   }
   e.getErrorPath = I;
-  function A(w, C, D = w.opts.strictSchema) {
+  function A(w, O, D = w.opts.strictSchema) {
     if (D) {
-      if (C = `strict mode: ${C}`, D === !0)
-        throw new Error(C);
-      w.self.logger.warn(C);
+      if (O = `strict mode: ${O}`, D === !0)
+        throw new Error(O);
+      w.self.logger.warn(O);
     }
   }
   e.checkStrictMode = A;
@@ -4317,42 +3855,42 @@ names$1.default = names;
   Object.defineProperty(e, "__esModule", { value: !0 }), e.extendErrors = e.resetErrorsCount = e.reportExtraError = e.reportError = e.keyword$DataError = e.keywordError = void 0;
   const t = codegen, r = util, n = names$1;
   e.keywordError = {
-    message: ({ keyword: $ }) => (0, t.str)`must pass "${$}" keyword validation`
+    message: ({ keyword: g }) => (0, t.str)`must pass "${g}" keyword validation`
   }, e.keyword$DataError = {
-    message: ({ keyword: $, schemaType: _ }) => _ ? (0, t.str)`"${$}" keyword must be ${_} ($data)` : (0, t.str)`"${$}" keyword is invalid ($data)`
+    message: ({ keyword: g, schemaType: _ }) => _ ? (0, t.str)`"${g}" keyword must be ${_} ($data)` : (0, t.str)`"${g}" keyword is invalid ($data)`
   };
-  function s($, _ = e.keywordError, k, O) {
-    const { it: I } = $, { gen: A, compositeRule: w, allErrors: C } = I, D = g($, _, k);
-    O ?? (w || C) ? p(A, D) : d(I, (0, t._)`[${D}]`);
+  function s(g, _ = e.keywordError, k, C) {
+    const { it: I } = g, { gen: A, compositeRule: w, allErrors: O } = I, D = $(g, _, k);
+    C ?? (w || O) ? p(A, D) : u(I, (0, t._)`[${D}]`);
   }
   e.reportError = s;
-  function i($, _ = e.keywordError, k) {
-    const { it: O } = $, { gen: I, compositeRule: A, allErrors: w } = O, C = g($, _, k);
-    p(I, C), A || w || d(O, n.default.vErrors);
+  function i(g, _ = e.keywordError, k) {
+    const { it: C } = g, { gen: I, compositeRule: A, allErrors: w } = C, O = $(g, _, k);
+    p(I, O), A || w || u(C, n.default.vErrors);
   }
   e.reportExtraError = i;
-  function a($, _) {
-    $.assign(n.default.errors, _), $.if((0, t._)`${n.default.vErrors} !== null`, () => $.if(_, () => $.assign((0, t._)`${n.default.vErrors}.length`, _), () => $.assign(n.default.vErrors, null)));
+  function a(g, _) {
+    g.assign(n.default.errors, _), g.if((0, t._)`${n.default.vErrors} !== null`, () => g.if(_, () => g.assign((0, t._)`${n.default.vErrors}.length`, _), () => g.assign(n.default.vErrors, null)));
   }
   e.resetErrorsCount = a;
-  function l({ gen: $, keyword: _, schemaValue: k, data: O, errsCount: I, it: A }) {
+  function l({ gen: g, keyword: _, schemaValue: k, data: C, errsCount: I, it: A }) {
     if (I === void 0)
       throw new Error("ajv implementation error");
-    const w = $.name("err");
-    $.forRange("i", I, n.default.errors, (C) => {
-      $.const(w, (0, t._)`${n.default.vErrors}[${C}]`), $.if((0, t._)`${w}.instancePath === undefined`, () => $.assign((0, t._)`${w}.instancePath`, (0, t.strConcat)(n.default.instancePath, A.errorPath))), $.assign((0, t._)`${w}.schemaPath`, (0, t.str)`${A.errSchemaPath}/${_}`), A.opts.verbose && ($.assign((0, t._)`${w}.schema`, k), $.assign((0, t._)`${w}.data`, O));
+    const w = g.name("err");
+    g.forRange("i", I, n.default.errors, (O) => {
+      g.const(w, (0, t._)`${n.default.vErrors}[${O}]`), g.if((0, t._)`${w}.instancePath === undefined`, () => g.assign((0, t._)`${w}.instancePath`, (0, t.strConcat)(n.default.instancePath, A.errorPath))), g.assign((0, t._)`${w}.schemaPath`, (0, t.str)`${A.errSchemaPath}/${_}`), A.opts.verbose && (g.assign((0, t._)`${w}.schema`, k), g.assign((0, t._)`${w}.data`, C));
     });
   }
   e.extendErrors = l;
-  function p($, _) {
-    const k = $.const("err", _);
-    $.if((0, t._)`${n.default.vErrors} === null`, () => $.assign(n.default.vErrors, (0, t._)`[${k}]`), (0, t._)`${n.default.vErrors}.push(${k})`), $.code((0, t._)`${n.default.errors}++`);
+  function p(g, _) {
+    const k = g.const("err", _);
+    g.if((0, t._)`${n.default.vErrors} === null`, () => g.assign(n.default.vErrors, (0, t._)`[${k}]`), (0, t._)`${n.default.vErrors}.push(${k})`), g.code((0, t._)`${n.default.errors}++`);
   }
-  function d($, _) {
-    const { gen: k, validateName: O, schemaEnv: I } = $;
-    I.$async ? k.throw((0, t._)`new ${$.ValidationError}(${_})`) : (k.assign((0, t._)`${O}.errors`, _), k.return(!1));
+  function u(g, _) {
+    const { gen: k, validateName: C, schemaEnv: I } = g;
+    I.$async ? k.throw((0, t._)`new ${g.ValidationError}(${_})`) : (k.assign((0, t._)`${C}.errors`, _), k.return(!1));
   }
-  const u = {
+  const d = {
     keyword: new t.Name("keyword"),
     schemaPath: new t.Name("schemaPath"),
     params: new t.Name("params"),
@@ -4361,28 +3899,28 @@ names$1.default = names;
     schema: new t.Name("schema"),
     parentSchema: new t.Name("parentSchema")
   };
-  function g($, _, k) {
-    const { createErrors: O } = $.it;
-    return O === !1 ? (0, t._)`{}` : S($, _, k);
-  }
-  function S($, _, k = {}) {
-    const { gen: O, it: I } = $, A = [
-      T(I, k),
-      v($, k)
+  function $(g, _, k) {
+    const { createErrors: C } = g.it;
+    return C === !1 ? (0, t._)`{}` : E(g, _, k);
+  }
+  function E(g, _, k = {}) {
+    const { gen: C, it: I } = g, A = [
+      R(I, k),
+      v(g, k)
     ];
-    return R($, _, A), O.object(...A);
+    return T(g, _, A), C.object(...A);
   }
-  function T({ errorPath: $ }, { instancePath: _ }) {
-    const k = _ ? (0, t.str)`${$}${(0, r.getErrorPath)(_, r.Type.Str)}` : $;
+  function R({ errorPath: g }, { instancePath: _ }) {
+    const k = _ ? (0, t.str)`${g}${(0, r.getErrorPath)(_, r.Type.Str)}` : g;
     return [n.default.instancePath, (0, t.strConcat)(n.default.instancePath, k)];
   }
-  function v({ keyword: $, it: { errSchemaPath: _ } }, { schemaPath: k, parentSchema: O }) {
-    let I = O ? _ : (0, t.str)`${_}/${$}`;
-    return k && (I = (0, t.str)`${I}${(0, r.getErrorPath)(k, r.Type.Str)}`), [u.schemaPath, I];
+  function v({ keyword: g, it: { errSchemaPath: _ } }, { schemaPath: k, parentSchema: C }) {
+    let I = C ? _ : (0, t.str)`${_}/${g}`;
+    return k && (I = (0, t.str)`${I}${(0, r.getErrorPath)(k, r.Type.Str)}`), [d.schemaPath, I];
   }
-  function R($, { params: _, message: k }, O) {
-    const { keyword: I, data: A, schemaValue: w, it: C } = $, { opts: D, propertyName: z, topSchemaRef: W, schemaPath: re } = C;
-    O.push([u.keyword, I], [u.params, typeof _ == "function" ? _($) : _ || (0, t._)`{}`]), D.messages && O.push([u.message, typeof k == "function" ? k($) : k]), D.verbose && O.push([u.schema, w], [u.parentSchema, (0, t._)`${W}${re}`], [n.default.data, A]), z && O.push([u.propertyName, z]);
+  function T(g, { params: _, message: k }, C) {
+    const { keyword: I, data: A, schemaValue: w, it: O } = g, { opts: D, propertyName: z, topSchemaRef: x, schemaPath: re } = O;
+    C.push([d.keyword, I], [d.params, typeof _ == "function" ? _(g) : _ || (0, t._)`{}`]), D.messages && C.push([d.message, typeof k == "function" ? k(g) : k]), D.verbose && C.push([d.schema, w], [d.parentSchema, (0, t._)`${x}${re}`], [n.default.data, A]), z && C.push([d.propertyName, z]);
   }
 })(errors);
 Object.defineProperty(boolSchema, "__esModule", { value: !0 });
@@ -4458,86 +3996,86 @@ applicability.shouldUseRule = shouldUseRule;
   Object.defineProperty(e, "__esModule", { value: !0 }), e.reportTypeError = e.checkDataTypes = e.checkDataType = e.coerceAndCheckDataType = e.getJSONTypes = e.getSchemaTypes = e.DataType = void 0;
   const t = rules, r = applicability, n = errors, s = codegen, i = util;
   var a;
-  (function(O) {
-    O[O.Correct = 0] = "Correct", O[O.Wrong = 1] = "Wrong";
+  (function(C) {
+    C[C.Correct = 0] = "Correct", C[C.Wrong = 1] = "Wrong";
   })(a = e.DataType || (e.DataType = {}));
-  function l(O) {
-    const I = p(O.type);
+  function l(C) {
+    const I = p(C.type);
     if (I.includes("null")) {
-      if (O.nullable === !1)
+      if (C.nullable === !1)
         throw new Error("type: null contradicts nullable: false");
     } else {
-      if (!I.length && O.nullable !== void 0)
+      if (!I.length && C.nullable !== void 0)
         throw new Error('"nullable" cannot be used without "type"');
-      O.nullable === !0 && I.push("null");
+      C.nullable === !0 && I.push("null");
     }
     return I;
   }
   e.getSchemaTypes = l;
-  function p(O) {
-    const I = Array.isArray(O) ? O : O ? [O] : [];
+  function p(C) {
+    const I = Array.isArray(C) ? C : C ? [C] : [];
     if (I.every(t.isJSONType))
       return I;
     throw new Error("type must be JSONType or JSONType[]: " + I.join(","));
   }
   e.getJSONTypes = p;
-  function d(O, I) {
-    const { gen: A, data: w, opts: C } = O, D = g(I, C.coerceTypes), z = I.length > 0 && !(D.length === 0 && I.length === 1 && (0, r.schemaHasRulesForType)(O, I[0]));
+  function u(C, I) {
+    const { gen: A, data: w, opts: O } = C, D = $(I, O.coerceTypes), z = I.length > 0 && !(D.length === 0 && I.length === 1 && (0, r.schemaHasRulesForType)(C, I[0]));
     if (z) {
-      const W = R(I, w, C.strictNumbers, a.Wrong);
-      A.if(W, () => {
-        D.length ? S(O, I, D) : _(O);
+      const x = T(I, w, O.strictNumbers, a.Wrong);
+      A.if(x, () => {
+        D.length ? E(C, I, D) : _(C);
       });
     }
     return z;
   }
-  e.coerceAndCheckDataType = d;
-  const u = /* @__PURE__ */ new Set(["string", "number", "integer", "boolean", "null"]);
-  function g(O, I) {
-    return I ? O.filter((A) => u.has(A) || I === "array" && A === "array") : [];
+  e.coerceAndCheckDataType = u;
+  const d = /* @__PURE__ */ new Set(["string", "number", "integer", "boolean", "null"]);
+  function $(C, I) {
+    return I ? C.filter((A) => d.has(A) || I === "array" && A === "array") : [];
   }
-  function S(O, I, A) {
-    const { gen: w, data: C, opts: D } = O, z = w.let("dataType", (0, s._)`typeof ${C}`), W = w.let("coerced", (0, s._)`undefined`);
-    D.coerceTypes === "array" && w.if((0, s._)`${z} == 'object' && Array.isArray(${C}) && ${C}.length == 1`, () => w.assign(C, (0, s._)`${C}[0]`).assign(z, (0, s._)`typeof ${C}`).if(R(I, C, D.strictNumbers), () => w.assign(W, C))), w.if((0, s._)`${W} !== undefined`);
+  function E(C, I, A) {
+    const { gen: w, data: O, opts: D } = C, z = w.let("dataType", (0, s._)`typeof ${O}`), x = w.let("coerced", (0, s._)`undefined`);
+    D.coerceTypes === "array" && w.if((0, s._)`${z} == 'object' && Array.isArray(${O}) && ${O}.length == 1`, () => w.assign(O, (0, s._)`${O}[0]`).assign(z, (0, s._)`typeof ${O}`).if(T(I, O, D.strictNumbers), () => w.assign(x, O))), w.if((0, s._)`${x} !== undefined`);
     for (const K of A)
-      (u.has(K) || K === "array" && D.coerceTypes === "array") && re(K);
-    w.else(), _(O), w.endIf(), w.if((0, s._)`${W} !== undefined`, () => {
-      w.assign(C, W), T(O, W);
+      (d.has(K) || K === "array" && D.coerceTypes === "array") && re(K);
+    w.else(), _(C), w.endIf(), w.if((0, s._)`${x} !== undefined`, () => {
+      w.assign(O, x), R(C, x);
     });
     function re(K) {
       switch (K) {
         case "string":
-          w.elseIf((0, s._)`${z} == "number" || ${z} == "boolean"`).assign(W, (0, s._)`"" + ${C}`).elseIf((0, s._)`${C} === null`).assign(W, (0, s._)`""`);
+          w.elseIf((0, s._)`${z} == "number" || ${z} == "boolean"`).assign(x, (0, s._)`"" + ${O}`).elseIf((0, s._)`${O} === null`).assign(x, (0, s._)`""`);
           return;
         case "number":
-          w.elseIf((0, s._)`${z} == "boolean" || ${C} === null
-              || (${z} == "string" && ${C} && ${C} == +${C})`).assign(W, (0, s._)`+${C}`);
+          w.elseIf((0, s._)`${z} == "boolean" || ${O} === null
+              || (${z} == "string" && ${O} && ${O} == +${O})`).assign(x, (0, s._)`+${O}`);
           return;
         case "integer":
-          w.elseIf((0, s._)`${z} === "boolean" || ${C} === null
-              || (${z} === "string" && ${C} && ${C} == +${C} && !(${C} % 1))`).assign(W, (0, s._)`+${C}`);
+          w.elseIf((0, s._)`${z} === "boolean" || ${O} === null
+              || (${z} === "string" && ${O} && ${O} == +${O} && !(${O} % 1))`).assign(x, (0, s._)`+${O}`);
           return;
         case "boolean":
-          w.elseIf((0, s._)`${C} === "false" || ${C} === 0 || ${C} === null`).assign(W, !1).elseIf((0, s._)`${C} === "true" || ${C} === 1`).assign(W, !0);
+          w.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":
-          w.elseIf((0, s._)`${C} === "" || ${C} === 0 || ${C} === false`), w.assign(W, null);
+          w.elseIf((0, s._)`${O} === "" || ${O} === 0 || ${O} === false`), w.assign(x, null);
           return;
         case "array":
           w.elseIf((0, s._)`${z} === "string" || ${z} === "number"
-              || ${z} === "boolean" || ${C} === null`).assign(W, (0, s._)`[${C}]`);
+              || ${z} === "boolean" || ${O} === null`).assign(x, (0, s._)`[${O}]`);
       }
     }
   }
-  function T({ gen: O, parentData: I, parentDataProperty: A }, w) {
-    O.if((0, s._)`${I} !== undefined`, () => O.assign((0, s._)`${I}[${A}]`, w));
+  function R({ gen: C, parentData: I, parentDataProperty: A }, w) {
+    C.if((0, s._)`${I} !== undefined`, () => C.assign((0, s._)`${I}[${A}]`, w));
   }
-  function v(O, I, A, w = a.Correct) {
-    const C = w === a.Correct ? s.operators.EQ : s.operators.NEQ;
+  function v(C, I, A, w = a.Correct) {
+    const O = w === a.Correct ? s.operators.EQ : s.operators.NEQ;
     let D;
-    switch (O) {
+    switch (C) {
       case "null":
-        return (0, s._)`${I} ${C} null`;
+        return (0, s._)`${I} ${O} null`;
       case "array":
         D = (0, s._)`Array.isArray(${I})`;
         break;
@@ -4551,51 +4089,51 @@ applicability.shouldUseRule = shouldUseRule;
         D = z();
         break;
       default:
-        return (0, s._)`typeof ${I} ${C} ${O}`;
+        return (0, s._)`typeof ${I} ${O} ${C}`;
     }
     return w === a.Correct ? D : (0, s.not)(D);
-    function z(W = s.nil) {
-      return (0, s.and)((0, s._)`typeof ${I} == "number"`, W, A ? (0, s._)`isFinite(${I})` : s.nil);
+    function z(x = s.nil) {
+      return (0, s.and)((0, s._)`typeof ${I} == "number"`, x, A ? (0, s._)`isFinite(${I})` : s.nil);
     }
   }
   e.checkDataType = v;
-  function R(O, I, A, w) {
-    if (O.length === 1)
-      return v(O[0], I, A, w);
-    let C;
-    const D = (0, i.toHash)(O);
+  function T(C, I, A, w) {
+    if (C.length === 1)
+      return v(C[0], I, A, w);
+    let O;
+    const D = (0, i.toHash)(C);
     if (D.array && D.object) {
       const z = (0, s._)`typeof ${I} != "object"`;
-      C = D.null ? z : (0, s._)`!${I} || ${z}`, delete D.null, delete D.array, delete D.object;
+      O = D.null ? z : (0, s._)`!${I} || ${z}`, delete D.null, delete D.array, delete D.object;
     } else
-      C = s.nil;
+      O = s.nil;
     D.number && delete D.integer;
     for (const z in D)
-      C = (0, s.and)(C, v(z, I, A, w));
-    return C;
+      O = (0, s.and)(O, v(z, I, A, w));
+    return O;
   }
-  e.checkDataTypes = R;
-  const $ = {
-    message: ({ schema: O }) => `must be ${O}`,
-    params: ({ schema: O, schemaValue: I }) => typeof O == "string" ? (0, s._)`{type: ${O}}` : (0, s._)`{type: ${I}}`
+  e.checkDataTypes = T;
+  const g = {
+    message: ({ schema: C }) => `must be ${C}`,
+    params: ({ schema: C, schemaValue: I }) => typeof C == "string" ? (0, s._)`{type: ${C}}` : (0, s._)`{type: ${I}}`
   };
-  function _(O) {
-    const I = k(O);
-    (0, n.reportError)(I, $);
+  function _(C) {
+    const I = k(C);
+    (0, n.reportError)(I, g);
   }
   e.reportTypeError = _;
-  function k(O) {
-    const { gen: I, data: A, schema: w } = O, C = (0, i.schemaRefOrVal)(O, w, "type");
+  function k(C) {
+    const { gen: I, data: A, schema: w } = C, O = (0, i.schemaRefOrVal)(C, w, "type");
     return {
       gen: I,
       keyword: "type",
       data: A,
       schema: w.type,
-      schemaCode: C,
-      schemaValue: C,
+      schemaCode: O,
+      schemaValue: O,
       parentSchema: w,
       params: {},
-      it: O
+      it: C
     };
   }
 })(dataType);
@@ -4673,16 +4211,16 @@ function schemaProperties(e, t) {
   return allSchemaProperties(t).filter((r) => !(0, util_1$o.alwaysValidSchema)(e, t[r]));
 }
 code.schemaProperties = schemaProperties;
-function callValidateCode({ schemaCode: e, data: t, it: { gen: r, topSchemaRef: n, schemaPath: s, errorPath: i }, it: a }, l, p, d) {
-  const u = d ? (0, codegen_1$q._)`${e}, ${t}, ${n}${s}` : t, g = [
+function callValidateCode({ schemaCode: e, data: t, it: { gen: r, topSchemaRef: n, schemaPath: s, errorPath: i }, it: a }, l, p, u) {
+  const d = u ? (0, codegen_1$q._)`${e}, ${t}, ${n}${s}` : t, $ = [
     [names_1$5.default.instancePath, (0, codegen_1$q.strConcat)(names_1$5.default.instancePath, i)],
     [names_1$5.default.parentData, a.parentData],
     [names_1$5.default.parentDataProperty, a.parentDataProperty],
     [names_1$5.default.rootData, names_1$5.default.rootData]
   ];
-  a.opts.dynamicRef && g.push([names_1$5.default.dynamicAnchors, names_1$5.default.dynamicAnchors]);
-  const S = (0, codegen_1$q._)`${u}, ${r.object(...g)}`;
-  return p !== codegen_1$q.nil ? (0, codegen_1$q._)`${l}.call(${p}, ${S})` : (0, codegen_1$q._)`${l}(${S})`;
+  a.opts.dynamicRef && $.push([names_1$5.default.dynamicAnchors, names_1$5.default.dynamicAnchors]);
+  const E = (0, codegen_1$q._)`${d}, ${r.object(...$)}`;
+  return p !== codegen_1$q.nil ? (0, codegen_1$q._)`${l}.call(${p}, ${E})` : (0, codegen_1$q._)`${l}(${E})`;
 }
 code.callValidateCode = callValidateCode;
 const newRegExp = (0, codegen_1$q._)`new RegExp`;
@@ -4704,10 +4242,10 @@ function validateArray(e) {
   return t.var(i, !0), a(() => t.break()), i;
   function a(l) {
     const p = t.const("len", (0, codegen_1$q._)`${r}.length`);
-    t.forRange("i", 0, p, (d) => {
+    t.forRange("i", 0, p, (u) => {
       e.subschema({
         keyword: n,
-        dataProp: d,
+        dataProp: u,
         dataPropType: util_1$o.Type.Num
       }, i), t.if((0, codegen_1$q.not)(i), l);
     });
@@ -4721,13 +4259,13 @@ function validateUnion(e) {
   if (r.some((p) => (0, util_1$o.alwaysValidSchema)(s, p)) && !s.opts.unevaluated)
     return;
   const a = t.let("valid", !1), l = t.name("_valid");
-  t.block(() => r.forEach((p, d) => {
-    const u = e.subschema({
+  t.block(() => r.forEach((p, u) => {
+    const d = e.subschema({
       keyword: n,
-      schemaProp: d,
+      schemaProp: u,
       compositeRule: !0
     }, l);
-    t.assign(a, (0, codegen_1$q._)`${a} || ${l}`), e.mergeValidEvaluated(u, l) || t.if((0, codegen_1$q.not)(a));
+    t.assign(a, (0, codegen_1$q._)`${a} || ${l}`), e.mergeValidEvaluated(d, l) || t.if((0, codegen_1$q.not)(a));
   })), e.result(a, () => e.reset(), () => e.error(!0));
 }
 code.validateUnion = validateUnion;
@@ -4737,45 +4275,45 @@ const codegen_1$p = codegen, names_1$4 = names$1, code_1$9 = code, errors_1$1 =
 function macroKeywordCode(e, t) {
   const { gen: r, keyword: n, schema: s, parentSchema: i, it: a } = e, l = t.macro.call(a.self, s, i, a), p = useKeyword(r, n, l);
   a.opts.validateSchema !== !1 && a.self.validateSchema(l, !0);
-  const d = r.name("valid");
+  const u = r.name("valid");
   e.subschema({
     schema: l,
     schemaPath: codegen_1$p.nil,
     errSchemaPath: `${a.errSchemaPath}/${n}`,
     topSchemaRef: p,
     compositeRule: !0
-  }, d), e.pass(d, () => e.error(!0));
+  }, u), e.pass(u, () => e.error(!0));
 }
 keyword.macroKeywordCode = macroKeywordCode;
 function funcKeywordCode(e, t) {
   var r;
   const { gen: n, keyword: s, schema: i, parentSchema: a, $data: l, it: p } = e;
   checkAsyncKeyword(p, t);
-  const d = !l && t.compile ? t.compile.call(p.self, i, a, p) : t.validate, u = useKeyword(n, s, d), g = n.let("valid");
-  e.block$data(g, S), e.ok((r = t.valid) !== null && r !== void 0 ? r : g);
-  function S() {
+  const u = !l && t.compile ? t.compile.call(p.self, i, a, p) : t.validate, d = useKeyword(n, s, u), $ = n.let("valid");
+  e.block$data($, E), e.ok((r = t.valid) !== null && r !== void 0 ? r : $);
+  function E() {
     if (t.errors === !1)
-      R(), t.modifying && modifyData(e), $(() => e.error());
+      T(), t.modifying && modifyData(e), g(() => e.error());
     else {
-      const _ = t.async ? T() : v();
-      t.modifying && modifyData(e), $(() => addErrs(e, _));
+      const _ = t.async ? R() : v();
+      t.modifying && modifyData(e), g(() => addErrs(e, _));
     }
   }
-  function T() {
+  function R() {
     const _ = n.let("ruleErrs", null);
-    return n.try(() => R((0, codegen_1$p._)`await `), (k) => n.assign(g, !1).if((0, codegen_1$p._)`${k} instanceof ${p.ValidationError}`, () => n.assign(_, (0, codegen_1$p._)`${k}.errors`), () => n.throw(k))), _;
+    return n.try(() => T((0, codegen_1$p._)`await `), (k) => n.assign($, !1).if((0, codegen_1$p._)`${k} instanceof ${p.ValidationError}`, () => n.assign(_, (0, codegen_1$p._)`${k}.errors`), () => n.throw(k))), _;
   }
   function v() {
-    const _ = (0, codegen_1$p._)`${u}.errors`;
-    return n.assign(_, null), R(codegen_1$p.nil), _;
+    const _ = (0, codegen_1$p._)`${d}.errors`;
+    return n.assign(_, null), T(codegen_1$p.nil), _;
   }
-  function R(_ = 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, O = !("compile" in t && !l || t.schema === !1);
-    n.assign(g, (0, codegen_1$p._)`${_}${(0, code_1$9.callValidateCode)(e, u, k, O)}`, t.modifying);
+  function T(_ = 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($, (0, codegen_1$p._)`${_}${(0, code_1$9.callValidateCode)(e, d, k, C)}`, t.modifying);
   }
-  function $(_) {
+  function g(_) {
     var k;
-    n.if((0, codegen_1$p.not)((k = t.valid) !== null && k !== void 0 ? k : g), _);
+    n.if((0, codegen_1$p.not)((k = t.valid) !== null && k !== void 0 ? k : $), _);
   }
 }
 keyword.funcKeywordCode = funcKeywordCode;
@@ -4854,16 +4392,16 @@ 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: g } = t, S = l.let("data", (0, codegen_1$o._)`${t.data}${(0, codegen_1$o.getProperty)(r)}`, !0);
-    p(S), e.errorPath = (0, codegen_1$o.str)`${d}${(0, util_1$n.getErrorPath)(r, n, g.jsPropertySyntax)}`, e.parentDataProperty = (0, codegen_1$o._)`${r}`, e.dataPathArr = [...u, e.parentDataProperty];
+    const { errorPath: u, dataPathArr: d, opts: $ } = t, E = l.let("data", (0, codegen_1$o._)`${t.data}${(0, codegen_1$o.getProperty)(r)}`, !0);
+    p(E), e.errorPath = (0, codegen_1$o.str)`${u}${(0, util_1$n.getErrorPath)(r, n, $.jsPropertySyntax)}`, e.parentDataProperty = (0, codegen_1$o._)`${r}`, e.dataPathArr = [...d, e.parentDataProperty];
   }
   if (s !== void 0) {
-    const d = s instanceof codegen_1$o.Name ? s : l.let("data", s, !0);
-    p(d), a !== void 0 && (e.propertyName = a);
+    const u = s instanceof codegen_1$o.Name ? s : l.let("data", s, !0);
+    p(u), a !== void 0 && (e.propertyName = a);
   }
   i && (e.dataTypes = i);
-  function p(d) {
-    e.data = d, e.dataLevel = t.dataLevel + 1, e.dataTypes = [], t.definedProperties = /* @__PURE__ */ new Set(), e.parentData = t.data, e.dataNames = [...t.dataNames, d];
+  function p(u) {
+    e.data = u, e.dataLevel = t.dataLevel + 1, e.dataTypes = [], t.definedProperties = /* @__PURE__ */ new Set(), e.parentData = t.data, e.dataNames = [...t.dataNames, u];
   }
 }
 subschema.extendSubschemaData = extendSubschemaData;
@@ -4956,23 +4494,23 @@ traverse$1.skipKeywords = {
   maxProperties: !0,
   minProperties: !0
 };
-function _traverse(e, t, r, n, s, i, a, l, p, d) {
+function _traverse(e, t, r, n, s, i, a, l, p, u) {
   if (n && typeof n == "object" && !Array.isArray(n)) {
-    t(n, s, i, a, l, p, d);
-    for (var u in n) {
-      var g = n[u];
-      if (Array.isArray(g)) {
-        if (u in traverse$1.arrayKeywords)
-          for (var S = 0; S < g.length; S++)
-            _traverse(e, t, r, g[S], s + "/" + u + "/" + S, i, s, u, n, S);
-      } else if (u in traverse$1.propsKeywords) {
-        if (g && typeof g == "object")
-          for (var T in g)
-            _traverse(e, t, r, g[T], s + "/" + u + "/" + escapeJsonPtr(T), i, s, u, n, T);
+    t(n, s, i, a, l, p, u);
+    for (var d in n) {
+      var $ = n[d];
+      if (Array.isArray($)) {
+        if (d in traverse$1.arrayKeywords)
+          for (var E = 0; E < $.length; E++)
+            _traverse(e, t, r, $[E], s + "/" + d + "/" + E, i, s, d, n, E);
+      } else if (d in traverse$1.propsKeywords) {
+        if ($ && typeof $ == "object")
+          for (var R in $)
+            _traverse(e, t, r, $[R], s + "/" + d + "/" + escapeJsonPtr(R), i, s, d, n, R);
       } else
-        (u in traverse$1.keywords || e.allKeys && !(u in traverse$1.skipKeywords)) && _traverse(e, t, r, g, s + "/" + u, i, s, u, n);
+        (d in traverse$1.keywords || e.allKeys && !(d in traverse$1.skipKeywords)) && _traverse(e, t, r, $, s + "/" + d, i, s, d, n);
     }
-    r(n, s, i, a, l, p, d);
+    r(n, s, i, a, l, p, u);
   }
 }
 function escapeJsonPtr(e) {
@@ -5054,34 +4592,34 @@ function getSchemaRefs(e, t) {
   if (typeof e == "boolean")
     return {};
   const { schemaId: r, uriResolver: n } = this.opts, s = normalizeId(e[r] || t), i = { "": s }, a = getFullPath(n, s, !1), l = {}, p = /* @__PURE__ */ new Set();
-  return traverse(e, { allKeys: !0 }, (g, S, T, v) => {
+  return traverse(e, { allKeys: !0 }, ($, E, R, v) => {
     if (v === void 0)
       return;
-    const R = a + S;
-    let $ = i[v];
-    typeof g[r] == "string" && ($ = _.call(this, g[r])), k.call(this, g.$anchor), k.call(this, g.$dynamicAnchor), i[S] = $;
-    function _(O) {
+    const T = a + E;
+    let g = i[v];
+    typeof $[r] == "string" && (g = _.call(this, $[r])), k.call(this, $.$anchor), k.call(this, $.$dynamicAnchor), i[E] = g;
+    function _(C) {
       const I = this.opts.uriResolver.resolve;
-      if (O = normalizeId($ ? I($, O) : O), p.has(O))
-        throw u(O);
-      p.add(O);
-      let A = this.refs[O];
-      return typeof A == "string" && (A = this.refs[A]), typeof A == "object" ? d(g, A.schema, O) : O !== normalizeId(R) && (O[0] === "#" ? (d(g, l[O], O), l[O] = g) : this.refs[O] = R), O;
-    }
-    function k(O) {
-      if (typeof O == "string") {
-        if (!ANCHOR.test(O))
-          throw new Error(`invalid anchor "${O}"`);
-        _.call(this, `#${O}`);
+      if (C = normalizeId(g ? I(g, C) : C), p.has(C))
+        throw d(C);
+      p.add(C);
+      let A = this.refs[C];
+      return typeof A == "string" && (A = this.refs[A]), typeof A == "object" ? u($, A.schema, C) : C !== normalizeId(T) && (C[0] === "#" ? (u($, l[C], C), l[C] = $) : this.refs[C] = T), C;
+    }
+    function k(C) {
+      if (typeof C == "string") {
+        if (!ANCHOR.test(C))
+          throw new Error(`invalid anchor "${C}"`);
+        _.call(this, `#${C}`);
       }
     }
   }), l;
-  function d(g, S, T) {
-    if (S !== void 0 && !equal$2(g, S))
-      throw u(T);
+  function u($, E, R) {
+    if (E !== void 0 && !equal$2($, E))
+      throw d(R);
   }
-  function u(g) {
-    return new Error(`reference "${g}" resolves to more than one schema`);
+  function d($) {
+    return new Error(`reference "${$}" resolves to more than one schema`);
   }
 }
 resolve$1.getSchemaRefs = getSchemaRefs;
@@ -5191,18 +4729,18 @@ function assignEvaluated({ gen: e, evaluated: t, props: r, items: n }) {
   r instanceof codegen_1$n.Name && e.assign((0, codegen_1$n._)`${t}.props`, r), n instanceof codegen_1$n.Name && e.assign((0, codegen_1$n._)`${t}.items`, n);
 }
 function schemaKeywords(e, t, r, n) {
-  const { gen: s, schema: i, data: a, allErrors: l, opts: p, self: d } = e, { RULES: u } = d;
-  if (i.$ref && (p.ignoreKeywordsWithRef || !(0, util_1$l.schemaHasRulesButRef)(i, u))) {
-    s.block(() => keywordCode(e, "$ref", u.all.$ref.definition));
+  const { gen: s, schema: i, data: a, allErrors: l, opts: p, self: u } = e, { RULES: d } = u;
+  if (i.$ref && (p.ignoreKeywordsWithRef || !(0, util_1$l.schemaHasRulesButRef)(i, d))) {
+    s.block(() => keywordCode(e, "$ref", d.all.$ref.definition));
     return;
   }
   p.jtd || checkStrictTypes(e, t), s.block(() => {
-    for (const S of u.rules)
-      g(S);
-    g(u.post);
+    for (const E of d.rules)
+      $(E);
+    $(d.post);
   });
-  function g(S) {
-    (0, applicability_1.shouldUseGroup)(i, S) && (S.type ? (s.if((0, dataType_2.checkDataType)(S.type, a, p.strictNumbers)), iterateKeywords(e, S), t.length === 1 && t[0] === S.type && r && (s.else(), (0, dataType_2.reportTypeError)(e)), s.endIf()) : iterateKeywords(e, S), l || s.if((0, codegen_1$n._)`${names_1$3.default.errors} === ${n || 0}`));
+  function $(E) {
+    (0, applicability_1.shouldUseGroup)(i, E) && (E.type ? (s.if((0, dataType_2.checkDataType)(E.type, a, p.strictNumbers)), iterateKeywords(e, E), t.length === 1 && t[0] === E.type && r && (s.else(), (0, dataType_2.reportTypeError)(e)), s.endIf()) : iterateKeywords(e, E), l || s.if((0, codegen_1$n._)`${names_1$3.default.errors} === ${n || 0}`));
   }
 }
 function iterateKeywords(e, t) {
@@ -5371,27 +4909,27 @@ function getData(e, { dataLevel: t, dataNames: r, dataPathArr: n }) {
       throw new Error(`Invalid JSON-pointer: ${e}`);
     s = e, i = names_1$3.default.rootData;
   } else {
-    const d = RELATIVE_JSON_POINTER.exec(e);
-    if (!d)
+    const u = RELATIVE_JSON_POINTER.exec(e);
+    if (!u)
       throw new Error(`Invalid JSON-pointer: ${e}`);
-    const u = +d[1];
-    if (s = d[2], s === "#") {
-      if (u >= t)
-        throw new Error(p("property/index", u));
-      return n[t - u];
-    }
-    if (u > t)
-      throw new Error(p("data", u));
-    if (i = r[t - u], !s)
+    const d = +u[1];
+    if (s = u[2], s === "#") {
+      if (d >= t)
+        throw new Error(p("property/index", d));
+      return n[t - d];
+    }
+    if (d > t)
+      throw new Error(p("data", d));
+    if (i = r[t - d], !s)
       return i;
   }
   let a = i;
   const l = s.split("/");
-  for (const d of l)
-    d && (i = (0, codegen_1$n._)`${i}${(0, codegen_1$n.getProperty)((0, util_1$l.unescapeJsonPointer)(d))}`, a = (0, codegen_1$n._)`${a} && ${i}`);
+  for (const u of l)
+    u && (i = (0, codegen_1$n._)`${i}${(0, codegen_1$n.getProperty)((0, util_1$l.unescapeJsonPointer)(u))}`, a = (0, codegen_1$n._)`${a} && ${i}`);
   return a;
-  function p(d, u) {
-    return `Cannot access ${d} ${u} levels up, current level is ${t}`;
+  function p(u, d) {
+    return `Cannot access ${u} ${d} levels up, current level is ${t}`;
   }
 }
 validate.getData = getData;
@@ -5437,7 +4975,7 @@ function compileSchema(e) {
   }));
   const p = a.scopeName("validate");
   e.validateName = p;
-  const d = {
+  const u = {
     gen: a,
     allErrors: this.opts.allErrors,
     data: names_1$2.default.data,
@@ -5461,24 +4999,24 @@ function compileSchema(e) {
     opts: this.opts,
     self: this
   };
-  let u;
+  let d;
   try {
-    this._compilations.add(e), (0, validate_1$1.validateFunctionCode)(d), a.optimize(this.opts.code.optimize);
-    const g = a.toString();
-    u = `${a.scopeRefs(names_1$2.default.scope)}return ${g}`, this.opts.code.process && (u = this.opts.code.process(u, e));
-    const T = new Function(`${names_1$2.default.self}`, `${names_1$2.default.scope}`, u)(this, this.scope.get());
-    if (this.scope.value(p, { ref: T }), T.errors = null, T.schema = e.schema, T.schemaEnv = e, e.$async && (T.$async = !0), this.opts.code.source === !0 && (T.source = { validateName: p, validateCode: g, scopeValues: a._values }), this.opts.unevaluated) {
-      const { props: v, items: R } = d;
-      T.evaluated = {
+    this._compilations.add(e), (0, validate_1$1.validateFunctionCode)(u), a.optimize(this.opts.code.optimize);
+    const $ = a.toString();
+    d = `${a.scopeRefs(names_1$2.default.scope)}return ${$}`, this.opts.code.process && (d = this.opts.code.process(d, e));
+    const R = new Function(`${names_1$2.default.self}`, `${names_1$2.default.scope}`, d)(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: $, scopeValues: a._values }), this.opts.unevaluated) {
+      const { props: v, items: T } = u;
+      R.evaluated = {
         props: v instanceof codegen_1$m.Name ? void 0 : v,
-        items: R instanceof codegen_1$m.Name ? void 0 : R,
+        items: T instanceof codegen_1$m.Name ? void 0 : T,
         dynamicProps: v instanceof codegen_1$m.Name,
-        dynamicItems: R instanceof codegen_1$m.Name
-      }, T.source && (T.source.evaluated = (0, codegen_1$m.stringify)(T.evaluated));
+        dynamicItems: T instanceof codegen_1$m.Name
+      }, R.source && (R.source.evaluated = (0, codegen_1$m.stringify)(R.evaluated));
     }
-    return e.validate = T, e;
-  } catch (g) {
-    throw delete e.validate, delete e.validateName, u && this.logger.error("Error compiling schema, function code:", u), g;
+    return e.validate = R, e;
+  } catch ($) {
+    throw delete e.validate, delete e.validateName, d && this.logger.error("Error compiling schema, function code:", d), $;
   } finally {
     this._compilations.delete(e);
   }
@@ -5529,8 +5067,8 @@ function resolveSchema(e, t) {
   }
   if (typeof (a == null ? void 0 : a.schema) == "object") {
     if (a.validate || compileSchema.call(this, a), i === (0, resolve_1.normalizeId)(t)) {
-      const { schema: l } = a, { schemaId: p } = this.opts, d = l[p];
-      return d && (s = (0, resolve_1.resolveUrl)(this.opts.uriResolver, s, d)), new SchemaEnv({ schema: l, schemaId: p, root: e, baseId: s });
+      const { schema: l } = a, { schemaId: p } = this.opts, u = l[p];
+      return u && (s = (0, resolve_1.resolveUrl)(this.opts.uriResolver, s, u)), new SchemaEnv({ schema: l, schemaId: p, root: e, baseId: s });
     }
     return getJsonPointer.call(this, r, a);
   }
@@ -5554,8 +5092,8 @@ function getJsonPointer(e, { baseId: t, schema: r, root: n }) {
     if (p === void 0)
       return;
     r = p;
-    const d = typeof r == "object" && r[this.opts.schemaId];
-    !PREVENT_SCOPE_CHANGE.has(l) && d && (t = (0, resolve_1.resolveUrl)(this.opts.uriResolver, t, d));
+    const u = typeof r == "object" && r[this.opts.schemaId];
+    !PREVENT_SCOPE_CHANGE.has(l) && u && (t = (0, resolve_1.resolveUrl)(this.opts.uriResolver, t, u));
   }
   let i;
   if (typeof r != "boolean" && r.$ref && !(0, util_1$k.schemaHasRulesButRef)(r, this.RULES)) {
@@ -5599,9 +5137,9 @@ var uri$1 = {}, uri_all = { exports: {} };
         c[m] = arguments[m];
       if (c.length > 1) {
         c[0] = c[0].slice(0, -1);
-        for (var E = c.length - 1, b = 1; b < E; ++b)
+        for (var S = c.length - 1, b = 1; b < S; ++b)
           c[b] = c[b].slice(1, -1);
-        return c[E] = c[E].slice(1), c.join("");
+        return c[S] = c[S].slice(1), c.join("");
       } else
         return c[0];
     }
@@ -5620,15 +5158,15 @@ var uri$1 = {}, uri_all = { exports: {} };
     function p(f, c) {
       var m = f;
       if (c)
-        for (var E in c)
-          m[E] = c[E];
+        for (var S in c)
+          m[S] = c[S];
       return m;
     }
-    function d(f) {
-      var c = "[A-Za-z]", m = "[0-9]", E = n(m, "[A-Fa-f]"), b = s(s("%[EFef]" + E + "%" + E + E + "%" + E + E) + "|" + s("%[89A-Fa-f]" + E + "%" + E + E) + "|" + s("%" + E + E)), U = "[\\:\\/\\?\\#\\[\\]\\@]", L = "[\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=]", J = n(U, L), Y = f ? "[\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]" : "[]", se = f ? "[\\uE000-\\uF8FF]" : "[]", B = n(c, m, "[\\-\\.\\_\\~]", Y);
+    function u(f) {
+      var c = "[A-Za-z]", m = "[0-9]", S = n(m, "[A-Fa-f]"), b = s(s("%[EFef]" + S + "%" + S + S + "%" + S + S) + "|" + s("%[89A-Fa-f]" + S + "%" + S + S) + "|" + s("%" + S + S)), U = "[\\:\\/\\?\\#\\[\\]\\@]", L = "[\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=]", J = n(U, L), Y = f ? "[\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]" : "[]", se = f ? "[\\uE000-\\uF8FF]" : "[]", B = n(c, m, "[\\-\\.\\_\\~]", Y);
       s(c + n(c, m, "[\\+\\-\\.]") + "*"), s(s(b + "|" + 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), ie = s(Q + "\\." + Q + "\\." + Q + "\\." + Q), V = s(E + "{1,4}"), X = s(s(V + "\\:" + V) + "|" + ie), 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), xe = 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, xe, Ie, fe, ye].join("|")), we = s(s(B + "|" + b) + "+");
-      s("[vV]" + E + "+\\." + n(B, L, "[\\:]") + "+"), s(s(b + "|" + 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), ie = s(Q + "\\." + Q + "\\." + Q + "\\." + Q), V = s(S + "{1,4}"), X = s(s(V + "\\:" + V) + "|" + ie), ae = s(s(V + "\\:") + "{6}" + X), ee = s("\\:\\:" + s(V + "\\:") + "{5}" + X), Ee = s(s(V) + "?\\:\\:" + s(V + "\\:") + "{4}" + X), $e = s(s(s(V + "\\:") + "{0,1}" + V) + "?\\:\\:" + s(V + "\\:") + "{3}" + X), ge = s(s(s(V + "\\:") + "{0,2}" + V) + "?\\:\\:" + s(V + "\\:") + "{2}" + X), Be = 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, $e, ge, Be, Ie, fe, ye].join("|")), we = s(s(B + "|" + b) + "+");
+      s("[vV]" + S + "+\\." + n(B, L, "[\\:]") + "+"), s(s(b + "|" + n(B, L)) + "*");
       var ct = s(b + "|" + n(B, L, "[\\:\\@]"));
       return s(s(b + "|" + n(B, L, "[\\@]")) + "+"), s(s(ct + "|" + n("[\\/\\?]", se)) + "*"), {
         NOT_SCHEME: new RegExp(n("[^]", c, m, "[\\+\\-\\.]"), "g"),
@@ -5643,15 +5181,15 @@ var uri$1 = {}, uri_all = { exports: {} };
         OTHER_CHARS: new RegExp(n("[^\\%]", B, J), "g"),
         PCT_ENCODED: new RegExp(b, "g"),
         IPV4ADDRESS: new RegExp("^(" + ie + ")$"),
-        IPV6ADDRESS: new RegExp("^\\[?(" + je + ")" + s(s("\\%25|\\%(?!" + E + "{2})") + "(" + we + ")") + "?\\]?$")
+        IPV6ADDRESS: new RegExp("^\\[?(" + je + ")" + s(s("\\%25|\\%(?!" + S + "{2})") + "(" + we + ")") + "?\\]?$")
         //RFC 6874, with relaxed parsing rules
       };
     }
-    var u = d(!1), g = d(!0), S = function() {
+    var d = u(!1), $ = u(!0), E = function() {
       function f(c, m) {
-        var E = [], b = !0, U = !1, L = void 0;
+        var S = [], b = !0, U = !1, L = void 0;
         try {
-          for (var J = c[Symbol.iterator](), Y; !(b = (Y = J.next()).done) && (E.push(Y.value), !(m && E.length === m)); b = !0)
+          for (var J = c[Symbol.iterator](), Y; !(b = (Y = J.next()).done) && (S.push(Y.value), !(m && S.length === m)); b = !0)
             ;
         } catch (se) {
           U = !0, L = se;
@@ -5663,7 +5201,7 @@ var uri$1 = {}, uri_all = { exports: {} };
               throw L;
           }
         }
-        return E;
+        return S;
       }
       return function(c, m) {
         if (Array.isArray(c))
@@ -5672,36 +5210,36 @@ var uri$1 = {}, uri_all = { exports: {} };
           return f(c, m);
         throw new TypeError("Invalid attempt to destructure non-iterable instance");
       };
-    }(), T = function(f) {
+    }(), R = function(f) {
       if (Array.isArray(f)) {
         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, R = 36, $ = 1, _ = 26, k = 38, O = 700, I = 72, A = 128, w = "-", C = /^xn--/, D = /[^\0-\x7E]/, z = /[\x2E\u3002\uFF0E\uFF61]/g, W = {
+    }, v = 2147483647, T = 36, g = 1, _ = 26, k = 38, C = 700, I = 72, A = 128, w = "-", O = /^xn--/, D = /[^\0-\x7E]/, z = /[\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 = R - $, K = Math.floor, ue = String.fromCharCode;
+    }, re = T - g, K = Math.floor, ue = String.fromCharCode;
     function oe(f) {
-      throw new RangeError(W[f]);
+      throw new RangeError(x[f]);
     }
     function ke(f, c) {
-      for (var m = [], E = f.length; E--; )
-        m[E] = c(f[E]);
+      for (var m = [], S = f.length; S--; )
+        m[S] = c(f[S]);
       return m;
     }
-    function Oe(f, c) {
-      var m = f.split("@"), E = "";
-      m.length > 1 && (E = m[0] + "@", f = m[1]), f = f.replace(z, ".");
+    function Ce(f, c) {
+      var m = f.split("@"), S = "";
+      m.length > 1 && (S = m[0] + "@", f = m[1]), f = f.replace(z, ".");
       var b = f.split("."), U = ke(b, c).join(".");
-      return E + U;
+      return S + U;
     }
     function qe(f) {
-      for (var c = [], m = 0, E = f.length; m < E; ) {
+      for (var c = [], m = 0, S = f.length; m < S; ) {
         var b = f.charCodeAt(m++);
-        if (b >= 55296 && b <= 56319 && m < E) {
+        if (b >= 55296 && b <= 56319 && m < S) {
           var U = f.charCodeAt(m++);
           (U & 64512) == 56320 ? c.push(((b & 1023) << 10) + (U & 1023) + 65536) : (c.push(b), m--);
         } else
@@ -5710,40 +5248,40 @@ var uri$1 = {}, uri_all = { exports: {} };
       return c;
     }
     var et = function(c) {
-      return String.fromCodePoint.apply(String, T(c));
-    }, Me = function(c) {
-      return c - 48 < 10 ? c - 22 : c - 65 < 26 ? c - 65 : c - 97 < 26 ? c - 97 : R;
+      return String.fromCodePoint.apply(String, R(c));
+    }, Ue = function(c) {
+      return c - 48 < 10 ? c - 22 : c - 65 < 26 ? c - 65 : c - 97 < 26 ? c - 97 : T;
     }, F = function(c, m) {
       return c + 22 + 75 * (c < 26) - ((m != 0) << 5);
-    }, y = function(c, m, E) {
+    }, y = function(c, m, S) {
       var b = 0;
       for (
-        c = E ? K(c / O) : c >> 1, c += K(c / m);
+        c = S ? K(c / C) : c >> 1, c += K(c / m);
         /* no initialization */
         c > re * _ >> 1;
-        b += R
+        b += T
       )
         c = K(c / re);
       return K(b + (re + 1) * c / (c + k));
     }, j = function(c) {
-      var m = [], E = c.length, b = 0, U = A, L = I, J = c.lastIndexOf(w);
+      var m = [], S = c.length, b = 0, U = A, L = I, J = c.lastIndexOf(w);
       J < 0 && (J = 0);
       for (var Y = 0; Y < J; ++Y)
         c.charCodeAt(Y) >= 128 && oe("not-basic"), m.push(c.charCodeAt(Y));
-      for (var se = J > 0 ? J + 1 : 0; se < E; ) {
+      for (var se = J > 0 ? J + 1 : 0; se < S; ) {
         for (
-          var B = b, Q = 1, ie = R;
+          var B = b, Q = 1, ie = T;
           ;
           /* no condition */
-          ie += R
+          ie += T
         ) {
-          se >= E && oe("invalid-input");
-          var V = Me(c.charCodeAt(se++));
-          (V >= R || V > K((v - b) / Q)) && oe("overflow"), b += V * Q;
-          var X = ie <= L ? $ : ie >= L + _ ? _ : ie - L;
+          se >= S && oe("invalid-input");
+          var V = Ue(c.charCodeAt(se++));
+          (V >= T || V > K((v - b) / Q)) && oe("overflow"), b += V * Q;
+          var X = ie <= L ? g : ie >= L + _ ? _ : ie - L;
           if (V < X)
             break;
-          var ae = R - X;
+          var ae = T - X;
           Q > K(v / ae) && oe("overflow"), Q *= ae;
         }
         var ee = m.length + 1;
@@ -5753,7 +5291,7 @@ var uri$1 = {}, uri_all = { exports: {} };
     }, P = function(c) {
       var m = [];
       c = qe(c);
-      var E = c.length, b = A, U = 0, L = I, J = !0, Y = !1, se = void 0;
+      var S = c.length, b = A, U = 0, L = I, J = !0, Y = !1, se = void 0;
       try {
         for (var B = c[Symbol.iterator](), Q; !(J = (Q = B.next()).done); J = !0) {
           var ie = Q.value;
@@ -5770,21 +5308,21 @@ var uri$1 = {}, uri_all = { exports: {} };
         }
       }
       var V = m.length, X = V;
-      for (V && m.push(w); X < E; ) {
-        var ae = v, ee = !0, Ee = !1, ge = void 0;
+      for (V && m.push(w); X < S; ) {
+        var ae = v, ee = !0, Ee = !1, $e = void 0;
         try {
-          for (var $e = c[Symbol.iterator](), xe; !(ee = (xe = $e.next()).done); ee = !0) {
-            var Ie = xe.value;
+          for (var ge = c[Symbol.iterator](), Be; !(ee = (Be = ge.next()).done); ee = !0) {
+            var Ie = Be.value;
             Ie >= b && Ie < ae && (ae = Ie);
           }
         } catch (lt) {
-          Ee = !0, ge = lt;
+          Ee = !0, $e = lt;
         } finally {
           try {
-            !ee && $e.return && $e.return();
+            !ee && ge.return && ge.return();
           } finally {
             if (Ee)
-              throw ge;
+              throw $e;
           }
         }
         var fe = X + 1;
@@ -5795,15 +5333,15 @@ var uri$1 = {}, uri_all = { exports: {} };
             var Ht = Lt.value;
             if (Ht < b && ++U > v && oe("overflow"), Ht == b) {
               for (
-                var pt = U, ft = R;
+                var pt = U, ft = T;
                 ;
                 /* no condition */
-                ft += R
+                ft += T
               ) {
-                var ht = ft <= L ? $ : ft >= L + _ ? _ : ft - L;
+                var ht = ft <= L ? g : ft >= L + _ ? _ : ft - L;
                 if (pt < ht)
                   break;
-                var zt = pt - ht, Vt = R - ht;
+                var zt = pt - ht, Vt = T - ht;
                 m.push(ue(F(ht + zt % Vt, 0))), pt = K(zt / Vt);
               }
               m.push(ue(F(pt, 0))), L = y(U, fe, X == V), U = 0, ++X;
@@ -5823,11 +5361,11 @@ var uri$1 = {}, uri_all = { exports: {} };
       }
       return m.join("");
     }, o = function(c) {
-      return Oe(c, function(m) {
-        return C.test(m) ? j(m.slice(4).toLowerCase()) : m;
+      return Ce(c, function(m) {
+        return O.test(m) ? j(m.slice(4).toLowerCase()) : m;
       });
     }, h = function(c) {
-      return Oe(c, function(m) {
+      return Ce(c, function(m) {
         return D.test(m) ? "xn--" + P(m) : m;
       });
     }, N = {
@@ -5852,25 +5390,25 @@ var uri$1 = {}, uri_all = { exports: {} };
       encode: P,
       toASCII: h,
       toUnicode: o
-    }, q = {};
-    function M(f) {
+    }, 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 x(f) {
-      for (var c = "", m = 0, E = f.length; m < E; ) {
+    function W(f) {
+      for (var c = "", m = 0, S = f.length; m < S; ) {
         var b = parseInt(f.substr(m + 1, 2), 16);
         if (b < 128)
           c += String.fromCharCode(b), m += 3;
         else if (b >= 194 && b < 224) {
-          if (E - m >= 6) {
+          if (S - m >= 6) {
             var U = parseInt(f.substr(m + 4, 2), 16);
             c += String.fromCharCode((b & 31) << 6 | U & 63);
           } else
             c += f.substr(m, 6);
           m += 6;
         } else if (b >= 224) {
-          if (E - m >= 9) {
+          if (S - m >= 9) {
             var L = parseInt(f.substr(m + 4, 2), 16), J = parseInt(f.substr(m + 7, 2), 16);
             c += String.fromCharCode((b & 15) << 12 | (L & 63) << 6 | J & 63);
           } else
@@ -5882,23 +5420,23 @@ var uri$1 = {}, uri_all = { exports: {} };
       return c;
     }
     function G(f, c) {
-      function m(E) {
-        var b = x(E);
-        return b.match(c.UNRESERVED) ? b : E;
+      function m(S) {
+        var b = W(S);
+        return b.match(c.UNRESERVED) ? b : S;
       }
-      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, M).replace(c.PCT_ENCODED, a)), f.host !== void 0 && (f.host = String(f.host).replace(c.PCT_ENCODED, m).toLowerCase().replace(c.NOT_HOST, M).replace(c.PCT_ENCODED, a)), f.path !== void 0 && (f.path = String(f.path).replace(c.PCT_ENCODED, m).replace(f.scheme ? c.NOT_PATH : c.NOT_PATH_NOSCHEME, M).replace(c.PCT_ENCODED, a)), f.query !== void 0 && (f.query = String(f.query).replace(c.PCT_ENCODED, m).replace(c.NOT_QUERY, M).replace(c.PCT_ENCODED, a)), f.fragment !== void 0 && (f.fragment = String(f.fragment).replace(c.PCT_ENCODED, m).replace(c.NOT_FRAGMENT, M).replace(c.PCT_ENCODED, a)), 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, a)), f.host !== void 0 && (f.host = String(f.host).replace(c.PCT_ENCODED, m).toLowerCase().replace(c.NOT_HOST, q).replace(c.PCT_ENCODED, a)), 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, a)), f.query !== void 0 && (f.query = String(f.query).replace(c.PCT_ENCODED, m).replace(c.NOT_QUERY, q).replace(c.PCT_ENCODED, a)), f.fragment !== void 0 && (f.fragment = String(f.fragment).replace(c.PCT_ENCODED, m).replace(c.NOT_FRAGMENT, q).replace(c.PCT_ENCODED, a)), f;
     }
     function ne(f) {
       return f.replace(/^0*(.*)/, "$1") || "0";
     }
     function he(f, c) {
-      var m = f.match(c.IPV4ADDRESS) || [], E = S(m, 2), b = E[1];
+      var m = f.match(c.IPV4ADDRESS) || [], S = E(m, 2), b = S[1];
       return b ? b.split(".").map(ne).join(".") : f;
     }
-    function Ue(f, c) {
-      var m = f.match(c.IPV6ADDRESS) || [], E = S(m, 3), b = E[1], U = E[2];
+    function Le(f, c) {
+      var m = f.match(c.IPV6ADDRESS) || [], S = E(m, 3), b = S[1], U = S[2];
       if (b) {
-        for (var L = b.toLowerCase().split("::").reverse(), J = S(L, 2), Y = J[0], se = J[1], B = se ? se.split(":").map(ne) : [], Q = Y.split(":").map(ne), ie = c.IPV4ADDRESS.test(Q[Q.length - 1]), V = ie ? 7 : 8, X = Q.length - V, ae = Array(V), ee = 0; ee < V; ++ee)
+        for (var L = b.toLowerCase().split("::").reverse(), J = E(L, 2), Y = J[0], se = J[1], B = se ? se.split(":").map(ne) : [], Q = Y.split(":").map(ne), ie = c.IPV4ADDRESS.test(Q[Q.length - 1]), V = ie ? 7 : 8, X = Q.length - V, ae = Array(V), ee = 0; ee < V; ++ee)
           ae[ee] = B[ee] || Q[X + ee] || "";
         ie && (ae[V - 1] = he(ae[V - 1], c));
         var Ee = ae.reduce(function(fe, ye, je) {
@@ -5907,105 +5445,105 @@ var uri$1 = {}, uri_all = { exports: {} };
             we && we.index + we.length === je ? we.length++ : fe.push({ index: je, length: 1 });
           }
           return fe;
-        }, []), ge = Ee.sort(function(fe, ye) {
+        }, []), $e = Ee.sort(function(fe, ye) {
           return ye.length - fe.length;
-        })[0], $e = void 0;
-        if (ge && ge.length > 1) {
-          var xe = ae.slice(0, ge.index), Ie = ae.slice(ge.index + ge.length);
-          $e = xe.join(":") + "::" + Ie.join(":");
+        })[0], ge = void 0;
+        if ($e && $e.length > 1) {
+          var Be = ae.slice(0, $e.index), Ie = ae.slice($e.index + $e.length);
+          ge = Be.join(":") + "::" + Ie.join(":");
         } else
-          $e = ae.join(":");
-        return U && ($e += "%" + U), $e;
+          ge = ae.join(":");
+        return U && (ge += "%" + U), ge;
       } else
         return f;
     }
     var tt = /^(?:([^:\/?#]+):)?(?:\/\/((?:([^\/?#@]*)@)?(\[[^\/?#\]]+\]|[^\/?#:]*)(?:\:(\d*))?))?([^?#]*)(?:\?([^#]*))?(?:#((?:.|\n|\r)*))?/i, rt = "".match(/(){0}/)[1] === void 0;
     function de(f) {
-      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = {}, E = c.iri !== !1 ? g : u;
+      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = {}, S = c.iri !== !1 ? $ : d;
       c.reference === "suffix" && (f = (c.scheme ? c.scheme + ":" : "") + "//" + f);
       var b = f.match(tt);
       if (b) {
-        rt ? (m.scheme = b[1], m.userinfo = b[3], m.host = b[4], m.port = parseInt(b[5], 10), m.path = b[6] || "", m.query = b[7], m.fragment = b[8], isNaN(m.port) && (m.port = b[5])) : (m.scheme = b[1] || void 0, m.userinfo = f.indexOf("@") !== -1 ? b[3] : void 0, m.host = f.indexOf("//") !== -1 ? b[4] : void 0, m.port = parseInt(b[5], 10), m.path = b[6] || "", m.query = f.indexOf("?") !== -1 ? b[7] : void 0, m.fragment = f.indexOf("#") !== -1 ? b[8] : void 0, isNaN(m.port) && (m.port = f.match(/\/\/(?:.|\n)*\:(?:\/|\?|\#|$)/) ? b[4] : void 0)), m.host && (m.host = Ue(he(m.host, E), E)), 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 = q[(c.scheme || m.scheme || "").toLowerCase()];
+        rt ? (m.scheme = b[1], m.userinfo = b[3], m.host = b[4], m.port = parseInt(b[5], 10), m.path = b[6] || "", m.query = b[7], m.fragment = b[8], isNaN(m.port) && (m.port = b[5])) : (m.scheme = b[1] || void 0, m.userinfo = f.indexOf("@") !== -1 ? b[3] : void 0, m.host = f.indexOf("//") !== -1 ? b[4] : void 0, m.port = parseInt(b[5], 10), m.path = b[6] || "", m.query = f.indexOf("?") !== -1 ? b[7] : void 0, m.fragment = f.indexOf("#") !== -1 ? b[8] : void 0, isNaN(m.port) && (m.port = f.match(/\/\/(?:.|\n)*\:(?:\/|\?|\#|$)/) ? b[4] : void 0)), m.host && (m.host = Le(he(m.host, S), S)), m.scheme === void 0 && m.userinfo === void 0 && m.host === void 0 && m.port === void 0 && !m.path && m.query === void 0 ? m.reference = "same-document" : m.scheme === void 0 ? m.reference = "relative" : m.fragment === void 0 ? m.reference = "absolute" : m.reference = "uri", c.reference && c.reference !== "suffix" && c.reference !== m.reference && (m.error = m.error || "URI is not a " + c.reference + " reference.");
+        var U = M[(c.scheme || m.scheme || "").toLowerCase()];
         if (!c.unicodeSupport && (!U || !U.unicodeSupport)) {
           if (m.host && (c.domainHost || U && U.domainHost))
             try {
-              m.host = N.toASCII(m.host.replace(E.PCT_ENCODED, x).toLowerCase());
+              m.host = N.toASCII(m.host.replace(S.PCT_ENCODED, W).toLowerCase());
             } catch (L) {
               m.error = m.error || "Host's domain name can not be converted to ASCII via punycode: " + L;
             }
-          G(m, u);
+          G(m, d);
         } else
-          G(m, E);
+          G(m, S);
         U && U.parse && U.parse(m, c);
       } else
         m.error = m.error || "URI can not be parsed.";
       return m;
     }
     function nt(f, c) {
-      var m = c.iri !== !1 ? g : u, E = [];
-      return f.userinfo !== void 0 && (E.push(f.userinfo), E.push("@")), f.host !== void 0 && E.push(Ue(he(String(f.host), m), m).replace(m.IPV6ADDRESS, function(b, U, L) {
+      var m = c.iri !== !1 ? $ : d, S = [];
+      return f.userinfo !== void 0 && (S.push(f.userinfo), S.push("@")), f.host !== void 0 && S.push(Le(he(String(f.host), m), m).replace(m.IPV6ADDRESS, function(b, U, L) {
         return "[" + U + (L ? "%25" + L : "") + "]";
-      })), (typeof f.port == "number" || typeof f.port == "string") && (E.push(":"), E.push(String(f.port))), E.length ? E.join("") : void 0;
+      })), (typeof f.port == "number" || typeof f.port == "string") && (S.push(":"), S.push(String(f.port))), S.length ? S.join("") : void 0;
     }
-    var Le = /^\.\.?\//, He = /^\/\.(\/|$)/, ze = /^\/\.\.(\/|$)/, st = /^\/?(?:.|\n)*?(?=\/|$)/;
+    var He = /^\.\.?\//, ze = /^\/\.(\/|$)/, Ve = /^\/\.\.(\/|$)/, 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, "/");
+        if (f.match(He))
+          f = f.replace(He, "");
         else if (f.match(ze))
-          f = f.replace(ze, "/"), c.pop();
+          f = f.replace(ze, "/");
+        else if (f.match(Ve))
+          f = f.replace(Ve, "/"), c.pop();
         else if (f === "." || f === "..")
           f = "";
         else {
           var m = f.match(st);
           if (m) {
-            var E = m[0];
-            f = f.slice(E.length), c.push(E);
+            var S = m[0];
+            f = f.slice(S.length), c.push(S);
           } else
             throw new Error("Unexpected dot segment condition");
         }
       return c.join("");
     }
     function le(f) {
-      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = c.iri ? g : u, E = [], b = q[(c.scheme || f.scheme || "").toLowerCase()];
+      var c = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, m = c.iri ? $ : d, S = [], b = M[(c.scheme || f.scheme || "").toLowerCase()];
       if (b && b.serialize && b.serialize(f, c), f.host && !m.IPV6ADDRESS.test(f.host)) {
         if (c.domainHost || b && b.domainHost)
           try {
-            f.host = c.iri ? N.toUnicode(f.host) : N.toASCII(f.host.replace(m.PCT_ENCODED, x).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, m), c.reference !== "suffix" && f.scheme && (E.push(f.scheme), E.push(":"));
+      G(f, m), c.reference !== "suffix" && f.scheme && (S.push(f.scheme), S.push(":"));
       var U = nt(f, c);
-      if (U !== void 0 && (c.reference !== "suffix" && E.push("//"), E.push(U), f.path && f.path.charAt(0) !== "/" && E.push("/")), f.path !== void 0) {
+      if (U !== void 0 && (c.reference !== "suffix" && S.push("//"), S.push(U), f.path && f.path.charAt(0) !== "/" && S.push("/")), f.path !== void 0) {
         var L = f.path;
-        !c.absolutePath && (!b || !b.absolutePath) && (L = me(L)), U === void 0 && (L = L.replace(/^\/\//, "/%2F")), E.push(L);
+        !c.absolutePath && (!b || !b.absolutePath) && (L = me(L)), U === void 0 && (L = L.replace(/^\/\//, "/%2F")), S.push(L);
       }
-      return f.query !== void 0 && (E.push("?"), E.push(f.query)), f.fragment !== void 0 && (E.push("#"), E.push(f.fragment)), E.join("");
+      return f.query !== void 0 && (S.push("?"), S.push(f.query)), f.fragment !== void 0 && (S.push("#"), S.push(f.fragment)), S.join("");
     }
-    function Ve(f, c) {
-      var m = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, E = arguments[3], b = {};
-      return E || (f = de(le(f, m), m), c = de(le(c, m), m)), m = m || {}, !m.tolerant && c.scheme ? (b.scheme = c.scheme, b.userinfo = c.userinfo, b.host = c.host, b.port = c.port, b.path = me(c.path || ""), b.query = c.query) : (c.userinfo !== void 0 || c.host !== void 0 || c.port !== void 0 ? (b.userinfo = c.userinfo, b.host = c.host, b.port = c.port, b.path = me(c.path || ""), b.query = c.query) : (c.path ? (c.path.charAt(0) === "/" ? b.path = me(c.path) : ((f.userinfo !== void 0 || f.host !== void 0 || f.port !== void 0) && !f.path ? b.path = "/" + c.path : f.path ? b.path = f.path.slice(0, f.path.lastIndexOf("/") + 1) + c.path : b.path = c.path, b.path = me(b.path)), b.query = c.query) : (b.path = f.path, c.query !== void 0 ? b.query = c.query : b.query = f.query), b.userinfo = f.userinfo, b.host = f.host, b.port = f.port), b.scheme = f.scheme), b.fragment = c.fragment, b;
+    function xe(f, c) {
+      var m = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, S = arguments[3], b = {};
+      return S || (f = de(le(f, m), m), c = de(le(c, m), m)), m = m || {}, !m.tolerant && c.scheme ? (b.scheme = c.scheme, b.userinfo = c.userinfo, b.host = c.host, b.port = c.port, b.path = me(c.path || ""), b.query = c.query) : (c.userinfo !== void 0 || c.host !== void 0 || c.port !== void 0 ? (b.userinfo = c.userinfo, b.host = c.host, b.port = c.port, b.path = me(c.path || ""), b.query = c.query) : (c.path ? (c.path.charAt(0) === "/" ? b.path = me(c.path) : ((f.userinfo !== void 0 || f.host !== void 0 || f.port !== void 0) && !f.path ? b.path = "/" + c.path : f.path ? b.path = f.path.slice(0, f.path.lastIndexOf("/") + 1) + c.path : b.path = c.path, b.path = me(b.path)), b.query = c.query) : (b.path = f.path, c.query !== void 0 ? b.query = c.query : b.query = f.query), b.userinfo = f.userinfo, b.host = f.host, b.port = f.port), b.scheme = f.scheme), b.fragment = c.fragment, b;
     }
     function it(f, c, m) {
-      var E = p({ scheme: "null" }, m);
-      return le(Ve(de(f, E), de(c, E), E, !0), E);
+      var S = p({ scheme: "null" }, m);
+      return le(xe(de(f, S), de(c, S), S, !0), S);
     }
-    function Ce(f, c) {
+    function Oe(f, c) {
       return typeof f == "string" ? f = le(de(f, c), c) : i(f) === "object" && (f = de(le(f, c), c)), f;
     }
     function ot(f, c, m) {
       return typeof f == "string" ? f = le(de(f, m), m) : i(f) === "object" && (f = le(f, m)), typeof c == "string" ? c = le(de(c, m), m) : i(c) === "object" && (c = le(c, m)), f === c;
     }
     function ut(f, c) {
-      return f && f.toString().replace(!c || !c.iri ? u.ESCAPE : g.ESCAPE, M);
+      return f && f.toString().replace(!c || !c.iri ? d.ESCAPE : $.ESCAPE, q);
     }
     function pe(f, c) {
-      return f && f.toString().replace(!c || !c.iri ? u.PCT_ENCODED : g.PCT_ENCODED, x);
+      return f && f.toString().replace(!c || !c.iri ? d.PCT_ENCODED : $.PCT_ENCODED, W);
     }
     var Ne = {
       scheme: "http",
@@ -6014,8 +5552,8 @@ var uri$1 = {}, uri_all = { exports: {} };
         return c.host || (c.error = c.error || "HTTP URIs must have a host."), c;
       },
       serialize: function(c, m) {
-        var E = String(c.scheme).toLowerCase() === "https";
-        return (c.port === (E ? 443 : 80) || c.port === "") && (c.port = void 0), c.path || (c.path = "/"), 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;
       }
     }, It = {
       scheme: "https",
@@ -6030,12 +5568,12 @@ var uri$1 = {}, uri_all = { exports: {} };
       scheme: "ws",
       domainHost: !0,
       parse: function(c, m) {
-        var E = c;
-        return E.secure = jt(E), E.resourceName = (E.path || "/") + (E.query ? "?" + E.query : ""), E.path = void 0, E.query = void 0, E;
+        var S = c;
+        return S.secure = jt(S), S.resourceName = (S.path || "/") + (S.query ? "?" + S.query : ""), S.path = void 0, S.query = void 0, S;
       },
       serialize: function(c, m) {
         if ((c.port === (jt(c) ? 443 : 80) || c.port === "") && (c.port = void 0), typeof c.secure == "boolean" && (c.scheme = c.secure ? "wss" : "ws", c.secure = void 0), c.resourceName) {
-          var E = c.resourceName.split("?"), b = S(E, 2), U = b[0], L = b[1];
+          var S = c.resourceName.split("?"), b = E(S, 2), U = b[0], L = b[1];
           c.path = U && U !== "/" ? U : void 0, c.query = L, c.resourceName = void 0;
         }
         return c.fragment = void 0, c;
@@ -6046,16 +5584,16 @@ var uri$1 = {}, uri_all = { exports: {} };
       parse: at.parse,
       serialize: at.serialize
     }, ir = {}, At = "[A-Za-z0-9\\-\\.\\_\\~\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]", _e = "[0-9A-Fa-f]", or = s(s("%[EFef]" + _e + "%" + _e + _e + "%" + _e + _e) + "|" + s("%[89A-Fa-f]" + _e + "%" + _e + _e) + "|" + s("%" + _e + _e)), ar = "[A-Za-z0-9\\!\\$\\%\\'\\*\\+\\-\\^\\_\\`\\{\\|\\}\\~]", cr = "[\\!\\$\\%\\'\\(\\)\\*\\+\\,\\-\\.0-9\\<\\>A-Z\\x5E-\\x7E]", lr = n(cr, '[\\"\\\\]'), dr = "[\\!\\$\\'\\(\\)\\*\\+\\,\\;\\:\\@]", ur = new RegExp(At, "g"), We = new RegExp(or, "g"), pr = new RegExp(n("[^]", ar, "[\\.]", '[\\"]', lr), "g"), Ft = new RegExp(n("[^]", At, dr), "g"), fr = Ft;
-    function Ct(f) {
-      var c = x(f);
+    function Ot(f) {
+      var c = W(f);
       return c.match(ur) ? c : f;
     }
-    var qt = {
+    var Mt = {
       scheme: "mailto",
       parse: function(c, m) {
-        var E = c, b = E.to = E.path ? E.path.split(",") : [];
-        if (E.path = void 0, E.query) {
-          for (var U = !1, L = {}, J = E.query.split("&"), Y = 0, se = J.length; Y < se; ++Y) {
+        var S = c, b = S.to = S.path ? S.path.split(",") : [];
+        if (S.path = void 0, S.query) {
+          for (var U = !1, L = {}, J = S.query.split("&"), Y = 0, se = J.length; Y < se; ++Y) {
             var B = J[Y].split("=");
             switch (B[0]) {
               case "to":
@@ -6063,19 +5601,19 @@ var uri$1 = {}, uri_all = { exports: {} };
                   b.push(Q[ie]);
                 break;
               case "subject":
-                E.subject = pe(B[1], m);
+                S.subject = pe(B[1], m);
                 break;
               case "body":
-                E.body = pe(B[1], m);
+                S.body = pe(B[1], m);
                 break;
               default:
                 U = !0, L[pe(B[0], m)] = pe(B[1], m);
                 break;
             }
           }
-          U && (E.headers = L);
+          U && (S.headers = L);
         }
-        E.query = void 0;
+        S.query = void 0;
         for (var X = 0, ae = b.length; X < ae; ++X) {
           var ee = b[X].split("@");
           if (ee[0] = pe(ee[0]), m.unicodeSupport)
@@ -6084,46 +5622,46 @@ var uri$1 = {}, uri_all = { exports: {} };
             try {
               ee[1] = N.toASCII(pe(ee[1], m).toLowerCase());
             } catch (Ee) {
-              E.error = E.error || "Email address's domain name can not be converted to ASCII via punycode: " + Ee;
+              S.error = S.error || "Email address's domain name can not be converted to ASCII via punycode: " + Ee;
             }
           b[X] = ee.join("@");
         }
-        return E;
+        return S;
       },
       serialize: function(c, m) {
-        var E = c, b = l(c.to);
+        var S = c, b = l(c.to);
         if (b) {
           for (var U = 0, L = b.length; U < L; ++U) {
-            var J = String(b[U]), Y = J.lastIndexOf("@"), se = J.slice(0, Y).replace(We, Ct).replace(We, a).replace(pr, M), B = J.slice(Y + 1);
+            var J = String(b[U]), Y = J.lastIndexOf("@"), se = J.slice(0, Y).replace(We, Ot).replace(We, a).replace(pr, q), B = J.slice(Y + 1);
             try {
               B = m.iri ? N.toUnicode(B) : N.toASCII(pe(B, m).toLowerCase());
             } catch (X) {
-              E.error = E.error || "Email address's domain name can not be converted to " + (m.iri ? "Unicode" : "ASCII") + " via punycode: " + X;
+              S.error = S.error || "Email address's domain name can not be converted to " + (m.iri ? "Unicode" : "ASCII") + " via punycode: " + X;
             }
             b[U] = se + "@" + B;
           }
-          E.path = b.join(",");
+          S.path = b.join(",");
         }
         var Q = c.headers = c.headers || {};
         c.subject && (Q.subject = c.subject), c.body && (Q.body = c.body);
         var ie = [];
         for (var V in Q)
-          Q[V] !== ir[V] && ie.push(V.replace(We, Ct).replace(We, a).replace(Ft, M) + "=" + Q[V].replace(We, Ct).replace(We, a).replace(fr, M));
-        return ie.length && (E.query = ie.join("&")), E;
+          Q[V] !== ir[V] && ie.push(V.replace(We, Ot).replace(We, a).replace(Ft, q) + "=" + Q[V].replace(We, Ot).replace(We, a).replace(fr, q));
+        return ie.length && (S.query = ie.join("&")), S;
       }
-    }, hr = /^([^\:]+)\:(.*)/, Mt = {
+    }, hr = /^([^\:]+)\:(.*)/, qt = {
       scheme: "urn",
       parse: function(c, m) {
-        var E = c.path && c.path.match(hr), b = c;
-        if (E) {
-          var U = m.scheme || b.scheme || "urn", L = E[1].toLowerCase(), J = E[2], Y = U + ":" + (m.nid || L), se = q[Y];
+        var S = c.path && c.path.match(hr), b = c;
+        if (S) {
+          var U = m.scheme || b.scheme || "urn", L = S[1].toLowerCase(), J = S[2], Y = U + ":" + (m.nid || L), se = M[Y];
           b.nid = L, b.nss = J, b.path = void 0, se && (b = se.parse(b, m));
         } else
           b.error = b.error || "URN can not be parsed.";
         return b;
       },
       serialize: function(c, m) {
-        var E = m.scheme || c.scheme || "urn", b = c.nid, U = E + ":" + (m.nid || b), L = q[U];
+        var S = m.scheme || c.scheme || "urn", b = c.nid, U = S + ":" + (m.nid || b), L = M[U];
         L && (c = L.serialize(c, m));
         var J = c, Y = c.nss;
         return J.path = (b || m.nid) + ":" + Y, J;
@@ -6131,15 +5669,15 @@ var uri$1 = {}, uri_all = { exports: {} };
     }, mr = /^[0-9A-Fa-f]{8}(?:\-[0-9A-Fa-f]{4}){3}\-[0-9A-Fa-f]{12}$/, Ut = {
       scheme: "urn:uuid",
       parse: function(c, m) {
-        var E = c;
-        return E.uuid = E.nss, E.nss = void 0, !m.tolerant && (!E.uuid || !E.uuid.match(mr)) && (E.error = E.error || "UUID is not valid."), E;
+        var S = c;
+        return S.uuid = S.nss, S.nss = void 0, !m.tolerant && (!S.uuid || !S.uuid.match(mr)) && (S.error = S.error || "UUID is not valid."), S;
       },
       serialize: function(c, m) {
-        var E = c;
-        return E.nss = (c.uuid || "").toLowerCase(), E;
+        var S = c;
+        return S.nss = (c.uuid || "").toLowerCase(), S;
       }
     };
-    q[Ne.scheme] = Ne, q[It.scheme] = It, q[at.scheme] = at, q[Dt.scheme] = Dt, q[qt.scheme] = qt, q[Mt.scheme] = Mt, q[Ut.scheme] = Ut, r.SCHEMES = q, r.pctEncChar = M, r.pctDecChars = x, r.parse = de, r.removeDotSegments = me, r.serialize = le, r.resolveComponents = Ve, r.resolve = it, r.normalize = Ce, r.equal = ot, r.escapeComponent = ut, r.unescapeComponent = pe, Object.defineProperty(r, "__esModule", { value: !0 });
+    M[Ne.scheme] = Ne, M[It.scheme] = It, M[at.scheme] = at, M[Dt.scheme] = Dt, M[Mt.scheme] = Mt, M[qt.scheme] = qt, M[Ut.scheme] = Ut, r.SCHEMES = M, r.pctEncChar = q, r.pctDecChars = W, r.parse = de, r.removeDotSegments = me, r.serialize = le, r.resolveComponents = xe, r.resolve = it, r.normalize = Oe, r.equal = ot, r.escapeComponent = ut, r.unescapeComponent = pe, Object.defineProperty(r, "__esModule", { value: !0 });
   });
 })(uri_all, uri_all.exports);
 var uri_allExports = uri_all.exports;
@@ -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, i = rules, a = compile, l = codegen, p = resolve$1, d = dataType, u = util, g = require$$9, S = uri$1, T = (F, y) => new RegExp(F, y);
-  T.code = "new RegExp";
-  const v = ["removeAdditional", "useDefaults", "coerceTypes"], R = /* @__PURE__ */ new Set([
+  const n = validation_error, s = ref_error, i = rules, a = compile, l = codegen, p = resolve$1, u = dataType, d = util, $ = require$$9, E = uri$1, R = (F, y) => new RegExp(F, y);
+  R.code = "new RegExp";
+  const v = ["removeAdditional", "useDefaults", "coerceTypes"], T = /* @__PURE__ */ new Set([
     "validate",
     "serialize",
     "parse",
@@ -6183,7 +5721,7 @@ uri$1.default = uri;
     "func",
     "obj",
     "Error"
-  ]), $ = {
+  ]), g = {
     errorDataPath: "",
     format: "`validateFormats: false` can be used instead.",
     nullable: '"nullable" keyword is supported by default.',
@@ -6204,45 +5742,45 @@ uri$1.default = uri;
     jsPropertySyntax: "",
     unicode: '"minLength"/"maxLength" account for unicode characters by default.'
   }, k = 200;
-  function O(F) {
-    var y, j, P, o, h, N, q, M, x, G, ne, he, Ue, tt, rt, de, nt, Le, He, ze, st, me, le, Ve, it;
-    const Ce = F.strict, ot = (y = F.code) === null || y === void 0 ? void 0 : y.optimize, ut = ot === !0 || ot === void 0 ? 1 : ot || 0, pe = (P = (j = F.code) === null || j === void 0 ? void 0 : j.regExp) !== null && P !== void 0 ? P : T, Ne = (o = F.uriResolver) !== null && o !== void 0 ? o : S.default;
+  function C(F) {
+    var y, j, P, o, h, N, M, q, W, G, ne, he, Le, tt, rt, de, nt, He, ze, Ve, st, me, le, xe, it;
+    const Oe = F.strict, ot = (y = F.code) === null || y === void 0 ? void 0 : y.optimize, ut = ot === !0 || ot === void 0 ? 1 : ot || 0, pe = (P = (j = F.code) === null || j === void 0 ? void 0 : j.regExp) !== null && P !== void 0 ? P : R, Ne = (o = F.uriResolver) !== null && o !== void 0 ? o : E.default;
     return {
-      strictSchema: (N = (h = F.strictSchema) !== null && h !== void 0 ? h : Ce) !== null && N !== void 0 ? N : !0,
-      strictNumbers: (M = (q = F.strictNumbers) !== null && q !== void 0 ? q : Ce) !== null && M !== void 0 ? M : !0,
-      strictTypes: (G = (x = F.strictTypes) !== null && x !== void 0 ? x : Ce) !== null && G !== void 0 ? G : "log",
-      strictTuples: (he = (ne = F.strictTuples) !== null && ne !== void 0 ? ne : Ce) !== null && he !== void 0 ? he : "log",
-      strictRequired: (tt = (Ue = F.strictRequired) !== null && Ue !== void 0 ? Ue : Ce) !== null && tt !== void 0 ? tt : !1,
+      strictSchema: (N = (h = F.strictSchema) !== null && h !== void 0 ? h : Oe) !== null && N !== void 0 ? N : !0,
+      strictNumbers: (q = (M = F.strictNumbers) !== null && M !== void 0 ? M : Oe) !== null && q !== void 0 ? q : !0,
+      strictTypes: (G = (W = F.strictTypes) !== null && W !== void 0 ? W : Oe) !== null && G !== void 0 ? G : "log",
+      strictTuples: (he = (ne = F.strictTuples) !== null && ne !== void 0 ? ne : Oe) !== null && he !== void 0 ? he : "log",
+      strictRequired: (tt = (Le = F.strictRequired) !== null && Le !== void 0 ? Le : Oe) !== null && tt !== void 0 ? tt : !1,
       code: F.code ? { ...F.code, optimize: ut, regExp: pe } : { optimize: ut, regExp: pe },
       loopRequired: (rt = F.loopRequired) !== null && rt !== void 0 ? rt : 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: (ze = F.schemaId) !== null && ze !== void 0 ? ze : "$id",
+      messages: (He = F.messages) !== null && He !== void 0 ? He : !0,
+      inlineRefs: (ze = F.inlineRefs) !== null && ze !== void 0 ? ze : !0,
+      schemaId: (Ve = F.schemaId) !== null && Ve !== void 0 ? Ve : "$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: (it = F.int32range) !== null && it !== void 0 ? it : !0,
       uriResolver: Ne
     };
   }
   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, ...O(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: P } = this.opts.code;
-      this.scope = new l.ValueScope({ scope: {}, prefixes: R, es5: j, lines: P }), this.logger = K(y.logger);
+      this.scope = new l.ValueScope({ scope: {}, prefixes: T, es5: j, lines: P }), this.logger = K(y.logger);
       const o = y.validateFormats;
-      y.validateFormats = !1, this.RULES = (0, i.getRules)(), A.call(this, $, y, "NOT SUPPORTED"), A.call(this, _, y, "DEPRECATED", "warn"), this._metaOpts = W.call(this), y.formats && D.call(this), this._addVocabularies(), this._addDefaultMetaSchema(), y.keywords && z.call(this, y.keywords), typeof y.meta == "object" && this.addMetaSchema(y.meta), C.call(this), y.validateFormats = o;
+      y.validateFormats = !1, this.RULES = (0, i.getRules)(), A.call(this, g, y, "NOT SUPPORTED"), A.call(this, _, y, "DEPRECATED", "warn"), this._metaOpts = x.call(this), y.formats && D.call(this), this._addVocabularies(), this._addDefaultMetaSchema(), y.keywords && z.call(this, y.keywords), typeof y.meta == "object" && this.addMetaSchema(y.meta), O.call(this), y.validateFormats = o;
     }
     _addVocabularies() {
       this.addKeyword("$async");
     }
     _addDefaultMetaSchema() {
       const { $data: y, meta: j, schemaId: P } = this.opts;
-      let o = g;
-      P === "id" && (o = { ...g }, o.id = o.$id, delete o.$id), j && y && this.addMetaSchema(o, o[P], !1);
+      let o = $;
+      P === "id" && (o = { ...$ }, o.id = o.$id, delete o.$id), j && y && this.addMetaSchema(o, o[P], !1);
     }
     defaultMeta() {
       const { meta: y, schemaId: j } = this.opts;
@@ -6281,18 +5819,18 @@ 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) {
-        const ne = await x.call(this, 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);
       }
-      async function x(G) {
+      async function W(G) {
         const ne = this._loading[G];
         if (ne)
           return ne;
@@ -6396,14 +5934,14 @@ uri$1.default = uri;
       } else
         throw new Error("invalid addKeywords parameters");
       if (oe.call(this, P, j), !j)
-        return (0, u.eachItem)(P, (h) => ke.call(this, h)), this;
+        return (0, d.eachItem)(P, (h) => ke.call(this, h)), this;
       qe.call(this, j);
       const o = {
         ...j,
-        type: (0, d.getJSONTypes)(j.type),
-        schemaType: (0, d.getJSONTypes)(j.schemaType)
+        type: (0, u.getJSONTypes)(j.type),
+        schemaType: (0, u.getJSONTypes)(j.schemaType)
       };
-      return (0, u.eachItem)(P, o.type.length === 0 ? (h) => ke.call(this, h, o) : (h) => o.type.forEach((N) => ke.call(this, h, o, N))), this;
+      return (0, d.eachItem)(P, o.type.length === 0 ? (h) => ke.call(this, h, o) : (h) => o.type.forEach((N) => ke.call(this, h, o, N))), this;
     }
     getKeyword(y) {
       const j = this.RULES.all[y];
@@ -6432,14 +5970,14 @@ uri$1.default = uri;
       for (const o of j) {
         const h = o.split("/").slice(1);
         let N = y;
-        for (const q of h)
-          N = N[q];
-        for (const q in P) {
-          const M = P[q];
-          if (typeof M != "object")
+        for (const M of h)
+          N = N[M];
+        for (const M in P) {
+          const q = P[M];
+          if (typeof q != "object")
             continue;
-          const { $data: x } = M.definition, G = N[q];
-          x && G && (N[q] = Me(G));
+          const { $data: W } = q.definition, G = N[M];
+          W && G && (N[M] = Ue(G));
         }
       }
       return y;
@@ -6452,21 +5990,21 @@ uri$1.default = uri;
     }
     _addSchema(y, j, P, o = 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;
+      let q = this._cache.get(y);
+      if (q !== void 0)
+        return q;
       P = (0, p.normalizeId)(N || P);
-      const x = p.getSchemaRefs.call(this, y, P);
-      return M = new a.SchemaEnv({ schema: y, schemaId: q, meta: j, baseId: P, localRefs: x }), this._cache.set(M.schema, M), h && !P.startsWith("#") && (P && this._checkUnique(P), this.refs[P] = M), o && this.validateSchema(y, !0), M;
+      const W = p.getSchemaRefs.call(this, y, P);
+      return q = new a.SchemaEnv({ schema: y, schemaId: M, meta: j, baseId: P, localRefs: W }), this._cache.set(q.schema, q), h && !P.startsWith("#") && (P && this._checkUnique(P), this.refs[P] = q), o && this.validateSchema(y, !0), q;
     }
     _checkUnique(y) {
       if (this.schemas[y] || this.refs[y])
@@ -6497,7 +6035,7 @@ uri$1.default = uri;
   function w(F) {
     return F = (0, p.normalizeId)(F), this.schemas[F] || this.refs[F];
   }
-  function C() {
+  function O() {
     const F = this.opts.schemas;
     if (F)
       if (Array.isArray(F))
@@ -6523,7 +6061,7 @@ uri$1.default = uri;
       j.keyword || (j.keyword = y), this.addKeyword(j);
     }
   }
-  function W() {
+  function x() {
     const F = { ...this.opts };
     for (const y of v)
       delete F[y];
@@ -6545,7 +6083,7 @@ uri$1.default = uri;
   const ue = /^[a-z_$][a-z0-9_$:-]*$/i;
   function oe(F, y) {
     const { RULES: j } = this;
-    if ((0, u.eachItem)(F, (P) => {
+    if ((0, d.eachItem)(F, (P) => {
       if (j.keywords[P])
         throw new Error(`Keyword ${P} is already defined`);
       if (!ue.test(P))
@@ -6559,31 +6097,31 @@ uri$1.default = uri;
     if (j && o)
       throw new Error('keyword with "post" flag cannot have "type"');
     const { RULES: h } = this;
-    let N = o ? h.post : h.rules.find(({ type: M }) => M === j);
+    let N = o ? 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,
-        type: (0, d.getJSONTypes)(y.type),
-        schemaType: (0, d.getJSONTypes)(y.schemaType)
+        type: (0, u.getJSONTypes)(y.type),
+        schemaType: (0, u.getJSONTypes)(y.schemaType)
       }
     };
-    y.before ? Oe.call(this, N, q, y.before) : N.rules.push(q), h.all[F] = q, (P = y.implements) === null || P === void 0 || P.forEach((M) => this.addKeyword(M));
+    y.before ? Ce.call(this, N, M, y.before) : N.rules.push(M), h.all[F] = M, (P = y.implements) === null || P === void 0 || P.forEach((q) => this.addKeyword(q));
   }
-  function Oe(F, y, j) {
+  function Ce(F, y, j) {
     const P = F.rules.findIndex((o) => o.keyword === j);
     P >= 0 ? F.rules.splice(P, 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);
@@ -6603,34 +6141,34 @@ const ref_error_1 = ref_error, code_1$8 = code, codegen_1$l = codegen, names_1$1
   keyword: "$ref",
   schemaType: "string",
   code(e) {
-    const { gen: t, schema: r, it: n } = e, { baseId: s, schemaEnv: i, validateName: a, opts: l, self: p } = n, { root: d } = i;
-    if ((r === "#" || r === "#/") && s === d.baseId)
-      return g();
-    const u = compile_1$1.resolveRef.call(p, d, s, r);
-    if (u === void 0)
+    const { gen: t, schema: r, it: n } = e, { baseId: s, schemaEnv: i, validateName: a, opts: l, self: p } = n, { root: u } = i;
+    if ((r === "#" || r === "#/") && s === u.baseId)
+      return $();
+    const d = compile_1$1.resolveRef.call(p, u, s, r);
+    if (d === void 0)
       throw new ref_error_1.default(n.opts.uriResolver, s, r);
-    if (u instanceof compile_1$1.SchemaEnv)
-      return S(u);
-    return T(u);
-    function g() {
-      if (i === d)
+    if (d instanceof compile_1$1.SchemaEnv)
+      return E(d);
+    return R(d);
+    function $() {
+      if (i === u)
         return callRef(e, a, i, i.$async);
-      const v = t.scopeValue("root", { ref: d });
-      return callRef(e, (0, codegen_1$l._)`${v}.validate`, d, d.$async);
+      const v = t.scopeValue("root", { ref: u });
+      return callRef(e, (0, codegen_1$l._)`${v}.validate`, u, u.$async);
     }
-    function S(v) {
-      const R = getValidate(e, v);
-      callRef(e, R, v, v.$async);
+    function E(v) {
+      const T = getValidate(e, v);
+      callRef(e, T, v, v.$async);
     }
-    function T(v) {
-      const R = t.scopeValue("schema", l.code.source === !0 ? { ref: v, code: (0, codegen_1$l.stringify)(v) } : { ref: v }), $ = t.name("valid"), _ = e.subschema({
+    function R(v) {
+      const T = t.scopeValue("schema", l.code.source === !0 ? { ref: v, code: (0, codegen_1$l.stringify)(v) } : { ref: v }), g = t.name("valid"), _ = e.subschema({
         schema: v,
         dataTypes: [],
         schemaPath: codegen_1$l.nil,
-        topSchemaRef: R,
+        topSchemaRef: T,
         errSchemaPath: r
-      }, $);
-      e.mergeEvaluated(_), e.ok($);
+      }, g);
+      e.mergeEvaluated(_), e.ok(g);
     }
   }
 };
@@ -6640,40 +6178,40 @@ function getValidate(e, t) {
 }
 ref.getValidate = getValidate;
 function callRef(e, t, r, n) {
-  const { gen: s, it: i } = e, { allErrors: a, schemaEnv: l, opts: p } = i, d = p.passContext ? names_1$1.default.this : codegen_1$l.nil;
-  n ? u() : g();
-  function u() {
+  const { gen: s, it: i } = e, { allErrors: a, schemaEnv: l, opts: p } = i, u = p.passContext ? names_1$1.default.this : codegen_1$l.nil;
+  n ? d() : $();
+  function d() {
     if (!l.$async)
       throw new Error("async schema referenced by sync schema");
     const v = s.let("valid");
     s.try(() => {
-      s.code((0, codegen_1$l._)`await ${(0, code_1$8.callValidateCode)(e, t, d)}`), T(t), a || s.assign(v, !0);
-    }, (R) => {
-      s.if((0, codegen_1$l._)`!(${R} instanceof ${i.ValidationError})`, () => s.throw(R)), S(R), a || s.assign(v, !1);
+      s.code((0, codegen_1$l._)`await ${(0, code_1$8.callValidateCode)(e, t, u)}`), R(t), a || s.assign(v, !0);
+    }, (T) => {
+      s.if((0, codegen_1$l._)`!(${T} instanceof ${i.ValidationError})`, () => s.throw(T)), E(T), a || s.assign(v, !1);
     }), e.ok(v);
   }
-  function g() {
-    e.result((0, code_1$8.callValidateCode)(e, t, d), () => T(t), () => S(t));
+  function $() {
+    e.result((0, code_1$8.callValidateCode)(e, t, u), () => R(t), () => E(t));
   }
-  function S(v) {
-    const R = (0, codegen_1$l._)`${v}.errors`;
-    s.assign(names_1$1.default.vErrors, (0, codegen_1$l._)`${names_1$1.default.vErrors} === null ? ${R} : ${names_1$1.default.vErrors}.concat(${R})`), s.assign(names_1$1.default.errors, (0, codegen_1$l._)`${names_1$1.default.vErrors}.length`);
+  function E(v) {
+    const T = (0, codegen_1$l._)`${v}.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 T(v) {
-    var R;
+  function R(v) {
+    var T;
     if (!i.opts.unevaluated)
       return;
-    const $ = (R = r == null ? void 0 : r.validate) === null || R === void 0 ? void 0 : R.evaluated;
+    const g = (T = r == null ? void 0 : r.validate) === null || T === void 0 ? void 0 : T.evaluated;
     if (i.props !== !0)
-      if ($ && !$.dynamicProps)
-        $.props !== void 0 && (i.props = util_1$j.mergeEvaluated.props(s, $.props, i.props));
+      if (g && !g.dynamicProps)
+        g.props !== void 0 && (i.props = util_1$j.mergeEvaluated.props(s, g.props, i.props));
       else {
         const _ = s.var("props", (0, codegen_1$l._)`${v}.evaluated.props`);
         i.props = util_1$j.mergeEvaluated.props(s, _, i.props, codegen_1$l.Name);
       }
     if (i.items !== !0)
-      if ($ && !$.dynamicItems)
-        $.items !== void 0 && (i.items = util_1$j.mergeEvaluated.items(s, $.items, i.items));
+      if (g && !g.dynamicItems)
+        g.items !== void 0 && (i.items = util_1$j.mergeEvaluated.items(s, g.items, i.items));
       else {
         const _ = s.var("items", (0, codegen_1$l._)`${v}.evaluated.items`);
         i.items = util_1$j.mergeEvaluated.items(s, _, i.items, codegen_1$l.Name);
@@ -6816,37 +6354,37 @@ const code_1$6 = code, codegen_1$f = codegen, util_1$h = util, error$d = {
     if (!i && r.length === 0)
       return;
     const p = r.length >= l.loopRequired;
-    if (a.allErrors ? d() : u(), l.strictRequired) {
-      const T = e.parentSchema.properties, { definedProperties: v } = e.it;
-      for (const R of r)
-        if ((T == null ? void 0 : T[R]) === void 0 && !v.has(R)) {
-          const $ = a.schemaEnv.baseId + a.errSchemaPath, _ = `required property "${R}" is not defined at "${$}" (strictRequired)`;
+    if (a.allErrors ? u() : d(), l.strictRequired) {
+      const R = e.parentSchema.properties, { definedProperties: v } = e.it;
+      for (const T of r)
+        if ((R == null ? void 0 : R[T]) === void 0 && !v.has(T)) {
+          const g = a.schemaEnv.baseId + a.errSchemaPath, _ = `required property "${T}" is not defined at "${g}" (strictRequired)`;
           (0, util_1$h.checkStrictMode)(a, _, a.opts.strictRequired);
         }
     }
-    function d() {
+    function u() {
       if (p || i)
-        e.block$data(codegen_1$f.nil, g);
+        e.block$data(codegen_1$f.nil, $);
       else
-        for (const T of r)
-          (0, code_1$6.checkReportMissingProp)(e, T);
+        for (const R of r)
+          (0, code_1$6.checkReportMissingProp)(e, R);
     }
-    function u() {
-      const T = t.let("missing");
+    function d() {
+      const R = t.let("missing");
       if (p || i) {
         const v = t.let("valid", !0);
-        e.block$data(v, () => S(T, v)), e.ok(v);
+        e.block$data(v, () => E(R, v)), e.ok(v);
       } else
-        t.if((0, code_1$6.checkMissingProp)(e, r, T)), (0, code_1$6.reportMissingProp)(e, T), t.else();
+        t.if((0, code_1$6.checkMissingProp)(e, r, R)), (0, code_1$6.reportMissingProp)(e, R), t.else();
     }
-    function g() {
-      t.forOf("prop", n, (T) => {
-        e.setParams({ missingProperty: T }), t.if((0, code_1$6.noPropertyInData)(t, s, T, l.ownProperties), () => e.error());
+    function $() {
+      t.forOf("prop", n, (R) => {
+        e.setParams({ missingProperty: R }), t.if((0, code_1$6.noPropertyInData)(t, s, R, l.ownProperties), () => e.error());
       });
     }
-    function S(T, v) {
-      e.setParams({ missingProperty: T }), t.forOf(T, n, () => {
-        t.assign(v, (0, code_1$6.propertyInData)(t, s, T, l.ownProperties)), t.if((0, codegen_1$f.not)(v), () => {
+    function E(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), () => {
           e.error(), t.break();
         });
       }, codegen_1$f.nil);
@@ -6893,26 +6431,26 @@ const dataType_1 = dataType, codegen_1$d = codegen, util_1$g = util, equal_1$2 =
     const { gen: t, data: r, $data: n, schema: s, parentSchema: i, schemaCode: a, it: l } = e;
     if (!n && !s)
       return;
-    const p = t.let("valid"), d = i.items ? (0, dataType_1.getSchemaTypes)(i.items) : [];
-    e.block$data(p, u, (0, codegen_1$d._)`${a} === false`), e.ok(p);
-    function u() {
-      const v = t.let("i", (0, codegen_1$d._)`${r}.length`), R = t.let("j");
-      e.setParams({ i: v, j: R }), t.assign(p, !0), t.if((0, codegen_1$d._)`${v} > 1`, () => (g() ? S : T)(v, R));
+    const p = t.let("valid"), u = i.items ? (0, dataType_1.getSchemaTypes)(i.items) : [];
+    e.block$data(p, d, (0, codegen_1$d._)`${a} === false`), e.ok(p);
+    function d() {
+      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`, () => ($() ? E : R)(v, T));
     }
-    function g() {
-      return d.length > 0 && !d.some((v) => v === "object" || v === "array");
+    function $() {
+      return u.length > 0 && !u.some((v) => v === "object" || v === "array");
     }
-    function S(v, R) {
-      const $ = t.name("item"), _ = (0, dataType_1.checkDataTypes)(d, $, l.opts.strictNumbers, dataType_1.DataType.Wrong), k = t.const("indices", (0, codegen_1$d._)`{}`);
+    function E(v, T) {
+      const g = t.name("item"), _ = (0, dataType_1.checkDataTypes)(u, g, 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(_, (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(R, (0, codegen_1$d._)`${k}[${$}]`), e.error(), t.assign(p, !1).break();
-        }).code((0, codegen_1$d._)`${k}[${$}] = ${v}`);
+        t.let(g, (0, codegen_1$d._)`${r}[${v}]`), t.if(_, (0, codegen_1$d._)`continue`), u.length > 1 && t.if((0, codegen_1$d._)`typeof ${g} == "string"`, (0, codegen_1$d._)`${g} += "_"`), t.if((0, codegen_1$d._)`typeof ${k}[${g}] == "number"`, () => {
+          t.assign(T, (0, codegen_1$d._)`${k}[${g}]`), e.error(), t.assign(p, !1).break();
+        }).code((0, codegen_1$d._)`${k}[${g}] = ${v}`);
       });
     }
-    function T(v, R) {
-      const $ = (0, util_1$g.useFunc)(t, equal_1$2.default), _ = t.name("outer");
-      t.label(_).for((0, codegen_1$d._)`;${v}--;`, () => t.for((0, codegen_1$d._)`${R} = ${v}; ${R}--;`, () => t.if((0, codegen_1$d._)`${$}(${r}[${v}], ${r}[${R}])`, () => {
+    function R(v, T) {
+      const g = (0, util_1$g.useFunc)(t, equal_1$2.default), _ = t.name("outer");
+      t.label(_).for((0, codegen_1$d._)`;${v}--;`, () => t.for((0, codegen_1$d._)`${T} = ${v}; ${T}--;`, () => t.if((0, codegen_1$d._)`${g}(${r}[${v}], ${r}[${T}])`, () => {
         e.error(), t.assign(p, !1).break(_);
       })));
     }
@@ -6950,23 +6488,23 @@ const codegen_1$b = codegen, util_1$e = util, equal_1 = equal$1, error$9 = {
       throw new Error("enum must have non-empty array");
     const l = s.length >= a.opts.loopEnum;
     let p;
-    const d = () => p ?? (p = (0, util_1$e.useFunc)(t, equal_1.default));
-    let u;
+    const u = () => p ?? (p = (0, util_1$e.useFunc)(t, equal_1.default));
+    let d;
     if (l || n)
-      u = t.let("valid"), e.block$data(u, g);
+      d = t.let("valid"), e.block$data(d, $);
     else {
       if (!Array.isArray(s))
         throw new Error("ajv implementation error");
-      const T = t.const("vSchema", i);
-      u = (0, codegen_1$b.or)(...s.map((v, R) => S(T, R)));
+      const R = t.const("vSchema", i);
+      d = (0, codegen_1$b.or)(...s.map((v, T) => E(R, T)));
     }
-    e.pass(u);
-    function g() {
-      t.assign(u, !1), t.forOf("v", i, (T) => t.if((0, codegen_1$b._)`${d()}(${r}, ${T})`, () => t.assign(u, !0).break()));
+    e.pass(d);
+    function $() {
+      t.assign(d, !1), t.forOf("v", i, (R) => t.if((0, codegen_1$b._)`${u()}(${r}, ${R})`, () => t.assign(d, !0).break()));
     }
-    function S(T, v) {
-      const R = s[v];
-      return typeof R == "object" && R !== null ? (0, codegen_1$b._)`${d()}(${r}, ${T}[${v}])` : (0, codegen_1$b._)`${r} === ${R}`;
+    function E(R, v) {
+      const T = s[v];
+      return typeof T == "object" && T !== null ? (0, codegen_1$b._)`${u()}(${r}, ${R}[${v}])` : (0, codegen_1$b._)`${r} === ${T}`;
     }
   }
 };
@@ -7020,12 +6558,12 @@ function validateAdditionalItems(e, t) {
   if (n === !1)
     e.setParams({ len: t.length }), e.pass((0, codegen_1$a._)`${l} <= ${t.length}`);
   else if (typeof n == "object" && !(0, util_1$d.alwaysValidSchema)(a, n)) {
-    const d = r.var("valid", (0, codegen_1$a._)`${l} <= ${t.length}`);
-    r.if((0, codegen_1$a.not)(d), () => p(d)), e.ok(d);
+    const u = r.var("valid", (0, codegen_1$a._)`${l} <= ${t.length}`);
+    r.if((0, codegen_1$a.not)(u), () => p(u)), e.ok(u);
   }
-  function p(d) {
-    r.forRange("i", t.length, l, (u) => {
-      e.subschema({ keyword: i, dataProp: u, dataPropType: util_1$d.Type.Num }, d), a.allErrors || r.if((0, codegen_1$a.not)(d), () => r.break());
+  function p(u) {
+    r.forRange("i", t.length, l, (d) => {
+      e.subschema({ keyword: i, dataProp: d, dataPropType: util_1$d.Type.Num }, u), a.allErrors || r.if((0, codegen_1$a.not)(u), () => r.break());
     });
   }
 }
@@ -7048,20 +6586,20 @@ const codegen_1$9 = codegen, util_1$c = util, code_1$5 = code, def$f = {
 };
 function validateTuple(e, t, r = e.schema) {
   const { gen: n, parentSchema: s, data: i, keyword: a, 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._)`${i}.length`);
-  r.forEach((g, S) => {
-    (0, util_1$c.alwaysValidSchema)(l, g) || (n.if((0, codegen_1$9._)`${d} > ${S}`, () => e.subschema({
+  d(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"), u = n.const("len", (0, codegen_1$9._)`${i}.length`);
+  r.forEach(($, E) => {
+    (0, util_1$c.alwaysValidSchema)(l, $) || (n.if((0, codegen_1$9._)`${u} > ${E}`, () => e.subschema({
       keyword: a,
-      schemaProp: S,
-      dataProp: S
+      schemaProp: E,
+      dataProp: E
     }, p)), e.ok(p));
   });
-  function u(g) {
-    const { opts: S, errSchemaPath: T } = l, v = r.length, R = v === g.minItems && (v === g.maxItems || g[t] === !1);
-    if (S.strictTuples && !R) {
-      const $ = `"${a}" is ${v}-tuple, but minItems or maxItems/${t} are not specified or different at path "${T}"`;
-      (0, util_1$c.checkStrictMode)(l, $, S.strictTuples);
+  function d($) {
+    const { opts: E, errSchemaPath: R } = l, v = r.length, T = v === $.minItems && (v === $.maxItems || $[t] === !1);
+    if (E.strictTuples && !T) {
+      const g = `"${a}" is ${v}-tuple, but minItems or maxItems/${t} are not specified or different at path "${R}"`;
+      (0, util_1$c.checkStrictMode)(l, g, E.strictTuples);
     }
   }
 }
@@ -7108,9 +6646,9 @@ const codegen_1$7 = codegen, util_1$a = util, error$6 = {
   code(e) {
     const { gen: t, schema: r, parentSchema: n, data: s, it: i } = e;
     let a, l;
-    const { minContains: p, maxContains: d } = n;
-    i.opts.next ? (a = p === void 0 ? 1 : p, l = d) : a = 1;
-    const u = t.const("len", (0, codegen_1$7._)`${s}.length`);
+    const { minContains: p, maxContains: u } = n;
+    i.opts.next ? (a = p === void 0 ? 1 : p, l = u) : a = 1;
+    const d = t.const("len", (0, codegen_1$7._)`${s}.length`);
     if (e.setParams({ min: a, max: l }), l === void 0 && a === 0) {
       (0, util_1$a.checkStrictMode)(i, '"minContains" == 0 without "maxContains": "contains" keyword ignored');
       return;
@@ -7120,29 +6658,29 @@ const codegen_1$7 = codegen, util_1$a = util, error$6 = {
       return;
     }
     if ((0, util_1$a.alwaysValidSchema)(i, r)) {
-      let R = (0, codegen_1$7._)`${u} >= ${a}`;
-      l !== void 0 && (R = (0, codegen_1$7._)`${R} && ${u} <= ${l}`), e.pass(R);
+      let T = (0, codegen_1$7._)`${d} >= ${a}`;
+      l !== void 0 && (T = (0, codegen_1$7._)`${T} && ${d} <= ${l}`), e.pass(T);
       return;
     }
     i.items = !0;
-    const g = t.name("valid");
-    l === void 0 && a === 1 ? T(g, () => t.if(g, () => t.break())) : a === 0 ? (t.let(g, !0), l !== void 0 && t.if((0, codegen_1$7._)`${s}.length > 0`, S)) : (t.let(g, !1), S()), e.result(g, () => e.reset());
-    function S() {
-      const R = t.name("_valid"), $ = t.let("count", 0);
-      T(R, () => t.if(R, () => v($)));
-    }
-    function T(R, $) {
-      t.forRange("i", 0, u, (_) => {
+    const $ = t.name("valid");
+    l === void 0 && a === 1 ? R($, () => t.if($, () => t.break())) : a === 0 ? (t.let($, !0), l !== void 0 && t.if((0, codegen_1$7._)`${s}.length > 0`, E)) : (t.let($, !1), E()), e.result($, () => e.reset());
+    function E() {
+      const T = t.name("_valid"), g = t.let("count", 0);
+      R(T, () => t.if(T, () => v(g)));
+    }
+    function R(T, g) {
+      t.forRange("i", 0, d, (_) => {
         e.subschema({
           keyword: "contains",
           dataProp: _,
           dataPropType: util_1$a.Type.Num,
           compositeRule: !0
-        }, R), $();
+        }, T), g();
       });
     }
-    function v(R) {
-      t.code((0, codegen_1$7._)`${R}++`), l === void 0 ? t.if((0, codegen_1$7._)`${R} >= ${a}`, () => t.assign(g, !0).break()) : (t.if((0, codegen_1$7._)`${R} > ${l}`, () => t.assign(g, !1).break()), a === 1 ? t.assign(g, !0) : t.if((0, codegen_1$7._)`${R} >= ${a}`, () => t.assign(g, !0)));
+    function v(T) {
+      t.code((0, codegen_1$7._)`${T}++`), l === void 0 ? t.if((0, codegen_1$7._)`${T} >= ${a}`, () => t.assign($, !0).break()) : (t.if((0, codegen_1$7._)`${T} > ${l}`, () => t.assign($, !1).break()), a === 1 ? t.assign($, !0) : t.if((0, codegen_1$7._)`${T} >= ${a}`, () => t.assign($, !0)));
     }
   }
 };
@@ -7152,14 +6690,14 @@ var dependencies = {};
   Object.defineProperty(e, "__esModule", { value: !0 }), e.validateSchemaDeps = e.validatePropertyDeps = e.error = void 0;
   const t = codegen, r = util, n = code;
   e.error = {
-    message: ({ params: { property: p, depsCount: d, deps: u } }) => {
-      const g = d === 1 ? "property" : "properties";
-      return (0, t.str)`must have ${g} ${u} when property ${p} is present`;
+    message: ({ params: { property: p, depsCount: u, deps: d } }) => {
+      const $ = u === 1 ? "property" : "properties";
+      return (0, t.str)`must have ${$} ${d} when property ${p} is present`;
     },
-    params: ({ params: { property: p, depsCount: d, deps: u, missingProperty: g } }) => (0, t._)`{property: ${p},
-    missingProperty: ${g},
-    depsCount: ${d},
-    deps: ${u}}`
+    params: ({ params: { property: p, depsCount: u, deps: d, missingProperty: $ } }) => (0, t._)`{property: ${p},
+    missingProperty: ${$},
+    depsCount: ${u},
+    deps: ${d}}`
     // TODO change to reference
   };
   const s = {
@@ -7168,51 +6706,51 @@ var dependencies = {};
     schemaType: "object",
     error: e.error,
     code(p) {
-      const [d, u] = i(p);
-      a(p, d), l(p, u);
+      const [u, d] = i(p);
+      a(p, u), l(p, d);
     }
   };
   function i({ schema: p }) {
-    const d = {}, u = {};
-    for (const g in p) {
-      if (g === "__proto__")
+    const u = {}, d = {};
+    for (const $ in p) {
+      if ($ === "__proto__")
         continue;
-      const S = Array.isArray(p[g]) ? d : u;
-      S[g] = p[g];
+      const E = Array.isArray(p[$]) ? u : d;
+      E[$] = p[$];
     }
-    return [d, u];
+    return [u, d];
   }
-  function a(p, d = p.schema) {
-    const { gen: u, data: g, it: S } = p;
-    if (Object.keys(d).length === 0)
+  function a(p, u = p.schema) {
+    const { gen: d, data: $, it: E } = p;
+    if (Object.keys(u).length === 0)
       return;
-    const T = u.let("missing");
-    for (const v in d) {
-      const R = d[v];
-      if (R.length === 0)
+    const R = d.let("missing");
+    for (const v in u) {
+      const T = u[v];
+      if (T.length === 0)
         continue;
-      const $ = (0, n.propertyInData)(u, g, v, S.opts.ownProperties);
+      const g = (0, n.propertyInData)(d, $, v, E.opts.ownProperties);
       p.setParams({
         property: v,
-        depsCount: R.length,
-        deps: R.join(", ")
-      }), S.allErrors ? u.if($, () => {
-        for (const _ of R)
+        depsCount: T.length,
+        deps: T.join(", ")
+      }), E.allErrors ? d.if(g, () => {
+        for (const _ of T)
           (0, n.checkReportMissingProp)(p, _);
-      }) : (u.if((0, t._)`${$} && (${(0, n.checkMissingProp)(p, R, T)})`), (0, n.reportMissingProp)(p, T), u.else());
+      }) : (d.if((0, t._)`${g} && (${(0, n.checkMissingProp)(p, T, R)})`), (0, n.reportMissingProp)(p, R), d.else());
     }
   }
   e.validatePropertyDeps = a;
-  function l(p, d = p.schema) {
-    const { gen: u, data: g, keyword: S, it: T } = p, v = u.name("valid");
-    for (const R in d)
-      (0, r.alwaysValidSchema)(T, d[R]) || (u.if(
-        (0, n.propertyInData)(u, g, R, T.opts.ownProperties),
+  function l(p, u = p.schema) {
+    const { gen: d, data: $, keyword: E, it: R } = p, v = d.name("valid");
+    for (const T in u)
+      (0, r.alwaysValidSchema)(R, u[T]) || (d.if(
+        (0, n.propertyInData)(d, $, T, R.opts.ownProperties),
         () => {
-          const $ = p.subschema({ keyword: S, schemaProp: R }, v);
-          p.mergeValidEvaluated($, v);
+          const g = p.subschema({ keyword: E, schemaProp: T }, v);
+          p.mergeValidEvaluated(g, v);
         },
-        () => u.var(v, !0)
+        () => d.var(v, !0)
         // TODO var
       ), p.ok(v));
   }
@@ -7266,52 +6804,52 @@ const code_1$3 = code, codegen_1$5 = codegen, names_1 = names$1, util_1$8 = util
     const { allErrors: l, opts: p } = a;
     if (a.props = !0, p.removeAdditional !== "all" && (0, util_1$8.alwaysValidSchema)(a, r))
       return;
-    const d = (0, code_1$3.allSchemaProperties)(n.properties), u = (0, code_1$3.allSchemaProperties)(n.patternProperties);
-    g(), e.ok((0, codegen_1$5._)`${i} === ${names_1.default.errors}`);
-    function g() {
-      t.forIn("key", s, ($) => {
-        !d.length && !u.length ? v($) : t.if(S($), () => v($));
+    const u = (0, code_1$3.allSchemaProperties)(n.properties), d = (0, code_1$3.allSchemaProperties)(n.patternProperties);
+    $(), e.ok((0, codegen_1$5._)`${i} === ${names_1.default.errors}`);
+    function $() {
+      t.forIn("key", s, (g) => {
+        !u.length && !d.length ? v(g) : t.if(E(g), () => v(g));
       });
     }
-    function S($) {
+    function E(g) {
       let _;
-      if (d.length > 8) {
+      if (u.length > 8) {
         const k = (0, util_1$8.schemaRefOrVal)(a, n.properties, "properties");
-        _ = (0, code_1$3.isOwnProperty)(t, k, $);
+        _ = (0, code_1$3.isOwnProperty)(t, k, g);
       } else
-        d.length ? _ = (0, codegen_1$5.or)(...d.map((k) => (0, codegen_1$5._)`${$} === ${k}`)) : _ = codegen_1$5.nil;
-      return u.length && (_ = (0, codegen_1$5.or)(_, ...u.map((k) => (0, codegen_1$5._)`${(0, code_1$3.usePattern)(e, k)}.test(${$})`))), (0, codegen_1$5.not)(_);
+        u.length ? _ = (0, codegen_1$5.or)(...u.map((k) => (0, codegen_1$5._)`${g} === ${k}`)) : _ = codegen_1$5.nil;
+      return d.length && (_ = (0, codegen_1$5.or)(_, ...d.map((k) => (0, codegen_1$5._)`${(0, code_1$3.usePattern)(e, k)}.test(${g})`))), (0, codegen_1$5.not)(_);
     }
-    function T($) {
-      t.code((0, codegen_1$5._)`delete ${s}[${$}]`);
+    function R(g) {
+      t.code((0, codegen_1$5._)`delete ${s}[${g}]`);
     }
-    function v($) {
+    function v(g) {
       if (p.removeAdditional === "all" || p.removeAdditional && r === !1) {
-        T($);
+        R(g);
         return;
       }
       if (r === !1) {
-        e.setParams({ additionalProperty: $ }), e.error(), l || t.break();
+        e.setParams({ additionalProperty: g }), e.error(), l || t.break();
         return;
       }
       if (typeof r == "object" && !(0, util_1$8.alwaysValidSchema)(a, r)) {
         const _ = t.name("valid");
-        p.removeAdditional === "failing" ? (R($, _, !1), t.if((0, codegen_1$5.not)(_), () => {
-          e.reset(), T($);
-        })) : (R($, _), l || t.if((0, codegen_1$5.not)(_), () => t.break()));
+        p.removeAdditional === "failing" ? (T(g, _, !1), t.if((0, codegen_1$5.not)(_), () => {
+          e.reset(), R(g);
+        })) : (T(g, _), l || t.if((0, codegen_1$5.not)(_), () => t.break()));
       }
     }
-    function R($, _, k) {
-      const O = {
+    function T(g, _, k) {
+      const C = {
         keyword: "additionalProperties",
-        dataProp: $,
+        dataProp: g,
         dataPropType: util_1$8.Type.Str
       };
-      k === !1 && Object.assign(O, {
+      k === !1 && Object.assign(C, {
         compositeRule: !0,
         createErrors: !1,
         allErrors: !1
-      }), e.subschema(O, _);
+      }), e.subschema(C, _);
     }
   }
 };
@@ -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: i } = e;
     i.opts.removeAdditional === "all" && n.additionalProperties === void 0 && additionalProperties_1$1.default.code(new validate_1.KeywordCxt(i, additionalProperties_1$1.default, "additionalProperties"));
     const a = (0, code_1$2.allSchemaProperties)(r);
-    for (const g of a)
-      i.definedProperties.add(g);
+    for (const $ of a)
+      i.definedProperties.add($);
     i.opts.unevaluated && a.length && i.props !== !0 && (i.props = util_1$7.mergeEvaluated.props(t, (0, util_1$7.toHash)(a), i.props));
-    const l = a.filter((g) => !(0, util_1$7.alwaysValidSchema)(i, r[g]));
+    const l = a.filter(($) => !(0, util_1$7.alwaysValidSchema)(i, r[$]));
     if (l.length === 0)
       return;
     const p = t.name("valid");
-    for (const g of l)
-      d(g) ? u(g) : (t.if((0, code_1$2.propertyInData)(t, s, g, i.opts.ownProperties)), u(g), i.allErrors || t.else().var(p, !0), t.endIf()), e.it.definedProperties.add(g), e.ok(p);
-    function d(g) {
-      return i.opts.useDefaults && !i.compositeRule && r[g].default !== void 0;
+    for (const $ of l)
+      u($) ? d($) : (t.if((0, code_1$2.propertyInData)(t, s, $, i.opts.ownProperties)), d($), i.allErrors || t.else().var(p, !0), t.endIf()), e.it.definedProperties.add($), e.ok(p);
+    function u($) {
+      return i.opts.useDefaults && !i.compositeRule && r[$].default !== void 0;
     }
-    function u(g) {
+    function d($) {
       e.subschema({
         keyword: "properties",
-        schemaProp: g,
-        dataProp: g
+        schemaProp: $,
+        dataProp: $
       }, p);
     }
   }
@@ -7355,31 +6893,31 @@ const code_1$1 = code, codegen_1$4 = codegen, util_1$6 = util, util_2 = util, de
   type: "object",
   schemaType: "object",
   code(e) {
-    const { gen: t, schema: r, data: n, parentSchema: s, it: i } = e, { opts: a } = i, l = (0, code_1$1.allSchemaProperties)(r), p = l.filter((R) => (0, util_1$6.alwaysValidSchema)(i, r[R]));
+    const { gen: t, schema: r, data: n, parentSchema: s, it: i } = e, { opts: a } = i, l = (0, code_1$1.allSchemaProperties)(r), p = l.filter((T) => (0, util_1$6.alwaysValidSchema)(i, r[T]));
     if (l.length === 0 || p.length === l.length && (!i.opts.unevaluated || i.props === !0))
       return;
-    const d = a.strictSchema && !a.allowMatchingProperties && s.properties, u = t.name("valid");
+    const u = a.strictSchema && !a.allowMatchingProperties && s.properties, d = t.name("valid");
     i.props !== !0 && !(i.props instanceof codegen_1$4.Name) && (i.props = (0, util_2.evaluatedPropsToName)(t, i.props));
-    const { props: g } = i;
-    S();
-    function S() {
-      for (const R of l)
-        d && T(R), i.allErrors ? v(R) : (t.var(u, !0), v(R), t.if(u));
-    }
-    function T(R) {
-      for (const $ in d)
-        new RegExp(R).test($) && (0, util_1$6.checkStrictMode)(i, `property ${$} matches pattern ${R} (use allowMatchingProperties)`);
-    }
-    function v(R) {
-      t.forIn("key", n, ($) => {
-        t.if((0, codegen_1$4._)`${(0, code_1$1.usePattern)(e, R)}.test(${$})`, () => {
-          const _ = p.includes(R);
+    const { props: $ } = i;
+    E();
+    function E() {
+      for (const T of l)
+        u && R(T), i.allErrors ? v(T) : (t.var(d, !0), v(T), t.if(d));
+    }
+    function R(T) {
+      for (const g in u)
+        new RegExp(T).test(g) && (0, util_1$6.checkStrictMode)(i, `property ${g} matches pattern ${T} (use allowMatchingProperties)`);
+    }
+    function v(T) {
+      t.forIn("key", n, (g) => {
+        t.if((0, codegen_1$4._)`${(0, code_1$1.usePattern)(e, T)}.test(${g})`, () => {
+          const _ = p.includes(T);
           _ || e.subschema({
             keyword: "patternProperties",
-            schemaProp: R,
-            dataProp: $,
+            schemaProp: T,
+            dataProp: g,
             dataPropType: util_2.Type.Str
-          }, u), i.opts.unevaluated && g !== !0 ? t.assign((0, codegen_1$4._)`${g}[${$}]`, !0) : !_ && !i.allErrors && t.if((0, codegen_1$4.not)(u), () => t.break());
+          }, d), i.opts.unevaluated && $ !== !0 ? t.assign((0, codegen_1$4._)`${$}[${g}]`, !0) : !_ && !i.allErrors && t.if((0, codegen_1$4.not)(d), () => t.break());
         });
       });
     }
@@ -7436,16 +6974,16 @@ const codegen_1$3 = codegen, util_1$4 = util, error$3 = {
     if (s.opts.discriminator && n.discriminator)
       return;
     const i = r, a = t.let("valid", !1), l = t.let("passing", null), p = t.name("_valid");
-    e.setParams({ passing: l }), t.block(d), e.result(a, () => e.reset(), () => e.error(!0));
-    function d() {
-      i.forEach((u, g) => {
-        let S;
-        (0, util_1$4.alwaysValidSchema)(s, u) ? t.var(p, !0) : S = e.subschema({
+    e.setParams({ passing: l }), t.block(u), e.result(a, () => e.reset(), () => e.error(!0));
+    function u() {
+      i.forEach((d, $) => {
+        let E;
+        (0, util_1$4.alwaysValidSchema)(s, d) ? t.var(p, !0) : E = e.subschema({
           keyword: "oneOf",
-          schemaProp: g,
+          schemaProp: $,
           compositeRule: !0
-        }, p), g > 0 && t.if((0, codegen_1$3._)`${p} && ${a}`).assign(a, !1).assign(l, (0, codegen_1$3._)`[${l}, ${g}]`).else(), t.if(p, () => {
-          t.assign(a, !0), t.assign(l, g), S && e.mergeEvaluated(S, codegen_1$3.Name);
+        }, p), $ > 0 && t.if((0, codegen_1$3._)`${p} && ${a}`).assign(a, !1).assign(l, (0, codegen_1$3._)`[${l}, ${$}]`).else(), t.if(p, () => {
+          t.assign(a, !0), t.assign(l, $), E && e.mergeEvaluated(E, codegen_1$3.Name);
         });
       });
     }
@@ -7489,24 +7027,24 @@ const codegen_1$2 = codegen, util_1$2 = util, error$2 = {
       return;
     const a = t.let("valid", !0), l = t.name("_valid");
     if (p(), e.reset(), s && i) {
-      const u = t.let("ifClause");
-      e.setParams({ ifClause: u }), t.if(l, d("then", u), d("else", u));
+      const d = t.let("ifClause");
+      e.setParams({ ifClause: d }), t.if(l, u("then", d), u("else", d));
     } else
-      s ? t.if(l, d("then")) : t.if((0, codegen_1$2.not)(l), d("else"));
+      s ? t.if(l, u("then")) : t.if((0, codegen_1$2.not)(l), u("else"));
     e.pass(a, () => e.error(!0));
     function p() {
-      const u = e.subschema({
+      const d = e.subschema({
         keyword: "if",
         compositeRule: !0,
         createErrors: !1,
         allErrors: !1
       }, l);
-      e.mergeEvaluated(u);
+      e.mergeEvaluated(d);
     }
-    function d(u, g) {
+    function u(d, $) {
       return () => {
-        const S = e.subschema({ keyword: u }, l);
-        t.assign(a, l), e.mergeValidEvaluated(S, a), g ? t.assign(g, (0, codegen_1$2._)`${u}`) : e.setParams({ ifClause: u });
+        const E = e.subschema({ keyword: d }, l);
+        t.assign(a, l), e.mergeValidEvaluated(E, a), $ ? t.assign($, (0, codegen_1$2._)`${d}`) : e.setParams({ ifClause: d });
       };
     }
   }
@@ -7559,55 +7097,55 @@ const codegen_1$1 = codegen, error$1 = {
   $data: !0,
   error: error$1,
   code(e, t) {
-    const { gen: r, data: n, $data: s, schema: i, schemaCode: a, it: l } = e, { opts: p, errSchemaPath: d, schemaEnv: u, self: g } = l;
+    const { gen: r, data: n, $data: s, schema: i, schemaCode: a, it: l } = e, { opts: p, errSchemaPath: u, schemaEnv: d, self: $ } = l;
     if (!p.validateFormats)
       return;
-    s ? S() : T();
-    function S() {
+    s ? E() : R();
+    function E() {
       const v = r.scopeValue("formats", {
-        ref: g.formats,
+        ref: $.formats,
         code: p.code.formats
-      }), R = r.const("fDef", (0, codegen_1$1._)`${v}[${a}]`), $ = r.let("fType"), _ = r.let("format");
-      r.if((0, codegen_1$1._)`typeof ${R} == "object" && !(${R} instanceof RegExp)`, () => r.assign($, (0, codegen_1$1._)`${R}.type || "string"`).assign(_, (0, codegen_1$1._)`${R}.validate`), () => r.assign($, (0, codegen_1$1._)`"string"`).assign(_, R)), e.fail$data((0, codegen_1$1.or)(k(), O()));
+      }), T = r.const("fDef", (0, codegen_1$1._)`${v}[${a}]`), g = r.let("fType"), _ = r.let("format");
+      r.if((0, codegen_1$1._)`typeof ${T} == "object" && !(${T} instanceof RegExp)`, () => r.assign(g, (0, codegen_1$1._)`${T}.type || "string"`).assign(_, (0, codegen_1$1._)`${T}.validate`), () => r.assign(g, (0, codegen_1$1._)`"string"`).assign(_, 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._)`${a} && !${_}`;
       }
-      function O() {
-        const I = u.$async ? (0, codegen_1$1._)`(${R}.async ? await ${_}(${n}) : ${_}(${n}))` : (0, codegen_1$1._)`${_}(${n})`, A = (0, codegen_1$1._)`(typeof ${_} == "function" ? ${I} : ${_}.test(${n}))`;
-        return (0, codegen_1$1._)`${_} && ${_} !== true && ${$} === ${t} && !${A}`;
+      function C() {
+        const I = d.$async ? (0, codegen_1$1._)`(${T}.async ? await ${_}(${n}) : ${_}(${n}))` : (0, codegen_1$1._)`${_}(${n})`, A = (0, codegen_1$1._)`(typeof ${_} == "function" ? ${I} : ${_}.test(${n}))`;
+        return (0, codegen_1$1._)`${_} && ${_} !== true && ${g} === ${t} && !${A}`;
       }
     }
-    function T() {
-      const v = g.formats[i];
+    function R() {
+      const v = $.formats[i];
       if (!v) {
         k();
         return;
       }
       if (v === !0)
         return;
-      const [R, $, _] = O(v);
-      R === t && e.pass(I());
+      const [T, g, _] = C(v);
+      T === t && e.pass(I());
       function k() {
         if (p.strictSchema === !1) {
-          g.logger.warn(A());
+          $.logger.warn(A());
           return;
         }
         throw new Error(A());
         function A() {
-          return `unknown format "${i}" ignored in schema at path "${d}"`;
+          return `unknown format "${i}" ignored in schema at path "${u}"`;
         }
       }
-      function O(A) {
-        const w = A instanceof RegExp ? (0, codegen_1$1.regexpCode)(A) : p.code.formats ? (0, codegen_1$1._)`${p.code.formats}${(0, codegen_1$1.getProperty)(i)}` : void 0, C = r.scopeValue("formats", { key: i, ref: A, code: w });
-        return typeof A == "object" && !(A instanceof RegExp) ? [A.type || "string", A.validate, (0, codegen_1$1._)`${C}.validate`] : ["string", A, C];
+      function C(A) {
+        const w = A instanceof RegExp ? (0, codegen_1$1.regexpCode)(A) : p.code.formats ? (0, codegen_1$1._)`${p.code.formats}${(0, codegen_1$1.getProperty)(i)}` : void 0, O = r.scopeValue("formats", { key: i, ref: A, code: w });
+        return typeof A == "object" && !(A instanceof RegExp) ? [A.type || "string", A.validate, (0, codegen_1$1._)`${O}.validate`] : ["string", A, O];
       }
       function I() {
         if (typeof v == "object" && !(v instanceof RegExp) && v.async) {
-          if (!u.$async)
+          if (!d.$async)
             throw new Error("async format in sync schema");
           return (0, codegen_1$1._)`await ${_}(${n})`;
         }
-        return typeof $ == "function" ? (0, codegen_1$1._)`${_}(${n})` : (0, codegen_1$1._)`${_}.test(${n})`;
+        return typeof g == "function" ? (0, codegen_1$1._)`${_}(${n})` : (0, codegen_1$1._)`${_}.test(${n})`;
       }
     }
   }
@@ -7669,32 +7207,32 @@ const codegen_1 = codegen, types_1 = types, compile_1 = compile, util_1 = util,
       throw new Error("discriminator: mapping is not supported");
     if (!a)
       throw new Error("discriminator: requires oneOf keyword");
-    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 T = S();
+    const p = t.let("valid", !1), u = t.const("tag", (0, codegen_1._)`${r}${(0, codegen_1.getProperty)(l)}`);
+    t.if((0, codegen_1._)`typeof ${u} == "string"`, () => d(), () => e.error(!1, { discrError: types_1.DiscrError.Tag, tag: u, tagName: l })), e.ok(p);
+    function d() {
+      const R = E();
       t.if(!1);
-      for (const v in T)
-        t.elseIf((0, codegen_1._)`${d} === ${v}`), t.assign(p, g(T[v]));
-      t.else(), e.error(!1, { discrError: types_1.DiscrError.Mapping, tag: d, tagName: l }), t.endIf();
-    }
-    function g(T) {
-      const v = t.name("valid"), R = e.subschema({ keyword: "oneOf", schemaProp: T }, v);
-      return e.mergeEvaluated(R, codegen_1.Name), v;
-    }
-    function S() {
-      var T;
-      const v = {}, R = _(s);
-      let $ = !0;
+      for (const v in R)
+        t.elseIf((0, codegen_1._)`${u} === ${v}`), t.assign(p, $(R[v]));
+      t.else(), e.error(!1, { discrError: types_1.DiscrError.Mapping, tag: u, tagName: l }), t.endIf();
+    }
+    function $(R) {
+      const v = t.name("valid"), T = e.subschema({ keyword: "oneOf", schemaProp: R }, v);
+      return e.mergeEvaluated(T, codegen_1.Name), v;
+    }
+    function E() {
+      var R;
+      const v = {}, T = _(s);
+      let g = !0;
       for (let I = 0; I < a.length; I++) {
         let A = a[I];
         A != null && A.$ref && !(0, util_1.schemaHasRulesButRef)(A, i.self.RULES) && (A = compile_1.resolveRef.call(i.self, i.schemaEnv.root, i.baseId, A == null ? void 0 : A.$ref), A instanceof compile_1.SchemaEnv && (A = A.schema));
-        const w = (T = A == null ? void 0 : A.properties) === null || T === void 0 ? void 0 : T[l];
+        const w = (R = A == null ? void 0 : A.properties) === null || R === void 0 ? void 0 : R[l];
         if (typeof w != "object")
           throw new Error(`discriminator: oneOf subschemas (or referenced schemas) must have "properties/${l}"`);
-        $ = $ && (R || _(A)), k(w, I);
+        g = g && (T || _(A)), k(w, I);
       }
-      if (!$)
+      if (!g)
         throw new Error(`discriminator: "${l}" must be required`);
       return v;
       function _({ required: I }) {
@@ -7702,14 +7240,14 @@ const codegen_1 = codegen, types_1 = types, compile_1 = compile, util_1 = util,
       }
       function k(I, A) {
         if (I.const)
-          O(I.const, A);
+          C(I.const, A);
         else if (I.enum)
           for (const w of I.enum)
-            O(w, A);
+            C(w, A);
         else
           throw new Error(`discriminator: "properties/${l}" must have "const" or "enum"`);
       }
-      function O(I, A) {
+      function C(I, A) {
         if (typeof I != "string" || I in v)
           throw new Error(`discriminator: "${l}" values must be unique strings`);
         v[I] = A;
@@ -7977,31 +7515,31 @@ const $schema$1 = "http://json-schema.org/draft-07/schema#", $id = "http://json-
     }
   }
   e.exports = t = p, Object.defineProperty(t, "__esModule", { value: !0 }), t.default = p;
-  var d = validate;
+  var u = validate;
   Object.defineProperty(t, "KeywordCxt", { enumerable: !0, get: function() {
-    return d.KeywordCxt;
+    return u.KeywordCxt;
   } });
-  var u = codegen;
+  var d = codegen;
   Object.defineProperty(t, "_", { enumerable: !0, get: function() {
-    return u._;
+    return d._;
   } }), Object.defineProperty(t, "str", { enumerable: !0, get: function() {
-    return u.str;
+    return d.str;
   } }), Object.defineProperty(t, "stringify", { enumerable: !0, get: function() {
-    return u.stringify;
+    return d.stringify;
   } }), Object.defineProperty(t, "nil", { enumerable: !0, get: function() {
-    return u.nil;
+    return d.nil;
   } }), Object.defineProperty(t, "Name", { enumerable: !0, get: function() {
-    return u.Name;
+    return d.Name;
   } }), Object.defineProperty(t, "CodeGen", { enumerable: !0, get: function() {
-    return u.CodeGen;
+    return d.CodeGen;
   } });
-  var g = validation_error;
+  var $ = validation_error;
   Object.defineProperty(t, "ValidationError", { enumerable: !0, get: function() {
-    return g.default;
+    return $.default;
   } });
-  var S = ref_error;
+  var E = ref_error;
   Object.defineProperty(t, "MissingRefError", { enumerable: !0, get: function() {
-    return S.default;
+    return E.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, g;
+  var u, d, $;
   if (e = {
     ...e,
     steps: (e.steps || []).filter(isStepDefinition)
@@ -9500,17 +8989,17 @@ function compileBlueprint(e, {
     step: "setSiteOptions",
     options: e.siteOptions
   }), e.plugins) {
-    const S = e.plugins.map((T) => typeof T == "string" ? T.startsWith("https://") ? {
+    const E = e.plugins.map((R) => typeof R == "string" ? R.startsWith("https://") ? {
       resource: "url",
-      url: T
+      url: R
     } : {
       resource: "wordpress.org/plugins",
-      slug: T
-    } : T).map((T) => ({
+      slug: R
+    } : R).map((R) => ({
       step: "installPlugin",
-      pluginZipFile: T
+      pluginZipFile: R
     }));
-    e.steps.unshift(...S);
+    e.steps.unshift(...E);
   }
   e.login && e.steps.push({
     step: "login",
@@ -9518,19 +9007,19 @@ function compileBlueprint(e, {
   });
   const { valid: s, errors: i } = validateBlueprint(e);
   if (!s) {
-    const S = new Error(
+    const E = new Error(
       `Invalid blueprint: ${i[0].message} at ${i[0].instancePath}`
     );
-    throw S.errors = i, S;
+    throw E.errors = i, E;
   }
   const a = e.steps || [], l = a.reduce(
-    (S, T) => {
+    (E, R) => {
       var v;
-      return S + (((v = T.progress) == null ? void 0 : v.weight) || 1);
+      return E + (((v = R.progress) == null ? void 0 : v.weight) || 1);
     },
     0
   ), p = a.map(
-    (S) => compileStep(S, {
+    (E) => compileStep(E, {
       semaphore: r,
       rootProgressTracker: t,
       totalProgressWeight: l
@@ -9539,11 +9028,11 @@ function compileBlueprint(e, {
   return {
     versions: {
       php: compileVersion(
-        (d = e.preferredVersions) == null ? void 0 : d.php,
+        (u = e.preferredVersions) == null ? void 0 : u.php,
         SupportedPHPVersions,
         LatestSupportedPHPVersion
       ),
-      wp: ((u = e.preferredVersions) == null ? void 0 : u.wp) || "latest"
+      wp: ((d = e.preferredVersions) == null ? void 0 : d.wp) || "latest"
     },
     phpExtensions: compilePHPExtensions(
       [],
@@ -9551,30 +9040,30 @@ function compileBlueprint(e, {
     ),
     features: {
       // Disable networking by default
-      networking: ((g = e.features) == null ? void 0 : g.networking) ?? !1
+      networking: (($ = e.features) == null ? void 0 : $.networking) ?? !1
     },
-    run: async (S) => {
+    run: async (E) => {
       try {
-        for (const { resources: T } of p)
-          for (const v of T)
-            v.setPlayground(S), v.isAsync && v.resolve();
-        for (const [T, { run: v, step: R }] of Object.entries(p))
+        for (const { resources: R } of p)
+          for (const v of R)
+            v.setPlayground(E), v.isAsync && v.resolve();
+        for (const [R, { run: v, step: T }] of Object.entries(p))
           try {
-            const $ = await v(S);
-            n($, R);
-          } catch ($) {
+            const g = await v(E);
+            n(g, T);
+          } catch (g) {
             throw new Error(
-              `Error when executing the blueprint step #${T} (${JSON.stringify(
-                R
+              `Error when executing the blueprint step #${R} (${JSON.stringify(
+                T
               )}). Inspect the cause of this error for more details`,
               {
-                cause: $
+                cause: g
               }
             );
           }
       } finally {
         try {
-          await S.goTo(
+          await E.goTo(
             e.landingPage || "/"
           );
         } catch {
@@ -9622,35 +9111,35 @@ function compileStep(e, {
   rootProgressTracker: r,
   totalProgressWeight: n
 }) {
-  var u;
+  var d;
   const s = r.stage(
-    (((u = e.progress) == null ? void 0 : u.weight) || 1) / n
+    (((d = e.progress) == null ? void 0 : d.weight) || 1) / n
   ), i = {};
-  for (const g of Object.keys(e)) {
-    let S = e[g];
-    isFileReference(S) && (S = Resource.create(S, {
+  for (const $ of Object.keys(e)) {
+    let E = e[$];
+    isFileReference(E) && (E = Resource.create(E, {
       semaphore: t
-    })), i[g] = S;
+    })), i[$] = E;
   }
-  const a = async (g) => {
-    var S;
+  const a = async ($) => {
+    var E;
     try {
       return s.fillSlowly(), await stepHandlers[e.step](
-        g,
+        $,
         await resolveArguments(i),
         {
           tracker: s,
-          initialCaption: (S = e.progress) == null ? void 0 : S.caption
+          initialCaption: (E = e.progress) == null ? void 0 : E.caption
         }
       );
     } finally {
       s.finish();
     }
   }, l = getResources(i), p = getResources(i).filter(
-    (g) => g.isAsync
-  ), d = 1 / (p.length + 1);
-  for (const g of p)
-    g.progress = s.stage(d);
+    ($) => $.isAsync
+  ), u = 1 / (p.length + 1);
+  for (const $ of p)
+    $.progress = s.stage(u);
   return { run: a, step: e, resources: l };
 }
 function getResources(e) {
@@ -9677,7 +9166,6 @@ function setPluginProxyURL() {
 export {
   activatePlugin,
   activateTheme,
-  applyWordPressPatches,
   compileBlueprint,
   cp,
   defineSiteUrl,