From 4256d25c7d59a11b1ecde9165d4866cd4a49e8e2 Mon Sep 17 00:00:00 2001
From: Mari <reya.git@reya.zone>
Date: Sat, 20 Jan 2024 00:45:19 -0800
Subject: [PATCH] almost done with the web interface...

---
 .gitignore                                    |    2 +-
 .idea/codeStyles/Project.xml                  |    3 +-
 LICENSE                                       |    2 +-
 README.md                                     |   26 +-
 ..._rollable_tables_from_the_database_too.sql |   25 +-
 package-lock.json                             | 2245 +++++++++++++++--
 package.json                                  |   10 +-
 ...nt.ts => bundle-client-with-source-map.ts} |    4 +-
 src/build/bundler.ts                          |   67 +-
 .../check-source-map-and-bundle-client.ts     |   10 +-
 src/client/attribution.less                   |   28 +
 src/client/basic-look.less                    |   35 +-
 ...combined-generator-responses-entrypoint.ts |    2 +
 src/client/generator-entrypoint.less          |   26 +-
 src/client/generator-entrypoint.ts            |  244 ++
 src/client/noscript-entrypoint.less           |    2 +-
 src/client/onload.ts                          |    7 +
 src/client/popup.less                         |   46 +
 src/client/popup.ts                           |   19 +
 src/client/pulse.less                         |   15 +
 src/client/pulse.ts                           |    6 +
 src/client/responses-entrypoint.less          |   11 +-
 src/client/responses-entrypoint.ts            |   16 +
 src/client/scraper.ts                         |  244 ++
 src/client/tsconfig.json                      |    6 +-
 src/common/bbcode.ts                          |    6 +
 src/common/bundle.ts                          |   17 +-
 src/common/rolltable.ts                       |  169 +-
 src/{server/web => common}/template.ts        |   94 +-
 src/common/tsconfig.json                      |   11 +
 src/server/db/database.ts                     |  349 +--
 src/server/db/queries.ts                      |  422 +---
 src/server/db/querytypes.ts                   |   10 +-
 src/server/db/transformers.ts                 |   10 +-
 src/server/discord/commands.ts                |    6 +-
 src/server/discord/embed.ts                   |    9 +-
 src/server/discord/router.ts                  |    6 +-
 src/server/entrypoint.ts                      |   10 +-
 src/server/request/query.ts                   |    4 +-
 tsconfig.json => src/server/tsconfig.json     |    0
 src/server/web/{ => bundles}/sourcemaps.ts    |    5 +-
 src/server/web/router.ts                      |   44 +-
 wrangler.toml                                 |   10 +-
 43 files changed, 3307 insertions(+), 976 deletions(-)
 rename src/build/{bundle-client.ts => bundle-client-with-source-map.ts} (87%)
 create mode 100644 src/client/onload.ts
 create mode 100644 src/client/popup.less
 create mode 100644 src/client/popup.ts
 create mode 100644 src/client/pulse.less
 create mode 100644 src/client/pulse.ts
 create mode 100644 src/client/scraper.ts
 create mode 100644 src/common/bbcode.ts
 rename src/{server/web => common}/template.ts (52%)
 create mode 100644 src/common/tsconfig.json
 rename tsconfig.json => src/server/tsconfig.json (100%)
 rename src/server/web/{ => bundles}/sourcemaps.ts (78%)

diff --git a/.gitignore b/.gitignore
index d4398ba..13081a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -173,4 +173,4 @@ dist
 
 # generated bundles from src/client
 
-src/server/web/client.generated.ts
+src/server/web/bundles/client.generated.ts
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 40e03b9..cfa58e6 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -9,6 +9,7 @@
       <option name="USE_DOUBLE_QUOTES" value="false" />
       <option name="FORCE_QUOTE_STYlE" value="true" />
       <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="USE_EXPLICIT_JS_EXTENSION" value="FALSE" />
       <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
       <option name="SPACES_WITHIN_IMPORTS" value="true" />
     </JSCodeStyleSettings>
@@ -18,7 +19,7 @@
       <option name="USE_DOUBLE_QUOTES" value="false" />
       <option name="FORCE_QUOTE_STYlE" value="true" />
       <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="USE_EXPLICIT_JS_EXTENSION" value="TRUE" />
+      <option name="USE_EXPLICIT_JS_EXTENSION" value="FALSE" />
       <option name="USE_IMPORT_TYPE" value="ALWAYS" />
       <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
       <option name="SPACES_WITHIN_IMPORTS" value="true" />
diff --git a/LICENSE b/LICENSE
index 9904ebf..9eb682d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2024 DeliciousReya
+Copyright (c) 2024 DeliciousReya
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/README.md b/README.md
index 31353f2..bc07477 100644
--- a/README.md
+++ b/README.md
@@ -64,11 +64,27 @@ responses are not private.
 ## Credits
 
 * Icon source: [obsid1an on DeviantArt](https://www.deviantart.com/obsid1an/art/Slot-Machine-Game-Icon-341475642)
-* Writing for default responses by [Ssublissive](https://aryion.com/g4/gallery/Ssublissive), with additional writing by
-	[DeliciousReya](https://aryion.com/g4/gallery/DeliciousReya), [Seina](https://aryion.com/g4/user/RediQ),
+* Writing for default response sets by [Ssublissive](https://aryion.com/g4/gallery/Ssublissive), with additional writing
+	by [DeliciousReya](https://aryion.com/g4/gallery/DeliciousReya), [Seina](https://aryion.com/g4/user/RediQ),
 	and [sushisama](https://arsenicteacups.carrd.co/).
-* Development by [DeliciousReya](https://aryion.com/g4/gallery/DeliciousReya), using
-	[slash-create](https://slash-create.js.org/#/), [discord-snowflake](https://github.com/ianmitchell/interaction-kit/tree/main/packages/discord-snowflake), [itty-router](https://github.com/kwhitley/itty-router),
-	and [typed-html](https://github.com/nicojs/typed-html).
+* UX testing by a :dolphin: friend.
+* Development by [DeliciousReya](https://aryion.com/g4/gallery/DeliciousReya) in [TypeScript](https://www.typescriptlang.org/), using
+	* [slash-create](https://slash-create.js.org/#/) and [discord-snowflake](https://github.com/ianmitchell/interaction-kit/tree/main/packages/discord-snowflake#readme) for Discord management,
+  * [itty-router](https://github.com/kwhitley/itty-router#readme), [escape-html](https://github.com/component/escape-html#readme),
+    [markdown-escape](https://github.com/kemitchell/markdown-escape.js#readme), [slug](https://github.com/Trott/slug#readme), and [collapse-white-space](https://github.com/wooorm/collapse-white-space#readme) for response generation,
+  * [less](https://lesscss.org) with [clean-css](https://github.com/clean-css/clean-css) and [babel](https://babeljs.io/) with [terser](https://terser.org/) for pretty and small client code,
+  * [rollup](https://rollupjs.org/) with [plugin-commonjs](https://github.com/rollup/plugins/tree/master/packages/commonjs/#readme)/[plugin-node-resolve](https://github.com/rollup/plugins/tree/master/packages/node-resolve/#readme)/[plugin-ts](https://github.com/wessberg/rollup-plugin-ts#readme)/[plugin-terser](https://github.com/rollup/plugins/tree/master/packages/terser#readme) for complete client bundles,
+  * and [camelcase](https://github.com/sindresorhus/camelcase#readme) and [fast-deep-equal](https://github.com/epoberezkin/fast-deep-equal#readme) for keeping the client bundles and their source maps up to date.
 * Hosted on [CloudFlare Workers](https://developers.cloudflare.com/workers/)
 	with [D1](https://developers.cloudflare.com/d1/).
+
+## License (MIT)
+
+Copyright (c) 2024 DeliciousReya and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/migrations/0002_load_rollable_tables_from_the_database_too.sql b/migrations/0002_load_rollable_tables_from_the_database_too.sql
index e1fd398..94d9030 100644
--- a/migrations/0002_load_rollable_tables_from_the_database_too.sql
+++ b/migrations/0002_load_rollable_tables_from_the_database_too.sql
@@ -146,26 +146,27 @@ BEGIN
 	UPDATE responses SET tableId = NEW.id WHERE tableId = OLD.id;
 END;
 
-CREATE TRIGGER IF NOT EXISTS rollableTableHeaderUpdate
-	AFTER UPDATE OF badge
+CREATE TRIGGER IF NOT EXISTS rollableTableBadgeUpdate
+	AFTER UPDATE
 	ON rollableTables
 	FOR EACH ROW
-	WHEN NOT EXISTS (SELECT id
-									 FROM rollableTableBadges
-									 WHERE badge = NEW.badge
-										 AND tableId = NEW.badge)
+	WHEN OLD.badge != NEW.badge AND NOT EXISTS (SELECT id
+																							FROM rollableTableBadges
+																							WHERE badge = NEW.badge
+																								AND tableId = NEW.id)
 BEGIN
-	INSERT INTO rollableTableHeaders (header, tableId) VALUES (NEW.badge, NEW.id);
+	INSERT INTO rollableTableBadges (badge, tableId)
+	VALUES (NEW.badge, NEW.id);
 END;
 
 CREATE TRIGGER IF NOT EXISTS rollableTableHeaderUpdate
-	AFTER UPDATE OF header
+	AFTER UPDATE
 	ON rollableTables
 	FOR EACH ROW
-	WHEN NOT EXISTS (SELECT id
-									 FROM rollableTableHeaders
-									 WHERE header = NEW.header
-										 AND tableId = NEW.id)
+	WHEN OLD.header != NEW.header AND NOT EXISTS (SELECT id
+																								FROM rollableTableHeaders
+																								WHERE header = NEW.header
+																									AND tableId = NEW.id)
 BEGIN
 	INSERT INTO rollableTableHeaders (header, tableId) VALUES (NEW.header, NEW.id);
 END;
diff --git a/package-lock.json b/package-lock.json
index d400674..bac1c25 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,30 +11,36 @@
         "collapse-white-space": "^2.1.0",
         "discord-snowflake": "^2.0.0",
         "escape-html": "^1.0.3",
-        "html-minifier": "^4.0.0",
         "itty-router": "^4.0.26",
         "markdown-escape": "^2.0.0",
         "slash-create": "^6.0.2",
         "slug": "^8.2.3"
       },
       "devDependencies": {
+        "@babel/core": "^7.23.7",
+        "@babel/plugin-transform-runtime": "^7.23.7",
+        "@babel/preset-env": "^7.23.8",
         "@babel/preset-typescript": "^7.23.3",
+        "@babel/runtime": "^7.23.8",
         "@cloudflare/workers-types": "^4.20231218.0",
         "@rollup/plugin-babel": "^6.0.4",
+        "@rollup/plugin-commonjs": "^25.0.7",
+        "@rollup/plugin-node-resolve": "^15.2.3",
         "@rollup/plugin-terser": "^0.4.4",
-        "@rollup/plugin-typescript": "^11.1.6",
         "@types/clean-css": "^4.2.11",
         "@types/escape-html": "^1.0.4",
-        "@types/html-minifier": "^4.0.5",
         "@types/less": "^3.0.6",
         "@types/markdown-escape": "^1.1.3",
         "@types/slug": "^5.0.7",
+        "babel": "^6.23.0",
         "camelcase": "^8.0.0",
         "clean-css": "^5.3.3",
         "fast-deep-equal": "^3.1.3",
         "less": "^4.2.0",
         "rollup": "^4.9.5",
+        "rollup-plugin-ts": "^3.4.5",
         "source-map": "^0.7.4",
+        "terser": "^5.27.0",
         "tsx": "^4.7.0",
         "typescript": "^5.0.4",
         "wrangler": "^3.0.0"
@@ -45,7 +51,6 @@
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
       "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
@@ -72,7 +77,6 @@
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
       "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -82,7 +86,6 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz",
       "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.23.5",
@@ -113,7 +116,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -123,7 +125,6 @@
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
       "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/types": "^7.23.6",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -139,7 +140,6 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.21.tgz",
       "integrity": "sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -157,12 +157,23 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
+      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.22.15"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/helper-compilation-targets": {
       "version": "7.23.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
       "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/compat-data": "^7.23.5",
         "@babel/helper-validator-option": "^7.23.5",
@@ -179,7 +190,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -216,6 +226,48 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
+      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
+      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
     "node_modules/@babel/helper-environment-visitor": {
       "version": "7.22.20",
       "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
@@ -243,7 +295,6 @@
       "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
       "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -315,6 +366,23 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
+      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-wrap-function": "^7.22.20"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/helper-replace-supers": {
       "version": "7.22.20",
       "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
@@ -395,53 +463,1163 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helpers": {
-      "version": "7.23.8",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.8.tgz",
-      "integrity": "sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==",
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
+      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.22.19"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.23.8",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.8.tgz",
+      "integrity": "sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.23.7",
+        "@babel/types": "^7.23.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
+      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz",
+      "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz",
+      "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.23.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.13.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz",
+      "integrity": "sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-assertions": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz",
+      "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz",
+      "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
+      "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz",
+      "integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz",
+      "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-generator-functions": {
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz",
+      "integrity": "sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.20",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
+      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.20"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz",
+      "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz",
+      "integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-properties": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz",
+      "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-static-block": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz",
+      "integrity": "sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.23.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz",
+      "integrity": "sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.23.6",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.20",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz",
+      "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/template": "^7.22.15"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz",
+      "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz",
+      "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz",
+      "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz",
+      "integrity": "sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz",
+      "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-export-namespace-from": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz",
+      "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz",
+      "integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz",
+      "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-json-strings": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz",
+      "integrity": "sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz",
+      "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz",
+      "integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz",
+      "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz",
+      "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.23.3",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz",
+      "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.23.3",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz",
+      "integrity": "sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.23.3",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz",
+      "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.23.3",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
+      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz",
+      "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz",
+      "integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-numeric-separator": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz",
+      "integrity": "sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-rest-spread": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz",
+      "integrity": "sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.23.3",
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.23.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz",
+      "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.20"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz",
+      "integrity": "sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz",
+      "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz",
+      "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-methods": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz",
+      "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-property-in-object": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz",
+      "integrity": "sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz",
+      "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz",
+      "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "regenerator-transform": "^0.15.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz",
+      "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime": {
+      "version": "7.23.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.7.tgz",
+      "integrity": "sha512-fa0hnfmiXc9fq/weK34MUV0drz2pOL/vfKWvN7Qw127hiUPabFCUMgAbYWcchRzMJit4o5ARsK/s+5h0249pLw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "babel-plugin-polyfill-corejs2": "^0.4.7",
+        "babel-plugin-polyfill-corejs3": "^0.8.7",
+        "babel-plugin-polyfill-regenerator": "^0.5.4",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz",
+      "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz",
+      "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz",
+      "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz",
+      "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz",
+      "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.7",
-        "@babel/types": "^7.23.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+    "node_modules/@babel/plugin-transform-typescript": {
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.6.tgz",
+      "integrity": "sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.23.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-typescript": "^7.23.3"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/parser": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
-      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz",
+      "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==",
       "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-jsx": {
+    "node_modules/@babel/plugin-transform-unicode-property-regex": {
       "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
-      "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz",
+      "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==",
       "dev": true,
       "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -451,12 +1629,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-typescript": {
+    "node_modules/@babel/plugin-transform-unicode-regex": {
       "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz",
-      "integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz",
+      "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==",
       "dev": true,
       "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -466,33 +1645,108 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
+    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
       "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz",
-      "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz",
+      "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-simple-access": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.6.tgz",
-      "integrity": "sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==",
+    "node_modules/@babel/preset-env": {
+      "version": "7.23.8",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.8.tgz",
+      "integrity": "sha512-lFlpmkApLkEP6woIKprO6DO60RImpatTQKtz4sUcDjVcK8M8mQ4sZsuxaTMNOZf0sqAq/ReYW1ZBHnOQwKpLWA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.23.6",
+        "@babel/compat-data": "^7.23.5",
+        "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-typescript": "^7.23.3"
+        "@babel/helper-validator-option": "^7.23.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.23.3",
+        "@babel/plugin-syntax-import-attributes": "^7.23.3",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.23.3",
+        "@babel/plugin-transform-async-generator-functions": "^7.23.7",
+        "@babel/plugin-transform-async-to-generator": "^7.23.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
+        "@babel/plugin-transform-block-scoping": "^7.23.4",
+        "@babel/plugin-transform-class-properties": "^7.23.3",
+        "@babel/plugin-transform-class-static-block": "^7.23.4",
+        "@babel/plugin-transform-classes": "^7.23.8",
+        "@babel/plugin-transform-computed-properties": "^7.23.3",
+        "@babel/plugin-transform-destructuring": "^7.23.3",
+        "@babel/plugin-transform-dotall-regex": "^7.23.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
+        "@babel/plugin-transform-dynamic-import": "^7.23.4",
+        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
+        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
+        "@babel/plugin-transform-for-of": "^7.23.6",
+        "@babel/plugin-transform-function-name": "^7.23.3",
+        "@babel/plugin-transform-json-strings": "^7.23.4",
+        "@babel/plugin-transform-literals": "^7.23.3",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
+        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
+        "@babel/plugin-transform-modules-amd": "^7.23.3",
+        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
+        "@babel/plugin-transform-modules-systemjs": "^7.23.3",
+        "@babel/plugin-transform-modules-umd": "^7.23.3",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.23.3",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
+        "@babel/plugin-transform-numeric-separator": "^7.23.4",
+        "@babel/plugin-transform-object-rest-spread": "^7.23.4",
+        "@babel/plugin-transform-object-super": "^7.23.3",
+        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
+        "@babel/plugin-transform-optional-chaining": "^7.23.4",
+        "@babel/plugin-transform-parameters": "^7.23.3",
+        "@babel/plugin-transform-private-methods": "^7.23.3",
+        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
+        "@babel/plugin-transform-property-literals": "^7.23.3",
+        "@babel/plugin-transform-regenerator": "^7.23.3",
+        "@babel/plugin-transform-reserved-words": "^7.23.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
+        "@babel/plugin-transform-spread": "^7.23.3",
+        "@babel/plugin-transform-sticky-regex": "^7.23.3",
+        "@babel/plugin-transform-template-literals": "^7.23.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
+        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
+        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "babel-plugin-polyfill-corejs2": "^0.4.7",
+        "babel-plugin-polyfill-corejs3": "^0.8.7",
+        "babel-plugin-polyfill-regenerator": "^0.5.4",
+        "core-js-compat": "^3.31.0",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -501,6 +1755,29 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/preset-env/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.6-no-external-plugins",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
+      }
+    },
     "node_modules/@babel/preset-typescript": {
       "version": "7.23.3",
       "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz",
@@ -520,6 +1797,24 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
+      "dev": true
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.23.8",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.8.tgz",
+      "integrity": "sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/template": {
       "version": "7.22.15",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
@@ -539,7 +1834,6 @@
       "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
       "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.23.5",
         "@babel/generator": "^7.23.6",
@@ -1133,6 +2427,12 @@
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
+    "node_modules/@mdn/browser-compat-data": {
+      "version": "5.5.7",
+      "resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.5.7.tgz",
+      "integrity": "sha512-DoHTZ/TjtNfUu9eiqJd+x3IcCQrhS+yOYU436TKUnlE36jZwNbK535D1CmTsSYdi/UcdCWNm5KRQZ9g1tlZCPw==",
+      "dev": true
+    },
     "node_modules/@rollup/plugin-babel": {
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-6.0.4.tgz",
@@ -1159,21 +2459,24 @@
         }
       }
     },
-    "node_modules/@rollup/plugin-terser": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
-      "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
+    "node_modules/@rollup/plugin-commonjs": {
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.7.tgz",
+      "integrity": "sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==",
       "dev": true,
       "dependencies": {
-        "serialize-javascript": "^6.0.1",
-        "smob": "^1.0.0",
-        "terser": "^5.17.4"
+        "@rollup/pluginutils": "^5.0.1",
+        "commondir": "^1.0.1",
+        "estree-walker": "^2.0.2",
+        "glob": "^8.0.3",
+        "is-reference": "1.2.1",
+        "magic-string": "^0.30.3"
       },
       "engines": {
         "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "rollup": "^2.0.0||^3.0.0||^4.0.0"
+        "rollup": "^2.68.0||^3.0.0||^4.0.0"
       },
       "peerDependenciesMeta": {
         "rollup": {
@@ -1181,28 +2484,67 @@
         }
       }
     },
-    "node_modules/@rollup/plugin-typescript": {
-      "version": "11.1.6",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.1.6.tgz",
-      "integrity": "sha512-R92yOmIACgYdJ7dJ97p4K69I8gg6IEHt8M7dUBxN3W6nrO8uUxX5ixl0yU/N3aZTi8WhPuICvOHXQvF6FaykAA==",
+    "node_modules/@rollup/plugin-commonjs/node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true
+    },
+    "node_modules/@rollup/plugin-commonjs/node_modules/magic-string": {
+      "version": "0.30.5",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
+      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@rollup/plugin-node-resolve": {
+      "version": "15.2.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
+      "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==",
       "dev": true,
       "dependencies": {
-        "@rollup/pluginutils": "^5.1.0",
+        "@rollup/pluginutils": "^5.0.1",
+        "@types/resolve": "1.20.2",
+        "deepmerge": "^4.2.2",
+        "is-builtin-module": "^3.2.1",
+        "is-module": "^1.0.0",
         "resolve": "^1.22.1"
       },
       "engines": {
         "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "rollup": "^2.14.0||^3.0.0||^4.0.0",
-        "tslib": "*",
-        "typescript": ">=3.7.0"
+        "rollup": "^2.78.0||^3.0.0||^4.0.0"
       },
       "peerDependenciesMeta": {
         "rollup": {
           "optional": true
-        },
-        "tslib": {
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-terser": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
+      "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
+      "dev": true,
+      "dependencies": {
+        "serialize-javascript": "^6.0.1",
+        "smob": "^1.0.0",
+        "terser": "^5.17.4"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
           "optional": true
         }
       }
@@ -1435,17 +2777,6 @@
       "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
       "dev": true
     },
-    "node_modules/@types/html-minifier": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier/-/html-minifier-4.0.5.tgz",
-      "integrity": "sha512-LfE7f7MFd+YUfZnlBz8W43P4NgSObWiqyKapANsWCj63Aqeqli8/9gVsGP4CwC8jPpTTYlTopKCk9rJSuht/ew==",
-      "dev": true,
-      "dependencies": {
-        "@types/clean-css": "*",
-        "@types/relateurl": "*",
-        "@types/uglify-js": "*"
-      }
-    },
     "node_modules/@types/less": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/less/-/less-3.0.6.tgz",
@@ -1476,10 +2807,22 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/relateurl": {
-      "version": "0.2.33",
-      "resolved": "https://registry.npmjs.org/@types/relateurl/-/relateurl-0.2.33.tgz",
-      "integrity": "sha512-bTQCKsVbIdzLqZhLkF5fcJQreE4y1ro4DIyVrlDNSCJRRwHhB8Z+4zXXa8jN6eDvc2HbRsEYgbvrnGvi54EpSw==",
+    "node_modules/@types/object-path": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/@types/object-path/-/object-path-0.11.4.tgz",
+      "integrity": "sha512-4tgJ1Z3elF/tOMpA8JLVuR9spt9Ynsf7+JjqsQ2IqtiPJtcLoHoXcT6qU4E10cPFqyXX5HDm9QwIzZhBSkLxsw==",
+      "dev": true
+    },
+    "node_modules/@types/resolve": {
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
+      "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
+      "dev": true
+    },
+    "node_modules/@types/semver": {
+      "version": "7.5.6",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
+      "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
       "dev": true
     },
     "node_modules/@types/slug": {
@@ -1488,22 +2831,19 @@
       "integrity": "sha512-u5T21+PqfRpHszRWSv5gJYDIkm6lmYUXLjZVYvQyWNO9aC0zs+a11qqtbxbsNRiNLTmw0Xi+5NWK/Qz+JjaB9w==",
       "dev": true
     },
-    "node_modules/@types/uglify-js": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.4.tgz",
-      "integrity": "sha512-Hm/T0kV3ywpJyMGNbsItdivRhYNCQQf1IIsYsXnoVPES4t+FMLyDe0/K+Ea7ahWtMtSNb22ZdY7MIyoD9rqARg==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
+    "node_modules/@types/ua-parser-js": {
+      "version": "0.7.39",
+      "resolved": "https://registry.npmjs.org/@types/ua-parser-js/-/ua-parser-js-0.7.39.tgz",
+      "integrity": "sha512-P/oDfpofrdtF5xw433SPALpdSchtJmY7nsJItf8h3KXqOslkbySh8zq4dSWXH2oTjRvJ5PczVEoCZPow6GicLg==",
+      "dev": true
     },
-    "node_modules/@types/uglify-js/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/@wessberg/stringutil": {
+      "version": "1.0.19",
+      "resolved": "https://registry.npmjs.org/@wessberg/stringutil/-/stringutil-1.0.19.tgz",
+      "integrity": "sha512-9AZHVXWlpN8Cn9k5BC/O0Dzb9E9xfEMXzYrNunwvkUTvuK7xgQPVRZpLo+jWCOZ5r8oBa8NIrHuPEu1hzbb6bg==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8.0.0"
       }
     },
     "node_modules/acorn": {
@@ -1527,6 +2867,15 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -1561,6 +2910,88 @@
         "printable-characters": "^1.0.42"
       }
     },
+    "node_modules/babel": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel/-/babel-6.23.0.tgz",
+      "integrity": "sha512-ZDcCaI8Vlct8PJ3DvmyqUz+5X2Ylz3ZuuItBe/74yXosk2dwyVo/aN7MCJ8HJzhnnJ+6yP4o+lDgG9MBe91DLA==",
+      "deprecated": "In 6.x, the babel package has been deprecated in favor of babel-cli. Check https://opencollective.com/babel to support the Babel maintainers",
+      "dev": true,
+      "bin": {
+        "babel": "lib/cli.js",
+        "babel-external-helpers": "lib/cli.js",
+        "babel-node": "lib/cli.js"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.4.8",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz",
+      "integrity": "sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.22.6",
+        "@babel/helper-define-polyfill-provider": "^0.5.0",
+        "semver": "^6.3.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.8.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz",
+      "integrity": "sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.4.4",
+        "core-js-compat": "^3.33.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz",
+      "integrity": "sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz",
+      "integrity": "sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.5.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -1576,6 +3007,15 @@
       "integrity": "sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==",
       "dev": true
     },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/braces": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
@@ -1607,7 +3047,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001565",
         "electron-to-chromium": "^1.4.601",
@@ -1621,19 +3060,83 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
+    "node_modules/browserslist-generator": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/browserslist-generator/-/browserslist-generator-2.1.0.tgz",
+      "integrity": "sha512-ZFz4mAOgqm0cbwKaZsfJbYDbTXGoPANlte7qRsRJOfjB9KmmISQrXJxAVrnXG8C8v/QHNzXyeJt0Cfcks6zZvQ==",
+      "dev": true,
+      "dependencies": {
+        "@mdn/browser-compat-data": "^5.3.7",
+        "@types/object-path": "^0.11.1",
+        "@types/semver": "^7.5.0",
+        "@types/ua-parser-js": "^0.7.36",
+        "browserslist": "^4.21.10",
+        "caniuse-lite": "^1.0.30001518",
+        "isbot": "^3.6.13",
+        "object-path": "^0.11.8",
+        "semver": "^7.5.4",
+        "ua-parser-js": "^1.0.35"
+      },
+      "engines": {
+        "node": ">=16.15.1",
+        "npm": ">=7.0.0",
+        "pnpm": ">=3.2.0",
+        "yarn": ">=1.13"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/wessberg/browserslist-generator?sponsor=1"
+      }
+    },
+    "node_modules/browserslist-generator/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/browserslist-generator/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/browserslist-generator/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
-    "node_modules/camel-case": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-      "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
-      "dependencies": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
+    "node_modules/builtin-modules": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/camelcase": {
@@ -1666,8 +3169,7 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ],
-      "peer": true
+      ]
     },
     "node_modules/capnp-ts": {
       "version": "0.7.0",
@@ -1777,14 +3279,35 @@
     "node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true
+    },
+    "node_modules/compatfactory": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/compatfactory/-/compatfactory-3.0.0.tgz",
+      "integrity": "sha512-WD5kF7koPwVoyKL8p0LlrmIZtilrD46sQStyzzxzTFinMKN2Dxk1hN+sddLSQU1mGIZvQfU8c+ONSghvvM40jg==",
+      "dev": true,
+      "dependencies": {
+        "helpertypes": "^0.0.19"
+      },
+      "engines": {
+        "node": ">=14.9.0"
+      },
+      "peerDependencies": {
+        "typescript": ">=3.x || >= 4.x || >= 5.x"
+      }
     },
     "node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/cookie": {
       "version": "0.5.0",
@@ -1807,6 +3330,37 @@
         "url": "https://github.com/sponsors/mesqueeb"
       }
     },
+    "node_modules/core-js-compat": {
+      "version": "3.35.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.0.tgz",
+      "integrity": "sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.22.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/crosspath": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/crosspath/-/crosspath-2.0.0.tgz",
+      "integrity": "sha512-ju88BYCQ2uvjO2bR+SsgLSTwTSctU+6Vp2ePbKPgSCZyy4MWZxYsT738DlKVRE5utUjobjPRm1MkTYKJxCmpTA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^17.0.36"
+      },
+      "engines": {
+        "node": ">=14.9.0"
+      }
+    },
+    "node_modules/crosspath/node_modules/@types/node": {
+      "version": "17.0.45",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
+      "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
+      "dev": true
+    },
     "node_modules/data-uri-to-buffer": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-2.0.2.tgz",
@@ -1830,6 +3384,15 @@
         }
       }
     },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/discord-snowflake": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/discord-snowflake/-/discord-snowflake-2.0.0.tgz",
@@ -1842,8 +3405,7 @@
       "version": "1.4.637",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.637.tgz",
       "integrity": "sha512-G7j3UCOukFtxVO1vWrPQUoDk3kL70mtvjc/DC/k2o7lE0wAdq+Vwp1ipagOow+BH0uVztFysLWbkM/RTIrbK3w==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/errno": {
       "version": "0.1.8",
@@ -1900,7 +3462,6 @@
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -1928,6 +3489,15 @@
       "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
       "dev": true
     },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/eventemitter3": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
@@ -1963,6 +3533,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -1991,7 +3567,6 @@
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -2027,6 +3602,25 @@
         "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
       }
     },
+    "node_modules/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/glob-parent": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -2050,7 +3644,6 @@
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=4"
       }
@@ -2083,51 +3676,13 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/html-minifier": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz",
-      "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==",
-      "dependencies": {
-        "camel-case": "^3.0.0",
-        "clean-css": "^4.2.1",
-        "commander": "^2.19.0",
-        "he": "^1.2.0",
-        "param-case": "^2.1.1",
-        "relateurl": "^0.2.7",
-        "uglify-js": "^3.5.1"
-      },
-      "bin": {
-        "html-minifier": "cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/html-minifier/node_modules/clean-css": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
-      "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
-      "dependencies": {
-        "source-map": "~0.6.0"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/html-minifier/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/helpertypes": {
+      "version": "0.0.19",
+      "resolved": "https://registry.npmjs.org/helpertypes/-/helpertypes-0.0.19.tgz",
+      "integrity": "sha512-J00e55zffgi3yVnUp0UdbMztNkr2PnizEkOe9URNohnrNhW5X0QpegkuLpOmFQInpi93Nb8MCjQRHAiCDF42NQ==",
+      "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.0.0"
       }
     },
     "node_modules/iconv-lite": {
@@ -2156,6 +3711,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -2168,6 +3739,21 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-builtin-module": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
+      "dev": true,
+      "dependencies": {
+        "builtin-modules": "^3.3.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-core-module": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
@@ -2201,6 +3787,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
+      "dev": true
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -2210,12 +3802,30 @@
         "node": ">=0.12.0"
       }
     },
+    "node_modules/is-reference": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
+      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*"
+      }
+    },
     "node_modules/is-what": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
       "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
       "dev": true
     },
+    "node_modules/isbot": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/isbot/-/isbot-3.8.0.tgz",
+      "integrity": "sha512-vne1mzQUTR+qsMLeCBL9+/tgnDXRyc2pygLGl/WsgA+EZKIiB5Ehu0CiVTHIIk30zhJ24uGz4M5Ppse37aR0Hg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/itty-router": {
       "version": "4.0.26",
       "resolved": "https://registry.npmjs.org/itty-router/-/itty-router-4.0.26.tgz",
@@ -2232,7 +3842,6 @@
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true,
-      "peer": true,
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -2245,7 +3854,6 @@
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
-      "peer": true,
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -2302,22 +3910,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+      "dev": true
+    },
     "node_modules/lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
     },
-    "node_modules/lower-case": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-      "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA=="
-    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -2388,6 +3996,18 @@
         "node": ">=16.13"
       }
     },
+    "node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -2438,14 +4058,6 @@
         "node": ">= 4.4.x"
       }
     },
-    "node_modules/no-case": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
-      "dependencies": {
-        "lower-case": "^1.1.1"
-      }
-    },
     "node_modules/node-forge": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
@@ -2459,8 +4071,7 @@
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
       "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -2471,12 +4082,22 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/param-case": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-      "integrity": "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==",
+    "node_modules/object-path": {
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz",
+      "integrity": "sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.12.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
       "dependencies": {
-        "no-case": "^2.2.0"
+        "wrappy": "1"
       }
     },
     "node_modules/parse-node-version": {
@@ -2504,8 +4125,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
       "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -2563,12 +4183,75 @@
         "node": ">=8.10.0"
       }
     },
-    "node_modules/relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+    "node_modules/regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true
+    },
+    "node_modules/regenerate-unicode-properties": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+      "dev": true,
+      "dependencies": {
+        "regenerate": "^1.4.2"
+      },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=4"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+      "dev": true
+    },
+    "node_modules/regenerator-transform": {
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "node_modules/regexpu-core": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
+      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/regjsgen": "^0.8.0",
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.1.0",
+        "regjsparser": "^0.9.1",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regjsparser": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+      "dev": true,
+      "dependencies": {
+        "jsesc": "~0.5.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/regjsparser/node_modules/jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
       }
     },
     "node_modules/resolve": {
@@ -2659,6 +4342,80 @@
         "rollup-plugin-inject": "^3.0.0"
       }
     },
+    "node_modules/rollup-plugin-ts": {
+      "version": "3.4.5",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-ts/-/rollup-plugin-ts-3.4.5.tgz",
+      "integrity": "sha512-9iCstRJpEZXSRQuXitlSZAzcGlrqTbJg1pE4CMbEi6xYldxVncdPyzA2I+j6vnh73wBymZckerS+Q/iEE/M3Ow==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.2",
+        "@wessberg/stringutil": "^1.0.19",
+        "ansi-colors": "^4.1.3",
+        "browserslist": "^4.21.10",
+        "browserslist-generator": "^2.1.0",
+        "compatfactory": "^3.0.0",
+        "crosspath": "^2.0.0",
+        "magic-string": "^0.30.2",
+        "ts-clone-node": "^3.0.0",
+        "tslib": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=16.15.1",
+        "npm": ">=7.0.0",
+        "pnpm": ">=3.2.0",
+        "yarn": ">=1.13"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/wessberg/rollup-plugin-ts?sponsor=1"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.x",
+        "@babel/plugin-transform-runtime": ">=7.x",
+        "@babel/preset-env": ">=7.x",
+        "@babel/preset-typescript": ">=7.x",
+        "@babel/runtime": ">=7.x",
+        "@swc/core": ">=1.x",
+        "@swc/helpers": ">=0.2",
+        "rollup": ">=1.x || >=2.x || >=3.x",
+        "typescript": ">=3.2.x || >= 4.x || >= 5.x"
+      },
+      "peerDependenciesMeta": {
+        "@babel/core": {
+          "optional": true
+        },
+        "@babel/plugin-transform-runtime": {
+          "optional": true
+        },
+        "@babel/preset-env": {
+          "optional": true
+        },
+        "@babel/preset-typescript": {
+          "optional": true
+        },
+        "@babel/runtime": {
+          "optional": true
+        },
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/helpers": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/rollup-plugin-ts/node_modules/magic-string": {
+      "version": "0.30.5",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
+      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/rollup-pluginutils": {
       "version": "2.8.2",
       "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
@@ -2895,6 +4652,25 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/ts-clone-node": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ts-clone-node/-/ts-clone-node-3.0.0.tgz",
+      "integrity": "sha512-egavvyHbIoelkgh1IC2agNB1uMNjB8VJgh0g/cn0bg2XXTcrtjrGMzEk4OD3Fi2hocICjP3vMa56nkzIzq0FRg==",
+      "dev": true,
+      "dependencies": {
+        "compatfactory": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.9.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/wessberg/ts-clone-node?sponsor=1"
+      },
+      "peerDependencies": {
+        "typescript": "^3.x || ^4.x || ^5.x"
+      }
+    },
     "node_modules/tslib": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
@@ -3328,15 +5104,27 @@
         "node": ">=14.17"
       }
     },
-    "node_modules/uglify-js": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
-      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
+    "node_modules/ua-parser-js": {
+      "version": "1.0.37",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz",
+      "integrity": "sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/ua-parser-js"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/faisalman"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/faisalman"
+        }
+      ],
       "engines": {
-        "node": ">=0.8.0"
+        "node": "*"
       }
     },
     "node_modules/undici": {
@@ -3356,6 +5144,46 @@
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
       "dev": true
     },
+    "node_modules/unicode-canonical-property-names-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+      "dev": true,
+      "dependencies": {
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-value-ecmascript": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-property-aliases-ecmascript": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.0.13",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
@@ -3375,7 +5203,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "peer": true,
       "dependencies": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
@@ -3387,11 +5214,6 @@
         "browserslist": ">= 4.21.0"
       }
     },
-    "node_modules/upper-case": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-      "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA=="
-    },
     "node_modules/workerd": {
       "version": "1.20231218.0",
       "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20231218.0.tgz",
@@ -3453,6 +5275,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
     "node_modules/ws": {
       "version": "8.16.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
@@ -3484,8 +5312,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/youch": {
       "version": "3.3.3",
diff --git a/package.json b/package.json
index 41f7845..8e0acf8 100644
--- a/package.json
+++ b/package.json
@@ -4,16 +4,22 @@
   "private": true,
   "scripts": {
     "deploy": "wrangler deploy",
+    "stage": "wrangler deploy --env staging",
     "dev": "wrangler dev",
     "start": "wrangler dev",
     "generate": "tsx src/build/bundle-client.ts"
   },
   "devDependencies": {
+    "@babel/core": "^7.23.7",
+    "@babel/plugin-transform-runtime": "^7.23.7",
+    "@babel/preset-env": "^7.23.8",
     "@babel/preset-typescript": "^7.23.3",
+    "@babel/runtime": "^7.23.8",
     "@cloudflare/workers-types": "^4.20231218.0",
     "@rollup/plugin-babel": "^6.0.4",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^11.1.6",
     "@types/clean-css": "^4.2.11",
     "@types/escape-html": "^1.0.4",
     "@types/less": "^3.0.6",
@@ -24,7 +30,7 @@
     "fast-deep-equal": "^3.1.3",
     "less": "^4.2.0",
     "rollup": "^4.9.5",
-    "source-map": "^0.7.4",
+    "rollup-plugin-ts": "^3.4.5",
     "tsx": "^4.7.0",
     "typescript": "^5.0.4",
     "wrangler": "^3.0.0"
diff --git a/src/build/bundle-client.ts b/src/build/bundle-client-with-source-map.ts
similarity index 87%
rename from src/build/bundle-client.ts
rename to src/build/bundle-client-with-source-map.ts
index 8871f53..7cdfad1 100644
--- a/src/build/bundle-client.ts
+++ b/src/build/bundle-client-with-source-map.ts
@@ -1,8 +1,8 @@
-import { DEFAULT_IN_PATH, DEFAULT_OUT_PATH, getBundle, writeBundle } from './bundler.js';
+import { DEFAULT_IN_PATH, DEFAULT_OUT_PATH, getBundle, writeBundle } from './bundler';
 
 async function main(inPath: string = DEFAULT_IN_PATH, outPath: string = DEFAULT_OUT_PATH) {
 	const bundle = await getBundle(inPath)
-	await writeBundle(bundle, outPath)
+	await writeBundle(bundle, outPath, true)
 }
 
 main(...process.argv.slice(2)).then(() => {
diff --git a/src/build/bundler.ts b/src/build/bundler.ts
index fa6a7ec..197b372 100644
--- a/src/build/bundler.ts
+++ b/src/build/bundler.ts
@@ -1,5 +1,6 @@
 import {
 	createPrinter,
+	parseJsonText,
 	factory,
 	NewLineKind,
 	NodeFlags,
@@ -15,15 +16,21 @@ import {createHash} from 'node:crypto';
 import camelcase from 'camelcase';
 import { render as renderLess } from 'less';
 import CleanCSS from 'clean-css';
-import type { HashedBundled, SourceMappedHashedBundled, SourceMappedBundled, Bundled } from '../common/bundle.js';
-import type { RawSourceMap } from 'source-map';
+import type {
+	HashedBundled,
+	SourceMappedHashedBundled,
+	SourceMappedBundled,
+	Bundled,
+	MaybeSourceMappedHashedBundled, SourceMap
+} from '../common/bundle';
 import { rollup, type RollupCache } from 'rollup';
-import babel from '@rollup/plugin-babel';
-import typescript from '@rollup/plugin-typescript';
+import typescript from 'rollup-plugin-ts';
 import terser from '@rollup/plugin-terser';
+import nodeResolve from '@rollup/plugin-node-resolve';
+import commonJs from '@rollup/plugin-commonjs';
 
-function* assignProperties(pairs: Iterable<[string, HashedBundled]>): Generator<PropertyAssignment> {
-	for (const [identifier, { bundled, hash }] of pairs) {
+function* assignProperties(pairs: Iterable<[string, MaybeSourceMappedHashedBundled]>, includeSourceMap: boolean): Generator<PropertyAssignment> {
+	for (const [identifier, { bundled, hash, sourceMap }] of pairs) {
 		yield factory.createPropertyAssignment(
 			factory.createIdentifier(identifier),
 			factory.createObjectLiteralExpression([
@@ -35,30 +42,34 @@ function* assignProperties(pairs: Iterable<[string, HashedBundled]>): Generator<
 					factory.createIdentifier("hash"),
 					factory.createStringLiteral(hash)
 				),
+				...(includeSourceMap && sourceMap ? [factory.createPropertyAssignment(
+					factory.createIdentifier("sourceMap"),
+					parseJsonText(hash + ".map", JSON.stringify(sourceMap)).statements[0].expression,
+				)] : [])
 			], true));
 	}
 }
 
-function declareObjectLiteral(identifier: string, pairs: Iterable<[string, HashedBundled]>): VariableDeclaration {
+function declareObjectLiteral(identifier: string, pairs: Iterable<[string, MaybeSourceMappedHashedBundled]>, includeSourceMap: boolean): VariableDeclaration {
 	return factory.createVariableDeclaration(
 		factory.createIdentifier(identifier),
 		undefined,
 		undefined,
 		factory.createSatisfiesExpression(
 			factory.createAsExpression(
-				factory.createObjectLiteralExpression(Array.from(assignProperties(pairs)), true),
+				factory.createObjectLiteralExpression(Array.from(assignProperties(pairs, includeSourceMap)), true),
 				factory.createTypeReferenceNode(factory.createIdentifier('const'))),
 			factory.createTypeReferenceNode(
 				factory.createIdentifier("Record"),
 				[
 						factory.createTypeReferenceNode(factory.createIdentifier("string")),
-						factory.createTypeReferenceNode(factory.createIdentifier("HashedBundled"))])));
+						factory.createTypeReferenceNode(factory.createIdentifier("MaybeSourceMappedHashedBundled"))])));
 }
 
-function exportObjectLiteral(identifier: string, pairs: Iterable<[string, HashedBundled]>): VariableStatement {
+function exportObjectLiteral(identifier: string, pairs: Iterable<[string, MaybeSourceMappedHashedBundled]>, includeSourceMap: boolean): VariableStatement {
 	return factory.createVariableStatement(
 		[factory.createToken(SyntaxKind.ExportKeyword)],
-		factory.createVariableDeclarationList([declareObjectLiteral(identifier, pairs)], NodeFlags.Const)
+		factory.createVariableDeclarationList([declareObjectLiteral(identifier, pairs, includeSourceMap)], NodeFlags.Const)
 	);
 }
 
@@ -72,7 +83,6 @@ async function processLess(atPath: string): Promise<SourceMappedBundled> {
 		strictImports: true,
 		sourceMap: {
 			outputSourceFiles: true,
-			sourceMapFileInline: true
 		}
 	});
 	const { styles, sourceMap } = await new CleanCSS({
@@ -93,8 +103,7 @@ async function processLess(atPath: string): Promise<SourceMappedBundled> {
 			sourceMap: lessMap
 		}
 	})
-
-	return { bundled: styles, sourceMap: JSON.parse(sourceMap!.toString()) as RawSourceMap };
+	return { bundled: styles, sourceMap: {...JSON.parse(sourceMap!.toString()), file: fileBase + ".css"} as SourceMap };
 }
 
 async function processTypescript(atPath: string, inDir: string, cache?: RollupCache): Promise<{cache: RollupCache, bundle: SourceMappedBundled}> {
@@ -102,25 +111,20 @@ async function processTypescript(atPath: string, inDir: string, cache?: RollupCa
 		cache: cache ?? true,
 		input: atPath,
 		plugins: [
+			nodeResolve({
+			}),
+			commonJs({
+			}),
 			typescript({
-				noEmitOnError: true,
-				noForceEmit: true,
-				emitDeclarationOnly: false,
-				noEmit: true,
-				include: [join(inDir, '**', '*.ts')],
+				transpiler: "babel",
 				typescript: typescriptModule,
 				tsconfig: join(inDir, 'tsconfig.json')
 			}),
-			babel({
-				babelHelpers: 'bundled',
-				include: [join(inDir, '**', '*.ts'), join(inDir, '**', '*.js')],
-				extensions: ['js', 'ts'],
-				presets: ['@babel/preset-typescript']
-			}),
 			terser({})
 		]
 	})
 	const {output: [chunk]} = await build.generate({
+		name: camelcase(basename(atPath.substring(0, atPath.length - TS_SUFFIX.length))),
 		sourcemap: 'hidden',
 		sourcemapFile: join(inDir, 'sourcemap.map'),
 		format: 'iife',
@@ -169,9 +173,12 @@ export async function getBundle(inDir: string): Promise<{ css: Map<string, Sourc
 }
 
 export const DEFAULT_IN_PATH = normalize(join(__dirname, '../../src/client/'))
-export const DEFAULT_OUT_PATH =  normalize(join(__dirname, '../../src/server/web/client.generated.ts'))
+export const DEFAULT_OUT_PATH =  normalize(join(__dirname, '../../src/server/web/bundles/client.generated.ts'))
 
-export async function writeBundle({ css, js }: {css: Map<string, HashedBundled>, js: Map<string, HashedBundled>}, outFile: string): Promise<void> {
+export async function writeBundle({ css, js }: {css: Map<string, SourceMappedHashedBundled>, js: Map<string, SourceMappedHashedBundled>}, outFile: string, includeSourceMap: true): Promise<void>
+export async function writeBundle({ css, js }: {css: Map<string, HashedBundled>, js: Map<string, HashedBundled>}, outFile: string, includeSourceMap: false): Promise<void>
+export async function writeBundle({ css, js }: {css: Map<string, MaybeSourceMappedHashedBundled>, js: Map<string, MaybeSourceMappedHashedBundled>}, outFile: string, includeSourceMap: boolean): Promise<void>
+export async function writeBundle({ css, js }: {css: Map<string, MaybeSourceMappedHashedBundled>, js: Map<string, MaybeSourceMappedHashedBundled>}, outFile: string, includeSourceMap: boolean): Promise<void> {
 	const printer = createPrinter({
 		newLine: NewLineKind.LineFeed,
 		omitTrailingSemicolon: true
@@ -186,12 +193,12 @@ export async function writeBundle({ css, js }: {css: Map<string, HashedBundled>,
 					factory.createImportSpecifier(
 						true,
 						undefined,
-						factory.createIdentifier("HashedBundled"))
+						factory.createIdentifier( "MaybeSourceMappedHashedBundled")),
 				])
 			),
 			factory.createStringLiteral("../../common/bundle.js")),
-		exportObjectLiteral('CSS', css),
-		exportObjectLiteral('JS', js)
+		exportObjectLiteral('CSS', css, includeSourceMap),
+		exportObjectLiteral('JS', js, includeSourceMap)
 	], factory.createToken(SyntaxKind.EndOfFileToken), NodeFlags.None)), {
 		encoding: 'utf-8',
 		mode: 0o644
diff --git a/src/build/check-source-map-and-bundle-client.ts b/src/build/check-source-map-and-bundle-client.ts
index 694c8ec..2d76df0 100644
--- a/src/build/check-source-map-and-bundle-client.ts
+++ b/src/build/check-source-map-and-bundle-client.ts
@@ -1,5 +1,5 @@
-import { DEFAULT_IN_PATH, DEFAULT_OUT_PATH, getBundle, writeBundle } from './bundler.js';
-import { getSourceMapFileName, SourceMapExtension, SourceMaps } from '../server/web/sourcemaps.js';
+import { DEFAULT_IN_PATH, DEFAULT_OUT_PATH, getBundle, writeBundle } from './bundler';
+import { getSourceMapFileName, SourceMapExtension, SourceMaps } from '../server/web/bundles/sourcemaps';
 import deepEqual from 'fast-deep-equal';
 
 async function main(inPath: string = DEFAULT_IN_PATH, outPath: string = DEFAULT_OUT_PATH) {
@@ -9,15 +9,15 @@ async function main(inPath: string = DEFAULT_IN_PATH, outPath: string = DEFAULT_
 		const filename = getSourceMapFileName(name, hash, SourceMapExtension.CSS)
 		const existingMap = SourceMaps.get(filename)
 		if (!existingMap) {
-			errors.push(`source map for ${filename} is missing; add this line to server/web/sourcemaps.ts:\n\t\t${JSON.stringify([filename, sourceMap])},\n\n`)
+			errors.push(`source map for ${filename} is missing; add this line to server/web/bundles/sourcemaps.ts:\n\t\t${JSON.stringify([filename, sourceMap])},\n\n`)
 		} else if (!deepEqual(sourceMap, existingMap)) {
-			errors.push(`source map for ${filename} is incorrect; replace this line in server/web/sourcemaps.ts:\n\t\t${JSON.stringify([filename, existingMap])},\n\nwith this line:\n\t\t${JSON.stringify([filename, sourceMap])},\n\n`)
+			errors.push(`source map for ${filename} is incorrect; replace this line in server/web/bundles/sourcemaps.ts:\n\t\t${JSON.stringify([filename, existingMap])},\n\nwith this line:\n\t\t${JSON.stringify([filename, sourceMap])},\n\n`)
 		}
 	}
 	if (errors.length > 0) {
 		throw Error(errors.join('\n'))
 	}
-	await writeBundle(bundle, outPath)
+	await writeBundle(bundle, outPath, false)
 }
 
 main(...process.argv.slice(2)).then(() => {
diff --git a/src/client/attribution.less b/src/client/attribution.less
index d55dcf8..b554a37 100644
--- a/src/client/attribution.less
+++ b/src/client/attribution.less
@@ -52,6 +52,14 @@
 	user-select: text;
 }
 
+.attributed:hover .attributionBubble {
+	transition-delay: 1.0s;
+}
+
+.attributed:focus-within .attributionBubble {
+	transition-delay: 0s;
+}
+
 .attributed:hover .attributionBubble, .attributed:focus-within .attributionBubble {
 	opacity: 100%;
 	transform: none;
@@ -61,3 +69,23 @@
 .attributed:hover .attributionBubble *, .attributed:focus-within .attributionBubble * {
 	user-select: text;
 }
+
+.attributionBubble a {
+	transition: color 300ms ease;
+}
+
+.attributionBubble a:link {
+	color: aquamarine;
+}
+
+.attributionBubble a:visited {
+	color: mediumaquamarine;
+}
+
+.attributionBubble a:focus, .attributionBubble a:hover {
+	color: lightcyan;
+}
+
+.attributionBubble a:active {
+	color: aqua;
+}
diff --git a/src/client/basic-look.less b/src/client/basic-look.less
index 78f852e..c8a47ac 100644
--- a/src/client/basic-look.less
+++ b/src/client/basic-look.less
@@ -104,15 +104,48 @@ footer {
 	font-family: inherit;
 	outline: 0;
 	border: 0;
-	padding: 0;
+	padding: 0.2rem 0.5rem;
 	cursor: pointer;
 	text-align: left;
 	word-wrap: normal;
 	width: 100%;
+	box-sizing: border-box;
 	white-space: normal;
 	user-select: text;
+	transition: background-color 0.2s ease;
+	border-radius: 0.3rem;
+}
+
+.resultText:hover {
+	background-color: #BFBFBF60;
+}
+
+.resultText:active, .resultText:focus {
+	background-color: #9F9FFF90;
 }
 
 footer {
 	text-align: center;
 }
+
+@keyframes popup {
+	from {
+		transform: scale(0);
+		opacity: 0;
+	}
+
+	10% {
+		transform: none;
+		opacity: 100%;
+	}
+
+	75% {
+		transform: none;
+		opacity: 100%;
+	}
+
+	to {
+		transform: scale(0);
+		opacity: 0;
+	}
+}
diff --git a/src/client/combined-generator-responses-entrypoint.ts b/src/client/combined-generator-responses-entrypoint.ts
index df17041..211a0ec 100644
--- a/src/client/combined-generator-responses-entrypoint.ts
+++ b/src/client/combined-generator-responses-entrypoint.ts
@@ -1,3 +1,5 @@
+import './generator-entrypoint'
+
 function updateHash(): void {
 	if (location.hash === "" || location.hash === "#" || !location.hash) {
 		location.replace("#generator")
diff --git a/src/client/generator-entrypoint.less b/src/client/generator-entrypoint.less
index 30ee830..cc5568a 100644
--- a/src/client/generator-entrypoint.less
+++ b/src/client/generator-entrypoint.less
@@ -1,5 +1,7 @@
 @import "basic-look";
 @import "attribution";
+@import "popup";
+@import "pulse";
 
 #generator {
 	position: absolute;
@@ -10,6 +12,7 @@
 	margin: 0;
 	padding: 2rem;
 	display: flex;
+	box-sizing: border-box;
 	flex-flow: column nowrap;
 	justify-content: center;
 	align-items: center;
@@ -25,6 +28,9 @@
 
 .generatedHead {
 	user-select: text;
+	margin: 0.5rem 0 0 0;
+	display: flex;
+	flex-flow: row nowrap;
 }
 
 .generatedHead .generatedLabel span {
@@ -44,8 +50,8 @@
 }
 
 .generated {
-	margin-left: 0;
-	margin-top: 0;
+	margin: 0;
+	padding: 0;
 	appearance: none;
 	font: inherit;
 	outline: 0;
@@ -58,12 +64,28 @@
 	cursor: pointer;
 	font-size: 1.5rem;
 	margin: 0;
+	transition: filter 0.3s ease, transform 0.3s ease;
+	width: 2rem;
+	height: 2rem;
+	text-align: center;
+	line-height: 2rem;
+	border-radius: 1rem;
 }
 
 #generator .buttons {
 	margin-left: -0.3rem;
 }
 
+.generatedHead:hover .generatedSelect, .generatedHead .generatedSelect:focus {
+	filter: brightness(120%) saturate(80%);
+	transform: scale(120%);
+}
+
+.generatedHead .generatedSelect:active {
+	filter: brightness(80%) saturate(110%);
+	transform: scale(80%);
+}
+
 .generatedSelect::after {
 	content: '🔒'
 }
diff --git a/src/client/generator-entrypoint.ts b/src/client/generator-entrypoint.ts
index e69de29..1108a77 100644
--- a/src/client/generator-entrypoint.ts
+++ b/src/client/generator-entrypoint.ts
@@ -0,0 +1,244 @@
+import {
+	ExportFormat,
+	exportScenario,
+	type GeneratedState,
+	generatedStateToString, getResultFrom,
+	RolledValues,
+	RollSelections,
+	type RollTable,
+	RollTableDatabase,
+	type RollTableResult
+} from '../common/rolltable';
+import {
+	buildGeneratedElement, copyBBID, copyEmojiTextID,
+	copyMDID, copyTextID,
+	htmlTableIdentifier, rerollAllId, rerollId,
+	selectAllId,
+	selectedIdPrefix,
+	selectNoneId
+} from '../common/template';
+import { DOMLoaded } from './onload';
+import { scrapeGeneratedScenario } from './scraper';
+import { showPopup } from './popup';
+import { pulseElement } from './pulse';
+
+export class Generator {
+	readonly generator: HTMLElement;
+	readonly scenario: HTMLUListElement;
+	readonly copyButtons: HTMLElement;
+	readonly rollButtons: HTMLElement;
+	readonly db: RollTableDatabase | undefined;
+	private readonly rolled = new RolledValues();
+	private readonly selected = new RollSelections();
+
+	get state(): GeneratedState {
+		return {
+			final: false,
+			rolled: this.rolled,
+			selected: this.selected,
+		}
+	}
+
+	getTableWithHtmlId(id: string, prefix?: string): RollTable | undefined {
+		return Array.from(this.rolled.keys()).find(t => id === ((prefix ?? '') + htmlTableIdentifier(t)));
+	}
+
+	selectAll(): this {
+		this.selected.clear();
+		for (const check of this.scenario.querySelectorAll('input[type=checkbox]') as Iterable<HTMLInputElement>) {
+			check.checked = true;
+			pulseElement(check);
+			const table = this.getTableWithHtmlId(check.id, selectedIdPrefix);
+			if (table) {
+				this.selected.add(table);
+			}
+		}
+		return this
+	}
+
+	selectNone(): this {
+		this.selected.clear();
+		for (const check of this.scenario.querySelectorAll('input[type=checkbox]') as Iterable<HTMLInputElement>) {
+			check.checked = false;
+			pulseElement(check);
+		}
+		return this
+	}
+
+	loadValuesFromDOM(): this {
+		this.rolled.clear()
+		this.selected.clear()
+		const scenario = scrapeGeneratedScenario(this.scenario)
+		if (!scenario) {
+			throw Error("Failed to load generated values from DOM")
+		}
+		for (const [scrapedTable, scrapedResult] of scenario.rolled) {
+			const table = this.db?.getTableMatching(scrapedTable) ?? scrapedTable
+			const result = getResultFrom(table, scrapedResult)
+			if (scenario.selected.has(scrapedTable)) {
+				this.selected.add(table)
+			}
+			this.rolled.add(result)
+		}
+		return this
+	}
+
+	attachHandlers(): this {
+		this.generator.addEventListener('click', (e) => this.clickHandler(e));
+		this.generator.addEventListener('change', (e) => this.changeHandler(e));
+		return this;
+	}
+
+	async copy(format: ExportFormat): Promise<void> {
+		const exported = exportScenario(Array.from(this.rolled.values()), format)
+		return navigator.clipboard.writeText(exported)
+	}
+
+	private clickHandler(e: Event): void {
+		if (e.target instanceof HTMLButtonElement || e.target instanceof HTMLAnchorElement) {
+			switch (e.target.id) {
+				case selectNoneId:
+					this.selectNone()
+					break
+				case selectAllId:
+					this.selectAll()
+					break
+				case copyMDID:
+					this.copy(ExportFormat.Markdown)
+						.then(() => showPopup(this.copyButtons, `Copied Markdown to clipboard!`, 'success'))
+						.catch((e) => {
+							console.error("Failed while copying Markdown:", e)
+							showPopup(this.copyButtons, `Failed to copy Markdown to clipboard`, 'error')
+						})
+					break
+				case copyBBID:
+					this.copy(ExportFormat.BBCode)
+						.then(() => showPopup(this.copyButtons, `Copied BBCode to clipboard!`, 'success'))
+						.catch((e) => {
+							console.error("Failed while copying BBCode:", e)
+							showPopup(this.copyButtons, `Failed to copy BBCode to clipboard`, 'error')
+						})
+					break
+				case copyEmojiTextID:
+					this.copy(ExportFormat.TextEmoji)
+						.then(() => showPopup(this.copyButtons, `Copied text (with emojis) to clipboard!`, 'success'))
+						.catch((e) => {
+							console.error("Failed while copying text (with emojis):", e)
+							showPopup(this.copyButtons, `Failed to copy text (with emojis) to clipboard`, 'error')
+						})
+					break
+				case copyTextID:
+					this.copy(ExportFormat.TextOnly)
+						.then(() => showPopup(this.copyButtons, `Copied text to clipboard!`, 'success'))
+						.catch((e) => {
+							console.error("Failed while copying text:", e)
+							showPopup(this.copyButtons, `Failed to copy text to clipboard`, 'error')
+						})
+					break
+				case rerollId:
+					for (const row of this.scenario.querySelectorAll(".generatedElement")) {
+						if (row.querySelector("input[type=checkbox]:checked")) {
+							const text = row.querySelector<HTMLElement>(".resultText")
+							if (text) {
+								pulseElement(text)
+							}
+						}
+					}
+					showPopup(this.rollButtons, `only pretending to reroll`, 'warning')
+					break
+				case rerollAllId:
+					for (const row of this.scenario.querySelectorAll(".generatedElement")) {
+						const check = row.querySelector<HTMLInputElement>("input[type=checkbox]:checked")
+						if (check) {
+							check.checked = false
+							pulseElement(check)
+						}
+						const text = row.querySelector<HTMLElement>(".resultText")
+						if (text) {
+							pulseElement(text)
+						}
+					}
+					showPopup(this.rollButtons, `only pretending to reroll all`, 'warning')
+					break
+				default:
+					if (e.target.classList.contains("resultText")) {
+						for (let target: HTMLElement|null = e.target; target && target !== this.generator; target = target.parentElement) {
+							if (target.classList.contains("generatedElement")) {
+								const check = target.querySelector<HTMLInputElement>(".generatedSelect")
+								if (check) {
+									check.click()
+								}
+							}
+						}
+					} else {
+						return
+					}
+			}
+			e.preventDefault()
+		}
+	}
+
+	private changeHandler(e: Event): void {
+		if (e.target instanceof HTMLInputElement && e.target.type === 'checkbox' && e.target.id.startsWith(selectedIdPrefix)) {
+			const check = e.target
+			const table = this.getTableWithHtmlId(check.id, selectedIdPrefix);
+			if (table) {
+				if (check.checked) {
+					this.selected.add(table);
+				} else {
+					this.selected.delete(table);
+				}
+				pulseElement(check)
+			}
+		}
+	}
+
+	private animationendHandler(e: AnimationEvent): void {
+		if (e.animationName === "pulse" && e.target instanceof HTMLElement && e.target.classList.contains("pulse")) {
+			e.target.classList.remove("pulse")
+		}
+	}
+
+	constructor(generator: HTMLElement, generatorForm: HTMLUListElement, copyButtons: HTMLElement, rollButtons: HTMLElement, db?: RollTableDatabase) {
+		this.generator = generator;
+		this.scenario = generatorForm;
+		this.copyButtons = copyButtons;
+		this.rollButtons = rollButtons;
+		this.db = db;
+	}
+}
+
+function initGenerator(db?: RollTableDatabase): Generator {
+	const generatorFound = document.getElementById('generator');
+	if (!generatorFound) {
+		throw Error('generator was not found');
+	}
+	const generatedScenarioFound = document.getElementById('generatedScenario');
+	if (!generatedScenarioFound || !(generatedScenarioFound instanceof HTMLUListElement)) {
+		throw Error('generated scenario was not found');
+	}
+	const copyButtons = document.getElementById("copyButtons")
+	if (!copyButtons) {
+		throw Error('copy buttons were not found')
+	}
+	const rollButtons = document.getElementById("rollButtons")
+	if (!rollButtons) {
+		throw Error('copy buttons were not found')
+	}
+	return new Generator(generatorFound, generatedScenarioFound, copyButtons, rollButtons, db).loadValuesFromDOM().attachHandlers();
+}
+
+let pendingGenerator: Promise<Generator>|undefined = undefined
+
+export async function prepareGenerator(db?: Promise<RollTableDatabase>): Promise<Generator> {
+	if (pendingGenerator) {
+		throw Error(`prepareGenerator should only be called once`)
+	}
+	pendingGenerator = DOMLoaded.then(() => db)
+		.then((promisedDb) => initGenerator(promisedDb))
+	return pendingGenerator
+}
+
+DOMLoaded.then(() => pendingGenerator ?? prepareGenerator())
+	.then(g => console.info(`loaded generator: ${generatedStateToString(g.state)}`))
+	.catch(e => console.error('failed to load generator', e))
diff --git a/src/client/noscript-entrypoint.less b/src/client/noscript-entrypoint.less
index ae5c52f..8ed695a 100644
--- a/src/client/noscript-entrypoint.less
+++ b/src/client/noscript-entrypoint.less
@@ -1,4 +1,4 @@
-.requiresJs {
+.requiresJs, .jsPopup {
 	display: none !important;
 	flex: 0 1 0 !important;
 }
diff --git a/src/client/onload.ts b/src/client/onload.ts
new file mode 100644
index 0000000..ea097dd
--- /dev/null
+++ b/src/client/onload.ts
@@ -0,0 +1,7 @@
+export const DOMLoaded = new Promise<void>((resolve) => {
+	if (document.readyState === 'loading') {
+		document.addEventListener('DOMContentLoaded', () => resolve())
+	} else {
+		resolve()
+	}
+})
diff --git a/src/client/popup.less b/src/client/popup.less
new file mode 100644
index 0000000..8b6723c
--- /dev/null
+++ b/src/client/popup.less
@@ -0,0 +1,46 @@
+.jsPopup {
+	bottom: calc(100% + 1rem);
+	animation: 1.5s ease 0s 1 popup;
+	transform-origin: 50% 70%;
+	user-select: none;
+	border: 0.1rem solid #303030BF;
+	box-shadow: 0.2rem 0.2rem #00000090;
+	border-radius: 0.5rem;
+	font-weight: bold;
+	font-size: 1rem;
+	padding: 0.3rem;
+	background-color: #f8f7e0;
+}
+
+.jsPopup.info {
+	background-color: paleturquoise;
+}
+.jsPopup.success {
+	background-color: palegreen;
+}
+.jsPopup.warning {
+	background-color: palegoldenrod;
+}
+.jsPopup.error {
+	background-color: palevioletred;
+}
+
+.jsPopup:hover {
+	animation-play-state: paused;
+}
+
+.jsPopupContainer {
+	position: absolute;
+	bottom: calc(100% + 1rem);
+	left: 0;
+	right: 0;
+	z-index: 1;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	user-select: none;
+}
+
+.jsPopupHost {
+	position: relative;
+}
diff --git a/src/client/popup.ts b/src/client/popup.ts
new file mode 100644
index 0000000..28d44b6
--- /dev/null
+++ b/src/client/popup.ts
@@ -0,0 +1,19 @@
+export function showPopup(parent: HTMLElement, text: string, className?: 'success'|'info'|'warning'|'error'): void {
+	if (!parent.classList.contains("jsPopupHost")) {
+		console.log(parent, "should be jsPopupHost")
+	}
+	const container = parent.ownerDocument.createElement("div")
+	container.classList.add("jsPopupContainer")
+	parent.appendChild(container)
+	const popup = parent.ownerDocument.createElement("div")
+	popup.classList.add("jsPopup")
+	if (className) {
+		popup.classList.add(className)
+	}
+	popup.innerText = text
+	container.appendChild(popup)
+	popup.addEventListener('animationend', () => {
+		container.removeChild(popup)
+		parent.removeChild(container)
+	})
+}
diff --git a/src/client/pulse.less b/src/client/pulse.less
new file mode 100644
index 0000000..7ceb474
--- /dev/null
+++ b/src/client/pulse.less
@@ -0,0 +1,15 @@
+@keyframes pulse-bg {
+	from {
+		background-color: transparent;
+	}
+	10% {
+		background-color: #60606060;
+	}
+	to {
+		background-color: transparent;
+	}
+}
+
+.pulse {
+	animation: 1.5s ease 0s 1 pulse-bg;
+}
diff --git a/src/client/pulse.ts b/src/client/pulse.ts
new file mode 100644
index 0000000..e0b99e0
--- /dev/null
+++ b/src/client/pulse.ts
@@ -0,0 +1,6 @@
+export function pulseElement(element: HTMLElement) {
+	element.classList.add("pulse")
+	element.style.animation = "none";
+	getComputedStyle(element).animation
+	setTimeout(element.style.animation = "")
+}
diff --git a/src/client/responses-entrypoint.less b/src/client/responses-entrypoint.less
index 2bc4f32..205d147 100644
--- a/src/client/responses-entrypoint.less
+++ b/src/client/responses-entrypoint.less
@@ -1,5 +1,6 @@
 @import "basic-look";
 @import "attribution";
+@import "popup";
 
 #responsesHeader {
 	position: sticky;
@@ -18,7 +19,7 @@
 	z-index: 2;
 }
 
-#responsesHeader nav {
+#responsesHeader .buttons {
 	display: flex;
 	flex-flow: row wrap;
 	padding-top: 0.2rem;
@@ -29,10 +30,8 @@
 	overflow-x: visible;
 }
 
-#responsesHeader nav .buttons {
-	flex-flow: row wrap;
-	padding-top: 0.2rem;
-	padding-right: 0.2rem;
+#returnToGenerator {
+	flex-basis: 50%;
 }
 
 .responseNavEmoji {
@@ -45,7 +44,7 @@
 	font-size: 1.5rem;
 }
 
-.responseLists {
+#responseLists {
 	display: flex;
 	flex-flow: row wrap;
 	padding: 0.1rem;
diff --git a/src/client/responses-entrypoint.ts b/src/client/responses-entrypoint.ts
index e69de29..1709fff 100644
--- a/src/client/responses-entrypoint.ts
+++ b/src/client/responses-entrypoint.ts
@@ -0,0 +1,16 @@
+import type { RollTable, RollTableDatabase } from '../common/rolltable';
+import { DOMLoaded } from './onload';
+
+class ResponseList {
+	readonly db: RollTableDatabase
+	constructor(db: RollTableDatabase) {
+		this.db = db
+	}
+}
+
+function initResponseList(): ResponseList {
+	throw Error("not yet implemented")
+}
+
+export const responseList: Promise<ResponseList> = DOMLoaded.then(() => initResponseList())
+export const db: Promise<RollTableDatabase> = responseList.then(r => r.db)
diff --git a/src/client/scraper.ts b/src/client/scraper.ts
new file mode 100644
index 0000000..fd504f8
--- /dev/null
+++ b/src/client/scraper.ts
@@ -0,0 +1,244 @@
+import {
+	type InProgressGeneratedState, RolledValues, RollSelections,
+	type RollTableAuthor,
+	type RollTableDetailsNoResults,
+	type RollTableLimited,
+	type RollTableResult,
+	type RollTableResultSet
+} from '../common/rolltable';
+
+export function asBoolean(s: string|undefined): boolean|undefined {
+	if (typeof s === "undefined") {
+		return
+	}
+	switch (s.toLowerCase()) {
+		case "true":
+			return true
+		case "false":
+			return false
+		default:
+			return
+	}
+}
+
+export function asInteger(s: string|undefined): number|undefined {
+	if (typeof s === "undefined") {
+		return
+	}
+	const result = parseInt(s)
+	if (Number.isNaN(result)) {
+		return
+	}
+	return result
+}
+
+export function asTimestamp(s: string|undefined): Date|undefined {
+	const i = asInteger(s)
+	if (typeof i === "undefined") {
+		return
+	}
+	const date = new Date(i)
+	if (Number.isNaN(date.valueOf())) {
+		return
+	}
+	return date
+}
+
+export function textFrom(e: HTMLElement|null): string|undefined {
+	if (!e) {
+		return
+	}
+	return e.innerText.trim()
+}
+
+export function hrefFrom(e: HTMLAnchorElement|null): string | null {
+	if (!e) {
+		return null
+	}
+	return e.href
+}
+
+export function checkedFrom(e: HTMLInputElement|null): boolean | null {
+	if (!e) {
+		return null
+	}
+	return e.checked
+}
+
+// element to find here is .author
+export function scrapeAuthor(author: HTMLElement|null): RollTableAuthor|null|undefined {
+	if (!author) {
+		return null
+	}
+	const id = asInteger(author.dataset["id"])
+	const name = textFrom(author.querySelector(".authorName"))
+	const url = hrefFrom(author.querySelector<HTMLAnchorElement>("a[href]"))
+	const relation = textFrom(author.querySelector(".authorRelation"))
+	if (typeof id === "undefined" || typeof name === "undefined" || typeof relation === 'undefined') {
+		return
+	}
+	return {
+		id,
+		name,
+		url,
+		relation
+	}
+}
+
+// element to find here is .resultSet
+export function scrapeResultSet(set: HTMLElement|null): RollTableResultSet|null|undefined {
+	if (!set) {
+		return null
+	}
+	const id = asInteger(set.dataset["id"])
+	const name = textFrom(set.querySelector(".setName"))
+	const global = asBoolean(set.dataset["global"])
+	if (typeof id === "undefined" || typeof global === "undefined") {
+		return
+	}
+	return {
+		id,
+		name: name ?? null,
+		description: null,
+		global,
+	}
+}
+
+// element to find here is .tableHeader
+export function scrapeTableHeader(head: HTMLElement|null): RollTableLimited|RollTableDetailsNoResults|null|undefined {
+	if (!head) {
+		return null
+	}
+	const emoji = textFrom(head.querySelector(".tableEmoji"))
+	const title = textFrom(head.querySelector(".tableTitle"))
+	const ordinal = asInteger(head.dataset["ordinal"])
+	const id = asInteger(head.dataset["id"])
+	const identifier = head.dataset["identifier"]
+	const name = head.dataset["name"]
+	if (typeof emoji === 'undefined' || typeof title === 'undefined' || typeof ordinal === 'undefined') {
+		return
+	}
+	const header = `${emoji} ${title}`
+	if (typeof id === 'undefined' || typeof identifier === 'undefined' || typeof name === 'undefined') {
+		return {
+			full: false,
+			emoji,
+			title,
+			header,
+			ordinal,
+		}
+	}
+	return {
+		full: 'details',
+		id,
+		identifier,
+		emoji,
+		title,
+		header,
+		ordinal,
+		name,
+	}
+}
+
+export function scrapeGeneratedHead(head: HTMLElement|null): {table: RollTableLimited|RollTableDetailsNoResults, selected: boolean|null}|null|undefined {
+	if (!head) {
+		return null
+	}
+	const table = scrapeTableHeader(head.querySelector(".tableHeader"))
+	if (!table) {
+		return
+	}
+	const selected = checkedFrom(head.querySelector("input[type=checkbox].generatedSelect"))
+	return {
+		table,
+		selected,
+	}
+}
+
+// element to find here is .resultText
+export function scrapeResultText(result: HTMLElement|null): {full: false, text: string}|{full: true, mappingId: number, textId: number, updated: Date, text: string}|undefined|null {
+	if (!result) {
+		return null
+	}
+	const text = textFrom(result)
+	const mappingId = asInteger(result.dataset["mappingid"])
+	const textId = asInteger(result.dataset["textid"])
+	const updated = asTimestamp(result.dataset["updated"])
+	if (typeof text === 'undefined') {
+		return
+	}
+	if (typeof mappingId === 'undefined' || typeof textId === 'undefined' || typeof updated == 'undefined') {
+		return {
+			full: false,
+			text,
+		}
+	}
+	return {
+		full: true,
+		text,
+		textId,
+		mappingId,
+		updated: new Date(updated)
+	}
+}
+
+// element to find here is .generatedElement
+export function scrapeGeneratedElement(generated: HTMLElement|null): {result: RollTableResult, selected: boolean|null}|null|undefined {
+	if (!generated) {
+		return null
+	}
+	const result = scrapeResultText(generated.querySelector(".resultText"))
+	const author = scrapeAuthor(generated.querySelector(".author"))
+	const set = scrapeResultSet(generated.querySelector(".resultSet"))
+	const header = scrapeGeneratedHead(generated.querySelector(".generatedHead"))
+	if (!header || !result) {
+		return
+	}
+	const {table, selected} = header
+	if (!set || typeof author === "undefined" || !result.full) {
+		return {
+			result: {
+				full: false,
+				table,
+				text: result.text,
+			},
+			selected
+		}
+	}
+	return {
+		result: {
+			...result,
+			author,
+			set,
+			table,
+		},
+		selected,
+	}
+}
+
+export function scrapeGeneratedScenario(scenario: HTMLElement): InProgressGeneratedState|undefined
+export function scrapeGeneratedScenario(scenario: null): null
+// element to find here is #generatedScenario
+export function scrapeGeneratedScenario(scenario: HTMLElement|null): InProgressGeneratedState|null|undefined {
+	if (!scenario) {
+		return null
+	}
+	const rolls = new RolledValues()
+	const selection = new RollSelections()
+	for (const item of scenario.querySelectorAll<HTMLElement>(".generatedElement")) {
+		const element = scrapeGeneratedElement(item)
+		if (!element) {
+			return
+		}
+		const {result, selected} = element
+		rolls.add(result)
+		if (selected) {
+			selection.add(result.table)
+		}
+	}
+	return {
+		final: false,
+		rolled: rolls,
+		selected: selection,
+	}
+}
diff --git a/src/client/tsconfig.json b/src/client/tsconfig.json
index e955acc..cac7504 100644
--- a/src/client/tsconfig.json
+++ b/src/client/tsconfig.json
@@ -11,8 +11,8 @@
 		// "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
 		/* Language and Environment */
-		"target": "ES5" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
-		"lib": ["dom", "dom.iterable", "ESNext"]
+		"target": "ES2015", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+		"lib": ["dom", "dom.iterable", "ES2015"]
       /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
 		// "jsx": "react" /* Specify what JSX code is generated. */,
 		// "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
@@ -70,7 +70,7 @@
 		/* Interop Constraints */
 		"isolatedModules": true /* Ensure that each file can be safely transpiled without relying on other imports. */,
 		"allowSyntheticDefaultImports": true /* Allow 'import x from y' when a module doesn't have a default export. */,
-		// "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
+		"esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
 		// "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
 		"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
 
diff --git a/src/common/bbcode.ts b/src/common/bbcode.ts
new file mode 100644
index 0000000..d32e4cb
--- /dev/null
+++ b/src/common/bbcode.ts
@@ -0,0 +1,6 @@
+const bracketRegexp = /\[/g
+
+export function bbcodeEscape(text: string): string {
+	// Add a zero-width non-joiner to make BBCode parsing fail
+	return text.replace(bracketRegexp, "[\u200c")
+}
diff --git a/src/common/bundle.ts b/src/common/bundle.ts
index 29d199f..6dace20 100644
--- a/src/common/bundle.ts
+++ b/src/common/bundle.ts
@@ -1,5 +1,3 @@
-import type { RawSourceMap } from 'source-map';
-
 export interface Bundled {
 	readonly bundled: string,
 }
@@ -8,8 +6,21 @@ export interface HashedBundled extends Bundled {
 	readonly hash: string,
 }
 
+export interface SourceMap {
+	readonly version: number
+	readonly file?: string
+	readonly sourceRoot?: string
+	readonly sources: readonly string[]
+	readonly sourcesContent?: readonly (string|null)[]
+	readonly names: readonly string[]
+	readonly mappings: string
+	readonly x_google_ignoreList?: readonly number[]
+}
+
 export interface SourceMappedBundled extends Bundled {
-	readonly sourceMap: RawSourceMap,
+	readonly sourceMap: SourceMap,
 }
 
 export interface SourceMappedHashedBundled extends SourceMappedBundled, HashedBundled {}
+
+export interface MaybeSourceMappedHashedBundled extends HashedBundled, Partial<Omit<SourceMappedBundled, keyof HashedBundled>> {}
diff --git a/src/common/rolltable.ts b/src/common/rolltable.ts
index 53d4e14..bef1ee8 100644
--- a/src/common/rolltable.ts
+++ b/src/common/rolltable.ts
@@ -1,10 +1,12 @@
+import markdownEscape from 'markdown-escape';
+import { bbcodeEscape } from './bbcode';
+
 export interface RollTableLimited {
 	readonly full: false,
 	readonly emoji: string,
 	readonly title: string,
 	readonly header: string,
 	readonly ordinal: number,
-	readonly results?: null,
 }
 
 export interface RollTableDetailsBase {
@@ -18,11 +20,11 @@ export interface RollTableDetailsBase {
 }
 
 export type RollTable = RollTableLimited | RollTableDetails
-export type RollTableOrInput = RollTable | RollTableDetailsInput
+export type RollTableOrInput = RollTable | RollTableDetailsInputResults
 
 export function rollTableToString(v: RollTable) {
 	if (v.full) {
-		return `${v.header} (${v.id}/${v.identifier}/${v.name}/${v.emoji}/${v.title}/#${v.ordinal})${v.full === 'results' ? ` [${v.results.size} results]` : '' }`
+		return `${v.header} (${v.id}/${v.identifier}/${v.name}/${v.emoji}/${v.title}/#${v.ordinal})${v.full === 'results' ? ` [${v.resultsById.size} results]` : '' }`
 	} else {
 		return `${v.header} (???#${v.ordinal})`
 	}
@@ -76,15 +78,15 @@ export interface RollTableResultFull<T extends RollTableOrInput = RollTableDetai
 export type RollTableResult<T extends RollTableOrInput = RollTable> = RollTableResultLimited<T> | RollTableResultFull<T>
 export type RollTableResultOrLookup<T extends RollTableOrInput = RollTable> = RollTableResultFull<T>|RollTableResultLookup
 
-function setToString(v: RollTableResultSet): string {
+export function setToString(v: RollTableResultSet): string {
 	return `${v.global ? 'global' : 'local'} ${v.name ?? 'set'}`
 }
 
-function authorToString(v: RollTableAuthor): string {
+export function authorToString(v: RollTableAuthor): string {
 	return `${v.relation} ${v.name} (${v.id})`
 }
 
-function resultToString(v: RollTableResult) {
+export function rollResultToString(v: RollTableResult) {
 	if (v.full) {
 		return `${v.text} (${v.mappingId}: ${v.textId}/${rollTableToStringShort(v.table)}/${setToString(v.set)}/${v.author ? authorToString(v.author) : 'no author'})`
 	} else {
@@ -103,33 +105,30 @@ export interface RollTableResultLookup {
 }
 
 export interface RollTableDetailsInputResults extends RollTableDetailsBase {
-	readonly results: Iterable<RollTableResultOrLookup<RollTableDetailsInputResults>|readonly [number, RollTableResultOrLookup<RollTableDetailsInputResults>]>;
+	readonly full: 'input'
+	readonly resultsById: Iterable<RollTableResultOrLookup<RollTableDetailsInputResults>|readonly [number, RollTableResultOrLookup<RollTableDetailsInputResults>]>;
 }
 
 function isResultArray(v: unknown): v is readonly [unknown, RollTableResultOrLookup<RollTableDetailsOrInput>] {
 	return Array.isArray(v) && isRollTableResult(v[1])
 }
 
-export interface RollTableDetailsInputNoResults extends RollTableDetailsBase {
-	readonly results?: null
-}
-
-export type RollTableDetailsInput = RollTableDetailsInputResults | RollTableDetailsInputNoResults
-export type RollTableDetailsOrInput = RollTableDetails | RollTableDetailsInput
+export type RollTableDetailsOrInput = RollTableDetails | RollTableDetailsInputResults
 
 export interface RollTableDetailsNoResults extends RollTableDetailsBase {
 	readonly full: 'details'
-	readonly results?: null;
 }
 
 export interface RollTableDetailsAndResults extends RollTableDetailsBase {
 	readonly full: 'results'
-	readonly results: ReadonlyMap<number, RollTableResultFull<this>>;
+	readonly resultsById: ReadonlyMap<number, RollTableResultFull<this>>
+	readonly resultsByText: ReadonlyMap<string, RollTableResultFull<this>>
 }
 
 interface RollTableDetailsAndResultsInternal extends RollTableDetailsBase {
 	readonly full: 'results'
-	readonly results: Map<number, RollTableResultFull<this>>;
+	readonly resultsById: Map<number, RollTableResultFull<this>>
+	readonly resultsByText: Map<string, RollTableResultFull<this>>
 }
 
 export type RollTableDetails = RollTableDetailsNoResults|RollTableDetailsAndResults
@@ -141,11 +140,46 @@ function compareRollTables(a: RollTableOrInput, b: RollTableOrInput): number {
 		(a.header > b.header ? 1 : a.header < b.header ? -1 : 0);
 }
 
+// <0: a is a better fit
+// >0: b is a better fit
+// =0: they're the same
+function compareRollTableResults(a: RollTableResult|null|undefined, b: RollTableResult|null|undefined): number {
+	const preferA = -1
+	const preferB = 1
+	const equalPreference = 0
+	if (a && a.full) {
+		if (b && b.full) {
+			if (a.set.global === b.set.global) {
+				return a.updated.getDate() < b.updated.getDate() ? preferA : preferB
+			} else {
+				return !a.set.global ? preferA : preferB
+			}
+		} else {
+			return preferA
+		}
+	} else {
+		if (b && b.full) {
+			return preferB
+		} else {
+			return equalPreference
+		}
+	}
+}
+
 function isRollTableResult(result: unknown): result is RollTableResult<RollTableDetailsOrInput> {
 	return (typeof result === "object" && result !== null && 'table' in result
 		&& !('tableId' in result && typeof result.tableId !== 'undefined') && 'full' in result);
 }
 
+export function getResultFrom(table: RollTable, originalResult: RollTableResult): RollTableResult {
+	const dbResult = table.full === "results" ? table.resultsByText.get(originalResult.text) : null
+	return dbResult ?? {
+		full: false,
+		table,
+		text: originalResult.text
+	}
+}
+
 export class RollTableMap<T extends RollTableOrInput> extends Map<T extends RollTable ? number : (number|string), T> {
 	[Symbol.iterator](): IterableIterator<[T extends RollTable ? number : (number|string), T]> {
 		return this.entries();
@@ -191,7 +225,7 @@ export class RollTableDatabase implements Iterable<RollTableDetailsAndResults> {
 
 	constructor({ tables = [], results = [], authors = [], sets = [] }: {
 		tables?: Iterable<RollTableDetailsOrInput>,
-		results?: Iterable<RollTableResultFull<RollTableDetailsInput> | RollTableResultLookup>,
+		results?: Iterable<RollTableResultFull<RollTableDetailsOrInput> | RollTableResultLookup>,
 		authors?: Iterable<RollTableAuthor>,
 		sets?: Iterable<RollTableResultSet>
 	} = {}) {
@@ -217,6 +251,14 @@ export class RollTableDatabase implements Iterable<RollTableDetailsAndResults> {
 		return this.tablesById;
 	}
 
+	getTableMatching(table: RollTableOrInput): RollTableDetailsAndResults|undefined {
+		if (table.full) {
+			return this.tables.get(table.id)
+		} else {
+			return Array.from(this.tables.values()).find(t => (t.header === table.header))
+		}
+	}
+
 	get sets(): ReadonlyMap<number, RollTableResultSet> {
 		return this.setsById;
 	}
@@ -233,15 +275,15 @@ export class RollTableDatabase implements Iterable<RollTableDetailsAndResults> {
 		return this.mappingsByTextId;
 	}
 
-	addTable(table: RollTableDetailsInput): RollTableDetailsAndResults {
+	addTable(table: RollTableDetailsOrInput): RollTableDetailsAndResults {
 		return this.addTableInternal(table);
 	}
 
-	private addTableInternal(table: RollTableDetailsInput): RollTableDetailsAndResultsInternal {
+	private addTableInternal(table: RollTableDetailsOrInput): RollTableDetailsAndResultsInternal {
 		const existingTable = this.tablesById.get(table.id);
 		if (existingTable) {
-			if (table.results) {
-				for (const result of table.results) {
+			if (table.full === 'input' || table.full === 'results') {
+				for (const result of table.resultsById) {
 					this.addResult(result);
 				}
 			}
@@ -250,10 +292,11 @@ export class RollTableDatabase implements Iterable<RollTableDetailsAndResults> {
 		const internalTable: RollTableDetailsAndResultsInternal = {
 			...table,
 			full: 'results',
-			results: new Map<number, RollTableResultFull<RollTableDetailsAndResultsInternal>>()
+			resultsById: new Map<number, RollTableResultFull<RollTableDetailsAndResultsInternal>>(),
+			resultsByText: new Map<string, RollTableResultFull<RollTableDetailsAndResultsInternal>>(),
 		};
-		if (table.results) {
-			for (const result of table.results) {
+		if (table.full === 'input' || table.full === 'results') {
+			for (const result of table.resultsById) {
 				this.addResult(result);
 			}
 		}
@@ -288,21 +331,24 @@ export class RollTableDatabase implements Iterable<RollTableDetailsAndResults> {
 			const [, innerResult] = result as [number, RollTableResultOrLookup<RollTableDetailsOrInput>];
 			return this.addResult(innerResult);
 		} else if (isRollTableResult(result)) {
-			const internalTable =
-					this.tablesById.get(result.table.id) ?? this.addTableInternal({... result.table, results: null});
-			const internalAuthor =
-				result.full && result.author ? (this.authorsById.get(result.author.id) ?? this.addAuthor(result.author)) : null;
-			const internalSet = this.setsById.get(result.set.id) ?? this.addSet(result.set);
-			const out: RollTableResultFull<RollTableDetailsAndResultsInternal> = {
-				...result,
-				table: internalTable,
-				author: internalAuthor,
-				set: internalSet
-			};
-			internalTable.results.set(out.textId, out);
-			this.mappingsByTextId.set(out.textId, out);
-			this.mappingsByMappingId.set(out.mappingId, out);
-			return out;
+			if (!this.tables.has(result.table.id)) {
+				this.addTableInternal({... result.table, full: 'details'})
+			}
+			if (result.author && !this.authors.has(result.author.id)) {
+				this.addAuthor(result.author)
+			}
+			if (!this.sets.has(result.set.id)) {
+				this.addSet(result.set)
+			}
+			return this.addResult({
+				tableId: result.table.id,
+				authorId: result.author?.id ?? null,
+				setId: result.set.id,
+				textId: result.textId,
+				text: result.text,
+				mappingId: result.mappingId,
+				updated: result.updated
+			})
 		} else {
 			const internalTable = this.tablesById.get(result.tableId);
 			const internalAuthor = typeof result.authorId === 'number' ? this.authorsById.get(result.authorId) : null;
@@ -315,6 +361,8 @@ export class RollTableDatabase implements Iterable<RollTableDetailsAndResults> {
 			} else if (typeof internalSet === 'undefined') {
 				throw Error(`no known set with ID ${result.setId}`);
 			}
+			const oldText = internalTable.resultsByText.get(result.text)
+			const oldId = internalTable.resultsById.get(result.textId)
 			const out: RollTableResultFull<RollTableDetailsAndResultsInternal> = {
 				full: true,
 				textId: result.textId,
@@ -325,7 +373,12 @@ export class RollTableDatabase implements Iterable<RollTableDetailsAndResults> {
 				set: internalSet,
 				updated: result.updated
 			};
-			internalTable.results.set(out.textId, out);
+			if (compareRollTableResults(oldText, out) > 0) {
+				internalTable.resultsByText.set(out.text, out);
+			}
+			if (compareRollTableResults(oldId, out) > 0) {
+				internalTable.resultsById.set(out.textId, out);
+			}
 			this.mappingsByTextId.set(out.textId, out);
 			this.mappingsByMappingId.set(out.mappingId, out);
 			return out;
@@ -333,15 +386,15 @@ export class RollTableDatabase implements Iterable<RollTableDetailsAndResults> {
 	}
 }
 
-function rollOn(table: RollTableDetailsAndResults): RollTableResult<RollTableDetailsAndResults> {
-	const results = Array.from(table.results.values());
+export function rollOn(table: RollTableDetailsAndResults): RollTableResult<RollTableDetailsAndResults> {
+	const results = Array.from(table.resultsById.values());
 	if (results.length === 0) {
 		throw Error(`no results for table ${table.identifier}`);
 	}
 	return results[Math.floor(results.length * Math.random())];
 }
 
-function rollOnAll(tables: Iterable<RollTableDetailsAndResults>): RolledValues<RollTableDetailsAndResults> {
+export function rollOnAll(tables: Iterable<RollTableDetailsAndResults>): RolledValues<RollTableDetailsAndResults> {
 	const result = new RolledValues<RollTableDetailsAndResults>();
 	for (const table of tables) {
 		result.set(table, rollOn(table));
@@ -349,7 +402,7 @@ function rollOnAll(tables: Iterable<RollTableDetailsAndResults>): RolledValues<R
 	return result;
 }
 
-function rerollOn<T extends RollTable>(tables: Iterable<RollTableDetailsAndResults>, original: Iterable<[T, RollTableResult<T>]>): RolledValues<T|RollTableDetailsAndResults> {
+export function rerollOn<T extends RollTable>(tables: Iterable<RollTableDetailsAndResults>, original: Iterable<[T, RollTableResult<T>]>): RolledValues<T|RollTableDetailsAndResults> {
 	const result = new RolledValues<T|RollTableDetailsAndResults>();
 	const tableSet = new Set<RollTable>(tables);
 	for (const [table, originalValue] of original) {
@@ -374,11 +427,35 @@ export interface InProgressGeneratedState<T extends RollTableOrInput = RollTable
 	readonly selected: ReadonlySet<T>
 }
 
+export enum ExportFormat {
+	Markdown = "md",
+	BBCode = "bb",
+	TextEmoji = "emoji",
+	TextOnly = "text",
+}
+
+export function exportResult(result: RollTableResult, format: ExportFormat): string {
+	switch (format) {
+		case ExportFormat.Markdown:
+			return `**${markdownEscape(result.table.header)}**\n${markdownEscape(result.text)}`
+		case ExportFormat.BBCode:
+			return `[b]${bbcodeEscape(result.table.title)}[/b]\n${bbcodeEscape(result.text)}`
+		case ExportFormat.TextEmoji:
+			return `${result.table.header}\n${result.text}`
+		case ExportFormat.TextOnly:
+			return `${result.table.title}\n${result.text}`
+	}
+}
+
+export function exportScenario(contents: RollTableResult[], format: ExportFormat): string {
+	return contents.map(r => exportResult(r, format)).join("\n\n")
+}
+
 export function generatedStateToString(contents: GeneratedState): string {
 	if (contents.final) {
-		return `Final state: ${Array.from(contents.rolled).map(([key, value]) => `${rollTableToString(key)} : ${resultToString(value)}`).join("  :::  ")}`
+		return `Final state: ${Array.from(contents.rolled).map(([key, value]) => `${rollTableToString(key)} : ${rollResultToString(value)}`).join("  :::  ")}`
 	} else {
-		return `Current state: ${Array.from(contents.rolled).map(([key, value]) => `${rollTableToString(key)} : ${resultToString(value)}`).join("  :::  ")}. Selection: ${Array.from(contents.selected).map(v => `${rollTableToStringShort(v)}`).join(", ")}`
+		return `Current state: ${Array.from(contents.rolled).map(([key, value]) => `${rollTableToString(key)} : ${rollResultToString(value)}`).join("  :::  ")}. Selection: ${Array.from(contents.selected).map(v => `${rollTableToStringShort(v)}`).join(", ")}`
 	}
 }
 
diff --git a/src/server/web/template.ts b/src/common/template.ts
similarity index 52%
rename from src/server/web/template.ts
rename to src/common/template.ts
index c9700e8..34ea78a 100644
--- a/src/server/web/template.ts
+++ b/src/common/template.ts
@@ -1,8 +1,8 @@
 import {
-	type RollTable, type RollTableAuthor, type RollTableDetails,
+	type RollTable, type RollTableAuthor, RollTableDatabase, type RollTableDetails,
 	type RollTableDetailsAndResults,
-	type RollTableResult, type RollTableResultFull, type RollTableResultSet, rollTableToString
-} from '../../common/rolltable.js';
+	type RollTableResult, type RollTableResultFull, type RollTableResultSet
+} from './rolltable';
 import escapeHTML from 'escape-html';
 import slug from 'slug';
 
@@ -17,17 +17,17 @@ export function htmlTableIdentifier(table: RollTable): string {
 export function buildFooter({ creditsUrl, includesResponses, includesGenerator }: { readonly creditsUrl: string, readonly includesResponses: boolean, readonly includesGenerator: boolean }): string {
 	return `
 		<footer>
-			${includesGenerator ? `<noscript><p>⚠️ Certain features - copy, select-all/select-none${ includesResponses ? ', reroll offline' : ''} - are currently disabled because Javascript is disabled.</p></noscript>` : '' }
+			${includesGenerator ? `<noscript><p>⚠️ Certain features - copy, select-all/select-none${ includesResponses ? ', reroll offline, select response' : ''} - are currently disabled because JavaScript is disabled.</p></noscript>` : '' }
 			${includesGenerator && includesResponses ? `<p class="requiresJs">💡 You can save this page to be able to generate scenarios offline!</p>` : ''}
 			<p>
-				<a href="${encodeURI(creditsUrl)}" rel="help" target="_blank">Project credits/instructions/source code</a>
+				<a href="${encodeURI(creditsUrl)}" rel="external help noreferrer">Project credits/instructions/source code</a>
 			</p>
 		</footer>`;
 }
 
 export function buildAuthor({ author }: { readonly author: RollTableAuthor }): string {
 	if (author.url) {
-		return `<div class="author" data-id="${escapeHTML(`${author.id}`)}"><span class="authorRelation">${escapeHTML(author.relation)}</span> <span class="authorName"><a href="${encodeURI(author.url)}" rel="external nofollow" target="_blank">${escapeHTML(author.name)}</a></span></div>`;
+		return `<div class="author" data-id="${escapeHTML(`${author.id}`)}"><span class="authorRelation">${escapeHTML(author.relation)}</span> <span class="authorName"><a href="${encodeURI(author.url)}" rel="external nofollow noreferrer">${escapeHTML(author.name)}</a></span></div>`;
 	} else {
 		return `<div class="author" data-id="${escapeHTML(`${author.id}`)}"><span class="authorRelation">${escapeHTML(author.relation)}</span> <span class="authorName">${escapeHTML(author.name)}</span></div>`;
 	}
@@ -41,41 +41,54 @@ export function buildResultAttribution({ result }: { readonly result: RollTableR
 	return `<div class="attribution"><div class="attributionBubble">${result.author ? buildAuthor({ author: result.author }) : ''}${buildSet({ resultSet: result.set })}</div></div>`;
 }
 
-export function buildGeneratedElement({ result, selected }: { readonly result: RollTableResult, readonly selected: boolean }): string {
+export const selectedIdPrefix = 'selected-'
+export function buildGeneratedElement({ result, selected }: { readonly result: RollTableResult, readonly selected: boolean|null }): string {
 	return (
 `<li class="generatedElement">
-		<h2 class="generatedHead tableHeader"><label class="generatedLabel" ${result.table.full === 'results' ? `for="selected-${htmlTableIdentifier(result.table)}"` : ''}><span class="tableEmoji">${escapeHTML(result.table.emoji)}</span> <span>${escapeHTML(result.table.title)}</span></label>${result.table.full === 'results' ? `<input class="generatedSelect" id="selected-${htmlTableIdentifier(result.table)}" name="selected-${htmlTableIdentifier(result.table)}" type="checkbox" ${selected ? 'checked' : ''} />` : ''}</h2>
-		<div class="resultText generated${result.full ? ' attributed' : ''}">${escapeHTML(result.text)}${result.full ? buildResultAttribution({ result }) : ''}</div>
+		<h2 class="generatedHead"><label class="generatedLabel tableHeader" ${buildTableData(result.table)} ${result.table.full === 'results' ? `for="${selectedIdPrefix}${htmlTableIdentifier(result.table)}"` : ''}><span class="tableEmoji">${escapeHTML(result.table.emoji)}</span> <span class="tableTitle">${escapeHTML(result.table.title)}</span></label>${selected !== null ? `<input class="generatedSelect" id="${selectedIdPrefix}${htmlTableIdentifier(result.table)}" name="${selectedIdPrefix}${htmlTableIdentifier(result.table)}" type="checkbox" ${selected ? 'checked' : ''} />` : ''}</h2>
+		<div class="generated${result.full ? ' attributed' : ''}"><button type="button" class="resultText" ${buildResultData(result)}>${escapeHTML(result.text)}</button>${result.full ? buildResultAttribution({ result }) : ''}</div>
 </li>`)
 }
 
+export const submitName = "submit"
+export const rerollId = "reroll"
+export const rerollAllId = "rerollAll"
+export const saveScenarioId = "saveScenario"
+export const selectAllId = "selectAll"
+export const selectNoneId = "selectNone"
+export const copyMDID = "copyMD"
+export const copyBBID = "copyBB"
+export const copyEmojiTextID = "copyEmojiText"
+export const copyTextID = "copyText"
 export function buildGeneratorPage(
-	{ results, baseUrl, clientId, creditsUrl, selected, includesResponses }:
-		{ readonly results: ReadonlyMap<RollTable, RollTableResult>, readonly baseUrl: string, readonly clientId: string, readonly creditsUrl: string, readonly selected: ReadonlySet<RollTable>, readonly includesResponses: boolean }): string {
+	{ results, generatorTargetUrl, clientId, creditsUrl, editable, selected, includesResponses }:
+		{ readonly results: ReadonlyMap<RollTable, RollTableResult>, readonly generatorTargetUrl: string, readonly clientId: string, readonly creditsUrl: string, readonly editable: boolean, readonly selected: ReadonlySet<RollTable>, readonly includesResponses: boolean }): string {
 	return `
 <div id="generator" class="page">
-	<form method="post" target="_self" action="${escapeHTML(baseUrl)}" id="generatorWindow" class="window readable">
+	<form method="post" action="${encodeURI(generatorTargetUrl)}" id="generatorWindow" class="window readable">
 		<h2 id="generatorHead">Your generated scenario</h2>
-		<ul id="generatedScenario">${Array.from(results.values()).map(result => buildGeneratedElement({ result, selected: selected.has(result.table) })).join('')}</ul>
+		<ul id="generatedScenario">${Array.from(results.values()).map(result => buildGeneratedElement({ result, selected: (editable && includesResponses && result.table.full === 'results') ? selected.has(result.table) : null })).join('')}</ul>
 		<div id="generatorControls">
-			<div id="copyButtons" class="buttons requiresJs">
-				<button class="button" id="copyMD">Markdown</button>
-				<button class="button" id="copyBB">BBCode</button>
-				<button class="button" id="copyEmojiText">Text + Emoji</button>
-				<button class="button" id="copyText">Text Only</button>
+			<div id="copyButtons" class="buttons requiresJs jsPopupHost">
+				<button type="button" class="button" id="${copyMDID}">Markdown</button>
+				<button type="button" class="button" id="${copyBBID}">BBCode</button>
+				<button type="button" class="button" id="${copyEmojiTextID}">Text + Emoji</button>
+				<button type="button" class="button" id="${copyTextID}">Text Only</button>
 			</div>
-			<div id="rollButtons" class="buttons">
-				<input type="submit" class="button" id="reroll" name="submit" value="Reroll Selected">
-				<button class="button requiresJs" id="selectAll">Select All</button>
-				<button class="button requiresJs" id="selectNone">Select None</button>
-			</div>
-			<div id="scenarioButtons" class="buttons">
-				<a href="${encodeURI(baseUrl)}" class="button" id="rerollAll" draggable="false">New Scenario</a>
-				<input type="submit" class="button" id="saveScenario" name="submit" formtarget="_blank" value="Get Scenario Link">
+			${editable ? `<div id="rollButtons" class="buttons jsPopupHost">
+				<button type="submit" class="button" id="${rerollId}" name="${submitName}" value="${rerollId}">Reroll Selected</button>
+				<button type="button" class="button requiresJs" id="${selectAllId}">Select All</button>
+				<button type="button" class="button requiresJs" id="${selectNoneId}">Select None</button>
+			</div>` : ''}
+			<div id="scenarioButtons" class="buttons jsPopupHost">
+				${editable
+					? `<a href="${encodeURI(generatorTargetUrl)}" class="button" id="${rerollAllId}" draggable="false">New Scenario</a>
+						 <button type="submit" class="button" id="${saveScenarioId}" name="${submitName}" value="${saveScenarioId}">Get Scenario Link</button>`
+					: `<a href="${encodeURI(generatorTargetUrl)}" class="button" draggable="false">Open in Generator</a>`}
 			</div>
 			${clientId !== '' || includesResponses ?
-			`<div id="generatorLinks" class="buttons">
-				${clientId !== '' ? `<a href="https://discord.com/api/oauth2/authorize?client_id=${encodeURIComponent(clientId)}&permissions=0&scope=applications.commands" class="button" rel="external nofollow" target="_blank" draggable="false">Add to Discord</a>` : ''}
+			`<div id="generatorLinks" class="buttons jsPopupHost">
+				${clientId !== '' ? `<a href="https://discord.com/api/oauth2/authorize?client_id=${encodeURIComponent(clientId)}&permissions=0&scope=applications.commands" class="button" rel="external nofollow noreferrer" draggable="false">Add to Discord</a>` : ''}
 				${includesResponses ? `<a href="#responses" class="button" id="responsesLink" draggable="false">View Possible Responses</a>` : ''}
 			</div>` : ''}
 		</div>
@@ -88,21 +101,28 @@ export function buildResponseTypeButton({table}: {readonly table: RollTableDetai
 	return `<a href="#responses-${htmlTableIdentifier(table)}" class="button" draggable="false">${escapeHTML(table.emoji)} ${escapeHTML(table.name)}</a>`
 }
 
+export function buildResultData(result: RollTableResult): string {
+	return result.full ? `data-mappingid="${result.mappingId}" data-textid="${result.textId}" data-updated="${result.updated.getTime()}"` : ''
+}
+
+export function buildTableData(table: RollTable): string {
+	return `data-ordinal="${table.ordinal}" ${table.full
+		? `data-id="${table.id}" data-identifier="${escapeHTML(table.identifier)}" data-name="${escapeHTML(table.name)}"`
+		: ''}`
+}
+
 export function buildResponse({result, active}: {readonly result: RollTableResult, readonly active: boolean}) {
-	return `<li class="response${active ? ' active' : ''}${result.full ? ' attributed' : ''}" data-id="${result.full ? result.mappingId : ''}">
-	<button class="resultText">${escapeHTML(result.text)}</button>
+	return `<li class="response${active ? ' active' : ''}${result.full ? ' attributed' : ''} jsPopupHost">
+	<button type="button" class="resultText" ${buildResultData(result)}>${escapeHTML(result.text)}</button>
 	${result.full ? buildResultAttribution({result}) : ''}
 </li>`
 }
 
 export function buildResponseList({table, activeResult}: {readonly table: RollTableDetailsAndResults, readonly activeResult?: RollTableResult}) {
 	return `<li class="responseType window readable" id="responses-${htmlTableIdentifier(table)}">
-		<div class="responseTypeHead tableHeader">
-			<span class="tableEmoji">${escapeHTML(table.emoji)}</span>
-			<h2>${escapeHTML(table.title)}</h2>
-		</div>
+		<h2 class="responseTypeHead tableHeader" ${buildTableData(table)}><span class="tableEmoji">${escapeHTML(table.emoji)}</span> <span class="tableTitle">${escapeHTML(table.title)}</span></h2>
 		<ul>
-			${Array.from(table.results.values()).map(result => buildResponse({result, active: result === activeResult})).join('')}
+			${Array.from(table.resultsById.values()).map(result => buildResponse({result, active: result === activeResult})).join('')}
 		</ul>
 	</li>`
 }
@@ -119,10 +139,10 @@ export function buildResponsesPage(
 			<h1 id="responsesHead">Possible Responses</h1>
 			<nav class="buttons" id="responsesHeaderNav">
 				${Array.from(tables).map(table => buildResponseTypeButton({table})).join('')}
-				<a href="#generator" class="button" draggable="false">Return to Generator</a>
+				<a id="returnToGenerator" href="#generator" class="button" draggable="false">Return to Generator</a>
 			</nav>
 		</header>
-		<ul class="responseLists">
+		<ul id="responseLists">
 			${Array.from(tables).map(table => buildResponseList({table, activeResult: results?.get(table)})).join('')}
 		</ul>
 		${buildFooter({ includesResponses: true, includesGenerator, creditsUrl })}
diff --git a/src/common/tsconfig.json b/src/common/tsconfig.json
new file mode 100644
index 0000000..1634754
--- /dev/null
+++ b/src/common/tsconfig.json
@@ -0,0 +1,11 @@
+{
+	"compilerOptions": {
+		"target": "es2015",
+		"module": "ES2015",
+		"esModuleInterop": true,
+		"forceConsistentCasingInFileNames": true,
+		"moduleResolution": "NodeNext",
+		"strict": true,
+		"skipLibCheck": true
+	}
+}
diff --git a/src/server/db/database.ts b/src/server/db/database.ts
index 2239d30..220740b 100644
--- a/src/server/db/database.ts
+++ b/src/server/db/database.ts
@@ -4,20 +4,19 @@ import {
 	type GeneratedContents,
 	type GeneratedState,
 	type InProgressGeneratedContents,
-	type InProgressGeneratedState, RolledValues, RollSelections,
+	type InProgressGeneratedState,
+	RolledValues, rollOn, rollResultToString,
+	RollSelections,
 	type RollTable,
-	type RollTableAuthor, RollTableDatabase,
+	type RollTableAuthor,
+	RollTableDatabase,
 	type RollTableDetailsNoResults,
-	type RollTableResult,
-	type RollTableResultFull
-} from '../../common/rolltable.js';
-import { type PreparedQueries, type QueryOutput, TypedDBWrapper } from './querytypes.js';
-import {
-	DatabaseQueries,
-} from './queries.js';
-import { recordError } from '../discord/embed.js';
+	type RollTableResultFull,
+} from '../../common/rolltable';
+import { type PreparedQueries, type QueryOutput, TypedDBWrapper } from './querytypes';
+import { DatabaseQueries } from './queries';
 
-function processOperationResult(result: QueryOutput<(typeof DatabaseQueries)["getResultMappingsForDiscordSet"]>[number] | undefined): (RollTableResultFull<RollTableDetailsNoResults> & {
+function processOperationResult(result: QueryOutput<(typeof DatabaseQueries)['getResultMappingsForDiscordSet']>[number] | undefined): (RollTableResultFull<RollTableDetailsNoResults> & {
 	status: 'updated' | 'existing'
 }) | undefined {
 	if (!result) {
@@ -55,93 +54,6 @@ function processOperationResult(result: QueryOutput<(typeof DatabaseQueries)["ge
 	};
 }
 
-function processGeneratedRow(result: QueryOutput<typeof DatabaseQueries['generateFromDiscord']>[number]): RollTableResult & { selected: boolean } {
-	if (result.tableId === null) {
-		return {
-			full: false,
-			table: {
-				full: false,
-				emoji: result.tableEmoji,
-				title: result.tableTitle,
-				header: result.tableHeader,
-				ordinal: result.tableOrdinal
-			},
-			text: result.resultText,
-			selected: false
-		};
-	} else if (result.mappingId === null) {
-		return {
-			full: false,
-			table: {
-				full: 'details',
-				emoji: result.tableEmoji,
-				header: result.tableHeader,
-				id: result.tableId,
-				identifier: result.tableIdentifier,
-				name: result.tableName,
-				ordinal: result.tableOrdinal,
-				title: result.tableTitle
-			},
-			text: result.resultText,
-			selected: result.selected
-		};
-	} else {
-		return {
-			full: true,
-			table: {
-				full: 'details',
-				emoji: result.tableEmoji,
-				header: result.tableHeader,
-				id: result.tableId,
-				identifier: result.tableIdentifier,
-				name: result.tableName,
-				ordinal: result.tableOrdinal,
-				title: result.tableTitle
-			},
-			author: result.authorId && result.authorName && result.authorRelation ? {
-				id: result.authorId,
-				name: result.authorName,
-				url: result.authorUrl,
-				relation: result.authorRelation
-			} : null,
-			set: {
-				id: result.setId,
-				name: result.setName,
-				description: result.setDescription,
-				global: !!(result.setGlobal)
-			},
-			mappingId: result.mappingId,
-			textId: result.resultId,
-			text: result.resultText,
-			updated: new Date(result.updated),
-			selected: result.selected
-		};
-	}
-}
-
-function processGeneration(results: QueryOutput<typeof DatabaseQueries['generateFromDiscord']>, final: true): FinalGeneratedState
-function processGeneration(results: QueryOutput<typeof DatabaseQueries['generateFromDiscord']>, final: false): InProgressGeneratedState
-function processGeneration(results: QueryOutput<typeof DatabaseQueries['generateFromDiscord']>, final: boolean): GeneratedState
-function processGeneration(results: QueryOutput<typeof DatabaseQueries['generateFromDiscord']>, final: boolean): GeneratedState {
-	const rolled = new Map<RollTable, RollTableResult>();
-	const selected = new Set<RollTable>();
-	for (const rawResult of results) {
-		const processed = processGeneratedRow(rawResult);
-		rolled.set(processed.table, processed);
-		if (!final && processed.selected) {
-			selected.add(processed.table);
-		}
-	}
-	return final ? {
-		final,
-		rolled
-	} : {
-		final,
-		rolled,
-		selected
-	};
-}
-
 export class Database {
 	private readonly db: TypedDBWrapper;
 	private readonly queries: PreparedQueries<typeof DatabaseQueries>;
@@ -162,7 +74,7 @@ export class Database {
 			setSnowflake: setSnowflake,
 			tableIdentifierSubstring: tableIdentifier,
 			pattern: partialText,
-			includeGlobal,
+			includeGlobal
 		}));
 	}
 
@@ -310,8 +222,8 @@ export class Database {
 			tableIdentifier: table,
 			text,
 			setSnowflake: setId,
-			includeGlobal: true,
-		}))
+			includeGlobal: true
+		}));
 		const result = processOperationResult(results[0]);
 		if (!result) {
 			return {
@@ -324,150 +236,145 @@ export class Database {
 		};
 	}
 
-	private async runGenerateFromDiscord(reroll: true, setId: string|null, contents?: InProgressGeneratedContents | null, finalize?: false): Promise<InProgressGeneratedState>
-	private async runGenerateFromDiscord(reroll: false, setId: string|null, contents: GeneratedContents, finalize: false): Promise<InProgressGeneratedState>
-	private async runGenerateFromDiscord(reroll: false, setId: string|null, contents: GeneratedContents, finalize: true): Promise<FinalGeneratedState>
-	private async runGenerateFromDiscord(reroll: false, setId: string|null, contents: InProgressGeneratedContents): Promise<InProgressGeneratedState>
-	private async runGenerateFromDiscord(reroll: false, setId: string|null, contents: FinalGeneratedContents): Promise<FinalGeneratedState>
-	private async runGenerateFromDiscord(reroll: false, setId: string|null, contents: GeneratedContents, finalize?: boolean): Promise<GeneratedState>
-	private async runGenerateFromDiscord(reroll: boolean, setId: string|null, contents?: GeneratedContents | null, finalize?: boolean): Promise<GeneratedState> {
-		const results = await this.db.run(this.queries.generateFromDiscord({
-			reroll,
-			setSnowflake: setId,
-			original: contents ? Array.from(contents.rolled) : null,
-			selection: contents && !contents.final ? Array.from(contents.selected) : null
-		}))
-		return processGeneration(results, finalize ?? contents?.final ?? false);
-	}
-
-	async expandFromDiscordSet(setId: string, contents: FinalGeneratedContents): Promise<FinalGeneratedState>
-	async expandFromDiscordSet(setId: string, contents: InProgressGeneratedContents): Promise<InProgressGeneratedState>
-	async expandFromDiscordSet(setId: string, contents: GeneratedContents): Promise<GeneratedState>
-	async expandFromDiscordSet(setId: string, contents: GeneratedContents): Promise<GeneratedState> {
-		return this.runGenerateFromDiscord(false, setId, contents);
-	}
-
-	async generateFromDiscordSet(setId: string): Promise<InProgressGeneratedState> {
-		return this.runGenerateFromDiscord(true, setId);
-	}
-
-	async rerollFromDiscordSet(setId: string, existing: InProgressGeneratedContents): Promise<InProgressGeneratedState> {
-		return this.runGenerateFromDiscord(true, setId, existing);
-	}
-
-	async reopenFromDiscordSet(setId: string, existing: FinalGeneratedContents): Promise<InProgressGeneratedState> {
-		return this.runGenerateFromDiscord(false, setId, existing, false);
-	}
-
-	async finalizeFromDiscordSet(setId: string, existing: InProgressGeneratedContents): Promise<FinalGeneratedState> {
-		return this.runGenerateFromDiscord(false, setId, existing, true);
-	}
-
 	async getDiscordAuthor(id: string): Promise<RollTableAuthor | null> {
 		return await this.db.run(this.queries.getDiscordAuthor({
-			userSnowflake: id,
-		}))
+			userSnowflake: id
+		}));
 	}
 
-	async setDiscordAuthor(id: string, username: string, name: string | null, url: string | null): Promise<RollTableAuthor|null> {
+	async setDiscordAuthor(id: string, username: string, name: string | null, url: string | null): Promise<RollTableAuthor | null> {
 		const [, result] = await this.db.batch(
 			this.queries.setDiscordAuthor({
 				userSnowflake: id,
 				username: username,
 				name: name,
-				url: url,
+				url: url
 			}),
-			this.queries.getDiscordAuthor({userSnowflake: id})
-		)
+			this.queries.getDiscordAuthor({ userSnowflake: id })
+		);
 		return result;
 	}
 
-	private async getWebPageDataForDiscordSet(reroll: true, setSnowflake: string|null, oldResults?: InProgressGeneratedContents | null, finalize?: false): Promise<InProgressGeneratedState & {db: RollTableDatabase}>
-	private async getWebPageDataForDiscordSet(reroll: false, setSnowflake: string|null, oldResults?: null): Promise<RollTableDatabase>
-	private async getWebPageDataForDiscordSet(reroll: false, setSnowflake: string|null, oldResults: GeneratedContents, finalize: false): Promise<InProgressGeneratedState & {db: RollTableDatabase}>
-	private async getWebPageDataForDiscordSet(reroll: false, setSnowflake: string|null, oldResults: GeneratedContents, finalize: true): Promise<FinalGeneratedState & {db: RollTableDatabase}>
-	private async getWebPageDataForDiscordSet(reroll: false, setSnowflake: string|null, oldResults: InProgressGeneratedContents): Promise<InProgressGeneratedState & {db: RollTableDatabase}>
-	private async getWebPageDataForDiscordSet(reroll: false, setSnowflake: string|null, oldResults: FinalGeneratedContents): Promise<FinalGeneratedState & {db: RollTableDatabase}>
-	private async getWebPageDataForDiscordSet(reroll: boolean, setSnowflake: string|null, oldResults?: GeneratedContents|null, finalize?: boolean): Promise<RollTableDatabase | (GeneratedState & {db: RollTableDatabase})>
-	private async getWebPageDataForDiscordSet(reroll: boolean, setSnowflake: string|null, oldResults?: GeneratedContents|null, finalize?: boolean): Promise<RollTableDatabase | (GeneratedState & {db: RollTableDatabase})> {
-		const { tables, mappings, results, sets, authors } =
-			await this.db.run(this.queries.getFullDatabaseForDiscordSet({
-				reroll,
-				setSnowflake,
-				original: oldResults ? Array.from(oldResults.rolled) : null,
-				selection: oldResults && !oldResults.final ? Array.from(oldResults.selected) : null,
-			}))
+	private async getGeneratorDataForDiscordSet(reroll: true, setSnowflake: string | null, oldResults?: InProgressGeneratedContents | null, finalize?: false): Promise<InProgressGeneratedState & {
+		db: RollTableDatabase
+	}>
+	private async getGeneratorDataForDiscordSet(reroll: false, setSnowflake: string | null, oldResults?: null): Promise<RollTableDatabase>
+	private async getGeneratorDataForDiscordSet(reroll: false, setSnowflake: string | null, oldResults: GeneratedContents, finalize: false): Promise<InProgressGeneratedState & {
+		db: RollTableDatabase
+	}>
+	private async getGeneratorDataForDiscordSet(reroll: false, setSnowflake: string | null, oldResults: GeneratedContents, finalize: true): Promise<FinalGeneratedState & {
+		db: RollTableDatabase
+	}>
+	private async getGeneratorDataForDiscordSet(reroll: false, setSnowflake: string | null, oldResults: InProgressGeneratedContents): Promise<InProgressGeneratedState & {
+		db: RollTableDatabase
+	}>
+	private async getGeneratorDataForDiscordSet(reroll: false, setSnowflake: string | null, oldResults: FinalGeneratedContents): Promise<FinalGeneratedState & {
+		db: RollTableDatabase
+	}>
+	private async getGeneratorDataForDiscordSet(reroll: boolean, setSnowflake: string | null, oldResults: GeneratedContents, finalize?: boolean): Promise<GeneratedState & {
+		db: RollTableDatabase
+	}>
+	private async getGeneratorDataForDiscordSet(reroll: boolean, setSnowflake: string | null, oldResults?: GeneratedContents | null, finalize?: boolean): Promise<RollTableDatabase | (GeneratedState & {
+		db: RollTableDatabase
+	})> {
+		const oldHeaders = oldResults && oldResults.rolled.size > 0 ? Array.from(oldResults.rolled.keys()) : [];
+		const [tables, oldKeys, oldSelection, { mappings, sets, authors }] =
+			await this.db.batch(
+				this.queries.getTables({}),
+				this.queries.getTableIdsByIdentifierOrHeader({
+					identifiersOrHeaders: oldHeaders
+				}),
+				this.queries.getTableIdsByIdentifierOrHeader({
+					identifiersOrHeaders: oldResults && !oldResults.final && oldResults.selected.size > 0 ? Array.from(oldResults.selected) : []
+				}),
+				this.queries.getFullDatabaseForDiscordSet({
+					setSnowflake
+				}));
 		const db = new RollTableDatabase({
-			tables, authors, sets, results: mappings.map(v => ({...v, updated: new Date(v.updated)}))})
-		if (!results) {
-			return db
+			tables: tables.map(v => ({ ...v, full: 'details' })),
+			authors,
+			sets,
+			results: mappings.map(v => ({ ...v, updated: new Date(v.updated) }))
+		});
+		if (!oldResults && !reroll) {
+			return db;
 		}
-		const rolled = new RolledValues()
-		for (const result of results) {
-			switch (result.type) {
-				case 'mapping':
-					const mapping = db.mappings.get(result.mappingId)
-					if (mapping) {
-						rolled.add(mapping)
-					} else {
-						recordError({
-							error: Error(`no mapping with ID ${result.mappingId}`),
-							context: 'getting web page data for discord set',
-						})
-					}
-					break
-				case 'unknownText':
-					const table = db.tables.get(result.tableId)
-					if (table) {
-						rolled.add({
-							full: false,
-							text: result.text,
-							table
-						})
-					} else {
-						recordError({
-							error: Error(`no table with ID ${result.tableId}`),
-							context: `assembling unknown text for discord set`
-						})
-					}
-					break
-				case 'unknownTable':
-					rolled.add({
-						full: false,
-						table: {
-							full: false,
-							ordinal: result.ordinal,
-							header: result.header,
-							emoji: result.emoji,
-							title: result.title
-						},
-						text: result.text
-					})
-					break
+		const selected = new RollSelections(oldSelection.flatMap(v => {
+			if (v === null) {
+				return [];
 			}
-		}
-		if (finalize === true || (finalize === null && oldResults?.final)) {
-			return {
-				final: true,
-				db,
-				rolled
+			const table = db.tables.get(v);
+			if (!table) {
+				return [];
 			}
-		}
-		const selected = new RollSelections()
-		for (const table of tables) {
-			if (table.selected) {
-				selected.add(db.tables.get(table.id)!)
+			return [table];
+		}));
+		const rolled = new RolledValues();
+		const rollKeys = oldResults ? oldKeys : tables.map(t => t.id);
+		for (let index = 0; index < rollKeys.length; index += 1) {
+			const tableId = rollKeys[index];
+			const lookupTable = tableId !== null ? db.tables.get(tableId) : null;
+			const oldHeader = oldHeaders[index];
+			const [oldEmoji, oldTitle] = oldHeader ? oldHeader.split(' ', 2) : ['', ''];
+			const table: RollTable = lookupTable ?? {
+				full: false,
+				header: oldHeader,
+				emoji: oldEmoji,
+				title: oldTitle,
+				ordinal: index
+			};
+			const text = oldResults?.rolled.get(oldHeader);
+			if (reroll && table.full && (!text || selected.has(table))) {
+				const result = rollOn(table)
+				rolled.add(result);
+			} else if (text) {
+				const lookupResult = text && table.full === 'results' ? table.resultsByText.get(text) : null;
+				const result = lookupResult ?? {
+					full: false,
+					text: text,
+					table
+				}
+				rolled.add(result);
 			}
 		}
-		return {
+		return (finalize ?? oldResults?.final) ? {
+			final: true,
+			db,
+			rolled
+		} : {
 			final: false,
 			db,
 			rolled,
 			selected
-		}
+		};
+	}
+
+	async getGeneratorPageForDiscordSet(setSnowflake: string | null, oldResults?: InProgressGeneratedContents | null): Promise<InProgressGeneratedState & {
+		db: RollTableDatabase
+	}> {
+		return this.getGeneratorDataForDiscordSet(true, setSnowflake, oldResults, false);
 	}
 
-	async getGeneratorPageForDiscordSet(setSnowflake: string|null, oldResults?: InProgressGeneratedContents|null): Promise<InProgressGeneratedState & {db: RollTableDatabase}> {
-		return this.getWebPageDataForDiscordSet(true, setSnowflake, oldResults, false)
+	async expandFromDiscordSet(setId: string, contents: FinalGeneratedContents): Promise<FinalGeneratedState>
+	async expandFromDiscordSet(setId: string, contents: InProgressGeneratedContents): Promise<InProgressGeneratedState>
+	async expandFromDiscordSet(setId: string, contents: GeneratedContents): Promise<GeneratedState>
+	async expandFromDiscordSet(setId: string, contents: GeneratedContents): Promise<GeneratedState> {
+		return this.getGeneratorDataForDiscordSet(false, setId, contents);
+	}
+
+	async generateFromDiscordSet(setId: string): Promise<InProgressGeneratedState> {
+		return this.getGeneratorDataForDiscordSet(true, setId);
+	}
+
+	async rerollFromDiscordSet(setId: string, existing: InProgressGeneratedContents): Promise<InProgressGeneratedState> {
+		return this.getGeneratorDataForDiscordSet(true, setId, existing);
+	}
+
+	async reopenFromDiscordSet(setId: string, existing: FinalGeneratedContents): Promise<InProgressGeneratedState> {
+		return this.getGeneratorDataForDiscordSet(false, setId, existing, false);
+	}
+
+	async finalizeFromDiscordSet(setId: string, existing: InProgressGeneratedContents): Promise<FinalGeneratedState> {
+		return this.getGeneratorDataForDiscordSet(false, setId, existing, true);
 	}
 }
diff --git a/src/server/db/queries.ts b/src/server/db/queries.ts
index 1e39f0c..fa4fe6f 100644
--- a/src/server/db/queries.ts
+++ b/src/server/db/queries.ts
@@ -1,4 +1,4 @@
-import { type QueryDefinitions, validatedDefinitions } from './querytypes.js';
+import { type QueryDefinitions, validatedDefinitions } from './querytypes';
 import {
 	boolean,
 	discordSnowflake,
@@ -10,8 +10,8 @@ import {
 	tableIdentifierSubstring,
 	timestamp,
 	URL
-} from './validators.js';
-import { guaranteedSingleton, jsonParser, nothing, rows, singleton, writeCount } from './transformers.js';
+} from './validators';
+import { extract, guaranteedSingleton, jsonParser, nothing, rows, singleton, writeCount } from './transformers';
 
 export const DatabaseQueries = validatedDefinitions({
 	autocompleteTable: {
@@ -470,190 +470,6 @@ export const DatabaseQueries = validatedDefinitions({
 		},
 		output: writeCount()
 	},
-	generateFromDiscord: {
-		query: `WITH originalResults (tableId, header, ordinal, text) AS (SELECT rollableTables.id      AS tableId,
-																																						 rollableTables.header  AS header,
-																																						 rollableTables.ordinal AS ordinal,
-																																						 NULL                   AS text
-																																			FROM rollableTables
-																																			WHERE ?3 IS NULL
-																																			UNION ALL
-																																			SELECT rollableTableHeaders.tableId AS id,
-																																						 original.value ->> '$[0]'    AS header,
-																																						 original.key                 AS ordinal,
-																																						 original.value ->> '$[1]'    AS text
-																																			FROM json_each(COALESCE(?3, '[]')) original
-																																						 LEFT JOIN rollableTableHeaders
-																																											 ON rollableTableHeaders.header = (original.value ->> '$[0]')
-																																			ORDER BY ordinal),
-								 selection (tableId)
-									 AS (SELECT COALESCE(rollableTableIdentifiers.tableId, rollableTableHeaders.tableId) AS tableId
-											 FROM json_each(COALESCE(?4, '[]')) selection
-															LEFT JOIN rollableTableIdentifiers
-																				ON rollableTableIdentifiers.identifier = selection.value
-															LEFT JOIN rollableTableHeaders
-																				ON rollableTableHeaders.header = selection.value
-											 WHERE COALESCE(rollableTableIdentifiers.tableId, rollableTableHeaders.tableId) IS NOT NULL),
-								 visibleSets (id, global) AS (SELECT resultSets.id, resultSets.global
-																							FROM resultSets
-																							WHERE (resultSets.global OR resultSets.discordSnowflake = ?2)),
-								 usedResults (id) AS (SELECT DISTINCT resultMappings.resultId
-																			FROM resultMappings
-																			WHERE resultMappings.setId IN (SELECT id FROM visibleSets)),
-								 usedTables (id) AS (SELECT DISTINCT rollableResults.tableId
-																		 FROM usedResults
-																						INNER JOIN rollableResults ON rollableResults.id = usedResults.id),
-								 usedMappings (id) AS (SELECT (SELECT resultMappings.id
-																							 FROM resultMappings
-																							 WHERE resultMappings.resultId = usedResults.id
-																								 AND resultMappings.setId IN (SELECT id FROM visibleSets)
-																							 ORDER BY (NOT visibleSets.global) DESC,
-																												(resultMappings.authorId IS NOT NULL) DESC,
-																												updated
-																							 LIMIT 1)
-																			 FROM usedResults),
-								 usedAuthors (id) AS (SELECT DISTINCT resultMappings.authorId
-																			FROM usedMappings
-																						 INNER JOIN resultMappings ON resultMappings.id = usedMappings.id),
-								 usedSets (id) AS (SELECT DISTINCT resultMappings.setId
-																	 FROM usedMappings
-																					INNER JOIN resultMappings ON resultMappings.id = usedMappings.id),
-								 results (resultId, tableId, header, ordinal, originalText) AS
-									 (SELECT (SELECT rollableResults.id
-														FROM rollableResults
-														WHERE rollableResults.tableId = originalResult.tableId
-															AND rollableResults.id IN usedResults
-															AND ((?1 AND (originalResult.text IS NULL OR ?4 IS NULL OR
-																						originalResult.tableId IN selection)) OR
-																	 rollableResults.text = originalResult.text)
-														ORDER BY RANDOM()
-														LIMIT 1)              AS resultId,
-													 originalResult.tableId AS tableId,
-													 originalResult.header  AS header,
-													 originalResult.ordinal AS ordinal,
-													 originalResult.text    AS originalText
-										FROM originalResults AS originalResult)
-						SELECT resultMappings.id                                            AS mappingId,
-									 rollableResults.id                                           AS resultId,
-									 COALESCE(rollableResults.text, results.originalText, '')     AS resultText,
-									 authors.id                                                   AS authorId,
-									 COALESCE(authors.name, authorshipTypes.defaultAuthor)        AS authorName,
-									 authors.url                                                  AS authorUrl,
-									 authorshipTypes.relationPrefix                               AS authorRelation,
-									 resultSets.id                                                AS setId,
-									 resultSets.name                                              AS setName,
-									 resultSets.description                                       AS setDescription,
-									 resultSets.global                                            AS setGlobal,
-									 rollableTables.id                                            AS tableId,
-									 rollableTables.identifier                                    AS tableIdentifier,
-									 rollableTables.name                                          AS tableName,
-									 COALESCE(
-										 rollableTables.title,
-										 SUBSTR(results.header, INSTR(results.header, ' ') + 1))    AS tableTitle,
-									 COALESCE(
-										 rollableTables.emoji,
-										 SUBSTR(results.header, 1, INSTR(results.header, ' ') - 1)) AS tableEmoji,
-									 results.header                                               AS tableHeader,
-									 results.ordinal                                              AS tableOrdinal,
-									 resultMappings.updated                                       AS updated,
-									 results.tableId IN selection                                 AS selected
-						FROM results
-									 LEFT JOIN rollableResults ON rollableResults.id = results.resultId
-									 LEFT JOIN rollableTables ON rollableTables.id = results.tableId
-									 LEFT JOIN resultMappings ON resultMappings.id = (SELECT resultMappings.id
-																																		FROM resultMappings
-																																					 INNER JOIN visibleSets ON visibleSets.id = resultMappings.setId
-																																		WHERE resultMappings.resultId = results.resultId
-																																		ORDER BY (NOT visibleSets.global) DESC,
-																																						 (resultMappings.authorId IS NOT NULL) DESC,
-																																						 updated
-																																		LIMIT 1)
-									 LEFT JOIN authors ON authors.id = resultMappings.authorId
-									 LEFT JOIN authorshipTypes ON authorshipTypes.id = authors.authorshipTypeId
-									 LEFT JOIN resultSets ON resultSets.id = resultMappings.setId;`,
-		parameters: {
-			'reroll': {
-				validator: boolean,
-				index: 1
-			},
-			'setSnowflake': {
-				validator: nullable(discordSnowflake),
-				index: 2
-			},
-			'original': {
-				validator: nullable(jsonArray),
-				index: 3
-			},
-			'selection': {
-				validator: nullable(jsonArray),
-				index: 4
-			}
-		},
-		output: rows<{
-			mappingId: null,
-			resultId: null,
-			resultText: string,
-			authorId: null,
-			authorName: null,
-			authorUrl: null,
-			authorRelation: null,
-			setId: null,
-			setName: null,
-			setDescription: null,
-			setGlobal: null,
-			tableId: null,
-			tableIdentifier: null,
-			tableName: null,
-			tableTitle: string,
-			tableEmoji: string,
-			tableHeader: string,
-			tableOrdinal: number,
-			updated: null,
-			selected: false;
-		} | {
-			mappingId: null,
-			resultId: null,
-			resultText: string,
-			authorId: null,
-			authorName: null,
-			authorUrl: null,
-			authorRelation: null,
-			setId: null,
-			setName: null,
-			setDescription: null,
-			setGlobal: null,
-			tableId: number,
-			tableIdentifier: string,
-			tableName: string,
-			tableTitle: string,
-			tableEmoji: string,
-			tableHeader: string,
-			tableOrdinal: number,
-			updated: null,
-			selected: boolean,
-		} | {
-			mappingId: number,
-			resultId: number,
-			resultText: string,
-			authorId: number | null,
-			authorName: string | null,
-			authorUrl: string | null,
-			authorRelation: string | null,
-			setId: number,
-			setName: string | null,
-			setDescription: string | null,
-			setGlobal: number,
-			tableId: number,
-			tableIdentifier: string,
-			tableName: string,
-			tableTitle: string,
-			tableEmoji: string,
-			tableHeader: string,
-			tableOrdinal: number,
-			updated: number,
-			selected: boolean,
-		}>()
-	},
 	getDiscordAuthor: {
 		query: `
 			SELECT authors.id                                            AS id,
@@ -699,160 +515,88 @@ export const DatabaseQueries = validatedDefinitions({
 		},
 		output: nothing()
 	},
-	getFullDatabaseForDiscordSet: {
-		query: `WITH originalResults (tableId, header, ordinal, text) AS (SELECT rollableTables.id      AS tableId,
-																																						 rollableTables.header  AS header,
-																																						 rollableTables.ordinal AS ordinal,
-																																						 NULL                   AS text
-																																			FROM rollableTables
-																																			WHERE ?3 IS NULL
-																																			UNION ALL
-																																			SELECT rollableTableHeaders.tableId AS id,
-																																						 original.value ->> '$[0]'    AS header,
-																																						 original.key                 AS ordinal,
-																																						 original.value ->> '$[1]'    AS text
-																																			FROM json_each(COALESCE(?3, '[]')) original
-																																						 LEFT JOIN rollableTableHeaders
-																																											 ON rollableTableHeaders.header = (original.value ->> '$[0]')
-																																			ORDER BY ordinal),
-								 selection (tableId)
-									 AS (SELECT COALESCE(rollableTableIdentifiers.tableId, rollableTableHeaders.tableId) AS tableId
-											 FROM json_each(COALESCE(?4, '[]')) selection
-															LEFT JOIN rollableTableIdentifiers
-																				ON rollableTableIdentifiers.identifier = selection.value
-															LEFT JOIN rollableTableHeaders
-																				ON rollableTableHeaders.header = selection.value
-											 WHERE COALESCE(rollableTableIdentifiers.tableId, rollableTableHeaders.tableId) IS NOT NULL),
-								 visibleSets (id, global) AS (SELECT resultSets.id, resultSets.global
-																							FROM resultSets
-																							WHERE (resultSets.global OR resultSets.discordSnowflake = ?2)),
-								 usedResults (id) AS (SELECT DISTINCT resultMappings.resultId
-																			FROM resultMappings
-																			WHERE resultMappings.setId IN (SELECT id FROM visibleSets)),
-								 usedTables (id) AS (SELECT DISTINCT rollableResults.tableId
-																		 FROM usedResults
-																						INNER JOIN rollableResults ON rollableResults.id = usedResults.id),
-								 usedMappings (id) AS (SELECT (SELECT resultMappings.id
-																							 FROM resultMappings
-																							 	INNER JOIN visibleSets ON resultMappings.setId = visibleSets.id
-																							 WHERE resultMappings.resultId = usedResults.id
-																							 ORDER BY (NOT visibleSets.global) DESC,
-																												(resultMappings.authorId IS NOT NULL) DESC,
-																												updated
-																							 LIMIT 1)
-																			 FROM usedResults),
-								 usedAuthors (id) AS (SELECT DISTINCT resultMappings.authorId
-																			FROM usedMappings
-																						 INNER JOIN resultMappings ON resultMappings.id = usedMappings.id),
-								 usedSets (id) AS (SELECT DISTINCT resultMappings.setId
-																	 FROM usedMappings
-																					INNER JOIN resultMappings ON resultMappings.id = usedMappings.id),
-								 generationResults (resultObj) AS
-									 (SELECT COALESCE((SELECT json_object(
-																							'type', 'mapping',
-																							'mappingId', resultMappings.id)
-																		 FROM rollableResults
-																						INNER JOIN resultMappings
-																											 ON resultMappings.resultId = rollableResults.id
-																						INNER JOIN usedMappings ON usedMappings.id = resultMappings.id
-																		 WHERE rollableResults.tableId = originalResult.tableId
-																			 AND rollableResults.id IN usedResults
-																			 AND ((?1 AND (originalResult.text IS NULL OR ?4 IS NULL OR
-																										 originalResult.tableId IN selection)) OR
-																						rollableResults.text = originalResult.text)
-																		 ORDER BY RANDOM()
-																		 LIMIT 1),
-																		CASE
-																			WHEN originalResult.tableId IN usedTables THEN json_object(
-																				'type', 'unknownText',
-																				'tableId', originalResult.tableId,
-																				'text', originalResult.text)
-																			ELSE json_object(
-																				'type', 'unknownTable',
-																				'header', originalResult.header,
-																				'title',
-																				SUBSTR(originalResult.header, INSTR(originalResult.header, ' ') + 1),
-																				'emoji',
-																				SUBSTR(originalResult.header, 1, INSTR(originalResult.header, ' ') - 1),
-																				'ordinal', originalResult.ordinal,
-																				'text', originalResult.text) END)
-										FROM originalResults AS originalResult
-										WHERE ?1
-											 OR (?3 IS NOT NULL))
-						SELECT (SELECT json_group_array(json(tableObj))
-										FROM (SELECT json_object('id', rollableTables.id,
-																						 'identifier', rollableTables.identifier,
-																						 'name', rollableTables.name,
-																						 'title', rollableTables.title,
-																						 'emoji', rollableTables.emoji,
-																						 'header', rollableTables.header,
-																						 'ordinal', rollableTables.ordinal,
-																						 'selected', CASE
-																													 WHEN rollableTables.id IN selection THEN json('true')
-																													 ELSE json('false') END) AS tableObj
-													FROM usedTables
-																 INNER JOIN rollableTables ON rollableTables.id = usedTables.id))              AS tables,
-									 (SELECT json_group_array(json(setObj))
-										FROM (SELECT json_object('id', resultSets.id,
-																						 'name', resultSets.name,
-																						 'description', resultSets.description,
-																						 'global', CASE
-																												 WHEN resultSets.global THEN json('true')
-																												 ELSE json('false') END) AS setObj
-													FROM usedSets
-																 INNER JOIN resultSets ON resultSets.id = usedSets.id))                        AS sets,
-									 (SELECT json_group_array(json(authorObj))
-										FROM (SELECT json_object('id', authors.id,
-																						 'name', COALESCE(authors.name, authorshipTypes.defaultAuthor),
-																						 'url', authors.url,
-																						 'relation', authorshipTypes.relationPrefix) AS authorObj
-													FROM usedAuthors
-																 INNER JOIN authors ON authors.id = usedAuthors.id
-																 INNER JOIN authorshipTypes ON authorshipTypes.id = authors.authorshipTypeId)) AS authors,
-									 (SELECT json_group_array(json(mappingObj))
-										FROM (SELECT json_object('mappingId', resultMappings.id,
-																						 'textId', resultMappings.resultId,
-																						 'text', rollableResults.text,
-																						 'tableId', rollableResults.tableId,
-																						 'setId', resultMappings.setId,
-																						 'authorId', resultMappings.authorId,
-																						 'updated', resultMappings.updated) AS mappingObj
-													FROM usedMappings
-																 INNER JOIN resultMappings ON resultMappings.id = usedMappings.id
-																 INNER JOIN rollableResults ON rollableResults.id = resultMappings.resultId))  AS mappings,
-									 CASE
-										 WHEN EXISTS (SELECT resultObj FROM generationResults)
-											 THEN (SELECT json_group_array(json(resultObj)) FROM generationResults)
-										 ELSE json('null') END                                                                     AS results;`,
+	getTableIdsByIdentifierOrHeader: {
+		query: `SELECT COALESCE(rollableTableIdentifiers.tableId, rollableTableHeaders.tableId) AS id
+						FROM json_each(?1) selection
+									 LEFT JOIN rollableTableIdentifiers
+														 ON rollableTableIdentifiers.identifier = selection.value
+									 LEFT JOIN rollableTableHeaders ON rollableTableHeaders.header = selection.value;`,
 		parameters: {
-			'reroll': {
-				validator: boolean,
+			'identifiersOrHeaders': {
+				validator: jsonArray,
 				index: 1
-			},
+			}
+		},
+		output: rows(extract<number | null>("id"))
+	},
+	getTables: {
+		query: `SELECT id, identifier, name, title, emoji, header, ordinal
+						FROM rollableTables`,
+		parameters: {},
+		output: rows<{
+			id: number,
+			identifier: string,
+			name: string,
+			title: string,
+			emoji: string,
+			header: string,
+			ordinal: number
+		}>()
+	},
+	getFullDatabaseForDiscordSet: {
+		query: `WITH visibleSets (id, name, description, global)
+									 AS (SELECT resultSets.id,
+															resultSets.name,
+															resultSets.description,
+															resultSets.global
+											 FROM resultSets
+											 WHERE (resultSets.global OR resultSets.discordSnowflake = ?1)),
+								 visibleResults (mappingId, setId, textId, tableId, text, authorId, updated)
+									 AS (SELECT resultMappings.id       AS mappingId,
+															resultMappings.setId    AS setId,
+															resultMappings.resultId AS textId,
+															rollableResults.tableId AS tableId,
+															rollableResults.text    AS text,
+															resultMappings.authorId AS authorId,
+															resultMappings.updated  AS updated
+											 FROM resultMappings
+															INNER JOIN visibleSets ON resultMappings.setId = visibleSets.id
+															INNER JOIN rollableResults ON rollableResults.id = resultMappings.resultId),
+								 visibleAuthors (id, name, url, relation)
+									 AS (SELECT DISTINCT authors.id,
+																			 COALESCE(authors.name, authorshipTypes.defaultAuthor),
+																			 authors.url,
+																			 authorshipTypes.relationPrefix
+											 FROM visibleResults
+															INNER JOIN authors ON authors.id = visibleResults.authorId
+															INNER JOIN authorshipTypes ON authorshipTypes.id = authors.authorshipTypeId)
+						SELECT (SELECT json_group_array(json_object('id', visibleSets.id,
+																												'name', visibleSets.name,
+																												'description', visibleSets.description,
+																												'global', CASE
+																																		WHEN visibleSets.global THEN json('true')
+																																		ELSE json('false') END))
+										FROM visibleSets)    AS sets,
+									 (SELECT json_group_array(json_object('id', visibleAuthors.id,
+																												'name', visibleAuthors.name,
+																												'url', visibleAuthors.url,
+																												'relation', visibleAuthors.relation))
+										FROM visibleAuthors) AS authors,
+									 (SELECT json_group_array(json_object('mappingId', visibleResults.mappingId,
+																												'textId', visibleResults.textId,
+																												'text', visibleResults.text,
+																												'tableId', visibleResults.tableId,
+																												'setId', visibleResults.setId,
+																												'authorId', visibleResults.authorId,
+																												'updated', visibleResults.updated))
+										FROM visibleResults) AS mappings;`,
+		parameters: {
 			'setSnowflake': {
 				validator: nullable(discordSnowflake),
-				index: 2
-			},
-			'original': {
-				validator: nullable(jsonArray),
-				index: 3
-			},
-			'selection': {
-				validator: nullable(jsonArray),
-				index: 4
+				index: 1
 			}
 		},
 		output: guaranteedSingleton(jsonParser<{
-			tables: {
-				id: number,
-				identifier: string,
-				name: string,
-				title: string,
-				emoji: string,
-				header: string,
-				ordinal: number,
-				selected: boolean
-			}[]
 			sets: { id: number, name: string | null, description: string | null, global: boolean }[],
 			authors: { id: number, name: string, url: string | null, relation: string }[],
 			mappings: {
@@ -864,15 +608,7 @@ export const DatabaseQueries = validatedDefinitions({
 				authorId: number,
 				updated: number
 			}[],
-			results: (({ type: 'mapping', mappingId: number } | { type: 'unknownText', tableId: number, text: string } | {
-				type: 'unknownTable',
-				header: string,
-				title: string,
-				emoji: string,
-				ordinal: number,
-				text: string
-			})[]) | null
-		}>(['tables', 'sets', 'authors', 'mappings', 'results']))
+		}>(['sets', 'authors', 'mappings']))
 	}
 } as const satisfies QueryDefinitions);
 
diff --git a/src/server/db/querytypes.ts b/src/server/db/querytypes.ts
index 7b4ced2..3da3efc 100644
--- a/src/server/db/querytypes.ts
+++ b/src/server/db/querytypes.ts
@@ -96,13 +96,19 @@ export function prepareAllQueries<T extends QueryDefinitions>(database: D1Databa
 }
 
 export async function runQuery<T>(db: D1Database, query: BoundQuery<T>): Promise<T> {
+	const startAt = performance.now()
 	const [results] = await db.batch([query.statement]);
+	const endAt = performance.now()
+	console.info(`DB query time: ${endAt - startAt} / Runtime: ${results.meta.duration} / Rows read: ${results.meta.rows_read} / Rows written: ${results.meta.rows_written}`)
 	return query.transformer(results as D1Result<object>);
 }
 
 export async function batchQueries<T extends [...unknown[]]>(db: D1Database, queries: { readonly [K in keyof T]: BoundQuery<T[K]> }): Promise<T> {
+	const startAt = performance.now()
 	const results = await db.batch(queries.map(q => q.statement));
-	return results.map((result, index) => queries[index].transformer(result as D1Result<object>)) as unknown as T;
+	const endAt = performance.now()
+	console.info(`DB transaction time: ${endAt - startAt} / Runtime: ${results.map(r => `${r.meta.duration ?? 0}`).join('+')} = ${results.reduce((t, r) => t + (r.meta.duration ?? 0), 0)} / Rows read: ${results.map(r => `${r.meta.rows_read ?? 0}`).join('+')} = ${results.reduce((t, r) => t + (r.meta.rows_read ?? 0), 0)} / Rows written: ${results.map(r => `${r.meta.rows_written ?? 0}`).join('+')} = ${results.reduce((t, r) => t + (r.meta.rows_written ?? 0), 0)}`)
+	return results.map((result, index) => queries[index].transformer(result as D1Result<object>)) as T;
 }
 
 export class TypedDBWrapper {
@@ -124,7 +130,7 @@ export class TypedDBWrapper {
 		return runQuery(this.db, query);
 	}
 
-	async batch<T extends [...unknown[]]>(...queries: { readonly [K in keyof T]: BoundQuery<T[K]> }): Promise<T> {
+	async batch<T extends [...unknown[]]>(...queries: { readonly [K in keyof T]: BoundQuery<T[K]>}): Promise<T> {
 		return batchQueries<T>(this.db, queries);
 	}
 }
diff --git a/src/server/db/transformers.ts b/src/server/db/transformers.ts
index 959947e..ad54329 100644
--- a/src/server/db/transformers.ts
+++ b/src/server/db/transformers.ts
@@ -9,7 +9,11 @@ export function jsonParser<OutputT extends object = object, KeysT extends keyof
 	}
 }
 
-export function rows<OutputT extends object = object, InputT extends object = object>(transformer?: (value: InputT) => OutputT): (result: D1Result<object>) => OutputT[] {
+export function extract<ValueT, KeyT extends string = string, ObjectT extends {[value in KeyT]: ValueT} = {[value in KeyT]: ValueT}>(key: KeyT): (value: ObjectT) => ObjectT[KeyT] {
+	return (value) => value[key]
+}
+
+export function rows<OutputT, InputT extends object = object>(transformer?: (value: InputT) => OutputT): (result: D1Result<object>) => OutputT[] {
 	if (transformer) {
 		return (result) => (result.results as InputT[]).map(transformer)
 	} else {
@@ -17,7 +21,7 @@ export function rows<OutputT extends object = object, InputT extends object = ob
 	}
 }
 
-export function guaranteedSingleton<OutputT extends object = object, InputT extends object = object>(transformer?: (value: InputT) => OutputT): (result: D1Result<object>) => OutputT {
+export function guaranteedSingleton<OutputT, InputT extends object = object>(transformer?: (value: InputT) => OutputT): (result: D1Result<object>) => OutputT {
 	const inner = singleton<OutputT, InputT>(transformer)
 
 	return (result) => {
@@ -29,7 +33,7 @@ export function guaranteedSingleton<OutputT extends object = object, InputT exte
 	}
 }
 
-export function singleton<OutputT extends object = object, InputT extends object = object>(transformer?: (value: InputT) => OutputT): (result: D1Result<object>) => OutputT | null {
+export function singleton<OutputT, InputT extends object = object>(transformer?: (value: InputT) => OutputT): (result: D1Result<object>) => OutputT | null {
 	if (transformer) {
 		return (result) => {
 			if (result.results.length > 1) {
diff --git a/src/server/discord/commands.ts b/src/server/discord/commands.ts
index eabedcf..fa7f1a4 100644
--- a/src/server/discord/commands.ts
+++ b/src/server/discord/commands.ts
@@ -8,7 +8,7 @@ import {
 	SlashCommand,
 	type SlashCreator
 } from 'slash-create/web';
-import { type Database } from '../db/database.js';
+import { type Database } from '../db/database';
 import { type Snowflake } from 'discord-snowflake';
 import {
 	DELETE_ID,
@@ -22,7 +22,7 @@ import {
 	loadEmbed, recordError,
 	REROLL_ID,
 	SELECT_ID, SUCCESS_COLOR, WARNING_COLOR
-} from './embed.js';
+} from './embed';
 import {
 	generatedContentsToString, generatedStateToString,
 	MAX_IDENTIFIER_LENGTH,
@@ -30,7 +30,7 @@ import {
 	MAX_RESULT_LENGTH,
 	MAX_URL_LENGTH,
 	type RollTableAuthor
-} from '../../common/rolltable.js';
+} from '../../common/rolltable';
 import markdownEscape from 'markdown-escape';
 
 const tableOption: Omit<ApplicationCommandOptionLimitedString, 'name' | 'description'> = {
diff --git a/src/server/discord/embed.ts b/src/server/discord/embed.ts
index d724b59..e6ad179 100644
--- a/src/server/discord/embed.ts
+++ b/src/server/discord/embed.ts
@@ -1,10 +1,10 @@
-import type { GeneratedContents, RollTableResult } from '../../common/rolltable.js';
+import type { GeneratedContents, RollTableResult } from '../../common/rolltable';
 import {
 	type FinalGeneratedContents,
 	type GeneratedState,
 	type InProgressGeneratedContents,
 	type RollTableResultFull
-} from '../../common/rolltable.js';
+} from '../../common/rolltable';
 import {
 	ButtonStyle,
 	type ComponentActionRow,
@@ -19,7 +19,7 @@ import {
 	type MessageOptions
 } from 'slash-create/web';
 import markdownEscape from 'markdown-escape';
-import type { EmbedFooterOptions } from 'slash-create/web.js';
+import type { EmbedFooterOptions } from 'slash-create/web';
 
 export const SCENARIO_COLOR = 0x15A3C7;
 export const SUCCESS_COLOR = 0x79AC78;
@@ -46,8 +46,9 @@ export function generateFooterForResult(result: RollTableResultFull): EmbedFoote
 }
 
 export function generateFieldForResult(value: RollTableResult, selected?: boolean): EmbedField {
+	let name = markdownEscape(`${value.table.header}${typeof selected === 'boolean' ? selected ? ROLL_SUFFIX : LOCK_SUFFIX : ''}`);
 	return {
-		name: markdownEscape(`${value.table.header}${typeof selected === 'boolean' ? selected ? ROLL_SUFFIX : LOCK_SUFFIX : ''}`),
+		name: name,
 		value: markdownEscape(value.text),
 	};
 }
diff --git a/src/server/discord/router.ts b/src/server/discord/router.ts
index 918fa08..febe918 100644
--- a/src/server/discord/router.ts
+++ b/src/server/discord/router.ts
@@ -1,9 +1,9 @@
-import { Database } from '../db/database.js';
+import { Database } from '../db/database';
 import { CloudflareWorkerServer, SlashCreator } from 'slash-create/web';
 import { isSnowflake, type Snowflake } from 'discord-snowflake';
-import { AuthorCommand, GenerateCommand, ResponseCommand } from './commands.js';
+import { AuthorCommand, GenerateCommand, ResponseCommand } from './commands';
 import { type IRequestStrict, Router } from 'itty-router';
-import { getQueryArray } from '../request/query.js';
+import { getQueryArray } from '../request/query';
 
 function getAuthorization(username: string, password: string): string {
 	return btoa(username + ':' + password);
diff --git a/src/server/entrypoint.ts b/src/server/entrypoint.ts
index 4e335c9..3b81960 100644
--- a/src/server/entrypoint.ts
+++ b/src/server/entrypoint.ts
@@ -1,7 +1,7 @@
-import { Database } from './db/database.js';
-import { discordRouter } from './discord/router.js';
+import { Database } from './db/database';
+import { discordRouter } from './discord/router';
 import { createCors, Router, IRequestStrict } from 'itty-router';
-import { webRouter } from './web/router.js';
+import { webRouter } from './web/router';
 
 export interface Env {
 	readonly BASE_URL: string;
@@ -26,6 +26,7 @@ const router = Router<IRequestStrict, [env: Env, db: Database, ctx: ExecutionCon
 // noinspection JSUnusedGlobalSymbols
 export default {
 	async fetch(req: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
+		const startTime = performance.now()
 		return router.handle(req, env, new Database(env.DB), ctx).then((result) => {
 			if (result instanceof Response) {
 				return result;
@@ -42,6 +43,9 @@ export default {
 			return new Response(`Failed: ${reason}`, { status: 500, statusText: 'Internal Server Error' });
 		}).then((response) => {
 			return corsify(response);
+		}).finally(() => {
+			const endTime = performance.now()
+			console.info(`request runtime: ${endTime - startTime}`)
 		});
 	}
 };
diff --git a/src/server/request/query.ts b/src/server/request/query.ts
index 22d67c7..ef3b070 100644
--- a/src/server/request/query.ts
+++ b/src/server/request/query.ts
@@ -2,9 +2,9 @@ export function takeLast(a: string, b: string): string {
 	return b
 }
 
-export function getQuerySingleton(value: string|string[]|undefined, reducer: (a: string, b: string) => string): string|null {
+export function getQuerySingleton(value: string|string[]|undefined, reducer: (a: string, b: string) => string): string|undefined {
 	if (typeof value === 'undefined' || typeof value === 'string') {
-		return value ?? null
+		return value
 	}
 	return value.reduce(reducer)
 }
diff --git a/tsconfig.json b/src/server/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to src/server/tsconfig.json
diff --git a/src/server/web/sourcemaps.ts b/src/server/web/bundles/sourcemaps.ts
similarity index 78%
rename from src/server/web/sourcemaps.ts
rename to src/server/web/bundles/sourcemaps.ts
index d509e2d..8c17e88 100644
--- a/src/server/web/sourcemaps.ts
+++ b/src/server/web/bundles/sourcemaps.ts
@@ -1,5 +1,4 @@
-import type { RawSourceMap } from 'source-map';
-import type { HashedBundled } from '../../common/bundle.js';
+import type { SourceMap } from '../../../common/bundle';
 
 export enum SourceMapExtension {
 	CSS = 'css',
@@ -9,7 +8,7 @@ export enum SourceMapExtension {
 export type SourceMapFilename<NameT extends string, HashT extends string, ExtensionT extends SourceMapExtension> =
 	`${NameT}.${HashT}.${ExtensionT}.map`
 
-export const SourceMaps = new Map<SourceMapFilename<string, string, SourceMapExtension>, RawSourceMap>([
+export const SourceMaps = new Map<SourceMapFilename<string, string, SourceMapExtension>, SourceMap>([
 
 ])
 
diff --git a/src/server/web/router.ts b/src/server/web/router.ts
index a94560a..bbb5e8a 100644
--- a/src/server/web/router.ts
+++ b/src/server/web/router.ts
@@ -1,11 +1,11 @@
 import { type IRequestStrict, Router } from 'itty-router';
-import type { Database } from '../db/database.js';
-import { buildGeneratorPage, buildResponsesPage, wrapPage } from './template.js';
-import { CSS, JS } from './client.generated.js';
-import type { HashedBundled } from '../../common/bundle.js';
-import { getSourceMapFileName, SourceMapExtension, SourceMaps } from './sourcemaps.js';
+import type { Database } from '../db/database';
+import { buildGeneratorPage, buildResponsesPage, wrapPage } from '../../common/template';
+import { CSS, JS } from './bundles/client.generated';
+import type { HashedBundled } from '../../common/bundle';
+import { getSourceMapFileName, SourceMapExtension, SourceMaps } from './bundles/sourcemaps';
 import { collapseWhiteSpace } from 'collapse-white-space';
-import { getQuerySingleton, takeLast } from '../request/query.js';
+import { getQuerySingleton, takeLast } from '../request/query';
 
 interface WebEnv {
 	readonly BASE_URL: string,
@@ -26,25 +26,23 @@ export function webRouter(base: string) {
 	}
 
 	async function handleMainPage(req: IRequestStrict, env: WebEnv, db: Database): Promise<string> {
-		const startAt = performance.now()
-		const results = await db.getGeneratorPageForDiscordSet(getQuerySingleton(req.query['server'], takeLast));
-		const resultsAt = performance.now()
+		const results = await db.getGeneratorPageForDiscordSet(
+			getQuerySingleton(req.query['server'], takeLast) ?? null);
 		const generator = buildGeneratorPage({
 			creditsUrl: env.CREDITS_URL,
 			clientId: env.DISCORD_APP_ID,
-			baseUrl: env.BASE_URL,
+			generatorTargetUrl: env.BASE_URL,
 			results: results.rolled,
+			editable: !results.final,
 			selected: results.selected,
 			includesResponses: true
 		})
-		const generatorAt = performance.now()
 		const responses = buildResponsesPage({
 			tables: Array.from(results.db.tables.values()),
 			results: results.rolled,
 			creditsUrl: env.CREDITS_URL,
 			includesGenerator: true
 		})
-		const responsesAt = performance.now()
 		const wrapped = wrapPage({
 			title: 'Vore Scenario Generator',
 			script: getSourceMappedJS('combinedGeneratorResponses'),
@@ -52,11 +50,7 @@ export function webRouter(base: string) {
 			noscriptStyles: getSourceMappedCSS('noscript'),
 			bodyContent: [generator, responses].join('')
 		})
-		const wrappedAt = performance.now()
-		const trimmed = collapseWhiteSpace(wrapped, {style: 'html'})
-		const trimmedAt = performance.now()
-		console.log(`database: ${resultsAt - startAt}, generator: ${generatorAt - resultsAt}, responses: ${responsesAt - generatorAt}, wrapped: ${wrappedAt - responsesAt}, trimmed: ${trimmedAt - wrappedAt}`)
-		return trimmed;
+		return collapseWhiteSpace(wrapped, { style: 'html' });
 	}
 	const router = Router<IRequestStrict, [env: WebEnv, db: Database, ctx: ExecutionContext]>({ base })
 		.get('/responses', async (req, _env, _db, _ctx) => {
@@ -77,6 +71,22 @@ export function webRouter(base: string) {
 		})
 		.get('/', handleMainPage)
 		.post('/', handleMainPage);
+	for (const key in CSS) {
+		if (CSS.hasOwnProperty(key)) {
+			const result = CSS[key as keyof typeof CSS]
+			if (result.sourceMap) {
+				router.get(`/${getSourceMapFileName(key, result.hash, SourceMapExtension.CSS)}`, () => result.sourceMap)
+			}
+		}
+	}
+	for (const key in JS) {
+		if (JS.hasOwnProperty(key)) {
+			const result = JS[key as keyof typeof JS]
+			if (result.sourceMap) {
+				router.get(`/${getSourceMapFileName(key, result.hash, SourceMapExtension.JS)}`, () => result.sourceMap)
+			}
+		}
+	}
 	for (const [filename, contents] of SourceMaps) {
 		router.get(`/${filename}`, () => contents);
 	}
diff --git a/wrangler.toml b/wrangler.toml
index d071fca..6c52361 100644
--- a/wrangler.toml
+++ b/wrangler.toml
@@ -8,9 +8,9 @@ keep_vars = true
 workers_dev = true
 
 [build]
-command = "tsx src/build/bundle-client.ts"
+command = "tsx src/build/bundle-client-with-source-map.ts"
 cwd = "."
-watch_dir = "src/client"
+watch_dir = ["src/client", "src/common", "src/build"]
 
 [placement]
 mode = "smart"
@@ -39,9 +39,9 @@ CREDITS_URL = "https://git.reya.zone/reya/vore-scenario-generator#credits"
 workers_dev = false
 
 [env.staging.build]
-command = "tsx src/build/bundle-client.ts"
+command = "tsx src/build/bundle-client-with-source-map.ts"
 cwd = "."
-watch_dir = "src/client"
+watch_dir = ["src/client", "src/common", "src/build"]
 
 [env.staging.placement]
 mode = "smart"
@@ -76,7 +76,7 @@ workers_dev = false
 [env.production.build]
 command = "tsx src/build/check-source-map-and-bundle-client.ts"
 cwd = "."
-watch_dir = "src/client"
+watch_dir = ["src/client", "src/common", "src/build"]
 
 [env.production.placement]
 mode = "smart"