diff --git a/.oxfmtrc.json b/.oxfmtrc.json new file mode 100644 index 00000000..e4ec3136 --- /dev/null +++ b/.oxfmtrc.json @@ -0,0 +1,23 @@ +{ + "$schema": "./node_modules/oxfmt/configuration_schema.json", + "useTabs": true, + "singleQuote": true, + "trailingComma": "none", + "printWidth": 100, + "ignorePatterns": [ + "package-lock.json", + "pnpm-lock.yaml", + "yarn.lock", + "bun.lock", + "bun.lockb", + "**/.svelte-kit", + "**/dist", + "**/.turbo", + "**/node_modules", + "**/src/vendor/**", + "**/vendor/**", + "**/public/**", + "**/gleamstd/**", + "**/*.gen.*" + ] +} diff --git a/apps/ppp/.oxfmtrc.json b/apps/ppp/.oxfmtrc.json new file mode 100644 index 00000000..63c44ff6 --- /dev/null +++ b/apps/ppp/.oxfmtrc.json @@ -0,0 +1,26 @@ +{ + "$schema": "./node_modules/oxfmt/configuration_schema.json", + "useTabs": true, + "singleQuote": true, + "trailingComma": "none", + "printWidth": 100, + "svelte": {}, + "sortTailwindcss": { + "stylesheet": "./src/app.css" + }, + "ignorePatterns": [ + "package-lock.json", + "pnpm-lock.yaml", + "yarn.lock", + "bun.lock", + "bun.lockb", + "**/.svelte-kit", + "**/dist", + "**/.turbo", + "**/node_modules", + "messages/", + "project.inlang/", + "src/lib/paraglide/", + "src/lib/assets/" + ] +} diff --git a/apps/ppp/.prettierignore b/apps/ppp/.prettierignore deleted file mode 100644 index 7d74fe24..00000000 --- a/apps/ppp/.prettierignore +++ /dev/null @@ -1,9 +0,0 @@ -# Package Managers -package-lock.json -pnpm-lock.yaml -yarn.lock -bun.lock -bun.lockb - -# Miscellaneous -/static/ diff --git a/apps/ppp/.prettierrc b/apps/ppp/.prettierrc deleted file mode 100644 index 8103a0b5..00000000 --- a/apps/ppp/.prettierrc +++ /dev/null @@ -1,16 +0,0 @@ -{ - "useTabs": true, - "singleQuote": true, - "trailingComma": "none", - "printWidth": 100, - "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"], - "overrides": [ - { - "files": "*.svelte", - "options": { - "parser": "svelte" - } - } - ], - "tailwindStylesheet": "./src/app.css" -} diff --git a/apps/ppp/eslint.config.js b/apps/ppp/eslint.config.js index 28b00d37..e24f4f97 100644 --- a/apps/ppp/eslint.config.js +++ b/apps/ppp/eslint.config.js @@ -6,11 +6,24 @@ import svelte from 'eslint-plugin-svelte'; import { defineConfig } from 'eslint/config'; import globals from 'globals'; import ts from 'typescript-eslint'; -import svelteConfig from './svelte.config.js'; const gitignorePath = fileURLToPath(new URL('./.gitignore', import.meta.url)); export default defineConfig( + { + ignores: [ + 'dist/**', + 'node_modules/**', + '.svelte-kit/**', + 'messages/**', + 'project.inlang/**', + 'src/lib/paraglide/**', + // vendored third-party code + 'src/lib/assets/**', + // problem statement example code, intentionally non-idiomatic + 'src/routes/(app)/problems/**/runtimes/*/code.*' + ] + }, includeIgnoreFile(gitignorePath), js.configs.recommended, ...ts.configs.recommended, @@ -39,14 +52,28 @@ export default defineConfig( ] } }, + { + files: ['**/*.svelte'], + rules: { + // bare reads of reactive variables inside $effect are the idiomatic + // Svelte 5 way of declaring dependencies + '@typescript-eslint/no-unused-expressions': 'off' + } + }, + { + // renders trusted problem-statement markdown + files: ['**/problem/content.svelte'], + rules: { + 'svelte/no-at-html-tags': 'off' + } + }, { files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'], languageOptions: { parserOptions: { projectService: true, extraFileExtensions: ['.svelte'], - parser: ts.parser, - svelteConfig + parser: ts.parser } } } diff --git a/apps/ppp/messages/en.json b/apps/ppp/messages/en.json index 33c2d552..22576ce3 100644 --- a/apps/ppp/messages/en.json +++ b/apps/ppp/messages/en.json @@ -1,19 +1,19 @@ { - "$schema": "https://inlang.com/schema/inlang-message-format", - "problems": "problems", - "editor": "editor", - "design_patterns": "design patterns", - "tests": "tests", - "output": "output", - "settings": "settings", - "vim_mode": "Vim mode", - "run": "run", - "stop": "stop", - "force_stop": "force stop", - "execution_timeout": "execution timeout (ms)", - "execution_timeout_description": "use zero to disable", - "untranslated_content": "this content has not yet been translated into your language.", - "input_mode": "input mode", - "problem_name_not_found": "Problem \"{name}\" not found", - "back_to_problems": "Back to problems" + "$schema": "https://inlang.com/schema/inlang-message-format", + "problems": "problems", + "editor": "editor", + "design_patterns": "design patterns", + "tests": "tests", + "output": "output", + "settings": "settings", + "vim_mode": "Vim mode", + "run": "run", + "stop": "stop", + "force_stop": "force stop", + "execution_timeout": "execution timeout (ms)", + "execution_timeout_description": "use zero to disable", + "untranslated_content": "this content has not yet been translated into your language.", + "input_mode": "input mode", + "problem_name_not_found": "Problem \"{name}\" not found", + "back_to_problems": "Back to problems" } diff --git a/apps/ppp/messages/ru.json b/apps/ppp/messages/ru.json index b53c9d30..ddff5cfa 100644 --- a/apps/ppp/messages/ru.json +++ b/apps/ppp/messages/ru.json @@ -1,28 +1,28 @@ { - "$schema": "https://inlang.com/schema/inlang-message-format", - "problems": "проблемы", - "editor": "редактор", - "design_patterns": "паттерны проектирования", - "tests": "Тесты", - "output": "Вывод", - "settings": "Настройки", - "vim_mode": "режим Vim", - "run": "Запустить", - "stop": "Остановить", - "force_stop": "остановить принудительно", - "execution_timeout": "таймаут выполнения (мс)", - "execution_timeout_description": "используйте ноль для отключения", - "untranslated_content": "этот контент пока не переведен на ваш язык", - "hello_world": "Hello, {name} from ru!", - "problemsPageTitle": "Проблемы", - "editorPageTitle": "Редактор", - "designPatterns": "Паттерны проектирования", - "vimMode": "Режим Vim", - "forceStop": "Остановить принудительно", - "executionTimeout": "Таймаут выполнения (мс)", - "executionTimeoutDescription": "Используйте ноль для отключения", - "currently_untranslated_problem": "Данная проблема пока не переведена для вашего языка", - "input_mode": "режим ввода", - "problem_name_not_found": "Проблема \"{name}\" не найдена", - "back_to_problems": "Назад к проблемам" -} \ No newline at end of file + "$schema": "https://inlang.com/schema/inlang-message-format", + "problems": "проблемы", + "editor": "редактор", + "design_patterns": "паттерны проектирования", + "tests": "Тесты", + "output": "Вывод", + "settings": "Настройки", + "vim_mode": "режим Vim", + "run": "Запустить", + "stop": "Остановить", + "force_stop": "остановить принудительно", + "execution_timeout": "таймаут выполнения (мс)", + "execution_timeout_description": "используйте ноль для отключения", + "untranslated_content": "этот контент пока не переведен на ваш язык", + "hello_world": "Hello, {name} from ru!", + "problemsPageTitle": "Проблемы", + "editorPageTitle": "Редактор", + "designPatterns": "Паттерны проектирования", + "vimMode": "Режим Vim", + "forceStop": "Остановить принудительно", + "executionTimeout": "Таймаут выполнения (мс)", + "executionTimeoutDescription": "Используйте ноль для отключения", + "currently_untranslated_problem": "Данная проблема пока не переведена для вашего языка", + "input_mode": "режим ввода", + "problem_name_not_found": "Проблема \"{name}\" не найдена", + "back_to_problems": "Назад к проблемам" +} diff --git a/apps/ppp/package.json b/apps/ppp/package.json index 024277f9..2cc5d312 100644 --- a/apps/ppp/package.json +++ b/apps/ppp/package.json @@ -1,7 +1,7 @@ { "name": "ppp", - "private": true, "version": "0.0.1", + "private": true, "type": "module", "scripts": { "paraglide-compile": "paraglide-js compile --strategy url --project ./project.inlang --outdir ./src/lib/paraglide", @@ -12,13 +12,14 @@ "prepare": "svelte-kit sync || echo ''", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", - "format": "prettier --write .", - "lint": "prettier --check . && eslint .", + "format": "oxfmt", + "lint": "eslint .", "test:unit": "vitest", - "test": "npm run test:unit -- --run" + "test": "npm run test:unit -- --run", + "format:check": "oxfmt --check ." }, "dependencies": { - "@andrewbranch/untar.js": "^1.0.3", + "@andrewbranch/untar.js": "^1.0.4", "@xterm/addon-fit": "^0.11.0", "@xterm/xterm": "^6.0.0", "dotnet-runtime": "workspace:*", @@ -28,8 +29,8 @@ "java-runtime": "workspace:*", "javascript-runtime": "workspace:*", "libs": "workspace:*", - "marked": "^18.0.2", - "monaco-editor": "^0.55.1", + "marked": "^18.0.10", + "monaco-editor": "^0.56.0", "monaco-editor-textmate": "^4.0.0", "monaco-textmate": "^3.0.1", "monaco-vim": "^0.4.4", @@ -42,38 +43,36 @@ "zig-runtime": "workspace:*" }, "devDependencies": { - "@eslint/compat": "^2.0.5", + "@eslint/compat": "^2.1.0", "@eslint/js": "^10.0.1", - "@iconify-json/lucide": "^1.2.103", - "@iconify-json/vscode-icons": "^1.2.46", - "@inlang/paraglide-js": "^2.16.1", - "@sveltejs/adapter-static": "^3.0.10", - "@sveltejs/kit": "^2.58.0", - "@sveltejs/vite-plugin-svelte": "^7.0.0", - "@tailwindcss/typography": "^0.5.19", - "@tailwindcss/vite": "^4.2.4", + "@iconify-json/lucide": "^1.2.124", + "@iconify-json/vscode-icons": "^1.2.74", + "@inlang/paraglide-js": "^2.24.1", + "@sveltejs/adapter-static": "4.0.0-next.4", + "@sveltejs/kit": "3.0.0-next.25", + "@sveltejs/vite-plugin-svelte": "^7.3.0", + "@tailwindcss/typography": "^0.5.20", + "@tailwindcss/vite": "^4.3.3", "@types/color": "^4.2.1", - "@types/node": "^24.12.2", - "@vitest/browser-playwright": "^4.1.5", - "daisyui": "^5.5.19", - "eslint": "^10.2.1", + "@types/node": "^26.2.0", + "@vitest/browser-playwright": "^4.1.11", + "daisyui": "^5.7.20", + "eslint": "^10.9.0", "eslint-config-prettier": "^10.1.8", - "eslint-plugin-svelte": "^3.17.1", - "globals": "^17.5.0", - "playwright": "^1.59.1", - "prettier": "^3.8.3", - "prettier-plugin-svelte": "^3.5.1", - "prettier-plugin-tailwindcss": "^0.7.3", - "svelte": "^5.55.5", - "svelte-check": "^4.4.6", - "tailwindcss": "^4.2.4", - "typescript": "^5.9.3", - "typescript-eslint": "^8.59.0", + "eslint-plugin-svelte": "^3.23.0", + "globals": "^17.11.0", + "oxfmt": "^0.64.0", + "playwright": "^1.62.1", + "svelte": "^5.56.10", + "svelte-check": "^4.7.6", + "tailwindcss": "^4.3.3", + "typescript": "^6.0.3", + "typescript-eslint": "^8.67.0", "unplugin-icons": "^23.0.1", "vite": "catalog:", - "vite-plugin-devtools-json": "^1.0.0", - "vite-plugin-static-copy": "catalog:", + "vite-plugin-devtools-json": "^1.1.0", + "vite-plugin-static-copy": "4.1.1", "vitest": "catalog:", - "vitest-browser-svelte": "^2.1.1" + "vitest-browser-svelte": "^3.0.0" } -} \ No newline at end of file +} diff --git a/apps/ppp/src/app.d.ts b/apps/ppp/src/app.d.ts index a900936a..b87d0fba 100644 --- a/apps/ppp/src/app.d.ts +++ b/apps/ppp/src/app.d.ts @@ -1,6 +1,6 @@ // See https://svelte.dev/docs/kit/types#app.d.ts // for information about these interfaces -import 'unplugin-icons/types/svelte' +import 'unplugin-icons/types/svelte'; declare global { namespace App { diff --git a/apps/ppp/src/hooks.server.ts b/apps/ppp/src/hooks.server.ts index 2d48a207..82e749df 100644 --- a/apps/ppp/src/hooks.server.ts +++ b/apps/ppp/src/hooks.server.ts @@ -1,11 +1,13 @@ -import type { Handle } from '@sveltejs/kit'; +import type { Handle } from '@sveltejs/kit/hooks'; import { paraglideMiddleware } from '$lib/paraglide/server'; import { getTextDirection } from '$lib/paraglide/runtime'; import { sequence } from '@sveltejs/kit/hooks'; const paraglideHandle: Handle = ({ event, resolve }) => paraglideMiddleware(event.request, ({ request: localizedRequest, locale }) => { - event.request = localizedRequest; + // Kit 3 made RequestEvent.request read-only, but paraglide's middleware + // is built around replacing it. + (event as { request: Request }).request = localizedRequest; return resolve(event, { transformPageChunk: ({ html }) => { return html.replace('%lang%', locale).replace('%dir%', getTextDirection(locale)); diff --git a/apps/ppp/src/hooks.ts b/apps/ppp/src/hooks.ts index e75600b3..08593618 100644 --- a/apps/ppp/src/hooks.ts +++ b/apps/ppp/src/hooks.ts @@ -1,3 +1,4 @@ +import type { Reroute } from '@sveltejs/kit/hooks'; import { deLocalizeUrl } from '$lib/paraglide/runtime'; -export const reroute = (request) => deLocalizeUrl(request.url).pathname; +export const reroute: Reroute = (request): string => deLocalizeUrl(request.url).pathname; diff --git a/apps/ppp/src/lib/assets/enable-threads.js b/apps/ppp/src/lib/assets/enable-threads.js index f3cf211c..5df2ad7b 100644 --- a/apps/ppp/src/lib/assets/enable-threads.js +++ b/apps/ppp/src/lib/assets/enable-threads.js @@ -1,146 +1,147 @@ /*! coi-serviceworker v0.1.7 - Guido Zuidhof and contributors, licensed under MIT */ let coepCredentialless = false; if (typeof window === 'undefined') { - self.addEventListener("install", () => self.skipWaiting()); - self.addEventListener("activate", (event) => event.waitUntil(self.clients.claim())); - - self.addEventListener("message", (ev) => { - if (!ev.data) { - return; - } else if (ev.data.type === "deregister") { - self.registration - .unregister() - .then(() => { - return self.clients.matchAll(); - }) - .then(clients => { - clients.forEach((client) => client.navigate(client.url)); - }); - } else if (ev.data.type === "coepCredentialless") { - coepCredentialless = ev.data.value; - } - }); - - self.addEventListener("fetch", function (event) { - const r = event.request; - if (r.cache === "only-if-cached" && r.mode !== "same-origin") { - return; - } - - const request = (coepCredentialless && r.mode === "no-cors") - ? new Request(r, { - credentials: "omit", - }) - : r; - event.respondWith( - fetch(request) - .then((response) => { - if (response.status === 0) { - return response; - } - - const newHeaders = new Headers(response.headers); - newHeaders.set("Cross-Origin-Embedder-Policy", - coepCredentialless ? "credentialless" : "require-corp" - ); - if (!coepCredentialless) { - newHeaders.set("Cross-Origin-Resource-Policy", "cross-origin"); - } - newHeaders.set("Cross-Origin-Opener-Policy", "same-origin"); - - return new Response(response.body, { - status: response.status, - statusText: response.statusText, - headers: newHeaders, - }); - }) - .catch((e) => console.error(e)) - ); - }); - + self.addEventListener('install', () => self.skipWaiting()); + self.addEventListener('activate', (event) => event.waitUntil(self.clients.claim())); + + self.addEventListener('message', (ev) => { + if (!ev.data) { + return; + } else if (ev.data.type === 'deregister') { + self.registration + .unregister() + .then(() => { + return self.clients.matchAll(); + }) + .then((clients) => { + clients.forEach((client) => client.navigate(client.url)); + }); + } else if (ev.data.type === 'coepCredentialless') { + coepCredentialless = ev.data.value; + } + }); + + self.addEventListener('fetch', function (event) { + const r = event.request; + if (r.cache === 'only-if-cached' && r.mode !== 'same-origin') { + return; + } + + const request = + coepCredentialless && r.mode === 'no-cors' + ? new Request(r, { + credentials: 'omit' + }) + : r; + event.respondWith( + fetch(request) + .then((response) => { + if (response.status === 0) { + return response; + } + + const newHeaders = new Headers(response.headers); + newHeaders.set( + 'Cross-Origin-Embedder-Policy', + coepCredentialless ? 'credentialless' : 'require-corp' + ); + if (!coepCredentialless) { + newHeaders.set('Cross-Origin-Resource-Policy', 'cross-origin'); + } + newHeaders.set('Cross-Origin-Opener-Policy', 'same-origin'); + + return new Response(response.body, { + status: response.status, + statusText: response.statusText, + headers: newHeaders + }); + }) + .catch((e) => console.error(e)) + ); + }); } else { - (() => { - const reloadedBySelf = window.sessionStorage.getItem("coiReloadedBySelf"); - window.sessionStorage.removeItem("coiReloadedBySelf"); - const coepDegrading = (reloadedBySelf == "coepdegrade"); - - // You can customize the behavior of this script through a global `coi` variable. - const coi = { - shouldRegister: () => !reloadedBySelf, - shouldDeregister: () => false, - coepCredentialless: () => true, - coepDegrade: () => true, - doReload: () => window.location.reload(), - quiet: false, - ...window.coi - }; - - const n = navigator; - const controlling = n.serviceWorker && n.serviceWorker.controller; - - // Record the failure if the page is served by serviceWorker. - if (controlling && !window.crossOriginIsolated) { - window.sessionStorage.setItem("coiCoepHasFailed", "true"); - } - const coepHasFailed = window.sessionStorage.getItem("coiCoepHasFailed"); - - if (controlling) { - // Reload only on the first failure. - const reloadToDegrade = coi.coepDegrade() && !( - coepDegrading || window.crossOriginIsolated - ); - n.serviceWorker.controller.postMessage({ - type: "coepCredentialless", - value: (reloadToDegrade || coepHasFailed && coi.coepDegrade()) - ? false - : coi.coepCredentialless(), - }); - if (reloadToDegrade) { - !coi.quiet && console.log("Reloading page to degrade COEP."); - window.sessionStorage.setItem("coiReloadedBySelf", "coepdegrade"); - coi.doReload("coepdegrade"); - } - - if (coi.shouldDeregister()) { - n.serviceWorker.controller.postMessage({ type: "deregister" }); - } - } - - // If we're already coi: do nothing. Perhaps it's due to this script doing its job, or COOP/COEP are - // already set from the origin server. Also if the browser has no notion of crossOriginIsolated, just give up here. - if (window.crossOriginIsolated !== false || !coi.shouldRegister()) return; - - if (!window.isSecureContext) { - !coi.quiet && console.log("COOP/COEP Service Worker not registered, a secure context is required."); - return; - } - - // In some environments (e.g. Firefox private mode) this won't be available - if (!n.serviceWorker) { - !coi.quiet && console.error("COOP/COEP Service Worker not registered, perhaps due to private mode."); - return; - } - - n.serviceWorker.register(window.document.currentScript.src).then( - (registration) => { - !coi.quiet && console.log("COOP/COEP Service Worker registered", registration.scope); - - registration.addEventListener("updatefound", () => { - !coi.quiet && console.log("Reloading page to make use of updated COOP/COEP Service Worker."); - window.sessionStorage.setItem("coiReloadedBySelf", "updatefound"); - coi.doReload(); - }); - - // If the registration is active, but it's not controlling the page - if (registration.active && !n.serviceWorker.controller) { - !coi.quiet && console.log("Reloading page to make use of COOP/COEP Service Worker."); - window.sessionStorage.setItem("coiReloadedBySelf", "notcontrolling"); - coi.doReload(); - } - }, - (err) => { - !coi.quiet && console.error("COOP/COEP Service Worker failed to register:", err); - } - ); - })(); -} \ No newline at end of file + (() => { + const reloadedBySelf = window.sessionStorage.getItem('coiReloadedBySelf'); + window.sessionStorage.removeItem('coiReloadedBySelf'); + const coepDegrading = reloadedBySelf == 'coepdegrade'; + + // You can customize the behavior of this script through a global `coi` variable. + const coi = { + shouldRegister: () => !reloadedBySelf, + shouldDeregister: () => false, + coepCredentialless: () => true, + coepDegrade: () => true, + doReload: () => window.location.reload(), + quiet: false, + ...window.coi + }; + + const n = navigator; + const controlling = n.serviceWorker && n.serviceWorker.controller; + + // Record the failure if the page is served by serviceWorker. + if (controlling && !window.crossOriginIsolated) { + window.sessionStorage.setItem('coiCoepHasFailed', 'true'); + } + const coepHasFailed = window.sessionStorage.getItem('coiCoepHasFailed'); + + if (controlling) { + // Reload only on the first failure. + const reloadToDegrade = coi.coepDegrade() && !(coepDegrading || window.crossOriginIsolated); + n.serviceWorker.controller.postMessage({ + type: 'coepCredentialless', + value: + reloadToDegrade || (coepHasFailed && coi.coepDegrade()) ? false : coi.coepCredentialless() + }); + if (reloadToDegrade) { + !coi.quiet && console.log('Reloading page to degrade COEP.'); + window.sessionStorage.setItem('coiReloadedBySelf', 'coepdegrade'); + coi.doReload('coepdegrade'); + } + + if (coi.shouldDeregister()) { + n.serviceWorker.controller.postMessage({ type: 'deregister' }); + } + } + + // If we're already coi: do nothing. Perhaps it's due to this script doing its job, or COOP/COEP are + // already set from the origin server. Also if the browser has no notion of crossOriginIsolated, just give up here. + if (window.crossOriginIsolated !== false || !coi.shouldRegister()) return; + + if (!window.isSecureContext) { + !coi.quiet && + console.log('COOP/COEP Service Worker not registered, a secure context is required.'); + return; + } + + // In some environments (e.g. Firefox private mode) this won't be available + if (!n.serviceWorker) { + !coi.quiet && + console.error('COOP/COEP Service Worker not registered, perhaps due to private mode.'); + return; + } + + n.serviceWorker.register(window.document.currentScript.src).then( + (registration) => { + !coi.quiet && console.log('COOP/COEP Service Worker registered', registration.scope); + + registration.addEventListener('updatefound', () => { + !coi.quiet && + console.log('Reloading page to make use of updated COOP/COEP Service Worker.'); + window.sessionStorage.setItem('coiReloadedBySelf', 'updatefound'); + coi.doReload(); + }); + + // If the registration is active, but it's not controlling the page + if (registration.active && !n.serviceWorker.controller) { + !coi.quiet && console.log('Reloading page to make use of COOP/COEP Service Worker.'); + window.sessionStorage.setItem('coiReloadedBySelf', 'notcontrolling'); + coi.doReload(); + } + }, + (err) => { + !coi.quiet && console.error('COOP/COEP Service Worker failed to register:', err); + } + ); + })(); +} diff --git a/apps/ppp/src/lib/components/dropdown.svelte b/apps/ppp/src/lib/components/dropdown.svelte index c445719e..d5711cae 100644 --- a/apps/ppp/src/lib/components/dropdown.svelte +++ b/apps/ppp/src/lib/components/dropdown.svelte @@ -1,89 +1,82 @@ -
- - {#if label} - {@render label(value)} - {:else} - {value} - {/if} - - -
- -
+ + + {/each} + {@render children?.()} + +
diff --git a/apps/ppp/src/lib/components/editor/context.svelte.ts b/apps/ppp/src/lib/components/editor/context.svelte.ts index 27c7a00e..7a2bd60c 100644 --- a/apps/ppp/src/lib/components/editor/context.svelte.ts +++ b/apps/ppp/src/lib/components/editor/context.svelte.ts @@ -1,23 +1,23 @@ -import { getContext, setContext } from "svelte"; -import type { editor } from "monaco-editor"; -import type { Terminal } from "@xterm/xterm"; +import { getContext, setContext } from 'svelte'; +import type { editor } from 'monaco-editor'; +import type { Terminal } from '@xterm/xterm'; import type { FitAddon } from '@xterm/addon-fit'; export class EditorContext { - editor = $state(); - constructor( - public model: editor.ITextModel, - public terminal: Terminal, - public terminalFitAddon: FitAddon - ) {} + editor = $state(); + constructor( + public model: editor.ITextModel, + public terminal: Terminal, + public terminalFitAddon: FitAddon + ) {} } -const EDITOR_CONTEXT = Symbol("editor-context"); +const EDITOR_CONTEXT = Symbol('editor-context'); export function setEditorContext(ctx: EditorContext) { - setContext(EDITOR_CONTEXT, ctx); + setContext(EDITOR_CONTEXT, ctx); } export function getEditorContext() { - return getContext(EDITOR_CONTEXT); + return getContext(EDITOR_CONTEXT); } diff --git a/apps/ppp/src/lib/components/editor/controls/checkbox.svelte b/apps/ppp/src/lib/components/editor/controls/checkbox.svelte index c9b260ab..af7e96ed 100644 --- a/apps/ppp/src/lib/components/editor/controls/checkbox.svelte +++ b/apps/ppp/src/lib/components/editor/controls/checkbox.svelte @@ -1,13 +1,13 @@ diff --git a/apps/ppp/src/lib/components/editor/controls/index.ts b/apps/ppp/src/lib/components/editor/controls/index.ts index 8eb88a54..086aa3c2 100644 --- a/apps/ppp/src/lib/components/editor/controls/index.ts +++ b/apps/ppp/src/lib/components/editor/controls/index.ts @@ -1,3 +1,3 @@ -export { default as CheckBox } from "./checkbox.svelte"; -export { default as Number } from "./number.svelte"; +export { default as CheckBox } from './checkbox.svelte'; +export { default as Number } from './number.svelte'; export { default as Select } from './select.svelte'; diff --git a/apps/ppp/src/lib/components/editor/controls/number.svelte b/apps/ppp/src/lib/components/editor/controls/number.svelte index d13d452d..cc957f23 100644 --- a/apps/ppp/src/lib/components/editor/controls/number.svelte +++ b/apps/ppp/src/lib/components/editor/controls/number.svelte @@ -1,17 +1,17 @@
- {title} - - {#if alt} -

{alt}

- {/if} + {title} + + {#if alt} +

{alt}

+ {/if}
diff --git a/apps/ppp/src/lib/components/editor/controls/select.svelte b/apps/ppp/src/lib/components/editor/controls/select.svelte index af3bbccf..c6156775 100644 --- a/apps/ppp/src/lib/components/editor/controls/select.svelte +++ b/apps/ppp/src/lib/components/editor/controls/select.svelte @@ -1,31 +1,31 @@
- {title} - - {#if alt} - {alt} - {/if} + {title} + + {#if alt} + {alt} + {/if}
diff --git a/apps/ppp/src/lib/components/editor/editor.svelte b/apps/ppp/src/lib/components/editor/editor.svelte index 0bb198e7..71eec1af 100644 --- a/apps/ppp/src/lib/components/editor/editor.svelte +++ b/apps/ppp/src/lib/components/editor/editor.svelte @@ -1,51 +1,51 @@
diff --git a/apps/ppp/src/lib/components/editor/index.ts b/apps/ppp/src/lib/components/editor/index.ts index 950e3b22..c8411610 100644 --- a/apps/ppp/src/lib/components/editor/index.ts +++ b/apps/ppp/src/lib/components/editor/index.ts @@ -1,6 +1,6 @@ export * from './process'; -export * from "./terminal"; -export * from "./context.svelte"; -export { default as Editor } from "./editor.svelte"; -export { default as VimStatus } from "./vim-status.svelte"; -export { default as RunButton } from "./run-button.svelte"; +export * from './terminal'; +export * from './context.svelte'; +export { default as Editor } from './editor.svelte'; +export { default as VimStatus } from './vim-status.svelte'; +export { default as RunButton } from './run-button.svelte'; diff --git a/apps/ppp/src/lib/components/editor/panel/context.svelte.ts b/apps/ppp/src/lib/components/editor/panel/context.svelte.ts index 7283945b..29848553 100644 --- a/apps/ppp/src/lib/components/editor/panel/context.svelte.ts +++ b/apps/ppp/src/lib/components/editor/panel/context.svelte.ts @@ -1,21 +1,21 @@ -import { getContext, setContext } from "svelte"; +import { getContext, setContext } from 'svelte'; -import { EditorPanelTab } from "$lib/editor-panel-tab"; +import { EditorPanelTab } from '$lib/editor-panel-tab'; export class EditorPanelContext { - selectedTab = $state(); + selectedTab = $state(); - constructor(selectedTab: EditorPanelTab) { - this.selectedTab = selectedTab; - } + constructor(selectedTab: EditorPanelTab) { + this.selectedTab = selectedTab; + } } -const EDITOR_PANEL_CONTEXT = Symbol("editor-panel-context"); +const EDITOR_PANEL_CONTEXT = Symbol('editor-panel-context'); export function setEditorPanelContext(ctx: EditorPanelContext) { - setContext(EDITOR_PANEL_CONTEXT, ctx); + setContext(EDITOR_PANEL_CONTEXT, ctx); } export function getEditorPanelContext() { - return getContext(EDITOR_PANEL_CONTEXT); + return getContext(EDITOR_PANEL_CONTEXT); } diff --git a/apps/ppp/src/lib/components/editor/panel/index.ts b/apps/ppp/src/lib/components/editor/panel/index.ts index 22cc38da..b2143d2e 100644 --- a/apps/ppp/src/lib/components/editor/panel/index.ts +++ b/apps/ppp/src/lib/components/editor/panel/index.ts @@ -1,7 +1,7 @@ -export * from "./model"; -export { default as Panel } from "./panel.svelte"; -export { default as Tab } from "./tab.svelte"; -export { default as Tabs } from "./tabs.svelte"; -export { default as TerminalTab } from "./terminal-tab.svelte"; -export { default as TabContent } from "./tab-content.svelte"; -export { default as PanelToggle } from "./panel-toggle.svelte"; +export * from './model'; +export { default as Panel } from './panel.svelte'; +export { default as Tab } from './tab.svelte'; +export { default as Tabs } from './tabs.svelte'; +export { default as TerminalTab } from './terminal-tab.svelte'; +export { default as TabContent } from './tab-content.svelte'; +export { default as PanelToggle } from './panel-toggle.svelte'; diff --git a/apps/ppp/src/lib/components/editor/panel/model.ts b/apps/ppp/src/lib/components/editor/panel/model.ts index 29b95688..694eed72 100644 --- a/apps/ppp/src/lib/components/editor/panel/model.ts +++ b/apps/ppp/src/lib/components/editor/panel/model.ts @@ -1,6 +1,3 @@ export const PANEL_BORDER_HEIGHT = 1; export const PANEL_HEADER_VERTICAL_PADDING = 4 * 2; -export const MIN_PANEL_HEIGHT = - 36 /* ??? */ + - PANEL_HEADER_VERTICAL_PADDING + - PANEL_BORDER_HEIGHT; +export const MIN_PANEL_HEIGHT = 36 /* ??? */ + PANEL_HEADER_VERTICAL_PADDING + PANEL_BORDER_HEIGHT; diff --git a/apps/ppp/src/lib/components/editor/panel/panel-toggle.svelte b/apps/ppp/src/lib/components/editor/panel/panel-toggle.svelte index 3915dbd1..871c5f22 100644 --- a/apps/ppp/src/lib/components/editor/panel/panel-toggle.svelte +++ b/apps/ppp/src/lib/components/editor/panel/panel-toggle.svelte @@ -1,68 +1,68 @@ - diff --git a/apps/ppp/src/lib/components/editor/panel/panel.svelte b/apps/ppp/src/lib/components/editor/panel/panel.svelte index 8012ca51..175089e7 100644 --- a/apps/ppp/src/lib/components/editor/panel/panel.svelte +++ b/apps/ppp/src/lib/components/editor/panel/panel.svelte @@ -1,36 +1,32 @@ - {@render children()} + {@render children()} diff --git a/apps/ppp/src/lib/components/editor/panel/tab-content.svelte b/apps/ppp/src/lib/components/editor/panel/tab-content.svelte index 6652381e..9fd1729b 100644 --- a/apps/ppp/src/lib/components/editor/panel/tab-content.svelte +++ b/apps/ppp/src/lib/components/editor/panel/tab-content.svelte @@ -1,20 +1,20 @@ {#if ctx.selectedTab === tab} - {@render children()} + {@render children()} {/if} diff --git a/apps/ppp/src/lib/components/editor/panel/tab.svelte b/apps/ppp/src/lib/components/editor/panel/tab.svelte index 293d562d..5cdea254 100644 --- a/apps/ppp/src/lib/components/editor/panel/tab.svelte +++ b/apps/ppp/src/lib/components/editor/panel/tab.svelte @@ -1,44 +1,40 @@ { - ctx.selectedTab = tab - }} + role="tab" + class={['tab', append && 'tab-with-badge', isSelected && 'tab-active']} + onclick={() => { + ctx.selectedTab = tab; + }} > - {EDITOR_PANEL_TAB_TO_LABEL[tab]()} - {#if append} - {@render append()} - {/if} + {EDITOR_PANEL_TAB_TO_LABEL[tab]()} + {#if append} + {@render append()} + {/if} diff --git a/apps/ppp/src/lib/components/editor/panel/tabs.svelte b/apps/ppp/src/lib/components/editor/panel/tabs.svelte index 3127af75..53c8aaef 100644 --- a/apps/ppp/src/lib/components/editor/panel/tabs.svelte +++ b/apps/ppp/src/lib/components/editor/panel/tabs.svelte @@ -1,22 +1,22 @@ -
- {@render children()} +
+ {@render children()}
diff --git a/apps/ppp/src/lib/components/editor/panel/terminal-tab.svelte b/apps/ppp/src/lib/components/editor/panel/terminal-tab.svelte index ec3ef054..0d9d6a41 100644 --- a/apps/ppp/src/lib/components/editor/panel/terminal-tab.svelte +++ b/apps/ppp/src/lib/components/editor/panel/terminal-tab.svelte @@ -1,51 +1,45 @@ -
+
diff --git a/apps/ppp/src/lib/components/editor/process.ts b/apps/ppp/src/lib/components/editor/process.ts index 1395bec4..8194cb51 100644 --- a/apps/ppp/src/lib/components/editor/process.ts +++ b/apps/ppp/src/lib/components/editor/process.ts @@ -1 +1 @@ -export type ProcessStatus = 'stopped' | 'stopping' | 'running' \ No newline at end of file +export type ProcessStatus = 'stopped' | 'stopping' | 'running'; diff --git a/apps/ppp/src/lib/components/editor/run-button.svelte b/apps/ppp/src/lib/components/editor/run-button.svelte index 5a3907d0..93992ec9 100644 --- a/apps/ppp/src/lib/components/editor/run-button.svelte +++ b/apps/ppp/src/lib/components/editor/run-button.svelte @@ -1,26 +1,26 @@ - diff --git a/apps/ppp/src/lib/components/editor/terminal.ts b/apps/ppp/src/lib/components/editor/terminal.ts index 383e4c68..4f50ca57 100644 --- a/apps/ppp/src/lib/components/editor/terminal.ts +++ b/apps/ppp/src/lib/components/editor/terminal.ts @@ -16,7 +16,7 @@ export enum InputMode { Raw = 'raw' } -export const INPUT_MODS = Object.values(InputMode) +export const INPUT_MODS = Object.values(InputMode); export function createTerminal({ theme = makeTerminalTheme() }: TerminalConfig = {}) { const terminal = new Terminal({ @@ -39,7 +39,7 @@ export function createReadableStream(terminal: Terminal) { }); }, cancel() { - console.log("CANCEL") + console.log('CANCEL'); disposable.dispose(); } }); diff --git a/apps/ppp/src/lib/components/editor/vim-status.svelte b/apps/ppp/src/lib/components/editor/vim-status.svelte index 665942af..cb6a242c 100644 --- a/apps/ppp/src/lib/components/editor/vim-status.svelte +++ b/apps/ppp/src/lib/components/editor/vim-status.svelte @@ -1,28 +1,28 @@
diff --git a/apps/ppp/src/lib/components/logo.svelte b/apps/ppp/src/lib/components/logo.svelte index 4ce05cf0..c981cd4a 100644 --- a/apps/ppp/src/lib/components/logo.svelte +++ b/apps/ppp/src/lib/components/logo.svelte @@ -1,10 +1,10 @@ -
- 3P -
+
+ 3P +
diff --git a/apps/ppp/src/lib/components/resizable-panel.svelte b/apps/ppp/src/lib/components/resizable-panel.svelte index 02bead73..caec1c57 100644 --- a/apps/ppp/src/lib/components/resizable-panel.svelte +++ b/apps/ppp/src/lib/components/resizable-panel.svelte @@ -1,79 +1,80 @@ -
- { - start = { x: size, y: e[coord] }; - }} - onMove={(e) => { - size = normalizeSize(op(start.y, e[coord], start.x), size); - }} - /> - {@render children()} +
+ { + start = { x: size, y: e[coord] }; + }} + onMove={(e) => { + size = normalizeSize(op(start.y, e[coord], start.x), size); + }} + /> + {@render children()}
diff --git a/apps/ppp/src/lib/components/resizer/index.ts b/apps/ppp/src/lib/components/resizer/index.ts index f12e0d38..0db7e5c6 100644 --- a/apps/ppp/src/lib/components/resizer/index.ts +++ b/apps/ppp/src/lib/components/resizer/index.ts @@ -1,2 +1,2 @@ -export * from './model' -export { default as Resizer } from './resizer.svelte' +export * from './model'; +export { default as Resizer } from './resizer.svelte'; diff --git a/apps/ppp/src/lib/components/resizer/model.ts b/apps/ppp/src/lib/components/resizer/model.ts index 1d2710d1..27785064 100644 --- a/apps/ppp/src/lib/components/resizer/model.ts +++ b/apps/ppp/src/lib/components/resizer/model.ts @@ -1,9 +1,9 @@ export enum Orientation { - Vertical = "vertical", - Horizontal = "horizontal", + Vertical = 'vertical', + Horizontal = 'horizontal' } export enum Alignment { - Start = "start", - End = "end", + Start = 'start', + End = 'end' } diff --git a/apps/ppp/src/lib/components/resizer/resizer.svelte b/apps/ppp/src/lib/components/resizer/resizer.svelte index 0ca1155f..0769ec3c 100644 --- a/apps/ppp/src/lib/components/resizer/resizer.svelte +++ b/apps/ppp/src/lib/components/resizer/resizer.svelte @@ -1,61 +1,59 @@
diff --git a/apps/ppp/src/lib/components/select.svelte b/apps/ppp/src/lib/components/select.svelte index 99783e3a..dba389af 100644 --- a/apps/ppp/src/lib/components/select.svelte +++ b/apps/ppp/src/lib/components/select.svelte @@ -1,16 +1,16 @@ - - + {#each options as option (option)} + + {/each} diff --git a/apps/ppp/src/lib/editor-panel-tab.ts b/apps/ppp/src/lib/editor-panel-tab.ts index 88286ab0..ef4f9303 100644 --- a/apps/ppp/src/lib/editor-panel-tab.ts +++ b/apps/ppp/src/lib/editor-panel-tab.ts @@ -1,14 +1,13 @@ import { m } from '$lib/paraglide/messages'; export enum EditorPanelTab { - Tests = "tests", - Output = "output", - Settings = "settings", + Tests = 'tests', + Output = 'output', + Settings = 'settings' } export const EDITOR_PANEL_TAB_TO_LABEL: Record string> = { - [EditorPanelTab.Tests]: m.tests, - [EditorPanelTab.Output]: m.output, - [EditorPanelTab.Settings]: m.settings, + [EditorPanelTab.Tests]: m.tests, + [EditorPanelTab.Output]: m.output, + [EditorPanelTab.Settings]: m.settings }; - diff --git a/apps/ppp/src/lib/editor-provider.svelte b/apps/ppp/src/lib/editor-provider.svelte index 7ba47470..78056afd 100644 --- a/apps/ppp/src/lib/editor-provider.svelte +++ b/apps/ppp/src/lib/editor-provider.svelte @@ -2,8 +2,8 @@ import type { Snippet } from 'svelte'; import 'monaco-editor'; - import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'; - import TsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'; + import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker.js?worker'; + import TsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker.js?worker'; import { loadTmGrammars } from '$lib/monaco'; diff --git a/apps/ppp/src/lib/gleam/gleam.tmLanguage.json b/apps/ppp/src/lib/gleam/gleam.tmLanguage.json index c5ab3755..837a3bbc 100644 --- a/apps/ppp/src/lib/gleam/gleam.tmLanguage.json +++ b/apps/ppp/src/lib/gleam/gleam.tmLanguage.json @@ -1,176 +1,176 @@ { - "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json", - "name": "Gleam", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#keywords" - }, - { - "include": "#strings" - }, - { - "include": "#constant" - }, - { - "include": "#entity" - }, - { - "include": "#discards" - } - ], - "repository": { - "keywords": { - "patterns": [ - { - "name": "keyword.control.gleam", - "match": "\\b(as|use|case|if|fn|import|let|assert|pub|type|opaque|const|todo|panic)\\b" - }, - { - "name": "keyword.operator.arrow.gleam", - "match": "(<\\-|\\->)" - }, - { - "name": "keyword.operator.pipe.gleam", - "match": "\\|>" - }, - { - "name": "keyword.operator.splat.gleam", - "match": "\\.\\." - }, - { - "name": "keyword.operator.comparison.float.gleam", - "match": "(<=\\.|>=\\.|==\\.|!=\\.|<\\.|>\\.)" - }, - { - "name": "keyword.operator.comparison.int.gleam", - "match": "(<=|>=|==|!=|<|>)" - }, - { - "name": "keyword.operator.logical.gleam", - "match": "(&&|\\|\\|)" - }, - { - "name": "keyword.operator.string.gleam", - "match": "<>" - }, - { - "name": "keyword.operator.other.gleam", - "match": "\\|" - }, - { - "name": "keyword.operator.arithmetic.float.gleam", - "match": "(\\+\\.|\\-\\.|/\\.|\\*\\.|%\\.)" - }, - { - "name": "keyword.operator.arithmetic.int.gleam", - "match": "(\\+|\\-|/|\\*|%)" - }, - { - "name": "keyword.operator.assignment.gleam", - "match": "=" - } - ] - }, - "strings": { - "name": "string.quoted.double.gleam", - "begin": "\"", - "end": "\"", - "patterns": [ - { - "name": "constant.character.escape.gleam", - "match": "\\\\." - } - ] - }, - "comments": { - "patterns": [ - { - "name": "comment.line.gleam", - "match": "\/\/.*" - } - ] - }, - "constant": { - "patterns": [ - { - "include": "#binary_number" - }, - { - "include": "#octal_number" - }, - { - "include": "#hexadecimal_number" - }, - { - "include": "#decimal_number" - }, - { - "include": "#boolean" - }, - { - "name": "entity.name.type.gleam", - "match": "[[:upper:]][[:word:]]*" - } - ] - }, - "binary_number": { - "name": "constant.numeric.binary.gleam", - "match": "\\b0[bB](_?[01])+\\b", - "patterns": [] - }, - "octal_number": { - "name": "constant.numeric.octal.gleam", - "match": "\\b0[oO](_?[0-7])+\\b", - "patterns": [] - }, - "decimal_number": { - "name": "constant.numeric.decimal.gleam", - "match": "\\b[[:digit:]]+(_?[[:digit:]])*(\\.[[:digit:]]*)?(e-?[[:digit:]]*)?\\b", - "patterns": [] - }, - "hexadecimal_number": { - "name": "constant.numeric.hexadecimal.gleam", - "match": "\\b0[xX](_?[[:xdigit:]])+\\b", - "patterns": [] - }, - "boolean": { - "name": "constant.language.boolean.gleam", - "match": "\\b(True|False)\\b", - "patterns": [] - }, - "entity": { - "patterns": [ - { - "begin": "\\b([[:lower:]][[:word:]]*)([[:space:]]*)?\\(", - "end": "\\)", - "patterns": [ - { - "include": "$self" - } - ], - "captures": { - "1": { - "name": "entity.name.function.gleam" - } - } - }, - { - "name": "variable.parameter.gleam", - "match": "\\b([[:lower:]][[:word:]]*):\\s" - }, - { - "name": "entity.name.namespace.gleam", - "match": "\\b([[:lower:]][[:word:]]*):" - } - ] - }, - "discards": { - "name": "comment.unused.gleam", - "match": "\\b_(?:[[:word:]]+)?\\b" - } - }, - "scopeName": "source.gleam" -} \ No newline at end of file + "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json", + "name": "Gleam", + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#keywords" + }, + { + "include": "#strings" + }, + { + "include": "#constant" + }, + { + "include": "#entity" + }, + { + "include": "#discards" + } + ], + "repository": { + "keywords": { + "patterns": [ + { + "name": "keyword.control.gleam", + "match": "\\b(as|use|case|if|fn|import|let|assert|pub|type|opaque|const|todo|panic)\\b" + }, + { + "name": "keyword.operator.arrow.gleam", + "match": "(<\\-|\\->)" + }, + { + "name": "keyword.operator.pipe.gleam", + "match": "\\|>" + }, + { + "name": "keyword.operator.splat.gleam", + "match": "\\.\\." + }, + { + "name": "keyword.operator.comparison.float.gleam", + "match": "(<=\\.|>=\\.|==\\.|!=\\.|<\\.|>\\.)" + }, + { + "name": "keyword.operator.comparison.int.gleam", + "match": "(<=|>=|==|!=|<|>)" + }, + { + "name": "keyword.operator.logical.gleam", + "match": "(&&|\\|\\|)" + }, + { + "name": "keyword.operator.string.gleam", + "match": "<>" + }, + { + "name": "keyword.operator.other.gleam", + "match": "\\|" + }, + { + "name": "keyword.operator.arithmetic.float.gleam", + "match": "(\\+\\.|\\-\\.|/\\.|\\*\\.|%\\.)" + }, + { + "name": "keyword.operator.arithmetic.int.gleam", + "match": "(\\+|\\-|/|\\*|%)" + }, + { + "name": "keyword.operator.assignment.gleam", + "match": "=" + } + ] + }, + "strings": { + "name": "string.quoted.double.gleam", + "begin": "\"", + "end": "\"", + "patterns": [ + { + "name": "constant.character.escape.gleam", + "match": "\\\\." + } + ] + }, + "comments": { + "patterns": [ + { + "name": "comment.line.gleam", + "match": "\/\/.*" + } + ] + }, + "constant": { + "patterns": [ + { + "include": "#binary_number" + }, + { + "include": "#octal_number" + }, + { + "include": "#hexadecimal_number" + }, + { + "include": "#decimal_number" + }, + { + "include": "#boolean" + }, + { + "name": "entity.name.type.gleam", + "match": "[[:upper:]][[:word:]]*" + } + ] + }, + "binary_number": { + "name": "constant.numeric.binary.gleam", + "match": "\\b0[bB](_?[01])+\\b", + "patterns": [] + }, + "octal_number": { + "name": "constant.numeric.octal.gleam", + "match": "\\b0[oO](_?[0-7])+\\b", + "patterns": [] + }, + "decimal_number": { + "name": "constant.numeric.decimal.gleam", + "match": "\\b[[:digit:]]+(_?[[:digit:]])*(\\.[[:digit:]]*)?(e-?[[:digit:]]*)?\\b", + "patterns": [] + }, + "hexadecimal_number": { + "name": "constant.numeric.hexadecimal.gleam", + "match": "\\b0[xX](_?[[:xdigit:]])+\\b", + "patterns": [] + }, + "boolean": { + "name": "constant.language.boolean.gleam", + "match": "\\b(True|False)\\b", + "patterns": [] + }, + "entity": { + "patterns": [ + { + "begin": "\\b([[:lower:]][[:word:]]*)([[:space:]]*)?\\(", + "end": "\\)", + "patterns": [ + { + "include": "$self" + } + ], + "captures": { + "1": { + "name": "entity.name.function.gleam" + } + } + }, + { + "name": "variable.parameter.gleam", + "match": "\\b([[:lower:]][[:word:]]*):\\s" + }, + { + "name": "entity.name.namespace.gleam", + "match": "\\b([[:lower:]][[:word:]]*):" + } + ] + }, + "discards": { + "name": "comment.unused.gleam", + "match": "\\b_(?:[[:word:]]+)?\\b" + } + }, + "scopeName": "source.gleam" +} diff --git a/apps/ppp/src/lib/gleam/language-configuration.ts b/apps/ppp/src/lib/gleam/language-configuration.ts index b4ca0c1a..49de9973 100644 --- a/apps/ppp/src/lib/gleam/language-configuration.ts +++ b/apps/ppp/src/lib/gleam/language-configuration.ts @@ -1,26 +1,26 @@ -import type { languages } from "monaco-editor"; +import type { languages } from 'monaco-editor'; export default { - comments: { - lineComment: "//", - }, - brackets: [ - ["{", "}"], - ["[", "]"], - ["(", ")"], - ], - autoClosingPairs: [ - { open:"{", close:"}" }, - { open:"[", close:"]" }, - { open:"(", close:")" }, - { open:'"', close:'"' }, - { open:"'", close:"'" }, - ], - surroundingPairs: [ - { open:"{", close: "}"}, - { open:"[", close: "]"}, - { open:"(", close: ")"}, - { open:'"', close: '"'}, - { open:"'", close: "'"}, - ], + comments: { + lineComment: '//' + }, + brackets: [ + ['{', '}'], + ['[', ']'], + ['(', ')'] + ], + autoClosingPairs: [ + { open: '{', close: '}' }, + { open: '[', close: ']' }, + { open: '(', close: ')' }, + { open: '"', close: '"' }, + { open: "'", close: "'" } + ], + surroundingPairs: [ + { open: '{', close: '}' }, + { open: '[', close: ']' }, + { open: '(', close: ')' }, + { open: '"', close: '"' }, + { open: "'", close: "'" } + ] } satisfies languages.LanguageConfiguration; diff --git a/apps/ppp/src/lib/math.ts b/apps/ppp/src/lib/math.ts index 48ea69a9..5315bb23 100644 --- a/apps/ppp/src/lib/math.ts +++ b/apps/ppp/src/lib/math.ts @@ -1,4 +1,4 @@ export interface Vec2 { - x: number; - y: number; + x: number; + y: number; } diff --git a/apps/ppp/src/lib/problem/content.svelte b/apps/ppp/src/lib/problem/content.svelte index ebe25d45..91b79c38 100644 --- a/apps/ppp/src/lib/problem/content.svelte +++ b/apps/ppp/src/lib/problem/content.svelte @@ -31,4 +31,5 @@

{meta.titles[lang]}

+ {@html marked.parse(content)} diff --git a/apps/ppp/src/lib/problem/editor.svelte b/apps/ppp/src/lib/problem/editor.svelte index 4c5e6094..12f59670 100644 --- a/apps/ppp/src/lib/problem/editor.svelte +++ b/apps/ppp/src/lib/problem/editor.svelte @@ -37,7 +37,7 @@ createLineInputMode, INPUT_MODS, InputMode, - createRawInputMode, + createRawInputMode } from '$lib/components/editor'; import { Panel, @@ -176,18 +176,22 @@ let executionTimeout = $state(executionTimeoutStorage.load()); debouncedSave(executionTimeoutStorage, () => executionTimeout, 100); - const inputModeStorage = createSyncStorage(localStorage, "test-editor-input-mode", InputMode.Line) - let inputMode = $state(inputModeStorage.load()) - immediateSave(inputModeStorage, () => inputMode) + const inputModeStorage = createSyncStorage( + localStorage, + 'test-editor-input-mode', + InputMode.Line + ); + let inputMode = $state(inputModeStorage.load()); + immediateSave(inputModeStorage, () => inputMode); const { terminal, fitAddon } = createTerminal(); - let lastInput: ReadableStreamOfBytes | undefined + let lastInput: ReadableStreamOfBytes | undefined; const input = $derived.by(() => { - lastInput?.cancel() - return lastInput = createReadableStream(terminal).pipeThrough( + lastInput?.cancel(); + return (lastInput = createReadableStream(terminal).pipeThrough( (inputMode === InputMode.Line ? createLineInputMode : createRawInputMode)(terminal) - ) - }) + )); + }); const terminalLogger = createLogger(terminal); const editorContext = new EditorContext(model, terminal, fitAddon); @@ -258,13 +262,13 @@
-
+
@@ -334,7 +338,7 @@
- {#each testCases as testCase, i} + {#each testCases as testCase, i (i)}
{#if lastTestId === i} @@ -369,8 +373,6 @@
- - e.stopPropagation()}>
diff --git a/apps/ppp/src/lib/routes.ts b/apps/ppp/src/lib/routes.ts index b726a672..505680ca 100644 --- a/apps/ppp/src/lib/routes.ts +++ b/apps/ppp/src/lib/routes.ts @@ -1,7 +1,7 @@ export enum Page { - Main = "/", - Problems = "/problems", - Editor = "/editor", + Main = '/', + Problems = '/problems', + Editor = '/editor' } -export const TITLE = "Programming Patterns Practice"; +export const TITLE = 'Programming Patterns Practice'; diff --git a/apps/ppp/src/lib/runtime/dotnet/compiler-factory.ts b/apps/ppp/src/lib/runtime/dotnet/compiler-factory.ts index 2e943d38..b1113b08 100644 --- a/apps/ppp/src/lib/runtime/dotnet/compiler-factory.ts +++ b/apps/ppp/src/lib/runtime/dotnet/compiler-factory.ts @@ -203,7 +203,7 @@ import netstandardDllUrl from 'dotnet-runtime/lib/netstandard.dll?url'; import { createCachedFetch } from '$lib/fetch'; const dotnetUrl = new URL( - `${import.meta.env.BASE_URL.replace(/\/$/, "")}/assets/dotnet/dotnet.js`, + `${import.meta.env.BASE_URL.replace(/\/$/, '')}/assets/dotnet/dotnet.js`, globalThis.location.origin ).toString(); diff --git a/apps/ppp/src/lib/runtime/dotnet/description.svelte b/apps/ppp/src/lib/runtime/dotnet/description.svelte index bf0f9c61..ccf95114 100644 --- a/apps/ppp/src/lib/runtime/dotnet/description.svelte +++ b/apps/ppp/src/lib/runtime/dotnet/description.svelte @@ -1,9 +1,9 @@

- Class Program with a public static method Main is required. + Class Program with a public static method Main is required.

diff --git a/apps/ppp/src/lib/runtime/dotnet/info.svelte b/apps/ppp/src/lib/runtime/dotnet/info.svelte index c739a86b..2c8a8e30 100644 --- a/apps/ppp/src/lib/runtime/dotnet/info.svelte +++ b/apps/ppp/src/lib/runtime/dotnet/info.svelte @@ -1,29 +1,29 @@

- .NET {version} + .NET {version}

- Your code is compiled by the Roslyn compiler (compiled to WebAssembly with a - several .NET assemblies) and is executed in a web worker environment. + Your code is compiled by the Roslyn compiler (compiled to WebAssembly with a several .NET + assemblies) and is executed in a web worker environment.

Available libraries:

- {#each libs as lib} -

- {lib} -

- {/each} + {#each libs as lib (lib)} +

+ {lib} +

+ {/each}
diff --git a/apps/ppp/src/lib/runtime/dotnet/test-compiler-factory.ts b/apps/ppp/src/lib/runtime/dotnet/test-compiler-factory.ts index d8212b72..b022a196 100644 --- a/apps/ppp/src/lib/runtime/dotnet/test-compiler-factory.ts +++ b/apps/ppp/src/lib/runtime/dotnet/test-compiler-factory.ts @@ -203,7 +203,7 @@ import netstandardDllUrl from 'dotnet-runtime/lib/netstandard.dll?url'; import { createCachedFetch } from '$lib/fetch'; const dotnetUrl = new URL( - `${import.meta.env.BASE_URL.replace(/\/$/, "")}/assets/dotnet/dotnet.js`, + `${import.meta.env.BASE_URL.replace(/\/$/, '')}/assets/dotnet/dotnet.js`, globalThis.location.origin ).toString(); diff --git a/apps/ppp/src/lib/runtime/dotnet/test-description.svelte b/apps/ppp/src/lib/runtime/dotnet/test-description.svelte index ae87a4a6..8b20404b 100644 --- a/apps/ppp/src/lib/runtime/dotnet/test-description.svelte +++ b/apps/ppp/src/lib/runtime/dotnet/test-description.svelte @@ -1,5 +1,5 @@

Namespace test is reserved.

diff --git a/apps/ppp/src/lib/runtime/dotnet/test-worker.ts b/apps/ppp/src/lib/runtime/dotnet/test-worker.ts index fafe6ca4..6e23970d 100644 --- a/apps/ppp/src/lib/runtime/dotnet/test-worker.ts +++ b/apps/ppp/src/lib/runtime/dotnet/test-worker.ts @@ -1,19 +1,17 @@ -import { startTestCompilerActor } from "libs/testing/actor"; -import { makeExecutionCode } from "dotnet-runtime"; -import { createContext } from "libs/context"; +import { startTestCompilerActor } from 'libs/testing/actor'; +import { makeExecutionCode } from 'dotnet-runtime'; +import { createContext } from 'libs/context'; -import { DotnetTestCompilerFactory } from "./test-compiler-factory"; +import { DotnetTestCompilerFactory } from './test-compiler-factory'; export interface DotnetTestWorkerConfig { - dotnetTestCompilerFactory: DotnetTestCompilerFactory; - makeExecutionCode: typeof makeExecutionCode; + dotnetTestCompilerFactory: DotnetTestCompilerFactory; + makeExecutionCode: typeof makeExecutionCode; } -startTestCompilerActor( - createContext(), - (ctx, streams, factory) => - factory(ctx, { - dotnetTestCompilerFactory: new DotnetTestCompilerFactory(streams), - makeExecutionCode, - }) +startTestCompilerActor(createContext(), (ctx, streams, factory) => + factory(ctx, { + dotnetTestCompilerFactory: new DotnetTestCompilerFactory(streams), + makeExecutionCode + }) ); diff --git a/apps/ppp/src/lib/runtime/dotnet/worker.ts b/apps/ppp/src/lib/runtime/dotnet/worker.ts index c1f2920b..11276166 100644 --- a/apps/ppp/src/lib/runtime/dotnet/worker.ts +++ b/apps/ppp/src/lib/runtime/dotnet/worker.ts @@ -1,6 +1,6 @@ -import { startCompilerActor } from "libs/compiler/actor"; +import { startCompilerActor } from 'libs/compiler/actor'; import { createContext } from 'libs/context'; -import { makeDotnetCompiler } from "./compiler-factory"; +import { makeDotnetCompiler } from './compiler-factory'; startCompilerActor(createContext(), makeDotnetCompiler); diff --git a/apps/ppp/src/lib/runtime/gleam/compiler-factory.ts b/apps/ppp/src/lib/runtime/gleam/compiler-factory.ts index 288b8565..d4cc8d70 100644 --- a/apps/ppp/src/lib/runtime/gleam/compiler-factory.ts +++ b/apps/ppp/src/lib/runtime/gleam/compiler-factory.ts @@ -9,7 +9,7 @@ import compilerWasmUrl from 'gleam-runtime/compiler.wasm?url'; import { createCachedFetch } from '$lib/fetch'; const precompiledGleamStdlibIndexUrl = new URL( - `${import.meta.env.BASE_URL.replace(/\/$/, "")}/assets/gleam`, + `${import.meta.env.BASE_URL.replace(/\/$/, '')}/assets/gleam`, globalThis.location.origin ).toString(); diff --git a/apps/ppp/src/lib/runtime/gleam/description.svelte b/apps/ppp/src/lib/runtime/gleam/description.svelte index 1d11b89a..fbb2ec41 100644 --- a/apps/ppp/src/lib/runtime/gleam/description.svelte +++ b/apps/ppp/src/lib/runtime/gleam/description.svelte @@ -1,17 +1,15 @@

- Gleam {version} + Gleam {version}

- Your code is compiled by Gleam compiler (compiled to WebAssembly with stdlib) to a JavaScript module and is executed in - a web worker environment. + Your code is compiled by Gleam compiler (compiled to WebAssembly with stdlib) to a JavaScript module and is executed in a web worker environment.

diff --git a/apps/ppp/src/lib/runtime/gleam/test-compiler-factory.ts b/apps/ppp/src/lib/runtime/gleam/test-compiler-factory.ts index a3d66ae6..beb7c94e 100644 --- a/apps/ppp/src/lib/runtime/gleam/test-compiler-factory.ts +++ b/apps/ppp/src/lib/runtime/gleam/test-compiler-factory.ts @@ -11,7 +11,7 @@ import { createCachedFetch } from '$lib/fetch'; import compilerWasmUrl from 'gleam-runtime/compiler.wasm?url'; const precompiledGleamStdlibIndexUrl = new URL( - `${import.meta.env.BASE_URL.replace(/\/$/, "")}/assets/gleam`, + `${import.meta.env.BASE_URL.replace(/\/$/, '')}/assets/gleam`, globalThis.location.origin ).toString(); diff --git a/apps/ppp/src/lib/runtime/gleam/test-worker.ts b/apps/ppp/src/lib/runtime/gleam/test-worker.ts index b32a4242..478d905c 100644 --- a/apps/ppp/src/lib/runtime/gleam/test-worker.ts +++ b/apps/ppp/src/lib/runtime/gleam/test-worker.ts @@ -1,16 +1,14 @@ -import { startTestCompilerActor } from "libs/testing/actor"; -import { createContext } from "libs/context"; +import { startTestCompilerActor } from 'libs/testing/actor'; +import { createContext } from 'libs/context'; -import { GleamTestCompilerFactory } from "./test-compiler-factory"; +import { GleamTestCompilerFactory } from './test-compiler-factory'; export interface GleamTestWorkerConfig { - gleamTestCompilerFactory: GleamTestCompilerFactory; + gleamTestCompilerFactory: GleamTestCompilerFactory; } -startTestCompilerActor( - createContext(), - (ctx, streams, factory) => - factory(ctx, { - gleamTestCompilerFactory: new GleamTestCompilerFactory(streams), - }) +startTestCompilerActor(createContext(), (ctx, streams, factory) => + factory(ctx, { + gleamTestCompilerFactory: new GleamTestCompilerFactory(streams) + }) ); diff --git a/apps/ppp/src/lib/runtime/gleam/worker.ts b/apps/ppp/src/lib/runtime/gleam/worker.ts index 9571e4be..7880fb84 100644 --- a/apps/ppp/src/lib/runtime/gleam/worker.ts +++ b/apps/ppp/src/lib/runtime/gleam/worker.ts @@ -1,6 +1,6 @@ -import { startCompilerActor } from "libs/compiler/actor"; +import { startCompilerActor } from 'libs/compiler/actor'; import { createContext } from 'libs/context'; -import { makeGleamCompiler } from "./compiler-factory"; +import { makeGleamCompiler } from './compiler-factory'; startCompilerActor(createContext(), makeGleamCompiler); diff --git a/apps/ppp/src/lib/runtime/go/description.svelte b/apps/ppp/src/lib/runtime/go/description.svelte index 740a4294..1fcb6e2c 100644 --- a/apps/ppp/src/lib/runtime/go/description.svelte +++ b/apps/ppp/src/lib/runtime/go/description.svelte @@ -1,23 +1,23 @@

- Your code is interpreted by Yaegi (compiled in WebAssembly with stdlib using go{version}, known limitations) in a web worker environment. + Your code is interpreted by Yaegi + (compiled in WebAssembly with stdlib using go{version}, + known limitations) in a web worker environment.

- Solution is inspired by Better Go Playground. + Solution is inspired by Better Go Playground.

diff --git a/apps/ppp/src/lib/runtime/go/test-worker.ts b/apps/ppp/src/lib/runtime/go/test-worker.ts index 154ee1ba..114dfbde 100644 --- a/apps/ppp/src/lib/runtime/go/test-worker.ts +++ b/apps/ppp/src/lib/runtime/go/test-worker.ts @@ -1,16 +1,14 @@ -import { startTestCompilerActor } from "libs/testing/actor"; -import { createContext } from "libs/context"; +import { startTestCompilerActor } from 'libs/testing/actor'; +import { createContext } from 'libs/context'; -import { GoTestCompilerFactory } from "./test-compiler-factory"; +import { GoTestCompilerFactory } from './test-compiler-factory'; export interface GoTestWorkerConfig { - goTestCompilerFactory: GoTestCompilerFactory; + goTestCompilerFactory: GoTestCompilerFactory; } -startTestCompilerActor( - createContext(), - (ctx, out, factory) => - factory(ctx, { - goTestCompilerFactory: new GoTestCompilerFactory(out), - }) +startTestCompilerActor(createContext(), (ctx, out, factory) => + factory(ctx, { + goTestCompilerFactory: new GoTestCompilerFactory(out) + }) ); diff --git a/apps/ppp/src/lib/runtime/go/worker.ts b/apps/ppp/src/lib/runtime/go/worker.ts index a15f1b2a..aa4706f3 100644 --- a/apps/ppp/src/lib/runtime/go/worker.ts +++ b/apps/ppp/src/lib/runtime/go/worker.ts @@ -1,6 +1,6 @@ -import { startCompilerActor } from "libs/compiler/actor"; +import { startCompilerActor } from 'libs/compiler/actor'; import { createContext } from 'libs/context'; -import { makeGoCompiler } from "./compiler-factory"; +import { makeGoCompiler } from './compiler-factory'; startCompilerActor(createContext(), makeGoCompiler); diff --git a/apps/ppp/src/lib/runtime/java/description.svelte b/apps/ppp/src/lib/runtime/java/description.svelte index a3dc1fad..ecf5ef58 100644 --- a/apps/ppp/src/lib/runtime/java/description.svelte +++ b/apps/ppp/src/lib/runtime/java/description.svelte @@ -1,9 +1,9 @@

- Class Program with a public static method main is required. + Class Program with a public static method main is required.

diff --git a/apps/ppp/src/lib/runtime/java/info.svelte b/apps/ppp/src/lib/runtime/java/info.svelte index 26c72baa..6818836b 100644 --- a/apps/ppp/src/lib/runtime/java/info.svelte +++ b/apps/ppp/src/lib/runtime/java/info.svelte @@ -1,14 +1,13 @@

- {version} + {version}

- Your code is compiled by Javac and executed in - DoppioJVM in a web worker environment. + Your code is compiled by Javac and executed in + DoppioJVM in a web + worker environment.

diff --git a/apps/ppp/src/lib/runtime/java/test-compiler-factory.ts b/apps/ppp/src/lib/runtime/java/test-compiler-factory.ts index 45c9272c..3960ce02 100644 --- a/apps/ppp/src/lib/runtime/java/test-compiler-factory.ts +++ b/apps/ppp/src/lib/runtime/java/test-compiler-factory.ts @@ -13,7 +13,10 @@ export interface Options { className?: string; classDefinitions: string; mainMethodBody: string; - nativesFactory: (input: I, saveOutput: (output: O) => void) => Record; + nativesFactory: ( + input: I, + saveOutput: (output: O) => void + ) => Record unknown>; } export class JavaTestCompilerFactory { @@ -40,7 +43,7 @@ export class JavaTestCompilerFactory { private saveOutput(output: O) { this.output = output; } - protected override getNatives(input: I): Record { + protected override getNatives(input: I): Record unknown> { this.output = undefined; return nativesFactory(input, this.saveOutput.bind(this)); } diff --git a/apps/ppp/src/lib/runtime/java/test-description.svelte b/apps/ppp/src/lib/runtime/java/test-description.svelte index 787d3dfd..9619f1e5 100644 --- a/apps/ppp/src/lib/runtime/java/test-description.svelte +++ b/apps/ppp/src/lib/runtime/java/test-description.svelte @@ -1,9 +1,9 @@

- Public class Test is reserved. + Public class Test is reserved.

diff --git a/apps/ppp/src/lib/runtime/java/test-worker.ts b/apps/ppp/src/lib/runtime/java/test-worker.ts index 5f881e51..169a2bf5 100644 --- a/apps/ppp/src/lib/runtime/java/test-worker.ts +++ b/apps/ppp/src/lib/runtime/java/test-worker.ts @@ -1,19 +1,17 @@ -import { util } from "java-runtime"; -import { startTestCompilerActor } from "libs/testing/actor"; -import { createContext } from "libs/context"; +import { util } from 'java-runtime'; +import { startTestCompilerActor } from 'libs/testing/actor'; +import { createContext } from 'libs/context'; -import { JavaTestCompilerFactory } from "./test-compiler-factory"; +import { JavaTestCompilerFactory } from './test-compiler-factory'; export interface JavaTestWorkerConfig { - javaTestCompilerFactory: JavaTestCompilerFactory; - util: typeof util; + javaTestCompilerFactory: JavaTestCompilerFactory; + util: typeof util; } -startTestCompilerActor( - createContext(), - (ctx, streams, factory) => - factory(ctx, { - javaTestCompilerFactory: new JavaTestCompilerFactory(streams), - util, - }) +startTestCompilerActor(createContext(), (ctx, streams, factory) => + factory(ctx, { + javaTestCompilerFactory: new JavaTestCompilerFactory(streams), + util + }) ); diff --git a/apps/ppp/src/lib/runtime/java/worker.ts b/apps/ppp/src/lib/runtime/java/worker.ts index 5a8a8bbc..ddf4a21f 100644 --- a/apps/ppp/src/lib/runtime/java/worker.ts +++ b/apps/ppp/src/lib/runtime/java/worker.ts @@ -1,6 +1,6 @@ -import { startCompilerActor } from "libs/compiler/actor"; +import { startCompilerActor } from 'libs/compiler/actor'; import { createContext } from 'libs/context'; -import { makeJavaCompiler } from "./compiler-factory"; +import { makeJavaCompiler } from './compiler-factory'; startCompilerActor(createContext(), makeJavaCompiler); diff --git a/apps/ppp/src/lib/runtime/js/compiler-factory.ts b/apps/ppp/src/lib/runtime/js/compiler-factory.ts index c60cee48..ce90bbab 100644 --- a/apps/ppp/src/lib/runtime/js/compiler-factory.ts +++ b/apps/ppp/src/lib/runtime/js/compiler-factory.ts @@ -1,16 +1,16 @@ -import { redirect, createLogger } from "libs/logger"; -import type { CompilerFactory, Program } from "libs/compiler"; +import { redirect, createLogger } from 'libs/logger'; +import type { CompilerFactory, Program } from 'libs/compiler'; import type { Streams } from 'libs/io'; -import { JsProgram } from "javascript-runtime"; +import { JsProgram } from 'javascript-runtime'; export const makeJsCompiler: CompilerFactory = async (_, streams) => { - const patchedConsole = redirect(globalThis.console, createLogger(streams.out)); - return { - async compile(_, files) { - if (files.length !== 1) { - throw new Error("Compilation of multiple files is not implemented"); - } - return new JsProgram(files[0].content, patchedConsole); - }, - }; + const patchedConsole = redirect(globalThis.console, createLogger(streams.out)); + return { + async compile(_, files) { + if (files.length !== 1) { + throw new Error('Compilation of multiple files is not implemented'); + } + return new JsProgram(files[0].content, patchedConsole); + } + }; }; diff --git a/apps/ppp/src/lib/runtime/js/description.svelte b/apps/ppp/src/lib/runtime/js/description.svelte index 1e90cf5c..1e9f8408 100644 --- a/apps/ppp/src/lib/runtime/js/description.svelte +++ b/apps/ppp/src/lib/runtime/js/description.svelte @@ -1,11 +1,7 @@

Your code is executed in a web worker environment.

- - Check supported features in your browser - . + + Check supported features in your browser + .

diff --git a/apps/ppp/src/lib/runtime/js/test-compiler-factory.ts b/apps/ppp/src/lib/runtime/js/test-compiler-factory.ts index af5924af..fd3231d7 100644 --- a/apps/ppp/src/lib/runtime/js/test-compiler-factory.ts +++ b/apps/ppp/src/lib/runtime/js/test-compiler-factory.ts @@ -1,36 +1,31 @@ -import type { Streams } from "libs/io"; -import { createLogger, redirect } from "libs/logger"; -import { compileJsModule } from "libs/js"; -import type { TestCompiler } from "libs/testing"; -import { JsTestProgram } from "javascript-runtime"; +import type { Streams } from 'libs/io'; +import { createLogger, redirect } from 'libs/logger'; +import { compileJsModule } from 'libs/js'; +import type { TestCompiler } from 'libs/testing'; +import { JsTestProgram } from 'javascript-runtime'; export type InvokeTestMethod = (m: M, input: I) => Promise; export class JsTestCompilerFactory { - protected readonly patchedConsole: Console; + protected readonly patchedConsole: Console; - constructor(streams: Streams) { - this.patchedConsole = redirect(globalThis.console, createLogger(streams.out)); - } + constructor(streams: Streams) { + this.patchedConsole = redirect(globalThis.console, createLogger(streams.out)); + } - create( - invokeTestMethod: InvokeTestMethod - ): TestCompiler { - class TestProgram extends JsTestProgram { - override executeTest(m: M, input: I): Promise { - return invokeTestMethod(m, input); - } - } - return { - compile: async (_, files) => { - if (files.length !== 1) { - throw new Error("Compilation of multiple files is not implemented"); - } - return new TestProgram( - await compileJsModule(files[0].content), - this.patchedConsole - ); - }, - }; - } + create(invokeTestMethod: InvokeTestMethod): TestCompiler { + class TestProgram extends JsTestProgram { + override executeTest(m: M, input: I): Promise { + return invokeTestMethod(m, input); + } + } + return { + compile: async (_, files) => { + if (files.length !== 1) { + throw new Error('Compilation of multiple files is not implemented'); + } + return new TestProgram(await compileJsModule(files[0].content), this.patchedConsole); + } + }; + } } diff --git a/apps/ppp/src/lib/runtime/js/test-worker.ts b/apps/ppp/src/lib/runtime/js/test-worker.ts index 26872f80..cc2fad2f 100644 --- a/apps/ppp/src/lib/runtime/js/test-worker.ts +++ b/apps/ppp/src/lib/runtime/js/test-worker.ts @@ -1,16 +1,14 @@ -import { createContext } from "libs/context"; -import { startTestCompilerActor } from "libs/testing/actor"; +import { createContext } from 'libs/context'; +import { startTestCompilerActor } from 'libs/testing/actor'; -import { JsTestCompilerFactory } from "./test-compiler-factory"; +import { JsTestCompilerFactory } from './test-compiler-factory'; export interface JsTestWorkerConfig { - jsTestCompilerFactory: JsTestCompilerFactory; + jsTestCompilerFactory: JsTestCompilerFactory; } -startTestCompilerActor( - createContext(), - (ctx, streams, factory) => - factory(ctx, { - jsTestCompilerFactory: new JsTestCompilerFactory(streams), - }) +startTestCompilerActor(createContext(), (ctx, streams, factory) => + factory(ctx, { + jsTestCompilerFactory: new JsTestCompilerFactory(streams) + }) ); diff --git a/apps/ppp/src/lib/runtime/js/worker.ts b/apps/ppp/src/lib/runtime/js/worker.ts index 28c54480..506167f8 100644 --- a/apps/ppp/src/lib/runtime/js/worker.ts +++ b/apps/ppp/src/lib/runtime/js/worker.ts @@ -1,6 +1,6 @@ import { createContext } from 'libs/context'; -import { startCompilerActor } from "libs/compiler/actor"; +import { startCompilerActor } from 'libs/compiler/actor'; -import { makeJsCompiler } from "./compiler-factory"; +import { makeJsCompiler } from './compiler-factory'; startCompilerActor(createContext(), makeJsCompiler); diff --git a/apps/ppp/src/lib/runtime/php/description.svelte b/apps/ppp/src/lib/runtime/php/description.svelte index f7001d88..95ace680 100644 --- a/apps/ppp/src/lib/runtime/php/description.svelte +++ b/apps/ppp/src/lib/runtime/php/description.svelte @@ -1,16 +1,16 @@

- PHP {version}. + PHP {version}.

- Your code is executed by WebAssembly PHP in a web worker environment. + Your code is executed by WebAssembly PHP in a web worker environment.

diff --git a/apps/ppp/src/lib/runtime/php/test-worker.ts b/apps/ppp/src/lib/runtime/php/test-worker.ts index c231e35f..affef10d 100644 --- a/apps/ppp/src/lib/runtime/php/test-worker.ts +++ b/apps/ppp/src/lib/runtime/php/test-worker.ts @@ -1,16 +1,14 @@ -import { startTestCompilerActor } from "libs/testing/actor"; -import { createContext } from "libs/context"; +import { startTestCompilerActor } from 'libs/testing/actor'; +import { createContext } from 'libs/context'; -import { PhpTestCompilerFactory } from "./test-compiler-factory"; +import { PhpTestCompilerFactory } from './test-compiler-factory'; export interface PhpTestWorkerConfig { - phpTestCompilerFactory: PhpTestCompilerFactory; + phpTestCompilerFactory: PhpTestCompilerFactory; } -startTestCompilerActor( - createContext(), - (ctx, streams, factory) => - factory(ctx, { - phpTestCompilerFactory: new PhpTestCompilerFactory(streams), - }) +startTestCompilerActor(createContext(), (ctx, streams, factory) => + factory(ctx, { + phpTestCompilerFactory: new PhpTestCompilerFactory(streams) + }) ); diff --git a/apps/ppp/src/lib/runtime/php/worker.ts b/apps/ppp/src/lib/runtime/php/worker.ts index 8677999d..ecba6cda 100644 --- a/apps/ppp/src/lib/runtime/php/worker.ts +++ b/apps/ppp/src/lib/runtime/php/worker.ts @@ -1,6 +1,6 @@ -import { startCompilerActor } from "libs/compiler/actor"; +import { startCompilerActor } from 'libs/compiler/actor'; import { createContext } from 'libs/context'; -import { makePhpCompiler } from "./compiler-factory"; +import { makePhpCompiler } from './compiler-factory'; startCompilerActor(createContext(), makePhpCompiler); diff --git a/apps/ppp/src/lib/runtime/python/compiler-factory.ts b/apps/ppp/src/lib/runtime/python/compiler-factory.ts index a4503f0a..3ff6aec3 100644 --- a/apps/ppp/src/lib/runtime/python/compiler-factory.ts +++ b/apps/ppp/src/lib/runtime/python/compiler-factory.ts @@ -3,22 +3,14 @@ import type { Streams } from 'libs/io'; import { createLogger } from 'libs/logger'; import { PyProgram, pyRuntimeFactory } from 'python-runtime'; -import wasmUrl from 'python-runtime/pyodide.wasm?url'; -import stdlibUrl from 'python-runtime/python-stdlib.zip?url'; - -import { createCachedFetch } from '$lib/fetch'; - export const makePythonCompiler: CompilerFactory = async (ctx, streams) => { const logger = createLogger(streams.out); - const fetcher = await createCachedFetch('python-cache@', wasmUrl); - const pyRuntime = await pyRuntimeFactory( - ctx, - streams, - (ctx, imports) => - WebAssembly.instantiateStreaming(fetcher(wasmUrl, { signal: ctx.signal }), imports), - stdlibUrl - ); - logger.info(`Loaded ${wasmUrl}`); + const indexUrl = new URL( + `${import.meta.env.BASE_URL.replace(/\/$/, '')}/assets/pyodide/`, + globalThis.location.origin + ).toString(); + const pyRuntime = await pyRuntimeFactory(ctx, streams, indexUrl); + logger.info(`Loaded ${indexUrl}`); return { async compile(_, files) { if (files.length !== 1) { diff --git a/apps/ppp/src/lib/runtime/python/description.svelte b/apps/ppp/src/lib/runtime/python/description.svelte index 62a2fcdf..df9e95c3 100644 --- a/apps/ppp/src/lib/runtime/python/description.svelte +++ b/apps/ppp/src/lib/runtime/python/description.svelte @@ -1,16 +1,13 @@

- Python {version}. + Python {version}.

- Your code is executed by Pyodide (Python distribution based on WebAssembly) in a web worker environment. + Your code is executed by Pyodide (Python distribution based on WebAssembly) in a web worker environment.

diff --git a/apps/ppp/src/lib/runtime/python/test-compiler-factory.ts b/apps/ppp/src/lib/runtime/python/test-compiler-factory.ts index 12ba4ac0..73771159 100644 --- a/apps/ppp/src/lib/runtime/python/test-compiler-factory.ts +++ b/apps/ppp/src/lib/runtime/python/test-compiler-factory.ts @@ -4,11 +4,6 @@ import { createLogger, type Logger } from 'libs/logger'; import type { TestCompiler } from 'libs/testing'; import { pyRuntimeFactory, PyTestProgram } from 'python-runtime'; -import wasmUrl from 'python-runtime/pyodide.wasm?url'; -import stdlibUrl from 'python-runtime/python-stdlib.zip?url'; - -import { createCachedFetch } from '$lib/fetch'; - export type GenerateCaseExecutionCode = (input: I) => string; export class PythonTestCompilerFactory { @@ -27,15 +22,12 @@ export class PythonTestCompilerFactory { return generateCaseExecutionCode(data); } } - const fetcher = await createCachedFetch('python-cache@', wasmUrl); - const pyRuntime = await pyRuntimeFactory( - ctx, - this.streams, - (ctx, imports) => - WebAssembly.instantiateStreaming(fetcher(wasmUrl, { signal: ctx.signal }), imports), - stdlibUrl - ); - this.logger.info(`Loaded ${wasmUrl}`); + const indexUrl = new URL( + `${import.meta.env.BASE_URL.replace(/\/$/, '')}/assets/pyodide/`, + globalThis.location.origin + ).toString(); + const pyRuntime = await pyRuntimeFactory(ctx, this.streams, indexUrl); + this.logger.info(`Loaded ${indexUrl}`); return { async compile(_, files) { if (files.length !== 1) { diff --git a/apps/ppp/src/lib/runtime/python/test-worker.ts b/apps/ppp/src/lib/runtime/python/test-worker.ts index 91876a29..9b0eb6f0 100644 --- a/apps/ppp/src/lib/runtime/python/test-worker.ts +++ b/apps/ppp/src/lib/runtime/python/test-worker.ts @@ -1,16 +1,14 @@ -import { startTestCompilerActor } from "libs/testing/actor"; -import { createContext } from "libs/context"; +import { startTestCompilerActor } from 'libs/testing/actor'; +import { createContext } from 'libs/context'; -import { PythonTestCompilerFactory } from "./test-compiler-factory"; +import { PythonTestCompilerFactory } from './test-compiler-factory'; export interface PythonTestWorkerConfig { - pythonTestCompilerFactory: PythonTestCompilerFactory; + pythonTestCompilerFactory: PythonTestCompilerFactory; } -startTestCompilerActor( - createContext(), - (ctx, streams, factory) => - factory(ctx, { - pythonTestCompilerFactory: new PythonTestCompilerFactory(streams), - }) +startTestCompilerActor(createContext(), (ctx, streams, factory) => + factory(ctx, { + pythonTestCompilerFactory: new PythonTestCompilerFactory(streams) + }) ); diff --git a/apps/ppp/src/lib/runtime/python/worker.ts b/apps/ppp/src/lib/runtime/python/worker.ts index caf4867c..e6f1d7fb 100644 --- a/apps/ppp/src/lib/runtime/python/worker.ts +++ b/apps/ppp/src/lib/runtime/python/worker.ts @@ -1,6 +1,6 @@ -import { startCompilerActor } from "libs/compiler/actor"; +import { startCompilerActor } from 'libs/compiler/actor'; import { createContext } from 'libs/context'; -import { makePythonCompiler } from "./compiler-factory"; +import { makePythonCompiler } from './compiler-factory'; startCompilerActor(createContext(), makePythonCompiler); diff --git a/apps/ppp/src/lib/runtime/ruby/description.svelte b/apps/ppp/src/lib/runtime/ruby/description.svelte index 481444a9..7991a5c3 100644 --- a/apps/ppp/src/lib/runtime/ruby/description.svelte +++ b/apps/ppp/src/lib/runtime/ruby/description.svelte @@ -1,22 +1,20 @@

- Ruby {version} + Ruby {version}

- Your code is interpreted by CRuby (ported to WebAssembly with stdlib) in a web worker environment. + Your code is interpreted by CRuby (ported to WebAssembly with stdlib) in a web worker environment.

- Notable Limitations. - - The current WASI target build does not yet support Thread related APIs. - Also there is no support for networking. + Notable Limitations. The current WASI target build does not yet support Thread related APIs. Also + there is no support for networking.

diff --git a/apps/ppp/src/lib/runtime/ruby/test-worker.ts b/apps/ppp/src/lib/runtime/ruby/test-worker.ts index 31d6d99d..7c29673c 100644 --- a/apps/ppp/src/lib/runtime/ruby/test-worker.ts +++ b/apps/ppp/src/lib/runtime/ruby/test-worker.ts @@ -1,16 +1,14 @@ -import { createContext } from "libs/context"; -import { startTestCompilerActor } from "libs/testing/actor"; +import { createContext } from 'libs/context'; +import { startTestCompilerActor } from 'libs/testing/actor'; -import { RubyTestCompilerFactory } from "./test-compiler-factory"; +import { RubyTestCompilerFactory } from './test-compiler-factory'; export interface RubyTestWorkerConfig { - rubyTestCompilerFactory: RubyTestCompilerFactory; + rubyTestCompilerFactory: RubyTestCompilerFactory; } -startTestCompilerActor( - createContext(), - (ctx, streams, factory) => - factory(ctx, { - rubyTestCompilerFactory: new RubyTestCompilerFactory(streams), - }) +startTestCompilerActor(createContext(), (ctx, streams, factory) => + factory(ctx, { + rubyTestCompilerFactory: new RubyTestCompilerFactory(streams) + }) ); diff --git a/apps/ppp/src/lib/runtime/ruby/worker.ts b/apps/ppp/src/lib/runtime/ruby/worker.ts index 51cce6e0..448a7ce3 100644 --- a/apps/ppp/src/lib/runtime/ruby/worker.ts +++ b/apps/ppp/src/lib/runtime/ruby/worker.ts @@ -1,6 +1,6 @@ -import { startCompilerActor } from "libs/compiler/actor"; +import { startCompilerActor } from 'libs/compiler/actor'; import { createContext } from 'libs/context'; -import { makeRubyCompiler } from "./compiler-factory"; +import { makeRubyCompiler } from './compiler-factory'; startCompilerActor(createContext(), makeRubyCompiler); diff --git a/apps/ppp/src/lib/runtime/rust/description.svelte b/apps/ppp/src/lib/runtime/rust/description.svelte index 913999f6..0143837f 100644 --- a/apps/ppp/src/lib/runtime/rust/description.svelte +++ b/apps/ppp/src/lib/runtime/rust/description.svelte @@ -1,38 +1,34 @@

- Rust {version} + Rust {version}

- Your code is interpreted by Miri (compiled to WebAssembly) in a web worker environment. + Your code is interpreted by Miri (compiled to WebAssembly) in a web worker environment.

Anything not supported by Miri or WASM is unsupported.

- This solution is based on bjorn3 - work on - porting Rust to WebAssembly - and - browser WASI shim. + This solution is based on bjorn3 + work on + porting Rust to WebAssembly + and + browser WASI shim.

diff --git a/apps/ppp/src/lib/runtime/rust/test-worker.ts b/apps/ppp/src/lib/runtime/rust/test-worker.ts index 8ac04d0d..926baca9 100644 --- a/apps/ppp/src/lib/runtime/rust/test-worker.ts +++ b/apps/ppp/src/lib/runtime/rust/test-worker.ts @@ -1,14 +1,14 @@ -import { startTestCompilerActor } from "libs/testing/actor"; +import { startTestCompilerActor } from 'libs/testing/actor'; import { createContext } from 'libs/context'; -import { RustTestCompilerFactory } from "./test-compiler-factory"; +import { RustTestCompilerFactory } from './test-compiler-factory'; export interface RustTestWorkerConfig { - rustTestCompilerFactory: RustTestCompilerFactory; + rustTestCompilerFactory: RustTestCompilerFactory; } startTestCompilerActor(createContext(), (ctx, out, factory) => - factory(ctx, { - rustTestCompilerFactory: new RustTestCompilerFactory(out), - }) + factory(ctx, { + rustTestCompilerFactory: new RustTestCompilerFactory(out) + }) ); diff --git a/apps/ppp/src/lib/runtime/rust/worker.ts b/apps/ppp/src/lib/runtime/rust/worker.ts index ed7404e4..76c62056 100644 --- a/apps/ppp/src/lib/runtime/rust/worker.ts +++ b/apps/ppp/src/lib/runtime/rust/worker.ts @@ -1,6 +1,6 @@ -import { startCompilerActor } from "libs/compiler/actor"; +import { startCompilerActor } from 'libs/compiler/actor'; import { createContext } from 'libs/context'; -import { makeRustCompiler } from "./compiler-factory"; +import { makeRustCompiler } from './compiler-factory'; startCompilerActor(createContext(), makeRustCompiler); diff --git a/apps/ppp/src/lib/runtime/ts/description.svelte b/apps/ppp/src/lib/runtime/ts/description.svelte index 213faf51..a87f822b 100644 --- a/apps/ppp/src/lib/runtime/ts/description.svelte +++ b/apps/ppp/src/lib/runtime/ts/description.svelte @@ -1,5 +1,5 @@

TypeScript {version}. Transpilation options:

@@ -16,11 +16,7 @@ strictFunctionTypes: true,

Transpiled code is executed in a web worker environment.

- - Check supported features in your browser - . + + Check supported features in your browser + .

diff --git a/apps/ppp/src/lib/runtime/ts/test-compiler-factory.ts b/apps/ppp/src/lib/runtime/ts/test-compiler-factory.ts index 9e66acd6..0669a2e1 100644 --- a/apps/ppp/src/lib/runtime/ts/test-compiler-factory.ts +++ b/apps/ppp/src/lib/runtime/ts/test-compiler-factory.ts @@ -1,37 +1,35 @@ -import type { Streams } from "libs/io"; -import { compileJsModule } from "libs/js"; -import { createLogger, redirect } from "libs/logger"; -import type { TestCompiler } from "libs/testing"; -import { JsTestProgram } from "javascript-runtime"; -import { compileTsModule } from "typescript-runtime"; +import type { Streams } from 'libs/io'; +import { compileJsModule } from 'libs/js'; +import { createLogger, redirect } from 'libs/logger'; +import type { TestCompiler } from 'libs/testing'; +import { JsTestProgram } from 'javascript-runtime'; +import { compileTsModule } from 'typescript-runtime'; export type InvokeTestMethod = (m: M, input: I) => Promise; export class TsTestCompilerFactory { - protected readonly patchedConsole: Console; + protected readonly patchedConsole: Console; - constructor(streams: Streams) { - this.patchedConsole = redirect(globalThis.console, createLogger(streams.out)); - } + constructor(streams: Streams) { + this.patchedConsole = redirect(globalThis.console, createLogger(streams.out)); + } - create( - invokeTestMethod: InvokeTestMethod - ): TestCompiler { - class TestProgram extends JsTestProgram { - override async executeTest(m: M, input: I): Promise { - return invokeTestMethod(m, input); - } - } - return { - compile: async (_, files) => { - if (files.length !== 1) { - throw new Error("Compilation of multiple files is not implemented"); - } - return new TestProgram( - await compileJsModule(compileTsModule(files[0].content)), - this.patchedConsole - ); - }, - }; - } + create(invokeTestMethod: InvokeTestMethod): TestCompiler { + class TestProgram extends JsTestProgram { + override async executeTest(m: M, input: I): Promise { + return invokeTestMethod(m, input); + } + } + return { + compile: async (_, files) => { + if (files.length !== 1) { + throw new Error('Compilation of multiple files is not implemented'); + } + return new TestProgram( + await compileJsModule(compileTsModule(files[0].content)), + this.patchedConsole + ); + } + }; + } } diff --git a/apps/ppp/src/lib/runtime/ts/test-worker.ts b/apps/ppp/src/lib/runtime/ts/test-worker.ts index c484355a..eaf38ce7 100644 --- a/apps/ppp/src/lib/runtime/ts/test-worker.ts +++ b/apps/ppp/src/lib/runtime/ts/test-worker.ts @@ -1,16 +1,14 @@ -import { createContext } from "libs/context"; -import { startTestCompilerActor } from "libs/testing/actor"; +import { createContext } from 'libs/context'; +import { startTestCompilerActor } from 'libs/testing/actor'; -import { TsTestCompilerFactory } from "./test-compiler-factory"; +import { TsTestCompilerFactory } from './test-compiler-factory'; export interface TsTestWorkerConfig { - tsTestCompilerFactory: TsTestCompilerFactory; + tsTestCompilerFactory: TsTestCompilerFactory; } -startTestCompilerActor( - createContext(), - (ctx, streams, factory) => - factory(ctx, { - tsTestCompilerFactory: new TsTestCompilerFactory(streams), - }) +startTestCompilerActor(createContext(), (ctx, streams, factory) => + factory(ctx, { + tsTestCompilerFactory: new TsTestCompilerFactory(streams) + }) ); diff --git a/apps/ppp/src/lib/runtime/ts/worker.ts b/apps/ppp/src/lib/runtime/ts/worker.ts index 686aa1cb..92475b81 100644 --- a/apps/ppp/src/lib/runtime/ts/worker.ts +++ b/apps/ppp/src/lib/runtime/ts/worker.ts @@ -1,6 +1,6 @@ -import { startCompilerActor } from "libs/compiler/actor"; +import { startCompilerActor } from 'libs/compiler/actor'; import { createContext } from 'libs/context'; -import { makeTsCompiler } from "./compiler-factory"; +import { makeTsCompiler } from './compiler-factory'; startCompilerActor(createContext(), makeTsCompiler); diff --git a/apps/ppp/src/lib/storage.ts b/apps/ppp/src/lib/storage.ts index db63716a..08664653 100644 --- a/apps/ppp/src/lib/storage.ts +++ b/apps/ppp/src/lib/storage.ts @@ -1,23 +1,23 @@ -import type { SyncStorage } from "$lib/sync-storage.svelte"; +import type { SyncStorage } from '$lib/sync-storage.svelte'; export function createSyncStorage( - storage: Storage, - key: string, - defaultValue: T + storage: Storage, + key: string, + defaultValue: T ): SyncStorage { - return { - load(): T { - const stored = storage.getItem(key); - if (stored === null) { - return defaultValue; - } - return JSON.parse(stored); - }, - save(data: T): void { - storage.setItem(key, JSON.stringify(data)); - }, - clear(): void { - storage.removeItem(key); - }, - }; + return { + load(): T { + const stored = storage.getItem(key); + if (stored === null) { + return defaultValue; + } + return JSON.parse(stored); + }, + save(data: T): void { + storage.setItem(key, JSON.stringify(data)); + }, + clear(): void { + storage.removeItem(key); + } + }; } diff --git a/apps/ppp/src/lib/sync-storage.svelte.ts b/apps/ppp/src/lib/sync-storage.svelte.ts index e8ec8ae6..107d07f7 100644 --- a/apps/ppp/src/lib/sync-storage.svelte.ts +++ b/apps/ppp/src/lib/sync-storage.svelte.ts @@ -1,29 +1,25 @@ export interface SyncStorage { - load(): T - save(data: T): void - clear(): void + load(): T; + save(data: T): void; + clear(): void; } export function immediateSave(storage: SyncStorage, value: () => T) { - $effect(() => { - storage.save(value()); - }); + $effect(() => { + storage.save(value()); + }); } -export function debouncedSave( - storage: SyncStorage, - value: () => T, - debounce: number -) { - let callbackId: NodeJS.Timeout; - $effect(() => { - clearTimeout(callbackId); - const newValue = value(); - callbackId = setTimeout(() => { - storage.save(newValue); - }, debounce); - return () => { - clearTimeout(callbackId); - }; - }); +export function debouncedSave(storage: SyncStorage, value: () => T, debounce: number) { + let callbackId: NodeJS.Timeout; + $effect(() => { + clearTimeout(callbackId); + const newValue = value(); + callbackId = setTimeout(() => { + storage.save(newValue); + }, debounce); + return () => { + clearTimeout(callbackId); + }; + }); } diff --git a/apps/ppp/src/lib/zig/zig.tmLanguage.json b/apps/ppp/src/lib/zig/zig.tmLanguage.json index 78ae72e4..33a84e17 100644 --- a/apps/ppp/src/lib/zig/zig.tmLanguage.json +++ b/apps/ppp/src/lib/zig/zig.tmLanguage.json @@ -1,340 +1,340 @@ { - "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json", - "name": "zig", - "scopeName": "source.zig", - "fileTypes": ["zig", "zon"], - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#strings" - }, - { - "include": "#keywords" - }, - { - "include": "#operators" - }, - { - "include": "#punctuation" - }, - { - "include": "#numbers" - }, - { - "include": "#support" - }, - { - "include": "#variables" - } - ], - "repository": { - "variables": { - "patterns": [ - { - "name": "meta.function.declaration.zig", - "patterns": [ - { - "match": "\\b(fn)\\s+([A-Z][a-zA-Z0-9]*)\\b", - "captures": { - "1": { - "name": "storage.type.function.zig" - }, - "2": { - "name": "entity.name.type.zig" - } - } - }, - { - "match": "\\b(fn)\\s+([_a-zA-Z][_a-zA-Z0-9]*)\\b", - "captures": { - "1": { - "name": "storage.type.function.zig" - }, - "2": { - "name": "entity.name.function.zig" - } - } - }, - { - "begin": "\\b(fn)\\s+@\"", - "end": "\"", - "name": "entity.name.function.string.zig", - "beginCaptures": { - "1": { - "name": "storage.type.function.zig" - } - }, - "patterns": [ - { - "include": "#stringcontent" - } - ] - }, - { - "name": "keyword.default.zig", - "match": "\\b(const|var|fn)\\b" - } - ] - }, - { - "name": "meta.function.call.zig", - "patterns": [ - { - "match": "([A-Z][a-zA-Z0-9]*)(?=\\s*\\()", - "name": "entity.name.type.zig" - }, - { - "match": "([_a-zA-Z][_a-zA-Z0-9]*)(?=\\s*\\()", - "name": "entity.name.function.zig" - } - ] - }, - { - "name": "meta.variable.zig", - "patterns": [ - { - "match": "\\b[_a-zA-Z][_a-zA-Z0-9]*\\b", - "name": "variable.zig" - }, - { - "begin": "@\"", - "end": "\"", - "name": "variable.string.zig", - "patterns": [ - { - "include": "#stringcontent" - } - ] - } - ] - } - ] - }, - "keywords": { - "patterns": [ - { - "match": "\\binline\\b(?!\\s*\\bfn\\b)", - "name": "keyword.control.repeat.zig" - }, - { - "match": "\\b(while|for)\\b", - "name": "keyword.control.repeat.zig" - }, - { - "name": "keyword.storage.zig", - "match": "\\b(extern|packed|export|pub|noalias|inline|comptime|volatile|align|linksection|threadlocal|allowzero|noinline|callconv|addrspace)\\b" - }, - { - "name": "keyword.structure.zig", - "match": "\\b(struct|enum|union|opaque)\\b" - }, - { - "name": "keyword.statement.zig", - "match": "\\b(asm|unreachable)\\b" - }, - { - "name": "keyword.control.flow.zig", - "match": "\\b(break|return|continue|defer|errdefer)\\b" - }, - { - "name": "keyword.control.async.zig", - "match": "\\b(resume|suspend|nosuspend)\\b" - }, - { - "name": "keyword.control.trycatch.zig", - "match": "\\b(try|catch)\\b" - }, - { - "name": "keyword.control.conditional.zig", - "match": "\\b(if|else|switch|orelse)\\b" - }, - { - "name": "keyword.constant.default.zig", - "match": "\\b(null|undefined)\\b" - }, - { - "name": "keyword.constant.bool.zig", - "match": "\\b(true|false)\\b" - }, - { - "name": "keyword.default.zig", - "match": "\\b(test|and|or)\\b" - }, - { - "name": "keyword.type.zig", - "match": "\\b(bool|void|noreturn|type|error|anyerror|anyframe|anytype|anyopaque)\\b" - }, - { - "name": "keyword.type.integer.zig", - "match": "\\b(f16|f32|f64|f80|f128|u\\d+|i\\d+|isize|usize|comptime_int|comptime_float)\\b" - }, - { - "name": "keyword.type.c.zig", - "match": "\\b(c_char|c_short|c_ushort|c_int|c_uint|c_long|c_ulong|c_longlong|c_ulonglong|c_longdouble)\\b" - } - ] - }, - "operators": { - "patterns": [ - { - "name": "keyword.operator.c-pointer.zig", - "match": "(?<=\\[)\\*c(?=\\])" - }, - { - "name": "keyword.operator.comparison.zig", - "match": "(\\b(and|or)\\b)|(==|!=|<=|>=|<|>)" - }, - { - "name": "keyword.operator.arithmetic.zig", - "match": "(-%?|\\+%?|\\*%?|/|%)=?" - }, - { - "name": "keyword.operator.bitwise.zig", - "match": "(<<%?|>>|!|~|&|\\^|\\|)=?" - }, - { - "name": "keyword.operator.special.zig", - "match": "(==|\\+\\+|\\*\\*|->)" - }, - { - "name": "keyword.operator.assignment.zig", - "match": "=" - }, - { - "name": "keyword.operator.question.zig", - "match": "\\?" - } - ] - }, - "comments": { - "patterns": [ - { - "name": "comment.line.documentation.zig", - "begin": "//[!/](?=[^/])", - "end": "$", - "patterns": [ - { - "include": "#commentContents" - } - ] - }, - { - "name": "comment.line.double-slash.zig", - "begin": "//", - "end": "$", - "patterns": [ - { - "include": "#commentContents" - } - ] - } - ] - }, - "commentContents": { - "patterns": [ - { - "match": "\\b(TODO|FIXME|XXX|NOTE)\\b:?", - "name": "keyword.todo.zig" - } - ] - }, - "punctuation": { - "patterns": [ - { - "name": "punctuation.accessor.zig", - "match": "\\." - }, - { - "name": "punctuation.comma.zig", - "match": "," - }, - { - "name": "punctuation.separator.key-value.zig", - "match": ":" - }, - { - "name": "punctuation.terminator.statement.zig", - "match": ";" - } - ] - }, - "strings": { - "patterns": [ - { - "name": "string.quoted.double.zig", - "begin": "\"", - "end": "\"", - "patterns": [ - { - "include": "#stringcontent" - } - ] - }, - { - "name": "string.multiline.zig", - "begin": "\\\\\\\\", - "end": "$" - }, - { - "name": "string.quoted.single.zig", - "match": "'([^'\\\\]|\\\\(x\\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.))'" - } - ] - }, - "stringcontent": { - "patterns": [ - { - "name": "constant.character.escape.zig", - "match": "\\\\([nrt'\"\\\\]|(x[0-9a-fA-F]{2})|(u\\{[0-9a-fA-F]+\\}))" - }, - { - "name": "invalid.illegal.unrecognized-string-escape.zig", - "match": "\\\\." - } - ] - }, - "numbers": { - "patterns": [ - { - "name": "constant.numeric.hexfloat.zig", - "match": "\\b0x[0-9a-fA-F][0-9a-fA-F_]*(\\.[0-9a-fA-F][0-9a-fA-F_]*)?([pP][+-]?[0-9a-fA-F_]+)?\\b" - }, - { - "name": "constant.numeric.float.zig", - "match": "\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?([eE][+-]?[0-9_]+)?\\b" - }, - { - "name": "constant.numeric.decimal.zig", - "match": "\\b[0-9][0-9_]*\\b" - }, - { - "name": "constant.numeric.hexadecimal.zig", - "match": "\\b0x[a-fA-F0-9_]+\\b" - }, - { - "name": "constant.numeric.octal.zig", - "match": "\\b0o[0-7_]+\\b" - }, - { - "name": "constant.numeric.binary.zig", - "match": "\\b0b[01_]+\\b" - }, - { - "name": "constant.numeric.invalid.zig", - "match": "\\b[0-9](([eEpP][+-])|[0-9a-zA-Z_])*(\\.(([eEpP][+-])|[0-9a-zA-Z_])*)?([eEpP][+-])?[0-9a-zA-Z_]*\\b" - } - ] - }, - "support": { - "patterns": [ - { - "comment": "Built-in functions", - "name": "support.function.builtin.zig", - "match": "@[_a-zA-Z][_a-zA-Z0-9]*" - } - ] - } - } + "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json", + "name": "zig", + "scopeName": "source.zig", + "fileTypes": ["zig", "zon"], + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#strings" + }, + { + "include": "#keywords" + }, + { + "include": "#operators" + }, + { + "include": "#punctuation" + }, + { + "include": "#numbers" + }, + { + "include": "#support" + }, + { + "include": "#variables" + } + ], + "repository": { + "variables": { + "patterns": [ + { + "name": "meta.function.declaration.zig", + "patterns": [ + { + "match": "\\b(fn)\\s+([A-Z][a-zA-Z0-9]*)\\b", + "captures": { + "1": { + "name": "storage.type.function.zig" + }, + "2": { + "name": "entity.name.type.zig" + } + } + }, + { + "match": "\\b(fn)\\s+([_a-zA-Z][_a-zA-Z0-9]*)\\b", + "captures": { + "1": { + "name": "storage.type.function.zig" + }, + "2": { + "name": "entity.name.function.zig" + } + } + }, + { + "begin": "\\b(fn)\\s+@\"", + "end": "\"", + "name": "entity.name.function.string.zig", + "beginCaptures": { + "1": { + "name": "storage.type.function.zig" + } + }, + "patterns": [ + { + "include": "#stringcontent" + } + ] + }, + { + "name": "keyword.default.zig", + "match": "\\b(const|var|fn)\\b" + } + ] + }, + { + "name": "meta.function.call.zig", + "patterns": [ + { + "match": "([A-Z][a-zA-Z0-9]*)(?=\\s*\\()", + "name": "entity.name.type.zig" + }, + { + "match": "([_a-zA-Z][_a-zA-Z0-9]*)(?=\\s*\\()", + "name": "entity.name.function.zig" + } + ] + }, + { + "name": "meta.variable.zig", + "patterns": [ + { + "match": "\\b[_a-zA-Z][_a-zA-Z0-9]*\\b", + "name": "variable.zig" + }, + { + "begin": "@\"", + "end": "\"", + "name": "variable.string.zig", + "patterns": [ + { + "include": "#stringcontent" + } + ] + } + ] + } + ] + }, + "keywords": { + "patterns": [ + { + "match": "\\binline\\b(?!\\s*\\bfn\\b)", + "name": "keyword.control.repeat.zig" + }, + { + "match": "\\b(while|for)\\b", + "name": "keyword.control.repeat.zig" + }, + { + "name": "keyword.storage.zig", + "match": "\\b(extern|packed|export|pub|noalias|inline|comptime|volatile|align|linksection|threadlocal|allowzero|noinline|callconv|addrspace)\\b" + }, + { + "name": "keyword.structure.zig", + "match": "\\b(struct|enum|union|opaque)\\b" + }, + { + "name": "keyword.statement.zig", + "match": "\\b(asm|unreachable)\\b" + }, + { + "name": "keyword.control.flow.zig", + "match": "\\b(break|return|continue|defer|errdefer)\\b" + }, + { + "name": "keyword.control.async.zig", + "match": "\\b(resume|suspend|nosuspend)\\b" + }, + { + "name": "keyword.control.trycatch.zig", + "match": "\\b(try|catch)\\b" + }, + { + "name": "keyword.control.conditional.zig", + "match": "\\b(if|else|switch|orelse)\\b" + }, + { + "name": "keyword.constant.default.zig", + "match": "\\b(null|undefined)\\b" + }, + { + "name": "keyword.constant.bool.zig", + "match": "\\b(true|false)\\b" + }, + { + "name": "keyword.default.zig", + "match": "\\b(test|and|or)\\b" + }, + { + "name": "keyword.type.zig", + "match": "\\b(bool|void|noreturn|type|error|anyerror|anyframe|anytype|anyopaque)\\b" + }, + { + "name": "keyword.type.integer.zig", + "match": "\\b(f16|f32|f64|f80|f128|u\\d+|i\\d+|isize|usize|comptime_int|comptime_float)\\b" + }, + { + "name": "keyword.type.c.zig", + "match": "\\b(c_char|c_short|c_ushort|c_int|c_uint|c_long|c_ulong|c_longlong|c_ulonglong|c_longdouble)\\b" + } + ] + }, + "operators": { + "patterns": [ + { + "name": "keyword.operator.c-pointer.zig", + "match": "(?<=\\[)\\*c(?=\\])" + }, + { + "name": "keyword.operator.comparison.zig", + "match": "(\\b(and|or)\\b)|(==|!=|<=|>=|<|>)" + }, + { + "name": "keyword.operator.arithmetic.zig", + "match": "(-%?|\\+%?|\\*%?|/|%)=?" + }, + { + "name": "keyword.operator.bitwise.zig", + "match": "(<<%?|>>|!|~|&|\\^|\\|)=?" + }, + { + "name": "keyword.operator.special.zig", + "match": "(==|\\+\\+|\\*\\*|->)" + }, + { + "name": "keyword.operator.assignment.zig", + "match": "=" + }, + { + "name": "keyword.operator.question.zig", + "match": "\\?" + } + ] + }, + "comments": { + "patterns": [ + { + "name": "comment.line.documentation.zig", + "begin": "//[!/](?=[^/])", + "end": "$", + "patterns": [ + { + "include": "#commentContents" + } + ] + }, + { + "name": "comment.line.double-slash.zig", + "begin": "//", + "end": "$", + "patterns": [ + { + "include": "#commentContents" + } + ] + } + ] + }, + "commentContents": { + "patterns": [ + { + "match": "\\b(TODO|FIXME|XXX|NOTE)\\b:?", + "name": "keyword.todo.zig" + } + ] + }, + "punctuation": { + "patterns": [ + { + "name": "punctuation.accessor.zig", + "match": "\\." + }, + { + "name": "punctuation.comma.zig", + "match": "," + }, + { + "name": "punctuation.separator.key-value.zig", + "match": ":" + }, + { + "name": "punctuation.terminator.statement.zig", + "match": ";" + } + ] + }, + "strings": { + "patterns": [ + { + "name": "string.quoted.double.zig", + "begin": "\"", + "end": "\"", + "patterns": [ + { + "include": "#stringcontent" + } + ] + }, + { + "name": "string.multiline.zig", + "begin": "\\\\\\\\", + "end": "$" + }, + { + "name": "string.quoted.single.zig", + "match": "'([^'\\\\]|\\\\(x\\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.))'" + } + ] + }, + "stringcontent": { + "patterns": [ + { + "name": "constant.character.escape.zig", + "match": "\\\\([nrt'\"\\\\]|(x[0-9a-fA-F]{2})|(u\\{[0-9a-fA-F]+\\}))" + }, + { + "name": "invalid.illegal.unrecognized-string-escape.zig", + "match": "\\\\." + } + ] + }, + "numbers": { + "patterns": [ + { + "name": "constant.numeric.hexfloat.zig", + "match": "\\b0x[0-9a-fA-F][0-9a-fA-F_]*(\\.[0-9a-fA-F][0-9a-fA-F_]*)?([pP][+-]?[0-9a-fA-F_]+)?\\b" + }, + { + "name": "constant.numeric.float.zig", + "match": "\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?([eE][+-]?[0-9_]+)?\\b" + }, + { + "name": "constant.numeric.decimal.zig", + "match": "\\b[0-9][0-9_]*\\b" + }, + { + "name": "constant.numeric.hexadecimal.zig", + "match": "\\b0x[a-fA-F0-9_]+\\b" + }, + { + "name": "constant.numeric.octal.zig", + "match": "\\b0o[0-7_]+\\b" + }, + { + "name": "constant.numeric.binary.zig", + "match": "\\b0b[01_]+\\b" + }, + { + "name": "constant.numeric.invalid.zig", + "match": "\\b[0-9](([eEpP][+-])|[0-9a-zA-Z_])*(\\.(([eEpP][+-])|[0-9a-zA-Z_])*)?([eEpP][+-])?[0-9a-zA-Z_]*\\b" + } + ] + }, + "support": { + "patterns": [ + { + "comment": "Built-in functions", + "name": "support.function.builtin.zig", + "match": "@[_a-zA-Z][_a-zA-Z0-9]*" + } + ] + } + } } diff --git a/apps/ppp/src/monaco-vim.d.ts b/apps/ppp/src/monaco-vim.d.ts index 0d8bf75b..657e628d 100644 --- a/apps/ppp/src/monaco-vim.d.ts +++ b/apps/ppp/src/monaco-vim.d.ts @@ -2,84 +2,84 @@ // https://github.com/typehero/typehero/blob/main/packages/monaco/monaco-vim.d.ts declare module 'monaco-vim' { - import type * as monaco from 'monaco-editor'; + import type * as monaco from 'monaco-editor'; - export function initVimMode( - editor: monaco.editor.IStandaloneCodeEditor, - statusbarNode?: Element | null, - ): CMAdapter; + export function initVimMode( + editor: monaco.editor.IStandaloneCodeEditor, + statusbarNode?: Element | null + ): CMAdapter; - type VimModes = 'insert' | 'normal' | 'visual'; + type VimModes = 'insert' | 'normal' | 'visual'; - class CMAdapter { - /** removes the attached vim bindings */ - dispose(): void; + class CMAdapter { + /** removes the attached vim bindings */ + dispose(): void; - attached: boolean; + attached: boolean; - editor: monaco.editor.IStandaloneCodeEditor; + editor: monaco.editor.IStandaloneCodeEditor; - statusBar: { - clear(): void; - node: HTMLElement; - }; + statusBar: { + clear(): void; + node: HTMLElement; + }; - /** @see https://codemirror.net/5/doc/manual.html#vimapi */ - static Vim: { - map(lhs: string, rhs: string, ctx: VimModes): void; - unmap(lhs: string, ctx: VimModes | false): boolean; - noremap(lhs: string, rhs: string, ctx: VimModes): void; + /** @see https://codemirror.net/5/doc/manual.html#vimapi */ + static Vim: { + map(lhs: string, rhs: string, ctx: VimModes): void; + unmap(lhs: string, ctx: VimModes | false): boolean; + noremap(lhs: string, rhs: string, ctx: VimModes): void; - mapCommand( - keys: string, - type: 'action', - name: string, - args?: Record, - extra?: Record, - ): void; + mapCommand( + keys: string, + type: 'action', + name: string, + args?: Record, + extra?: Record + ): void; - defineAction( - name: string, - fn: ( - ctx: CMAdapter, - // TODO: Document other args - ...args: [unknown, unknown] - ) => void, - ): void; + defineAction( + name: string, + fn: ( + ctx: CMAdapter, + // TODO: Document other args + ...args: [unknown, unknown] + ) => void + ): void; - defineEx( - name: string, - prefix: string | undefined, - fn: ( - ctx: CMAdapter, - data: { - commandName: string; - input: string; - } & ( - | { - argString: string; - args: [string, ...string[]]; - } - | { argString?: never; args?: never } - ) & - ({ line: undefined } | { line: number; lineEnd: number }), - ) => void, - ): void; + defineEx( + name: string, + prefix: string | undefined, + fn: ( + ctx: CMAdapter, + data: { + commandName: string; + input: string; + } & ( + | { + argString: string; + args: [string, ...string[]]; + } + | { argString?: never; args?: never } + ) & + ({ line: undefined } | { line: number; lineEnd: number }) + ) => void + ): void; - /** clears user created mappings */ - mapclear(ctx?: VimModes): void; + /** clears user created mappings */ + mapclear(ctx?: VimModes): void; - /** call this before `VimMode.Vim.handleKey` */ - maybeInitVimState_(cma: CMAdapter): void; + /** call this before `VimMode.Vim.handleKey` */ + maybeInitVimState_(cma: CMAdapter): void; - /** - * calls an ex command, equivalent to `:` in vim - * - * *If it fails with `vim is null` call `VimMode.Vim.maybeInitVimState_` first* - */ - handleEx(cma: CMAdapter, ex: string): void; - }; - } + /** + * calls an ex command, equivalent to `:` in vim + * + * *If it fails with `vim is null` call `VimMode.Vim.maybeInitVimState_` first* + */ + handleEx(cma: CMAdapter, ex: string): void; + }; + } - export { CMAdapter as VimMode, type CMAdapter }; + export { CMAdapter as VimMode, type CMAdapter }; } diff --git a/apps/ppp/src/routes/(app)/editor/+page@.svelte b/apps/ppp/src/routes/(app)/editor/+page@.svelte index 234d1883..37733349 100644 --- a/apps/ppp/src/routes/(app)/editor/+page@.svelte +++ b/apps/ppp/src/routes/(app)/editor/+page@.svelte @@ -101,18 +101,18 @@ let executionTimeout = $state(executionTimeoutStorage.load()); debouncedSave(executionTimeoutStorage, () => executionTimeout, 100); - const inputModeStorage = createSyncStorage(localStorage, "editor-input-mode", InputMode.Line) - let inputMode = $state(inputModeStorage.load()) - immediateSave(inputModeStorage, () => inputMode) + const inputModeStorage = createSyncStorage(localStorage, 'editor-input-mode', InputMode.Line); + let inputMode = $state(inputModeStorage.load()); + immediateSave(inputModeStorage, () => inputMode); const { terminal, fitAddon } = createTerminal(); - let lastInput: ReadableStreamOfBytes | undefined + let lastInput: ReadableStreamOfBytes | undefined; const input = $derived.by(() => { - lastInput?.cancel() - return lastInput = createReadableStream(terminal).pipeThrough( + lastInput?.cancel(); + return (lastInput = createReadableStream(terminal).pipeThrough( (inputMode === InputMode.Line ? createLineInputMode : createRawInputMode)(terminal) - ) - }) + )); + }); const terminalLogger = createLogger(terminal); setEditorContext(new EditorContext(model, terminal, fitAddon)); @@ -133,7 +133,7 @@ }); const programCtx = createRecoverableContext(() => withCancel(compilerCtx.ref)); $effect(() => () => programCtx[Symbol.dispose]()); - + async function handleRun() { if (status === 'running') { // At the moment, programs do not know how to stop @@ -200,14 +200,12 @@ class="invisible group-hover:visible" /> {/snippet} - {#snippet children()} -
  • - - - GitHub - -
    • - {/snippet} +
  • + + + GitHub + +
    • @@ -229,8 +227,6 @@
    - - e.stopPropagation()}>
    diff --git a/apps/ppp/src/routes/(app)/editor/_program.js b/apps/ppp/src/routes/(app)/editor/_program.js index 184dfcc9..eb065f93 100644 --- a/apps/ppp/src/routes/(app)/editor/_program.js +++ b/apps/ppp/src/routes/(app)/editor/_program.js @@ -1 +1 @@ -console.log("Hello, World!"); +console.log('Hello, World!'); diff --git a/apps/ppp/src/routes/(app)/editor/_program.ts b/apps/ppp/src/routes/(app)/editor/_program.ts index 184dfcc9..eb065f93 100644 --- a/apps/ppp/src/routes/(app)/editor/_program.ts +++ b/apps/ppp/src/routes/(app)/editor/_program.ts @@ -1 +1 @@ -console.log("Hello, World!"); +console.log('Hello, World!'); diff --git a/apps/ppp/src/routes/(app)/problems/+page.svelte b/apps/ppp/src/routes/(app)/problems/+page.svelte index 829f1c74..3b71597f 100644 --- a/apps/ppp/src/routes/(app)/problems/+page.svelte +++ b/apps/ppp/src/routes/(app)/problems/+page.svelte @@ -2,18 +2,21 @@ import { getLocale } from '$lib/paraglide/runtime'; import type { ProblemMeta } from '$lib/problem'; - const problems = import.meta.glob('./\\[problem\\]/**/problem.ts', { eager: true, import: 'meta' }); + const problems = import.meta.glob('./\\[problem\\]/**/problem.ts', { + eager: true, + import: 'meta' + }); const lang = getLocale(); function getHref(path: string) { - const idx = path.lastIndexOf('/', path.length - 12) + 1 + const idx = path.lastIndexOf('/', path.length - 12) + 1; return `./${path.slice(idx, -10)}`; }
    - {#each Object.entries(problems) as [path, p]} + {#each Object.entries(problems) as [path, p] (path)} {p.titles[lang]} {/each}
    diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/+page@.svelte b/apps/ppp/src/routes/(app)/problems/[problem]/+page@.svelte index cc81ae47..c34b46d0 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/+page@.svelte +++ b/apps/ppp/src/routes/(app)/problems/[problem]/+page@.svelte @@ -1,7 +1,7 @@ {#if key} @@ -27,8 +29,8 @@ {/await} {:else} -
    +

    {m.problem_name_not_found({ name: page.params.problem! })}

    - {m.back_to_problems()} + {m.back_to_problems()}
    {/if} diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/reference.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/reference.ts index e90e5191..322112b1 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/reference.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/reference.ts @@ -1,36 +1,31 @@ export const enum PaymentSystemType { - PayPal = "paypal", - WebMoney = "webmoney", - CatBank = "cat-bank", + PayPal = 'paypal', + WebMoney = 'webmoney', + CatBank = 'cat-bank' } interface PaymentSystem { - payment(amount: number): number; - payout(amount: number): number; + payment(amount: number): number; + payout(amount: number): number; } type PaymentSystemFactory = (base: number) => PaymentSystem; -const paymentSystemFactories: Record = - { - [PaymentSystemType.PayPal]: (base) => ({ - payment: (amount: number) => base + amount, - payout: (amount: number) => base - amount, - }), - [PaymentSystemType.WebMoney]: (base) => ({ - payment: (amount: number) => base + 2 * amount, - payout: (amount: number) => base - 2 * amount, - }), - [PaymentSystemType.CatBank]: (base) => ({ - payment: (amount: number) => base * amount, - payout: (amount: number) => base / amount, - }), - }; +const paymentSystemFactories: Record = { + [PaymentSystemType.PayPal]: (base) => ({ + payment: (amount: number) => base + amount, + payout: (amount: number) => base - amount + }), + [PaymentSystemType.WebMoney]: (base) => ({ + payment: (amount: number) => base + 2 * amount, + payout: (amount: number) => base - 2 * amount + }), + [PaymentSystemType.CatBank]: (base) => ({ + payment: (amount: number) => base * amount, + payout: (amount: number) => base / amount + }) +}; -export function payment( - type: PaymentSystemType, - base: number, - amount: number -): number { - return paymentSystemFactories[type](base).payment(amount); +export function payment(type: PaymentSystemType, base: number, amount: number): number { + return paymentSystemFactories[type](base).payment(amount); } diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/csharp/index.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/csharp/index.ts index 56a1383b..4385afbe 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/csharp/index.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/csharp/index.ts @@ -1,2 +1,2 @@ -export { default as code } from "./code.cs?raw"; -export { factory } from "./factory"; +export { default as code } from './code.cs?raw'; +export { factory } from './factory'; diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/gleam/index.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/gleam/index.ts index 542a0425..fed002bb 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/gleam/index.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/gleam/index.ts @@ -1,2 +1,2 @@ -export { default as code } from "./code.gleam?raw"; -export { factory } from "./factory"; +export { default as code } from './code.gleam?raw'; +export { factory } from './factory'; diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/go/index.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/go/index.ts index 59b4c244..6ea53fd3 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/go/index.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/go/index.ts @@ -1,2 +1,2 @@ -export { default as code } from "./code.go?raw"; -export { factory } from "./factory"; +export { default as code } from './code.go?raw'; +export { factory } from './factory'; diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/java/factory.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/java/factory.ts index 38aea4e1..7079df47 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/java/factory.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/java/factory.ts @@ -32,12 +32,12 @@ export const factory: TestCompilerFactory ({ - // @ts-expect-error TODO: import thread type - 'getSystemType()Ljava/lang/String;': (t) => - util.initString(t.getBsCl(), JAVA_PAYMENT_SYSTEM_TYPES[input.paymentSystem]), + 'getSystemType()Ljava/lang/String;': (t: { + getBsCl(): Parameters[0]; + }) => util.initString(t.getBsCl(), JAVA_PAYMENT_SYSTEM_TYPES[input.paymentSystem]), 'getBase()I': () => input.base, 'getAmount()I': () => input.amount, - 'saveResult(I)V': (_: unknown, result: number) => save(result) + 'saveResult(I)V': (_: never, result: number) => save(result) }) }); } diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/java/index.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/java/index.ts index 045c9fca..3418aedb 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/java/index.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/java/index.ts @@ -1,2 +1,2 @@ -export { default as code } from "./code.java?raw"; -export { factory } from "./factory" +export { default as code } from './code.java?raw'; +export { factory } from './factory'; diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/javascript/code.js b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/javascript/code.js index 154770c0..deca24d7 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/javascript/code.js +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/javascript/code.js @@ -1,15 +1,9 @@ const PAYMENT_SYSTEM_TYPE = { - PAYPAL: "paypal", - WEBMONEY: "webmoney", - CAT_BANK: "cat-bank", + PAYPAL: 'paypal', + WEBMONEY: 'webmoney', + CAT_BANK: 'cat-bank' }; - - - - - - export function payment(type, base, amount) { - throw new Error("Not implemented"); + throw new Error('Not implemented'); } diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/javascript/index.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/javascript/index.ts index 4c257eab..28594d5b 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/javascript/index.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/javascript/index.ts @@ -1,2 +1,2 @@ -export { default as code } from "./code.js?raw"; -export { factory } from "./factory"; +export { default as code } from './code.js?raw'; +export { factory } from './factory'; diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/php/index.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/php/index.ts index c3f3c925..09d6c086 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/php/index.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/php/index.ts @@ -1,2 +1,2 @@ -export { default as code } from "./code.php?raw"; -export { factory } from "./factory"; +export { default as code } from './code.php?raw'; +export { factory } from './factory'; diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/python/index.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/python/index.ts index 58996f17..5001b4ea 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/python/index.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/python/index.ts @@ -1,2 +1,2 @@ -export { default as code } from "./code.py?raw"; -export { factory } from "./factory"; +export { default as code } from './code.py?raw'; +export { factory } from './factory'; diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/ruby/index.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/ruby/index.ts index 2bda17c6..378f80c0 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/ruby/index.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/ruby/index.ts @@ -1,2 +1,2 @@ -export { default as code } from "./code.rb?raw"; -export { factory } from "./factory" +export { default as code } from './code.rb?raw'; +export { factory } from './factory'; diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/rust/index.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/rust/index.ts index 4da80781..fe6cfa05 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/rust/index.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/rust/index.ts @@ -1,2 +1,2 @@ -export { default as code } from "./code.rs?raw"; -export { factory } from "./factory"; +export { default as code } from './code.rs?raw'; +export { factory } from './factory'; diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/typescript/code.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/typescript/code.ts index 3290b6fb..79bb30d8 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/typescript/code.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/typescript/code.ts @@ -1,19 +1,9 @@ const enum PaymentSystemType { - PayPal = "paypal", - WebMoney = "webmoney", - CatBank = "cat-bank", + PayPal = 'paypal', + WebMoney = 'webmoney', + CatBank = 'cat-bank' } - - - - - - -export function payment( - type: PaymentSystemType, - base: number, - amount: number -): number { - throw new Error("Not implemented"); +export function payment(type: PaymentSystemType, base: number, amount: number): number { + throw new Error('Not implemented'); } diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/typescript/index.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/typescript/index.ts index ba0679d6..ab6c32cf 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/typescript/index.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/runtimes/typescript/index.ts @@ -1,2 +1,2 @@ -export { default as code } from "./code.ts?raw"; -export { factory } from "./factory"; +export { default as code } from './code.ts?raw'; +export { factory } from './factory'; diff --git a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/tests-data.ts b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/tests-data.ts index 33e9ecef..b3faf936 100644 --- a/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/tests-data.ts +++ b/apps/ppp/src/routes/(app)/problems/[problem]/design-patterns/factory/payment-system/tests-data.ts @@ -1,31 +1,29 @@ -import { testCase } from "libs/testing"; +import { testCase } from 'libs/testing'; -import { PaymentSystemType, payment } from "./reference"; +import { PaymentSystemType, payment } from './reference'; export interface Input { - paymentSystem: PaymentSystemType; - base: number; - amount: number; + paymentSystem: PaymentSystemType; + base: number; + amount: number; } export type Output = number; export const testCases = [ - { - paymentSystem: PaymentSystemType.PayPal, - base: 1, - amount: 1, - }, - { - paymentSystem: PaymentSystemType.WebMoney, - base: 1, - amount: 1, - }, - { - paymentSystem: PaymentSystemType.CatBank, - base: 1, - amount: 1, - }, -].map( - testCase((input) => payment(input.paymentSystem, input.base, input.amount)) -); + { + paymentSystem: PaymentSystemType.PayPal, + base: 1, + amount: 1 + }, + { + paymentSystem: PaymentSystemType.WebMoney, + base: 1, + amount: 1 + }, + { + paymentSystem: PaymentSystemType.CatBank, + base: 1, + amount: 1 + } +].map(testCase((input) => payment(input.paymentSystem, input.base, input.amount))); diff --git a/apps/ppp/src/routes/+layout.svelte b/apps/ppp/src/routes/+layout.svelte index ad3f2cc5..0372ac59 100644 --- a/apps/ppp/src/routes/+layout.svelte +++ b/apps/ppp/src/routes/+layout.svelte @@ -16,11 +16,12 @@ + src="https://ppp.counter.x0k.dev/count.js" + >
    - {#each locales as locale} + {#each locales as locale (locale)} {locale} {/each}
    diff --git a/apps/ppp/src/routes/layout.css b/apps/ppp/src/routes/layout.css index d6b892c7..26048028 100644 --- a/apps/ppp/src/routes/layout.css +++ b/apps/ppp/src/routes/layout.css @@ -1,10 +1,10 @@ @import 'tailwindcss'; @plugin '@tailwindcss/typography'; -@plugin "daisyui" { - themes: business --default; +@plugin 'daisyui' { + themes: business --default; } -@plugin "daisyui/theme" { - name: "business"; - default: true; - --color-base-100: oklch(28% 0 0); +@plugin 'daisyui/theme' { + name: 'business'; + default: true; + --color-base-100: oklch(28% 0 0); } diff --git a/apps/ppp/svelte.config.js b/apps/ppp/svelte.config.js deleted file mode 100644 index a5123e7b..00000000 --- a/apps/ppp/svelte.config.js +++ /dev/null @@ -1,30 +0,0 @@ -import adapter from '@sveltejs/adapter-static'; -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'; - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - // Consult https://svelte.dev/docs/kit/integrations - // for more information about preprocessors - preprocess: vitePreprocess(), - kit: { - adapter: adapter({ - fallback: '404.html', - pages: 'dist' - }), - paths: { - base: process.argv.includes('dev') ? '' : process.env.BASE_PATH, - relative: false - }, - typescript: { - config: (config) => { - config.exclude.push( - '../src/lib/assets/**', - '../src/routes/(app)/problems/**/runtimes/*/code.*' - ); - return config; - } - } - } -}; - -export default config; diff --git a/apps/ppp/tsconfig.json b/apps/ppp/tsconfig.json index 5d2b5716..a5956418 100644 --- a/apps/ppp/tsconfig.json +++ b/apps/ppp/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./.svelte-kit/tsconfig.json", + "extends": "$app/tsconfig", "compilerOptions": { "allowImportingTsExtensions": true, "allowJs": true, @@ -10,11 +10,12 @@ "skipLibCheck": true, "sourceMap": true, "strict": true, - "moduleResolution": "bundler" - } - // Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias - // except $lib which is handled by https://svelte.dev/docs/kit/configuration#files - // - // To make changes to top-level options such as include and exclude, we recommend extending - // the generated config; see https://svelte.dev/docs/kit/configuration#typescript + "moduleResolution": "bundler", + "paths": { + "$lib": ["./src/lib"], + "$lib/*": ["./src/lib/*"] + } + }, + "include": ["src/**/*.ts", "src/**/*.js", "src/**/*.svelte", "*.d.ts"], + "exclude": ["src/lib/assets/**", "src/routes/(app)/problems/**/runtimes/*/code.*"] } diff --git a/apps/ppp/vite.config.ts b/apps/ppp/vite.config.ts index b155f10e..4dd6cfda 100644 --- a/apps/ppp/vite.config.ts +++ b/apps/ppp/vite.config.ts @@ -7,6 +7,8 @@ import { sveltekit } from '@sveltejs/kit/vite'; import { viteStaticCopy } from 'vite-plugin-static-copy'; import Icons from 'unplugin-icons/vite'; import { DEV } from 'esm-env'; +import adapter from '@sveltejs/adapter-static'; +import { resolve } from 'path'; const base = DEV ? undefined : process.env.BASE_PATH?.slice(1); @@ -14,6 +16,14 @@ export default defineConfig({ worker: { format: 'es' }, + resolve: { + alias: { + $lib: resolve(import.meta.dirname, 'src/lib'), + // monaco 0.56 added a strict exports map that doesn't match + // subpath imports with vite's ?worker query suffix + 'monaco-editor/esm/vs': resolve(import.meta.dirname, 'node_modules/monaco-editor/esm/vs') + } + }, esbuild: { target: 'es2022' }, @@ -32,7 +42,18 @@ export default defineConfig({ assetsInclude: ['**/*.wasm', '**/*.zip', '**/*.rlib', '**/*.so'], plugins: [ tailwindcss(), - sveltekit(), + sveltekit({ + adapter: adapter({ + fallback: '404.html', + pages: 'dist' + }), + paths: { + base: process.argv.includes('dev') + ? '' + : (process.env.BASE_PATH as `/${string}` | undefined), + relative: false + } + }), Icons({ compiler: 'svelte' }), devtoolsJson(), paraglideVitePlugin({ @@ -62,6 +83,13 @@ export default defineConfig({ src: 'node_modules/dotnet-runtime/dist/compiler', dest: 'assets/dotnet', rename: { stripBase: 4 } + }, + { + // pyodide 314 eagerly fetches `${indexURL}pyodide.asm.wasm` itself, + // so the wasm must be available at a stable (non-hashed) path + src: 'node_modules/python-runtime/dist/pyodide', + dest: 'assets/pyodide', + rename: { stripBase: 4 } } ] }) diff --git a/mkfile b/mkfile index ca6c48ac..b75e3264 100644 --- a/mkfile +++ b/mkfile @@ -14,6 +14,9 @@ b: p: pnpm run preview +fmt: + pnpm run format + artifacts: */artifacts libs/: diff --git a/package.json b/package.json index 1ad4ffe5..011576de 100644 --- a/package.json +++ b/package.json @@ -1,31 +1,35 @@ { - "name": "root", - "version": "0.0.0", - "author": "Krasilnikov Roman", - "private": true, - "type": "module", - "packageManager": "pnpm@10.28.0", - "scripts": { - "preinstall": "npx only-allow pnpm", - "build": "turbo run build", - "dev": "turbo run dev", - "check": "turbo run check", - "preview": "turbo run preview" - }, - "devDependencies": { - "@total-typescript/tsconfig": "^1.0.4", - "only-allow": "^1.2.2", - "turbo": "^2.9.6", - "typescript": "^5.9.3" - }, - "pnpm": { - "patchedDependencies": { - "browserfs@1.4.3": "patches/browserfs@1.4.3.patch", - "doppiojvm@0.5.0": "patches/doppiojvm@0.5.0.patch" - }, - "onlyBuiltDependencies": [ - "esbuild", - "@tailwindcss/oxide" - ] - } -} \ No newline at end of file + "name": "root", + "version": "0.0.0", + "author": "Krasilnikov Roman", + "private": true, + "type": "module", + "packageManager": "pnpm@10.28.0", + "scripts": { + "preinstall": "npx only-allow pnpm", + "build": "turbo run build", + "dev": "turbo run dev", + "check": "turbo run check", + "preview": "turbo run preview", + "format": "turbo run format", + "format:check": "turbo run format:check" + }, + "devDependencies": { + "@total-typescript/tsconfig": "^1.0.4", + "@typescript/typescript6": "^6.0.2", + "only-allow": "^1.2.2", + "oxfmt": "^0.64.0", + "turbo": "^2.10.11", + "typescript": "^6.0.3" + }, + "pnpm": { + "patchedDependencies": { + "browserfs@1.4.3": "patches/browserfs@1.4.3.patch", + "doppiojvm@0.5.0": "patches/doppiojvm@0.5.0.patch" + }, + "onlyBuiltDependencies": [ + "esbuild", + "@tailwindcss/oxide" + ] + } +} diff --git a/packages/dotnet-runtime/compiler/Properties/launchSettings.json b/packages/dotnet-runtime/compiler/Properties/launchSettings.json index 3c596f2a..d7394ccc 100644 --- a/packages/dotnet-runtime/compiler/Properties/launchSettings.json +++ b/packages/dotnet-runtime/compiler/Properties/launchSettings.json @@ -1,13 +1,13 @@ -{ - "profiles": { - "compiler": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:7247;http://localhost:5203", - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - } - } -} +{ + "profiles": { + "compiler": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:7247;http://localhost:5203", + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}" + } + } +} diff --git a/packages/dotnet-runtime/compiler/runtimeconfig.template.json b/packages/dotnet-runtime/compiler/runtimeconfig.template.json index 2fa631c7..a547d54a 100644 --- a/packages/dotnet-runtime/compiler/runtimeconfig.template.json +++ b/packages/dotnet-runtime/compiler/runtimeconfig.template.json @@ -1,13 +1,11 @@ { - "wasmHostProperties": { - "perHostConfig": [ - { - "name": "browser", - "host": "browser", - "assemblies": [ - "System.Text.Json.dll" - ] - } - ] - } -} \ No newline at end of file + "wasmHostProperties": { + "perHostConfig": [ + { + "name": "browser", + "host": "browser", + "assemblies": ["System.Text.Json.dll"] + } + ] + } +} diff --git a/packages/dotnet-runtime/package.json b/packages/dotnet-runtime/package.json index a979faff..7f7389c6 100644 --- a/packages/dotnet-runtime/package.json +++ b/packages/dotnet-runtime/package.json @@ -1,25 +1,27 @@ { - "name": "dotnet-runtime", - "private": true, - "version": "1.0.0", - "type": "module", - "scripts": { - "check": "tsc", - "prebuild": "./artifacts.sh", - "build": "vite build" - }, - "dependencies": { - "libs": "workspace:*" - }, - "devDependencies": { - "vite": "catalog:", - "vite-plugin-dts": "catalog:", - "vite-plugin-static-copy": "catalog:" - }, - "exports": { - ".": "./dist/index.js", - "./version": "./dist/version.js", - "./compiler/*": "./dist/compiler/*", - "./lib/*": "./dist/lib/*" - } -} \ No newline at end of file + "name": "dotnet-runtime", + "version": "1.0.0", + "private": true, + "type": "module", + "exports": { + ".": "./dist/index.js", + "./version": "./dist/version.js", + "./compiler/*": "./dist/compiler/*", + "./lib/*": "./dist/lib/*" + }, + "scripts": { + "check": "tsc", + "prebuild": "./artifacts.sh", + "build": "vite build", + "format": "oxfmt", + "format:check": "oxfmt --check ." + }, + "dependencies": { + "libs": "workspace:*" + }, + "devDependencies": { + "vite": "catalog:", + "vite-plugin-dts": "catalog:", + "vite-plugin-static-copy": "catalog:" + } +} diff --git a/packages/dotnet-runtime/probe/index.html b/packages/dotnet-runtime/probe/index.html index fb13b6e0..5d9cd9bd 100644 --- a/packages/dotnet-runtime/probe/index.html +++ b/packages/dotnet-runtime/probe/index.html @@ -1,11 +1,11 @@ - + - - - - Dotnet probe - - - - - \ No newline at end of file + + + + Dotnet probe + + + + + diff --git a/packages/dotnet-runtime/probe/index.js b/packages/dotnet-runtime/probe/index.js index e6fecdad..c20bbe1a 100644 --- a/packages/dotnet-runtime/probe/index.js +++ b/packages/dotnet-runtime/probe/index.js @@ -1,5 +1,5 @@ -const worker = new Worker(new URL("./worker.js", import.meta.url), { - type: "module" +const worker = new Worker(new URL('./worker.js', import.meta.url), { + type: 'module' }); -worker.postMessage("start") +worker.postMessage('start'); diff --git a/packages/dotnet-runtime/probe/worker.js b/packages/dotnet-runtime/probe/worker.js index 4e6767f6..b88efce2 100644 --- a/packages/dotnet-runtime/probe/worker.js +++ b/packages/dotnet-runtime/probe/worker.js @@ -1,252 +1,249 @@ -import { dotnet } from "./compiler/dotnet.js"; +import { dotnet } from './compiler/dotnet.js'; export function createCachedFetch(cache) { - return async (url) => { - const request = new Request(url); - const cached = await cache.match(request); - if (cached) { - return cached.clone(); - } - const response = await fetch(request); - if (response.ok && response.type === "basic") { - cache.put(request, response.clone()); - } - return response; - }; + return async (url) => { + const request = new Request(url); + const cached = await cache.match(request); + if (cached) { + return cached.clone(); + } + const response = await fetch(request); + if (response.ok && response.type === 'basic') { + cache.put(request, response.clone()); + } + return response; + }; } onmessage = async (e) => { - console.log("Message received from main script", e); + console.log('Message received from main script', e); - const { setModuleImports, getAssemblyExports, getConfig } = - await dotnet.create(); + const { setModuleImports, getAssemblyExports, getConfig } = await dotnet.create(); - const load = createCachedFetch(await caches.open("dotnet-cache")); + const load = createCachedFetch(await caches.open('dotnet-cache')); - let bytes; - setModuleImports("main.js", { - logger: { - debug: (msg) => console.log(msg), - info: (msg) => console.info(msg), - warn: (msg) => console.warn(msg), - error: (msg) => console.error(msg), - }, - loader: { - load: (url) => - load(url) - .then((r) => r.bytes()) - .then( - (data) => { - bytes = data; - return 0; - }, - () => 1 - ), - getResult: () => bytes, - }, - }); + let bytes; + setModuleImports('main.js', { + logger: { + debug: (msg) => console.log(msg), + info: (msg) => console.info(msg), + warn: (msg) => console.warn(msg), + error: (msg) => console.error(msg) + }, + loader: { + load: (url) => + load(url) + .then((r) => r.bytes()) + .then( + (data) => { + bytes = data; + return 0; + }, + () => 1 + ), + getResult: () => bytes + } + }); - const config = getConfig(); - const exports = await getAssemblyExports(config.mainAssemblyName); + const config = getConfig(); + const exports = await getAssemblyExports(config.mainAssemblyName); - const libs = [ - "Humanizer.dll", - "Microsoft.Bcl.AsyncInterfaces.dll", - "Microsoft.CSharp.dll", - // "Microsoft.CodeAnalysis.CSharp.Workspaces.dll", - // "Microsoft.CodeAnalysis.CSharp.dll", - // "Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll", - // "Microsoft.CodeAnalysis.VisualBasic.dll", - // "Microsoft.CodeAnalysis.Workspaces.dll", - // "Microsoft.CodeAnalysis.dll", - // "Microsoft.JSInterop.WebAssembly.dll", - // "Microsoft.JSInterop.dll", - // "Microsoft.VisualBasic.Core.dll", - // "Microsoft.VisualBasic.dll", - // "Microsoft.Win32.Primitives.dll", - // "Microsoft.Win32.Registry.dll", - "System.AppContext.dll", - "System.Buffers.dll", - "System.Collections.Concurrent.dll", - "System.Collections.Immutable.dll", - "System.Collections.NonGeneric.dll", - "System.Collections.Specialized.dll", - "System.Collections.dll", - // "System.ComponentModel.Annotations.dll", - // "System.ComponentModel.DataAnnotations.dll", - // "System.ComponentModel.EventBasedAsync.dll", - // "System.ComponentModel.Primitives.dll", - // "System.ComponentModel.TypeConverter.dll", - // "System.ComponentModel.dll", - // "System.Composition.AttributedModel.dll", - // "System.Composition.Convention.dll", - // "System.Composition.Hosting.dll", - // "System.Composition.Runtime.dll", - // "System.Composition.TypedParts.dll", - // "System.Configuration.dll", - "System.Console.dll", - "System.Core.dll", - // "System.Data.Common.dll", - // "System.Data.DataSetExtensions.dll", - // "System.Data.dll", - // "System.Diagnostics.Contracts.dll", - "System.Diagnostics.Debug.dll", - // "System.Diagnostics.DiagnosticSource.dll", - // "System.Diagnostics.FileVersionInfo.dll", - // "System.Diagnostics.Process.dll", - // "System.Diagnostics.StackTrace.dll", - // "System.Diagnostics.TextWriterTraceListener.dll", - // "System.Diagnostics.Tools.dll", - // "System.Diagnostics.TraceSource.dll", - // "System.Diagnostics.Tracing.dll", - // "System.Drawing.Primitives.dll", - // "System.Drawing.dll", - // "System.Dynamic.Runtime.dll", - // "System.Formats.Asn1.dll", - // "System.Formats.Tar.dll", - "System.Globalization.Calendars.dll", - "System.Globalization.Extensions.dll", - "System.Globalization.dll", - // "System.IO.Compression.Brotli.dll", - // "System.IO.Compression.FileSystem.dll", - // "System.IO.Compression.ZipFile.dll", - // "System.IO.Compression.dll", - // "System.IO.FileSystem.AccessControl.dll", - // "System.IO.FileSystem.DriveInfo.dll", - // "System.IO.FileSystem.Primitives.dll", - // "System.IO.FileSystem.Watcher.dll", - "System.IO.FileSystem.dll", - // "System.IO.IsolatedStorage.dll", - // "System.IO.MemoryMappedFiles.dll", - // "System.IO.Pipelines.dll", - // "System.IO.Pipes.AccessControl.dll", - // "System.IO.Pipes.dll", - "System.IO.UnmanagedMemoryStream.dll", - "System.IO.dll", - "System.Linq.Expressions.dll", - "System.Linq.Parallel.dll", - "System.Linq.Queryable.dll", - "System.Linq.dll", - "System.Memory.dll", - "System.Net.Http.Json.dll", - "System.Net.Http.dll", - "System.Net.HttpListener.dll", - // "System.Net.Mail.dll", - "System.Net.NameResolution.dll", - "System.Net.NetworkInformation.dll", - // "System.Net.Ping.dll", - "System.Net.Primitives.dll", - // "System.Net.Quic.dll", - "System.Net.Requests.dll", - // "System.Net.Security.dll", - // "System.Net.ServicePoint.dll", - "System.Net.Sockets.dll", - "System.Net.WebClient.dll", - "System.Net.WebHeaderCollection.dll", - // "System.Net.WebProxy.dll", - // "System.Net.WebSockets.Client.dll", - // "System.Net.WebSockets.dll", - "System.Net.dll", - "System.Numerics.Vectors.dll", - "System.Numerics.dll", - "System.ObjectModel.dll", - "System.Private.CoreLib.dll", - // "System.Private.DataContractSerialization.dll", - "System.Private.Uri.dll", - // "System.Private.Xml.Linq.dll", - // "System.Private.Xml.dll", - // "System.Reflection.DispatchProxy.dll", - // "System.Reflection.Emit.ILGeneration.dll", - // "System.Reflection.Emit.Lightweight.dll", - // "System.Reflection.Emit.dll", - // "System.Reflection.Extensions.dll", - // "System.Reflection.Metadata.dll", - // "System.Reflection.Primitives.dll", - // "System.Reflection.TypeExtensions.dll", - "System.Reflection.dll", - "System.Resources.Reader.dll", - "System.Resources.ResourceManager.dll", - "System.Resources.Writer.dll", - // "System.Runtime.CompilerServices.Unsafe.dll", - // "System.Runtime.CompilerServices.VisualC.dll", - "System.Runtime.Extensions.dll", - "System.Runtime.Handles.dll", - // "System.Runtime.InteropServices.JavaScript.dll", - "System.Runtime.InteropServices.RuntimeInformation.dll", - "System.Runtime.InteropServices.dll", - // "System.Runtime.Intrinsics.dll", - // "System.Runtime.Loader.dll", - // "System.Runtime.Numerics.dll", - // "System.Runtime.Serialization.Formatters.dll", - // "System.Runtime.Serialization.Json.dll", - // "System.Runtime.Serialization.Primitives.dll", - // "System.Runtime.Serialization.Xml.dll", - // "System.Runtime.Serialization.dll", - "System.Runtime.dll", - // "System.Security.AccessControl.dll", - // "System.Security.Claims.dll", - // "System.Security.Cryptography.Algorithms.dll", - // "System.Security.Cryptography.Cng.dll", - // "System.Security.Cryptography.Csp.dll", - // "System.Security.Cryptography.Encoding.dll", - // "System.Security.Cryptography.OpenSsl.dll", - // "System.Security.Cryptography.Primitives.dll", - // "System.Security.Cryptography.X509Certificates.dll", - // "System.Security.Cryptography.dll", - // "System.Security.Principal.Windows.dll", - "System.Security.Principal.dll", - "System.Security.SecureString.dll", - "System.Security.dll", - // "System.ServiceModel.Web.dll", - // "System.ServiceProcess.dll", - // "System.Text.Encoding.CodePages.dll", - "System.Text.Encoding.Extensions.dll", - "System.Text.Encoding.dll", - "System.Text.Encodings.Web.dll", - "System.Text.Json.dll", - "System.Text.RegularExpressions.dll", - // "System.Threading.Channels.dll", - // "System.Threading.Overlapped.dll", - // "System.Threading.Tasks.Dataflow.dll", - "System.Threading.Tasks.Extensions.dll", - "System.Threading.Tasks.Parallel.dll", - "System.Threading.Tasks.dll", - "System.Threading.Thread.dll", - "System.Threading.ThreadPool.dll", - "System.Threading.Timer.dll", - "System.Threading.dll", - // "System.Transactions.Local.dll", - "System.Transactions.dll", - "System.ValueTuple.dll", - "System.Web.HttpUtility.dll", - // "System.Web.dll", - // "System.Windows.dll", - // "System.Xml.Linq.dll", - // "System.Xml.ReaderWriter.dll", - // "System.Xml.Serialization.dll", - // "System.Xml.XDocument.dll", - // "System.Xml.XPath.XDocument.dll", - // "System.Xml.XPath.dll", - // "System.Xml.XmlDocument.dll", - // "System.Xml.XmlSerializer.dll", - // "System.Xml.dll", - "System.dll", - "WebAssembly.dll", - // "WindowsBase.dll", - "compiler.dll", - "mscorlib.dll", - "netstandard.dll", - ]; + const libs = [ + 'Humanizer.dll', + 'Microsoft.Bcl.AsyncInterfaces.dll', + 'Microsoft.CSharp.dll', + // "Microsoft.CodeAnalysis.CSharp.Workspaces.dll", + // "Microsoft.CodeAnalysis.CSharp.dll", + // "Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll", + // "Microsoft.CodeAnalysis.VisualBasic.dll", + // "Microsoft.CodeAnalysis.Workspaces.dll", + // "Microsoft.CodeAnalysis.dll", + // "Microsoft.JSInterop.WebAssembly.dll", + // "Microsoft.JSInterop.dll", + // "Microsoft.VisualBasic.Core.dll", + // "Microsoft.VisualBasic.dll", + // "Microsoft.Win32.Primitives.dll", + // "Microsoft.Win32.Registry.dll", + 'System.AppContext.dll', + 'System.Buffers.dll', + 'System.Collections.Concurrent.dll', + 'System.Collections.Immutable.dll', + 'System.Collections.NonGeneric.dll', + 'System.Collections.Specialized.dll', + 'System.Collections.dll', + // "System.ComponentModel.Annotations.dll", + // "System.ComponentModel.DataAnnotations.dll", + // "System.ComponentModel.EventBasedAsync.dll", + // "System.ComponentModel.Primitives.dll", + // "System.ComponentModel.TypeConverter.dll", + // "System.ComponentModel.dll", + // "System.Composition.AttributedModel.dll", + // "System.Composition.Convention.dll", + // "System.Composition.Hosting.dll", + // "System.Composition.Runtime.dll", + // "System.Composition.TypedParts.dll", + // "System.Configuration.dll", + 'System.Console.dll', + 'System.Core.dll', + // "System.Data.Common.dll", + // "System.Data.DataSetExtensions.dll", + // "System.Data.dll", + // "System.Diagnostics.Contracts.dll", + 'System.Diagnostics.Debug.dll', + // "System.Diagnostics.DiagnosticSource.dll", + // "System.Diagnostics.FileVersionInfo.dll", + // "System.Diagnostics.Process.dll", + // "System.Diagnostics.StackTrace.dll", + // "System.Diagnostics.TextWriterTraceListener.dll", + // "System.Diagnostics.Tools.dll", + // "System.Diagnostics.TraceSource.dll", + // "System.Diagnostics.Tracing.dll", + // "System.Drawing.Primitives.dll", + // "System.Drawing.dll", + // "System.Dynamic.Runtime.dll", + // "System.Formats.Asn1.dll", + // "System.Formats.Tar.dll", + 'System.Globalization.Calendars.dll', + 'System.Globalization.Extensions.dll', + 'System.Globalization.dll', + // "System.IO.Compression.Brotli.dll", + // "System.IO.Compression.FileSystem.dll", + // "System.IO.Compression.ZipFile.dll", + // "System.IO.Compression.dll", + // "System.IO.FileSystem.AccessControl.dll", + // "System.IO.FileSystem.DriveInfo.dll", + // "System.IO.FileSystem.Primitives.dll", + // "System.IO.FileSystem.Watcher.dll", + 'System.IO.FileSystem.dll', + // "System.IO.IsolatedStorage.dll", + // "System.IO.MemoryMappedFiles.dll", + // "System.IO.Pipelines.dll", + // "System.IO.Pipes.AccessControl.dll", + // "System.IO.Pipes.dll", + 'System.IO.UnmanagedMemoryStream.dll', + 'System.IO.dll', + 'System.Linq.Expressions.dll', + 'System.Linq.Parallel.dll', + 'System.Linq.Queryable.dll', + 'System.Linq.dll', + 'System.Memory.dll', + 'System.Net.Http.Json.dll', + 'System.Net.Http.dll', + 'System.Net.HttpListener.dll', + // "System.Net.Mail.dll", + 'System.Net.NameResolution.dll', + 'System.Net.NetworkInformation.dll', + // "System.Net.Ping.dll", + 'System.Net.Primitives.dll', + // "System.Net.Quic.dll", + 'System.Net.Requests.dll', + // "System.Net.Security.dll", + // "System.Net.ServicePoint.dll", + 'System.Net.Sockets.dll', + 'System.Net.WebClient.dll', + 'System.Net.WebHeaderCollection.dll', + // "System.Net.WebProxy.dll", + // "System.Net.WebSockets.Client.dll", + // "System.Net.WebSockets.dll", + 'System.Net.dll', + 'System.Numerics.Vectors.dll', + 'System.Numerics.dll', + 'System.ObjectModel.dll', + 'System.Private.CoreLib.dll', + // "System.Private.DataContractSerialization.dll", + 'System.Private.Uri.dll', + // "System.Private.Xml.Linq.dll", + // "System.Private.Xml.dll", + // "System.Reflection.DispatchProxy.dll", + // "System.Reflection.Emit.ILGeneration.dll", + // "System.Reflection.Emit.Lightweight.dll", + // "System.Reflection.Emit.dll", + // "System.Reflection.Extensions.dll", + // "System.Reflection.Metadata.dll", + // "System.Reflection.Primitives.dll", + // "System.Reflection.TypeExtensions.dll", + 'System.Reflection.dll', + 'System.Resources.Reader.dll', + 'System.Resources.ResourceManager.dll', + 'System.Resources.Writer.dll', + // "System.Runtime.CompilerServices.Unsafe.dll", + // "System.Runtime.CompilerServices.VisualC.dll", + 'System.Runtime.Extensions.dll', + 'System.Runtime.Handles.dll', + // "System.Runtime.InteropServices.JavaScript.dll", + 'System.Runtime.InteropServices.RuntimeInformation.dll', + 'System.Runtime.InteropServices.dll', + // "System.Runtime.Intrinsics.dll", + // "System.Runtime.Loader.dll", + // "System.Runtime.Numerics.dll", + // "System.Runtime.Serialization.Formatters.dll", + // "System.Runtime.Serialization.Json.dll", + // "System.Runtime.Serialization.Primitives.dll", + // "System.Runtime.Serialization.Xml.dll", + // "System.Runtime.Serialization.dll", + 'System.Runtime.dll', + // "System.Security.AccessControl.dll", + // "System.Security.Claims.dll", + // "System.Security.Cryptography.Algorithms.dll", + // "System.Security.Cryptography.Cng.dll", + // "System.Security.Cryptography.Csp.dll", + // "System.Security.Cryptography.Encoding.dll", + // "System.Security.Cryptography.OpenSsl.dll", + // "System.Security.Cryptography.Primitives.dll", + // "System.Security.Cryptography.X509Certificates.dll", + // "System.Security.Cryptography.dll", + // "System.Security.Principal.Windows.dll", + 'System.Security.Principal.dll', + 'System.Security.SecureString.dll', + 'System.Security.dll', + // "System.ServiceModel.Web.dll", + // "System.ServiceProcess.dll", + // "System.Text.Encoding.CodePages.dll", + 'System.Text.Encoding.Extensions.dll', + 'System.Text.Encoding.dll', + 'System.Text.Encodings.Web.dll', + 'System.Text.Json.dll', + 'System.Text.RegularExpressions.dll', + // "System.Threading.Channels.dll", + // "System.Threading.Overlapped.dll", + // "System.Threading.Tasks.Dataflow.dll", + 'System.Threading.Tasks.Extensions.dll', + 'System.Threading.Tasks.Parallel.dll', + 'System.Threading.Tasks.dll', + 'System.Threading.Thread.dll', + 'System.Threading.ThreadPool.dll', + 'System.Threading.Timer.dll', + 'System.Threading.dll', + // "System.Transactions.Local.dll", + 'System.Transactions.dll', + 'System.ValueTuple.dll', + 'System.Web.HttpUtility.dll', + // "System.Web.dll", + // "System.Windows.dll", + // "System.Xml.Linq.dll", + // "System.Xml.ReaderWriter.dll", + // "System.Xml.Serialization.dll", + // "System.Xml.XDocument.dll", + // "System.Xml.XPath.XDocument.dll", + // "System.Xml.XPath.dll", + // "System.Xml.XmlDocument.dll", + // "System.Xml.XmlSerializer.dll", + // "System.Xml.dll", + 'System.dll', + 'WebAssembly.dll', + // "WindowsBase.dll", + 'compiler.dll', + 'mscorlib.dll', + 'netstandard.dll' + ]; - let status = await exports.Compiler.Init( - libs.map((l) => `${location.origin}/lib/${l}`) - ); - if (status !== 0) { - throw new Error("Init failed"); - } + let status = await exports.Compiler.Init(libs.map((l) => `${location.origin}/lib/${l}`)); + if (status !== 0) { + throw new Error('Init failed'); + } - status = await exports.Compiler.Compile([ - `using System; + status = await exports.Compiler.Compile([ + `using System; namespace ppp { public class Program @@ -259,7 +256,7 @@ onmessage = async (e) => { } } `, - `using System.Collections.Generic; + `using System.Collections.Generic; using System.Text.Json; using System.Diagnostics.CodeAnalysis; @@ -274,22 +271,20 @@ onmessage = async (e) => { } } } - `, - ]); - if (status !== 0) { - throw new Error(`Compilation failed: ${status}`); - } + ` + ]); + if (status !== 0) { + throw new Error(`Compilation failed: ${status}`); + } - status = await exports.Compiler.Run("test.Program", "Test", [ - JSON.stringify([1, 2]), - ]); - if (status !== 0) { - throw new Error("Run failed"); - } + status = await exports.Compiler.Run('test.Program', 'Test', [JSON.stringify([1, 2])]); + if (status !== 0) { + throw new Error('Run failed'); + } - const result = await exports.Compiler.GetResultAsString(); + const result = await exports.Compiler.GetResultAsString(); - console.log(result); + console.log(result); - await exports.Compiler.DisposeAssembly(); + await exports.Compiler.DisposeAssembly(); }; diff --git a/packages/dotnet-runtime/src/dotnet-compiler-factory.ts b/packages/dotnet-runtime/src/dotnet-compiler-factory.ts index 031d8266..2ac1e724 100644 --- a/packages/dotnet-runtime/src/dotnet-compiler-factory.ts +++ b/packages/dotnet-runtime/src/dotnet-compiler-factory.ts @@ -1,80 +1,76 @@ -import type { Logger } from "libs/logger"; -import type { Fetcher } from "libs/fetch"; +import type { Logger } from 'libs/logger'; +import type { Fetcher } from 'libs/fetch'; export interface DotnetConfig { - mainAssemblyName: string; + mainAssemblyName: string; } export interface DotnetModule { - getConfig: () => DotnetConfig; - setModuleImports: (esModuleName: string, imports: I) => void; - getAssemblyExports: (assemblyName: string) => Promise; + getConfig: () => DotnetConfig; + setModuleImports: (esModuleName: string, imports: I) => void; + getAssemblyExports: (assemblyName: string) => Promise; } export interface DotnetLibsLoader { - load: (url: string) => Promise; - getResult: () => Uint8Array; + load: (url: string) => Promise; + getResult: () => Uint8Array; } export function createLibsLoader(fetcher: Fetcher): DotnetLibsLoader { - let bytes = new Uint8Array(); - return { - load: (url) => - fetcher(url) - .then((r) => r.bytes()) - .then( - (data) => { - bytes = data; - return 0; - }, - () => 1, - ), - getResult: () => bytes, - }; + let bytes = new Uint8Array(); + return { + load: (url) => + fetcher(url) + .then((r) => r.bytes()) + .then( + (data) => { + bytes = data; + return 0; + }, + () => 1 + ), + getResult: () => bytes + }; } export interface CompilerModuleImports { - logger: Logger; - loader: DotnetLibsLoader; + logger: Logger; + loader: DotnetLibsLoader; } export interface CompilerModuleExports { - Compiler: { - Init: (dllUrls: string[]) => Promise; - Compile: (code: string[]) => number; - Run: (typeFullName: string, methodName: string, args: string[]) => number; - GetResultAsString: () => string | null; - DisposeAssembly: () => void; - }; + Compiler: { + Init: (dllUrls: string[]) => Promise; + Compile: (code: string[]) => number; + Run: (typeFullName: string, methodName: string, args: string[]) => number; + GetResultAsString: () => string | null; + DisposeAssembly: () => void; + }; } -export type DotnetCompiler = Omit; +export type DotnetCompiler = Omit; -const ES_MODULE_NAME = "main.js"; +const ES_MODULE_NAME = 'main.js'; export class DotnetCompilerFactory { - constructor( - protected readonly logger: Logger, - protected readonly loader: DotnetLibsLoader, - protected readonly compilerModule: DotnetModule< - CompilerModuleImports, - CompilerModuleExports - >, - ) {} + constructor( + protected readonly logger: Logger, + protected readonly loader: DotnetLibsLoader, + protected readonly compilerModule: DotnetModule + ) {} - async create(dllUrls: string[]): Promise { - const { setModuleImports, getAssemblyExports, getConfig } = - this.compilerModule; - setModuleImports(ES_MODULE_NAME, { - logger: this.logger, - loader: this.loader, - }); - const config = getConfig(); - const exports = await getAssemblyExports(config.mainAssemblyName); - const status = await exports.Compiler.Init(dllUrls); - if (status !== 0) { - throw new Error("Init failed"); - } - return exports.Compiler; - } + async create(dllUrls: string[]): Promise { + const { setModuleImports, getAssemblyExports, getConfig } = this.compilerModule; + setModuleImports(ES_MODULE_NAME, { + logger: this.logger, + loader: this.loader + }); + const config = getConfig(); + const exports = await getAssemblyExports(config.mainAssemblyName); + const status = await exports.Compiler.Init(dllUrls); + if (status !== 0) { + throw new Error('Init failed'); + } + return exports.Compiler; + } } diff --git a/packages/dotnet-runtime/src/dotnet-program.ts b/packages/dotnet-runtime/src/dotnet-program.ts index 9bcbbee7..e0c4897a 100644 --- a/packages/dotnet-runtime/src/dotnet-program.ts +++ b/packages/dotnet-runtime/src/dotnet-program.ts @@ -1,15 +1,15 @@ -import type { Program } from "libs/compiler"; -import type { Context } from "libs/context"; +import type { Program } from 'libs/compiler'; +import type { Context } from 'libs/context'; -import type { DotnetRuntime } from "./dotnet-runtime-factory"; +import type { DotnetRuntime } from './dotnet-runtime-factory'; export class DotnetProgram implements Program { - constructor(protected readonly runtime: DotnetRuntime) {} + constructor(protected readonly runtime: DotnetRuntime) {} - async run(_: Context): Promise { - const status = this.runtime.Run("Program", "Main", []); - if (status !== 0) { - throw new Error("Run failed"); - } - } + async run(_: Context): Promise { + const status = this.runtime.Run('Program', 'Main', []); + if (status !== 0) { + throw new Error('Run failed'); + } + } } diff --git a/packages/dotnet-runtime/src/dotnet-runtime-factory.ts b/packages/dotnet-runtime/src/dotnet-runtime-factory.ts index 2fd8debe..56345fc5 100644 --- a/packages/dotnet-runtime/src/dotnet-runtime-factory.ts +++ b/packages/dotnet-runtime/src/dotnet-runtime-factory.ts @@ -1,20 +1,20 @@ import type { Context } from 'libs/context'; -import type { DotnetCompiler } from "./dotnet-compiler-factory"; +import type { DotnetCompiler } from './dotnet-compiler-factory'; -export type DotnetRuntime = Omit; +export type DotnetRuntime = Omit; export class DotnetRuntimeFactory { - constructor(protected readonly compiler: DotnetCompiler) {} + constructor(protected readonly compiler: DotnetCompiler) {} - create(ctx: Context, ...code: string[]): DotnetRuntime { - ctx.onCancel(() => { - this.compiler.DisposeAssembly() - }) - const status = this.compiler.Compile(code); - if (status !== 0) { - throw new Error("Compilation failed"); - } - return this.compiler; - } + create(ctx: Context, ...code: string[]): DotnetRuntime { + ctx.onCancel(() => { + this.compiler.DisposeAssembly(); + }); + const status = this.compiler.Compile(code); + if (status !== 0) { + throw new Error('Compilation failed'); + } + return this.compiler; + } } diff --git a/packages/dotnet-runtime/src/dotnet-test-program.ts b/packages/dotnet-runtime/src/dotnet-test-program.ts index c09bacae..e63c566c 100644 --- a/packages/dotnet-runtime/src/dotnet-test-program.ts +++ b/packages/dotnet-runtime/src/dotnet-test-program.ts @@ -1,36 +1,32 @@ -import type { Context } from "libs/context"; -import type { TestProgram } from "libs/testing"; +import type { Context } from 'libs/context'; +import type { TestProgram } from 'libs/testing'; -import type { DotnetRuntime } from "./dotnet-runtime-factory"; +import type { DotnetRuntime } from './dotnet-runtime-factory'; export class DotnetTestProgram implements TestProgram { - constructor( - protected readonly typeFullName: string, - protected readonly methodName: string, - protected readonly runtime: DotnetRuntime - ) {} + constructor( + protected readonly typeFullName: string, + protected readonly methodName: string, + protected readonly runtime: DotnetRuntime + ) {} - async run(_: Context, input: I): Promise { - const status = this.runtime.Run( - this.typeFullName, - this.methodName, - this.convertToArgs(input) - ); - if (status !== 0) { - throw new Error("Run failed"); - } - return this.getResult(); - } + async run(_: Context, input: I): Promise { + const status = this.runtime.Run(this.typeFullName, this.methodName, this.convertToArgs(input)); + if (status !== 0) { + throw new Error('Run failed'); + } + return this.getResult(); + } - protected convertToArgs(input: I): string[] { - return [JSON.stringify(input)]; - } + protected convertToArgs(input: I): string[] { + return [JSON.stringify(input)]; + } - protected getResult(): O { - const result = this.runtime.GetResultAsString(); - if (result === null) { - throw new Error("GetResultAsString failed"); - } - return JSON.parse(result); - } + protected getResult(): O { + const result = this.runtime.GetResultAsString(); + if (result === null) { + throw new Error('GetResultAsString failed'); + } + return JSON.parse(result); + } } diff --git a/packages/dotnet-runtime/src/execution-code-factory.ts b/packages/dotnet-runtime/src/execution-code-factory.ts index 427e7da8..8e0c6aba 100644 --- a/packages/dotnet-runtime/src/execution-code-factory.ts +++ b/packages/dotnet-runtime/src/execution-code-factory.ts @@ -1,56 +1,53 @@ export interface UsingOptions { - /** @default true */ - serialization?: boolean; - /** @default "" */ - additional?: string; + /** @default true */ + serialization?: boolean; + /** @default "" */ + additional?: string; } export interface ExecutionCodeOptions { - executionCode: string; - /** @default "" */ - additionalDefinitions?: string; - /** @default {} */ - using?: UsingOptions; - /** @default "test" */ - namespace?: string; - /** @default "Test" */ - className?: string; - /** @default "Execute" */ - methodName?: string; - /** @default "string jsonArguments" */ - args?: string; - /** @default "result" */ - resultVar?: string; - /** @default `return JsonSerializer.Serialize(${resultVar});` */ - serializeCode?: string; + executionCode: string; + /** @default "" */ + additionalDefinitions?: string; + /** @default {} */ + using?: UsingOptions; + /** @default "test" */ + namespace?: string; + /** @default "Test" */ + className?: string; + /** @default "Execute" */ + methodName?: string; + /** @default "string jsonArguments" */ + args?: string; + /** @default "result" */ + resultVar?: string; + /** @default `return JsonSerializer.Serialize(${resultVar});` */ + serializeCode?: string; } export function makeExecutionCode({ - executionCode, - using: { - serialization: serializationUsing = true, - additional: additionalUsing = "", - } = {}, - additionalDefinitions = "", - namespace = "test", - className = "Test", - methodName = "Execute", - args = "string jsonArguments", - resultVar = "result", - serializeCode = `return JsonSerializer.Serialize(${resultVar});`, + executionCode, + using: { serialization: serializationUsing = true, additional: additionalUsing = '' } = {}, + additionalDefinitions = '', + namespace = 'test', + className = 'Test', + methodName = 'Execute', + args = 'string jsonArguments', + resultVar = 'result', + serializeCode = `return JsonSerializer.Serialize(${resultVar});` }: ExecutionCodeOptions) { - return `using System.Text.Json; -${serializationUsing ? "using System.Text.Json.Serialization;" : ""} + return `using System.Text.Json; +${serializationUsing ? 'using System.Text.Json.Serialization;' : ''} using System.Diagnostics.CodeAnalysis; ${additionalUsing} namespace ${namespace} { - ${additionalDefinitions.split("\n").join("\n ")} + ${additionalDefinitions.split('\n').join('\n ')} public class ${className} { [RequiresUnreferencedCode("Calls System.Text.Json.JsonSerializer.Serialize(TValue, JsonSerializerOptions)")] public static string ${methodName}(${args}) { - ${executionCode.split("\n").join("\n ")} + ${executionCode.split('\n').join('\n ')} ${serializeCode} } } diff --git a/packages/dotnet-runtime/src/index.ts b/packages/dotnet-runtime/src/index.ts index fd31f539..088ed5eb 100644 --- a/packages/dotnet-runtime/src/index.ts +++ b/packages/dotnet-runtime/src/index.ts @@ -1,6 +1,6 @@ -export * from "./dotnet-compiler-factory.js"; -export * from "./dotnet-runtime-factory.js"; -export * from "./dotnet-test-program.js"; -export * from "./version.js"; -export * from "./execution-code-factory.js"; -export * from "./dotnet-program.js"; +export * from './dotnet-compiler-factory.js'; +export * from './dotnet-runtime-factory.js'; +export * from './dotnet-test-program.js'; +export * from './version.js'; +export * from './execution-code-factory.js'; +export * from './dotnet-program.js'; diff --git a/packages/dotnet-runtime/src/version.ts b/packages/dotnet-runtime/src/version.ts index f3f4c518..8e2c357f 100644 --- a/packages/dotnet-runtime/src/version.ts +++ b/packages/dotnet-runtime/src/version.ts @@ -1 +1 @@ -export const version = "10.0.0"; +export const version = '10.0.0'; diff --git a/packages/dotnet-runtime/tsconfig.json b/packages/dotnet-runtime/tsconfig.json index d9302dd7..e12023ec 100644 --- a/packages/dotnet-runtime/tsconfig.json +++ b/packages/dotnet-runtime/tsconfig.json @@ -1,19 +1,11 @@ { - "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", - "compilerOptions": { - "lib": [ - "ES2022", - "ESNext.Disposable", - "DOM" - ], - "noUncheckedIndexedAccess": false, - "outDir": "dist", - "rootDir": "src", - "types": [ - "vite/client" - ] - }, - "include": [ - "src/**/*" - ], -} \ No newline at end of file + "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", + "compilerOptions": { + "lib": ["ES2022", "ESNext.Disposable", "DOM"], + "noUncheckedIndexedAccess": false, + "outDir": "dist", + "rootDir": "src", + "types": ["vite/client"] + }, + "include": ["src/**/*"] +} diff --git a/packages/dotnet-runtime/vite.config.js b/packages/dotnet-runtime/vite.config.js index e1c61135..ced2dda6 100644 --- a/packages/dotnet-runtime/vite.config.js +++ b/packages/dotnet-runtime/vite.config.js @@ -1,49 +1,49 @@ -import { resolve } from "path"; -import { defineConfig } from "vite"; -import dts from "vite-plugin-dts"; -import { viteStaticCopy } from "vite-plugin-static-copy"; +import { resolve } from 'path'; +import { defineConfig } from 'vite'; +import dts from 'vite-plugin-dts'; +import { viteStaticCopy } from 'vite-plugin-static-copy'; export default defineConfig({ - build: { - lib: { - // Could also be a dictionary or array of multiple entry points - entry: { - index: resolve(__dirname, "src/index.ts"), - version: resolve(__dirname, "src/version.ts"), - }, - formats: ["es"], - // name: "MyLib", - // the proper extensions will be added - // fileName: "index", - }, - rollupOptions: { - // make sure to externalize deps that shouldn't be bundled - // into your library - external: [/^libs\//], - output: { - // Provide global variables to use in the UMD build - // for externalized deps - globals: { - // vue: "Vue", - }, - }, - }, - }, - plugins: [ - dts(), - viteStaticCopy({ - targets: [ - { - src: "src/vendor/compiler", - dest: ".", - rename: { stripBase: 2 }, - }, - { - src: "src/vendor/lib", - dest: ".", - rename: { stripBase: 2 }, - }, - ], - }), - ], + build: { + lib: { + // Could also be a dictionary or array of multiple entry points + entry: { + index: resolve(import.meta.dirname, 'src/index.ts'), + version: resolve(import.meta.dirname, 'src/version.ts') + }, + formats: ['es'] + // name: "MyLib", + // the proper extensions will be added + // fileName: "index", + }, + rollupOptions: { + // make sure to externalize deps that shouldn't be bundled + // into your library + external: [/^libs\//], + output: { + // Provide global variables to use in the UMD build + // for externalized deps + globals: { + // vue: "Vue", + } + } + } + }, + plugins: [ + dts(), + viteStaticCopy({ + targets: [ + { + src: 'src/vendor/compiler', + dest: '.', + rename: { stripBase: 2 } + }, + { + src: 'src/vendor/lib', + dest: '.', + rename: { stripBase: 2 } + } + ] + }) + ] }); diff --git a/packages/gleam-runtime/package.json b/packages/gleam-runtime/package.json index b705ef90..87da7b9a 100644 --- a/packages/gleam-runtime/package.json +++ b/packages/gleam-runtime/package.json @@ -1,26 +1,28 @@ { - "name": "gleam-runtime", - "private": true, - "version": "1.0.0", - "type": "module", - "scripts": { - "precheck": "./artifacts.sh", - "check": "tsc", - "prebuild": "./artifacts.sh", - "build": "vite build" - }, - "dependencies": { - "libs": "workspace:*" - }, - "devDependencies": { - "vite": "catalog:", - "vite-plugin-dts": "catalog:", - "vite-plugin-static-copy": "catalog:" - }, - "exports": { - ".": "./dist/index.js", - "./version": "./dist/version.js", - "./compiler.wasm": "./dist/gleam_wasm_bg.wasm", - "./stdlib/*": "./dist/precompiled/*" - } -} \ No newline at end of file + "name": "gleam-runtime", + "version": "1.0.0", + "private": true, + "type": "module", + "exports": { + ".": "./dist/index.js", + "./version": "./dist/version.js", + "./compiler.wasm": "./dist/gleam_wasm_bg.wasm", + "./stdlib/*": "./dist/precompiled/*" + }, + "scripts": { + "precheck": "./artifacts.sh", + "check": "tsc", + "prebuild": "./artifacts.sh", + "build": "vite build", + "format": "oxfmt", + "format:check": "oxfmt --check ." + }, + "dependencies": { + "libs": "workspace:*" + }, + "devDependencies": { + "vite": "catalog:", + "vite-plugin-dts": "catalog:", + "vite-plugin-static-copy": "catalog:" + } +} diff --git a/packages/gleam-runtime/probe/index.ts b/packages/gleam-runtime/probe/index.ts index 5d9587f1..80a95c58 100644 --- a/packages/gleam-runtime/probe/index.ts +++ b/packages/gleam-runtime/probe/index.ts @@ -1,38 +1,45 @@ const compilerFile = Bun.file( - new URL("../src/vendor/compiler/gleam_wasm_bg.wasm", import.meta.url) + new URL('../src/vendor/compiler/gleam_wasm_bg.wasm', import.meta.url) ); -import { initSync, write_module, initialise_panic_hook, reset_warnings, compile_package, read_compiled_javascript } from "../src/vendor/compiler/gleam_wasm"; -import stdlib from '../src/vendor/stdlib/stdlib' +import { + initSync, + write_module, + initialise_panic_hook, + reset_warnings, + compile_package, + read_compiled_javascript +} from '../src/vendor/compiler/gleam_wasm'; +import stdlib from '../src/vendor/stdlib/stdlib'; initSync({ module: await compilerFile.arrayBuffer() }); -initialise_panic_hook(false) +initialise_panic_hook(false); -const projectId = 1 +const projectId = 1; for (const [name, code] of Object.entries(stdlib)) { - write_module(projectId, name, code) + write_module(projectId, name, code); } -const code = await Bun.file(new URL("code.gleam", import.meta.url)).text() +const code = await Bun.file(new URL('code.gleam', import.meta.url)).text(); -write_module(projectId, "main", code) +write_module(projectId, 'main', code); // old garbage collect projects - // garbageCollectProjects() { - // const gone = []; - // for (const [id, project] of this.#projects) { - // if (!project.deref()) gone.push(id); - // } - // for (const id of gone) { - // this.#projects.delete(id); - // this.#wasm.delete_project(id); - // } - // } - -reset_warnings(projectId) - -compile_package(projectId, "javascript") - -console.log(read_compiled_javascript(projectId, "main")) +// garbageCollectProjects() { +// const gone = []; +// for (const [id, project] of this.#projects) { +// if (!project.deref()) gone.push(id); +// } +// for (const id of gone) { +// this.#projects.delete(id); +// this.#wasm.delete_project(id); +// } +// } + +reset_warnings(projectId); + +compile_package(projectId, 'javascript'); + +console.log(read_compiled_javascript(projectId, 'main')); diff --git a/packages/gleam-runtime/probe/package.json b/packages/gleam-runtime/probe/package.json index bda587b0..0a3b91d3 100644 --- a/packages/gleam-runtime/probe/package.json +++ b/packages/gleam-runtime/probe/package.json @@ -1,11 +1,11 @@ { - "name": "probe", - "module": "index.ts", - "type": "module", - "devDependencies": { - "@types/bun": "latest" - }, - "peerDependencies": { - "typescript": "^5.0.0" - } -} \ No newline at end of file + "name": "probe", + "type": "module", + "module": "index.ts", + "devDependencies": { + "@types/bun": "latest" + }, + "peerDependencies": { + "typescript": "^5.0.0" + } +} diff --git a/packages/gleam-runtime/probe/tsconfig.json b/packages/gleam-runtime/probe/tsconfig.json index 238655f2..ffc08abf 100644 --- a/packages/gleam-runtime/probe/tsconfig.json +++ b/packages/gleam-runtime/probe/tsconfig.json @@ -1,27 +1,27 @@ { - "compilerOptions": { - // Enable latest features - "lib": ["ESNext", "DOM"], - "target": "ESNext", - "module": "ESNext", - "moduleDetection": "force", - "jsx": "react-jsx", - "allowJs": true, + "compilerOptions": { + // Enable latest features + "lib": ["ESNext", "DOM"], + "target": "ESNext", + "module": "ESNext", + "moduleDetection": "force", + "jsx": "react-jsx", + "allowJs": true, - // Bundler mode - "moduleResolution": "bundler", - "allowImportingTsExtensions": true, - "verbatimModuleSyntax": true, - "noEmit": true, + // Bundler mode + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "verbatimModuleSyntax": true, + "noEmit": true, - // Best practices - "strict": true, - "skipLibCheck": true, - "noFallthroughCasesInSwitch": true, + // Best practices + "strict": true, + "skipLibCheck": true, + "noFallthroughCasesInSwitch": true, - // Some stricter flags (disabled by default) - "noUnusedLocals": false, - "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false - } + // Some stricter flags (disabled by default) + "noUnusedLocals": false, + "noUnusedParameters": false, + "noPropertyAccessFromIndexSignature": false + } } diff --git a/packages/gleam-runtime/src/gleam-module-compiler.ts b/packages/gleam-runtime/src/gleam-module-compiler.ts index 17e09132..7115191b 100644 --- a/packages/gleam-runtime/src/gleam-module-compiler.ts +++ b/packages/gleam-runtime/src/gleam-module-compiler.ts @@ -1,67 +1,60 @@ -import { COLOR } from "libs/logger"; -import type { Writer } from "libs/io"; +import { COLOR } from 'libs/logger'; +import type { Writer } from 'libs/io'; import { - initSync, - write_module, - initialise_panic_hook, - compile_package, - read_compiled_javascript, - delete_project, - pop_warning, -} from "./vendor/compiler/gleam_wasm.js"; -import stdlib from "./vendor/stdlib/stdlib.js"; + initSync, + write_module, + initialise_panic_hook, + compile_package, + read_compiled_javascript, + delete_project, + pop_warning +} from './vendor/compiler/gleam_wasm.js'; +import stdlib from './vendor/stdlib/stdlib.js'; export class GleamModuleCompiler { - protected lastProjectId = 0; + protected lastProjectId = 0; - constructor( - protected readonly writer: Writer, - protected readonly precompiledStdlibIndexUrl: string, - compilerModule: WebAssembly.Module - ) { - initSync({ module: compilerModule }); - initialise_panic_hook(false); - } + constructor( + protected readonly writer: Writer, + protected readonly precompiledStdlibIndexUrl: string, + compilerModule: WebAssembly.Module + ) { + initSync({ module: compilerModule }); + initialise_panic_hook(false); + } - compile(gleamCode: string) { - const jsCode = this.compileGleamToJavascript(gleamCode); - return jsCode.replaceAll( - /from\s+"\.\/(.+)"/g, - `from "${this.precompiledStdlibIndexUrl}/$1"` - ); - } + compile(gleamCode: string) { + const jsCode = this.compileGleamToJavascript(gleamCode); + return jsCode.replaceAll(/from\s+"\.\/(.+)"/g, `from "${this.precompiledStdlibIndexUrl}/$1"`); + } - protected compileGleamToJavascript(gleamCode: string) { - const projectId = this.lastProjectId++; - try { - for (const [name, code] of Object.entries(stdlib)) { - write_module(projectId, name, code); - } - write_module(projectId, "main", gleamCode); - // reset_warnings(projectId); // Performed automatically - compile_package(projectId, "javascript"); - this.printWarnings(projectId); - const jsCode = read_compiled_javascript(projectId, "main"); - if (jsCode === undefined) { - throw new Error("Failed to compile Gleam code"); - } - return jsCode; - } finally { - delete_project(projectId); - } - } + protected compileGleamToJavascript(gleamCode: string) { + const projectId = this.lastProjectId++; + try { + for (const [name, code] of Object.entries(stdlib)) { + write_module(projectId, name, code); + } + write_module(projectId, 'main', gleamCode); + // reset_warnings(projectId); // Performed automatically + compile_package(projectId, 'javascript'); + this.printWarnings(projectId); + const jsCode = read_compiled_javascript(projectId, 'main'); + if (jsCode === undefined) { + throw new Error('Failed to compile Gleam code'); + } + return jsCode; + } finally { + delete_project(projectId); + } + } - protected printWarnings(projectId: number) { - const encoder = new TextEncoder(); - while (true) { - const warning = pop_warning(projectId); - if (warning === undefined) break; - this.writer.write( - encoder.encode( - `${COLOR.WARN}warning:${COLOR.RESET}${warning.slice(9)}\n` - ) - ); - } - } + protected printWarnings(projectId: number) { + const encoder = new TextEncoder(); + while (true) { + const warning = pop_warning(projectId); + if (warning === undefined) break; + this.writer.write(encoder.encode(`${COLOR.WARN}warning:${COLOR.RESET}${warning.slice(9)}\n`)); + } + } } diff --git a/packages/gleam-runtime/src/gleam-program.ts b/packages/gleam-runtime/src/gleam-program.ts index 9317734e..0b7fb191 100644 --- a/packages/gleam-runtime/src/gleam-program.ts +++ b/packages/gleam-runtime/src/gleam-program.ts @@ -1,21 +1,21 @@ -import type { Context } from "libs/context"; +import type { Context } from 'libs/context'; import { patch } from 'libs/patcher'; -import type { Program } from "libs/compiler"; +import type { Program } from 'libs/compiler'; export interface GleamModule { - main(): void | Promise; + main(): void | Promise; } export class GleamProgram implements Program { - constructor( - protected readonly module: GleamModule, - protected readonly patchedConsole: Console - ) {} + constructor( + protected readonly module: GleamModule, + protected readonly patchedConsole: Console + ) {} - async run(_ctx: Context): Promise { - using _ = patch(globalThis, "console", this.patchedConsole); - // By default gleam main function is synchronous - // TODO: Find out if gleam can produce asynchronous code - await this.module.main(); - } + async run(_ctx: Context): Promise { + using _ = patch(globalThis, 'console', this.patchedConsole); + // By default gleam main function is synchronous + // TODO: Find out if gleam can produce asynchronous code + await this.module.main(); + } } diff --git a/packages/gleam-runtime/src/index.ts b/packages/gleam-runtime/src/index.ts index 549af535..5ec353ec 100644 --- a/packages/gleam-runtime/src/index.ts +++ b/packages/gleam-runtime/src/index.ts @@ -1,3 +1,3 @@ -export * from "./gleam-program.js"; -export * from "./gleam-module-compiler.js"; -export * from "./version.js"; +export * from './gleam-program.js'; +export * from './gleam-module-compiler.js'; +export * from './version.js'; diff --git a/packages/gleam-runtime/src/version.ts b/packages/gleam-runtime/src/version.ts index e908bdb1..bc59d9cb 100644 --- a/packages/gleam-runtime/src/version.ts +++ b/packages/gleam-runtime/src/version.ts @@ -1 +1 @@ -export { version } from "./vendor/compiler/package.json"; +export { version } from './vendor/compiler/package.json'; diff --git a/packages/gleam-runtime/tsconfig.json b/packages/gleam-runtime/tsconfig.json index d9302dd7..e12023ec 100644 --- a/packages/gleam-runtime/tsconfig.json +++ b/packages/gleam-runtime/tsconfig.json @@ -1,19 +1,11 @@ { - "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", - "compilerOptions": { - "lib": [ - "ES2022", - "ESNext.Disposable", - "DOM" - ], - "noUncheckedIndexedAccess": false, - "outDir": "dist", - "rootDir": "src", - "types": [ - "vite/client" - ] - }, - "include": [ - "src/**/*" - ], -} \ No newline at end of file + "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", + "compilerOptions": { + "lib": ["ES2022", "ESNext.Disposable", "DOM"], + "noUncheckedIndexedAccess": false, + "outDir": "dist", + "rootDir": "src", + "types": ["vite/client"] + }, + "include": ["src/**/*"] +} diff --git a/packages/gleam-runtime/vite.config.js b/packages/gleam-runtime/vite.config.js index ca69f707..a3a9171c 100644 --- a/packages/gleam-runtime/vite.config.js +++ b/packages/gleam-runtime/vite.config.js @@ -1,49 +1,49 @@ -import { resolve } from "path"; -import { defineConfig } from "vite"; -import dts from "vite-plugin-dts"; -import { viteStaticCopy } from "vite-plugin-static-copy"; +import { resolve } from 'path'; +import { defineConfig } from 'vite'; +import dts from 'vite-plugin-dts'; +import { viteStaticCopy } from 'vite-plugin-static-copy'; export default defineConfig({ - build: { - lib: { - // Could also be a dictionary or array of multiple entry points - entry: { - index: resolve(__dirname, "src/index.ts"), - version: resolve(__dirname, "src/version.ts"), - }, - formats: ["es"], - // name: "MyLib", - // the proper extensions will be added - // fileName: "index", - }, - rollupOptions: { - // make sure to externalize deps that shouldn't be bundled - // into your library - external: [/^libs\//], - output: { - // Provide global variables to use in the UMD build - // for externalized deps - globals: { - // vue: "Vue", - }, - }, - }, - }, - plugins: [ - dts(), - viteStaticCopy({ - targets: [ - { - src: "src/vendor/compiler/gleam_wasm_bg.wasm", - dest: ".", - rename: { stripBase: true }, - }, - { - src: "src/vendor/stdlib/precompiled/**", - dest: ".", - rename: { stripBase: 3 }, - }, - ], - }), - ], + build: { + lib: { + // Could also be a dictionary or array of multiple entry points + entry: { + index: resolve(import.meta.dirname, 'src/index.ts'), + version: resolve(import.meta.dirname, 'src/version.ts') + }, + formats: ['es'] + // name: "MyLib", + // the proper extensions will be added + // fileName: "index", + }, + rollupOptions: { + // make sure to externalize deps that shouldn't be bundled + // into your library + external: [/^libs\//], + output: { + // Provide global variables to use in the UMD build + // for externalized deps + globals: { + // vue: "Vue", + } + } + } + }, + plugins: [ + dts(), + viteStaticCopy({ + targets: [ + { + src: 'src/vendor/compiler/gleam_wasm_bg.wasm', + dest: '.', + rename: { stripBase: true } + }, + { + src: 'src/vendor/stdlib/precompiled/**', + dest: '.', + rename: { stripBase: 3 } + } + ] + }) + ] }); diff --git a/packages/go-runtime/package.json b/packages/go-runtime/package.json index 032b6ce1..89ad073b 100644 --- a/packages/go-runtime/package.json +++ b/packages/go-runtime/package.json @@ -1,25 +1,27 @@ { - "name": "go-runtime", - "private": true, - "version": "1.0.0", - "type": "module", - "scripts": { - "precheck": "./artifacts.sh", - "check": "tsc", - "prebuild": "./artifacts.sh", - "build": "vite build" - }, - "dependencies": { - "libs": "workspace:*" - }, - "devDependencies": { - "@types/golang-wasm-exec": "^1.15.2", - "vite": "catalog:", - "vite-plugin-dts": "catalog:" - }, - "exports": { - ".": "./dist/index.js", - "./version": "./dist/version.js", - "./compiler.wasm": "./dist/compiler.wasm" - } -} \ No newline at end of file + "name": "go-runtime", + "version": "1.0.0", + "private": true, + "type": "module", + "exports": { + ".": "./dist/index.js", + "./version": "./dist/version.js", + "./compiler.wasm": "./dist/compiler.wasm" + }, + "scripts": { + "precheck": "./artifacts.sh", + "check": "tsc", + "prebuild": "./artifacts.sh", + "build": "vite build", + "format": "oxfmt", + "format:check": "oxfmt --check ." + }, + "dependencies": { + "libs": "workspace:*" + }, + "devDependencies": { + "@types/golang-wasm-exec": "^1.15.2", + "vite": "catalog:", + "vite-plugin-dts": "catalog:" + } +} diff --git a/packages/go-runtime/probe/index.ts b/packages/go-runtime/probe/index.ts index fb157665..bfcb0ea3 100644 --- a/packages/go-runtime/probe/index.ts +++ b/packages/go-runtime/probe/index.ts @@ -1,57 +1,54 @@ // @ts-ignore -import WASM_PATH from "../public/compiler.wasm"; +import WASM_PATH from '../public/compiler.wasm'; -import { LogLevel, makeCompilerFactory } from "../src/index.js"; +import { LogLevel, makeCompilerFactory } from '../src/index.js'; const wasmFile = Bun.file(WASM_PATH); const makeCompiler = await makeCompilerFactory( - async (imports) => - ( - await WebAssembly.instantiate(await wasmFile.arrayBuffer(), imports) - ).instance + async (imports) => (await WebAssembly.instantiate(await wasmFile.arrayBuffer(), imports)).instance ); const compiler = makeCompiler({ - logger: { - level: LogLevel.Debug, - console: globalThis.console, - }, - stdin: { - read() { - return new Uint8Array() - } - }, - stdout: { - write(s) { - console.log(s); - }, - }, - stderr: { - write(s) { - console.error(s); - }, - }, + logger: { + level: LogLevel.Debug, + console: globalThis.console + }, + stdin: { + read() { + return new Uint8Array(); + } + }, + stdout: { + write(s) { + console.log(s); + } + }, + stderr: { + write(s) { + console.error(s); + } + } }); if (!compiler.ok) { - throw new Error(compiler.error); + throw new Error(compiler.error); } const ctrl = new AbortController(); const executor = await compiler.value.createEvaluator( - ctrl.signal, - `package main + ctrl.signal, + `package main func Test() string { return "test" }` ); if (!executor.ok) { - throw new Error(executor.error); + throw new Error(executor.error); } -const r = await executor.value(ctrl.signal, "main.Test()"); +const r = await executor.value(ctrl.signal, 'main.Test()'); if (!r.ok) { - throw new Error(r.error); + throw new Error(r.error); } console.log(r.value); diff --git a/packages/go-runtime/probe/package.json b/packages/go-runtime/probe/package.json index 636a8e26..45fff43b 100644 --- a/packages/go-runtime/probe/package.json +++ b/packages/go-runtime/probe/package.json @@ -1,12 +1,12 @@ { - "name": "probe", - "module": "index.ts", - "type": "module", - "devDependencies": { - "@types/bun": "latest", - "@types/golang-wasm-exec": "^1.15.2" - }, - "peerDependencies": { - "typescript": "^5.0.0" - } -} \ No newline at end of file + "name": "probe", + "type": "module", + "module": "index.ts", + "devDependencies": { + "@types/bun": "latest", + "@types/golang-wasm-exec": "^1.15.2" + }, + "peerDependencies": { + "typescript": "^5.0.0" + } +} diff --git a/packages/go-runtime/probe/result.ts b/packages/go-runtime/probe/result.ts index e04ac621..ce639427 100644 --- a/packages/go-runtime/probe/result.ts +++ b/packages/go-runtime/probe/result.ts @@ -1,27 +1,27 @@ export interface Ok { - ok: true - value: T + ok: true; + value: T; } export interface Err { - ok: false - error: E + ok: false; + error: E; } -export type Result = Ok | Err +export type Result = Ok | Err; export function isOk(result: Result): result is Ok { - return result.ok + return result.ok; } export function isErr(result: Result): result is Err { - return !result.ok + return !result.ok; } export function ok(value: T): Ok { - return { ok: true, value } + return { ok: true, value }; } export function err(error: E): Err { - return { ok: false, error } + return { ok: false, error }; } diff --git a/packages/go-runtime/probe/tsconfig.json b/packages/go-runtime/probe/tsconfig.json index 238655f2..ffc08abf 100644 --- a/packages/go-runtime/probe/tsconfig.json +++ b/packages/go-runtime/probe/tsconfig.json @@ -1,27 +1,27 @@ { - "compilerOptions": { - // Enable latest features - "lib": ["ESNext", "DOM"], - "target": "ESNext", - "module": "ESNext", - "moduleDetection": "force", - "jsx": "react-jsx", - "allowJs": true, + "compilerOptions": { + // Enable latest features + "lib": ["ESNext", "DOM"], + "target": "ESNext", + "module": "ESNext", + "moduleDetection": "force", + "jsx": "react-jsx", + "allowJs": true, - // Bundler mode - "moduleResolution": "bundler", - "allowImportingTsExtensions": true, - "verbatimModuleSyntax": true, - "noEmit": true, + // Bundler mode + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "verbatimModuleSyntax": true, + "noEmit": true, - // Best practices - "strict": true, - "skipLibCheck": true, - "noFallthroughCasesInSwitch": true, + // Best practices + "strict": true, + "skipLibCheck": true, + "noFallthroughCasesInSwitch": true, - // Some stricter flags (disabled by default) - "noUnusedLocals": false, - "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false - } + // Some stricter flags (disabled by default) + "noUnusedLocals": false, + "noUnusedParameters": false, + "noPropertyAccessFromIndexSignature": false + } } diff --git a/packages/go-runtime/src/compiler-factory.ts b/packages/go-runtime/src/compiler-factory.ts index 4604c587..ce6c3d51 100644 --- a/packages/go-runtime/src/compiler-factory.ts +++ b/packages/go-runtime/src/compiler-factory.ts @@ -1,20 +1,15 @@ -import "./vendor/wasm_exec.js"; +import './vendor/wasm_exec.js'; -import { - DEFAULT_GLOBAL_COMPILER_INIT_FUNCTION_NAME, - type CompilerFactory, -} from "./model.js"; +import { DEFAULT_GLOBAL_COMPILER_INIT_FUNCTION_NAME, type CompilerFactory } from './model.js'; export async function makeCompilerFactory( - instantiate: ( - importObject: WebAssembly.Imports - ) => Promise, - globalCompilerInitFunctionName = DEFAULT_GLOBAL_COMPILER_INIT_FUNCTION_NAME + instantiate: (importObject: WebAssembly.Imports) => Promise, + globalCompilerInitFunctionName = DEFAULT_GLOBAL_COMPILER_INIT_FUNCTION_NAME ): Promise { - const go = new Go(); - go.argv.push(globalCompilerInitFunctionName); - void go.run(await instantiate(go.importObject)); - // @ts-expect-error dynamic global property - const factory = globalThis[globalCompilerInitFunctionName] as CompilerFactory; - return factory; + const go = new Go(); + go.argv.push(globalCompilerInitFunctionName); + void go.run(await instantiate(go.importObject)); + // @ts-expect-error dynamic global property + const factory = globalThis[globalCompilerInitFunctionName] as CompilerFactory; + return factory; } diff --git a/packages/go-runtime/src/go-compiler-factory.ts b/packages/go-runtime/src/go-compiler-factory.ts index 4a35cab4..199cd656 100644 --- a/packages/go-runtime/src/go-compiler-factory.ts +++ b/packages/go-runtime/src/go-compiler-factory.ts @@ -1,28 +1,22 @@ -import { createLogger, redirect } from "libs/logger"; -import { isErr } from "libs/result"; +import { createLogger, redirect } from 'libs/logger'; +import { isErr } from 'libs/result'; -import { - LogLevel, - type CompilerFactory, - type GoCompilerFactory, -} from "./model"; +import { LogLevel, type CompilerFactory, type GoCompilerFactory } from './model'; -export function makeGoCompilerFactory( - makeCompiler: CompilerFactory -): GoCompilerFactory { - return (streams) => { - const compiler = makeCompiler({ - logger: { - level: LogLevel.Info, - console: redirect(globalThis.console, createLogger(streams.out)), - }, - stdin: streams.in, - stdout: streams.out, - stderr: streams.err, - }); - if (isErr(compiler)) { - throw new Error(compiler.error); - } - return compiler.value; - }; +export function makeGoCompilerFactory(makeCompiler: CompilerFactory): GoCompilerFactory { + return (streams) => { + const compiler = makeCompiler({ + logger: { + level: LogLevel.Info, + console: redirect(globalThis.console, createLogger(streams.out)) + }, + stdin: streams.in, + stdout: streams.out, + stderr: streams.err + }); + if (isErr(compiler)) { + throw new Error(compiler.error); + } + return compiler.value; + }; } diff --git a/packages/go-runtime/src/go-evaluator-factory.ts b/packages/go-runtime/src/go-evaluator-factory.ts index 0153db15..e8b34a1f 100644 --- a/packages/go-runtime/src/go-evaluator-factory.ts +++ b/packages/go-runtime/src/go-evaluator-factory.ts @@ -1,16 +1,16 @@ -import { isErr } from "libs/result"; +import { isErr } from 'libs/result'; -import { type Evaluator, type GoCompilerFactory, type GoProgramFactory } from "./model"; +import { type Evaluator, type GoCompilerFactory, type GoProgramFactory } from './model'; export function makeGoEvaluatorFactory( - makeCompiler: GoCompilerFactory + makeCompiler: GoCompilerFactory ): GoProgramFactory> { - return async (ctx, streams, code) => { - const compiler = makeCompiler(streams); - const executor = await compiler.createEvaluator(ctx.signal, code); - if (isErr(executor)) { - throw new Error(executor.error); - } - return executor.value; - }; + return async (ctx, streams, code) => { + const compiler = makeCompiler(streams); + const executor = await compiler.createEvaluator(ctx.signal, code); + if (isErr(executor)) { + throw new Error(executor.error); + } + return executor.value; + }; } diff --git a/packages/go-runtime/src/go-executor-factory.ts b/packages/go-runtime/src/go-executor-factory.ts index a9500398..46c0237f 100644 --- a/packages/go-runtime/src/go-executor-factory.ts +++ b/packages/go-runtime/src/go-executor-factory.ts @@ -1,20 +1,14 @@ -import { isErr } from "libs/result"; +import { isErr } from 'libs/result'; -import { - type Executor, - type GoCompilerFactory, - type GoProgramFactory, -} from "./model"; +import { type Executor, type GoCompilerFactory, type GoProgramFactory } from './model'; -export function makeGoExecutorFactory( - makeCompiler: GoCompilerFactory -): GoProgramFactory { - return async (ctx, streams, code) => { - const compiler = makeCompiler(streams); - const executor = await compiler.createExecutor(ctx.signal, code); - if (isErr(executor)) { - throw new Error(executor.error); - } - return executor.value; - }; +export function makeGoExecutorFactory(makeCompiler: GoCompilerFactory): GoProgramFactory { + return async (ctx, streams, code) => { + const compiler = makeCompiler(streams); + const executor = await compiler.createExecutor(ctx.signal, code); + if (isErr(executor)) { + throw new Error(executor.error); + } + return executor.value; + }; } diff --git a/packages/go-runtime/src/go-program.ts b/packages/go-runtime/src/go-program.ts index 8c2240ba..d2ea5267 100644 --- a/packages/go-runtime/src/go-program.ts +++ b/packages/go-runtime/src/go-program.ts @@ -1,16 +1,16 @@ -import type { Program } from "libs/compiler"; -import type { Context } from "libs/context"; -import { isErr } from "libs/result"; +import type { Program } from 'libs/compiler'; +import type { Context } from 'libs/context'; +import { isErr } from 'libs/result'; -import type { Executor } from "./model"; +import type { Executor } from './model'; export class GoProgram implements Program { - constructor(protected readonly program: Executor) {} + constructor(protected readonly program: Executor) {} - async run(ctx: Context): Promise { - const result = await this.program(ctx.signal); - if (isErr(result)) { - throw new Error(result.error); - } - } + async run(ctx: Context): Promise { + const result = await this.program(ctx.signal); + if (isErr(result)) { + throw new Error(result.error); + } + } } diff --git a/packages/go-runtime/src/go-test-program.ts b/packages/go-runtime/src/go-test-program.ts index 41ab6ce7..e41a4c41 100644 --- a/packages/go-runtime/src/go-test-program.ts +++ b/packages/go-runtime/src/go-test-program.ts @@ -1,22 +1,19 @@ -import { type Context } from "libs/context"; -import { isErr } from "libs/result"; -import type { TestProgram } from "libs/testing"; +import { type Context } from 'libs/context'; +import { isErr } from 'libs/result'; +import type { TestProgram } from 'libs/testing'; -import type { Evaluator } from "./model"; +import type { Evaluator } from './model'; export abstract class GoTestProgram implements TestProgram { - constructor(protected readonly program: Evaluator) {} + constructor(protected readonly program: Evaluator) {} - protected abstract generateCaseExecutionCode(input: I): string + protected abstract generateCaseExecutionCode(input: I): string; - async run(ctx: Context, input: I): Promise { - const result = await this.program( - ctx.signal, - this.generateCaseExecutionCode(input) - ); - if (isErr(result)) { - throw new Error(result.error); - } - return result.value; - } + async run(ctx: Context, input: I): Promise { + const result = await this.program(ctx.signal, this.generateCaseExecutionCode(input)); + if (isErr(result)) { + throw new Error(result.error); + } + return result.value; + } } diff --git a/packages/go-runtime/src/index.ts b/packages/go-runtime/src/index.ts index 26965bca..588a8220 100644 --- a/packages/go-runtime/src/index.ts +++ b/packages/go-runtime/src/index.ts @@ -1,8 +1,8 @@ -export * from "./model.js"; -export * from "./compiler-factory.js"; -export * from "./go-compiler-factory.js"; -export * from "./go-evaluator-factory.js"; -export * from "./go-executor-factory.js"; -export * from "./go-test-program.js"; -export * from "./go-program.js"; -export * from "./version.js"; +export * from './model.js'; +export * from './compiler-factory.js'; +export * from './go-compiler-factory.js'; +export * from './go-evaluator-factory.js'; +export * from './go-executor-factory.js'; +export * from './go-test-program.js'; +export * from './go-program.js'; +export * from './version.js'; diff --git a/packages/go-runtime/src/model.ts b/packages/go-runtime/src/model.ts index 868f663e..c3a26962 100644 --- a/packages/go-runtime/src/model.ts +++ b/packages/go-runtime/src/model.ts @@ -1,56 +1,40 @@ -import type { Context } from "libs/context"; -import type { Result } from "libs/result"; -import type { Reader, Streams, Writer } from "libs/io"; +import type { Context } from 'libs/context'; +import type { Result } from 'libs/result'; +import type { Reader, Streams, Writer } from 'libs/io'; export enum LogLevel { - Disabled = -8, - Debug = -4, - Info = 0, - Warn = 4, - Error = 8, + Disabled = -8, + Debug = -4, + Info = 0, + Warn = 4, + Error = 8 } export interface LoggerConfig { - level: LogLevel; - console: globalThis.Console; + level: LogLevel; + console: globalThis.Console; } export interface CompilerConfig { - logger: LoggerConfig; - stdin: Reader; - stdout: Writer; - stderr: Writer; + logger: LoggerConfig; + stdin: Reader; + stdout: Writer; + stderr: Writer; } -export type Evaluator = ( - signal: AbortSignal, - code: string -) => Promise>; +export type Evaluator = (signal: AbortSignal, code: string) => Promise>; export type Executor = (signal: AbortSignal) => Promise>; export interface Compiler { - createEvaluator( - signal: AbortSignal, - code: string - ): Promise, string>>; - createExecutor( - signal: AbortSignal, - code: string - ): Promise>; + createEvaluator(signal: AbortSignal, code: string): Promise, string>>; + createExecutor(signal: AbortSignal, code: string): Promise>; } -export type CompilerFactory = ( - config: CompilerConfig -) => Result; +export type CompilerFactory = (config: CompilerConfig) => Result; export type GoCompilerFactory = (streams: Streams) => Compiler; -export type GoProgramFactory = ( - ctx: Context, - streams: Streams, - code: string -) => Promise; +export type GoProgramFactory = (ctx: Context, streams: Streams, code: string) => Promise; -export const DEFAULT_GLOBAL_COMPILER_INIT_FUNCTION_NAME = - "__compiler_init_function"; +export const DEFAULT_GLOBAL_COMPILER_INIT_FUNCTION_NAME = '__compiler_init_function'; diff --git a/packages/go-runtime/src/version.ts b/packages/go-runtime/src/version.ts index d820c7c3..b3e74aaa 100644 --- a/packages/go-runtime/src/version.ts +++ b/packages/go-runtime/src/version.ts @@ -1 +1 @@ -export const version = "1.24.13"; +export const version = '1.24.13'; diff --git a/packages/go-runtime/tsconfig.json b/packages/go-runtime/tsconfig.json index f24b28b0..9b7fb8cc 100644 --- a/packages/go-runtime/tsconfig.json +++ b/packages/go-runtime/tsconfig.json @@ -1,16 +1,10 @@ { - "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", - "compilerOptions": { - "lib": [ - "ES2022", - "ESNext.Disposable", - "DOM" - ], - "noUncheckedIndexedAccess": false, - "rootDir": "src", - "types": ["vite/client", "golang-wasm-exec"] - }, - "include": [ - "src/**/*" - ], -} \ No newline at end of file + "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", + "compilerOptions": { + "lib": ["ES2022", "ESNext.Disposable", "DOM"], + "noUncheckedIndexedAccess": false, + "rootDir": "src", + "types": ["vite/client", "golang-wasm-exec"] + }, + "include": ["src/**/*"] +} diff --git a/packages/go-runtime/vite.config.js b/packages/go-runtime/vite.config.js index 8ac4ed8e..b98cdfeb 100644 --- a/packages/go-runtime/vite.config.js +++ b/packages/go-runtime/vite.config.js @@ -1,32 +1,32 @@ -import { resolve } from "path"; -import { defineConfig } from "vite"; -import dts from "vite-plugin-dts"; +import { resolve } from 'path'; +import { defineConfig } from 'vite'; +import dts from 'vite-plugin-dts'; export default defineConfig({ - build: { - lib: { - // Could also be a dictionary or array of multiple entry points - entry: { - index: resolve(__dirname, "src/index.ts"), - version: resolve(__dirname, "src/version.ts"), - }, - formats: ["es"], - // name: "MyLib", - // the proper extensions will be added - // fileName: "index", - }, - rollupOptions: { - // make sure to externalize deps that shouldn't be bundled - // into your library - external: [/^libs\//], - output: { - // Provide global variables to use in the UMD build - // for externalized deps - globals: { - // vue: "Vue", - }, - }, - }, - }, - plugins: [dts()], + build: { + lib: { + // Could also be a dictionary or array of multiple entry points + entry: { + index: resolve(import.meta.dirname, 'src/index.ts'), + version: resolve(import.meta.dirname, 'src/version.ts') + }, + formats: ['es'] + // name: "MyLib", + // the proper extensions will be added + // fileName: "index", + }, + rollupOptions: { + // make sure to externalize deps that shouldn't be bundled + // into your library + external: [/^libs\//], + output: { + // Provide global variables to use in the UMD build + // for externalized deps + globals: { + // vue: "Vue", + } + } + } + }, + plugins: [dts()] }); diff --git a/packages/java-runtime/build.mjs b/packages/java-runtime/build.mjs index dc2b2aa3..e2081614 100644 --- a/packages/java-runtime/build.mjs +++ b/packages/java-runtime/build.mjs @@ -1,56 +1,56 @@ -import esbuild from "esbuild"; -import fs from "fs/promises"; -import { exec } from "child_process"; +import esbuild from 'esbuild'; +import fs from 'fs/promises'; +import { exec } from 'child_process'; -await fs.rm("dist", { recursive: true, force: true }); -await fs.rm("tsconfig.tsbuildinfo", { force: true }); +await fs.rm('dist', { recursive: true, force: true }); +await fs.rm('tsconfig.tsbuildinfo', { force: true }); -console.log("Build main bundle..."); +console.log('Build main bundle...'); await esbuild - .build({ - outdir: "dist", - entryPoints: ["src/index.ts"], - bundle: true, - sourcemap: "external", - inject: ["src/bfs-shim.js"], - format: "esm", - target: "es2022", - define: { - global: "{}", - setImmediate: "queueMicrotask", - }, - alias: { - buffer: "browserfs/dist/shims/buffer", - fs: "browserfs/dist/shims/fs", - path: "browserfs/dist/shims/path", - processGlobal: "browserfs/dist/shims/process.js", - bufferGlobal: "browserfs/dist/shims/bufferGlobal.js", - bfsGlobal: "browserfs", - }, - external: ["libs/*"], - }) - .catch(() => process.exit(1)); + .build({ + outdir: 'dist', + entryPoints: ['src/index.ts'], + bundle: true, + sourcemap: 'external', + inject: ['src/bfs-shim.js'], + format: 'esm', + target: 'es2022', + define: { + global: '{}', + setImmediate: 'queueMicrotask' + }, + alias: { + buffer: 'browserfs/dist/shims/buffer', + fs: 'browserfs/dist/shims/fs', + path: 'browserfs/dist/shims/path', + processGlobal: 'browserfs/dist/shims/process.js', + bufferGlobal: 'browserfs/dist/shims/bufferGlobal.js', + bfsGlobal: 'browserfs' + }, + external: ['libs/*'] + }) + .catch(() => process.exit(1)); -console.log("Build version bundle..."); +console.log('Build version bundle...'); await esbuild.build({ - outdir: "dist", - entryPoints: ["src/version.ts"], - bundle: true, - sourcemap: "external", - format: "esm", - target: "es2022", + outdir: 'dist', + entryPoints: ['src/version.ts'], + bundle: true, + sourcemap: 'external', + format: 'esm', + target: 'es2022' }); -console.log("Generate typescript definitions..."); +console.log('Generate typescript definitions...'); await new Promise((resolve, reject) => { - exec("npx tsc", (error) => { - if (error) { - reject(error); - return; - } - resolve(); - }); + exec('npx tsc', (error) => { + if (error) { + reject(error); + return; + } + resolve(); + }); }); -console.log("Copy doppio.zip..."); -await fs.cp("src/vendor/doppio.zip", "dist/doppio/doppio.zip", { force: true }); +console.log('Copy doppio.zip...'); +await fs.cp('src/vendor/doppio.zip', 'dist/doppio/doppio.zip', { force: true }); diff --git a/packages/java-runtime/package.json b/packages/java-runtime/package.json index c106ad71..428487f7 100644 --- a/packages/java-runtime/package.json +++ b/packages/java-runtime/package.json @@ -1,24 +1,26 @@ { - "name": "java-runtime", - "private": true, - "version": "1.0.0", - "type": "module", - "scripts": { - "check": "tsc", - "prebuild": "./artifacts.sh", - "build": "node build.mjs" - }, - "dependencies": { - "browserfs": "^1.4.3", - "doppiojvm": "^0.5.0", - "libs": "workspace:*" - }, - "devDependencies": { - "esbuild": "~0.28.0" - }, - "exports": { - ".": "./dist/index.js", - "./version": "./dist/version.js", - "./doppio.zip": "./dist/doppio/doppio.zip" - } -} \ No newline at end of file + "name": "java-runtime", + "version": "1.0.0", + "private": true, + "type": "module", + "exports": { + ".": "./dist/index.js", + "./version": "./dist/version.js", + "./doppio.zip": "./dist/doppio/doppio.zip" + }, + "scripts": { + "check": "tsc", + "prebuild": "./artifacts.sh", + "build": "node build.mjs", + "format": "oxfmt", + "format:check": "oxfmt --check ." + }, + "dependencies": { + "browserfs": "^1.4.3", + "doppiojvm": "^0.5.0", + "libs": "workspace:*" + }, + "devDependencies": { + "esbuild": "~0.28.2" + } +} diff --git a/packages/java-runtime/probe/build.ts b/packages/java-runtime/probe/build.ts index 184c8758..923c26e2 100644 --- a/packages/java-runtime/probe/build.ts +++ b/packages/java-runtime/probe/build.ts @@ -1,27 +1,27 @@ -import esbuild from "esbuild"; +import esbuild from 'esbuild'; esbuild - .build({ - entryPoints: ["src/index.ts"], // Adjust this to your main entry point - inject: ["src/bfs-shim.js"], - bundle: true, - outfile: "dist/bundle.js", // Adjust the output file as needed - format: "esm", - target: "es2022", - define: { - global: "{}", - setImmediate: "queueMicrotask", - }, - loader: { - ".java": "text" - }, - alias: { - buffer: "browserfs/dist/shims/buffer", - fs: "browserfs/dist/shims/fs", - path: "browserfs/dist/shims/path", - processGlobal: "browserfs/dist/shims/process.js", - bufferGlobal: "browserfs/dist/shims/bufferGlobal.js", - bfsGlobal: "browserfs", - }, - }) - .catch(() => process.exit(1)); + .build({ + entryPoints: ['src/index.ts'], // Adjust this to your main entry point + inject: ['src/bfs-shim.js'], + bundle: true, + outfile: 'dist/bundle.js', // Adjust the output file as needed + format: 'esm', + target: 'es2022', + define: { + global: '{}', + setImmediate: 'queueMicrotask' + }, + loader: { + '.java': 'text' + }, + alias: { + buffer: 'browserfs/dist/shims/buffer', + fs: 'browserfs/dist/shims/fs', + path: 'browserfs/dist/shims/path', + processGlobal: 'browserfs/dist/shims/process.js', + bufferGlobal: 'browserfs/dist/shims/bufferGlobal.js', + bfsGlobal: 'browserfs' + } + }) + .catch(() => process.exit(1)); diff --git a/packages/java-runtime/probe/index.html b/packages/java-runtime/probe/index.html index 5b9c16d3..51a1e9f1 100644 --- a/packages/java-runtime/probe/index.html +++ b/packages/java-runtime/probe/index.html @@ -1,11 +1,11 @@ - + - - - - Java probe - - - - + + + + Java probe + + + + diff --git a/packages/java-runtime/probe/package.json b/packages/java-runtime/probe/package.json index 3202a71c..3e1ca704 100644 --- a/packages/java-runtime/probe/package.json +++ b/packages/java-runtime/probe/package.json @@ -1,23 +1,23 @@ { - "name": "java-probe", - "private": true, - "version": "1.0.0", - "type": "module", - "scripts": { - "dev": "vite", - "build": "vite build", - "preview": "vite preview" - }, - "dependencies": { - "async": "^1.5.2", - "browserfs": "^1.4.3", - "doppiojvm": "^0.5.0" - }, - "devDependencies": { - "@rollup/plugin-inject": "^5.0.5", - "@types/async": "1.4.28", - "esbuild": "^0.23.0", - "typescript": "^5.5.4", - "vite": "^5.3.3" - } + "name": "java-probe", + "version": "1.0.0", + "private": true, + "type": "module", + "scripts": { + "dev": "vite", + "build": "vite build", + "preview": "vite preview" + }, + "dependencies": { + "async": "^1.5.2", + "browserfs": "^1.4.3", + "doppiojvm": "^0.5.0" + }, + "devDependencies": { + "@rollup/plugin-inject": "^5.0.5", + "@types/async": "1.4.28", + "esbuild": "^0.23.0", + "typescript": "^5.5.4", + "vite": "^5.3.3" + } } diff --git a/packages/java-runtime/probe/src/assert.ts b/packages/java-runtime/probe/src/assert.ts index df07b6d5..e842db6d 100644 --- a/packages/java-runtime/probe/src/assert.ts +++ b/packages/java-runtime/probe/src/assert.ts @@ -1,18 +1,14 @@ -import Doppio from "doppiojvm"; +import Doppio from 'doppiojvm'; /** * Checks the given assertion. Throws an error if it fails. */ export default function assert( - assertion: boolean, - msg?: string, - thread?: Doppio.VM.Threading.JVMThread + assertion: boolean, + msg?: string, + thread?: Doppio.VM.Threading.JVMThread ) { - if (!assertion) { - throw new Error( - `Assertion failed: ${msg}\n${ - thread ? thread.getPrintableStackTrace() : "" - }` - ); - } + if (!assertion) { + throw new Error(`Assertion failed: ${msg}\n${thread ? thread.getPrintableStackTrace() : ''}`); + } } diff --git a/packages/java-runtime/probe/src/bfs-shim.js b/packages/java-runtime/probe/src/bfs-shim.js index 032c6bc4..5bc97e7c 100644 --- a/packages/java-runtime/probe/src/bfs-shim.js +++ b/packages/java-runtime/probe/src/bfs-shim.js @@ -1,3 +1,3 @@ import BrowserFS from 'browserfs'; -export { BrowserFS } +export { BrowserFS }; diff --git a/packages/java-runtime/probe/src/bootstap-class-loader.ts b/packages/java-runtime/probe/src/bootstap-class-loader.ts index 3cedfd58..98e15072 100644 --- a/packages/java-runtime/probe/src/bootstap-class-loader.ts +++ b/packages/java-runtime/probe/src/bootstap-class-loader.ts @@ -1,29 +1,25 @@ -import Doppio from 'doppiojvm' +import Doppio from 'doppiojvm'; export function makeBootstrapClassLoaderFactory( - cache: Map + cache: Map ) { - return ( - javaHome: string, - classPaths: string[], - next: (err?: any) => void - ) => { - const key = `${javaHome}:${classPaths.join(";")}`; - const cached = cache.get(key); - if (cached !== undefined) { - console.log("Using cached bootstrap class loader"); - setTimeout(next, 0); - return cached; - } - if (cache.size > 0) { - cache.clear(); - } - const bootstrapClassLoader = new Doppio.VM.ClassFile.BootstrapClassLoader( - javaHome, - classPaths, - next - ); - cache.set(key, bootstrapClassLoader); - return bootstrapClassLoader; - }; + return (javaHome: string, classPaths: string[], next: (err?: any) => void) => { + const key = `${javaHome}:${classPaths.join(';')}`; + const cached = cache.get(key); + if (cached !== undefined) { + console.log('Using cached bootstrap class loader'); + setTimeout(next, 0); + return cached; + } + if (cache.size > 0) { + cache.clear(); + } + const bootstrapClassLoader = new Doppio.VM.ClassFile.BootstrapClassLoader( + javaHome, + classPaths, + next + ); + cache.set(key, bootstrapClassLoader); + return bootstrapClassLoader; + }; } diff --git a/packages/java-runtime/probe/src/fs.ts b/packages/java-runtime/probe/src/fs.ts index 7d8a813b..7b1891be 100644 --- a/packages/java-runtime/probe/src/fs.ts +++ b/packages/java-runtime/probe/src/fs.ts @@ -1,78 +1,73 @@ -import BrowserFS from "browserfs"; +import BrowserFS from 'browserfs'; -import type { FSModule } from "browserfs/dist/node/core/FS"; +import type { FSModule } from 'browserfs/dist/node/core/FS'; export { FSModule }; -const path = BrowserFS.BFSRequire("path"); -const fs = BrowserFS.BFSRequire("fs"); -const { Buffer } = BrowserFS.BFSRequire("buffer"); +const path = BrowserFS.BFSRequire('path'); +const fs = BrowserFS.BFSRequire('fs'); +const { Buffer } = BrowserFS.BFSRequire('buffer'); function copyFile(srcFile: string, destFile: string) { - fs.writeFileSync(destFile, fs.readFileSync(srcFile)); + fs.writeFileSync(destFile, fs.readFileSync(srcFile)); } function recursiveCopy(srcFolder: string, destFolder: string) { - function processDir(srcFolder: string, destFolder: string) { - try { - fs.mkdirSync(destFolder); - } catch (err) { - // Ignore EEXIST. - if ( - err && - typeof err === "object" && - "code" in err && - err.code !== "EEXIST" - ) { - throw err; - } - } - for (let item of fs.readdirSync(srcFolder)) { - const srcItem = path.resolve(srcFolder, item), - destItem = path.resolve(destFolder, item), - stat = fs.statSync(srcItem); - if (stat.isDirectory()) { - processDir(srcItem, destItem); - } else { - copyFile(srcItem, destItem); - } - } - } - processDir(srcFolder, destFolder); + function processDir(srcFolder: string, destFolder: string) { + try { + fs.mkdirSync(destFolder); + } catch (err) { + // Ignore EEXIST. + if (err && typeof err === 'object' && 'code' in err && err.code !== 'EEXIST') { + throw err; + } + } + for (let item of fs.readdirSync(srcFolder)) { + const srcItem = path.resolve(srcFolder, item), + destItem = path.resolve(destFolder, item), + stat = fs.statSync(srcItem); + if (stat.isDirectory()) { + processDir(srcItem, destItem); + } else { + copyFile(srcItem, destItem); + } + } + } + processDir(srcFolder, destFolder); } export async function initFs(libZipData: ArrayBuffer): Promise { - await new Promise((resolve, reject) => - BrowserFS.configure( - { - fs: "MountableFileSystem", - options: { - "/tmp": { - fs: "InMemory", - options: {}, - }, - "/home": { - fs: "InMemory", - options: {}, - }, - "/zip": { - fs: "ZipFS", - options: { - zipData: Buffer.from(libZipData), - }, - }, - "/sys": { - fs: "InMemory", - options: {}, - }, - }, - }, - (e) => (e ? reject(e) : resolve()) - ) - ); - recursiveCopy("/zip", "/sys"); - return fs; + await new Promise((resolve, reject) => + BrowserFS.configure( + { + fs: 'MountableFileSystem', + options: { + '/tmp': { + fs: 'InMemory', + options: {} + }, + '/home': { + fs: 'InMemory', + options: {} + }, + '/zip': { + fs: 'ZipFS', + options: { + zipData: Buffer.from(libZipData) + } + }, + '/sys': { + fs: 'InMemory', + options: {} + } + } + }, + (e) => (e ? reject(e) : resolve()) + ) + ); + recursiveCopy('/zip', '/sys'); + return fs; } export function ls(path: string) { - fs.readdirSync(path).forEach((file) => console.log(file)); + fs.readdirSync(path).forEach((file) => console.log(file)); } diff --git a/packages/java-runtime/probe/src/index.ts b/packages/java-runtime/probe/src/index.ts index 4d1b9421..4e79f7c8 100644 --- a/packages/java-runtime/probe/src/index.ts +++ b/packages/java-runtime/probe/src/index.ts @@ -1,110 +1,99 @@ -import BrowserFS from "browserfs"; +import BrowserFS from 'browserfs'; // import { makeJVMFactory } from "./jvm"; -import { createJVM, util, JVMThread } from "./jvm"; -import { initFs, ls } from "./fs"; +import { createJVM, util, JVMThread } from './jvm'; +import { initFs, ls } from './fs'; //@ts-ignore -import javaCode from "./Probe.java?raw"; +import javaCode from './Probe.java?raw'; // import { makeBootstrapClassLoaderFactory } from './bootstap-class-loader'; -const data = await fetch("/doppio.zip").then((res) => res.arrayBuffer()); +const data = await fetch('/doppio.zip').then((res) => res.arrayBuffer()); const fs = await initFs(data); -console.time("Run"); +console.time('Run'); -ls("/sys"); +ls('/sys'); // const createJVM = makeJVMFactory( // makeBootstrapClassLoaderFactory(new Map()) // ) let jvm = await createJVM({ - doppioHomePath: "/sys", - classpath: ["/home", "/sys/classes"], + doppioHomePath: '/sys', + classpath: ['/home', '/sys/classes'] }); console.log(jvm); // Grab BrowserFS's 'process' module, which emulates NodeJS's process. -var process = BrowserFS.BFSRequire("process"); +var process = BrowserFS.BFSRequire('process'); // Initialize TTYs; required if needed to be initialized immediately due to // circular dependency issue. // See: https://github.com/jvilk/bfs-process#stdinstdoutstderr // process.initializeTTYs(); -process.stdout.on("data", function (data) { - // data is a Node Buffer, which BrowserFS implements in the browser. - // http://nodejs.org/api/buffer.html - console.log(data.toString()); +process.stdout.on('data', function (data) { + // data is a Node Buffer, which BrowserFS implements in the browser. + // http://nodejs.org/api/buffer.html + console.log(data.toString()); }); -process.stderr.on("data", function (data) { - // data is a Node Buffer, which BrowserFS implements in the browser. - // http://nodejs.org/api/buffer.html - console.log(data.toString()); +process.stderr.on('data', function (data) { + // data is a Node Buffer, which BrowserFS implements in the browser. + // http://nodejs.org/api/buffer.html + console.log(data.toString()); }); // Write text to standard in. // process.stdin.write('Some text'); -fs.writeFileSync("/home/Probe.java", javaCode); +fs.writeFileSync('/home/Probe.java', javaCode); await new Promise((resolve, reject) => - jvm.runClass("util.Javac", ["/home/Probe.java"], (code) => { - if (code === 0) { - resolve(0); - } else { - reject(code); - } - }) + jvm.runClass('util.Javac', ['/home/Probe.java'], (code) => { + if (code === 0) { + resolve(0); + } else { + reject(code); + } + }) ); -ls("/home"); +ls('/home'); jvm = await createJVM({ - doppioHomePath: "/sys", - classpath: ["/home", "/sys/classes"], + doppioHomePath: '/sys', + classpath: ['/home', '/sys/classes'] }); jvm.registerNatives({ - Probe: { - "getStringArg()Ljava/lang/String;": function ( - thread: JVMThread - ) { - return util.initString(thread.getBsCl(), "FRIDAY"); - }, - "saveNumber(I)V": function (thread: JVMThread, arg0: number) { - console.log("Number: ", arg0); - }, - "saveString(Ljava/lang/String;)V": function ( - thread: JVMThread, - arg0: string - ) { - console.log("String: ", arg0.toString()); - }, - "saveArray([I)V": function ( - thread: JVMThread, - arg0: number[] - ) { - console.log("Array: ", arg0); - }, - "saveEnum(LDayOfWeek;)V": function ( - thread: JVMThread, - arg0: object - ) { - console.log("Enum: ", arg0); - }, - }, + Probe: { + 'getStringArg()Ljava/lang/String;': function (thread: JVMThread) { + return util.initString(thread.getBsCl(), 'FRIDAY'); + }, + 'saveNumber(I)V': function (thread: JVMThread, arg0: number) { + console.log('Number: ', arg0); + }, + 'saveString(Ljava/lang/String;)V': function (thread: JVMThread, arg0: string) { + console.log('String: ', arg0.toString()); + }, + 'saveArray([I)V': function (thread: JVMThread, arg0: number[]) { + console.log('Array: ', arg0); + }, + 'saveEnum(LDayOfWeek;)V': function (thread: JVMThread, arg0: object) { + console.log('Enum: ', arg0); + } + } }); await new Promise((resolve, reject) => - jvm.runClass("Probe", [], (code) => { - if (code === 0) { - resolve(0); - } else { - reject(code); - } - }) + jvm.runClass('Probe', [], (code) => { + if (code === 0) { + resolve(0); + } else { + reject(code); + } + }) ); -console.timeEnd("Run"); +console.timeEnd('Run'); -ls("/home"); +ls('/home'); diff --git a/packages/java-runtime/probe/src/jvm.ts b/packages/java-runtime/probe/src/jvm.ts index 1dd592ed..214ef46e 100644 --- a/packages/java-runtime/probe/src/jvm.ts +++ b/packages/java-runtime/probe/src/jvm.ts @@ -1,343 +1,323 @@ -import Doppio from "doppiojvm"; +import Doppio from 'doppiojvm'; -import { ThreadPool } from "./threadpool"; -import JVMTypes from "./vendor/includes/JVMTypes"; +import { ThreadPool } from './threadpool'; +import JVMTypes from './vendor/includes/JVMTypes'; export type JVMThread = Doppio.VM.Threading.JVMThread; export const { - VM: { Util: util }, + VM: { Util: util } } = Doppio; // XXX: We currently initialize these classes at JVM bootup. This is expensive. // We should attempt to prune this list as much as possible. const coreClasses = [ - "Ljava/lang/String;", - "Ljava/lang/Class;", - "Ljava/lang/ClassLoader;", - "Ljava/lang/reflect/Constructor;", - "Ljava/lang/reflect/Field;", - "Ljava/lang/reflect/Method;", - "Ljava/lang/Error;", - "Ljava/lang/StackTraceElement;", - "Ljava/lang/System;", - "Ljava/lang/Thread;", - "Ljava/lang/ThreadGroup;", - "Ljava/lang/Throwable;", - "Ljava/nio/ByteOrder;", - "Lsun/misc/VM;", - "Lsun/reflect/ConstantPool;", - "Ljava/lang/Byte;", - "Ljava/lang/Character;", - "Ljava/lang/Double;", - "Ljava/lang/Float;", - "Ljava/lang/Integer;", - "Ljava/lang/Long;", - "Ljava/lang/Short;", - "Ljava/lang/Void;", - "Ljava/io/FileDescriptor;", - "Ljava/lang/Boolean;", - "[Lsun/management/MemoryManagerImpl;", - "[Lsun/management/MemoryPoolImpl;", - // Contains important FS constants used by natives. These constants are - // inlined into JCL class files, so it typically never gets initialized - // implicitly by the JVM. - "Lsun/nio/fs/UnixConstants;", + 'Ljava/lang/String;', + 'Ljava/lang/Class;', + 'Ljava/lang/ClassLoader;', + 'Ljava/lang/reflect/Constructor;', + 'Ljava/lang/reflect/Field;', + 'Ljava/lang/reflect/Method;', + 'Ljava/lang/Error;', + 'Ljava/lang/StackTraceElement;', + 'Ljava/lang/System;', + 'Ljava/lang/Thread;', + 'Ljava/lang/ThreadGroup;', + 'Ljava/lang/Throwable;', + 'Ljava/nio/ByteOrder;', + 'Lsun/misc/VM;', + 'Lsun/reflect/ConstantPool;', + 'Ljava/lang/Byte;', + 'Ljava/lang/Character;', + 'Ljava/lang/Double;', + 'Ljava/lang/Float;', + 'Ljava/lang/Integer;', + 'Ljava/lang/Long;', + 'Ljava/lang/Short;', + 'Ljava/lang/Void;', + 'Ljava/io/FileDescriptor;', + 'Ljava/lang/Boolean;', + '[Lsun/management/MemoryManagerImpl;', + '[Lsun/management/MemoryPoolImpl;', + // Contains important FS constants used by natives. These constants are + // inlined into JCL class files, so it typically never gets initialized + // implicitly by the JVM. + 'Lsun/nio/fs/UnixConstants;' ]; export type BootstrapClassLoaderFactory = ( - javaHome: string, - classPaths: string[], - next: (err?: any) => void + javaHome: string, + classPaths: string[], + next: (err?: any) => void ) => Doppio.VM.ClassFile.BootstrapClassLoader; //@ts-expect-error private method override export class JVM extends Doppio.VM.JVM { - public static bootstrapClassLoaderFactory: BootstrapClassLoaderFactory; + public static bootstrapClassLoaderFactory: BootstrapClassLoaderFactory; - override _initSystemProperties( - bootstrapClasspath: string[], - javaClassPath: string[], - javaHomePath: string, - tmpDir: string, - opts: { [name: string]: string } - ): void { - // @ts-expect-error hack - super._initSystemProperties( - bootstrapClasspath, - javaClassPath, - javaHomePath, - tmpDir, - opts - ); + override _initSystemProperties( + bootstrapClasspath: string[], + javaClassPath: string[], + javaHomePath: string, + tmpDir: string, + opts: { [name: string]: string } + ): void { + // @ts-expect-error hack + super._initSystemProperties(bootstrapClasspath, javaClassPath, javaHomePath, tmpDir, opts); - let bootupTasks: { (next: (err?: any) => void): void }[] = [], - firstThread: Doppio.VM.Threading.JVMThread, - firstThreadObj: JVMTypes.java_lang_Thread; - /** - * Task #1: Initialize native methods. - */ - bootupTasks.push((next: (err?: any) => void): void => { - console.time("Task 1"); - //@ts-expect-error private method - this.initializeNatives(next); - }); + let bootupTasks: { (next: (err?: any) => void): void }[] = [], + firstThread: Doppio.VM.Threading.JVMThread, + firstThreadObj: JVMTypes.java_lang_Thread; + /** + * Task #1: Initialize native methods. + */ + bootupTasks.push((next: (err?: any) => void): void => { + console.time('Task 1'); + //@ts-expect-error private method + this.initializeNatives(next); + }); - /** - * Task #2: Construct the bootstrap class loader. - */ - bootupTasks.push((next: (err?: any) => void): void => { - console.timeEnd("Task 1"); - console.time("Task 2"); - //@ts-expect-error private property - this.bsCl = JVM.bootstrapClassLoaderFactory( - //@ts-expect-error private property - this.systemProperties["java.home"], - bootstrapClasspath, - next - ); - }); + /** + * Task #2: Construct the bootstrap class loader. + */ + bootupTasks.push((next: (err?: any) => void): void => { + console.timeEnd('Task 1'); + console.time('Task 2'); + //@ts-expect-error private property + this.bsCl = JVM.bootstrapClassLoaderFactory( + //@ts-expect-error private property + this.systemProperties['java.home'], + bootstrapClasspath, + next + ); + }); - /** - * Task #3: Construct the thread pool, resolve thread class, and construct - * the first thread. - */ - bootupTasks.push((next: (err?: any) => void): void => { - console.timeEnd("Task 2"); - console.time("Task 3"); - //@ts-expect-error private property - this.threadPool = new ThreadPool( - (): boolean => { - //@ts-expect-error private method - return this.threadPoolIsEmpty(); - } - ); - // Resolve Ljava/lang/Thread so we can fake a thread. - // NOTE: This should never actually use the Thread object unless - // there's an error loading java/lang/Thread and associated classes. - //@ts-expect-error private property - this.bsCl.resolveClass( - null, - "Ljava/lang/Thread;", - ( - threadCdata: Doppio.VM.ClassFile.ReferenceClassData - ) => { - if (threadCdata == null) { - // Failed. - next("Failed to resolve java/lang/Thread."); - } else { - // Construct a thread. - // @ts-expect-error implementation error - firstThreadObj = new (threadCdata.getConstructor(null))(null); - firstThreadObj.$thread = - firstThread = - //@ts-expect-error private property - this.firstThread = - new Doppio.VM.Threading.JVMThread( - //@ts-expect-error error - this, - //@ts-expect-error private property - this.threadPool, - firstThreadObj - ); - firstThreadObj.ref = 1; - firstThreadObj["java/lang/Thread/priority"] = 5; - firstThreadObj["java/lang/Thread/name"] = Doppio.VM.Util.initCarr( - //@ts-expect-error private property - this.bsCl, - "main" - ); - firstThreadObj["java/lang/Thread/blockerLock"] = new ((< - Doppio.VM.ClassFile.ReferenceClassData //@ts-expect-error private property - >this.bsCl.getResolvedClass("Ljava/lang/Object;")).getConstructor(firstThread))(firstThread); - next(); - } - } - ); - }); + /** + * Task #3: Construct the thread pool, resolve thread class, and construct + * the first thread. + */ + bootupTasks.push((next: (err?: any) => void): void => { + console.timeEnd('Task 2'); + console.time('Task 3'); + //@ts-expect-error private property + this.threadPool = new ThreadPool((): boolean => { + //@ts-expect-error private method + return this.threadPoolIsEmpty(); + }); + // Resolve Ljava/lang/Thread so we can fake a thread. + // NOTE: This should never actually use the Thread object unless + // there's an error loading java/lang/Thread and associated classes. + //@ts-expect-error private property + this.bsCl.resolveClass( + null, + 'Ljava/lang/Thread;', + (threadCdata: Doppio.VM.ClassFile.ReferenceClassData) => { + if (threadCdata == null) { + // Failed. + next('Failed to resolve java/lang/Thread.'); + } else { + // Construct a thread. + // @ts-expect-error implementation error + firstThreadObj = new (threadCdata.getConstructor(null))(null); + firstThreadObj.$thread = + firstThread = + //@ts-expect-error private property + this.firstThread = + new Doppio.VM.Threading.JVMThread( + //@ts-expect-error error + this, + //@ts-expect-error private property + this.threadPool, + firstThreadObj + ); + firstThreadObj.ref = 1; + firstThreadObj['java/lang/Thread/priority'] = 5; + firstThreadObj['java/lang/Thread/name'] = Doppio.VM.Util.initCarr( + //@ts-expect-error private property + this.bsCl, + 'main' + ); + firstThreadObj['java/lang/Thread/blockerLock'] = new ((< + Doppio.VM.ClassFile.ReferenceClassData //@ts-expect-error private property + >this.bsCl.getResolvedClass('Ljava/lang/Object;')).getConstructor(firstThread))(firstThread); + next(); + } + } + ); + }); - /** - * Task #4: Preinitialize some essential JVM classes, and initializes the - * JVM's ThreadGroup once that class is initialized. - */ - bootupTasks.push((next: (err?: any) => void): void => { - console.timeEnd("Task 3"); - console.time("Task 4"); - Doppio.VM.Util.asyncForEach( - coreClasses, - (coreClass: string, nextItem: (err?: any) => void) => { - //@ts-expect-error private property - this.bsCl.initializeClass( - firstThread, - coreClass, - (cdata: Doppio.VM.ClassFile.ClassData) => { - if (cdata == null) { - nextItem(`Failed to initialize ${coreClass}`); - } else { - // One of the later preinitialized classes references Thread.group. - // Initialize the system's ThreadGroup now. - if (coreClass === "Ljava/lang/ThreadGroup;") { - // Construct a ThreadGroup object for the first thread. - var threadGroupCons = (< - Doppio.VM.ClassFile.ReferenceClassData - >cdata).getConstructor(firstThread), - groupObj = new threadGroupCons(firstThread); - groupObj["()V"]( - firstThread, - //@ts-expect-error implementation error - null, - (e?: JVMTypes.java_lang_Throwable) => { - // Tell the initial thread to use this group. - firstThreadObj["java/lang/Thread/group"] = groupObj; - nextItem(e); - } - ); - } else { - nextItem(); - } - } - } - ); - }, - next - ); - }); + /** + * Task #4: Preinitialize some essential JVM classes, and initializes the + * JVM's ThreadGroup once that class is initialized. + */ + bootupTasks.push((next: (err?: any) => void): void => { + console.timeEnd('Task 3'); + console.time('Task 4'); + Doppio.VM.Util.asyncForEach( + coreClasses, + (coreClass: string, nextItem: (err?: any) => void) => { + //@ts-expect-error private property + this.bsCl.initializeClass( + firstThread, + coreClass, + (cdata: Doppio.VM.ClassFile.ClassData) => { + if (cdata == null) { + nextItem(`Failed to initialize ${coreClass}`); + } else { + // One of the later preinitialized classes references Thread.group. + // Initialize the system's ThreadGroup now. + if (coreClass === 'Ljava/lang/ThreadGroup;') { + // Construct a ThreadGroup object for the first thread. + var threadGroupCons = (< + Doppio.VM.ClassFile.ReferenceClassData + >cdata).getConstructor(firstThread), + groupObj = new threadGroupCons(firstThread); + groupObj['()V']( + firstThread, + //@ts-expect-error implementation error + null, + (e?: JVMTypes.java_lang_Throwable) => { + // Tell the initial thread to use this group. + firstThreadObj['java/lang/Thread/group'] = groupObj; + nextItem(e); + } + ); + } else { + nextItem(); + } + } + } + ); + }, + next + ); + }); - /** - * Task #5: Initialize the system class. - */ - bootupTasks.push((next: (err?: any) => void): void => { - console.timeEnd("Task 4"); - console.time("Task 5"); - // Initialize the system class (initializes things like println/etc). - var sysInit = ( - (>( - //@ts-expect-error private property - this.bsCl.getInitializedClass(firstThread, "Ljava/lang/System;") - )).getConstructor(firstThread) - ); - sysInit["java/lang/System/initializeSystemClass()V"]( - firstThread, - //@ts-expect-error implementation error - null, - (e) => { - console.log("Task 5 callback", e); - console.log(e?.["toString()Ljava/lang/String;"]); - next(e); - } - ); - }); + /** + * Task #5: Initialize the system class. + */ + bootupTasks.push((next: (err?: any) => void): void => { + console.timeEnd('Task 4'); + console.time('Task 5'); + // Initialize the system class (initializes things like println/etc). + var sysInit = ( + (>( + //@ts-expect-error private property + this.bsCl.getInitializedClass(firstThread, 'Ljava/lang/System;') + )).getConstructor(firstThread) + ); + sysInit['java/lang/System/initializeSystemClass()V']( + firstThread, + //@ts-expect-error implementation error + null, + (e) => { + console.log('Task 5 callback', e); + console.log(e?.['toString()Ljava/lang/String;']); + next(e); + } + ); + }); - /** - * Task #6: Initialize the application's - */ - bootupTasks.push((next: (err?: any) => void) => { - console.timeEnd("Task 5"); - console.time("Task 6"); - var clCons = (< - Doppio.VM.ClassFile.ReferenceClassData //@ts-expect-error private property - >this.bsCl.getInitializedClass(firstThread, "Ljava/lang/ClassLoader;")).getConstructor(firstThread); - clCons[ - "java/lang/ClassLoader/getSystemClassLoader()Ljava/lang/ClassLoader;" - ]( - firstThread, - //@ts-expect-error implementation error - null, - ( - e?: JVMTypes.java_lang_Throwable, - rv?: JVMTypes.java_lang_ClassLoader - ) => { - console.log("Task 6 callback", e, rv); - if (e) { - next(e); - } else { - if (rv === undefined) { - next(new Error("Failed to get system class loader.")); - return; - } - //@ts-expect-error private property - this.systemClassLoader = rv.$loader; - firstThreadObj["java/lang/Thread/contextClassLoader"] = rv; + /** + * Task #6: Initialize the application's + */ + bootupTasks.push((next: (err?: any) => void) => { + console.timeEnd('Task 5'); + console.time('Task 6'); + var clCons = (< + Doppio.VM.ClassFile.ReferenceClassData //@ts-expect-error private property + >this.bsCl.getInitializedClass(firstThread, 'Ljava/lang/ClassLoader;')).getConstructor(firstThread); + clCons['java/lang/ClassLoader/getSystemClassLoader()Ljava/lang/ClassLoader;']( + firstThread, + //@ts-expect-error implementation error + null, + (e?: JVMTypes.java_lang_Throwable, rv?: JVMTypes.java_lang_ClassLoader) => { + console.log('Task 6 callback', e, rv); + if (e) { + next(e); + } else { + if (rv === undefined) { + next(new Error('Failed to get system class loader.')); + return; + } + //@ts-expect-error private property + this.systemClassLoader = rv.$loader; + firstThreadObj['java/lang/Thread/contextClassLoader'] = rv; - // Initialize assertion data. - // TODO: Is there a better way to force this? :| - let defaultAssertionStatus = - //@ts-expect-error private property - this.enabledAssertions === true ? 1 : 0; - rv["java/lang/ClassLoader/setDefaultAssertionStatus(Z)V"]( - firstThread, - [defaultAssertionStatus], - next - ); - } - } - ); - }); + // Initialize assertion data. + // TODO: Is there a better way to force this? :| + let defaultAssertionStatus = + //@ts-expect-error private property + this.enabledAssertions === true ? 1 : 0; + rv['java/lang/ClassLoader/setDefaultAssertionStatus(Z)V']( + firstThread, + [defaultAssertionStatus], + next + ); + } + } + ); + }); - /** - * Task #7: Initialize DoppioJVM's security provider for things like cryptographically strong RNG. - */ - // bootupTasks.push((next: (err?: any) => void) => { - // console.log("Task 7") - // //@ts-expect-error private property - // this.bsCl.initializeClass( - // firstThread, - // "Ldoppio/security/DoppioProvider;", - // (cdata) => { - // next( - // cdata ? null : new Error(`Failed to initialize DoppioProvider.`) - // ); - // } - // ); - // }); + /** + * Task #7: Initialize DoppioJVM's security provider for things like cryptographically strong RNG. + */ + // bootupTasks.push((next: (err?: any) => void) => { + // console.log("Task 7") + // //@ts-expect-error private property + // this.bsCl.initializeClass( + // firstThread, + // "Ldoppio/security/DoppioProvider;", + // (cdata) => { + // next( + // cdata ? null : new Error(`Failed to initialize DoppioProvider.`) + // ); + // } + // ); + // }); - // Perform bootup tasks, and then trigger the callback function. - throw new Promise((resolve, reject) => - Doppio.VM.Util.asyncSeries(bootupTasks, (err?: any): void => { - // XXX: Without setImmediate, the firstThread won't clear out the stack - // frame that triggered us, and the firstThread won't transition to a - // 'terminated' status. - setTimeout(() => { - console.timeEnd("Task 6"); - if (err) { - //@ts-expect-error private property - this.status = Doppio.VM.Enums.JVMStatus.TERMINATED; - reject(err); - } else { - //@ts-expect-error private property - this.status = Doppio.VM.Enums.JVMStatus.BOOTED; - resolve(this); - } - }); - }) - ); - } + // Perform bootup tasks, and then trigger the callback function. + throw new Promise((resolve, reject) => + Doppio.VM.Util.asyncSeries(bootupTasks, (err?: any): void => { + // XXX: Without setImmediate, the firstThread won't clear out the stack + // frame that triggered us, and the firstThread won't transition to a + // 'terminated' status. + setTimeout(() => { + console.timeEnd('Task 6'); + if (err) { + //@ts-expect-error private property + this.status = Doppio.VM.Enums.JVMStatus.TERMINATED; + reject(err); + } else { + //@ts-expect-error private property + this.status = Doppio.VM.Enums.JVMStatus.BOOTED; + resolve(this); + } + }); + }) + ); + } } -export function createJVM( - opts: Doppio.VM.Interfaces.JVMOptions -): Promise { - return new Promise( - (resolve, reject) => - new Doppio.VM.JVM(opts, (e, jvm) => (e ? reject(e) : resolve(jvm!))) - ); +export function createJVM(opts: Doppio.VM.Interfaces.JVMOptions): Promise { + return new Promise( + (resolve, reject) => new Doppio.VM.JVM(opts, (e, jvm) => (e ? reject(e) : resolve(jvm!))) + ); } const noop = () => {}; -export function makeJVMFactory( - bootstrapClassLoaderFactory: BootstrapClassLoaderFactory -) { - JVM.bootstrapClassLoaderFactory = bootstrapClassLoaderFactory; - return (opts: Doppio.VM.Interfaces.JVMOptions): Promise => { - try { - new JVM(opts, noop); - } catch (e) { - if (e instanceof Promise) { - return e; - } - return Promise.reject(e); - } - return Promise.reject(new Error("JVM creation failed")); - }; +export function makeJVMFactory(bootstrapClassLoaderFactory: BootstrapClassLoaderFactory) { + JVM.bootstrapClassLoaderFactory = bootstrapClassLoaderFactory; + return (opts: Doppio.VM.Interfaces.JVMOptions): Promise => { + try { + new JVM(opts, noop); + } catch (e) { + if (e instanceof Promise) { + return e; + } + return Promise.reject(e); + } + return Promise.reject(new Error('JVM creation failed')); + }; } diff --git a/packages/java-runtime/probe/src/threadpool.ts b/packages/java-runtime/probe/src/threadpool.ts index ac3af09a..c41b3149 100644 --- a/packages/java-runtime/probe/src/threadpool.ts +++ b/packages/java-runtime/probe/src/threadpool.ts @@ -1,256 +1,250 @@ -import { setImmediate } from "browserfs"; -import Doppio from 'doppiojvm' +import { setImmediate } from 'browserfs'; +import Doppio from 'doppiojvm'; -import assert from "./assert"; +import assert from './assert'; /** * Generic interface for a thread. */ export interface Thread { - getStatus(): Doppio.VM.Enums.ThreadStatus; - isDaemon(): boolean; - getPriority(): number; - setStatus(status: Doppio.VM.Enums.ThreadStatus): void; - run(): void; + getStatus(): Doppio.VM.Enums.ThreadStatus; + isDaemon(): boolean; + getPriority(): number; + setStatus(status: Doppio.VM.Enums.ThreadStatus): void; + run(): void; } /** * Checks if the given thread status indicates that the thread is scheduleable. */ function isRunnable(status: Doppio.VM.Enums.ThreadStatus): boolean { - return status === Doppio.VM.Enums.ThreadStatus.RUNNABLE; + return status === Doppio.VM.Enums.ThreadStatus.RUNNABLE; } /** * Implements a thread scheduling algorithm */ export interface Scheduler { - /** - * Schedule the given thread to run. - */ - scheduleThread(thread: T): void; - /** - * Signal that the given thread's priority has changed. - */ - priorityChange(thread: T): void; - /** - * Unschedule the given thread to run. It is removed from - * the scheduler's queue. - */ - unscheduleThread(thread: T): void; - /** - * Retrieve the currently running thread. Returns NULL if - * no threads are running. - */ - getRunningThread(): T; - /** - * Called when a thread's quantum is over. - */ - quantumOver(thread: T): void; + /** + * Schedule the given thread to run. + */ + scheduleThread(thread: T): void; + /** + * Signal that the given thread's priority has changed. + */ + priorityChange(thread: T): void; + /** + * Unschedule the given thread to run. It is removed from + * the scheduler's queue. + */ + unscheduleThread(thread: T): void; + /** + * Retrieve the currently running thread. Returns NULL if + * no threads are running. + */ + getRunningThread(): T; + /** + * Called when a thread's quantum is over. + */ + quantumOver(thread: T): void; } /** * A Weighted Round Robin thread scheduler. */ class WeightedRoundRobinScheduler implements Scheduler { - // Number of quanta given to the current thread. - private _count: number = 0; - // The queue of threads. - private _queue: T[] = []; - // Read by runThread. Used as a lock. - private _threadScheduled: boolean = false; - - public scheduleThread(thread: T): void { - this._queue.push(thread); - if (this._queue.length === 1) { - // There aren't any threads running. Run this thread. - this.runThread(); - } - } - - /** - * Run the thread at the head of the queue. - */ - private runThread(): void { - if (this._threadScheduled) { - return; - } - this._threadScheduled = true; - setImmediate(() => { - let queue = this._queue; - this._threadScheduled = false; - if (queue.length > 0) { - let thread = this._queue[0]; - assert( - thread.getStatus() === Doppio.VM.Enums.ThreadStatus.RUNNABLE, - `Attempted to run non-runnable thread.` - ); - thread.run(); - } - }); - } - - public unscheduleThread(thread: T): void { - let queue = this._queue; - let isRunningThread = queue[0] === thread; - assert( - queue.indexOf(thread) > -1, - `Tried to unschedule thread that was not scheduled.` - ); - // Remove thread from queue. - if (isRunningThread) { - queue.shift(); - this._count = 0; - // Schedule the next thread. - this.runThread(); - } else { - queue.splice(queue.indexOf(thread), 1); - } - } - - public getRunningThread(): T { - let queue = this._queue; - if (queue.length > 0) { - return queue[0]; - } else { - // @ts-expect-error implementation error - return null; - } - } - - public priorityChange(thread: T): void { - // Not important for the algorithm. We'll pick up the change - // next time we schedule. - } - - public quantumOver(thread: T): void { - assert( - this._queue[0] === thread, - `A non-running thread has an expired quantum?` - ); - this._count++; - if ( - this._count >= thread.getPriority() || - thread.getStatus() !== Doppio.VM.Enums.ThreadStatus.RUNNABLE - ) { - // Move to back of queue, reset count. - this._count = 0; - this._queue.push(this._queue.shift()!); - } - // Schedule the next thread. - this.runThread(); - } + // Number of quanta given to the current thread. + private _count: number = 0; + // The queue of threads. + private _queue: T[] = []; + // Read by runThread. Used as a lock. + private _threadScheduled: boolean = false; + + public scheduleThread(thread: T): void { + this._queue.push(thread); + if (this._queue.length === 1) { + // There aren't any threads running. Run this thread. + this.runThread(); + } + } + + /** + * Run the thread at the head of the queue. + */ + private runThread(): void { + if (this._threadScheduled) { + return; + } + this._threadScheduled = true; + setImmediate(() => { + let queue = this._queue; + this._threadScheduled = false; + if (queue.length > 0) { + let thread = this._queue[0]; + assert( + thread.getStatus() === Doppio.VM.Enums.ThreadStatus.RUNNABLE, + `Attempted to run non-runnable thread.` + ); + thread.run(); + } + }); + } + + public unscheduleThread(thread: T): void { + let queue = this._queue; + let isRunningThread = queue[0] === thread; + assert(queue.indexOf(thread) > -1, `Tried to unschedule thread that was not scheduled.`); + // Remove thread from queue. + if (isRunningThread) { + queue.shift(); + this._count = 0; + // Schedule the next thread. + this.runThread(); + } else { + queue.splice(queue.indexOf(thread), 1); + } + } + + public getRunningThread(): T { + let queue = this._queue; + if (queue.length > 0) { + return queue[0]; + } else { + // @ts-expect-error implementation error + return null; + } + } + + public priorityChange(thread: T): void { + // Not important for the algorithm. We'll pick up the change + // next time we schedule. + } + + public quantumOver(thread: T): void { + assert(this._queue[0] === thread, `A non-running thread has an expired quantum?`); + this._count++; + if ( + this._count >= thread.getPriority() || + thread.getStatus() !== Doppio.VM.Enums.ThreadStatus.RUNNABLE + ) { + // Move to back of queue, reset count. + this._count = 0; + this._queue.push(this._queue.shift()!); + } + // Schedule the next thread. + this.runThread(); + } } /** * Represents a thread pool. Handles scheduling duties. */ export class ThreadPool { - private threads: T[] = []; - // private runningThread: T; - private scheduler: Scheduler = new WeightedRoundRobinScheduler(); - /** - * Called when the ThreadPool becomes empty. This is usually a sign that - * execution has finished. - * - * If the callback returns true it signals that this threadpool can free its resources. - */ - private emptyCallback: (() => boolean) | null; - - constructor(emptyCallback: () => boolean) { - this.emptyCallback = emptyCallback; - } - - /** - * Retrieve all of the threads in the thread pool. - */ - public getThreads(): T[] { - // Return a copy of our internal array. - return this.threads.slice(0); - } - - /** - * Checks if any remaining threads are non-daemonic and could be runnable. - * If not, we can terminate execution. - * - * This check is invoked each time a thread terminates. - */ - private anyNonDaemonicThreads(): boolean { - for (let i = 0; i < this.threads.length; i++) { - let t = this.threads[i]; - if (t.isDaemon()) { - continue; - } - let status = t.getStatus(); - if ( - status !== Doppio.VM.Enums.ThreadStatus.NEW && - status !== Doppio.VM.Enums.ThreadStatus.TERMINATED - ) { - return true; - } - } - return false; - } - - private threadTerminated(thread: T): void { - var idx: number = this.threads.indexOf(thread); - assert(idx >= 0); - // Remove the specified thread from the threadpool. - this.threads.splice(idx, 1); - - if (!this.anyNonDaemonicThreads()) { - const close = this.emptyCallback?.(); - if (close) { - this.emptyCallback = null; - } - } - } - - /** - * Called when a thread's status changes. - */ - public statusChange( - thread: T, - oldStatus: Doppio.VM.Enums.ThreadStatus, - newStatus: Doppio.VM.Enums.ThreadStatus - ): void { - var wasRunnable = isRunnable(oldStatus), - nowRunnable = isRunnable(newStatus); - - if ( - oldStatus === Doppio.VM.Enums.ThreadStatus.NEW || - oldStatus === Doppio.VM.Enums.ThreadStatus.TERMINATED - ) { - if (this.threads.indexOf(thread) === -1) { - this.threads.push(thread); - } - } - - // Inform scheduling algorithm if thread changes from runnable => unrunnable, or unrunnable => runnable. - if (wasRunnable !== nowRunnable) { - if (wasRunnable) { - this.scheduler.unscheduleThread(thread); - } else { - this.scheduler.scheduleThread(thread); - } - } - - if (newStatus === Doppio.VM.Enums.ThreadStatus.TERMINATED) { - this.threadTerminated(thread); - } - } - - /** - * Called when a thread's priority changes. - */ - public priorityChange(thread: T): void { - this.scheduler.priorityChange(thread); - } - - /** - * Called when a thread's quantum is over. - */ - public quantumOver(thread: T): void { - this.scheduler.quantumOver(thread); - } + private threads: T[] = []; + // private runningThread: T; + private scheduler: Scheduler = new WeightedRoundRobinScheduler(); + /** + * Called when the ThreadPool becomes empty. This is usually a sign that + * execution has finished. + * + * If the callback returns true it signals that this threadpool can free its resources. + */ + private emptyCallback: (() => boolean) | null; + + constructor(emptyCallback: () => boolean) { + this.emptyCallback = emptyCallback; + } + + /** + * Retrieve all of the threads in the thread pool. + */ + public getThreads(): T[] { + // Return a copy of our internal array. + return this.threads.slice(0); + } + + /** + * Checks if any remaining threads are non-daemonic and could be runnable. + * If not, we can terminate execution. + * + * This check is invoked each time a thread terminates. + */ + private anyNonDaemonicThreads(): boolean { + for (let i = 0; i < this.threads.length; i++) { + let t = this.threads[i]; + if (t.isDaemon()) { + continue; + } + let status = t.getStatus(); + if ( + status !== Doppio.VM.Enums.ThreadStatus.NEW && + status !== Doppio.VM.Enums.ThreadStatus.TERMINATED + ) { + return true; + } + } + return false; + } + + private threadTerminated(thread: T): void { + var idx: number = this.threads.indexOf(thread); + assert(idx >= 0); + // Remove the specified thread from the threadpool. + this.threads.splice(idx, 1); + + if (!this.anyNonDaemonicThreads()) { + const close = this.emptyCallback?.(); + if (close) { + this.emptyCallback = null; + } + } + } + + /** + * Called when a thread's status changes. + */ + public statusChange( + thread: T, + oldStatus: Doppio.VM.Enums.ThreadStatus, + newStatus: Doppio.VM.Enums.ThreadStatus + ): void { + var wasRunnable = isRunnable(oldStatus), + nowRunnable = isRunnable(newStatus); + + if ( + oldStatus === Doppio.VM.Enums.ThreadStatus.NEW || + oldStatus === Doppio.VM.Enums.ThreadStatus.TERMINATED + ) { + if (this.threads.indexOf(thread) === -1) { + this.threads.push(thread); + } + } + + // Inform scheduling algorithm if thread changes from runnable => unrunnable, or unrunnable => runnable. + if (wasRunnable !== nowRunnable) { + if (wasRunnable) { + this.scheduler.unscheduleThread(thread); + } else { + this.scheduler.scheduleThread(thread); + } + } + + if (newStatus === Doppio.VM.Enums.ThreadStatus.TERMINATED) { + this.threadTerminated(thread); + } + } + + /** + * Called when a thread's priority changes. + */ + public priorityChange(thread: T): void { + this.scheduler.priorityChange(thread); + } + + /** + * Called when a thread's quantum is over. + */ + public quantumOver(thread: T): void { + this.scheduler.quantumOver(thread); + } } diff --git a/packages/java-runtime/probe/tsconfig.json b/packages/java-runtime/probe/tsconfig.json index 4e804690..20e009bd 100644 --- a/packages/java-runtime/probe/tsconfig.json +++ b/packages/java-runtime/probe/tsconfig.json @@ -1,23 +1,17 @@ { - "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", - "compilerOptions": { - "lib": [ - "ES2022", - "ESNext.Disposable", - "DOM" - ], - "noUncheckedIndexedAccess": false, - "rootDir": "src", - "types": ["vite/client"], - "verbatimModuleSyntax": false, - "allowSyntheticDefaultImports": true, - "noEmit": false, - "declaration": true, - "composite": true, - "emitDeclarationOnly": true, - "outDir": "dist", - }, - "include": [ - "src/**/*" - ], -} \ No newline at end of file + "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", + "compilerOptions": { + "lib": ["ES2022", "ESNext.Disposable", "DOM"], + "noUncheckedIndexedAccess": false, + "rootDir": "src", + "types": ["vite/client"], + "verbatimModuleSyntax": false, + "allowSyntheticDefaultImports": true, + "noEmit": false, + "declaration": true, + "composite": true, + "emitDeclarationOnly": true, + "outDir": "dist" + }, + "include": ["src/**/*"] +} diff --git a/packages/java-runtime/probe/vite.config.js b/packages/java-runtime/probe/vite.config.js index 2794312f..5c38b66e 100644 --- a/packages/java-runtime/probe/vite.config.js +++ b/packages/java-runtime/probe/vite.config.js @@ -1,41 +1,41 @@ -import { defineConfig } from "vite"; -import inject from "@rollup/plugin-inject"; +import { defineConfig } from 'vite'; +import inject from '@rollup/plugin-inject'; export default defineConfig({ - define: { - global: {}, - setImmediate: "queueMicrotask", - }, - resolve: { - alias: { - buffer: "browserfs/dist/shims/buffer", - fs: "browserfs/dist/shims/fs", - path: "browserfs/dist/shims/path", - processGlobal: "browserfs/dist/shims/process.js", - bufferGlobal: "browserfs/dist/shims/bufferGlobal.js", - bfsGlobal: "browserfs", - }, - }, - build: { - target: "es2022", - // minify: 'esbuild', - // rollupOptions: { - // preserveEntrySignatures: "allow-extension", - // output: { - // preserveModules: true, - // } - // }, - commonjsOptions: { - transformMixedEsModules: true, - }, - }, - // optimizeDeps: { - // disabled: true, - // }, - plugins: [ - inject({ - BrowserFS: ["browserfs", "*"], - process: "/src/bfs-process.js", - }), - ], + define: { + global: {}, + setImmediate: 'queueMicrotask' + }, + resolve: { + alias: { + buffer: 'browserfs/dist/shims/buffer', + fs: 'browserfs/dist/shims/fs', + path: 'browserfs/dist/shims/path', + processGlobal: 'browserfs/dist/shims/process.js', + bufferGlobal: 'browserfs/dist/shims/bufferGlobal.js', + bfsGlobal: 'browserfs' + } + }, + build: { + target: 'es2022', + // minify: 'esbuild', + // rollupOptions: { + // preserveEntrySignatures: "allow-extension", + // output: { + // preserveModules: true, + // } + // }, + commonjsOptions: { + transformMixedEsModules: true + } + }, + // optimizeDeps: { + // disabled: true, + // }, + plugins: [ + inject({ + BrowserFS: ['browserfs', '*'], + process: '/src/bfs-process.js' + }) + ] }); diff --git a/packages/java-runtime/src/bfs-shim.js b/packages/java-runtime/src/bfs-shim.js index 032c6bc4..5bc97e7c 100644 --- a/packages/java-runtime/src/bfs-shim.js +++ b/packages/java-runtime/src/bfs-shim.js @@ -1,3 +1,3 @@ import BrowserFS from 'browserfs'; -export { BrowserFS } +export { BrowserFS }; diff --git a/packages/java-runtime/src/fs.ts b/packages/java-runtime/src/fs.ts index 7d266548..08148f01 100644 --- a/packages/java-runtime/src/fs.ts +++ b/packages/java-runtime/src/fs.ts @@ -1,74 +1,69 @@ -import BrowserFS from "browserfs"; -import type { FSModule } from "browserfs/dist/node/core/FS"; +import BrowserFS from 'browserfs'; +import type { FSModule } from 'browserfs/dist/node/core/FS'; export { FSModule }; -const path = BrowserFS.BFSRequire("path"); -const fs = BrowserFS.BFSRequire("fs"); -const { Buffer } = BrowserFS.BFSRequire("buffer"); +const path = BrowserFS.BFSRequire('path'); +const fs = BrowserFS.BFSRequire('fs'); +const { Buffer } = BrowserFS.BFSRequire('buffer'); function copyFile(srcFile: string, destFile: string) { - fs.writeFileSync(destFile, fs.readFileSync(srcFile)); + fs.writeFileSync(destFile, fs.readFileSync(srcFile)); } function recursiveCopy(srcFolder: string, destFolder: string) { - function processDir(srcFolder: string, destFolder: string) { - try { - fs.mkdirSync(destFolder); - } catch (err) { - // Ignore EEXIST. - if ( - err && - typeof err === "object" && - "code" in err && - err.code !== "EEXIST" - ) { - throw err; - } - } - for (let item of fs.readdirSync(srcFolder)) { - const srcItem = path.resolve(srcFolder, item), - destItem = path.resolve(destFolder, item), - stat = fs.statSync(srcItem); - if (stat.isDirectory()) { - processDir(srcItem, destItem); - } else { - copyFile(srcItem, destItem); - } - } - } - processDir(srcFolder, destFolder); + function processDir(srcFolder: string, destFolder: string) { + try { + fs.mkdirSync(destFolder); + } catch (err) { + // Ignore EEXIST. + if (err && typeof err === 'object' && 'code' in err && err.code !== 'EEXIST') { + throw err; + } + } + for (let item of fs.readdirSync(srcFolder)) { + const srcItem = path.resolve(srcFolder, item), + destItem = path.resolve(destFolder, item), + stat = fs.statSync(srcItem); + if (stat.isDirectory()) { + processDir(srcItem, destItem); + } else { + copyFile(srcItem, destItem); + } + } + } + processDir(srcFolder, destFolder); } export async function initFs(libZipData: ArrayBuffer): Promise { - await new Promise((resolve, reject) => - BrowserFS.configure( - { - fs: "MountableFileSystem", - options: { - "/tmp": { - fs: "InMemory", - options: {}, - }, - "/home": { - fs: "InMemory", - options: {}, - }, - "/zip": { - fs: "ZipFS", - options: { - zipData: Buffer.from(libZipData), - }, - }, - "/sys": { - fs: "InMemory", - options: {}, - }, - }, - }, - (e) => (e ? reject(e) : resolve()) - ) - ); - recursiveCopy("/zip", "/sys"); - return fs; + await new Promise((resolve, reject) => + BrowserFS.configure( + { + fs: 'MountableFileSystem', + options: { + '/tmp': { + fs: 'InMemory', + options: {} + }, + '/home': { + fs: 'InMemory', + options: {} + }, + '/zip': { + fs: 'ZipFS', + options: { + zipData: Buffer.from(libZipData) + } + }, + '/sys': { + fs: 'InMemory', + options: {} + } + } + }, + (e) => (e ? reject(e) : resolve()) + ) + ); + recursiveCopy('/zip', '/sys'); + return fs; } diff --git a/packages/java-runtime/src/index.ts b/packages/java-runtime/src/index.ts index 44edf1cc..9bef9000 100644 --- a/packages/java-runtime/src/index.ts +++ b/packages/java-runtime/src/index.ts @@ -1,9 +1,9 @@ -export * from "./jvm"; -export * from "./fs"; +export * from './jvm'; +export * from './fs'; -export * from "./java-program.js"; -export * from "./java-test-program.js"; -export * from "./java-compiler.js"; -export * from "./jvm-factory.js"; +export * from './java-program.js'; +export * from './java-test-program.js'; +export * from './java-compiler.js'; +export * from './jvm-factory.js'; -export * from "./version.js"; +export * from './version.js'; diff --git a/packages/java-runtime/src/java-compiler.ts b/packages/java-runtime/src/java-compiler.ts index a29fd61f..0dbdbae4 100644 --- a/packages/java-runtime/src/java-compiler.ts +++ b/packages/java-runtime/src/java-compiler.ts @@ -1,27 +1,27 @@ -import { Context, withCancel } from "libs/context"; +import { Context, withCancel } from 'libs/context'; -import { FSModule } from "./fs"; -import { JVMFactory } from "./jvm-factory"; +import { FSModule } from './fs'; +import { JVMFactory } from './jvm-factory'; export class JavaCompiler { - constructor( - protected readonly jvmFactory: JVMFactory, - protected readonly classPath: string, - protected readonly fs: FSModule - ) {} + constructor( + protected readonly jvmFactory: JVMFactory, + protected readonly classPath: string, + protected readonly fs: FSModule + ) {} - async compile(ctx: Context, code: string) { - this.fs.writeFileSync(this.classPath, code); - const [jvmCtx, cancel] = withCancel(ctx); - const jvm = await this.jvmFactory(jvmCtx); - return new Promise((resolve, reject) => { - jvm.runClass("util.Javac", [this.classPath], (code) => { - if (code === 0) { - resolve(); - } else { - reject(new Error("Compilation failed")); - } - }); - }).finally(cancel); - } + async compile(ctx: Context, code: string) { + this.fs.writeFileSync(this.classPath, code); + const [jvmCtx, cancel] = withCancel(ctx); + const jvm = await this.jvmFactory(jvmCtx); + return new Promise((resolve, reject) => { + jvm.runClass('util.Javac', [this.classPath], (code) => { + if (code === 0) { + resolve(); + } else { + reject(new Error('Compilation failed')); + } + }); + }).finally(cancel); + } } diff --git a/packages/java-runtime/src/java-program.ts b/packages/java-runtime/src/java-program.ts index 3d3267d8..eac8a9f5 100644 --- a/packages/java-runtime/src/java-program.ts +++ b/packages/java-runtime/src/java-program.ts @@ -1,21 +1,19 @@ -import { Program } from "libs/compiler"; -import { Context } from "libs/context"; +import { Program } from 'libs/compiler'; +import { Context } from 'libs/context'; -import { JVMFactory } from "./jvm-factory"; +import { JVMFactory } from './jvm-factory'; export class JavaProgram implements Program { - constructor( - protected readonly className: string, - protected readonly jvmFactory: JVMFactory - ) {} + constructor( + protected readonly className: string, + protected readonly jvmFactory: JVMFactory + ) {} - async run(ctx: Context): Promise { - const jvm = await this.jvmFactory(ctx); - const code = await new Promise((resolve) => - jvm.runClass(this.className, [], resolve) - ); - if (code !== 0) { - throw new Error("Run failed"); - } - } + async run(ctx: Context): Promise { + const jvm = await this.jvmFactory(ctx); + const code = await new Promise((resolve) => jvm.runClass(this.className, [], resolve)); + if (code !== 0) { + throw new Error('Run failed'); + } + } } diff --git a/packages/java-runtime/src/java-test-program.ts b/packages/java-runtime/src/java-test-program.ts index ea43bb92..f05b83eb 100644 --- a/packages/java-runtime/src/java-test-program.ts +++ b/packages/java-runtime/src/java-test-program.ts @@ -1,28 +1,26 @@ -import type { Context } from "libs/context"; -import type { TestProgram } from "libs/testing"; +import type { Context } from 'libs/context'; +import type { TestProgram } from 'libs/testing'; -import type { JVMFactory } from "./jvm-factory.js"; +import type { JVMFactory } from './jvm-factory.js'; export abstract class JavaTestProgram implements TestProgram { - constructor( - protected readonly className: string, - protected readonly jvmFactory: JVMFactory - ) {} + constructor( + protected readonly className: string, + protected readonly jvmFactory: JVMFactory + ) {} - async run(ctx: Context, input: I): Promise { - const jvm = await this.jvmFactory(ctx); - jvm.registerNatives({ - [this.className]: this.getNatives(input), - }); - const code = await new Promise((resolve) => - jvm.runClass(this.className, [], resolve) - ); - if (code !== 0) { - throw new Error("Run failed"); - } - return this.getResult(); - } + async run(ctx: Context, input: I): Promise { + const jvm = await this.jvmFactory(ctx); + jvm.registerNatives({ + [this.className]: this.getNatives(input) + }); + const code = await new Promise((resolve) => jvm.runClass(this.className, [], resolve)); + if (code !== 0) { + throw new Error('Run failed'); + } + return this.getResult(); + } - protected abstract getNatives(input: I): Record; - protected abstract getResult(): O; + protected abstract getNatives(input: I): Record; + protected abstract getResult(): O; } diff --git a/packages/java-runtime/src/jvm-factory.ts b/packages/java-runtime/src/jvm-factory.ts index 12c53007..e77b7a70 100644 --- a/packages/java-runtime/src/jvm-factory.ts +++ b/packages/java-runtime/src/jvm-factory.ts @@ -1,38 +1,38 @@ -import BrowserFS from "browserfs"; -import { type Context, inContext } from "libs/context"; -import type { Streams } from "libs/io"; -import { patch } from "libs/patcher"; +import BrowserFS from 'browserfs'; +import { type Context, inContext } from 'libs/context'; +import type { Streams } from 'libs/io'; +import { patch } from 'libs/patcher'; -import { createJVM, JVM } from "./jvm"; -import { process } from "./process.js"; +import { createJVM, JVM } from './jvm'; +import { process } from './process.js'; -const { Buffer } = BrowserFS.BFSRequire("buffer"); +const { Buffer } = BrowserFS.BFSRequire('buffer'); export type JVMFactory = (ctx: Context) => Promise; export function makeJVMFactory(streams: Streams): JVMFactory { - return async (ctx) => { - const jvm = await inContext( - ctx, - createJVM({ - doppioHomePath: "/sys", - classpath: ["/home", "/sys/classes"], - }) - ); - const onStdout = (data: Uint8Array) => streams.out.write(data); - const onStderr = (data: Uint8Array) => streams.err.write(data); - // process.initializeTTYs(); - const disposableRead = patch(process.stdin, "read", () => { - return Buffer.from(streams.in.read()); - }); - process.stdout.on("data", onStdout); - process.stderr.on("data", onStderr); - ctx.onCancel(() => { - jvm.halt(1); - process.stdout.removeListener("data", onStdout); - process.stderr.removeListener("data", onStderr); - disposableRead[Symbol.dispose](); - }); - return jvm; - }; + return async (ctx) => { + const jvm = await inContext( + ctx, + createJVM({ + doppioHomePath: '/sys', + classpath: ['/home', '/sys/classes'] + }) + ); + const onStdout = (data: Uint8Array) => streams.out.write(data); + const onStderr = (data: Uint8Array) => streams.err.write(data); + // process.initializeTTYs(); + const disposableRead = patch(process.stdin, 'read', () => { + return Buffer.from(streams.in.read()); + }); + process.stdout.on('data', onStdout); + process.stderr.on('data', onStderr); + ctx.onCancel(() => { + jvm.halt(1); + process.stdout.removeListener('data', onStdout); + process.stderr.removeListener('data', onStderr); + disposableRead[Symbol.dispose](); + }); + return jvm; + }; } diff --git a/packages/java-runtime/src/jvm/assert.ts b/packages/java-runtime/src/jvm/assert.ts index df07b6d5..e842db6d 100644 --- a/packages/java-runtime/src/jvm/assert.ts +++ b/packages/java-runtime/src/jvm/assert.ts @@ -1,18 +1,14 @@ -import Doppio from "doppiojvm"; +import Doppio from 'doppiojvm'; /** * Checks the given assertion. Throws an error if it fails. */ export default function assert( - assertion: boolean, - msg?: string, - thread?: Doppio.VM.Threading.JVMThread + assertion: boolean, + msg?: string, + thread?: Doppio.VM.Threading.JVMThread ) { - if (!assertion) { - throw new Error( - `Assertion failed: ${msg}\n${ - thread ? thread.getPrintableStackTrace() : "" - }` - ); - } + if (!assertion) { + throw new Error(`Assertion failed: ${msg}\n${thread ? thread.getPrintableStackTrace() : ''}`); + } } diff --git a/packages/java-runtime/src/jvm/index.ts b/packages/java-runtime/src/jvm/index.ts index 03ad5db7..d9a45daf 100644 --- a/packages/java-runtime/src/jvm/index.ts +++ b/packages/java-runtime/src/jvm/index.ts @@ -1 +1 @@ -export * from './jvm.js' +export * from './jvm.js'; diff --git a/packages/java-runtime/src/jvm/jvm.ts b/packages/java-runtime/src/jvm/jvm.ts index 975e6170..c15c1e95 100644 --- a/packages/java-runtime/src/jvm/jvm.ts +++ b/packages/java-runtime/src/jvm/jvm.ts @@ -1,320 +1,299 @@ -import Doppio from "doppiojvm"; -import type JVMTypes from "doppiojvm/dist/typings/includes/JVMTypes"; +import Doppio from 'doppiojvm'; +import type JVMTypes from 'doppiojvm/dist/typings/includes/JVMTypes'; -import { ThreadPool } from "./threadpool"; +import { ThreadPool } from './threadpool'; export const { - VM: { Util: util }, + VM: { Util: util } } = Doppio; // XXX: We currently initialize these classes at JVM bootup. This is expensive. // We should attempt to prune this list as much as possible. const coreClasses = [ - "Ljava/lang/String;", - "Ljava/lang/Class;", - "Ljava/lang/ClassLoader;", - "Ljava/lang/reflect/Constructor;", - "Ljava/lang/reflect/Field;", - "Ljava/lang/reflect/Method;", - "Ljava/lang/Error;", - "Ljava/lang/StackTraceElement;", - "Ljava/lang/System;", - "Ljava/lang/Thread;", - "Ljava/lang/ThreadGroup;", - "Ljava/lang/Throwable;", - "Ljava/nio/ByteOrder;", - "Lsun/misc/VM;", - "Lsun/reflect/ConstantPool;", - "Ljava/lang/Byte;", - "Ljava/lang/Character;", - "Ljava/lang/Double;", - "Ljava/lang/Float;", - "Ljava/lang/Integer;", - "Ljava/lang/Long;", - "Ljava/lang/Short;", - "Ljava/lang/Void;", - "Ljava/io/FileDescriptor;", - "Ljava/lang/Boolean;", - "[Lsun/management/MemoryManagerImpl;", - "[Lsun/management/MemoryPoolImpl;", - // Contains important FS constants used by natives. These constants are - // inlined into JCL class files, so it typically never gets initialized - // implicitly by the JVM. - "Lsun/nio/fs/UnixConstants;", + 'Ljava/lang/String;', + 'Ljava/lang/Class;', + 'Ljava/lang/ClassLoader;', + 'Ljava/lang/reflect/Constructor;', + 'Ljava/lang/reflect/Field;', + 'Ljava/lang/reflect/Method;', + 'Ljava/lang/Error;', + 'Ljava/lang/StackTraceElement;', + 'Ljava/lang/System;', + 'Ljava/lang/Thread;', + 'Ljava/lang/ThreadGroup;', + 'Ljava/lang/Throwable;', + 'Ljava/nio/ByteOrder;', + 'Lsun/misc/VM;', + 'Lsun/reflect/ConstantPool;', + 'Ljava/lang/Byte;', + 'Ljava/lang/Character;', + 'Ljava/lang/Double;', + 'Ljava/lang/Float;', + 'Ljava/lang/Integer;', + 'Ljava/lang/Long;', + 'Ljava/lang/Short;', + 'Ljava/lang/Void;', + 'Ljava/io/FileDescriptor;', + 'Ljava/lang/Boolean;', + '[Lsun/management/MemoryManagerImpl;', + '[Lsun/management/MemoryPoolImpl;', + // Contains important FS constants used by natives. These constants are + // inlined into JCL class files, so it typically never gets initialized + // implicitly by the JVM. + 'Lsun/nio/fs/UnixConstants;' ]; //@ts-expect-error private method override export class JVM extends Doppio.VM.JVM { - override _initSystemProperties( - bootstrapClasspath: string[], - javaClassPath: string[], - javaHomePath: string, - tmpDir: string, - opts: { [name: string]: string } - ): void { - // @ts-expect-error hack - super._initSystemProperties( - bootstrapClasspath, - javaClassPath, - javaHomePath, - tmpDir, - opts - ); + override _initSystemProperties( + bootstrapClasspath: string[], + javaClassPath: string[], + javaHomePath: string, + tmpDir: string, + opts: { [name: string]: string } + ): void { + // @ts-expect-error hack + super._initSystemProperties(bootstrapClasspath, javaClassPath, javaHomePath, tmpDir, opts); - let bootupTasks: { (next: (err?: any) => void): void }[] = [], - firstThread: Doppio.VM.Threading.JVMThread, - firstThreadObj: JVMTypes.java_lang_Thread; - /** - * Task #1: Initialize native methods. - */ - bootupTasks.push((next: (err?: any) => void): void => { - // console.time("Task 1") - //@ts-expect-error private method - this.initializeNatives(next); - }); + let bootupTasks: { (next: (err?: any) => void): void }[] = [], + firstThread: Doppio.VM.Threading.JVMThread, + firstThreadObj: JVMTypes.java_lang_Thread; + /** + * Task #1: Initialize native methods. + */ + bootupTasks.push((next: (err?: any) => void): void => { + // console.time("Task 1") + //@ts-expect-error private method + this.initializeNatives(next); + }); - /** - * Task #2: Construct the bootstrap class loader. - */ - bootupTasks.push((next: (err?: any) => void): void => { - // console.timeEnd("Task 1") - // console.time("Task 2") - //@ts-expect-error private property - this.bsCl = new Doppio.VM.ClassFile.BootstrapClassLoader( - //@ts-expect-error private property - this.systemProperties["java.home"], - bootstrapClasspath, - next - ); - }); + /** + * Task #2: Construct the bootstrap class loader. + */ + bootupTasks.push((next: (err?: any) => void): void => { + // console.timeEnd("Task 1") + // console.time("Task 2") + //@ts-expect-error private property + this.bsCl = new Doppio.VM.ClassFile.BootstrapClassLoader( + //@ts-expect-error private property + this.systemProperties['java.home'], + bootstrapClasspath, + next + ); + }); - /** - * Task #3: Construct the thread pool, resolve thread class, and construct - * the first thread. - */ - bootupTasks.push((next: (err?: any) => void): void => { - // console.timeEnd("Task 2") - // console.time("Task 3") - //@ts-expect-error private property - this.threadPool = new ThreadPool( - (): boolean => { - //@ts-expect-error private method - return this.threadPoolIsEmpty(); - } - ); - // Resolve Ljava/lang/Thread so we can fake a thread. - // NOTE: This should never actually use the Thread object unless - // there's an error loading java/lang/Thread and associated classes. - //@ts-expect-error private property - this.bsCl.resolveClass( - null, - "Ljava/lang/Thread;", - ( - threadCdata: Doppio.VM.ClassFile.ReferenceClassData - ) => { - if (threadCdata == null) { - // Failed. - next("Failed to resolve java/lang/Thread."); - } else { - // Construct a thread. - // @ts-expect-error implementation error - firstThreadObj = new (threadCdata.getConstructor(null))(null); - firstThreadObj.$thread = - firstThread = - //@ts-expect-error private property - this.firstThread = - new Doppio.VM.Threading.JVMThread( - //@ts-expect-error error - this, - //@ts-expect-error private property - this.threadPool, - firstThreadObj - ); - firstThreadObj.ref = 1; - firstThreadObj["java/lang/Thread/priority"] = 5; - firstThreadObj["java/lang/Thread/name"] = Doppio.VM.Util.initCarr( - //@ts-expect-error private property - this.bsCl, - "main" - ); - firstThreadObj["java/lang/Thread/blockerLock"] = new ((< - Doppio.VM.ClassFile.ReferenceClassData //@ts-expect-error private property - >this.bsCl.getResolvedClass("Ljava/lang/Object;")).getConstructor(firstThread))(firstThread); - next(); - } - } - ); - }); + /** + * Task #3: Construct the thread pool, resolve thread class, and construct + * the first thread. + */ + bootupTasks.push((next: (err?: any) => void): void => { + // console.timeEnd("Task 2") + // console.time("Task 3") + //@ts-expect-error private property + this.threadPool = new ThreadPool((): boolean => { + //@ts-expect-error private method + return this.threadPoolIsEmpty(); + }); + // Resolve Ljava/lang/Thread so we can fake a thread. + // NOTE: This should never actually use the Thread object unless + // there's an error loading java/lang/Thread and associated classes. + //@ts-expect-error private property + this.bsCl.resolveClass( + null, + 'Ljava/lang/Thread;', + (threadCdata: Doppio.VM.ClassFile.ReferenceClassData) => { + if (threadCdata == null) { + // Failed. + next('Failed to resolve java/lang/Thread.'); + } else { + // Construct a thread. + // @ts-expect-error implementation error + firstThreadObj = new (threadCdata.getConstructor(null))(null); + firstThreadObj.$thread = + firstThread = + //@ts-expect-error private property + this.firstThread = + new Doppio.VM.Threading.JVMThread( + //@ts-expect-error error + this, + //@ts-expect-error private property + this.threadPool, + firstThreadObj + ); + firstThreadObj.ref = 1; + firstThreadObj['java/lang/Thread/priority'] = 5; + firstThreadObj['java/lang/Thread/name'] = Doppio.VM.Util.initCarr( + //@ts-expect-error private property + this.bsCl, + 'main' + ); + firstThreadObj['java/lang/Thread/blockerLock'] = new ((< + Doppio.VM.ClassFile.ReferenceClassData //@ts-expect-error private property + >this.bsCl.getResolvedClass('Ljava/lang/Object;')).getConstructor(firstThread))(firstThread); + next(); + } + } + ); + }); - /** - * Task #4: Preinitialize some essential JVM classes, and initializes the - * JVM's ThreadGroup once that class is initialized. - */ - bootupTasks.push((next: (err?: any) => void): void => { - // console.timeEnd("Task 3") - // console.time("Task 4") - Doppio.VM.Util.asyncForEach( - coreClasses, - (coreClass: string, nextItem: (err?: any) => void) => { - //@ts-expect-error private property - this.bsCl.initializeClass( - firstThread, - coreClass, - (cdata: Doppio.VM.ClassFile.ClassData) => { - if (cdata == null) { - nextItem(`Failed to initialize ${coreClass}`); - } else { - // One of the later preinitialized classes references Thread.group. - // Initialize the system's ThreadGroup now. - if (coreClass === "Ljava/lang/ThreadGroup;") { - // Construct a ThreadGroup object for the first thread. - var threadGroupCons = (< - Doppio.VM.ClassFile.ReferenceClassData - >cdata).getConstructor(firstThread), - groupObj = new threadGroupCons(firstThread); - groupObj["()V"]( - firstThread, - //@ts-expect-error implementation error - null, - (e?: JVMTypes.java_lang_Throwable) => { - // Tell the initial thread to use this group. - firstThreadObj["java/lang/Thread/group"] = groupObj; - nextItem(e); - } - ); - } else { - nextItem(); - } - } - } - ); - }, - next - ); - }); + /** + * Task #4: Preinitialize some essential JVM classes, and initializes the + * JVM's ThreadGroup once that class is initialized. + */ + bootupTasks.push((next: (err?: any) => void): void => { + // console.timeEnd("Task 3") + // console.time("Task 4") + Doppio.VM.Util.asyncForEach( + coreClasses, + (coreClass: string, nextItem: (err?: any) => void) => { + //@ts-expect-error private property + this.bsCl.initializeClass( + firstThread, + coreClass, + (cdata: Doppio.VM.ClassFile.ClassData) => { + if (cdata == null) { + nextItem(`Failed to initialize ${coreClass}`); + } else { + // One of the later preinitialized classes references Thread.group. + // Initialize the system's ThreadGroup now. + if (coreClass === 'Ljava/lang/ThreadGroup;') { + // Construct a ThreadGroup object for the first thread. + var threadGroupCons = (< + Doppio.VM.ClassFile.ReferenceClassData + >cdata).getConstructor(firstThread), + groupObj = new threadGroupCons(firstThread); + groupObj['()V']( + firstThread, + //@ts-expect-error implementation error + null, + (e?: JVMTypes.java_lang_Throwable) => { + // Tell the initial thread to use this group. + firstThreadObj['java/lang/Thread/group'] = groupObj; + nextItem(e); + } + ); + } else { + nextItem(); + } + } + } + ); + }, + next + ); + }); - /** - * Task #5: Initialize the system class. - */ - bootupTasks.push((next: (err?: any) => void): void => { - // console.timeEnd("Task 4") - // console.time("Task 5") - // Initialize the system class (initializes things like println/etc). - var sysInit = ( - (>( - //@ts-expect-error private property - this.bsCl.getInitializedClass(firstThread, "Ljava/lang/System;") - )).getConstructor(firstThread) - ); - sysInit["java/lang/System/initializeSystemClass()V"]( - firstThread, - //@ts-expect-error implementation error - null, - next - ); - }); + /** + * Task #5: Initialize the system class. + */ + bootupTasks.push((next: (err?: any) => void): void => { + // console.timeEnd("Task 4") + // console.time("Task 5") + // Initialize the system class (initializes things like println/etc). + var sysInit = ( + (>( + //@ts-expect-error private property + this.bsCl.getInitializedClass(firstThread, 'Ljava/lang/System;') + )).getConstructor(firstThread) + ); + sysInit['java/lang/System/initializeSystemClass()V']( + firstThread, + //@ts-expect-error implementation error + null, + next + ); + }); - /** - * Task #6: Initialize the application's - */ - bootupTasks.push((next: (err?: any) => void) => { - // console.timeEnd("Task 5") - // console.time("Task 6") - var clCons = ( - (< - Doppio.VM.ClassFile.ReferenceClassData - >//@ts-expect-error private property - this.bsCl.getInitializedClass( - firstThread, - "Ljava/lang/ClassLoader;" - )).getConstructor(firstThread) - ); - clCons[ - "java/lang/ClassLoader/getSystemClassLoader()Ljava/lang/ClassLoader;" - ]( - firstThread, - //@ts-expect-error implementation error - null, - ( - e?: JVMTypes.java_lang_Throwable, - rv?: JVMTypes.java_lang_ClassLoader - ) => { - if (e) { - next(e); - } else { - if (rv === undefined) { - next(new Error("Failed to get system class loader.")); - return; - } - //@ts-expect-error private property - this.systemClassLoader = rv.$loader; - firstThreadObj["java/lang/Thread/contextClassLoader"] = rv; + /** + * Task #6: Initialize the application's + */ + bootupTasks.push((next: (err?: any) => void) => { + // console.timeEnd("Task 5") + // console.time("Task 6") + var clCons = (< + Doppio.VM.ClassFile.ReferenceClassData //@ts-expect-error private property + >this.bsCl.getInitializedClass(firstThread, 'Ljava/lang/ClassLoader;')).getConstructor(firstThread); + clCons['java/lang/ClassLoader/getSystemClassLoader()Ljava/lang/ClassLoader;']( + firstThread, + //@ts-expect-error implementation error + null, + (e?: JVMTypes.java_lang_Throwable, rv?: JVMTypes.java_lang_ClassLoader) => { + if (e) { + next(e); + } else { + if (rv === undefined) { + next(new Error('Failed to get system class loader.')); + return; + } + //@ts-expect-error private property + this.systemClassLoader = rv.$loader; + firstThreadObj['java/lang/Thread/contextClassLoader'] = rv; - // Initialize assertion data. - // TODO: Is there a better way to force this? :| - let defaultAssertionStatus = - //@ts-expect-error private property - this.enabledAssertions === true ? 1 : 0; - rv["java/lang/ClassLoader/setDefaultAssertionStatus(Z)V"]( - firstThread, - [defaultAssertionStatus], - next - ); - } - } - ); - }); + // Initialize assertion data. + // TODO: Is there a better way to force this? :| + let defaultAssertionStatus = + //@ts-expect-error private property + this.enabledAssertions === true ? 1 : 0; + rv['java/lang/ClassLoader/setDefaultAssertionStatus(Z)V']( + firstThread, + [defaultAssertionStatus], + next + ); + } + } + ); + }); - /** - * Task #7: Initialize DoppioJVM's security provider for things like cryptographically strong RNG. - */ - // bootupTasks.push((next: (err?: any) => void) => { - // console.log("Task 7") - // //@ts-expect-error private property - // this.bsCl.initializeClass( - // firstThread, - // "Ldoppio/security/DoppioProvider;", - // (cdata) => { - // next( - // cdata ? null : new Error(`Failed to initialize DoppioProvider.`) - // ); - // } - // ); - // }); + /** + * Task #7: Initialize DoppioJVM's security provider for things like cryptographically strong RNG. + */ + // bootupTasks.push((next: (err?: any) => void) => { + // console.log("Task 7") + // //@ts-expect-error private property + // this.bsCl.initializeClass( + // firstThread, + // "Ldoppio/security/DoppioProvider;", + // (cdata) => { + // next( + // cdata ? null : new Error(`Failed to initialize DoppioProvider.`) + // ); + // } + // ); + // }); - // Perform bootup tasks, and then trigger the callback function. - throw new Promise((resolve, reject) => - Doppio.VM.Util.asyncSeries(bootupTasks, (err?: any): void => { - // XXX: Without setImmediate, the firstThread won't clear out the stack - // frame that triggered us, and the firstThread won't transition to a - // 'terminated' status. - setTimeout(() => { - // console.timeEnd("Task 6") - if (err) { - //@ts-expect-error private property - this.status = Doppio.VM.Enums.JVMStatus.TERMINATED; - reject(err); - } else { - //@ts-expect-error private property - this.status = Doppio.VM.Enums.JVMStatus.BOOTED; - resolve(this); - } - }); - }) - ); - } + // Perform bootup tasks, and then trigger the callback function. + throw new Promise((resolve, reject) => + Doppio.VM.Util.asyncSeries(bootupTasks, (err?: any): void => { + // XXX: Without setImmediate, the firstThread won't clear out the stack + // frame that triggered us, and the firstThread won't transition to a + // 'terminated' status. + setTimeout(() => { + // console.timeEnd("Task 6") + if (err) { + //@ts-expect-error private property + this.status = Doppio.VM.Enums.JVMStatus.TERMINATED; + reject(err); + } else { + //@ts-expect-error private property + this.status = Doppio.VM.Enums.JVMStatus.BOOTED; + resolve(this); + } + }); + }) + ); + } } const noop = () => {}; export function createJVM(opts: Doppio.VM.Interfaces.JVMOptions): Promise { - try { - new JVM(opts, noop); - } catch (e) { - if (e instanceof Promise) { - return e; - } - return Promise.reject(e); - } - return Promise.reject(new Error("JVM creation failed")); + try { + new JVM(opts, noop); + } catch (e) { + if (e instanceof Promise) { + return e; + } + return Promise.reject(e); + } + return Promise.reject(new Error('JVM creation failed')); } diff --git a/packages/java-runtime/src/jvm/threadpool.ts b/packages/java-runtime/src/jvm/threadpool.ts index 68e51363..8ac10bb6 100644 --- a/packages/java-runtime/src/jvm/threadpool.ts +++ b/packages/java-runtime/src/jvm/threadpool.ts @@ -1,257 +1,251 @@ -import { setImmediate } from "browserfs"; -import Doppio from "doppiojvm"; +import { setImmediate } from 'browserfs'; +import Doppio from 'doppiojvm'; -import assert from "./assert"; +import assert from './assert'; /** * Generic interface for a thread. */ export interface Thread { - getStatus(): Doppio.VM.Enums.ThreadStatus; - isDaemon(): boolean; - getPriority(): number; - setStatus(status: Doppio.VM.Enums.ThreadStatus): void; - run(): void; + getStatus(): Doppio.VM.Enums.ThreadStatus; + isDaemon(): boolean; + getPriority(): number; + setStatus(status: Doppio.VM.Enums.ThreadStatus): void; + run(): void; } /** * Checks if the given thread status indicates that the thread is scheduleable. */ function isRunnable(status: Doppio.VM.Enums.ThreadStatus): boolean { - return status === Doppio.VM.Enums.ThreadStatus.RUNNABLE; + return status === Doppio.VM.Enums.ThreadStatus.RUNNABLE; } /** * Implements a thread scheduling algorithm */ export interface Scheduler { - /** - * Schedule the given thread to run. - */ - scheduleThread(thread: T): void; - /** - * Signal that the given thread's priority has changed. - */ - priorityChange(thread: T): void; - /** - * Unschedule the given thread to run. It is removed from - * the scheduler's queue. - */ - unscheduleThread(thread: T): void; - /** - * Retrieve the currently running thread. Returns NULL if - * no threads are running. - */ - getRunningThread(): T; - /** - * Called when a thread's quantum is over. - */ - quantumOver(thread: T): void; + /** + * Schedule the given thread to run. + */ + scheduleThread(thread: T): void; + /** + * Signal that the given thread's priority has changed. + */ + priorityChange(thread: T): void; + /** + * Unschedule the given thread to run. It is removed from + * the scheduler's queue. + */ + unscheduleThread(thread: T): void; + /** + * Retrieve the currently running thread. Returns NULL if + * no threads are running. + */ + getRunningThread(): T; + /** + * Called when a thread's quantum is over. + */ + quantumOver(thread: T): void; } /** * A Weighted Round Robin thread scheduler. */ class WeightedRoundRobinScheduler implements Scheduler { - // Number of quanta given to the current thread. - private _count: number = 0; - // The queue of threads. - private _queue: T[] = []; - // Read by runThread. Used as a lock. - private _threadScheduled: boolean = false; - - public scheduleThread(thread: T): void { - this._queue.push(thread); - if (this._queue.length === 1) { - // There aren't any threads running. Run this thread. - this.runThread(); - } - } - - /** - * Run the thread at the head of the queue. - */ - private runThread(): void { - if (this._threadScheduled) { - return; - } - this._threadScheduled = true; - setImmediate(() => { - let queue = this._queue; - this._threadScheduled = false; - if (queue.length > 0) { - let thread = this._queue[0]; - assert( - thread.getStatus() === Doppio.VM.Enums.ThreadStatus.RUNNABLE, - `Attempted to run non-runnable thread.` - ); - thread.run(); - } - }); - } - - public unscheduleThread(thread: T): void { - let queue = this._queue; - let isRunningThread = queue[0] === thread; - assert( - queue.indexOf(thread) > -1, - `Tried to unschedule thread that was not scheduled.` - ); - // Remove thread from queue. - if (isRunningThread) { - queue.shift(); - this._count = 0; - // Schedule the next thread. - this.runThread(); - } else { - queue.splice(queue.indexOf(thread), 1); - } - } - - public getRunningThread(): T { - let queue = this._queue; - if (queue.length > 0) { - return queue[0]; - } else { - // @ts-expect-error implementation error - return null; - } - } - - public priorityChange(thread: T): void { - // Not important for the algorithm. We'll pick up the change - // next time we schedule. - } - - public quantumOver(thread: T): void { - assert( - this._queue[0] === thread, - `A non-running thread has an expired quantum?` - ); - this._count++; - if ( - this._count >= thread.getPriority() || - thread.getStatus() !== Doppio.VM.Enums.ThreadStatus.RUNNABLE - ) { - // Move to back of queue, reset count. - this._count = 0; - this._queue.push(this._queue.shift()!); - } - // Schedule the next thread. - this.runThread(); - } + // Number of quanta given to the current thread. + private _count: number = 0; + // The queue of threads. + private _queue: T[] = []; + // Read by runThread. Used as a lock. + private _threadScheduled: boolean = false; + + public scheduleThread(thread: T): void { + this._queue.push(thread); + if (this._queue.length === 1) { + // There aren't any threads running. Run this thread. + this.runThread(); + } + } + + /** + * Run the thread at the head of the queue. + */ + private runThread(): void { + if (this._threadScheduled) { + return; + } + this._threadScheduled = true; + setImmediate(() => { + let queue = this._queue; + this._threadScheduled = false; + if (queue.length > 0) { + let thread = this._queue[0]; + assert( + thread.getStatus() === Doppio.VM.Enums.ThreadStatus.RUNNABLE, + `Attempted to run non-runnable thread.` + ); + thread.run(); + } + }); + } + + public unscheduleThread(thread: T): void { + let queue = this._queue; + let isRunningThread = queue[0] === thread; + assert(queue.indexOf(thread) > -1, `Tried to unschedule thread that was not scheduled.`); + // Remove thread from queue. + if (isRunningThread) { + queue.shift(); + this._count = 0; + // Schedule the next thread. + this.runThread(); + } else { + queue.splice(queue.indexOf(thread), 1); + } + } + + public getRunningThread(): T { + let queue = this._queue; + if (queue.length > 0) { + return queue[0]; + } else { + // @ts-expect-error implementation error + return null; + } + } + + public priorityChange(thread: T): void { + // Not important for the algorithm. We'll pick up the change + // next time we schedule. + } + + public quantumOver(thread: T): void { + assert(this._queue[0] === thread, `A non-running thread has an expired quantum?`); + this._count++; + if ( + this._count >= thread.getPriority() || + thread.getStatus() !== Doppio.VM.Enums.ThreadStatus.RUNNABLE + ) { + // Move to back of queue, reset count. + this._count = 0; + this._queue.push(this._queue.shift()!); + } + // Schedule the next thread. + this.runThread(); + } } /** * Represents a thread pool. Handles scheduling duties. */ export class ThreadPool { - private threads: T[] = []; - // unused property - // private runningThread: T; - private scheduler: Scheduler = new WeightedRoundRobinScheduler(); - /** - * Called when the ThreadPool becomes empty. This is usually a sign that - * execution has finished. - * - * If the callback returns true it signals that this threadpool can free its resources. - */ - private emptyCallback: (() => boolean) | null; - - constructor(emptyCallback: () => boolean) { - this.emptyCallback = emptyCallback; - } - - /** - * Retrieve all of the threads in the thread pool. - */ - public getThreads(): T[] { - // Return a copy of our internal array. - return this.threads.slice(0); - } - - /** - * Checks if any remaining threads are non-daemonic and could be runnable. - * If not, we can terminate execution. - * - * This check is invoked each time a thread terminates. - */ - private anyNonDaemonicThreads(): boolean { - for (let i = 0; i < this.threads.length; i++) { - let t = this.threads[i]; - if (t.isDaemon()) { - continue; - } - let status = t.getStatus(); - if ( - status !== Doppio.VM.Enums.ThreadStatus.NEW && - status !== Doppio.VM.Enums.ThreadStatus.TERMINATED - ) { - return true; - } - } - return false; - } - - private threadTerminated(thread: T): void { - var idx: number = this.threads.indexOf(thread); - assert(idx >= 0); - // Remove the specified thread from the threadpool. - this.threads.splice(idx, 1); - - if (!this.anyNonDaemonicThreads()) { - const close = this.emptyCallback?.(); - if (close) { - this.emptyCallback = null; - } - } - } - - /** - * Called when a thread's status changes. - */ - public statusChange( - thread: T, - oldStatus: Doppio.VM.Enums.ThreadStatus, - newStatus: Doppio.VM.Enums.ThreadStatus - ): void { - var wasRunnable = isRunnable(oldStatus), - nowRunnable = isRunnable(newStatus); - - if ( - oldStatus === Doppio.VM.Enums.ThreadStatus.NEW || - oldStatus === Doppio.VM.Enums.ThreadStatus.TERMINATED - ) { - if (this.threads.indexOf(thread) === -1) { - this.threads.push(thread); - } - } - - // Inform scheduling algorithm if thread changes from runnable => unrunnable, or unrunnable => runnable. - if (wasRunnable !== nowRunnable) { - if (wasRunnable) { - this.scheduler.unscheduleThread(thread); - } else { - this.scheduler.scheduleThread(thread); - } - } - - if (newStatus === Doppio.VM.Enums.ThreadStatus.TERMINATED) { - this.threadTerminated(thread); - } - } - - /** - * Called when a thread's priority changes. - */ - public priorityChange(thread: T): void { - this.scheduler.priorityChange(thread); - } - - /** - * Called when a thread's quantum is over. - */ - public quantumOver(thread: T): void { - this.scheduler.quantumOver(thread); - } + private threads: T[] = []; + // unused property + // private runningThread: T; + private scheduler: Scheduler = new WeightedRoundRobinScheduler(); + /** + * Called when the ThreadPool becomes empty. This is usually a sign that + * execution has finished. + * + * If the callback returns true it signals that this threadpool can free its resources. + */ + private emptyCallback: (() => boolean) | null; + + constructor(emptyCallback: () => boolean) { + this.emptyCallback = emptyCallback; + } + + /** + * Retrieve all of the threads in the thread pool. + */ + public getThreads(): T[] { + // Return a copy of our internal array. + return this.threads.slice(0); + } + + /** + * Checks if any remaining threads are non-daemonic and could be runnable. + * If not, we can terminate execution. + * + * This check is invoked each time a thread terminates. + */ + private anyNonDaemonicThreads(): boolean { + for (let i = 0; i < this.threads.length; i++) { + let t = this.threads[i]; + if (t.isDaemon()) { + continue; + } + let status = t.getStatus(); + if ( + status !== Doppio.VM.Enums.ThreadStatus.NEW && + status !== Doppio.VM.Enums.ThreadStatus.TERMINATED + ) { + return true; + } + } + return false; + } + + private threadTerminated(thread: T): void { + var idx: number = this.threads.indexOf(thread); + assert(idx >= 0); + // Remove the specified thread from the threadpool. + this.threads.splice(idx, 1); + + if (!this.anyNonDaemonicThreads()) { + const close = this.emptyCallback?.(); + if (close) { + this.emptyCallback = null; + } + } + } + + /** + * Called when a thread's status changes. + */ + public statusChange( + thread: T, + oldStatus: Doppio.VM.Enums.ThreadStatus, + newStatus: Doppio.VM.Enums.ThreadStatus + ): void { + var wasRunnable = isRunnable(oldStatus), + nowRunnable = isRunnable(newStatus); + + if ( + oldStatus === Doppio.VM.Enums.ThreadStatus.NEW || + oldStatus === Doppio.VM.Enums.ThreadStatus.TERMINATED + ) { + if (this.threads.indexOf(thread) === -1) { + this.threads.push(thread); + } + } + + // Inform scheduling algorithm if thread changes from runnable => unrunnable, or unrunnable => runnable. + if (wasRunnable !== nowRunnable) { + if (wasRunnable) { + this.scheduler.unscheduleThread(thread); + } else { + this.scheduler.scheduleThread(thread); + } + } + + if (newStatus === Doppio.VM.Enums.ThreadStatus.TERMINATED) { + this.threadTerminated(thread); + } + } + + /** + * Called when a thread's priority changes. + */ + public priorityChange(thread: T): void { + this.scheduler.priorityChange(thread); + } + + /** + * Called when a thread's quantum is over. + */ + public quantumOver(thread: T): void { + this.scheduler.quantumOver(thread); + } } diff --git a/packages/java-runtime/src/process.ts b/packages/java-runtime/src/process.ts index 2d05704d..bbacc668 100644 --- a/packages/java-runtime/src/process.ts +++ b/packages/java-runtime/src/process.ts @@ -1,3 +1,3 @@ -import BrowserFS from "browserfs"; +import BrowserFS from 'browserfs'; -export const process = BrowserFS.BFSRequire("process"); +export const process = BrowserFS.BFSRequire('process'); diff --git a/packages/java-runtime/src/version.ts b/packages/java-runtime/src/version.ts index 4045ecf9..c7c38ce8 100644 --- a/packages/java-runtime/src/version.ts +++ b/packages/java-runtime/src/version.ts @@ -1 +1 @@ -export const version = "Java 8 OpenJDK" +export const version = 'Java 8 OpenJDK'; diff --git a/packages/java-runtime/tsconfig.json b/packages/java-runtime/tsconfig.json index 5e43c735..76ffdeb5 100644 --- a/packages/java-runtime/tsconfig.json +++ b/packages/java-runtime/tsconfig.json @@ -1,21 +1,15 @@ { - "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", - "compilerOptions": { - "lib": [ - "ES2022", - "ESNext.Disposable", - "DOM" - ], - "noUncheckedIndexedAccess": false, - "rootDir": "src", - "verbatimModuleSyntax": false, - "noEmit": false, - "composite": true, - "declarationMap": true, - "emitDeclarationOnly": true, - "outDir": "dist", - }, - "include": [ - "src/**/*" - ], -} \ No newline at end of file + "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", + "compilerOptions": { + "lib": ["ES2022", "ESNext.Disposable", "DOM"], + "noUncheckedIndexedAccess": false, + "rootDir": "src", + "verbatimModuleSyntax": false, + "noEmit": false, + "composite": true, + "declarationMap": true, + "emitDeclarationOnly": true, + "outDir": "dist" + }, + "include": ["src/**/*"] +} diff --git a/packages/javascript-runtime/package.json b/packages/javascript-runtime/package.json index 5e654d26..a32fdb40 100644 --- a/packages/javascript-runtime/package.json +++ b/packages/javascript-runtime/package.json @@ -1,18 +1,20 @@ { - "name": "javascript-runtime", - "version": "1.0.0", - "description": "", - "type": "module", - "scripts": { - "build": "tsc", - "dev": "tsc --watch" - }, - "author": "Krasilnikov Roman", - "license": "ISC", - "exports": { - ".": "./dist/index.js" - }, - "dependencies": { - "libs": "workspace:*" - } -} \ No newline at end of file + "name": "javascript-runtime", + "version": "1.0.0", + "description": "", + "license": "ISC", + "author": "Krasilnikov Roman", + "type": "module", + "exports": { + ".": "./dist/index.js" + }, + "scripts": { + "build": "tsc", + "dev": "tsc --watch", + "format": "oxfmt", + "format:check": "oxfmt --check ." + }, + "dependencies": { + "libs": "workspace:*" + } +} diff --git a/packages/javascript-runtime/src/index.ts b/packages/javascript-runtime/src/index.ts index 571ee8de..cab261b7 100644 --- a/packages/javascript-runtime/src/index.ts +++ b/packages/javascript-runtime/src/index.ts @@ -1,2 +1,2 @@ export * from './js-program.js'; -export * from "./js-test-program.js"; +export * from './js-test-program.js'; diff --git a/packages/javascript-runtime/src/js-program.ts b/packages/javascript-runtime/src/js-program.ts index 24274c5d..02a68f56 100644 --- a/packages/javascript-runtime/src/js-program.ts +++ b/packages/javascript-runtime/src/js-program.ts @@ -1,15 +1,15 @@ -import type { Program } from "libs/compiler"; -import { type Context } from "libs/context"; -import { patch } from "libs/patcher"; +import type { Program } from 'libs/compiler'; +import { type Context } from 'libs/context'; +import { patch } from 'libs/patcher'; export class JsProgram implements Program { - constructor( - protected readonly code: string, - protected readonly patchedConsole: Console - ) {} + constructor( + protected readonly code: string, + protected readonly patchedConsole: Console + ) {} - async run(_ctx: Context): Promise { - using _ = patch(globalThis, "console", this.patchedConsole); - eval(this.code); - } + async run(_ctx: Context): Promise { + using _ = patch(globalThis, 'console', this.patchedConsole); + eval(this.code); + } } diff --git a/packages/javascript-runtime/src/js-test-program.ts b/packages/javascript-runtime/src/js-test-program.ts index f9db5733..a0864ef1 100644 --- a/packages/javascript-runtime/src/js-test-program.ts +++ b/packages/javascript-runtime/src/js-test-program.ts @@ -1,18 +1,18 @@ -import { inContext, type Context } from "libs/context"; -import { patch } from "libs/patcher"; +import { inContext, type Context } from 'libs/context'; +import { patch } from 'libs/patcher'; -import type { TestProgram } from "libs/testing"; +import type { TestProgram } from 'libs/testing'; export abstract class JsTestProgram implements TestProgram { - constructor( - protected readonly m: M, - protected readonly patchedConsole: Console - ) {} + constructor( + protected readonly m: M, + protected readonly patchedConsole: Console + ) {} - abstract executeTest(m: M, input: I): Promise; + abstract executeTest(m: M, input: I): Promise; - async run(ctx: Context, input: I): Promise { - using _ = patch(globalThis, "console", this.patchedConsole); - return await inContext(ctx, this.executeTest(this.m, input)); - } + async run(ctx: Context, input: I): Promise { + using _ = patch(globalThis, 'console', this.patchedConsole); + return await inContext(ctx, this.executeTest(this.m, input)); + } } diff --git a/packages/javascript-runtime/tsconfig.json b/packages/javascript-runtime/tsconfig.json index 5acadfe6..bb8a61c1 100644 --- a/packages/javascript-runtime/tsconfig.json +++ b/packages/javascript-runtime/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "@total-typescript/tsconfig/tsc/dom/library-monorepo", - "compilerOptions": { - "outDir": "dist", - "rootDir": "src", - "lib": ["ES2022", "ESNext.Disposable", "DOM"], - "noUncheckedIndexedAccess": false, - }, -} \ No newline at end of file + "extends": "@total-typescript/tsconfig/tsc/dom/library-monorepo", + "compilerOptions": { + "outDir": "dist", + "rootDir": "src", + "lib": ["ES2022", "ESNext.Disposable", "DOM"], + "noUncheckedIndexedAccess": false + } +} diff --git a/packages/libs/package.json b/packages/libs/package.json index 1f4cd592..523a82ca 100644 --- a/packages/libs/package.json +++ b/packages/libs/package.json @@ -1,36 +1,38 @@ { - "name": "libs", - "version": "1.0.0", - "description": "", - "type": "module", - "scripts": { - "build": "tsc", - "dev": "tsc --watch", - "test": "vitest run" - }, - "keywords": [], - "author": "Krasilnikov Roman", - "license": "ISC", - "exports": { - "./sync": "./dist/sync/index.js", - "./actor": "./dist/actor/index.js", - "./compiler": "./dist/compiler/index.js", - "./compiler/actor": "./dist/compiler/actor.js", - "./testing": "./dist/testing/index.js", - "./testing/actor": "./dist/testing/actor.js", - "./wasi": "./dist/wasi/index.js", - "./*": { - "types": "./dist/*.d.ts", - "default": "./dist/*.js" - } - }, - "peerDependencies": { - "@bjorn3/browser_wasi_shim": "^0.4.0" - }, - "devDependencies": { - "@bjorn3/browser_wasi_shim": "^0.4.2", - "@types/node": "^24.10.1", - "vite": "catalog:", - "vitest": "catalog:" - } -} \ No newline at end of file + "name": "libs", + "version": "1.0.0", + "description": "", + "keywords": [], + "license": "ISC", + "author": "Krasilnikov Roman", + "type": "module", + "exports": { + "./sync": "./dist/sync/index.js", + "./actor": "./dist/actor/index.js", + "./compiler": "./dist/compiler/index.js", + "./compiler/actor": "./dist/compiler/actor.js", + "./testing": "./dist/testing/index.js", + "./testing/actor": "./dist/testing/actor.js", + "./wasi": "./dist/wasi/index.js", + "./*": { + "types": "./dist/*.d.ts", + "default": "./dist/*.js" + } + }, + "scripts": { + "build": "tsc", + "dev": "tsc --watch", + "test": "vitest run", + "format": "oxfmt", + "format:check": "oxfmt --check ." + }, + "devDependencies": { + "@bjorn3/browser_wasi_shim": "catalog:", + "@types/node": "^26.2.0", + "vite": "catalog:", + "vitest": "catalog:" + }, + "peerDependencies": { + "@bjorn3/browser_wasi_shim": "^0.4.0" + } +} diff --git a/packages/libs/src/actor/actor.ts b/packages/libs/src/actor/actor.ts index a5aa55c8..26186da1 100644 --- a/packages/libs/src/actor/actor.ts +++ b/packages/libs/src/actor/actor.ts @@ -1,84 +1,79 @@ import type { Context } from '../context.js'; -import { err, ok, type Result } from "../result.js"; -import { neverError } from "../error.js"; +import { err, ok, type Result } from '../result.js'; +import { neverError } from '../error.js'; import { - MessageType, - type Connection, - type EventMessage, - type Handlers, - type IncomingMessage, - type OutgoingMessage, - type RequestMessage, - type ResponseMessage, -} from "./model.js"; + MessageType, + type Connection, + type EventMessage, + type Handlers, + type IncomingMessage, + type OutgoingMessage, + type RequestMessage, + type ResponseMessage +} from './model.js'; export interface ActorConfig { - connection: Connection, OutgoingMessage>; - handlers: H; - caseError: (error: any) => E; + connection: Connection, OutgoingMessage>; + handlers: H; + caseError: (error: any) => E; } export class Actor { - constructor( - protected readonly connection: Connection< - IncomingMessage, - OutgoingMessage - >, - protected readonly handlers: H, - protected readonly caseError: (error: any) => E - ) {} + constructor( + protected readonly connection: Connection, OutgoingMessage>, + protected readonly handlers: H, + protected readonly caseError: (error: any) => E + ) {} - start(ctx: Context) { - this.connection.onMessage(ctx, this.handleMessage.bind(this)); - } + start(ctx: Context) { + this.connection.onMessage(ctx, this.handleMessage.bind(this)); + } - private async handleMessage(msg: IncomingMessage) { - switch (msg.type) { - case MessageType.Request: { - const result = await this.handleRequest(msg); - this.connection.send(result); - return; - } - case MessageType.Event: { - await this.handleEvent(msg); - return; - } - default: - throw neverError(msg, "Unknown message type"); - } - } + private async handleMessage(msg: IncomingMessage) { + switch (msg.type) { + case MessageType.Request: { + const result = await this.handleRequest(msg); + this.connection.send(result); + return; + } + case MessageType.Event: { + await this.handleEvent(msg); + return; + } + default: + throw neverError(msg, 'Unknown message type'); + } + } - private async handleEvent( - event: EventMessage[0]> - ) { - try { - await this.handlers[event.event](event.payload); - } catch (error) { - this.connection.send({ - type: MessageType.Event, - event: "error", - payload: this.caseError(error), - }); - } - } + private async handleEvent(event: EventMessage[0]>) { + try { + await this.handlers[event.event](event.payload); + } catch (error) { + this.connection.send({ + type: MessageType.Event, + event: 'error', + payload: this.caseError(error) + }); + } + } - private async handleRequest( - request: RequestMessage[0]> - ): Promise, E>>> { - try { - const result = await this.handlers[request.request](request.payload); - return { - type: MessageType.Response, - id: request.id, - result: ok(result), - }; - } catch (error) { - return { - type: MessageType.Response, - id: request.id, - result: err(this.caseError(error)), - }; - } - } + private async handleRequest( + request: RequestMessage[0]> + ): Promise, E>>> { + try { + const result = await this.handlers[request.request](request.payload); + return { + type: MessageType.Response, + id: request.id, + result: ok(result) + }; + } catch (error) { + return { + type: MessageType.Response, + id: request.id, + result: err(this.caseError(error)) + }; + } + } } diff --git a/packages/libs/src/actor/index.ts b/packages/libs/src/actor/index.ts index 1f105725..e8fa8c8d 100644 --- a/packages/libs/src/actor/index.ts +++ b/packages/libs/src/actor/index.ts @@ -1,4 +1,4 @@ -export * from './model.js' -export * from './actor.js' -export * from './worker-connection.js' -export * from './remote.js' +export * from './model.js'; +export * from './actor.js'; +export * from './worker-connection.js'; +export * from './remote.js'; diff --git a/packages/libs/src/actor/model.ts b/packages/libs/src/actor/model.ts index 3a1023ef..e1fcbd2a 100644 --- a/packages/libs/src/actor/model.ts +++ b/packages/libs/src/actor/model.ts @@ -1,58 +1,51 @@ -import type { Brand } from "../type.js"; -import type { Result } from "../result.js"; -import type { Context } from "../context.js"; +import type { Brand } from '../type.js'; +import type { Result } from '../result.js'; +import type { Context } from '../context.js'; export enum MessageType { - Event = "event", - Request = "request", - Response = "response", + Event = 'event', + Request = 'request', + Response = 'response' } export interface AbstractMessage { - type: T; + type: T; } -export interface EventMessage< - T extends PropertyKey, - P, -> extends AbstractMessage { - event: T; - payload: P; +export interface EventMessage extends AbstractMessage { + event: T; + payload: P; } -export type RequestId = Brand<"RequestId", number>; +export type RequestId = Brand<'RequestId', number>; export interface RequestMessage< - T extends PropertyKey, - P, + T extends PropertyKey, + P > extends AbstractMessage { - id: RequestId; - request: T; - payload: P; + id: RequestId; + request: T; + payload: P; } -export interface ResponseMessage< - R, -> extends AbstractMessage { - id: RequestId; - result: R; +export interface ResponseMessage extends AbstractMessage { + id: RequestId; + result: R; } export interface Connection { - onMessage: (ctx: Context, handler: (message: Incoming) => void) => void; - send: (message: Outgoing) => void; + onMessage: (ctx: Context, handler: (message: Incoming) => void) => void; + send: (message: Outgoing) => void; } export type Handlers = Record any>; export type IncomingMessage = { - [K in keyof H]: - | RequestMessage[0]> - | EventMessage[0]>; + [K in keyof H]: RequestMessage[0]> | EventMessage[0]>; }[keyof H]; -export interface ErrorEventMessage extends EventMessage<"error", E> {} +export interface ErrorEventMessage extends EventMessage<'error', E> {} export type OutgoingMessage = - | ResponseMessage, E>> - | ErrorEventMessage; + | ResponseMessage, E>> + | ErrorEventMessage; diff --git a/packages/libs/src/actor/remote.ts b/packages/libs/src/actor/remote.ts index a14a75d5..4b5afc23 100644 --- a/packages/libs/src/actor/remote.ts +++ b/packages/libs/src/actor/remote.ts @@ -1,109 +1,98 @@ import { CanceledError, type Context } from '../context.js'; -import type { Logger } from "../logger.js"; -import { neverError } from "../error.js"; -import { isOk } from "../result.js"; +import type { Logger } from '../logger.js'; +import { neverError } from '../error.js'; +import { isOk } from '../result.js'; import { - MessageType, - type Connection, - type ErrorEventMessage, - type EventMessage, - type Handlers, - type IncomingMessage, - type OutgoingMessage, - type RequestId, -} from "./model.js"; + MessageType, + type Connection, + type ErrorEventMessage, + type EventMessage, + type Handlers, + type IncomingMessage, + type OutgoingMessage, + type RequestId +} from './model.js'; interface DeferredPromise { - resolve: (value: T) => void; - reject: (error: E) => void; + resolve: (value: T) => void; + reject: (error: E) => void; } -export function startRemote< - H extends Handlers, - E, - Event extends EventMessage ->( - ctx: Context, - log: Logger, - connection: Connection | Event, IncomingMessage>, - eventHandlers: { - [K in Event["event"]]: ( - e: Extract>["payload"] - ) => void; - } & { - [K in ErrorEventMessage["event"]]: ( - e: ErrorEventMessage["payload"] - ) => void; - } +export function startRemote>( + ctx: Context, + log: Logger, + connection: Connection | Event, IncomingMessage>, + eventHandlers: { + [K in Event['event']]: (e: Extract>['payload']) => void; + } & { + [K in ErrorEventMessage['event']]: ( + e: ErrorEventMessage['payload'] + ) => void; + } ) { - let lastId = 0; - const promises = new Map< - RequestId, - DeferredPromise, E | CanceledError> - >(); - ctx.onCancel(() => { - for (const [, p] of promises) { - p.reject(new CanceledError()) - } - promises.clear() - }) - connection.onMessage(ctx, (msg) => { - switch (msg.type) { - case MessageType.Response: { - const { id, result } = msg; - const deferred = promises.get(id); - if (!deferred) { - log.error(`Received response for unknown request ${id}`); - return; - } - promises.delete(id); - if (isOk(result)) { - deferred.resolve(result.value); - } else { - deferred.reject(result.error); - } - return; - } - case MessageType.Event: { - // @ts-expect-error ts problem - const handler = eventHandlers[msg.event]; - if (!handler) { - log.error(`Received unknown event ${msg.event}`); - return; - } - handler(msg.payload); - return; - } - default: - throw neverError(msg, "Unknown message type"); - } - }); - return new Proxy( - {}, - { - get(_, prop) { - const request = prop as keyof H; - return (arg: Parameters[0]) => { - const id = lastId++ as RequestId; - const promise = new Promise>( - (resolve, reject) => { - promises.set(id, { resolve, reject }); - } - ); - connection.send({ - id: id, - request, - type: MessageType.Request, - payload: arg, - }); - return promise; - }; - }, - } - ) as { - [K in keyof H]: Parameters["length"] extends 0 - ? () => Promise> - : (arg: Parameters[0]) => Promise>; - }; + let lastId = 0; + const promises = new Map, E | CanceledError>>(); + ctx.onCancel(() => { + for (const [, p] of promises) { + p.reject(new CanceledError()); + } + promises.clear(); + }); + connection.onMessage(ctx, (msg) => { + switch (msg.type) { + case MessageType.Response: { + const { id, result } = msg; + const deferred = promises.get(id); + if (!deferred) { + log.error(`Received response for unknown request ${id}`); + return; + } + promises.delete(id); + if (isOk(result)) { + deferred.resolve(result.value); + } else { + deferred.reject(result.error); + } + return; + } + case MessageType.Event: { + // @ts-expect-error ts problem + const handler = eventHandlers[msg.event]; + if (!handler) { + log.error(`Received unknown event ${msg.event}`); + return; + } + handler(msg.payload); + return; + } + default: + throw neverError(msg, 'Unknown message type'); + } + }); + return new Proxy( + {}, + { + get(_, prop) { + const request = prop as keyof H; + return (arg: Parameters[0]) => { + const id = lastId++ as RequestId; + const promise = new Promise>((resolve, reject) => { + promises.set(id, { resolve, reject }); + }); + connection.send({ + id: id, + request, + type: MessageType.Request, + payload: arg + }); + return promise; + }; + } + } + ) as { + [K in keyof H]: Parameters['length'] extends 0 + ? () => Promise> + : (arg: Parameters[0]) => Promise>; + }; } diff --git a/packages/libs/src/actor/worker-connection.ts b/packages/libs/src/actor/worker-connection.ts index fcfc7367..8d1024c6 100644 --- a/packages/libs/src/actor/worker-connection.ts +++ b/packages/libs/src/actor/worker-connection.ts @@ -1,34 +1,32 @@ -import type { Context } from "../context.js"; +import type { Context } from '../context.js'; -import type { Connection } from "./model.js"; +import type { Connection } from './model.js'; -export class WorkerConnection - implements Connection -{ - private handlers = new Set<(message: Incoming) => void>(); +export class WorkerConnection implements Connection { + private handlers = new Set<(message: Incoming) => void>(); - constructor(private readonly worker: Worker) {} + constructor(private readonly worker: Worker) {} - start(ctx: Context) { - this.worker.addEventListener( - "message", - (e) => { - for (const handler of this.handlers) { - handler(e.data); - } - }, - ctx - ); - } + start(ctx: Context) { + this.worker.addEventListener( + 'message', + (e) => { + for (const handler of this.handlers) { + handler(e.data); + } + }, + ctx + ); + } - send(message: Outgoing) { - this.worker.postMessage(message); - } + send(message: Outgoing) { + this.worker.postMessage(message); + } - onMessage(ctx: Context, handler: (message: Incoming) => void) { - this.handlers.add(handler); - ctx.onCancel(() => { - this.handlers.delete(handler); - }); - } + onMessage(ctx: Context, handler: (message: Incoming) => void) { + this.handlers.add(handler); + ctx.onCancel(() => { + this.handlers.delete(handler); + }); + } } diff --git a/packages/libs/src/compiler/actor.ts b/packages/libs/src/compiler/actor.ts index d9143d04..41a61e64 100644 --- a/packages/libs/src/compiler/actor.ts +++ b/packages/libs/src/compiler/actor.ts @@ -1,196 +1,184 @@ import { - Actor, - MessageType, - startRemote, - WorkerConnection, - type Connection, - type EventMessage, - type IncomingMessage, - type OutgoingMessage, -} from "libs/actor"; -import { SharedQueue, createStreamsClient, writeToQueue } from "libs/sync"; + Actor, + MessageType, + startRemote, + WorkerConnection, + type Connection, + type EventMessage, + type IncomingMessage, + type OutgoingMessage +} from 'libs/actor'; +import { SharedQueue, createStreamsClient, writeToQueue } from 'libs/sync'; import { - CanceledError, - createContext, - createRecoverableContext, - withCancel, - type Context, -} from "libs/context"; -import { stringifyError } from "libs/error"; -import { createLogger } from "libs/logger"; + CanceledError, + createContext, + createRecoverableContext, + withCancel, + type Context +} from 'libs/context'; +import { stringifyError } from 'libs/error'; +import { createLogger } from 'libs/logger'; import type { ReadableStreamOfBytes, Streams, Writer } from 'libs/io'; -import type { - Compiler, - CompilerFactory, - File, - Program, -} from "./compiler.js"; +import type { Compiler, CompilerFactory, File, Program } from './compiler.js'; interface Handlers { - [key: string]: any; - initialize (buffer: SharedArrayBuffer | ArrayBuffer): Promise; - destroy (): void; + [key: string]: any; + initialize(buffer: SharedArrayBuffer | ArrayBuffer): Promise; + destroy(): void; - compile (files: File[]): Promise; - stopCompile (): void; + compile(files: File[]): Promise; + stopCompile(): void; - run (): Promise; - stopRun (): void; + run(): Promise; + stopRun(): void; } type Incoming = IncomingMessage; -interface WriteEventMessage extends EventMessage<"write", Uint8Array> { } +interface WriteEventMessage extends EventMessage<'write', Uint8Array> {} type CompilerActorEvent = WriteEventMessage; type Outgoing = OutgoingMessage | CompilerActorEvent; class CompilerActor extends Actor implements Disposable { - protected compiler: Compiler | null = null; - protected compilerCtx = createRecoverableContext(() => { - this.compiler = null; - return withCancel(createContext()); - }); - protected program: Program | null = null; - protected programCtx = createRecoverableContext(() => { - this.program = null; - return withCancel(this.compilerCtx.ref); - }); - protected runCtx = createRecoverableContext(() => - withCancel(this.programCtx.ref) - ); + protected compiler: Compiler | null = null; + protected compilerCtx = createRecoverableContext(() => { + this.compiler = null; + return withCancel(createContext()); + }); + protected program: Program | null = null; + protected programCtx = createRecoverableContext(() => { + this.program = null; + return withCancel(this.compilerCtx.ref); + }); + protected runCtx = createRecoverableContext(() => withCancel(this.programCtx.ref)); - constructor( - connection: Connection, - compilerFactory: CompilerFactory - ) { - const handlers: Handlers = { - initialize: async (buffer: SharedArrayBuffer) => { - this.compiler = await compilerFactory(this.compilerCtx.ref, createStreamsClient(new SharedQueue(buffer), - { - write (data) { - connection.send({ - type: MessageType.Event, - event: "write", - payload: data, - }); - }, - })); - }, - destroy: () => { - this.compilerCtx.cancel(); - }, - compile: async (files) => { - if (this.compiler === null) { - throw new Error("Compiler not initialized"); - } - this.program = await this.compiler.compile(this.programCtx.ref, files); - }, - stopCompile: () => { - this.programCtx.cancel(); - }, - run: async () => { - if (this.program === null) { - const err = new Error("Program not compiled"); - connection.send({ - type: MessageType.Event, - event: "error", - payload: err.message, - }); - throw err; - } - try { - await this.program.run(this.runCtx.ref); - } finally { - this.runCtx.cancel(); - } - }, - stopRun: () => { - this.runCtx.cancel(); - }, - }; - super(connection, handlers, stringifyError); - } + constructor( + connection: Connection, + compilerFactory: CompilerFactory + ) { + const handlers: Handlers = { + initialize: async (buffer: SharedArrayBuffer) => { + this.compiler = await compilerFactory( + this.compilerCtx.ref, + createStreamsClient(new SharedQueue(buffer), { + write(data) { + connection.send({ + type: MessageType.Event, + event: 'write', + payload: data + }); + } + }) + ); + }, + destroy: () => { + this.compilerCtx.cancel(); + }, + compile: async (files) => { + if (this.compiler === null) { + throw new Error('Compiler not initialized'); + } + this.program = await this.compiler.compile(this.programCtx.ref, files); + }, + stopCompile: () => { + this.programCtx.cancel(); + }, + run: async () => { + if (this.program === null) { + const err = new Error('Program not compiled'); + connection.send({ + type: MessageType.Event, + event: 'error', + payload: err.message + }); + throw err; + } + try { + await this.program.run(this.runCtx.ref); + } finally { + this.runCtx.cancel(); + } + }, + stopRun: () => { + this.runCtx.cancel(); + } + }; + super(connection, handlers, stringifyError); + } - [Symbol.dispose] (): void { - this.compiler = null; - this.compilerCtx[Symbol.dispose](); - this.program = null; - this.programCtx[Symbol.dispose](); - this.runCtx[Symbol.dispose](); - } + [Symbol.dispose](): void { + this.compiler = null; + this.compilerCtx[Symbol.dispose](); + this.program = null; + this.programCtx[Symbol.dispose](); + this.runCtx[Symbol.dispose](); + } } -export function startCompilerActor ( - ctx: Context, - compilerFactory: CompilerFactory +export function startCompilerActor( + ctx: Context, + compilerFactory: CompilerFactory ) { - const connection = new WorkerConnection( - self as unknown as Worker - ); - connection.start(ctx); - const actor = new CompilerActor(connection, compilerFactory); - ctx.onCancel(() => { - actor[Symbol.dispose](); - }); - actor.start(ctx); + const connection = new WorkerConnection(self as unknown as Worker); + connection.start(ctx); + const actor = new CompilerActor(connection, compilerFactory); + ctx.onCancel(() => { + actor[Symbol.dispose](); + }); + actor.start(ctx); } interface WorkerConstructor { - new(): Worker; + new (): Worker; } export interface RemoteCompilerFactoryOptions { - input: ReadableStreamOfBytes - output: Writer + input: ReadableStreamOfBytes; + output: Writer; } -export function makeRemoteCompilerFactory (Worker: WorkerConstructor) { - return async ( - ctx: Context, - { input, output }: RemoteCompilerFactoryOptions - ): Promise> => { - const worker = new Worker(); - ctx.onCancel(() => { - worker.terminate(); - }); - const connection = new WorkerConnection(worker); - connection.start(ctx); - const log = createLogger(output); - const Buffer = window.SharedArrayBuffer ? SharedArrayBuffer : ArrayBuffer; - const buffer = new Buffer(1024 * 1024); - const sharedWriter = writeToQueue(input, new SharedQueue(buffer)); - ctx.onCancel(() => { - sharedWriter[Symbol.dispose](); - }); - const remote = startRemote( - ctx, - log, - connection, - { - write (data) { - output.write(data); - }, - error (err) { - log.error(err instanceof CanceledError ? err.message : err); - }, - } - ); - using _ = ctx.onCancel(() => remote.destroy()); - await remote.initialize(buffer); - return { - async compile (ctx, files) { - using _ = ctx.onCancel(() => remote.stopCompile()); - await remote.compile(files); - return { - async run (ctx) { - using _ = ctx.onCancel(() => remote.stopRun()); - await remote.run(); - }, - }; - }, - }; - }; +export function makeRemoteCompilerFactory(Worker: WorkerConstructor) { + return async ( + ctx: Context, + { input, output }: RemoteCompilerFactoryOptions + ): Promise> => { + const worker = new Worker(); + ctx.onCancel(() => { + worker.terminate(); + }); + const connection = new WorkerConnection(worker); + connection.start(ctx); + const log = createLogger(output); + const Buffer = window.SharedArrayBuffer ? SharedArrayBuffer : ArrayBuffer; + const buffer = new Buffer(1024 * 1024); + const sharedWriter = writeToQueue(input, new SharedQueue(buffer)); + ctx.onCancel(() => { + sharedWriter[Symbol.dispose](); + }); + const remote = startRemote(ctx, log, connection, { + write(data) { + output.write(data); + }, + error(err) { + log.error(err instanceof CanceledError ? err.message : err); + } + }); + using _ = ctx.onCancel(() => remote.destroy()); + await remote.initialize(buffer); + return { + async compile(ctx, files) { + using _ = ctx.onCancel(() => remote.stopCompile()); + await remote.compile(files); + return { + async run(ctx) { + using _ = ctx.onCancel(() => remote.stopRun()); + await remote.run(); + } + }; + } + }; + }; } diff --git a/packages/libs/src/compiler/compiler.ts b/packages/libs/src/compiler/compiler.ts index 83408948..0b8c7807 100644 --- a/packages/libs/src/compiler/compiler.ts +++ b/packages/libs/src/compiler/compiler.ts @@ -1,19 +1,16 @@ -import type { Context } from "libs/context"; +import type { Context } from 'libs/context'; export interface Program { - run: (ctx: Context) => Promise; + run: (ctx: Context) => Promise; } export interface File { - filename: string; - content: string; + filename: string; + content: string; } export interface Compiler

    { - compile: (ctx: Context, files: File[]) => Promise

    ; + compile: (ctx: Context, files: File[]) => Promise

    ; } -export type CompilerFactory = ( - ctx: Context, - options: O -) => Promise>; +export type CompilerFactory = (ctx: Context, options: O) => Promise>; diff --git a/packages/libs/src/compiler/index.ts b/packages/libs/src/compiler/index.ts index c493aabc..3ac15564 100644 --- a/packages/libs/src/compiler/index.ts +++ b/packages/libs/src/compiler/index.ts @@ -1 +1 @@ -export * from './compiler.js' +export * from './compiler.js'; diff --git a/packages/libs/src/context.ts b/packages/libs/src/context.ts index 44995391..17f7a869 100644 --- a/packages/libs/src/context.ts +++ b/packages/libs/src/context.ts @@ -1,89 +1,86 @@ -import { noop } from "./function.js"; +import { noop } from './function.js'; export interface Context { - readonly signal: AbortSignal; - onCancel(action: () => void): Disposable; + readonly signal: AbortSignal; + onCancel(action: () => void): Disposable; } function createContextFromSignal(signal: AbortSignal): Context { - return { - signal, - onCancel(action) { - if (signal.aborted) { - action(); - return { [Symbol.dispose]: noop }; - } - const dispose = () => signal.removeEventListener("abort", handler); - const handler = () => { - dispose(); - action(); - }; - signal.addEventListener("abort", handler); - return { [Symbol.dispose]: dispose }; - }, - }; + return { + signal, + onCancel(action) { + if (signal.aborted) { + action(); + return { [Symbol.dispose]: noop }; + } + const dispose = () => signal.removeEventListener('abort', handler); + const handler = () => { + dispose(); + action(); + }; + signal.addEventListener('abort', handler); + return { [Symbol.dispose]: dispose }; + } + }; } export function createContext(): Context { - const ctrl = new AbortController(); - return createContextFromSignal(ctrl.signal); + const ctrl = new AbortController(); + return createContextFromSignal(ctrl.signal); } export function withCancel(ctx: Context): [Context, () => void] { - const ctrl = new AbortController(); - const signal = AbortSignal.any([ctx.signal, ctrl.signal]); - return [createContextFromSignal(signal), ctrl.abort.bind(ctrl)]; + const ctrl = new AbortController(); + const signal = AbortSignal.any([ctx.signal, ctrl.signal]); + return [createContextFromSignal(signal), ctrl.abort.bind(ctrl)]; } export function withTimeout(ctx: Context, timeoutInMs: number): Context { - const signal = AbortSignal.any([ - ctx.signal, - AbortSignal.timeout(timeoutInMs), - ]); - return createContextFromSignal(signal); + const signal = AbortSignal.any([ctx.signal, AbortSignal.timeout(timeoutInMs)]); + return createContextFromSignal(signal); } export class CanceledError extends Error { - constructor() { - super("Context is canceled"); - } + constructor() { + super('Context is canceled'); + } } export function inContext(ctx: Context, promise: Promise): Promise { - return new Promise((resolve, reject) => { - if (ctx.signal.aborted) { - reject(new CanceledError()); - return; - } - const cancel = () => { - reject(new CanceledError()); - }; - ctx.signal.addEventListener("abort", cancel); - promise.then(resolve, reject).finally(() => { - ctx.signal.removeEventListener("abort", cancel); - }); - }); + return new Promise((resolve, reject) => { + if (ctx.signal.aborted) { + reject(new CanceledError()); + return; + } + const cancel = () => { + reject(new CanceledError()); + }; + ctx.signal.addEventListener('abort', cancel); + promise.then(resolve, reject).finally(() => { + ctx.signal.removeEventListener('abort', cancel); + }); + }); } export interface RecoverableContext extends Disposable { - ref: Context; - cancel: () => void; + ref: Context; + cancel: () => void; } export function createRecoverableContext( - contextFactory: () => [Context, () => void], + contextFactory: () => [Context, () => void] ): RecoverableContext { - let [ref, cancel] = contextFactory(); - const disposable = ref.onCancel(function handleCancel() { - [ref, cancel] = contextFactory(); - recoverable.ref = ref; - recoverable.cancel = cancel; - recoverable[Symbol.dispose] = ref.onCancel(handleCancel)[Symbol.dispose]; - }); - const recoverable: RecoverableContext = { - ref, - cancel, - [Symbol.dispose]: disposable[Symbol.dispose], - }; - return recoverable; + let [ref, cancel] = contextFactory(); + const disposable = ref.onCancel(function handleCancel() { + [ref, cancel] = contextFactory(); + recoverable.ref = ref; + recoverable.cancel = cancel; + recoverable[Symbol.dispose] = ref.onCancel(handleCancel)[Symbol.dispose]; + }); + const recoverable: RecoverableContext = { + ref, + cancel, + [Symbol.dispose]: disposable[Symbol.dispose] + }; + return recoverable; } diff --git a/packages/libs/src/deep-equal.ts b/packages/libs/src/deep-equal.ts index d017055e..fc57ae5b 100644 --- a/packages/libs/src/deep-equal.ts +++ b/packages/libs/src/deep-equal.ts @@ -1,42 +1,37 @@ import { isObject } from './object.js'; export function isDeepEqual(a: any, b: any): boolean { - if (a === b) { - return true; - } - if (isObject(a) && isObject(b)) { - if (Array.isArray(a)) { - if (!Array.isArray(b)) { - return false; - } - const { length } = a; - if (length !== b.length) { - return false; - } - for (let i = length; i-- !== 0; ) { - if (!isDeepEqual(a[i], b[i])) { - return false; - } - } - return true; - } - if (Array.isArray(b)) { - return false; - } - const aKeys = Object.keys(a); - let key; - for (let i = aKeys.length; i-- !== 0; ) { - key = aKeys[i]!; - if ( - !isDeepEqual( - (a as Record)[key], - (b as Record)[key] - ) - ) { - return false; - } - } - return Object.keys(b).length === aKeys.length; - } - return a !== a && b !== b; + if (a === b) { + return true; + } + if (isObject(a) && isObject(b)) { + if (Array.isArray(a)) { + if (!Array.isArray(b)) { + return false; + } + const { length } = a; + if (length !== b.length) { + return false; + } + for (let i = length; i-- !== 0;) { + if (!isDeepEqual(a[i], b[i])) { + return false; + } + } + return true; + } + if (Array.isArray(b)) { + return false; + } + const aKeys = Object.keys(a); + let key; + for (let i = aKeys.length; i-- !== 0;) { + key = aKeys[i]!; + if (!isDeepEqual((a as Record)[key], (b as Record)[key])) { + return false; + } + } + return Object.keys(b).length === aKeys.length; + } + return a !== a && b !== b; } diff --git a/packages/libs/src/error.ts b/packages/libs/src/error.ts index 4ba7a270..89972431 100644 --- a/packages/libs/src/error.ts +++ b/packages/libs/src/error.ts @@ -1,24 +1,24 @@ -import { stringify } from "./json.js"; +import { stringify } from './json.js'; export function neverError(value: never, message: string) { - return new Error(`${message}: ${value}`); + return new Error(`${message}: ${value}`); } export function stringifyError(err: unknown): string { - if (typeof err === "string") { - return err; - } - if (err instanceof Error) { - return err.message; - } - if (err && typeof err === "object") { - if ("toString" in err && typeof err.toString === "function") { - const str = err.toString(); - if (str !== "[object Object]") { - return str; - } - } - return stringify(err); - } - return String(err); + if (typeof err === 'string') { + return err; + } + if (err instanceof Error) { + return err.message; + } + if (err && typeof err === 'object') { + if ('toString' in err && typeof err.toString === 'function') { + const str = err.toString(); + if (str !== '[object Object]') { + return str; + } + } + return stringify(err); + } + return String(err); } diff --git a/packages/libs/src/fetch.ts b/packages/libs/src/fetch.ts index 472e905a..ea9c58de 100644 --- a/packages/libs/src/fetch.ts +++ b/packages/libs/src/fetch.ts @@ -1,26 +1,26 @@ export type Fetcher = (url: string) => Promise; export function createCachedFetch(cache: Cache) { - return async (url: string, init?: RequestInit) => { - const request = new Request(url, init); - const cached = await cache.match(request); - if (cached) { - return cached.clone(); - } - const response = await fetch(request); - if (response.ok && response.type === "basic") { - cache.put(request, response.clone()); - } - return response; - }; + return async (url: string, init?: RequestInit) => { + const request = new Request(url, init); + const cached = await cache.match(request); + if (cached) { + return cached.clone(); + } + const response = await fetch(request); + if (response.ok && response.type === 'basic') { + cache.put(request, response.clone()); + } + return response; + }; } export async function cache(prefix: string, version: string) { - const name = `${prefix}${version}`; - for (const n of await caches.keys()) { - if (n.startsWith(prefix) && n !== name) { - await caches.delete(n); - } - } - return await caches.open(name); + const name = `${prefix}${version}`; + for (const n of await caches.keys()) { + if (n.startsWith(prefix) && n !== name) { + await caches.delete(n); + } + } + return await caches.open(name); } diff --git a/packages/libs/src/hash.ts b/packages/libs/src/hash.ts index 3f71765e..1c3e02b7 100644 --- a/packages/libs/src/hash.ts +++ b/packages/libs/src/hash.ts @@ -1,16 +1,14 @@ const textEncoder = new TextEncoder(); -const HEX_STRINGS = Array.from({ length: 256 }, (_, i) => - i.toString(16).padStart(2, "0"), -); +const HEX_STRINGS = Array.from({ length: 256 }, (_, i) => i.toString(16).padStart(2, '0')); export async function hashString(str: string) { - const bytes = textEncoder.encode(str); - const digest = await crypto.subtle.digest("SHA-256", bytes); + const bytes = textEncoder.encode(str); + const digest = await crypto.subtle.digest('SHA-256', bytes); - const hashArray = new Uint8Array(digest); - let hex = ""; - for (let i = 0; i < hashArray.length; i++) { - hex += HEX_STRINGS[hashArray[i]]; - } - return hex; + const hashArray = new Uint8Array(digest); + let hex = ''; + for (let i = 0; i < hashArray.length; i++) { + hex += HEX_STRINGS[hashArray[i]]; + } + return hex; } diff --git a/packages/libs/src/io.ts b/packages/libs/src/io.ts index 75b3f73a..915653db 100644 --- a/packages/libs/src/io.ts +++ b/packages/libs/src/io.ts @@ -1,21 +1,19 @@ export interface Writer { - write(data: Uint8Array): void; + write(data: Uint8Array): void; } export interface Reader { - read(): Uint8Array; + read(): Uint8Array; } export interface Streams { - in: Reader; - out: Writer; - err: Writer; + in: Reader; + out: Writer; + err: Writer; } export type ReadableStreamOfBytes = ReadableStream; export type WritableStreamOfBytes = WritableStream; -export type BytesStreamWriter = WritableStreamDefaultWriter< - Uint8Array ->; +export type BytesStreamWriter = WritableStreamDefaultWriter>; diff --git a/packages/libs/src/js.ts b/packages/libs/src/js.ts index 780fae4c..8445c476 100644 --- a/packages/libs/src/js.ts +++ b/packages/libs/src/js.ts @@ -1,3 +1,3 @@ export async function compileJsModule(code: string): Promise { - return import(/* @vite-ignore */ `data:text/javascript;base64,${btoa(code)}`); + return import(/* @vite-ignore */ `data:text/javascript;base64,${btoa(code)}`); } diff --git a/packages/libs/src/json.ts b/packages/libs/src/json.ts index 49093ca3..2ef2191f 100644 --- a/packages/libs/src/json.ts +++ b/packages/libs/src/json.ts @@ -1,16 +1,16 @@ export function stringify(obj: any, spaces?: number | string) { - const seen = new WeakSet(); - return JSON.stringify( - obj, - (_, value) => { - if (typeof value === "object" && value !== null) { - if (seen.has(value)) { - return "[Circular]"; - } - seen.add(value); - } - return value; - }, - spaces - ); + const seen = new WeakSet(); + return JSON.stringify( + obj, + (_, value) => { + if (typeof value === 'object' && value !== null) { + if (seen.has(value)) { + return '[Circular]'; + } + seen.add(value); + } + return value; + }, + spaces + ); } diff --git a/packages/libs/src/logger.ts b/packages/libs/src/logger.ts index fdfe4cba..9f3eeaf2 100644 --- a/packages/libs/src/logger.ts +++ b/packages/libs/src/logger.ts @@ -1,109 +1,101 @@ -import { stringify } from "./json.js"; +import { stringify } from './json.js'; import type { Writer } from './io.js'; export interface Logger { - debug(text: string): void; - info(text: string): void; - warn(text: string): void; - error(text: string): void; + debug(text: string): void; + info(text: string): void; + warn(text: string): void; + error(text: string): void; } // ANSI color codes for log levels export const COLOR = { - DEBUG: "\x1b[32m", // Green - INFO: "\x1b[34m", // Blue - WARN: "\x1b[33m", // Yellow - ERROR: "\x1b[31m", // Red - RESET: "\x1b[0m", // Reset to default color + DEBUG: '\x1b[32m', // Green + INFO: '\x1b[34m', // Blue + WARN: '\x1b[33m', // Yellow + ERROR: '\x1b[31m', // Red + RESET: '\x1b[0m' // Reset to default color }; const encoder = new TextEncoder(); -export const BACKSPACE = encoder.encode('\x7f') +export const BACKSPACE = encoder.encode('\x7f'); export const COLOR_ENCODED: Record = { - DEBUG: encoder.encode(COLOR.DEBUG), - INFO: encoder.encode(COLOR.INFO), - WARN: encoder.encode(COLOR.WARN), - ERROR: encoder.encode(COLOR.ERROR), - RESET: encoder.encode(COLOR.RESET), -} + DEBUG: encoder.encode(COLOR.DEBUG), + INFO: encoder.encode(COLOR.INFO), + WARN: encoder.encode(COLOR.WARN), + ERROR: encoder.encode(COLOR.ERROR), + RESET: encoder.encode(COLOR.RESET) +}; export function makeErrorWriter(out: Writer): Writer { - return { - write (data) { - out.write(COLOR_ENCODED.ERROR) - out.write(data) - out.write(COLOR_ENCODED.RESET) - }, - } + return { + write(data) { + out.write(COLOR_ENCODED.ERROR); + out.write(data); + out.write(COLOR_ENCODED.RESET); + } + }; } export function createLogger(writer: Writer, textEncoder = encoder): Logger { - return { - debug(text) { - writer.write(textEncoder.encode(`[${COLOR.DEBUG}DEBUG${COLOR.RESET}] ${text}\n`)); - }, - info(text) { - writer.write(textEncoder.encode(`[${COLOR.INFO}INFO${COLOR.RESET}] ${text}\n`)); - }, - warn(text) { - writer.write(textEncoder.encode(`[${COLOR.WARN}WARN${COLOR.RESET}] ${text}\n`)); - }, - error(text) { - writer.write(textEncoder.encode(`[${COLOR.ERROR}ERROR${COLOR.RESET}] ${text}\n`)); - }, - }; + return { + debug(text) { + writer.write(textEncoder.encode(`[${COLOR.DEBUG}DEBUG${COLOR.RESET}] ${text}\n`)); + }, + info(text) { + writer.write(textEncoder.encode(`[${COLOR.INFO}INFO${COLOR.RESET}] ${text}\n`)); + }, + warn(text) { + writer.write(textEncoder.encode(`[${COLOR.WARN}WARN${COLOR.RESET}] ${text}\n`)); + }, + error(text) { + writer.write(textEncoder.encode(`[${COLOR.ERROR}ERROR${COLOR.RESET}] ${text}\n`)); + } + }; } -type ConsoleLogMethod = - | "log" - | "info" - | "warn" - | "error" - | "debug" - | "trace" - | "assert" - | "dir"; +type ConsoleLogMethod = 'log' | 'info' | 'warn' | 'error' | 'debug' | 'trace' | 'assert' | 'dir'; const CONSOLE_LOGGER_METHOD: Record = { - dir: "debug", - trace: "debug", - log: "debug", - debug: "debug", - info: "info", - warn: "warn", - error: "error", - assert: "error", + dir: 'debug', + trace: 'debug', + log: 'debug', + debug: 'debug', + info: 'info', + warn: 'warn', + error: 'error', + assert: 'error' }; const safeStringify = (value: any) => stringify(value, 2); export function redirect(originalConsole: Console, logger: Logger): Console { - return new Proxy(originalConsole, { - get(target, p, receiver) { - if (p in CONSOLE_LOGGER_METHOD) { - const method = CONSOLE_LOGGER_METHOD[p as ConsoleLogMethod]; - if (p === "assert") { - return (condition: any, ...args: any[]) => { - if (condition) { - return; - } - const text = args.map(safeStringify).join(" "); - logger[method](text); - }; - } - if (p === "dir") { - return (arg: any) => { - logger[method](safeStringify(arg)); - }; - } - return (...args: any[]) => { - const text = args.map(safeStringify).join(" "); - logger[method](text); - }; - } - return Reflect.get(target, p, receiver); - }, - }); + return new Proxy(originalConsole, { + get(target, p, receiver) { + if (p in CONSOLE_LOGGER_METHOD) { + const method = CONSOLE_LOGGER_METHOD[p as ConsoleLogMethod]; + if (p === 'assert') { + return (condition: any, ...args: any[]) => { + if (condition) { + return; + } + const text = args.map(safeStringify).join(' '); + logger[method](text); + }; + } + if (p === 'dir') { + return (arg: any) => { + logger[method](safeStringify(arg)); + }; + } + return (...args: any[]) => { + const text = args.map(safeStringify).join(' '); + logger[method](text); + }; + } + return Reflect.get(target, p, receiver); + } + }); } diff --git a/packages/libs/src/object.ts b/packages/libs/src/object.ts index 2cca2d73..f8a8520e 100644 --- a/packages/libs/src/object.ts +++ b/packages/libs/src/object.ts @@ -1,3 +1,3 @@ export function isObject(value: unknown): value is object { - return typeof value === "object" && value !== null; + return typeof value === 'object' && value !== null; } diff --git a/packages/libs/src/patcher.ts b/packages/libs/src/patcher.ts index 990e322f..ad3613a4 100644 --- a/packages/libs/src/patcher.ts +++ b/packages/libs/src/patcher.ts @@ -1,13 +1,9 @@ -export function patch( - obj: T, - key: K, - value: T[K] -): Disposable { - const originalValue = obj[key]; - obj[key] = value; - return { - [Symbol.dispose]: () => { - obj[key] = originalValue; - }, - }; +export function patch(obj: T, key: K, value: T[K]): Disposable { + const originalValue = obj[key]; + obj[key] = value; + return { + [Symbol.dispose]: () => { + obj[key] = originalValue; + } + }; } diff --git a/packages/libs/src/result.ts b/packages/libs/src/result.ts index 5ad01afc..504d35f7 100644 --- a/packages/libs/src/result.ts +++ b/packages/libs/src/result.ts @@ -1,35 +1,35 @@ export interface Ok { - ok: true; - value: T; + ok: true; + value: T; } export interface Err { - ok: false; - error: E; + ok: false; + error: E; } export type Result = Ok | Err; export function isOk(result: Result): result is Ok { - return result.ok; + return result.ok; } export function isErr(result: Result): result is Err { - return !result.ok; + return !result.ok; } export function ok(value: T): Ok { - return { ok: true, value }; + return { ok: true, value }; } export function err(error: E): Err { - return { ok: false, error }; + return { ok: false, error }; } export function unwrap(g: Generator, Result, T>) { - let result = g.next(); - while (!result.done && isOk(result.value)) { - result = g.next(result.value.value); - } - return result.value; + let result = g.next(); + while (!result.done && isOk(result.value)) { + result = g.next(result.value.value); + } + return result.value; } diff --git a/packages/libs/src/sync/index.ts b/packages/libs/src/sync/index.ts index e3b5500e..ca10ae28 100644 --- a/packages/libs/src/sync/index.ts +++ b/packages/libs/src/sync/index.ts @@ -1,2 +1,2 @@ -export * from './shared-queue.js' -export * from './io.js' +export * from './shared-queue.js'; +export * from './io.js'; diff --git a/packages/libs/src/sync/io.ts b/packages/libs/src/sync/io.ts index 34ba12d3..55ab3467 100644 --- a/packages/libs/src/sync/io.ts +++ b/packages/libs/src/sync/io.ts @@ -1,55 +1,50 @@ -import type { ReadableStreamOfBytes, Streams, Writer } from "libs/io"; -import { makeErrorWriter } from "libs/logger"; -import { noop } from "libs/function"; +import type { ReadableStreamOfBytes, Streams, Writer } from 'libs/io'; +import { makeErrorWriter } from 'libs/logger'; +import { noop } from 'libs/function'; -import type { SharedQueue } from "./shared-queue.js"; +import type { SharedQueue } from './shared-queue.js'; export function readFromQueue(inputQueue: SharedQueue) { - const input = new ReadableStream({ - pull(controller) { - const r = inputQueue.blockingRead(); - const bytes = r.next().value.bytes; - // NOTE: The generator must be exhausted - r.next(); - controller.enqueue(bytes); - }, - }); - return input; + const input = new ReadableStream({ + pull(controller) { + const r = inputQueue.blockingRead(); + const bytes = r.next().value.bytes; + // NOTE: The generator must be exhausted + r.next(); + controller.enqueue(bytes); + } + }); + return input; } export function writeToQueue(input: ReadableStreamOfBytes, queue: SharedQueue) { - const w = new WritableStream({ - write(bytes) { - queue.pushBytes(bytes); - queue.commit(); - }, - }); - const controller = new AbortController(); - input - .pipeTo(w, { signal: controller.signal, preventCancel: true }) - .catch(noop); - return { - [Symbol.dispose]() { - controller.abort(); - }, - }; + const w = new WritableStream({ + write(bytes) { + queue.pushBytes(bytes); + queue.commit(); + } + }); + const controller = new AbortController(); + input.pipeTo(w, { signal: controller.signal, preventCancel: true }).catch(noop); + return { + [Symbol.dispose]() { + controller.abort(); + } + }; } -export function createStreamsClient( - inputQueue: SharedQueue, - writer: Writer -): Streams { - return { - in: { - read() { - const r = inputQueue.blockingRead(); - const bytes = r.next().value.bytes; - // NOTE: The generator must be exhausted - r.next(); - return bytes; - }, - }, - out: writer, - err: makeErrorWriter(writer), - }; +export function createStreamsClient(inputQueue: SharedQueue, writer: Writer): Streams { + return { + in: { + read() { + const r = inputQueue.blockingRead(); + const bytes = r.next().value.bytes; + // NOTE: The generator must be exhausted + r.next(); + return bytes; + } + }, + out: writer, + err: makeErrorWriter(writer) + }; } diff --git a/packages/libs/src/sync/shared-queue.ts b/packages/libs/src/sync/shared-queue.ts index 59dce5b9..761b8521 100644 --- a/packages/libs/src/sync/shared-queue.ts +++ b/packages/libs/src/sync/shared-queue.ts @@ -1,161 +1,161 @@ export class SharedQueue { - protected encoder = new TextEncoder(); - protected decoder = new TextDecoder(); - /** @private */ - public index = 0; - /** @private */ - public lastIndex = 0; - - protected len: number; - protected byteArr: Uint8Array; - protected uintArr: Uint32Array; - protected intArr: Int32Array; - protected floatArr: Float32Array; - - constructor(buffer: ArrayBuffer | SharedArrayBuffer) { - this.byteArr = new Uint8Array(buffer); - this.uintArr = new Uint32Array(buffer); - this.intArr = new Int32Array(buffer); - this.floatArr = new Float32Array(buffer); - this.len = this.uintArr.length; - } - - pushUint(element: number) { - this.uintArr[this.nextIndex()] = element; - } - - pushInt(element: number) { - this.intArr[this.nextIndex()] = element; - } - - pushFloat(element: number) { - this.floatArr[this.nextIndex()] = element; - } - - pushBytes(bytes: Uint8Array | Uint8ClampedArray) { - // TODO: push operations should consider the last index (free space) - if (this.byteArr.length < bytes.length + 12) { - // commit + len + padding - throw new Error(`Too large`); - } - this.pushUint(bytes.length); - const offset = (this.index + 1) * 4; - const diff = this.byteArr.length - offset; - if (bytes.length <= diff) { - this.byteArr.set(bytes, offset); - this.index += Math.ceil(bytes.length / 4); - } else { - this.byteArr.set(bytes.subarray(0, diff), offset); - this.byteArr.set(bytes.subarray(diff), 0); - this.index = Math.ceil((bytes.length - diff) / 4) - 1; - } - } - - pushString(str: string) { - const encoded = this.encoder.encode(str); - this.pushBytes(encoded); - } - - commit() { - if (this.lastIndex === this.index) { - return; - } - this.nextIndex(); - this.intArr[this.index] = this.index; - Atomics.store(this.intArr, this.lastIndex, this.index); - Atomics.notify(this.intArr, this.lastIndex); - this.lastIndex = this.index; - } - - get float() { - return this.floatArr[this.lastIndex]; - } - - get int() { - return this.intArr[this.lastIndex]; - } - - get uint() { - return this.uintArr[this.lastIndex]; - } - - get bytes() { - const len = this.uintArr[this.lastIndex]; - const bytes = new Uint8Array(len); - const offset = (this.lastIndex + 1) * 4; - const diff = this.byteArr.length - offset; - if (len <= diff) { - bytes.set(this.byteArr.subarray(offset, offset + len), 0); - this.lastIndex += Math.ceil(len / 4); - } else { - bytes.set(this.byteArr.subarray(offset, offset + diff), 0); - bytes.set(this.byteArr.subarray(0, len - diff), diff); - this.lastIndex = Math.ceil((len - diff) / 4) - 1; - } - return bytes; - } - - get string() { - return this.decoder.decode(this.bytes); - } - - get blob() { - return new Blob([this.bytes]); - } - - pop(handle: (queue: SharedQueue) => void) { - if (this.isActual()) { - return; - } - this.popData(handle); - } - - *read() { - if (this.isActual()) { - return this; - } - yield* this.readData(); - return this; - } - - blockingPop(handler: (queue: SharedQueue) => void) { - this.waitForNewData(); - this.popData(handler); - } - - blockingRead() { - this.waitForNewData(); - return this.readData(); - } - - protected nextIndex() { - return (this.index = (this.index + 1) % this.len); - } - - protected nextLastIndex() { - return (this.lastIndex = (this.lastIndex + 1) % this.len); - } - - protected isActual() { - this.index = Atomics.load(this.uintArr, this.lastIndex); - return this.index === this.lastIndex; - } - - protected waitForNewData() { - Atomics.wait(this.intArr, this.lastIndex, this.index); - this.index = this.intArr[this.lastIndex]; - } - - protected popData(handler: (queue: SharedQueue) => void) { - while (this.index !== this.nextLastIndex()) { - handler(this); - } - } - - protected *readData() { - while (this.index !== this.nextLastIndex()) { - yield this; - } - return this; - } + protected encoder = new TextEncoder(); + protected decoder = new TextDecoder(); + /** @private */ + public index = 0; + /** @private */ + public lastIndex = 0; + + protected len: number; + protected byteArr: Uint8Array; + protected uintArr: Uint32Array; + protected intArr: Int32Array; + protected floatArr: Float32Array; + + constructor(buffer: ArrayBuffer | SharedArrayBuffer) { + this.byteArr = new Uint8Array(buffer); + this.uintArr = new Uint32Array(buffer); + this.intArr = new Int32Array(buffer); + this.floatArr = new Float32Array(buffer); + this.len = this.uintArr.length; + } + + pushUint(element: number) { + this.uintArr[this.nextIndex()] = element; + } + + pushInt(element: number) { + this.intArr[this.nextIndex()] = element; + } + + pushFloat(element: number) { + this.floatArr[this.nextIndex()] = element; + } + + pushBytes(bytes: Uint8Array | Uint8ClampedArray) { + // TODO: push operations should consider the last index (free space) + if (this.byteArr.length < bytes.length + 12) { + // commit + len + padding + throw new Error(`Too large`); + } + this.pushUint(bytes.length); + const offset = (this.index + 1) * 4; + const diff = this.byteArr.length - offset; + if (bytes.length <= diff) { + this.byteArr.set(bytes, offset); + this.index += Math.ceil(bytes.length / 4); + } else { + this.byteArr.set(bytes.subarray(0, diff), offset); + this.byteArr.set(bytes.subarray(diff), 0); + this.index = Math.ceil((bytes.length - diff) / 4) - 1; + } + } + + pushString(str: string) { + const encoded = this.encoder.encode(str); + this.pushBytes(encoded); + } + + commit() { + if (this.lastIndex === this.index) { + return; + } + this.nextIndex(); + this.intArr[this.index] = this.index; + Atomics.store(this.intArr, this.lastIndex, this.index); + Atomics.notify(this.intArr, this.lastIndex); + this.lastIndex = this.index; + } + + get float() { + return this.floatArr[this.lastIndex]; + } + + get int() { + return this.intArr[this.lastIndex]; + } + + get uint() { + return this.uintArr[this.lastIndex]; + } + + get bytes() { + const len = this.uintArr[this.lastIndex]; + const bytes = new Uint8Array(len); + const offset = (this.lastIndex + 1) * 4; + const diff = this.byteArr.length - offset; + if (len <= diff) { + bytes.set(this.byteArr.subarray(offset, offset + len), 0); + this.lastIndex += Math.ceil(len / 4); + } else { + bytes.set(this.byteArr.subarray(offset, offset + diff), 0); + bytes.set(this.byteArr.subarray(0, len - diff), diff); + this.lastIndex = Math.ceil((len - diff) / 4) - 1; + } + return bytes; + } + + get string() { + return this.decoder.decode(this.bytes); + } + + get blob() { + return new Blob([this.bytes]); + } + + pop(handle: (queue: SharedQueue) => void) { + if (this.isActual()) { + return; + } + this.popData(handle); + } + + *read() { + if (this.isActual()) { + return this; + } + yield* this.readData(); + return this; + } + + blockingPop(handler: (queue: SharedQueue) => void) { + this.waitForNewData(); + this.popData(handler); + } + + blockingRead() { + this.waitForNewData(); + return this.readData(); + } + + protected nextIndex() { + return (this.index = (this.index + 1) % this.len); + } + + protected nextLastIndex() { + return (this.lastIndex = (this.lastIndex + 1) % this.len); + } + + protected isActual() { + this.index = Atomics.load(this.uintArr, this.lastIndex); + return this.index === this.lastIndex; + } + + protected waitForNewData() { + Atomics.wait(this.intArr, this.lastIndex, this.index); + this.index = this.intArr[this.lastIndex]; + } + + protected popData(handler: (queue: SharedQueue) => void) { + while (this.index !== this.nextLastIndex()) { + handler(this); + } + } + + protected *readData() { + while (this.index !== this.nextLastIndex()) { + yield this; + } + return this; + } } diff --git a/packages/libs/src/sync/shared_queue.test.ts b/packages/libs/src/sync/shared_queue.test.ts index 68be80e9..e47f206b 100644 --- a/packages/libs/src/sync/shared_queue.test.ts +++ b/packages/libs/src/sync/shared_queue.test.ts @@ -1,70 +1,70 @@ -import { it, describe, beforeEach, expect } from "vitest"; +import { it, describe, beforeEach, expect } from 'vitest'; -import { SharedQueue } from "./shared-queue.js"; +import { SharedQueue } from './shared-queue.js'; let buffer; let w: SharedQueue; let r: SharedQueue; -describe("SharedQueue Tests", () => { - beforeEach(() => { - buffer = new ArrayBuffer(32); - w = new SharedQueue(buffer); - r = new SharedQueue(buffer); - }); +describe('SharedQueue Tests', () => { + beforeEach(() => { + buffer = new ArrayBuffer(32); + w = new SharedQueue(buffer); + r = new SharedQueue(buffer); + }); - it("Should store small buffer", () => { - const arr = new Uint8Array([1, 2, 3, 4, 5, 6]); - w.pushBytes(arr); - w.commit(); - for (const item of r.read()) { - expect(item.bytes).toEqual(arr); - } - expect(w.lastIndex).toBe(4); - expect(w.index).toBe(4); - expect(r.lastIndex).toBe(4); - expect(r.index).toBe(4); - }); + it('Should store small buffer', () => { + const arr = new Uint8Array([1, 2, 3, 4, 5, 6]); + w.pushBytes(arr); + w.commit(); + for (const item of r.read()) { + expect(item.bytes).toEqual(arr); + } + expect(w.lastIndex).toBe(4); + expect(w.index).toBe(4); + expect(r.lastIndex).toBe(4); + expect(r.index).toBe(4); + }); - it("Should handle overlapping", () => { - const padding = new Uint8Array(12); - w.pushBytes(padding); - w.commit(); - r.pop((item) => expect(item.bytes).toEqual(padding)); - const arr = new Uint8Array([1, 2, 3, 4, 5, 6]); - w.pushBytes(arr); - w.commit(); - for (const item of r.read()) { - expect(item.bytes).toEqual(arr); - } - expect(w.lastIndex).toBe(1); - expect(w.index).toBe(1); - expect(r.lastIndex).toBe(1); - expect(r.index).toBe(1); - }); + it('Should handle overlapping', () => { + const padding = new Uint8Array(12); + w.pushBytes(padding); + w.commit(); + r.pop((item) => expect(item.bytes).toEqual(padding)); + const arr = new Uint8Array([1, 2, 3, 4, 5, 6]); + w.pushBytes(arr); + w.commit(); + for (const item of r.read()) { + expect(item.bytes).toEqual(arr); + } + expect(w.lastIndex).toBe(1); + expect(w.index).toBe(1); + expect(r.lastIndex).toBe(1); + expect(r.index).toBe(1); + }); - it("Should handle multiple buffers", () => { - const a = new Uint8Array([1, 2, 3, 4, 5, 6]); - w.pushBytes(a); - const b = new Uint8Array([7, 8, 9]); - w.pushBytes(b); - w.commit(); - const gen = r.read(); - expect(gen.next().value.bytes).toEqual(a); - expect(gen.next().value.bytes).toEqual(b); - }); + it('Should handle multiple buffers', () => { + const a = new Uint8Array([1, 2, 3, 4, 5, 6]); + w.pushBytes(a); + const b = new Uint8Array([7, 8, 9]); + w.pushBytes(b); + w.commit(); + const gen = r.read(); + expect(gen.next().value.bytes).toEqual(a); + expect(gen.next().value.bytes).toEqual(b); + }); - it("Should work with empty byte arrays", () => { - const empty = new Uint8Array() - w.pushBytes(empty) - w.commit() - for (const item of r.read()) { - expect(item.bytes).toEqual(empty) - } - w.pushBytes(empty) - w.commit() - for (const item of r.read()) { - expect(item.bytes).toEqual(empty) - } - }) + it('Should work with empty byte arrays', () => { + const empty = new Uint8Array(); + w.pushBytes(empty); + w.commit(); + for (const item of r.read()) { + expect(item.bytes).toEqual(empty); + } + w.pushBytes(empty); + w.commit(); + for (const item of r.read()) { + expect(item.bytes).toEqual(empty); + } + }); }); diff --git a/packages/libs/src/testing/actor.ts b/packages/libs/src/testing/actor.ts index 445ed381..95723a98 100644 --- a/packages/libs/src/testing/actor.ts +++ b/packages/libs/src/testing/actor.ts @@ -1,232 +1,212 @@ import { - CanceledError, - createContext, - createRecoverableContext, - withCancel, - type Context, -} from "libs/context"; -import { createLogger } from "libs/logger"; -import { stringifyError } from "libs/error"; -import { compileJsModule } from "libs/js"; -import type { Streams } from "libs/io"; + CanceledError, + createContext, + createRecoverableContext, + withCancel, + type Context +} from 'libs/context'; +import { createLogger } from 'libs/logger'; +import { stringifyError } from 'libs/error'; +import { compileJsModule } from 'libs/js'; +import type { Streams } from 'libs/io'; import { - Actor, - MessageType, - WorkerConnection, - startRemote, - type Connection, - type EventMessage, - type IncomingMessage, - type OutgoingMessage, -} from "libs/actor"; -import { writeToQueue, SharedQueue, createStreamsClient } from "libs/sync"; -import type { File } from "libs/compiler"; + Actor, + MessageType, + WorkerConnection, + startRemote, + type Connection, + type EventMessage, + type IncomingMessage, + type OutgoingMessage +} from 'libs/actor'; +import { writeToQueue, SharedQueue, createStreamsClient } from 'libs/sync'; +import type { File } from 'libs/compiler'; import type { RemoteCompilerFactoryOptions } from 'libs/compiler/actor'; -import type { TestProgram, TestCompiler } from "./testing.js"; +import type { TestProgram, TestCompiler } from './testing.js'; export interface InitConfig { - buffer: ArrayBuffer | SharedArrayBuffer; - universalFactoryFunction: string; + buffer: ArrayBuffer | SharedArrayBuffer; + universalFactoryFunction: string; } interface Handlers { - [key: string]: any; - initialize (config: InitConfig): Promise; - destroy (): void; + [key: string]: any; + initialize(config: InitConfig): Promise; + destroy(): void; - compile (files: File[]): Promise; - stopCompile (): void; + compile(files: File[]): Promise; + stopCompile(): void; - test (data: I): Promise; - stopTest (): void; + test(data: I): Promise; + stopTest(): void; } type Incoming = IncomingMessage>; -interface WriteEventMessage extends EventMessage<"write", Uint8Array> { } +interface WriteEventMessage extends EventMessage<'write', Uint8Array> {} type TestingActorEvent = WriteEventMessage; -type Outgoing = - | OutgoingMessage, string> - | TestingActorEvent; +type Outgoing = OutgoingMessage, string> | TestingActorEvent; -async function evalEntity (functionStr: string) { - const moduleStr = `export default ${functionStr}`; - const mod = await compileJsModule<{ default: T }>(moduleStr); - return mod.default; +async function evalEntity(functionStr: string) { + const moduleStr = `export default ${functionStr}`; + const mod = await compileJsModule<{ default: T }>(moduleStr); + return mod.default; } -export type UniversalFactory = ( - ctx: Context, - data: D -) => Promise>; +export type UniversalFactory = (ctx: Context, data: D) => Promise>; export type TestCompilerSuperFactory = ( - ctx: Context, - streams: Streams, - universalFactory: UniversalFactory + ctx: Context, + streams: Streams, + universalFactory: UniversalFactory ) => Promise>; -class TestCompilerActor - extends Actor, string> - implements Disposable { - protected compiler: TestCompiler | null = null; - protected compilerCtx = createRecoverableContext(() => { - this.compiler = null; - return withCancel(createContext()); - }); - protected program: TestProgram | null = null; - protected programCtx = createRecoverableContext(() => { - this.program = null; - return withCancel(this.compilerCtx.ref); - }); - protected runCtx = createRecoverableContext(() => - withCancel(this.programCtx.ref) - ); - - constructor( - connection: Connection, Outgoing>, - superFactory: TestCompilerSuperFactory - ) { - const handlers: Handlers = { - initialize: async ({ universalFactoryFunction, buffer }) => { - const universalFactory = await evalEntity>( - universalFactoryFunction - ); - this.compiler = await superFactory( - this.compilerCtx.ref, - createStreamsClient( - new SharedQueue(buffer), - { - write (data) { - connection.send({ - type: MessageType.Event, - event: "write", - payload: data, - }); - }, - } - ), - universalFactory - ); - }, - destroy: () => { - this.compilerCtx.cancel(); - }, - compile: async (files) => { - if (this.compiler === null) { - throw new Error("Test runner not initialized"); - } - this.program = await this.compiler.compile(this.programCtx.ref, files); - }, - stopCompile: () => { - this.programCtx.cancel(); - }, - test: async (input) => { - if (this.program === null) { - const err = new Error("Test runner not initialized"); - connection.send({ - type: MessageType.Event, - event: "error", - payload: err.message, - }); - throw err; - } - try { - return await this.program.run(this.runCtx.ref, input); - } finally { - this.runCtx.cancel(); - } - }, - stopTest: () => { - this.runCtx.cancel(); - }, - }; - super(connection, handlers, stringifyError); - } - - [Symbol.dispose] (): void { - this.compiler = null; - this.compilerCtx[Symbol.dispose](); - this.program = null; - this.programCtx[Symbol.dispose](); - this.runCtx[Symbol.dispose](); - } +class TestCompilerActor extends Actor, string> implements Disposable { + protected compiler: TestCompiler | null = null; + protected compilerCtx = createRecoverableContext(() => { + this.compiler = null; + return withCancel(createContext()); + }); + protected program: TestProgram | null = null; + protected programCtx = createRecoverableContext(() => { + this.program = null; + return withCancel(this.compilerCtx.ref); + }); + protected runCtx = createRecoverableContext(() => withCancel(this.programCtx.ref)); + + constructor( + connection: Connection, Outgoing>, + superFactory: TestCompilerSuperFactory + ) { + const handlers: Handlers = { + initialize: async ({ universalFactoryFunction, buffer }) => { + const universalFactory = + await evalEntity>(universalFactoryFunction); + this.compiler = await superFactory( + this.compilerCtx.ref, + createStreamsClient(new SharedQueue(buffer), { + write(data) { + connection.send({ + type: MessageType.Event, + event: 'write', + payload: data + }); + } + }), + universalFactory + ); + }, + destroy: () => { + this.compilerCtx.cancel(); + }, + compile: async (files) => { + if (this.compiler === null) { + throw new Error('Test runner not initialized'); + } + this.program = await this.compiler.compile(this.programCtx.ref, files); + }, + stopCompile: () => { + this.programCtx.cancel(); + }, + test: async (input) => { + if (this.program === null) { + const err = new Error('Test runner not initialized'); + connection.send({ + type: MessageType.Event, + event: 'error', + payload: err.message + }); + throw err; + } + try { + return await this.program.run(this.runCtx.ref, input); + } finally { + this.runCtx.cancel(); + } + }, + stopTest: () => { + this.runCtx.cancel(); + } + }; + super(connection, handlers, stringifyError); + } + + [Symbol.dispose](): void { + this.compiler = null; + this.compilerCtx[Symbol.dispose](); + this.program = null; + this.programCtx[Symbol.dispose](); + this.runCtx[Symbol.dispose](); + } } -export function startTestCompilerActor ( - ctx: Context, - superFactory: TestCompilerSuperFactory +export function startTestCompilerActor( + ctx: Context, + superFactory: TestCompilerSuperFactory ) { - const connection = new WorkerConnection, Outgoing>( - self as unknown as Worker - ); - connection.start(ctx); - const actor = new TestCompilerActor(connection, superFactory); - ctx.onCancel(() => { - actor[Symbol.dispose](); - }); - actor.start(ctx); + const connection = new WorkerConnection, Outgoing>( + self as unknown as Worker + ); + connection.start(ctx); + const actor = new TestCompilerActor(connection, superFactory); + ctx.onCancel(() => { + actor[Symbol.dispose](); + }); + actor.start(ctx); } interface WorkerConstructor { - new(): Worker; + new (): Worker; } -export function makeRemoteTestCompilerFactory ( - Worker: WorkerConstructor, - universalFactory: UniversalFactory +export function makeRemoteTestCompilerFactory( + Worker: WorkerConstructor, + universalFactory: UniversalFactory ) { - return async ( - ctx: Context, - { input, output }: RemoteCompilerFactoryOptions - ): Promise> => { - const worker = new Worker(); - ctx.onCancel(() => { - worker.terminate(); - }); - const connection = new WorkerConnection, Incoming>( - worker - ); - connection.start(ctx); - const log = createLogger(output); - const Buffer = window.SharedArrayBuffer ? SharedArrayBuffer : ArrayBuffer; - const buffer = new Buffer(1024 * 1024 * 10); - const sharedWriter = writeToQueue(input, new SharedQueue(buffer)); - ctx.onCancel(() => { - sharedWriter[Symbol.dispose](); - }); - const remote = startRemote, string, TestingActorEvent>( - ctx, - log, - connection, - { - write (data) { - output.write(data); - }, - error (err) { - log.error(err instanceof CanceledError ? err.message : err); - }, - } - ); - using _ = ctx.onCancel(() => remote.destroy()); - await remote.initialize({ - universalFactoryFunction: universalFactory.toString(), - buffer, - }); - return { - async compile (ctx, files) { - using _ = ctx.onCancel(() => remote.stopCompile()); - await remote.compile(files); - return { - async run (ctx, input) { - using _ = ctx.onCancel(() => remote.stopTest()); - return await remote.test(input); - }, - }; - }, - }; - }; + return async ( + ctx: Context, + { input, output }: RemoteCompilerFactoryOptions + ): Promise> => { + const worker = new Worker(); + ctx.onCancel(() => { + worker.terminate(); + }); + const connection = new WorkerConnection, Incoming>(worker); + connection.start(ctx); + const log = createLogger(output); + const Buffer = window.SharedArrayBuffer ? SharedArrayBuffer : ArrayBuffer; + const buffer = new Buffer(1024 * 1024 * 10); + const sharedWriter = writeToQueue(input, new SharedQueue(buffer)); + ctx.onCancel(() => { + sharedWriter[Symbol.dispose](); + }); + const remote = startRemote, string, TestingActorEvent>(ctx, log, connection, { + write(data) { + output.write(data); + }, + error(err) { + log.error(err instanceof CanceledError ? err.message : err); + } + }); + using _ = ctx.onCancel(() => remote.destroy()); + await remote.initialize({ + universalFactoryFunction: universalFactory.toString(), + buffer + }); + return { + async compile(ctx, files) { + using _ = ctx.onCancel(() => remote.stopCompile()); + await remote.compile(files); + return { + async run(ctx, input) { + using _ = ctx.onCancel(() => remote.stopTest()); + return await remote.test(input); + } + }; + } + }; + }; } diff --git a/packages/libs/src/testing/index.ts b/packages/libs/src/testing/index.ts index 6d793ecc..2b957b46 100644 --- a/packages/libs/src/testing/index.ts +++ b/packages/libs/src/testing/index.ts @@ -1 +1 @@ -export * from "./testing.js"; +export * from './testing.js'; diff --git a/packages/libs/src/testing/testing.ts b/packages/libs/src/testing/testing.ts index e121a737..70bf913c 100644 --- a/packages/libs/src/testing/testing.ts +++ b/packages/libs/src/testing/testing.ts @@ -1,58 +1,51 @@ -import type { Logger } from "libs/logger"; -import type { Context } from "libs/context"; -import type { Compiler, CompilerFactory } from "libs/compiler"; -import { isDeepEqual } from "libs/deep-equal"; +import type { Logger } from 'libs/logger'; +import type { Context } from 'libs/context'; +import type { Compiler, CompilerFactory } from 'libs/compiler'; +import { isDeepEqual } from 'libs/deep-equal'; export interface TestCase { - input: I; - output: O; + input: I; + output: O; } -export function testCase( - test: (input: I) => O -): (input: I) => TestCase { - return (input) => ({ - input, - output: test(input), - }); +export function testCase(test: (input: I) => O): (input: I) => TestCase { + return (input) => ({ + input, + output: test(input) + }); } export interface TestProgram { - run: (ctx: Context, input: I) => Promise; + run: (ctx: Context, input: I) => Promise; } export type TestCompiler = Compiler>; -export type TestCompilerFactory = CompilerFactory< - Options, - TestProgram ->; +export type TestCompilerFactory = CompilerFactory>; export async function runTests( - ctx: Context, - log: Logger, - testProgram: TestProgram, - testsCases: TestCase[] + ctx: Context, + log: Logger, + testProgram: TestProgram, + testsCases: TestCase[] ) { - let i = 0; - for (; i < testsCases.length; i++) { - if (ctx.signal.aborted) { - log.error("Test canceled by user"); - return i; - } - const testCase = testsCases[i]; - try { - const result = await testProgram.run(ctx, testCase.input); - if (!isDeepEqual(result, testCase.output)) { - log.error( - `Test case failed, expected "${testCase.output}", but got "${result}"` - ); - return i; - } - } catch (err) { - log.error(`Test case failed: ${err}`); - return i; - } - } - return i; + let i = 0; + for (; i < testsCases.length; i++) { + if (ctx.signal.aborted) { + log.error('Test canceled by user'); + return i; + } + const testCase = testsCases[i]; + try { + const result = await testProgram.run(ctx, testCase.input); + if (!isDeepEqual(result, testCase.output)) { + log.error(`Test case failed, expected "${testCase.output}", but got "${result}"`); + return i; + } + } catch (err) { + log.error(`Test case failed: ${err}`); + return i; + } + } + return i; } diff --git a/packages/libs/src/type.ts b/packages/libs/src/type.ts index bcc92814..52e7768a 100644 --- a/packages/libs/src/type.ts +++ b/packages/libs/src/type.ts @@ -1,3 +1,3 @@ export type Brand = Base & { - __brand: Name; + __brand: Name; }; diff --git a/packages/libs/src/wasi/fs.ts b/packages/libs/src/wasi/fs.ts index b97a5e4d..3924cb04 100644 --- a/packages/libs/src/wasi/fs.ts +++ b/packages/libs/src/wasi/fs.ts @@ -1,49 +1,43 @@ import { - type Inode, - Directory, - Fd, - OpenDirectory, - wasi as wasiDef, - File, -} from "@bjorn3/browser_wasi_shim"; + type Inode, + Directory, + Fd, + OpenDirectory, + wasi as wasiDef, + File +} from '@bjorn3/browser_wasi_shim'; -import { type Result, err, ok, isErr } from "../result.js"; +import { type Result, err, ok, isErr } from '../result.js'; export function contents(data: Record): Map { - return new Map(Object.entries(data)); + return new Map(Object.entries(data)); } export function dir(data: Record): Directory { - return new Directory(contents(data)); + return new Directory(contents(data)); } export function assertOpenDir(fd: Fd): asserts fd is OpenDirectory { - if (!(fd instanceof OpenDirectory)) { - throw new Error("Not an open directory"); - } + if (!(fd instanceof OpenDirectory)) { + throw new Error('Not an open directory'); + } } -export function lookup( - dir: OpenDirectory, - path: string, -): Result { - const { ret, inode_obj } = dir.path_lookup(path, 0); - if (ret !== wasiDef.ERRNO_SUCCESS || !inode_obj) { - return err(`failed to lookup "${path}", errno: ${ret}`); - } - return ok(inode_obj); +export function lookup(dir: OpenDirectory, path: string): Result { + const { ret, inode_obj } = dir.path_lookup(path, 0); + if (ret !== wasiDef.ERRNO_SUCCESS || !inode_obj) { + return err(`failed to lookup "${path}", errno: ${ret}`); + } + return ok(inode_obj); } -export function lookupFile( - dir: OpenDirectory, - path: string, -): Result { - const r = lookup(dir, path); - if (isErr(r)) { - return r; - } - if (!(r.value instanceof File)) { - return err(`${path} is not a file`); - } - return ok(r.value); +export function lookupFile(dir: OpenDirectory, path: string): Result { + const r = lookup(dir, path); + if (isErr(r)) { + return r; + } + if (!(r.value instanceof File)) { + return err(`${path} is not a file`); + } + return ok(r.value); } diff --git a/packages/libs/src/wasi/index.ts b/packages/libs/src/wasi/index.ts index 51bf7a20..c6936b5a 100644 --- a/packages/libs/src/wasi/index.ts +++ b/packages/libs/src/wasi/index.ts @@ -1,2 +1,2 @@ -export * from "./fs.js"; -export * from "./stdin.js"; +export * from './fs.js'; +export * from './stdin.js'; diff --git a/packages/libs/src/wasi/stdin.ts b/packages/libs/src/wasi/stdin.ts index 59c3a911..932a7047 100644 --- a/packages/libs/src/wasi/stdin.ts +++ b/packages/libs/src/wasi/stdin.ts @@ -1,61 +1,57 @@ -import { Fd, Inode, wasi } from "@bjorn3/browser_wasi_shim"; +import { Fd, Inode, wasi } from '@bjorn3/browser_wasi_shim'; export class Stdin extends Fd { - private ino: bigint; - buffer: Uint8Array = new Uint8Array(); - read: () => Uint8Array; + private ino: bigint; + buffer: Uint8Array = new Uint8Array(); + read: () => Uint8Array; - constructor(read: () => Uint8Array) { - super(); - this.ino = Inode.issue_ino(); - this.read = read; - } + constructor(read: () => Uint8Array) { + super(); + this.ino = Inode.issue_ino(); + this.read = read; + } - override fd_filestat_get(): { ret: number; filestat: wasi.Filestat } { - const filestat = new wasi.Filestat( - this.ino, - wasi.FILETYPE_CHARACTER_DEVICE, - BigInt(0), - ); - return { ret: 0, filestat }; - } + override fd_filestat_get(): { ret: number; filestat: wasi.Filestat } { + const filestat = new wasi.Filestat(this.ino, wasi.FILETYPE_CHARACTER_DEVICE, BigInt(0)); + return { ret: 0, filestat }; + } - override fd_fdstat_get(): { ret: number; fdstat: wasi.Fdstat | null } { - const fdstat = new wasi.Fdstat(wasi.FILETYPE_CHARACTER_DEVICE, 0); - fdstat.fs_rights_base = BigInt(wasi.RIGHTS_FD_READ); - return { ret: 0, fdstat }; - } + override fd_fdstat_get(): { ret: number; fdstat: wasi.Fdstat | null } { + const fdstat = new wasi.Fdstat(wasi.FILETYPE_CHARACTER_DEVICE, 0); + fdstat.fs_rights_base = BigInt(wasi.RIGHTS_FD_READ); + return { ret: 0, fdstat }; + } - override fd_read(size: number): { ret: number; data: Uint8Array } { - const data = this.read_data(size); - return { ret: 0, data }; - } + override fd_read(size: number): { ret: number; data: Uint8Array } { + const data = this.read_data(size); + return { ret: 0, data }; + } - protected read_data(size: number) { - const bl = this.buffer.length; - if (bl >= size) { - const data = this.buffer.subarray(0, size); - this.buffer = this.buffer.subarray(size); - return data; - } - const input = this.read(); - let next: Uint8Array; - if (bl === 0) { - if (input.length <= size) { - return input; - } - next = input; - } else { - next = new Uint8Array(bl + input.length); - next.set(this.buffer); - next.set(input, bl); - if (next.length < size) { - this.buffer = this.buffer.subarray(0, 0); - return next; - } - } - const data = next.subarray(0, size); - this.buffer = next.subarray(size); - return data; - } + protected read_data(size: number) { + const bl = this.buffer.length; + if (bl >= size) { + const data = this.buffer.subarray(0, size); + this.buffer = this.buffer.subarray(size); + return data; + } + const input = this.read(); + let next: Uint8Array; + if (bl === 0) { + if (input.length <= size) { + return input; + } + next = input; + } else { + next = new Uint8Array(bl + input.length); + next.set(this.buffer); + next.set(input, bl); + if (next.length < size) { + this.buffer = this.buffer.subarray(0, 0); + return next; + } + } + const data = next.subarray(0, size); + this.buffer = next.subarray(size); + return data; + } } diff --git a/packages/libs/tsconfig.json b/packages/libs/tsconfig.json index 371de888..0a72dc89 100644 --- a/packages/libs/tsconfig.json +++ b/packages/libs/tsconfig.json @@ -1,14 +1,10 @@ { - "extends": "@total-typescript/tsconfig/tsc/dom/library-monorepo", - "compilerOptions": { - "outDir": "dist", - "rootDir": "src", - "lib": [ - "DOM", - "ES2022", - "ESNext.Disposable", - ], - "noUncheckedIndexedAccess": false, - }, - "exclude": ["vitest.config.ts", "dist"] -} \ No newline at end of file + "extends": "@total-typescript/tsconfig/tsc/dom/library-monorepo", + "compilerOptions": { + "outDir": "dist", + "rootDir": "src", + "lib": ["DOM", "ES2022", "ESNext.Disposable"], + "noUncheckedIndexedAccess": false + }, + "exclude": ["vitest.config.ts", "dist"] +} diff --git a/packages/libs/vitest.config.ts b/packages/libs/vitest.config.ts index a86d4cbb..94ede10e 100644 --- a/packages/libs/vitest.config.ts +++ b/packages/libs/vitest.config.ts @@ -1,5 +1,3 @@ import { defineConfig } from 'vitest/config'; - -export default defineConfig({ -}); +export default defineConfig({}); diff --git a/packages/php-runtime/package.json b/packages/php-runtime/package.json index c91d92ac..860f21d5 100644 --- a/packages/php-runtime/package.json +++ b/packages/php-runtime/package.json @@ -1,25 +1,27 @@ { - "name": "php-runtime", - "private": true, - "version": "0.0.0", - "type": "module", - "scripts": { - "check": "tsc", - "build": "vite build" - }, - "dependencies": { - "@php-wasm/universal": "^3.1.20", - "@php-wasm/web-8-5": "^3.1.20", - "libs": "workspace:*" - }, - "devDependencies": { - "vite": "catalog:", - "vite-plugin-dts": "catalog:", - "vite-plugin-static-copy": "catalog:" - }, - "exports": { - ".": "./dist/index.js", - "./version": "./dist/version.js", - "./php.wasm": "./dist/php.wasm" - } -} \ No newline at end of file + "name": "php-runtime", + "version": "0.0.0", + "private": true, + "type": "module", + "exports": { + ".": "./dist/index.js", + "./version": "./dist/version.js", + "./php.wasm": "./dist/php.wasm" + }, + "scripts": { + "check": "tsc", + "build": "vite build", + "format": "oxfmt", + "format:check": "oxfmt --check ." + }, + "dependencies": { + "@php-wasm/universal": "^3.1.50", + "@php-wasm/web-8-5": "^3.1.50", + "libs": "workspace:*" + }, + "devDependencies": { + "vite": "catalog:", + "vite-plugin-dts": "catalog:", + "vite-plugin-static-copy": "catalog:" + } +} diff --git a/packages/php-runtime/src/index.ts b/packages/php-runtime/src/index.ts index 1b35f4fd..444d9bd1 100644 --- a/packages/php-runtime/src/index.ts +++ b/packages/php-runtime/src/index.ts @@ -1,4 +1,4 @@ -export * from "./php-program.js"; -export * from "./php-test-program"; -export * from "./php-compiler-factory"; -export * from "./version"; +export * from './php-program.js'; +export * from './php-test-program'; +export * from './php-compiler-factory'; +export * from './version'; diff --git a/packages/php-runtime/src/php-compiler-factory.ts b/packages/php-runtime/src/php-compiler-factory.ts index 5f4e68ad..f34a88bf 100644 --- a/packages/php-runtime/src/php-compiler-factory.ts +++ b/packages/php-runtime/src/php-compiler-factory.ts @@ -1,23 +1,19 @@ -import { - PHP, - loadPHPRuntime, - type EmscriptenOptions, -} from "@php-wasm/universal"; -import type { Context } from "libs/context"; +import { PHP, loadPHPRuntime, type EmscriptenOptions } from '@php-wasm/universal'; +import type { Context } from 'libs/context'; // @ts-expect-error hack -import * as phpModule from "/node_modules/@php-wasm/web-8-5/jspi/php_8_5.js"; +import * as phpModule from '/node_modules/@php-wasm/web-8-5/jspi/php_8_5.js'; export async function phpCompilerFactory( - ctx: Context, - instantiateWasm: EmscriptenOptions["instantiateWasm"], + ctx: Context, + instantiateWasm: EmscriptenOptions['instantiateWasm'] ) { - const phpRuntime = await loadPHPRuntime(phpModule, { - instantiateWasm, - }); - const php = new PHP(phpRuntime); - ctx.onCancel(() => { - php.exit(1); - }); - return php; + const phpRuntime = await loadPHPRuntime(phpModule, { + instantiateWasm + }); + const php = new PHP(phpRuntime); + ctx.onCancel(() => { + php.exit(1); + }); + return php; } diff --git a/packages/php-runtime/src/php-program.ts b/packages/php-runtime/src/php-program.ts index 9cb276ac..fbcd134d 100644 --- a/packages/php-runtime/src/php-program.ts +++ b/packages/php-runtime/src/php-program.ts @@ -1,26 +1,26 @@ -import type { PHP } from "@php-wasm/universal"; -import type { Context } from "libs/context"; -import type { Streams } from "libs/io"; -import type { Program } from "libs/compiler"; +import type { PHP } from '@php-wasm/universal'; +import type { Context } from 'libs/context'; +import type { Streams } from 'libs/io'; +import type { Program } from 'libs/compiler'; export class PHPProgram implements Program { - constructor( - protected readonly code: string, - protected readonly php: PHP, - protected readonly streams: Streams - ) {} + constructor( + protected readonly code: string, + protected readonly php: PHP, + protected readonly streams: Streams + ) {} - async run(_: Context): Promise { - const response = await this.php.runStream({ - code: this.code, - }); - await Promise.all([ - response.stdout.pipeTo(new WritableStream(this.streams.out)), - response.stderr.pipeTo(new WritableStream(this.streams.err)), - ]); - const exitCode = await response.exitCode; - if (exitCode !== 0) { - throw new Error(`Command failed with exit code ${exitCode}`); - } - } + async run(_: Context): Promise { + const response = await this.php.runStream({ + code: this.code + }); + await Promise.all([ + response.stdout.pipeTo(new WritableStream(this.streams.out)), + response.stderr.pipeTo(new WritableStream(this.streams.err)) + ]); + const exitCode = await response.exitCode; + if (exitCode !== 0) { + throw new Error(`Command failed with exit code ${exitCode}`); + } + } } diff --git a/packages/php-runtime/src/php-test-program.ts b/packages/php-runtime/src/php-test-program.ts index b2468cba..9e74b03c 100644 --- a/packages/php-runtime/src/php-test-program.ts +++ b/packages/php-runtime/src/php-test-program.ts @@ -1,57 +1,55 @@ -import type { PHP } from "@php-wasm/universal"; -import type { Streams } from "libs/io"; -import type { Context } from "libs/context"; -import type { TestProgram } from "libs/testing"; +import type { PHP } from '@php-wasm/universal'; +import type { Streams } from 'libs/io'; +import type { Context } from 'libs/context'; +import type { TestProgram } from 'libs/testing'; export abstract class PHPTestProgram implements TestProgram { - private result?: O; - private disposeOnMessage: () => Promise; - - constructor( - protected readonly streams: Streams, - protected readonly php: PHP, - protected readonly code: string, - ) { - this.disposeOnMessage = php.onMessage(this.handleResult.bind(this)); - } - - protected caseExecutionCode(_input: I): string { - throw new Error("Not implemented"); - } - - protected transformCode(input: I) { - return `${ - this.code - }\npost_message_to_js(json_encode(${this.caseExecutionCode(input)}));`; - } - - protected transformResult(result: string): O { - return JSON.parse(result); - } - - private handleResult(result: string) { - this.result = this.transformResult(result); - } - - async run(_: Context, input: I): Promise { - const code = this.transformCode(input); - const response = await this.php.runStream({ code }); - await Promise.all([ - response.stdout.pipeTo(new WritableStream(this.streams.out)), - response.stderr.pipeTo(new WritableStream(this.streams.err)), - ]); - const exitCode = await response.exitCode; - if (exitCode !== 0) { - throw new Error(`Command failed with exit code ${exitCode}`); - } - if (this.result === undefined) { - throw new Error("No result"); - } - return this.result; - } - - [Symbol.dispose]() { - this.result = undefined; - this.disposeOnMessage(); - } + private result?: O; + private disposeOnMessage: () => Promise; + + constructor( + protected readonly streams: Streams, + protected readonly php: PHP, + protected readonly code: string + ) { + this.disposeOnMessage = php.onMessage(this.handleResult.bind(this)); + } + + protected caseExecutionCode(_input: I): string { + throw new Error('Not implemented'); + } + + protected transformCode(input: I) { + return `${this.code}\npost_message_to_js(json_encode(${this.caseExecutionCode(input)}));`; + } + + protected transformResult(result: string): O { + return JSON.parse(result); + } + + private handleResult(result: string) { + this.result = this.transformResult(result); + } + + async run(_: Context, input: I): Promise { + const code = this.transformCode(input); + const response = await this.php.runStream({ code }); + await Promise.all([ + response.stdout.pipeTo(new WritableStream(this.streams.out)), + response.stderr.pipeTo(new WritableStream(this.streams.err)) + ]); + const exitCode = await response.exitCode; + if (exitCode !== 0) { + throw new Error(`Command failed with exit code ${exitCode}`); + } + if (this.result === undefined) { + throw new Error('No result'); + } + return this.result; + } + + [Symbol.dispose]() { + this.result = undefined; + this.disposeOnMessage(); + } } diff --git a/packages/php-runtime/src/version.ts b/packages/php-runtime/src/version.ts index 592b2dfe..8bedb833 100644 --- a/packages/php-runtime/src/version.ts +++ b/packages/php-runtime/src/version.ts @@ -1 +1 @@ -export const version = "8.5.3"; +export const version = '8.5.3'; diff --git a/packages/php-runtime/tsconfig.json b/packages/php-runtime/tsconfig.json index 5e346453..b7c29229 100644 --- a/packages/php-runtime/tsconfig.json +++ b/packages/php-runtime/tsconfig.json @@ -1,15 +1,9 @@ { - "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", - "compilerOptions": { - "lib": [ - "ES2022", - "ESNext.Disposable", - "DOM" - ], - "noUncheckedIndexedAccess": false, - "rootDir": "src", - }, - "include": [ - "src/**/*" - ], -} \ No newline at end of file + "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", + "compilerOptions": { + "lib": ["ES2022", "ESNext.Disposable", "DOM"], + "noUncheckedIndexedAccess": false, + "rootDir": "src" + }, + "include": ["src/**/*"] +} diff --git a/packages/php-runtime/vite.config.js b/packages/php-runtime/vite.config.js index 120c395b..56c89379 100644 --- a/packages/php-runtime/vite.config.js +++ b/packages/php-runtime/vite.config.js @@ -1,53 +1,54 @@ -import { resolve } from "path"; -import { defineConfig } from "vite"; -import dts from "vite-plugin-dts"; -import { viteStaticCopy } from "vite-plugin-static-copy"; +import { resolve } from 'path'; +import { defineConfig } from 'vite'; +import dts from 'vite-plugin-dts'; +import { viteStaticCopy } from 'vite-plugin-static-copy'; export default defineConfig({ - build: { - lib: { - // Could also be a dictionary or array of multiple entry points - entry: { - index: resolve(__dirname, "src/index.ts"), - version: resolve(__dirname, "src/version.ts"), - }, - formats: ["es"], - // name: "MyLib", - // the proper extensions will be added - // fileName: "index", - }, - rollupOptions: { - // make sure to externalize deps that shouldn't be bundled - // into your library - external: [/^libs\//], - output: { - // Provide global variables to use in the UMD build - // for externalized deps - globals: { - // vue: "Vue", - }, - assetFileNames: "assets/[name].[hash].[ext]", - }, - }, - }, - plugins: [ - { - name: "ignore-wasm-imports", - load(id) { - if (id.endsWith(".wasm")) { - return `export default {}`; - } - }, - }, - dts(), - viteStaticCopy({ - targets: [ - { - src: "node_modules/@php-wasm/web-8-5/jspi/8_5_3/php_8_5.wasm", - dest: ".", - rename: { stripBase: true, name: "php.wasm" }, - }, - ], - }), - ], + build: { + lib: { + // Could also be a dictionary or array of multiple entry points + entry: { + index: resolve(import.meta.dirname, 'src/index.ts'), + version: resolve(import.meta.dirname, 'src/version.ts') + }, + formats: ['es'] + // name: "MyLib", + // the proper extensions will be added + // fileName: "index", + }, + rollupOptions: { + // make sure to externalize deps that shouldn't be bundled + // into your library + external: [/^libs\//], + output: { + // Provide global variables to use in the UMD build + // for externalized deps + globals: { + // vue: "Vue", + }, + assetFileNames: 'assets/[name].[hash].[ext]' + } + } + }, + plugins: [ + { + name: 'ignore-wasm-imports', + enforce: 'pre', + load(id) { + if (id.endsWith('.wasm')) { + return `export default {}`; + } + } + }, + dts(), + viteStaticCopy({ + targets: [ + { + src: 'node_modules/@php-wasm/web-8-5/jspi/8_5_8/php_8_5.wasm', + dest: '.', + rename: { stripBase: true, name: 'php.wasm' } + } + ] + }) + ] }); diff --git a/packages/python-runtime/package.json b/packages/python-runtime/package.json index 1cdc9ffe..a81dafae 100644 --- a/packages/python-runtime/package.json +++ b/packages/python-runtime/package.json @@ -1,25 +1,27 @@ { - "name": "python-runtime", - "private": true, - "version": "0.0.0", - "type": "module", - "scripts": { - "check": "tsc", - "build": "vite build" - }, - "dependencies": { - "libs": "workspace:*", - "pyodide": "^0.29.3" - }, - "devDependencies": { - "vite": "catalog:", - "vite-plugin-dts": "catalog:", - "vite-plugin-static-copy": "catalog:" - }, - "exports": { - ".": "./dist/index.js", - "./version": "./dist/version.js", - "./pyodide.wasm": "./dist/pyodide/pyodide.asm.wasm", - "./python-stdlib.zip": "./dist/pyodide/python_stdlib.zip" - } -} \ No newline at end of file + "name": "python-runtime", + "version": "0.0.0", + "private": true, + "type": "module", + "exports": { + ".": "./dist/index.js", + "./version": "./dist/version.js", + "./pyodide.wasm": "./dist/pyodide/pyodide.asm.wasm", + "./python-stdlib.zip": "./dist/pyodide/python_stdlib.zip" + }, + "scripts": { + "check": "tsc", + "build": "vite build", + "format": "oxfmt", + "format:check": "oxfmt --check ." + }, + "dependencies": { + "libs": "workspace:*", + "pyodide": "^314.0.5" + }, + "devDependencies": { + "vite": "catalog:", + "vite-plugin-dts": "catalog:", + "vite-plugin-static-copy": "catalog:" + } +} diff --git a/packages/python-runtime/src/index.ts b/packages/python-runtime/src/index.ts index a069342d..ec88d1c2 100644 --- a/packages/python-runtime/src/index.ts +++ b/packages/python-runtime/src/index.ts @@ -1,4 +1,4 @@ -export * from "./py-program.js"; -export * from "./py-test-program"; -export * from "./py-runtime-factory"; -export * from "./version"; +export * from './py-program.js'; +export * from './py-test-program'; +export * from './py-runtime-factory'; +export * from './version'; diff --git a/packages/python-runtime/src/py-program.ts b/packages/python-runtime/src/py-program.ts index 1546f516..b67ac485 100644 --- a/packages/python-runtime/src/py-program.ts +++ b/packages/python-runtime/src/py-program.ts @@ -1,14 +1,14 @@ -import type { loadPyodide } from "pyodide"; -import type { Program } from "libs/compiler"; -import { inContext, type Context } from "libs/context"; +import type { loadPyodide } from 'pyodide'; +import type { Program } from 'libs/compiler'; +import { inContext, type Context } from 'libs/context'; export class PyProgram implements Program { - constructor( - protected readonly code: string, - protected readonly python: Awaited>, - ) {} + constructor( + protected readonly code: string, + protected readonly python: Awaited> + ) {} - async run(ctx: Context): Promise { - await inContext(ctx, this.python.runPythonAsync(this.code)); - } + async run(ctx: Context): Promise { + await inContext(ctx, this.python.runPythonAsync(this.code)); + } } diff --git a/packages/python-runtime/src/py-runtime-factory.ts b/packages/python-runtime/src/py-runtime-factory.ts index 7a9d068c..82babc9e 100644 --- a/packages/python-runtime/src/py-runtime-factory.ts +++ b/packages/python-runtime/src/py-runtime-factory.ts @@ -1,89 +1,38 @@ -import { loadPyodide, type PyodideInterface } from "pyodide"; -import lockFilerUrl from "pyodide/pyodide-lock.json?url"; -import "pyodide/pyodide.asm.js"; +import { loadPyodide, type PyodideInterface } from 'pyodide'; -import { inContext, type Context } from "libs/context"; -import { patch } from "libs/patcher"; -import { stringifyError } from "libs/error"; -import type { Streams } from "libs/io"; - -interface EmscriptenSettings { - readonly instantiateWasm?: ( - imports: { [key: string]: any }, - successCallback: ( - instance: WebAssembly.Instance, - module: WebAssembly.Module, - ) => void, - ) => void; -} - -declare global { - function _createPyodideModule(settings: EmscriptenSettings): Promise; -} - -const originalCreatePyodideModule = globalThis._createPyodideModule; +import { inContext, type Context } from 'libs/context'; +import type { Streams } from 'libs/io'; export const pyRuntimeFactory = async ( - ctx: Context, - streams: Streams, - wasmInstance: ( - ctx: Context, - imports: WebAssembly.Imports, - ) => Promise, - stdLibUrl: string, + ctx: Context, + streams: Streams, + indexUrl: string ): Promise => { - using _ = patch( - globalThis, - "_createPyodideModule", - function (settings: EmscriptenSettings) { - return originalCreatePyodideModule({ - ...settings, - instantiateWasm(imports, callback) { - const error_marker = Symbol("error marker"); - imports.sentinel = { - create_sentinel: () => error_marker, - is_sentinel: (val: any): val is typeof error_marker => - val === error_marker, - }; - wasmInstance(ctx, imports).then( - ({ instance, module }) => { - callback(instance, module); - }, - (e) => { - const text = stringifyError(e); - const encoder = new TextEncoder(); - streams.err.write(encoder.encode(text)); - }, - ); - return {}; - }, - }); - }, - ); - const pyodide = await inContext( - ctx, - loadPyodide({ - indexURL: "intentionally-missing-index-url", - stdLibURL: stdLibUrl, - lockFileURL: lockFilerUrl, - }), - ); - pyodide.setStdin({ - stdin: streams.in.read.bind(streams.in), - isatty: true, - autoEOF: false, - }); - pyodide.setStdout({ - write(data) { - streams.out.write(data); - return data.length; - }, - }); - pyodide.setStderr({ - write(data) { - streams.err.write(data); - return data.length; - }, - }); - return pyodide; + // pyodide loads pyodide.asm.wasm/mjs, python_stdlib.zip and + // pyodide-lock.json relative to indexURL, which must point at a served + // copy of the pyodide distribution (see the app's static-copy config). + const pyodide = await inContext( + ctx, + loadPyodide({ + indexURL: indexUrl + }) + ); + pyodide.setStdin({ + stdin: streams.in.read.bind(streams.in), + isatty: true, + autoEOF: false + }); + pyodide.setStdout({ + write(data) { + streams.out.write(data); + return data.length; + } + }); + pyodide.setStderr({ + write(data) { + streams.err.write(data); + return data.length; + } + }); + return pyodide; }; diff --git a/packages/python-runtime/src/py-test-program.ts b/packages/python-runtime/src/py-test-program.ts index fd2f397b..7dfec1b7 100644 --- a/packages/python-runtime/src/py-test-program.ts +++ b/packages/python-runtime/src/py-test-program.ts @@ -1,48 +1,45 @@ -import { loadPyodide } from "pyodide"; -import type { PyProxy } from "pyodide/ffi"; +import { loadPyodide } from 'pyodide'; +import type { PyProxy } from 'pyodide/ffi'; -import { inContext, type Context } from "libs/context"; -import type { TestProgram } from "libs/testing"; +import { inContext, type Context } from 'libs/context'; +import type { TestProgram } from 'libs/testing'; function isPyProxy(obj: any): obj is PyProxy { - return typeof obj === "object" && obj; + return typeof obj === 'object' && obj; } export abstract class PyTestProgram implements TestProgram { - private proxies: PyProxy[] = []; - - constructor( - protected readonly python: Awaited>, - protected readonly code: string - ) {} - - protected abstract caseExecutionCode(input: I): string; - - protected transformCode(input: I): string { - return `${this.code}\n${this.caseExecutionCode(input)}`; - } - - protected transformResult(result: any): O { - if (isPyProxy(result)) { - this.proxies.push(result); - return result.toJs({ pyproxies: this.proxies }); - } - return result; - } - - async run(ctx: Context, input: I): Promise { - return this.transformResult( - await inContext( - ctx, - this.python.runPythonAsync(this.transformCode(input)) - ) - ); - } - - [Symbol.dispose](): void { - for (const p of this.proxies) { - p.destroy(); - } - this.proxies.length = 0; - } + private proxies: PyProxy[] = []; + + constructor( + protected readonly python: Awaited>, + protected readonly code: string + ) {} + + protected abstract caseExecutionCode(input: I): string; + + protected transformCode(input: I): string { + return `${this.code}\n${this.caseExecutionCode(input)}`; + } + + protected transformResult(result: any): O { + if (isPyProxy(result)) { + this.proxies.push(result); + return result.toJs({ pyproxies: this.proxies }); + } + return result; + } + + async run(ctx: Context, input: I): Promise { + return this.transformResult( + await inContext(ctx, this.python.runPythonAsync(this.transformCode(input))) + ); + } + + [Symbol.dispose](): void { + for (const p of this.proxies) { + p.destroy(); + } + this.proxies.length = 0; + } } diff --git a/packages/python-runtime/src/version.ts b/packages/python-runtime/src/version.ts index 77b212b4..f3046449 100644 --- a/packages/python-runtime/src/version.ts +++ b/packages/python-runtime/src/version.ts @@ -2,4 +2,4 @@ // export { version } from "pyodide"; // According to https://pyodide.org/en/stable/project/changelog.html#version-0-28-0 -export const version = "3.13.2"; +export const version = '3.13.2'; diff --git a/packages/python-runtime/tsconfig.json b/packages/python-runtime/tsconfig.json index 5366bc2f..0a0d6535 100644 --- a/packages/python-runtime/tsconfig.json +++ b/packages/python-runtime/tsconfig.json @@ -1,16 +1,10 @@ { - "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", - "compilerOptions": { - "lib": [ - "ES2022", - "ESNext.Disposable", - "DOM" - ], - "noUncheckedIndexedAccess": false, - "rootDir": "src", - "types": ["vite/client"] - }, - "include": [ - "src/**/*" - ], -} \ No newline at end of file + "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", + "compilerOptions": { + "lib": ["ES2022", "ESNext.Disposable", "DOM"], + "noUncheckedIndexedAccess": false, + "rootDir": "src", + "types": ["vite/client"] + }, + "include": ["src/**/*"] +} diff --git a/packages/python-runtime/vite.config.js b/packages/python-runtime/vite.config.js index db77b83c..e464eda9 100644 --- a/packages/python-runtime/vite.config.js +++ b/packages/python-runtime/vite.config.js @@ -1,59 +1,69 @@ -import { resolve } from "path"; -import { defineConfig, createLogger } from "vite"; -import dts from "vite-plugin-dts"; -import { viteStaticCopy } from "vite-plugin-static-copy"; +import { resolve } from 'path'; +import { defineConfig, createLogger } from 'vite'; +import dts from 'vite-plugin-dts'; +import { viteStaticCopy } from 'vite-plugin-static-copy'; const logger = createLogger(); const loggerWarn = logger.warn; logger.warn = (msg, options) => { - // Ignore warnings from pyodide distribution - if (msg.includes("pyodide/pyodide")) return; - loggerWarn(msg, options); + // Ignore warnings from pyodide distribution + if (msg.includes('pyodide/pyodide')) return; + loggerWarn(msg, options); }; export default defineConfig({ - customLogger: logger, - build: { - lib: { - // Could also be a dictionary or array of multiple entry points - entry: { - index: resolve(__dirname, "src/index.ts"), - version: resolve(__dirname, "src/version.ts"), - }, - formats: ["es"], - // name: "MyLib", - // the proper extensions will be added - // fileName: "index", - }, - rollupOptions: { - // make sure to externalize deps that shouldn't be bundled - // into your library - external: [/^libs\//], - output: { - // Provide global variables to use in the UMD build - // for externalized deps - globals: { - // vue: "Vue", - }, - }, - }, - }, - plugins: [ - dts(), - viteStaticCopy({ - targets: [ - { - src: "node_modules/pyodide/pyodide.asm.wasm", - dest: "pyodide", - rename: { stripBase: true }, - }, - { - src: "node_modules/pyodide/python_stdlib.zip", - dest: "pyodide", - rename: { stripBase: true }, - }, - ], - }), - ], + customLogger: logger, + build: { + lib: { + // Could also be a dictionary or array of multiple entry points + entry: { + index: resolve(import.meta.dirname, 'src/index.ts'), + version: resolve(import.meta.dirname, 'src/version.ts') + }, + formats: ['es'] + // name: "MyLib", + // the proper extensions will be added + // fileName: "index", + }, + rollupOptions: { + // make sure to externalize deps that shouldn't be bundled + // into your library + external: [/^libs\//], + output: { + // Provide global variables to use in the UMD build + // for externalized deps + globals: { + // vue: "Vue", + } + } + } + }, + plugins: [ + dts(), + viteStaticCopy({ + targets: [ + { + src: 'node_modules/pyodide/pyodide.asm.wasm', + dest: 'pyodide', + rename: { stripBase: true } + }, + { + src: 'node_modules/pyodide/pyodide.asm.mjs', + dest: 'pyodide', + rename: { stripBase: true } + }, + { + src: 'node_modules/pyodide/python_stdlib.zip', + dest: 'pyodide', + rename: { stripBase: true } + }, + { + src: 'node_modules/pyodide/pyodide-lock.json', + dest: 'pyodide', + rename: { stripBase: true } + } + ] + }) + ] }); diff --git a/packages/ruby-runtime/package.json b/packages/ruby-runtime/package.json index 18883173..5f03e502 100644 --- a/packages/ruby-runtime/package.json +++ b/packages/ruby-runtime/package.json @@ -1,29 +1,31 @@ { - "name": "ruby-runtime", - "private": true, - "version": "1.0.0", - "type": "module", - "scripts": { - "check": "tsc", - "build": "vite build" - }, - "peerDependencies": { - "@bjorn3/browser_wasi_shim": "^0.4.0" - }, - "dependencies": { - "@ruby/wasm-wasi": "2.9.3-2.9.4", - "libs": "workspace:*" - }, - "devDependencies": { - "@bjorn3/browser_wasi_shim": "catalog:", - "@ruby/4.0-wasm-wasi": "2.9.3-2.9.4", - "vite": "catalog:", - "vite-plugin-dts": "catalog:", - "vite-plugin-static-copy": "catalog:" - }, - "exports": { - ".": "./dist/index.js", - "./version": "./dist/version.js", - "./ruby.wasm": "./dist/ruby.wasm" - } -} \ No newline at end of file + "name": "ruby-runtime", + "version": "1.0.0", + "private": true, + "type": "module", + "exports": { + ".": "./dist/index.js", + "./version": "./dist/version.js", + "./ruby.wasm": "./dist/ruby.wasm" + }, + "scripts": { + "check": "tsc", + "build": "vite build", + "format": "oxfmt", + "format:check": "oxfmt --check ." + }, + "dependencies": { + "@ruby/wasm-wasi": "2.10.1", + "libs": "workspace:*" + }, + "devDependencies": { + "@bjorn3/browser_wasi_shim": "catalog:", + "@ruby/4.0-wasm-wasi": "2.10.1", + "vite": "catalog:", + "vite-plugin-dts": "catalog:", + "vite-plugin-static-copy": "catalog:" + }, + "peerDependencies": { + "@bjorn3/browser_wasi_shim": "^0.4.0" + } +} diff --git a/packages/ruby-runtime/probe/index.ts b/packages/ruby-runtime/probe/index.ts index 4b103a9c..b502f559 100644 --- a/packages/ruby-runtime/probe/index.ts +++ b/packages/ruby-runtime/probe/index.ts @@ -1,16 +1,13 @@ -import { DefaultRubyVM } from "@ruby/wasm-wasi/dist/browser"; +import { DefaultRubyVM } from '@ruby/wasm-wasi/dist/browser'; // @ts-expect-error -import WASM_PATH from "./public/ruby+stdlib.wasm"; +import WASM_PATH from './public/ruby+stdlib.wasm'; const wasmFile = Bun.file(WASM_PATH); -const { vm } = await DefaultRubyVM( - await WebAssembly.compile(await wasmFile.arrayBuffer()), - { - consolePrint: true - } -); +const { vm } = await DefaultRubyVM(await WebAssembly.compile(await wasmFile.arrayBuffer()), { + consolePrint: true +}); vm.eval("puts 'hello world'"); -vm.printVersion() \ No newline at end of file +vm.printVersion(); diff --git a/packages/ruby-runtime/probe/package.json b/packages/ruby-runtime/probe/package.json index 3ee838a2..b854a0e5 100644 --- a/packages/ruby-runtime/probe/package.json +++ b/packages/ruby-runtime/probe/package.json @@ -1,15 +1,15 @@ { - "name": "probe", - "module": "index.ts", - "type": "module", - "devDependencies": { - "@types/bun": "latest" - }, - "peerDependencies": { - "typescript": "^5.9.3" - }, - "dependencies": { - "@ruby/3.4-wasm-wasi": "^2.7.2", - "@ruby/wasm-wasi": "^2.7.2" - } -} \ No newline at end of file + "name": "probe", + "type": "module", + "module": "index.ts", + "dependencies": { + "@ruby/3.4-wasm-wasi": "^2.7.2", + "@ruby/wasm-wasi": "^2.7.2" + }, + "devDependencies": { + "@types/bun": "latest" + }, + "peerDependencies": { + "typescript": "^5.9.3" + } +} diff --git a/packages/ruby-runtime/probe/tsconfig.json b/packages/ruby-runtime/probe/tsconfig.json index 238655f2..ffc08abf 100644 --- a/packages/ruby-runtime/probe/tsconfig.json +++ b/packages/ruby-runtime/probe/tsconfig.json @@ -1,27 +1,27 @@ { - "compilerOptions": { - // Enable latest features - "lib": ["ESNext", "DOM"], - "target": "ESNext", - "module": "ESNext", - "moduleDetection": "force", - "jsx": "react-jsx", - "allowJs": true, + "compilerOptions": { + // Enable latest features + "lib": ["ESNext", "DOM"], + "target": "ESNext", + "module": "ESNext", + "moduleDetection": "force", + "jsx": "react-jsx", + "allowJs": true, - // Bundler mode - "moduleResolution": "bundler", - "allowImportingTsExtensions": true, - "verbatimModuleSyntax": true, - "noEmit": true, + // Bundler mode + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "verbatimModuleSyntax": true, + "noEmit": true, - // Best practices - "strict": true, - "skipLibCheck": true, - "noFallthroughCasesInSwitch": true, + // Best practices + "strict": true, + "skipLibCheck": true, + "noFallthroughCasesInSwitch": true, - // Some stricter flags (disabled by default) - "noUnusedLocals": false, - "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false - } + // Some stricter flags (disabled by default) + "noUnusedLocals": false, + "noUnusedParameters": false, + "noPropertyAccessFromIndexSignature": false + } } diff --git a/packages/ruby-runtime/src/index.ts b/packages/ruby-runtime/src/index.ts index e3d4e8d5..292a937f 100644 --- a/packages/ruby-runtime/src/index.ts +++ b/packages/ruby-runtime/src/index.ts @@ -1,4 +1,4 @@ -export * from './ruby-vm-factory.js' -export * from './ruby-program.js' -export * from './ruby-test-program.js' -export * from './version.js' +export * from './ruby-vm-factory.js'; +export * from './ruby-program.js'; +export * from './ruby-test-program.js'; +export * from './version.js'; diff --git a/packages/ruby-runtime/src/ruby-program.ts b/packages/ruby-runtime/src/ruby-program.ts index 5edd654b..1765ff21 100644 --- a/packages/ruby-runtime/src/ruby-program.ts +++ b/packages/ruby-runtime/src/ruby-program.ts @@ -1,14 +1,14 @@ -import { RubyVM } from "@ruby/wasm-wasi"; -import type { Program } from "libs/compiler"; -import { inContext, type Context } from "libs/context"; +import { RubyVM } from '@ruby/wasm-wasi'; +import type { Program } from 'libs/compiler'; +import { inContext, type Context } from 'libs/context'; export class RubyProgram implements Program { - constructor( - protected readonly code: string, - protected readonly rubyVm: RubyVM - ) {} + constructor( + protected readonly code: string, + protected readonly rubyVm: RubyVM + ) {} - async run(ctx: Context): Promise { - await inContext(ctx, this.rubyVm.evalAsync(this.code)); - } + async run(ctx: Context): Promise { + await inContext(ctx, this.rubyVm.evalAsync(this.code)); + } } diff --git a/packages/ruby-runtime/src/ruby-test-program.ts b/packages/ruby-runtime/src/ruby-test-program.ts index 1ff9f2b4..2f850397 100644 --- a/packages/ruby-runtime/src/ruby-test-program.ts +++ b/packages/ruby-runtime/src/ruby-test-program.ts @@ -1,19 +1,19 @@ -import type { RubyVM, RbValue } from "@ruby/wasm-wasi"; -import { inContext, type Context } from "libs/context"; -import type { TestProgram } from "libs/testing"; +import type { RubyVM, RbValue } from '@ruby/wasm-wasi'; +import { inContext, type Context } from 'libs/context'; +import type { TestProgram } from 'libs/testing'; export abstract class RubyTestProgram implements TestProgram { - constructor(protected readonly rubyVm: RubyVM) {} + constructor(protected readonly rubyVm: RubyVM) {} - async run(ctx: Context, input: I): Promise { - return this.transformResult( - await inContext(ctx, this.rubyVm.evalAsync(this.caseExecutionCode(input))) - ); - } + async run(ctx: Context, input: I): Promise { + return this.transformResult( + await inContext(ctx, this.rubyVm.evalAsync(this.caseExecutionCode(input))) + ); + } - protected abstract caseExecutionCode(input: I): string; + protected abstract caseExecutionCode(input: I): string; - protected transformResult(result: RbValue): O { - return result.toJS(); - } + protected transformResult(result: RbValue): O { + return result.toJS(); + } } diff --git a/packages/ruby-runtime/src/ruby-vm-factory.ts b/packages/ruby-runtime/src/ruby-vm-factory.ts index 3927e62c..0b21a442 100644 --- a/packages/ruby-runtime/src/ruby-vm-factory.ts +++ b/packages/ruby-runtime/src/ruby-vm-factory.ts @@ -1,45 +1,33 @@ -import { RubyVM } from "@ruby/wasm-wasi"; -import { - Fd, - PreopenDirectory, - WASI, - ConsoleStdout, -} from "@bjorn3/browser_wasi_shim"; -import { inContext, type Context } from "libs/context"; -import type { Streams } from "libs/io"; -import { Stdin } from "libs/wasi"; +import { RubyVM } from '@ruby/wasm-wasi'; +import { Fd, PreopenDirectory, WASI, ConsoleStdout } from '@bjorn3/browser_wasi_shim'; +import { inContext, type Context } from 'libs/context'; +import type { Streams } from 'libs/io'; +import { Stdin } from 'libs/wasi'; // https://github.com/ruby/ruby.wasm/blob/ef0300af384779db2e5de1e8c4528597d28eabe2/packages/npm-packages/ruby-wasm-wasi/src/vm.ts#L126 -export async function createRubyVM( - ctx: Context, - streams: Streams, - wasmModule: WebAssembly.Module, -) { - const args: string[] = []; - const env: string[] = []; +export async function createRubyVM(ctx: Context, streams: Streams, wasmModule: WebAssembly.Module) { + const args: string[] = []; + const env: string[] = []; - const fds: Fd[] = [ - new Stdin(streams.in.read.bind(streams.in)), - new ConsoleStdout(streams.out.write.bind(streams.out)), - new ConsoleStdout(streams.err.write.bind(streams.err)), - new PreopenDirectory("/", new Map()), - ]; - const wasi = new WASI(args, env, fds, { debug: false }); - const vm = new RubyVM(); - const imports = { - wasi_snapshot_preview1: wasi.wasiImport, - }; - vm.addToImports(imports); + const fds: Fd[] = [ + new Stdin(streams.in.read.bind(streams.in)), + new ConsoleStdout(streams.out.write.bind(streams.out)), + new ConsoleStdout(streams.err.write.bind(streams.err)), + new PreopenDirectory('/', new Map()) + ]; + const wasi = new WASI(args, env, fds, { debug: false }); + const vm = new RubyVM(); + const imports = { + wasi_snapshot_preview1: wasi.wasiImport + }; + vm.addToImports(imports); - const instance = await inContext( - ctx, - WebAssembly.instantiate(wasmModule, imports), - ); - await inContext(ctx, vm.setInstance(instance)); + const instance = await inContext(ctx, WebAssembly.instantiate(wasmModule, imports)); + await inContext(ctx, vm.setInstance(instance)); - //@ts-expect-error lack of type information - wasi.initialize(instance); - vm.initialize(); + //@ts-expect-error lack of type information + wasi.initialize(instance); + vm.initialize(); - return vm; + return vm; } diff --git a/packages/ruby-runtime/src/version.ts b/packages/ruby-runtime/src/version.ts index 4ac1e9c8..52199be6 100644 --- a/packages/ruby-runtime/src/version.ts +++ b/packages/ruby-runtime/src/version.ts @@ -1 +1 @@ -export const version = "4.0.0"; +export const version = '4.0.0'; diff --git a/packages/ruby-runtime/tsconfig.json b/packages/ruby-runtime/tsconfig.json index 5366bc2f..0a0d6535 100644 --- a/packages/ruby-runtime/tsconfig.json +++ b/packages/ruby-runtime/tsconfig.json @@ -1,16 +1,10 @@ { - "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", - "compilerOptions": { - "lib": [ - "ES2022", - "ESNext.Disposable", - "DOM" - ], - "noUncheckedIndexedAccess": false, - "rootDir": "src", - "types": ["vite/client"] - }, - "include": [ - "src/**/*" - ], -} \ No newline at end of file + "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", + "compilerOptions": { + "lib": ["ES2022", "ESNext.Disposable", "DOM"], + "noUncheckedIndexedAccess": false, + "rootDir": "src", + "types": ["vite/client"] + }, + "include": ["src/**/*"] +} diff --git a/packages/ruby-runtime/vite.config.js b/packages/ruby-runtime/vite.config.js index 59361a13..9f83d45c 100644 --- a/packages/ruby-runtime/vite.config.js +++ b/packages/ruby-runtime/vite.config.js @@ -1,44 +1,44 @@ -import { resolve } from "path"; -import { defineConfig } from "vite"; -import dts from "vite-plugin-dts"; -import { viteStaticCopy } from "vite-plugin-static-copy"; +import { resolve } from 'path'; +import { defineConfig } from 'vite'; +import dts from 'vite-plugin-dts'; +import { viteStaticCopy } from 'vite-plugin-static-copy'; export default defineConfig({ - build: { - lib: { - // Could also be a dictionary or array of multiple entry points - entry: { - index: resolve(__dirname, "src/index.ts"), - version: resolve(__dirname, "src/version.ts"), - }, - formats: ["es"], - // name: "MyLib", - // the proper extensions will be added - // fileName: "index", - }, - rollupOptions: { - // make sure to externalize deps that shouldn't be bundled - // into your library - external: [/^libs\//, "@bjorn3/browser_wasi_shim"], - output: { - // Provide global variables to use in the UMD build - // for externalized deps - globals: { - // vue: "Vue", - }, - }, - }, - }, - plugins: [ - dts(), - viteStaticCopy({ - targets: [ - { - src: "node_modules/@ruby/4.0-wasm-wasi/dist/ruby+stdlib.wasm", - dest: ".", - rename: { stripBase: true, name: "ruby.wasm" }, - }, - ], - }), - ], + build: { + lib: { + // Could also be a dictionary or array of multiple entry points + entry: { + index: resolve(import.meta.dirname, 'src/index.ts'), + version: resolve(import.meta.dirname, 'src/version.ts') + }, + formats: ['es'] + // name: "MyLib", + // the proper extensions will be added + // fileName: "index", + }, + rollupOptions: { + // make sure to externalize deps that shouldn't be bundled + // into your library + external: [/^libs\//, '@bjorn3/browser_wasi_shim'], + output: { + // Provide global variables to use in the UMD build + // for externalized deps + globals: { + // vue: "Vue", + } + } + } + }, + plugins: [ + dts(), + viteStaticCopy({ + targets: [ + { + src: 'node_modules/@ruby/4.0-wasm-wasi/dist/ruby+stdlib.wasm', + dest: '.', + rename: { stripBase: true, name: 'ruby.wasm' } + } + ] + }) + ] }); diff --git a/packages/rust-runtime/package.json b/packages/rust-runtime/package.json index 56edc246..66e86eea 100644 --- a/packages/rust-runtime/package.json +++ b/packages/rust-runtime/package.json @@ -1,27 +1,29 @@ { - "name": "rust-runtime", - "private": true, - "version": "1.0.0", - "type": "module", - "scripts": { - "check": "tsc", - "build": "vite build" - }, - "peerDependencies": { - "@bjorn3/browser_wasi_shim": "^0.4.0" - }, - "dependencies": { - "libs": "workspace:*" - }, - "devDependencies": { - "@bjorn3/browser_wasi_shim": "catalog:", - "vite": "catalog:", - "vite-plugin-dts": "catalog:" - }, - "exports": { - ".": "./dist/index.js", - "./version": "./dist/version.js", - "./miri.wasm": "./dist/miri.wasm", - "./lib/*": "./dist/lib/*" - } -} \ No newline at end of file + "name": "rust-runtime", + "version": "1.0.0", + "private": true, + "type": "module", + "exports": { + ".": "./dist/index.js", + "./version": "./dist/version.js", + "./miri.wasm": "./dist/miri.wasm", + "./lib/*": "./dist/lib/*" + }, + "scripts": { + "check": "tsc", + "build": "vite build", + "format": "oxfmt", + "format:check": "oxfmt --check ." + }, + "dependencies": { + "libs": "workspace:*" + }, + "devDependencies": { + "@bjorn3/browser_wasi_shim": "catalog:", + "vite": "catalog:", + "vite-plugin-dts": "catalog:" + }, + "peerDependencies": { + "@bjorn3/browser_wasi_shim": "^0.4.0" + } +} diff --git a/packages/rust-runtime/probe/index.ts b/packages/rust-runtime/probe/index.ts index aa2b20d1..eca6f09a 100644 --- a/packages/rust-runtime/probe/index.ts +++ b/packages/rust-runtime/probe/index.ts @@ -1,83 +1,79 @@ import { - Fd, - File, - Directory, - PreopenDirectory, - WASI, - Inode, - wasi as wasiDefs, -} from "@bjorn3/browser_wasi_shim"; -import { readdir } from "node:fs/promises"; + Fd, + File, + Directory, + PreopenDirectory, + WASI, + Inode, + wasi as wasiDefs +} from '@bjorn3/browser_wasi_shim'; +import { readdir } from 'node:fs/promises'; -const miriFile = Bun.file(new URL("../public/miri.wasm", import.meta.url)); +const miriFile = Bun.file(new URL('../public/miri.wasm', import.meta.url)); -const libs = await readdir(new URL("../public/lib", import.meta.url)); +const libs = await readdir(new URL('../public/lib', import.meta.url)); function dirContent(data: Record) { - return new Map(Object.entries(data)); + return new Map(Object.entries(data)); } function dir(data: Record) { - return new Directory(dirContent(data)); + return new Directory(dirContent(data)); } function buildSysroot(lib: Directory): PreopenDirectory { - // Create SYSROOT directory for Miri - return new PreopenDirectory( - "/sysroot", - dirContent({ - lib: dir({ - rustlib: dir({ - "wasm32-wasi": dir({ lib: dir({}) }), - "x86_64-unknown-linux-gnu": dir({ - lib: lib, - }), - }), - }), - }) - ); + // Create SYSROOT directory for Miri + return new PreopenDirectory( + '/sysroot', + dirContent({ + lib: dir({ + rustlib: dir({ + 'wasm32-wasi': dir({ lib: dir({}) }), + 'x86_64-unknown-linux-gnu': dir({ + lib: lib + }) + }) + }) + }) + ); } async function loadLib(lib: string): Promise<[string, File]> { - return [ - lib, - new File( - await Bun.file( - new URL(`../public/lib/${lib}`, import.meta.url) - ).arrayBuffer() - ), - ]; + return [ + lib, + new File(await Bun.file(new URL(`../public/lib/${lib}`, import.meta.url)).arrayBuffer()) + ]; } async function loadLibs(libs: string[]) { - return new Directory(await Promise.all(libs.map(loadLib))); + return new Directory(await Promise.all(libs.map(loadLib))); } class Stdio extends Fd { - private out: Uint8Array[]; - - constructor(out: Uint8Array[] = []) { - super(); - this.out = out; - } - - fd_write(data: Uint8Array): { ret: number; nwritten: number } { - this.out.push(data); - return { ret: 0, nwritten: data.byteLength }; - } - - clear() { - this.out.length = 0; - } - - text(): string { - const decoder = new TextDecoder("utf-8"); - let string = ""; - for (const b of this.out) { - string += decoder.decode(b); - } - return string; - } + private out: Uint8Array[]; + + constructor(out: Uint8Array[] = []) { + super(); + this.out = out; + } + + fd_write(data: Uint8Array): { ret: number; nwritten: number } { + this.out.push(data); + return { ret: 0, nwritten: data.byteLength }; + } + + clear() { + this.out.length = 0; + } + + text(): string { + const decoder = new TextDecoder('utf-8'); + let string = ''; + for (const b of this.out) { + string += decoder.decode(b); + } + return string; + } } const miriModule = await WebAssembly.compile(await miriFile.arrayBuffer()); @@ -85,71 +81,71 @@ const out: Uint8Array[] = []; const stdin = new Stdio(out); const stdout = new Stdio(out); const stderr = new Stdio(out); -const tmp = new PreopenDirectory("/tmp", dirContent({})); +const tmp = new PreopenDirectory('/tmp', dirContent({})); const sysroot = buildSysroot(await loadLibs(libs)); -const code = await Bun.file(new URL("./code.rs", import.meta.url)).text(); +const code = await Bun.file(new URL('./code.rs', import.meta.url)).text(); const mainFile = new File(new TextEncoder().encode(code)); const root = new PreopenDirectory( - "/", - dirContent({ - "main.rs": mainFile, - }) + '/', + dirContent({ + 'main.rs': mainFile + }) ); const descriptors = [stdin, stdout, stderr, tmp, sysroot, root]; const env: string[] = []; const args = [ - "miri", - "--sysroot", - "/sysroot", - "main.rs", - "--target", - "x86_64-unknown-linux-gnu", - // "-Zmir-opt-level=3", - "-Zmiri-ignore-leaks", - "-Zmiri-permissive-provenance", - "-Zmiri-preemption-rate=0", - "-Zmiri-disable-alignment-check", - "-Zmiri-disable-data-race-detector", - "-Zmiri-disable-stacked-borrows", - "-Zmiri-disable-validation", - "-Zmir-emit-retag=false", - "-Zmiri-disable-isolation", - "-Zmiri-panic-on-unsupported", - "--color=always", + 'miri', + '--sysroot', + '/sysroot', + 'main.rs', + '--target', + 'x86_64-unknown-linux-gnu', + // "-Zmir-opt-level=3", + '-Zmiri-ignore-leaks', + '-Zmiri-permissive-provenance', + '-Zmiri-preemption-rate=0', + '-Zmiri-disable-alignment-check', + '-Zmiri-disable-data-race-detector', + '-Zmiri-disable-stacked-borrows', + '-Zmiri-disable-validation', + '-Zmir-emit-retag=false', + '-Zmiri-disable-isolation', + '-Zmiri-panic-on-unsupported', + '--color=always' ]; const wasi = new WASI(args, env, descriptors, { debug: false }); let thread_id = 1; const miri = await WebAssembly.instantiate(miriModule, { - env: { - memory: new WebAssembly.Memory({ - initial: 256, - // maximum: 1024 * 4, - shared: false, - }), - }, - wasi: { - // @ts-ignore - "thread-spawn": (start_arg) => { - let id = thread_id++; - // @ts-ignore - miri.exports.wasi_thread_start(id, start_arg); - return id; - }, - }, - wasi_snapshot_preview1: wasi.wasiImport, + env: { + memory: new WebAssembly.Memory({ + initial: 256, + // maximum: 1024 * 4, + shared: false + }) + }, + wasi: { + // @ts-ignore + 'thread-spawn': (start_arg) => { + let id = thread_id++; + // @ts-ignore + miri.exports.wasi_thread_start(id, start_arg); + return id; + } + }, + wasi_snapshot_preview1: wasi.wasiImport }); try { - // @ts-ignore - wasi.start(miri); + // @ts-ignore + wasi.start(miri); } catch (e) { - console.error(e); + console.error(e); } console.log(stdout.text()); -const node = root.path_lookup("foo.txt", 0).inode_obj; +const node = root.path_lookup('foo.txt', 0).inode_obj; if (node === null || !(node instanceof File)) { - throw new Error("foo.txt not found"); + throw new Error('foo.txt not found'); } console.log(new TextDecoder().decode(node.data)); diff --git a/packages/rust-runtime/probe/package.json b/packages/rust-runtime/probe/package.json index 7135cdbf..8cbd5cc0 100644 --- a/packages/rust-runtime/probe/package.json +++ b/packages/rust-runtime/probe/package.json @@ -1,14 +1,14 @@ { - "name": "probe", - "module": "index.ts", - "type": "module", - "devDependencies": { - "@types/bun": "latest" - }, - "peerDependencies": { - "typescript": "^5.0.0" - }, - "dependencies": { - "@bjorn3/browser_wasi_shim": "^0.3.0" - } -} \ No newline at end of file + "name": "probe", + "type": "module", + "module": "index.ts", + "dependencies": { + "@bjorn3/browser_wasi_shim": "^0.3.0" + }, + "devDependencies": { + "@types/bun": "latest" + }, + "peerDependencies": { + "typescript": "^5.0.0" + } +} diff --git a/packages/rust-runtime/probe/tsconfig.json b/packages/rust-runtime/probe/tsconfig.json index 238655f2..ffc08abf 100644 --- a/packages/rust-runtime/probe/tsconfig.json +++ b/packages/rust-runtime/probe/tsconfig.json @@ -1,27 +1,27 @@ { - "compilerOptions": { - // Enable latest features - "lib": ["ESNext", "DOM"], - "target": "ESNext", - "module": "ESNext", - "moduleDetection": "force", - "jsx": "react-jsx", - "allowJs": true, + "compilerOptions": { + // Enable latest features + "lib": ["ESNext", "DOM"], + "target": "ESNext", + "module": "ESNext", + "moduleDetection": "force", + "jsx": "react-jsx", + "allowJs": true, - // Bundler mode - "moduleResolution": "bundler", - "allowImportingTsExtensions": true, - "verbatimModuleSyntax": true, - "noEmit": true, + // Bundler mode + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "verbatimModuleSyntax": true, + "noEmit": true, - // Best practices - "strict": true, - "skipLibCheck": true, - "noFallthroughCasesInSwitch": true, + // Best practices + "strict": true, + "skipLibCheck": true, + "noFallthroughCasesInSwitch": true, - // Some stricter flags (disabled by default) - "noUnusedLocals": false, - "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false - } + // Some stricter flags (disabled by default) + "noUnusedLocals": false, + "noUnusedParameters": false, + "noPropertyAccessFromIndexSignature": false + } } diff --git a/packages/rust-runtime/src/create-wasi.ts b/packages/rust-runtime/src/create-wasi.ts index ec84a4d2..a38f575d 100644 --- a/packages/rust-runtime/src/create-wasi.ts +++ b/packages/rust-runtime/src/create-wasi.ts @@ -1,70 +1,65 @@ import { - WASI, - ConsoleStdout, - Fd, - PreopenDirectory, - File, - Directory, -} from "@bjorn3/browser_wasi_shim"; -import type { Streams } from "libs/io"; -import { contents, dir, Stdin } from "libs/wasi"; + WASI, + ConsoleStdout, + Fd, + PreopenDirectory, + File, + Directory +} from '@bjorn3/browser_wasi_shim'; +import type { Streams } from 'libs/io'; +import { contents, dir, Stdin } from 'libs/wasi'; -export function createWASI( - streams: Streams, - libs: [string, ArrayBuffer][], -): WASI { - const env: string[] = []; - const args = [ - "miri", - "--sysroot", - "/sysroot", - "main.rs", - "--target", - "x86_64-unknown-linux-gnu", - // "-Zmir-opt-level=3", - "-Zmiri-ignore-leaks", - "-Zmiri-permissive-provenance", - "-Zmiri-preemption-rate=0", - "-Zmiri-disable-alignment-check", - "-Zmiri-disable-data-race-detector", - "-Zmiri-disable-stacked-borrows", - "-Zmiri-disable-validation", - "-Zmir-emit-retag=false", - "-Zmiri-disable-isolation", - "-Zmiri-panic-on-unsupported", - "--color=always", - ]; - const tmpDir = new PreopenDirectory("/tmp", contents({})); - const sysrootDir = new PreopenDirectory( - "/sysroot", - contents({ - lib: dir({ - rustlib: dir({ - "wasm32-wasi": dir({ lib: dir({}) }), - "x86_64-unknown-linux-gnu": dir({ - lib: new Directory( - libs.map( - ([lib, buffer]) => [lib, new File(buffer)] as [string, File], - ), - ), - }), - }), - }), - }), - ); - const rootDir = new PreopenDirectory( - "/", - contents({ - "main.rs": new File([]), - }), - ); - const descriptors: Array = [ - new Stdin(streams.in.read.bind(streams.in)), - new ConsoleStdout(streams.out.write.bind(streams.out)), - new ConsoleStdout(streams.err.write.bind(streams.err)), - tmpDir, - sysrootDir, - rootDir, - ]; - return new WASI(args, env, descriptors, { debug: false }); +export function createWASI(streams: Streams, libs: [string, ArrayBuffer][]): WASI { + const env: string[] = []; + const args = [ + 'miri', + '--sysroot', + '/sysroot', + 'main.rs', + '--target', + 'x86_64-unknown-linux-gnu', + // "-Zmir-opt-level=3", + '-Zmiri-ignore-leaks', + '-Zmiri-permissive-provenance', + '-Zmiri-preemption-rate=0', + '-Zmiri-disable-alignment-check', + '-Zmiri-disable-data-race-detector', + '-Zmiri-disable-stacked-borrows', + '-Zmiri-disable-validation', + '-Zmir-emit-retag=false', + '-Zmiri-disable-isolation', + '-Zmiri-panic-on-unsupported', + '--color=always' + ]; + const tmpDir = new PreopenDirectory('/tmp', contents({})); + const sysrootDir = new PreopenDirectory( + '/sysroot', + contents({ + lib: dir({ + rustlib: dir({ + 'wasm32-wasi': dir({ lib: dir({}) }), + 'x86_64-unknown-linux-gnu': dir({ + lib: new Directory( + libs.map(([lib, buffer]) => [lib, new File(buffer)] as [string, File]) + ) + }) + }) + }) + }) + ); + const rootDir = new PreopenDirectory( + '/', + contents({ + 'main.rs': new File([]) + }) + ); + const descriptors: Array = [ + new Stdin(streams.in.read.bind(streams.in)), + new ConsoleStdout(streams.out.write.bind(streams.out)), + new ConsoleStdout(streams.err.write.bind(streams.err)), + tmpDir, + sysrootDir, + rootDir + ]; + return new WASI(args, env, descriptors, { debug: false }); } diff --git a/packages/rust-runtime/src/index.ts b/packages/rust-runtime/src/index.ts index 1de29211..dd955d7d 100644 --- a/packages/rust-runtime/src/index.ts +++ b/packages/rust-runtime/src/index.ts @@ -1,3 +1,3 @@ -export * from "./rust-program.js"; -export * from "./rust-test-program.js"; -export * from "./create-wasi.js"; +export * from './rust-program.js'; +export * from './rust-test-program.js'; +export * from './create-wasi.js'; diff --git a/packages/rust-runtime/src/rust-program.ts b/packages/rust-runtime/src/rust-program.ts index cdca1a9f..4c069da6 100644 --- a/packages/rust-runtime/src/rust-program.ts +++ b/packages/rust-runtime/src/rust-program.ts @@ -1,57 +1,57 @@ -import type { OpenDirectory, WASI } from "@bjorn3/browser_wasi_shim"; -import type { Program } from "libs/compiler"; -import { inContext, type Context } from "libs/context"; -import { isErr } from "libs/result"; -import { assertOpenDir, lookupFile } from "libs/wasi"; +import type { OpenDirectory, WASI } from '@bjorn3/browser_wasi_shim'; +import type { Program } from 'libs/compiler'; +import { inContext, type Context } from 'libs/context'; +import { isErr } from 'libs/result'; +import { assertOpenDir, lookupFile } from 'libs/wasi'; // TODO: extract common code with RustTestProgram export class RustProgram implements Program { - protected threads_count = 1; + protected threads_count = 1; - constructor( - protected readonly code: string, - protected readonly wasi: WASI, - protected readonly miriModule: WebAssembly.Module, - ) {} + constructor( + protected readonly code: string, + protected readonly wasi: WASI, + protected readonly miriModule: WebAssembly.Module + ) {} - async run(ctx: Context): Promise { - this.threads_count = 1; - this.writeCaseExecutionCode(this.code); - const instance = await inContext( - ctx, - WebAssembly.instantiate(this.miriModule, { - env: { - memory: new WebAssembly.Memory({ initial: 256, shared: false }), - }, - wasi: { - "thread-spawn": (start_arg: unknown) => { - let id = this.threads_count++; - // @ts-ignore - instance.exports.wasi_thread_start(id, start_arg); - return id; - }, - }, - wasi_snapshot_preview1: this.wasi.wasiImport, - }), - ); - // @ts-expect-error lack of type information - const exitCode = this.wasi.start(instance); - if (exitCode !== 0) { - throw new Error(`Code execution failed with exit code ${exitCode}`); - } - } + async run(ctx: Context): Promise { + this.threads_count = 1; + this.writeCaseExecutionCode(this.code); + const instance = await inContext( + ctx, + WebAssembly.instantiate(this.miriModule, { + env: { + memory: new WebAssembly.Memory({ initial: 256, shared: false }) + }, + wasi: { + 'thread-spawn': (start_arg: unknown) => { + let id = this.threads_count++; + // @ts-ignore + instance.exports.wasi_thread_start(id, start_arg); + return id; + } + }, + wasi_snapshot_preview1: this.wasi.wasiImport + }) + ); + // @ts-expect-error lack of type information + const exitCode = this.wasi.start(instance); + if (exitCode !== 0) { + throw new Error(`Code execution failed with exit code ${exitCode}`); + } + } - protected get rootDir(): OpenDirectory { - const dir = this.wasi.fds[5]; - assertOpenDir(dir); - return dir; - } + protected get rootDir(): OpenDirectory { + const dir = this.wasi.fds[5]; + assertOpenDir(dir); + return dir; + } - protected writeCaseExecutionCode(code: string) { - const file = lookupFile(this.rootDir, "main.rs"); - if (isErr(file)) { - throw new Error(`Failed to read main file: ${file.error}`); - } - file.value.data = new TextEncoder().encode(code); - } + protected writeCaseExecutionCode(code: string) { + const file = lookupFile(this.rootDir, 'main.rs'); + if (isErr(file)) { + throw new Error(`Failed to read main file: ${file.error}`); + } + file.value.data = new TextEncoder().encode(code); + } } diff --git a/packages/rust-runtime/src/rust-test-program.ts b/packages/rust-runtime/src/rust-test-program.ts index 8101417b..6a9f6146 100644 --- a/packages/rust-runtime/src/rust-test-program.ts +++ b/packages/rust-runtime/src/rust-test-program.ts @@ -1,84 +1,84 @@ -import { Fd, WASI, OpenDirectory, File } from "@bjorn3/browser_wasi_shim"; -import type { TestProgram } from "libs/testing"; -import { inContext, type Context } from "libs/context"; -import { isErr } from "libs/result"; -import { assertOpenDir, lookupFile } from "libs/wasi"; +import { Fd, WASI, OpenDirectory, File } from '@bjorn3/browser_wasi_shim'; +import type { TestProgram } from 'libs/testing'; +import { inContext, type Context } from 'libs/context'; +import { isErr } from 'libs/result'; +import { assertOpenDir, lookupFile } from 'libs/wasi'; export abstract class RustTestProgram implements TestProgram { - protected threads_count = 1; - - constructor( - protected readonly code: string, - protected readonly wasi: WASI, - protected readonly miriModule: WebAssembly.Module, - protected readonly outputPath: string, - ) {} - - async run(ctx: Context, input: I): Promise { - this.threads_count = 1; - this.writeCaseExecutionCode(this.generateCaseExecutionCode(input)); - const instance = await inContext( - ctx, - WebAssembly.instantiate(this.miriModule, { - env: { - memory: new WebAssembly.Memory({ initial: 256, shared: false }), - }, - wasi: { - "thread-spawn": (start_arg: unknown) => { - let id = this.threads_count++; - // @ts-ignore - instance.exports.wasi_thread_start(id, start_arg); - return id; - }, - }, - wasi_snapshot_preview1: this.wasi.wasiImport, - }), - ); - // @ts-expect-error lack of type information - const exitCode = this.wasi.start(instance); - if (exitCode !== 0) { - throw new Error(`Code execution failed with exit code ${exitCode}`); - } - return this.readResult(); - } - - protected get stdin(): Fd { - return this.wasi.fds[0]; - } - - protected get stdout(): Fd { - return this.wasi.fds[1]; - } - - protected get stderr(): Fd { - return this.wasi.fds[2]; - } - - protected get tmpDir(): OpenDirectory { - const dir = this.wasi.fds[3]; - assertOpenDir(dir); - return dir; - } - - protected get sysroot(): OpenDirectory { - const dir = this.wasi.fds[4]; - assertOpenDir(dir); - return dir; - } - - protected get rootDir(): OpenDirectory { - const dir = this.wasi.fds[5]; - assertOpenDir(dir); - return dir; - } - - /** - * Should generate a code that produces a variable `output_content: &[u8]` - */ - protected abstract generateOutputContentCode(input: I): string; - - protected generateCaseExecutionCode(input: I): string { - return `${this.code} + protected threads_count = 1; + + constructor( + protected readonly code: string, + protected readonly wasi: WASI, + protected readonly miriModule: WebAssembly.Module, + protected readonly outputPath: string + ) {} + + async run(ctx: Context, input: I): Promise { + this.threads_count = 1; + this.writeCaseExecutionCode(this.generateCaseExecutionCode(input)); + const instance = await inContext( + ctx, + WebAssembly.instantiate(this.miriModule, { + env: { + memory: new WebAssembly.Memory({ initial: 256, shared: false }) + }, + wasi: { + 'thread-spawn': (start_arg: unknown) => { + let id = this.threads_count++; + // @ts-ignore + instance.exports.wasi_thread_start(id, start_arg); + return id; + } + }, + wasi_snapshot_preview1: this.wasi.wasiImport + }) + ); + // @ts-expect-error lack of type information + const exitCode = this.wasi.start(instance); + if (exitCode !== 0) { + throw new Error(`Code execution failed with exit code ${exitCode}`); + } + return this.readResult(); + } + + protected get stdin(): Fd { + return this.wasi.fds[0]; + } + + protected get stdout(): Fd { + return this.wasi.fds[1]; + } + + protected get stderr(): Fd { + return this.wasi.fds[2]; + } + + protected get tmpDir(): OpenDirectory { + const dir = this.wasi.fds[3]; + assertOpenDir(dir); + return dir; + } + + protected get sysroot(): OpenDirectory { + const dir = this.wasi.fds[4]; + assertOpenDir(dir); + return dir; + } + + protected get rootDir(): OpenDirectory { + const dir = this.wasi.fds[5]; + assertOpenDir(dir); + return dir; + } + + /** + * Should generate a code that produces a variable `output_content: &[u8]` + */ + protected abstract generateOutputContentCode(input: I): string; + + protected generateCaseExecutionCode(input: I): string { + return `${this.code} fn main() -> Result<(), Box> { ${this.generateOutputContentCode(input)} @@ -88,33 +88,33 @@ fn main() -> Result<(), Box> { Ok(()) } `; - } - - protected writeCaseExecutionCode(code: string) { - const file = lookupFile(this.rootDir, "main.rs"); - if (isErr(file)) { - throw new Error(`Failed to read main file: ${file.error}`); - } - file.value.data = new TextEncoder().encode(code); - } - - protected abstract transformResult(data: string): O; - - protected readOutputFile(): File { - const file = lookupFile(this.rootDir, this.outputPath); - if (isErr(file)) { - throw new Error(`Failed to read output file: ${file.error}`); - } - return file.value; - } - - protected decodeFileContent(file: File): string { - return new TextDecoder("utf-8").decode(file.data); - } - - protected readResult(): O { - const file = this.readOutputFile(); - const content = this.decodeFileContent(file); - return this.transformResult(content); - } + } + + protected writeCaseExecutionCode(code: string) { + const file = lookupFile(this.rootDir, 'main.rs'); + if (isErr(file)) { + throw new Error(`Failed to read main file: ${file.error}`); + } + file.value.data = new TextEncoder().encode(code); + } + + protected abstract transformResult(data: string): O; + + protected readOutputFile(): File { + const file = lookupFile(this.rootDir, this.outputPath); + if (isErr(file)) { + throw new Error(`Failed to read output file: ${file.error}`); + } + return file.value; + } + + protected decodeFileContent(file: File): string { + return new TextDecoder('utf-8').decode(file.data); + } + + protected readResult(): O { + const file = this.readOutputFile(); + const content = this.decodeFileContent(file); + return this.transformResult(content); + } } diff --git a/packages/rust-runtime/src/version.ts b/packages/rust-runtime/src/version.ts index b5589e7e..e69def9b 100644 --- a/packages/rust-runtime/src/version.ts +++ b/packages/rust-runtime/src/version.ts @@ -1 +1 @@ -export const version = "1.76.0"; +export const version = '1.76.0'; diff --git a/packages/rust-runtime/tsconfig.json b/packages/rust-runtime/tsconfig.json index 5366bc2f..0a0d6535 100644 --- a/packages/rust-runtime/tsconfig.json +++ b/packages/rust-runtime/tsconfig.json @@ -1,16 +1,10 @@ { - "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", - "compilerOptions": { - "lib": [ - "ES2022", - "ESNext.Disposable", - "DOM" - ], - "noUncheckedIndexedAccess": false, - "rootDir": "src", - "types": ["vite/client"] - }, - "include": [ - "src/**/*" - ], -} \ No newline at end of file + "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", + "compilerOptions": { + "lib": ["ES2022", "ESNext.Disposable", "DOM"], + "noUncheckedIndexedAccess": false, + "rootDir": "src", + "types": ["vite/client"] + }, + "include": ["src/**/*"] +} diff --git a/packages/rust-runtime/vite.config.js b/packages/rust-runtime/vite.config.js index 5b18c7a6..27795f73 100644 --- a/packages/rust-runtime/vite.config.js +++ b/packages/rust-runtime/vite.config.js @@ -1,32 +1,32 @@ -import { resolve } from "path"; -import { defineConfig } from "vite"; -import dts from "vite-plugin-dts"; +import { resolve } from 'path'; +import { defineConfig } from 'vite'; +import dts from 'vite-plugin-dts'; export default defineConfig({ - build: { - lib: { - // Could also be a dictionary or array of multiple entry points - entry: { - index: resolve(__dirname, "src/index.ts"), - version: resolve(__dirname, "src/version.ts"), - }, - formats: ["es"], - // name: "MyLib", - // the proper extensions will be added - // fileName: "index", - }, - rollupOptions: { - // make sure to externalize deps that shouldn't be bundled - // into your library - external: [/^libs\//, "@bjorn3/browser_wasi_shim"], - output: { - // Provide global variables to use in the UMD build - // for externalized deps - globals: { - // vue: "Vue", - }, - }, - }, - }, - plugins: [dts()], + build: { + lib: { + // Could also be a dictionary or array of multiple entry points + entry: { + index: resolve(import.meta.dirname, 'src/index.ts'), + version: resolve(import.meta.dirname, 'src/version.ts') + }, + formats: ['es'] + // name: "MyLib", + // the proper extensions will be added + // fileName: "index", + }, + rollupOptions: { + // make sure to externalize deps that shouldn't be bundled + // into your library + external: [/^libs\//, '@bjorn3/browser_wasi_shim'], + output: { + // Provide global variables to use in the UMD build + // for externalized deps + globals: { + // vue: "Vue", + } + } + } + }, + plugins: [dts()] }); diff --git a/packages/typescript-runtime/package.json b/packages/typescript-runtime/package.json index 3c8d1df9..6a0a41f2 100644 --- a/packages/typescript-runtime/package.json +++ b/packages/typescript-runtime/package.json @@ -1,19 +1,21 @@ { - "name": "typescript-runtime", - "version": "1.0.0", - "description": "", - "type": "module", - "scripts": { - "build": "tsc", - "dev": "tsc --watch" - }, - "author": "Krasilnikov Roman", - "license": "ISC", - "exports": { - ".": "./dist/index.js", - "./version": "./dist/version.js" - }, - "dependencies": { - "typescript": "6.0.3" - } -} \ No newline at end of file + "name": "typescript-runtime", + "version": "1.0.0", + "description": "", + "license": "ISC", + "author": "Krasilnikov Roman", + "type": "module", + "exports": { + ".": "./dist/index.js", + "./version": "./dist/version.js" + }, + "scripts": { + "build": "tsc", + "dev": "tsc --watch", + "format": "oxfmt", + "format:check": "oxfmt --check ." + }, + "dependencies": { + "typescript": "6.0.3" + } +} diff --git a/packages/typescript-runtime/src/index.ts b/packages/typescript-runtime/src/index.ts index 71892447..bf2322b4 100644 --- a/packages/typescript-runtime/src/index.ts +++ b/packages/typescript-runtime/src/index.ts @@ -1,2 +1,2 @@ -export * from "./ts-module-compiler.js"; -export * from "./version.js"; +export * from './ts-module-compiler.js'; +export * from './version.js'; diff --git a/packages/typescript-runtime/src/ts-module-compiler.ts b/packages/typescript-runtime/src/ts-module-compiler.ts index 1822fd95..75893c2c 100644 --- a/packages/typescript-runtime/src/ts-module-compiler.ts +++ b/packages/typescript-runtime/src/ts-module-compiler.ts @@ -1,10 +1,10 @@ -import { transpile, ScriptTarget } from "typescript"; +import { transpile, ScriptTarget } from 'typescript'; export function compileTsModule(code: string) { - return transpile(code, { - target: ScriptTarget.ES2022, - strict: true, - strictBindCallApply: true, - strictFunctionTypes: true, - }); + return transpile(code, { + target: ScriptTarget.ES2022, + strict: true, + strictBindCallApply: true, + strictFunctionTypes: true + }); } diff --git a/packages/typescript-runtime/src/version.ts b/packages/typescript-runtime/src/version.ts index 68607c81..e9238bae 100644 --- a/packages/typescript-runtime/src/version.ts +++ b/packages/typescript-runtime/src/version.ts @@ -1,3 +1,3 @@ -import pkg from "../package.json" with { type: "json" } +import pkg from '../package.json' with { type: 'json' }; -export const version = pkg.dependencies['typescript'] +export const version = pkg.dependencies['typescript']; diff --git a/packages/typescript-runtime/tsconfig.json b/packages/typescript-runtime/tsconfig.json index c9da992e..951fa9f7 100644 --- a/packages/typescript-runtime/tsconfig.json +++ b/packages/typescript-runtime/tsconfig.json @@ -1,14 +1,10 @@ { - "extends": "@total-typescript/tsconfig/tsc/dom/library-monorepo", - "compilerOptions": { - "outDir": "dist", - "rootDir": "src", - "lib": [ - "ES2022", - "ESNext.Disposable", - "DOM" - ], - "noUncheckedIndexedAccess": false, - "resolveJsonModule": true, - }, -} \ No newline at end of file + "extends": "@total-typescript/tsconfig/tsc/dom/library-monorepo", + "compilerOptions": { + "outDir": "dist", + "rootDir": "src", + "lib": ["ES2022", "ESNext.Disposable", "DOM"], + "noUncheckedIndexedAccess": false, + "resolveJsonModule": true + } +} diff --git a/packages/zig-runtime/package.json b/packages/zig-runtime/package.json index 5e2b2f18..df04b742 100644 --- a/packages/zig-runtime/package.json +++ b/packages/zig-runtime/package.json @@ -1,28 +1,30 @@ { - "name": "zig-runtime", - "private": true, - "version": "1.0.0", - "type": "module", - "scripts": { - "check": "tsc", - "prebuild": "./artifacts.sh", - "build": "vite build" - }, - "peerDependencies": { - "@bjorn3/browser_wasi_shim": "^0.4.0" - }, - "dependencies": { - "libs": "workspace:*" - }, - "devDependencies": { - "@bjorn3/browser_wasi_shim": "catalog:", - "vite": "catalog:", - "vite-plugin-dts": "catalog:" - }, - "exports": { - ".": "./dist/index.js", - "./version": "./dist/version.js", - "./zig.wasm": "./dist/zig/bin/zig.wasm", - "./lib/*": "./dist/zig/*" - } -} \ No newline at end of file + "name": "zig-runtime", + "version": "1.0.0", + "private": true, + "type": "module", + "exports": { + ".": "./dist/index.js", + "./version": "./dist/version.js", + "./zig.wasm": "./dist/zig/bin/zig.wasm", + "./lib/*": "./dist/zig/*" + }, + "scripts": { + "check": "tsc", + "prebuild": "./artifacts.sh", + "build": "vite build", + "format": "oxfmt", + "format:check": "oxfmt --check ." + }, + "dependencies": { + "libs": "workspace:*" + }, + "devDependencies": { + "@bjorn3/browser_wasi_shim": "catalog:", + "vite": "catalog:", + "vite-plugin-dts": "catalog:" + }, + "peerDependencies": { + "@bjorn3/browser_wasi_shim": "^0.4.0" + } +} diff --git a/packages/zig-runtime/src/create-wasi.ts b/packages/zig-runtime/src/create-wasi.ts index 40b6641c..1b5fc081 100644 --- a/packages/zig-runtime/src/create-wasi.ts +++ b/packages/zig-runtime/src/create-wasi.ts @@ -1,99 +1,99 @@ import { - ConsoleStdout, - Inode, - PreopenDirectory, - WASI, - File, - Directory, -} from "@bjorn3/browser_wasi_shim"; -import type { Streams } from "libs/io"; -import { Stdin } from "libs/wasi"; + ConsoleStdout, + Inode, + PreopenDirectory, + WASI, + File, + Directory +} from '@bjorn3/browser_wasi_shim'; +import type { Streams } from 'libs/io'; +import { Stdin } from 'libs/wasi'; interface FileData { - path: string[]; - data: Uint8Array; + path: string[]; + data: Uint8Array; } function convert(files: FileData[], i = 0): Directory { - const data = new Map(); - while (files.length > 0) { - const toConvert: FileData[] = []; - let wIndex = 0; - let key: string | undefined = undefined; - for (let rIndex = 0; rIndex < files.length; rIndex++) { - const f = files[rIndex]; - if (f.path.length <= i) { - throw new Error(`Path too short at index ${i}: ${f.path}`); - } else if (f.path.length - 1 === i) { - data.set(f.path[i], new File(f.data)); - } else if (key === undefined) { - key = f.path[i]; - toConvert.push(f); - } else if (f.path[i] === key) { - toConvert.push(f); - } else { - files[wIndex++] = files[rIndex]; - } - } - files.length = wIndex; - if (toConvert.length > 0) { - data.set(key!, convert(toConvert, i + 1)); - } - } - return new Directory(data); + const data = new Map(); + while (files.length > 0) { + const toConvert: FileData[] = []; + let wIndex = 0; + let key: string | undefined = undefined; + for (let rIndex = 0; rIndex < files.length; rIndex++) { + const f = files[rIndex]; + if (f.path.length <= i) { + throw new Error(`Path too short at index ${i}: ${f.path}`); + } else if (f.path.length - 1 === i) { + data.set(f.path[i], new File(f.data)); + } else if (key === undefined) { + key = f.path[i]; + toConvert.push(f); + } else if (f.path[i] === key) { + toConvert.push(f); + } else { + files[wIndex++] = files[rIndex]; + } + } + files.length = wIndex; + if (toConvert.length > 0) { + data.set(key!, convert(toConvert, i + 1)); + } + } + return new Directory(data); } const compilerArgs = [ - "zig.wasm", - "build-exe", - "main.zig", - "libcompiler_rt.a", - "-fno-compiler-rt", // manually linked because the self hosted webassembly backend cannot compile it by itself - "-fno-entry", // prevent the native webassembly backend from adding a start function to the module + 'zig.wasm', + 'build-exe', + 'main.zig', + 'libcompiler_rt.a', + '-fno-compiler-rt', // manually linked because the self hosted webassembly backend cannot compile it by itself + '-fno-entry' // prevent the native webassembly backend from adding a start function to the module ]; const compilerEnv: string[] = []; -const LIB_PREFIX = "lib/"; +const LIB_PREFIX = 'lib/'; export function createCompilerWASI( - streams: Streams, - libCompilerRt: ArrayBuffer, - stdLibFiles: { - filename: string; - fileData: Uint8Array; - }[], + streams: Streams, + libCompilerRt: ArrayBuffer, + stdLibFiles: { + filename: string; + fileData: Uint8Array; + }[] ) { - const files: FileData[] = []; - for (const f of stdLibFiles) { - if (!f.filename.startsWith(LIB_PREFIX)) { - continue; - } - const path = f.filename.slice(LIB_PREFIX.length).split("/"); - files.push({ path, data: f.fileData }); - } - const descriptors = [ - new Stdin(streams.in.read.bind(streams.in)), - new ConsoleStdout(streams.out.write.bind(streams.out)), - new ConsoleStdout(streams.err.write.bind(streams.err)), - new PreopenDirectory( - ".", - new Map([ - ["main.zig", new File([])], - ["libcompiler_rt.a", new File(libCompilerRt)], - ]), - ), - new PreopenDirectory("/lib", convert(files).contents), - new PreopenDirectory("/cache", new Map()), - ]; - return new WASI(compilerArgs, compilerEnv, descriptors, { debug: false }); + const files: FileData[] = []; + for (const f of stdLibFiles) { + if (!f.filename.startsWith(LIB_PREFIX)) { + continue; + } + const path = f.filename.slice(LIB_PREFIX.length).split('/'); + files.push({ path, data: f.fileData }); + } + const descriptors = [ + new Stdin(streams.in.read.bind(streams.in)), + new ConsoleStdout(streams.out.write.bind(streams.out)), + new ConsoleStdout(streams.err.write.bind(streams.err)), + new PreopenDirectory( + '.', + new Map([ + ['main.zig', new File([])], + ['libcompiler_rt.a', new File(libCompilerRt)] + ]) + ), + new PreopenDirectory('/lib', convert(files).contents), + new PreopenDirectory('/cache', new Map()) + ]; + return new WASI(compilerArgs, compilerEnv, descriptors, { debug: false }); } -const programArgs = ["main.wasm"]; +const programArgs = ['main.wasm']; const programEnv: string[] = []; export function createProgramWASI(streams: Streams) { - const descriptors = [ - new Stdin(streams.in.read.bind(streams.in)), - new ConsoleStdout(streams.out.write.bind(streams.out)), - new ConsoleStdout(streams.err.write.bind(streams.err)), - new PreopenDirectory(".", new Map()), - ]; - return new WASI(programArgs, programEnv, descriptors, { debug: false }); + const descriptors = [ + new Stdin(streams.in.read.bind(streams.in)), + new ConsoleStdout(streams.out.write.bind(streams.out)), + new ConsoleStdout(streams.err.write.bind(streams.err)), + new PreopenDirectory('.', new Map()) + ]; + return new WASI(programArgs, programEnv, descriptors, { debug: false }); } diff --git a/packages/zig-runtime/src/index.ts b/packages/zig-runtime/src/index.ts index 26a727d4..0a6e5ed3 100644 --- a/packages/zig-runtime/src/index.ts +++ b/packages/zig-runtime/src/index.ts @@ -1,3 +1,3 @@ -export * from "./create-wasi.js"; -export * from "./zig-compiler.js"; -export * from "./zig-program.js"; +export * from './create-wasi.js'; +export * from './zig-compiler.js'; +export * from './zig-program.js'; diff --git a/packages/zig-runtime/src/version.ts b/packages/zig-runtime/src/version.ts index 5314a97f..b7190d27 100644 --- a/packages/zig-runtime/src/version.ts +++ b/packages/zig-runtime/src/version.ts @@ -1 +1 @@ -export const version = "0.16.0"; +export const version = '0.16.0'; diff --git a/packages/zig-runtime/src/zig-compiler.ts b/packages/zig-runtime/src/zig-compiler.ts index e00d5bdb..14a62665 100644 --- a/packages/zig-runtime/src/zig-compiler.ts +++ b/packages/zig-runtime/src/zig-compiler.ts @@ -1,51 +1,51 @@ -import type { OpenDirectory, WASI } from "@bjorn3/browser_wasi_shim"; -import { inContext, type Context } from "libs/context"; -import { isErr } from "libs/result"; -import { assertOpenDir, lookupFile } from "libs/wasi"; +import type { OpenDirectory, WASI } from '@bjorn3/browser_wasi_shim'; +import { inContext, type Context } from 'libs/context'; +import { isErr } from 'libs/result'; +import { assertOpenDir, lookupFile } from 'libs/wasi'; export class ZigCompiler { - protected textEncoder = new TextEncoder(); + protected textEncoder = new TextEncoder(); - constructor( - protected readonly wasi: WASI, - protected readonly zigModule: WebAssembly.Module, - ) {} + constructor( + protected readonly wasi: WASI, + protected readonly zigModule: WebAssembly.Module + ) {} - async compile(ctx: Context, source: string) { - this.writeSourceCode(source); - const instance = await inContext( - ctx, - WebAssembly.instantiate(this.zigModule, { - wasi_snapshot_preview1: this.wasi.wasiImport, - }), - ); - // @ts-expect-error lack of type information - const exitCode = this.wasi.start(instance); - if (exitCode !== 0) { - throw new Error(`Code execution failed with exit code ${exitCode}`); - } - return this.getWasmFile().data; - } + async compile(ctx: Context, source: string) { + this.writeSourceCode(source); + const instance = await inContext( + ctx, + WebAssembly.instantiate(this.zigModule, { + wasi_snapshot_preview1: this.wasi.wasiImport + }) + ); + // @ts-expect-error lack of type information + const exitCode = this.wasi.start(instance); + if (exitCode !== 0) { + throw new Error(`Code execution failed with exit code ${exitCode}`); + } + return this.getWasmFile().data; + } - protected get rootDir(): OpenDirectory { - const dir = this.wasi.fds[3]; - assertOpenDir(dir); - return dir; - } + protected get rootDir(): OpenDirectory { + const dir = this.wasi.fds[3]; + assertOpenDir(dir); + return dir; + } - protected writeSourceCode(code: string) { - const file = lookupFile(this.rootDir, "main.zig"); - if (isErr(file)) { - throw new Error(`Failed to read main file: ${file.error}`); - } - file.value.data = this.textEncoder.encode(code); - } + protected writeSourceCode(code: string) { + const file = lookupFile(this.rootDir, 'main.zig'); + if (isErr(file)) { + throw new Error(`Failed to read main file: ${file.error}`); + } + file.value.data = this.textEncoder.encode(code); + } - protected getWasmFile() { - const file = lookupFile(this.rootDir, "main.wasm"); - if (isErr(file)) { - throw new Error(`Failed to read compiled file: ${file.error}`); - } - return file.value; - } + protected getWasmFile() { + const file = lookupFile(this.rootDir, 'main.wasm'); + if (isErr(file)) { + throw new Error(`Failed to read compiled file: ${file.error}`); + } + return file.value; + } } diff --git a/packages/zig-runtime/src/zig-program.ts b/packages/zig-runtime/src/zig-program.ts index 4da5d8b2..daf5b9ca 100644 --- a/packages/zig-runtime/src/zig-program.ts +++ b/packages/zig-runtime/src/zig-program.ts @@ -1,24 +1,24 @@ -import type { WASI } from "@bjorn3/browser_wasi_shim"; -import type { Program } from "libs/compiler"; -import { inContext, type Context } from "libs/context"; +import type { WASI } from '@bjorn3/browser_wasi_shim'; +import type { Program } from 'libs/compiler'; +import { inContext, type Context } from 'libs/context'; export class ZigProgram implements Program { - constructor( - protected readonly wasi: WASI, - protected readonly programModule: BufferSource, - ) {} + constructor( + protected readonly wasi: WASI, + protected readonly programModule: BufferSource + ) {} - async run(ctx: Context): Promise { - const { instance } = await inContext( - ctx, - WebAssembly.instantiate(this.programModule, { - wasi_snapshot_preview1: this.wasi.wasiImport, - }), - ); - // @ts-expect-error lack of type information - const exitCode = this.wasi.start(instance); - if (exitCode !== 0) { - throw new Error(`Code execution failed with exit code ${exitCode}`); - } - } + async run(ctx: Context): Promise { + const { instance } = await inContext( + ctx, + WebAssembly.instantiate(this.programModule, { + wasi_snapshot_preview1: this.wasi.wasiImport + }) + ); + // @ts-expect-error lack of type information + const exitCode = this.wasi.start(instance); + if (exitCode !== 0) { + throw new Error(`Code execution failed with exit code ${exitCode}`); + } + } } diff --git a/packages/zig-runtime/tsconfig.json b/packages/zig-runtime/tsconfig.json index 5366bc2f..0a0d6535 100644 --- a/packages/zig-runtime/tsconfig.json +++ b/packages/zig-runtime/tsconfig.json @@ -1,16 +1,10 @@ { - "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", - "compilerOptions": { - "lib": [ - "ES2022", - "ESNext.Disposable", - "DOM" - ], - "noUncheckedIndexedAccess": false, - "rootDir": "src", - "types": ["vite/client"] - }, - "include": [ - "src/**/*" - ], -} \ No newline at end of file + "extends": "@total-typescript/tsconfig/bundler/dom/library-monorepo", + "compilerOptions": { + "lib": ["ES2022", "ESNext.Disposable", "DOM"], + "noUncheckedIndexedAccess": false, + "rootDir": "src", + "types": ["vite/client"] + }, + "include": ["src/**/*"] +} diff --git a/packages/zig-runtime/vite.config.js b/packages/zig-runtime/vite.config.js index 5b18c7a6..27795f73 100644 --- a/packages/zig-runtime/vite.config.js +++ b/packages/zig-runtime/vite.config.js @@ -1,32 +1,32 @@ -import { resolve } from "path"; -import { defineConfig } from "vite"; -import dts from "vite-plugin-dts"; +import { resolve } from 'path'; +import { defineConfig } from 'vite'; +import dts from 'vite-plugin-dts'; export default defineConfig({ - build: { - lib: { - // Could also be a dictionary or array of multiple entry points - entry: { - index: resolve(__dirname, "src/index.ts"), - version: resolve(__dirname, "src/version.ts"), - }, - formats: ["es"], - // name: "MyLib", - // the proper extensions will be added - // fileName: "index", - }, - rollupOptions: { - // make sure to externalize deps that shouldn't be bundled - // into your library - external: [/^libs\//, "@bjorn3/browser_wasi_shim"], - output: { - // Provide global variables to use in the UMD build - // for externalized deps - globals: { - // vue: "Vue", - }, - }, - }, - }, - plugins: [dts()], + build: { + lib: { + // Could also be a dictionary or array of multiple entry points + entry: { + index: resolve(import.meta.dirname, 'src/index.ts'), + version: resolve(import.meta.dirname, 'src/version.ts') + }, + formats: ['es'] + // name: "MyLib", + // the proper extensions will be added + // fileName: "index", + }, + rollupOptions: { + // make sure to externalize deps that shouldn't be bundled + // into your library + external: [/^libs\//, '@bjorn3/browser_wasi_shim'], + output: { + // Provide global variables to use in the UMD build + // for externalized deps + globals: { + // vue: "Vue", + } + } + } + }, + plugins: [dts()] }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b0f29a0e..6f600a27 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,17 +10,17 @@ catalogs: specifier: ^0.4.2 version: 0.4.2 vite: - specifier: ^8.0.10 - version: 8.0.10 + specifier: ^8.2.2 + version: 8.2.2 vite-plugin-dts: - specifier: ^4.5.4 - version: 4.5.4 + specifier: ^5.0.3 + version: 5.0.3 vite-plugin-static-copy: - specifier: ^4.1.0 - version: 4.1.0 + specifier: ^4.1.1 + version: 4.1.1 vitest: - specifier: ^4.1.5 - version: 4.1.5 + specifier: ^4.1.11 + version: 4.1.11 patchedDependencies: browserfs@1.4.3: @@ -37,21 +37,27 @@ importers: '@total-typescript/tsconfig': specifier: ^1.0.4 version: 1.0.4 + '@typescript/typescript6': + specifier: ^6.0.2 + version: 6.0.2 only-allow: specifier: ^1.2.2 version: 1.2.2 + oxfmt: + specifier: ^0.64.0 + version: 0.64.0(svelte@5.56.10(@typescript-eslint/types@8.67.0)) turbo: - specifier: ^2.9.6 - version: 2.9.6 + specifier: ^2.10.11 + version: 2.10.11 typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.3 + version: 6.0.3 apps/ppp: dependencies: '@andrewbranch/untar.js': - specifier: ^1.0.3 - version: 1.0.3 + specifier: ^1.0.4 + version: 1.0.4 '@xterm/addon-fit': specifier: ^0.11.0 version: 0.11.0 @@ -80,20 +86,20 @@ importers: specifier: workspace:* version: link:../../packages/libs marked: - specifier: ^18.0.2 - version: 18.0.2 + specifier: ^18.0.10 + version: 18.0.10 monaco-editor: - specifier: ^0.55.1 - version: 0.55.1 + specifier: ^0.56.0 + version: 0.56.0 monaco-editor-textmate: specifier: ^4.0.0 - version: 4.0.0(monaco-editor@0.55.1)(monaco-textmate@3.0.1(onigasm@2.2.5)) + version: 4.0.0(monaco-editor@0.56.0)(monaco-textmate@3.0.1(onigasm@2.2.5)) monaco-textmate: specifier: ^3.0.1 version: 3.0.1(onigasm@2.2.5) monaco-vim: specifier: ^0.4.4 - version: 0.4.4(monaco-editor@0.55.1) + version: 0.4.4(monaco-editor@0.56.0) onigasm: specifier: ^2.2.5 version: 2.2.5 @@ -117,104 +123,98 @@ importers: version: link:../../packages/zig-runtime devDependencies: '@eslint/compat': - specifier: ^2.0.5 - version: 2.0.5(eslint@10.2.1(jiti@2.6.1)) + specifier: ^2.1.0 + version: 2.1.0(eslint@10.9.0(jiti@2.7.0)) '@eslint/js': specifier: ^10.0.1 - version: 10.0.1(eslint@10.2.1(jiti@2.6.1)) + version: 10.0.1(eslint@10.9.0(jiti@2.7.0)) '@iconify-json/lucide': - specifier: ^1.2.103 - version: 1.2.103 + specifier: ^1.2.124 + version: 1.2.124 '@iconify-json/vscode-icons': - specifier: ^1.2.46 - version: 1.2.46 + specifier: ^1.2.74 + version: 1.2.74 '@inlang/paraglide-js': - specifier: ^2.16.1 - version: 2.16.1 + specifier: ^2.24.1 + version: 2.24.1(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) '@sveltejs/adapter-static': - specifier: ^3.0.10 - version: 3.0.10(@sveltejs/kit@2.58.0(@sveltejs/vite-plugin-svelte@7.0.0(svelte@5.55.5(@typescript-eslint/types@8.59.0))(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)))(svelte@5.55.5(@typescript-eslint/types@8.59.0))(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1))) + specifier: 4.0.0-next.4 + version: 4.0.0-next.4(@sveltejs/kit@3.0.0-next.25(@sveltejs/vite-plugin-svelte@7.3.0(svelte@5.56.10(@typescript-eslint/types@8.67.0))(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)))(svelte@5.56.10(@typescript-eslint/types@8.67.0))(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1))) '@sveltejs/kit': - specifier: ^2.58.0 - version: 2.58.0(@sveltejs/vite-plugin-svelte@7.0.0(svelte@5.55.5(@typescript-eslint/types@8.59.0))(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)))(svelte@5.55.5(@typescript-eslint/types@8.59.0))(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + specifier: 3.0.0-next.25 + version: 3.0.0-next.25(@sveltejs/vite-plugin-svelte@7.3.0(svelte@5.56.10(@typescript-eslint/types@8.67.0))(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)))(svelte@5.56.10(@typescript-eslint/types@8.67.0))(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) '@sveltejs/vite-plugin-svelte': - specifier: ^7.0.0 - version: 7.0.0(svelte@5.55.5(@typescript-eslint/types@8.59.0))(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + specifier: ^7.3.0 + version: 7.3.0(svelte@5.56.10(@typescript-eslint/types@8.67.0))(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) '@tailwindcss/typography': - specifier: ^0.5.19 - version: 0.5.19(tailwindcss@4.2.4) + specifier: ^0.5.20 + version: 0.5.20(tailwindcss@4.3.3) '@tailwindcss/vite': - specifier: ^4.2.4 - version: 4.2.4(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + specifier: ^4.3.3 + version: 4.3.3(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) '@types/color': specifier: ^4.2.1 version: 4.2.1 '@types/node': - specifier: ^24.12.2 - version: 24.12.2 + specifier: ^26.2.0 + version: 26.2.0 '@vitest/browser-playwright': - specifier: ^4.1.5 - version: 4.1.5(playwright@1.59.1)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1))(vitest@4.1.5) + specifier: ^4.1.11 + version: 4.1.11(playwright@1.62.1)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1))(vitest@4.1.11) daisyui: - specifier: ^5.5.19 - version: 5.5.19 + specifier: ^5.7.20 + version: 5.7.20 eslint: - specifier: ^10.2.1 - version: 10.2.1(jiti@2.6.1) + specifier: ^10.9.0 + version: 10.9.0(jiti@2.7.0) eslint-config-prettier: specifier: ^10.1.8 - version: 10.1.8(eslint@10.2.1(jiti@2.6.1)) + version: 10.1.8(eslint@10.9.0(jiti@2.7.0)) eslint-plugin-svelte: - specifier: ^3.17.1 - version: 3.17.1(eslint@10.2.1(jiti@2.6.1))(svelte@5.55.5(@typescript-eslint/types@8.59.0)) + specifier: ^3.23.0 + version: 3.23.0(eslint@10.9.0(jiti@2.7.0))(svelte@5.56.10(@typescript-eslint/types@8.67.0)) globals: - specifier: ^17.5.0 - version: 17.5.0 + specifier: ^17.11.0 + version: 17.11.0 + oxfmt: + specifier: ^0.64.0 + version: 0.64.0(svelte@5.56.10(@typescript-eslint/types@8.67.0)) playwright: - specifier: ^1.59.1 - version: 1.59.1 - prettier: - specifier: ^3.8.3 - version: 3.8.3 - prettier-plugin-svelte: - specifier: ^3.5.1 - version: 3.5.1(prettier@3.8.3)(svelte@5.55.5(@typescript-eslint/types@8.59.0)) - prettier-plugin-tailwindcss: - specifier: ^0.7.3 - version: 0.7.3(prettier-plugin-svelte@3.5.1(prettier@3.8.3)(svelte@5.55.5(@typescript-eslint/types@8.59.0)))(prettier@3.8.3) + specifier: ^1.62.1 + version: 1.62.1 svelte: - specifier: ^5.55.5 - version: 5.55.5(@typescript-eslint/types@8.59.0) + specifier: ^5.56.10 + version: 5.56.10(@typescript-eslint/types@8.67.0) svelte-check: - specifier: ^4.4.6 - version: 4.4.6(picomatch@4.0.4)(svelte@5.55.5(@typescript-eslint/types@8.59.0))(typescript@5.9.3) + specifier: ^4.7.6 + version: 4.7.6(picomatch@4.0.5)(svelte@5.56.10(@typescript-eslint/types@8.67.0))(typescript@6.0.3) tailwindcss: - specifier: ^4.2.4 - version: 4.2.4 + specifier: ^4.3.3 + version: 4.3.3 typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.3 + version: 6.0.3 typescript-eslint: - specifier: ^8.59.0 - version: 8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3) + specifier: ^8.67.0 + version: 8.67.0(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3) unplugin-icons: specifier: ^23.0.1 - version: 23.0.1(svelte@5.55.5(@typescript-eslint/types@8.59.0)) + version: 23.0.1(svelte@5.56.10(@typescript-eslint/types@8.67.0)) vite: specifier: 'catalog:' - version: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + version: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) vite-plugin-devtools-json: - specifier: ^1.0.0 - version: 1.0.0(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + specifier: ^1.1.0 + version: 1.1.0(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) vite-plugin-static-copy: - specifier: 'catalog:' - version: 4.1.0(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + specifier: 4.1.1 + version: 4.1.1(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) vitest: specifier: 'catalog:' - version: 4.1.5(@types/node@24.12.2)(@vitest/browser-playwright@4.1.5)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 4.1.11(@types/node@26.2.0)(@vitest/browser-playwright@4.1.11)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) vitest-browser-svelte: - specifier: ^2.1.1 - version: 2.1.1(svelte@5.55.5(@typescript-eslint/types@8.59.0))(vitest@4.1.5) + specifier: ^3.0.0 + version: 3.0.0(svelte@5.56.10(@typescript-eslint/types@8.67.0))(vitest@4.1.11) packages/dotnet-runtime: dependencies: @@ -224,13 +224,13 @@ importers: devDependencies: vite: specifier: 'catalog:' - version: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + version: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) vite-plugin-dts: specifier: 'catalog:' - version: 4.5.4(@types/node@24.12.2)(rollup@4.53.2)(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 5.0.3(@microsoft/api-extractor@7.54.0(@types/node@26.2.0))(esbuild@0.28.2)(rolldown@1.2.5)(rollup@4.53.2)(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) vite-plugin-static-copy: specifier: 'catalog:' - version: 4.1.0(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 4.1.1(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) packages/gleam-runtime: dependencies: @@ -240,13 +240,13 @@ importers: devDependencies: vite: specifier: 'catalog:' - version: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + version: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) vite-plugin-dts: specifier: 'catalog:' - version: 4.5.4(@types/node@24.12.2)(rollup@4.53.2)(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 5.0.3(@microsoft/api-extractor@7.54.0(@types/node@26.2.0))(esbuild@0.28.2)(rolldown@1.2.5)(rollup@4.53.2)(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) vite-plugin-static-copy: specifier: 'catalog:' - version: 4.1.0(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 4.1.1(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) packages/go-runtime: dependencies: @@ -259,10 +259,10 @@ importers: version: 1.15.2 vite: specifier: 'catalog:' - version: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + version: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) vite-plugin-dts: specifier: 'catalog:' - version: 4.5.4(@types/node@24.12.2)(rollup@4.53.2)(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 5.0.3(@microsoft/api-extractor@7.54.0(@types/node@26.2.0))(esbuild@0.28.2)(rolldown@1.2.5)(rollup@4.53.2)(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) packages/java-runtime: dependencies: @@ -277,8 +277,8 @@ importers: version: link:../libs devDependencies: esbuild: - specifier: ~0.28.0 - version: 0.28.0 + specifier: ~0.28.2 + version: 0.28.2 packages/javascript-runtime: dependencies: @@ -289,39 +289,39 @@ importers: packages/libs: devDependencies: '@bjorn3/browser_wasi_shim': - specifier: ^0.4.2 + specifier: 'catalog:' version: 0.4.2 '@types/node': - specifier: ^24.10.1 - version: 24.12.2 + specifier: ^26.2.0 + version: 26.2.0 vite: specifier: 'catalog:' - version: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + version: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) vitest: specifier: 'catalog:' - version: 4.1.5(@types/node@24.12.2)(@vitest/browser-playwright@4.1.5)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 4.1.11(@types/node@26.2.0)(@vitest/browser-playwright@4.1.11)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) packages/php-runtime: dependencies: '@php-wasm/universal': - specifier: ^3.1.20 - version: 3.1.20 + specifier: ^3.1.50 + version: 3.1.50 '@php-wasm/web-8-5': - specifier: ^3.1.20 - version: 3.1.20 + specifier: ^3.1.50 + version: 3.1.50 libs: specifier: workspace:* version: link:../libs devDependencies: vite: specifier: 'catalog:' - version: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + version: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) vite-plugin-dts: specifier: 'catalog:' - version: 4.5.4(@types/node@24.12.2)(rollup@4.53.2)(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 5.0.3(@microsoft/api-extractor@7.54.0(@types/node@26.2.0))(esbuild@0.28.2)(rolldown@1.2.5)(rollup@4.53.2)(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) vite-plugin-static-copy: specifier: 'catalog:' - version: 4.1.0(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 4.1.1(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) packages/python-runtime: dependencies: @@ -329,24 +329,24 @@ importers: specifier: workspace:* version: link:../libs pyodide: - specifier: ^0.29.3 - version: 0.29.3 + specifier: ^314.0.5 + version: 314.0.5 devDependencies: vite: specifier: 'catalog:' - version: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + version: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) vite-plugin-dts: specifier: 'catalog:' - version: 4.5.4(@types/node@24.12.2)(rollup@4.53.2)(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 5.0.3(@microsoft/api-extractor@7.54.0(@types/node@26.2.0))(esbuild@0.28.2)(rolldown@1.2.5)(rollup@4.53.2)(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) vite-plugin-static-copy: specifier: 'catalog:' - version: 4.1.0(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 4.1.1(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) packages/ruby-runtime: dependencies: '@ruby/wasm-wasi': - specifier: 2.9.3-2.9.4 - version: 2.9.3-2.9.4 + specifier: 2.10.1 + version: 2.10.1 libs: specifier: workspace:* version: link:../libs @@ -355,17 +355,17 @@ importers: specifier: 'catalog:' version: 0.4.2 '@ruby/4.0-wasm-wasi': - specifier: 2.9.3-2.9.4 - version: 2.9.3-2.9.4 + specifier: 2.10.1 + version: 2.10.1 vite: specifier: 'catalog:' - version: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + version: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) vite-plugin-dts: specifier: 'catalog:' - version: 4.5.4(@types/node@24.12.2)(rollup@4.53.2)(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 5.0.3(@microsoft/api-extractor@7.54.0(@types/node@26.2.0))(esbuild@0.28.2)(rolldown@1.2.5)(rollup@4.53.2)(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) vite-plugin-static-copy: specifier: 'catalog:' - version: 4.1.0(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 4.1.1(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) packages/rust-runtime: dependencies: @@ -378,10 +378,10 @@ importers: version: 0.4.2 vite: specifier: 'catalog:' - version: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + version: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) vite-plugin-dts: specifier: 'catalog:' - version: 4.5.4(@types/node@24.12.2)(rollup@4.53.2)(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 5.0.3(@microsoft/api-extractor@7.54.0(@types/node@26.2.0))(esbuild@0.28.2)(rolldown@1.2.5)(rollup@4.53.2)(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) packages/typescript-runtime: dependencies: @@ -400,209 +400,183 @@ importers: version: 0.4.2 vite: specifier: 'catalog:' - version: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + version: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) vite-plugin-dts: specifier: 'catalog:' - version: 4.5.4(@types/node@24.12.2)(rollup@4.53.2)(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + version: 5.0.3(@microsoft/api-extractor@7.54.0(@types/node@26.2.0))(esbuild@0.28.2)(rolldown@1.2.5)(rollup@4.53.2)(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) packages: - '@andrewbranch/untar.js@1.0.3': - resolution: {integrity: sha512-Jh15/qVmrLGhkKJBdXlK1+9tY4lZruYjsgkDFj08ZmDiWVBLJcqkok7Z0/R0In+i1rScBpJlSvrTS2Lm41Pbnw==} + '@andrewbranch/untar.js@1.0.4': + resolution: {integrity: sha512-pVXSwPsLuw8IGLo2Di0EaOfsk+ntVvpkk942J/sHYIkwvtKUakEcPh7HBgZ6tuimgzKSEHgCvO4XgQ05DEbwDw==} '@antfu/install-pkg@1.1.0': resolution: {integrity: sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ==} - '@babel/helper-string-parser@7.25.7': - resolution: {integrity: sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==} - engines: {node: '>=6.9.0'} - - '@babel/helper-validator-identifier@7.25.7': - resolution: {integrity: sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==} - engines: {node: '>=6.9.0'} - - '@babel/parser@7.25.8': - resolution: {integrity: sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==} - engines: {node: '>=6.0.0'} - hasBin: true - - '@babel/types@7.25.8': - resolution: {integrity: sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==} - engines: {node: '>=6.9.0'} - '@bjorn3/browser_wasi_shim@0.4.2': resolution: {integrity: sha512-/iHkCVUG3VbcbmEHn5iIUpIrh7a7WPiwZ3sHy4HZKZzBdSadwdddYDZAII2zBvQYV0Lfi8naZngPCN7WPHI/hA==} '@blazediff/core@1.9.1': resolution: {integrity: sha512-ehg3jIkYKulZh+8om/O25vkvSsXXwC+skXmyA87FFx6A/45eqOkZsBltMw/TVteb0mloiGT8oGRTcjRAz66zaA==} - '@emnapi/core@1.10.0': - resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==} - - '@emnapi/runtime@1.10.0': - resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==} - - '@emnapi/wasi-threads@1.2.1': - resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==} - - '@esbuild/aix-ppc64@0.28.0': - resolution: {integrity: sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==} + '@esbuild/aix-ppc64@0.28.2': + resolution: {integrity: sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] - '@esbuild/android-arm64@0.28.0': - resolution: {integrity: sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==} + '@esbuild/android-arm64@0.28.2': + resolution: {integrity: sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==} engines: {node: '>=18'} cpu: [arm64] os: [android] - '@esbuild/android-arm@0.28.0': - resolution: {integrity: sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==} + '@esbuild/android-arm@0.28.2': + resolution: {integrity: sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==} engines: {node: '>=18'} cpu: [arm] os: [android] - '@esbuild/android-x64@0.28.0': - resolution: {integrity: sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==} + '@esbuild/android-x64@0.28.2': + resolution: {integrity: sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==} engines: {node: '>=18'} cpu: [x64] os: [android] - '@esbuild/darwin-arm64@0.28.0': - resolution: {integrity: sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==} + '@esbuild/darwin-arm64@0.28.2': + resolution: {integrity: sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] - '@esbuild/darwin-x64@0.28.0': - resolution: {integrity: sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==} + '@esbuild/darwin-x64@0.28.2': + resolution: {integrity: sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==} engines: {node: '>=18'} cpu: [x64] os: [darwin] - '@esbuild/freebsd-arm64@0.28.0': - resolution: {integrity: sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==} + '@esbuild/freebsd-arm64@0.28.2': + resolution: {integrity: sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-x64@0.28.0': - resolution: {integrity: sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==} + '@esbuild/freebsd-x64@0.28.2': + resolution: {integrity: sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] - '@esbuild/linux-arm64@0.28.0': - resolution: {integrity: sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==} + '@esbuild/linux-arm64@0.28.2': + resolution: {integrity: sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==} engines: {node: '>=18'} cpu: [arm64] os: [linux] - '@esbuild/linux-arm@0.28.0': - resolution: {integrity: sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==} + '@esbuild/linux-arm@0.28.2': + resolution: {integrity: sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==} engines: {node: '>=18'} cpu: [arm] os: [linux] - '@esbuild/linux-ia32@0.28.0': - resolution: {integrity: sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==} + '@esbuild/linux-ia32@0.28.2': + resolution: {integrity: sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==} engines: {node: '>=18'} cpu: [ia32] os: [linux] - '@esbuild/linux-loong64@0.28.0': - resolution: {integrity: sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==} + '@esbuild/linux-loong64@0.28.2': + resolution: {integrity: sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==} engines: {node: '>=18'} cpu: [loong64] os: [linux] - '@esbuild/linux-mips64el@0.28.0': - resolution: {integrity: sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==} + '@esbuild/linux-mips64el@0.28.2': + resolution: {integrity: sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] - '@esbuild/linux-ppc64@0.28.0': - resolution: {integrity: sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==} + '@esbuild/linux-ppc64@0.28.2': + resolution: {integrity: sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] - '@esbuild/linux-riscv64@0.28.0': - resolution: {integrity: sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==} + '@esbuild/linux-riscv64@0.28.2': + resolution: {integrity: sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] - '@esbuild/linux-s390x@0.28.0': - resolution: {integrity: sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==} + '@esbuild/linux-s390x@0.28.2': + resolution: {integrity: sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==} engines: {node: '>=18'} cpu: [s390x] os: [linux] - '@esbuild/linux-x64@0.28.0': - resolution: {integrity: sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==} + '@esbuild/linux-x64@0.28.2': + resolution: {integrity: sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==} engines: {node: '>=18'} cpu: [x64] os: [linux] - '@esbuild/netbsd-arm64@0.28.0': - resolution: {integrity: sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==} + '@esbuild/netbsd-arm64@0.28.2': + resolution: {integrity: sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==} engines: {node: '>=18'} cpu: [arm64] os: [netbsd] - '@esbuild/netbsd-x64@0.28.0': - resolution: {integrity: sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==} + '@esbuild/netbsd-x64@0.28.2': + resolution: {integrity: sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] - '@esbuild/openbsd-arm64@0.28.0': - resolution: {integrity: sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==} + '@esbuild/openbsd-arm64@0.28.2': + resolution: {integrity: sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-x64@0.28.0': - resolution: {integrity: sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==} + '@esbuild/openbsd-x64@0.28.2': + resolution: {integrity: sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] - '@esbuild/openharmony-arm64@0.28.0': - resolution: {integrity: sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==} + '@esbuild/openharmony-arm64@0.28.2': + resolution: {integrity: sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==} engines: {node: '>=18'} cpu: [arm64] os: [openharmony] - '@esbuild/sunos-x64@0.28.0': - resolution: {integrity: sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==} + '@esbuild/sunos-x64@0.28.2': + resolution: {integrity: sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==} engines: {node: '>=18'} cpu: [x64] os: [sunos] - '@esbuild/win32-arm64@0.28.0': - resolution: {integrity: sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==} + '@esbuild/win32-arm64@0.28.2': + resolution: {integrity: sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==} engines: {node: '>=18'} cpu: [arm64] os: [win32] - '@esbuild/win32-ia32@0.28.0': - resolution: {integrity: sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==} + '@esbuild/win32-ia32@0.28.2': + resolution: {integrity: sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==} engines: {node: '>=18'} cpu: [ia32] os: [win32] - '@esbuild/win32-x64@0.28.0': - resolution: {integrity: sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==} + '@esbuild/win32-x64@0.28.2': + resolution: {integrity: sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==} engines: {node: '>=18'} cpu: [x64] os: [win32] - '@eslint-community/eslint-utils@4.9.1': - resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==} + '@eslint-community/eslint-utils@4.10.1': + resolution: {integrity: sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 @@ -611,8 +585,8 @@ packages: resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint/compat@2.0.5': - resolution: {integrity: sha512-IbHDbHJfkVNv6xjlET8AIVo/K1NQt7YT4Rp6ok/clyBGcpRx1l6gv0Rq3vBvYfPJIZt6ODf66Zq08FJNDpnzgg==} + '@eslint/compat@2.1.0': + resolution: {integrity: sha512-LgaSCymEpw7tF53xvDw9SNsraPb1IBHxpdABIOM0hW8UAlP8znrjYtuxfR58FSJ3L9BhwD+FaPRFQpZq84Nh6g==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} peerDependencies: eslint: ^8.40 || 9 || 10 @@ -624,8 +598,8 @@ packages: resolution: {integrity: sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} - '@eslint/config-helpers@0.5.5': - resolution: {integrity: sha512-eIJYKTCECbP/nsKaaruF6LW967mtbQbsw4JTtSVkUQc9MneSkbrgPJAbKl9nWr0ZeowV8BfsarBmPpBzGelA2w==} + '@eslint/config-helpers@0.7.0': + resolution: {integrity: sha512-DObd/KKUsU+FaFv4PLxSRenpXfQWmPXXP3pPZ6/K1PCrMu2vQpMDMuQe/BqYeoLcz8ro0bVDF1RxOJgfVEdhUw==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} '@eslint/core@1.2.1': @@ -645,16 +619,20 @@ packages: resolution: {integrity: sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} - '@eslint/plugin-kit@0.7.1': - resolution: {integrity: sha512-rZAP3aVgB9ds9KOeUSL+zZ21hPmo8dh6fnIFwRQj5EAZl9gzR7wxYbYXYysAM8CTqGmUGyp2S4kUdV17MnGuWQ==} + '@eslint/plugin-kit@0.7.2': + resolution: {integrity: sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} - '@humanfs/core@0.19.1': - resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} + '@humanfs/core@0.19.2': + resolution: {integrity: sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==} + engines: {node: '>=18.18.0'} + + '@humanfs/node@0.16.8': + resolution: {integrity: sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==} engines: {node: '>=18.18.0'} - '@humanfs/node@0.16.7': - resolution: {integrity: sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==} + '@humanfs/types@0.15.0': + resolution: {integrity: sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==} engines: {node: '>=18.18.0'} '@humanwhocodes/module-importer@1.0.1': @@ -665,40 +643,47 @@ packages: resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==} engines: {node: '>=18.18'} - '@iconify-json/lucide@1.2.103': - resolution: {integrity: sha512-A5WdDll62RPxYs1yeYa9b2mV1Vs+lK/wX0wYKR+xVnhwsfPGLBwo6qfyoAQLo7AaP7oHlkw3gnHdOCERegbwTA==} + '@iconify-json/lucide@1.2.124': + resolution: {integrity: sha512-mO6JyBVNER7uXEkW2bXiN9Rrm6w91IXxwnNmIMbu2KZX0ZPcVZH1xDUTw94pryxESUIpBhinkOUIZIav+TA9ng==} - '@iconify-json/vscode-icons@1.2.46': - resolution: {integrity: sha512-ZuLQscdXzGfUy1BtpNE74rNRjhNkcT/BLUbclQpY7aNLS2ByBuF9RzSjJQ1c0nqRyyInBFWmEL8DbTufw6w5Vw==} + '@iconify-json/vscode-icons@1.2.74': + resolution: {integrity: sha512-ZVf1IM5sOvvY+0Gc6jtuD5okkd51mJe/BoVMhWJCu1WqZLSF6XgbSguxUOyuBmMjJXNPSw1OBvPwEVq1bXfiTw==} '@iconify/types@2.0.0': resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} - '@iconify/utils@3.1.0': - resolution: {integrity: sha512-Zlzem1ZXhI1iHeeERabLNzBHdOa4VhQbqAcOQaMKuTuyZCpwKbC2R4Dd0Zo3g9EAc+Y4fiarO8HIHRAth7+skw==} + '@iconify/utils@3.1.4': + resolution: {integrity: sha512-b1S7B1k9ohZ+iNTi2ATxbRYG9fTrJmUT0rc46bvVnNxqNRGW7dyo/vRREwyniI5IRN2RSJHDcm+s3BjWrSAjHw==} - '@inlang/paraglide-js@2.16.1': - resolution: {integrity: sha512-Ni1UgMt9UKnzmAnCaPvWw1+7hIJAdtoLRzPxbM+wRjT0ovNIys+A/EgiMX2IomLXNRmPj+dw3wSKHe1AGcMQEg==} + '@inlang/paraglide-js@2.24.1': + resolution: {integrity: sha512-r/gak0kY2yuqgz0RFxccb7A89fgcLpiqoEbYfv3nxlqyhdW2v8NajE1A2xiXrv/iAo7WCX4zk8EJAhL69rcp0g==} hasBin: true + peerDependencies: + typescript: '>=5.6' + vite: '>=5.0.0' + peerDependenciesMeta: + typescript: + optional: true + vite: + optional: true '@inlang/recommend-sherlock@0.2.1': resolution: {integrity: sha512-ckv8HvHy/iTqaVAEKrr+gnl+p3XFNwe5D2+6w6wJk2ORV2XkcRkKOJ/XsTUJbPSiyi4PI+p+T3bqbmNx/rDUlg==} - '@inlang/sdk@2.9.2': - resolution: {integrity: sha512-H/iVZEcOtbowKaiq6yirnUR9eyffAOsXpgwWr4eAe45H7l1f1A1Wowb7hVkWQcAE62sL1g76qN4XkyOx2BkV2w==} + '@inlang/sdk@3.0.2': + resolution: {integrity: sha512-qBAzkOLRQ42hZBl2/AZFZD+/JkdjBAvwxWphdTs9UbikMsuLathOBOIl+rC/mzaq48ylD3zE8Je2nrx7tbm0pw==} engines: {node: '>=20.0.0'} '@isaacs/balanced-match@4.0.1': resolution: {integrity: sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==} engines: {node: 20 || >=22} - '@isaacs/brace-expansion@5.0.0': - resolution: {integrity: sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==} + '@isaacs/brace-expansion@5.0.1': + resolution: {integrity: sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==} engines: {node: 20 || >=22} - '@jridgewell/gen-mapping@0.3.5': - resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} - engines: {node: '>=6.0.0'} + '@jridgewell/gen-mapping@0.3.13': + resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==} '@jridgewell/remapping@2.3.5': resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==} @@ -707,22 +692,34 @@ packages: resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} engines: {node: '>=6.0.0'} - '@jridgewell/set-array@1.2.1': - resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} - engines: {node: '>=6.0.0'} - '@jridgewell/sourcemap-codec@1.5.5': resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} - '@jridgewell/trace-mapping@0.3.25': - resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} + '@jridgewell/trace-mapping@0.3.31': + resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} - '@lix-js/sdk@0.4.10': - resolution: {integrity: sha512-0dMInAJK/67guTG5rRZaCEhvzC5cCXENOjaePA5AqMXrCE97kaY7SRor9e2vnoGsFIiGqXKlT0MCIoZj36G0gg==} - engines: {node: '>=18'} + '@lix-js/sdk-darwin-arm64@0.12.3': + resolution: {integrity: sha512-YeMJyYGk+QwvQe8O4AAcBMgfNm68IjAGDvuvZHr1U1rIb3GC2kYFStajqf4mT4BGc+cN65/P/2kkqEo+Igu/sA==} + cpu: [arm64] + os: [darwin] + + '@lix-js/sdk-linux-arm64@0.12.3': + resolution: {integrity: sha512-jtmfNg6jLW61l1QvsU3W184l3hGtYUyPGzZrQyekk0vsMF1hxsP++7ONEGNI19PE7ldwSnGCB8Q6OzRKX87abQ==} + cpu: [arm64] + os: [linux] - '@lix-js/server-protocol-schema@0.1.1': - resolution: {integrity: sha512-jBeALB6prAbtr5q4vTuxnRZZv1M2rKe8iNqRQhFJ4Tv7150unEa0vKyz0hs8Gl3fUGsWaNJBh3J8++fpbrpRBQ==} + '@lix-js/sdk-linux-x64@0.12.3': + resolution: {integrity: sha512-PiQL4h1FJXbxnZx/PgenI5grgpFtYlS/ZtPtTYh638YHVu+6J0cqGY/pLVqP8CKv1dWAKsZ2YgftLd+1j2+WKA==} + cpu: [x64] + os: [linux] + + '@lix-js/sdk-win32-x64@0.12.3': + resolution: {integrity: sha512-hnxMI7kPS4ngXs0ZVnOve5CmtC4+vaNIyNDi/yWU0rSvxj7mqw/1RCegTrCB7LjxlX4DG+eg9HruXurk9NDjGg==} + cpu: [x64] + os: [win32] + + '@lix-js/sdk@0.12.3': + resolution: {integrity: sha512-T2194yoZsM2S9kyRmI8UtEJL0fgXYAkeY9jZ/PVyC0K78/wmBvrqOSt9SdvgYxM5qnZ57re3NLOjVlV+X5hWxQ==} '@microsoft/api-extractor-model@7.31.3': resolution: {integrity: sha512-dv4quQI46p0U03TCEpasUf6JrJL3qjMN7JUAobsPElxBv4xayYYvWW9aPpfYV+Jx6hqUcVaLVOeV7+5hxsyoFQ==} @@ -737,135 +734,244 @@ packages: '@microsoft/tsdoc@0.15.1': resolution: {integrity: sha512-4aErSrCR/On/e5G2hDP0wjooqDdauzEbIq8hIkIe5pXV0rtWJZvdCEKL0ykZxex+IxIwBp0eGeV48hQN07dXtw==} - '@napi-rs/wasm-runtime@1.1.4': - resolution: {integrity: sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==} - peerDependencies: - '@emnapi/core': ^1.7.1 - '@emnapi/runtime': ^1.7.1 + '@oxc-project/types@0.146.0': + resolution: {integrity: sha512-XC0QsnnhVe7sLIWmYmdPw7x5P0h4W8vUU3Nv1ySgWXtvCz8NizoAEpGXA0sOYoJQV2Rl13LgURAHQ5cI5ILCSA==} + + '@oxfmt/binding-android-arm-eabi@0.64.0': + resolution: {integrity: sha512-o6uzh/jTOQeAY5TdkAeXdqv7MBRcPxiRA08zrcBtkKj5cSu/FMu0Hl7Q6Fi1KCKyCWZ6lJVjBzdsJvsKltUsGQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [android] + + '@oxfmt/binding-android-arm64@0.64.0': + resolution: {integrity: sha512-jRGSUeeP7p3Gynw2YaCVtjBIA6ZxY6bEB/ES5i54OhqmRTyuVg7ZgstEtzgq6GOAJd+2QZ5pvf+bFfmW5Mp9cw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [android] + + '@oxfmt/binding-darwin-arm64@0.64.0': + resolution: {integrity: sha512-JINwtU2lW7nOFSqi+H2qplipNUqah9Gc1jgGmB82kTD4UnZrZIVxCJ9qEmFiKfjNq27gYLFhrUb0to86aCwMjw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [darwin] + + '@oxfmt/binding-darwin-x64@0.64.0': + resolution: {integrity: sha512-gCmuswrgrOSajV4HCRFkVCGIruPq8bjYuPYgSE2WQB3mD6XrdyZ3JMSRZCkQ8zCxOyGWriBo6QoZ5nmMHQ1BfA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [darwin] + + '@oxfmt/binding-freebsd-x64@0.64.0': + resolution: {integrity: sha512-Ab8g7a38pT0MMImjh7anRSTve6buWBIlcXIFBYa5xl4s6UxEgKSc2xOOhbGtLwvXnEi2PsEDGoJh3oUU7xkehQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [freebsd] + + '@oxfmt/binding-linux-arm-gnueabihf@0.64.0': + resolution: {integrity: sha512-BgvS3CoQ+Xy2deoZqEN8JVKabcCZi2RxA3yant8G9OAv9KuPJ9TCjHkqigzdHUVwErZxEP5d2bzLIEyKYyBDLg==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [linux] + + '@oxfmt/binding-linux-arm-musleabihf@0.64.0': + resolution: {integrity: sha512-QXpNxwoMj0YvnceCNZadNSden3bIcnvjn/sDp/rwZhRoZoZYGpHvtPyhGsdJz9uvT9GkaMW7SsLddurU56dt8w==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [linux] + + '@oxfmt/binding-linux-arm64-gnu@0.64.0': + resolution: {integrity: sha512-BBgH3I1ppDsI5pZ4Pdhw0ceYxwVCfbU/bZEBCeZ6caRS9x0ZabErxubP7riGUn11PXZBhe8DYdjkDKP1FlVQ5w==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + + '@oxfmt/binding-linux-arm64-musl@0.64.0': + resolution: {integrity: sha512-v19HSjC/BGXdt26qEvKZtwAHgGmQ2Agcap2kQP+KIqoRZqivVzYth3ui2dJA1i+6/fjpjga85lIOaJJjQ/bOOw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + + '@oxfmt/binding-linux-ppc64-gnu@0.64.0': + resolution: {integrity: sha512-PElLnOo4xFTBZrxPhgTIj0eHqZXwEBQoNWtb7facUV170T0B0FRET0iNbb3LUeLWTybkUW+vsdyv4ihOdyXGyw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [ppc64] + os: [linux] + + '@oxfmt/binding-linux-riscv64-gnu@0.64.0': + resolution: {integrity: sha512-Qzsg15n4F5CH+MorcRW4MkAEMiLzXmeG+DiDSbP/bBTqCmWOH3K9DHryNrve+JHlV0txS+B6Z9P5Xz+cmWeL+g==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [riscv64] + os: [linux] + + '@oxfmt/binding-linux-riscv64-musl@0.64.0': + resolution: {integrity: sha512-/GZ358wnQ/Ez4UVnCcZIi56JkY0sOdZ+B108pqXKqZz3jLS59F4KEAB1Qv3fRlObrFEk+3L2vUQ/xoPx+3vjXw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [riscv64] + os: [linux] + + '@oxfmt/binding-linux-s390x-gnu@0.64.0': + resolution: {integrity: sha512-/C9We3DXegowfLXtVCYHeNiU9azwCDr5cQkEtCVlc74vyn+lLQSPApJ1CZmxAduqeq/Oi3gQ+IVptyhCaTMtkQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [s390x] + os: [linux] + + '@oxfmt/binding-linux-x64-gnu@0.64.0': + resolution: {integrity: sha512-91KM2CeRWscIEHlj1NsW2WSnzGeq1Ehq+39bfDowTdkn+fcvK/x4Y1RcyqT7glyBjZio0ldkeCG6Usj3v7ASog==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + + '@oxfmt/binding-linux-x64-musl@0.64.0': + resolution: {integrity: sha512-gw7uEk9I+7zoT1EYLra1eWArIzNcz8e3jkv+Noo2+o2T7wPvsNSQbfoa4DSfZlvn1i6mJ05RiZ4/omaXPDNhQg==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + + '@oxfmt/binding-openharmony-arm64@0.64.0': + resolution: {integrity: sha512-HYHFf616FHSPSO07c09mjmXBfQ73wIVM3m0txOiooa5XZkGoxFd6B14PVj0LB0DXIqJ6wAO/dDR/NX/5UUaqnw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [openharmony] + + '@oxfmt/binding-win32-arm64-msvc@0.64.0': + resolution: {integrity: sha512-uQjFp081IZSWD6VAofX2iO2z01awAdHmfC+NrieWIPKrT2hZKQDyq/U18M7ifC0sm0Wz8aHY/p6+FDYIzs/CrQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [win32] + + '@oxfmt/binding-win32-ia32-msvc@0.64.0': + resolution: {integrity: sha512-lNM6byTAQ881jugzFu8juJTbNRgsUTlswMA6pJmwi1XDvmIqnnb49lcUAs5gz94fCJLrVN+/X3s3jOKqx23WIQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [ia32] + os: [win32] - '@oxc-project/types@0.127.0': - resolution: {integrity: sha512-aIYXQBo4lCbO4z0R3FHeucQHpF46l2LbMdxRvqvuRuW2OxdnSkcng5B8+K12spgLDj93rtN3+J2Vac/TIO+ciQ==} + '@oxfmt/binding-win32-x64-msvc@0.64.0': + resolution: {integrity: sha512-BtmbtL/QjMtF1a6C3CqoDluH2IfB6fJt62E+B9RFfUPtFk4Iz9PFS6+y/SzzOvSxc7aUk2Kphwg7Dh8lMbwu6g==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [win32] - '@php-wasm/logger@3.1.20': - resolution: {integrity: sha512-uewkiBJKohKTqcUT3oyi+ijwhW4DiSP9E1wqXdMbIwfFw3ZKKQWuqS0+TsLMt6imR6wTir1jwZwacizVjE6Lcg==} + '@php-wasm/logger@3.1.50': + resolution: {integrity: sha512-fkseJcXaohL/DgsAemAe8WZdLpYkbFfpJ9IwrriBvmnHAIw0psx2Ed3imoxwJeIKKV9LGU6Deba+Liw/OVgQ5g==} engines: {node: '>=20.10.0', npm: '>=10.2.3'} - '@php-wasm/progress@3.1.20': - resolution: {integrity: sha512-URARh4wAb+I8p9SJ1gMPov89wEWd2VIe7ikR6kHdKbKWUNsPfyrvuhqDKF+2sMiQWGjLlZenckDRePoMwyrAJw==} + '@php-wasm/progress@3.1.50': + resolution: {integrity: sha512-QRrDYcyMdSVI2v7dmSNPX3c7VWLYChPxZXvCETB2fKfXXYhtbesfxUN2OuGgemy91vyj9E/zIowc6z9ORvFeyQ==} engines: {node: '>=20.10.0', npm: '>=10.2.3'} - '@php-wasm/stream-compression@3.1.20': - resolution: {integrity: sha512-nAOA7wb0GKtMD2kcgVworVT5wrgmfSS3b5cacM0YUPb4z2uHhmBjhBQTQKVkTc1p3BrzUQpILqrnxVsRVuahNQ==} + '@php-wasm/stream-compression@3.1.50': + resolution: {integrity: sha512-bRQXVIO2hNswlRwIjAbOvjTpiG/6auhzLRV3F2YL/NIWTr8g785ebNHEHP7QyH2tBey2UOXGKWTsGQS7NCiBcw==} - '@php-wasm/universal@3.1.20': - resolution: {integrity: sha512-ptpup7608diKaq7wVQBkx1BQjpVI+nXRyE/1eg9XehtMCSwTBsW2ykLJfTVwVem9yRGGUNdCdvYlpOesknrGOA==} + '@php-wasm/universal@3.1.50': + resolution: {integrity: sha512-HvJ//8hPCcTbpoquKVrmSZ1Jg14bN2C6TrQ0OvVXQJe+tIVmjHfLefvtvVOuNn3nY5XqFHp8QCRpGCbr0hC+aA==} engines: {node: '>=20.10.0', npm: '>=10.2.3'} - '@php-wasm/util@3.1.20': - resolution: {integrity: sha512-5Ad14Y6BO38bWzvSdYvmljREY7iVlkEp9auzh8KtQ8OeymQPvzAafdHuS0dsO5Cv61KC01LQfMZzhn9QlDIeJg==} + '@php-wasm/util@3.1.50': + resolution: {integrity: sha512-7lFPrxH2q7nvMDSMHkKMhyJJpO9lyEYLo5xpR4GO4k7poKK3Vvml5oKn02qAxhdInP4Q9l57zsp8Zc9uNQqjrg==} engines: {node: '>=20.10.0', npm: '>=10.2.3'} - '@php-wasm/web-8-5@3.1.20': - resolution: {integrity: sha512-Ex1X3ZDWrJ0WBhG8iqLsPPVZVkxeoVcXnIhIbLV5lJ3R4iVe8p0uk6U61+gUtm3Z5V26o9whJe3eXeUMsNYEBQ==} + '@php-wasm/web-8-5@3.1.50': + resolution: {integrity: sha512-f6n826Bfg9cqiQtDSjKXvDVAyJHhe61aqgqRkXKnK5Wwxw40gBOKUv0nVwvjkB1qTVqZdN6UYEDfXdusaz61IA==} engines: {node: '>=20.10.0', npm: '>=10.2.3'} '@polka/url@1.0.0-next.29': resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==} - '@rolldown/binding-android-arm64@1.0.0-rc.17': - resolution: {integrity: sha512-s70pVGhw4zqGeFnXWvAzJDlvxhlRollagdCCKRgOsgUOH3N1l0LIxf83AtGzmb5SiVM4Hjl5HyarMRfdfj3DaQ==} + '@rolldown/binding-android-arm-eabi@1.2.5': + resolution: {integrity: sha512-DLe/i+l8ynIBY7XEQ191TeZvCoowIGa18R+dIV30GW7DiOtp74i/xX8hs8GUjW5ARV7VZuie3d6AumSmCwbeRA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [android] + + '@rolldown/binding-android-arm64@1.2.5': + resolution: {integrity: sha512-zXcwKlQApYAOELHd8PwKDFkagYF9Wy4e0RJ+0qnzl9Pjnpj75TEG8ufv40p2J7kCEfwZAsNiuzRIyNNMWT38ig==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] - '@rolldown/binding-darwin-arm64@1.0.0-rc.17': - resolution: {integrity: sha512-4ksWc9n0mhlZpZ9PMZgTGjeOPRu8MB1Z3Tz0Mo02eWfWCHMW1zN82Qz/pL/rC+yQa+8ZnutMF0JjJe7PjwasYw==} + '@rolldown/binding-darwin-arm64@1.2.5': + resolution: {integrity: sha512-dK4QakI42nzWgJT5sm4y4y/O//D4OxM75/cH28RLV+nzIN9AY+YsbuUVrUTjlLjXR6vpyxFbSsbmNuJ6BP9sww==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] - '@rolldown/binding-darwin-x64@1.0.0-rc.17': - resolution: {integrity: sha512-SUSDOI6WwUVNcWxd02QEBjLdY1VPHvlEkw6T/8nYG322iYWCTxRb1vzk4E+mWWYehTp7ERibq54LSJGjmouOsw==} + '@rolldown/binding-darwin-x64@1.2.5': + resolution: {integrity: sha512-fqSALaUu1Wjd1nK2uW2kJDWdLCc8lx1IcY+MTY26Aurfdx19anlzhqXOgCFbBFQnlFDTn4TC1/7Nz4Bl2mLP3A==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] - '@rolldown/binding-freebsd-x64@1.0.0-rc.17': - resolution: {integrity: sha512-hwnz3nw9dbJ05EDO/PvcjaaewqqDy7Y1rn1UO81l8iIK1GjenME75dl16ajbvSSMfv66WXSRCYKIqfgq2KCfxw==} + '@rolldown/binding-freebsd-x64@1.2.5': + resolution: {integrity: sha512-/vCnNxlkxs9tKxNDcyWUePpJ/PgTzxIaVhoM5SmG8UV+GR/IcPam4VYxi7GIMo7PSDuNqlJqvprqii9NqqVCMw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] - '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.17': - resolution: {integrity: sha512-IS+W7epTcwANmFSQFrS1SivEXHtl1JtuQA9wlxrZTcNi6mx+FDOYrakGevvvTwgj2JvWiK8B29/qD9BELZPyXQ==} + '@rolldown/binding-linux-arm-gnueabihf@1.2.5': + resolution: {integrity: sha512-abk0NLA519LxRCszmbE0jYKuQ9YPocOXTiOXOo6Yr+YAT95VH+PtqYAjOJvGKt3viEd/x4qzabAlwd5bHOOARg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.17': - resolution: {integrity: sha512-e6usGaHKW5BMNZOymS1UcEYGowQMWcgZ71Z17Sl/h2+ZziNJ1a9n3Zvcz6LdRyIW5572wBCTH/Z+bKuZouGk9Q==} + '@rolldown/binding-linux-arm64-gnu@1.2.5': + resolution: {integrity: sha512-Y7eALiJ8lr0M2HH103Js+g7V34wf6snlpZLAsHI90uLhr3PVlNsbFVAXJC9d/V6BnPyKtpSwI+NcB/RLxsQxuA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] - '@rolldown/binding-linux-arm64-musl@1.0.0-rc.17': - resolution: {integrity: sha512-b/CgbwAJpmrRLp02RPfhbudf5tZnN9nsPWK82znefso832etkem8H7FSZwxrOI9djcdTP7U6YfNhbRnh7djErg==} + '@rolldown/binding-linux-arm64-musl@1.2.5': + resolution: {integrity: sha512-xMvZgnbZg4YVnR/AX2b3oOPDTFYJvUVaJg5FedA/LuvexAtXibZQej4cnTkw3rjsJ/ggUROB64TdtETiim+FYA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] - '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.17': - resolution: {integrity: sha512-4EII1iNGRUN5WwGbF/kOh/EIkoDN9HsupgLQoXfY+D1oyJm7/F4t5PYU5n8SWZgG0FEwakyM8pGgwcBYruGTlA==} + '@rolldown/binding-linux-ppc64-gnu@1.2.5': + resolution: {integrity: sha512-GRjeqTUDHTo5GwntsLaAMcBahG3nlpjftXWZLN73HiYQlhwEowvarFgQnRnQZtIp4keXX7quXFbG38uPZBa2EA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] - '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.17': - resolution: {integrity: sha512-AH8oq3XqQo4IibpVXvPeLDI5pzkpYn0WiZAfT05kFzoJ6tQNzwRdDYQ45M8I/gslbodRZwW8uxLhbSBbkv96rA==} + '@rolldown/binding-linux-s390x-gnu@1.2.5': + resolution: {integrity: sha512-vLNTR45F2Uwc8AufkNXPmB4VliaXs+FvcheEogIzOXzO4l+LzieXF5A/TWxLy5HtqpsRCHUfd0lPVrrdgXdLHQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] - '@rolldown/binding-linux-x64-gnu@1.0.0-rc.17': - resolution: {integrity: sha512-cLnjV3xfo7KslbU41Z7z8BH/E1y5mzUYzAqih1d1MDaIGZRCMqTijqLv76/P7fyHuvUcfGsIpqCdddbxLLK9rA==} + '@rolldown/binding-linux-x64-gnu@1.2.5': + resolution: {integrity: sha512-Mgj59/HTuYeK9Gz2MA+mBWKnHsAgkBSec15ZMb1st3oIfFbX7gCjOae7GydHhzcyQi9Z/7M1QuN9bR3oFqF0jQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] - '@rolldown/binding-linux-x64-musl@1.0.0-rc.17': - resolution: {integrity: sha512-0phclDw1spsL7dUB37sIARuis2tAgomCJXAHZlpt8PXZ4Ba0dRP1e+66lsRqrfhISeN9bEGNjQs+T/Fbd7oYGw==} + '@rolldown/binding-linux-x64-musl@1.2.5': + resolution: {integrity: sha512-mY8AP0/ichsbhAxGnLa3d3+MwV0EfgrPND2bplI3Ym8T6R2pJ0N87bvrKVwNXmdy3jnr6eQBecdqx/HMknBmpA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] - '@rolldown/binding-openharmony-arm64@1.0.0-rc.17': - resolution: {integrity: sha512-0ag/hEgXOwgw4t8QyQvUCxvEg+V0KBcA6YuOx9g0r02MprutRF5dyljgm3EmR02O292UX7UeS6HzWHAl6KgyhA==} + '@rolldown/binding-openharmony-arm64@1.2.5': + resolution: {integrity: sha512-8SLssA2oweAxyRgDp789ACfRb/3P+zNRJpzZxSizxF9m8NUDQ4+3xjo8ttjhVGGw6Qxb70oZiEtIjaKikCO7Yw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] - '@rolldown/binding-wasm32-wasi@1.0.0-rc.17': - resolution: {integrity: sha512-LEXei6vo0E5wTGwpkJ4KoT3OZJRnglwldt5ziLzOlc6qqb55z4tWNq2A+PFqCJuvWWdP53CVhG1Z9NtToDPJrA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [wasm32] - - '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.17': - resolution: {integrity: sha512-gUmyzBl3SPMa6hrqFUth9sVfcLBlYsbMzBx5PlexMroZStgzGqlZ26pYG89rBb45Mnia+oil6YAIFeEWGWhoZA==} + '@rolldown/binding-win32-arm64-msvc@1.2.5': + resolution: {integrity: sha512-vGbruD5zquhoc8D9SViXgN2FBJtNdTyQ4DtG+SWiEGlJiAzoKcZ2xp+xuXCffhubVdt0NJlTZqkeRuERy7g8Cw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] - '@rolldown/binding-win32-x64-msvc@1.0.0-rc.17': - resolution: {integrity: sha512-3hkiolcUAvPB9FLb3UZdfjVVNWherN1f/skkGWJP/fgSQhYUZpSIRr0/I8ZK9TkF3F7kxvJAk0+IcKvPHk9qQg==} + '@rolldown/binding-win32-x64-msvc@1.2.5': + resolution: {integrity: sha512-e/SXpgISz+IoqVcSSI0rx/d/he8zqLex+/rCWpnHpmVfmPIUjag9H6P7zotf0gJHwPUhQxZ/mF8tr6acebT9yw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] - '@rolldown/pluginutils@1.0.0-rc.17': - resolution: {integrity: sha512-n8iosDOt6Ig1UhJ2AYqoIhHWh/isz0xpicHTzpKBeotdVsTEcxsSA/i3EVM7gQAj0rU27OLAxCjzlj15IWY7bg==} + '@rolldown/pluginutils@1.0.1': + resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==} - '@rollup/pluginutils@5.1.4': - resolution: {integrity: sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==} + '@rollup/pluginutils@5.4.0': + resolution: {integrity: sha512-MfPp06CjRLfXQ3wY0R8vJDYBy/MvVcc9OulEfR0B8Iv9ko+GCNaRZ+EpJYFl27LhKsZK0o420sYCRHCjfCgeUg==} engines: {node: '>=14.0.0'} peerDependencies: rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 @@ -983,11 +1089,11 @@ packages: cpu: [x64] os: [win32] - '@ruby/4.0-wasm-wasi@2.9.3-2.9.4': - resolution: {integrity: sha512-USLEWmCjM/DIota/9c7Mwzzl3v8mvmg4x24m+zMq8+vLx5+AdOS6dyXvsL/B8+XjQn5UgYhh3c8ekaUdWFkUMA==} + '@ruby/4.0-wasm-wasi@2.10.1': + resolution: {integrity: sha512-ObIFKo4CyXJFWtJU2BRnrnvWA4YZEY9wYEVGCiVZVQ1fZ0Ox4PJuUJT0+Z7FKQ3vAVI75ymddknYEV0zPHKDpw==} - '@ruby/wasm-wasi@2.9.3-2.9.4': - resolution: {integrity: sha512-WxW9wON/TIf+8Ktng8qDJeV/6iH8kw+YwxOsOyXdAdLJgfYDPAXOqpIVd/96y2C9V8VJ2yqZm/IRv6nLeV6EKg==} + '@ruby/wasm-wasi@2.10.1': + resolution: {integrity: sha512-OGSxxDraRq8alWQsWqDJQsaAavQwhwIVRkDozpPucjD1tUofMF6n99Y8Ia1bpDhOAXCwiNIHqhumfqFw0H0DZw==} '@rushstack/node-core-library@5.18.0': resolution: {integrity: sha512-XDebtBdw5S3SuZIt+Ra2NieT8kQ3D2Ow1HxhDQ/2soinswnOu9e7S69VSwTOLlQnx5mpWbONu+5JJjDxMAb6Fw==} @@ -1019,8 +1125,8 @@ packages: '@rushstack/ts-command-line@5.1.3': resolution: {integrity: sha512-Kdv0k/BnnxIYFlMVC1IxrIS0oGQd4T4b7vKfx52Y2+wk2WZSDFIvedr7JrhenzSlm3ou5KwtoTGTGd5nbODRug==} - '@sinclair/typebox@0.31.28': - resolution: {integrity: sha512-/s55Jujywdw/Jpan+vsy6JZs1z2ZTGxTmbZTPiuSL2wz9mfzA2gN1zzaqmvfi4pq+uOt7Du85fkiwv5ymW84aQ==} + '@sinclair/typebox@0.31.30': + resolution: {integrity: sha512-MGsM7bVmHg3sUKCphlu3SGQ+T+5JTbygZWYArfKQCW5anJeACHeqLhcnf+R7XlCWZ+QR3C8JTBx3kCKJTN69ow==} '@sqlite.org/sqlite-wasm@3.48.0-build4': resolution: {integrity: sha512-hI6twvUkzOmyGZhQMza1gpfqErZxXRw6JEsiVjUbo7tFanVD+8Oil0Ih3l2nGzHdxPI41zFmfUQG7GHqhciKZQ==} @@ -1029,98 +1135,102 @@ packages: '@standard-schema/spec@1.1.0': resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==} - '@sveltejs/acorn-typescript@1.0.6': - resolution: {integrity: sha512-4awhxtMh4cx9blePWl10HRHj8Iivtqj+2QdDCSMDzxG+XKa9+VCNupQuCuvzEhYPzZSrX+0gC+0lHA/0fFKKQQ==} + '@sveltejs/acorn-typescript@1.0.13': + resolution: {integrity: sha512-wgKggnhZVL9Bfx1OaKKTrYY9BFRk6C8UAkQNUcIv1+llzYrIqy+RZm5HPKzn0NpEBvTVhTqB4kQyllZywsRBRQ==} peerDependencies: acorn: ^8.9.0 - '@sveltejs/adapter-static@3.0.10': - resolution: {integrity: sha512-7D9lYFWJmB7zxZyTE/qxjksvMqzMuYrrsyh1f4AlZqeZeACPRySjbC3aFiY55wb1tWUaKOQG9PVbm74JcN2Iew==} + '@sveltejs/adapter-static@4.0.0-next.4': + resolution: {integrity: sha512-LpHOHYLQctyUASoxlR+m2NYZ9PgQQEpo7Ij8FVs5arLmnGZ3FmFi6RFs5SBk05hzLhmzsUkVcmw8vn7FmWzVJg==} peerDependencies: - '@sveltejs/kit': ^2.0.0 + '@sveltejs/kit': ^3.0.0-next.0 - '@sveltejs/kit@2.58.0': - resolution: {integrity: sha512-kT9GCN8yJTkCK1W+Gi/bvGooWAM7y7WXP+yd+rf6QOIjyoK1ERPrMwSufXJUNu2pMWIqruhFvmz+LbOqsEmKmA==} - engines: {node: '>=18.13'} + '@sveltejs/kit@3.0.0-next.25': + resolution: {integrity: sha512-3ih37NCbIQUnGzn3fPK7XA9Qn9ipA6D4+6rBfHZfpUc1ga1eLxyJmINPzV1lFlM55LaWjus88rGoUSiKeevRhw==} + engines: {node: '>=22.17'} hasBin: true peerDependencies: '@opentelemetry/api': ^1.0.0 - '@sveltejs/vite-plugin-svelte': ^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0 || ^7.0.0 - svelte: ^4.0.0 || ^5.0.0-next.0 - typescript: ^5.3.3 || ^6.0.0 - vite: ^5.0.3 || ^6.0.0 || ^7.0.0-beta.0 || ^8.0.0 + '@sveltejs/vite-plugin-svelte': ^7.0.0 + svelte: ^5.56.4 + typescript: ^6.0.0 + vite: ^8.0.12 peerDependenciesMeta: '@opentelemetry/api': optional: true typescript: optional: true - '@sveltejs/vite-plugin-svelte@7.0.0': - resolution: {integrity: sha512-ILXmxC7HAsnkK2eslgPetrqqW1BKSL7LktsFgqzNj83MaivMGZzluWq32m25j2mDOjmSKX7GGWahePhuEs7P/g==} + '@sveltejs/load-config@0.2.3': + resolution: {integrity: sha512-VT3qmUb8pRV2QrZjd8iAmtg8lf4W0TIjZbvXtz5MKei/q96teWZgGJyyidJzOjzZzvdq616eSRVeMYIQChUTAQ==} + engines: {node: '>= 18.0.0'} + + '@sveltejs/vite-plugin-svelte@7.3.0': + resolution: {integrity: sha512-QbRoJyD92e9R0ufeQIWRHrCC0ObcqSv/aBDdrQMoU+sypav3cDx5wytdQ6GLdXjEMO6xjrXGzfkUygng8JMv0A==} engines: {node: ^20.19 || ^22.12 || >=24} peerDependencies: svelte: ^5.46.4 vite: ^8.0.0-beta.7 || ^8.0.0 - '@tailwindcss/node@4.2.4': - resolution: {integrity: sha512-Ai7+yQPxz3ddrDQzFfBKdHEVBg0w3Zl83jnjuwxnZOsnH9pGn93QHQtpU0p/8rYWxvbFZHneni6p1BSLK4DkGA==} + '@tailwindcss/node@4.3.3': + resolution: {integrity: sha512-/T8IKEsf9VTU6tLjgC7+sv2mOPtQxzE2jMw7u4Tt40Tx+QSZxpzh95/H6cMKoja9XuW7iMdLJYBB0o9G1CaAgg==} - '@tailwindcss/oxide-android-arm64@4.2.4': - resolution: {integrity: sha512-e7MOr1SAn9U8KlZzPi1ZXGZHeC5anY36qjNwmZv9pOJ8E4Q6jmD1vyEHkQFmNOIN7twGPEMXRHmitN4zCMN03g==} + '@tailwindcss/oxide-android-arm64@4.3.3': + resolution: {integrity: sha512-Y85A2gmPSkl5Ve5qR86GL4HT509cFqQh1aes9p3sSkyTPwt0Pppf3GkwGe4JPACcRYjgJIEhQgM6dBClnr0NYw==} engines: {node: '>= 20'} cpu: [arm64] os: [android] - '@tailwindcss/oxide-darwin-arm64@4.2.4': - resolution: {integrity: sha512-tSC/Kbqpz/5/o/C2sG7QvOxAKqyd10bq+ypZNf+9Fi2TvbVbv1zNpcEptcsU7DPROaSbVgUXmrzKhurFvo5eDg==} + '@tailwindcss/oxide-darwin-arm64@4.3.3': + resolution: {integrity: sha512-BiaWatpBcERQFDlOjRDpIVXuFK5PJez5SA4JMg6VYZdBYU+qKfV/vqjcIs+IYmtitf1xYQZTwXvU/8y4lfZUGw==} engines: {node: '>= 20'} cpu: [arm64] os: [darwin] - '@tailwindcss/oxide-darwin-x64@4.2.4': - resolution: {integrity: sha512-yPyUXn3yO/ufR6+Kzv0t4fCg2qNr90jxXc5QqBpjlPNd0NqyDXcmQb/6weunH/MEDXW5dhyEi+agTDiqa3WsGg==} + '@tailwindcss/oxide-darwin-x64@4.3.3': + resolution: {integrity: sha512-fAeUqfV5ndhxRwai8cXGzdLvul9utWOmeTkv69unv4ZXixjn61Z+p9lCWdwOwA3TYboG3BwdVuN/RDjhBRl0mw==} engines: {node: '>= 20'} cpu: [x64] os: [darwin] - '@tailwindcss/oxide-freebsd-x64@4.2.4': - resolution: {integrity: sha512-BoMIB4vMQtZsXdGLVc2z+P9DbETkiopogfWZKbWwM8b/1Vinbs4YcUwo+kM/KeLkX3Ygrf4/PsRndKaYhS8Eiw==} + '@tailwindcss/oxide-freebsd-x64@4.3.3': + resolution: {integrity: sha512-iyf5bV6+wnAlflVeEy7R25dupxTNECZN5QMI0qNT6eT+EgaGdZcKhGkr5SdoaWiLJ3spLqIY9VCeSGrwmtg4kw==} engines: {node: '>= 20'} cpu: [x64] os: [freebsd] - '@tailwindcss/oxide-linux-arm-gnueabihf@4.2.4': - resolution: {integrity: sha512-7pIHBLTHYRAlS7V22JNuTh33yLH4VElwKtB3bwchK/UaKUPpQ0lPQiOWcbm4V3WP2I6fNIJ23vABIvoy2izdwA==} + '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.3': + resolution: {integrity: sha512-aAYUprJAJQWWbRrPvtjdroZ56Md+JM8pMiopS6xGEwDfLhqj+2ver2p4nU4Mb3CRqcMmNBjo8KkUgcxhkzVQGQ==} engines: {node: '>= 20'} cpu: [arm] os: [linux] - '@tailwindcss/oxide-linux-arm64-gnu@4.2.4': - resolution: {integrity: sha512-+E4wxJ0ZGOzSH325reXTWB48l42i93kQqMvDyz5gqfRzRZ7faNhnmvlV4EPGJU3QJM/3Ab5jhJ5pCRUsKn6OQw==} + '@tailwindcss/oxide-linux-arm64-gnu@4.3.3': + resolution: {integrity: sha512-nDxldcEENOxZRzC2uu9jrutZdAAQtb+8WWDCSnWL1zvBk1+FN+x6MtDViPB5AJMfttVCUhehGWus3XBPgatM/w==} engines: {node: '>= 20'} cpu: [arm64] os: [linux] - '@tailwindcss/oxide-linux-arm64-musl@4.2.4': - resolution: {integrity: sha512-bBADEGAbo4ASnppIziaQJelekCxdMaxisrk+fB7Thit72IBnALp9K6ffA2G4ruj90G9XRS2VQ6q2bCKbfFV82g==} + '@tailwindcss/oxide-linux-arm64-musl@4.3.3': + resolution: {integrity: sha512-Md44bD6veX/PC5iyF8cDVnw4HBIANZepRZZ7a8DQOvkfo5WUBwcp6iAuCUz23u+4SUkhJlD3eL7hNdW8ezd/kA==} engines: {node: '>= 20'} cpu: [arm64] os: [linux] - '@tailwindcss/oxide-linux-x64-gnu@4.2.4': - resolution: {integrity: sha512-7Mx25E4WTfnht0TVRTyC00j3i0M+EeFe7wguMDTlX4mRxafznw0CA8WJkFjWYH5BlgELd1kSjuU2JiPnNZbJDA==} + '@tailwindcss/oxide-linux-x64-gnu@4.3.3': + resolution: {integrity: sha512-tx7us1muwOKAKWao2v/GaafFeQboE6aj88vC6ziN2NCGcRm8gWUhwjzg+YdVB1e4boAtdtma4L43onunI6NS4w==} engines: {node: '>= 20'} cpu: [x64] os: [linux] - '@tailwindcss/oxide-linux-x64-musl@4.2.4': - resolution: {integrity: sha512-2wwJRF7nyhOR0hhHoChc04xngV3iS+akccHTGtz965FwF0up4b2lOdo6kI1EbDaEXKgvcrFBYcYQQ/rrnWFVfA==} + '@tailwindcss/oxide-linux-x64-musl@4.3.3': + resolution: {integrity: sha512-SJxX60smvHgasZoBy11dX6YRjXJFovwWBoedhbQPOBzgFWBHGB+TVPWB9BxzR7TTxU8FQZAI2AyiNCMzFm8Img==} engines: {node: '>= 20'} cpu: [x64] os: [linux] - '@tailwindcss/oxide-wasm32-wasi@4.2.4': - resolution: {integrity: sha512-FQsqApeor8Fo6gUEklzmaa9994orJZZDBAlQpK2Mq+DslRKFJeD6AjHpBQ0kZFQohVr8o85PPh8eOy86VlSCmw==} + '@tailwindcss/oxide-wasm32-wasi@4.3.3': + resolution: {integrity: sha512-jx1+rPhY/5Ympkktd656HBWEBLxP7dH06losBLjjf5vgCODXvi9KhtftWcMIwTFIDqBr7cRnQkdLnAG+IOlGvQ==} engines: {node: '>=14.0.0'} cpu: [wasm32] bundledDependencies: @@ -1131,34 +1241,34 @@ packages: - '@emnapi/wasi-threads' - tslib - '@tailwindcss/oxide-win32-arm64-msvc@4.2.4': - resolution: {integrity: sha512-L9BXqxC4ToVgwMFqj3pmZRqyHEztulpUJzCxUtLjobMCzTPsGt1Fa9enKbOpY2iIyVtaHNeNvAK8ERP/64sqGQ==} + '@tailwindcss/oxide-win32-arm64-msvc@4.3.3': + resolution: {integrity: sha512-3rc292Ca2ceK6Ulcc/bAVnTs/3nDtoPhyEKlgPv+yQJQi/JS/AMJlqzxvlDacL1nekbrcf6bTqp/jV4qgnPxNQ==} engines: {node: '>= 20'} cpu: [arm64] os: [win32] - '@tailwindcss/oxide-win32-x64-msvc@4.2.4': - resolution: {integrity: sha512-ESlKG0EpVJQwRjXDDa9rLvhEAh0mhP1sF7sap9dNZT0yyl9SAG6T7gdP09EH0vIv0UNTlo6jPWyujD6559fZvw==} + '@tailwindcss/oxide-win32-x64-msvc@4.3.3': + resolution: {integrity: sha512-yJ0pwIVc/nYeGoV02WtsN8KYyLQv7kyI2wDnkezyJlGGjkd4QLwDGAwl47YpPJeuI0M0ObaXGSPjvWDPeTPggw==} engines: {node: '>= 20'} cpu: [x64] os: [win32] - '@tailwindcss/oxide@4.2.4': - resolution: {integrity: sha512-9El/iI069DKDSXwTvB9J4BwdO5JhRrOweGaK25taBAvBXyXqJAX+Jqdvs8r8gKpsI/1m0LeJLyQYTf/WLrBT1Q==} + '@tailwindcss/oxide@4.3.3': + resolution: {integrity: sha512-krXjAikiaFSPaK/FkAQT5UTx3VormQaiZ5hBFlJZ9UFQGB/rwg1MZIhHAG9smMQRTdyJxP6Qt5MwMtdyU5FWrA==} engines: {node: '>= 20'} - '@tailwindcss/typography@0.5.19': - resolution: {integrity: sha512-w31dd8HOx3k9vPtcQh5QHP9GwKcgbMp87j58qi6xgiBnFFtKEAgCWnDw4qUT8aHwkCp8bKvb/KGKWWHedP0AAg==} + '@tailwindcss/typography@0.5.20': + resolution: {integrity: sha512-hwbzQuNUfcPvbegQFatVPl/MY/tcM9KLl963hQ5laJKPh81TEZ1+dNG9PirGvcaDBkp+BCshExAyKVPW91dozw==} peerDependencies: - tailwindcss: '>=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1' + tailwindcss: '>=3.0.0 || >=4.0.0 || insiders' - '@tailwindcss/vite@4.2.4': - resolution: {integrity: sha512-pCvohwOCspk3ZFn6eJzrrX3g4n2JY73H6MmYC87XfGPyTty4YsCjYTMArRZm/zOI8dIt3+EcrLHAFPe5A4bgtw==} + '@tailwindcss/vite@4.3.3': + resolution: {integrity: sha512-yYU8cogLeSh/ms2jh8Fj7jaba/EWa7Ja6GoUqYZaraEuCI5YS6ms6ObZgjjedm+jm6XZjdNRWBpPP6Z86oOxcw==} peerDependencies: vite: ^5.2.0 || ^6 || ^7 || ^8 - '@testing-library/svelte-core@1.0.0': - resolution: {integrity: sha512-VkUePoLV6oOYwSUvX6ShA8KLnJqZiYMIbP2JW2t0GLWLkJxKGvuH5qrrZBV/X7cXFnLGuFQEC7RheYiZOW68KQ==} + '@testing-library/svelte-core@1.1.3': + resolution: {integrity: sha512-KkMAvXeWorxN2Yn0kdC1lfoAItxpoj4uOWzxK5leDrNxonLvS5nwBFvztrroyTszQ0Wf/EU6iLT8JhY5qcn22g==} engines: {node: '>=16'} peerDependencies: svelte: ^3 || ^4 || ^5 || ^5.0.0-next.0 @@ -1166,57 +1276,51 @@ packages: '@total-typescript/tsconfig@1.0.4': resolution: {integrity: sha512-fO4ctMPGz1kOFOQ4RCPBRBfMy3gDn+pegUfrGyUFRMv/Rd0ZM3/SHH3hFCYG4u6bPLG8OlmOGcBLDexvyr3A5w==} - '@turbo/darwin-64@2.9.6': - resolution: {integrity: sha512-X/56SnVXIQZBLKwniGTwEQTGmtE5brSACnKMBWpY3YafuxVYefrC2acamfjgxP7BG5w3I+6jf0UrLoSzgPcSJg==} + '@turbo/darwin-64@2.10.11': + resolution: {integrity: sha512-v3R+1R/Ysozyo+p7Ri8MCIbndOvYt3DgPFrGLhrhQHfvyvbxyH3WyJj+A/2JTNmNleuAlh3JUyCV0iSVHIONTA==} cpu: [x64] os: [darwin] - '@turbo/darwin-arm64@2.9.6': - resolution: {integrity: sha512-aalBeSl4agT/QtYGDyf/XLajedWzUC9Vg/pm/YO6QQ93vkQ91Vz5uK1ta5RbVRDozQSz4njxUNqRNmOXDzW+qw==} + '@turbo/darwin-arm64@2.10.11': + resolution: {integrity: sha512-R0a0CvGAeYYsBgPIgFNB3agGXh6qukjduNhFlwVVX1Ss2IdBJLXmgjytNGmo084bLKS0B6UdLRwKhXMHKKaObQ==} cpu: [arm64] os: [darwin] - '@turbo/linux-64@2.9.6': - resolution: {integrity: sha512-YKi05jnNHaD7vevgYwahpzGwbsNNTwzU2c7VZdmdFm7+cGDP4oREUWSsainiMfRqjRuolQxBwRn8wf1jmu+YZA==} + '@turbo/linux-64@2.10.11': + resolution: {integrity: sha512-dGlY2vg7jpsLjGS1bf9sD/cw1sGMAYbeHGQKGRFxd5Zaj+Ufbj8cNXl/vIit8ueCU97zhL/znn60ZV5iSfZAxw==} cpu: [x64] - os: [linux] + os: [android, linux] - '@turbo/linux-arm64@2.9.6': - resolution: {integrity: sha512-02o/ZS69cOYEDczXvOB2xmyrtzjQ2hVFtWZK1iqxXUfzMmTjZK4UumrfNnjckSg+gqeBfnPRHa0NstA173Ik3g==} + '@turbo/linux-arm64@2.10.11': + resolution: {integrity: sha512-eSP9+jjsSCBs2x0QpJZlp49dSD1EIMwXH7PsMIhdWk7w6IThhuKJ+jL95JQ2IW7tRjRmdh8gKcKQtrHLD5R5lA==} cpu: [arm64] - os: [linux] + os: [android, linux] - '@turbo/windows-64@2.9.6': - resolution: {integrity: sha512-wVdQjvnBI15wB6JrA+43CtUtagjIMmX6XYO758oZHAsCNSxqRlJtdyujih0D8OCnwCRWiGWGI63zAxR0hO6s9g==} + '@turbo/windows-64@2.10.11': + resolution: {integrity: sha512-4aD7edogJ8arK8DOyvjTI2KKwmchD5M/WM4BZgidrtFf7aSgn8Ce2rJnDwmriw980c2cKlHnhXtlGy38VtKB8g==} cpu: [x64] os: [win32] - '@turbo/windows-arm64@2.9.6': - resolution: {integrity: sha512-1XUUyWW0W6FTSqGEhU8RHVqb2wP1SPkr7hIvBlMEwH9jr+sJQK5kqeosLJ/QaUv4ecSAd1ZhIrLoW7qslAzT4A==} + '@turbo/windows-arm64@2.10.11': + resolution: {integrity: sha512-m8tJkIrTrbQ9O1uHxV0GUq623Zg1678xGna8eMsy4KbygUX/wVFgdZDYV/AxyoyaW/U7nyKoBvaDVwm22p9xqA==} cpu: [arm64] os: [win32] - '@tybys/wasm-util@0.10.1': - resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==} - '@types/argparse@1.0.38': resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==} '@types/chai@5.2.3': resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==} - '@types/color-convert@2.0.3': - resolution: {integrity: sha512-2Q6wzrNiuEvYxVQqhh7sXM2mhIhvZR/Paq4FdsQkOMgWsCIkKvSGj8Le1/XalulrmgOzPMqNa0ix+ePY4hTrfg==} + '@types/color-convert@2.0.4': + resolution: {integrity: sha512-Ub1MmDdyZ7mX//g25uBAoH/mWGd9swVbt8BseymnaE18SU4po/PjmCrHxqIIRjBo3hV/vh1KGr0eMxUhp+t+dQ==} - '@types/color-name@1.1.4': - resolution: {integrity: sha512-hulKeREDdLFesGQjl96+4aoJSHY5b2GRjagzzcqCfIrWhe5vkCqIvrLbqzBaI1q94Vg8DNJZZqTR5ocdWmWclg==} + '@types/color-name@1.1.5': + resolution: {integrity: sha512-j2K5UJqGTxeesj6oQuGpMgifpT5k9HprgQd8D1Y0lOFqKHl3PJu5GMeS4Y5EgjS55AE6OQxf8mPED9uaGbf4Cg==} '@types/color@4.2.1': resolution: {integrity: sha512-ResWeDLy1vozIMbD6JLRKuNBbIcIlBkjTIxVHHd5Cqtm77T+ahH3BWE/PWv1OhFd1HAwcn8no4ig2uTaRXpYQQ==} - '@types/cookie@0.6.0': - resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} - '@types/deep-eql@4.0.2': resolution: {integrity: sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==} @@ -1229,93 +1333,100 @@ packages: '@types/estree@1.0.8': resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==} + '@types/estree@1.0.9': + resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==} + '@types/golang-wasm-exec@1.15.2': resolution: {integrity: sha512-NA77toY4yOiiV5foDVT/rfxmtoox7ASHqGs4Eek8xTMcKWwAhZLOD3SYfLQKq4P2jtOLQQkeISq3zSuQ1Y+apg==} '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/node@24.12.2': - resolution: {integrity: sha512-A1sre26ke7HDIuY/M23nd9gfB+nrmhtYyMINbjI1zHJxYteKR6qSMX56FsmjMcDb3SMcjJg5BiRRgOCC/yBD0g==} + '@types/node@26.2.0': + resolution: {integrity: sha512-5IviulTZeRNp2vAJ514cc/HUlY5nZ9fCbq9DMyC52BrhFZACo3nI0R7qBxhQmo/d27NFe96ur/b7Wwxklda+kg==} '@types/trusted-types@2.0.7': resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==} - '@typescript-eslint/eslint-plugin@8.59.0': - resolution: {integrity: sha512-HyAZtpdkgZwpq8Sz3FSUvCR4c+ScbuWa9AksK2Jweub7w4M3yTz4O11AqVJzLYjy/B9ZWPyc81I+mOdJU/bDQw==} + '@typescript-eslint/eslint-plugin@8.67.0': + resolution: {integrity: sha512-Un7Heoyj65NREbKAyIrFxeM143NZpExWmy1Nep4DLeQOeLlTeumPjoNKnBrU5D5moWXbPJgRa5Uwcdu0faVNGQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@typescript-eslint/parser': ^8.59.0 + '@typescript-eslint/parser': ^8.67.0 eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/parser@8.59.0': - resolution: {integrity: sha512-TI1XGwKbDpo9tRW8UDIXCOeLk55qe9ZFGs8MTKU6/M08HWTw52DD/IYhfQtOEhEdPhLMT26Ka/x7p70nd3dzDg==} + '@typescript-eslint/parser@8.67.0': + resolution: {integrity: sha512-fUBfTuuEulWqX6V8+O3PtScV01tzYYRUDTAirHFKoRAt7nOzoGiPt0M/bB47wWNy0coOOcgEwAMUtBpykMxl6w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/project-service@8.59.0': - resolution: {integrity: sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw==} + '@typescript-eslint/project-service@8.67.0': + resolution: {integrity: sha512-cvE8c7ulYeXN9fYuszhCeCsbzyVEXuhrRCybnBre7TUmqb5nRmBfQAwCj0O3WJFDeyAZt4VYv51vMCC9LHSdYw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/scope-manager@8.59.0': - resolution: {integrity: sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==} + '@typescript-eslint/scope-manager@8.67.0': + resolution: {integrity: sha512-EgvsleTwS4E+WzzSvem8fAUubLwatMNF1B5hHSLQxcvs7q2dtRhGyujHwLJSYlG41niJ7GP24Aha2+0mb1b2kg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/tsconfig-utils@8.59.0': - resolution: {integrity: sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg==} + '@typescript-eslint/tsconfig-utils@8.67.0': + resolution: {integrity: sha512-vV+LUSv5njUWsknE71fqKTlXUva+R76SaeORd6Zojcunk/6DvKFXONU3BrAs2H49mbygUXt6gbYunzwqNwlhdg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/type-utils@8.59.0': - resolution: {integrity: sha512-3TRiZaQSltGqGeNrJzzr1+8YcEobKH9rHnqIp/1psfKFmhRQDNMGP5hBufanYTGznwShzVLs3Mz+gDN7HkWfXg==} + '@typescript-eslint/type-utils@8.67.0': + resolution: {integrity: sha512-aVWDXbRmdXO9siTfX4ditQI1T9+zVcNazT48EJCD0v40/9RIFoUgZ05CmGEq9H2gixRpjUn/iplwvlcvutJW/Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/types@8.59.0': - resolution: {integrity: sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==} + '@typescript-eslint/types@8.67.0': + resolution: {integrity: sha512-sBtgslww8nsMYUjhdPBiSyUqSzT8uR6g93A2QXnQC8+cGdjz0CyaOdqHDRJb1AtORbZCNUJBBeFA/tNR2uQmww==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.59.0': - resolution: {integrity: sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw==} + '@typescript-eslint/typescript-estree@8.67.0': + resolution: {integrity: sha512-EKQBCE9yNlRJYm7jdTW5AhDacDUmSwQb0FAJAmK2EKYrNXIsa2vxcSZx6PvJ/dEdI6lS+Y9W+EXckLj0iPFGcw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/utils@8.59.0': - resolution: {integrity: sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g==} + '@typescript-eslint/utils@8.67.0': + resolution: {integrity: sha512-U9D1FdwEWBwok3hxxSdhclMb0twvt9QnjIQ0VfQ1AiX2epnpSgv2ubVDsayOFyY8K6FX+AQ7E0FKWVG3iKsj1A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/visitor-keys@8.59.0': - resolution: {integrity: sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==} + '@typescript-eslint/visitor-keys@8.67.0': + resolution: {integrity: sha512-fkv8dHRDqfGtTHuJeebdrQ7cX6Ad4WAS00rgHh9UGvMycF1mjBfsxry1XsLIFhWZ6Judlh6UdzK+TYlbpCXgnA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@vitest/browser-playwright@4.1.5': - resolution: {integrity: sha512-CWy0lBQJq97nionyJJdnaU4961IXTl43a7UCu5nHy51IoKxAt6PVIJLo+76rVl7KOOgcWHNkG4kbJu/pW7knvA==} + '@typescript/typescript6@6.0.2': + resolution: {integrity: sha512-mbCddXd+jm7hfx7w2YU64/Av4/NqqeG3GoRZgxPcgoTxYjhrcfJRw9ULch71SS4G+Q3bOXFhRvPqjguN0Hyp5w==} + hasBin: true + + '@vitest/browser-playwright@4.1.11': + resolution: {integrity: sha512-riLBxPqwnJ0lWs2DN2WeUfYeKLoAjbP2Xx8cLQdSddzMi20sksIa6K2mPz79DyMZKKVKH2ksOC2yJvtNcZg8cg==} peerDependencies: playwright: '*' - vitest: 4.1.5 + vitest: 4.1.11 - '@vitest/browser@4.1.5': - resolution: {integrity: sha512-iCDGI8c4yg+xmjUg2VsygdAUSIIB4x5Rht/P68OXy1hPELKXHDkzh87lkuTcdYmemRChDkEpB426MmDjzC0ziA==} + '@vitest/browser@4.1.11': + resolution: {integrity: sha512-bwMovvAeuTFOK5kIFevw4VEf+1gVEICv4SYK4k3knJOxl6b1zEWud8mYKD73e1B0odAn174h1MofURy2TPWf3w==} peerDependencies: - vitest: 4.1.5 + vitest: 4.1.11 - '@vitest/expect@4.1.5': - resolution: {integrity: sha512-PWBaRY5JoKuRnHlUHfpV/KohFylaDZTupcXN1H9vYryNLOnitSw60Mw9IAE2r67NbwwzBw/Cc/8q9BK3kIX8Kw==} + '@vitest/expect@4.1.11': + resolution: {integrity: sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==} - '@vitest/mocker@4.1.5': - resolution: {integrity: sha512-/x2EmFC4mT4NNzqvC3fmesuV97w5FC903KPmey4gsnJiMQ3Be1IlDKVaDaG8iqaLFHqJ2FVEkxZk5VmeLjIItw==} + '@vitest/mocker@4.1.11': + resolution: {integrity: sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==} peerDependencies: msw: ^2.4.9 vite: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -1325,49 +1436,29 @@ packages: vite: optional: true - '@vitest/pretty-format@4.1.5': - resolution: {integrity: sha512-7I3q6l5qr03dVfMX2wCo9FxwSJbPdwKjy2uu/YPpU3wfHvIL4QHwVRp57OfGrDFeUJ8/8QdfBKIV12FTtLn00g==} - - '@vitest/runner@4.1.5': - resolution: {integrity: sha512-2D+o7Pr82IEO46YPpoA/YU0neeyr6FTerQb5Ro7BUnBuv6NQtT/kmVnczngiMEBhzgqz2UZYl5gArejsyERDSQ==} - - '@vitest/snapshot@4.1.5': - resolution: {integrity: sha512-zypXEt4KH/XgKGPUz4eC2AvErYx0My5hfL8oDb1HzGFpEk1P62bxSohdyOmvz+d9UJwanI68MKwr2EquOaOgMQ==} - - '@vitest/spy@4.1.5': - resolution: {integrity: sha512-2lNOsh6+R2Idnf1TCZqSwYlKN2E/iDlD8sgU59kYVl+OMDmvldO1VDk39smRfpUNwYpNRVn3w4YfuC7KfbBnkQ==} - - '@vitest/utils@4.1.5': - resolution: {integrity: sha512-76wdkrmfXfqGjueGgnb45ITPyUi1ycZ4IHgC2bhPDUfWHklY/q3MdLOAB+TF1e6xfl8NxNY0ZYaPCFNWSsw3Ug==} - - '@volar/language-core@2.4.11': - resolution: {integrity: sha512-lN2C1+ByfW9/JRPpqScuZt/4OrUUse57GLI6TbLgTIqBVemdl1wNcZ1qYGEo2+Gw8coYLgCy7SuKqn6IrQcQgg==} + '@vitest/pretty-format@4.1.11': + resolution: {integrity: sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==} - '@volar/source-map@2.4.11': - resolution: {integrity: sha512-ZQpmafIGvaZMn/8iuvCFGrW3smeqkq/IIh9F1SdSx9aUl0J4Iurzd6/FhmjNO5g2ejF3rT45dKskgXWiofqlZQ==} + '@vitest/runner@4.1.11': + resolution: {integrity: sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==} - '@volar/typescript@2.4.11': - resolution: {integrity: sha512-2DT+Tdh88Spp5PyPbqhyoYavYCPDsqbHLFwcUI9K1NlY1YgUJvujGdrqUp0zWxnW7KWNTr3xSpMuv2WnaTKDAw==} + '@vitest/snapshot@4.1.11': + resolution: {integrity: sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==} - '@vue/compiler-core@3.5.7': - resolution: {integrity: sha512-A0gay3lK71MddsSnGlBxRPOugIVdACze9L/rCo5X5srCyjQfZOfYtSFMJc3aOZCM+xN55EQpb4R97rYn/iEbSw==} + '@vitest/spy@4.1.11': + resolution: {integrity: sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==} - '@vue/compiler-dom@3.5.7': - resolution: {integrity: sha512-GYWl3+gO8/g0ZdYaJ18fYHdI/WVic2VuuUd1NsPp60DWXKy+XjdhFsDW7FbUto8siYYZcosBGn9yVBkjhq1M8Q==} + '@vitest/utils@4.1.11': + resolution: {integrity: sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==} - '@vue/compiler-vue2@2.7.16': - resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==} + '@volar/language-core@2.4.28': + resolution: {integrity: sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==} - '@vue/language-core@2.2.0': - resolution: {integrity: sha512-O1ZZFaaBGkKbsRfnVH1ifOK1/1BUkyK+3SQsfnh6PmMmD4qJcTU8godCeA96jjDRTL6zgnK7YzCHfaUlH2r0Mw==} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true + '@volar/source-map@2.4.28': + resolution: {integrity: sha512-yX2BDBqJkRXfKw8my8VarTyjv48QwxdJtvRgUpNE5erCsgEUdI2DsLbpa+rOQVAJYshY99szEcRDmyHbF10ggQ==} - '@vue/shared@3.5.7': - resolution: {integrity: sha512-NBE1PBIvzIedxIc2RZiKXvGbJkrZ2/hLf3h8GlS4/sP9xcXEZMFWOazFkNd6aGeUCMaproe5MHVYB3/4AW9q9g==} + '@volar/typescript@2.4.28': + resolution: {integrity: sha512-Ja6yvWrbis2QtN4ClAKreeUZPVYMARDYZl9LMEv1iQ1QdepB6wn0jTRxA9MftYmYa4DQ4k/DaSZpFPUfxl8giw==} '@xterm/addon-fit@0.11.0': resolution: {integrity: sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g==} @@ -1380,8 +1471,8 @@ packages: peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 - acorn@8.16.0: - resolution: {integrity: sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==} + acorn@8.18.0: + resolution: {integrity: sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==} engines: {node: '>=0.4.0'} hasBin: true @@ -1410,9 +1501,6 @@ packages: ajv@8.13.0: resolution: {integrity: sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==} - alien-signals@0.4.14: - resolution: {integrity: sha512-itUAVzhczTmP2U5yX67xVpsbbOiquusbWVyA9N+sy6+r6YVbFkahXvNCeEPWEOMhwDYwbVbGHFkVL03N9I5g+Q==} - anymatch@3.1.3: resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} engines: {node: '>= 8'} @@ -1434,6 +1522,10 @@ packages: async@2.6.4: resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} + available-typed-arrays@1.0.7: + resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} + engines: {node: '>= 0.4'} + axobject-query@4.1.0: resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==} engines: {node: '>= 0.4'} @@ -1452,15 +1544,12 @@ packages: bl@1.2.3: resolution: {integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==} - brace-expansion@1.1.11: - resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} - - brace-expansion@2.0.1: - resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} + brace-expansion@1.1.18: + resolution: {integrity: sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==} - brace-expansion@5.0.5: - resolution: {integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==} - engines: {node: 18 || 20 || >=22} + brace-expansion@5.0.9: + resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==} + engines: {node: 20 || >=22} braces@3.0.3: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} @@ -1486,6 +1575,18 @@ packages: buffer-from@1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} + call-bind-apply-helpers@1.0.2: + resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==} + engines: {node: '>= 0.4'} + + call-bind@1.0.9: + resolution: {integrity: sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==} + engines: {node: '>= 0.4'} + + call-bound@1.0.4: + resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==} + engines: {node: '>= 0.4'} + chai@6.2.2: resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==} engines: {node: '>=18'} @@ -1494,8 +1595,8 @@ packages: resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} engines: {node: '>= 8.10.0'} - chokidar@4.0.1: - resolution: {integrity: sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==} + chokidar@4.0.3: + resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} engines: {node: '>= 14.16.0'} chownr@1.1.4: @@ -1509,8 +1610,8 @@ packages: resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==} engines: {node: '>=16'} - comment-json@4.2.5: - resolution: {integrity: sha512-bKw/r35jR3HGt5PEPm1ljsQQGyCrR8sFGNiN5L+ykDHdpO8Smxkrkla9Yi6NkQyUrb8V54PGhfMs6NrIwtxtdw==} + comment-json@4.6.2: + resolution: {integrity: sha512-R2rze/hDX30uul4NZoIZ76ImSJLFxn/1/ZxtKC1L77y2X1k+yYu1joKbAtMA2Fg3hZrTOiw0I5mwVMo0cf250w==} engines: {node: '>= 6'} compare-versions@6.1.1: @@ -1522,8 +1623,8 @@ packages: confbox@0.1.8: resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==} - confbox@0.2.2: - resolution: {integrity: sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==} + confbox@0.2.4: + resolution: {integrity: sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==} consola@3.4.0: resolution: {integrity: sha512-EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==} @@ -1532,9 +1633,9 @@ packages: convert-source-map@2.0.0: resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} - cookie@0.6.0: - resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} - engines: {node: '>= 0.6'} + cookie@2.0.1: + resolution: {integrity: sha512-yuToqVvRrj6pfDXREyQAAv8SkAEk/8GS3jQRTiUMm66TVtBYmqQeoEjL2Lmq8Rpo6271vH76InTChTitEAm65w==} + engines: {node: '>=22'} core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} @@ -1548,11 +1649,8 @@ packages: engines: {node: '>=4'} hasBin: true - daisyui@5.5.19: - resolution: {integrity: sha512-pbFAkl1VCEh/MPCeclKL61I/MqRIFFhNU7yiXoDDRapXN4/qNCoMxeCCswyxEEhqL5eiTTfwHvucFtOE71C9sA==} - - de-indent@1.0.2: - resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==} + daisyui@5.7.20: + resolution: {integrity: sha512-qoL9qXXo/K/MzcteD1SvZOSeBaL8F9qBJvwX3KEpiVHQLzIEtGkNl/ZznSI7J0d+qnQJa2dAAFzTFDAx9df1rw==} debug@4.4.3: resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} @@ -1563,14 +1661,6 @@ packages: supports-color: optional: true - dedent@1.5.1: - resolution: {integrity: sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==} - peerDependencies: - babel-plugin-macros: ^3.1.0 - peerDependenciesMeta: - babel-plugin-macros: - optional: true - deep-is@0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} @@ -1578,43 +1668,59 @@ packages: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} - detect-libc@2.0.3: - resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==} + define-data-property@1.1.4: + resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} + engines: {node: '>= 0.4'} + + detect-libc@2.1.2: + resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==} engines: {node: '>=8'} - devalue@5.7.1: - resolution: {integrity: sha512-MUbZ586EgQqdRnC4yDrlod3BEdyvE4TapGYHMW2CiaW+KkkFmWEFqBUaLltEZCGi0iFXCEjRF0OjF0DV2QHjOA==} + devalue@5.9.1: + resolution: {integrity: sha512-+17vil3EVQRzvtDJSFuTWEb8XJRvXqAiV3qZyQWD398QeXUa6CxsUyMdD1fxzEhUrd4FojitFz7lhIHBTlV4fw==} - diff@8.0.2: - resolution: {integrity: sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg==} + diff@8.0.4: + resolution: {integrity: sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==} engines: {node: '>=0.3.1'} - dompurify@3.2.7: - resolution: {integrity: sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==} + dompurify@3.4.8: + resolution: {integrity: sha512-yb1cEmaOum7wFvOCSQxyfgVlv5D47Rc30iZWoMpbDIWTnJ6grDDQyu2KFJzB2k7u0pMuJcQ1zphH//fFnw2tjQ==} doppiojvm@0.5.0: resolution: {integrity: sha512-8KuYG48nTBs2ixltiL+fn+8meD8uxcBHz1xNlM19+jOhj0rhq3t5jQfcKZWl2Glcw6vN+ZluWZvHtZ/H+tLlRg==} hasBin: true + dunder-proto@1.0.1: + resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==} + engines: {node: '>= 0.4'} + duplexify@3.7.1: resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==} - end-of-stream@1.4.4: - resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} + end-of-stream@1.4.5: + resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==} - enhanced-resolve@5.21.0: - resolution: {integrity: sha512-otxSQPw4lkOZWkHpB3zaEQs6gWYEsmX4xQF68ElXC/TWvGxGMSGOvoNbaLXm6/cS/fSfHtsEdw90y20PCd+sCA==} + enhanced-resolve@5.24.5: + resolution: {integrity: sha512-L1l8TNvomm6UVW5B253AGxQagSQr+vGwhMlrrfRS2qmhx46AMpMVJKQYLvWYbysTMY8VoicOvzHzoHMbyzB+4A==} engines: {node: '>=10.13.0'} - entities@4.5.0: - resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} - engines: {node: '>=0.12'} + es-define-property@1.0.1: + resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==} + engines: {node: '>= 0.4'} + + es-errors@1.3.0: + resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} + engines: {node: '>= 0.4'} + + es-module-lexer@2.3.2: + resolution: {integrity: sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==} - es-module-lexer@2.1.0: - resolution: {integrity: sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==} + es-object-atoms@1.1.2: + resolution: {integrity: sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==} + engines: {node: '>= 0.4'} - esbuild@0.28.0: - resolution: {integrity: sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==} + esbuild@0.28.2: + resolution: {integrity: sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==} engines: {node: '>=18'} hasBin: true @@ -1628,8 +1734,8 @@ packages: peerDependencies: eslint: '>=7.0.0' - eslint-plugin-svelte@3.17.1: - resolution: {integrity: sha512-NyiXHtS3Ni7e532RBwS9OXlMKDIrENg3gY+/+ODjZzQx2xhU3NlJ+nIl1a93iUUQeiJL3lS8KLmY+W8hklzweQ==} + eslint-plugin-svelte@3.23.0: + resolution: {integrity: sha512-n9jRklDqy0+W834568a4ZIZTK7DHXxvvHHxxGP8nNq7N//pOZMubttskHOquyGgfTR4Z05q2NdGNlsTpIEA48w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.1 || ^9.0.0 || ^10.0.0 @@ -1658,8 +1764,8 @@ packages: resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} - eslint@10.2.1: - resolution: {integrity: sha512-wiyGaKsDgqXvF40P8mDwiUp/KQjE1FdrIEJsM8PZ3XCiniTMXS3OHWWUe5FI5agoCnr8x4xPrTDZuxsBlNHl+Q==} + eslint@10.9.0: + resolution: {integrity: sha512-5KeEOJZBfEVA47boFiBsf+6MmmJpffM7qEBg4pLla2e4nlKgdKlqCW0oSLOGsT8Wl5uCGJptLV1bkaiShj90Gw==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} hasBin: true peerDependencies: @@ -1688,8 +1794,8 @@ packages: resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==} engines: {node: '>=0.10'} - esrap@2.2.5: - resolution: {integrity: sha512-/yLB1538mag+dn0wsePTe8C0rDIjUOaJpMs2McodSzmM2msWcZsBSdRtg6HOBt0A/r82BN+Md3pgwSc/uWt2Ig==} + esrap@2.3.6: + resolution: {integrity: sha512-yc0OC12UjPqLoc+fe+v5GNs4TOjAigUw3sTikfC+xeBPGUw7gDRz3DtYaqEhxyMVJojcSWJw7jT0QWR+CbuE/A==} peerDependencies: '@typescript-eslint/types': ^8.2.0 peerDependenciesMeta: @@ -1714,12 +1820,12 @@ packages: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} - expect-type@1.3.0: - resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==} + expect-type@1.4.0: + resolution: {integrity: sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==} engines: {node: '>=12.0.0'} - exsolve@1.0.8: - resolution: {integrity: sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==} + exsolve@1.1.1: + resolution: {integrity: sha512-9U/jZUgjnSGyntRr6y5Muu1MJcwFl6kPu7k8qLF0IMNfLqvw0NZ4nnVDq0RVoZ0RvCyumib4Ez3KYrVfilrw+g==} fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} @@ -1742,6 +1848,9 @@ packages: picomatch: optional: true + fflate@0.8.3: + resolution: {integrity: sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==} + file-entry-cache@8.0.0: resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} engines: {node: '>=16.0.0'} @@ -1758,14 +1867,18 @@ packages: resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} engines: {node: '>=16'} - flatted@3.3.3: - resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==} + flatted@3.4.4: + resolution: {integrity: sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==} + + for-each@0.3.5: + resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==} + engines: {node: '>= 0.4'} fs-constants@1.0.0: resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} - fs-extra@11.3.2: - resolution: {integrity: sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==} + fs-extra@11.3.6: + resolution: {integrity: sha512-w8ZNZr2mKIc7qeNaQ9AVPT1+iFaI+Avd4xudVOvdDJ8VytREi1Ft5Ih7hd9jjehod8vAM5GMsfQ/TpPf4EyoEA==} engines: {node: '>=14.14'} fs.realpath@1.0.0: @@ -1784,6 +1897,14 @@ packages: function-bind@1.1.2: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} + get-intrinsic@1.3.0: + resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==} + engines: {node: '>= 0.4'} + + get-proto@1.0.1: + resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==} + engines: {node: '>= 0.4'} + glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -1800,10 +1921,14 @@ packages: resolution: {integrity: sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==} engines: {node: '>=18'} - globals@17.5.0: - resolution: {integrity: sha512-qoV+HK2yFl/366t2/Cb3+xxPUo5BuMynomoDmiaZBIdbs+0pYbjfZU+twLhGKp4uCZ/+NbtpVepH5bGCxRyy2g==} + globals@17.11.0: + resolution: {integrity: sha512-Z2I8hM+PbJDXQDq3Icgpzv+mPdwr68iZUU9d5WW4FuXfDUQfkZaZuvjMv42/5crNyw154+9+VWXbYrUgDXbxNw==} engines: {node: '>=18'} + gopd@1.2.0: + resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==} + engines: {node: '>= 0.4'} + graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} @@ -1815,34 +1940,36 @@ packages: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} - has-own-prop@2.0.0: - resolution: {integrity: sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==} - engines: {node: '>=8'} + has-property-descriptors@1.0.2: + resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} - hasown@2.0.2: - resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} + has-symbols@1.1.0: + resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==} engines: {node: '>= 0.4'} - he@1.2.0: - resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} - hasBin: true + has-tostringtag@1.0.2: + resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==} + engines: {node: '>= 0.4'} - human-id@4.1.1: - resolution: {integrity: sha512-3gKm/gCSUipeLsRYZbbdA1BD83lBoWUkZ7G9VFrhWPAU76KwYo5KR8V28bpoPm/ygy0x5/GCbpRQdY7VLYCoIg==} - hasBin: true + hasown@2.0.4: + resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==} + engines: {node: '>= 0.4'} ignore@5.3.2: resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} engines: {node: '>= 4'} - ignore@7.0.5: - resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==} + ignore@7.0.6: + resolution: {integrity: sha512-BAg6QkE8W+TuQLrrw0Ugr7HegXduRuuj8/ti2kSOc+jz1dmx8/WNcjr6XGnq5YpDWxFwwaavqD0+jIUOKelTsw==} engines: {node: '>= 4'} import-lazy@4.0.0: resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==} engines: {node: '>=8'} + import-meta-resolve@4.2.0: + resolution: {integrity: sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==} + imurmurhash@0.1.4: resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} engines: {node: '>=0.8.19'} @@ -1862,8 +1989,12 @@ packages: resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} engines: {node: '>=8'} - is-core-module@2.15.1: - resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==} + is-callable@1.2.7: + resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} + engines: {node: '>= 0.4'} + + is-core-module@2.16.2: + resolution: {integrity: sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==} engines: {node: '>= 0.4'} is-deflate@1.0.0: @@ -1888,22 +2019,26 @@ packages: is-reference@3.0.3: resolution: {integrity: sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==} + is-typed-array@1.1.15: + resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==} + engines: {node: '>= 0.4'} + isarray@1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} + isarray@2.0.5: + resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==} + isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - jiti@2.6.1: - resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==} + jiti@2.7.0: + resolution: {integrity: sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==} hasBin: true jju@1.4.0: resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==} - js-sha256@0.11.0: - resolution: {integrity: sha512-6xNlKayMZvds9h1Y1VWc0fQHQ82BxTXizWPEtEeGvmOUYpBRy4gbWroHLpzowe6xiQhHpelCQiE7HEdznyBL9Q==} - json-buffer@3.0.1: resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} @@ -1921,24 +2056,20 @@ packages: engines: {node: '>=6'} hasBin: true - jsonfile@6.1.0: - resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==} + jsonfile@6.2.1: + resolution: {integrity: sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==} keyv@4.5.4: resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} - kleur@4.1.5: - resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} - engines: {node: '>=6'} - known-css-properties@0.37.0: resolution: {integrity: sha512-JCDrsP4Z1Sb9JwG0aJ8Eo2r7k4Ou5MwmThS/6lcIe1ICyb7UBJKGRIUUdqc2ASdE/42lgz6zFUnzAIhtXnBVrQ==} kolorist@1.8.0: resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==} - kysely@0.28.16: - resolution: {integrity: sha512-3i5pmOiZvMDj00qhrIVbH0AnioVTx22DMP7Vn5At4yJO46iy+FM8Y/g61ltenLVSo3fiO8h8Q3QOFgf/gQ72ww==} + kysely@0.28.17: + resolution: {integrity: sha512-nbD8lB9EB3wNdMhOCdx5Li8DxnLbvKByylRLcJ1h+4SkrowVeECAyZlyiKMThF7xFdRz0jSQ2MoJr+wXux2y0Q==} engines: {node: '>=20.0.0'} levn@0.4.1: @@ -1951,76 +2082,146 @@ packages: cpu: [arm64] os: [android] + lightningcss-android-arm64@1.33.0: + resolution: {integrity: sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [android] + lightningcss-darwin-arm64@1.32.0: resolution: {integrity: sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [darwin] + lightningcss-darwin-arm64@1.33.0: + resolution: {integrity: sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [darwin] + lightningcss-darwin-x64@1.32.0: resolution: {integrity: sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [darwin] + lightningcss-darwin-x64@1.33.0: + resolution: {integrity: sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [darwin] + lightningcss-freebsd-x64@1.32.0: resolution: {integrity: sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [freebsd] + lightningcss-freebsd-x64@1.33.0: + resolution: {integrity: sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [freebsd] + lightningcss-linux-arm-gnueabihf@1.32.0: resolution: {integrity: sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==} engines: {node: '>= 12.0.0'} cpu: [arm] os: [linux] + lightningcss-linux-arm-gnueabihf@1.33.0: + resolution: {integrity: sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==} + engines: {node: '>= 12.0.0'} + cpu: [arm] + os: [linux] + lightningcss-linux-arm64-gnu@1.32.0: resolution: {integrity: sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + lightningcss-linux-arm64-gnu@1.33.0: + resolution: {integrity: sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + lightningcss-linux-arm64-musl@1.32.0: resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + lightningcss-linux-arm64-musl@1.33.0: + resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + lightningcss-linux-x64-gnu@1.32.0: resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + lightningcss-linux-x64-gnu@1.33.0: + resolution: {integrity: sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + lightningcss-linux-x64-musl@1.32.0: resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + lightningcss-linux-x64-musl@1.33.0: + resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + lightningcss-win32-arm64-msvc@1.32.0: resolution: {integrity: sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [win32] + lightningcss-win32-arm64-msvc@1.33.0: + resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [win32] + lightningcss-win32-x64-msvc@1.32.0: resolution: {integrity: sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [win32] + lightningcss-win32-x64-msvc@1.33.0: + resolution: {integrity: sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [win32] + lightningcss@1.32.0: resolution: {integrity: sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==} engines: {node: '>= 12.0.0'} + lightningcss@1.33.0: + resolution: {integrity: sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==} + engines: {node: '>= 12.0.0'} + lilconfig@2.1.0: resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} engines: {node: '>=10'} - local-pkg@1.1.2: - resolution: {integrity: sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==} + local-pkg@1.2.1: + resolution: {integrity: sha512-++gUqRDEvcnN6Zhqrr+y/CkVEHhlrR96vZn3nZZPYzMcBUyBtTKzB9NadClFIsIVSsu+3i9tfk/erqy9kAmt7Q==} engines: {node: '>=14'} locate-character@3.0.0: @@ -2030,8 +2231,11 @@ packages: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} - lodash@4.17.21: - resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + lodash@4.17.23: + resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==} + + lodash@4.18.1: + resolution: {integrity: sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==} lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} @@ -2043,30 +2247,33 @@ packages: magic-string@0.30.21: resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==} + magic-string@1.2.2: + resolution: {integrity: sha512-veT/+7iXrXzT39XnEN4lOxtNl72dMgJ8Lp+5Bd6YcMSWpb0n0MjBM8Uuooi6jgJr8dhUW2swQgBmoZVMni5SVg==} + marked@14.0.0: resolution: {integrity: sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==} engines: {node: '>= 18'} hasBin: true - marked@18.0.2: - resolution: {integrity: sha512-NsmlUYBS/Zg57rgDWMYdnre6OTj4e+qq/JS2ot3KrYLSoHLw+sDu0Nm1ZGpRgYAq6c+b1ekaY5NzVchMCQnzcg==} + marked@18.0.10: + resolution: {integrity: sha512-FJeH4bRpYoXiggcgriCGItKCSv3xkngJc4QCZ/rkQCogU3VYaLxYJoZl8Nw/b4+x7iij/pd+09mZ6A1dXzpL0A==} engines: {node: '>= 20'} hasBin: true + math-intrinsics@1.1.0: + resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==} + engines: {node: '>= 0.4'} + minimatch@10.0.3: resolution: {integrity: sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==} engines: {node: 20 || >=22} - minimatch@10.2.5: - resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==} + minimatch@10.2.6: + resolution: {integrity: sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==} engines: {node: 18 || 20 || >=22} - minimatch@3.1.2: - resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} - - minimatch@9.0.5: - resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==} - engines: {node: '>=16 || 14 >=14.17'} + minimatch@3.1.5: + resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==} minimist@0.0.10: resolution: {integrity: sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==} @@ -2078,8 +2285,8 @@ packages: resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} hasBin: true - mlly@1.8.0: - resolution: {integrity: sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==} + mlly@1.8.2: + resolution: {integrity: sha512-d+ObxMQFmbt10sretNDytwt85VrbkhhUA/JBGm1MPaWJ65Cl4wOgLaB1NYvJSZ0Ef03MMEU/0xpPMXUIQ29UfA==} monaco-editor-textmate@4.0.0: resolution: {integrity: sha512-Clwup5LJzVfwURQrS+odSEC5/hZBEG36pQnvBKt4OtBndF8r2xLeXUZcK/AqEBK2u0Npy7frFp9hG7m66Ol9hA==} @@ -2087,8 +2294,8 @@ packages: monaco-editor: 0.x.x monaco-textmate: ^3.0.0 - monaco-editor@0.55.1: - resolution: {integrity: sha512-jz4x+TJNFHwHtwuV9vA9rMujcZRb0CEilTEwG2rRSpe/A7Jdkuj8xPKttCgOh+v/lkHy7HsZ64oj+q3xoAFl9A==} + monaco-editor@0.56.0: + resolution: {integrity: sha512-sXboRm3BeBeLm938eaiyLMe0OxzfXIlZvbv4ir/jVgQy1zDhWjgmny0WoN45fuDKhCCQsYMbBJrv/A6jd8aCUg==} monaco-textmate@3.0.1: resolution: {integrity: sha512-ZxxY3OsqUczYP1sGqo97tu+CJmMBwuSW+dL0WEBdDhOZ5G1zntw72hvBc68ZQAirosWvbDKgN1dL5k173QtFww==} @@ -2104,18 +2311,15 @@ packages: resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} engines: {node: '>=4'} - mrmime@2.0.0: - resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==} + mrmime@2.0.1: + resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==} engines: {node: '>=10'} ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - muggle-string@0.4.1: - resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==} - - nanoid@3.3.11: - resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==} + nanoid@3.3.18: + resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -2126,8 +2330,9 @@ packages: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} - obug@2.1.1: - resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==} + obug@2.1.4: + resolution: {integrity: sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==} + engines: {node: '>=12.20.0'} once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} @@ -2146,6 +2351,19 @@ packages: resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==} engines: {node: '>= 0.8.0'} + oxfmt@0.64.0: + resolution: {integrity: sha512-XZ4GFBN/PLbXKq+0zrgpQfPKYuJlUuj+nzZJY7UpIbFMNyefNLCdN9EwViycNqnYcv0wrn0jXcQLlqJp8RCKBg==} + engines: {node: ^20.19.0 || >=22.12.0} + hasBin: true + peerDependencies: + svelte: ^5.0.0 + vite-plus: '*' + peerDependenciesMeta: + svelte: + optional: true + vite-plus: + optional: true + p-limit@3.1.0: resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} engines: {node: '>=10'} @@ -2154,12 +2372,12 @@ packages: resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} engines: {node: '>=10'} - p-map@7.0.4: - resolution: {integrity: sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==} + p-map@7.0.6: + resolution: {integrity: sha512-I4Prw6ivkd6p8PiYR1tXASOAOBzIJwu0TB7fqaX0c/8c3QAehNYmX57EijyGGGBt3c/BIowGwV03RVBtXvHEVg==} engines: {node: '>=18'} - package-manager-detector@1.5.0: - resolution: {integrity: sha512-uBj69dVlYe/+wxj8JOpr97XfsxH/eumMt6HqjNTmJDf/6NO9s+0uxeOneIz3AsPt2m6y9PqzDzd3ATcU17MNfw==} + package-manager-detector@1.8.0: + resolution: {integrity: sha512-yQA4H19AmPEoMUeavPMDIe1higySl/gH/yaQrkT/s07Qp+7pp2hYz30N3z2l5BkjVkF9Ow6o0wjJamm2y7Sn0A==} pako@0.2.9: resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==} @@ -2194,34 +2412,38 @@ packages: picocolors@1.1.1: resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} - picomatch@2.3.1: - resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} + picomatch@2.3.2: + resolution: {integrity: sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==} engines: {node: '>=8.6'} - picomatch@4.0.4: - resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==} + picomatch@4.0.5: + resolution: {integrity: sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==} engines: {node: '>=12'} pkg-types@1.3.1: resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} - pkg-types@2.3.0: - resolution: {integrity: sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==} + pkg-types@2.3.1: + resolution: {integrity: sha512-y+ichcgc2LrADuhLNAx8DFjVfgz91pRxfZdI3UDhxHvcVEZsenLO+7XaU5vOp0u/7V/wZ+plyuQxtrDlZJ+yeg==} - playwright-core@1.59.1: - resolution: {integrity: sha512-HBV/RJg81z5BiiZ9yPzIiClYV/QMsDCKUyogwH9p3MCP6IYjUFu/MActgYAvK0oWyV9NlwM3GLBjADyWgydVyg==} - engines: {node: '>=18'} + playwright-core@1.62.1: + resolution: {integrity: sha512-wPYSwEBJY9GHraISXqyqtx0na0LpO3XEX7jNDhntbex7tzUS7kLnZsOlFruFJB4Hi/rhDMjXGqHewDZ68nYZVw==} + engines: {node: '>=20'} hasBin: true - playwright@1.59.1: - resolution: {integrity: sha512-C8oWjPR3F81yljW9o5OxcWzfh6avkVwDD2VYdwIGqTkl+OGFISgypqzfu7dOe4QNLL2aqcWBmI3PMtLIK233lw==} - engines: {node: '>=18'} + playwright@1.62.1: + resolution: {integrity: sha512-0M+L3LAD8/nm554LOla9Ayx0j0tmFZ0FBcoQ7F1VuVHpM/XpiC8RcDzBQB8W5+hA8L22THxELzeF+2WcUzvcLg==} + engines: {node: '>=20'} hasBin: true pngjs@7.0.0: resolution: {integrity: sha512-LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow==} engines: {node: '>=14.19.0'} + possible-typed-array-names@1.1.0: + resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==} + engines: {node: '>= 0.4'} + postcss-load-config@3.1.4: resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} engines: {node: '>= 10'} @@ -2250,86 +2472,20 @@ packages: resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==} engines: {node: '>=4'} - postcss-selector-parser@7.1.0: - resolution: {integrity: sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==} + postcss-selector-parser@7.1.5: + resolution: {integrity: sha512-KvvtD7SrlBP7dlgkBghEE3r84CABm5SmV2aNcG4oCA+qDnJ/tvKonFVvwWAyyWUEwxuNawdfEAZKP9zM3oZ2Uw==} engines: {node: '>=4'} - postcss@8.5.11: - resolution: {integrity: sha512-5dDj8+lmvA8XB78SmzGI8NlQoksv7IfutGWeVZxiixHbO+p4LDPT3wuG/D9sM/wrjZZ9I+Siy/e117vbFPxSZg==} + postcss@8.5.26: + resolution: {integrity: sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==} engines: {node: ^10 || ^12 || >=14} prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} - prettier-plugin-svelte@3.5.1: - resolution: {integrity: sha512-65+fr5+cgIKWKiqM1Doum4uX6bY8iFCdztvvp2RcF+AJoieaw9kJOFMNcJo/bkmKYsxFaM9OsVZK/gWauG/5mg==} - peerDependencies: - prettier: ^3.0.0 - svelte: ^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0 - - prettier-plugin-tailwindcss@0.7.3: - resolution: {integrity: sha512-lckXaWWdo2ZVXoMoUO3WIBiz9hVY+YBEh1gYyMFfrWP9WZW/wpFXQKizHx7WrFQFMkcG0bGShdpp531X1n+qpg==} - engines: {node: '>=20.19'} - peerDependencies: - '@ianvs/prettier-plugin-sort-imports': '*' - '@prettier/plugin-hermes': '*' - '@prettier/plugin-oxc': '*' - '@prettier/plugin-pug': '*' - '@shopify/prettier-plugin-liquid': '*' - '@trivago/prettier-plugin-sort-imports': '*' - '@zackad/prettier-plugin-twig': '*' - prettier: ^3.0 - prettier-plugin-astro: '*' - prettier-plugin-css-order: '*' - prettier-plugin-jsdoc: '*' - prettier-plugin-marko: '*' - prettier-plugin-multiline-arrays: '*' - prettier-plugin-organize-attributes: '*' - prettier-plugin-organize-imports: '*' - prettier-plugin-sort-imports: '*' - prettier-plugin-svelte: '*' - peerDependenciesMeta: - '@ianvs/prettier-plugin-sort-imports': - optional: true - '@prettier/plugin-hermes': - optional: true - '@prettier/plugin-oxc': - optional: true - '@prettier/plugin-pug': - optional: true - '@shopify/prettier-plugin-liquid': - optional: true - '@trivago/prettier-plugin-sort-imports': - optional: true - '@zackad/prettier-plugin-twig': - optional: true - prettier-plugin-astro: - optional: true - prettier-plugin-css-order: - optional: true - prettier-plugin-jsdoc: - optional: true - prettier-plugin-marko: - optional: true - prettier-plugin-multiline-arrays: - optional: true - prettier-plugin-organize-attributes: - optional: true - prettier-plugin-organize-imports: - optional: true - prettier-plugin-sort-imports: - optional: true - prettier-plugin-svelte: - optional: true - - prettier@3.8.3: - resolution: {integrity: sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==} - engines: {node: '>=14'} - hasBin: true - - process-nextick-args@2.0.1: - resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} + process-nextick-args@2.0.1: + resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} pump@1.0.3: resolution: {integrity: sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==} @@ -2344,8 +2500,8 @@ packages: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} - pyodide@0.29.3: - resolution: {integrity: sha512-22UBuhOJawj7vKUnS7/F3xK+515LJdjiMAHoCfuS6/PbHiOrSQVnYwDe+2sbVwiOZ3sMMexdXICew6NqOMQGgA==} + pyodide@314.0.5: + resolution: {integrity: sha512-Dl5rvbSMQP0hC3Yp61F+lr4o1vwrWZpapmJajt4KTlGWTeso7WLAp6HOIMC+26NeXjCCEF8dXw7FJ0nfQRTyPg==} engines: {node: '>=18.0.0'} quansync@0.2.11: @@ -2358,20 +2514,17 @@ packages: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} - readdirp@4.0.2: - resolution: {integrity: sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==} - engines: {node: '>= 14.16.0'} - - repeat-string@1.6.1: - resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==} - engines: {node: '>=0.10'} + readdirp@4.1.2: + resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==} + engines: {node: '>= 14.18.0'} require-from-string@2.0.2: resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} engines: {node: '>=0.10.0'} - resolve@1.22.8: - resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} + resolve@1.22.12: + resolution: {integrity: sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==} + engines: {node: '>= 0.4'} hasBin: true rimraf@2.7.1: @@ -2379,8 +2532,8 @@ packages: deprecated: Rimraf versions prior to v4 are no longer supported hasBin: true - rolldown@1.0.0-rc.17: - resolution: {integrity: sha512-ZrT53oAKrtA4+YtBWPQbtPOxIbVDbxT0orcYERKd63VJTF13zPcgXTvD4843L8pcsI7M6MErt8QtON6lrB9tyA==} + rolldown@1.2.5: + resolution: {integrity: sha512-VD2IE5PUG4Oj8zz2VGykiYd5wbnjdIiSsNQb8Qu5B+noEp+A78mu2iVvpp27g8es14Tk9rofNs5Tku9iQCS4fA==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true @@ -2404,13 +2557,14 @@ packages: engines: {node: '>=10'} hasBin: true - semver@7.7.4: - resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==} + semver@7.8.5: + resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==} engines: {node: '>=10'} hasBin: true - set-cookie-parser@3.0.1: - resolution: {integrity: sha512-n7Z7dXZhJbwuAHhNzkTti6Aw9QDDjZtm3JTpTGATIdNzdQz5GuFs22w90BcvF4INfnrL5xrX3oGsuqO5Dx3A1Q==} + set-function-length@1.2.2: + resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} + engines: {node: '>= 0.4'} shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} @@ -2453,8 +2607,8 @@ packages: stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} - std-env@4.1.0: - resolution: {integrity: sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==} + std-env@4.2.0: + resolution: {integrity: sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==} stream-shift@1.0.3: resolution: {integrity: sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==} @@ -2478,36 +2632,36 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - svelte-check@4.4.6: - resolution: {integrity: sha512-kP1zG81EWaFe9ZyTv4ZXv44Csi6Pkdpb7S3oj6m+K2ec/IcDg/a8LsFsnVLqm2nxtkSwsd5xPj/qFkTBgXHXjg==} + svelte-check@4.7.6: + resolution: {integrity: sha512-t2scM//ZuVbSY/T2w6FSBw1v9s2NEmh/g+sy1lqtosW5ylBV5AF4wFb1Ts9Kf3MbfPDUDJDZ9L436YT0SPTdvw==} engines: {node: '>= 18.0.0'} hasBin: true peerDependencies: svelte: ^4.0.0 || ^5.0.0-next.0 - typescript: '>=5.0.0' + typescript: ^5.0.0 || ^6.0.0 - svelte-eslint-parser@1.4.0: - resolution: {integrity: sha512-fjPzOfipR5S7gQ/JvI9r2H8y9gMGXO3JtmrylHLLyahEMquXI0lrebcjT+9/hNgDej0H7abTyox5HpHmW1PSWA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0, pnpm: 10.18.3} + svelte-eslint-parser@1.8.1: + resolution: {integrity: sha512-5zgKBqAf6V8Jyrmr1jViksyG4NKT8NheYwkdxRaMRDAqpGWi9wR8ktcGrAZbfMn/PHUp1BWzAp0cYQECkWuAMA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0, pnpm: 10.34.5} peerDependencies: svelte: ^3.37.0 || ^4.0.0 || ^5.0.0 peerDependenciesMeta: svelte: optional: true - svelte@5.55.5: - resolution: {integrity: sha512-2uCs/LZ9us+AktdzYJM8OcxQ8qnPS1kpaO7syGT/MgO+6Qr1Ybl+TqPq+97u7PHqmmMlye5ZkoyXONy5mjjAbw==} + svelte@5.56.10: + resolution: {integrity: sha512-Lcxbj8I/KAbpY+VjtY4ENQBV0dDCipfGAhqb51XQZ67CIQqXgsv/8dPkbILaj4Fb6/b6JAEM/PIVbILXgDQy2g==} engines: {node: '>=18'} - tailwindcss@4.2.4: - resolution: {integrity: sha512-HhKppgO81FQof5m6TEnuBWCZGgfRAWbaeOaGT00KOy/Pf/j6oUihdvBpA7ltCeAvZpFhW3j0PTclkxsd4IXYDA==} + tailwindcss@4.3.3: + resolution: {integrity: sha512-gOhV3P7ufE62QDGg1zVaTgCR+EtPv92k2nIhVcVKcLmxT1sUBsQGhnZj175j+MqRt4zLF7ic+sCYjfhxMxj7YQ==} tapable@2.3.3: resolution: {integrity: sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==} engines: {node: '>=6'} - tar-fs@1.16.3: - resolution: {integrity: sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==} + tar-fs@1.16.6: + resolution: {integrity: sha512-JkOgFt3FxM/2v2CNpAVHqMW2QASjc/Hxo7IGfNd3MHaDYSW/sBFiS7YVmmhmr8x6vwN1VFQDQGdT2MWpmIuVKA==} tar-stream@1.6.2: resolution: {integrity: sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==} @@ -2519,24 +2673,25 @@ packages: tinybench@2.9.0: resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} - tinyexec@1.0.2: - resolution: {integrity: sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==} + tinyexec@1.3.0: + resolution: {integrity: sha512-QKAl9m8gWWGHV8jZcPeym6j+XULi6tOf1mT83WYJ4Lk2ytW/uwAWkrP0uFsdoYMdueVJ0qs26wZ+23xeB4ibNQ==} engines: {node: '>=18'} - tinyglobby@0.2.16: - resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==} + tinyglobby@0.2.17: + resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==} engines: {node: '>=12.0.0'} - tinyrainbow@3.1.0: - resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==} - engines: {node: '>=14.0.0'} + tinypool@2.1.0: + resolution: {integrity: sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw==} + engines: {node: ^20.0.0 || >=22.0.0} - to-buffer@1.1.1: - resolution: {integrity: sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==} + tinyrainbow@3.1.1: + resolution: {integrity: sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw==} + engines: {node: '>=14.0.0'} - to-fast-properties@2.0.0: - resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} - engines: {node: '>=4'} + to-buffer@1.2.2: + resolution: {integrity: sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==} + engines: {node: '>= 0.4'} to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} @@ -2555,16 +2710,20 @@ packages: tslib@2.8.1: resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} - turbo@2.9.6: - resolution: {integrity: sha512-+v2QJey7ZUeUiuigkU+uFfklvNUyPI2VO2vBpMYJA+a1hKFLFiKtUYlRHdb3P9CrAvMzi0upbjI4WT+zKtqkBg==} + turbo@2.10.11: + resolution: {integrity: sha512-yQfwQVoRXwOuyX1LxiJFBFNg6VfuYh+/RyZLd82+isgyLkBXw3S5XRRzvcck1FAjSCG5sVyLd+O1eDMvYa3J7g==} hasBin: true type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} - typescript-eslint@8.59.0: - resolution: {integrity: sha512-BU3ONW9X+v90EcCH9ZS6LMackcVtxRLlI3XrYyqZIwVSHIk7Qf7bFw1z0M9Q0IUxhTMZCf8piY9hTYaNEIASrw==} + typed-array-buffer@1.0.3: + resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==} + engines: {node: '>= 0.4'} + + typescript-eslint@8.67.0: + resolution: {integrity: sha512-S2udFs8tCKEKffuJ4TB1idGUZiXdCPGi3IPBGWXarbLQ5UPXORV8QEVzJ4gCRduURMb5EkpNCdjbk0eDIuI8Yg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 @@ -2575,26 +2734,51 @@ packages: engines: {node: '>=14.17'} hasBin: true - typescript@5.9.3: - resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} - engines: {node: '>=14.17'} - hasBin: true - typescript@6.0.3: resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==} engines: {node: '>=14.17'} hasBin: true - ufo@1.6.3: - resolution: {integrity: sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q==} + ufo@1.6.4: + resolution: {integrity: sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==} - undici-types@7.16.0: - resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==} + undici-types@8.3.0: + resolution: {integrity: sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==} universalify@2.0.1: resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==} engines: {node: '>= 10.0.0'} + unplugin-dts@1.0.3: + resolution: {integrity: sha512-/GR887wfG4r1cWyt1UZsLRuMIjsmEbGkS9yJrz+0dsToHAYUD5CTyP3JMGVLv25j9K0mJcwAVvZno/aTuSUvNg==} + peerDependencies: + '@microsoft/api-extractor': '>=7' + '@rspack/core': ^1 + '@vue/language-core': ^3.1.5 + esbuild: '*' + rolldown: '*' + rollup: '>=3' + typescript: '>=4' + vite: '>=3' + webpack: ^4 || ^5 + peerDependenciesMeta: + '@microsoft/api-extractor': + optional: true + '@rspack/core': + optional: true + '@vue/language-core': + optional: true + esbuild: + optional: true + rolldown: + optional: true + rollup: + optional: true + vite: + optional: true + webpack: + optional: true + unplugin-icons@23.0.1: resolution: {integrity: sha512-rv0XEJepajKzDLvRUWASM8K+8+/CCfZn2jtogXqg6RIp7kpatRc/aFrVJn8ANQA09e++lPEEv9yX8cC9enc+QQ==} peerDependencies: @@ -2619,47 +2803,48 @@ packages: uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} - urlpattern-polyfill@10.0.0: - resolution: {integrity: sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==} + urlpattern-polyfill@10.1.0: + resolution: {integrity: sha512-IGjKp/o0NL3Bso1PymYURCJxMPNAf/ILOpendP9f5B6e1rTJgdgiOvgfoT8VxCAdY+Wisb9uhGaJJf3yZ2V9nw==} util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - uuid@11.1.0: - resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==} + uuid@14.0.2: + resolution: {integrity: sha512-xZe/16rV4aa+HGSOCiY2YeLT1OybRLrrkL/Rqaq7p7GMVXjFh+6wN4oMYgjFmnSnhY8t6Xpdl2l9qmnHYuMHwQ==} hasBin: true - uuid@14.0.0: - resolution: {integrity: sha512-Qo+uWgilfSmAhXCMav1uYFynlQO7fMFiMVZsQqZRMIXp0O7rR7qjkj+cPvBHLgBqi960QCoo/PH2/6ZtVqKvrg==} - hasBin: true - - vite-plugin-devtools-json@1.0.0: - resolution: {integrity: sha512-MobvwqX76Vqt/O4AbnNMNWoXWGrKUqZbphCUle/J2KXH82yKQiunOeKnz/nqEPosPsoWWPP9FtNuPBSYpiiwkw==} + vite-plugin-devtools-json@1.1.0: + resolution: {integrity: sha512-Fy9nMgMudGzDtUh1tGL7v0WAH0gsnZcZu2LFr/+1YxvYaJnxgbqRqv4jLU2tn5L9oqSaETHVCdDo9f8mSCQEZQ==} peerDependencies: - vite: ^5.0.0 || ^6.0.0 || ^7.0.0 + vite: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 - vite-plugin-dts@4.5.4: - resolution: {integrity: sha512-d4sOM8M/8z7vRXHHq/ebbblfaxENjogAAekcfcDCCwAyvGqnPrc7f4NZbvItS+g4WTgerW0xDwSz5qz11JT3vg==} + vite-plugin-dts@5.0.3: + resolution: {integrity: sha512-gIth6NdCEHWPiiRMCK3N6C8WjvdsrtEQrmsiG8h6Ov+lFP+b07Y+wcs9H0H7n146l0PDTYK4cQN1vgeG1pMdRQ==} peerDependencies: - typescript: '*' - vite: '*' + '@microsoft/api-extractor': '>=7' + rollup: '>=3' + vite: '>=3' peerDependenciesMeta: + '@microsoft/api-extractor': + optional: true + rollup: + optional: true vite: optional: true - vite-plugin-static-copy@4.1.0: - resolution: {integrity: sha512-9XOarNV7LgP0KBB7AApxdgFikLXx3daZdqjC3AevYsL6MrUH62zphonLUs2a6LZc1HN1GY+vQdheZ8VVJb6dQQ==} + vite-plugin-static-copy@4.1.1: + resolution: {integrity: sha512-GrlA8YklrAfSyxJ4M3fdQLOo9oNkp56IM9FYgX/WtEgeIFkPwhu4wzpufBCIuNKCa6Fn77FkRdYxkHqV0FwjAw==} engines: {node: ^22.0.0 || >=24.0.0} peerDependencies: vite: ^6.0.0 || ^7.0.0 || ^8.0.0 - vite@8.0.10: - resolution: {integrity: sha512-rZuUu9j6J5uotLDs+cAA4O5H4K1SfPliUlQwqa6YEwSrWDZzP4rhm00oJR5snMewjxF5V/K3D4kctsUTsIU9Mw==} + vite@8.2.2: + resolution: {integrity: sha512-cFKLV/PRgAUlIRm5WjMjJ86jrftzpqcgH+Us+DS8mI3CDNiH30Whrz8uHL3+MOLPAgqbMBAqWdAHAphOAM+z/Q==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: '@types/node': ^20.19.0 || >=22.12.0 - '@vitejs/devtools': ^0.1.0 + '@vitejs/devtools': ^0.4.0 || ^0.5.0 esbuild: ^0.27.0 || ^0.28.0 jiti: '>=1.21.0' less: ^4.0.0 @@ -2704,26 +2889,26 @@ packages: vite: optional: true - vitest-browser-svelte@2.1.1: - resolution: {integrity: sha512-qbunYRSm+N92r9bfTkdDTpBZESLmp4QFz2SluV3n/x8U7ysosfeXYJZ4vXbJ0Y0LzoqqDnV5LHprmFgn4Eo+Ug==} + vitest-browser-svelte@3.0.0: + resolution: {integrity: sha512-BKM9iBGNsEQzigWuSZFAiw6AJDqQqMttApoD8gM8LTI6vxfd423rDMN8GqUHJyGbhH3XcOo9N9u/4hu47Nxhsw==} peerDependencies: svelte: ^3 || ^4 || ^5 || ^5.0.0-next.0 vitest: ^4.0.0 - vitest@4.1.5: - resolution: {integrity: sha512-9Xx1v3/ih3m9hN+SbfkUyy0JAs72ap3r7joc87XL6jwF0jGg6mFBvQ1SrwaX+h8BlkX6Hz9shdd1uo6AF+ZGpg==} + vitest@4.1.11: + resolution: {integrity: sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==} engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@opentelemetry/api': ^1.9.0 '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0 - '@vitest/browser-playwright': 4.1.5 - '@vitest/browser-preview': 4.1.5 - '@vitest/browser-webdriverio': 4.1.5 - '@vitest/coverage-istanbul': 4.1.5 - '@vitest/coverage-v8': 4.1.5 - '@vitest/ui': 4.1.5 + '@vitest/browser-playwright': 4.1.11 + '@vitest/browser-preview': 4.1.11 + '@vitest/browser-webdriverio': 4.1.11 + '@vitest/coverage-istanbul': 4.1.11 + '@vitest/coverage-v8': 4.1.11 + '@vitest/ui': 4.1.11 happy-dom: '*' jsdom: '*' vite: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -2751,8 +2936,8 @@ packages: jsdom: optional: true - vscode-uri@3.0.8: - resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==} + vscode-uri@3.1.0: + resolution: {integrity: sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==} wasm-feature-detect@1.8.0: resolution: {integrity: sha512-zksaLKM2fVlnB5jQQDqKXXwYHLQUVH9es+5TOOHwGOVJOCeRBCiPjwSg+3tN2AdTCzjgli4jijCH290kXb/zWQ==} @@ -2764,6 +2949,10 @@ packages: resolution: {integrity: sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==} engines: {node: '>=4'} + which-typed-array@1.1.22: + resolution: {integrity: sha512-fvO4ExWMFsqyhG3AiPAObMuY1lxaqgYcxbc49CNdWDDECOJNgQyvsOWVwbZc+qf3rzRtxojBK+CMEv0Ld5CYpw==} + engines: {node: '>= 0.4'} + which@2.0.2: resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} engines: {node: '>= 8'} @@ -2785,8 +2974,8 @@ packages: wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} - ws@8.20.0: - resolution: {integrity: sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==} + ws@8.21.3: + resolution: {integrity: sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==} engines: {node: '>=10.0.0'} peerDependencies: bufferutil: ^4.0.1 @@ -2807,8 +2996,8 @@ packages: yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - yaml@1.10.2: - resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} + yaml@1.10.3: + resolution: {integrity: sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==} engines: {node: '>= 6'} yaml@2.5.1: @@ -2820,152 +3009,122 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} - zimmerframe@1.1.2: - resolution: {integrity: sha512-rAbqEGa8ovJy4pyBxZM70hg4pE6gDgaQ0Sl9M3enG3I0d6H4XSAM3GeNGLKnsBpuijUow064sf7ww1nutC5/3w==} + zimmerframe@1.1.4: + resolution: {integrity: sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ==} snapshots: - '@andrewbranch/untar.js@1.0.3': {} + '@andrewbranch/untar.js@1.0.4': {} '@antfu/install-pkg@1.1.0': dependencies: - package-manager-detector: 1.5.0 - tinyexec: 1.0.2 - - '@babel/helper-string-parser@7.25.7': {} - - '@babel/helper-validator-identifier@7.25.7': {} - - '@babel/parser@7.25.8': - dependencies: - '@babel/types': 7.25.8 - - '@babel/types@7.25.8': - dependencies: - '@babel/helper-string-parser': 7.25.7 - '@babel/helper-validator-identifier': 7.25.7 - to-fast-properties: 2.0.0 + package-manager-detector: 1.8.0 + tinyexec: 1.3.0 '@bjorn3/browser_wasi_shim@0.4.2': {} '@blazediff/core@1.9.1': {} - '@emnapi/core@1.10.0': - dependencies: - '@emnapi/wasi-threads': 1.2.1 - tslib: 2.8.1 + '@esbuild/aix-ppc64@0.28.2': optional: true - '@emnapi/runtime@1.10.0': - dependencies: - tslib: 2.8.1 + '@esbuild/android-arm64@0.28.2': optional: true - '@emnapi/wasi-threads@1.2.1': - dependencies: - tslib: 2.8.1 + '@esbuild/android-arm@0.28.2': optional: true - '@esbuild/aix-ppc64@0.28.0': + '@esbuild/android-x64@0.28.2': optional: true - '@esbuild/android-arm64@0.28.0': + '@esbuild/darwin-arm64@0.28.2': optional: true - '@esbuild/android-arm@0.28.0': + '@esbuild/darwin-x64@0.28.2': optional: true - '@esbuild/android-x64@0.28.0': + '@esbuild/freebsd-arm64@0.28.2': optional: true - '@esbuild/darwin-arm64@0.28.0': + '@esbuild/freebsd-x64@0.28.2': optional: true - '@esbuild/darwin-x64@0.28.0': + '@esbuild/linux-arm64@0.28.2': optional: true - '@esbuild/freebsd-arm64@0.28.0': + '@esbuild/linux-arm@0.28.2': optional: true - '@esbuild/freebsd-x64@0.28.0': + '@esbuild/linux-ia32@0.28.2': optional: true - '@esbuild/linux-arm64@0.28.0': + '@esbuild/linux-loong64@0.28.2': optional: true - '@esbuild/linux-arm@0.28.0': + '@esbuild/linux-mips64el@0.28.2': optional: true - '@esbuild/linux-ia32@0.28.0': + '@esbuild/linux-ppc64@0.28.2': optional: true - '@esbuild/linux-loong64@0.28.0': + '@esbuild/linux-riscv64@0.28.2': optional: true - '@esbuild/linux-mips64el@0.28.0': + '@esbuild/linux-s390x@0.28.2': optional: true - '@esbuild/linux-ppc64@0.28.0': + '@esbuild/linux-x64@0.28.2': optional: true - '@esbuild/linux-riscv64@0.28.0': + '@esbuild/netbsd-arm64@0.28.2': optional: true - '@esbuild/linux-s390x@0.28.0': + '@esbuild/netbsd-x64@0.28.2': optional: true - '@esbuild/linux-x64@0.28.0': + '@esbuild/openbsd-arm64@0.28.2': optional: true - '@esbuild/netbsd-arm64@0.28.0': + '@esbuild/openbsd-x64@0.28.2': optional: true - '@esbuild/netbsd-x64@0.28.0': + '@esbuild/openharmony-arm64@0.28.2': optional: true - '@esbuild/openbsd-arm64@0.28.0': + '@esbuild/sunos-x64@0.28.2': optional: true - '@esbuild/openbsd-x64@0.28.0': + '@esbuild/win32-arm64@0.28.2': optional: true - '@esbuild/openharmony-arm64@0.28.0': + '@esbuild/win32-ia32@0.28.2': optional: true - '@esbuild/sunos-x64@0.28.0': + '@esbuild/win32-x64@0.28.2': optional: true - '@esbuild/win32-arm64@0.28.0': - optional: true - - '@esbuild/win32-ia32@0.28.0': - optional: true - - '@esbuild/win32-x64@0.28.0': - optional: true - - '@eslint-community/eslint-utils@4.9.1(eslint@10.2.1(jiti@2.6.1))': + '@eslint-community/eslint-utils@4.10.1(eslint@10.9.0(jiti@2.7.0))': dependencies: - eslint: 10.2.1(jiti@2.6.1) + eslint: 10.9.0(jiti@2.7.0) eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.12.2': {} - '@eslint/compat@2.0.5(eslint@10.2.1(jiti@2.6.1))': + '@eslint/compat@2.1.0(eslint@10.9.0(jiti@2.7.0))': dependencies: '@eslint/core': 1.2.1 optionalDependencies: - eslint: 10.2.1(jiti@2.6.1) + eslint: 10.9.0(jiti@2.7.0) '@eslint/config-array@0.23.5': dependencies: '@eslint/object-schema': 3.0.5 debug: 4.4.3 - minimatch: 10.2.5 + minimatch: 10.2.6 transitivePeerDependencies: - supports-color - '@eslint/config-helpers@0.5.5': + '@eslint/config-helpers@0.7.0': dependencies: '@eslint/core': 1.2.1 @@ -2973,241 +3132,300 @@ snapshots: dependencies: '@types/json-schema': 7.0.15 - '@eslint/js@10.0.1(eslint@10.2.1(jiti@2.6.1))': + '@eslint/js@10.0.1(eslint@10.9.0(jiti@2.7.0))': optionalDependencies: - eslint: 10.2.1(jiti@2.6.1) + eslint: 10.9.0(jiti@2.7.0) '@eslint/object-schema@3.0.5': {} - '@eslint/plugin-kit@0.7.1': + '@eslint/plugin-kit@0.7.2': dependencies: '@eslint/core': 1.2.1 levn: 0.4.1 - '@humanfs/core@0.19.1': {} + '@humanfs/core@0.19.2': + dependencies: + '@humanfs/types': 0.15.0 - '@humanfs/node@0.16.7': + '@humanfs/node@0.16.8': dependencies: - '@humanfs/core': 0.19.1 + '@humanfs/core': 0.19.2 + '@humanfs/types': 0.15.0 '@humanwhocodes/retry': 0.4.3 + '@humanfs/types@0.15.0': {} + '@humanwhocodes/module-importer@1.0.1': {} '@humanwhocodes/retry@0.4.3': {} - '@iconify-json/lucide@1.2.103': + '@iconify-json/lucide@1.2.124': dependencies: '@iconify/types': 2.0.0 - '@iconify-json/vscode-icons@1.2.46': + '@iconify-json/vscode-icons@1.2.74': dependencies: '@iconify/types': 2.0.0 '@iconify/types@2.0.0': {} - '@iconify/utils@3.1.0': + '@iconify/utils@3.1.4': dependencies: '@antfu/install-pkg': 1.1.0 '@iconify/types': 2.0.0 - mlly: 1.8.0 + import-meta-resolve: 4.2.0 - '@inlang/paraglide-js@2.16.1': + '@inlang/paraglide-js@2.24.1(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1))': dependencies: '@inlang/recommend-sherlock': 0.2.1 - '@inlang/sdk': 2.9.2 + '@inlang/sdk': 3.0.2 commander: 11.1.0 consola: 3.4.0 json5: 2.2.3 unplugin: 2.3.11 - urlpattern-polyfill: 10.0.0 - transitivePeerDependencies: - - babel-plugin-macros + urlpattern-polyfill: 10.1.0 + optionalDependencies: + typescript: 6.0.3 + vite: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) '@inlang/recommend-sherlock@0.2.1': dependencies: - comment-json: 4.2.5 + comment-json: 4.6.2 - '@inlang/sdk@2.9.2': + '@inlang/sdk@3.0.2': dependencies: - '@lix-js/sdk': 0.4.10 - '@sinclair/typebox': 0.31.28 - kysely: 0.28.16 - sqlite-wasm-kysely: 0.3.0(kysely@0.28.16) - uuid: 14.0.0 - transitivePeerDependencies: - - babel-plugin-macros + '@lix-js/sdk': 0.12.3 + '@sinclair/typebox': 0.31.30 + kysely: 0.28.17 + sqlite-wasm-kysely: 0.3.0(kysely@0.28.17) + uuid: 14.0.2 - '@isaacs/balanced-match@4.0.1': {} + '@isaacs/balanced-match@4.0.1': + optional: true - '@isaacs/brace-expansion@5.0.0': + '@isaacs/brace-expansion@5.0.1': dependencies: '@isaacs/balanced-match': 4.0.1 + optional: true - '@jridgewell/gen-mapping@0.3.5': + '@jridgewell/gen-mapping@0.3.13': dependencies: - '@jridgewell/set-array': 1.2.1 '@jridgewell/sourcemap-codec': 1.5.5 - '@jridgewell/trace-mapping': 0.3.25 + '@jridgewell/trace-mapping': 0.3.31 '@jridgewell/remapping@2.3.5': dependencies: - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 + '@jridgewell/gen-mapping': 0.3.13 + '@jridgewell/trace-mapping': 0.3.31 '@jridgewell/resolve-uri@3.1.2': {} - '@jridgewell/set-array@1.2.1': {} - '@jridgewell/sourcemap-codec@1.5.5': {} - '@jridgewell/trace-mapping@0.3.25': + '@jridgewell/trace-mapping@0.3.31': dependencies: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.5 - '@lix-js/sdk@0.4.10': - dependencies: - '@lix-js/server-protocol-schema': 0.1.1 - dedent: 1.5.1 - human-id: 4.1.1 - js-sha256: 0.11.0 - kysely: 0.28.16 - sqlite-wasm-kysely: 0.3.0(kysely@0.28.16) - uuid: 14.0.0 - transitivePeerDependencies: - - babel-plugin-macros + '@lix-js/sdk-darwin-arm64@0.12.3': + optional: true + + '@lix-js/sdk-linux-arm64@0.12.3': + optional: true + + '@lix-js/sdk-linux-x64@0.12.3': + optional: true + + '@lix-js/sdk-win32-x64@0.12.3': + optional: true - '@lix-js/server-protocol-schema@0.1.1': {} + '@lix-js/sdk@0.12.3': + dependencies: + fflate: 0.8.3 + optionalDependencies: + '@lix-js/sdk-darwin-arm64': 0.12.3 + '@lix-js/sdk-linux-arm64': 0.12.3 + '@lix-js/sdk-linux-x64': 0.12.3 + '@lix-js/sdk-win32-x64': 0.12.3 - '@microsoft/api-extractor-model@7.31.3(@types/node@24.12.2)': + '@microsoft/api-extractor-model@7.31.3(@types/node@26.2.0)': dependencies: '@microsoft/tsdoc': 0.15.1 '@microsoft/tsdoc-config': 0.17.1 - '@rushstack/node-core-library': 5.18.0(@types/node@24.12.2) + '@rushstack/node-core-library': 5.18.0(@types/node@26.2.0) transitivePeerDependencies: - '@types/node' + optional: true - '@microsoft/api-extractor@7.54.0(@types/node@24.12.2)': + '@microsoft/api-extractor@7.54.0(@types/node@26.2.0)': dependencies: - '@microsoft/api-extractor-model': 7.31.3(@types/node@24.12.2) + '@microsoft/api-extractor-model': 7.31.3(@types/node@26.2.0) '@microsoft/tsdoc': 0.15.1 '@microsoft/tsdoc-config': 0.17.1 - '@rushstack/node-core-library': 5.18.0(@types/node@24.12.2) + '@rushstack/node-core-library': 5.18.0(@types/node@26.2.0) '@rushstack/rig-package': 0.6.0 - '@rushstack/terminal': 0.19.3(@types/node@24.12.2) - '@rushstack/ts-command-line': 5.1.3(@types/node@24.12.2) - diff: 8.0.2 - lodash: 4.17.21 + '@rushstack/terminal': 0.19.3(@types/node@26.2.0) + '@rushstack/ts-command-line': 5.1.3(@types/node@26.2.0) + diff: 8.0.4 + lodash: 4.17.23 minimatch: 10.0.3 - resolve: 1.22.8 + resolve: 1.22.12 semver: 7.5.4 source-map: 0.6.1 typescript: 5.8.2 transitivePeerDependencies: - '@types/node' + optional: true '@microsoft/tsdoc-config@0.17.1': dependencies: '@microsoft/tsdoc': 0.15.1 ajv: 8.12.0 jju: 1.4.0 - resolve: 1.22.8 + resolve: 1.22.12 + optional: true - '@microsoft/tsdoc@0.15.1': {} + '@microsoft/tsdoc@0.15.1': + optional: true - '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@tybys/wasm-util': 0.10.1 + '@oxc-project/types@0.146.0': {} + + '@oxfmt/binding-android-arm-eabi@0.64.0': optional: true - '@oxc-project/types@0.127.0': {} + '@oxfmt/binding-android-arm64@0.64.0': + optional: true - '@php-wasm/logger@3.1.20': {} + '@oxfmt/binding-darwin-arm64@0.64.0': + optional: true - '@php-wasm/progress@3.1.20': + '@oxfmt/binding-darwin-x64@0.64.0': + optional: true + + '@oxfmt/binding-freebsd-x64@0.64.0': + optional: true + + '@oxfmt/binding-linux-arm-gnueabihf@0.64.0': + optional: true + + '@oxfmt/binding-linux-arm-musleabihf@0.64.0': + optional: true + + '@oxfmt/binding-linux-arm64-gnu@0.64.0': + optional: true + + '@oxfmt/binding-linux-arm64-musl@0.64.0': + optional: true + + '@oxfmt/binding-linux-ppc64-gnu@0.64.0': + optional: true + + '@oxfmt/binding-linux-riscv64-gnu@0.64.0': + optional: true + + '@oxfmt/binding-linux-riscv64-musl@0.64.0': + optional: true + + '@oxfmt/binding-linux-s390x-gnu@0.64.0': + optional: true + + '@oxfmt/binding-linux-x64-gnu@0.64.0': + optional: true + + '@oxfmt/binding-linux-x64-musl@0.64.0': + optional: true + + '@oxfmt/binding-openharmony-arm64@0.64.0': + optional: true + + '@oxfmt/binding-win32-arm64-msvc@0.64.0': + optional: true + + '@oxfmt/binding-win32-ia32-msvc@0.64.0': + optional: true + + '@oxfmt/binding-win32-x64-msvc@0.64.0': + optional: true + + '@php-wasm/logger@3.1.50': {} + + '@php-wasm/progress@3.1.50': dependencies: - '@php-wasm/logger': 3.1.20 + '@php-wasm/logger': 3.1.50 - '@php-wasm/stream-compression@3.1.20': + '@php-wasm/stream-compression@3.1.50': dependencies: - '@php-wasm/util': 3.1.20 + '@php-wasm/util': 3.1.50 - '@php-wasm/universal@3.1.20': + '@php-wasm/universal@3.1.50': dependencies: - '@php-wasm/logger': 3.1.20 - '@php-wasm/progress': 3.1.20 - '@php-wasm/stream-compression': 3.1.20 - '@php-wasm/util': 3.1.20 + '@php-wasm/logger': 3.1.50 + '@php-wasm/progress': 3.1.50 + '@php-wasm/stream-compression': 3.1.50 + '@php-wasm/util': 3.1.50 ini: 4.1.2 - '@php-wasm/util@3.1.20': {} + '@php-wasm/util@3.1.50': {} - '@php-wasm/web-8-5@3.1.20': + '@php-wasm/web-8-5@3.1.50': dependencies: - '@php-wasm/universal': 3.1.20 - ini: 4.1.2 + '@php-wasm/universal': 3.1.50 wasm-feature-detect: 1.8.0 '@polka/url@1.0.0-next.29': {} - '@rolldown/binding-android-arm64@1.0.0-rc.17': + '@rolldown/binding-android-arm-eabi@1.2.5': optional: true - '@rolldown/binding-darwin-arm64@1.0.0-rc.17': + '@rolldown/binding-android-arm64@1.2.5': optional: true - '@rolldown/binding-darwin-x64@1.0.0-rc.17': + '@rolldown/binding-darwin-arm64@1.2.5': optional: true - '@rolldown/binding-freebsd-x64@1.0.0-rc.17': + '@rolldown/binding-darwin-x64@1.2.5': optional: true - '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.17': + '@rolldown/binding-freebsd-x64@1.2.5': optional: true - '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.17': + '@rolldown/binding-linux-arm-gnueabihf@1.2.5': optional: true - '@rolldown/binding-linux-arm64-musl@1.0.0-rc.17': + '@rolldown/binding-linux-arm64-gnu@1.2.5': optional: true - '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.17': + '@rolldown/binding-linux-arm64-musl@1.2.5': optional: true - '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.17': + '@rolldown/binding-linux-ppc64-gnu@1.2.5': optional: true - '@rolldown/binding-linux-x64-gnu@1.0.0-rc.17': + '@rolldown/binding-linux-s390x-gnu@1.2.5': optional: true - '@rolldown/binding-linux-x64-musl@1.0.0-rc.17': + '@rolldown/binding-linux-x64-gnu@1.2.5': optional: true - '@rolldown/binding-openharmony-arm64@1.0.0-rc.17': + '@rolldown/binding-linux-x64-musl@1.2.5': optional: true - '@rolldown/binding-wasm32-wasi@1.0.0-rc.17': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) + '@rolldown/binding-openharmony-arm64@1.2.5': optional: true - '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.17': + '@rolldown/binding-win32-arm64-msvc@1.2.5': optional: true - '@rolldown/binding-win32-x64-msvc@1.0.0-rc.17': + '@rolldown/binding-win32-x64-msvc@1.2.5': optional: true - '@rolldown/pluginutils@1.0.0-rc.17': {} + '@rolldown/pluginutils@1.0.1': {} - '@rollup/pluginutils@5.1.4(rollup@4.53.2)': + '@rollup/pluginutils@5.4.0(rollup@4.53.2)': dependencies: - '@types/estree': 1.0.8 + '@types/estree': 1.0.9 estree-walker: 2.0.2 - picomatch: 4.0.4 + picomatch: 4.0.5 optionalDependencies: rollup: 4.53.2 @@ -3277,217 +3495,216 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.53.2': optional: true - '@ruby/4.0-wasm-wasi@2.9.3-2.9.4': + '@ruby/4.0-wasm-wasi@2.10.1': dependencies: - '@ruby/wasm-wasi': 2.9.3-2.9.4 + '@ruby/wasm-wasi': 2.10.1 - '@ruby/wasm-wasi@2.9.3-2.9.4': + '@ruby/wasm-wasi@2.10.1': dependencies: '@bjorn3/browser_wasi_shim': 0.4.2 tslib: 2.8.1 - '@rushstack/node-core-library@5.18.0(@types/node@24.12.2)': + '@rushstack/node-core-library@5.18.0(@types/node@26.2.0)': dependencies: ajv: 8.13.0 ajv-draft-04: 1.0.0(ajv@8.13.0) ajv-formats: 3.0.1(ajv@8.13.0) - fs-extra: 11.3.2 + fs-extra: 11.3.6 import-lazy: 4.0.0 jju: 1.4.0 - resolve: 1.22.8 + resolve: 1.22.12 semver: 7.5.4 optionalDependencies: - '@types/node': 24.12.2 + '@types/node': 26.2.0 + optional: true - '@rushstack/problem-matcher@0.1.1(@types/node@24.12.2)': + '@rushstack/problem-matcher@0.1.1(@types/node@26.2.0)': optionalDependencies: - '@types/node': 24.12.2 + '@types/node': 26.2.0 + optional: true '@rushstack/rig-package@0.6.0': dependencies: - resolve: 1.22.8 + resolve: 1.22.12 strip-json-comments: 3.1.1 + optional: true - '@rushstack/terminal@0.19.3(@types/node@24.12.2)': + '@rushstack/terminal@0.19.3(@types/node@26.2.0)': dependencies: - '@rushstack/node-core-library': 5.18.0(@types/node@24.12.2) - '@rushstack/problem-matcher': 0.1.1(@types/node@24.12.2) + '@rushstack/node-core-library': 5.18.0(@types/node@26.2.0) + '@rushstack/problem-matcher': 0.1.1(@types/node@26.2.0) supports-color: 8.1.1 optionalDependencies: - '@types/node': 24.12.2 + '@types/node': 26.2.0 + optional: true - '@rushstack/ts-command-line@5.1.3(@types/node@24.12.2)': + '@rushstack/ts-command-line@5.1.3(@types/node@26.2.0)': dependencies: - '@rushstack/terminal': 0.19.3(@types/node@24.12.2) + '@rushstack/terminal': 0.19.3(@types/node@26.2.0) '@types/argparse': 1.0.38 argparse: 1.0.10 string-argv: 0.3.2 transitivePeerDependencies: - '@types/node' + optional: true - '@sinclair/typebox@0.31.28': {} + '@sinclair/typebox@0.31.30': {} '@sqlite.org/sqlite-wasm@3.48.0-build4': {} '@standard-schema/spec@1.1.0': {} - '@sveltejs/acorn-typescript@1.0.6(acorn@8.16.0)': + '@sveltejs/acorn-typescript@1.0.13(acorn@8.18.0)': dependencies: - acorn: 8.16.0 + acorn: 8.18.0 - '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.58.0(@sveltejs/vite-plugin-svelte@7.0.0(svelte@5.55.5(@typescript-eslint/types@8.59.0))(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)))(svelte@5.55.5(@typescript-eslint/types@8.59.0))(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)))': + '@sveltejs/adapter-static@4.0.0-next.4(@sveltejs/kit@3.0.0-next.25(@sveltejs/vite-plugin-svelte@7.3.0(svelte@5.56.10(@typescript-eslint/types@8.67.0))(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)))(svelte@5.56.10(@typescript-eslint/types@8.67.0))(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)))': dependencies: - '@sveltejs/kit': 2.58.0(@sveltejs/vite-plugin-svelte@7.0.0(svelte@5.55.5(@typescript-eslint/types@8.59.0))(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)))(svelte@5.55.5(@typescript-eslint/types@8.59.0))(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + '@sveltejs/kit': 3.0.0-next.25(@sveltejs/vite-plugin-svelte@7.3.0(svelte@5.56.10(@typescript-eslint/types@8.67.0))(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)))(svelte@5.56.10(@typescript-eslint/types@8.67.0))(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) - '@sveltejs/kit@2.58.0(@sveltejs/vite-plugin-svelte@7.0.0(svelte@5.55.5(@typescript-eslint/types@8.59.0))(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)))(svelte@5.55.5(@typescript-eslint/types@8.59.0))(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1))': + '@sveltejs/kit@3.0.0-next.25(@sveltejs/vite-plugin-svelte@7.3.0(svelte@5.56.10(@typescript-eslint/types@8.67.0))(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)))(svelte@5.56.10(@typescript-eslint/types@8.67.0))(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1))': dependencies: + '@rolldown/pluginutils': 1.0.1 '@standard-schema/spec': 1.1.0 - '@sveltejs/acorn-typescript': 1.0.6(acorn@8.16.0) - '@sveltejs/vite-plugin-svelte': 7.0.0(svelte@5.55.5(@typescript-eslint/types@8.59.0))(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) - '@types/cookie': 0.6.0 - acorn: 8.16.0 - cookie: 0.6.0 - devalue: 5.7.1 + '@sveltejs/acorn-typescript': 1.0.13(acorn@8.18.0) + '@sveltejs/vite-plugin-svelte': 7.3.0(svelte@5.56.10(@typescript-eslint/types@8.67.0))(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) + acorn: 8.18.0 + cookie: 2.0.1 + devalue: 5.9.1 esm-env: 1.2.2 - kleur: 4.1.5 - magic-string: 0.30.21 - mrmime: 2.0.0 - set-cookie-parser: 3.0.1 + magic-string: 1.2.2 + mrmime: 2.0.1 sirv: 3.0.2 - svelte: 5.55.5(@typescript-eslint/types@8.59.0) - vite: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + svelte: 5.56.10(@typescript-eslint/types@8.67.0) + vite: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) optionalDependencies: - typescript: 5.9.3 + typescript: 6.0.3 - '@sveltejs/vite-plugin-svelte@7.0.0(svelte@5.55.5(@typescript-eslint/types@8.59.0))(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1))': + '@sveltejs/load-config@0.2.3': {} + + '@sveltejs/vite-plugin-svelte@7.3.0(svelte@5.56.10(@typescript-eslint/types@8.67.0))(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1))': dependencies: deepmerge: 4.3.1 - magic-string: 0.30.21 - obug: 2.1.1 - svelte: 5.55.5(@typescript-eslint/types@8.59.0) - vite: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) - vitefu: 1.1.3(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + magic-string: 1.2.2 + obug: 2.1.4 + svelte: 5.56.10(@typescript-eslint/types@8.67.0) + vite: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) + vitefu: 1.1.3(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) - '@tailwindcss/node@4.2.4': + '@tailwindcss/node@4.3.3': dependencies: '@jridgewell/remapping': 2.3.5 - enhanced-resolve: 5.21.0 - jiti: 2.6.1 + enhanced-resolve: 5.24.5 + jiti: 2.7.0 lightningcss: 1.32.0 magic-string: 0.30.21 source-map-js: 1.2.1 - tailwindcss: 4.2.4 + tailwindcss: 4.3.3 - '@tailwindcss/oxide-android-arm64@4.2.4': + '@tailwindcss/oxide-android-arm64@4.3.3': optional: true - '@tailwindcss/oxide-darwin-arm64@4.2.4': + '@tailwindcss/oxide-darwin-arm64@4.3.3': optional: true - '@tailwindcss/oxide-darwin-x64@4.2.4': + '@tailwindcss/oxide-darwin-x64@4.3.3': optional: true - '@tailwindcss/oxide-freebsd-x64@4.2.4': + '@tailwindcss/oxide-freebsd-x64@4.3.3': optional: true - '@tailwindcss/oxide-linux-arm-gnueabihf@4.2.4': + '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.3': optional: true - '@tailwindcss/oxide-linux-arm64-gnu@4.2.4': + '@tailwindcss/oxide-linux-arm64-gnu@4.3.3': optional: true - '@tailwindcss/oxide-linux-arm64-musl@4.2.4': + '@tailwindcss/oxide-linux-arm64-musl@4.3.3': optional: true - '@tailwindcss/oxide-linux-x64-gnu@4.2.4': + '@tailwindcss/oxide-linux-x64-gnu@4.3.3': optional: true - '@tailwindcss/oxide-linux-x64-musl@4.2.4': + '@tailwindcss/oxide-linux-x64-musl@4.3.3': optional: true - '@tailwindcss/oxide-wasm32-wasi@4.2.4': + '@tailwindcss/oxide-wasm32-wasi@4.3.3': optional: true - '@tailwindcss/oxide-win32-arm64-msvc@4.2.4': + '@tailwindcss/oxide-win32-arm64-msvc@4.3.3': optional: true - '@tailwindcss/oxide-win32-x64-msvc@4.2.4': + '@tailwindcss/oxide-win32-x64-msvc@4.3.3': optional: true - '@tailwindcss/oxide@4.2.4': + '@tailwindcss/oxide@4.3.3': optionalDependencies: - '@tailwindcss/oxide-android-arm64': 4.2.4 - '@tailwindcss/oxide-darwin-arm64': 4.2.4 - '@tailwindcss/oxide-darwin-x64': 4.2.4 - '@tailwindcss/oxide-freebsd-x64': 4.2.4 - '@tailwindcss/oxide-linux-arm-gnueabihf': 4.2.4 - '@tailwindcss/oxide-linux-arm64-gnu': 4.2.4 - '@tailwindcss/oxide-linux-arm64-musl': 4.2.4 - '@tailwindcss/oxide-linux-x64-gnu': 4.2.4 - '@tailwindcss/oxide-linux-x64-musl': 4.2.4 - '@tailwindcss/oxide-wasm32-wasi': 4.2.4 - '@tailwindcss/oxide-win32-arm64-msvc': 4.2.4 - '@tailwindcss/oxide-win32-x64-msvc': 4.2.4 - - '@tailwindcss/typography@0.5.19(tailwindcss@4.2.4)': + '@tailwindcss/oxide-android-arm64': 4.3.3 + '@tailwindcss/oxide-darwin-arm64': 4.3.3 + '@tailwindcss/oxide-darwin-x64': 4.3.3 + '@tailwindcss/oxide-freebsd-x64': 4.3.3 + '@tailwindcss/oxide-linux-arm-gnueabihf': 4.3.3 + '@tailwindcss/oxide-linux-arm64-gnu': 4.3.3 + '@tailwindcss/oxide-linux-arm64-musl': 4.3.3 + '@tailwindcss/oxide-linux-x64-gnu': 4.3.3 + '@tailwindcss/oxide-linux-x64-musl': 4.3.3 + '@tailwindcss/oxide-wasm32-wasi': 4.3.3 + '@tailwindcss/oxide-win32-arm64-msvc': 4.3.3 + '@tailwindcss/oxide-win32-x64-msvc': 4.3.3 + + '@tailwindcss/typography@0.5.20(tailwindcss@4.3.3)': dependencies: postcss-selector-parser: 6.0.10 - tailwindcss: 4.2.4 + tailwindcss: 4.3.3 - '@tailwindcss/vite@4.2.4(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1))': + '@tailwindcss/vite@4.3.3(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1))': dependencies: - '@tailwindcss/node': 4.2.4 - '@tailwindcss/oxide': 4.2.4 - tailwindcss: 4.2.4 - vite: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + '@tailwindcss/node': 4.3.3 + '@tailwindcss/oxide': 4.3.3 + tailwindcss: 4.3.3 + vite: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) - '@testing-library/svelte-core@1.0.0(svelte@5.55.5(@typescript-eslint/types@8.59.0))': + '@testing-library/svelte-core@1.1.3(svelte@5.56.10(@typescript-eslint/types@8.67.0))': dependencies: - svelte: 5.55.5(@typescript-eslint/types@8.59.0) + svelte: 5.56.10(@typescript-eslint/types@8.67.0) '@total-typescript/tsconfig@1.0.4': {} - '@turbo/darwin-64@2.9.6': + '@turbo/darwin-64@2.10.11': optional: true - '@turbo/darwin-arm64@2.9.6': + '@turbo/darwin-arm64@2.10.11': optional: true - '@turbo/linux-64@2.9.6': + '@turbo/linux-64@2.10.11': optional: true - '@turbo/linux-arm64@2.9.6': + '@turbo/linux-arm64@2.10.11': optional: true - '@turbo/windows-64@2.9.6': + '@turbo/windows-64@2.10.11': optional: true - '@turbo/windows-arm64@2.9.6': + '@turbo/windows-arm64@2.10.11': optional: true - '@tybys/wasm-util@0.10.1': - dependencies: - tslib: 2.8.1 + '@types/argparse@1.0.38': optional: true - '@types/argparse@1.0.38': {} - '@types/chai@5.2.3': dependencies: '@types/deep-eql': 4.0.2 assertion-error: 2.0.1 - '@types/color-convert@2.0.3': + '@types/color-convert@2.0.4': dependencies: - '@types/color-name': 1.1.4 + '@types/color-name': 1.1.5 - '@types/color-name@1.1.4': {} + '@types/color-name@1.1.5': {} '@types/color@4.2.1': dependencies: - '@types/color-convert': 2.0.3 - - '@types/cookie@0.6.0': {} + '@types/color-convert': 2.0.4 '@types/deep-eql@4.0.2': {} @@ -3495,242 +3712,218 @@ snapshots: '@types/esrecurse@4.3.1': {} - '@types/estree@1.0.8': {} + '@types/estree@1.0.8': + optional: true + + '@types/estree@1.0.9': {} '@types/golang-wasm-exec@1.15.2': {} '@types/json-schema@7.0.15': {} - '@types/node@24.12.2': + '@types/node@26.2.0': dependencies: - undici-types: 7.16.0 + undici-types: 8.3.0 '@types/trusted-types@2.0.7': {} - '@typescript-eslint/eslint-plugin@8.59.0(@typescript-eslint/parser@8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3))(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3)': + '@typescript-eslint/eslint-plugin@8.67.0(@typescript-eslint/parser@8.67.0(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3)': dependencies: '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3) - '@typescript-eslint/scope-manager': 8.59.0 - '@typescript-eslint/type-utils': 8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3) - '@typescript-eslint/utils': 8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3) - '@typescript-eslint/visitor-keys': 8.59.0 - eslint: 10.2.1(jiti@2.6.1) - ignore: 7.0.5 + '@typescript-eslint/parser': 8.67.0(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3) + '@typescript-eslint/scope-manager': 8.67.0 + '@typescript-eslint/type-utils': 8.67.0(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3) + '@typescript-eslint/utils': 8.67.0(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3) + '@typescript-eslint/visitor-keys': 8.67.0 + eslint: 10.9.0(jiti@2.7.0) + ignore: 7.0.6 natural-compare: 1.4.0 - ts-api-utils: 2.5.0(typescript@5.9.3) - typescript: 5.9.3 + ts-api-utils: 2.5.0(typescript@6.0.3) + typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3)': + '@typescript-eslint/parser@8.67.0(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3)': dependencies: - '@typescript-eslint/scope-manager': 8.59.0 - '@typescript-eslint/types': 8.59.0 - '@typescript-eslint/typescript-estree': 8.59.0(typescript@5.9.3) - '@typescript-eslint/visitor-keys': 8.59.0 + '@typescript-eslint/scope-manager': 8.67.0 + '@typescript-eslint/types': 8.67.0 + '@typescript-eslint/typescript-estree': 8.67.0(typescript@6.0.3) + '@typescript-eslint/visitor-keys': 8.67.0 debug: 4.4.3 - eslint: 10.2.1(jiti@2.6.1) - typescript: 5.9.3 + eslint: 10.9.0(jiti@2.7.0) + typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.59.0(typescript@5.9.3)': + '@typescript-eslint/project-service@8.67.0(typescript@6.0.3)': dependencies: - '@typescript-eslint/tsconfig-utils': 8.59.0(typescript@5.9.3) - '@typescript-eslint/types': 8.59.0 + '@typescript-eslint/tsconfig-utils': 8.67.0(typescript@6.0.3) + '@typescript-eslint/types': 8.67.0 debug: 4.4.3 - typescript: 5.9.3 + typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.59.0': + '@typescript-eslint/scope-manager@8.67.0': dependencies: - '@typescript-eslint/types': 8.59.0 - '@typescript-eslint/visitor-keys': 8.59.0 + '@typescript-eslint/types': 8.67.0 + '@typescript-eslint/visitor-keys': 8.67.0 - '@typescript-eslint/tsconfig-utils@8.59.0(typescript@5.9.3)': + '@typescript-eslint/tsconfig-utils@8.67.0(typescript@6.0.3)': dependencies: - typescript: 5.9.3 + typescript: 6.0.3 - '@typescript-eslint/type-utils@8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3)': + '@typescript-eslint/type-utils@8.67.0(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3)': dependencies: - '@typescript-eslint/types': 8.59.0 - '@typescript-eslint/typescript-estree': 8.59.0(typescript@5.9.3) - '@typescript-eslint/utils': 8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/types': 8.67.0 + '@typescript-eslint/typescript-estree': 8.67.0(typescript@6.0.3) + '@typescript-eslint/utils': 8.67.0(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3) debug: 4.4.3 - eslint: 10.2.1(jiti@2.6.1) - ts-api-utils: 2.5.0(typescript@5.9.3) - typescript: 5.9.3 + eslint: 10.9.0(jiti@2.7.0) + ts-api-utils: 2.5.0(typescript@6.0.3) + typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/types@8.59.0': {} + '@typescript-eslint/types@8.67.0': {} - '@typescript-eslint/typescript-estree@8.59.0(typescript@5.9.3)': + '@typescript-eslint/typescript-estree@8.67.0(typescript@6.0.3)': dependencies: - '@typescript-eslint/project-service': 8.59.0(typescript@5.9.3) - '@typescript-eslint/tsconfig-utils': 8.59.0(typescript@5.9.3) - '@typescript-eslint/types': 8.59.0 - '@typescript-eslint/visitor-keys': 8.59.0 + '@typescript-eslint/project-service': 8.67.0(typescript@6.0.3) + '@typescript-eslint/tsconfig-utils': 8.67.0(typescript@6.0.3) + '@typescript-eslint/types': 8.67.0 + '@typescript-eslint/visitor-keys': 8.67.0 debug: 4.4.3 - minimatch: 10.2.5 - semver: 7.7.4 - tinyglobby: 0.2.16 - ts-api-utils: 2.5.0(typescript@5.9.3) - typescript: 5.9.3 + minimatch: 10.2.6 + semver: 7.8.5 + tinyglobby: 0.2.17 + ts-api-utils: 2.5.0(typescript@6.0.3) + typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3)': + '@typescript-eslint/utils@8.67.0(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3)': dependencies: - '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1)) - '@typescript-eslint/scope-manager': 8.59.0 - '@typescript-eslint/types': 8.59.0 - '@typescript-eslint/typescript-estree': 8.59.0(typescript@5.9.3) - eslint: 10.2.1(jiti@2.6.1) - typescript: 5.9.3 + '@eslint-community/eslint-utils': 4.10.1(eslint@10.9.0(jiti@2.7.0)) + '@typescript-eslint/scope-manager': 8.67.0 + '@typescript-eslint/types': 8.67.0 + '@typescript-eslint/typescript-estree': 8.67.0(typescript@6.0.3) + eslint: 10.9.0(jiti@2.7.0) + typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.59.0': + '@typescript-eslint/visitor-keys@8.67.0': dependencies: - '@typescript-eslint/types': 8.59.0 + '@typescript-eslint/types': 8.67.0 eslint-visitor-keys: 5.0.1 - '@vitest/browser-playwright@4.1.5(playwright@1.59.1)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1))(vitest@4.1.5)': + '@typescript/typescript6@6.0.2': dependencies: - '@vitest/browser': 4.1.5(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1))(vitest@4.1.5) - '@vitest/mocker': 4.1.5(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) - playwright: 1.59.1 - tinyrainbow: 3.1.0 - vitest: 4.1.5(@types/node@24.12.2)(@vitest/browser-playwright@4.1.5)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + '@typescript/old': typescript@6.0.3 + + '@vitest/browser-playwright@4.1.11(playwright@1.62.1)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1))(vitest@4.1.11)': + dependencies: + '@vitest/browser': 4.1.11(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1))(vitest@4.1.11) + '@vitest/mocker': 4.1.11(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) + playwright: 1.62.1 + tinyrainbow: 3.1.1 + vitest: 4.1.11(@types/node@26.2.0)(@vitest/browser-playwright@4.1.11)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) transitivePeerDependencies: - bufferutil - msw - utf-8-validate - vite - '@vitest/browser@4.1.5(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1))(vitest@4.1.5)': + '@vitest/browser@4.1.11(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1))(vitest@4.1.11)': dependencies: '@blazediff/core': 1.9.1 - '@vitest/mocker': 4.1.5(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) - '@vitest/utils': 4.1.5 + '@vitest/mocker': 4.1.11(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) + '@vitest/utils': 4.1.11 magic-string: 0.30.21 pngjs: 7.0.0 sirv: 3.0.2 - tinyrainbow: 3.1.0 - vitest: 4.1.5(@types/node@24.12.2)(@vitest/browser-playwright@4.1.5)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) - ws: 8.20.0 + tinyrainbow: 3.1.1 + vitest: 4.1.11(@types/node@26.2.0)(@vitest/browser-playwright@4.1.11)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) + ws: 8.21.3 transitivePeerDependencies: - bufferutil - msw - utf-8-validate - vite - '@vitest/expect@4.1.5': + '@vitest/expect@4.1.11': dependencies: '@standard-schema/spec': 1.1.0 '@types/chai': 5.2.3 - '@vitest/spy': 4.1.5 - '@vitest/utils': 4.1.5 + '@vitest/spy': 4.1.11 + '@vitest/utils': 4.1.11 chai: 6.2.2 - tinyrainbow: 3.1.0 + tinyrainbow: 3.1.1 - '@vitest/mocker@4.1.5(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1))': + '@vitest/mocker@4.1.11(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1))': dependencies: - '@vitest/spy': 4.1.5 + '@vitest/spy': 4.1.11 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - vite: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + vite: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) - '@vitest/pretty-format@4.1.5': + '@vitest/pretty-format@4.1.11': dependencies: - tinyrainbow: 3.1.0 + tinyrainbow: 3.1.1 - '@vitest/runner@4.1.5': + '@vitest/runner@4.1.11': dependencies: - '@vitest/utils': 4.1.5 + '@vitest/utils': 4.1.11 pathe: 2.0.3 - '@vitest/snapshot@4.1.5': + '@vitest/snapshot@4.1.11': dependencies: - '@vitest/pretty-format': 4.1.5 - '@vitest/utils': 4.1.5 + '@vitest/pretty-format': 4.1.11 + '@vitest/utils': 4.1.11 magic-string: 0.30.21 pathe: 2.0.3 - '@vitest/spy@4.1.5': {} + '@vitest/spy@4.1.11': {} - '@vitest/utils@4.1.5': + '@vitest/utils@4.1.11': dependencies: - '@vitest/pretty-format': 4.1.5 + '@vitest/pretty-format': 4.1.11 convert-source-map: 2.0.0 - tinyrainbow: 3.1.0 + tinyrainbow: 3.1.1 - '@volar/language-core@2.4.11': + '@volar/language-core@2.4.28': dependencies: - '@volar/source-map': 2.4.11 + '@volar/source-map': 2.4.28 - '@volar/source-map@2.4.11': {} + '@volar/source-map@2.4.28': {} - '@volar/typescript@2.4.11': + '@volar/typescript@2.4.28': dependencies: - '@volar/language-core': 2.4.11 + '@volar/language-core': 2.4.28 path-browserify: 1.0.1 - vscode-uri: 3.0.8 - - '@vue/compiler-core@3.5.7': - dependencies: - '@babel/parser': 7.25.8 - '@vue/shared': 3.5.7 - entities: 4.5.0 - estree-walker: 2.0.2 - source-map-js: 1.2.1 - - '@vue/compiler-dom@3.5.7': - dependencies: - '@vue/compiler-core': 3.5.7 - '@vue/shared': 3.5.7 - - '@vue/compiler-vue2@2.7.16': - dependencies: - de-indent: 1.0.2 - he: 1.2.0 - - '@vue/language-core@2.2.0(typescript@5.9.3)': - dependencies: - '@volar/language-core': 2.4.11 - '@vue/compiler-dom': 3.5.7 - '@vue/compiler-vue2': 2.7.16 - '@vue/shared': 3.5.7 - alien-signals: 0.4.14 - minimatch: 9.0.5 - muggle-string: 0.4.1 - path-browserify: 1.0.1 - optionalDependencies: - typescript: 5.9.3 - - '@vue/shared@3.5.7': {} + vscode-uri: 3.1.0 '@xterm/addon-fit@0.11.0': {} '@xterm/xterm@6.0.0': {} - acorn-jsx@5.3.2(acorn@8.16.0): + acorn-jsx@5.3.2(acorn@8.18.0): dependencies: - acorn: 8.16.0 + acorn: 8.18.0 - acorn@8.16.0: {} + acorn@8.18.0: {} ajv-draft-04@1.0.0(ajv@8.13.0): optionalDependencies: ajv: 8.13.0 + optional: true ajv-formats@3.0.1(ajv@8.13.0): optionalDependencies: ajv: 8.13.0 + optional: true ajv@6.15.0: dependencies: @@ -3745,6 +3938,7 @@ snapshots: json-schema-traverse: 1.0.0 require-from-string: 2.0.2 uri-js: 4.4.1 + optional: true ajv@8.13.0: dependencies: @@ -3752,17 +3946,17 @@ snapshots: json-schema-traverse: 1.0.0 require-from-string: 2.0.2 uri-js: 4.4.1 - - alien-signals@0.4.14: {} + optional: true anymatch@3.1.3: dependencies: normalize-path: 3.0.0 - picomatch: 2.3.1 + picomatch: 2.3.2 argparse@1.0.10: dependencies: sprintf-js: 1.0.3 + optional: true aria-query@5.3.1: {} @@ -3772,7 +3966,11 @@ snapshots: async@2.6.4: dependencies: - lodash: 4.17.21 + lodash: 4.18.1 + + available-typed-arrays@1.0.7: + dependencies: + possible-typed-array-names: 1.1.0 axobject-query@4.1.0: {} @@ -3787,16 +3985,12 @@ snapshots: readable-stream: 2.3.8 safe-buffer: 5.2.1 - brace-expansion@1.1.11: + brace-expansion@1.1.18: dependencies: balanced-match: 1.0.2 concat-map: 0.0.1 - brace-expansion@2.0.1: - dependencies: - balanced-match: 1.0.2 - - brace-expansion@5.0.5: + brace-expansion@5.0.9: dependencies: balanced-match: 4.0.4 @@ -3824,6 +4018,23 @@ snapshots: buffer-from@1.1.2: {} + call-bind-apply-helpers@1.0.2: + dependencies: + es-errors: 1.3.0 + function-bind: 1.1.2 + + call-bind@1.0.9: + dependencies: + call-bind-apply-helpers: 1.0.2 + es-define-property: 1.0.1 + get-intrinsic: 1.3.0 + set-function-length: 1.2.2 + + call-bound@1.0.4: + dependencies: + call-bind-apply-helpers: 1.0.2 + get-intrinsic: 1.3.0 + chai@6.2.2: {} chokidar@3.6.0: @@ -3838,9 +4049,9 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - chokidar@4.0.1: + chokidar@4.0.3: dependencies: - readdirp: 4.0.2 + readdirp: 4.1.2 chownr@1.1.4: {} @@ -3848,13 +4059,10 @@ snapshots: commander@11.1.0: {} - comment-json@4.2.5: + comment-json@4.6.2: dependencies: array-timsort: 1.0.3 - core-util-is: 1.0.3 esprima: 4.0.1 - has-own-prop: 2.0.0 - repeat-string: 1.6.1 compare-versions@6.1.1: {} @@ -3862,13 +4070,13 @@ snapshots: confbox@0.1.8: {} - confbox@0.2.2: {} + confbox@0.2.4: {} consola@3.4.0: {} convert-source-map@2.0.0: {} - cookie@0.6.0: {} + cookie@2.0.1: {} core-util-is@1.0.3: {} @@ -3880,27 +4088,30 @@ snapshots: cssesc@3.0.0: {} - daisyui@5.5.19: {} - - de-indent@1.0.2: {} + daisyui@5.7.20: {} debug@4.4.3: dependencies: ms: 2.1.3 - dedent@1.5.1: {} - deep-is@0.1.4: {} deepmerge@4.3.1: {} - detect-libc@2.0.3: {} + define-data-property@1.1.4: + dependencies: + es-define-property: 1.0.1 + es-errors: 1.3.0 + gopd: 1.2.0 + + detect-libc@2.1.2: {} - devalue@5.7.1: {} + devalue@5.9.1: {} - diff@8.0.2: {} + diff@8.0.4: + optional: true - dompurify@3.2.7: + dompurify@3.4.8: optionalDependencies: '@types/trusted-types': 2.0.7 @@ -3914,78 +4125,90 @@ snapshots: pako: 1.0.11 rimraf: 2.7.1 source-map-support: 0.4.18 - tar-fs: 1.16.3 + tar-fs: 1.16.6 + + dunder-proto@1.0.1: + dependencies: + call-bind-apply-helpers: 1.0.2 + es-errors: 1.3.0 + gopd: 1.2.0 duplexify@3.7.1: dependencies: - end-of-stream: 1.4.4 + end-of-stream: 1.4.5 inherits: 2.0.4 readable-stream: 2.3.8 stream-shift: 1.0.3 - end-of-stream@1.4.4: + end-of-stream@1.4.5: dependencies: once: 1.4.0 - enhanced-resolve@5.21.0: + enhanced-resolve@5.24.5: dependencies: graceful-fs: 4.2.11 tapable: 2.3.3 - entities@4.5.0: {} + es-define-property@1.0.1: {} + + es-errors@1.3.0: {} - es-module-lexer@2.1.0: {} + es-module-lexer@2.3.2: {} + + es-object-atoms@1.1.2: + dependencies: + es-errors: 1.3.0 - esbuild@0.28.0: + esbuild@0.28.2: optionalDependencies: - '@esbuild/aix-ppc64': 0.28.0 - '@esbuild/android-arm': 0.28.0 - '@esbuild/android-arm64': 0.28.0 - '@esbuild/android-x64': 0.28.0 - '@esbuild/darwin-arm64': 0.28.0 - '@esbuild/darwin-x64': 0.28.0 - '@esbuild/freebsd-arm64': 0.28.0 - '@esbuild/freebsd-x64': 0.28.0 - '@esbuild/linux-arm': 0.28.0 - '@esbuild/linux-arm64': 0.28.0 - '@esbuild/linux-ia32': 0.28.0 - '@esbuild/linux-loong64': 0.28.0 - '@esbuild/linux-mips64el': 0.28.0 - '@esbuild/linux-ppc64': 0.28.0 - '@esbuild/linux-riscv64': 0.28.0 - '@esbuild/linux-s390x': 0.28.0 - '@esbuild/linux-x64': 0.28.0 - '@esbuild/netbsd-arm64': 0.28.0 - '@esbuild/netbsd-x64': 0.28.0 - '@esbuild/openbsd-arm64': 0.28.0 - '@esbuild/openbsd-x64': 0.28.0 - '@esbuild/openharmony-arm64': 0.28.0 - '@esbuild/sunos-x64': 0.28.0 - '@esbuild/win32-arm64': 0.28.0 - '@esbuild/win32-ia32': 0.28.0 - '@esbuild/win32-x64': 0.28.0 + '@esbuild/aix-ppc64': 0.28.2 + '@esbuild/android-arm': 0.28.2 + '@esbuild/android-arm64': 0.28.2 + '@esbuild/android-x64': 0.28.2 + '@esbuild/darwin-arm64': 0.28.2 + '@esbuild/darwin-x64': 0.28.2 + '@esbuild/freebsd-arm64': 0.28.2 + '@esbuild/freebsd-x64': 0.28.2 + '@esbuild/linux-arm': 0.28.2 + '@esbuild/linux-arm64': 0.28.2 + '@esbuild/linux-ia32': 0.28.2 + '@esbuild/linux-loong64': 0.28.2 + '@esbuild/linux-mips64el': 0.28.2 + '@esbuild/linux-ppc64': 0.28.2 + '@esbuild/linux-riscv64': 0.28.2 + '@esbuild/linux-s390x': 0.28.2 + '@esbuild/linux-x64': 0.28.2 + '@esbuild/netbsd-arm64': 0.28.2 + '@esbuild/netbsd-x64': 0.28.2 + '@esbuild/openbsd-arm64': 0.28.2 + '@esbuild/openbsd-x64': 0.28.2 + '@esbuild/openharmony-arm64': 0.28.2 + '@esbuild/sunos-x64': 0.28.2 + '@esbuild/win32-arm64': 0.28.2 + '@esbuild/win32-ia32': 0.28.2 + '@esbuild/win32-x64': 0.28.2 escape-string-regexp@4.0.0: {} - eslint-config-prettier@10.1.8(eslint@10.2.1(jiti@2.6.1)): + eslint-config-prettier@10.1.8(eslint@10.9.0(jiti@2.7.0)): dependencies: - eslint: 10.2.1(jiti@2.6.1) + eslint: 10.9.0(jiti@2.7.0) - eslint-plugin-svelte@3.17.1(eslint@10.2.1(jiti@2.6.1))(svelte@5.55.5(@typescript-eslint/types@8.59.0)): + eslint-plugin-svelte@3.23.0(eslint@10.9.0(jiti@2.7.0))(svelte@5.56.10(@typescript-eslint/types@8.67.0)): dependencies: - '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1)) + '@eslint-community/eslint-utils': 4.10.1(eslint@10.9.0(jiti@2.7.0)) '@jridgewell/sourcemap-codec': 1.5.5 - eslint: 10.2.1(jiti@2.6.1) + eslint: 10.9.0(jiti@2.7.0) esutils: 2.0.3 globals: 16.5.0 known-css-properties: 0.37.0 - postcss: 8.5.11 - postcss-load-config: 3.1.4(postcss@8.5.11) - postcss-safe-parser: 7.0.1(postcss@8.5.11) - semver: 7.7.4 - svelte-eslint-parser: 1.4.0(svelte@5.55.5(@typescript-eslint/types@8.59.0)) + postcss: 8.5.26 + postcss-load-config: 3.1.4(postcss@8.5.26) + postcss-safe-parser: 7.0.1(postcss@8.5.26) + semver: 7.8.5 + svelte-eslint-parser: 1.8.1(svelte@5.56.10(@typescript-eslint/types@8.67.0)) optionalDependencies: - svelte: 5.55.5(@typescript-eslint/types@8.59.0) + svelte: 5.56.10(@typescript-eslint/types@8.67.0) transitivePeerDependencies: - ts-node @@ -3997,7 +4220,7 @@ snapshots: eslint-scope@9.1.2: dependencies: '@types/esrecurse': 4.3.1 - '@types/estree': 1.0.8 + '@types/estree': 1.0.9 esrecurse: 4.3.0 estraverse: 5.3.0 @@ -4007,18 +4230,18 @@ snapshots: eslint-visitor-keys@5.0.1: {} - eslint@10.2.1(jiti@2.6.1): + eslint@10.9.0(jiti@2.7.0): dependencies: - '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1)) + '@eslint-community/eslint-utils': 4.10.1(eslint@10.9.0(jiti@2.7.0)) '@eslint-community/regexpp': 4.12.2 '@eslint/config-array': 0.23.5 - '@eslint/config-helpers': 0.5.5 + '@eslint/config-helpers': 0.7.0 '@eslint/core': 1.2.1 - '@eslint/plugin-kit': 0.7.1 - '@humanfs/node': 0.16.7 + '@eslint/plugin-kit': 0.7.2 + '@humanfs/node': 0.16.8 '@humanwhocodes/module-importer': 1.0.1 '@humanwhocodes/retry': 0.4.3 - '@types/estree': 1.0.8 + '@types/estree': 1.0.9 ajv: 6.15.0 cross-spawn: 7.0.6 debug: 4.4.3 @@ -4036,11 +4259,11 @@ snapshots: imurmurhash: 0.1.4 is-glob: 4.0.3 json-stable-stringify-without-jsonify: 1.0.1 - minimatch: 10.2.5 + minimatch: 10.2.6 natural-compare: 1.4.0 optionator: 0.9.4 optionalDependencies: - jiti: 2.6.1 + jiti: 2.7.0 transitivePeerDependencies: - supports-color @@ -4048,14 +4271,14 @@ snapshots: espree@10.4.0: dependencies: - acorn: 8.16.0 - acorn-jsx: 5.3.2(acorn@8.16.0) + acorn: 8.18.0 + acorn-jsx: 5.3.2(acorn@8.18.0) eslint-visitor-keys: 4.2.1 espree@11.2.0: dependencies: - acorn: 8.16.0 - acorn-jsx: 5.3.2(acorn@8.16.0) + acorn: 8.18.0 + acorn-jsx: 5.3.2(acorn@8.18.0) eslint-visitor-keys: 5.0.1 esprima@4.0.1: {} @@ -4064,11 +4287,11 @@ snapshots: dependencies: estraverse: 5.3.0 - esrap@2.2.5(@typescript-eslint/types@8.59.0): + esrap@2.3.6(@typescript-eslint/types@8.67.0): dependencies: '@jridgewell/sourcemap-codec': 1.5.5 optionalDependencies: - '@typescript-eslint/types': 8.59.0 + '@typescript-eslint/types': 8.67.0 esrecurse@4.3.0: dependencies: @@ -4080,13 +4303,13 @@ snapshots: estree-walker@3.0.3: dependencies: - '@types/estree': 1.0.8 + '@types/estree': 1.0.9 esutils@2.0.3: {} - expect-type@1.3.0: {} + expect-type@1.4.0: {} - exsolve@1.0.8: {} + exsolve@1.1.1: {} fast-deep-equal@3.1.3: {} @@ -4096,9 +4319,11 @@ snapshots: fast-plist@0.1.3: {} - fdir@6.5.0(picomatch@4.0.4): + fdir@6.5.0(picomatch@4.0.5): optionalDependencies: - picomatch: 4.0.4 + picomatch: 4.0.5 + + fflate@0.8.3: {} file-entry-cache@8.0.0: dependencies: @@ -4115,18 +4340,23 @@ snapshots: flat-cache@4.0.1: dependencies: - flatted: 3.3.3 + flatted: 3.4.4 keyv: 4.5.4 - flatted@3.3.3: {} + flatted@3.4.4: {} + + for-each@0.3.5: + dependencies: + is-callable: 1.2.7 fs-constants@1.0.0: {} - fs-extra@11.3.2: + fs-extra@11.3.6: dependencies: graceful-fs: 4.2.11 - jsonfile: 6.1.0 + jsonfile: 6.2.1 universalify: 2.0.1 + optional: true fs.realpath@1.0.0: {} @@ -4138,6 +4368,24 @@ snapshots: function-bind@1.1.2: {} + get-intrinsic@1.3.0: + dependencies: + call-bind-apply-helpers: 1.0.2 + es-define-property: 1.0.1 + es-errors: 1.3.0 + es-object-atoms: 1.1.2 + function-bind: 1.1.2 + get-proto: 1.0.1 + gopd: 1.2.0 + has-symbols: 1.1.0 + hasown: 2.0.4 + math-intrinsics: 1.1.0 + + get-proto@1.0.1: + dependencies: + dunder-proto: 1.0.1 + es-object-atoms: 1.1.2 + glob-parent@5.1.2: dependencies: is-glob: 4.0.3 @@ -4151,13 +4399,15 @@ snapshots: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.4 - minimatch: 3.1.2 + minimatch: 3.1.5 once: 1.4.0 path-is-absolute: 1.0.1 globals@16.5.0: {} - globals@17.5.0: {} + globals@17.11.0: {} + + gopd@1.2.0: {} graceful-fs@4.2.11: {} @@ -4170,23 +4420,31 @@ snapshots: pumpify: 1.5.1 through2: 2.0.5 - has-flag@4.0.0: {} - - has-own-prop@2.0.0: {} + has-flag@4.0.0: + optional: true - hasown@2.0.2: + has-property-descriptors@1.0.2: dependencies: - function-bind: 1.1.2 + es-define-property: 1.0.1 + + has-symbols@1.1.0: {} - he@1.2.0: {} + has-tostringtag@1.0.2: + dependencies: + has-symbols: 1.1.0 - human-id@4.1.1: {} + hasown@2.0.4: + dependencies: + function-bind: 1.1.2 ignore@5.3.2: {} - ignore@7.0.5: {} + ignore@7.0.6: {} - import-lazy@4.0.0: {} + import-lazy@4.0.0: + optional: true + + import-meta-resolve@4.2.0: {} imurmurhash@0.1.4: {} @@ -4203,9 +4461,12 @@ snapshots: dependencies: binary-extensions: 2.3.0 - is-core-module@2.15.1: + is-callable@1.2.7: {} + + is-core-module@2.16.2: dependencies: - hasown: 2.0.2 + hasown: 2.0.4 + optional: true is-deflate@1.0.0: {} @@ -4221,45 +4482,50 @@ snapshots: is-reference@3.0.3: dependencies: - '@types/estree': 1.0.8 + '@types/estree': 1.0.9 + + is-typed-array@1.1.15: + dependencies: + which-typed-array: 1.1.22 isarray@1.0.0: {} - isexe@2.0.0: {} + isarray@2.0.5: {} - jiti@2.6.1: {} + isexe@2.0.0: {} - jju@1.4.0: {} + jiti@2.7.0: {} - js-sha256@0.11.0: {} + jju@1.4.0: + optional: true json-buffer@3.0.1: {} json-schema-traverse@0.4.1: {} - json-schema-traverse@1.0.0: {} + json-schema-traverse@1.0.0: + optional: true json-stable-stringify-without-jsonify@1.0.1: {} json5@2.2.3: {} - jsonfile@6.1.0: + jsonfile@6.2.1: dependencies: universalify: 2.0.1 optionalDependencies: graceful-fs: 4.2.11 + optional: true keyv@4.5.4: dependencies: json-buffer: 3.0.1 - kleur@4.1.5: {} - known-css-properties@0.37.0: {} kolorist@1.8.0: {} - kysely@0.28.16: {} + kysely@0.28.17: {} levn@0.4.1: dependencies: @@ -4269,39 +4535,72 @@ snapshots: lightningcss-android-arm64@1.32.0: optional: true + lightningcss-android-arm64@1.33.0: + optional: true + lightningcss-darwin-arm64@1.32.0: optional: true + lightningcss-darwin-arm64@1.33.0: + optional: true + lightningcss-darwin-x64@1.32.0: optional: true + lightningcss-darwin-x64@1.33.0: + optional: true + lightningcss-freebsd-x64@1.32.0: optional: true + lightningcss-freebsd-x64@1.33.0: + optional: true + lightningcss-linux-arm-gnueabihf@1.32.0: optional: true + lightningcss-linux-arm-gnueabihf@1.33.0: + optional: true + lightningcss-linux-arm64-gnu@1.32.0: optional: true + lightningcss-linux-arm64-gnu@1.33.0: + optional: true + lightningcss-linux-arm64-musl@1.32.0: optional: true + lightningcss-linux-arm64-musl@1.33.0: + optional: true + lightningcss-linux-x64-gnu@1.32.0: optional: true + lightningcss-linux-x64-gnu@1.33.0: + optional: true + lightningcss-linux-x64-musl@1.32.0: optional: true + lightningcss-linux-x64-musl@1.33.0: + optional: true + lightningcss-win32-arm64-msvc@1.32.0: optional: true + lightningcss-win32-arm64-msvc@1.33.0: + optional: true + lightningcss-win32-x64-msvc@1.32.0: optional: true + lightningcss-win32-x64-msvc@1.33.0: + optional: true + lightningcss@1.32.0: dependencies: - detect-libc: 2.0.3 + detect-libc: 2.1.2 optionalDependencies: lightningcss-android-arm64: 1.32.0 lightningcss-darwin-arm64: 1.32.0 @@ -4315,12 +4614,28 @@ snapshots: lightningcss-win32-arm64-msvc: 1.32.0 lightningcss-win32-x64-msvc: 1.32.0 + lightningcss@1.33.0: + dependencies: + detect-libc: 2.1.2 + optionalDependencies: + lightningcss-android-arm64: 1.33.0 + lightningcss-darwin-arm64: 1.33.0 + lightningcss-darwin-x64: 1.33.0 + lightningcss-freebsd-x64: 1.33.0 + lightningcss-linux-arm-gnueabihf: 1.33.0 + lightningcss-linux-arm64-gnu: 1.33.0 + lightningcss-linux-arm64-musl: 1.33.0 + lightningcss-linux-x64-gnu: 1.33.0 + lightningcss-linux-x64-musl: 1.33.0 + lightningcss-win32-arm64-msvc: 1.33.0 + lightningcss-win32-x64-msvc: 1.33.0 + lilconfig@2.1.0: {} - local-pkg@1.1.2: + local-pkg@1.2.1: dependencies: - mlly: 1.8.0 - pkg-types: 2.3.0 + mlly: 1.8.2 + pkg-types: 2.3.1 quansync: 0.2.11 locate-character@3.0.0: {} @@ -4329,7 +4644,10 @@ snapshots: dependencies: p-locate: 5.0.0 - lodash@4.17.21: {} + lodash@4.17.23: + optional: true + + lodash@4.18.1: {} lru-cache@5.1.1: dependencies: @@ -4338,30 +4656,34 @@ snapshots: lru-cache@6.0.0: dependencies: yallist: 4.0.0 + optional: true magic-string@0.30.21: dependencies: '@jridgewell/sourcemap-codec': 1.5.5 + magic-string@1.2.2: + dependencies: + '@jridgewell/sourcemap-codec': 1.5.5 + marked@14.0.0: {} - marked@18.0.2: {} + marked@18.0.10: {} - minimatch@10.0.3: - dependencies: - '@isaacs/brace-expansion': 5.0.0 + math-intrinsics@1.1.0: {} - minimatch@10.2.5: + minimatch@10.0.3: dependencies: - brace-expansion: 5.0.5 + '@isaacs/brace-expansion': 5.0.1 + optional: true - minimatch@3.1.2: + minimatch@10.2.6: dependencies: - brace-expansion: 1.1.11 + brace-expansion: 5.0.9 - minimatch@9.0.5: + minimatch@3.1.5: dependencies: - brace-expansion: 2.0.1 + brace-expansion: 1.1.18 minimist@0.0.10: {} @@ -4371,21 +4693,21 @@ snapshots: dependencies: minimist: 1.2.8 - mlly@1.8.0: + mlly@1.8.2: dependencies: - acorn: 8.16.0 + acorn: 8.18.0 pathe: 2.0.3 pkg-types: 1.3.1 - ufo: 1.6.3 + ufo: 1.6.4 - monaco-editor-textmate@4.0.0(monaco-editor@0.55.1)(monaco-textmate@3.0.1(onigasm@2.2.5)): + monaco-editor-textmate@4.0.0(monaco-editor@0.56.0)(monaco-textmate@3.0.1(onigasm@2.2.5)): dependencies: - monaco-editor: 0.55.1 + monaco-editor: 0.56.0 monaco-textmate: 3.0.1(onigasm@2.2.5) - monaco-editor@0.55.1: + monaco-editor@0.56.0: dependencies: - dompurify: 3.2.7 + dompurify: 3.4.8 marked: 14.0.0 monaco-textmate@3.0.1(onigasm@2.2.5): @@ -4393,25 +4715,23 @@ snapshots: fast-plist: 0.1.3 onigasm: 2.2.5 - monaco-vim@0.4.4(monaco-editor@0.55.1): + monaco-vim@0.4.4(monaco-editor@0.56.0): dependencies: - monaco-editor: 0.55.1 + monaco-editor: 0.56.0 mri@1.2.0: {} - mrmime@2.0.0: {} + mrmime@2.0.1: {} ms@2.1.3: {} - muggle-string@0.4.1: {} - - nanoid@3.3.11: {} + nanoid@3.3.18: {} natural-compare@1.4.0: {} normalize-path@3.0.0: {} - obug@2.1.1: {} + obug@2.1.4: {} once@1.4.0: dependencies: @@ -4439,6 +4759,31 @@ snapshots: type-check: 0.4.0 word-wrap: 1.2.5 + oxfmt@0.64.0(svelte@5.56.10(@typescript-eslint/types@8.67.0)): + dependencies: + tinypool: 2.1.0 + optionalDependencies: + '@oxfmt/binding-android-arm-eabi': 0.64.0 + '@oxfmt/binding-android-arm64': 0.64.0 + '@oxfmt/binding-darwin-arm64': 0.64.0 + '@oxfmt/binding-darwin-x64': 0.64.0 + '@oxfmt/binding-freebsd-x64': 0.64.0 + '@oxfmt/binding-linux-arm-gnueabihf': 0.64.0 + '@oxfmt/binding-linux-arm-musleabihf': 0.64.0 + '@oxfmt/binding-linux-arm64-gnu': 0.64.0 + '@oxfmt/binding-linux-arm64-musl': 0.64.0 + '@oxfmt/binding-linux-ppc64-gnu': 0.64.0 + '@oxfmt/binding-linux-riscv64-gnu': 0.64.0 + '@oxfmt/binding-linux-riscv64-musl': 0.64.0 + '@oxfmt/binding-linux-s390x-gnu': 0.64.0 + '@oxfmt/binding-linux-x64-gnu': 0.64.0 + '@oxfmt/binding-linux-x64-musl': 0.64.0 + '@oxfmt/binding-openharmony-arm64': 0.64.0 + '@oxfmt/binding-win32-arm64-msvc': 0.64.0 + '@oxfmt/binding-win32-ia32-msvc': 0.64.0 + '@oxfmt/binding-win32-x64-msvc': 0.64.0 + svelte: 5.56.10(@typescript-eslint/types@8.67.0) + p-limit@3.1.0: dependencies: yocto-queue: 0.1.0 @@ -4447,9 +4792,9 @@ snapshots: dependencies: p-limit: 3.1.0 - p-map@7.0.4: {} + p-map@7.0.6: {} - package-manager-detector@1.5.0: {} + package-manager-detector@1.8.0: {} pako@0.2.9: {} @@ -4463,7 +4808,8 @@ snapshots: path-key@3.1.1: {} - path-parse@1.0.7: {} + path-parse@1.0.7: + optional: true pathe@2.0.3: {} @@ -4475,88 +4821,77 @@ snapshots: picocolors@1.1.1: {} - picomatch@2.3.1: {} + picomatch@2.3.2: {} - picomatch@4.0.4: {} + picomatch@4.0.5: {} pkg-types@1.3.1: dependencies: confbox: 0.1.8 - mlly: 1.8.0 + mlly: 1.8.2 pathe: 2.0.3 - pkg-types@2.3.0: + pkg-types@2.3.1: dependencies: - confbox: 0.2.2 - exsolve: 1.0.8 + confbox: 0.2.4 + exsolve: 1.1.1 pathe: 2.0.3 - playwright-core@1.59.1: {} + playwright-core@1.62.1: {} - playwright@1.59.1: + playwright@1.62.1: dependencies: - playwright-core: 1.59.1 + playwright-core: 1.62.1 optionalDependencies: fsevents: 2.3.2 pngjs@7.0.0: {} - postcss-load-config@3.1.4(postcss@8.5.11): + possible-typed-array-names@1.1.0: {} + + postcss-load-config@3.1.4(postcss@8.5.26): dependencies: lilconfig: 2.1.0 - yaml: 1.10.2 + yaml: 1.10.3 optionalDependencies: - postcss: 8.5.11 + postcss: 8.5.26 - postcss-safe-parser@7.0.1(postcss@8.5.11): + postcss-safe-parser@7.0.1(postcss@8.5.26): dependencies: - postcss: 8.5.11 + postcss: 8.5.26 - postcss-scss@4.0.9(postcss@8.5.11): + postcss-scss@4.0.9(postcss@8.5.26): dependencies: - postcss: 8.5.11 + postcss: 8.5.26 postcss-selector-parser@6.0.10: dependencies: cssesc: 3.0.0 util-deprecate: 1.0.2 - postcss-selector-parser@7.1.0: + postcss-selector-parser@7.1.5: dependencies: cssesc: 3.0.0 util-deprecate: 1.0.2 - postcss@8.5.11: + postcss@8.5.26: dependencies: - nanoid: 3.3.11 + nanoid: 3.3.18 picocolors: 1.1.1 source-map-js: 1.2.1 prelude-ls@1.2.1: {} - prettier-plugin-svelte@3.5.1(prettier@3.8.3)(svelte@5.55.5(@typescript-eslint/types@8.59.0)): - dependencies: - prettier: 3.8.3 - svelte: 5.55.5(@typescript-eslint/types@8.59.0) - - prettier-plugin-tailwindcss@0.7.3(prettier-plugin-svelte@3.5.1(prettier@3.8.3)(svelte@5.55.5(@typescript-eslint/types@8.59.0)))(prettier@3.8.3): - dependencies: - prettier: 3.8.3 - optionalDependencies: - prettier-plugin-svelte: 3.5.1(prettier@3.8.3)(svelte@5.55.5(@typescript-eslint/types@8.59.0)) - - prettier@3.8.3: {} - process-nextick-args@2.0.1: {} pump@1.0.3: dependencies: - end-of-stream: 1.4.4 + end-of-stream: 1.4.5 once: 1.4.0 pump@2.0.1: dependencies: - end-of-stream: 1.4.4 + end-of-stream: 1.4.5 once: 1.4.0 pumpify@1.5.1: @@ -4567,10 +4902,10 @@ snapshots: punycode@2.3.1: {} - pyodide@0.29.3: + pyodide@314.0.5: dependencies: '@types/emscripten': 1.41.5 - ws: 8.20.0 + ws: 8.21.3 transitivePeerDependencies: - bufferutil - utf-8-validate @@ -4589,44 +4924,45 @@ snapshots: readdirp@3.6.0: dependencies: - picomatch: 2.3.1 - - readdirp@4.0.2: {} + picomatch: 2.3.2 - repeat-string@1.6.1: {} + readdirp@4.1.2: {} - require-from-string@2.0.2: {} + require-from-string@2.0.2: + optional: true - resolve@1.22.8: + resolve@1.22.12: dependencies: - is-core-module: 2.15.1 + es-errors: 1.3.0 + is-core-module: 2.16.2 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 + optional: true rimraf@2.7.1: dependencies: glob: 7.2.3 - rolldown@1.0.0-rc.17: + rolldown@1.2.5: dependencies: - '@oxc-project/types': 0.127.0 - '@rolldown/pluginutils': 1.0.0-rc.17 + '@oxc-project/types': 0.146.0 + '@rolldown/pluginutils': 1.0.1 optionalDependencies: - '@rolldown/binding-android-arm64': 1.0.0-rc.17 - '@rolldown/binding-darwin-arm64': 1.0.0-rc.17 - '@rolldown/binding-darwin-x64': 1.0.0-rc.17 - '@rolldown/binding-freebsd-x64': 1.0.0-rc.17 - '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-rc.17 - '@rolldown/binding-linux-arm64-gnu': 1.0.0-rc.17 - '@rolldown/binding-linux-arm64-musl': 1.0.0-rc.17 - '@rolldown/binding-linux-ppc64-gnu': 1.0.0-rc.17 - '@rolldown/binding-linux-s390x-gnu': 1.0.0-rc.17 - '@rolldown/binding-linux-x64-gnu': 1.0.0-rc.17 - '@rolldown/binding-linux-x64-musl': 1.0.0-rc.17 - '@rolldown/binding-openharmony-arm64': 1.0.0-rc.17 - '@rolldown/binding-wasm32-wasi': 1.0.0-rc.17 - '@rolldown/binding-win32-arm64-msvc': 1.0.0-rc.17 - '@rolldown/binding-win32-x64-msvc': 1.0.0-rc.17 + '@rolldown/binding-android-arm-eabi': 1.2.5 + '@rolldown/binding-android-arm64': 1.2.5 + '@rolldown/binding-darwin-arm64': 1.2.5 + '@rolldown/binding-darwin-x64': 1.2.5 + '@rolldown/binding-freebsd-x64': 1.2.5 + '@rolldown/binding-linux-arm-gnueabihf': 1.2.5 + '@rolldown/binding-linux-arm64-gnu': 1.2.5 + '@rolldown/binding-linux-arm64-musl': 1.2.5 + '@rolldown/binding-linux-ppc64-gnu': 1.2.5 + '@rolldown/binding-linux-s390x-gnu': 1.2.5 + '@rolldown/binding-linux-x64-gnu': 1.2.5 + '@rolldown/binding-linux-x64-musl': 1.2.5 + '@rolldown/binding-openharmony-arm64': 1.2.5 + '@rolldown/binding-win32-arm64-msvc': 1.2.5 + '@rolldown/binding-win32-x64-msvc': 1.2.5 rollup@4.53.2: dependencies: @@ -4668,10 +5004,18 @@ snapshots: semver@7.5.4: dependencies: lru-cache: 6.0.0 + optional: true - semver@7.7.4: {} + semver@7.8.5: {} - set-cookie-parser@3.0.1: {} + set-function-length@1.2.2: + dependencies: + define-data-property: 1.1.4 + es-errors: 1.3.0 + function-bind: 1.1.2 + get-intrinsic: 1.3.0 + gopd: 1.2.0 + has-property-descriptors: 1.0.2 shebang-command@2.0.0: dependencies: @@ -4684,7 +5028,7 @@ snapshots: sirv@3.0.2: dependencies: '@polka/url': 1.0.0-next.29 - mrmime: 2.0.0 + mrmime: 2.0.1 totalist: 3.0.1 source-map-js@1.2.1: {} @@ -4695,84 +5039,92 @@ snapshots: source-map@0.5.7: {} - source-map@0.6.1: {} + source-map@0.6.1: + optional: true - sprintf-js@1.0.3: {} + sprintf-js@1.0.3: + optional: true - sqlite-wasm-kysely@0.3.0(kysely@0.28.16): + sqlite-wasm-kysely@0.3.0(kysely@0.28.17): dependencies: '@sqlite.org/sqlite-wasm': 3.48.0-build4 - kysely: 0.28.16 + kysely: 0.28.17 stackback@0.0.2: {} - std-env@4.1.0: {} + std-env@4.2.0: {} stream-shift@1.0.3: {} - string-argv@0.3.2: {} + string-argv@0.3.2: + optional: true string_decoder@1.1.1: dependencies: safe-buffer: 5.1.2 - strip-json-comments@3.1.1: {} + strip-json-comments@3.1.1: + optional: true supports-color@8.1.1: dependencies: has-flag: 4.0.0 + optional: true - supports-preserve-symlinks-flag@1.0.0: {} + supports-preserve-symlinks-flag@1.0.0: + optional: true - svelte-check@4.4.6(picomatch@4.0.4)(svelte@5.55.5(@typescript-eslint/types@8.59.0))(typescript@5.9.3): + svelte-check@4.7.6(picomatch@4.0.5)(svelte@5.56.10(@typescript-eslint/types@8.67.0))(typescript@6.0.3): dependencies: - '@jridgewell/trace-mapping': 0.3.25 - chokidar: 4.0.1 - fdir: 6.5.0(picomatch@4.0.4) + '@jridgewell/trace-mapping': 0.3.31 + '@sveltejs/load-config': 0.2.3 + chokidar: 4.0.3 + fdir: 6.5.0(picomatch@4.0.5) picocolors: 1.1.1 sade: 1.8.1 - svelte: 5.55.5(@typescript-eslint/types@8.59.0) - typescript: 5.9.3 + svelte: 5.56.10(@typescript-eslint/types@8.67.0) + typescript: 6.0.3 transitivePeerDependencies: - picomatch - svelte-eslint-parser@1.4.0(svelte@5.55.5(@typescript-eslint/types@8.59.0)): + svelte-eslint-parser@1.8.1(svelte@5.56.10(@typescript-eslint/types@8.67.0)): dependencies: eslint-scope: 8.4.0 eslint-visitor-keys: 4.2.1 espree: 10.4.0 - postcss: 8.5.11 - postcss-scss: 4.0.9(postcss@8.5.11) - postcss-selector-parser: 7.1.0 + postcss: 8.5.26 + postcss-scss: 4.0.9(postcss@8.5.26) + postcss-selector-parser: 7.1.5 + semver: 7.8.5 optionalDependencies: - svelte: 5.55.5(@typescript-eslint/types@8.59.0) + svelte: 5.56.10(@typescript-eslint/types@8.67.0) - svelte@5.55.5(@typescript-eslint/types@8.59.0): + svelte@5.56.10(@typescript-eslint/types@8.67.0): dependencies: '@jridgewell/remapping': 2.3.5 '@jridgewell/sourcemap-codec': 1.5.5 - '@sveltejs/acorn-typescript': 1.0.6(acorn@8.16.0) - '@types/estree': 1.0.8 + '@sveltejs/acorn-typescript': 1.0.13(acorn@8.18.0) + '@types/estree': 1.0.9 '@types/trusted-types': 2.0.7 - acorn: 8.16.0 + acorn: 8.18.0 aria-query: 5.3.1 axobject-query: 4.1.0 clsx: 2.1.1 - devalue: 5.7.1 + devalue: 5.9.1 esm-env: 1.2.2 - esrap: 2.2.5(@typescript-eslint/types@8.59.0) + esrap: 2.3.6(@typescript-eslint/types@8.67.0) is-reference: 3.0.3 locate-character: 3.0.0 magic-string: 0.30.21 - zimmerframe: 1.1.2 + zimmerframe: 1.1.4 transitivePeerDependencies: - '@typescript-eslint/types' - tailwindcss@4.2.4: {} + tailwindcss@4.3.3: {} tapable@2.3.3: {} - tar-fs@1.16.3: + tar-fs@1.16.6: dependencies: chownr: 1.1.4 mkdirp: 0.5.6 @@ -4783,10 +5135,10 @@ snapshots: dependencies: bl: 1.2.3 buffer-alloc: 1.2.0 - end-of-stream: 1.4.4 + end-of-stream: 1.4.5 fs-constants: 1.0.0 readable-stream: 2.3.8 - to-buffer: 1.1.1 + to-buffer: 1.2.2 xtend: 4.0.2 through2@2.0.5: @@ -4796,18 +5148,22 @@ snapshots: tinybench@2.9.0: {} - tinyexec@1.0.2: {} + tinyexec@1.3.0: {} - tinyglobby@0.2.16: + tinyglobby@0.2.17: dependencies: - fdir: 6.5.0(picomatch@4.0.4) - picomatch: 4.0.4 + fdir: 6.5.0(picomatch@4.0.5) + picomatch: 4.0.5 - tinyrainbow@3.1.0: {} + tinypool@2.1.0: {} - to-buffer@1.1.1: {} + tinyrainbow@3.1.1: {} - to-fast-properties@2.0.0: {} + to-buffer@1.2.2: + dependencies: + isarray: 2.0.5 + safe-buffer: 5.2.1 + typed-array-buffer: 1.0.3 to-regex-range@5.0.1: dependencies: @@ -4815,162 +5171,183 @@ snapshots: totalist@3.0.1: {} - ts-api-utils@2.5.0(typescript@5.9.3): + ts-api-utils@2.5.0(typescript@6.0.3): dependencies: - typescript: 5.9.3 + typescript: 6.0.3 tslib@2.8.1: {} - turbo@2.9.6: + turbo@2.10.11: optionalDependencies: - '@turbo/darwin-64': 2.9.6 - '@turbo/darwin-arm64': 2.9.6 - '@turbo/linux-64': 2.9.6 - '@turbo/linux-arm64': 2.9.6 - '@turbo/windows-64': 2.9.6 - '@turbo/windows-arm64': 2.9.6 + '@turbo/darwin-64': 2.10.11 + '@turbo/darwin-arm64': 2.10.11 + '@turbo/linux-64': 2.10.11 + '@turbo/linux-arm64': 2.10.11 + '@turbo/windows-64': 2.10.11 + '@turbo/windows-arm64': 2.10.11 type-check@0.4.0: dependencies: prelude-ls: 1.2.1 - typescript-eslint@8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3): + typed-array-buffer@1.0.3: + dependencies: + call-bound: 1.0.4 + es-errors: 1.3.0 + is-typed-array: 1.1.15 + + typescript-eslint@8.67.0(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.59.0(@typescript-eslint/parser@8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3))(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3) - '@typescript-eslint/parser': 8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3) - '@typescript-eslint/typescript-estree': 8.59.0(typescript@5.9.3) - '@typescript-eslint/utils': 8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@5.9.3) - eslint: 10.2.1(jiti@2.6.1) - typescript: 5.9.3 + '@typescript-eslint/eslint-plugin': 8.67.0(@typescript-eslint/parser@8.67.0(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3) + '@typescript-eslint/parser': 8.67.0(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3) + '@typescript-eslint/typescript-estree': 8.67.0(typescript@6.0.3) + '@typescript-eslint/utils': 8.67.0(eslint@10.9.0(jiti@2.7.0))(typescript@6.0.3) + eslint: 10.9.0(jiti@2.7.0) + typescript: 6.0.3 transitivePeerDependencies: - supports-color - typescript@5.8.2: {} - - typescript@5.9.3: {} + typescript@5.8.2: + optional: true typescript@6.0.3: {} - ufo@1.6.3: {} + ufo@1.6.4: {} - undici-types@7.16.0: {} + undici-types@8.3.0: {} - universalify@2.0.1: {} + universalify@2.0.1: + optional: true + + unplugin-dts@1.0.3(@microsoft/api-extractor@7.54.0(@types/node@26.2.0))(esbuild@0.28.2)(rolldown@1.2.5)(rollup@4.53.2)(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)): + dependencies: + '@rollup/pluginutils': 5.4.0(rollup@4.53.2) + '@volar/typescript': 2.4.28 + compare-versions: 6.1.1 + debug: 4.4.3 + kolorist: 1.8.0 + local-pkg: 1.2.1 + magic-string: 0.30.21 + typescript: 6.0.3 + unplugin: 2.3.11 + optionalDependencies: + '@microsoft/api-extractor': 7.54.0(@types/node@26.2.0) + esbuild: 0.28.2 + rolldown: 1.2.5 + rollup: 4.53.2 + vite: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) + transitivePeerDependencies: + - supports-color - unplugin-icons@23.0.1(svelte@5.55.5(@typescript-eslint/types@8.59.0)): + unplugin-icons@23.0.1(svelte@5.56.10(@typescript-eslint/types@8.67.0)): dependencies: '@antfu/install-pkg': 1.1.0 - '@iconify/utils': 3.1.0 - local-pkg: 1.1.2 - obug: 2.1.1 + '@iconify/utils': 3.1.4 + local-pkg: 1.2.1 + obug: 2.1.4 unplugin: 2.3.11 optionalDependencies: - svelte: 5.55.5(@typescript-eslint/types@8.59.0) + svelte: 5.56.10(@typescript-eslint/types@8.67.0) unplugin@2.3.11: dependencies: '@jridgewell/remapping': 2.3.5 - acorn: 8.16.0 - picomatch: 4.0.4 + acorn: 8.18.0 + picomatch: 4.0.5 webpack-virtual-modules: 0.6.2 uri-js@4.4.1: dependencies: punycode: 2.3.1 - urlpattern-polyfill@10.0.0: {} + urlpattern-polyfill@10.1.0: {} util-deprecate@1.0.2: {} - uuid@11.1.0: {} + uuid@14.0.2: {} - uuid@14.0.0: {} - - vite-plugin-devtools-json@1.0.0(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)): + vite-plugin-devtools-json@1.1.0(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)): dependencies: - uuid: 11.1.0 - vite: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + uuid: 14.0.2 + vite: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) - vite-plugin-dts@4.5.4(@types/node@24.12.2)(rollup@4.53.2)(typescript@5.9.3)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)): + vite-plugin-dts@5.0.3(@microsoft/api-extractor@7.54.0(@types/node@26.2.0))(esbuild@0.28.2)(rolldown@1.2.5)(rollup@4.53.2)(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)): dependencies: - '@microsoft/api-extractor': 7.54.0(@types/node@24.12.2) - '@rollup/pluginutils': 5.1.4(rollup@4.53.2) - '@volar/typescript': 2.4.11 - '@vue/language-core': 2.2.0(typescript@5.9.3) - compare-versions: 6.1.1 - debug: 4.4.3 - kolorist: 1.8.0 - local-pkg: 1.1.2 - magic-string: 0.30.21 - typescript: 5.9.3 + unplugin-dts: 1.0.3(@microsoft/api-extractor@7.54.0(@types/node@26.2.0))(esbuild@0.28.2)(rolldown@1.2.5)(rollup@4.53.2)(typescript@6.0.3)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) optionalDependencies: - vite: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + '@microsoft/api-extractor': 7.54.0(@types/node@26.2.0) + rollup: 4.53.2 + vite: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) transitivePeerDependencies: - - '@types/node' - - rollup + - '@rspack/core' + - '@vue/language-core' + - esbuild + - rolldown - supports-color + - typescript + - webpack - vite-plugin-static-copy@4.1.0(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)): + vite-plugin-static-copy@4.1.1(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)): dependencies: chokidar: 3.6.0 - p-map: 7.0.4 + p-map: 7.0.6 picocolors: 1.1.1 - tinyglobby: 0.2.16 - vite: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + tinyglobby: 0.2.17 + vite: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) - vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1): + vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1): dependencies: - lightningcss: 1.32.0 - picomatch: 4.0.4 - postcss: 8.5.11 - rolldown: 1.0.0-rc.17 - tinyglobby: 0.2.16 + lightningcss: 1.33.0 + picomatch: 4.0.5 + postcss: 8.5.26 + rolldown: 1.2.5 + tinyglobby: 0.2.17 optionalDependencies: - '@types/node': 24.12.2 - esbuild: 0.28.0 + '@types/node': 26.2.0 + esbuild: 0.28.2 fsevents: 2.3.3 - jiti: 2.6.1 + jiti: 2.7.0 yaml: 2.5.1 - vitefu@1.1.3(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)): + vitefu@1.1.3(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)): optionalDependencies: - vite: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + vite: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) - vitest-browser-svelte@2.1.1(svelte@5.55.5(@typescript-eslint/types@8.59.0))(vitest@4.1.5): + vitest-browser-svelte@3.0.0(svelte@5.56.10(@typescript-eslint/types@8.67.0))(vitest@4.1.11): dependencies: - '@testing-library/svelte-core': 1.0.0(svelte@5.55.5(@typescript-eslint/types@8.59.0)) - svelte: 5.55.5(@typescript-eslint/types@8.59.0) - vitest: 4.1.5(@types/node@24.12.2)(@vitest/browser-playwright@4.1.5)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) + '@testing-library/svelte-core': 1.1.3(svelte@5.56.10(@typescript-eslint/types@8.67.0)) + svelte: 5.56.10(@typescript-eslint/types@8.67.0) + vitest: 4.1.11(@types/node@26.2.0)(@vitest/browser-playwright@4.1.11)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) - vitest@4.1.5(@types/node@24.12.2)(@vitest/browser-playwright@4.1.5)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)): + vitest@4.1.11(@types/node@26.2.0)(@vitest/browser-playwright@4.1.11)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)): dependencies: - '@vitest/expect': 4.1.5 - '@vitest/mocker': 4.1.5(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1)) - '@vitest/pretty-format': 4.1.5 - '@vitest/runner': 4.1.5 - '@vitest/snapshot': 4.1.5 - '@vitest/spy': 4.1.5 - '@vitest/utils': 4.1.5 - es-module-lexer: 2.1.0 - expect-type: 1.3.0 + '@vitest/expect': 4.1.11 + '@vitest/mocker': 4.1.11(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1)) + '@vitest/pretty-format': 4.1.11 + '@vitest/runner': 4.1.11 + '@vitest/snapshot': 4.1.11 + '@vitest/spy': 4.1.11 + '@vitest/utils': 4.1.11 + es-module-lexer: 2.3.2 + expect-type: 1.4.0 magic-string: 0.30.21 - obug: 2.1.1 + obug: 2.1.4 pathe: 2.0.3 - picomatch: 4.0.4 - std-env: 4.1.0 + picomatch: 4.0.5 + std-env: 4.2.0 tinybench: 2.9.0 - tinyexec: 1.0.2 - tinyglobby: 0.2.16 - tinyrainbow: 3.1.0 - vite: 8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1) + tinyexec: 1.3.0 + tinyglobby: 0.2.17 + tinyrainbow: 3.1.1 + vite: 8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 24.12.2 - '@vitest/browser-playwright': 4.1.5(playwright@1.59.1)(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(yaml@2.5.1))(vitest@4.1.5) + '@types/node': 26.2.0 + '@vitest/browser-playwright': 4.1.11(playwright@1.62.1)(vite@8.2.2(@types/node@26.2.0)(esbuild@0.28.2)(jiti@2.7.0)(yaml@2.5.1))(vitest@4.1.11) transitivePeerDependencies: - msw - vscode-uri@3.0.8: {} + vscode-uri@3.1.0: {} wasm-feature-detect@1.8.0: {} @@ -4978,6 +5355,16 @@ snapshots: which-pm-runs@1.1.0: {} + which-typed-array@1.1.22: + dependencies: + available-typed-arrays: 1.0.7 + call-bind: 1.0.9 + call-bound: 1.0.4 + for-each: 0.3.5 + get-proto: 1.0.1 + gopd: 1.2.0 + has-tostringtag: 1.0.2 + which@2.0.2: dependencies: isexe: 2.0.0 @@ -4993,19 +5380,20 @@ snapshots: wrappy@1.0.2: {} - ws@8.20.0: {} + ws@8.21.3: {} xtend@4.0.2: {} yallist@3.1.1: {} - yallist@4.0.0: {} + yallist@4.0.0: + optional: true - yaml@1.10.2: {} + yaml@1.10.3: {} yaml@2.5.1: optional: true yocto-queue@0.1.0: {} - zimmerframe@1.1.2: {} + zimmerframe@1.1.4: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 75ad27f6..1f28a2fd 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,10 +1,10 @@ packages: - - "packages/*" - - "apps/*" + - packages/* + - apps/* catalog: - vite: ^8.0.10 - vitest: ^4.1.5 - vite-plugin-dts: ^4.5.4 - vite-plugin-static-copy: ^4.1.0 - "@bjorn3/browser_wasi_shim": "^0.4.2" + '@bjorn3/browser_wasi_shim': ^0.4.2 + vite: ^8.2.2 + vite-plugin-dts: ^5.0.3 + vite-plugin-static-copy: ^4.1.1 + vitest: ^4.1.11 diff --git a/turbo.json b/turbo.json index 8f2b9df6..cb96c1ae 100644 --- a/turbo.json +++ b/turbo.json @@ -1,35 +1,51 @@ { "$schema": "https://turbo.build/schema.json", - "tasks": { - "check": { - "dependsOn": [ - "^build" - ] - }, - "build": { - "dependsOn": [ - "check" - ], - "env": [ - "BASE_PATH" - ], - "outputs": [ - "dist/**" - ] - }, - "dev": { - "dependsOn": [ - "^build" - ], - "persistent": true, - "cache": false - }, - "preview": { - "persistent": true, - "cache": false, - "dependsOn": [ - "build" - ] - } - } + "tasks": { + "check": { + "dependsOn": [ + "^build" + ] + }, + "build": { + "dependsOn": [ + "^build", + "format:check", + "check" + ], + "env": [ + "BASE_PATH" + ], + "outputs": [ + "dist/**" + ] + }, + "dev": { + "dependsOn": [ + "^build" + ], + "persistent": true, + "cache": false + }, + "preview": { + "persistent": true, + "cache": false, + "dependsOn": [ + "build" + ] + }, + "lint": { + "dependsOn": [ + "format:check", + "^build" + ] + }, + "format:check": { + "dependsOn": [ + "^build" + ] + }, + "format": { + "cache": false + } + } } \ No newline at end of file