From 08c8d40512f5c378fd5be2b88812374be0611cf3 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 26 Jul 2026 11:07:48 +0530 Subject: [PATCH 001/195] feat(lsp): add pull diagnostics and native TypeScript 7 (#2537) * feat(lsp): add pull diagnostics and native TypeScript 7 - support pull diagnostics and server requests - replace legacy TypeScript server with native TypeScript 7 * fix initial diagnostic pull --- src/cm/lsp/clientManager.ts | 49 +++++- src/cm/lsp/diagnostics.ts | 280 ++++++++++++++++++++++++++++--- src/cm/lsp/providerUtils.ts | 6 + src/cm/lsp/serverLauncher.ts | 33 +++- src/cm/lsp/serverRegistry.ts | 5 + src/cm/lsp/servers/javascript.ts | 52 ++---- src/cm/lsp/transport.ts | 120 +++++++++---- src/cm/lsp/types.ts | 26 +++ src/cm/lsp/workspace.ts | 6 + 9 files changed, 472 insertions(+), 105 deletions(-) diff --git a/src/cm/lsp/clientManager.ts b/src/cm/lsp/clientManager.ts index 4dd47daa05..e6b2eedc95 100644 --- a/src/cm/lsp/clientManager.ts +++ b/src/cm/lsp/clientManager.ts @@ -12,7 +12,11 @@ import lspStatusBar from "components/lspStatusBar"; import notificationManager from "lib/notificationManager"; import Uri from "utils/Uri"; import Url from "utils/Url"; -import { clearDiagnosticsEffect } from "./diagnostics"; +import { + clearDiagnosticsEffect, + disposePullDiagnostics, + lspDiagnosticsAutoSyncExtension, +} from "./diagnostics"; import { supportsBuiltinFormatting } from "./formattingSupport"; import { documentColorsExtension } from "./documentColors"; import { inlayHintsExtension } from "./inlayHints"; @@ -74,6 +78,22 @@ function safeString(value: unknown): string { return value != null ? String(value) : ""; } +function formatInitializationError(error: unknown): string { + if (isPlainObject(error)) { + const message = safeString(error.message).trim(); + const code = + typeof error.code === "number" || typeof error.code === "string" + ? ` (${error.code})` + : ""; + if (message) return `Initialization failed${code}: ${message}`; + } + const message = + error instanceof Error ? error.message : safeString(error).trim(); + return message + ? `Initialization failed: ${message}` + : "Initialization failed"; +} + function isSettingsOrKeybindingsFile( server: LspServerDefinition, uri: string | null | undefined, @@ -359,6 +379,14 @@ export class LspClientManager { originalUri && originalUri !== normalizedUri ? [originalUri] : []; clientState.attach(normalizedUri, view as EditorView, aliases); lspExtensions.push(plugin); + if (diagnosticsUiExtension) { + lspExtensions.push( + lspDiagnosticsAutoSyncExtension( + clientState.client, + normalizedUri, + ), + ); + } } catch (error) { console.error( `Failed to initialize LSP client for ${server.id}`, @@ -632,11 +660,14 @@ export class LspClientManager { ? defaultExtensions.filter((ext) => ext !== diagnosticsExtension) : defaultExtensions; - const progressCapabilities: LSPClientExtension = { + const clientCapabilities: LSPClientExtension = { clientCapabilities: { window: { workDoneProgress: true, }, + workspace: { + configuration: true, + }, }, }; @@ -644,7 +675,7 @@ export class LspClientManager { ...filteredBuiltins, ...extraExtensions, ...serverExtensions, - progressCapabilities, + clientCapabilities, ]; clientConfig.extensions = mergedExtensions; @@ -906,6 +937,17 @@ export class LspClientManager { client.__acodeLoggedInfo = true; } } catch (error) { + addLspLog( + server.id, + "error", + formatInitializationError(error), + error, + ); + try { + client?.disconnect(); + } catch { + /* Client may not have finished connecting */ + } if (transportHandle) { await transportHandle.dispose?.(); } else { @@ -995,6 +1037,7 @@ export class LspClientManager { }; const dispose = async (): Promise => { + disposePullDiagnostics(client); try { client.disconnect(); } catch (error) { diff --git a/src/cm/lsp/diagnostics.ts b/src/cm/lsp/diagnostics.ts index ae671b3743..c1a37966ea 100644 --- a/src/cm/lsp/diagnostics.ts +++ b/src/cm/lsp/diagnostics.ts @@ -8,8 +8,11 @@ import { StateEffect, StateField, } from "@codemirror/state"; -import { type EditorView, ViewPlugin } from "@codemirror/view"; +import { type EditorView, ViewPlugin, type ViewUpdate } from "@codemirror/view"; +import { addLspLogFor } from "./logs"; import type { + DocumentDiagnosticParams, + DocumentDiagnosticReport, LSPClientWithWorkspace, LSPPluginAPI, LspDiagnostic, @@ -22,6 +25,34 @@ let diagnosticsEventTimer: ReturnType | null = null; let diagnosticsViewCount = 0; export const LSP_DIAGNOSTICS_EVENT = "acode:lsp-diagnostics-updated"; +const PULL_DIAGNOSTICS_DELAY = 250; + +interface PullDiagnosticsState { + timers: Map>; + generations: Map; + resultIds: Map; + failures: Map; +} + +const pullDiagnosticsStates = new WeakMap(); + +function getPullDiagnosticsState(client: LSPClient): PullDiagnosticsState { + let state = pullDiagnosticsStates.get(client); + if (!state) { + state = { + timers: new Map(), + generations: new Map(), + resultIds: new Map(), + failures: new Map(), + }; + pullDiagnosticsStates.set(client, state); + } + return state; +} + +function supportsPullDiagnostics(client: LSPClient): boolean { + return !!client.serverCapabilities?.diagnosticProvider; +} function isCoarsePointerDevice(): boolean { if (typeof window !== "undefined") { @@ -170,6 +201,204 @@ function sameDiagnostics( return true; } +function applyDiagnostics( + client: LSPClient, + uri: string, + version: number | undefined, + rawDiagnostics: RawDiagnostic[], +): boolean { + const clientWithWorkspace = client as unknown as LSPClientWithWorkspace; + const file = clientWithWorkspace.workspace.getFile(uri); + if (!file || (version != null && version !== file.version)) { + return false; + } + const view = file.getView(); + if (!view) return false; + const plugin = LSPPlugin.get(view) as LSPPluginAPI | null; + if (!plugin) return false; + + const diagnostics = collectLspDiagnostics(plugin, rawDiagnostics); + const current = view.state.field(lspPublishedDiagnostics, false) ?? []; + if (sameDiagnostics(current, diagnostics)) { + return true; + } + + view.dispatch({ + effects: storeLspDiagnostics(diagnostics), + }); + scheduleDiagnosticsUpdated(); + return true; +} + +async function pullDiagnostics( + client: LSPClient, + uri: string, + generation: number, +): Promise { + if (!supportsPullDiagnostics(client)) return; + + client.sync(); + const clientWithWorkspace = client as unknown as LSPClientWithWorkspace; + const file = clientWithWorkspace.workspace.getFile(uri); + if (!file) return; + + const state = getPullDiagnosticsState(client); + const version = file.version; + const provider = client.serverCapabilities?.diagnosticProvider; + const params: DocumentDiagnosticParams = { + textDocument: { uri }, + }; + if ( + provider && + typeof provider === "object" && + "identifier" in provider && + typeof provider.identifier === "string" + ) { + params.identifier = provider.identifier; + } + const previousResultId = state.resultIds.get(uri); + if (previousResultId !== undefined) { + params.previousResultId = previousResultId; + } + + try { + const report = await client.request< + DocumentDiagnosticParams, + DocumentDiagnosticReport + >("textDocument/diagnostic", params); + if (state.generations.get(uri) !== generation) return; + state.failures.delete(uri); + + const currentFile = clientWithWorkspace.workspace.getFile(uri); + if (!currentFile || currentFile.version !== version) { + schedulePullDiagnostics(client, uri, 0); + return; + } + + if (report.kind === "unchanged") { + state.resultIds.set(uri, report.resultId); + return; + } + + if (typeof report.resultId === "string") { + state.resultIds.set(uri, report.resultId); + } else { + state.resultIds.delete(uri); + } + applyDiagnostics(client, uri, version, report.items); + } catch (error) { + if (state.generations.get(uri) === generation) { + const message = + error instanceof Error ? error.message : String(error); + const failures = (state.failures.get(uri) ?? 0) + 1; + state.failures.set(uri, failures); + if (/timed out/i.test(message) && failures <= 2) { + schedulePullDiagnostics(client, uri, failures * 750); + return; + } + addLspLogFor( + client, + "warn", + `Diagnostic pull failed for ${uri}: ${message}`, + error, + ); + console.warn(`[LSP:Diagnostics] Pull failed for ${uri}`, error); + } + } +} + +export function schedulePullDiagnostics( + client: LSPClient, + uri: string, + delay = PULL_DIAGNOSTICS_DELAY, +): void { + if (!supportsPullDiagnostics(client)) { + if (client.connected && !client.serverCapabilities) { + void client.initializing + .then(() => { + schedulePullDiagnostics(client, uri, delay); + }) + .catch(() => {}); + } + return; + } + + const state = getPullDiagnosticsState(client); + const existing = state.timers.get(uri); + if (existing != null) clearTimeout(existing); + + const generation = (state.generations.get(uri) ?? 0) + 1; + state.generations.set(uri, generation); + state.timers.set( + uri, + setTimeout(() => { + state.timers.delete(uri); + void pullDiagnostics(client, uri, generation); + }, Math.max(0, delay)), + ); +} + +export function schedulePullDiagnosticsForOpenFiles( + client: LSPClient, + delay = 0, +): void { + if (!supportsPullDiagnostics(client)) return; + for (const file of client.workspace.files) { + schedulePullDiagnostics(client, file.uri, delay); + } +} + +export function forgetPullDiagnostics(client: LSPClient, uri: string): void { + const state = pullDiagnosticsStates.get(client); + if (!state) return; + const timer = state.timers.get(uri); + if (timer != null) clearTimeout(timer); + state.timers.delete(uri); + state.generations.delete(uri); + state.resultIds.delete(uri); + state.failures.delete(uri); +} + +export function disposePullDiagnostics(client: LSPClient): void { + const state = pullDiagnosticsStates.get(client); + if (!state) return; + for (const timer of state.timers.values()) { + clearTimeout(timer); + } + state.generations.clear(); + state.failures.clear(); + pullDiagnosticsStates.delete(client); +} + +export function lspDiagnosticsAutoSyncExtension( + client: LSPClient, + uri: string, +): Extension { + return ViewPlugin.fromClass( + class { + pending: ReturnType | null = null; + + constructor() { + schedulePullDiagnostics(client, uri, 0); + } + + update(update: ViewUpdate): void { + if (!update.docChanged) return; + if (this.pending != null) clearTimeout(this.pending); + this.pending = setTimeout(() => { + this.pending = null; + client.sync(); + schedulePullDiagnostics(client, uri, 0); + }, 500); + } + + destroy(): void { + if (this.pending != null) clearTimeout(this.pending); + } + }, + ); +} + function scheduleDiagnosticsUpdated(): void { if (diagnosticsEventTimer != null) return; diagnosticsEventTimer = setTimeout(() => { @@ -230,7 +459,7 @@ export function lspDiagnosticsClientExtension(): { clientCapabilities: Record; notificationHandlers: Record< string, - (client: LSPClient, params: PublishDiagnosticsParams) => boolean + (client: LSPClient, params: unknown) => boolean >; } { return { @@ -242,36 +471,33 @@ export function lspDiagnosticsClientExtension(): { dataSupport: true, versionSupport: true, }, + diagnostic: { + dynamicRegistration: false, + relatedDocumentSupport: false, + }, + }, + workspace: { + diagnostics: { + refreshSupport: true, + }, }, }, notificationHandlers: { "textDocument/publishDiagnostics": ( client: LSPClient, - params: PublishDiagnosticsParams, + rawParams: unknown, ): boolean => { - const clientWithWorkspace = client as unknown as LSPClientWithWorkspace; - const file = clientWithWorkspace.workspace.getFile(params.uri); - if ( - !file || - (params.version != null && params.version !== file.version) - ) { - return true; - } - const view = file.getView(); - if (!view) return true; - const plugin = LSPPlugin.get(view) as LSPPluginAPI | null; - if (!plugin) return true; - - const diagnostics = collectLspDiagnostics(plugin, params.diagnostics); - const current = view.state.field(lspPublishedDiagnostics, false) ?? []; - if (sameDiagnostics(current, diagnostics)) { - return true; - } - - view.dispatch({ - effects: storeLspDiagnostics(diagnostics), - }); - scheduleDiagnosticsUpdated(); + const params = rawParams as PublishDiagnosticsParams; + applyDiagnostics( + client, + params.uri, + params.version, + params.diagnostics, + ); + return true; + }, + "workspace/diagnostic/refresh": (client: LSPClient): boolean => { + schedulePullDiagnosticsForOpenFiles(client); return true; }, }, @@ -316,7 +542,7 @@ interface DiagnosticsExtension { clientCapabilities: Record; notificationHandlers: Record< string, - (client: LSPClient, params: PublishDiagnosticsParams) => boolean + (client: LSPClient, params: unknown) => boolean >; editorExtension: Extension[]; } diff --git a/src/cm/lsp/providerUtils.ts b/src/cm/lsp/providerUtils.ts index 93e8a30948..d669f17ea7 100644 --- a/src/cm/lsp/providerUtils.ts +++ b/src/cm/lsp/providerUtils.ts @@ -22,8 +22,10 @@ export interface ManagedServerOptions { versionCommand?: string; updateCommand?: string; uninstallCommand?: string; + logOutput?: "all" | "warnings-and-errors"; startupTimeout?: number; initializationOptions?: Record; + workspaceConfiguration?: Record; clientConfig?: LspServerManifest["clientConfig"]; resolveLanguageId?: LspServerManifest["resolveLanguageId"]; rootUri?: LspServerManifest["rootUri"]; @@ -79,8 +81,10 @@ export function defineServer(options: ManagedServerOptions): LspServerManifest { versionCommand, updateCommand, uninstallCommand, + logOutput, startupTimeout, initializationOptions, + workspaceConfiguration, clientConfig, resolveLanguageId, rootUri, @@ -104,6 +108,7 @@ export function defineServer(options: ManagedServerOptions): LspServerManifest { versionCommand, updateCommand, uninstallCommand, + logOutput, install: installer, bridge: bridgeCommand ? { @@ -117,6 +122,7 @@ export function defineServer(options: ManagedServerOptions): LspServerManifest { }, startupTimeout, initializationOptions, + workspaceConfiguration, clientConfig, resolveLanguageId, rootUri, diff --git a/src/cm/lsp/serverLauncher.ts b/src/cm/lsp/serverLauncher.ts index c7db21e100..ea39576d5a 100644 --- a/src/cm/lsp/serverLauncher.ts +++ b/src/cm/lsp/serverLauncher.ts @@ -168,7 +168,7 @@ async function readPortFromFile(filePath: string): Promise { /** * Get the port for a running LSP server from the axs port file. - * @param serverName - The LSP server binary name (e.g., "typescript-language-server") + * @param serverName - The LSP server binary name (e.g., "pylsp") * @param session - Session ID for port file naming */ export async function getLspPort( @@ -907,20 +907,35 @@ async function performInstallCheck( async function startInteractiveServer( command: string, serverId: string, + logOutput: LauncherConfig["logOutput"] = "all", ): Promise { const executor = getExecutor(); const callback: ExecutorCallback = (type, data) => { + if (type === "stderr" && /proot warning/i.test(data)) return; + if (type === "stdout" && /listening on/i.test(data)) { + signalServerReady(serverId); + } + + if (logOutput === "warnings-and-errors") { + const level = /\b(error|failed|failure|fatal|panic)\b/i.test(data) + ? "error" + : /\b(warn(?:ing)?|unknown method|disabled|not supported|lacks)\b/i.test( + data, + ) + ? "warn" + : null; + if (!level) return; + addLspLog(serverId, level, data); + console[level](`[LSP:${serverId}] ${data}`); + return; + } + if (type === "stderr") { - if (/proot warning/i.test(data)) return; addLspLog(serverId, "stderr", data); console.warn(`[LSP:${serverId}] ${data}`); } else if (type === "stdout" && data && data.trim()) { addLspLog(serverId, "info", data); console.info(`[LSP:${serverId}] ${data}`); - // Detect when the axs proxy signals it's listening - if (/listening on/i.test(data)) { - signalServerReady(serverId); - } } }; const uuid = await executor.start(command, callback, true); @@ -1104,7 +1119,11 @@ export async function ensureServerRunning( } try { - const uuid = await startInteractiveServer(command, key); + const uuid = await startInteractiveServer( + command, + key, + launcher.logOutput, + ); // For auto-port discovery, wait for server ready signal then read port let discoveredPort: number | undefined; diff --git a/src/cm/lsp/serverRegistry.ts b/src/cm/lsp/serverRegistry.ts index 8175c2f460..155ab31522 100644 --- a/src/cm/lsp/serverRegistry.ts +++ b/src/cm/lsp/serverRegistry.ts @@ -241,6 +241,10 @@ function sanitizeDefinition( versionCommand: rawLauncher.versionCommand, updateCommand: rawLauncher.updateCommand, uninstallCommand: rawLauncher.uninstallCommand, + logOutput: + rawLauncher.logOutput === "warnings-and-errors" + ? "warnings-and-errors" + : "all", install: rawLauncher.install && typeof rawLauncher.install === "object" ? { @@ -298,6 +302,7 @@ function sanitizeDefinition( languages: sanitizeLanguages(definition.languages), transport: sanitizedTransport, initializationOptions: clone(definition.initializationOptions), + workspaceConfiguration: clone(definition.workspaceConfiguration), clientConfig: clone(definition.clientConfig), startupTimeout: typeof definition.startupTimeout === "number" diff --git a/src/cm/lsp/servers/javascript.ts b/src/cm/lsp/servers/javascript.ts index 0663592758..2725ab0dce 100644 --- a/src/cm/lsp/servers/javascript.ts +++ b/src/cm/lsp/servers/javascript.ts @@ -4,9 +4,9 @@ import { resolveJsTsLanguageId } from "./shared"; export const javascriptServers: LspServerManifest[] = [ defineServer({ - id: "typescript", - label: "TypeScript / JavaScript", - useWorkspaceFolders: true, + id: "typescript-native", + label: "TypeScript 7 / JavaScript (Native STDIO)", + useWorkspaceFolders: false, languages: [ "javascript", "javascriptreact", @@ -18,49 +18,27 @@ export const javascriptServers: LspServerManifest[] = [ transport: { kind: "websocket", }, - command: "typescript-language-server", - args: ["--stdio"], - checkCommand: "which typescript-language-server", + command: "tsc", + args: ["--lsp", "--stdio"], + checkCommand: "which tsc && tsc --version | grep -q '^Version 7\\.'", + versionCommand: "tsc --version", installer: installers.npm({ - executable: "typescript-language-server", - packages: ["typescript-language-server", "typescript"], + executable: "tsc", + packages: ["@typescript/native@npm:typescript@^7.0.2"], }), + logOutput: "warnings-and-errors", enabled: true, initializationOptions: { provideFormatter: true, hostInfo: "acode", - tsserver: { - maxTsServerMemory: 4096, - useSeparateSyntaxServer: true, - }, - preferences: { - includeInlayParameterNameHints: "all", - includeInlayParameterNameHintsWhenArgumentMatchesName: true, - includeInlayFunctionParameterTypeHints: true, - includeInlayVariableTypeHints: true, - includeInlayVariableTypeHintsWhenTypeMatchesName: false, - includeInlayPropertyDeclarationTypeHints: true, - includeInlayFunctionLikeReturnTypeHints: true, - includeInlayEnumMemberValueHints: true, - importModuleSpecifierPreference: "shortest", - importModuleSpecifierEnding: "auto", - includePackageJsonAutoImports: "auto", - provideRefactorNotApplicableReason: true, - allowIncompleteCompletions: true, - allowRenameOfImportPath: true, - generateReturnInDocTemplate: true, - organizeImportsIgnoreCase: "auto", - organizeImportsCollation: "ordinal", - organizeImportsCollationConfig: "default", - autoImportFileExcludePatterns: [], - preferTypeOnlyAutoImports: false, - }, + }, + workspaceConfiguration: { completions: { completeFunctionCalls: true, }, - diagnostics: { - reportStyleChecksAsWarnings: true, - }, + }, + clientConfig: { + timeout: 15000, }, resolveLanguageId: ({ languageId, languageName }) => resolveJsTsLanguageId(languageId, languageName), diff --git a/src/cm/lsp/transport.ts b/src/cm/lsp/transport.ts index d760893ac8..1095687e67 100644 --- a/src/cm/lsp/transport.ts +++ b/src/cm/lsp/transport.ts @@ -73,6 +73,45 @@ function createWebSocketTransport( const encoder = binaryMode ? new TextEncoder() : null; + function resolveWorkspaceConfiguration(section: unknown): unknown { + const configuration = server.workspaceConfiguration; + if (!configuration || typeof section !== "string" || !section.trim()) { + return configuration ?? null; + } + + let value: unknown = configuration; + for (const key of section.split(".")) { + if ( + !value || + typeof value !== "object" || + !Object.prototype.hasOwnProperty.call(value, key) + ) { + return null; + } + value = (value as Record)[key]; + } + return value; + } + + function sendMessage(message: string): void { + if (!socket || socket.readyState !== WebSocket.OPEN) return; + if (binaryMode && encoder) { + socket.send(encoder.encode(message)); + } else { + socket.send(message); + } + } + + function notifyListeners(data: string): void { + listeners.forEach((listener) => { + try { + listener(data); + } catch (error) { + console.error("LSP transport listener failed", error); + } + }); + } + function createSocket(): WebSocket { try { // pylsp's websocket endpoint does not require subprotocol negotiation. @@ -124,50 +163,69 @@ function createWebSocketTransport( console.debug(`[LSP:${server.id}] <=`, data); } - // Temporary fix - // Intercept server requests that the CodeMirror LSP client doesn't handle - // The client only handles notifications, but some servers (e.g., TypeScript) - // send requests like window/workDoneProgress/create that need a response try { const msg = JSON.parse(data); - if ( - msg && - typeof msg.id !== "undefined" && - msg.method === "window/workDoneProgress/create" - ) { - // This is a request, respond with success + if (msg && typeof msg.id !== "undefined") { + let handled = true; + let result: unknown = null; + switch (msg.method) { + case "window/workDoneProgress/create": + case "workspace/diagnostic/refresh": + case "client/registerCapability": + case "client/unregisterCapability": + break; + case "workspace/configuration": + result = Array.isArray(msg.params?.items) + ? msg.params.items.map( + (item: { section?: unknown }) => + resolveWorkspaceConfiguration(item?.section), + ) + : []; + break; + case "workspace/workspaceFolders": { + const rootUri = context.rootUri; + result = rootUri + ? [ + { + uri: rootUri, + name: + rootUri.replace(/\/$/, "").split("/").pop() || + rootUri, + }, + ] + : null; + break; + } + default: + handled = false; + } + if (!handled) { + notifyListeners(data); + return; + } const response = JSON.stringify({ jsonrpc: "2.0", id: msg.id, - result: null, + result, }); if (context?.debugWebSocket) { console.debug(`[LSP:${server.id}] => (auto-response)`, response); } - if (socket && socket.readyState === WebSocket.OPEN) { - if (binaryMode && encoder) { - socket.send(encoder.encode(response)); - } else { - socket.send(response); - } + sendMessage(response); + if (msg.method === "workspace/diagnostic/refresh") { + notifyListeners( + JSON.stringify({ + jsonrpc: "2.0", + method: msg.method, + params: msg.params ?? {}, + }), + ); } - // Don't pass this request to listeners since we handled it - console.info( - `[LSP:${server.id}] Auto-responded to window/workDoneProgress/create`, - ); return; } - } catch (_) { - // Not valid JSON or missing fields, pass through normally - } + } catch (_) {} - listeners.forEach((listener) => { - try { - listener(data); - } catch (error) { - console.error("LSP transport listener failed", error); - } - }); + notifyListeners(data); } function handleClose(event: CloseEvent): void { diff --git a/src/cm/lsp/types.ts b/src/cm/lsp/types.ts index 1448056c7c..5c53b9690c 100644 --- a/src/cm/lsp/types.ts +++ b/src/cm/lsp/types.ts @@ -232,6 +232,7 @@ export interface LauncherConfig { command?: string; args?: string[]; startCommand?: string | string[]; + logOutput?: "all" | "warnings-and-errors"; checkCommand?: string; versionCommand?: string; updateCommand?: string; @@ -284,6 +285,7 @@ export interface LspServerManifest { languages?: string[]; transport?: TransportDescriptor; initializationOptions?: Record; + workspaceConfiguration?: Record; clientConfig?: Record | AcodeClientConfig; startupTimeout?: number; capabilityOverrides?: Record; @@ -339,6 +341,7 @@ export interface LspServerDefinition { languages: string[]; transport: TransportDescriptor; initializationOptions?: Record; + workspaceConfiguration?: Record; clientConfig?: AcodeClientConfig; startupTimeout?: number; capabilityOverrides?: Record; @@ -545,6 +548,29 @@ export interface PublishDiagnosticsParams { diagnostics: RawDiagnostic[]; } +export interface DocumentDiagnosticParams { + textDocument: { + uri: string; + }; + identifier?: string; + previousResultId?: string; +} + +export interface FullDocumentDiagnosticReport { + kind: "full"; + resultId?: string; + items: RawDiagnostic[]; +} + +export interface UnchangedDocumentDiagnosticReport { + kind: "unchanged"; + resultId: string; +} + +export type DocumentDiagnosticReport = + | FullDocumentDiagnosticReport + | UnchangedDocumentDiagnosticReport; + export interface RawDiagnostic { range: Range; severity?: number; diff --git a/src/cm/lsp/workspace.ts b/src/cm/lsp/workspace.ts index 0ac350ff8f..23fd9588bd 100644 --- a/src/cm/lsp/workspace.ts +++ b/src/cm/lsp/workspace.ts @@ -3,6 +3,10 @@ import { LSPPlugin, Workspace } from "@codemirror/lsp-client"; import type { Text, TransactionSpec } from "@codemirror/state"; import type { EditorView } from "@codemirror/view"; import { getModeForPath } from "cm/modelist"; +import { + forgetPullDiagnostics, + schedulePullDiagnostics, +} from "./diagnostics"; import { addLspLogFor, type LspLogLevel } from "./logs"; import type { WorkspaceFileUpdate, WorkspaceOptions } from "./types"; @@ -161,6 +165,7 @@ export default class AcodeWorkspace extends Workspace { if (!file.views.size) { this.client.didClose(uri); + forgetPullDiagnostics(this.client, uri); this.#removeFileEntry(file); } } @@ -176,6 +181,7 @@ export default class AcodeWorkspace extends Workspace { connected(): void { for (const file of this.files) { this.client.didOpen(file); + schedulePullDiagnostics(this.client, file.uri, 0); } } From 212c3985a64c52af4aca453fde197862424c9ac4 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 26 Jul 2026 12:08:19 +0530 Subject: [PATCH 002/195] feat(lsp): add web worker language servers as defaults (#2531) * feat(lsp): add web worker language servers as defaults * fix: lint gutter * fix dispose * feat: add new worker transport api * fix crash and rejection * fix * fix undefined codeaction issue * adress the review findings * fix: dispose * fix: html , ts worker lsp * fix ts worker --- bun.lock | 18 + package-lock.json | 65 ++ package.json | 4 + rspack.config.js | 21 + src/cm/lsp/api.ts | 12 + src/cm/lsp/clientManager.ts | 156 +++- src/cm/lsp/diagnostics.ts | 8 +- src/cm/lsp/index.ts | 7 + src/cm/lsp/providerUtils.ts | 3 + src/cm/lsp/runtimeProviders.ts | 2 + src/cm/lsp/runtimes/registerBuiltins.ts | 2 + src/cm/lsp/runtimes/webWorker.ts | 104 +++ src/cm/lsp/servers/javascript.ts | 27 +- src/cm/lsp/servers/web.ts | 64 +- src/cm/lsp/types.ts | 2 + src/cm/lsp/workerTransport.ts | 302 +++++++ src/cm/lsp/workers/css.worker.ts | 209 +++++ src/cm/lsp/workers/html.worker.ts | 599 +++++++++++++ src/cm/lsp/workers/htmlEmbeddedSupport.ts | 286 +++++++ src/cm/lsp/workers/json.worker.ts | 183 ++++ src/cm/lsp/workers/jsonSchemas.ts | 60 ++ src/cm/lsp/workers/nestedLspClient.ts | 219 +++++ src/cm/lsp/workers/protocol.ts | 412 +++++++++ src/cm/lsp/workers/typescript.worker.ts | 993 ++++++++++++++++++++++ src/cm/lsp/workers/typescriptLibs.ts | 29 + src/lib/editorManager.js | 18 +- src/settings/lspServerDetail.js | 3 + 27 files changed, 3766 insertions(+), 42 deletions(-) create mode 100644 src/cm/lsp/runtimes/webWorker.ts create mode 100644 src/cm/lsp/workerTransport.ts create mode 100644 src/cm/lsp/workers/css.worker.ts create mode 100644 src/cm/lsp/workers/html.worker.ts create mode 100644 src/cm/lsp/workers/htmlEmbeddedSupport.ts create mode 100644 src/cm/lsp/workers/json.worker.ts create mode 100644 src/cm/lsp/workers/jsonSchemas.ts create mode 100644 src/cm/lsp/workers/nestedLspClient.ts create mode 100644 src/cm/lsp/workers/protocol.ts create mode 100644 src/cm/lsp/workers/typescript.worker.ts create mode 100644 src/cm/lsp/workers/typescriptLibs.ts diff --git a/bun.lock b/bun.lock index 9a60acd1c6..2e3f69e04f 100644 --- a/bun.lock +++ b/bun.lock @@ -78,6 +78,10 @@ "picomatch": "^4.0.4", "url-parse": "^1.5.10", "vanilla-picker": "^2.12.3", + "vscode-css-languageservice": "6.3.10", + "vscode-html-languageservice": "5.6.2", + "vscode-json-languageservice": "5.7.2", + "vscode-languageserver-textdocument": "1.0.12", "yargs": "^18.0.0", }, "devDependencies": { @@ -726,6 +730,8 @@ "@upsetjs/venn.js": ["@upsetjs/venn.js@2.0.0", "", { "optionalDependencies": { "d3-selection": "^3.0.0", "d3-transition": "^3.0.1" } }, "sha512-WbBhLrooyePuQ1VZxrJjtLvTc4NVfpOyKx0sKqioq9bX1C1m7Jgykkn8gLrtwumBioXIqam8DLxp88Adbue6Hw=="], + "@vscode/l10n": ["@vscode/l10n@0.0.18", "", {}, "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ=="], + "@webassemblyjs/ast": ["@webassemblyjs/ast@1.14.1", "", { "dependencies": { "@webassemblyjs/helper-numbers": "1.13.2", "@webassemblyjs/helper-wasm-bytecode": "1.13.2" } }, "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ=="], "@webassemblyjs/floating-point-hex-parser": ["@webassemblyjs/floating-point-hex-parser@1.13.2", "", {}, "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA=="], @@ -1538,6 +1544,8 @@ "json5": ["json5@2.2.3", "", { "bin": { "json5": "lib/cli.js" } }, "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="], + "jsonc-parser": ["jsonc-parser@3.3.1", "", {}, "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ=="], + "jsonfile": ["jsonfile@6.2.1", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q=="], "jsonparse": ["jsonparse@1.3.1", "", {}, "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg=="], @@ -2174,12 +2182,22 @@ "verror": ["verror@1.10.0", "", { "dependencies": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", "extsprintf": "^1.2.0" } }, "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="], + "vscode-css-languageservice": ["vscode-css-languageservice@6.3.10", "", { "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "3.17.5", "vscode-uri": "^3.1.0" } }, "sha512-eq5N9Er3fC4vA9zd9EFhyBG90wtCCuXgRSpAndaOgXMh1Wgep5lBgRIeDgjZBW9pa+332yC9+49cZMW8jcL3MA=="], + + "vscode-html-languageservice": ["vscode-html-languageservice@5.6.2", "", { "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "^3.17.5", "vscode-uri": "^3.1.0" } }, "sha512-ulCrSnFnfQ16YzvwnYUgEbUEl/ZG7u2eV27YhvLObSHKkb8fw1Z9cgsnUwjTEeDIdJDoTDTDpxuhQwoenoLNMg=="], + + "vscode-json-languageservice": ["vscode-json-languageservice@5.7.2", "", { "dependencies": { "@vscode/l10n": "^0.0.18", "jsonc-parser": "^3.3.1", "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "^3.17.5", "vscode-uri": "^3.1.0" } }, "sha512-WtKRDtJfFEmLrgtu+ODexOHm/6/krRF0k6t+uvkKIKW1Jh9ZIyxZQwJJwB3qhrEgvAxa37zbUg+vn+UyUK/U2w=="], + "vscode-jsonrpc": ["vscode-jsonrpc@8.2.0", "", {}, "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA=="], "vscode-languageserver-protocol": ["vscode-languageserver-protocol@3.17.5", "", { "dependencies": { "vscode-jsonrpc": "8.2.0", "vscode-languageserver-types": "3.17.5" } }, "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg=="], + "vscode-languageserver-textdocument": ["vscode-languageserver-textdocument@1.0.12", "", {}, "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA=="], + "vscode-languageserver-types": ["vscode-languageserver-types@3.17.5", "", {}, "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="], + "vscode-uri": ["vscode-uri@3.1.0", "", {}, "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ=="], + "w3c-keyname": ["w3c-keyname@2.2.8", "", {}, "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ=="], "walk-up-path": ["walk-up-path@4.0.0", "", {}, "sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A=="], diff --git a/package-lock.json b/package-lock.json index 50540a937c..bd40e8ff37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -82,6 +82,10 @@ "picomatch": "^4.0.4", "url-parse": "^1.5.10", "vanilla-picker": "^2.12.3", + "vscode-css-languageservice": "6.3.10", + "vscode-html-languageservice": "5.6.2", + "vscode-json-languageservice": "5.7.2", + "vscode-languageserver-textdocument": "1.0.12", "yargs": "^18.0.0" }, "devDependencies": { @@ -18565,6 +18569,67 @@ "version": "0.0.1", "dev": true, "license": "Apache-2.0" + }, + "node_modules/vscode-css-languageservice": { + "version": "6.3.10", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.10.tgz", + "integrity": "sha512-eq5N9Er3fC4vA9zd9EFhyBG90wtCCuXgRSpAndaOgXMh1Wgep5lBgRIeDgjZBW9pa+332yC9+49cZMW8jcL3MA==", + "license": "MIT", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "vscode-languageserver-textdocument": "^1.0.12", + "vscode-languageserver-types": "3.17.5", + "vscode-uri": "^3.1.0" + } + }, + "node_modules/@vscode/l10n": { + "version": "0.0.18", + "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", + "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==", + "license": "MIT" + }, + "node_modules/vscode-languageserver-textdocument": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", + "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==", + "license": "MIT" + }, + "node_modules/vscode-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz", + "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==", + "license": "MIT" + }, + "node_modules/vscode-html-languageservice": { + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.6.2.tgz", + "integrity": "sha512-ulCrSnFnfQ16YzvwnYUgEbUEl/ZG7u2eV27YhvLObSHKkb8fw1Z9cgsnUwjTEeDIdJDoTDTDpxuhQwoenoLNMg==", + "license": "MIT", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "vscode-languageserver-textdocument": "^1.0.12", + "vscode-languageserver-types": "^3.17.5", + "vscode-uri": "^3.1.0" + } + }, + "node_modules/vscode-json-languageservice": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.7.2.tgz", + "integrity": "sha512-WtKRDtJfFEmLrgtu+ODexOHm/6/krRF0k6t+uvkKIKW1Jh9ZIyxZQwJJwB3qhrEgvAxa37zbUg+vn+UyUK/U2w==", + "license": "MIT", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "jsonc-parser": "^3.3.1", + "vscode-languageserver-textdocument": "^1.0.12", + "vscode-languageserver-types": "^3.17.5", + "vscode-uri": "^3.1.0" + } + }, + "node_modules/jsonc-parser": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", + "license": "MIT" } } } diff --git a/package.json b/package.json index 39fc2f685c..7ceabea901 100644 --- a/package.json +++ b/package.json @@ -187,6 +187,10 @@ "picomatch": "^4.0.4", "url-parse": "^1.5.10", "vanilla-picker": "^2.12.3", + "vscode-css-languageservice": "6.3.10", + "vscode-html-languageservice": "5.6.2", + "vscode-json-languageservice": "5.7.2", + "vscode-languageserver-textdocument": "1.0.12", "yargs": "^18.0.0" }, "overrides": { diff --git a/rspack.config.js b/rspack.config.js index c8e64e72d3..08d1b8dce1 100644 --- a/rspack.config.js +++ b/rspack.config.js @@ -13,6 +13,10 @@ module.exports = (env, options) => { : ''; const rules = [ + { + test: /typescript[\\/]lib[\\/]lib\..*\.d\.ts$/, + type: 'asset/source', + }, // TypeScript/TSX files - Custom JSX loader + SWC { test: /\.tsx?$/, @@ -120,12 +124,20 @@ module.exports = (env, options) => { const main = { mode, + node: { + __dirname: false, + __filename: false, + }, entry: { boot: './src/boot.js', main: './src/main.js', console: './src/lib/console.js', searchInFilesWorker: './src/sidebarApps/searchInFiles/worker.js', searchIndexWorker: './src/sidebarApps/searchInFiles/indexWorker.js', + htmlLspWorker: './src/cm/lsp/workers/html.worker.ts', + cssLspWorker: './src/cm/lsp/workers/css.worker.ts', + jsonLspWorker: './src/cm/lsp/workers/json.worker.ts', + typescriptLspWorker: './src/cm/lsp/workers/typescript.worker.ts', }, output: { path: path.resolve(__dirname, 'www/build/'), @@ -135,8 +147,17 @@ module.exports = (env, options) => { publicPath: devOrigin ? ''.concat(devOrigin, '/build/') : '/build/', clean: !isDev, }, + // TypeScript's Node-only plugin loader uses a dynamic require. It is never + // reached by the browser worker, but Rspack cannot prove that statically. + ignoreWarnings: [ + { + module: /typescript[\\/]lib[\\/]typescript\.js$/, + message: /Critical dependency/, + }, + ], module: { rules, + exprContextCritical: false, parser: { javascript: { exportsPresence: 'error', diff --git a/src/cm/lsp/api.ts b/src/cm/lsp/api.ts index 74fadb41f5..44103e342f 100644 --- a/src/cm/lsp/api.ts +++ b/src/cm/lsp/api.ts @@ -31,8 +31,13 @@ import type { LspServerDefinition, LspServerManifest, } from "./types"; +import { + createWorkerTransport, + type LspWorkerTransportOptions, +} from "./workerTransport"; export { defineBundle, defineServer, installers }; +export type { LspWorkerHostHandler, LspWorkerTransportOptions } from "./workerTransport"; export type LspRegistrationEntry = LspServerManifest | LspServerBundle; @@ -117,6 +122,12 @@ export const runtimes = { export const registerRuntime = runtimes.register; export const unregisterRuntime = runtimes.unregister; +export const workers = { + createTransport(options: LspWorkerTransportOptions) { + return createWorkerTransport(options); + }, +}; + const lspApi = { defineServer, defineBundle, @@ -126,6 +137,7 @@ const lspApi = { servers, bundles, runtimes, + workers, registerRuntimeProvider: registerRuntime, unregisterRuntimeProvider: unregisterRuntime, }; diff --git a/src/cm/lsp/clientManager.ts b/src/cm/lsp/clientManager.ts index e6b2eedc95..d6929049d8 100644 --- a/src/cm/lsp/clientManager.ts +++ b/src/cm/lsp/clientManager.ts @@ -261,10 +261,13 @@ interface InitContext { key: string; normalizedRootUri: string | null; originalRootUri: string | null; + runtimeRootUri: string | null; + runtimeOriginalRootUri: string | null; originalDocumentUri: string; documentUri: string; runtimeProvider: LspRuntimeProvider; scope: LspClientScope; + signal: AbortSignal; } interface ResolvedRuntimeTarget { @@ -281,11 +284,56 @@ interface ExtendedLSPClient extends LSPClient { __acodeLoggedInfo?: boolean; } +interface PendingClientInitialization { + serverId: string; + controller: AbortController; + promise: Promise; +} + +function initializationCancelledError(serverId: string): Error { + const error = new Error(`LSP client initialization cancelled for ${serverId}`); + error.name = "AbortError"; + return error; +} + +function throwIfInitializationCancelled( + signal: AbortSignal, + serverId: string, +): void { + if (!signal.aborted) return; + throw initializationCancelledError(serverId); +} + +function waitForInitialization( + promise: PromiseLike, + signal: AbortSignal, + serverId: string, +): Promise { + throwIfInitializationCancelled(signal, serverId); + return new Promise((resolve, reject) => { + const onAbort = () => { + signal.removeEventListener("abort", onAbort); + reject(initializationCancelledError(serverId)); + }; + signal.addEventListener("abort", onAbort, { once: true }); + Promise.resolve(promise).then( + (value) => { + signal.removeEventListener("abort", onAbort); + resolve(value); + }, + (error) => { + signal.removeEventListener("abort", onAbort); + reject(error); + }, + ); + }); +} + export class LspClientManager { options: ClientManagerOptions; #clients: Map; - #pendingClients: Map>; + #pendingClients: Map; constructor(options: ClientManagerOptions = {}) { this.options = { ...options }; @@ -477,6 +525,27 @@ export class LspClientManager { } } + async disposeServer(serverId: string): Promise { + const normalizedId = safeString(serverId).toLowerCase(); + if (!normalizedId) return; + const pendingDisposals: Promise[] = []; + for (const [key, pending] of this.#pendingClients.entries()) { + if (pending.serverId !== normalizedId) continue; + pending.controller.abort(); + this.#pendingClients.delete(key); + pendingDisposals.push( + pending.promise.then((state) => state.dispose()), + ); + } + const states = Array.from(this.#clients.values()).filter( + (state) => state.server.id.toLowerCase() === normalizedId, + ); + await Promise.allSettled([ + ...states.map((state) => state.dispose()), + ...pendingDisposals, + ]); + } + async dispose(): Promise { try { interface FileWithSession { @@ -527,6 +596,11 @@ export class LspClientManager { } const disposeOps: Promise[] = []; + for (const [key, pending] of this.#pendingClients.entries()) { + pending.controller.abort(); + this.#pendingClients.delete(key); + disposeOps.push(pending.promise.then((state) => state.dispose())); + } for (const [key, state] of this.#clients.entries()) { disposeOps.push(state.dispose()); this.#clients.delete(key); @@ -571,25 +645,50 @@ export class LspClientManager { // If initialization is already in progress, wait for it if (this.#pendingClients.has(key)) { - return this.#pendingClients.get(key)!; + const pending = await this.#pendingClients.get(key)!.promise; + if (useWsFolders && normalizedRootUri) { + const workspace = pending.client.workspace as AcodeWorkspace | null; + if (workspace && !workspace.hasWorkspaceFolder(normalizedRootUri)) { + workspace.addWorkspaceFolder(normalizedRootUri); + } + } + return pending; } // Create and track the pending initialization + const controller = new AbortController(); const initPromise = this.#initializeClient(server, context, { key, normalizedRootUri: useWsFolders ? null : normalizedRootUri, originalRootUri: useWsFolders ? null : originalRootUri, + runtimeRootUri: normalizedRootUri, + runtimeOriginalRootUri: originalRootUri, originalDocumentUri: target.originalDocumentUri, documentUri, runtimeProvider, scope, + signal: controller.signal, }); - this.#pendingClients.set(key, initPromise); + const pending: PendingClientInitialization = { + serverId: server.id.toLowerCase(), + controller, + promise: initPromise, + }; + this.#pendingClients.set(key, pending); try { - return await initPromise; + const state = await initPromise; + if (useWsFolders && normalizedRootUri) { + const workspace = state.client.workspace as AcodeWorkspace | null; + if (workspace && !workspace.hasWorkspaceFolder(normalizedRootUri)) { + workspace.addWorkspaceFolder(normalizedRootUri); + } + } + return state; } finally { - this.#pendingClients.delete(key); + if (this.#pendingClients.get(key) === pending) { + this.#pendingClients.delete(key); + } } } @@ -602,10 +701,13 @@ export class LspClientManager { key, normalizedRootUri, originalRootUri, + runtimeRootUri, + runtimeOriginalRootUri, originalDocumentUri, documentUri, runtimeProvider, scope, + signal, } = initContext; const workspaceOptions = { @@ -877,13 +979,14 @@ export class LspClientManager { let runtimeConnection: LspRuntimeConnection | undefined; try { + throwIfInitializationCancelled(signal, server.id); const runtimeContext = { ...context, uri: documentUri, documentUri, originalDocumentUri, - rootUri: normalizedRootUri ?? null, - originalRootUri: originalRootUri ?? undefined, + rootUri: runtimeRootUri, + originalRootUri: runtimeOriginalRootUri ?? undefined, serverId: server.id, allowNonTerminalWorkspace: this.options.allowNonTerminalWorkspace === true, @@ -902,17 +1005,18 @@ export class LspClientManager { } }; runtimeConnection = connection; + throwIfInitializationCancelled(signal, server.id); transportHandle = createTransportFromRuntimeConnection( server, runtimeContext, connection, ); - await transportHandle.ready; + await waitForInitialization(transportHandle.ready, signal, server.id); client = new LSPClient(clientConfig) as ExtendedLSPClient; client.__acodeServerId = server.id; connectClient(client, transportHandle.transport, initializationOptions); - await client.initializing; + await waitForInitialization(client.initializing, signal, server.id); if (!client.__acodeLoggedInfo) { // Log root URI info to console if (normalizedRootUri) { @@ -988,6 +1092,7 @@ export class LspClientManager { const fileRefs = new Map>(); const uriAliases = new Map(); const effectiveRoot = normalizedRootUri ?? originalRootUri ?? null; + let disposed = false; const attach = ( uri: string, @@ -1006,6 +1111,23 @@ export class LspClientManager { logLspInfo(`[LSP:${server.id}] attached to ${uri}${suffix}`); }; + const dispose = async (): Promise => { + if (disposed) return; + disposed = true; + disposePullDiagnostics(client); + this.#clients.delete(key); + try { + client.disconnect(); + } catch (error) { + console.warn(`Error disconnecting LSP client ${server.id}`, error); + } + try { + await transportHandle.dispose?.(); + } catch (error) { + console.warn(`Error disposing LSP transport ${server.id}`, error); + } + }; + const detach = (uri: string, view?: EditorView): void => { const actualUri = uriAliases.get(uri) ?? uri; const existing = fileRefs.get(actualUri); @@ -1032,25 +1154,11 @@ export class LspClientManager { server, client, rootUri: effectiveRoot, + dispose, }); } }; - const dispose = async (): Promise => { - disposePullDiagnostics(client); - try { - client.disconnect(); - } catch (error) { - console.warn(`Error disconnecting LSP client ${server.id}`, error); - } - try { - await transportHandle.dispose?.(); - } catch (error) { - console.warn(`Error disposing LSP transport ${server.id}`, error); - } - this.#clients.delete(key); - }; - return { server, client, diff --git a/src/cm/lsp/diagnostics.ts b/src/cm/lsp/diagnostics.ts index c1a37966ea..53aec8eb3b 100644 --- a/src/cm/lsp/diagnostics.ts +++ b/src/cm/lsp/diagnostics.ts @@ -527,13 +527,7 @@ export function lspDiagnosticsUiExtension(includeGutter = true): Extension[] { }), ]; if (includeGutter) { - extensions.splice( - 1, - 0, - lintGutter({ - tooltipFilter: diagnosticsTooltipFilter, - }), - ); + extensions.splice(1, 0, lintGutter()); } return extensions; } diff --git a/src/cm/lsp/index.ts b/src/cm/lsp/index.ts index e3dfebaf66..f3a8b4d36a 100644 --- a/src/cm/lsp/index.ts +++ b/src/cm/lsp/index.ts @@ -12,7 +12,13 @@ export { servers, unregisterRuntime, upsert, + workers, } from "./api"; +export type { + LspWorkerHostHandler, + LspWorkerTransportOptions, +} from "./api"; +export { createWorkerTransport } from "./workerTransport"; export { default as clientManager, LspClientManager } from "./clientManager"; export type { CodeActionItem } from "./codeActions"; export { @@ -103,6 +109,7 @@ export { registerRuntimeProvider, selectRuntimeProvider, unregisterRuntimeProvider, + WEB_WORKER_RUNTIME_ID, } from "./runtimeProviders"; export { checkRuntimeServerInstallation, diff --git a/src/cm/lsp/providerUtils.ts b/src/cm/lsp/providerUtils.ts index d669f17ea7..61ef189f65 100644 --- a/src/cm/lsp/providerUtils.ts +++ b/src/cm/lsp/providerUtils.ts @@ -13,6 +13,7 @@ export interface ManagedServerOptions { languages: string[]; enabled?: boolean; useWorkspaceFolders?: boolean; + runtimes?: string[]; command?: string; args?: string[]; transport?: Partial; @@ -72,6 +73,7 @@ export function defineServer(options: ManagedServerOptions): LspServerManifest { languages, enabled = true, useWorkspaceFolders = false, + runtimes, command, args, transport, @@ -99,6 +101,7 @@ export function defineServer(options: ManagedServerOptions): LspServerManifest { languages, enabled, useWorkspaceFolders, + runtimes, transport: { kind: "websocket", ...(transport || {}), diff --git a/src/cm/lsp/runtimeProviders.ts b/src/cm/lsp/runtimeProviders.ts index 0a4e4a7c4f..61e9323533 100644 --- a/src/cm/lsp/runtimeProviders.ts +++ b/src/cm/lsp/runtimeProviders.ts @@ -8,6 +8,7 @@ import { getConfiguredRuntimeId } from "./runtimeSettings"; export const BUILTIN_ALPINE_RUNTIME_ID = "builtin-alpine"; export const EXTERNAL_WEBSOCKET_RUNTIME_ID = "external-websocket"; +export const WEB_WORKER_RUNTIME_ID = "web-worker"; interface RegisterRuntimeProviderOptions { replace?: boolean; @@ -211,6 +212,7 @@ export function isBuiltinAlpineAccessible( export default { BUILTIN_ALPINE_RUNTIME_ID, + WEB_WORKER_RUNTIME_ID, getRuntimeProvider, inferWorkspaceKind, isBuiltinAlpineAccessible, diff --git a/src/cm/lsp/runtimes/registerBuiltins.ts b/src/cm/lsp/runtimes/registerBuiltins.ts index fe7efadd9c..5e49c5c9fc 100644 --- a/src/cm/lsp/runtimes/registerBuiltins.ts +++ b/src/cm/lsp/runtimes/registerBuiltins.ts @@ -1,6 +1,8 @@ import { registerRuntimeProvider } from "../runtimeProviders"; import builtinAlpineRuntimeProvider from "./builtinAlpine"; import externalWebSocketRuntimeProvider from "./externalWebSocket"; +import webWorkerRuntimeProvider from "./webWorker"; registerRuntimeProvider(builtinAlpineRuntimeProvider, { replace: true }); registerRuntimeProvider(externalWebSocketRuntimeProvider, { replace: true }); +registerRuntimeProvider(webWorkerRuntimeProvider, { replace: true }); diff --git a/src/cm/lsp/runtimes/webWorker.ts b/src/cm/lsp/runtimes/webWorker.ts new file mode 100644 index 0000000000..2cec4c7030 --- /dev/null +++ b/src/cm/lsp/runtimes/webWorker.ts @@ -0,0 +1,104 @@ +import type { + InstallCheckResult, + LspRuntimeProvider, + LspServerDefinition, + TransportContext, + TransportHandle, +} from "../types"; +import { createWorkerTransport } from "../workerTransport"; + +export const WEB_WORKER_RUNTIME_ID = "web-worker"; + +const SUPPORTED_SERVERS = new Set(["html", "css", "json", "typescript"]); +const WORKER_URLS: Record = { + html: "build/htmlLspWorker.js", + css: "build/cssLspWorker.js", + json: "build/jsonLspWorker.js", + typescript: "build/typescriptLspWorker.js", +}; +const STARTUP_TIMEOUT = 10000; + +const bundledStatus: InstallCheckResult = { + status: "present", + version: "bundled", + canInstall: false, + canUpdate: false, + message: "Built into Acode and runs offline in a Web Worker.", +}; + +async function readFileFromHost(uri: string): Promise { + const { default: fsOperation } = await import("fileSystem"); + const fs = fsOperation(uri); + if (!fs) throw new Error(`No filesystem provider can handle ${uri}`); + return (await fs.readFile("utf-8")) as string; +} + +function createBuiltinWorkerTransport( + server: LspServerDefinition, + context: TransportContext, +): TransportHandle { + const workerUrl = WORKER_URLS[server.id]; + if (!workerUrl) { + throw new Error(`No built-in worker is available for ${server.id}`); + } + + return createWorkerTransport({ + url: workerUrl, + name: `acode-${server.id}-lsp`, + serverId: server.id, + startupTimeout: server.startupTimeout ?? STARTUP_TIMEOUT, + configure: { + kind: "configure", + serverId: server.id, + initializationOptions: server.initializationOptions, + rootUri: context.originalRootUri ?? context.rootUri, + }, + hostHandlers: { + readFile: async (params) => { + const uri = String(params.uri ?? ""); + if (!uri) throw new Error("A filesystem URI is required"); + return readFileFromHost(uri); + }, + }, + }); +} + +export const webWorkerRuntimeProvider: LspRuntimeProvider = { + id: WEB_WORKER_RUNTIME_ID, + label: "Built-in Web Worker", + priority: 100, + + canHandle(server) { + return SUPPORTED_SERVERS.has(server.id) && typeof Worker !== "undefined"; + }, + + resolveUris(_server, context) { + return { + documentUri: context.originalDocumentUri, + rootUri: context.originalRootUri, + scope: "workspace", + }; + }, + + async checkInstallation() { + return bundledStatus; + }, + + getInstallCommand() { + return null; + }, + + getUninstallCommand() { + return null; + }, + + async start(server, context) { + return { + kind: "transport", + providerId: WEB_WORKER_RUNTIME_ID, + transport: createBuiltinWorkerTransport(server, context), + }; + }, +}; + +export default webWorkerRuntimeProvider; diff --git a/src/cm/lsp/servers/javascript.ts b/src/cm/lsp/servers/javascript.ts index 2725ab0dce..67253e7be3 100644 --- a/src/cm/lsp/servers/javascript.ts +++ b/src/cm/lsp/servers/javascript.ts @@ -3,6 +3,29 @@ import type { LspServerBundle, LspServerManifest } from "../types"; import { resolveJsTsLanguageId } from "./shared"; export const javascriptServers: LspServerManifest[] = [ + defineServer({ + id: "typescript", + label: "TypeScript / JavaScript (Web Worker)", + useWorkspaceFolders: true, + languages: [ + "javascript", + "javascriptreact", + "typescript", + "typescriptreact", + "tsx", + "jsx", + ], + runtimes: ["web-worker"], + transport: { kind: "external" }, + enabled: true, + clientConfig: { + builtinExtensions: { + inlayHints: true, + }, + }, + resolveLanguageId: ({ languageId, languageName }) => + resolveJsTsLanguageId(languageId, languageName), + }), defineServer({ id: "typescript-native", label: "TypeScript 7 / JavaScript (Native STDIO)", @@ -15,6 +38,7 @@ export const javascriptServers: LspServerManifest[] = [ "tsx", "jsx", ], + runtimes: ["builtin-alpine"], transport: { kind: "websocket", }, @@ -27,7 +51,7 @@ export const javascriptServers: LspServerManifest[] = [ packages: ["@typescript/native@npm:typescript@^7.0.2"], }), logOutput: "warnings-and-errors", - enabled: true, + enabled: false, initializationOptions: { provideFormatter: true, hostInfo: "acode", @@ -55,6 +79,7 @@ export const javascriptServers: LspServerManifest[] = [ "tsx", "jsx", ], + runtimes: ["builtin-alpine"], transport: { kind: "websocket", }, diff --git a/src/cm/lsp/servers/web.ts b/src/cm/lsp/servers/web.ts index ecc0746658..4b811312ad 100644 --- a/src/cm/lsp/servers/web.ts +++ b/src/cm/lsp/servers/web.ts @@ -4,8 +4,51 @@ import type { LspServerBundle, LspServerManifest } from "../types"; export const webServers: LspServerManifest[] = [ defineServer({ id: "html", - label: "HTML", + label: "HTML (Web Worker)", languages: ["html", "vue", "svelte"], + runtimes: ["web-worker"], + transport: { kind: "external" }, + clientConfig: { + builtinExtensions: { + keymaps: false, + }, + }, + useWorkspaceFolders: true, + enabled: true, + }), + defineServer({ + id: "css", + label: "CSS (Web Worker)", + languages: ["css", "scss", "less"], + runtimes: ["web-worker"], + transport: { kind: "external" }, + clientConfig: { + builtinExtensions: { + keymaps: false, + }, + }, + useWorkspaceFolders: true, + enabled: true, + }), + defineServer({ + id: "json", + label: "JSON (Web Worker)", + languages: ["json", "jsonc"], + runtimes: ["web-worker"], + transport: { kind: "external" }, + clientConfig: { + builtinExtensions: { + keymaps: false, + }, + }, + useWorkspaceFolders: true, + enabled: true, + }), + defineServer({ + id: "html-stdio", + label: "HTML (STDIO)", + languages: ["html", "vue", "svelte"], + runtimes: ["builtin-alpine"], command: "vscode-html-language-server", args: ["--stdio"], checkCommand: "which vscode-html-language-server", @@ -18,12 +61,14 @@ export const webServers: LspServerManifest[] = [ keymaps: false, }, }, - enabled: true, + useWorkspaceFolders: true, + enabled: false, }), defineServer({ - id: "css", - label: "CSS", + id: "css-stdio", + label: "CSS (STDIO)", languages: ["css", "scss", "less"], + runtimes: ["builtin-alpine"], command: "vscode-css-language-server", args: ["--stdio"], checkCommand: "which vscode-css-language-server", @@ -36,12 +81,14 @@ export const webServers: LspServerManifest[] = [ keymaps: false, }, }, - enabled: true, + useWorkspaceFolders: true, + enabled: false, }), defineServer({ - id: "json", - label: "JSON", + id: "json-stdio", + label: "JSON (STDIO)", languages: ["json", "jsonc"], + runtimes: ["builtin-alpine"], command: "vscode-json-language-server", args: ["--stdio"], checkCommand: "which vscode-json-language-server", @@ -54,7 +101,8 @@ export const webServers: LspServerManifest[] = [ keymaps: false, }, }, - enabled: true, + useWorkspaceFolders: true, + enabled: false, }), ]; diff --git a/src/cm/lsp/types.ts b/src/cm/lsp/types.ts index 5c53b9690c..3fa29bdadf 100644 --- a/src/cm/lsp/types.ts +++ b/src/cm/lsp/types.ts @@ -416,6 +416,8 @@ export interface ClientIdleInfo { server: LspServerDefinition; client: LSPClient; rootUri: string | null; + /** Disposes only this idle client instance (not every client for the server id). */ + dispose: () => Promise; } export interface ClientState { diff --git a/src/cm/lsp/workerTransport.ts b/src/cm/lsp/workerTransport.ts new file mode 100644 index 0000000000..cf45a2c864 --- /dev/null +++ b/src/cm/lsp/workerTransport.ts @@ -0,0 +1,302 @@ +/* +Handles worker lifecycle, readiness, logging, timeouts, disposal, RPC +message fan-out, and optional host-request dispatch so plugins do not +reimplement the same boilerplate. +*/ + +import { addLspLog } from "./logs"; +import type { Transport, TransportHandle } from "./types"; + +const DEFAULT_STARTUP_TIMEOUT = 10_000; + +export type LspWorkerHostHandler = ( + params: Record, +) => unknown | Promise; + +export interface LspWorkerTransportOptions { + /** Absolute or app-relative URL of the worker script. */ + url: string; + /** Worker name (WorkerOptions.name) and default log identity. */ + name?: string; + /** Optional id used for LSP logs and error messages. */ + serverId?: string; + /** Milliseconds to wait for a `{ kind: "ready" }` control message. */ + startupTimeout?: number; + /** + * Optional configure payload posted immediately after the worker is + * created. Callers typically include `kind: "configure"` plus server + * metadata the worker needs before it signals ready. + */ + configure?: Record; + /** + * Host-request handlers keyed by method name. Workers send + * `{ kind: "host-request", id, method, params? }` (or flat fields such + * as `uri` for built-in workers). Responses are posted back as + * `{ kind: "host-response", id, result?, error? }`. + */ + hostHandlers?: Record; +} + +interface WorkerControlMessage { + kind?: string; + id?: number; + method?: string; + params?: Record; + level?: "error" | "warn" | "info"; + message?: string; + uri?: string; + [key: string]: unknown; +} + +interface WorkerHostResponse { + kind: "host-response"; + id: number; + result?: unknown; + error?: string; +} + +type MessageListener = (data: string) => void; + +function isControlMessage(value: unknown): value is WorkerControlMessage { + return ( + !!value && + typeof value === "object" && + "kind" in value && + typeof (value as { kind?: unknown }).kind === "string" + ); +} + +function extractHostRequest( + data: WorkerControlMessage, +): { id: number; method: string; params: Record } | null { + if (data.kind !== "host-request" || typeof data.id !== "number") { + return null; + } + if (typeof data.method !== "string" || !data.method) { + return null; + } + + if (data.params && typeof data.params === "object" && !Array.isArray(data.params)) { + return { + id: data.id, + method: data.method, + params: data.params, + }; + } + + const params: Record = {}; + for (const [key, value] of Object.entries(data)) { + if (key === "kind" || key === "id" || key === "method" || key === "params") { + continue; + } + params[key] = value; + } + return { id: data.id, method: data.method, params }; +} + +/** + * Create a CodeMirror-compatible LSP transport backed by a Web Worker. + * + * The worker is expected to: + * - signal readiness with `{ kind: "ready" }` + * - exchange JSON-RPC as string messages + * - optionally request host services via `{ kind: "host-request", ... }` + * - optionally emit `{ kind: "log" | "status", ... }` control messages + */ +export function createWorkerTransport( + options: LspWorkerTransportOptions, +): TransportHandle { + if (!options?.url) { + throw new Error("createWorkerTransport requires a worker url"); + } + if (typeof Worker === "undefined") { + throw new Error("Web Workers are not available in this environment"); + } + + const name = options.name?.trim() || "acode-lsp-worker"; + const serverId = options.serverId?.trim() || name; + const startupTimeout = + typeof options.startupTimeout === "number" && options.startupTimeout > 0 + ? options.startupTimeout + : DEFAULT_STARTUP_TIMEOUT; + const hostHandlers = options.hostHandlers ?? {}; + + const worker = new Worker(options.url, { name }); + const listeners = new Set(); + let disposed = false; + let readySettled = false; + let resolveReady!: () => void; + let rejectReady!: (error: Error) => void; + + const ready = new Promise((resolve, reject) => { + resolveReady = resolve; + rejectReady = reject; + }); + + const startupTimer = setTimeout(() => { + if (readySettled || disposed) return; + failTransport( + new Error( + `Timed out starting the ${serverId} worker after ${startupTimeout}ms`, + ), + ); + }, startupTimeout); + + function settleReady(error?: Error): void { + if (readySettled) return; + readySettled = true; + clearTimeout(startupTimer); + if (error) rejectReady(error); + else resolveReady(); + } + + /** + * Tear down the worker and reject readiness when still pending. + * Safe after `ready` has already resolved (e.g. OOM / post-start crash): + * `settleReady` is then a no-op, but the transport must still close so + * later `send()` calls throw instead of talking to a dead worker. + */ + function failTransport(error: Error): void { + addLspLog(serverId, "error", error.message); + console.error(`[LSP:${serverId}:worker]`, error); + settleReady(error); + if (disposed) return; + disposed = true; + clearTimeout(startupTimer); + listeners.clear(); + try { + worker.terminate(); + } catch { + // Already terminated by the browser (e.g. OOM kill). + } + } + + function dispatchToListeners(data: string): void { + if (disposed) return; + for (const listener of listeners) { + try { + listener(data); + } catch (error) { + console.error(`[LSP:${serverId}] Worker transport listener failed`, error); + } + } + } + + async function handleHostRequest(message: WorkerControlMessage): Promise { + const request = extractHostRequest(message); + if (!request) return; + + const response: WorkerHostResponse = { + kind: "host-response", + id: request.id, + }; + + const handler = hostHandlers[request.method]; + if (!handler) { + response.error = `Unsupported worker host method: ${request.method}`; + } else { + try { + response.result = await handler(request.params); + } catch (error) { + response.error = + error instanceof Error ? error.message : String(error); + } + } + + if (!disposed) worker.postMessage(response); + } + + function handleControlMessage(data: WorkerControlMessage): void { + switch (data.kind) { + case "ready": + if (disposed) return; + settleReady(); + addLspLog(serverId, "info", "Web Worker is ready"); + return; + case "error": { + const message = + typeof data.message === "string" && data.message + ? data.message + : `The ${serverId} worker failed to start`; + failTransport(new Error(message)); + return; + } + case "host-request": + void handleHostRequest(data); + return; + case "log": { + const level = data.level ?? "info"; + const message = data.message ?? "Worker message"; + addLspLog(serverId, level, message); + console[level](`[LSP:${serverId}:worker] ${message}`); + return; + } + case "status": { + const message = data.message ?? ""; + if (message) { + addLspLog(serverId, "info", message); + console.info(`[LSP:${serverId}:worker] ${message}`); + } + return; + } + default: + // Ignore unknown control frames so plugins can extend the protocol. + return; + } + } + + worker.onmessage = (event: MessageEvent) => { + if (disposed) return; + const data = event.data; + if (typeof data === "string") { + dispatchToListeners(data); + return; + } + if (!isControlMessage(data)) return; + handleControlMessage(data); + }; + + worker.onerror = (event: ErrorEvent) => { + failTransport( + new Error(event.message || `The ${serverId} worker failed`), + ); + }; + + if (options.configure && typeof options.configure === "object") { + worker.postMessage(options.configure); + } + + const transport: Transport = { + send(message: string): void { + if (disposed) { + throw new Error(`The ${serverId} worker is closed`); + } + worker.postMessage(message); + }, + subscribe(handler: MessageListener): void { + if (disposed) return; + listeners.add(handler); + }, + unsubscribe(handler: MessageListener): void { + listeners.delete(handler); + }, + }; + + return { + transport, + ready, + dispose(): void { + if (disposed) return; + disposed = true; + clearTimeout(startupTimer); + listeners.clear(); + try { + worker.terminate(); + } catch { + // Already terminated. + } + }, + }; +} + +export default { createTransport: createWorkerTransport }; diff --git a/src/cm/lsp/workers/css.worker.ts b/src/cm/lsp/workers/css.worker.ts new file mode 100644 index 0000000000..c5c3b5cff1 --- /dev/null +++ b/src/cm/lsp/workers/css.worker.ts @@ -0,0 +1,209 @@ +import { + getCSSLanguageService, + getLESSLanguageService, + getSCSSLanguageService, + type LanguageService, + type Stylesheet, +} from "vscode-css-languageservice"; +import type { TextDocument } from "vscode-languageserver-textdocument"; +import { + getTextDocument, + METHOD_NOT_HANDLED, + resolveReference, + startWorkerServer, +} from "./protocol"; + +interface CachedStylesheet { + version: number; + languageId: string; + stylesheet: Stylesheet; +} + +startWorkerServer(({ documents }) => { + const services = { + css: getCSSLanguageService(), + less: getLESSLanguageService(), + scss: getSCSSLanguageService(), + }; + const parsedDocuments = new Map(); + const documentContext = { resolveReference }; + + function getService(document: TextDocument): LanguageService { + if (document.languageId === "less") return services.less; + if (document.languageId === "scss") return services.scss; + return services.css; + } + + function getStylesheet( + document: TextDocument, + service: LanguageService, + ): Stylesheet { + const cached = parsedDocuments.get(document.uri); + if ( + cached?.version === document.version && + cached.languageId === document.languageId + ) { + return cached.stylesheet; + } + const stylesheet = service.parseStylesheet(document); + parsedDocuments.set(document.uri, { + version: document.version, + languageId: document.languageId, + stylesheet, + }); + return stylesheet; + } + + return { + capabilities: { + completionProvider: { + resolveProvider: false, + triggerCharacters: ["/", "-", ":", "("], + }, + hoverProvider: true, + documentFormattingProvider: true, + documentRangeFormattingProvider: true, + documentSymbolProvider: true, + definitionProvider: true, + referencesProvider: true, + renameProvider: { + prepareProvider: true, + }, + documentHighlightProvider: true, + documentLinkProvider: { + resolveProvider: false, + }, + codeActionProvider: true, + colorProvider: true, + foldingRangeProvider: true, + selectionRangeProvider: true, + }, + + validate(document) { + const service = getService(document); + return service.doValidation( + document, + getStylesheet(document, service), + ); + }, + + async request(method, params) { + const document = getTextDocument(documents, params); + if (!document) return null; + const service = getService(document); + const stylesheet = getStylesheet(document, service); + const request = params as { + position: Parameters[1]; + range?: Parameters[1]; + options: Parameters[2]; + newName: string; + context: Parameters[2]; + color: Parameters[2]; + positions: Parameters[1]; + }; + + switch (method) { + case "textDocument/completion": + return service.doComplete2( + document, + request.position, + stylesheet, + documentContext, + ); + case "textDocument/hover": + return service.doHover(document, request.position, stylesheet); + case "textDocument/formatting": + return service.format(document, undefined, request.options); + case "textDocument/rangeFormatting": + return service.format(document, request.range, request.options); + case "textDocument/documentSymbol": + return service.findDocumentSymbols2(document, stylesheet); + case "textDocument/definition": { + const definition = service.findDefinition( + document, + request.position, + stylesheet, + ); + return definition ? [definition] : null; + } + case "textDocument/references": + return service.findReferences( + document, + request.position, + stylesheet, + ); + case "textDocument/prepareRename": + return ( + service.prepareRename(document, request.position, stylesheet) ?? + null + ); + case "textDocument/rename": + return service.doRename( + document, + request.position, + request.newName, + stylesheet, + ); + case "textDocument/documentHighlight": + return service.findDocumentHighlights( + document, + request.position, + stylesheet, + ); + case "textDocument/documentLink": + return service.findDocumentLinks2( + document, + stylesheet, + documentContext, + ); + case "textDocument/codeAction": + return service.doCodeActions2( + document, + request.range!, + request.context, + stylesheet, + ); + case "textDocument/documentColor": + return service.findDocumentColors(document, stylesheet); + case "textDocument/colorPresentation": + return service.getColorPresentations( + document, + stylesheet, + request.color, + request.range!, + ); + case "textDocument/foldingRange": + return service.getFoldingRanges(document); + case "textDocument/selectionRange": + return service.getSelectionRanges( + document, + request.positions, + stylesheet, + ); + default: + return METHOD_NOT_HANDLED; + } + }, + + configure(settings) { + const languageSettings = settings as + | { + css?: Parameters[0]; + less?: Parameters[0]; + scss?: Parameters[0]; + } + | undefined; + services.css.configure(languageSettings?.css); + services.less.configure(languageSettings?.less); + services.scss.configure(languageSettings?.scss); + }, + + dispose() { + parsedDocuments.clear(); + }, + + closeDocument(uri) { + parsedDocuments.delete(uri); + }, + }; +}); diff --git a/src/cm/lsp/workers/html.worker.ts b/src/cm/lsp/workers/html.worker.ts new file mode 100644 index 0000000000..b6e8e2de3b --- /dev/null +++ b/src/cm/lsp/workers/html.worker.ts @@ -0,0 +1,599 @@ +import { + getCSSLanguageService, + type LanguageService as CssLanguageService, + type Stylesheet, +} from "vscode-css-languageservice"; +import { + getLanguageService as getHtmlLanguageService, + type HTMLDocument, + type LanguageService as HtmlLanguageService, +} from "vscode-html-languageservice"; +import { + ClientCapabilities, + getLanguageService as getJsonLanguageService, + type JSONDocument, + type LanguageService as JsonLanguageService, +} from "vscode-json-languageservice"; +import { TextDocument } from "vscode-languageserver-textdocument"; +import type { + Diagnostic, + DocumentSymbol, + FoldingRange, + Position, +} from "vscode-languageserver-types"; +import { + clearDocumentRegions, + getDocumentRegions, + type HTMLDocumentRegions, +} from "./htmlEmbeddedSupport"; +import { importMapSchema } from "./jsonSchemas"; +import { NestedLspClient } from "./nestedLspClient"; +import { + getTextDocument, + METHOD_NOT_HANDLED, + resolveReference, + startWorkerServer, +} from "./protocol"; + +interface CachedHtmlDocument { + version: number; + document: HTMLDocument; +} + +interface EmbeddedDocuments { + regions: HTMLDocumentRegions; + css: TextDocument | null; + importmap: TextDocument | null; + javascript: TextDocument | null; +} + +interface CachedEmbeddedDocuments extends EmbeddedDocuments { + version: number; +} + +interface RequestParams { + position: Position; + range?: Parameters[1]; + options: Parameters[2]; + newName: string; + context: Parameters[2]; + color: Parameters[2]; + positions: Parameters[1]; +} + +startWorkerServer(({ documents, requestFile, rootUri }) => { + const htmlService = getHtmlLanguageService(); + const cssService = getCSSLanguageService(); + const jsonService = createImportMapService(); + const parsedHtml = new Map(); + const embeddedDocuments = new Map(); + const parsedCss = new Map(); + const parsedJson = new Map(); + const documentContext = { resolveReference }; + let typescriptClient: NestedLspClient | null | undefined; + + function getTypeScriptClient(): NestedLspClient | null { + if (typescriptClient !== undefined) return typescriptClient; + if (typeof Worker === "undefined") { + typescriptClient = null; + return null; + } + typescriptClient = new NestedLspClient( + "typescriptLspWorker.js", + { + serverId: "typescript", + rootUri, + }, + requestFile, + ); + return typescriptClient; + } + + async function requestTypeScript( + method: string, + params: unknown, + document: TextDocument | null, + ): Promise { + const client = getTypeScriptClient(); + if (!client) return null; + return client.request(method, params, document ?? undefined); + } + + function getHtml(document: TextDocument): HTMLDocument { + const cached = parsedHtml.get(document.uri); + if (cached?.version === document.version) return cached.document; + const parsed = htmlService.parseHTMLDocument(document); + parsedHtml.set(document.uri, { + version: document.version, + document: parsed, + }); + return parsed; + } + + function getEmbedded(document: TextDocument): EmbeddedDocuments { + const cached = embeddedDocuments.get(document.uri); + if (cached?.version === document.version) return cached; + const regions = getDocumentRegions(htmlService, document); + const cssText = regions.getEmbeddedDocument("css", false); + const importMapText = regions.getEmbeddedDocument("importmap", false); + const javascriptText = regions.getEmbeddedDocument("javascript", false); + const result: CachedEmbeddedDocuments = { + version: document.version, + regions, + css: cssText + ? TextDocument.create( + document.uri, + "css", + document.version, + cssText, + ) + : null, + importmap: importMapText + ? TextDocument.create( + document.uri, + "json", + document.version, + importMapText, + ) + : null, + javascript: javascriptText + ? TextDocument.create( + document.uri, + "javascript", + document.version, + javascriptText, + ) + : null, + }; + embeddedDocuments.set(document.uri, result); + return result; + } + + function getCss(document: TextDocument): Stylesheet { + const cached = parsedCss.get(document.uri); + if (cached?.version === document.version) return cached.document; + const parsed = cssService.parseStylesheet(document); + parsedCss.set(document.uri, { + version: document.version, + document: parsed, + }); + return parsed; + } + + function getJson(document: TextDocument): JSONDocument { + const cached = parsedJson.get(document.uri); + if (cached?.version === document.version) return cached.document; + const parsed = jsonService.parseJSONDocument(document); + parsedJson.set(document.uri, { + version: document.version, + document: parsed, + }); + return parsed; + } + + function embeddedLanguageAt( + embedded: EmbeddedDocuments, + position?: Position, + ): string | undefined { + return position + ? embedded.regions.getEmbeddedLanguageAtPosition(position) + : undefined; + } + + return { + capabilities: { + completionProvider: { + resolveProvider: true, + triggerCharacters: ["<", " ", ":", '"', "=", "/", "-", "("], + }, + hoverProvider: true, + signatureHelpProvider: { + triggerCharacters: ["(", ",", "<"], + retriggerCharacters: [")"], + }, + documentFormattingProvider: true, + documentRangeFormattingProvider: true, + documentSymbolProvider: true, + definitionProvider: true, + referencesProvider: true, + renameProvider: true, + documentHighlightProvider: true, + documentLinkProvider: { + resolveProvider: false, + }, + codeActionProvider: true, + colorProvider: true, + foldingRangeProvider: true, + selectionRangeProvider: true, + linkedEditingRangeProvider: true, + inlayHintProvider: true, + }, + + async validate(document) { + const diagnostics: Diagnostic[] = []; + const embedded = getEmbedded(document); + + if (embedded.css) { + diagnostics.push( + ...cssService.doValidation( + embedded.css, + getCss(embedded.css), + ), + ); + } + if (embedded.importmap) { + diagnostics.push( + ...(await jsonService.doValidation( + embedded.importmap, + getJson(embedded.importmap), + undefined, + importMapSchema.schema, + )), + ); + } + if (embedded.javascript) { + const javascriptDiagnostics = await requestTypeScript( + "acode/validate", + { + textDocument: { uri: embedded.javascript.uri }, + }, + embedded.javascript, + ); + if (Array.isArray(javascriptDiagnostics)) { + diagnostics.push(...(javascriptDiagnostics as Diagnostic[])); + } + } + return diagnostics; + }, + + async request(method, params) { + if (method === "completionItem/resolve") { + if ( + params && + typeof params === "object" && + (params as { data?: { acodeLspProvider?: unknown } }).data + ?.acodeLspProvider === "typescript" + ) { + return requestTypeScript(method, params, null); + } + return params; + } + + const document = getTextDocument(documents, params); + if (!document) return null; + const html = getHtml(document); + const embedded = getEmbedded(document); + const request = params as RequestParams; + const languageId = embeddedLanguageAt( + embedded, + request.position ?? request.range?.start, + ); + const css = embedded.css; + const importmap = embedded.importmap; + const javascript = embedded.javascript; + + switch (method) { + case "textDocument/completion": + if (languageId === "css" && css) { + return cssService.doComplete2( + css, + request.position, + getCss(css), + documentContext, + ); + } + if (languageId === "importmap" && importmap) { + return jsonService.doComplete( + importmap, + request.position, + getJson(importmap), + ); + } + if (languageId === "javascript") { + return requestTypeScript(method, params, javascript); + } + return htmlService.doComplete2( + document, + request.position, + html, + documentContext, + ); + case "textDocument/hover": + if (languageId === "css" && css) { + return cssService.doHover(css, request.position, getCss(css)); + } + if (languageId === "importmap" && importmap) { + return jsonService.doHover( + importmap, + request.position, + getJson(importmap), + ); + } + if (languageId === "javascript") { + return requestTypeScript(method, params, javascript); + } + return htmlService.doHover(document, request.position, html); + case "textDocument/signatureHelp": + return languageId === "javascript" + ? requestTypeScript(method, params, javascript) + : null; + case "textDocument/formatting": + return htmlService.format(document, undefined, { + ...request.options, + contentUnformatted: "script", + }); + case "textDocument/rangeFormatting": + if (languageId === "css" && css) { + return cssService.format(css, request.range, request.options); + } + if (languageId === "importmap" && importmap) { + return jsonService.format( + importmap, + request.range, + { + tabSize: request.options.tabSize ?? 4, + insertSpaces: request.options.insertSpaces ?? true, + }, + ); + } + if (languageId === "javascript") { + return requestTypeScript(method, params, javascript); + } + return htmlService.format( + document, + request.range, + request.options, + ); + case "textDocument/documentSymbol": { + const symbols: DocumentSymbol[] = + htmlService.findDocumentSymbols2(document, html); + if (css) { + symbols.push( + ...cssService.findDocumentSymbols2(css, getCss(css)), + ); + } + if (importmap) { + symbols.push( + ...jsonService.findDocumentSymbols2( + importmap, + getJson(importmap), + ), + ); + } + if (javascript) { + const javascriptSymbols = await requestTypeScript( + method, + params, + javascript, + ); + if (Array.isArray(javascriptSymbols)) { + symbols.push(...(javascriptSymbols as DocumentSymbol[])); + } + } + return symbols; + } + case "textDocument/definition": + if (languageId === "css" && css) { + const definition = cssService.findDefinition( + css, + request.position, + getCss(css), + ); + return definition ? [definition] : null; + } + if (languageId === "importmap" && importmap) { + return jsonService.findDefinition( + importmap, + request.position, + getJson(importmap), + ); + } + if (languageId === "javascript") { + return requestTypeScript(method, params, javascript); + } + return null; + case "textDocument/references": + if (languageId === "javascript") { + return requestTypeScript(method, params, javascript); + } + return languageId === "css" && css + ? cssService.findReferences( + css, + request.position, + getCss(css), + ) + : null; + case "textDocument/rename": + if (languageId === "css" && css) { + return cssService.doRename( + css, + request.position, + request.newName, + getCss(css), + ); + } + if (languageId === "javascript") { + return requestTypeScript(method, params, javascript); + } + if (languageId) return null; + return htmlService.doRename( + document, + request.position, + request.newName, + html, + ); + case "textDocument/documentHighlight": + if (languageId === "css" && css) { + return cssService.findDocumentHighlights( + css, + request.position, + getCss(css), + ); + } + if (languageId === "javascript") { + return requestTypeScript(method, params, javascript); + } + if (languageId) return null; + return htmlService.findDocumentHighlights( + document, + request.position, + html, + ); + case "textDocument/documentLink": { + const links = htmlService.findDocumentLinks( + document, + documentContext, + ); + if (css) { + links.push( + ...(await cssService.findDocumentLinks2( + css, + getCss(css), + documentContext, + )), + ); + } + if (importmap) { + links.push( + ...(await jsonService.findLinks( + importmap, + getJson(importmap), + )), + ); + } + return links; + } + case "textDocument/codeAction": + if (languageId === "javascript") { + return requestTypeScript(method, params, javascript); + } + return languageId === "css" && css + ? cssService.doCodeActions2( + css, + request.range!, + request.context, + getCss(css), + ) + : []; + case "textDocument/documentColor": + return css + ? cssService.findDocumentColors(css, getCss(css)) + : []; + case "textDocument/colorPresentation": + return languageId === "css" && css + ? cssService.getColorPresentations( + css, + getCss(css), + request.color, + request.range!, + ) + : []; + case "textDocument/foldingRange": { + const ranges: FoldingRange[] = + htmlService.getFoldingRanges(document); + if (css) ranges.push(...cssService.getFoldingRanges(css)); + if (importmap) { + ranges.push(...jsonService.getFoldingRanges(importmap)); + } + if (javascript) { + const javascriptRanges = await requestTypeScript( + method, + params, + javascript, + ); + if (Array.isArray(javascriptRanges)) { + ranges.push(...(javascriptRanges as FoldingRange[])); + } + } + return ranges.sort((a, b) => a.startLine - b.startLine); + } + case "textDocument/selectionRange": + if ( + embeddedLanguageAt(embedded, request.positions?.[0]) === "css" && + css + ) { + return cssService.getSelectionRanges( + css, + request.positions, + getCss(css), + ); + } + if ( + embeddedLanguageAt(embedded, request.positions?.[0]) === + "importmap" && + importmap + ) { + return jsonService.getSelectionRanges( + importmap, + request.positions, + getJson(importmap), + ); + } + if ( + embeddedLanguageAt(embedded, request.positions?.[0]) === + "javascript" && + javascript + ) { + return requestTypeScript(method, params, javascript); + } + return htmlService.getSelectionRanges( + document, + request.positions, + ); + case "textDocument/linkedEditingRange": { + if (languageId) return null; + const ranges = htmlService.findLinkedEditingRanges( + document, + request.position, + html, + ); + return ranges ? { ranges } : null; + } + case "textDocument/inlayHint": + return languageId === "javascript" + ? requestTypeScript(method, params, javascript) + : []; + default: + return METHOD_NOT_HANDLED; + } + }, + + closeDocument(uri) { + parsedHtml.delete(uri); + embeddedDocuments.delete(uri); + parsedCss.delete(uri); + parsedJson.delete(uri); + clearDocumentRegions(uri); + jsonService.resetSchema(uri); + typescriptClient?.closeDocument(uri); + }, + + dispose() { + parsedHtml.clear(); + embeddedDocuments.clear(); + parsedCss.clear(); + parsedJson.clear(); + clearDocumentRegions(); + typescriptClient?.dispose(); + typescriptClient = null; + }, + }; +}); + +function createImportMapService(): JsonLanguageService { + const service = getJsonLanguageService({ + promiseConstructor: Promise, + clientCapabilities: ClientCapabilities.LATEST, + }); + service.configure({ + validate: true, + allowComments: false, + schemas: [ + { + ...importMapSchema, + fileMatch: ["*"], + }, + ], + }); + return service; +} diff --git a/src/cm/lsp/workers/htmlEmbeddedSupport.ts b/src/cm/lsp/workers/htmlEmbeddedSupport.ts new file mode 100644 index 0000000000..9a56ac39f3 --- /dev/null +++ b/src/cm/lsp/workers/htmlEmbeddedSupport.ts @@ -0,0 +1,286 @@ +import { + type LanguageService, + type Position, + type TextDocument, + TokenType, +} from "vscode-html-languageservice"; + +export interface EmbeddedRegion { + start: number; + end: number; + languageId?: string; + attributeValue?: boolean; +} + +export interface HTMLDocumentRegions { + readonly regions: readonly EmbeddedRegion[]; + getEmbeddedDocument( + languageId: string, + ignoreAttributeValues: boolean, + ): string | null; + getEmbeddedLanguages(ignoreAttributeValues?: boolean): string[]; + getEmbeddedLanguageAtPosition(position: Position): string | undefined; + hasEmbeddedLanguage( + languageId: string, + ignoreAttributeValues?: boolean, + ): boolean; +} + +interface CachedRegions { + regions: EmbeddedRegion[]; + version: number; + expires: number; +} + +const cache = new Map(); + +export function clearDocumentRegions(uri?: string): void { + if (uri) cache.delete(uri); + else cache.clear(); +} + +export function getDocumentRegions( + languageService: LanguageService, + document: TextDocument, +): HTMLDocumentRegions { + const regions: EmbeddedRegion[] = []; + const cached = cache.get(document.uri); + + if ( + cached && + cached.version === document.version && + cached.expires > Date.now() + ) { + regions.push(...cached.regions); + } else { + const scanner = languageService.createScanner(document.getText()); + let lastTagName = ""; + let lastAttributeName: string | null = null; + let lastLanguageId: string | undefined; + let token = scanner.scan(); + + while (token !== TokenType.EOS) { + switch (token) { + case TokenType.StartTag: + lastTagName = scanner.getTokenText(); + lastAttributeName = null; + lastLanguageId = "javascript"; + break; + case TokenType.Styles: + regions.push({ + languageId: "css", + start: scanner.getTokenOffset(), + end: scanner.getTokenEnd(), + }); + break; + case TokenType.Script: + regions.push({ + languageId: lastLanguageId, + start: scanner.getTokenOffset(), + end: scanner.getTokenEnd(), + }); + break; + case TokenType.AttributeName: + lastAttributeName = scanner.getTokenText(); + break; + case TokenType.AttributeValue: + if ( + lastAttributeName === "type" && + lastTagName.toLowerCase() === "script" + ) { + const tokenText = scanner.getTokenText(); + if ( + /["'](module|(text|application)\/(java|ecma)script|text\/babel)["']/.test( + tokenText, + ) + ) { + lastLanguageId = "javascript"; + } else if (/["']importmap["']/.test(tokenText)) { + lastLanguageId = "importmap"; + } else { + lastLanguageId = undefined; + } + } else if (lastAttributeName) { + const languageId = getAttributeLanguage(lastAttributeName); + if (languageId) { + let start = scanner.getTokenOffset(); + let end = scanner.getTokenEnd(); + const firstChar = document.getText()[start]; + if (firstChar === "'" || firstChar === '"') { + start++; + end--; + } + regions.push({ + languageId, + start, + end, + attributeValue: true, + }); + } + } + lastAttributeName = null; + break; + } + token = scanner.scan(); + } + + cache.set(document.uri, { + regions, + version: document.version, + expires: Date.now() + 30000, + }); + } + + return { + regions, + getEmbeddedDocument: (languageId, ignoreAttributeValues) => + getEmbeddedDocument( + document, + regions, + languageId, + ignoreAttributeValues, + ), + getEmbeddedLanguages: (ignoreAttributeValues) => + getEmbeddedLanguages(regions, ignoreAttributeValues), + getEmbeddedLanguageAtPosition: (position) => + getEmbeddedLanguageAtPosition(document, regions, position), + hasEmbeddedLanguage: (languageId, ignoreAttributeValues) => + regions.some( + (region) => + region.languageId === languageId && + (!ignoreAttributeValues || !region.attributeValue), + ), + }; +} + +function getEmbeddedLanguages( + regions: EmbeddedRegion[], + ignoreAttributeValues?: boolean, +): string[] { + const result: string[] = []; + for (const { languageId, attributeValue } of regions) { + if ( + languageId && + (!ignoreAttributeValues || !attributeValue) && + !result.includes(languageId) + ) { + result.push(languageId); + } + } + return result; +} + +function getEmbeddedLanguageAtPosition( + document: TextDocument, + regions: EmbeddedRegion[], + position: Position, +): string | undefined { + const offset = document.offsetAt(position); + for (const region of regions) { + if (region.start > offset) break; + if (offset <= region.end) return region.languageId; + } + return undefined; +} + +function getEmbeddedDocument( + document: TextDocument, + regions: EmbeddedRegion[], + languageId: string, + ignoreAttributeValues: boolean, +): string | null { + const documentText = document.getText(); + let currentPosition = 0; + let result = ""; + let lastSuffix = ""; + let hasAny = false; + + for (const region of regions) { + if ( + region.languageId === languageId && + (!ignoreAttributeValues || !region.attributeValue) + ) { + result = substituteWithWhitespace( + result, + currentPosition, + region.start, + documentText, + lastSuffix, + getPrefix(region), + ); + result += updateContent( + region, + documentText.substring(region.start, region.end), + ); + currentPosition = region.end; + lastSuffix = getSuffix(region); + hasAny = true; + } + } + + return hasAny ? result + lastSuffix : null; +} + +function getPrefix(region: EmbeddedRegion): string { + if (region.attributeValue && region.languageId === "css") return "__{"; + return ""; +} + +function getSuffix(region: EmbeddedRegion): string { + if (!region.attributeValue) return ""; + if (region.languageId === "css") return "}"; + if (region.languageId === "javascript") return ";"; + return ""; +} + +function updateContent(region: EmbeddedRegion, content: string): string { + if (!region.attributeValue && region.languageId === "javascript") { + return content.replace("", " */"); + } + return content; +} + +function substituteWithWhitespace( + result: string, + start: number, + end: number, + oldContent: string, + before: string, + after: string, +): string { + result += before; + let accumulatedWhitespace = -before.length; + for (let index = start; index < end; index++) { + const character = oldContent[index]; + if (character === "\n" || character === "\r") { + accumulatedWhitespace = 0; + result += character; + } else { + accumulatedWhitespace++; + } + } + result = append(result, " ", accumulatedWhitespace - after.length); + return result + after; +} + +function append(result: string, value: string, count: number): string { + let repeatedValue = value; + let remaining = count; + while (remaining > 0) { + if (remaining & 1) result += repeatedValue; + remaining >>= 1; + repeatedValue += repeatedValue; + } + return result; +} + +function getAttributeLanguage(attributeName: string): string | null { + if (attributeName === "style") return "css"; + if ( + attributeName.startsWith("on") && + /^[a-z]+$/.test(attributeName.slice(2)) + ) { + return "javascript"; + } + return null; +} diff --git a/src/cm/lsp/workers/json.worker.ts b/src/cm/lsp/workers/json.worker.ts new file mode 100644 index 0000000000..5357d6e1a0 --- /dev/null +++ b/src/cm/lsp/workers/json.worker.ts @@ -0,0 +1,183 @@ +import { + ClientCapabilities, + getLanguageService, + type JSONDocument, + type LanguageService, +} from "vscode-json-languageservice"; +import type { TextDocument } from "vscode-languageserver-textdocument"; +import { + getTextDocument, + METHOD_NOT_HANDLED, + startWorkerServer, +} from "./protocol"; +import { schemas } from "./jsonSchemas"; + +interface CachedJsonDocument { + version: number; + languageId: string; + document: JSONDocument; +} + +startWorkerServer(({ documents, requestFile }) => { + async function requestSchema(uri: string): Promise { + const url = new URL(uri); + if (url.protocol === "http:" || url.protocol === "https:") { + const response = await fetch(url.href); + if (!response.ok) { + throw new Error( + `Unable to load JSON schema (${response.status} ${response.statusText})`, + ); + } + return response.text(); + } + return requestFile(uri); + } + + function createService(allowComments: boolean): LanguageService { + const service = getLanguageService({ + schemaRequestService: requestSchema, + workspaceContext: { + resolveRelativePath(relativePath, resource) { + return new URL(relativePath, resource).href; + }, + }, + promiseConstructor: Promise, + clientCapabilities: ClientCapabilities.LATEST, + }); + service.configure({ + validate: true, + allowComments, + schemas, + }); + return service; + } + + const services = { + json: createService(false), + jsonc: createService(true), + }; + const parsedDocuments = new Map(); + + function getService(document: TextDocument): LanguageService { + return document.languageId === "jsonc" ? services.jsonc : services.json; + } + + function getParsed( + document: TextDocument, + service: LanguageService, + ): JSONDocument { + const cached = parsedDocuments.get(document.uri); + if ( + cached?.version === document.version && + cached.languageId === document.languageId + ) { + return cached.document; + } + const parsed = service.parseJSONDocument(document); + parsedDocuments.set(document.uri, { + version: document.version, + languageId: document.languageId, + document: parsed, + }); + return parsed; + } + + return { + capabilities: { + completionProvider: { + resolveProvider: true, + triggerCharacters: [" ", ":", '"'], + }, + hoverProvider: true, + documentFormattingProvider: true, + documentRangeFormattingProvider: true, + documentSymbolProvider: true, + definitionProvider: true, + documentLinkProvider: { + resolveProvider: false, + }, + colorProvider: true, + foldingRangeProvider: true, + selectionRangeProvider: true, + }, + + validate(document) { + const service = getService(document); + return service.doValidation(document, getParsed(document, service), { + comments: document.languageId === "jsonc" ? "ignore" : "error", + trailingCommas: + document.languageId === "jsonc" ? "warning" : "error", + }); + }, + + async request(method, params) { + if (method === "completionItem/resolve") { + return services.json.doResolve( + params as Parameters[0], + ); + } + + const document = getTextDocument(documents, params); + if (!document) return null; + const service = getService(document); + const json = getParsed(document, service); + const request = params as { + position: Parameters[1]; + range?: Parameters[1]; + options: Parameters[2]; + color: Parameters[2]; + positions: Parameters[1]; + }; + + switch (method) { + case "textDocument/completion": + return service.doComplete(document, request.position, json); + case "textDocument/hover": + return service.doHover(document, request.position, json); + case "textDocument/formatting": + return service.format(document, undefined, request.options); + case "textDocument/rangeFormatting": + return service.format(document, request.range, request.options); + case "textDocument/documentSymbol": + return service.findDocumentSymbols2(document, json); + case "textDocument/definition": + return service.findDefinition(document, request.position, json); + case "textDocument/documentLink": + return service.findLinks(document, json); + case "textDocument/documentColor": + return service.findDocumentColors(document, json); + case "textDocument/colorPresentation": + return service.getColorPresentations( + document, + json, + request.color, + request.range!, + ); + case "textDocument/foldingRange": + return service.getFoldingRanges(document); + case "textDocument/selectionRange": + return service.getSelectionRanges( + document, + request.positions, + json, + ); + default: + return METHOD_NOT_HANDLED; + } + }, + + dispose() { + parsedDocuments.clear(); + for (const uri of documents.keys()) { + services.json.resetSchema(uri); + services.jsonc.resetSchema(uri); + } + }, + + closeDocument(uri) { + parsedDocuments.delete(uri); + services.json.resetSchema(uri); + services.jsonc.resetSchema(uri); + }, + }; +}); diff --git a/src/cm/lsp/workers/jsonSchemas.ts b/src/cm/lsp/workers/jsonSchemas.ts new file mode 100644 index 0000000000..893270071a --- /dev/null +++ b/src/cm/lsp/workers/jsonSchemas.ts @@ -0,0 +1,60 @@ +import type { SchemaConfiguration } from "vscode-json-languageservice"; + +export const importMapSchema: SchemaConfiguration = { + uri: "https://github.com/denoland/vscode_deno/blob/main/schemas/import_map.schema.json", + fileMatch: [ + "import_map.json", + "import-map.json", + "importmap.json", + "importMap.json", + "*.importmap", + ], + schema: { + $schema: "http://json-schema.org/draft-07/schema#", + title: "An Import Map", + description: + "An import map which is used to remap imports when modules are loaded.", + type: "object", + properties: { + imports: { + description: "A map of specifiers to their remapped specifiers.", + type: "object", + properties: { + "@jsxRuntime": { + description: + "The key is the specifier for JSX import source, with a value that represents the target specifier.", + type: "string", + default: "https://esm.sh/react@18.3.1", + }, + }, + additionalProperties: { + description: + "The key is the specifier or partial specifier to match, with a value that represents the target specifier.", + type: "string", + }, + }, + scopes: { + description: + "Define a scope which remaps a specifier in only a specified scope", + type: "object", + additionalProperties: { + description: "A definition of a scoped remapping.", + type: "object", + additionalProperties: { + description: + "The key is the specifier or partial specifier to match within the referring scope, with a value that represents the target specifier.", + type: "string", + }, + }, + }, + }, + }, +}; + +export const schemas: SchemaConfiguration[] = [ + importMapSchema, + { + uri: "https://json.schemastore.org/tsconfig", + fileMatch: ["tsconfig.json"], + }, +]; diff --git a/src/cm/lsp/workers/nestedLspClient.ts b/src/cm/lsp/workers/nestedLspClient.ts new file mode 100644 index 0000000000..a4dc90c0ec --- /dev/null +++ b/src/cm/lsp/workers/nestedLspClient.ts @@ -0,0 +1,219 @@ +import type { TextDocument } from "vscode-languageserver-textdocument"; + +interface HostRequest { + kind: "host-request"; + id: number; + method: "readFile"; + uri: string; +} + +interface PendingRequest { + resolve(value: unknown): void; + reject(error: Error): void; +} + +export class NestedLspClient { + private readonly worker: Worker; + private readonly pending = new Map(); + private readonly versions = new Map(); + private nextRequestId = 0; + private ready: Promise; + /** Set when the worker fails or is disposed; new requests fail immediately. */ + private closedError: Error | null = null; + + constructor( + url: string, + config: { + serverId: string; + rootUri?: string | null; + initializationOptions?: Record; + }, + private readonly requestFile: (uri: string) => Promise, + ) { + this.worker = new Worker(url, { + name: `acode-embedded-${config.serverId}-lsp`, + }); + this.ready = new Promise((resolve, reject) => { + const timeout = setTimeout(() => { + const error = new Error( + `Timed out starting ${config.serverId} worker`, + ); + this.fail(error); + reject(error); + }, 10000); + this.worker.onmessage = (event: MessageEvent) => { + const data = event.data; + if (data && typeof data === "object") { + const kind = (data as { kind?: unknown }).kind; + if (kind === "ready") { + clearTimeout(timeout); + resolve(); + return; + } + if (kind === "error") { + clearTimeout(timeout); + const message = + typeof (data as { message?: unknown }).message === "string" + ? (data as { message: string }).message + : "Nested worker failed"; + const error = new Error(message); + this.fail(error); + reject(error); + return; + } + } + void this.handleMessage(data); + }; + this.worker.onerror = (event) => { + clearTimeout(timeout); + const error = new Error(event.message || "Nested worker failed"); + this.fail(error); + reject(error); + }; + }).then(async () => { + if (this.closedError) throw this.closedError; + await this.requestRaw("initialize", { + processId: null, + rootUri: config.rootUri ?? null, + capabilities: {}, + }); + this.notify("initialized", {}); + }); + this.worker.postMessage({ kind: "configure", ...config }); + } + + async syncDocument(document: TextDocument): Promise { + await this.ready; + this.throwIfClosed(); + const previousVersion = this.versions.get(document.uri); + if (previousVersion === document.version) return; + if (previousVersion === undefined) { + this.notify("textDocument/didOpen", { + textDocument: { + uri: document.uri, + languageId: document.languageId, + version: document.version, + text: document.getText(), + }, + }); + } else { + this.notify("textDocument/didChange", { + textDocument: { + uri: document.uri, + version: document.version, + }, + contentChanges: [{ text: document.getText() }], + }); + } + this.versions.set(document.uri, document.version); + } + + async request( + method: string, + params: unknown, + document?: TextDocument, + ): Promise { + await this.ready; + this.throwIfClosed(); + if (document) await this.syncDocument(document); + return this.requestRaw(method, params); + } + + closeDocument(uri: string): void { + if (!this.versions.delete(uri)) return; + if (this.closedError) return; + this.notify("textDocument/didClose", { + textDocument: { uri }, + }); + } + + dispose(): void { + this.fail(new Error("Nested worker disposed")); + this.versions.clear(); + this.worker.terminate(); + } + + private throwIfClosed(): void { + if (this.closedError) throw this.closedError; + } + + /** + * Marks the client dead, rejects every in-flight request, and blocks new ones. + * Safe to call multiple times (e.g. onerror after ready, then dispose). + */ + private fail(error: Error): void { + if (this.closedError) return; + this.closedError = error; + for (const request of this.pending.values()) { + request.reject(error); + } + this.pending.clear(); + } + + private requestRaw(method: string, params: unknown): Promise { + if (this.closedError) return Promise.reject(this.closedError); + const id = ++this.nextRequestId; + return new Promise((resolve, reject) => { + if (this.closedError) { + reject(this.closedError); + return; + } + this.pending.set(id, { resolve, reject }); + this.worker.postMessage( + JSON.stringify({ jsonrpc: "2.0", id, method, params }), + ); + }); + } + + private notify(method: string, params: unknown): void { + if (this.closedError) return; + this.worker.postMessage(JSON.stringify({ jsonrpc: "2.0", method, params })); + } + + private async handleMessage(data: unknown): Promise { + if (typeof data === "string") { + const message = JSON.parse(data) as { + id?: number; + result?: unknown; + error?: { message?: string }; + }; + if (typeof message.id !== "number") return; + const request = this.pending.get(message.id); + if (!request) return; + this.pending.delete(message.id); + if (message.error) { + request.reject(new Error(message.error.message || "Nested request failed")); + } else { + request.resolve(message.result); + } + return; + } + + if (this.closedError) return; + + const hostRequest = data as HostRequest | null; + if ( + !hostRequest || + hostRequest.kind !== "host-request" || + hostRequest.method !== "readFile" + ) { + return; + } + try { + const result = await this.requestFile(hostRequest.uri); + if (this.closedError) return; + this.worker.postMessage({ + kind: "host-response", + id: hostRequest.id, + result, + }); + } catch (error) { + if (this.closedError) return; + this.worker.postMessage({ + kind: "host-response", + id: hostRequest.id, + error: error instanceof Error ? error.message : String(error), + }); + } + } +} diff --git a/src/cm/lsp/workers/protocol.ts b/src/cm/lsp/workers/protocol.ts new file mode 100644 index 0000000000..65c7494281 --- /dev/null +++ b/src/cm/lsp/workers/protocol.ts @@ -0,0 +1,412 @@ +import { + TextDocument, + type TextDocumentContentChangeEvent, +} from "vscode-languageserver-textdocument"; +import type { Diagnostic } from "vscode-languageserver-types"; + +export const METHOD_NOT_HANDLED = Symbol("method-not-handled"); + +type JsonRpcId = number | string | null; + +interface JsonRpcMessage { + jsonrpc?: string; + id?: JsonRpcId; + method?: string; + params?: unknown; +} + +interface ConfigureMessage { + kind: "configure"; + serverId: string; + initializationOptions?: Record; + rootUri?: string | null; +} + +interface HostResponseMessage { + kind: "host-response"; + id: number; + result?: unknown; + error?: string; +} + +interface HostRequestMessage { + kind: "host-request"; + id: number; + method: "readFile"; + uri: string; +} + +interface WorkerScope { + onmessage: ((event: MessageEvent) => void) | null; + postMessage(message: unknown): void; + close(): void; +} + +interface TextDocumentIdentifier { + uri: string; +} + +interface VersionedTextDocumentIdentifier extends TextDocumentIdentifier { + version: number; +} + +interface TextDocumentItem extends VersionedTextDocumentIdentifier { + languageId: string; + text: string; +} + +interface DidOpenParams { + textDocument: TextDocumentItem; +} + +interface DidChangeParams { + textDocument: VersionedTextDocumentIdentifier; + contentChanges: TextDocumentContentChangeEvent[]; +} + +interface DidCloseParams { + textDocument: TextDocumentIdentifier; +} + +export interface WorkerServerContext { + documents: Map; + initializationOptions?: Record; + rootUri?: string | null; + getProjectVersion(): string; + requestFile(uri: string): Promise; +} + +export interface WorkerLanguageAdapter { + capabilities: Record; + validate?(document: TextDocument): Diagnostic[] | PromiseLike; + request( + method: string, + params: unknown, + ): unknown | PromiseLike | typeof METHOD_NOT_HANDLED; + configure?(settings: unknown): void; + closeDocument?(uri: string): void; + dispose?(): void; +} + +type AdapterFactory = ( + context: WorkerServerContext, +) => WorkerLanguageAdapter | Promise; + +const workerScope = globalThis as unknown as WorkerScope; +const documents = new Map(); +const validationTimers = new Map>(); +const cancelledRequests = new Set(); +const hostRequests = new Map< + number, + { resolve: (value: unknown) => void; reject: (error: Error) => void } +>(); + +let adapter: WorkerLanguageAdapter | null = null; +let serverId = "worker"; +let nextHostRequestId = 0; +let projectVersion = 0; + +function sendJson(message: unknown): void { + workerScope.postMessage(JSON.stringify(message)); +} + +function sendResponse(id: JsonRpcId, result: unknown): void { + sendJson({ jsonrpc: "2.0", id, result: result ?? null }); +} + +function sendError(id: JsonRpcId, code: number, error: unknown): void { + const message = error instanceof Error ? error.message : String(error); + sendJson({ + jsonrpc: "2.0", + id, + error: { + code, + message, + }, + }); +} + +function sendNotification(method: string, params: unknown): void { + sendJson({ jsonrpc: "2.0", method, params }); +} + +function sendLog(level: "error" | "warn" | "info", message: string): void { + workerScope.postMessage({ kind: "log", level, message }); +} + +function isConfigureMessage(value: unknown): value is ConfigureMessage { + return ( + !!value && + typeof value === "object" && + (value as { kind?: unknown }).kind === "configure" + ); +} + +function isHostResponse(value: unknown): value is HostResponseMessage { + return ( + !!value && + typeof value === "object" && + (value as { kind?: unknown }).kind === "host-response" + ); +} + +function requestHost(method: HostRequestMessage["method"], uri: string) { + const id = ++nextHostRequestId; + const message: HostRequestMessage = { + kind: "host-request", + id, + method, + uri, + }; + return new Promise((resolve, reject) => { + hostRequests.set(id, { resolve, reject }); + workerScope.postMessage(message); + }); +} + +async function requestFile(uri: string): Promise { + return String(await requestHost("readFile", uri)); +} + +function handleHostResponse(message: HostResponseMessage): void { + const pending = hostRequests.get(message.id); + if (!pending) return; + hostRequests.delete(message.id); + if (message.error) pending.reject(new Error(message.error)); + else pending.resolve(message.result); +} + +function publishDiagnostics( + uri: string, + version: number, + diagnostics: Diagnostic[], +): void { + sendNotification("textDocument/publishDiagnostics", { + uri, + version, + diagnostics, + }); +} + +function scheduleValidation(uri: string): void { + const existing = validationTimers.get(uri); + if (existing) clearTimeout(existing); + + validationTimers.set( + uri, + setTimeout(async () => { + validationTimers.delete(uri); + const document = documents.get(uri); + if (!document || !adapter?.validate) return; + const version = document.version; + try { + const diagnostics = await adapter.validate(document); + const current = documents.get(uri); + if (current?.version === version) { + publishDiagnostics(uri, version, diagnostics ?? []); + } + } catch (error) { + sendLog( + "warn", + `Validation failed for ${uri}: ${ + error instanceof Error ? error.message : String(error) + }`, + ); + } + }, 180), + ); +} + +function didOpen(params: DidOpenParams): void { + const item = params.textDocument; + const document = TextDocument.create( + item.uri, + item.languageId, + item.version, + item.text, + ); + documents.set(item.uri, document); + projectVersion++; + scheduleValidation(item.uri); +} + +function didChange(params: DidChangeParams): void { + const identifier = params.textDocument; + const document = documents.get(identifier.uri); + if (!document) return; + TextDocument.update(document, params.contentChanges, identifier.version); + projectVersion++; + scheduleValidation(identifier.uri); +} + +function didClose(params: DidCloseParams): void { + const { uri } = params.textDocument; + const timer = validationTimers.get(uri); + if (timer) clearTimeout(timer); + validationTimers.delete(uri); + if (documents.delete(uri)) projectVersion++; + adapter?.closeDocument?.(uri); + publishDiagnostics(uri, 0, []); +} + +function cancelRequest(params: unknown): void { + const id = (params as { id?: JsonRpcId } | null)?.id; + if (id !== undefined) cancelledRequests.add(id); +} + +async function handleRequest(message: JsonRpcMessage): Promise { + const id = message.id ?? null; + const method = message.method ?? ""; + + try { + switch (method) { + case "initialize": + sendResponse(id, { + capabilities: { + textDocumentSync: { + openClose: true, + change: 2, + }, + workspace: { + workspaceFolders: { + supported: true, + changeNotifications: true, + }, + }, + ...(adapter?.capabilities ?? {}), + }, + serverInfo: { + name: `Acode built-in ${serverId} worker`, + }, + }); + return; + case "shutdown": + sendResponse(id, null); + return; + } + + if (!adapter) { + sendError(id, -32002, "Worker language service is not initialized"); + return; + } + + const result = await adapter.request(method, message.params); + if (cancelledRequests.delete(id)) { + sendError(id, -32800, "Request cancelled"); + return; + } + if (result === METHOD_NOT_HANDLED) { + sendError(id, -32601, `Method not implemented: ${method}`); + return; + } + sendResponse(id, result); + } catch (error) { + sendError(id, -32603, error); + } +} + +function handleNotification(message: JsonRpcMessage): void { + switch (message.method) { + case "textDocument/didOpen": + didOpen(message.params as DidOpenParams); + break; + case "textDocument/didChange": + didChange(message.params as DidChangeParams); + break; + case "textDocument/didClose": + didClose(message.params as DidCloseParams); + break; + case "workspace/didChangeConfiguration": + adapter?.configure?.( + (message.params as { settings?: unknown } | null)?.settings, + ); + for (const uri of documents.keys()) scheduleValidation(uri); + break; + case "$/cancelRequest": + cancelRequest(message.params); + break; + case "exit": + adapter?.dispose?.(); + workerScope.close(); + break; + } +} + +async function handleJsonRpc(data: string): Promise { + let message: JsonRpcMessage; + try { + message = JSON.parse(data) as JsonRpcMessage; + } catch { + sendLog("warn", "Ignored an invalid JSON-RPC message"); + return; + } + + if (!message.method) return; + if (message.id !== undefined) { + await handleRequest(message); + } else { + handleNotification(message); + } +} + +export function startWorkerServer(factory: AdapterFactory): void { + workerScope.onmessage = (event: MessageEvent) => { + const data = event.data; + if (isHostResponse(data)) { + handleHostResponse(data); + return; + } + if (isConfigureMessage(data)) { + if (adapter) return; + serverId = data.serverId; + Promise.resolve( + factory({ + documents, + initializationOptions: data.initializationOptions, + rootUri: data.rootUri, + getProjectVersion: () => String(projectVersion), + requestFile, + }), + ).then( + (value) => { + adapter = value; + workerScope.postMessage({ kind: "ready" }); + }, + (error) => { + const message = + error instanceof Error ? error.message : String(error); + sendLog("error", `Failed to initialize worker: ${message}`); + // Signal the host immediately, then shut down so we do not + // leave a live worker waiting for the host startup timeout. + workerScope.postMessage({ kind: "error", message }); + workerScope.close(); + }, + ); + return; + } + if (typeof data === "string") { + void handleJsonRpc(data); + } + }; +} + +export function getTextDocument( + documentsMap: Map, + params: unknown, +): TextDocument | null { + const uri = ( + params as { textDocument?: { uri?: unknown } } | null + )?.textDocument?.uri; + return typeof uri === "string" ? (documentsMap.get(uri) ?? null) : null; +} + +export function resolveReference( + reference: string, + baseUri: string, +): string | undefined { + try { + return new URL(reference, baseUri).href; + } catch { + return undefined; + } +} diff --git a/src/cm/lsp/workers/typescript.worker.ts b/src/cm/lsp/workers/typescript.worker.ts new file mode 100644 index 0000000000..6595e6c057 --- /dev/null +++ b/src/cm/lsp/workers/typescript.worker.ts @@ -0,0 +1,993 @@ +import ts from "typescript"; +import { TextDocument } from "vscode-languageserver-textdocument"; +import { + CompletionItemKind, + DiagnosticSeverity, + DiagnosticTag, + DocumentHighlightKind, + FoldingRangeKind, + InlayHintKind, + Range, + SelectionRange, + SymbolKind, + type CodeAction, + type CodeActionContext, + type CompletionItem, + type Diagnostic, + type DocumentHighlight, + type DocumentSymbol, + type FoldingRange, + type FormattingOptions, + type InlayHint, + type Location, + type LocationLink, + type MarkupContent, + type Position, + type SelectionRange as LspSelectionRange, + type SignatureHelp, + type TextEdit, + type WorkspaceEdit, +} from "vscode-languageserver-types"; +import { + getTextDocument, + METHOD_NOT_HANDLED, + startWorkerServer, +} from "./protocol"; +import libraries from "./typescriptLibs"; + +interface CompletionData { + acodeLspProvider: "typescript"; + uri: string; + offset: number; + name: string; + source?: string; + entryData?: ts.CompletionEntryData; +} + +interface RequestParams { + position: Position; + range?: Range; + options?: FormattingOptions; + newName: string; + context: CodeActionContext & { + triggerKind?: number; + triggerCharacter?: string; + isRetrigger?: boolean; + }; +} + +class TypeScriptHost implements ts.LanguageServiceHost { + constructor( + private readonly documents: Map, + private readonly options: ts.CompilerOptions, + private readonly projectVersion: () => string, + ) {} + + getCompilationSettings(): ts.CompilerOptions { + return this.options; + } + + getCurrentDirectory(): string { + return "/"; + } + + getDefaultLibFileName(options: ts.CompilerOptions): string { + return ts.getDefaultLibFileName(options); + } + + getScriptFileNames(): string[] { + return [...this.documents.keys()]; + } + + getScriptVersion(fileName: string): string { + const document = this.documents.get(fileName); + return document ? String(document.version) : "1"; + } + + getProjectVersion(): string { + return this.projectVersion(); + } + + getScriptSnapshot(fileName: string): ts.IScriptSnapshot | undefined { + const text = this.readFile(fileName); + return text === undefined ? undefined : ts.ScriptSnapshot.fromString(text); + } + + getScriptKind(fileName: string): ts.ScriptKind { + const languageId = this.documents.get(fileName)?.languageId; + if (languageId === "typescriptreact" || languageId === "tsx") { + return ts.ScriptKind.TSX; + } + if (languageId === "javascriptreact" || languageId === "jsx") { + return ts.ScriptKind.JSX; + } + if (languageId === "typescript") return ts.ScriptKind.TS; + if (languageId === "javascript") return ts.ScriptKind.JS; + const path = uriPath(fileName).toLowerCase(); + if (path.endsWith(".tsx")) return ts.ScriptKind.TSX; + if (path.endsWith(".jsx")) return ts.ScriptKind.JSX; + if ( + path.endsWith(".ts") || + path.endsWith(".mts") || + path.endsWith(".cts") + ) { + return ts.ScriptKind.TS; + } + if ( + path.endsWith(".js") || + path.endsWith(".mjs") || + path.endsWith(".cjs") + ) { + return ts.ScriptKind.JS; + } + if (path.endsWith(".json")) return ts.ScriptKind.JSON; + return ts.ScriptKind.Unknown; + } + + fileExists(fileName: string): boolean { + return this.documents.has(fileName) || fileName in libraries; + } + + readFile(fileName: string): string | undefined { + return this.documents.get(fileName)?.getText() ?? libraries[fileName]; + } + + readDirectory(): string[] { + return [...this.documents.keys()]; + } + + directoryExists(): boolean { + return true; + } + + getDirectories(): string[] { + return []; + } + + useCaseSensitiveFileNames(): boolean { + return true; + } + + getNewLine(): string { + return "\n"; + } + + resolveModuleNames( + moduleNames: string[], + containingFile: string, + ): (ts.ResolvedModule | undefined)[] { + return moduleNames.map((moduleName) => { + const openDocument = this.resolveOpenDocument( + moduleName, + containingFile, + ); + if (openDocument) return openDocument; + return ts.resolveModuleName( + moduleName, + containingFile, + this.options, + this, + ).resolvedModule; + }); + } + + private resolveOpenDocument( + moduleName: string, + containingFile: string, + ): ts.ResolvedModule | undefined { + if (!moduleName.startsWith(".") && !/^[a-z]+:/i.test(moduleName)) { + return undefined; + } + let base: string; + try { + base = new URL(moduleName, containingFile).href; + } catch { + return undefined; + } + const candidates = [ + base, + `${base}.ts`, + `${base}.tsx`, + `${base}.js`, + `${base}.jsx`, + `${base}/index.ts`, + `${base}/index.tsx`, + `${base}/index.js`, + `${base}/index.jsx`, + ]; + for (const candidate of candidates) { + if (!this.documents.has(candidate)) continue; + return { + resolvedFileName: candidate, + isExternalLibraryImport: false, + }; + } + return undefined; + } +} + +startWorkerServer(async ({ + documents, + requestFile, + rootUri, + getProjectVersion, +}) => { + const compilerOptions = await loadCompilerOptions(rootUri, requestFile); + const host = new TypeScriptHost( + documents, + compilerOptions, + getProjectVersion, + ); + const service = ts.createLanguageService( + host, + ts.createDocumentRegistry(true, "/"), + ); + + return { + capabilities: { + completionProvider: { + resolveProvider: true, + triggerCharacters: [".", "/", '"', "'", "<"], + }, + hoverProvider: true, + signatureHelpProvider: { + triggerCharacters: ["(", ",", "<"], + retriggerCharacters: [")"], + }, + documentFormattingProvider: true, + documentRangeFormattingProvider: true, + documentSymbolProvider: true, + definitionProvider: true, + referencesProvider: true, + renameProvider: { + prepareProvider: true, + }, + documentHighlightProvider: true, + codeActionProvider: true, + foldingRangeProvider: true, + selectionRangeProvider: true, + inlayHintProvider: true, + }, + + validate(document) { + const diagnostics: ts.Diagnostic[] = [ + ...service.getSyntacticDiagnostics(document.uri), + ...service.getSuggestionDiagnostics(document.uri), + ]; + if (isTypeScriptDocument(document)) { + diagnostics.push(...service.getSemanticDiagnostics(document.uri)); + } + return diagnostics.map((diagnostic) => + toDiagnostic(document, diagnostic), + ); + }, + + request(method, params) { + if (method === "completionItem/resolve") { + return resolveCompletion( + service, + documents, + params as CompletionItem, + ); + } + + const document = getTextDocument(documents, params); + if (!document) return null; + const request = params as RequestParams; + const offset = request.position + ? document.offsetAt(request.position) + : 0; + + switch (method) { + case "acode/validate": { + const diagnostics: ts.Diagnostic[] = [ + ...service.getSyntacticDiagnostics(document.uri), + ...service.getSuggestionDiagnostics(document.uri), + ]; + if (isTypeScriptDocument(document)) { + diagnostics.push( + ...service.getSemanticDiagnostics(document.uri), + ); + } + return diagnostics.map((diagnostic) => + toDiagnostic(document, diagnostic), + ); + } + case "textDocument/completion": + return completions(service, document, offset); + case "textDocument/hover": + return hover(service, document, offset); + case "textDocument/signatureHelp": + return signatureHelp( + service, + document, + offset, + request.context, + ); + case "textDocument/formatting": + return format(service, document, undefined, request.options); + case "textDocument/rangeFormatting": + return format( + service, + document, + request.range, + request.options, + ); + case "textDocument/documentSymbol": + return documentSymbols(service, document); + case "textDocument/definition": + return definitions(service, documents, document, offset); + case "textDocument/references": + return references(service, documents, document, offset); + case "textDocument/prepareRename": { + const info = service.getRenameInfo(document.uri, offset, { + allowRenameOfImportPath: true, + }); + return info.canRename + ? rangeFromSpan(document, info.triggerSpan) + : null; + } + case "textDocument/rename": + return rename( + service, + documents, + document, + offset, + request.newName, + ); + case "textDocument/documentHighlight": + return documentHighlights(service, document, offset); + case "textDocument/codeAction": + return codeActions( + service, + documents, + document, + request.range!, + request.context, + request.options, + ); + case "textDocument/foldingRange": + return foldingRanges(service, document); + case "textDocument/selectionRange": + return selectionRanges( + service, + document, + (params as { positions: Position[] }).positions, + ); + case "textDocument/inlayHint": + return inlayHints(service, document, request.range!); + default: + return METHOD_NOT_HANDLED; + } + }, + + // Only wipe the shared semantic program when nothing is open. + // cleanupSemanticCache() releases every source file and forces a full + // re-analysis of remaining tabs — costly on multi-file mobile sessions. + closeDocument() { + if (documents.size === 0) { + service.cleanupSemanticCache(); + } + }, + + dispose() { + service.dispose(); + }, + }; +}); + +async function loadCompilerOptions( + rootUri: string | null | undefined, + requestFile: (uri: string) => Promise, +): Promise { + const defaults: ts.CompilerOptions = { + allowJs: true, + checkJs: true, + allowImportingTsExtensions: true, + noEmit: true, + isolatedModules: true, + module: ts.ModuleKind.ESNext, + moduleResolution: ts.ModuleResolutionKind.Bundler, + moduleDetection: ts.ModuleDetectionKind.Force, + skipLibCheck: true, + target: ts.ScriptTarget.ES2022, + jsx: ts.JsxEmit.ReactJSX, + useDefineForClassFields: true, + }; + ( + defaults as ts.CompilerOptions & { + allowNonTsExtensions: boolean; + } + ).allowNonTsExtensions = true; + if (!rootUri) return defaults; + + try { + const base = rootUri.endsWith("/") ? rootUri : `${rootUri}/`; + const configUri = new URL("tsconfig.json", base).href; + const text = await requestFile(configUri); + const parsed = ts.parseConfigFileTextToJson(configUri, text); + if (parsed.error || !parsed.config?.compilerOptions) return defaults; + const converted = ts.convertCompilerOptionsFromJson( + parsed.config.compilerOptions, + base, + ); + return { ...defaults, ...converted.options, noEmit: true }; + } catch { + return defaults; + } +} + +function completions( + service: ts.LanguageService, + document: TextDocument, + offset: number, +) { + const result = service.getCompletionsAtPosition(document.uri, offset, { + allowIncompleteCompletions: true, + allowRenameOfImportPath: true, + includeCompletionsForImportStatements: true, + includeCompletionsForModuleExports: true, + includeCompletionsWithInsertText: true, + includeAutomaticOptionalChainCompletions: true, + includeCompletionsWithClassMemberSnippets: true, + includeCompletionsWithObjectLiteralMethodSnippets: true, + includeCompletionsWithSnippetText: true, + importModuleSpecifierPreference: "shortest", + }); + if (!result) return { isIncomplete: false, items: [] }; + return { + isIncomplete: !!result.isIncomplete, + items: result.entries + .filter((entry) => entry.name) + .map((entry): CompletionItem => { + const item: CompletionItem = { + label: entry.name, + kind: completionKind(entry.kind), + sortText: entry.sortText, + filterText: entry.filterText, + insertText: entry.insertText ?? entry.name, + commitCharacters: + entry.commitCharacters ?? result.defaultCommitCharacters, + data: { + acodeLspProvider: "typescript", + uri: document.uri, + offset, + name: entry.name, + source: entry.source, + entryData: entry.data, + } satisfies CompletionData, + }; + if (entry.replacementSpan) { + item.textEdit = { + range: rangeFromSpan(document, entry.replacementSpan), + newText: entry.insertText ?? entry.name, + }; + } + return item; + }), + }; +} + +function resolveCompletion( + service: ts.LanguageService, + documents: Map, + item: CompletionItem, +): CompletionItem { + const data = item.data as CompletionData | undefined; + if (!data || !documents.has(data.uri)) return item; + const details = service.getCompletionEntryDetails( + data.uri, + data.offset, + data.name, + formatSettings({ tabSize: 4, insertSpaces: true }), + data.source, + { + allowRenameOfImportPath: true, + importModuleSpecifierPreference: "shortest", + }, + data.entryData, + ); + if (!details) return item; + + item.detail = ts.displayPartsToString(details.displayParts); + const documentation = ts.displayPartsToString(details.documentation); + const tags = details.tags?.map(jsDocTag).join("\n\n") ?? ""; + item.documentation = markdownContent( + [documentation, tags].filter(Boolean).join("\n\n"), + ); + const edits: TextEdit[] = []; + for (const action of details.codeActions ?? []) { + for (const change of action.changes) { + const target = documents.get(change.fileName); + if (!target || change.fileName !== data.uri) continue; + for (const textChange of change.textChanges) { + edits.push({ + range: rangeFromSpan(target, textChange.span), + newText: textChange.newText, + }); + } + } + } + if (edits.length) item.additionalTextEdits = edits; + return item; +} + +function hover( + service: ts.LanguageService, + document: TextDocument, + offset: number, +) { + const info = service.getQuickInfoAtPosition(document.uri, offset); + if (!info) return null; + const signature = ts.displayPartsToString(info.displayParts); + const documentation = ts.displayPartsToString(info.documentation); + const tags = info.tags?.map(jsDocTag).join("\n\n") ?? ""; + return { + range: rangeFromSpan(document, info.textSpan), + contents: [ + { + language: isTypeScriptDocument(document) + ? "typescript" + : "javascript", + value: signature, + }, + [documentation, tags].filter(Boolean).join("\n\n"), + ], + }; +} + +function signatureHelp( + service: ts.LanguageService, + document: TextDocument, + offset: number, + context: RequestParams["context"], +): SignatureHelp | null { + const items = service.getSignatureHelpItems(document.uri, offset, { + triggerReason: signatureTrigger(context), + }); + if (!items) return null; + return { + activeSignature: items.selectedItemIndex, + activeParameter: items.argumentIndex, + signatures: items.items.map((item) => ({ + label: + ts.displayPartsToString(item.prefixDisplayParts) + + item.parameters + .map((parameter) => + ts.displayPartsToString(parameter.displayParts), + ) + .join(ts.displayPartsToString(item.separatorDisplayParts)) + + ts.displayPartsToString(item.suffixDisplayParts), + documentation: markdownContent( + ts.displayPartsToString(item.documentation), + ), + parameters: item.parameters.map((parameter) => ({ + label: ts.displayPartsToString(parameter.displayParts), + documentation: markdownContent( + ts.displayPartsToString(parameter.documentation), + ), + })), + })), + }; +} + +function markdownContent(value: string): MarkupContent | undefined { + return value ? { kind: "markdown", value } : undefined; +} + +function format( + service: ts.LanguageService, + document: TextDocument, + range: Range | undefined, + options?: FormattingOptions, +): TextEdit[] { + const settings = formatSettings(options); + const edits = range + ? service.getFormattingEditsForRange( + document.uri, + document.offsetAt(range.start), + document.offsetAt(range.end), + settings, + ) + : service.getFormattingEditsForDocument(document.uri, settings); + return edits.map((edit) => ({ + range: rangeFromSpan(document, edit.span), + newText: edit.newText, + })); +} + +function documentSymbols( + service: ts.LanguageService, + document: TextDocument, +): DocumentSymbol[] { + const convert = (item: ts.NavigationTree): DocumentSymbol => ({ + name: item.text, + kind: symbolKind(item.kind), + range: rangeFromSpan(document, item.spans[0]), + selectionRange: rangeFromSpan(document, item.spans[0]), + children: item.childItems?.map(convert), + }); + return service.getNavigationTree(document.uri).childItems?.map(convert) ?? []; +} + +function definitions( + service: ts.LanguageService, + documents: Map, + document: TextDocument, + offset: number, +): LocationLink[] { + const result = service.getDefinitionAndBoundSpan(document.uri, offset); + if (!result?.definitions) return []; + const links: LocationLink[] = []; + for (const definition of result.definitions) { + const target = documents.get(definition.fileName); + if (!target) continue; + const selection = rangeFromSpan(target, definition.textSpan); + links.push({ + targetUri: definition.fileName, + targetRange: definition.contextSpan + ? rangeFromSpan(target, definition.contextSpan) + : selection, + targetSelectionRange: selection, + originSelectionRange: rangeFromSpan(document, result.textSpan), + }); + } + return links; +} + +function references( + service: ts.LanguageService, + documents: Map, + document: TextDocument, + offset: number, +): Location[] { + const result: Location[] = []; + for (const reference of + service.getReferencesAtPosition(document.uri, offset) ?? []) { + const target = documents.get(reference.fileName); + if (!target) continue; + result.push({ + uri: reference.fileName, + range: rangeFromSpan(target, reference.textSpan), + }); + } + return result; +} + +function rename( + service: ts.LanguageService, + documents: Map, + document: TextDocument, + offset: number, + newName: string, +): WorkspaceEdit | null { + const locations = service.findRenameLocations( + document.uri, + offset, + false, + false, + { providePrefixAndSuffixTextForRename: false }, + ); + if (!locations) return null; + const changes: Record = {}; + for (const location of locations) { + const target = documents.get(location.fileName); + if (!target) continue; + (changes[location.fileName] ??= []).push({ + range: rangeFromSpan(target, location.textSpan), + newText: newName, + }); + } + return { changes }; +} + +function documentHighlights( + service: ts.LanguageService, + document: TextDocument, + offset: number, +): DocumentHighlight[] { + const result: DocumentHighlight[] = []; + for (const item of + service.getDocumentHighlights(document.uri, offset, [document.uri]) ?? + []) { + for (const highlight of item.highlightSpans) { + result.push({ + range: rangeFromSpan(document, highlight.textSpan), + kind: + highlight.kind === "writtenReference" + ? DocumentHighlightKind.Write + : DocumentHighlightKind.Text, + }); + } + } + return result; +} + +function codeActions( + service: ts.LanguageService, + documents: Map, + document: TextDocument, + range: Range, + context: CodeActionContext, + options?: FormattingOptions, +): CodeAction[] { + const fixes = service.getCodeFixesAtPosition( + document.uri, + document.offsetAt(range.start), + document.offsetAt(range.end), + context.diagnostics + .map((diagnostic) => Number(diagnostic.code)) + .filter(Number.isFinite), + formatSettings(options), + {}, + ); + return fixes.map((fix) => { + const changes: Record = {}; + for (const change of fix.changes) { + const target = documents.get(change.fileName); + if (!target) continue; + changes[change.fileName] = change.textChanges.map((textChange) => ({ + range: rangeFromSpan(target, textChange.span), + newText: textChange.newText, + })); + } + return { + title: fix.description, + kind: "quickfix", + edit: Object.keys(changes).length ? { changes } : undefined, + }; + }); +} + +function foldingRanges( + service: ts.LanguageService, + document: TextDocument, +): FoldingRange[] { + const result: FoldingRange[] = []; + for (const item of service.getOutliningSpans(document.uri)) { + const range = rangeFromSpan(document, item.textSpan); + if (range.start.line >= range.end.line) continue; + result.push({ + startLine: range.start.line, + endLine: range.end.line, + kind: + item.kind === ts.OutliningSpanKind.Comment + ? FoldingRangeKind.Comment + : item.kind === ts.OutliningSpanKind.Region + ? FoldingRangeKind.Region + : undefined, + }); + } + return result; +} + +function selectionRanges( + service: ts.LanguageService, + document: TextDocument, + positions: Position[], +): LspSelectionRange[] { + const convert = (selection: ts.SelectionRange): LspSelectionRange => + SelectionRange.create( + rangeFromSpan(document, selection.textSpan), + selection.parent ? convert(selection.parent) : undefined, + ); + return positions.map((position) => + convert( + service.getSmartSelectionRange( + document.uri, + document.offsetAt(position), + ), + ), + ); +} + +function inlayHints( + service: ts.LanguageService, + document: TextDocument, + range: Range, +): InlayHint[] { + const start = document.offsetAt(range.start); + const end = document.offsetAt(range.end); + return service + .provideInlayHints( + document.uri, + { start, length: end - start }, + { + includeInlayParameterNameHints: "all", + includeInlayParameterNameHintsWhenArgumentMatchesName: true, + includeInlayFunctionParameterTypeHints: true, + includeInlayVariableTypeHints: true, + includeInlayPropertyDeclarationTypeHints: true, + includeInlayFunctionLikeReturnTypeHints: true, + includeInlayEnumMemberValueHints: true, + }, + ) + .map((hint) => ({ + position: document.positionAt(hint.position), + label: + hint.text || + hint.displayParts?.map((part) => part.text).join("") || + "", + kind: + hint.kind === ts.InlayHintKind.Parameter + ? InlayHintKind.Parameter + : InlayHintKind.Type, + paddingLeft: hint.whitespaceBefore, + paddingRight: hint.whitespaceAfter, + })); +} + +function toDiagnostic( + document: TextDocument, + diagnostic: ts.Diagnostic, +): Diagnostic { + const tags: DiagnosticTag[] = []; + if (diagnostic.reportsUnnecessary) tags.push(DiagnosticTag.Unnecessary); + if (diagnostic.reportsDeprecated) tags.push(DiagnosticTag.Deprecated); + return { + range: rangeFromSpan(document, diagnostic), + code: diagnostic.code, + severity: diagnosticSeverity(diagnostic.category), + message: ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n"), + source: diagnostic.source ?? "typescript", + tags, + }; +} + +function rangeFromSpan( + document: TextDocument, + span: { start?: number; length?: number }, +): Range { + const startOffset = span.start ?? 0; + return Range.create( + document.positionAt(startOffset), + document.positionAt(startOffset + (span.length ?? 0)), + ); +} + +function formatSettings( + options?: FormattingOptions | null, +): ts.FormatCodeSettings { + const tabSize = options?.tabSize ?? 4; + const insertSpaces = options?.insertSpaces ?? true; + return { + tabSize, + indentSize: tabSize, + convertTabsToSpaces: insertSpaces, + trimTrailingWhitespace: options?.trimTrailingWhitespace, + insertSpaceAfterCommaDelimiter: insertSpaces, + insertSpaceAfterSemicolonInForStatements: insertSpaces, + insertSpaceBeforeAndAfterBinaryOperators: insertSpaces, + insertSpaceAfterKeywordsInControlFlowStatements: insertSpaces, + insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: insertSpaces, + }; +} + +function completionKind(kind: ts.ScriptElementKind): CompletionItemKind { + switch (kind) { + case ts.ScriptElementKind.primitiveType: + case ts.ScriptElementKind.keyword: + return CompletionItemKind.Keyword; + case ts.ScriptElementKind.constElement: + case ts.ScriptElementKind.letElement: + case ts.ScriptElementKind.variableElement: + case ts.ScriptElementKind.localVariableElement: + case ts.ScriptElementKind.alias: + case ts.ScriptElementKind.parameterElement: + return CompletionItemKind.Variable; + case ts.ScriptElementKind.memberVariableElement: + case ts.ScriptElementKind.memberGetAccessorElement: + case ts.ScriptElementKind.memberSetAccessorElement: + return CompletionItemKind.Field; + case ts.ScriptElementKind.functionElement: + case ts.ScriptElementKind.localFunctionElement: + return CompletionItemKind.Function; + case ts.ScriptElementKind.memberFunctionElement: + case ts.ScriptElementKind.constructSignatureElement: + case ts.ScriptElementKind.callSignatureElement: + case ts.ScriptElementKind.indexSignatureElement: + return CompletionItemKind.Method; + case ts.ScriptElementKind.enumElement: + return CompletionItemKind.Enum; + case ts.ScriptElementKind.enumMemberElement: + return CompletionItemKind.EnumMember; + case ts.ScriptElementKind.moduleElement: + case ts.ScriptElementKind.externalModuleName: + return CompletionItemKind.Module; + case ts.ScriptElementKind.classElement: + case ts.ScriptElementKind.typeElement: + return CompletionItemKind.Class; + case ts.ScriptElementKind.interfaceElement: + return CompletionItemKind.Interface; + case ts.ScriptElementKind.scriptElement: + return CompletionItemKind.File; + case ts.ScriptElementKind.directory: + return CompletionItemKind.Folder; + default: + return CompletionItemKind.Property; + } +} + +function symbolKind(kind: ts.ScriptElementKind): SymbolKind { + switch (kind) { + case ts.ScriptElementKind.memberVariableElement: + return SymbolKind.Field; + case ts.ScriptElementKind.functionElement: + case ts.ScriptElementKind.localFunctionElement: + return SymbolKind.Function; + case ts.ScriptElementKind.memberFunctionElement: + return SymbolKind.Method; + case ts.ScriptElementKind.enumElement: + return SymbolKind.Enum; + case ts.ScriptElementKind.enumMemberElement: + return SymbolKind.EnumMember; + case ts.ScriptElementKind.moduleElement: + case ts.ScriptElementKind.externalModuleName: + return SymbolKind.Module; + case ts.ScriptElementKind.classElement: + case ts.ScriptElementKind.typeElement: + return SymbolKind.Class; + case ts.ScriptElementKind.interfaceElement: + return SymbolKind.Interface; + case ts.ScriptElementKind.scriptElement: + return SymbolKind.File; + default: + return SymbolKind.Variable; + } +} + +function diagnosticSeverity( + category: ts.DiagnosticCategory, +): DiagnosticSeverity { + switch (category) { + case ts.DiagnosticCategory.Error: + return DiagnosticSeverity.Error; + case ts.DiagnosticCategory.Warning: + return DiagnosticSeverity.Warning; + case ts.DiagnosticCategory.Suggestion: + return DiagnosticSeverity.Hint; + default: + return DiagnosticSeverity.Information; + } +} + +function signatureTrigger( + context: RequestParams["context"], +): ts.SignatureHelpTriggerReason { + if (context?.triggerKind === 2 && context.triggerCharacter) { + return context.isRetrigger + ? { + kind: "retrigger", + triggerCharacter: + context.triggerCharacter as ts.SignatureHelpTriggerCharacter, + } + : { + kind: "characterTyped", + triggerCharacter: + context.triggerCharacter as ts.SignatureHelpTriggerCharacter, + }; + } + return context?.isRetrigger ? { kind: "retrigger" } : { kind: "invoked" }; +} + +function jsDocTag(tag: ts.JSDocTagInfo): string { + const text = Array.isArray(tag.text) + ? tag.text.map((part) => part.text).join("") + : (tag.text ?? ""); + return `*@${tag.name}*${text ? ` — ${text}` : ""}`; +} + +function isTypeScriptDocument(document: TextDocument): boolean { + return ( + document.languageId.startsWith("typescript") || + document.languageId === "tsx" + ); +} + +function uriPath(uri: string): string { + try { + return new URL(uri).pathname; + } catch { + return uri; + } +} diff --git a/src/cm/lsp/workers/typescriptLibs.ts b/src/cm/lsp/workers/typescriptLibs.ts new file mode 100644 index 0000000000..616e5dbab6 --- /dev/null +++ b/src/cm/lsp/workers/typescriptLibs.ts @@ -0,0 +1,29 @@ +interface RspackContext { + (key: string): string | { default: string }; + keys(): string[]; +} + +interface RspackRequire { + context( + directory: string, + useSubdirectories: boolean, + filter: RegExp, + ): RspackContext; +} + +declare const require: RspackRequire; + +const context = require.context( + "typescript/lib", + false, + /^\.\/lib\..*\.d\.ts$/, +); + +const libraries: Record = {}; +for (const key of context.keys()) { + const value = context(key); + libraries[key.slice(2)] = + typeof value === "string" ? value : value.default; +} + +export default libraries; diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js index 5341cc8ffc..fcde408f21 100644 --- a/src/lib/editorManager.js +++ b/src/lib/editorManager.js @@ -3290,8 +3290,22 @@ async function EditorManager($header, $body) { lspClientManager.setOptions({ resolveRoot: resolveRootUriForContext, - onClientIdle: ({ server }) => { - if (server?.id) stopManagedServer(server.id); + onClientIdle: ({ server, dispose }) => { + if (!server?.id || typeof dispose !== "function") return; + // Dispose only this idle client. disposeServer(server.id) would tear + // down every workspace sharing the server id (e.g. web-worker LSPs). + void (async () => { + await dispose(); + const stillActive = lspClientManager + .getActiveClients() + .some( + (state) => + state.server?.id?.toLowerCase() === server.id.toLowerCase(), + ); + if (!stillActive) { + stopManagedServer(server.id); + } + })(); }, displayFile: async (targetUri) => { if (!targetUri) return null; diff --git a/src/settings/lspServerDetail.js b/src/settings/lspServerDetail.js index 98c05e3a2b..5e8179185f 100644 --- a/src/settings/lspServerDetail.js +++ b/src/settings/lspServerDetail.js @@ -1,4 +1,5 @@ import lspApi from "cm/lsp/api"; +import lspClientManager from "cm/lsp/clientManager"; import { checkRuntimeServerInstallation, getRuntimeInstallCommand, @@ -579,6 +580,7 @@ export default function lspServerDetail(serverId) { case "enabled": await persistEnabled(serverId, value); if (!value) { + await lspClientManager.disposeServer(serverId); stopManagedServer(serverId); } toast( @@ -601,6 +603,7 @@ export default function lspServerDetail(serverId) { break; } $loader.show(); + await lspClientManager.disposeServer(serverId); stopManagedServer(serverId); await removeCustomServer(serverId); toast(strings["lsp-custom-server-removed"]); From ba4c7d604d22201f7b455637a570cdedfec5fc0f Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 26 Jul 2026 12:43:56 +0530 Subject: [PATCH 003/195] fix: ux issues lsp related etc - back button issue on lsp details page - toast spam on lsp settings page - sidebutton placement - z index issue of sidebutton - lsp options merge issue --- src/cm/lsp/clientManager.ts | 19 ++++------- src/cm/lsp/connectionState.js | 15 ++++++++ src/components/settingsPage.js | 1 + src/components/sideButton/style.scss | 4 +-- src/lib/editorManager.js | 7 +++- src/settings/lspServerDetail.js | 51 +++++++++++++++------------- 6 files changed, 59 insertions(+), 38 deletions(-) diff --git a/src/cm/lsp/clientManager.ts b/src/cm/lsp/clientManager.ts index d6929049d8..fce8e19503 100644 --- a/src/cm/lsp/clientManager.ts +++ b/src/cm/lsp/clientManager.ts @@ -95,24 +95,20 @@ function formatInitializationError(error: unknown): string { } function isSettingsOrKeybindingsFile( - server: LspServerDefinition, uri: string | null | undefined, file?: { uri?: string } | null, ): boolean { - if (server.id !== "json") return false; - const fileUri = String(uri || file?.uri || "").toLowerCase(); if (!fileUri) return false; - // 1. Check if it matches the exact Acode paths from window globals try { const dataStorage = (globalThis as any).DATA_STORAGE; if (dataStorage) { - const settingsPath = Url.join(dataStorage, "settings.json").toLowerCase(); - const keybindingsPath = ( - (globalThis as any).KEYBINDING_FILE || - Url.join(dataStorage, ".key-bindings.json") - ).toLowerCase(); + const settingsPath = Url.join(dataStorage, "settings.json").toLowerCase(); + const keybindingsPath = ( + (globalThis as any).KEYBINDING_FILE || + Url.join(dataStorage, ".key-bindings.json") + ).toLowerCase(); if (fileUri === settingsPath || fileUri === keybindingsPath) { return true; @@ -120,7 +116,6 @@ function isSettingsOrKeybindingsFile( } } catch {} - // 2. Check if it matches generic/relative names as a robust fallback return ( fileUri.endsWith("/settings.json") || fileUri.endsWith("/.key-bindings.json") || @@ -369,7 +364,7 @@ export class LspClientManager { const diagnosticsUiExtension = this.options.diagnosticsUiExtension; for (const server of servers) { - if (isSettingsOrKeybindingsFile(server, originalUri, file)) { + if (isSettingsOrKeybindingsFile(originalUri, file)) { continue; } const target = await this.#resolveRuntimeTarget(server, { @@ -463,7 +458,7 @@ export class LspClientManager { if (!servers.length) return false; for (const server of servers) { - if (isSettingsOrKeybindingsFile(server, originalUri, file)) { + if (isSettingsOrKeybindingsFile(originalUri, file)) { continue; } if (!supportsBuiltinFormatting(server)) continue; diff --git a/src/cm/lsp/connectionState.js b/src/cm/lsp/connectionState.js index 123665709e..45637a1068 100644 --- a/src/cm/lsp/connectionState.js +++ b/src/cm/lsp/connectionState.js @@ -1,5 +1,17 @@ import serverRegistry from "./serverRegistry"; +function isInternalConfigFile(file) { + const name = String(file?.filename || file?.name || "") + .trim() + .toLowerCase(); + return ( + name === "settings.json" || + name === ".key-bindings.json" || + name === "keybindings.json" || + name === ".keybindings.json" + ); +} + function getCurrentFileLanguage() { try { const file = window.editorManager?.activeFile; @@ -11,6 +23,9 @@ function getCurrentFileLanguage() { } function getServersForCurrentFile() { + const file = window.editorManager?.activeFile; + if (isInternalConfigFile(file)) return []; + const language = getCurrentFileLanguage(); if (!language) return []; diff --git a/src/components/settingsPage.js b/src/components/settingsPage.js index befbbb28cc..1203c595fe 100644 --- a/src/components/settingsPage.js +++ b/src/components/settingsPage.js @@ -241,6 +241,7 @@ function listItems($list, items, callback, options = {}) { const item = itemByKey.get(key); if (!item) return; + if (isBooleanSetting(item)) e.preventDefault(); const result = await resolveItemInteraction(item, $target); if (result.shouldCallCallback === false) { dispatchItemInteractionEnd($target, false); diff --git a/src/components/sideButton/style.scss b/src/components/sideButton/style.scss index 79a85796d0..c5b79f59f8 100644 --- a/src/components/sideButton/style.scss +++ b/src/components/sideButton/style.scss @@ -28,7 +28,7 @@ position: absolute; right: 0; top: 0; - z-index: 999; + z-index: 10000; display: flex; flex-direction: column; gap: 5px; @@ -36,4 +36,4 @@ @supports not (gap: 1px) { > * + * { margin-top: 5px; } } -} \ No newline at end of file +} diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js index fcde408f21..4e32dc6c5a 100644 --- a/src/lib/editorManager.js +++ b/src/lib/editorManager.js @@ -707,6 +707,7 @@ async function EditorManager($header, $body) { updateHeaderForFile(manager.activeFile); if (isPaneTabLayout()) syncGlobalOpenFileListMirror(); updateActivePaneScrollbars(); + updateSideButtonContainer(); toggleProblemButton(); if (options.emitSwitch !== false && manager.activeFile) { recordHistory(manager.activeFile); @@ -1569,6 +1570,10 @@ async function EditorManager($header, $body) { next.clientConfig = { ...current.clientConfig, ...config.clientConfig, + builtinExtensions: { + ...(current.clientConfig?.builtinExtensions || {}), + ...(config.clientConfig.builtinExtensions || {}), + }, }; } if ( @@ -4752,7 +4757,7 @@ async function EditorManager($header, $body) { return; } - $body.append(sideButtonContainer); + getActivePane()?.content.append(sideButtonContainer); } /** diff --git a/src/settings/lspServerDetail.js b/src/settings/lspServerDetail.js index 5e8179185f..b4f431a851 100644 --- a/src/settings/lspServerDetail.js +++ b/src/settings/lspServerDetail.js @@ -489,6 +489,10 @@ async function persistClientConfig(serverId, clientConfig) { clientConfig: { ...(current.clientConfig || {}), ...clientConfig, + builtinExtensions: { + ...(current.clientConfig?.builtinExtensions || {}), + ...(clientConfig.builtinExtensions || {}), + }, }, })); } @@ -567,7 +571,19 @@ export default function lspServerDetail(serverId) { }; async function callback(key, value) { - const $loader = loader.create("LSP", strings["loading..."]); + const isSwitch = + key === "enabled" || + [ + "ext_hover", + "ext_completion", + "ext_signature", + "ext_diagnostics", + "ext_inlayHints", + "ext_formatting", + ].includes(key); + const $loader = isSwitch + ? null + : loader.create("LSP", strings["loading..."]); try { const snapshot = await buildSnapshot(serverId); @@ -591,7 +607,7 @@ export default function lspServerDetail(serverId) { break; case "remove_custom_server": - $loader.hide(); + $loader?.hide(); if ( !(await confirm( strings["lsp-remove-custom-server"], @@ -602,7 +618,7 @@ export default function lspServerDetail(serverId) { ) { break; } - $loader.show(); + $loader?.show(); await lspClientManager.disposeServer(serverId); stopManagedServer(serverId); await removeCustomServer(serverId); @@ -613,7 +629,7 @@ export default function lspServerDetail(serverId) { case "install_status": { const result = await checkRuntimeServerInstallation(snapshot.merged); - $loader.hide(); + $loader?.hide(); const lines = [ fillTemplate(strings["lsp-status-line"], { status: formatInstallStatus(result), @@ -652,7 +668,7 @@ export default function lspServerDetail(serverId) { toast(strings["lsp-uninstall-command-unavailable"]); break; } - $loader.hide(); + $loader?.hide(); if ( !(await confirm( strings["lsp-uninstall-server"], @@ -663,7 +679,7 @@ export default function lspServerDetail(serverId) { ) { break; } - $loader.show(); + $loader?.show(); await uninstallRuntimeServer(snapshot.merged); toast(strings["lsp-server-uninstalled"]); break; @@ -673,7 +689,7 @@ export default function lspServerDetail(serverId) { snapshot.override.startupTimeout ?? snapshot.liveServer.startupTimeout ?? 5000; - $loader.hide(); + $loader?.hide(); const result = await prompt( strings["lsp-startup-timeout-ms"], String(currentTimeout), @@ -696,7 +712,7 @@ export default function lspServerDetail(serverId) { break; } - $loader.show(); + $loader?.show(); await persistStartupTimeout(serverId, timeout); toast( fillTemplate(strings["lsp-startup-timeout-set"], { @@ -712,7 +728,7 @@ export default function lspServerDetail(serverId) { null, 2, ); - $loader.hide(); + $loader?.hide(); const result = await prompt( strings["lsp-initialization-options-json"], currentJson || "{}", @@ -733,7 +749,7 @@ export default function lspServerDetail(serverId) { break; } - $loader.show(); + $loader?.show(); await persistInitOptions(serverId, JSON.parse(result)); toast(strings["lsp-initialization-options-updated"]); break; @@ -745,7 +761,7 @@ export default function lspServerDetail(serverId) { null, 2, ); - $loader.hide(); + $loader?.hide(); alert( strings["lsp-initialization-options"], `
${escapeHtml(json)}
`, @@ -760,9 +776,6 @@ export default function lspServerDetail(serverId) { case "ext_inlayHints": case "ext_formatting": { const extKey = key.replace("ext_", ""); - const feature = getFeatureItems().find( - ([featureKey]) => featureKey === key, - ); const currentClientConfig = clone( snapshot.override.clientConfig || {}, ); @@ -775,14 +788,6 @@ export default function lspServerDetail(serverId) { [extKey]: value, }, }); - toast( - fillTemplate(strings["lsp-feature-state-toast"], { - feature: feature?.[2] || extKey, - state: value - ? strings["lsp-state-enabled"] - : strings["lsp-state-disabled"], - }), - ); break; } @@ -795,7 +800,7 @@ export default function lspServerDetail(serverId) { await refreshVisibleState($connectedList, itemsByKey, serverId); } } finally { - $loader.destroy(); + $loader?.destroy(); } } } From abf6ed438da0fcab651c0f7145d1eba61039ad87 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 26 Jul 2026 13:21:39 +0530 Subject: [PATCH 004/195] remove indentation in text wrap added in (#2507) --- src/cm/indentedLineWrapping.ts | 299 --------------------------------- src/lang/ar-ye.json | 8 +- src/lang/be-by.json | 8 +- src/lang/bn-bd.json | 8 +- src/lang/cs-cz.json | 8 +- src/lang/de-de.json | 8 +- src/lang/en-us.json | 8 +- src/lang/es-sv.json | 8 +- src/lang/fr-fr.json | 8 +- src/lang/he-il.json | 8 +- src/lang/hi-in.json | 8 +- src/lang/hu-hu.json | 8 +- src/lang/id-id.json | 8 +- src/lang/index.d.ts | 6 - src/lang/ir-fa.json | 8 +- src/lang/it-it.json | 8 +- src/lang/ja-jp.json | 8 +- src/lang/ko-kr.json | 8 +- src/lang/ml-in.json | 8 +- src/lang/mm-unicode.json | 8 +- src/lang/mm-zawgyi.json | 8 +- src/lang/pl-pl.json | 8 +- src/lang/pt-br.json | 8 +- src/lang/pu-in.json | 8 +- src/lang/ru-ru.json | 8 +- src/lang/tl-ph.json | 8 +- src/lang/tr-tr.json | 8 +- src/lang/uk-ua.json | 8 +- src/lang/uz-uz.json | 8 +- src/lang/vi-vn.json | 8 +- src/lang/zh-cn.json | 8 +- src/lang/zh-hant.json | 8 +- src/lang/zh-tw.json | 8 +- src/lib/editorFile.js | 1 - src/lib/editorManager.js | 13 +- src/lib/settings.js | 1 - src/settings/editorSettings.js | 29 +--- src/test/editor.tests.js | 103 ------------ 38 files changed, 34 insertions(+), 666 deletions(-) delete mode 100644 src/cm/indentedLineWrapping.ts diff --git a/src/cm/indentedLineWrapping.ts b/src/cm/indentedLineWrapping.ts deleted file mode 100644 index 8a6303df87..0000000000 --- a/src/cm/indentedLineWrapping.ts +++ /dev/null @@ -1,299 +0,0 @@ -import type { Extension } from "@codemirror/state"; -import { EditorState, RangeSetBuilder } from "@codemirror/state"; -import { - Decoration, - type DecorationSet, - EditorView, - ViewPlugin, - type ViewUpdate, -} from "@codemirror/view"; - -export interface IndentedLineWrappingConfig { - /** How continuation rows are indented relative to the logical line. */ - mode?: WrappingIndentMode; - /** - * Absolute maximum continuation indent in visual columns. The effective - * maximum is also limited to half of the editor's visible width. - */ - maxIndentColumns?: number; -} - -export type WrappingIndentMode = "none" | "same" | "indent" | "deepIndent"; - -export const DEFAULT_WRAPPING_INDENT_MODE: WrappingIndentMode = "indent"; -export const DEFAULT_MAX_WRAP_INDENT_COLUMNS = 40; - -const WRAPPED_LINE_CLASS = "cm-indented-line-wrap"; -const WRAP_INDENT_PROPERTY = "--cm-wrap-indent"; -const WRAP_INDENT_NEGATIVE_PROPERTY = "--cm-wrap-indent-negative"; - -type DecorationCache = Map; - -function getTabSize(state: EditorState): number { - const tabSize = state.facet(EditorState.tabSize); - return Number.isFinite(tabSize) && tabSize > 0 - ? Math.max(1, Math.trunc(tabSize)) - : 4; -} - -function normalizeMaxIndentColumns(value: number | undefined): number { - if (!Number.isFinite(value) || Number(value) <= 0) { - return DEFAULT_MAX_WRAP_INDENT_COLUMNS; - } - return Math.max(1, Math.trunc(Number(value))); -} - -function normalizeWrappingIndentMode( - value: WrappingIndentMode | undefined, -): WrappingIndentMode { - switch (value) { - case "none": - case "same": - case "indent": - case "deepIndent": - return value; - default: - return DEFAULT_WRAPPING_INDENT_MODE; - } -} - -/** - * Count leading indentation in visual columns. The scan stops as soon as the - * configured cap is reached, keeping even pathological lines cheap to process. - */ -export function getWrapIndentColumns( - line: string, - tabSize: number, - maxIndentColumns = DEFAULT_MAX_WRAP_INDENT_COLUMNS, -): number { - const normalizedTabSize = - Number.isFinite(tabSize) && tabSize > 0 - ? Math.max(1, Math.trunc(tabSize)) - : 4; - const normalizedMax = normalizeMaxIndentColumns(maxIndentColumns); - let columns = 0; - - for (let index = 0; index < line.length; index++) { - const character = line.charCodeAt(index); - if (character === 32) { - columns++; - } else if (character === 9) { - columns += normalizedTabSize - (columns % normalizedTabSize); - } else { - break; - } - - if (columns >= normalizedMax) return normalizedMax; - } - - return columns; -} - -/** - * Calculate the visual column where wrapped continuation rows should start. - * `indent` mirrors Ace and VS Code by adding one indentation step, while - * `deepIndent` adds two. - */ -export function getContinuationIndentColumns( - line: string, - tabSize: number, - mode: WrappingIndentMode = DEFAULT_WRAPPING_INDENT_MODE, - maxIndentColumns = DEFAULT_MAX_WRAP_INDENT_COLUMNS, -): number { - if (!line.length || mode === "none") return 0; - - const normalizedTabSize = - Number.isFinite(tabSize) && tabSize > 0 - ? Math.max(1, Math.trunc(tabSize)) - : 4; - const normalizedMax = normalizeMaxIndentColumns(maxIndentColumns); - const baseIndent = getWrapIndentColumns( - line, - normalizedTabSize, - normalizedMax, - ); - const additionalIndent = - mode === "deepIndent" - ? normalizedTabSize * 2 - : mode === "indent" - ? normalizedTabSize - : 0; - - return Math.min(baseIndent + additionalIndent, normalizedMax); -} - -function getEffectiveMaxIndentColumns( - view: EditorView, - absoluteMaximum: number, -): number { - const tabSize = getTabSize(view.state); - const characterWidth = view.defaultCharacterWidth; - const contentWidth = view.scrollDOM.clientWidth || view.dom.clientWidth; - - if ( - !Number.isFinite(characterWidth) || - characterWidth <= 0 || - !Number.isFinite(contentWidth) || - contentWidth <= 0 - ) { - return absoluteMaximum; - } - - const halfVisibleColumns = Math.floor(contentWidth / characterWidth / 2); - return Math.max( - 1, - Math.min(absoluteMaximum, Math.max(tabSize, halfVisibleColumns)), - ); -} - -function getLineDecoration( - columns: number, - cache: DecorationCache, -): Decoration { - let decoration = cache.get(columns); - if (decoration) return decoration; - - decoration = Decoration.line({ - attributes: { - class: WRAPPED_LINE_CLASS, - style: `${WRAP_INDENT_PROPERTY}:${columns}ch;${WRAP_INDENT_NEGATIVE_PROPERTY}:-${columns}ch`, - }, - }); - cache.set(columns, decoration); - return decoration; -} - -function buildDecorations( - view: EditorView, - mode: WrappingIndentMode, - maxIndentColumns: number, - cache: DecorationCache, -): DecorationSet { - const builder = new RangeSetBuilder(); - const { doc } = view.state; - const tabSize = getTabSize(view.state); - let lastProcessedLine = 0; - - for (const { from, to } of view.visibleRanges) { - const firstLine = doc.lineAt(from); - const lastLine = doc.lineAt(Math.max(from, to - 1)); - - for ( - let lineNumber = firstLine.number; - lineNumber <= lastLine.number; - lineNumber++ - ) { - if (lineNumber <= lastProcessedLine) continue; - lastProcessedLine = lineNumber; - - const line = doc.line(lineNumber); - const columns = getContinuationIndentColumns( - line.text, - tabSize, - mode, - maxIndentColumns, - ); - if (columns === 0) continue; - - builder.add(line.from, line.from, getLineDecoration(columns, cache)); - } - } - - return builder.finish(); -} - -function createIndentedLineWrappingPlugin( - mode: WrappingIndentMode, - absoluteMaxIndentColumns: number, -): Extension { - return ViewPlugin.fromClass( - class { - decorations: DecorationSet; - decorationCache: DecorationCache = new Map(); - lastTabSize: number; - lastMaxIndentColumns: number; - - constructor(view: EditorView) { - this.lastTabSize = getTabSize(view.state); - this.lastMaxIndentColumns = getEffectiveMaxIndentColumns( - view, - absoluteMaxIndentColumns, - ); - this.decorations = buildDecorations( - view, - mode, - this.lastMaxIndentColumns, - this.decorationCache, - ); - } - - update(update: ViewUpdate): void { - const tabSize = getTabSize(update.state); - const maxIndentColumns = getEffectiveMaxIndentColumns( - update.view, - absoluteMaxIndentColumns, - ); - if ( - !update.docChanged && - !update.viewportChanged && - tabSize === this.lastTabSize && - maxIndentColumns === this.lastMaxIndentColumns - ) { - return; - } - - this.lastTabSize = tabSize; - this.lastMaxIndentColumns = maxIndentColumns; - this.decorations = buildDecorations( - update.view, - mode, - this.lastMaxIndentColumns, - this.decorationCache, - ); - } - - destroy(): void { - this.decorationCache.clear(); - } - }, - { - decorations: (value) => value.decorations, - }, - ); -} - -// The zero-width pseudo-element shifts only the first visual row back over the -// added padding. Unlike `text-indent`, it does not change CodeMirror's global -// line-origin measurement, which is also used by rectangular selections. -const indentedLineWrappingTheme = EditorView.baseTheme({ - [`.cm-line.${WRAPPED_LINE_CLASS}`]: { - paddingInlineStart: `calc(6px + var(${WRAP_INDENT_PROPERTY}))`, - }, - [`.cm-line.${WRAPPED_LINE_CLASS}::before`]: { - content: '""', - display: "inline-block", - width: "0", - height: "0", - marginInlineStart: `var(${WRAP_INDENT_NEGATIVE_PROPERTY})`, - }, -}); - -/** - * Enable regular CodeMirror line wrapping and align continuation rows with the - * logical line's leading indentation. - */ -export function indentedLineWrapping( - config: IndentedLineWrappingConfig = {}, -): Extension { - const mode = normalizeWrappingIndentMode(config.mode); - const maxIndentColumns = normalizeMaxIndentColumns(config.maxIndentColumns); - if (mode === "none") return EditorView.lineWrapping; - - return [ - EditorView.lineWrapping, - createIndentedLineWrappingPlugin(mode, maxIndentColumns), - indentedLineWrappingTheme, - ]; -} - -export default indentedLineWrapping; diff --git a/src/lang/ar-ye.json b/src/lang/ar-ye.json index 550b640c1f..4a1c09c7ca 100644 --- a/src/lang/ar-ye.json +++ b/src/lang/ar-ye.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/be-by.json b/src/lang/be-by.json index 40b46313e8..5d92508798 100644 --- a/src/lang/be-by.json +++ b/src/lang/be-by.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/bn-bd.json b/src/lang/bn-bd.json index 57cf60c75c..d2b354ad3b 100644 --- a/src/lang/bn-bd.json +++ b/src/lang/bn-bd.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/cs-cz.json b/src/lang/cs-cz.json index 2e35b681d4..79492bb4eb 100644 --- a/src/lang/cs-cz.json +++ b/src/lang/cs-cz.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/de-de.json b/src/lang/de-de.json index c095fbd3fc..bd63f3bf04 100644 --- a/src/lang/de-de.json +++ b/src/lang/de-de.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/en-us.json b/src/lang/en-us.json index f89e5acf07..acd7938cd2 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -831,11 +831,5 @@ "diff sec": "{sec}s ago", "command": "Command", "managed": "Managed", - "acode service": "Acode Service", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "acode service": "Acode Service" } diff --git a/src/lang/es-sv.json b/src/lang/es-sv.json index a8cf5f5753..34f2a3a438 100644 --- a/src/lang/es-sv.json +++ b/src/lang/es-sv.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/fr-fr.json b/src/lang/fr-fr.json index 13060486ef..e1320be03c 100644 --- a/src/lang/fr-fr.json +++ b/src/lang/fr-fr.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/he-il.json b/src/lang/he-il.json index eed0fd6124..9ccb79ea86 100644 --- a/src/lang/he-il.json +++ b/src/lang/he-il.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/hi-in.json b/src/lang/hi-in.json index 42dc54ac59..b73bbdb60d 100644 --- a/src/lang/hi-in.json +++ b/src/lang/hi-in.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index b017be33d7..5c55a8396a 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -831,11 +831,5 @@ "managed": "Kezelt", "acode service": "Acode-szolgáltatás", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/id-id.json b/src/lang/id-id.json index 1b66878ead..2763d37f83 100644 --- a/src/lang/id-id.json +++ b/src/lang/id-id.json @@ -831,11 +831,5 @@ "managed": "Dikelola", "acode service": "Layanan Acode", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/index.d.ts b/src/lang/index.d.ts index 314937d6d4..447cc8052b 100644 --- a/src/lang/index.d.ts +++ b/src/lang/index.d.ts @@ -835,12 +835,6 @@ declare type LangStrings = { "command": string; "managed": string; "acode service": string; - "wrapped line indent": string; - "same": string; - "indent": string; - "deep indent": string; - "settings-info-editor-wrapping-indent": string; - "settings-info-editor-wrap-performance-warning": string; }; declare var strings: LangStrings; diff --git a/src/lang/ir-fa.json b/src/lang/ir-fa.json index 5e9fe12e0f..8c2ac9da59 100644 --- a/src/lang/ir-fa.json +++ b/src/lang/ir-fa.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/it-it.json b/src/lang/it-it.json index 093b1474ef..e338789274 100644 --- a/src/lang/it-it.json +++ b/src/lang/it-it.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/ja-jp.json b/src/lang/ja-jp.json index 9da4ba340a..c1d28ba356 100644 --- a/src/lang/ja-jp.json +++ b/src/lang/ja-jp.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/ko-kr.json b/src/lang/ko-kr.json index 3978417016..42963a18f6 100644 --- a/src/lang/ko-kr.json +++ b/src/lang/ko-kr.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/ml-in.json b/src/lang/ml-in.json index f42dc5deb1..ee8052f1a3 100644 --- a/src/lang/ml-in.json +++ b/src/lang/ml-in.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/mm-unicode.json b/src/lang/mm-unicode.json index c636574d5d..e74101b9f1 100644 --- a/src/lang/mm-unicode.json +++ b/src/lang/mm-unicode.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/mm-zawgyi.json b/src/lang/mm-zawgyi.json index 8f8ab895e7..7726546895 100644 --- a/src/lang/mm-zawgyi.json +++ b/src/lang/mm-zawgyi.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/pl-pl.json b/src/lang/pl-pl.json index 5d202aca9c..76f7e05b39 100644 --- a/src/lang/pl-pl.json +++ b/src/lang/pl-pl.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/pt-br.json b/src/lang/pt-br.json index 93cb528fce..facba76b0e 100644 --- a/src/lang/pt-br.json +++ b/src/lang/pt-br.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/pu-in.json b/src/lang/pu-in.json index 798bae345b..2daa7dee96 100644 --- a/src/lang/pu-in.json +++ b/src/lang/pu-in.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/ru-ru.json b/src/lang/ru-ru.json index 2baef72245..8e101865dc 100644 --- a/src/lang/ru-ru.json +++ b/src/lang/ru-ru.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/tl-ph.json b/src/lang/tl-ph.json index 2873183882..ddf0162be9 100644 --- a/src/lang/tl-ph.json +++ b/src/lang/tl-ph.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/tr-tr.json b/src/lang/tr-tr.json index 732fe92187..6154499ba4 100644 --- a/src/lang/tr-tr.json +++ b/src/lang/tr-tr.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/uk-ua.json b/src/lang/uk-ua.json index 20b9ab0e04..080ea08dd2 100644 --- a/src/lang/uk-ua.json +++ b/src/lang/uk-ua.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/uz-uz.json b/src/lang/uz-uz.json index b13dc5f24e..15dc46c84a 100644 --- a/src/lang/uz-uz.json +++ b/src/lang/uz-uz.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/vi-vn.json b/src/lang/vi-vn.json index 9b832c902d..14e338c470 100644 --- a/src/lang/vi-vn.json +++ b/src/lang/vi-vn.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index e92bf80a86..a517f4ecab 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json index cceb08e51b..68e3cb1ba6 100644 --- a/src/lang/zh-hant.json +++ b/src/lang/zh-hant.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index 03f4cb64a3..d42f8b7529 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -831,11 +831,5 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "wrapped line indent": "Wrapped line indent", - "same": "Same", - "indent": "Indent", - "deep indent": "Deep indent", - "settings-info-editor-wrapping-indent": "Choose how far visually wrapped continuation lines are indented.", - "settings-info-editor-wrap-performance-warning": "May reduce editor performance with very long lines or large files." + "terminal:show scrollbar": "Show Scrollbar" } diff --git a/src/lib/editorFile.js b/src/lib/editorFile.js index 1b57275f27..b151fda805 100644 --- a/src/lib/editorFile.js +++ b/src/lib/editorFile.js @@ -1898,7 +1898,6 @@ export default class EditorFile { tabSize: appSettings.value.tabSize, softTab: appSettings.value.softTab, textWrap: appSettings.value.textWrap, - wrappingIndent: appSettings.value.wrappingIndent, }; } diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js index 4e32dc6c5a..6c923f62a0 100644 --- a/src/lib/editorManager.js +++ b/src/lib/editorManager.js @@ -72,7 +72,6 @@ import { restoreSelection, setScrollPosition, } from "cm/editorUtils"; -import indentedLineWrapping from "cm/indentedLineWrapping"; import indentGuides from "cm/indentGuides"; import { lineBreakMarker } from "cm/lineBreakMarker"; import quickToolsModifierInput from "cm/quickToolsModifierInput"; @@ -1026,11 +1025,7 @@ async function EditorManager($header, $body) { } function makeWrapExtension() { - return appSettings?.value?.textWrap - ? indentedLineWrapping({ - mode: appSettings?.value?.wrappingIndent || "indent", - }) - : []; + return appSettings?.value?.textWrap ? EditorView.lineWrapping : []; } function makeLineNumberExtension() { @@ -1187,7 +1182,7 @@ async function EditorManager($header, $body) { }, }, { - keys: ["textWrap", "wrappingIndent"], + keys: ["textWrap"], compartments: [wrapCompartment], build() { return makeWrapExtension(); @@ -3405,10 +3400,6 @@ async function EditorManager($header, $body) { applyOptions(["textWrap"]); }); - appSettings.on("update:wrappingIndent", function () { - applyOptions(["wrappingIndent"]); - }); - function updateEditorIndentationSettings() { applyOptions(["softTab", "tabSize"]); } diff --git a/src/lib/settings.js b/src/lib/settings.js index 7ec789f9f2..6728c80b92 100644 --- a/src/lib/settings.js +++ b/src/lib/settings.js @@ -134,7 +134,6 @@ class Settings { cursorWidth: 2, editorTheme: "one_dark", textWrap: false, - wrappingIndent: "indent", softTab: true, tabSize: 2, retryRemoteFsAfterFail: true, diff --git a/src/settings/editorSettings.js b/src/settings/editorSettings.js index 7dc181c537..29e9070178 100644 --- a/src/settings/editorSettings.js +++ b/src/settings/editorSettings.js @@ -7,15 +7,6 @@ import scrollSettings from "./scrollSettings"; export default function editorSettings() { const title = strings["editor settings"]; const values = appSettings.value; - const wrappingIndentLabels = { - none: strings.none || "None", - same: strings.same || "Same", - indent: strings.indent || "Indent", - deepIndent: strings["deep indent"] || "Deep indent", - }; - const wrapPerformanceWarning = - strings["settings-info-editor-wrap-performance-warning"] || - "May reduce editor performance with very long lines or large files."; const categories = { scrolling: strings["settings-category-scrolling"], textLayout: strings["settings-category-text-layout"], @@ -73,25 +64,7 @@ export default function editorSettings() { key: "textWrap", text: strings["text wrap"], checkbox: values.textWrap, - info: `${strings["settings-info-editor-text-wrap"]} ${wrapPerformanceWarning}`, - category: categories.textLayout, - }, - { - key: "wrappingIndent", - text: strings["wrapped line indent"] || "Wrapped line indent", - value: values.wrappingIndent || "indent", - valueText: (value) => - wrappingIndentLabels[value] || wrappingIndentLabels.indent, - select: [ - ["none", wrappingIndentLabels.none], - ["same", wrappingIndentLabels.same], - ["indent", wrappingIndentLabels.indent], - ["deepIndent", wrappingIndentLabels.deepIndent], - ], - info: `${ - strings["settings-info-editor-wrapping-indent"] || - "Choose how far visually wrapped continuation lines are indented." - } ${wrapPerformanceWarning}`, + info: strings["settings-info-editor-text-wrap"], category: categories.textLayout, }, { diff --git a/src/test/editor.tests.js b/src/test/editor.tests.js index 8541362683..551311ab32 100644 --- a/src/test/editor.tests.js +++ b/src/test/editor.tests.js @@ -27,11 +27,6 @@ import { moveLineUpFoldAware, } from "cm/foldAwareLineCommands"; import { foldAllCodeBlocks, unfoldAllCodeBlocks } from "cm/foldingCommands"; -import indentedLineWrapping, { - DEFAULT_MAX_WRAP_INDENT_COLUMNS, - getContinuationIndentColumns, - getWrapIndentColumns, -} from "cm/indentedLineWrapping"; import indentGuides from "cm/indentGuides"; import { canonicalizeKeyBinding, @@ -1108,104 +1103,6 @@ export async function runCodeMirrorTests(writeOutput) { ); }); - runner.test("Indented wrapping counts spaces and tab stops", async (test) => { - test.assertEqual(getWrapIndentColumns(" value", 4), 4); - test.assertEqual(getWrapIndentColumns("\t value", 4), 6); - test.assertEqual(getWrapIndentColumns(" \tvalue", 4), 4); - test.assertEqual(getWrapIndentColumns("value", 4), 0); - test.assertEqual( - getWrapIndentColumns(" ".repeat(100), 4), - DEFAULT_MAX_WRAP_INDENT_COLUMNS, - ); - }); - - runner.test("Wrapping indent modes match editor behavior", async (test) => { - test.assertEqual(getContinuationIndentColumns("value", 4, "none"), 0); - test.assertEqual(getContinuationIndentColumns(" value", 4, "same"), 2); - test.assertEqual(getContinuationIndentColumns("value", 4, "indent"), 4); - test.assertEqual(getContinuationIndentColumns(" value", 4, "indent"), 6); - test.assertEqual( - getContinuationIndentColumns(" value", 4, "deepIndent"), - 10, - ); - test.assertEqual( - getContinuationIndentColumns(" value", 4, "deepIndent", 12), - 12, - "Continuation indentation should respect its width cap", - ); - }); - - runner.test("Default wrapping adds one continuation indent", async (test) => { - await withEditor( - test, - async (view) => { - const line = view.dom.querySelector(".cm-line.cm-indented-line-wrap"); - test.assert( - line != null, - "Default wrapping should decorate code lines", - ); - test.assertEqual( - line.style.getPropertyValue("--cm-wrap-indent").trim(), - "4ch", - ); - }, - "const value = someVeryLongFunctionCall(argument);", - [EditorState.tabSize.of(4), indentedLineWrapping()], - ); - }); - - runner.test( - "Wrapped continuation indent updates with the document", - async (test) => { - const doc = "\t const value = someVeryLongFunctionCall(argument);"; - const tabSizeCompartment = new Compartment(); - await withEditor( - test, - async (view) => { - const getWrappedLine = () => - view.dom.querySelector(".cm-line.cm-indented-line-wrap"); - - test.assert(view.lineWrapping, "Line wrapping should be enabled"); - let line = getWrappedLine(); - test.assert(line != null, "Indented line should be decorated"); - test.assertEqual( - line.style.getPropertyValue("--cm-wrap-indent").trim(), - "6ch", - ); - - view.dispatch({ - effects: tabSizeCompartment.reconfigure(EditorState.tabSize.of(8)), - }); - line = getWrappedLine(); - test.assert(line != null, "Tab-size changes should retain wrapping"); - test.assertEqual( - line.style.getPropertyValue("--cm-wrap-indent").trim(), - "10ch", - ); - - view.dispatch({ changes: { from: 0, to: 3, insert: " " } }); - line = getWrappedLine(); - test.assert(line != null, "Edited indentation should stay decorated"); - test.assertEqual( - line.style.getPropertyValue("--cm-wrap-indent").trim(), - "2ch", - ); - - view.dispatch({ changes: { from: 0, to: 2, insert: "" } }); - test.assert( - getWrappedLine() == null, - "Decoration should be removed when indentation is removed", - ); - }, - doc, - [ - tabSizeCompartment.of(EditorState.tabSize.of(4)), - indentedLineWrapping({ mode: "same" }), - ], - ); - }, - ); - runner.test("Focus and blur", async (test) => { await withEditor(test, async (view) => { view.focus(); From a72b4f77f7dc8a6f49d87868d4c471f016e5a3c4 Mon Sep 17 00:00:00 2001 From: Rohit Kushvaha Date: Sun, 26 Jul 2026 18:09:01 +0530 Subject: [PATCH 005/195] fix: system theme (#2524) * fix: system theme * Update src/theme/preInstalled.js Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> * fix: theme listener --------- Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --- src/palettes/changeTheme/index.js | 42 +---------------------------- src/theme/list.js | 45 +++++++++++++++++++++++++++++++ src/theme/preInstalled.js | 1 + 3 files changed, 47 insertions(+), 41 deletions(-) diff --git a/src/palettes/changeTheme/index.js b/src/palettes/changeTheme/index.js index b76e88f1d0..5d64170533 100644 --- a/src/palettes/changeTheme/index.js +++ b/src/palettes/changeTheme/index.js @@ -2,9 +2,7 @@ import "./style.scss"; import palette from "components/palette"; import config from "lib/config"; import appSettings from "lib/settings"; -import { isDeviceDarkTheme } from "lib/systemConfiguration"; -import themes from "theme/list"; -import { updateSystemTheme } from "theme/preInstalled"; +import themes, { updateSystemThemeWatcher } from "theme/list"; import changeEditorTheme from "../changeEditorTheme"; export default function changeTheme(type = "editor") { @@ -41,44 +39,6 @@ function generateHints(type) { }); } -let previousDark = isDeviceDarkTheme(); -const updateTimeMs = 2000; - -let intervalId = null; - -function syncSystemTheme() { - if (appSettings.value.appTheme.toLowerCase() === "system") { - const isDark = isDeviceDarkTheme(); - if (isDark !== previousDark) { - previousDark = isDark; - updateSystemTheme(isDark); - } - } -} - -function startSystemThemeWatcher() { - if (intervalId) return; - intervalId = setInterval(syncSystemTheme, updateTimeMs); -} - -function stopSystemThemeWatcher() { - if (!intervalId) return; - clearInterval(intervalId); - intervalId = null; -} - -function updateSystemThemeWatcher(theme) { - if (String(theme).toLowerCase() === "system") { - startSystemThemeWatcher(); - syncSystemTheme(); - return; - } - stopSystemThemeWatcher(); -} - -updateSystemThemeWatcher(appSettings.value.appTheme); -appSettings.on("update:appTheme", updateSystemThemeWatcher); - function onselect(value) { if (!value) return; diff --git a/src/theme/list.js b/src/theme/list.js index 5d52cfccdc..fca3f9c2cd 100644 --- a/src/theme/list.js +++ b/src/theme/list.js @@ -11,8 +11,13 @@ const appThemes = new Map(); let themeApplied = false; let firstTime = true; +const darkModeMediaQuery = window.matchMedia("(prefers-color-scheme: dark)"); +let systemThemeWatcherActive = false; + function init() { themes.forEach((theme) => add(theme)); + updateSystemThemeWatcher(settings.value.appTheme); + settings.on("update:appTheme", updateSystemThemeWatcher); } /** @@ -159,6 +164,45 @@ export function update(theme) { }); } +function syncSystemTheme(event) { + if (settings.value.appTheme.toLowerCase() !== "system") return; + const isDark = event ? event.matches : darkModeMediaQuery.matches; + updateSystemTheme(isDark); +} + +function startSystemThemeWatcher() { + if (systemThemeWatcherActive) return; + systemThemeWatcherActive = true; + if (typeof darkModeMediaQuery.addEventListener === "function") { + darkModeMediaQuery.addEventListener("change", syncSystemTheme); + } else { + darkModeMediaQuery.addListener(syncSystemTheme); + } +} + +function stopSystemThemeWatcher() { + if (!systemThemeWatcherActive) return; + systemThemeWatcherActive = false; + if (typeof darkModeMediaQuery.removeEventListener === "function") { + darkModeMediaQuery.removeEventListener("change", syncSystemTheme); + } else { + darkModeMediaQuery.removeListener(syncSystemTheme); + } +} + +/** + * Start or stop syncing the app theme with the OS color scheme + * @param {string} theme + */ +export function updateSystemThemeWatcher(theme) { + if (String(theme).toLowerCase() === "system") { + startSystemThemeWatcher(); + syncSystemTheme(); + return; + } + stopSystemThemeWatcher(); +} + export default { get applied() { return themeApplied; @@ -169,4 +213,5 @@ export default { add, apply, update, + updateSystemThemeWatcher, }; diff --git a/src/theme/preInstalled.js b/src/theme/preInstalled.js index 6e31657447..8eb266e962 100644 --- a/src/theme/preInstalled.js +++ b/src/theme/preInstalled.js @@ -280,6 +280,7 @@ export function updateSystemTheme(darkTheme) { if (appSettings?.value?.appTheme === "system") { apply(system.id); + appSettings.update({ editorTheme: system.preferredEditorTheme }, false); } } From 9cf831bd0b47e7321cfae1f13c44e6f606d935f0 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 26 Jul 2026 22:22:25 +0530 Subject: [PATCH 006/195] feat(editor): add indentation folding for legacy modes(as fallback) (#2538) --- src/cm/baseExtensions.ts | 3 +- src/cm/indentationFolding.ts | 69 ++++++++++++++++++++++++++++++++++++ src/test/editor.tests.js | 30 ++++++++++++++++ 3 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 src/cm/indentationFolding.ts diff --git a/src/cm/baseExtensions.ts b/src/cm/baseExtensions.ts index 927c3ed943..336027f51a 100644 --- a/src/cm/baseExtensions.ts +++ b/src/cm/baseExtensions.ts @@ -15,6 +15,7 @@ import { import { highlightSelectionMatches } from "@codemirror/search"; import type { Extension } from "@codemirror/state"; import { EditorState, Prec } from "@codemirror/state"; +import indentationFolding from "./indentationFolding"; import { crosshairCursor, drawSelection, @@ -56,7 +57,7 @@ export default function createBaseExtensions( ]; if (enableHighlightActiveLine) extensions.push(highlightActiveLineGutter()); - if (codeFolding) extensions.push(foldGutter()); + if (codeFolding) extensions.push(foldGutter(), indentationFolding); extensions.push(drawSelection()); extensions.push(dropCursor()); extensions.push(EditorState.allowMultipleSelections.of(true)); diff --git a/src/cm/indentationFolding.ts b/src/cm/indentationFolding.ts new file mode 100644 index 0000000000..7be802cbfa --- /dev/null +++ b/src/cm/indentationFolding.ts @@ -0,0 +1,69 @@ +import { + foldService, + language, + StreamLanguage, +} from "@codemirror/language"; +import { countColumn, type EditorState } from "@codemirror/state"; + +interface FoldRange { + from: number; + to: number; +} + +const foldCache = new WeakMap< + EditorState, + Map +>(); + +function findIndentationFold( + state: EditorState, + from: number, +): FoldRange | null { + const activeLanguage = state.facet(language); + if (activeLanguage && !(activeLanguage instanceof StreamLanguage)) { + return null; + } + + const line = state.doc.lineAt(from); + let stateCache = foldCache.get(state); + if (!stateCache) { + stateCache = new Map(); + foldCache.set(state, stateCache); + } + if (stateCache.has(line.from)) return stateCache.get(line.from) ?? null; + + const indentationEnd = line.text.search(/\S|$/); + if (indentationEnd === line.text.length) { + stateCache.set(line.from, null); + return null; + } + + const indentation = countColumn(line.text, state.tabSize, indentationEnd); + let foldEnd: number | null = null; + + for ( + let lineNumber = line.number + 1; + lineNumber <= state.doc.lines; + lineNumber++ + ) { + const nextLine = state.doc.line(lineNumber); + const nextIndentationEnd = nextLine.text.search(/\S|$/); + if (nextIndentationEnd === nextLine.text.length) continue; + + const nextIndentation = countColumn( + nextLine.text, + state.tabSize, + nextIndentationEnd, + ); + if (nextIndentation <= indentation) break; + + foldEnd = nextLine.to; + } + + const range = + foldEnd === null ? null : { from: line.to, to: foldEnd }; + stateCache.set(line.from, range); + return range; +} + +export default foldService.of(findIndentationFold); diff --git a/src/test/editor.tests.js b/src/test/editor.tests.js index 551311ab32..e9a6928494 100644 --- a/src/test/editor.tests.js +++ b/src/test/editor.tests.js @@ -10,9 +10,11 @@ import { javascript } from "@codemirror/lang-javascript"; import { bracketMatching, defaultHighlightStyle, + foldable, foldEffect, foldedRanges, foldGutter, + StreamLanguage, syntaxHighlighting, } from "@codemirror/language"; import { highlightSelectionMatches, searchKeymap } from "@codemirror/search"; @@ -754,6 +756,34 @@ export async function runCodeMirrorTests(writeOutput) { }, ); + runner.test( + "Legacy modes fold indentation while preserving blank lines", + (test) => { + const streamLanguage = StreamLanguage.define({ + startState: () => ({}), + copyState: (state) => ({ ...state }), + token: (stream) => { + stream.skipToEnd(); + return null; + }, + }); + const state = EditorState.create({ + doc: "root\n\tchild\n\n\tchild2\nnext", + extensions: [ + ...createBaseExtensions(), + EditorState.tabSize.of(4), + streamLanguage, + ], + }); + const firstLine = state.doc.line(1); + const range = foldable(state, firstLine.from, firstLine.to); + + test.assert(range != null, "Indented lines should be foldable"); + test.assertEqual(range.from, firstLine.to); + test.assertEqual(range.to, state.doc.line(4).to); + }, + ); + runner.test( "Fold all includes same-line nested blocks and unfold all clears them", async (test) => { From 2396d20301bd78be6d259bec0fec3708dbc63832 Mon Sep 17 00:00:00 2001 From: Rohit Kushvaha Date: Mon, 27 Jul 2026 08:34:22 +0530 Subject: [PATCH 007/195] feat: add WebView Plugin API (#2525) * feat: add WebView Plugin API Add cordova-plugin-acode-webview allowing plugins to create and manage isolated WebView instances with fullscreen, window, panel, and hidden modes. Features: - Create independent WebView instances via acode.webview.create() - Load URLs, HTML content, and execute JavaScript - Bidirectional messaging between plugin and WebView - Lifecycle management: show, hide, reload, destroy - Lifecycle events: pageFinished, titleChanged, closed * format * fix: remove title bar and close button from fullscreen WebView Fullscreen mode is now a clean full-screen WebView with no chrome. Back button handles navigation and closing. * fix: lifecycle events, hidden show, fullscreen disconnect, and security - Fix event dispatch: filter callbacks by event name instead of calling {event,callback} objects as functions (webview.js) - Make hidden WebViews showable: attachToActivity() on first show() - Remove universal file access (setAllowFileAccessFromFileURLs, setAllowUniversalAccessFromFileURLs) for untrusted content - Clean up fullscreen path: remove throwaway WebView in Activity, register instance cleanup in onDestroy - Add deprecated shouldOverrideUrlLoading(String) for compat - Use Handler(Looper.getMainLooper()) instead of View.post() so hidden WebViews can process loadURL/evaluate without a window - Remove unused constructor params (title, x, y, initiallyVisible) * fixes * improvements * fix: lock --- package-lock.json | 3596 ++++++----------- package.json | 4 +- src/index.d.ts | 67 +- src/lib/acode.js | 2 + src/lib/webview.js | 166 + src/plugins/webview/package.json | 11 + src/plugins/webview/plugin.xml | 26 + .../com/foxdebug/webview/WebViewActivity.java | 93 + .../com/foxdebug/webview/WebViewInstance.java | 589 +++ .../com/foxdebug/webview/WebViewPlugin.java | 291 ++ src/plugins/webview/www/webview.js | 88 + 11 files changed, 2608 insertions(+), 2325 deletions(-) create mode 100644 src/lib/webview.js create mode 100644 src/plugins/webview/package.json create mode 100644 src/plugins/webview/plugin.xml create mode 100644 src/plugins/webview/src/android/com/foxdebug/webview/WebViewActivity.java create mode 100644 src/plugins/webview/src/android/com/foxdebug/webview/WebViewInstance.java create mode 100644 src/plugins/webview/src/android/com/foxdebug/webview/WebViewPlugin.java create mode 100644 src/plugins/webview/www/webview.js diff --git a/package-lock.json b/package-lock.json index bd40e8ff37..9386001651 100644 --- a/package-lock.json +++ b/package-lock.json @@ -115,6 +115,7 @@ "com.foxdebug.acode.rk.plugin.plugincontext": "file:src/plugins/pluginContext", "cordova-android": "^15.0.0", "cordova-clipboard": "^1.3.0", + "cordova-plugin-acode-webview": "file:src/plugins/webview", "cordova-plugin-advanced-http": "file:src/plugins/cordova-plugin-advanced-http", "cordova-plugin-browser": "file:src/plugins/browser", "cordova-plugin-buildinfo": "file:src/plugins/cordova-plugin-buildinfo", @@ -159,18 +160,17 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", - "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.28.5", - "js-tokens": "^4.0.0", - "picocolors": "^1.1.1" + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" }, "engines": { - "node": ">=6.9.0" + "node": "^22.18.0 || >=24.11.0" } }, "node_modules/@babel/compat-data": { @@ -215,20 +215,6 @@ "url": "https://opencollective.com/babel" } }, - "node_modules/@babel/core/node_modules/@babel/code-frame": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", - "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^8.0.0", - "js-tokens": "^10.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/core/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -247,44 +233,14 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/core/node_modules/@babel/helper-globals": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", - "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/core/node_modules/@babel/helper-string-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/core/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/core/node_modules/@babel/parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", - "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", + "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.0" + "@babel/types": "^8.0.4" }, "bin": { "parser": "bin/babel-parser.js" @@ -293,83 +249,34 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/core/node_modules/@babel/template": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", - "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/core/node_modules/@babel/traverse": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", - "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", + "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.0", + "@babel/parser": "^8.0.4", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.0", + "@babel/types": "^8.0.4", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/core/node_modules/@babel/types": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/core/node_modules/js-tokens": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", - "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/@babel/core/node_modules/semver": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", - "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@babel/generator": { - "version": "7.29.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz", - "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz", + "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.29.0", - "@babel/types": "^7.29.0", + "@babel/parser": "^7.29.7", + "@babel/types": "^7.29.7", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -378,48 +285,48 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/helper-annotate-as-pure": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-8.0.0.tgz", - "integrity": "sha512-NSpMkMsvvZqzThJ0p1B02cbtA2ObEyfBvq950bmNkyxsxvcxwhvvCB036rKhlEnuBBo30bOrk13u3FzlKSoRrw==", + "node_modules/@babel/generator/node_modules/@babel/helper-string-parser": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", + "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", "dev": true, "license": "MIT", - "dependencies": { - "@babel/types": "^8.0.0" - }, "engines": { - "node": "^22.18.0 || >=24.11.0" + "node": ">=6.9.0" } }, - "node_modules/@babel/helper-annotate-as-pure/node_modules/@babel/helper-string-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "node_modules/@babel/generator/node_modules/@babel/helper-validator-identifier": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", "dev": true, "license": "MIT", "engines": { - "node": "^22.18.0 || >=24.11.0" + "node": ">=6.9.0" } }, - "node_modules/@babel/helper-annotate-as-pure/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "node_modules/@babel/generator/node_modules/@babel/types": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz", + "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==", "dev": true, "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7" + }, "engines": { - "node": "^22.18.0 || >=24.11.0" + "node": ">=6.9.0" } }, - "node_modules/@babel/helper-annotate-as-pure/node_modules/@babel/types": { + "node_modules/@babel/helper-annotate-as-pure": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-8.0.0.tgz", + "integrity": "sha512-NSpMkMsvvZqzThJ0p1B02cbtA2ObEyfBvq950bmNkyxsxvcxwhvvCB036rKhlEnuBBo30bOrk13u3FzlKSoRrw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" + "@babel/types": "^8.0.0" }, "engines": { "node": "^22.18.0 || >=24.11.0" @@ -442,19 +349,6 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", - "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@babel/helper-create-class-features-plugin": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-8.0.1.tgz", @@ -477,20 +371,6 @@ "@babel/core": "^8.0.0" } }, - "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/code-frame": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", - "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^8.0.0", - "js-tokens": "^10.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -509,44 +389,14 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-globals": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", - "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-string-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", - "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", + "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.0" + "@babel/types": "^8.0.4" }, "bin": { "parser": "bin/babel-parser.js" @@ -555,74 +405,25 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/template": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", - "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/traverse": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", - "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", + "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.0", + "@babel/parser": "^8.0.4", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.0", + "@babel/types": "^8.0.4", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/types": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-create-class-features-plugin/node_modules/js-tokens": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", - "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", - "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@babel/helper-create-regexp-features-plugin": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-8.0.1.tgz", @@ -641,19 +442,6 @@ "@babel/core": "^8.0.0" } }, - "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", - "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@babel/helper-define-polyfill-provider": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-1.0.0.tgz", @@ -673,13 +461,13 @@ } }, "node_modules/@babel/helper-globals": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", - "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", + "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", "dev": true, "license": "MIT", "engines": { - "node": ">=6.9.0" + "node": "^22.18.0 || >=24.11.0" } }, "node_modules/@babel/helper-member-expression-to-functions": { @@ -696,20 +484,6 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/code-frame": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", - "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^8.0.0", - "js-tokens": "^10.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -728,107 +502,41 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/helper-globals": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", - "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", + "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/parser": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", + "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", "dev": true, "license": "MIT", + "dependencies": { + "@babel/types": "^8.0.4" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/helper-string-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", - "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^8.0.0" - }, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/template": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", - "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/traverse": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", - "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", + "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/traverse": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", + "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.0", + "@babel/parser": "^8.0.4", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.0", + "@babel/types": "^8.0.4", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-member-expression-to-functions/node_modules/js-tokens": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", - "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/helper-module-imports": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-8.0.0.tgz", @@ -843,20 +551,6 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-module-imports/node_modules/@babel/code-frame": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", - "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^8.0.0", - "js-tokens": "^10.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-module-imports/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -875,44 +569,14 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-module-imports/node_modules/@babel/helper-globals": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", - "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-module-imports/node_modules/@babel/helper-string-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-module-imports/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-module-imports/node_modules/@babel/parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", - "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", + "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.0" + "@babel/types": "^8.0.4" }, "bin": { "parser": "bin/babel-parser.js" @@ -921,61 +585,25 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-module-imports/node_modules/@babel/template": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", - "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-module-imports/node_modules/@babel/traverse": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", - "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", + "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.0", + "@babel/parser": "^8.0.4", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.0", + "@babel/types": "^8.0.4", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-module-imports/node_modules/@babel/types": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-module-imports/node_modules/js-tokens": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", - "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/helper-module-transforms": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-8.0.1.tgz", @@ -994,20 +622,6 @@ "@babel/core": "^8.0.0" } }, - "node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", - "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^8.0.0", - "js-tokens": "^10.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-module-transforms/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -1026,44 +640,14 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-globals": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", - "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-string-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-module-transforms/node_modules/@babel/parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", - "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", + "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.0" + "@babel/types": "^8.0.4" }, "bin": { "parser": "bin/babel-parser.js" @@ -1072,61 +656,25 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-module-transforms/node_modules/@babel/template": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", - "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-module-transforms/node_modules/@babel/traverse": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", - "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", + "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.0", + "@babel/parser": "^8.0.4", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.0", + "@babel/types": "^8.0.4", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-module-transforms/node_modules/@babel/types": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-module-transforms/node_modules/js-tokens": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", - "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/helper-optimise-call-expression": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-8.0.0.tgz", @@ -1140,40 +688,6 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/helper-string-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-plugin-utils": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-8.0.1.tgz", @@ -1205,20 +719,6 @@ "@babel/core": "^8.0.0" } }, - "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/code-frame": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", - "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^8.0.0", - "js-tokens": "^10.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -1237,107 +737,41 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-globals": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", - "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", + "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/parser": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", + "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", "dev": true, "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-string-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", - "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^8.0.0" - }, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/template": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", - "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0" - }, + "dependencies": { + "@babel/types": "^8.0.4" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/traverse": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", - "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", + "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.0", + "@babel/parser": "^8.0.4", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.0", + "@babel/types": "^8.0.4", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/types": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-remap-async-to-generator/node_modules/js-tokens": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", - "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/helper-replace-supers": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-8.0.1.tgz", @@ -1356,20 +790,6 @@ "@babel/core": "^8.0.0" } }, - "node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", - "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^8.0.0", - "js-tokens": "^10.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-replace-supers/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -1388,44 +808,14 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-globals": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", - "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-string-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-replace-supers/node_modules/@babel/parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", - "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", + "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.0" + "@babel/types": "^8.0.4" }, "bin": { "parser": "bin/babel-parser.js" @@ -1434,61 +824,25 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-replace-supers/node_modules/@babel/template": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", - "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", - "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", + "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.0", + "@babel/parser": "^8.0.4", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.0", + "@babel/types": "^8.0.4", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-replace-supers/node_modules/@babel/types": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-replace-supers/node_modules/js-tokens": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", - "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-8.0.0.tgz", @@ -1503,20 +857,6 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/code-frame": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", - "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^8.0.0", - "js-tokens": "^10.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -1524,352 +864,123 @@ "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0", - "@jridgewell/gen-mapping": "^0.3.12", - "@jridgewell/trace-mapping": "^0.3.28", - "@types/jsesc": "^2.5.0", - "jsesc": "^3.0.2" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/helper-globals": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", - "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/helper-string-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", - "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^8.0.0" - }, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/template": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", - "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/traverse": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", - "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/generator": "^8.0.0", - "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/template": "^8.0.0", - "@babel/types": "^8.0.0", - "obug": "^2.1.1" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/types": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/js-tokens": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", - "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/@babel/helper-string-parser": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", - "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", - "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-option": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-8.0.0.tgz", - "integrity": "sha512-U4Dybxh4WESWHt5XhBeExi4DrY0/DNK1aHpQbsrQXCUbFHuMweT0TpLEWKvaraV2Y6fS+ZXunsZ8zIuZIgvF2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-wrap-function": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-8.0.0.tgz", - "integrity": "sha512-Qpm8+wi5xfDkBfollanwriCcKniFfBmMmaKB01GVM6VGzKXo1fdxosZp04qEr5HM+LKhwr3hG1yRy8+ORsficA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/template": "^8.0.0", - "@babel/traverse": "^8.0.0", - "@babel/types": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-wrap-function/node_modules/@babel/code-frame": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", - "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^8.0.0", - "js-tokens": "^10.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-wrap-function/node_modules/@babel/generator": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", - "integrity": "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0", - "@jridgewell/gen-mapping": "^0.3.12", - "@jridgewell/trace-mapping": "^0.3.28", - "@types/jsesc": "^2.5.0", - "jsesc": "^3.0.2" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-globals": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", - "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-string-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/helper-wrap-function/node_modules/@babel/parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", - "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^8.0.0" - }, - "bin": { - "parser": "bin/babel-parser.js" + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0", + "@jridgewell/gen-mapping": "^0.3.12", + "@jridgewell/trace-mapping": "^0.3.28", + "@types/jsesc": "^2.5.0", + "jsesc": "^3.0.2" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", - "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/parser": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", + "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0" + "@babel/types": "^8.0.4" + }, + "bin": { + "parser": "bin/babel-parser.js" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-wrap-function/node_modules/@babel/traverse": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", - "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", + "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/traverse": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", + "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.0", + "@babel/parser": "^8.0.4", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.0", + "@babel/types": "^8.0.4", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-wrap-function/node_modules/@babel/types": { + "node_modules/@babel/helper-string-parser": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", "dev": true, "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" - }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-wrap-function/node_modules/js-tokens": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", - "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/@babel/helpers": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-8.0.0.tgz", - "integrity": "sha512-wfbi91pM3py96oIiJEz7qIpyXDytgr9zQC1HEWwlGNVRAEmItuU/0a41ZUKu1sJGyhhOIpc4t5vk4PYzt8wpsg==", + "node_modules/@babel/helper-validator-identifier": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.4.tgz", + "integrity": "sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg==", "dev": true, "license": "MIT", - "dependencies": { - "@babel/template": "^8.0.0", - "@babel/types": "^8.0.0" - }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helpers/node_modules/@babel/code-frame": { + "node_modules/@babel/helper-validator-option": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", - "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-8.0.0.tgz", + "integrity": "sha512-U4Dybxh4WESWHt5XhBeExi4DrY0/DNK1aHpQbsrQXCUbFHuMweT0TpLEWKvaraV2Y6fS+ZXunsZ8zIuZIgvF2Q==", "dev": true, "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^8.0.0", - "js-tokens": "^10.0.0" - }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helpers/node_modules/@babel/helper-string-parser": { + "node_modules/@babel/helper-wrap-function": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-8.0.0.tgz", + "integrity": "sha512-Qpm8+wi5xfDkBfollanwriCcKniFfBmMmaKB01GVM6VGzKXo1fdxosZp04qEr5HM+LKhwr3hG1yRy8+ORsficA==", "dev": true, "license": "MIT", + "dependencies": { + "@babel/template": "^8.0.0", + "@babel/traverse": "^8.0.0", + "@babel/types": "^8.0.0" + }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helpers/node_modules/@babel/helper-validator-identifier": { + "node_modules/@babel/helper-wrap-function/node_modules/@babel/generator": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", + "integrity": "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==", "dev": true, "license": "MIT", + "dependencies": { + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0", + "@jridgewell/gen-mapping": "^0.3.12", + "@jridgewell/trace-mapping": "^0.3.28", + "@types/jsesc": "^2.5.0", + "jsesc": "^3.0.2" + }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helpers/node_modules/@babel/parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", - "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", + "node_modules/@babel/helper-wrap-function/node_modules/@babel/parser": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", + "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.0" + "@babel/types": "^8.0.4" }, "bin": { "parser": "bin/babel-parser.js" @@ -1878,50 +989,47 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helpers/node_modules/@babel/template": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", - "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "node_modules/@babel/helper-wrap-function/node_modules/@babel/traverse": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", + "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0" + "@babel/generator": "^8.0.0", + "@babel/helper-globals": "^8.0.0", + "@babel/parser": "^8.0.4", + "@babel/template": "^8.0.0", + "@babel/types": "^8.0.4", + "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helpers/node_modules/@babel/types": { + "node_modules/@babel/helpers": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-8.0.0.tgz", + "integrity": "sha512-wfbi91pM3py96oIiJEz7qIpyXDytgr9zQC1HEWwlGNVRAEmItuU/0a41ZUKu1sJGyhhOIpc4t5vk4PYzt8wpsg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" + "@babel/template": "^8.0.0", + "@babel/types": "^8.0.0" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helpers/node_modules/js-tokens": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", - "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/parser": { - "version": "7.29.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.3.tgz", - "integrity": "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz", + "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.29.0" + "@babel/types": "^7.29.7" }, "bin": { "parser": "bin/babel-parser.js" @@ -1930,6 +1038,40 @@ "node": ">=6.0.0" } }, + "node_modules/@babel/parser/node_modules/@babel/helper-string-parser": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", + "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser/node_modules/@babel/helper-validator-identifier": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser/node_modules/@babel/types": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz", + "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-8.0.1.tgz", @@ -2030,9 +1172,9 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-8.0.1.tgz", - "integrity": "sha512-YBpIeuOZSUZx7RGH/U+dIAsHDHyojBVDRHNBUgOiUDS5IIcgBm1uyu9xs/2kM27B/bmDfOxzJ9k8cU2QuOwGIA==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-8.0.3.tgz", + "integrity": "sha512-jmTPwps7oSQSZaV1SxkQ3C12UWyufGysGc5OzDpZzvPAIX4mO7dJT3hoqkWVrSImvkcMiknir1iLN1SNV/CZzg==", "dev": true, "license": "MIT", "dependencies": { @@ -2079,20 +1221,6 @@ "@babel/core": "^8.0.0" } }, - "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/code-frame": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", - "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^8.0.0", - "js-tokens": "^10.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -2111,44 +1239,14 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/helper-globals": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", - "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/helper-string-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", - "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", + "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.0" + "@babel/types": "^8.0.4" }, "bin": { "parser": "bin/babel-parser.js" @@ -2157,61 +1255,25 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/template": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", - "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/traverse": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", - "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", + "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.0", + "@babel/parser": "^8.0.4", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.0", + "@babel/types": "^8.0.4", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/types": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/js-tokens": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", - "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/plugin-transform-async-to-generator": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-8.0.1.tgz", @@ -2317,20 +1379,6 @@ "@babel/core": "^8.0.0" } }, - "node_modules/@babel/plugin-transform-classes/node_modules/@babel/code-frame": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", - "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^8.0.0", - "js-tokens": "^10.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/plugin-transform-classes/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -2342,114 +1390,48 @@ "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", - "@types/jsesc": "^2.5.0", - "jsesc": "^3.0.2" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-globals": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", - "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-string-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/plugin-transform-classes/node_modules/@babel/parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", - "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^8.0.0" - }, - "bin": { - "parser": "bin/babel-parser.js" + "@types/jsesc": "^2.5.0", + "jsesc": "^3.0.2" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/plugin-transform-classes/node_modules/@babel/template": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", - "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "node_modules/@babel/plugin-transform-classes/node_modules/@babel/parser": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", + "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0" + "@babel/types": "^8.0.4" + }, + "bin": { + "parser": "bin/babel-parser.js" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, "node_modules/@babel/plugin-transform-classes/node_modules/@babel/traverse": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", - "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", + "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.0", + "@babel/parser": "^8.0.4", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.0", + "@babel/types": "^8.0.4", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/plugin-transform-classes/node_modules/@babel/types": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", - "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, - "node_modules/@babel/plugin-transform-classes/node_modules/js-tokens": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", - "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/plugin-transform-computed-properties": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-8.0.1.tgz", @@ -2747,16 +1729,6 @@ "@babel/core": "^8.0.0" } }, - "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/helper-validator-identifier": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", - "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^22.18.0 || >=24.11.0" - } - }, "node_modules/@babel/plugin-transform-modules-umd": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-8.0.1.tgz", @@ -2976,9 +1948,9 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-8.0.1.tgz", - "integrity": "sha512-1WjCi/45Mn5e0uvz26FdvRe6bTAvN6WAtkHgIjl0w/LkBvrv4Y5bDR+8YY72r7cefXBfwYUXIHSoxQkrIfnjXQ==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-8.0.2.tgz", + "integrity": "sha512-aFfsjCRYducRV4dPnpsBbdRkLjboca9FVDg6HZCgy0Ahvk2ZQ/2exmCRC5qS9P6rsWwrmIheNaIM6A1j2F8KMA==", "dev": true, "license": "MIT", "dependencies": { @@ -3210,9 +2182,9 @@ } }, "node_modules/@babel/preset-env": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-8.0.1.tgz", - "integrity": "sha512-tiwl69ZQGIbPif28GK8vI/Nm1nYdP+UHXWRnqXl0fjfBS7DWmAs2XvlpVkZyZjVVDxcprcbzCnN93SbuSgz8WQ==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-8.0.2.tgz", + "integrity": "sha512-CUGLn9hNBCF/eXnwdFAWERbniCcXCRvnKwLV9fegeUEIqv7YlU2MepsWMMM54GcILx5XYMnRh+JAL+K5G+mK6g==", "dev": true, "license": "MIT", "dependencies": { @@ -3265,7 +2237,7 @@ "@babel/plugin-transform-private-methods": "^8.0.1", "@babel/plugin-transform-private-property-in-object": "^8.0.1", "@babel/plugin-transform-property-literals": "^8.0.1", - "@babel/plugin-transform-regenerator": "^8.0.1", + "@babel/plugin-transform-regenerator": "^8.0.2", "@babel/plugin-transform-regexp-modifiers": "^8.0.1", "@babel/plugin-transform-reserved-words": "^8.0.1", "@babel/plugin-transform-shorthand-properties": "^8.0.1", @@ -3277,8 +2249,8 @@ "@babel/plugin-transform-unicode-property-regex": "^8.0.1", "@babel/plugin-transform-unicode-regex": "^8.0.1", "@babel/plugin-transform-unicode-sets-regex": "^8.0.1", - "@babel/preset-modules": "0.1.6-no-external-plugins", - "babel-plugin-polyfill-corejs3": "^1.0.0-rc.2", + "@babel/preset-modules": "^0.2.0", + "babel-plugin-polyfill-corejs3": "^1.0.0", "core-js-compat": "^3.48.0", "semver": "^7.7.3" }, @@ -3289,42 +2261,21 @@ "@babel/core": "^8.0.0" } }, - "node_modules/@babel/preset-env/node_modules/semver": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", - "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@babel/preset-modules": { - "version": "0.1.6-no-external-plugins", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", - "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.2.0.tgz", + "integrity": "sha512-yz0RBN2fx4fjCeFcTWsWgL7PxSRltvTa0Qg14HkWCU3qS8MO7ZSJlBVbGceynd5C9NsJwwUHNQD3dc6tYO+jqQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/types": "^7.4.4", + "@babel/helper-plugin-utils": "^8.0.1", + "@babel/plugin-transform-dotall-regex": "^8.0.1", + "@babel/plugin-transform-unicode-property-regex": "^8.0.1", + "@babel/types": "^8.0.0", "esutils": "^2.0.2" }, "peerDependencies": { - "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" - } - }, - "node_modules/@babel/preset-modules/node_modules/@babel/helper-plugin-utils": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz", - "integrity": "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" + "@babel/core": "^8.0.0" } }, "node_modules/@babel/preset-typescript": { @@ -3347,9 +2298,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.29.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz", - "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz", + "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==", "dev": true, "license": "MIT", "engines": { @@ -3357,9 +2308,9 @@ } }, "node_modules/@babel/runtime-corejs3": { - "version": "7.29.2", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.29.2.tgz", - "integrity": "sha512-Lc94FOD5+0aXhdb0Tdg3RUtqT6yWbI/BbFWvlaSJ3gAb9Ks+99nHRDKADVqC37er4eCB0fHyWT+y+K3QOvJKbw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.29.7.tgz", + "integrity": "sha512-ppj9ouYku+RX0ljtgZd+KMO5mkM2bCqg8H2PYAFWnLsHEIKIdRojqbJ2i3eVHrisuxy7nOFCmngTDdWtUCdXUQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3370,53 +2321,150 @@ } }, "node_modules/@babel/template": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz", - "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", + "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.28.6", - "@babel/parser": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/code-frame": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0" }, "engines": { - "node": ">=6.9.0" + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/template/node_modules/@babel/parser": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", + "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^8.0.4" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" } }, "node_modules/@babel/traverse": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz", - "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz", + "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.29.0", - "@babel/generator": "^7.29.0", - "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.29.0", - "@babel/template": "^7.28.6", - "@babel/types": "^7.29.0", + "@babel/code-frame": "^7.29.7", + "@babel/generator": "^7.29.7", + "@babel/helper-globals": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/template": "^7.29.7", + "@babel/types": "^7.29.7", "debug": "^4.3.1" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/types": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", - "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", + "node_modules/@babel/traverse/node_modules/@babel/code-frame": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", + "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.29.7", + "js-tokens": "^4.0.0", + "picocolors": "^1.1.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/@babel/helper-globals": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz", + "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/@babel/helper-string-parser": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", + "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/@babel/helper-validator-identifier": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/@babel/template": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz", + "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/types": "^7.29.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/@babel/types": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz", + "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.27.1", - "@babel/helper-validator-identifier": "^7.28.5" + "@babel/helper-string-parser": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/traverse/node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/types": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.4.tgz", + "integrity": "sha512-eY+Yn3dCqTGmyiq2QRU66lA5FL8lqqqvecHt0fF3uHONIa7ToYsaCiWV8lOKqAs0Rb2SjixiKFROngnulPtt2g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.4" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@biomejs/biome": { "version": "2.4.11", "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.4.11.tgz", @@ -3486,6 +2534,9 @@ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT OR Apache-2.0", "optional": true, "os": [ @@ -3503,6 +2554,9 @@ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT OR Apache-2.0", "optional": true, "os": [ @@ -3520,6 +2574,9 @@ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT OR Apache-2.0", "optional": true, "os": [ @@ -3537,6 +2594,9 @@ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT OR Apache-2.0", "optional": true, "os": [ @@ -3605,13 +2665,13 @@ } }, "node_modules/@codemirror/commands": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.10.3.tgz", - "integrity": "sha512-JFRiqhKu+bvSkDLI+rUhJwSxQxYb759W5GBezE8Uc8mHLqC9aV/9aTC7yJSqCtB3F00pylrLCwnyS91Ap5ej4Q==", + "version": "6.10.4", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.10.4.tgz", + "integrity": "sha512-Ryk9y9T0FFVF0cUGhAknveAyUOl/A1qReTFi+qPKtOh2Z9F4AUBz3XOrYD4ZEgZirdugVzHvd/2/Wcwy5OliTg==", "license": "MIT", "dependencies": { "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.6.0", + "@codemirror/state": "^6.7.0", "@codemirror/view": "^6.27.0", "@lezer/common": "^1.1.0" } @@ -3764,9 +2824,9 @@ } }, "node_modules/@codemirror/lang-markdown": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.5.0.tgz", - "integrity": "sha512-0K40bZ35jpHya6FriukbgaleaqzBLZfOh7HuzqbMxBXkbYMJDxfF39c23xOgxFezR+3G+tR2/Mup+Xk865OMvw==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.5.1.tgz", + "integrity": "sha512-6re5avCNfyRMIoi3XNjbEfQM1vTeVD3JS3g/Fyegyso/eoANFM71Cyvbb66LDyYtQLMEcRFlzioywCqDo9SlLA==", "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.7.1", @@ -3897,9 +2957,9 @@ } }, "node_modules/@codemirror/language": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.12.3.tgz", - "integrity": "sha512-QwCZW6Tt1siP37Jet9Tb02Zs81TQt6qQrZR2H+eGMcFsL1zMrk2/b9CLC7/9ieP1fjIUMgviLWMmgiHoJrj+ZA==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.12.4.tgz", + "integrity": "sha512-1q4PaT+o6PbgpkJt4Q8Fv5XJxTy4FUZ4MWETtyiDw3J0Pyr9E2vqcKL+k9wcvjNTIsauxvE7OfmWj3FRPHQ76A==", "license": "MIT", "dependencies": { "@codemirror/state": "^6.0.0", @@ -3989,9 +3049,9 @@ } }, "node_modules/@codemirror/state": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.6.0.tgz", - "integrity": "sha512-4nbvra5R5EtiCzr9BTHiTLc+MLXK2QGiAVYMyi8PkQd3SR+6ixar/Q/01Fa21TBIDOZXgeWV4WppsQolSreAPQ==", + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.7.1.tgz", + "integrity": "sha512-9QzNDgE4EYDnAHfrTlR2lwiPciiOymLtwKK+8yHQzCc7GXhAP9xdEbEJFy2IWB1j9UGUl9BsgMmTo/ImA02T7A==", "license": "MIT", "dependencies": { "@marijn/find-cluster-break": "^1.0.0" @@ -4010,9 +3070,9 @@ } }, "node_modules/@codemirror/view": { - "version": "6.43.4", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.43.4.tgz", - "integrity": "sha512-YImu23iyKfncJzT7sRy+rEqEhSc8RhOHqDxwy4WzXRKJwYm6iwf/9OJk5ctCAdZ6yi2ZqaGEvmf55fSVqMDrgg==", + "version": "6.43.6", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.43.6.tgz", + "integrity": "sha512-EVunGSYN1wz1p75WY1s3Xg7t3i8Yol0kGZGizNdX9BUFgMFILYVe8/u6EVpo7Ff5PwbZuILb4QAq7IZoKzIEQA==", "license": "MIT", "dependencies": { "@codemirror/state": "^6.7.0", @@ -4080,21 +3140,21 @@ "license": "MIT" }, "node_modules/@emnapi/core": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz", - "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==", + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.2.tgz", + "integrity": "sha512-TC8MkTuZUtcTSiFeuC0ksCh9QIJ5+F21MvZ4Wn4ORfYaFJ/0dsiudv5tVkejgwZlwQ39jL9WWDe2lz8x0WglOA==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@emnapi/wasi-threads": "1.2.1", + "@emnapi/wasi-threads": "1.2.2", "tslib": "^2.4.0" } }, "node_modules/@emnapi/runtime": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz", - "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==", + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.2.tgz", + "integrity": "sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA==", "dev": true, "license": "MIT", "optional": true, @@ -4103,9 +3163,9 @@ } }, "node_modules/@emnapi/wasi-threads": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz", - "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz", + "integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==", "dev": true, "license": "MIT", "optional": true, @@ -4136,9 +3196,9 @@ "license": "MIT" }, "node_modules/@iconify/utils": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-3.1.3.tgz", - "integrity": "sha512-LPKOXPn/zV+zis1oOfGWogaXVpqUybF3ZS6SCZIsz8vg0ivVp9+fVqyYB7xq0aiST/VhUQYGO1qo6uoYSiEJqw==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-3.1.4.tgz", + "integrity": "sha512-b1S7B1k9ohZ+iNTi2ATxbRYG9fTrJmUT0rc46bvVnNxqNRGW7dyo/vRREwyniI5IRN2RSJHDcm+s3BjWrSAjHw==", "license": "MIT", "dependencies": { "@antfu/install-pkg": "^1.1.0", @@ -4222,9 +3282,9 @@ "license": "MIT" }, "node_modules/@lezer/cpp": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@lezer/cpp/-/cpp-1.1.5.tgz", - "integrity": "sha512-DIhSXmYtJKLehrjzDFN+2cPt547ySQ41nA8yqcDf/GxMc+YM736xqltFkvADL2M0VebU5I+3+4ks2Vv+Kyq3Aw==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@lezer/cpp/-/cpp-1.1.6.tgz", + "integrity": "sha512-vh9gWWJOXFVY8HBHK3Twzq8MgwG2iN4GSyzBP9sCGTe37P15x2R14VaBQk0VA0ezTRN1KHYBBsHhvpGZ2Xy/pA==", "license": "MIT", "dependencies": { "@lezer/common": "^1.2.0", @@ -4233,9 +3293,9 @@ } }, "node_modules/@lezer/css": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.3.tgz", - "integrity": "sha512-RzBo8r+/6QJeow7aPHIpGVIH59xTcJXp399820gZoMo9noQDRVpJLheIBUicYwKcsbOYoBRoLZlf2720dG/4Tg==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.4.tgz", + "integrity": "sha512-N+tn9tej2hPvyKgHEApMOQfHczDJCwxrRFS3SPn9QjYN+uwHvEDnCgKRrb3mxDYxRS8sKMM8fhC3+lc04Abz5Q==", "license": "MIT", "dependencies": { "@lezer/common": "^1.2.0", @@ -4331,9 +3391,9 @@ } }, "node_modules/@lezer/markdown": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.6.3.tgz", - "integrity": "sha512-jpGm5Ps+XErS+xA4urw7ogEGkeZOahVQF21Z6oECF0sj+2liwZopd2+I8uH5I/vZsRuuze3OxBREIANLf6KKUw==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.7.2.tgz", + "integrity": "sha512-iTkYvoVcKt3WkeL7qUDyXHONZEwLio4wj8KTNi2dnjQEXBZKMV63BpQrPqfsM+OkvuRbiSTAcycYAsQzLhRNoQ==", "license": "MIT", "dependencies": { "@lezer/common": "^1.5.0", @@ -4352,9 +3412,9 @@ } }, "node_modules/@lezer/python": { - "version": "1.1.18", - "resolved": "https://registry.npmjs.org/@lezer/python/-/python-1.1.18.tgz", - "integrity": "sha512-31FiUrU7z9+d/ElGQLJFXl+dKOdx0jALlP3KEOsGTex8mvj+SoE1FgItcHWK/axkxCHGUSpqIHt6JAWfWu9Rhg==", + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/@lezer/python/-/python-1.1.19.tgz", + "integrity": "sha512-MhQIURHRytsNzP/YXnqpYKW6la6voAH3kyplTOOiCdjyFY6cWWGFVmYVdHIPrElqSDf4iCDktQCockB9FxuhzQ==", "license": "MIT", "dependencies": { "@lezer/common": "^1.2.0", @@ -4407,29 +3467,29 @@ } }, "node_modules/@marijn/find-cluster-break": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz", - "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.3.tgz", + "integrity": "sha512-FY+MKLBoTsLNJF/eLWaOsXGdz6uh3Iu1axjPf6TUq92IYumcTcXWHoS747JARLkcdlJ/Waiaxc5wQfFO8jC6NA==", "license": "MIT" }, "node_modules/@mermaid-js/parser": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.1.1.tgz", - "integrity": "sha512-VuHdsYMK1bT6X2JbcAaWAhugTRvRBRyuZgd+c22swUeI9g/ntaxF7CY7dYarhZovofCbUNO0G7JesfmNtjYOCw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.2.0.tgz", + "integrity": "sha512-oYPyv8A4As1yH5Bx+04iQEQxXuIQDe0GKCNSRgao6z8AM9jixXIfP0vsppRLvGf+nKIOb9/LdpWA4YuJiVvESA==", "license": "MIT", "dependencies": { - "@chevrotain/types": "~11.1.1" + "@chevrotain/types": "~11.1.2" } }, "node_modules/@napi-rs/wasm-runtime": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz", - "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz", + "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@tybys/wasm-util": "^0.10.1" + "@tybys/wasm-util": "^0.10.3" }, "funding": { "type": "github", @@ -4487,9 +3547,9 @@ } }, "node_modules/@npmcli/agent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.0.tgz", - "integrity": "sha512-kAQTcEN9E8ERLVg5AsGwLNoFb+oEG6engbqAU2P43gD4JEIkNGMHdVQ096FsOAAYpZPB0RSt0zgInKIAS1l5QA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.2.tgz", + "integrity": "sha512-EUEuWAxnL07Sp5/iC/1X6Xj+XThUvnbei9zfRWZdEXa7lss9RTHMhAHBeg+MZ5To9s/gGaSI+UwZTPdYMvKSeg==", "license": "ISC", "dependencies": { "agent-base": "^7.1.0", @@ -4503,9 +3563,9 @@ } }, "node_modules/@npmcli/arborist": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-9.5.0.tgz", - "integrity": "sha512-qS+TtKWC58sjBjD+szLrhEj2TCLnwzUA9vlMyCnU9ztw01ZjQSu25iQPxeBa0sk9sS9/Hzs/xJMWl7J/vRCjGQ==", + "version": "9.9.0", + "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-9.9.0.tgz", + "integrity": "sha512-tzsb1R8mx0k0drlLDT/9ckEYaQHIaWnUti/ci2IaFoQqdqwfmYrc+90p1+QEZC/ocvqcxBep9P1xKw4FbAGofw==", "license": "ISC", "dependencies": { "@gar/promise-retry": "^1.0.0", @@ -4550,18 +3610,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/@npmcli/arborist/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@npmcli/fs": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-5.0.0.tgz", @@ -4574,18 +3622,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/@npmcli/fs/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@npmcli/git": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-7.0.2.tgz", @@ -4605,18 +3641,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/@npmcli/git/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@npmcli/installed-package-contents": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-4.0.0.tgz", @@ -4664,18 +3688,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/@npmcli/metavuln-calculator/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@npmcli/move-file": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", @@ -4740,18 +3752,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/@npmcli/package-json/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@npmcli/promise-spawn": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-9.0.1.tgz", @@ -4802,9 +3802,9 @@ } }, "node_modules/@parcel/watcher": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz", - "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.6.0.tgz", + "integrity": "sha512-7FNeNl8NCE7aINx7WXiKQrPYZWC/hvrTsmk6zmxbI7LTXE7hVek/n8AfVgpe2y82zl3w0HvCHN0bVKMBoJcC0w==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -4813,7 +3813,7 @@ "detect-libc": "^2.0.3", "is-glob": "^4.0.3", "node-addon-api": "^7.0.0", - "picomatch": "^4.0.3" + "picomatch": "^4.0.4" }, "engines": { "node": ">= 10.0.0" @@ -4823,25 +3823,24 @@ "url": "https://opencollective.com/parcel" }, "optionalDependencies": { - "@parcel/watcher-android-arm64": "2.5.6", - "@parcel/watcher-darwin-arm64": "2.5.6", - "@parcel/watcher-darwin-x64": "2.5.6", - "@parcel/watcher-freebsd-x64": "2.5.6", - "@parcel/watcher-linux-arm-glibc": "2.5.6", - "@parcel/watcher-linux-arm-musl": "2.5.6", - "@parcel/watcher-linux-arm64-glibc": "2.5.6", - "@parcel/watcher-linux-arm64-musl": "2.5.6", - "@parcel/watcher-linux-x64-glibc": "2.5.6", - "@parcel/watcher-linux-x64-musl": "2.5.6", - "@parcel/watcher-win32-arm64": "2.5.6", - "@parcel/watcher-win32-ia32": "2.5.6", - "@parcel/watcher-win32-x64": "2.5.6" + "@parcel/watcher-android-arm64": "2.6.0", + "@parcel/watcher-darwin-arm64": "2.6.0", + "@parcel/watcher-darwin-x64": "2.6.0", + "@parcel/watcher-freebsd-x64": "2.6.0", + "@parcel/watcher-linux-arm-glibc": "2.6.0", + "@parcel/watcher-linux-arm-musl": "2.6.0", + "@parcel/watcher-linux-arm64-glibc": "2.6.0", + "@parcel/watcher-linux-arm64-musl": "2.6.0", + "@parcel/watcher-linux-x64-glibc": "2.6.0", + "@parcel/watcher-linux-x64-musl": "2.6.0", + "@parcel/watcher-win32-arm64": "2.6.0", + "@parcel/watcher-win32-x64": "2.6.0" } }, "node_modules/@parcel/watcher-android-arm64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz", - "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.6.0.tgz", + "integrity": "sha512-trgpLSCKRC/huFjXX/Smh+0sWe4+YtKfktIToiMl59ghz7z+qkH6kMvNnUbLyRs9N11t8l4svSCs1+5B3rOAhA==", "cpu": [ "arm64" ], @@ -4860,9 +3859,9 @@ } }, "node_modules/@parcel/watcher-darwin-arm64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz", - "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.6.0.tgz", + "integrity": "sha512-Y3QV0gl7Q1zbfueunkWIERICbEojQFCgpyG7YqOGNFLsckXyI1xu9mAIUpKY9QBYzBtSkN8dBPwd3yiAO9ovMw==", "cpu": [ "arm64" ], @@ -4881,9 +3880,9 @@ } }, "node_modules/@parcel/watcher-darwin-x64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz", - "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.6.0.tgz", + "integrity": "sha512-Ohv6OpzhUfKYD7Beb8kDvG0jbIxORCYY1JRdZnaBtnjjkJxgD7ZVL0nw2sCYd0yTMKTvz3nnTnOF3cDifK+kvw==", "cpu": [ "x64" ], @@ -4902,9 +3901,9 @@ } }, "node_modules/@parcel/watcher-freebsd-x64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz", - "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.6.0.tgz", + "integrity": "sha512-5HmXvDgs8VK+74jF9y9/2FE3/OnlcKmc56tjmSrEuZjpSZOGL+fvAu+HKJBdPs9uwoP2hE6TlSUpXZ/C5jUFmQ==", "cpu": [ "x64" ], @@ -4923,13 +3922,16 @@ } }, "node_modules/@parcel/watcher-linux-arm-glibc": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz", - "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.6.0.tgz", + "integrity": "sha512-Ps/hui3A+vMbjdqlqAowK2ZL8+BO8dBjxeWXj6npTBs3jx4wWmbPpaLuqwrQrSqIVMCnpWo238bJ1U37GhQOYg==", "cpu": [ "arm" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -4944,13 +3946,16 @@ } }, "node_modules/@parcel/watcher-linux-arm-musl": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz", - "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.6.0.tgz", + "integrity": "sha512-9c6AUHgHoG+IY88MRIHupztQiQnrbqHYQjkM2btA+Bf/wQnQMuiD0Wfk1EVv3TlNT3x41uU71rn6E4xh/+zvkw==", "cpu": [ "arm" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -4965,13 +3970,16 @@ } }, "node_modules/@parcel/watcher-linux-arm64-glibc": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz", - "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.6.0.tgz", + "integrity": "sha512-yHRqS2owEXe6Hic9z6Mh1ECsCd+ODVOGvZDyciqRd21+v+o+DnXMOrw50DSpIG2sb8GPEaPPmfeCAWKPJdq46g==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -4986,13 +3994,16 @@ } }, "node_modules/@parcel/watcher-linux-arm64-musl": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz", - "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.6.0.tgz", + "integrity": "sha512-WhB2e/V7rqdHHWZusBSPuy5Ei8S6lSz6FE5TKKQz5h3a0O+C+mhY7vxU9b/stqvMb8beLnPY82ZrFTLKs+SrKA==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5007,13 +4018,16 @@ } }, "node_modules/@parcel/watcher-linux-x64-glibc": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz", - "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.6.0.tgz", + "integrity": "sha512-ulGE6x6Oz6iAwg75T8YQSoguBWasniIbX+QWpaYPcCnDOpdWX3k+4xbEYPZVLxOuoJI+svJJPD3sEj8G7lrQ3A==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5028,13 +4042,16 @@ } }, "node_modules/@parcel/watcher-linux-x64-musl": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz", - "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.6.0.tgz", + "integrity": "sha512-tkBYKt7YQrjIJWYDnto2YgO8MRkjlMTSNoRHzsXinBqbLdeOM3L32wPZJvIZxqaLMfSlS/4sUjH/6STVP/XDLw==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5049,9 +4066,9 @@ } }, "node_modules/@parcel/watcher-win32-arm64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz", - "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.6.0.tgz", + "integrity": "sha512-gIZAP23jaHjGWasY/TY6yL7NHFClf0Ga7FN+iINvk+KN94rhm94lYZhFsbYFNcA04/onvGD9kKmiJLJB2HbNwQ==", "cpu": [ "arm64" ], @@ -5069,31 +4086,10 @@ "url": "https://opencollective.com/parcel" } }, - "node_modules/@parcel/watcher-win32-ia32": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz", - "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, "node_modules/@parcel/watcher-win32-x64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz", - "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.6.0.tgz", + "integrity": "sha512-cA+/pXV2YkfxlIcXOQ5fSWqAzzPyD78/x5qbK/I0vUkrlYHA8TIz+MXjAbGouguKVSI4bOmkTSJ1/poVSsgt+A==", "cpu": [ "x64" ], @@ -5112,74 +4108,116 @@ } }, "node_modules/@rspack/binding": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-2.0.3.tgz", - "integrity": "sha512-4exVNhGhW5RFHjK87XeTKbkA/qAgI5NHJlT1jNqiJv0gcUXLqTOEU3w7f8+f9zUo4JMFvPc0c9veOi4M19YYTg==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-2.1.5.tgz", + "integrity": "sha512-lF3ZLeeyV0AN3BL0m2jAmNZD5pP9IHsQ8gUXN7mo0g4xsW6nf6hsN7o9CnEHECz5uUZb+EoWsuWzAAmnA9Ip8Q==", "dev": true, "license": "MIT", "optionalDependencies": { - "@rspack/binding-darwin-arm64": "2.0.3", - "@rspack/binding-darwin-x64": "2.0.3", - "@rspack/binding-linux-arm64-gnu": "2.0.3", - "@rspack/binding-linux-arm64-musl": "2.0.3", - "@rspack/binding-linux-x64-gnu": "2.0.3", - "@rspack/binding-linux-x64-musl": "2.0.3", - "@rspack/binding-wasm32-wasi": "2.0.3", - "@rspack/binding-win32-arm64-msvc": "2.0.3", - "@rspack/binding-win32-ia32-msvc": "2.0.3", - "@rspack/binding-win32-x64-msvc": "2.0.3" + "@rspack/binding-darwin-arm64": "2.1.5", + "@rspack/binding-darwin-x64": "2.1.5", + "@rspack/binding-linux-arm64-gnu": "2.1.5", + "@rspack/binding-linux-arm64-musl": "2.1.5", + "@rspack/binding-linux-riscv64-gnu": "2.1.5", + "@rspack/binding-linux-riscv64-musl": "2.1.5", + "@rspack/binding-linux-x64-gnu": "2.1.5", + "@rspack/binding-linux-x64-musl": "2.1.5", + "@rspack/binding-wasm32-wasi": "2.1.5", + "@rspack/binding-win32-arm64-msvc": "2.1.5", + "@rspack/binding-win32-ia32-msvc": "2.1.5", + "@rspack/binding-win32-x64-msvc": "2.1.5" } }, "node_modules/@rspack/binding-darwin-arm64": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-2.0.3.tgz", - "integrity": "sha512-4UyCjLJwU/WxR6K1/gG4u3+jUsoaRHJ5rNu9fto/UbvrItwdlVNULChAApqZFw6mcSetMddSjSICeuj5pSB6sA==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-2.1.5.tgz", + "integrity": "sha512-XLAN6YSU36qkciJtV9DY9z57pdHOjKy/f1HyoqpZenRg8p46jnXPziV45lfrTZpG+FF6g/jtTUc4dKbeyoWqPw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rspack/binding-darwin-x64": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-2.1.5.tgz", + "integrity": "sha512-KLW7PV86jyCOyqJSqrkZdvYUWYCFX/Q4LsGmVc8tyDA8jBYLMHJDewC/lNf9ot3rU2SoLDZKhDUh7q7dX0FRmg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rspack/binding-linux-arm64-gnu": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-2.1.5.tgz", + "integrity": "sha512-KOooAC8L+Ljx5sY7ZuMeaXCQ310FNWaPWXcYQJpFPApF3qyLeSfuOftUGwxcxeo5U0mS5OY3zxp7/5CaHWKYjg==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ - "darwin" + "linux" ] }, - "node_modules/@rspack/binding-darwin-x64": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-2.0.3.tgz", - "integrity": "sha512-K3evrbTgZNa8emEqk+AjDtbuoXZp5tPZz3pcEgETxuu3KanW8Zu+Fb+TUp1DEUcL0xOmHPPox8H2cZ3pF4Zmug==", + "node_modules/@rspack/binding-linux-arm64-musl": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-2.1.5.tgz", + "integrity": "sha512-0GFc07gT71+uRbHtejDecBfSL0fs7dQAwCtXYieXboACauL7UvS3Hwr6v8A91aGtAcvLotnCaIa3CWWYwtYlYQ==", "cpu": [ - "x64" + "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ - "darwin" + "linux" ] }, - "node_modules/@rspack/binding-linux-arm64-gnu": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-2.0.3.tgz", - "integrity": "sha512-aPLDaaTtX1wqjLYAIHc2MGDQZtv1Hbjx47oaaefbWz5GbAnSA4P8jdYIeeGRyrqvQ0WqJXIWXgT0d/iXtes00A==", + "node_modules/@rspack/binding-linux-riscv64-gnu": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-2.1.5.tgz", + "integrity": "sha512-isQQDp3fBzPSZpLVFzPqVXIVA4I9b9mKs58TfUgOzDP/1g1582YSV3iFopgFogvEliihXDuuXvM6aAkP+w8Z+Q==", "cpu": [ - "arm64" + "riscv64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ "linux" ] }, - "node_modules/@rspack/binding-linux-arm64-musl": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-2.0.3.tgz", - "integrity": "sha512-0WulUQPop6vmSDfrTxghmVlm+6crU8/XqD2f0dOWbEniZVuDZJ5/Y/cBqTRyk3rjl0vrmUv3lc87/t7UgQJQSw==", + "node_modules/@rspack/binding-linux-riscv64-musl": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-2.1.5.tgz", + "integrity": "sha512-/SP6VknY4kH60BYplI2FDNAJCo4U4DUszLxhKsgVlgA5ImgHC8Ew2AsKgidk7ceiYV9OcKzYuWYe9tVpysBYVA==", "cpu": [ - "arm64" + "riscv64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5187,13 +4225,16 @@ ] }, "node_modules/@rspack/binding-linux-x64-gnu": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-2.0.3.tgz", - "integrity": "sha512-fAhiMuV5omT53YMft+f3Y9euAFgspuyBAk9ZpeW2buL2TkuUMwP07adhhvQfKdQ5gpELfzmjQaRDGqaIT8UWiA==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-2.1.5.tgz", + "integrity": "sha512-/GJmS+buA4pilT10gs5mfAhAZxSHXpDD8veZ3QpYvNUuoU9gvempAq9TgjbyNN/vc5pf76GdXPXKFMiehudYSA==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5201,13 +4242,16 @@ ] }, "node_modules/@rspack/binding-linux-x64-musl": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-2.0.3.tgz", - "integrity": "sha512-0kcuFoZ8vy2iNWoISFOZt+/Ujo7LRLrzE7h07AV5r+oN/mv+/v14Sd/8NUtDIScCkrYOszYq/QS31e6t0UrVfw==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-2.1.5.tgz", + "integrity": "sha512-iwS3t75nZ2TnUjB05KtvpvjpdkOy/nLxbaOnwjbdnNZZXpUaMadLbllGAWayHPGCMsL2yKBEhVEESZpR7tK3SA==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5215,9 +4259,9 @@ ] }, "node_modules/@rspack/binding-wasm32-wasi": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-2.0.3.tgz", - "integrity": "sha512-x2fsw7GzNZEnw444ikj4/b8kVjM0Y0TllxmizHpYZ9gmaQrOk5OXo9RQdz+l4zzoGors0l2IZP5Cc4GJNCaSoQ==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-2.1.5.tgz", + "integrity": "sha512-jOhW69t1H/jcRaSMB5U8jVzWP18j0YQIlo0nT8W+KvNVScJeyOze4FFc+5RIS7VmuT8/jid7hUyydZOfm6UgqA==", "cpu": [ "wasm32" ], @@ -5225,15 +4269,15 @@ "license": "MIT", "optional": true, "dependencies": { - "@emnapi/core": "1.10.0", - "@emnapi/runtime": "1.10.0", - "@napi-rs/wasm-runtime": "1.1.4" + "@emnapi/core": "1.11.2", + "@emnapi/runtime": "1.11.2", + "@napi-rs/wasm-runtime": "1.1.6" } }, "node_modules/@rspack/binding-win32-arm64-msvc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-2.0.3.tgz", - "integrity": "sha512-jqlxuVPdrgMuwj/HEjSkC/jmhl4fAuKyob36zJXq2uAusn2FRJ4kClGe1fLFpfxRXFVQAWwlAOwLJg8T0suuaA==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-2.1.5.tgz", + "integrity": "sha512-OLfMXmtFBcrWr9BRGKXJYrWgYR0JSaoAWr3EVFDjKGi/YR5aUwQSGc3AJPBph9g0YsdSqRuUhtQGtCk84DeeEA==", "cpu": [ "arm64" ], @@ -5245,9 +4289,9 @@ ] }, "node_modules/@rspack/binding-win32-ia32-msvc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-2.0.3.tgz", - "integrity": "sha512-QM4JEuyk5QaZ5gnvnAIaCwVQzCkrD2E4Sud77kx/MVGDsRkcOlMx3blMC5QNHPDamRmWGk+7314YOQvRhKuWyg==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-2.1.5.tgz", + "integrity": "sha512-p4OSmnj21+AY8vpIADveLEBXfXJRXonOTYim2VLVWV4TbXfhYNMLiX3qESHCdNnn6lVJM0q6zxxzEUfTyAKydw==", "cpu": [ "ia32" ], @@ -5259,9 +4303,9 @@ ] }, "node_modules/@rspack/binding-win32-x64-msvc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-2.0.3.tgz", - "integrity": "sha512-vSQNnAy0wswG6AfNRuArTHQBiXOXl+A9ddQxBFup4PMHUzXxKtsBLQzw7BgFC0EgrPeHbt+30j7sXVZKYukj4A==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-2.1.5.tgz", + "integrity": "sha512-YCkLLDGMkHsw5CpcsFtFhzCu+JZEsNrcH9O1GpWMkyxR2ku2Fq1i2wEHYSm26HyW+PJ3+Fv347MPWMFZIz9q2g==", "cpu": [ "x64" ], @@ -5273,9 +4317,9 @@ ] }, "node_modules/@rspack/cli": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/cli/-/cli-2.0.3.tgz", - "integrity": "sha512-h/Xbkupx82UaPr5Ye3hNORi5eXmpEGSPri7WkEOrKIcT+Y3h603kujCQziNIPX3G4UURWPiksIArp1GBTF+A9w==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/cli/-/cli-2.1.5.tgz", + "integrity": "sha512-N6Bm8sxHwatNoiZR68+/VKvVMDh19ya39t2Nfxu1/fBmGCrQX1ct8uPooVSysLtUF2Qx31sSRl1DX1SS0eYt2A==", "dev": true, "license": "MIT", "bin": { @@ -5292,20 +4336,20 @@ } }, "node_modules/@rspack/core": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/core/-/core-2.0.3.tgz", - "integrity": "sha512-2ufO/8FHIA/lX6UOgSsKPhpDvHr0sh9lYq/n/LsIZsTwu3973BGbu2fg1Akvuu3rEnskPqXjsqH2EPBzEA42uA==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@rspack/core/-/core-2.1.5.tgz", + "integrity": "sha512-YHjL7xVXycAWsjJtF39cRZ2u+ddiNFxY+FcNgEBe6Y8OaLeUfMfjba3gK+B1Oj32UcKD6BmXGsPfu9p+OII/Yw==", "dev": true, "license": "MIT", "dependencies": { - "@rspack/binding": "2.0.3" + "@rspack/binding": "2.1.5" }, "engines": { "node": "^20.19.0 || >=22.12.0" }, "peerDependencies": { "@module-federation/runtime-tools": "^0.24.1 || ^2.0.0", - "@swc/helpers": ">=0.5.1" + "@swc/helpers": "^0.5.23" }, "peerDependenciesMeta": { "@module-federation/runtime-tools": { @@ -5452,9 +4496,9 @@ } }, "node_modules/@tybys/wasm-util": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz", - "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==", + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz", + "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==", "dev": true, "license": "MIT", "optional": true, @@ -5657,9 +4701,9 @@ "license": "MIT" }, "node_modules/@types/d3-random": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz", - "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.4.tgz", + "integrity": "sha512-UHYId5WTCx4L4YNel7NU00XUXXgvgpgZOvp10PuvsQENjMDXhh2RyFc0KBjO7B45ne4Ha1yVH7ii0vnzKkuzWA==", "license": "MIT" }, "node_modules/@types/d3-scale": { @@ -5729,30 +4773,6 @@ "@types/d3-selection": "*" } }, - "node_modules/@types/eslint": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", - "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, "node_modules/@types/estree": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", @@ -5814,14 +4834,14 @@ "peer": true }, "node_modules/@types/node": { - "version": "25.8.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-25.8.0.tgz", - "integrity": "sha512-TCFSk8IZh+iLX1xtksoBVtdmgL+1IX0fC9BeU4QqFSuNdN/K+HUlhqOzEmSYYpZUVsLYcPqc9KX+60iDuninSQ==", + "version": "26.1.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.1.tgz", + "integrity": "sha512-nxAkRSVkN1Y0JC1W8ky/fTfkGsMmcrRsbx+3XoZE+rMOX71kLYTV7fLXpqud1GpbpP5TuffXFqfX7fH2GgZREw==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "undici-types": ">=7.24.0 <7.24.7" + "undici-types": "~8.3.0" } }, "node_modules/@types/trusted-types": { @@ -5861,6 +4881,12 @@ "d3-transition": "^3.0.1" } }, + "node_modules/@vscode/l10n": { + "version": "0.0.18", + "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", + "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==", + "license": "MIT" + }, "node_modules/@webassemblyjs/ast": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz", @@ -6170,9 +5196,9 @@ } }, "node_modules/acorn": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", - "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz", + "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -6181,20 +5207,6 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-phases": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz", - "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=10.13.0" - }, - "peerDependencies": { - "acorn": "^8.14.0" - } - }, "node_modules/agent-base": { "version": "7.1.4", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", @@ -6280,28 +5292,15 @@ } }, "node_modules/android-versions": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-2.1.1.tgz", - "integrity": "sha512-dYeO3KHDO81WvEwZFK+OF0dJl/ESvxV3QZE/qo/AAnG/uijco6DOXJJla3CdoC8Eg53YBlbRIyobRGYqIAGw8Q==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-2.2.0.tgz", + "integrity": "sha512-lrad0HHmy9406sSmBHYIetx4n3WMnVVD+HMv7C+YJrByLFGPYWvlM1WcYrYL+e2s1GErvRF85nWsRY7RpwIGLw==", "dev": true, "license": "MIT", "dependencies": { "semver": "^7.5.2" } }, - "node_modules/android-versions/node_modules/semver": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.3.tgz", - "integrity": "sha512-wnilbGyMxzbY7dNOl7jpKbLSjcfeweJWU5j4+u5qW+6/wuGD9KzIGOyZnQVSBM9E7DtWaaH3CyHkppYrKYoxwg==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/ansi": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz", @@ -6494,9 +5493,9 @@ "license": "MIT" }, "node_modules/archiver-utils/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -6547,9 +5546,9 @@ "license": "MIT" }, "node_modules/archiver/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -6718,9 +5717,9 @@ } }, "node_modules/autoprefixer": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.0.tgz", - "integrity": "sha512-FMhOoZV4+qR6aTUALKX2rEqGG+oyATvwBt9IIzVR5rMa2HRWPkxf+P+PAJLD1I/H5/II+HuZcBJYEFBpq39ong==", + "version": "10.5.4", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.4.tgz", + "integrity": "sha512-MaU0U/za7N3r6brxD4YB/l4NSrFzLPlANv6wEuQVaIPlD3L4W9rFcQPbL/EilY9BHhHvhfcz3gInDLrEtWT4EA==", "dev": true, "funding": [ { @@ -6738,8 +5737,8 @@ ], "license": "MIT", "dependencies": { - "browserslist": "^4.28.2", - "caniuse-lite": "^1.0.30001787", + "browserslist": "^4.28.6", + "caniuse-lite": "^1.0.30001806", "fraction.js": "^5.3.4", "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" @@ -6850,9 +5849,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.10.30", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.30.tgz", - "integrity": "sha512-xjOFN16Ha1+Rz4nFYKqHU/LSB+gx/Vi3yQLX7r7sAW+Wa+8hhF2h4pvqTrTMc8+WcDBEunnUurr46Jvv0jk3Vg==", + "version": "2.11.3", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.3.tgz", + "integrity": "sha512-sbT0Ui/CZwyAyy7icT1Gw5P1LKRlFaHwaF6tDCW5YHq2X5SeeZFphBuIagopSfwSSZq3sQcbmEL072yphxm7ew==", "dev": true, "license": "Apache-2.0", "bin": { @@ -6892,9 +5891,9 @@ } }, "node_modules/bin-links": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-6.0.0.tgz", - "integrity": "sha512-X4CiKlcV2GjnCMwnKAfbVWpHa++65th9TuzAEYtZoATiOE2DQKhSp4CJlyLoTqdhBKlXjpXjCTYPNNFS33Fi6w==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-6.0.2.tgz", + "integrity": "sha512-frE1t78WOwJ45PKV2cF2tNPjTcs9L1J9s6VkrV59wanRP4GlaomuxYPVma7BwthMg8WnfSory4w5PTE6FZZ81w==", "license": "ISC", "dependencies": { "cmd-shim": "^8.0.0", @@ -6972,9 +5971,9 @@ } }, "node_modules/body-parser": { - "version": "1.20.5", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.5.tgz", - "integrity": "sha512-3grm+/2tUOvu2cjJkvsIxrv/wVpfXQW4PsQHYm7yk4vfpu7Ekl6nEsYBoJUL6qDwZUx8wUhQ8tR2qz+ad9c9OA==", + "version": "1.20.6", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.6.tgz", + "integrity": "sha512-p5tAzS57i5MV9fZFDj9LeIiTZEufbSe2eDozP+ElheSUq1m74CRq1jI4mYNDdVs9vQztXFLuk/Gd6BWTdwRJ5g==", "dev": true, "license": "MIT", "dependencies": { @@ -7142,15 +6141,15 @@ } }, "node_modules/brace-expansion": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", - "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz", + "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==", "license": "MIT", "dependencies": { "balanced-match": "^4.0.2" }, "engines": { - "node": "18 || 20 || >=22" + "node": "20 || >=22" } }, "node_modules/braces": { @@ -7173,9 +6172,9 @@ "license": "ISC" }, "node_modules/browserslist": { - "version": "4.28.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz", - "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==", + "version": "4.28.7", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.7.tgz", + "integrity": "sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==", "dev": true, "funding": [ { @@ -7193,10 +6192,10 @@ ], "license": "MIT", "dependencies": { - "baseline-browser-mapping": "^2.10.12", - "caniuse-lite": "^1.0.30001782", - "electron-to-chromium": "^1.5.328", - "node-releases": "^2.0.36", + "baseline-browser-mapping": "^2.10.44", + "caniuse-lite": "^1.0.30001806", + "electron-to-chromium": "^1.5.393", + "node-releases": "^2.0.51", "update-browserslist-db": "^1.2.3" }, "bin": { @@ -7386,9 +6385,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001793", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz", - "integrity": "sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==", + "version": "1.0.30001806", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001806.tgz", + "integrity": "sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw==", "dev": true, "funding": [ { @@ -7577,9 +6576,9 @@ "license": "MIT" }, "node_modules/cli/node_modules/brace-expansion": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", - "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -7636,6 +6635,23 @@ "node": ">=20" } }, + "node_modules/cliui/node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/clone-response": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", @@ -7908,19 +6924,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/conf/node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/configstore": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", @@ -8046,9 +7049,9 @@ } }, "node_modules/cordova-android": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-15.0.0.tgz", - "integrity": "sha512-EpFSKUtBLJ7bTpuVD7NeC6toAooi5PI6VIR2jd8Ut5PJu7HSR5tPRwS87Q1DS03RSyDTlroB64JPUWC0pmAhnw==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-15.1.0.tgz", + "integrity": "sha512-mnOnOisYUVhyrLCPVlHJBKh4ro+X6nZA7nPqBrpVnyTpiiDiakNCfbBJjSs1MTBUJZ6dcmhhvNKZWPT9w6aGPA==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -8069,19 +7072,6 @@ "node": ">=20.17.0 || >=22.9.0" } }, - "node_modules/cordova-android/node_modules/semver": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.3.tgz", - "integrity": "sha512-wnilbGyMxzbY7dNOl7jpKbLSjcfeweJWU5j4+u5qW+6/wuGD9KzIGOyZnQVSBM9E7DtWaaH3CyHkppYrKYoxwg==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/cordova-app-hello-world": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-7.0.0.tgz", @@ -8163,18 +7153,6 @@ "node": ">=18" } }, - "node_modules/cordova-fetch/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/cordova-fetch/node_modules/which": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", @@ -8210,18 +7188,6 @@ "node": ">=20.17.0 || >=22.9.0" } }, - "node_modules/cordova-lib/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/cordova-lib/node_modules/signal-exit": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", @@ -8246,6 +7212,10 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/cordova-plugin-acode-webview": { + "resolved": "src/plugins/webview", + "link": true + }, "node_modules/cordova-plugin-advanced-http": { "resolved": "src/plugins/cordova-plugin-advanced-http", "link": true @@ -8383,18 +7353,6 @@ "node": ">= 8" } }, - "node_modules/cordova/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/core-js": { "version": "3.49.0", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.49.0.tgz", @@ -8448,9 +7406,9 @@ } }, "node_modules/cosmiconfig": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.1.tgz", - "integrity": "sha512-hr4ihw+DBqcvrsEDioRO31Z17x71pUYoNe/4h6Z0wB72p7MU7/9gH8Q3s12NFhHPfYBBOV3qyfUxmr/Yn3shnQ==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.2.tgz", + "integrity": "sha512-gtTZxTDau1wL7Y7zifc2dd8jHSK/k6BTx/2Xp/BpdlAdnlYWFVt7qhJqgwi7637yRwRQ3qL4ZidbB4I8tA5VOg==", "dev": true, "license": "MIT", "dependencies": { @@ -8514,9 +7472,9 @@ } }, "node_modules/crelt": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", - "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.7.tgz", + "integrity": "sha512-aK6BbWfhf4U/wCcLHKPJl/xa6VkVstRaPywWtMKGwuOLc/wZTyQYuoxgvZnNsBvv7Kg3YTBQYYBCggcviQczuA==", "license": "MIT" }, "node_modules/cross-spawn": { @@ -8599,19 +7557,6 @@ } } }, - "node_modules/css-loader/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", @@ -8638,9 +7583,9 @@ } }, "node_modules/cytoscape": { - "version": "3.33.3", - "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.3.tgz", - "integrity": "sha512-Gej7U+OKR+LZ8kvX7rb2HhCYJ0IhvEFsnkud4SB1PR+BUY/TsSO0dmOW59WEVLu51b1Rm+gQRKoz4bLYxGSZ2g==", + "version": "3.34.0", + "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.34.0.tgz", + "integrity": "sha512-62rNSrioXw93uliKFBwjukeQyeWwH2PqDrTac31r2P6464u3AUvTk0xS4LVvT251g7IgkFunrI48ZEZGjywSOg==", "license": "MIT", "engines": { "node": ">=0.10" @@ -9165,9 +8110,9 @@ "dev": true }, "node_modules/dayjs": { - "version": "1.11.20", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.20.tgz", - "integrity": "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==", + "version": "1.11.21", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.21.tgz", + "integrity": "sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==", "license": "MIT" }, "node_modules/debounce-fn": { @@ -9455,9 +8400,9 @@ } }, "node_modules/dompurify": { - "version": "3.4.11", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.11.tgz", - "integrity": "sha512-zhlUV12GsaRzMsf9q5M254YhA4+VuF0fG+QFqu6aYpoGlKtz+w8//jBcGVYBgQkR5GHjUomejY84AV+/uPbWdw==", + "version": "3.4.12", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.12.tgz", + "integrity": "sha512-zQvGet8Z2sWbQhCmfFz/T5QWH2oBmjnqK3qvOjaqaNLrLEF912WamU+ohnTp0TCep/MFVHpdJuCZEdFOdTnEFg==", "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { "@types/trusted-types": "^2.0.7" @@ -9532,9 +8477,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.357", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.357.tgz", - "integrity": "sha512-NHlTIQDK8fmVwHwuIzmXYEJ1Ewq3D9wDNc0cWXxDGysP6Pb21giwGNkxiTifyKy/4SoPuN5l6GLP1W9Sv7zB2g==", + "version": "1.5.396", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.396.tgz", + "integrity": "sha512-yHiw2Y3C3H9U6TMbOfoWK/BPreiOPXRfTWPBwQBoZG6/8TB6eOPnsy5oaRYuatR7Fw2SJ4kKforgufeo7fq0EQ==", "dev": true, "license": "ISC" }, @@ -9641,11 +8586,12 @@ "license": "MIT" }, "node_modules/enhanced-resolve": { - "version": "5.21.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.3.tgz", - "integrity": "sha512-QyL119InA+XXEkNLNTPCXPugSvOfhwv0JOlGNzvxs0hZaiHLNvXSpudUWsOlsXGWJh8G6ckCScEkVHfX3kw/2Q==", + "version": "5.24.3", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.24.3.tgz", + "integrity": "sha512-PwKooW9JUzh5chmYfHM3IQl5OkK2u2Nm011MgeZrss3JmFraUx/fqrf78kk8GUMYoibx/14MdwTl/1WKkG7TpQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.3.3" @@ -9712,9 +8658,9 @@ } }, "node_modules/es-module-lexer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz", - "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.1.tgz", + "integrity": "sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==", "dev": true, "license": "MIT", "peer": true @@ -9733,13 +8679,14 @@ } }, "node_modules/es-toolkit": { - "version": "1.46.1", - "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.46.1.tgz", - "integrity": "sha512-5eNtXOs3tbfxXOj04tjjseeWkRWaoCjdEI+96DgwzZoe6c9juL49pXlzAFTI72aWC9Y8p7168g6XIKjh7k6pyQ==", + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.50.0.tgz", + "integrity": "sha512-OyZKhUVvEep9ITEiwHn8GKnMRQIVqoSIX7WnRbkWgJkllCujilqP2rD0u979tkl8wqyc8ICwlc1UBVv/Sl1G6w==", "license": "MIT", "workspaces": [ "docs", - "benchmarks" + "benchmarks", + "tests/types" ] }, "node_modules/escalade": { @@ -10109,9 +9056,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", - "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.4.tgz", + "integrity": "sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==", "dev": true, "funding": [ { @@ -10175,9 +9122,9 @@ } }, "node_modules/filesize": { - "version": "11.0.17", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-11.0.17.tgz", - "integrity": "sha512-oHLTvMLw6imZUl1se/RBQrFlyy50nXce4sU7yGR6Qc0JgCwqnfiFsAnEwotdGmfKLD7SArGUk2/5STU0k8LOBQ==", + "version": "11.0.22", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-11.0.22.tgz", + "integrity": "sha512-RlCVs9CY+oSsRnNZn95J9vDXjNjOwddKyTFjOYtA4yxYVIxBnwiVVGJX+TFhsmu3uUf81JDGyijtYL9xgawlTw==", "license": "BSD-3-Clause", "engines": { "node": ">= 10.8.0" @@ -10331,12 +9278,12 @@ } }, "node_modules/framer-motion": { - "version": "12.42.0", - "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.42.0.tgz", - "integrity": "sha512-wp7EJnfWaaEScVygKv3e20udoRz+LbtxScsuTkakAxfXmt+ReC6WyPW2nINRAGvd+hG9odwcjBLyOTPjH5pBRA==", + "version": "12.42.2", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.42.2.tgz", + "integrity": "sha512-5XY9luDiu0oHfHBjpDthFMh0ES+122w6p/papSJBweMkO8Sn+PW2QaEgRblQBpWFnuvZS5qvarpt/hO2pjGmnw==", "license": "MIT", "dependencies": { - "motion-dom": "^12.42.0", + "motion-dom": "^12.42.2", "motion-utils": "^12.39.0", "tslib": "^2.4.0" }, @@ -10632,14 +9579,6 @@ "node": ">= 6" } }, - "node_modules/glob-to-regexp": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true, - "license": "BSD-2-Clause", - "peer": true - }, "node_modules/global-dirs": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", @@ -10847,9 +9786,9 @@ } }, "node_modules/hasown": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.3.tgz", - "integrity": "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz", + "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==", "license": "MIT", "dependencies": { "function-bind": "^1.1.2" @@ -11096,9 +10035,9 @@ "license": "MIT" }, "node_modules/immutable": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz", - "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.9.tgz", + "integrity": "sha512-m8nVez3rwrgmWxtLMt1ZYXB2Lv7OKYn/disyxAlSDYAlKSlFoPPfIAmAM/M5xqL4m4C/wAPw7S2/CNaUii1Hxg==", "dev": true, "license": "MIT" }, @@ -11251,19 +10190,6 @@ "node": ">=10" } }, - "node_modules/init-package-json/node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/init-package-json/node_modules/validate-npm-package-name": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", @@ -11274,6 +10200,13 @@ "builtins": "^1.0.3" } }, + "node_modules/init-package-json/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, "node_modules/inquirer": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", @@ -11515,9 +10448,9 @@ } }, "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.3.1.tgz", + "integrity": "sha512-1e9d3kb97NHJTIJDZW9rKqW2h6+dFa50Dy0fpPSMQp2ADje5gvKsXmdiK6dwY5t76TaTt5+P5N1Y/LoToIxP6g==", "license": "MIT", "engines": { "node": ">= 12" @@ -11829,16 +10762,16 @@ } }, "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", "dev": true, "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz", - "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz", + "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==", "dev": true, "funding": [ { @@ -11905,9 +10838,9 @@ "license": "MIT" }, "node_modules/jshint/node_modules/brace-expansion": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", - "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -12001,6 +10934,12 @@ "node": ">=6" } }, + "node_modules/jsonc-parser": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", + "license": "MIT" + }, "node_modules/jsonfile": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz", @@ -12153,9 +11092,9 @@ "license": "MIT" }, "node_modules/linkify-it": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.1.tgz", - "integrity": "sha512-wVoTjP4Q6R0NW5hiZkVJaFZPWgtXfoGF+6LucL3/FtiNjmcHhYjEr5f1Kqjirc1nBW07J/ZuRFumqr2oqccEWg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.2.tgz", + "integrity": "sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q==", "funding": [ { "type": "github", @@ -12171,21 +11110,6 @@ "uc.micro": "^2.0.0" } }, - "node_modules/loader-runner": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.2.tgz", - "integrity": "sha512-DFEqQ3ihfS9blba08cLfYf1NRAIEm+dDjic073DRDc3/JspI/8wYmtDsHwd3+4hwvdxSK7PGaElfTmm0awWJ4w==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=6.11.5" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, "node_modules/loader-utils": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", @@ -12323,9 +11247,9 @@ } }, "node_modules/lru-cache": { - "version": "11.5.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.1.tgz", - "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==", + "version": "11.5.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz", + "integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==", "license": "BlueOak-1.0.0", "engines": { "node": "20 || >=22" @@ -12359,10 +11283,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/make-fetch-happen": { - "version": "15.0.5", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.5.tgz", - "integrity": "sha512-uCbIa8jWWmQZt4dSnEStkVC6gdakiinAm4PiGsywIkguF0eWMdcjDz0ECYhUolFU3pFLOev9VNPCEygydXnddg==", + "version": "15.0.6", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.6.tgz", + "integrity": "sha512-Je0fLJ0F5atA7F+eIlLzk+Wkcl57JDf4kf+EW8xiP5E31xOQxkIxTbgf1Oi1Lw9tRI9UEMRdI5Vz2xTzoNU1Jw==", "license": "ISC", "dependencies": { "@gar/promise-retry": "^1.0.0", @@ -12383,9 +11316,9 @@ } }, "node_modules/markdown-it": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.2.0.tgz", - "integrity": "sha512-1TGiQiJVRQ3NPmZH6sx5Cfnmg6GQm9jvC1ch4TK511NjSJvjzKLzn5pPfZRNZkRPZP0HqCioSndqH8v2nRaWVQ==", + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.3.0.tgz", + "integrity": "sha512-RCEsPjR+sr0x+AuYp601tKTkgFG4YEPLCzHST3cQ/fhlJkqAkz1L2/Qbp1j9qw5SBwQHFBoW8+hoN5xssOF0Tw==", "funding": [ { "type": "github", @@ -12399,8 +11332,8 @@ "license": "MIT", "dependencies": { "argparse": "^2.0.1", - "entities": "^4.4.0", - "linkify-it": "^5.0.1", + "entities": "^4.5.0", + "linkify-it": "^5.0.2", "mdurl": "^2.0.0", "punycode.js": "^2.3.1", "uc.micro": "^2.1.0" @@ -12410,9 +11343,9 @@ } }, "node_modules/markdown-it-anchor": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-9.2.0.tgz", - "integrity": "sha512-sa2ErMQ6kKOA4l31gLGYliFQrMKkqSO0ZJgGhDHKijPf0pNFM9vghjAh3gn26pS4JDRs7Iwa9S36gxm3vgZTzg==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-9.2.1.tgz", + "integrity": "sha512-p6APiLJDFAW2GEvaavDvhIBn7jrX2jLv77NkBGgNacFTurbORYc4pyYySg/mI6mpR6cHQuAtzKtmqgQr4K8dsQ==", "license": "Unlicense", "peerDependencies": { "@types/markdown-it": "*", @@ -12420,9 +11353,9 @@ } }, "node_modules/markdown-it-emoji": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-3.0.0.tgz", - "integrity": "sha512-+rUD93bXHubA4arpEZO3q80so0qgoFJEKRkRbjKX8RTdca89v2kfyF+xR3i2sQTwql9tpPZPOQN5B+PunspXRg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-3.1.0.tgz", + "integrity": "sha512-NhmMEH2ywduD4Nty1E8uB5NqfLhAT1VR0dyvoJyStKOqCzbZmVdn/+8wj7zpDsb/fLBikpCPsWwxqKlvMmbz4g==", "license": "MIT" }, "node_modules/markdown-it-footnote": { @@ -12491,9 +11424,9 @@ } }, "node_modules/mdurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", - "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.1.0.tgz", + "integrity": "sha512-1+HBaOx0zi/dQWht8rNv9MYf9qqpqL/kxI0hXImU6Y547zM6Sni8BQibt7ifgMcYtQg41ao3Ivd6cnSM86inpg==", "license": "MIT" }, "node_modules/media-typer": { @@ -12532,26 +11465,26 @@ } }, "node_modules/mermaid": { - "version": "11.15.0", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.15.0.tgz", - "integrity": "sha512-pTMbcf3rWdtLiYGpmoTjHEpeY8seiy6sR+9nD7LOs8KfUbHE4lOUAprTRqRAcWSQ6MQpdX+YEsxShtGsINtPtw==", + "version": "11.16.0", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.16.0.tgz", + "integrity": "sha512-Zvm3kbstgdpvIJPPItlL7fppIZ3kibvc1oZIGxdvk9t6UFz6flv+Jw7FtRGKwfcI8OckmH04LqG6LlS6X4B1pA==", "license": "MIT", "dependencies": { - "@braintree/sanitize-url": "^7.1.1", + "@braintree/sanitize-url": "^7.1.2", "@iconify/utils": "^3.0.2", - "@mermaid-js/parser": "^1.1.1", + "@mermaid-js/parser": "^1.2.0", "@types/d3": "^7.4.3", "@upsetjs/venn.js": "^2.0.0", - "cytoscape": "^3.33.1", + "cytoscape": "^3.33.3", "cytoscape-cose-bilkent": "^4.1.0", "cytoscape-fcose": "^2.2.0", "d3": "^7.9.0", "d3-sankey": "^0.12.3", "dagre-d3-es": "7.0.14", - "dayjs": "^1.11.19", - "dompurify": "^3.3.1", + "dayjs": "^1.11.20", + "dompurify": "^3.3.3", "es-toolkit": "^1.45.1", - "katex": "^0.16.25", + "katex": "^0.16.45", "khroma": "^2.1.0", "marked": "^16.3.0", "roughjs": "^4.6.6", @@ -12710,6 +11643,68 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/minimizer-webpack-plugin": { + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/minimizer-webpack-plugin/-/minimizer-webpack-plugin-5.6.1.tgz", + "integrity": "sha512-DoeAZz8Q1C1znwsUzej1fdoi4jCf7/+Em27ouLqfK/+3m8G+D7yDhUwrc3CNhjSzGUN1kn7Iv4sWmjflQHenpw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.25", + "jest-worker": "^27.4.5", + "schema-utils": "^4.3.0", + "terser": "^5.31.1" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@minify-html/node": { + "optional": true + }, + "@swc/core": { + "optional": true + }, + "@swc/css": { + "optional": true + }, + "@swc/html": { + "optional": true + }, + "clean-css": { + "optional": true + }, + "cssnano": { + "optional": true + }, + "csso": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "html-minifier-terser": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "postcss": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, "node_modules/minipass": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", @@ -12749,9 +11744,9 @@ } }, "node_modules/minipass-fetch/node_modules/iconv-lite": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", - "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz", + "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==", "license": "MIT", "optional": true, "dependencies": { @@ -12789,6 +11784,12 @@ "node": ">=8" } }, + "node_modules/minipass-flush/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "license": "ISC" + }, "node_modules/minipass-json-stream": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz", @@ -12813,6 +11814,13 @@ "node": ">=8" } }, + "node_modules/minipass-json-stream/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, "node_modules/minipass-pipeline": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", @@ -12837,6 +11845,12 @@ "node": ">=8" } }, + "node_modules/minipass-pipeline/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "license": "ISC" + }, "node_modules/minipass-sized": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-2.0.0.tgz", @@ -12936,9 +11950,9 @@ "license": "MIT" }, "node_modules/mocha/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -13259,12 +12273,12 @@ } }, "node_modules/motion": { - "version": "12.42.0", - "resolved": "https://registry.npmjs.org/motion/-/motion-12.42.0.tgz", - "integrity": "sha512-Qhwvu9sVl5/URSq5CNzwMCpSKK8Uhnrwb6VO977kZyj/wOCS7mWebJUnBoHx5cZU1Zv8a9BD5CSICWKAlrLJgA==", + "version": "12.42.2", + "resolved": "https://registry.npmjs.org/motion/-/motion-12.42.2.tgz", + "integrity": "sha512-Atvv11yUKIid41cVrRBDVX5m8tF8kNpExRSlbpt6APClhDjtwQssgFHhQzejxw7/7YYbjHSPKBVbHo05BuJT5Q==", "license": "MIT", "dependencies": { - "framer-motion": "^12.42.0", + "framer-motion": "^12.42.2", "tslib": "^2.4.0" }, "peerDependencies": { @@ -13285,9 +12299,9 @@ } }, "node_modules/motion-dom": { - "version": "12.42.0", - "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.42.0.tgz", - "integrity": "sha512-M63h4n8R+quJdNhBwuLlgxM+OLYa9+I/T2pzDRboB9fLXRdbou+Gw7Zury+SkpaCyACP1JHSjHgZ1EgTkBr30w==", + "version": "12.42.2", + "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.42.2.tgz", + "integrity": "sha512-5gIMWLp/PycBtJRJWRgjxke5n8dlvkSn2DrYW+tr3XcqAZY1xZh6BJyooJXCM8wdfM7wfMjkBJNLge1CKPUIRA==", "license": "MIT", "dependencies": { "motion-utils": "^12.39.0" @@ -13322,9 +12336,9 @@ "license": "ISC" }, "node_modules/nanoid": { - "version": "3.3.12", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz", - "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==", + "version": "3.3.16", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz", + "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==", "dev": true, "funding": [ { @@ -13365,9 +12379,9 @@ "optional": true }, "node_modules/node-gyp": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.3.0.tgz", - "integrity": "sha512-QNcUWM+HgJplcPzBvFBZ9VXacyGZ4+VTOb80PwWR+TlVzoHbRKULNEzpRsnaoxG3Wzr7Qh7BYxGDU3CbKib2Yg==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.4.0.tgz", + "integrity": "sha512-OMcPNvqTCFUnNaBlmdgq+lfNqY7gTiSmNRDjY3uAXRyudeKZEZxu3CLtjMQrx4zZxCX2b/mpNqTtwuCJgXhHkw==", "license": "MIT", "dependencies": { "env-paths": "^2.2.0", @@ -13388,24 +12402,15 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/node-gyp/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/node-releases": { - "version": "2.0.44", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.44.tgz", - "integrity": "sha512-5WUyunoPMsvvEhS8AxHtRzP+oA8UCkJ7YRxatWKjngndhDGLiqEVAQKWjFAiAiuL8zMRGzGSJxFnLetoa43qGQ==", + "version": "2.0.51", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.51.tgz", + "integrity": "sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">=18" + } }, "node_modules/nopt": { "version": "9.0.0", @@ -13464,18 +12469,12 @@ "node": ">=10" } }, - "node_modules/normalize-package-data/node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "node_modules/normalize-package-data/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } + "license": "ISC" }, "node_modules/normalize-path": { "version": "3.0.0", @@ -13521,18 +12520,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/npm-install-checks/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/npm-normalize-package-bin": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-5.0.0.tgz", @@ -13557,18 +12544,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/npm-package-arg/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/npm-packlist": { "version": "10.0.4", "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-10.0.4.tgz", @@ -13597,18 +12572,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/npm-pick-manifest/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/npm-registry-fetch": { "version": "19.1.1", "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-19.1.1.tgz", @@ -13704,9 +12667,9 @@ "license": "ISC" }, "node_modules/obug": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.3.tgz", - "integrity": "sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.4.tgz", + "integrity": "sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==", "dev": true, "funding": [ "https://github.com/sponsors/sxzz", @@ -13862,9 +12825,9 @@ } }, "node_modules/p-map": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz", - "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.6.tgz", + "integrity": "sha512-I4Prw6ivkd6p8PiYR1tXASOAOBzIJwu0TB7fqaX0c/8c3QAehNYmX57EijyGGGBt3c/BIowGwV03RVBtXvHEVg==", "license": "MIT", "engines": { "node": ">=18" @@ -13899,16 +12862,26 @@ "node": ">=8" } }, + "node_modules/package-json/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/package-manager-detector": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.6.0.tgz", - "integrity": "sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.8.0.tgz", + "integrity": "sha512-yQA4H19AmPEoMUeavPMDIe1higySl/gH/yaQrkT/s07Qp+7pp2hYz30N3z2l5BkjVkF9Ow6o0wjJamm2y7Sn0A==", "license": "MIT" }, "node_modules/pacote": { - "version": "21.5.0", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-21.5.0.tgz", - "integrity": "sha512-VtZ0SB8mb5Tzw3dXDfVAIjhyVKUHZkS/ZH9/5mpKenwC9sFOXNI0JI7kEF7IMkwOnsWMFrvAZHzx1T5fmrp9FQ==", + "version": "21.5.1", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-21.5.1.tgz", + "integrity": "sha512-KvcJ9iy3crysCsgqc4+PknH/w6jkrp8JN36mpZBPwNaDRwTfMZD37YzRazNstiZUOhuF5pno9f78n9mEJBavwg==", "license": "ISC", "dependencies": { "@gar/promise-retry": "^1.0.0", @@ -13987,6 +12960,38 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/parse-json/node_modules/@babel/code-frame": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", + "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.29.7", + "js-tokens": "^4.0.0", + "picocolors": "^1.1.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/parse-json/node_modules/@babel/helper-validator-identifier": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/parse-json/node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, "node_modules/parse-json/node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -14115,9 +13120,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", - "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", + "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", "license": "MIT", "engines": { "node": ">=12" @@ -14246,9 +13251,9 @@ } }, "node_modules/postcss": { - "version": "8.5.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.14.tgz", - "integrity": "sha512-SoSL4+OSEtR99LHFZQiJLkT59C5B1amGO1NzTwj7TT1qCUgUO6hxOvzkOYxD+vMrXBM3XJIKzokoERdqQq/Zmg==", + "version": "8.5.23", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.23.tgz", + "integrity": "sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==", "dev": true, "funding": [ { @@ -14266,7 +13271,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.11", + "nanoid": "^3.3.16", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -14306,19 +13311,6 @@ } } }, - "node_modules/postcss-loader/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/postcss-modules-extract-imports": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz", @@ -14383,9 +13375,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz", - "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.4.tgz", + "integrity": "sha512-HeP7D2wyhkR+XaK6v4W8oRF62Dsz4flyuczALJp61GckGm42u1saSSJ/0auvcBqxs3jMRFEcPK34At/0JBKdOg==", "license": "MIT", "dependencies": { "cssesc": "^3.0.0", @@ -14413,9 +13405,9 @@ } }, "node_modules/prettier": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz", - "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==", + "version": "3.9.6", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.6.tgz", + "integrity": "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==", "dev": true, "license": "MIT", "bin": { @@ -14429,13 +13421,13 @@ } }, "node_modules/prettier-plugin-java": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/prettier-plugin-java/-/prettier-plugin-java-2.9.1.tgz", - "integrity": "sha512-qdvMRgSlx5li5fkbIQlMAUSJQn8rIwP2Ux0U1Xg8ganHMAK4UOUoOG00GeZfoLRllSgNt5V3dZOlwUXPLoamSQ==", + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/prettier-plugin-java/-/prettier-plugin-java-2.10.3.tgz", + "integrity": "sha512-/g52mTbsN2ee8JjLRpBWGGmcmRhdv2zRWyj4QbsL9CQ+nKR022GRJhebwEpRyaCc8hLV6aO3JPGNQyXp1DPrCA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "web-tree-sitter": "0.26.8" + "web-tree-sitter": "0.26.11" }, "peerDependencies": { "prettier": "^3.0.0" @@ -14887,9 +13879,9 @@ "license": "MIT" }, "node_modules/read-package-json/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -15274,9 +14266,9 @@ "license": "MIT" }, "node_modules/rimraf/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -15409,13 +14401,13 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.99.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.99.0.tgz", - "integrity": "sha512-kgW13M54DUB7IsIRM5LvJkNlpH+WhMpooUcaWGFARkF1Tc82v9mIWkCbCYf+MBvpIUBSeSOTilpZjEPr2VYE6Q==", + "version": "1.102.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.102.0.tgz", + "integrity": "sha512-NSOyTnaQF7rTAEOtI2fwb386vL+akyiQLBZu8Na7hXCb+umJy0GAqlcMIaqACZ6Z1VgTBS4K9PG6B3IdjHGJsw==", "dev": true, "license": "MIT", "dependencies": { - "chokidar": "^4.0.0", + "chokidar": "^5.0.0", "immutable": "^5.1.5", "source-map-js": ">=0.6.2 <2.0.0" }, @@ -15423,7 +14415,7 @@ "sass": "sass.js" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.19.0" }, "optionalDependencies": { "@parcel/watcher": "^2.4.1" @@ -15470,6 +14462,36 @@ } } }, + "node_modules/sass/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/sass/node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/sax": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz", @@ -15497,12 +14519,15 @@ } }, "node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", "license": "ISC", "bin": { "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/semver-diff": { @@ -15518,6 +14543,16 @@ "node": ">=8" } }, + "node_modules/semver-diff/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/send": { "version": "0.19.2", "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", @@ -15710,17 +14745,17 @@ "license": "ISC" }, "node_modules/sigstore": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-4.1.0.tgz", - "integrity": "sha512-/fUgUhYghuLzVT/gaJoeVehLCgZiUxPCPMcyVNY0lIf/cTCz58K/WTI7PefDarXxp9nUKpEwg1yyz3eSBMTtgA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-4.1.1.tgz", + "integrity": "sha512-endqECJkfhozrXMK5ngu/UAA0xVcVEFdnHJCElGaExypjW+HK5i6zu3NteLoaX/iFbRUbC3+DjttQs0GARr+5w==", "license": "Apache-2.0", "dependencies": { "@sigstore/bundle": "^4.0.0", - "@sigstore/core": "^3.1.0", + "@sigstore/core": "^3.2.1", "@sigstore/protobuf-specs": "^0.5.0", - "@sigstore/sign": "^4.1.0", - "@sigstore/tuf": "^4.0.1", - "@sigstore/verify": "^3.1.0" + "@sigstore/sign": "^4.1.1", + "@sigstore/tuf": "^4.0.2", + "@sigstore/verify": "^3.1.1" }, "engines": { "node": "^20.17.0 || >=22.9.0" @@ -15939,17 +14974,16 @@ } }, "node_modules/string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.2.tgz", + "integrity": "sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==", "license": "MIT", "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" + "get-east-asian-width": "^1.5.0", + "strip-ansi": "^7.1.2" }, "engines": { - "node": ">=18" + "node": ">=20" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -16064,9 +15098,9 @@ } }, "node_modules/systeminformation": { - "version": "5.31.6", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.31.6.tgz", - "integrity": "sha512-Uv2b2uGGM6ns+26czgW2cYRabYdnswM0ddSOOlryHOaelzsmDSet1iM/NT7VOYxW8x/BW+HkY+b1Ve2pLTSGSA==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.33.1.tgz", + "integrity": "sha512-DEN6ICHk3Tk0Uf/hrAHh7xlt7iL5CJFBtPZinA0H62DrGG/KPKqq/Nzj6lCXPS4Ay/sf/14zNnk9LpqKzBIc+w==", "license": "MIT", "os": [ "darwin", @@ -16082,7 +15116,7 @@ "systeminformation": "lib/cli.js" }, "engines": { - "node": ">=8.0.0" + "node": ">=10.0.0" }, "funding": { "type": "Buy me a coffee", @@ -16104,9 +15138,9 @@ } }, "node_modules/tar": { - "version": "7.5.16", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.16.tgz", - "integrity": "sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==", + "version": "7.5.22", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.22.tgz", + "integrity": "sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA==", "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", @@ -16151,15 +15185,6 @@ "node": ">= 6" } }, - "node_modules/tar/node_modules/yallist": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", - "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=18" - } - }, "node_modules/terminal": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/terminal/-/terminal-0.1.4.tgz", @@ -16168,90 +15193,28 @@ "dependencies": { "sprintf": ">= 0.1.1" }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/terser": { - "version": "5.47.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.47.1.tgz", - "integrity": "sha512-tPbLXTI6ohPASb/1YViL428oEHu6/qv1OxqYnfaonVCFHqx4+wCd95pHrQWsL5X4pl90CTyW9piSAsS2L0VoMw==", - "dev": true, - "license": "BSD-2-Clause", - "peer": true, - "dependencies": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.15.0", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/terser-webpack-plugin": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.6.0.tgz", - "integrity": "sha512-Eum+5ajkaOhf5KbM26osvv21kLD7BaGqQ1UA4Ami4arYwylmGUQTgHFpHDdmJod1q4QXa66p0to/FBKID+J1vA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.25", - "jest-worker": "^27.4.5", - "schema-utils": "^4.3.0", - "terser": "^5.31.1" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/terser": { + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.49.0.tgz", + "integrity": "sha512-SNiDnXyHSrxVcIOtVbULzcTmniUiwcV7Nwdyj1twVubeTmbjoa8p69KKDpfkdoOavuM4/GRm1+ykI8qqnavHoA==", + "dev": true, + "license": "BSD-2-Clause", + "peer": true, + "dependencies": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.15.0", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" }, - "peerDependencies": { - "webpack": "^5.1.0" + "bin": { + "terser": "bin/terser" }, - "peerDependenciesMeta": { - "@minify-html/node": { - "optional": true - }, - "@swc/core": { - "optional": true - }, - "@swc/css": { - "optional": true - }, - "@swc/html": { - "optional": true - }, - "clean-css": { - "optional": true - }, - "cssnano": { - "optional": true - }, - "csso": { - "optional": true - }, - "esbuild": { - "optional": true - }, - "html-minifier-terser": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "postcss": { - "optional": true - }, - "uglify-js": { - "optional": true - } + "engines": { + "node": ">=10" } }, "node_modules/terser/node_modules/commander": { @@ -16270,18 +15233,18 @@ "license": "MIT" }, "node_modules/tinyexec": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.1.2.tgz", - "integrity": "sha512-dAqSqE/RabpBKI8+h26GfLq6Vb3JVXs30XYQjdMjaj/c2tS8IYYMbIzP599KtRj7c57/wYApb3QjgRgXmrCukA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.2.4.tgz", + "integrity": "sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==", "license": "MIT", "engines": { "node": ">=18" } }, "node_modules/tinyglobby": { - "version": "0.2.16", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz", - "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==", + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", + "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", "license": "MIT", "dependencies": { "fdir": "^6.5.0", @@ -16366,46 +15329,37 @@ } }, "node_modules/ts-dedent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz", - "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.3.0.tgz", + "integrity": "sha512-JfJeIHke7y2egdGGgRAvpCwYFUsHlM2gPcrVOxFkznt/4uzQ7HFmvE63iFHVLBJNDuyDOQgijDK/tXH/f6Msjg==", "license": "MIT", "engines": { "node": ">=6.10" } }, "node_modules/ts-loader": { - "version": "9.5.7", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.7.tgz", - "integrity": "sha512-/ZNrKgA3K3PtpMYOC71EeMWIloGw3IYEa5/t1cyz2r5/PyUwTXGzYJvcD3kfUvmhlfpz1rhV8B2O6IVTQ0avsg==", + "version": "9.6.2", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.6.2.tgz", + "integrity": "sha512-R4iuczmtgxvtuI556s+hTZ6/7Ee03VCAk/l/M8LY1OAsUgB7YydsCxkgq9D9pKRaD7GJqUi2u8fp9zZP/ufjKA==", "dev": true, "license": "MIT", "dependencies": { "chalk": "^4.1.0", - "enhanced-resolve": "^5.0.0", - "micromatch": "^4.0.0", - "semver": "^7.3.4", + "picomatch": "^4.0.0", "source-map": "^0.7.4" }, "engines": { "node": ">=12.0.0" }, "peerDependencies": { + "loader-utils": "*", "typescript": "*", - "webpack": "^5.0.0" - } - }, - "node_modules/ts-loader/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" + "webpack": "^4.0.0 || ^5.0.0" }, - "engines": { - "node": ">=10" + "peerDependenciesMeta": { + "loader-utils": { + "optional": true + } } }, "node_modules/tslib": { @@ -16552,18 +15506,18 @@ "license": "MIT" }, "node_modules/undici": { - "version": "6.27.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.27.0.tgz", - "integrity": "sha512-YmfV3YnEDzXRC5lZ2jWtWWHKGUm1zIt8AhesR1tens+HTNv+YZlN/dp6G727LOvMJ8xjP9Be7Y2Sdr96LDm+pg==", + "version": "6.28.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.28.0.tgz", + "integrity": "sha512-LIY910g9TI13YS95lrMFrs8Rm/u/irgHeTWoKCoteeJ04CUJ92eEfj0rVn+7VKMPBpUPiUoBKfhNyLI23EE/KA==", "license": "MIT", "engines": { "node": ">=18.17" } }, "node_modules/undici-types": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz", - "integrity": "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz", + "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==", "dev": true, "license": "MIT", "peer": true @@ -16734,19 +15688,6 @@ "url": "https://github.com/yeoman/update-notifier?sponsor=1" } }, - "node_modules/update-notifier/node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -16797,9 +15738,9 @@ } }, "node_modules/uuid": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.0.tgz", - "integrity": "sha512-Qo+uWgilfSmAhXCMav1uYFynlQO7fMFiMVZsQqZRMIXp0O7rR7qjkj+cPvBHLgBqi960QCoo/PH2/6ZtVqKvrg==", + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.1.tgz", + "integrity": "sha512-6ZxzVpzDXDa3bJWaHilVayA+BH/1zmxCJoVgvmqJnid/gPoKHxUrS/aC/T6LGQtNHT+XHG9fXPJB4d+IrU30Ew==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" @@ -16896,29 +15837,84 @@ "dev": true, "license": "MIT" }, + "node_modules/vscode-css-languageservice": { + "version": "6.3.10", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.10.tgz", + "integrity": "sha512-eq5N9Er3fC4vA9zd9EFhyBG90wtCCuXgRSpAndaOgXMh1Wgep5lBgRIeDgjZBW9pa+332yC9+49cZMW8jcL3MA==", + "license": "MIT", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "vscode-languageserver-textdocument": "^1.0.12", + "vscode-languageserver-types": "3.17.5", + "vscode-uri": "^3.1.0" + } + }, + "node_modules/vscode-css-languageservice/node_modules/vscode-languageserver-types": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", + "license": "MIT" + }, + "node_modules/vscode-html-languageservice": { + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.6.2.tgz", + "integrity": "sha512-ulCrSnFnfQ16YzvwnYUgEbUEl/ZG7u2eV27YhvLObSHKkb8fw1Z9cgsnUwjTEeDIdJDoTDTDpxuhQwoenoLNMg==", + "license": "MIT", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "vscode-languageserver-textdocument": "^1.0.12", + "vscode-languageserver-types": "^3.17.5", + "vscode-uri": "^3.1.0" + } + }, + "node_modules/vscode-json-languageservice": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.7.2.tgz", + "integrity": "sha512-WtKRDtJfFEmLrgtu+ODexOHm/6/krRF0k6t+uvkKIKW1Jh9ZIyxZQwJJwB3qhrEgvAxa37zbUg+vn+UyUK/U2w==", + "license": "MIT", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "jsonc-parser": "^3.3.1", + "vscode-languageserver-textdocument": "^1.0.12", + "vscode-languageserver-types": "^3.17.5", + "vscode-uri": "^3.1.0" + } + }, "node_modules/vscode-jsonrpc": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", - "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.1.tgz", + "integrity": "sha512-rfuA6T75H6m5EkbhtEPzre9pT0HPcDI2MMy4+nPFIBks5J8JBAUHD4tRYSgaBOijIEC7SRkC1kKyXTLqbmh9jw==", "license": "MIT", "engines": { "node": ">=14.0.0" } }, "node_modules/vscode-languageserver-protocol": { - "version": "3.17.5", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", - "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==", + "version": "3.18.2", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.18.2.tgz", + "integrity": "sha512-XRyDbT0Pp3sSNti3JmxVEUMySWCSi1hhM+/KUlCy1hV1zmrqpM1OwO12EAki8blhmLuIMpaJrYbo0OzGVfK2Qg==", "license": "MIT", "dependencies": { - "vscode-jsonrpc": "8.2.0", - "vscode-languageserver-types": "3.17.5" + "vscode-jsonrpc": "9.0.1", + "vscode-languageserver-types": "3.18.0" } }, + "node_modules/vscode-languageserver-textdocument": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", + "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==", + "license": "MIT" + }, "node_modules/vscode-languageserver-types": { - "version": "3.17.5", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", - "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", + "version": "3.18.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.18.0.tgz", + "integrity": "sha512-8TsGPNMIMiiBdkORgRSvLjuiEIiAFtO+KssmYWxQ+uSVvlf7RjK8YKCOjPzZ+YA04jXEV7+7LvkSmHkhpNS99g==", + "license": "MIT" + }, + "node_modules/vscode-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz", + "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==", "license": "MIT" }, "node_modules/w3c-keyname": { @@ -16937,14 +15933,13 @@ } }, "node_modules/watchpack": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz", - "integrity": "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.2.tgz", + "integrity": "sha512-6i/00NBjP4yGPs+caKSyRfpTF/8Torsu0MOW3mMzIbhgISFder8i7xbqgHlLMwJrdiN8ndBV3UA1/AfzPSr+jg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" }, "engines": { @@ -16975,44 +15970,40 @@ } }, "node_modules/web-tree-sitter": { - "version": "0.26.8", - "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.26.8.tgz", - "integrity": "sha512-4sUwi7ZyOrIk5KLgYLkc2A/F0LFMQnBhfb+2Cdl7ik4ePJ6JD+fk4ofI2sA5eGawBKBaK4Vntt7Ww5KcEsay4A==", + "version": "0.26.11", + "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.26.11.tgz", + "integrity": "sha512-Q5Dm3YTIXSXuH6FxX6RuzX2Qwpc4DPGiYMU87Wg5Z8OIStiQFiUex4zMDc0vBTw78EphaYJacncJghCHzbZptg==", "dev": true, "license": "MIT" }, "node_modules/webpack": { - "version": "5.106.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.106.2.tgz", - "integrity": "sha512-wGN3qcrBQIFmQ/c0AiOAQBvrZ5lmY8vbbMv4Mxfgzqd/B6+9pXtLo73WuS1dSGXM5QYY3hZnIbvx+K1xxe6FyA==", + "version": "5.109.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.109.0.tgz", + "integrity": "sha512-vomrngskVVXEZF9sMZfYAd4pXZUnfaWdJGlF+BTNF+gJBCKYCQBnOeVPlrh39Ewl7nlCsirDplMy6o5g9xJHBg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", "@types/json-schema": "^7.0.15", "@webassemblyjs/ast": "^1.14.1", "@webassemblyjs/wasm-edit": "^1.14.1", "@webassemblyjs/wasm-parser": "^1.14.1", "acorn": "^8.16.0", - "acorn-import-phases": "^1.0.3", "browserslist": "^4.28.1", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.20.0", - "es-module-lexer": "^2.0.0", + "enhanced-resolve": "^5.24.2", + "es-module-lexer": "^2.1.0", "eslint-scope": "5.1.1", "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.2.11", - "loader-runner": "^4.3.1", "mime-db": "^1.54.0", + "minimizer-webpack-plugin": "^5.6.1", "neo-async": "^2.6.2", "schema-utils": "^4.3.3", "tapable": "^2.3.0", - "terser-webpack-plugin": "^5.3.17", - "watchpack": "^2.5.1", - "webpack-sources": "^3.3.4" + "watchpack": "^2.5.2", + "webpack-sources": "^3.5.1" }, "bin": { "webpack": "bin/webpack.js" @@ -17031,9 +16022,9 @@ } }, "node_modules/webpack-sources": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.4.1.tgz", - "integrity": "sha512-eACpxRN02yaawnt+uUNIF7Qje6A9zArxBbcAJjK1PK3S9Ycg5jIuJ8pW4q8EMnwNZCEGltcjkRx1QzOxOkKD8A==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.5.1.tgz", + "integrity": "sha512-jyuiGJdtvY434z5bUZrjz67v76/ePNvFZTp9Mdz29IlH4+GPsgyGjiv0fKI+M7BdkU6ADjulUcKAd3tUK3WlEw==", "dev": true, "license": "MIT", "peer": true, @@ -17286,6 +16277,23 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -17306,9 +16314,9 @@ } }, "node_modules/ws": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz", - "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==", + "version": "8.21.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.1.tgz", + "integrity": "sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==", "dev": true, "license": "MIT", "engines": { @@ -17379,21 +16387,24 @@ } }, "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } }, "node_modules/yargs": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", - "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", + "version": "18.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.1.0.tgz", + "integrity": "sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg==", "license": "MIT", "dependencies": { "cliui": "^9.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", - "string-width": "^7.2.0", + "string-width": "^8.2.1", "y18n": "^5.0.5", "yargs-parser": "^22.0.0" }, @@ -17617,9 +16628,9 @@ } }, "src/plugins/cordova-plugin-advanced-http/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -18348,19 +17359,6 @@ "node": ">= 6" } }, - "src/plugins/cordova-plugin-advanced-http/node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "src/plugins/cordova-plugin-advanced-http/node_modules/socks-proxy-agent": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", @@ -18469,6 +17467,13 @@ "node": ">= 8" } }, + "src/plugins/cordova-plugin-advanced-http/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, "src/plugins/cordova-plugin-buildinfo": { "version": "4.0.0", "dev": true, @@ -18570,66 +17575,11 @@ "dev": true, "license": "Apache-2.0" }, - "node_modules/vscode-css-languageservice": { - "version": "6.3.10", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.10.tgz", - "integrity": "sha512-eq5N9Er3fC4vA9zd9EFhyBG90wtCCuXgRSpAndaOgXMh1Wgep5lBgRIeDgjZBW9pa+332yC9+49cZMW8jcL3MA==", - "license": "MIT", - "dependencies": { - "@vscode/l10n": "^0.0.18", - "vscode-languageserver-textdocument": "^1.0.12", - "vscode-languageserver-types": "3.17.5", - "vscode-uri": "^3.1.0" - } - }, - "node_modules/@vscode/l10n": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", - "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==", - "license": "MIT" - }, - "node_modules/vscode-languageserver-textdocument": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", - "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==", - "license": "MIT" - }, - "node_modules/vscode-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz", - "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==", - "license": "MIT" - }, - "node_modules/vscode-html-languageservice": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.6.2.tgz", - "integrity": "sha512-ulCrSnFnfQ16YzvwnYUgEbUEl/ZG7u2eV27YhvLObSHKkb8fw1Z9cgsnUwjTEeDIdJDoTDTDpxuhQwoenoLNMg==", - "license": "MIT", - "dependencies": { - "@vscode/l10n": "^0.0.18", - "vscode-languageserver-textdocument": "^1.0.12", - "vscode-languageserver-types": "^3.17.5", - "vscode-uri": "^3.1.0" - } - }, - "node_modules/vscode-json-languageservice": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.7.2.tgz", - "integrity": "sha512-WtKRDtJfFEmLrgtu+ODexOHm/6/krRF0k6t+uvkKIKW1Jh9ZIyxZQwJJwB3qhrEgvAxa37zbUg+vn+UyUK/U2w==", - "license": "MIT", - "dependencies": { - "@vscode/l10n": "^0.0.18", - "jsonc-parser": "^3.3.1", - "vscode-languageserver-textdocument": "^1.0.12", - "vscode-languageserver-types": "^3.17.5", - "vscode-uri": "^3.1.0" - } - }, - "node_modules/jsonc-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", - "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", - "license": "MIT" + "src/plugins/webview": { + "name": "cordova-plugin-acode-webview", + "version": "1.0.0", + "dev": true, + "license": "Apache-2.0" } } } diff --git a/package.json b/package.json index 7ceabea901..34b717ccee 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,8 @@ "com.foxdebug.acode.rk.customtabs": {}, "cordova-plugin-system": {}, "cordova-plugin-crashhandler": {}, - "cordova-plugin-advanced-http": {} + "cordova-plugin-advanced-http": {}, + "cordova-plugin-acode-webview": {} }, "platforms": [ "android" @@ -84,6 +85,7 @@ "com.foxdebug.acode.rk.plugin.plugincontext": "file:src/plugins/pluginContext", "cordova-android": "^15.0.0", "cordova-clipboard": "^1.3.0", + "cordova-plugin-acode-webview": "file:src/plugins/webview", "cordova-plugin-advanced-http": "file:src/plugins/cordova-plugin-advanced-http", "cordova-plugin-browser": "file:src/plugins/browser", "cordova-plugin-buildinfo": "file:src/plugins/cordova-plugin-buildinfo", diff --git a/src/index.d.ts b/src/index.d.ts index 7f6cbaeb22..12e76f127f 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -8,7 +8,10 @@ declare const PLUGIN_DIR: string; declare const KEYBINDING_FILE: string; declare const ANDROID_SDK_INT: number; declare const DOES_SUPPORT_THEME: boolean; -declare const acode: object; +declare const acode: { + webview: AcodeWebViewAPI; + [key: string]: unknown; +}; interface Window { ASSETS_DIRECTORY: string; @@ -107,3 +110,65 @@ interface AcodeFile { declare global { var Executor: Executor | undefined; } + +interface WebViewOptions { + /** Title applied to the hosting activity in fullscreen mode. */ + title?: string; + /** + * "fullscreen" displays the WebView in its own activity, "hidden" runs it + * headless (never displayed). Defaults to "hidden". + */ + mode?: "fullscreen" | "hidden"; + /** + * Allow in-WebView navigation. Defaults to true. Only http(s) targets + * ever load; other schemes are always blocked for isolation. + */ + allowNavigation?: boolean; + /** + * Ask the user with a confirmation dialog before downloading files via + * the system DownloadManager. Defaults to false. + */ + allowDownloads?: boolean; + /** + * Show immediately after creation. Defaults to true. Only meaningful for + * fullscreen mode: when false, the activity launch is deferred until + * show() is called. + */ + visible?: boolean; +} + +interface AcodeWebView { + readonly id: string; + readonly options: WebViewOptions; + /** Load an http(s) URL. Other schemes are rejected. */ + loadURL(url: string): Promise; + loadHTML(html: string): Promise; + evaluate(js: string): Promise; + onMessage(callback: (message: unknown) => void): void; + offMessage(callback: (message: unknown) => void): void; + /** + * Subscribe to lifecycle events: "pageFinished", "titleChanged" and + * "closed" (fullscreen closed by the user or the system). After "closed" + * the instance is destroyed and cannot be reused. + */ + on(event: string, callback: (event: string, data?: unknown) => void): void; + off(event: string, callback: (event: string, data?: unknown) => void): void; + postMessage(message: unknown): Promise; + /** + * Show the WebView. Only fullscreen instances can be shown; rejects for + * "hidden" mode. + */ + show(): Promise; + /** + * Hide the WebView. Fullscreen instances are moved to the background; + * show() brings the same WebView back with its page state intact. + * No-op for "hidden" mode. + */ + hide(): Promise; + reload(): Promise; + destroy(): Promise; +} + +interface AcodeWebViewAPI { + create(options?: WebViewOptions): Promise; +} diff --git a/src/lib/acode.js b/src/lib/acode.js index 81c82f08ab..3e0ecf694b 100644 --- a/src/lib/acode.js +++ b/src/lib/acode.js @@ -74,6 +74,7 @@ import helpers from "utils/helpers"; import KeyboardEvent from "utils/keyboardEvent"; import Url from "utils/Url"; import config from "./config"; +import webview from "./webview"; class Acode { #modules = {}; @@ -396,6 +397,7 @@ class Acode { this.define("selectionMenu", selectionMenu); this.define("sidebarApps", sidebarAppsModule); this.define("terminal", terminalModule); + this.define("webview", webview); this.define("codemirror", codemirrorModule); this.define("@codemirror/autocomplete", cmAutocomplete); this.define("@codemirror/commands", cmCommands); diff --git a/src/lib/webview.js b/src/lib/webview.js new file mode 100644 index 0000000000..26a3bb7c35 --- /dev/null +++ b/src/lib/webview.js @@ -0,0 +1,166 @@ +import nativeBridge from "../plugins/webview/www/webview"; + +let initialized = false; +const instances = new Map(); + +function ensureInit() { + if (!initialized) { + nativeBridge.setMessageCallback((payload) => { + const { id, message, event, data } = payload; + const instance = instances.get(id); + if (!instance) return; + + if (event) { + // Iterate a copy so callbacks can unsubscribe during dispatch. + for (const entry of instance._eventCallbacks.slice()) { + if (entry.event === event) { + try { + entry.callback(event, data); + } catch (e) { + console.error("WebView event callback error:", e); + } + } + } + + // A fullscreen WebView closed by the user (or by hide()) is + // gone natively; mark it destroyed so later calls fail fast + // and its listeners can be garbage collected. + if (event === "closed") { + instance._destroyed = true; + instances.delete(id); + instance._messageCallbacks = []; + instance._eventCallbacks = []; + } + return; + } + + if (message !== undefined) { + let parsed = message; + try { + parsed = JSON.parse(message); + } catch (_) {} + for (const cb of instance._messageCallbacks.slice()) { + try { + cb(parsed); + } catch (e) { + console.error("WebView message callback error:", e); + } + } + } + }); + initialized = true; + } +} + +class WebView { + constructor(id, options = {}) { + this.id = id; + this.options = options; + this._messageCallbacks = []; + this._eventCallbacks = []; + this._destroyed = false; + + instances.set(id, this); + } + + async loadURL(url) { + this._checkDestroyed(); + await nativeBridge.loadURL(this.id, url); + } + + async loadHTML(html) { + this._checkDestroyed(); + await nativeBridge.loadHTML(this.id, html); + } + + async evaluate(js) { + this._checkDestroyed(); + return await nativeBridge.evaluate(this.id, js); + } + + onMessage(callback) { + this._checkDestroyed(); + if (typeof callback === "function") { + this._messageCallbacks.push(callback); + } + } + + offMessage(callback) { + this._messageCallbacks = this._messageCallbacks.filter( + (cb) => cb !== callback, + ); + } + + on(event, callback) { + this._checkDestroyed(); + if (typeof callback === "function") { + this._eventCallbacks.push({ event, callback }); + } + } + + off(event, callback) { + this._eventCallbacks = this._eventCallbacks.filter( + (entry) => !(entry.event === event && entry.callback === callback), + ); + } + + async postMessage(message) { + this._checkDestroyed(); + await nativeBridge.postMessage(this.id, message); + } + + async show() { + this._checkDestroyed(); + await nativeBridge.show(this.id); + } + + async hide() { + this._checkDestroyed(); + await nativeBridge.hide(this.id); + } + + async reload() { + this._checkDestroyed(); + await nativeBridge.reload(this.id); + } + + async destroy() { + this._checkDestroyed(); + this._destroyed = true; + await nativeBridge.destroy(this.id); + instances.delete(this.id); + this._messageCallbacks = []; + this._eventCallbacks = []; + } + + _checkDestroyed() { + if (this._destroyed) { + throw new Error("WebView has been destroyed"); + } + } +} + +const webviewAPI = { + async create(options = {}) { + ensureInit(); + + const mode = options.mode || "hidden"; + if (mode !== "fullscreen" && mode !== "hidden") { + throw new Error( + `Unsupported WebView mode: "${mode}". Use "fullscreen" or "hidden".`, + ); + } + + const id = await nativeBridge.create({ + title: options.title || "", + mode, + allowNavigation: options.allowNavigation !== false, + allowDownloads: options.allowDownloads === true, + visible: options.visible !== false, + }); + + return new WebView(id, options); + }, +}; + +export default webviewAPI; diff --git a/src/plugins/webview/package.json b/src/plugins/webview/package.json new file mode 100644 index 0000000000..673be361cb --- /dev/null +++ b/src/plugins/webview/package.json @@ -0,0 +1,11 @@ +{ + "name": "cordova-plugin-acode-webview", + "version": "1.0.0", + "description": "Acode WebView Plugin API", + "main": "", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "Apache-2.0" +} diff --git a/src/plugins/webview/plugin.xml b/src/plugins/webview/plugin.xml new file mode 100644 index 0000000000..c7a6ff773d --- /dev/null +++ b/src/plugins/webview/plugin.xml @@ -0,0 +1,26 @@ + + + cordova-plugin-acode-webview + Acode WebView Plugin API - Create and manage isolated WebView instances + Apache 2.0 + + + + + + + + + + + + + + + + + + + + diff --git a/src/plugins/webview/src/android/com/foxdebug/webview/WebViewActivity.java b/src/plugins/webview/src/android/com/foxdebug/webview/WebViewActivity.java new file mode 100644 index 0000000000..6090979a7d --- /dev/null +++ b/src/plugins/webview/src/android/com/foxdebug/webview/WebViewActivity.java @@ -0,0 +1,93 @@ +package com.foxdebug.webview; + +import android.app.Activity; +import android.os.Build; +import android.os.Bundle; +import android.view.ViewGroup; +import android.webkit.WebView; +import android.widget.FrameLayout; + +public class WebViewActivity extends Activity { + + private WebView webView; + private String webviewId; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + webviewId = getIntent().getStringExtra("webviewId"); + + // The plugin registers itself in pluginInitialize(), so the singleton is + // always available while the app is alive. Previously this read a static + // field that was never set, which made every fullscreen WebView close + // instantly because the instance lookup returned null. + WebViewPlugin plugin = WebViewPlugin.getInstance(); + WebViewInstance instance = plugin != null ? plugin.getInstance(webviewId) : null; + if (instance == null) { + finish(); + return; + } + + instance.createWebView(this); + webView = instance.getWebView(); + if (webView == null) { + finish(); + return; + } + instance.setHostingActivity(this); + + String title = instance.getTitle(); + if (title != null && !title.isEmpty()) { + setTitle(title); + } + + if (webView.getParent() != null) { + ((ViewGroup) webView.getParent()).removeView(webView); + } + FrameLayout container = new FrameLayout(this); + // Edge-to-edge is enforced on newer Android versions, so pad the content + // out from under the status and navigation bars. + WebViewInstance.applySystemBarInsets(container); + container.addView(webView, new FrameLayout.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT + )); + setContentView(container); + + if (Build.VERSION.SDK_INT >= 30) { + getWindow().setDecorFitsSystemWindows(false); + } + } + + @Override + public void onBackPressed() { + if (webView != null && webView.canGoBack()) { + webView.goBack(); + } else { + finish(); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + + WebViewPlugin plugin = WebViewPlugin.getInstance(); + if (plugin != null && webviewId != null) { + WebViewInstance instance = plugin.getInstance(webviewId); + if (instance != null) { + instance.clearHostingActivity(this); + // Actually destroy the WebView instead of leaking it, then drop the + // instance so later calls fail instead of touching a dead WebView. + // destroy() is idempotent, so this is safe when the JS side already + // called destroy() and finishing this activity is what tore us down. + instance.destroy(); + plugin.removeInstance(webviewId); + } + plugin.sendEventToCordova(webviewId, "closed", null); + } + + webView = null; + } +} diff --git a/src/plugins/webview/src/android/com/foxdebug/webview/WebViewInstance.java b/src/plugins/webview/src/android/com/foxdebug/webview/WebViewInstance.java new file mode 100644 index 0000000000..72ecefc67c --- /dev/null +++ b/src/plugins/webview/src/android/com/foxdebug/webview/WebViewInstance.java @@ -0,0 +1,589 @@ +package com.foxdebug.webview; + +import android.app.Activity; +import android.app.AlertDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.graphics.Bitmap; +import android.graphics.Insets; +import android.net.Uri; +import android.os.Build; +import android.os.Handler; +import android.os.Looper; +import android.util.Log; +import android.view.View; +import android.view.ViewGroup; +import android.view.WindowInsets; +import android.webkit.DownloadListener; +import android.webkit.JavascriptInterface; +import android.webkit.URLUtil; +import android.webkit.ValueCallback; +import android.webkit.WebChromeClient; +import android.webkit.WebResourceRequest; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewClient; +import android.widget.Toast; +import java.util.Locale; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.apache.cordova.CallbackContext; +import org.json.JSONException; +import org.json.JSONObject; +import org.json.JSONTokener; + +public class WebViewInstance { + + private static final String TAG = "WebViewInstance"; + + /** + * Page-side messaging bridge. Injected on page started (best effort, runs + * before page scripts in most cases) and again on page finished (guaranteed). + * It is idempotent and non-destructive: the guard keeps callbacks registered + * by the page between the two injections intact. + */ + private static final String BRIDGE_JS = + "(function(){" + + "if(window.webview&&window.webview.__acodeBridge){return;}" + + "var callbacks=[];" + + "window.webview={" + + "__acodeBridge:true," + + "onMessage:function(cb){if(typeof cb==='function'){callbacks.push(cb);}}," + + "offMessage:function(cb){callbacks=callbacks.filter(function(c){return c!==cb;});}," + + "postMessage:function(msg){" + + "var data=(typeof msg==='string')?msg:JSON.stringify(msg);" + + "window.AcodeWebViewNative.postMessage(String(data));" + + "}," + + "_dispatch:function(msg){" + + "callbacks.slice().forEach(function(cb){try{cb(msg);}catch(e){console.error(e);}});" + + "}" + + "};" + + "})();"; + + final String id; + final String mode; + final String title; + final boolean allowNavigation; + final boolean allowDownloads; + final WebViewPlugin plugin; + + private WebView webView; + /** The activity hosting this instance in fullscreen mode, while alive. */ + private WebViewActivity hostingActivity = null; + private boolean isDestroyed = false; + /** Content requested before the fullscreen WebView exists yet. */ + private String pendingUrl = null; + private String pendingHtml = null; + + WebViewInstance( + String id, String mode, String title, + boolean allowNavigation, boolean allowDownloads, + WebViewPlugin plugin + ) { + this.id = id; + this.mode = mode; + this.title = title; + this.allowNavigation = allowNavigation; + this.allowDownloads = allowDownloads; + this.plugin = plugin; + } + + public WebView getWebView() { + return webView; + } + + String getTitle() { + return title; + } + + boolean isFullscreen() { + return "fullscreen".equals(mode); + } + + WebViewActivity getHostingActivity() { + return hostingActivity; + } + + void setHostingActivity(WebViewActivity activity) { + hostingActivity = activity; + } + + void clearHostingActivity(WebViewActivity activity) { + if (hostingActivity == activity) { + hostingActivity = null; + } + } + + void createWebView(Activity activity) { + // Idempotent: a recreated hosting activity reuses the existing WebView + // (and its page state) instead of leaking one instance per recreation. + if (webView != null) return; + webView = new WebView(activity); + + WebSettings settings = webView.getSettings(); + settings.setJavaScriptEnabled(true); + settings.setDomStorageEnabled(true); + // Isolation: hosted content must not reach app/device data. File and + // content scheme access stay disabled, and loadURL()/navigation below + // only allow http(s), so these cannot be bypassed with a crafted URL. + settings.setAllowFileAccess(false); + settings.setAllowContentAccess(false); + setFileUrlAccessFlags(settings); + settings.setDisplayZoomControls(false); + settings.setLoadWithOverviewMode(true); + settings.setUseWideViewPort(true); + + webView.setWebViewClient(new InstanceWebViewClient()); + webView.setWebChromeClient(new InstanceWebChromeClient()); + webView.setFocusable(true); + webView.setFocusableInTouchMode(true); + + webView.addJavascriptInterface(new JsBridge(), "AcodeWebViewNative"); + + if (allowDownloads) { + webView.setDownloadListener(new InstanceDownloadListener(activity)); + } + + injectBridge(webView); + + // Apply content requested while the WebView did not exist yet + // (fullscreen instances are created lazily by WebViewActivity). + if (pendingUrl != null) { + webView.loadUrl(pendingUrl); + pendingUrl = null; + pendingHtml = null; + } else if (pendingHtml != null) { + webView.loadDataWithBaseURL(null, pendingHtml, "text/html", "UTF-8", null); + pendingHtml = null; + } + } + + @SuppressWarnings("deprecation") + private static void setFileUrlAccessFlags(WebSettings settings) { + settings.setAllowFileAccessFromFileURLs(false); + settings.setAllowUniversalAccessFromFileURLs(false); + } + + private static void injectBridge(WebView view) { + view.evaluateJavascript(BRIDGE_JS, null); + } + + /** + * Pads the view so content stays clear of the status and navigation bars. + * Required on API 35+ where edge-to-edge is enforced for the app; on older + * versions the window usually consumes the insets first, making the padding + * zero and this a no-op. + */ + @SuppressWarnings("deprecation") + static void applySystemBarInsets(final View view) { + view.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() { + @Override + public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) { + int left, top, right, bottom; + if (Build.VERSION.SDK_INT >= 30) { + Insets bars = insets.getInsets(WindowInsets.Type.systemBars()); + left = bars.left; + top = bars.top; + right = bars.right; + bottom = bars.bottom; + } else { + left = insets.getSystemWindowInsetLeft(); + top = insets.getSystemWindowInsetTop(); + right = insets.getSystemWindowInsetRight(); + bottom = insets.getSystemWindowInsetBottom(); + } + v.setPadding(left, top, right, bottom); + return insets; + } + }); + } + + private static final Pattern SCHEME_PATTERN = + Pattern.compile("^([a-zA-Z][a-zA-Z0-9+\\-.]*)://"); + + /** + * Allows only http and https URLs, so hosted pages can never reach local + * files, app content providers or execute javascript: URLs. Input without + * a "scheme://" prefix ("example.com", "localhost:8080/page") is treated + * as a host and loaded over https; anything that is not clearly a URL + * degrades into a harmless failed https load. + */ + private static String sanitizeUrl(String url) { + if (url == null) return null; + String trimmed = url.trim(); + if (trimmed.isEmpty()) return null; + Matcher matcher = SCHEME_PATTERN.matcher(trimmed); + if (matcher.find()) { + String scheme = matcher.group(1); + if (scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https")) { + return trimmed; + } + return null; // file://, content://, intent://, etc. + } + return "https://" + trimmed; + } + + void loadURL(String url, final CallbackContext callbackContext) { + if (isDestroyed) { + callbackContext.error("WebView has been destroyed"); + return; + } + + final String safeUrl = sanitizeUrl(url); + if (safeUrl == null) { + callbackContext.error("Blocked URL: only http:// and https:// URLs are allowed"); + return; + } + + // Fullscreen instances create their WebView lazily in WebViewActivity. + if (webView == null) { + pendingUrl = safeUrl; + pendingHtml = null; + callbackContext.success(); + return; + } + + runOnUiThread(new Runnable() { + @Override + public void run() { + webView.loadUrl(safeUrl); + callbackContext.success(); + } + }); + } + + void loadHTML(final String html, final CallbackContext callbackContext) { + if (isDestroyed) { + callbackContext.error("WebView has been destroyed"); + return; + } + + if (webView == null) { + pendingHtml = html; + pendingUrl = null; + callbackContext.success(); + return; + } + + runOnUiThread(new Runnable() { + @Override + public void run() { + webView.loadDataWithBaseURL(null, html, "text/html", "UTF-8", null); + callbackContext.success(); + } + }); + } + + void evaluate(String js, final CallbackContext callbackContext) { + if (isDestroyed) { + callbackContext.error("WebView has been destroyed"); + return; + } + if (webView == null) { + callbackContext.error("WebView is not ready"); + return; + } + runOnUiThread(new Runnable() { + @Override + public void run() { + webView.evaluateJavascript(js, new ValueCallback() { + @Override + public void onReceiveValue(String value) { + callbackContext.success(decodeJsResult(value)); + } + }); + } + }); + } + + /** + * evaluateJavascript() delivers the result as a JSON-encoded string. + * Decode it properly instead of stripping quotes by hand so escapes + * (newlines, unicode, quotes) survive the round trip. + */ + private static String decodeJsResult(String value) { + if (value == null) return null; + try { + Object parsed = new JSONTokener(value).nextValue(); + if (parsed == JSONObject.NULL) return null; + return String.valueOf(parsed); + } catch (JSONException e) { + return value; + } + } + + void postMessage(String message, final CallbackContext callbackContext) { + if (isDestroyed) { + callbackContext.error("WebView has been destroyed"); + return; + } + if (webView == null) { + callbackContext.error("WebView is not ready"); + return; + } + + // JSONObject.quote() produces a safe JS string literal for any input, + // so a malicious or sloppy payload cannot break out of the string and + // inject code into the page context. The page receives a parsed value + // for JSON payloads and the raw string otherwise. + final String js = + "(function(){" + + "var raw=" + JSONObject.quote(message) + ";" + + "var msg;try{msg=JSON.parse(raw);}catch(e){msg=raw;}" + + "if(window.webview&&window.webview._dispatch){window.webview._dispatch(msg);}" + + "})();"; + + runOnUiThread(new Runnable() { + @Override + public void run() { + webView.evaluateJavascript(js, null); + callbackContext.success(); + } + }); + } + + void show(final CallbackContext callbackContext) { + if (isDestroyed) { + callbackContext.error("WebView has been destroyed"); + return; + } + if (!isFullscreen()) { + callbackContext.error("Hidden WebViews cannot be shown; use mode \"fullscreen\" to display content"); + return; + } + // Launches the hosting activity, or brings it back to the front if it + // is still alive (e.g. after hide() backgrounded it). + runOnUiThread(new Runnable() { + @Override + public void run() { + plugin.showFullscreenActivity(id); + } + }); + callbackContext.success(); + } + + void hide(final CallbackContext callbackContext) { + if (isDestroyed) { + callbackContext.error("WebView has been destroyed"); + return; + } + if (!isFullscreen()) { + // A hidden (headless) WebView is already hidden. + callbackContext.success(); + return; + } + hideFullscreen(callbackContext); + } + + /** + * Hiding a fullscreen WebView moves its hosting activity (and its task) + * to the background. Nothing is destroyed, so show() brings the same + * WebView back with its page state intact. The instance is only destroyed + * when the user actually closes it (back button/task removal) or when + * destroy() is called. + */ + private void hideFullscreen(CallbackContext callbackContext) { + if (isDestroyed) { + callbackContext.error("WebView has been destroyed"); + return; + } + runOnUiThread(new Runnable() { + @Override + public void run() { + if (hostingActivity != null + && !hostingActivity.isFinishing() + && !hostingActivity.isDestroyed()) { + hostingActivity.moveTaskToBack(true); + } + } + }); + callbackContext.success(); + } + + void reload(final CallbackContext callbackContext) { + if (isDestroyed) { + callbackContext.error("WebView has been destroyed"); + return; + } + if (webView == null) { + callbackContext.error("WebView is not ready"); + return; + } + runOnUiThread(new Runnable() { + @Override + public void run() { + webView.reload(); + callbackContext.success(); + } + }); + } + + void destroy() { + if (isDestroyed) return; + isDestroyed = true; + + // Finish the hosting fullscreen activity, if any. Its onDestroy() calls + // destroy() again, which is a no-op now that isDestroyed is set. + WebViewActivity hosting = hostingActivity; + hostingActivity = null; + if (hosting != null && !hosting.isFinishing()) { + hosting.finish(); + } + + runOnUiThread(new Runnable() { + @Override + public void run() { + if (webView != null) { + if (webView.getParent() != null) { + ((ViewGroup) webView.getParent()).removeView(webView); + } + webView.removeJavascriptInterface("AcodeWebViewNative"); + webView.setDownloadListener(null); + webView.setWebChromeClient(null); + webView.setWebViewClient(null); + webView.loadUrl("about:blank"); + webView.destroy(); + } + webView = null; + } + }); + } + + void onPageFinished(WebView view) { + // Navigation replaced the page's JS context, so the bridge injected into + // the previous document is gone. Re-inject (no-op if already present). + injectBridge(view); + try { + JSONObject data = new JSONObject(); + String url = view.getUrl(); + String pageTitle = view.getTitle(); + data.put("url", url != null ? url : ""); + data.put("title", pageTitle != null ? pageTitle : ""); + plugin.sendEventToCordova(id, "pageFinished", data); + } catch (JSONException e) { + Log.e(TAG, "onPageFinished error", e); + } + } + + private static void runOnUiThread(Runnable runnable) { + new Handler(Looper.getMainLooper()).post(runnable); + } + + private class InstanceWebViewClient extends WebViewClient { + @Override + public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) { + return shouldBlockNavigation(request.getUrl()); + } + + @SuppressWarnings("deprecation") + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + return shouldBlockNavigation(Uri.parse(url)); + } + + /** + * Blocks all navigation when allowNavigation is false. Even when it is + * true, only http(s) targets may load inside the WebView; other schemes + * (file:, content:, intent:, javascript:, tel:, ...) are blocked so + * hostile pages cannot escape the sandbox or launch other apps. + */ + private boolean shouldBlockNavigation(Uri uri) { + if (!allowNavigation) return true; + String scheme = uri.getScheme(); + return scheme == null + || !(scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https")); + } + + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + super.onPageStarted(view, url, favicon); + // Best effort: gets the bridge in before the page's own scripts run. + injectBridge(view); + } + + @Override + public void onPageFinished(WebView view, String url) { + super.onPageFinished(view, url); + WebViewInstance.this.onPageFinished(view); + } + } + + private class InstanceWebChromeClient extends WebChromeClient { + @Override + public void onReceivedTitle(WebView view, String pageTitle) { + super.onReceivedTitle(view, pageTitle); + try { + JSONObject data = new JSONObject(); + data.put("title", pageTitle != null ? pageTitle : ""); + plugin.sendEventToCordova(id, "titleChanged", data); + } catch (JSONException e) { + Log.e(TAG, "onReceivedTitle error", e); + } + } + } + + private class InstanceDownloadListener implements DownloadListener { + private final Context context; + + InstanceDownloadListener(Context context) { + this.context = context; + } + + @Override + public void onDownloadStart(final String url, final String userAgent, String contentDisposition, final String mimeType, long contentLength) { + if (isDestroyed) return; + if (context instanceof Activity && ((Activity) context).isFinishing()) return; + + // DownloadManager can only fetch http(s) URLs. + String scheme = Uri.parse(url).getScheme(); + if (scheme == null + || !(scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https"))) { + runOnUiThread(new Runnable() { + @Override + public void run() { + Toast.makeText(context, "This download type is not supported", Toast.LENGTH_SHORT).show(); + } + }); + return; + } + + final String fileName = URLUtil.guessFileName(url, contentDisposition, mimeType); + String size = formatSize(contentLength); + final String message = size.isEmpty() + ? "Do you want to download \"" + fileName + "\"?" + : "Do you want to download \"" + fileName + "\" (" + size + ")?"; + + runOnUiThread(new Runnable() { + @Override + public void run() { + new AlertDialog.Builder(context) + .setTitle("Download file") + .setMessage(message) + .setPositiveButton("Download", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + plugin.download(url, userAgent, mimeType, fileName); + } + }) + .setNegativeButton("Cancel", null) + .show(); + } + }); + } + } + + private static String formatSize(long bytes) { + if (bytes <= 0) return ""; + if (bytes < 1024) return bytes + " B"; + if (bytes < 1024 * 1024) return String.format(Locale.US, "%.1f KB", bytes / 1024.0); + if (bytes < 1024L * 1024 * 1024) return String.format(Locale.US, "%.1f MB", bytes / (1024.0 * 1024)); + return String.format(Locale.US, "%.1f GB", bytes / (1024.0 * 1024 * 1024)); + } + + public class JsBridge { + @JavascriptInterface + public void postMessage(String message) { + plugin.sendMessageToCordova(id, message); + } + } +} diff --git a/src/plugins/webview/src/android/com/foxdebug/webview/WebViewPlugin.java b/src/plugins/webview/src/android/com/foxdebug/webview/WebViewPlugin.java new file mode 100644 index 0000000000..db6adb85c6 --- /dev/null +++ b/src/plugins/webview/src/android/com/foxdebug/webview/WebViewPlugin.java @@ -0,0 +1,291 @@ +package com.foxdebug.webview; + +import android.app.DownloadManager; +import android.content.Context; +import android.content.Intent; +import android.net.Uri; +import android.os.Environment; +import android.util.Log; +import android.webkit.CookieManager; +import android.widget.Toast; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.UUID; +import org.apache.cordova.CallbackContext; +import org.apache.cordova.CordovaPlugin; +import org.apache.cordova.PluginResult; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +public class WebViewPlugin extends CordovaPlugin { + + private static final String TAG = "AcodeWebView"; + private static WebViewPlugin instance; + + private final HashMap instances = new HashMap<>(); + private CallbackContext messageCallback; + + @Override + protected void pluginInitialize() { + instance = this; + } + + public static WebViewPlugin getInstance() { + return instance; + } + + @Override + public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException { + try { + switch (action) { + case "setMessageCallback": + this.messageCallback = callbackContext; + PluginResult keepResult = new PluginResult(PluginResult.Status.NO_RESULT); + keepResult.setKeepCallback(true); + callbackContext.sendPluginResult(keepResult); + return true; + case "create": + create(args.getJSONObject(0), callbackContext); + return true; + case "loadURL": + loadURL(args.getString(0), args.getString(1), callbackContext); + return true; + case "loadHTML": + loadHTML(args.getString(0), args.getString(1), callbackContext); + return true; + case "evaluate": + evaluate(args.getString(0), args.getString(1), callbackContext); + return true; + case "postMessage": + postMessage(args.getString(0), args.getString(1), callbackContext); + return true; + case "show": + show(args.getString(0), callbackContext); + return true; + case "hide": + hide(args.getString(0), callbackContext); + return true; + case "reload": + reload(args.getString(0), callbackContext); + return true; + case "destroy": + destroy(args.getString(0), callbackContext); + return true; + default: + callbackContext.error("Unknown action: " + action); + return true; + } + } catch (Exception e) { + Log.e(TAG, "Error: " + action, e); + callbackContext.error(e.getMessage()); + } + return true; + } + + private String generateId() { + return "wv_" + UUID.randomUUID().toString().replace("-", "").substring(0, 12); + } + + private void create(JSONObject options, final CallbackContext callbackContext) throws JSONException { + final String id = generateId(); + final String mode = options.optString("mode", "hidden"); + final String title = options.optString("title", ""); + final boolean allowNavigation = options.optBoolean("allowNavigation", true); + final boolean allowDownloads = options.optBoolean("allowDownloads", false); + final boolean visible = options.optBoolean("visible", true); + + cordova.getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + WebViewInstance instance = new WebViewInstance( + id, mode, title, + allowNavigation, allowDownloads, + WebViewPlugin.this + ); + instances.put(id, instance); + + try { + if (instance.isFullscreen()) { + // The WebView is created lazily by WebViewActivity. When the + // caller asked for an initially hidden instance, the launch is + // deferred until show() is called. + if (visible) { + showFullscreenActivity(id); + } + } else { + // "hidden" mode: a headless WebView that is never displayed. + instance.createWebView(cordova.getActivity()); + } + callbackContext.success(id); + } catch (Exception e) { + instances.remove(id); + try { + instance.destroy(); + } catch (Exception ignored) {} + Log.e(TAG, "Create error: " + e.getMessage(), e); + callbackContext.error(e.getMessage()); + } + } + }); + } + + /** + * Shows a fullscreen WebView: launches its hosting activity, or brings the + * existing one back to the front if it is still alive (e.g. after hide() + * backgrounded it), preserving the WebView's page state. + */ + void showFullscreenActivity(String id) { + Intent intent = new Intent(cordova.getActivity(), WebViewActivity.class); + intent.putExtra("webviewId", id); + WebViewInstance target = getInstance(id); + WebViewActivity hosting = target != null ? target.getHostingActivity() : null; + if (hosting != null && !hosting.isFinishing() && !hosting.isDestroyed()) { + intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); + } + cordova.getActivity().startActivity(intent); + } + + public WebViewInstance getInstance(String id) { + return instances.get(id); + } + + public void removeInstance(String id) { + instances.remove(id); + } + + private void loadURL(String id, String url, CallbackContext callbackContext) { + WebViewInstance instance = getInstance(id); + if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + instance.loadURL(url, callbackContext); + } + + private void loadHTML(String id, String html, CallbackContext callbackContext) { + WebViewInstance instance = getInstance(id); + if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + instance.loadHTML(html, callbackContext); + } + + private void evaluate(String id, String js, CallbackContext callbackContext) { + WebViewInstance instance = getInstance(id); + if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + instance.evaluate(js, callbackContext); + } + + private void postMessage(String id, String message, CallbackContext callbackContext) { + WebViewInstance instance = getInstance(id); + if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + instance.postMessage(message, callbackContext); + } + + private void show(String id, CallbackContext callbackContext) { + WebViewInstance instance = getInstance(id); + if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + instance.show(callbackContext); + } + + private void hide(String id, CallbackContext callbackContext) { + WebViewInstance instance = getInstance(id); + if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + instance.hide(callbackContext); + } + + private void reload(String id, CallbackContext callbackContext) { + WebViewInstance instance = getInstance(id); + if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + instance.reload(callbackContext); + } + + private void destroy(String id, final CallbackContext callbackContext) { + final WebViewInstance instance = instances.remove(id); + if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + + cordova.getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + instance.destroy(); + callbackContext.success(); + } + }); + } + + /** + * Starts a confirmed download via the system DownloadManager into the + * public Downloads directory. The WebView's cookies are forwarded so + * authenticated downloads work. + */ + void download(String url, String userAgent, String mimeType, String fileName) { + Context context = cordova.getActivity(); + try { + DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url)); + request.setMimeType(mimeType); + request.addRequestHeader("User-Agent", userAgent); + String cookie = CookieManager.getInstance().getCookie(url); + if (cookie != null && !cookie.isEmpty()) { + request.addRequestHeader("Cookie", cookie); + } + request.setDescription("Downloading file..."); + request.setTitle(fileName); + request.allowScanningByMediaScanner(); + request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); + request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName); + + DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE); + if (dm == null) { + throw new IllegalStateException("DownloadManager unavailable"); + } + dm.enqueue(request); + Toast.makeText(context, "Download started...", Toast.LENGTH_SHORT).show(); + } catch (Exception e) { + Log.e(TAG, "Download failed", e); + Toast.makeText(context, "Download failed", Toast.LENGTH_SHORT).show(); + } + } + + public void sendMessageToCordova(String id, String message) { + if (messageCallback == null) return; + + try { + JSONObject payload = new JSONObject(); + payload.put("id", id); + payload.put("message", message); + + PluginResult result = new PluginResult(PluginResult.Status.OK, payload); + result.setKeepCallback(true); + messageCallback.sendPluginResult(result); + } catch (JSONException e) { + Log.e(TAG, "Error building message payload", e); + } + } + + public void sendEventToCordova(String id, String event, JSONObject data) { + if (messageCallback == null) return; + + try { + JSONObject payload = new JSONObject(); + payload.put("id", id); + payload.put("event", event); + if (data != null) { + payload.put("data", data); + } + + PluginResult result = new PluginResult(PluginResult.Status.OK, payload); + result.setKeepCallback(true); + messageCallback.sendPluginResult(result); + } catch (JSONException e) { + Log.e(TAG, "Error building event payload", e); + } + } + + @Override + public void onDestroy() { + super.onDestroy(); + // Copy: destroying a fullscreen instance finishes its activity, whose + // onDestroy() removes it from the map. + for (WebViewInstance instance : new ArrayList<>(instances.values())) { + try { instance.destroy(); } catch (Exception ignored) {} + } + instances.clear(); + instance = null; + } +} diff --git a/src/plugins/webview/www/webview.js b/src/plugins/webview/www/webview.js new file mode 100644 index 0000000000..b1935dddfe --- /dev/null +++ b/src/plugins/webview/www/webview.js @@ -0,0 +1,88 @@ +const SERVICE = "AcodeWebView"; + +let messageCallback = null; + +function setMessageCallback(callback) { + messageCallback = callback; + cordova.exec( + (payload) => { + if (messageCallback) { + messageCallback(payload); + } + }, + (error) => { + console.error("WebView message callback error:", error); + }, + SERVICE, + "setMessageCallback", + [] + ); +} + +function create(options) { + return new Promise((resolve, reject) => { + cordova.exec(resolve, reject, SERVICE, "create", [options || {}]); + }); +} + +function loadURL(id, url) { + return new Promise((resolve, reject) => { + cordova.exec(resolve, reject, SERVICE, "loadURL", [id, url]); + }); +} + +function loadHTML(id, html) { + return new Promise((resolve, reject) => { + cordova.exec(resolve, reject, SERVICE, "loadHTML", [id, html]); + }); +} + +function evaluate(id, js) { + return new Promise((resolve, reject) => { + cordova.exec(resolve, reject, SERVICE, "evaluate", [id, js]); + }); +} + +function postMessage(id, message) { + return new Promise((resolve, reject) => { + const payload = typeof message === "string" ? message : JSON.stringify(message); + cordova.exec(resolve, reject, SERVICE, "postMessage", [id, payload]); + }); +} + +function show(id) { + return new Promise((resolve, reject) => { + cordova.exec(resolve, reject, SERVICE, "show", [id]); + }); +} + +function hide(id) { + return new Promise((resolve, reject) => { + cordova.exec(resolve, reject, SERVICE, "hide", [id]); + }); +} + +function reload(id) { + return new Promise((resolve, reject) => { + cordova.exec(resolve, reject, SERVICE, "reload", [id]); + }); +} + +function destroy(id) { + return new Promise((resolve, reject) => { + cordova.exec(resolve, reject, SERVICE, "destroy", [id]); + }); +} + +export default { + setMessageCallback, + create, + loadURL, + loadHTML, + evaluate, + postMessage, + show, + hide, + reload, + destroy, +}; From a53fde3adeb16ba1e63822cbbc0efafdcfc93180 Mon Sep 17 00:00:00 2001 From: Rohit Kushvaha Date: Mon, 27 Jul 2026 19:13:04 +0530 Subject: [PATCH 008/195] fix: lockfile (#2541) --- package-lock.json | 3447 +++++++++++++++++++++++++++++---------------- 1 file changed, 2254 insertions(+), 1193 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9386001651..07ef97f47d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -160,17 +160,18 @@ } }, "node_modules/@babel/code-frame": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", - "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", + "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^8.0.0", - "js-tokens": "^10.0.0" + "@babel/helper-validator-identifier": "^7.28.5", + "js-tokens": "^4.0.0", + "picocolors": "^1.1.1" }, "engines": { - "node": "^22.18.0 || >=24.11.0" + "node": ">=6.9.0" } }, "node_modules/@babel/compat-data": { @@ -215,6 +216,20 @@ "url": "https://opencollective.com/babel" } }, + "node_modules/@babel/core/node_modules/@babel/code-frame": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/core/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -233,14 +248,44 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/core/node_modules/@babel/helper-globals": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", + "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/core/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/core/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/core/node_modules/@babel/parser": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", - "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", + "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.4" + "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -249,34 +294,83 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/core/node_modules/@babel/template": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", + "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/core/node_modules/@babel/traverse": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", - "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", + "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.4", + "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.4", + "@babel/types": "^8.0.0", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/core/node_modules/@babel/types": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/core/node_modules/js-tokens": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/core/node_modules/semver": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", + "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@babel/generator": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz", - "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==", + "version": "7.29.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz", + "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.29.7", - "@babel/types": "^7.29.7", + "@babel/parser": "^7.29.0", + "@babel/types": "^7.29.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -285,48 +379,48 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/generator/node_modules/@babel/helper-string-parser": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", - "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", + "node_modules/@babel/helper-annotate-as-pure": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-8.0.0.tgz", + "integrity": "sha512-NSpMkMsvvZqzThJ0p1B02cbtA2ObEyfBvq950bmNkyxsxvcxwhvvCB036rKhlEnuBBo30bOrk13u3FzlKSoRrw==", "dev": true, "license": "MIT", + "dependencies": { + "@babel/types": "^8.0.0" + }, "engines": { - "node": ">=6.9.0" + "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/generator/node_modules/@babel/helper-validator-identifier": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", - "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", + "node_modules/@babel/helper-annotate-as-pure/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", "dev": true, "license": "MIT", "engines": { - "node": ">=6.9.0" + "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/generator/node_modules/@babel/types": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz", - "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==", + "node_modules/@babel/helper-annotate-as-pure/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", "dev": true, "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^7.29.7", - "@babel/helper-validator-identifier": "^7.29.7" - }, "engines": { - "node": ">=6.9.0" + "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-annotate-as-pure": { + "node_modules/@babel/helper-annotate-as-pure/node_modules/@babel/types": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-8.0.0.tgz", - "integrity": "sha512-NSpMkMsvvZqzThJ0p1B02cbtA2ObEyfBvq950bmNkyxsxvcxwhvvCB036rKhlEnuBBo30bOrk13u3FzlKSoRrw==", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.0" + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" }, "engines": { "node": "^22.18.0 || >=24.11.0" @@ -349,6 +443,19 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-compilation-targets/node_modules/semver": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", + "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@babel/helper-create-class-features-plugin": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-8.0.1.tgz", @@ -371,6 +478,20 @@ "@babel/core": "^8.0.0" } }, + "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/code-frame": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -389,14 +510,44 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-globals": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", + "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/parser": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", - "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", + "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.4" + "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -405,25 +556,74 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/template": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", + "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/traverse": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", - "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", + "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.4", + "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.4", + "@babel/types": "^8.0.0", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/types": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-create-class-features-plugin/node_modules/js-tokens": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", + "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@babel/helper-create-regexp-features-plugin": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-8.0.1.tgz", @@ -442,6 +642,19 @@ "@babel/core": "^8.0.0" } }, + "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", + "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@babel/helper-define-polyfill-provider": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-1.0.0.tgz", @@ -461,13 +674,13 @@ } }, "node_modules/@babel/helper-globals": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", - "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", + "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", "dev": true, "license": "MIT", "engines": { - "node": "^22.18.0 || >=24.11.0" + "node": ">=6.9.0" } }, "node_modules/@babel/helper-member-expression-to-functions": { @@ -484,6 +697,20 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/code-frame": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -502,41 +729,107 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/parser": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", - "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", + "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/helper-globals": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", + "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", "dev": true, "license": "MIT", - "dependencies": { - "@babel/types": "^8.0.4" - }, - "bin": { - "parser": "bin/babel-parser.js" - }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/traverse": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", - "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", + "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", "dev": true, "license": "MIT", - "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/generator": "^8.0.0", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", + "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^8.0.0" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/template": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", + "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/traverse": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", + "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.4", + "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.4", + "@babel/types": "^8.0.0", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-member-expression-to-functions/node_modules/js-tokens": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", + "dev": true, + "license": "MIT" + }, "node_modules/@babel/helper-module-imports": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-8.0.0.tgz", @@ -551,6 +844,20 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-module-imports/node_modules/@babel/code-frame": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-module-imports/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -569,14 +876,44 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-module-imports/node_modules/@babel/helper-globals": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", + "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-module-imports/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-module-imports/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-module-imports/node_modules/@babel/parser": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", - "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", + "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.4" + "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -585,25 +922,61 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-module-imports/node_modules/@babel/template": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", + "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-module-imports/node_modules/@babel/traverse": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", - "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", + "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.4", + "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.4", + "@babel/types": "^8.0.0", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-module-imports/node_modules/@babel/types": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-module-imports/node_modules/js-tokens": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", + "dev": true, + "license": "MIT" + }, "node_modules/@babel/helper-module-transforms": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-8.0.1.tgz", @@ -622,6 +995,20 @@ "@babel/core": "^8.0.0" } }, + "node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-module-transforms/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -640,14 +1027,44 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-globals": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", + "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-module-transforms/node_modules/@babel/parser": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", - "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", + "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.4" + "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -656,25 +1073,61 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-module-transforms/node_modules/@babel/template": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", + "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-module-transforms/node_modules/@babel/traverse": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", - "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", + "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.4", + "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.4", + "@babel/types": "^8.0.0", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-module-transforms/node_modules/@babel/types": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-module-transforms/node_modules/js-tokens": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", + "dev": true, + "license": "MIT" + }, "node_modules/@babel/helper-optimise-call-expression": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-8.0.0.tgz", @@ -688,6 +1141,40 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-plugin-utils": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-8.0.1.tgz", @@ -714,83 +1201,324 @@ }, "engines": { "node": "^22.18.0 || >=24.11.0" - }, - "peerDependencies": { - "@babel/core": "^8.0.0" + }, + "peerDependencies": { + "@babel/core": "^8.0.0" + } + }, + "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/code-frame": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/generator": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", + "integrity": "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0", + "@jridgewell/gen-mapping": "^0.3.12", + "@jridgewell/trace-mapping": "^0.3.28", + "@types/jsesc": "^2.5.0", + "jsesc": "^3.0.2" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-globals": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", + "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", + "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^8.0.0" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/template": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", + "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/traverse": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", + "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/generator": "^8.0.0", + "@babel/helper-globals": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/template": "^8.0.0", + "@babel/types": "^8.0.0", + "obug": "^2.1.1" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/types": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-remap-async-to-generator/node_modules/js-tokens": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/helper-replace-supers": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-8.0.1.tgz", + "integrity": "sha512-B1SZADIcy3tmH8CmWvj4SHi/oAPom4UL3uknTc2QRNsPVLFk/sPnZvQL/8kj7Y5omvjMqie0vklvs6XM4OLW5Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-member-expression-to-functions": "^8.0.0", + "@babel/helper-optimise-call-expression": "^8.0.0", + "@babel/traverse": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + }, + "peerDependencies": { + "@babel/core": "^8.0.0" + } + }, + "node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-replace-supers/node_modules/@babel/generator": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", + "integrity": "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0", + "@jridgewell/gen-mapping": "^0.3.12", + "@jridgewell/trace-mapping": "^0.3.28", + "@types/jsesc": "^2.5.0", + "jsesc": "^3.0.2" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-globals": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", + "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-replace-supers/node_modules/@babel/parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", + "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^8.0.0" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-replace-supers/node_modules/@babel/template": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", + "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/generator": { + "node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", - "integrity": "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", + "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", "dev": true, "license": "MIT", "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/generator": "^8.0.0", + "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", + "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", - "@jridgewell/gen-mapping": "^0.3.12", - "@jridgewell/trace-mapping": "^0.3.28", - "@types/jsesc": "^2.5.0", - "jsesc": "^3.0.2" + "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/parser": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", - "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", + "node_modules/@babel/helper-replace-supers/node_modules/@babel/types": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.4" - }, - "bin": { - "parser": "bin/babel-parser.js" + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/traverse": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", - "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", + "node_modules/@babel/helper-replace-supers/node_modules/js-tokens": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/helper-skip-transparent-expression-wrappers": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-8.0.0.tgz", + "integrity": "sha512-xmCA9kP3IhySsqhzwIdWGlDN/1A4cCKNBO/uwZx/3YzmDoMePwno2Q5/Bq0q+tYaKbeF940YiKV/kaW8Mzvpjw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/generator": "^8.0.0", - "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.4", - "@babel/template": "^8.0.0", - "@babel/types": "^8.0.4", - "obug": "^2.1.1" + "@babel/traverse": "^8.0.0", + "@babel/types": "^8.0.0" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-replace-supers": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-8.0.1.tgz", - "integrity": "sha512-B1SZADIcy3tmH8CmWvj4SHi/oAPom4UL3uknTc2QRNsPVLFk/sPnZvQL/8kj7Y5omvjMqie0vklvs6XM4OLW5Q==", + "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/code-frame": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-member-expression-to-functions": "^8.0.0", - "@babel/helper-optimise-call-expression": "^8.0.0", - "@babel/traverse": "^8.0.0" + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" }, "engines": { "node": "^22.18.0 || >=24.11.0" - }, - "peerDependencies": { - "@babel/core": "^8.0.0" } }, - "node_modules/@babel/helper-replace-supers/node_modules/@babel/generator": { + "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", "integrity": "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==", @@ -808,126 +1536,125 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-replace-supers/node_modules/@babel/parser": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", - "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", + "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/helper-globals": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", + "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", "dev": true, "license": "MIT", - "dependencies": { - "@babel/types": "^8.0.4" - }, - "bin": { - "parser": "bin/babel-parser.js" - }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", - "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", + "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", "dev": true, "license": "MIT", - "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/generator": "^8.0.0", - "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.4", - "@babel/template": "^8.0.0", - "@babel/types": "^8.0.4", - "obug": "^2.1.1" - }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers": { + "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/helper-validator-identifier": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-8.0.0.tgz", - "integrity": "sha512-xmCA9kP3IhySsqhzwIdWGlDN/1A4cCKNBO/uwZx/3YzmDoMePwno2Q5/Bq0q+tYaKbeF940YiKV/kaW8Mzvpjw==", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", "dev": true, "license": "MIT", - "dependencies": { - "@babel/traverse": "^8.0.0", - "@babel/types": "^8.0.0" - }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/generator": { + "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/parser": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", - "integrity": "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", + "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0", - "@jridgewell/gen-mapping": "^0.3.12", - "@jridgewell/trace-mapping": "^0.3.28", - "@types/jsesc": "^2.5.0", - "jsesc": "^3.0.2" + "@babel/types": "^8.0.0" + }, + "bin": { + "parser": "bin/babel-parser.js" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/parser": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", - "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", + "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/template": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", + "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.4" - }, - "bin": { - "parser": "bin/babel-parser.js" + "@babel/code-frame": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/traverse": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", - "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", + "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.4", + "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.4", + "@babel/types": "^8.0.0", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/helper-string-parser": { + "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/types": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", - "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", "dev": true, "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" + }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/js-tokens": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", + "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-validator-identifier": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.4.tgz", - "integrity": "sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg==", + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", + "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", "dev": true, "license": "MIT", "engines": { - "node": "^22.18.0 || >=24.11.0" + "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { @@ -955,6 +1682,20 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-wrap-function/node_modules/@babel/code-frame": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-wrap-function/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -973,14 +1714,44 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-globals": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", + "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-wrap-function/node_modules/@babel/parser": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", - "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", + "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.4" + "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -989,25 +1760,61 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", + "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/helper-wrap-function/node_modules/@babel/traverse": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", - "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", + "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.4", + "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.4", + "@babel/types": "^8.0.0", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/helper-wrap-function/node_modules/@babel/types": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helper-wrap-function/node_modules/js-tokens": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", + "dev": true, + "license": "MIT" + }, "node_modules/@babel/helpers": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-8.0.0.tgz", @@ -1022,54 +1829,106 @@ "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/parser": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz", - "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==", + "node_modules/@babel/helpers/node_modules/@babel/code-frame": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helpers/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helpers/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helpers/node_modules/@babel/parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", + "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.29.7" + "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" }, "engines": { - "node": ">=6.0.0" + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/helpers/node_modules/@babel/template": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", + "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/parser/node_modules/@babel/helper-string-parser": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", - "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", + "node_modules/@babel/helpers/node_modules/@babel/types": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", "dev": true, "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" + }, "engines": { - "node": ">=6.9.0" + "node": "^22.18.0 || >=24.11.0" } }, - "node_modules/@babel/parser/node_modules/@babel/helper-validator-identifier": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", - "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", + "node_modules/@babel/helpers/node_modules/js-tokens": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } + "license": "MIT" }, - "node_modules/@babel/parser/node_modules/@babel/types": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz", - "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==", + "node_modules/@babel/parser": { + "version": "7.29.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.3.tgz", + "integrity": "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.29.7", - "@babel/helper-validator-identifier": "^7.29.7" + "@babel/types": "^7.29.0" + }, + "bin": { + "parser": "bin/babel-parser.js" }, "engines": { - "node": ">=6.9.0" + "node": ">=6.0.0" } }, "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": { @@ -1172,9 +2031,9 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-8.0.3.tgz", - "integrity": "sha512-jmTPwps7oSQSZaV1SxkQ3C12UWyufGysGc5OzDpZzvPAIX4mO7dJT3hoqkWVrSImvkcMiknir1iLN1SNV/CZzg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-8.0.1.tgz", + "integrity": "sha512-YBpIeuOZSUZx7RGH/U+dIAsHDHyojBVDRHNBUgOiUDS5IIcgBm1uyu9xs/2kM27B/bmDfOxzJ9k8cU2QuOwGIA==", "dev": true, "license": "MIT", "dependencies": { @@ -1221,6 +2080,20 @@ "@babel/core": "^8.0.0" } }, + "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/code-frame": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -1239,14 +2112,44 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/helper-globals": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", + "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/parser": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", - "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", + "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.4" + "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -1255,25 +2158,61 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/template": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", + "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/traverse": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", - "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", + "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.4", + "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.4", + "@babel/types": "^8.0.0", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/types": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/plugin-transform-async-generator-functions/node_modules/js-tokens": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", + "dev": true, + "license": "MIT" + }, "node_modules/@babel/plugin-transform-async-to-generator": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-8.0.1.tgz", @@ -1379,6 +2318,20 @@ "@babel/core": "^8.0.0" } }, + "node_modules/@babel/plugin-transform-classes/node_modules/@babel/code-frame": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/plugin-transform-classes/node_modules/@babel/generator": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz", @@ -1397,14 +2350,44 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-globals": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-8.0.0.tgz", + "integrity": "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/plugin-transform-classes/node_modules/@babel/parser": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", - "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0.tgz", + "integrity": "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^8.0.4" + "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -1413,25 +2396,61 @@ "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/plugin-transform-classes/node_modules/@babel/template": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", + "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^8.0.0", + "@babel/parser": "^8.0.0", + "@babel/types": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/plugin-transform-classes/node_modules/@babel/traverse": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.4.tgz", - "integrity": "sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-8.0.0.tgz", + "integrity": "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", - "@babel/parser": "^8.0.4", + "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", - "@babel/types": "^8.0.4", + "@babel/types": "^8.0.0", "obug": "^2.1.1" }, "engines": { "node": "^22.18.0 || >=24.11.0" } }, + "node_modules/@babel/plugin-transform-classes/node_modules/@babel/types": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0.tgz", + "integrity": "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/plugin-transform-classes/node_modules/js-tokens": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", + "dev": true, + "license": "MIT" + }, "node_modules/@babel/plugin-transform-computed-properties": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-8.0.1.tgz", @@ -1729,6 +2748,16 @@ "@babel/core": "^8.0.0" } }, + "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0.tgz", + "integrity": "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, "node_modules/@babel/plugin-transform-modules-umd": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-8.0.1.tgz", @@ -1948,9 +2977,9 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-8.0.2.tgz", - "integrity": "sha512-aFfsjCRYducRV4dPnpsBbdRkLjboca9FVDg6HZCgy0Ahvk2ZQ/2exmCRC5qS9P6rsWwrmIheNaIM6A1j2F8KMA==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-8.0.1.tgz", + "integrity": "sha512-1WjCi/45Mn5e0uvz26FdvRe6bTAvN6WAtkHgIjl0w/LkBvrv4Y5bDR+8YY72r7cefXBfwYUXIHSoxQkrIfnjXQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2182,9 +3211,9 @@ } }, "node_modules/@babel/preset-env": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-8.0.2.tgz", - "integrity": "sha512-CUGLn9hNBCF/eXnwdFAWERbniCcXCRvnKwLV9fegeUEIqv7YlU2MepsWMMM54GcILx5XYMnRh+JAL+K5G+mK6g==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-8.0.1.tgz", + "integrity": "sha512-tiwl69ZQGIbPif28GK8vI/Nm1nYdP+UHXWRnqXl0fjfBS7DWmAs2XvlpVkZyZjVVDxcprcbzCnN93SbuSgz8WQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2237,7 +3266,7 @@ "@babel/plugin-transform-private-methods": "^8.0.1", "@babel/plugin-transform-private-property-in-object": "^8.0.1", "@babel/plugin-transform-property-literals": "^8.0.1", - "@babel/plugin-transform-regenerator": "^8.0.2", + "@babel/plugin-transform-regenerator": "^8.0.1", "@babel/plugin-transform-regexp-modifiers": "^8.0.1", "@babel/plugin-transform-reserved-words": "^8.0.1", "@babel/plugin-transform-shorthand-properties": "^8.0.1", @@ -2249,220 +3278,144 @@ "@babel/plugin-transform-unicode-property-regex": "^8.0.1", "@babel/plugin-transform-unicode-regex": "^8.0.1", "@babel/plugin-transform-unicode-sets-regex": "^8.0.1", - "@babel/preset-modules": "^0.2.0", - "babel-plugin-polyfill-corejs3": "^1.0.0", + "@babel/preset-modules": "0.1.6-no-external-plugins", + "babel-plugin-polyfill-corejs3": "^1.0.0-rc.2", "core-js-compat": "^3.48.0", "semver": "^7.7.3" }, "engines": { "node": "^22.18.0 || >=24.11.0" - }, - "peerDependencies": { - "@babel/core": "^8.0.0" - } - }, - "node_modules/@babel/preset-modules": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.2.0.tgz", - "integrity": "sha512-yz0RBN2fx4fjCeFcTWsWgL7PxSRltvTa0Qg14HkWCU3qS8MO7ZSJlBVbGceynd5C9NsJwwUHNQD3dc6tYO+jqQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^8.0.1", - "@babel/plugin-transform-dotall-regex": "^8.0.1", - "@babel/plugin-transform-unicode-property-regex": "^8.0.1", - "@babel/types": "^8.0.0", - "esutils": "^2.0.2" - }, - "peerDependencies": { - "@babel/core": "^8.0.0" - } - }, - "node_modules/@babel/preset-typescript": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-8.0.1.tgz", - "integrity": "sha512-qrPhQIN1NLrPmzgazF9XKQqXrOcp/WJly+K+6ReFonn24FZqRJO7clxOJo6Ni75L+2vAqI3cHVU2OJLBxoPp5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^8.0.1", - "@babel/helper-validator-option": "^8.0.0", - "@babel/plugin-transform-modules-commonjs": "^8.0.1", - "@babel/plugin-transform-typescript": "^8.0.1" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" - }, - "peerDependencies": { - "@babel/core": "^8.0.0" - } - }, - "node_modules/@babel/runtime": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz", - "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/runtime-corejs3": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.29.7.tgz", - "integrity": "sha512-ppj9ouYku+RX0ljtgZd+KMO5mkM2bCqg8H2PYAFWnLsHEIKIdRojqbJ2i3eVHrisuxy7nOFCmngTDdWtUCdXUQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "core-js-pure": "^3.48.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/template": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz", - "integrity": "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^8.0.0", - "@babel/parser": "^8.0.0", - "@babel/types": "^8.0.0" - }, - "engines": { - "node": "^22.18.0 || >=24.11.0" + }, + "peerDependencies": { + "@babel/core": "^8.0.0" } }, - "node_modules/@babel/template/node_modules/@babel/parser": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz", - "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==", + "node_modules/@babel/preset-env/node_modules/semver": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", + "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^8.0.4" - }, + "license": "ISC", "bin": { - "parser": "bin/babel-parser.js" + "semver": "bin/semver.js" }, "engines": { - "node": "^22.18.0 || >=24.11.0" + "node": ">=10" } }, - "node_modules/@babel/traverse": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz", - "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==", + "node_modules/@babel/preset-modules": { + "version": "0.1.6-no-external-plugins", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", + "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.29.7", - "@babel/generator": "^7.29.7", - "@babel/helper-globals": "^7.29.7", - "@babel/parser": "^7.29.7", - "@babel/template": "^7.29.7", - "@babel/types": "^7.29.7", - "debug": "^4.3.1" + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/types": "^7.4.4", + "esutils": "^2.0.2" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/@babel/traverse/node_modules/@babel/code-frame": { + "node_modules/@babel/preset-modules/node_modules/@babel/helper-plugin-utils": { "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", - "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz", + "integrity": "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==", "dev": true, "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.29.7", - "js-tokens": "^4.0.0", - "picocolors": "^1.1.1" - }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/@babel/helper-globals": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz", - "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==", + "node_modules/@babel/preset-typescript": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-8.0.1.tgz", + "integrity": "sha512-qrPhQIN1NLrPmzgazF9XKQqXrOcp/WJly+K+6ReFonn24FZqRJO7clxOJo6Ni75L+2vAqI3cHVU2OJLBxoPp5A==", "dev": true, "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^8.0.1", + "@babel/helper-validator-option": "^8.0.0", + "@babel/plugin-transform-modules-commonjs": "^8.0.1", + "@babel/plugin-transform-typescript": "^8.0.1" + }, "engines": { - "node": ">=6.9.0" + "node": "^22.18.0 || >=24.11.0" + }, + "peerDependencies": { + "@babel/core": "^8.0.0" } }, - "node_modules/@babel/traverse/node_modules/@babel/helper-string-parser": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", - "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", + "node_modules/@babel/runtime": { + "version": "7.29.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz", + "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==", "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/@babel/helper-validator-identifier": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", - "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", + "node_modules/@babel/runtime-corejs3": { + "version": "7.29.2", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.29.2.tgz", + "integrity": "sha512-Lc94FOD5+0aXhdb0Tdg3RUtqT6yWbI/BbFWvlaSJ3gAb9Ks+99nHRDKADVqC37er4eCB0fHyWT+y+K3QOvJKbw==", "dev": true, "license": "MIT", + "dependencies": { + "core-js-pure": "^3.48.0" + }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/@babel/template": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz", - "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==", + "node_modules/@babel/template": { + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz", + "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.29.7", - "@babel/parser": "^7.29.7", - "@babel/types": "^7.29.7" + "@babel/code-frame": "^7.28.6", + "@babel/parser": "^7.28.6", + "@babel/types": "^7.28.6" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/@babel/types": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz", - "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==", + "node_modules/@babel/traverse": { + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz", + "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.29.7", - "@babel/helper-validator-identifier": "^7.29.7" + "@babel/code-frame": "^7.29.0", + "@babel/generator": "^7.29.0", + "@babel/helper-globals": "^7.28.0", + "@babel/parser": "^7.29.0", + "@babel/template": "^7.28.6", + "@babel/types": "^7.29.0", + "debug": "^4.3.1" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/types": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.4.tgz", - "integrity": "sha512-eY+Yn3dCqTGmyiq2QRU66lA5FL8lqqqvecHt0fF3uHONIa7ToYsaCiWV8lOKqAs0Rb2SjixiKFROngnulPtt2g==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", + "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^8.0.0", - "@babel/helper-validator-identifier": "^8.0.4" + "@babel/helper-string-parser": "^7.27.1", + "@babel/helper-validator-identifier": "^7.28.5" }, "engines": { - "node": "^22.18.0 || >=24.11.0" + "node": ">=6.9.0" } }, "node_modules/@biomejs/biome": { @@ -2534,9 +3487,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT OR Apache-2.0", "optional": true, "os": [ @@ -2554,9 +3504,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT OR Apache-2.0", "optional": true, "os": [ @@ -2574,9 +3521,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT OR Apache-2.0", "optional": true, "os": [ @@ -2594,9 +3538,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT OR Apache-2.0", "optional": true, "os": [ @@ -2665,13 +3606,13 @@ } }, "node_modules/@codemirror/commands": { - "version": "6.10.4", - "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.10.4.tgz", - "integrity": "sha512-Ryk9y9T0FFVF0cUGhAknveAyUOl/A1qReTFi+qPKtOh2Z9F4AUBz3XOrYD4ZEgZirdugVzHvd/2/Wcwy5OliTg==", + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.10.3.tgz", + "integrity": "sha512-JFRiqhKu+bvSkDLI+rUhJwSxQxYb759W5GBezE8Uc8mHLqC9aV/9aTC7yJSqCtB3F00pylrLCwnyS91Ap5ej4Q==", "license": "MIT", "dependencies": { "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.7.0", + "@codemirror/state": "^6.6.0", "@codemirror/view": "^6.27.0", "@lezer/common": "^1.1.0" } @@ -2824,9 +3765,9 @@ } }, "node_modules/@codemirror/lang-markdown": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.5.1.tgz", - "integrity": "sha512-6re5avCNfyRMIoi3XNjbEfQM1vTeVD3JS3g/Fyegyso/eoANFM71Cyvbb66LDyYtQLMEcRFlzioywCqDo9SlLA==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.5.0.tgz", + "integrity": "sha512-0K40bZ35jpHya6FriukbgaleaqzBLZfOh7HuzqbMxBXkbYMJDxfF39c23xOgxFezR+3G+tR2/Mup+Xk865OMvw==", "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.7.1", @@ -2957,9 +3898,9 @@ } }, "node_modules/@codemirror/language": { - "version": "6.12.4", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.12.4.tgz", - "integrity": "sha512-1q4PaT+o6PbgpkJt4Q8Fv5XJxTy4FUZ4MWETtyiDw3J0Pyr9E2vqcKL+k9wcvjNTIsauxvE7OfmWj3FRPHQ76A==", + "version": "6.12.3", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.12.3.tgz", + "integrity": "sha512-QwCZW6Tt1siP37Jet9Tb02Zs81TQt6qQrZR2H+eGMcFsL1zMrk2/b9CLC7/9ieP1fjIUMgviLWMmgiHoJrj+ZA==", "license": "MIT", "dependencies": { "@codemirror/state": "^6.0.0", @@ -3049,9 +3990,9 @@ } }, "node_modules/@codemirror/state": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.7.1.tgz", - "integrity": "sha512-9QzNDgE4EYDnAHfrTlR2lwiPciiOymLtwKK+8yHQzCc7GXhAP9xdEbEJFy2IWB1j9UGUl9BsgMmTo/ImA02T7A==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.6.0.tgz", + "integrity": "sha512-4nbvra5R5EtiCzr9BTHiTLc+MLXK2QGiAVYMyi8PkQd3SR+6ixar/Q/01Fa21TBIDOZXgeWV4WppsQolSreAPQ==", "license": "MIT", "dependencies": { "@marijn/find-cluster-break": "^1.0.0" @@ -3070,9 +4011,9 @@ } }, "node_modules/@codemirror/view": { - "version": "6.43.6", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.43.6.tgz", - "integrity": "sha512-EVunGSYN1wz1p75WY1s3Xg7t3i8Yol0kGZGizNdX9BUFgMFILYVe8/u6EVpo7Ff5PwbZuILb4QAq7IZoKzIEQA==", + "version": "6.43.4", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.43.4.tgz", + "integrity": "sha512-YImu23iyKfncJzT7sRy+rEqEhSc8RhOHqDxwy4WzXRKJwYm6iwf/9OJk5ctCAdZ6yi2ZqaGEvmf55fSVqMDrgg==", "license": "MIT", "dependencies": { "@codemirror/state": "^6.7.0", @@ -3140,21 +4081,21 @@ "license": "MIT" }, "node_modules/@emnapi/core": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.2.tgz", - "integrity": "sha512-TC8MkTuZUtcTSiFeuC0ksCh9QIJ5+F21MvZ4Wn4ORfYaFJ/0dsiudv5tVkejgwZlwQ39jL9WWDe2lz8x0WglOA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz", + "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@emnapi/wasi-threads": "1.2.2", + "@emnapi/wasi-threads": "1.2.1", "tslib": "^2.4.0" } }, "node_modules/@emnapi/runtime": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.2.tgz", - "integrity": "sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz", + "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==", "dev": true, "license": "MIT", "optional": true, @@ -3163,9 +4104,9 @@ } }, "node_modules/@emnapi/wasi-threads": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz", - "integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz", + "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==", "dev": true, "license": "MIT", "optional": true, @@ -3196,9 +4137,9 @@ "license": "MIT" }, "node_modules/@iconify/utils": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-3.1.4.tgz", - "integrity": "sha512-b1S7B1k9ohZ+iNTi2ATxbRYG9fTrJmUT0rc46bvVnNxqNRGW7dyo/vRREwyniI5IRN2RSJHDcm+s3BjWrSAjHw==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-3.1.3.tgz", + "integrity": "sha512-LPKOXPn/zV+zis1oOfGWogaXVpqUybF3ZS6SCZIsz8vg0ivVp9+fVqyYB7xq0aiST/VhUQYGO1qo6uoYSiEJqw==", "license": "MIT", "dependencies": { "@antfu/install-pkg": "^1.1.0", @@ -3282,9 +4223,9 @@ "license": "MIT" }, "node_modules/@lezer/cpp": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@lezer/cpp/-/cpp-1.1.6.tgz", - "integrity": "sha512-vh9gWWJOXFVY8HBHK3Twzq8MgwG2iN4GSyzBP9sCGTe37P15x2R14VaBQk0VA0ezTRN1KHYBBsHhvpGZ2Xy/pA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@lezer/cpp/-/cpp-1.1.5.tgz", + "integrity": "sha512-DIhSXmYtJKLehrjzDFN+2cPt547ySQ41nA8yqcDf/GxMc+YM736xqltFkvADL2M0VebU5I+3+4ks2Vv+Kyq3Aw==", "license": "MIT", "dependencies": { "@lezer/common": "^1.2.0", @@ -3293,9 +4234,9 @@ } }, "node_modules/@lezer/css": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.4.tgz", - "integrity": "sha512-N+tn9tej2hPvyKgHEApMOQfHczDJCwxrRFS3SPn9QjYN+uwHvEDnCgKRrb3mxDYxRS8sKMM8fhC3+lc04Abz5Q==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.3.tgz", + "integrity": "sha512-RzBo8r+/6QJeow7aPHIpGVIH59xTcJXp399820gZoMo9noQDRVpJLheIBUicYwKcsbOYoBRoLZlf2720dG/4Tg==", "license": "MIT", "dependencies": { "@lezer/common": "^1.2.0", @@ -3391,9 +4332,9 @@ } }, "node_modules/@lezer/markdown": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.7.2.tgz", - "integrity": "sha512-iTkYvoVcKt3WkeL7qUDyXHONZEwLio4wj8KTNi2dnjQEXBZKMV63BpQrPqfsM+OkvuRbiSTAcycYAsQzLhRNoQ==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.6.3.tgz", + "integrity": "sha512-jpGm5Ps+XErS+xA4urw7ogEGkeZOahVQF21Z6oECF0sj+2liwZopd2+I8uH5I/vZsRuuze3OxBREIANLf6KKUw==", "license": "MIT", "dependencies": { "@lezer/common": "^1.5.0", @@ -3412,9 +4353,9 @@ } }, "node_modules/@lezer/python": { - "version": "1.1.19", - "resolved": "https://registry.npmjs.org/@lezer/python/-/python-1.1.19.tgz", - "integrity": "sha512-MhQIURHRytsNzP/YXnqpYKW6la6voAH3kyplTOOiCdjyFY6cWWGFVmYVdHIPrElqSDf4iCDktQCockB9FxuhzQ==", + "version": "1.1.18", + "resolved": "https://registry.npmjs.org/@lezer/python/-/python-1.1.18.tgz", + "integrity": "sha512-31FiUrU7z9+d/ElGQLJFXl+dKOdx0jALlP3KEOsGTex8mvj+SoE1FgItcHWK/axkxCHGUSpqIHt6JAWfWu9Rhg==", "license": "MIT", "dependencies": { "@lezer/common": "^1.2.0", @@ -3467,29 +4408,29 @@ } }, "node_modules/@marijn/find-cluster-break": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.3.tgz", - "integrity": "sha512-FY+MKLBoTsLNJF/eLWaOsXGdz6uh3Iu1axjPf6TUq92IYumcTcXWHoS747JARLkcdlJ/Waiaxc5wQfFO8jC6NA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz", + "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==", "license": "MIT" }, "node_modules/@mermaid-js/parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.2.0.tgz", - "integrity": "sha512-oYPyv8A4As1yH5Bx+04iQEQxXuIQDe0GKCNSRgao6z8AM9jixXIfP0vsppRLvGf+nKIOb9/LdpWA4YuJiVvESA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.1.1.tgz", + "integrity": "sha512-VuHdsYMK1bT6X2JbcAaWAhugTRvRBRyuZgd+c22swUeI9g/ntaxF7CY7dYarhZovofCbUNO0G7JesfmNtjYOCw==", "license": "MIT", "dependencies": { - "@chevrotain/types": "~11.1.2" + "@chevrotain/types": "~11.1.1" } }, "node_modules/@napi-rs/wasm-runtime": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz", - "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz", + "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@tybys/wasm-util": "^0.10.3" + "@tybys/wasm-util": "^0.10.1" }, "funding": { "type": "github", @@ -3547,9 +4488,9 @@ } }, "node_modules/@npmcli/agent": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.2.tgz", - "integrity": "sha512-EUEuWAxnL07Sp5/iC/1X6Xj+XThUvnbei9zfRWZdEXa7lss9RTHMhAHBeg+MZ5To9s/gGaSI+UwZTPdYMvKSeg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.0.tgz", + "integrity": "sha512-kAQTcEN9E8ERLVg5AsGwLNoFb+oEG6engbqAU2P43gD4JEIkNGMHdVQ096FsOAAYpZPB0RSt0zgInKIAS1l5QA==", "license": "ISC", "dependencies": { "agent-base": "^7.1.0", @@ -3563,9 +4504,9 @@ } }, "node_modules/@npmcli/arborist": { - "version": "9.9.0", - "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-9.9.0.tgz", - "integrity": "sha512-tzsb1R8mx0k0drlLDT/9ckEYaQHIaWnUti/ci2IaFoQqdqwfmYrc+90p1+QEZC/ocvqcxBep9P1xKw4FbAGofw==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-9.5.0.tgz", + "integrity": "sha512-qS+TtKWC58sjBjD+szLrhEj2TCLnwzUA9vlMyCnU9ztw01ZjQSu25iQPxeBa0sk9sS9/Hzs/xJMWl7J/vRCjGQ==", "license": "ISC", "dependencies": { "@gar/promise-retry": "^1.0.0", @@ -3610,6 +4551,18 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/@npmcli/arborist/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@npmcli/fs": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-5.0.0.tgz", @@ -3622,6 +4575,18 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/@npmcli/fs/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@npmcli/git": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-7.0.2.tgz", @@ -3641,6 +4606,18 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/@npmcli/git/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@npmcli/installed-package-contents": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-4.0.0.tgz", @@ -3688,6 +4665,18 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/@npmcli/metavuln-calculator/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@npmcli/move-file": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", @@ -3752,6 +4741,18 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/@npmcli/package-json/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@npmcli/promise-spawn": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-9.0.1.tgz", @@ -3802,9 +4803,9 @@ } }, "node_modules/@parcel/watcher": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.6.0.tgz", - "integrity": "sha512-7FNeNl8NCE7aINx7WXiKQrPYZWC/hvrTsmk6zmxbI7LTXE7hVek/n8AfVgpe2y82zl3w0HvCHN0bVKMBoJcC0w==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz", + "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -3813,7 +4814,7 @@ "detect-libc": "^2.0.3", "is-glob": "^4.0.3", "node-addon-api": "^7.0.0", - "picomatch": "^4.0.4" + "picomatch": "^4.0.3" }, "engines": { "node": ">= 10.0.0" @@ -3823,24 +4824,25 @@ "url": "https://opencollective.com/parcel" }, "optionalDependencies": { - "@parcel/watcher-android-arm64": "2.6.0", - "@parcel/watcher-darwin-arm64": "2.6.0", - "@parcel/watcher-darwin-x64": "2.6.0", - "@parcel/watcher-freebsd-x64": "2.6.0", - "@parcel/watcher-linux-arm-glibc": "2.6.0", - "@parcel/watcher-linux-arm-musl": "2.6.0", - "@parcel/watcher-linux-arm64-glibc": "2.6.0", - "@parcel/watcher-linux-arm64-musl": "2.6.0", - "@parcel/watcher-linux-x64-glibc": "2.6.0", - "@parcel/watcher-linux-x64-musl": "2.6.0", - "@parcel/watcher-win32-arm64": "2.6.0", - "@parcel/watcher-win32-x64": "2.6.0" + "@parcel/watcher-android-arm64": "2.5.6", + "@parcel/watcher-darwin-arm64": "2.5.6", + "@parcel/watcher-darwin-x64": "2.5.6", + "@parcel/watcher-freebsd-x64": "2.5.6", + "@parcel/watcher-linux-arm-glibc": "2.5.6", + "@parcel/watcher-linux-arm-musl": "2.5.6", + "@parcel/watcher-linux-arm64-glibc": "2.5.6", + "@parcel/watcher-linux-arm64-musl": "2.5.6", + "@parcel/watcher-linux-x64-glibc": "2.5.6", + "@parcel/watcher-linux-x64-musl": "2.5.6", + "@parcel/watcher-win32-arm64": "2.5.6", + "@parcel/watcher-win32-ia32": "2.5.6", + "@parcel/watcher-win32-x64": "2.5.6" } }, "node_modules/@parcel/watcher-android-arm64": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.6.0.tgz", - "integrity": "sha512-trgpLSCKRC/huFjXX/Smh+0sWe4+YtKfktIToiMl59ghz7z+qkH6kMvNnUbLyRs9N11t8l4svSCs1+5B3rOAhA==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz", + "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==", "cpu": [ "arm64" ], @@ -3859,9 +4861,9 @@ } }, "node_modules/@parcel/watcher-darwin-arm64": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.6.0.tgz", - "integrity": "sha512-Y3QV0gl7Q1zbfueunkWIERICbEojQFCgpyG7YqOGNFLsckXyI1xu9mAIUpKY9QBYzBtSkN8dBPwd3yiAO9ovMw==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz", + "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==", "cpu": [ "arm64" ], @@ -3880,9 +4882,9 @@ } }, "node_modules/@parcel/watcher-darwin-x64": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.6.0.tgz", - "integrity": "sha512-Ohv6OpzhUfKYD7Beb8kDvG0jbIxORCYY1JRdZnaBtnjjkJxgD7ZVL0nw2sCYd0yTMKTvz3nnTnOF3cDifK+kvw==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz", + "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==", "cpu": [ "x64" ], @@ -3901,9 +4903,9 @@ } }, "node_modules/@parcel/watcher-freebsd-x64": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.6.0.tgz", - "integrity": "sha512-5HmXvDgs8VK+74jF9y9/2FE3/OnlcKmc56tjmSrEuZjpSZOGL+fvAu+HKJBdPs9uwoP2hE6TlSUpXZ/C5jUFmQ==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz", + "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==", "cpu": [ "x64" ], @@ -3922,16 +4924,13 @@ } }, "node_modules/@parcel/watcher-linux-arm-glibc": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.6.0.tgz", - "integrity": "sha512-Ps/hui3A+vMbjdqlqAowK2ZL8+BO8dBjxeWXj6npTBs3jx4wWmbPpaLuqwrQrSqIVMCnpWo238bJ1U37GhQOYg==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz", + "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==", "cpu": [ "arm" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -3946,16 +4945,13 @@ } }, "node_modules/@parcel/watcher-linux-arm-musl": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.6.0.tgz", - "integrity": "sha512-9c6AUHgHoG+IY88MRIHupztQiQnrbqHYQjkM2btA+Bf/wQnQMuiD0Wfk1EVv3TlNT3x41uU71rn6E4xh/+zvkw==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz", + "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==", "cpu": [ "arm" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -3970,16 +4966,13 @@ } }, "node_modules/@parcel/watcher-linux-arm64-glibc": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.6.0.tgz", - "integrity": "sha512-yHRqS2owEXe6Hic9z6Mh1ECsCd+ODVOGvZDyciqRd21+v+o+DnXMOrw50DSpIG2sb8GPEaPPmfeCAWKPJdq46g==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz", + "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==", "cpu": [ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -3994,16 +4987,13 @@ } }, "node_modules/@parcel/watcher-linux-arm64-musl": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.6.0.tgz", - "integrity": "sha512-WhB2e/V7rqdHHWZusBSPuy5Ei8S6lSz6FE5TKKQz5h3a0O+C+mhY7vxU9b/stqvMb8beLnPY82ZrFTLKs+SrKA==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz", + "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==", "cpu": [ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -4018,16 +5008,13 @@ } }, "node_modules/@parcel/watcher-linux-x64-glibc": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.6.0.tgz", - "integrity": "sha512-ulGE6x6Oz6iAwg75T8YQSoguBWasniIbX+QWpaYPcCnDOpdWX3k+4xbEYPZVLxOuoJI+svJJPD3sEj8G7lrQ3A==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz", + "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==", "cpu": [ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -4042,16 +5029,13 @@ } }, "node_modules/@parcel/watcher-linux-x64-musl": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.6.0.tgz", - "integrity": "sha512-tkBYKt7YQrjIJWYDnto2YgO8MRkjlMTSNoRHzsXinBqbLdeOM3L32wPZJvIZxqaLMfSlS/4sUjH/6STVP/XDLw==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz", + "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==", "cpu": [ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -4066,9 +5050,9 @@ } }, "node_modules/@parcel/watcher-win32-arm64": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.6.0.tgz", - "integrity": "sha512-gIZAP23jaHjGWasY/TY6yL7NHFClf0Ga7FN+iINvk+KN94rhm94lYZhFsbYFNcA04/onvGD9kKmiJLJB2HbNwQ==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz", + "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==", "cpu": [ "arm64" ], @@ -4086,10 +5070,31 @@ "url": "https://opencollective.com/parcel" } }, + "node_modules/@parcel/watcher-win32-ia32": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz", + "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, "node_modules/@parcel/watcher-win32-x64": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.6.0.tgz", - "integrity": "sha512-cA+/pXV2YkfxlIcXOQ5fSWqAzzPyD78/x5qbK/I0vUkrlYHA8TIz+MXjAbGouguKVSI4bOmkTSJ1/poVSsgt+A==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz", + "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==", "cpu": [ "x64" ], @@ -4108,30 +5113,28 @@ } }, "node_modules/@rspack/binding": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-2.1.5.tgz", - "integrity": "sha512-lF3ZLeeyV0AN3BL0m2jAmNZD5pP9IHsQ8gUXN7mo0g4xsW6nf6hsN7o9CnEHECz5uUZb+EoWsuWzAAmnA9Ip8Q==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-2.0.3.tgz", + "integrity": "sha512-4exVNhGhW5RFHjK87XeTKbkA/qAgI5NHJlT1jNqiJv0gcUXLqTOEU3w7f8+f9zUo4JMFvPc0c9veOi4M19YYTg==", "dev": true, "license": "MIT", "optionalDependencies": { - "@rspack/binding-darwin-arm64": "2.1.5", - "@rspack/binding-darwin-x64": "2.1.5", - "@rspack/binding-linux-arm64-gnu": "2.1.5", - "@rspack/binding-linux-arm64-musl": "2.1.5", - "@rspack/binding-linux-riscv64-gnu": "2.1.5", - "@rspack/binding-linux-riscv64-musl": "2.1.5", - "@rspack/binding-linux-x64-gnu": "2.1.5", - "@rspack/binding-linux-x64-musl": "2.1.5", - "@rspack/binding-wasm32-wasi": "2.1.5", - "@rspack/binding-win32-arm64-msvc": "2.1.5", - "@rspack/binding-win32-ia32-msvc": "2.1.5", - "@rspack/binding-win32-x64-msvc": "2.1.5" + "@rspack/binding-darwin-arm64": "2.0.3", + "@rspack/binding-darwin-x64": "2.0.3", + "@rspack/binding-linux-arm64-gnu": "2.0.3", + "@rspack/binding-linux-arm64-musl": "2.0.3", + "@rspack/binding-linux-x64-gnu": "2.0.3", + "@rspack/binding-linux-x64-musl": "2.0.3", + "@rspack/binding-wasm32-wasi": "2.0.3", + "@rspack/binding-win32-arm64-msvc": "2.0.3", + "@rspack/binding-win32-ia32-msvc": "2.0.3", + "@rspack/binding-win32-x64-msvc": "2.0.3" } }, "node_modules/@rspack/binding-darwin-arm64": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-2.1.5.tgz", - "integrity": "sha512-XLAN6YSU36qkciJtV9DY9z57pdHOjKy/f1HyoqpZenRg8p46jnXPziV45lfrTZpG+FF6g/jtTUc4dKbeyoWqPw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-2.0.3.tgz", + "integrity": "sha512-4UyCjLJwU/WxR6K1/gG4u3+jUsoaRHJ5rNu9fto/UbvrItwdlVNULChAApqZFw6mcSetMddSjSICeuj5pSB6sA==", "cpu": [ "arm64" ], @@ -4143,9 +5146,9 @@ ] }, "node_modules/@rspack/binding-darwin-x64": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-2.1.5.tgz", - "integrity": "sha512-KLW7PV86jyCOyqJSqrkZdvYUWYCFX/Q4LsGmVc8tyDA8jBYLMHJDewC/lNf9ot3rU2SoLDZKhDUh7q7dX0FRmg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-2.0.3.tgz", + "integrity": "sha512-K3evrbTgZNa8emEqk+AjDtbuoXZp5tPZz3pcEgETxuu3KanW8Zu+Fb+TUp1DEUcL0xOmHPPox8H2cZ3pF4Zmug==", "cpu": [ "x64" ], @@ -4157,16 +5160,13 @@ ] }, "node_modules/@rspack/binding-linux-arm64-gnu": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-2.1.5.tgz", - "integrity": "sha512-KOooAC8L+Ljx5sY7ZuMeaXCQ310FNWaPWXcYQJpFPApF3qyLeSfuOftUGwxcxeo5U0mS5OY3zxp7/5CaHWKYjg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-2.0.3.tgz", + "integrity": "sha512-aPLDaaTtX1wqjLYAIHc2MGDQZtv1Hbjx47oaaefbWz5GbAnSA4P8jdYIeeGRyrqvQ0WqJXIWXgT0d/iXtes00A==", "cpu": [ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -4174,50 +5174,13 @@ ] }, "node_modules/@rspack/binding-linux-arm64-musl": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-2.1.5.tgz", - "integrity": "sha512-0GFc07gT71+uRbHtejDecBfSL0fs7dQAwCtXYieXboACauL7UvS3Hwr6v8A91aGtAcvLotnCaIa3CWWYwtYlYQ==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-2.0.3.tgz", + "integrity": "sha512-0WulUQPop6vmSDfrTxghmVlm+6crU8/XqD2f0dOWbEniZVuDZJ5/Y/cBqTRyk3rjl0vrmUv3lc87/t7UgQJQSw==", "cpu": [ "arm64" ], "dev": true, - "libc": [ - "musl" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rspack/binding-linux-riscv64-gnu": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-2.1.5.tgz", - "integrity": "sha512-isQQDp3fBzPSZpLVFzPqVXIVA4I9b9mKs58TfUgOzDP/1g1582YSV3iFopgFogvEliihXDuuXvM6aAkP+w8Z+Q==", - "cpu": [ - "riscv64" - ], - "dev": true, - "libc": [ - "glibc" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rspack/binding-linux-riscv64-musl": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-2.1.5.tgz", - "integrity": "sha512-/SP6VknY4kH60BYplI2FDNAJCo4U4DUszLxhKsgVlgA5ImgHC8Ew2AsKgidk7ceiYV9OcKzYuWYe9tVpysBYVA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -4225,16 +5188,13 @@ ] }, "node_modules/@rspack/binding-linux-x64-gnu": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-2.1.5.tgz", - "integrity": "sha512-/GJmS+buA4pilT10gs5mfAhAZxSHXpDD8veZ3QpYvNUuoU9gvempAq9TgjbyNN/vc5pf76GdXPXKFMiehudYSA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-2.0.3.tgz", + "integrity": "sha512-fAhiMuV5omT53YMft+f3Y9euAFgspuyBAk9ZpeW2buL2TkuUMwP07adhhvQfKdQ5gpELfzmjQaRDGqaIT8UWiA==", "cpu": [ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -4242,16 +5202,13 @@ ] }, "node_modules/@rspack/binding-linux-x64-musl": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-2.1.5.tgz", - "integrity": "sha512-iwS3t75nZ2TnUjB05KtvpvjpdkOy/nLxbaOnwjbdnNZZXpUaMadLbllGAWayHPGCMsL2yKBEhVEESZpR7tK3SA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-2.0.3.tgz", + "integrity": "sha512-0kcuFoZ8vy2iNWoISFOZt+/Ujo7LRLrzE7h07AV5r+oN/mv+/v14Sd/8NUtDIScCkrYOszYq/QS31e6t0UrVfw==", "cpu": [ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -4259,9 +5216,9 @@ ] }, "node_modules/@rspack/binding-wasm32-wasi": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-2.1.5.tgz", - "integrity": "sha512-jOhW69t1H/jcRaSMB5U8jVzWP18j0YQIlo0nT8W+KvNVScJeyOze4FFc+5RIS7VmuT8/jid7hUyydZOfm6UgqA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-2.0.3.tgz", + "integrity": "sha512-x2fsw7GzNZEnw444ikj4/b8kVjM0Y0TllxmizHpYZ9gmaQrOk5OXo9RQdz+l4zzoGors0l2IZP5Cc4GJNCaSoQ==", "cpu": [ "wasm32" ], @@ -4269,15 +5226,15 @@ "license": "MIT", "optional": true, "dependencies": { - "@emnapi/core": "1.11.2", - "@emnapi/runtime": "1.11.2", - "@napi-rs/wasm-runtime": "1.1.6" + "@emnapi/core": "1.10.0", + "@emnapi/runtime": "1.10.0", + "@napi-rs/wasm-runtime": "1.1.4" } }, "node_modules/@rspack/binding-win32-arm64-msvc": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-2.1.5.tgz", - "integrity": "sha512-OLfMXmtFBcrWr9BRGKXJYrWgYR0JSaoAWr3EVFDjKGi/YR5aUwQSGc3AJPBph9g0YsdSqRuUhtQGtCk84DeeEA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-2.0.3.tgz", + "integrity": "sha512-jqlxuVPdrgMuwj/HEjSkC/jmhl4fAuKyob36zJXq2uAusn2FRJ4kClGe1fLFpfxRXFVQAWwlAOwLJg8T0suuaA==", "cpu": [ "arm64" ], @@ -4289,9 +5246,9 @@ ] }, "node_modules/@rspack/binding-win32-ia32-msvc": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-2.1.5.tgz", - "integrity": "sha512-p4OSmnj21+AY8vpIADveLEBXfXJRXonOTYim2VLVWV4TbXfhYNMLiX3qESHCdNnn6lVJM0q6zxxzEUfTyAKydw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-2.0.3.tgz", + "integrity": "sha512-QM4JEuyk5QaZ5gnvnAIaCwVQzCkrD2E4Sud77kx/MVGDsRkcOlMx3blMC5QNHPDamRmWGk+7314YOQvRhKuWyg==", "cpu": [ "ia32" ], @@ -4303,9 +5260,9 @@ ] }, "node_modules/@rspack/binding-win32-x64-msvc": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-2.1.5.tgz", - "integrity": "sha512-YCkLLDGMkHsw5CpcsFtFhzCu+JZEsNrcH9O1GpWMkyxR2ku2Fq1i2wEHYSm26HyW+PJ3+Fv347MPWMFZIz9q2g==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-2.0.3.tgz", + "integrity": "sha512-vSQNnAy0wswG6AfNRuArTHQBiXOXl+A9ddQxBFup4PMHUzXxKtsBLQzw7BgFC0EgrPeHbt+30j7sXVZKYukj4A==", "cpu": [ "x64" ], @@ -4317,9 +5274,9 @@ ] }, "node_modules/@rspack/cli": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/cli/-/cli-2.1.5.tgz", - "integrity": "sha512-N6Bm8sxHwatNoiZR68+/VKvVMDh19ya39t2Nfxu1/fBmGCrQX1ct8uPooVSysLtUF2Qx31sSRl1DX1SS0eYt2A==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rspack/cli/-/cli-2.0.3.tgz", + "integrity": "sha512-h/Xbkupx82UaPr5Ye3hNORi5eXmpEGSPri7WkEOrKIcT+Y3h603kujCQziNIPX3G4UURWPiksIArp1GBTF+A9w==", "dev": true, "license": "MIT", "bin": { @@ -4336,20 +5293,20 @@ } }, "node_modules/@rspack/core": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@rspack/core/-/core-2.1.5.tgz", - "integrity": "sha512-YHjL7xVXycAWsjJtF39cRZ2u+ddiNFxY+FcNgEBe6Y8OaLeUfMfjba3gK+B1Oj32UcKD6BmXGsPfu9p+OII/Yw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@rspack/core/-/core-2.0.3.tgz", + "integrity": "sha512-2ufO/8FHIA/lX6UOgSsKPhpDvHr0sh9lYq/n/LsIZsTwu3973BGbu2fg1Akvuu3rEnskPqXjsqH2EPBzEA42uA==", "dev": true, "license": "MIT", "dependencies": { - "@rspack/binding": "2.1.5" + "@rspack/binding": "2.0.3" }, "engines": { "node": "^20.19.0 || >=22.12.0" }, "peerDependencies": { "@module-federation/runtime-tools": "^0.24.1 || ^2.0.0", - "@swc/helpers": "^0.5.23" + "@swc/helpers": ">=0.5.1" }, "peerDependenciesMeta": { "@module-federation/runtime-tools": { @@ -4496,9 +5453,9 @@ } }, "node_modules/@tybys/wasm-util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz", - "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==", + "version": "0.10.2", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz", + "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==", "dev": true, "license": "MIT", "optional": true, @@ -4701,9 +5658,9 @@ "license": "MIT" }, "node_modules/@types/d3-random": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.4.tgz", - "integrity": "sha512-UHYId5WTCx4L4YNel7NU00XUXXgvgpgZOvp10PuvsQENjMDXhh2RyFc0KBjO7B45ne4Ha1yVH7ii0vnzKkuzWA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz", + "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==", "license": "MIT" }, "node_modules/@types/d3-scale": { @@ -4773,6 +5730,30 @@ "@types/d3-selection": "*" } }, + "node_modules/@types/eslint": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", + "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/eslint-scope": { + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, "node_modules/@types/estree": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", @@ -4834,14 +5815,14 @@ "peer": true }, "node_modules/@types/node": { - "version": "26.1.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.1.tgz", - "integrity": "sha512-nxAkRSVkN1Y0JC1W8ky/fTfkGsMmcrRsbx+3XoZE+rMOX71kLYTV7fLXpqud1GpbpP5TuffXFqfX7fH2GgZREw==", + "version": "25.8.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.8.0.tgz", + "integrity": "sha512-TCFSk8IZh+iLX1xtksoBVtdmgL+1IX0fC9BeU4QqFSuNdN/K+HUlhqOzEmSYYpZUVsLYcPqc9KX+60iDuninSQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "undici-types": "~8.3.0" + "undici-types": ">=7.24.0 <7.24.7" } }, "node_modules/@types/trusted-types": { @@ -5196,9 +6177,9 @@ } }, "node_modules/acorn": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz", - "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", + "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -5207,6 +6188,20 @@ "node": ">=0.4.0" } }, + "node_modules/acorn-import-phases": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz", + "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=10.13.0" + }, + "peerDependencies": { + "acorn": "^8.14.0" + } + }, "node_modules/agent-base": { "version": "7.1.4", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", @@ -5292,15 +6287,28 @@ } }, "node_modules/android-versions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-2.2.0.tgz", - "integrity": "sha512-lrad0HHmy9406sSmBHYIetx4n3WMnVVD+HMv7C+YJrByLFGPYWvlM1WcYrYL+e2s1GErvRF85nWsRY7RpwIGLw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-2.1.1.tgz", + "integrity": "sha512-dYeO3KHDO81WvEwZFK+OF0dJl/ESvxV3QZE/qo/AAnG/uijco6DOXJJla3CdoC8Eg53YBlbRIyobRGYqIAGw8Q==", "dev": true, "license": "MIT", "dependencies": { "semver": "^7.5.2" } }, + "node_modules/android-versions/node_modules/semver": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.3.tgz", + "integrity": "sha512-wnilbGyMxzbY7dNOl7jpKbLSjcfeweJWU5j4+u5qW+6/wuGD9KzIGOyZnQVSBM9E7DtWaaH3CyHkppYrKYoxwg==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/ansi": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz", @@ -5493,9 +6501,9 @@ "license": "MIT" }, "node_modules/archiver-utils/node_modules/brace-expansion": { - "version": "1.1.16", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", - "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", + "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", "dev": true, "license": "MIT", "dependencies": { @@ -5546,9 +6554,9 @@ "license": "MIT" }, "node_modules/archiver/node_modules/brace-expansion": { - "version": "1.1.16", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", - "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", + "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", "dev": true, "license": "MIT", "dependencies": { @@ -5717,9 +6725,9 @@ } }, "node_modules/autoprefixer": { - "version": "10.5.4", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.4.tgz", - "integrity": "sha512-MaU0U/za7N3r6brxD4YB/l4NSrFzLPlANv6wEuQVaIPlD3L4W9rFcQPbL/EilY9BHhHvhfcz3gInDLrEtWT4EA==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.0.tgz", + "integrity": "sha512-FMhOoZV4+qR6aTUALKX2rEqGG+oyATvwBt9IIzVR5rMa2HRWPkxf+P+PAJLD1I/H5/II+HuZcBJYEFBpq39ong==", "dev": true, "funding": [ { @@ -5737,8 +6745,8 @@ ], "license": "MIT", "dependencies": { - "browserslist": "^4.28.6", - "caniuse-lite": "^1.0.30001806", + "browserslist": "^4.28.2", + "caniuse-lite": "^1.0.30001787", "fraction.js": "^5.3.4", "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" @@ -5849,9 +6857,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.11.3", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.3.tgz", - "integrity": "sha512-sbT0Ui/CZwyAyy7icT1Gw5P1LKRlFaHwaF6tDCW5YHq2X5SeeZFphBuIagopSfwSSZq3sQcbmEL072yphxm7ew==", + "version": "2.10.30", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.30.tgz", + "integrity": "sha512-xjOFN16Ha1+Rz4nFYKqHU/LSB+gx/Vi3yQLX7r7sAW+Wa+8hhF2h4pvqTrTMc8+WcDBEunnUurr46Jvv0jk3Vg==", "dev": true, "license": "Apache-2.0", "bin": { @@ -5891,9 +6899,9 @@ } }, "node_modules/bin-links": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-6.0.2.tgz", - "integrity": "sha512-frE1t78WOwJ45PKV2cF2tNPjTcs9L1J9s6VkrV59wanRP4GlaomuxYPVma7BwthMg8WnfSory4w5PTE6FZZ81w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-6.0.0.tgz", + "integrity": "sha512-X4CiKlcV2GjnCMwnKAfbVWpHa++65th9TuzAEYtZoATiOE2DQKhSp4CJlyLoTqdhBKlXjpXjCTYPNNFS33Fi6w==", "license": "ISC", "dependencies": { "cmd-shim": "^8.0.0", @@ -5971,9 +6979,9 @@ } }, "node_modules/body-parser": { - "version": "1.20.6", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.6.tgz", - "integrity": "sha512-p5tAzS57i5MV9fZFDj9LeIiTZEufbSe2eDozP+ElheSUq1m74CRq1jI4mYNDdVs9vQztXFLuk/Gd6BWTdwRJ5g==", + "version": "1.20.5", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.5.tgz", + "integrity": "sha512-3grm+/2tUOvu2cjJkvsIxrv/wVpfXQW4PsQHYm7yk4vfpu7Ekl6nEsYBoJUL6qDwZUx8wUhQ8tR2qz+ad9c9OA==", "dev": true, "license": "MIT", "dependencies": { @@ -6141,15 +7149,15 @@ } }, "node_modules/brace-expansion": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz", - "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", + "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", "license": "MIT", "dependencies": { "balanced-match": "^4.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" } }, "node_modules/braces": { @@ -6172,9 +7180,9 @@ "license": "ISC" }, "node_modules/browserslist": { - "version": "4.28.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.7.tgz", - "integrity": "sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==", + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz", + "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==", "dev": true, "funding": [ { @@ -6192,10 +7200,10 @@ ], "license": "MIT", "dependencies": { - "baseline-browser-mapping": "^2.10.44", - "caniuse-lite": "^1.0.30001806", - "electron-to-chromium": "^1.5.393", - "node-releases": "^2.0.51", + "baseline-browser-mapping": "^2.10.12", + "caniuse-lite": "^1.0.30001782", + "electron-to-chromium": "^1.5.328", + "node-releases": "^2.0.36", "update-browserslist-db": "^1.2.3" }, "bin": { @@ -6385,9 +7393,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001806", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001806.tgz", - "integrity": "sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw==", + "version": "1.0.30001793", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz", + "integrity": "sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==", "dev": true, "funding": [ { @@ -6576,9 +7584,9 @@ "license": "MIT" }, "node_modules/cli/node_modules/brace-expansion": { - "version": "1.1.16", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", - "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", + "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", "dev": true, "license": "MIT", "dependencies": { @@ -6631,25 +7639,8 @@ "strip-ansi": "^7.1.0", "wrap-ansi": "^9.0.0" }, - "engines": { - "node": ">=20" - } - }, - "node_modules/cliui/node_modules/string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "license": "MIT", - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": ">=20" } }, "node_modules/clone-response": { @@ -6924,6 +7915,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/conf/node_modules/semver": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/configstore": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", @@ -7049,9 +8053,9 @@ } }, "node_modules/cordova-android": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-15.1.0.tgz", - "integrity": "sha512-mnOnOisYUVhyrLCPVlHJBKh4ro+X6nZA7nPqBrpVnyTpiiDiakNCfbBJjSs1MTBUJZ6dcmhhvNKZWPT9w6aGPA==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-15.0.0.tgz", + "integrity": "sha512-EpFSKUtBLJ7bTpuVD7NeC6toAooi5PI6VIR2jd8Ut5PJu7HSR5tPRwS87Q1DS03RSyDTlroB64JPUWC0pmAhnw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -7072,6 +8076,19 @@ "node": ">=20.17.0 || >=22.9.0" } }, + "node_modules/cordova-android/node_modules/semver": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.3.tgz", + "integrity": "sha512-wnilbGyMxzbY7dNOl7jpKbLSjcfeweJWU5j4+u5qW+6/wuGD9KzIGOyZnQVSBM9E7DtWaaH3CyHkppYrKYoxwg==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/cordova-app-hello-world": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-7.0.0.tgz", @@ -7153,6 +8170,18 @@ "node": ">=18" } }, + "node_modules/cordova-fetch/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/cordova-fetch/node_modules/which": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", @@ -7188,6 +8217,18 @@ "node": ">=20.17.0 || >=22.9.0" } }, + "node_modules/cordova-lib/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/cordova-lib/node_modules/signal-exit": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", @@ -7353,6 +8394,18 @@ "node": ">= 8" } }, + "node_modules/cordova/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/core-js": { "version": "3.49.0", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.49.0.tgz", @@ -7406,9 +8459,9 @@ } }, "node_modules/cosmiconfig": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.2.tgz", - "integrity": "sha512-gtTZxTDau1wL7Y7zifc2dd8jHSK/k6BTx/2Xp/BpdlAdnlYWFVt7qhJqgwi7637yRwRQ3qL4ZidbB4I8tA5VOg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.1.tgz", + "integrity": "sha512-hr4ihw+DBqcvrsEDioRO31Z17x71pUYoNe/4h6Z0wB72p7MU7/9gH8Q3s12NFhHPfYBBOV3qyfUxmr/Yn3shnQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7472,9 +8525,9 @@ } }, "node_modules/crelt": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.7.tgz", - "integrity": "sha512-aK6BbWfhf4U/wCcLHKPJl/xa6VkVstRaPywWtMKGwuOLc/wZTyQYuoxgvZnNsBvv7Kg3YTBQYYBCggcviQczuA==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", + "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==", "license": "MIT" }, "node_modules/cross-spawn": { @@ -7557,6 +8610,19 @@ } } }, + "node_modules/css-loader/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", @@ -7583,9 +8649,9 @@ } }, "node_modules/cytoscape": { - "version": "3.34.0", - "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.34.0.tgz", - "integrity": "sha512-62rNSrioXw93uliKFBwjukeQyeWwH2PqDrTac31r2P6464u3AUvTk0xS4LVvT251g7IgkFunrI48ZEZGjywSOg==", + "version": "3.33.3", + "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.3.tgz", + "integrity": "sha512-Gej7U+OKR+LZ8kvX7rb2HhCYJ0IhvEFsnkud4SB1PR+BUY/TsSO0dmOW59WEVLu51b1Rm+gQRKoz4bLYxGSZ2g==", "license": "MIT", "engines": { "node": ">=0.10" @@ -8110,9 +9176,9 @@ "dev": true }, "node_modules/dayjs": { - "version": "1.11.21", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.21.tgz", - "integrity": "sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==", + "version": "1.11.20", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.20.tgz", + "integrity": "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==", "license": "MIT" }, "node_modules/debounce-fn": { @@ -8400,9 +9466,9 @@ } }, "node_modules/dompurify": { - "version": "3.4.12", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.12.tgz", - "integrity": "sha512-zQvGet8Z2sWbQhCmfFz/T5QWH2oBmjnqK3qvOjaqaNLrLEF912WamU+ohnTp0TCep/MFVHpdJuCZEdFOdTnEFg==", + "version": "3.4.11", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.11.tgz", + "integrity": "sha512-zhlUV12GsaRzMsf9q5M254YhA4+VuF0fG+QFqu6aYpoGlKtz+w8//jBcGVYBgQkR5GHjUomejY84AV+/uPbWdw==", "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { "@types/trusted-types": "^2.0.7" @@ -8477,9 +9543,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.396", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.396.tgz", - "integrity": "sha512-yHiw2Y3C3H9U6TMbOfoWK/BPreiOPXRfTWPBwQBoZG6/8TB6eOPnsy5oaRYuatR7Fw2SJ4kKforgufeo7fq0EQ==", + "version": "1.5.357", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.357.tgz", + "integrity": "sha512-NHlTIQDK8fmVwHwuIzmXYEJ1Ewq3D9wDNc0cWXxDGysP6Pb21giwGNkxiTifyKy/4SoPuN5l6GLP1W9Sv7zB2g==", "dev": true, "license": "ISC" }, @@ -8586,12 +9652,11 @@ "license": "MIT" }, "node_modules/enhanced-resolve": { - "version": "5.24.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.24.3.tgz", - "integrity": "sha512-PwKooW9JUzh5chmYfHM3IQl5OkK2u2Nm011MgeZrss3JmFraUx/fqrf78kk8GUMYoibx/14MdwTl/1WKkG7TpQ==", + "version": "5.21.3", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.3.tgz", + "integrity": "sha512-QyL119InA+XXEkNLNTPCXPugSvOfhwv0JOlGNzvxs0hZaiHLNvXSpudUWsOlsXGWJh8G6ckCScEkVHfX3kw/2Q==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.3.3" @@ -8658,9 +9723,9 @@ } }, "node_modules/es-module-lexer": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.1.tgz", - "integrity": "sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz", + "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==", "dev": true, "license": "MIT", "peer": true @@ -8679,14 +9744,13 @@ } }, "node_modules/es-toolkit": { - "version": "1.50.0", - "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.50.0.tgz", - "integrity": "sha512-OyZKhUVvEep9ITEiwHn8GKnMRQIVqoSIX7WnRbkWgJkllCujilqP2rD0u979tkl8wqyc8ICwlc1UBVv/Sl1G6w==", + "version": "1.46.1", + "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.46.1.tgz", + "integrity": "sha512-5eNtXOs3tbfxXOj04tjjseeWkRWaoCjdEI+96DgwzZoe6c9juL49pXlzAFTI72aWC9Y8p7168g6XIKjh7k6pyQ==", "license": "MIT", "workspaces": [ "docs", - "benchmarks", - "tests/types" + "benchmarks" ] }, "node_modules/escalade": { @@ -9056,9 +10120,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.4.tgz", - "integrity": "sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", + "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", "dev": true, "funding": [ { @@ -9122,9 +10186,9 @@ } }, "node_modules/filesize": { - "version": "11.0.22", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-11.0.22.tgz", - "integrity": "sha512-RlCVs9CY+oSsRnNZn95J9vDXjNjOwddKyTFjOYtA4yxYVIxBnwiVVGJX+TFhsmu3uUf81JDGyijtYL9xgawlTw==", + "version": "11.0.17", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-11.0.17.tgz", + "integrity": "sha512-oHLTvMLw6imZUl1se/RBQrFlyy50nXce4sU7yGR6Qc0JgCwqnfiFsAnEwotdGmfKLD7SArGUk2/5STU0k8LOBQ==", "license": "BSD-3-Clause", "engines": { "node": ">= 10.8.0" @@ -9278,12 +10342,12 @@ } }, "node_modules/framer-motion": { - "version": "12.42.2", - "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.42.2.tgz", - "integrity": "sha512-5XY9luDiu0oHfHBjpDthFMh0ES+122w6p/papSJBweMkO8Sn+PW2QaEgRblQBpWFnuvZS5qvarpt/hO2pjGmnw==", + "version": "12.42.0", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.42.0.tgz", + "integrity": "sha512-wp7EJnfWaaEScVygKv3e20udoRz+LbtxScsuTkakAxfXmt+ReC6WyPW2nINRAGvd+hG9odwcjBLyOTPjH5pBRA==", "license": "MIT", "dependencies": { - "motion-dom": "^12.42.2", + "motion-dom": "^12.42.0", "motion-utils": "^12.39.0", "tslib": "^2.4.0" }, @@ -9579,6 +10643,14 @@ "node": ">= 6" } }, + "node_modules/glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true, + "license": "BSD-2-Clause", + "peer": true + }, "node_modules/global-dirs": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", @@ -9786,9 +10858,9 @@ } }, "node_modules/hasown": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz", - "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.3.tgz", + "integrity": "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==", "license": "MIT", "dependencies": { "function-bind": "^1.1.2" @@ -10035,9 +11107,9 @@ "license": "MIT" }, "node_modules/immutable": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.9.tgz", - "integrity": "sha512-m8nVez3rwrgmWxtLMt1ZYXB2Lv7OKYn/disyxAlSDYAlKSlFoPPfIAmAM/M5xqL4m4C/wAPw7S2/CNaUii1Hxg==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz", + "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==", "dev": true, "license": "MIT" }, @@ -10190,6 +11262,19 @@ "node": ">=10" } }, + "node_modules/init-package-json/node_modules/semver": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/init-package-json/node_modules/validate-npm-package-name": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", @@ -10200,13 +11285,6 @@ "builtins": "^1.0.3" } }, - "node_modules/init-package-json/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "license": "ISC" - }, "node_modules/inquirer": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", @@ -10448,9 +11526,9 @@ } }, "node_modules/ip-address": { - "version": "10.3.1", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.3.1.tgz", - "integrity": "sha512-1e9d3kb97NHJTIJDZW9rKqW2h6+dFa50Dy0fpPSMQp2ADje5gvKsXmdiK6dwY5t76TaTt5+P5N1Y/LoToIxP6g==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", + "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", "license": "MIT", "engines": { "node": ">= 12" @@ -10762,16 +11840,16 @@ } }, "node_modules/js-tokens": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", - "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "dev": true, "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz", - "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz", + "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==", "dev": true, "funding": [ { @@ -10838,9 +11916,9 @@ "license": "MIT" }, "node_modules/jshint/node_modules/brace-expansion": { - "version": "1.1.16", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", - "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", + "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", "dev": true, "license": "MIT", "dependencies": { @@ -11092,9 +12170,9 @@ "license": "MIT" }, "node_modules/linkify-it": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.2.tgz", - "integrity": "sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.1.tgz", + "integrity": "sha512-wVoTjP4Q6R0NW5hiZkVJaFZPWgtXfoGF+6LucL3/FtiNjmcHhYjEr5f1Kqjirc1nBW07J/ZuRFumqr2oqccEWg==", "funding": [ { "type": "github", @@ -11110,6 +12188,21 @@ "uc.micro": "^2.0.0" } }, + "node_modules/loader-runner": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.2.tgz", + "integrity": "sha512-DFEqQ3ihfS9blba08cLfYf1NRAIEm+dDjic073DRDc3/JspI/8wYmtDsHwd3+4hwvdxSK7PGaElfTmm0awWJ4w==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6.11.5" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, "node_modules/loader-utils": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", @@ -11247,9 +12340,9 @@ } }, "node_modules/lru-cache": { - "version": "11.5.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz", - "integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==", + "version": "11.5.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.1.tgz", + "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==", "license": "BlueOak-1.0.0", "engines": { "node": "20 || >=22" @@ -11283,19 +12376,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/make-fetch-happen": { - "version": "15.0.6", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.6.tgz", - "integrity": "sha512-Je0fLJ0F5atA7F+eIlLzk+Wkcl57JDf4kf+EW8xiP5E31xOQxkIxTbgf1Oi1Lw9tRI9UEMRdI5Vz2xTzoNU1Jw==", + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.5.tgz", + "integrity": "sha512-uCbIa8jWWmQZt4dSnEStkVC6gdakiinAm4PiGsywIkguF0eWMdcjDz0ECYhUolFU3pFLOev9VNPCEygydXnddg==", "license": "ISC", "dependencies": { "@gar/promise-retry": "^1.0.0", @@ -11316,9 +12400,9 @@ } }, "node_modules/markdown-it": { - "version": "14.3.0", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.3.0.tgz", - "integrity": "sha512-RCEsPjR+sr0x+AuYp601tKTkgFG4YEPLCzHST3cQ/fhlJkqAkz1L2/Qbp1j9qw5SBwQHFBoW8+hoN5xssOF0Tw==", + "version": "14.2.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.2.0.tgz", + "integrity": "sha512-1TGiQiJVRQ3NPmZH6sx5Cfnmg6GQm9jvC1ch4TK511NjSJvjzKLzn5pPfZRNZkRPZP0HqCioSndqH8v2nRaWVQ==", "funding": [ { "type": "github", @@ -11332,8 +12416,8 @@ "license": "MIT", "dependencies": { "argparse": "^2.0.1", - "entities": "^4.5.0", - "linkify-it": "^5.0.2", + "entities": "^4.4.0", + "linkify-it": "^5.0.1", "mdurl": "^2.0.0", "punycode.js": "^2.3.1", "uc.micro": "^2.1.0" @@ -11343,9 +12427,9 @@ } }, "node_modules/markdown-it-anchor": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-9.2.1.tgz", - "integrity": "sha512-p6APiLJDFAW2GEvaavDvhIBn7jrX2jLv77NkBGgNacFTurbORYc4pyYySg/mI6mpR6cHQuAtzKtmqgQr4K8dsQ==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-9.2.0.tgz", + "integrity": "sha512-sa2ErMQ6kKOA4l31gLGYliFQrMKkqSO0ZJgGhDHKijPf0pNFM9vghjAh3gn26pS4JDRs7Iwa9S36gxm3vgZTzg==", "license": "Unlicense", "peerDependencies": { "@types/markdown-it": "*", @@ -11353,9 +12437,9 @@ } }, "node_modules/markdown-it-emoji": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-3.1.0.tgz", - "integrity": "sha512-NhmMEH2ywduD4Nty1E8uB5NqfLhAT1VR0dyvoJyStKOqCzbZmVdn/+8wj7zpDsb/fLBikpCPsWwxqKlvMmbz4g==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-3.0.0.tgz", + "integrity": "sha512-+rUD93bXHubA4arpEZO3q80so0qgoFJEKRkRbjKX8RTdca89v2kfyF+xR3i2sQTwql9tpPZPOQN5B+PunspXRg==", "license": "MIT" }, "node_modules/markdown-it-footnote": { @@ -11424,9 +12508,9 @@ } }, "node_modules/mdurl": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.1.0.tgz", - "integrity": "sha512-1+HBaOx0zi/dQWht8rNv9MYf9qqpqL/kxI0hXImU6Y547zM6Sni8BQibt7ifgMcYtQg41ao3Ivd6cnSM86inpg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", + "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", "license": "MIT" }, "node_modules/media-typer": { @@ -11465,26 +12549,26 @@ } }, "node_modules/mermaid": { - "version": "11.16.0", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.16.0.tgz", - "integrity": "sha512-Zvm3kbstgdpvIJPPItlL7fppIZ3kibvc1oZIGxdvk9t6UFz6flv+Jw7FtRGKwfcI8OckmH04LqG6LlS6X4B1pA==", + "version": "11.15.0", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.15.0.tgz", + "integrity": "sha512-pTMbcf3rWdtLiYGpmoTjHEpeY8seiy6sR+9nD7LOs8KfUbHE4lOUAprTRqRAcWSQ6MQpdX+YEsxShtGsINtPtw==", "license": "MIT", "dependencies": { - "@braintree/sanitize-url": "^7.1.2", + "@braintree/sanitize-url": "^7.1.1", "@iconify/utils": "^3.0.2", - "@mermaid-js/parser": "^1.2.0", + "@mermaid-js/parser": "^1.1.1", "@types/d3": "^7.4.3", "@upsetjs/venn.js": "^2.0.0", - "cytoscape": "^3.33.3", + "cytoscape": "^3.33.1", "cytoscape-cose-bilkent": "^4.1.0", "cytoscape-fcose": "^2.2.0", "d3": "^7.9.0", "d3-sankey": "^0.12.3", "dagre-d3-es": "7.0.14", - "dayjs": "^1.11.20", - "dompurify": "^3.3.3", + "dayjs": "^1.11.19", + "dompurify": "^3.3.1", "es-toolkit": "^1.45.1", - "katex": "^0.16.45", + "katex": "^0.16.25", "khroma": "^2.1.0", "marked": "^16.3.0", "roughjs": "^4.6.6", @@ -11643,68 +12727,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/minimizer-webpack-plugin": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/minimizer-webpack-plugin/-/minimizer-webpack-plugin-5.6.1.tgz", - "integrity": "sha512-DoeAZz8Q1C1znwsUzej1fdoi4jCf7/+Em27ouLqfK/+3m8G+D7yDhUwrc3CNhjSzGUN1kn7Iv4sWmjflQHenpw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.25", - "jest-worker": "^27.4.5", - "schema-utils": "^4.3.0", - "terser": "^5.31.1" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" - }, - "peerDependenciesMeta": { - "@minify-html/node": { - "optional": true - }, - "@swc/core": { - "optional": true - }, - "@swc/css": { - "optional": true - }, - "@swc/html": { - "optional": true - }, - "clean-css": { - "optional": true - }, - "cssnano": { - "optional": true - }, - "csso": { - "optional": true - }, - "esbuild": { - "optional": true - }, - "html-minifier-terser": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "postcss": { - "optional": true - }, - "uglify-js": { - "optional": true - } - } - }, "node_modules/minipass": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", @@ -11744,9 +12766,9 @@ } }, "node_modules/minipass-fetch/node_modules/iconv-lite": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz", - "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", + "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", "license": "MIT", "optional": true, "dependencies": { @@ -11784,12 +12806,6 @@ "node": ">=8" } }, - "node_modules/minipass-flush/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - }, "node_modules/minipass-json-stream": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz", @@ -11814,13 +12830,6 @@ "node": ">=8" } }, - "node_modules/minipass-json-stream/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "license": "ISC" - }, "node_modules/minipass-pipeline": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", @@ -11845,12 +12854,6 @@ "node": ">=8" } }, - "node_modules/minipass-pipeline/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - }, "node_modules/minipass-sized": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-2.0.0.tgz", @@ -11950,9 +12953,9 @@ "license": "MIT" }, "node_modules/mocha/node_modules/brace-expansion": { - "version": "1.1.16", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", - "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", + "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", "dev": true, "license": "MIT", "dependencies": { @@ -12273,12 +13276,12 @@ } }, "node_modules/motion": { - "version": "12.42.2", - "resolved": "https://registry.npmjs.org/motion/-/motion-12.42.2.tgz", - "integrity": "sha512-Atvv11yUKIid41cVrRBDVX5m8tF8kNpExRSlbpt6APClhDjtwQssgFHhQzejxw7/7YYbjHSPKBVbHo05BuJT5Q==", + "version": "12.42.0", + "resolved": "https://registry.npmjs.org/motion/-/motion-12.42.0.tgz", + "integrity": "sha512-Qhwvu9sVl5/URSq5CNzwMCpSKK8Uhnrwb6VO977kZyj/wOCS7mWebJUnBoHx5cZU1Zv8a9BD5CSICWKAlrLJgA==", "license": "MIT", "dependencies": { - "framer-motion": "^12.42.2", + "framer-motion": "^12.42.0", "tslib": "^2.4.0" }, "peerDependencies": { @@ -12299,9 +13302,9 @@ } }, "node_modules/motion-dom": { - "version": "12.42.2", - "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.42.2.tgz", - "integrity": "sha512-5gIMWLp/PycBtJRJWRgjxke5n8dlvkSn2DrYW+tr3XcqAZY1xZh6BJyooJXCM8wdfM7wfMjkBJNLge1CKPUIRA==", + "version": "12.42.0", + "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.42.0.tgz", + "integrity": "sha512-M63h4n8R+quJdNhBwuLlgxM+OLYa9+I/T2pzDRboB9fLXRdbou+Gw7Zury+SkpaCyACP1JHSjHgZ1EgTkBr30w==", "license": "MIT", "dependencies": { "motion-utils": "^12.39.0" @@ -12336,9 +13339,9 @@ "license": "ISC" }, "node_modules/nanoid": { - "version": "3.3.16", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz", - "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==", + "version": "3.3.12", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz", + "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==", "dev": true, "funding": [ { @@ -12379,9 +13382,9 @@ "optional": true }, "node_modules/node-gyp": { - "version": "12.4.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.4.0.tgz", - "integrity": "sha512-OMcPNvqTCFUnNaBlmdgq+lfNqY7gTiSmNRDjY3uAXRyudeKZEZxu3CLtjMQrx4zZxCX2b/mpNqTtwuCJgXhHkw==", + "version": "12.3.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.3.0.tgz", + "integrity": "sha512-QNcUWM+HgJplcPzBvFBZ9VXacyGZ4+VTOb80PwWR+TlVzoHbRKULNEzpRsnaoxG3Wzr7Qh7BYxGDU3CbKib2Yg==", "license": "MIT", "dependencies": { "env-paths": "^2.2.0", @@ -12402,16 +13405,25 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/node-releases": { - "version": "2.0.51", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.51.tgz", - "integrity": "sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==", - "dev": true, - "license": "MIT", + "node_modules/node-gyp/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, "engines": { - "node": ">=18" + "node": ">=10" } }, + "node_modules/node-releases": { + "version": "2.0.44", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.44.tgz", + "integrity": "sha512-5WUyunoPMsvvEhS8AxHtRzP+oA8UCkJ7YRxatWKjngndhDGLiqEVAQKWjFAiAiuL8zMRGzGSJxFnLetoa43qGQ==", + "dev": true, + "license": "MIT" + }, "node_modules/nopt": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-9.0.0.tgz", @@ -12469,12 +13481,18 @@ "node": ">=10" } }, - "node_modules/normalize-package-data/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "node_modules/normalize-package-data/node_modules/semver": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", "dev": true, - "license": "ISC" + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } }, "node_modules/normalize-path": { "version": "3.0.0", @@ -12520,6 +13538,18 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/npm-install-checks/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/npm-normalize-package-bin": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-5.0.0.tgz", @@ -12544,6 +13574,18 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/npm-package-arg/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/npm-packlist": { "version": "10.0.4", "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-10.0.4.tgz", @@ -12572,6 +13614,18 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/npm-pick-manifest/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/npm-registry-fetch": { "version": "19.1.1", "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-19.1.1.tgz", @@ -12667,9 +13721,9 @@ "license": "ISC" }, "node_modules/obug": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.4.tgz", - "integrity": "sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.3.tgz", + "integrity": "sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg==", "dev": true, "funding": [ "https://github.com/sponsors/sxzz", @@ -12825,9 +13879,9 @@ } }, "node_modules/p-map": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.6.tgz", - "integrity": "sha512-I4Prw6ivkd6p8PiYR1tXASOAOBzIJwu0TB7fqaX0c/8c3QAehNYmX57EijyGGGBt3c/BIowGwV03RVBtXvHEVg==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz", + "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==", "license": "MIT", "engines": { "node": ">=18" @@ -12862,26 +13916,16 @@ "node": ">=8" } }, - "node_modules/package-json/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/package-manager-detector": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.8.0.tgz", - "integrity": "sha512-yQA4H19AmPEoMUeavPMDIe1higySl/gH/yaQrkT/s07Qp+7pp2hYz30N3z2l5BkjVkF9Ow6o0wjJamm2y7Sn0A==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.6.0.tgz", + "integrity": "sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA==", "license": "MIT" }, "node_modules/pacote": { - "version": "21.5.1", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-21.5.1.tgz", - "integrity": "sha512-KvcJ9iy3crysCsgqc4+PknH/w6jkrp8JN36mpZBPwNaDRwTfMZD37YzRazNstiZUOhuF5pno9f78n9mEJBavwg==", + "version": "21.5.0", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-21.5.0.tgz", + "integrity": "sha512-VtZ0SB8mb5Tzw3dXDfVAIjhyVKUHZkS/ZH9/5mpKenwC9sFOXNI0JI7kEF7IMkwOnsWMFrvAZHzx1T5fmrp9FQ==", "license": "ISC", "dependencies": { "@gar/promise-retry": "^1.0.0", @@ -12960,38 +14004,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/parse-json/node_modules/@babel/code-frame": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", - "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.29.7", - "js-tokens": "^4.0.0", - "picocolors": "^1.1.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/parse-json/node_modules/@babel/helper-validator-identifier": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", - "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/parse-json/node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true, - "license": "MIT" - }, "node_modules/parse-json/node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -13120,9 +14132,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", - "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "license": "MIT", "engines": { "node": ">=12" @@ -13251,9 +14263,9 @@ } }, "node_modules/postcss": { - "version": "8.5.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.23.tgz", - "integrity": "sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==", + "version": "8.5.14", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.14.tgz", + "integrity": "sha512-SoSL4+OSEtR99LHFZQiJLkT59C5B1amGO1NzTwj7TT1qCUgUO6hxOvzkOYxD+vMrXBM3XJIKzokoERdqQq/Zmg==", "dev": true, "funding": [ { @@ -13271,7 +14283,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.16", + "nanoid": "^3.3.11", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -13311,6 +14323,19 @@ } } }, + "node_modules/postcss-loader/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/postcss-modules-extract-imports": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz", @@ -13375,9 +14400,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.4.tgz", - "integrity": "sha512-HeP7D2wyhkR+XaK6v4W8oRF62Dsz4flyuczALJp61GckGm42u1saSSJ/0auvcBqxs3jMRFEcPK34At/0JBKdOg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz", + "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==", "license": "MIT", "dependencies": { "cssesc": "^3.0.0", @@ -13405,9 +14430,9 @@ } }, "node_modules/prettier": { - "version": "3.9.6", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.6.tgz", - "integrity": "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==", + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz", + "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==", "dev": true, "license": "MIT", "bin": { @@ -13421,13 +14446,13 @@ } }, "node_modules/prettier-plugin-java": { - "version": "2.10.3", - "resolved": "https://registry.npmjs.org/prettier-plugin-java/-/prettier-plugin-java-2.10.3.tgz", - "integrity": "sha512-/g52mTbsN2ee8JjLRpBWGGmcmRhdv2zRWyj4QbsL9CQ+nKR022GRJhebwEpRyaCc8hLV6aO3JPGNQyXp1DPrCA==", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-java/-/prettier-plugin-java-2.9.1.tgz", + "integrity": "sha512-qdvMRgSlx5li5fkbIQlMAUSJQn8rIwP2Ux0U1Xg8ganHMAK4UOUoOG00GeZfoLRllSgNt5V3dZOlwUXPLoamSQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "web-tree-sitter": "0.26.11" + "web-tree-sitter": "0.26.8" }, "peerDependencies": { "prettier": "^3.0.0" @@ -13879,9 +14904,9 @@ "license": "MIT" }, "node_modules/read-package-json/node_modules/brace-expansion": { - "version": "1.1.16", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", - "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", + "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", "dev": true, "license": "MIT", "dependencies": { @@ -14266,9 +15291,9 @@ "license": "MIT" }, "node_modules/rimraf/node_modules/brace-expansion": { - "version": "1.1.16", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", - "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", + "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", "dev": true, "license": "MIT", "dependencies": { @@ -14401,13 +15426,13 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.102.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.102.0.tgz", - "integrity": "sha512-NSOyTnaQF7rTAEOtI2fwb386vL+akyiQLBZu8Na7hXCb+umJy0GAqlcMIaqACZ6Z1VgTBS4K9PG6B3IdjHGJsw==", + "version": "1.99.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.99.0.tgz", + "integrity": "sha512-kgW13M54DUB7IsIRM5LvJkNlpH+WhMpooUcaWGFARkF1Tc82v9mIWkCbCYf+MBvpIUBSeSOTilpZjEPr2VYE6Q==", "dev": true, "license": "MIT", "dependencies": { - "chokidar": "^5.0.0", + "chokidar": "^4.0.0", "immutable": "^5.1.5", "source-map-js": ">=0.6.2 <2.0.0" }, @@ -14415,7 +15440,7 @@ "sass": "sass.js" }, "engines": { - "node": ">=20.19.0" + "node": ">=14.0.0" }, "optionalDependencies": { "@parcel/watcher": "^2.4.1" @@ -14462,36 +15487,6 @@ } } }, - "node_modules/sass/node_modules/chokidar": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", - "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", - "dev": true, - "license": "MIT", - "dependencies": { - "readdirp": "^5.0.0" - }, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/sass/node_modules/readdirp": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", - "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - }, "node_modules/sax": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz", @@ -14519,15 +15514,12 @@ } }, "node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "license": "ISC", "bin": { "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" } }, "node_modules/semver-diff": { @@ -14543,16 +15535,6 @@ "node": ">=8" } }, - "node_modules/semver-diff/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/send": { "version": "0.19.2", "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", @@ -14745,17 +15727,17 @@ "license": "ISC" }, "node_modules/sigstore": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-4.1.1.tgz", - "integrity": "sha512-endqECJkfhozrXMK5ngu/UAA0xVcVEFdnHJCElGaExypjW+HK5i6zu3NteLoaX/iFbRUbC3+DjttQs0GARr+5w==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-4.1.0.tgz", + "integrity": "sha512-/fUgUhYghuLzVT/gaJoeVehLCgZiUxPCPMcyVNY0lIf/cTCz58K/WTI7PefDarXxp9nUKpEwg1yyz3eSBMTtgA==", "license": "Apache-2.0", "dependencies": { "@sigstore/bundle": "^4.0.0", - "@sigstore/core": "^3.2.1", + "@sigstore/core": "^3.1.0", "@sigstore/protobuf-specs": "^0.5.0", - "@sigstore/sign": "^4.1.1", - "@sigstore/tuf": "^4.0.2", - "@sigstore/verify": "^3.1.1" + "@sigstore/sign": "^4.1.0", + "@sigstore/tuf": "^4.0.1", + "@sigstore/verify": "^3.1.0" }, "engines": { "node": "^20.17.0 || >=22.9.0" @@ -14974,16 +15956,17 @@ } }, "node_modules/string-width": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.2.tgz", - "integrity": "sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", "license": "MIT", "dependencies": { - "get-east-asian-width": "^1.5.0", - "strip-ansi": "^7.1.2" + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=20" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -15098,9 +16081,9 @@ } }, "node_modules/systeminformation": { - "version": "5.33.1", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.33.1.tgz", - "integrity": "sha512-DEN6ICHk3Tk0Uf/hrAHh7xlt7iL5CJFBtPZinA0H62DrGG/KPKqq/Nzj6lCXPS4Ay/sf/14zNnk9LpqKzBIc+w==", + "version": "5.31.6", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.31.6.tgz", + "integrity": "sha512-Uv2b2uGGM6ns+26czgW2cYRabYdnswM0ddSOOlryHOaelzsmDSet1iM/NT7VOYxW8x/BW+HkY+b1Ve2pLTSGSA==", "license": "MIT", "os": [ "darwin", @@ -15116,7 +16099,7 @@ "systeminformation": "lib/cli.js" }, "engines": { - "node": ">=10.0.0" + "node": ">=8.0.0" }, "funding": { "type": "Buy me a coffee", @@ -15138,9 +16121,9 @@ } }, "node_modules/tar": { - "version": "7.5.22", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.22.tgz", - "integrity": "sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA==", + "version": "7.5.16", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.16.tgz", + "integrity": "sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==", "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", @@ -15185,6 +16168,15 @@ "node": ">= 6" } }, + "node_modules/tar/node_modules/yallist": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } + }, "node_modules/terminal": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/terminal/-/terminal-0.1.4.tgz", @@ -15198,9 +16190,9 @@ } }, "node_modules/terser": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.49.0.tgz", - "integrity": "sha512-SNiDnXyHSrxVcIOtVbULzcTmniUiwcV7Nwdyj1twVubeTmbjoa8p69KKDpfkdoOavuM4/GRm1+ykI8qqnavHoA==", + "version": "5.47.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.47.1.tgz", + "integrity": "sha512-tPbLXTI6ohPASb/1YViL428oEHu6/qv1OxqYnfaonVCFHqx4+wCd95pHrQWsL5X4pl90CTyW9piSAsS2L0VoMw==", "dev": true, "license": "BSD-2-Clause", "peer": true, @@ -15217,6 +16209,68 @@ "node": ">=10" } }, + "node_modules/terser-webpack-plugin": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.6.0.tgz", + "integrity": "sha512-Eum+5ajkaOhf5KbM26osvv21kLD7BaGqQ1UA4Ami4arYwylmGUQTgHFpHDdmJod1q4QXa66p0to/FBKID+J1vA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.25", + "jest-worker": "^27.4.5", + "schema-utils": "^4.3.0", + "terser": "^5.31.1" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@minify-html/node": { + "optional": true + }, + "@swc/core": { + "optional": true + }, + "@swc/css": { + "optional": true + }, + "@swc/html": { + "optional": true + }, + "clean-css": { + "optional": true + }, + "cssnano": { + "optional": true + }, + "csso": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "html-minifier-terser": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "postcss": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, "node_modules/terser/node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -15233,18 +16287,18 @@ "license": "MIT" }, "node_modules/tinyexec": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.2.4.tgz", - "integrity": "sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.1.2.tgz", + "integrity": "sha512-dAqSqE/RabpBKI8+h26GfLq6Vb3JVXs30XYQjdMjaj/c2tS8IYYMbIzP599KtRj7c57/wYApb3QjgRgXmrCukA==", "license": "MIT", "engines": { "node": ">=18" } }, "node_modules/tinyglobby": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", - "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", + "version": "0.2.16", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz", + "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==", "license": "MIT", "dependencies": { "fdir": "^6.5.0", @@ -15329,37 +16383,46 @@ } }, "node_modules/ts-dedent": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.3.0.tgz", - "integrity": "sha512-JfJeIHke7y2egdGGgRAvpCwYFUsHlM2gPcrVOxFkznt/4uzQ7HFmvE63iFHVLBJNDuyDOQgijDK/tXH/f6Msjg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz", + "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==", "license": "MIT", "engines": { "node": ">=6.10" } }, "node_modules/ts-loader": { - "version": "9.6.2", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.6.2.tgz", - "integrity": "sha512-R4iuczmtgxvtuI556s+hTZ6/7Ee03VCAk/l/M8LY1OAsUgB7YydsCxkgq9D9pKRaD7GJqUi2u8fp9zZP/ufjKA==", + "version": "9.5.7", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.7.tgz", + "integrity": "sha512-/ZNrKgA3K3PtpMYOC71EeMWIloGw3IYEa5/t1cyz2r5/PyUwTXGzYJvcD3kfUvmhlfpz1rhV8B2O6IVTQ0avsg==", "dev": true, "license": "MIT", "dependencies": { "chalk": "^4.1.0", - "picomatch": "^4.0.0", + "enhanced-resolve": "^5.0.0", + "micromatch": "^4.0.0", + "semver": "^7.3.4", "source-map": "^0.7.4" }, "engines": { "node": ">=12.0.0" }, "peerDependencies": { - "loader-utils": "*", "typescript": "*", - "webpack": "^4.0.0 || ^5.0.0" + "webpack": "^5.0.0" + } + }, + "node_modules/ts-loader/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" }, - "peerDependenciesMeta": { - "loader-utils": { - "optional": true - } + "engines": { + "node": ">=10" } }, "node_modules/tslib": { @@ -15506,18 +16569,18 @@ "license": "MIT" }, "node_modules/undici": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.28.0.tgz", - "integrity": "sha512-LIY910g9TI13YS95lrMFrs8Rm/u/irgHeTWoKCoteeJ04CUJ92eEfj0rVn+7VKMPBpUPiUoBKfhNyLI23EE/KA==", + "version": "6.27.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.27.0.tgz", + "integrity": "sha512-YmfV3YnEDzXRC5lZ2jWtWWHKGUm1zIt8AhesR1tens+HTNv+YZlN/dp6G727LOvMJ8xjP9Be7Y2Sdr96LDm+pg==", "license": "MIT", "engines": { "node": ">=18.17" } }, "node_modules/undici-types": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz", - "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz", + "integrity": "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==", "dev": true, "license": "MIT", "peer": true @@ -15688,6 +16751,19 @@ "url": "https://github.com/yeoman/update-notifier?sponsor=1" } }, + "node_modules/update-notifier/node_modules/semver": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -15738,9 +16814,9 @@ } }, "node_modules/uuid": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.1.tgz", - "integrity": "sha512-6ZxzVpzDXDa3bJWaHilVayA+BH/1zmxCJoVgvmqJnid/gPoKHxUrS/aC/T6LGQtNHT+XHG9fXPJB4d+IrU30Ew==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.0.tgz", + "integrity": "sha512-Qo+uWgilfSmAhXCMav1uYFynlQO7fMFiMVZsQqZRMIXp0O7rR7qjkj+cPvBHLgBqi960QCoo/PH2/6ZtVqKvrg==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" @@ -15849,12 +16925,6 @@ "vscode-uri": "^3.1.0" } }, - "node_modules/vscode-css-languageservice/node_modules/vscode-languageserver-types": { - "version": "3.17.5", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", - "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", - "license": "MIT" - }, "node_modules/vscode-html-languageservice": { "version": "5.6.2", "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.6.2.tgz", @@ -15881,22 +16951,22 @@ } }, "node_modules/vscode-jsonrpc": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.1.tgz", - "integrity": "sha512-rfuA6T75H6m5EkbhtEPzre9pT0HPcDI2MMy4+nPFIBks5J8JBAUHD4tRYSgaBOijIEC7SRkC1kKyXTLqbmh9jw==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", "license": "MIT", "engines": { "node": ">=14.0.0" } }, "node_modules/vscode-languageserver-protocol": { - "version": "3.18.2", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.18.2.tgz", - "integrity": "sha512-XRyDbT0Pp3sSNti3JmxVEUMySWCSi1hhM+/KUlCy1hV1zmrqpM1OwO12EAki8blhmLuIMpaJrYbo0OzGVfK2Qg==", + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", + "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==", "license": "MIT", "dependencies": { - "vscode-jsonrpc": "9.0.1", - "vscode-languageserver-types": "3.18.0" + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" } }, "node_modules/vscode-languageserver-textdocument": { @@ -15906,9 +16976,9 @@ "license": "MIT" }, "node_modules/vscode-languageserver-types": { - "version": "3.18.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.18.0.tgz", - "integrity": "sha512-8TsGPNMIMiiBdkORgRSvLjuiEIiAFtO+KssmYWxQ+uSVvlf7RjK8YKCOjPzZ+YA04jXEV7+7LvkSmHkhpNS99g==", + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", "license": "MIT" }, "node_modules/vscode-uri": { @@ -15933,13 +17003,14 @@ } }, "node_modules/watchpack": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.2.tgz", - "integrity": "sha512-6i/00NBjP4yGPs+caKSyRfpTF/8Torsu0MOW3mMzIbhgISFder8i7xbqgHlLMwJrdiN8ndBV3UA1/AfzPSr+jg==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz", + "integrity": "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { + "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" }, "engines": { @@ -15970,40 +17041,44 @@ } }, "node_modules/web-tree-sitter": { - "version": "0.26.11", - "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.26.11.tgz", - "integrity": "sha512-Q5Dm3YTIXSXuH6FxX6RuzX2Qwpc4DPGiYMU87Wg5Z8OIStiQFiUex4zMDc0vBTw78EphaYJacncJghCHzbZptg==", + "version": "0.26.8", + "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.26.8.tgz", + "integrity": "sha512-4sUwi7ZyOrIk5KLgYLkc2A/F0LFMQnBhfb+2Cdl7ik4ePJ6JD+fk4ofI2sA5eGawBKBaK4Vntt7Ww5KcEsay4A==", "dev": true, "license": "MIT" }, "node_modules/webpack": { - "version": "5.109.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.109.0.tgz", - "integrity": "sha512-vomrngskVVXEZF9sMZfYAd4pXZUnfaWdJGlF+BTNF+gJBCKYCQBnOeVPlrh39Ewl7nlCsirDplMy6o5g9xJHBg==", + "version": "5.106.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.106.2.tgz", + "integrity": "sha512-wGN3qcrBQIFmQ/c0AiOAQBvrZ5lmY8vbbMv4Mxfgzqd/B6+9pXtLo73WuS1dSGXM5QYY3hZnIbvx+K1xxe6FyA==", "dev": true, "license": "MIT", "peer": true, "dependencies": { + "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", "@types/json-schema": "^7.0.15", "@webassemblyjs/ast": "^1.14.1", "@webassemblyjs/wasm-edit": "^1.14.1", "@webassemblyjs/wasm-parser": "^1.14.1", "acorn": "^8.16.0", + "acorn-import-phases": "^1.0.3", "browserslist": "^4.28.1", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.24.2", - "es-module-lexer": "^2.1.0", + "enhanced-resolve": "^5.20.0", + "es-module-lexer": "^2.0.0", "eslint-scope": "5.1.1", "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.2.11", + "loader-runner": "^4.3.1", "mime-db": "^1.54.0", - "minimizer-webpack-plugin": "^5.6.1", "neo-async": "^2.6.2", "schema-utils": "^4.3.3", "tapable": "^2.3.0", - "watchpack": "^2.5.2", - "webpack-sources": "^3.5.1" + "terser-webpack-plugin": "^5.3.17", + "watchpack": "^2.5.1", + "webpack-sources": "^3.3.4" }, "bin": { "webpack": "bin/webpack.js" @@ -16022,9 +17097,9 @@ } }, "node_modules/webpack-sources": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.5.1.tgz", - "integrity": "sha512-jyuiGJdtvY434z5bUZrjz67v76/ePNvFZTp9Mdz29IlH4+GPsgyGjiv0fKI+M7BdkU6ADjulUcKAd3tUK3WlEw==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.4.1.tgz", + "integrity": "sha512-eACpxRN02yaawnt+uUNIF7Qje6A9zArxBbcAJjK1PK3S9Ycg5jIuJ8pW4q8EMnwNZCEGltcjkRx1QzOxOkKD8A==", "dev": true, "license": "MIT", "peer": true, @@ -16277,23 +17352,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "license": "MIT", - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -16314,9 +17372,9 @@ } }, "node_modules/ws": { - "version": "8.21.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.1.tgz", - "integrity": "sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz", + "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==", "dev": true, "license": "MIT", "engines": { @@ -16387,24 +17445,21 @@ } }, "node_modules/yallist": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", - "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=18" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "license": "ISC" }, "node_modules/yargs": { - "version": "18.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.1.0.tgz", - "integrity": "sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg==", + "version": "18.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", + "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", "license": "MIT", "dependencies": { "cliui": "^9.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", - "string-width": "^8.2.1", + "string-width": "^7.2.0", "y18n": "^5.0.5", "yargs-parser": "^22.0.0" }, @@ -16628,9 +17683,9 @@ } }, "src/plugins/cordova-plugin-advanced-http/node_modules/brace-expansion": { - "version": "1.1.16", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", - "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", + "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", "dev": true, "license": "MIT", "dependencies": { @@ -17359,6 +18414,19 @@ "node": ">= 6" } }, + "src/plugins/cordova-plugin-advanced-http/node_modules/semver": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "src/plugins/cordova-plugin-advanced-http/node_modules/socks-proxy-agent": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", @@ -17467,13 +18535,6 @@ "node": ">= 8" } }, - "src/plugins/cordova-plugin-advanced-http/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "license": "ISC" - }, "src/plugins/cordova-plugin-buildinfo": { "version": "4.0.0", "dev": true, From b2eb8f55a6d472fb9b1564b8001a84a1d81e802c Mon Sep 17 00:00:00 2001 From: summoner Date: Mon, 27 Jul 2026 18:04:28 +0200 Subject: [PATCH 009/195] Translation: Update hu-hu.json (#2542) Translate new string --- src/lang/hu-hu.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index 5c55a8396a..ce9ac47fb0 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -830,6 +830,6 @@ "command": "Parancs", "managed": "Kezelt", "acode service": "Acode-szolgáltatás", - "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "info-terminal-show-scrollbar": "Az xterm görgetősávjának megjelenítése a terminál mellett.", + "terminal:show scrollbar": "Görgetősáv megjelenítése" } From 7c68ddd9bb0542f47bb08a5a01f057e4ef1c942b Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Tue, 28 Jul 2026 11:31:46 +0530 Subject: [PATCH 010/195] feat(files): move workspace indexing and search to native for saf/files (#2529) * feat(files): move workspace indexing and search to native for saf/files * fix batch stuff * fix(files): avoid full workspace rescans after sidebar mutations - incrementally update native workspace indexes - stop nested folder creation from refreshing every workspace - serialize index writes and fix scan cancellation ownership - keep FileTree state synchronized after copy and move operations - insert new sidebar entries without rebuilding expanded directories --- src/components/fileTree/index.js | 10 +- src/components/inputhints/index.js | 36 +- src/components/palette/index.js | 16 +- src/lib/acode.js | 17 +- src/lib/fileIndex.js | 297 +++++++ src/lib/fileList.js | 178 ++-- src/lib/openFolder.js | 107 +-- src/palettes/findFile/index.js | 59 +- src/plugins/sdcard/index.d.ts | 18 + src/plugins/sdcard/src/android/SDcard.java | 12 + .../sdcard/src/android/WorkspaceIndex.java | 801 +++++++++++++++--- src/plugins/sdcard/www/plugin.js | 6 + src/sidebarApps/searchInFiles/index.js | 133 ++- src/utils/helpers.js | 3 + 14 files changed, 1320 insertions(+), 373 deletions(-) create mode 100644 src/lib/fileIndex.js diff --git a/src/components/fileTree/index.js b/src/components/fileTree/index.js index f6154d0264..22176d7dfe 100644 --- a/src/components/fileTree/index.js +++ b/src/components/fileTree/index.js @@ -373,6 +373,8 @@ export default class FileTree { * @param {boolean} isDirectory */ appendEntry(name, url, isDirectory) { + if (this.entries.some((entry) => entry.url === url)) return; + const entry = { name, url, isDirectory, isFile: !isDirectory }; // Insert in sorted position @@ -399,10 +401,10 @@ export default class FileTree { // Virtual list mode: update items this.virtualList.setItems(this.entries); } else { - // Fragment mode: re-render - this.destroyChildTrees(); - this.container.innerHTML = ""; - this.renderWithFragment(); + const index = this.entries.findIndex((item) => item.url === url); + const $el = this.createEntryElement(entry); + const $next = this.container.children[index]; + this.container.insertBefore($el, $next || null); } } diff --git a/src/components/inputhints/index.js b/src/components/inputhints/index.js index 23bba3cfec..9e8f5fad6f 100644 --- a/src/components/inputhints/index.js +++ b/src/components/inputhints/index.js @@ -27,9 +27,11 @@ import "./style.scss"; * @param {HTMLInputElement} $input Input field * @param {Array|HintCallback} hints Hints or a callback to generate hints * @param {(value: string) => void} onSelect Callback to call when a hint is selected + * @param {object} [options] + * @param {boolean} [options.dynamic] Regenerate hints when input changes * @returns {{getSelected: ()=>HTMLLIElement, container: HTMLUListElement}} */ -export default function inputhints($input, hints, onSelect) { +export default function inputhints($input, hints, onSelect, options = {}) { /**@type {HTMLUListElement} */ const $ul =
    ; const LIMIT = 100; @@ -38,14 +40,26 @@ export default function inputhints($input, hints, onSelect) { let updateUlTimeout; let pages = 0; let currentHints = []; + let hintProvider = null; + let dynamicUpdateTimeout = 0; + let dynamicUpdateVersion = 0; $input.addEventListener("focus", onfocus); if (typeof hints === "function") { const cb = hints; + hintProvider = cb; hints = []; $ul.content = []; - cb(setHints, hintModification()); + const version = ++dynamicUpdateVersion; + cb( + (list) => { + if (!options.dynamic || version === dynamicUpdateVersion) + setHints(list); + }, + hintModification(), + "", + ); } else { setHints(hints); } @@ -139,6 +153,21 @@ export default function inputhints($input, hints, onSelect) { */ function oninput() { const { value: toTest } = this; + if (options.dynamic && hintProvider) { + clearTimeout(dynamicUpdateTimeout); + const version = ++dynamicUpdateVersion; + dynamicUpdateTimeout = setTimeout(() => { + hintProvider( + (list) => { + if (version === dynamicUpdateVersion) setHints(list); + }, + hintModification(), + toTest, + ); + }, 120); + return; + } + const matched = []; const regexp = new RegExp(escapeRegExp(toTest), "i"); hints.forEach((hint) => { @@ -171,6 +200,8 @@ export default function inputhints($input, hints, onSelect) { if (preventUpdate) return; clearTimeout(updateUlTimeout); + clearTimeout(dynamicUpdateTimeout); + dynamicUpdateVersion += 1; $input.removeEventListener("keypress", handleKeypress); $input.removeEventListener("keydown", handleKeydown); $input.removeEventListener("blur", onblur); @@ -215,6 +246,7 @@ export default function inputhints($input, hints, onSelect) { * @param {Array} list Hint items */ function setHints(list) { + pages = 0; if (Array.isArray(list)) { hints = list; } else { diff --git a/src/components/palette/index.js b/src/components/palette/index.js index 899a26cd09..fe68530699 100644 --- a/src/components/palette/index.js +++ b/src/components/palette/index.js @@ -45,12 +45,20 @@ This shows that using keyboardHideStart event is faster than not using it. * @param {()=>string} onsSelectCb Callback to call when a hint is selected * @param {string} placeholder Placeholder for input * @param {function} onremove Callback to call when palette is removed + * @param {object} [options] + * @param {boolean} [options.dynamic] Regenerate hints when the query changes * @returns {void} */ // Track active palette for chaining let activePalette = null; -export default function palette(getList, onsSelectCb, placeholder, onremove) { +export default function palette( + getList, + onsSelectCb, + placeholder, + onremove, + options = {}, +) { // Store previous palette if exists const previousPalette = activePalette; const isChained = !!previousPalette; @@ -69,7 +77,7 @@ export default function palette(getList, onsSelectCb, placeholder, onremove) { const $palette =
    {$input}
    ; // Create a palette with input and hints - inputhints($input, generateHints, onSelect); + inputhints($input, generateHints, onSelect, options); // Only set the darkened theme when this is not a chained palette if (!isChained) { @@ -137,8 +145,8 @@ export default function palette(getList, onsSelectCb, placeholder, onremove) { * @param {HintCallback} setHints Set hints callback * @param {HintModification} hintModification Hint modification object */ - async function generateHints(setHints, hintModification) { - const list = getList(hintModification); + async function generateHints(setHints, hintModification, query) { + const list = getList(hintModification, query); const data = list instanceof Promise ? await list : list; setHints(data); } diff --git a/src/lib/acode.js b/src/lib/acode.js index 3e0ecf694b..15cc4b6f93 100644 --- a/src/lib/acode.js +++ b/src/lib/acode.js @@ -51,6 +51,7 @@ import windowResize from "handlers/windowResize"; import actionStack from "lib/actionStack"; import commands from "lib/commands"; import EditorFile from "lib/editorFile"; +import fileIndex from "lib/fileIndex"; import files from "lib/fileList"; import fileTypeHandler from "lib/fileTypeHandler"; import fonts from "lib/fonts"; @@ -366,7 +367,21 @@ class Acode { this.define("dialogBox", dialog); this.define("prompt", prompt); this.define("intent", intent); - this.define("fileList", files); + let didWarnAboutFileList = false; + const deprecatedFileList = (...args) => { + if (!didWarnAboutFileList) { + didWarnAboutFileList = true; + console.warn( + 'acode.require("fileList") is deprecated. Use the asynchronous "fileIndex" API. fileList now contains only non-native storage providers.', + ); + } + return files(...args); + }; + Object.assign(deprecatedFileList, files); + deprecatedFileList.deprecated = true; + deprecatedFileList.replacement = "fileIndex"; + this.define("fileList", deprecatedFileList); + this.define("fileIndex", fileIndex); this.define("fs", fsOperation); this.define("confirm", confirm); this.define("helpers", helpers); diff --git a/src/lib/fileIndex.js b/src/lib/fileIndex.js new file mode 100644 index 0000000000..dd9a7a0367 --- /dev/null +++ b/src/lib/fileIndex.js @@ -0,0 +1,297 @@ +import settings from "./settings"; + +const pendingScans = new Map(); +const scanIdsByRoot = new Map(); +const listeners = new Set(); + +/** + * Whether a URL can be indexed by the Android native workspace index. + * Remote providers such as FTP and SFTP remain on the JavaScript fallback. + * @param {string} url + */ +export function supports(url = "") { + return ( + typeof sdcard !== "undefined" && + typeof sdcard.workspaceScan === "function" && + (/^file:/.test(url) || /^content:/.test(url)) + ); +} + +/** + * Scan a SAF or file:// workspace entirely on the native side. + * @param {string|object} root + * @param {object} [options] + * @returns {Promise & {id: string, cancel: () => Promise}} + */ +export function scan(root, options = {}) { + const rootUrl = typeof root === "string" ? root : root?.url; + const title = + typeof root === "string" + ? options.title || options.name + : root?.name || root?.title; + if (!supports(rootUrl)) { + return Promise.reject( + new Error(`Native file index does not support: ${rootUrl}`), + ); + } + + cancelRootScan(rootUrl); + const id = `scan-${Date.now()}-${Math.random().toString(36).slice(2)}`; + scanIdsByRoot.set(rootUrl, id); + + const promise = new Promise((resolve, reject) => { + sdcard.workspaceScan( + { + id, + rootUrl, + title, + excludeFolders: options.excludeFolders || settings.value.excludeFolders, + showHiddenFiles: + options.showHiddenFiles ?? + !!settings.value.fileBrowser?.showHiddenFiles, + defaultEncoding: + options.defaultEncoding || settings.value.defaultFileEncoding, + indexContent: !!options.indexContent, + emitEntries: false, + }, + (event) => { + emit(event); + switch (event?.type || event?.action) { + case "done": + clearScanId(rootUrl, id); + resolve(event); + break; + case "cancelled": + clearScanId(rootUrl, id); + resolve(event); + break; + case "error": + clearScanId(rootUrl, id); + reject(new Error(event.error || "Native scan failed")); + break; + } + }, + (error) => { + clearScanId(rootUrl, id); + reject(normalizeError(error)); + }, + ); + }); + + pendingScans.set(rootUrl, promise); + const cleanup = () => { + if (pendingScans.get(rootUrl) === promise) pendingScans.delete(rootUrl); + }; + promise.then(cleanup, cleanup); + promise.id = id; + promise.cancel = () => cancel(id); + return promise; +} + +/** + * Incrementally refresh changed files or directory subtrees in a native index. + * @param {string|object} root + * @param {object} changes + * @param {{url: string, parentUrl: string}[]} [changes.added] + * @param {string[]} [changes.removed] + */ +export function update(root, changes = {}) { + const rootUrl = typeof root === "string" ? root : root?.url; + const title = + typeof root === "string" ? changes.title || changes.name : root?.title; + if (!supports(rootUrl)) { + return Promise.reject( + new Error(`Native file index does not support: ${rootUrl}`), + ); + } + + return callNative("workspaceUpdate", [ + { + rootUrl, + title, + added: changes.added || [], + removed: changes.removed || [], + excludeFolders: changes.excludeFolders || settings.value.excludeFolders, + showHiddenFiles: + changes.showHiddenFiles ?? + !!settings.value.fileBrowser?.showHiddenFiles, + defaultEncoding: + changes.defaultEncoding || settings.value.defaultFileEncoding, + }, + ]); +} + +/** + * Query indexed entries. Results are flat and paginated. + * @param {object} [options] + */ +export function query(options = {}) { + if ( + typeof sdcard === "undefined" || + typeof sdcard.workspaceQuery !== "function" + ) { + return Promise.reject(new Error("Native file index is unavailable")); + } + + return new Promise((resolve, reject) => { + sdcard.workspaceQuery( + { + roots: options.roots || [], + text: options.text || "", + url: options.url || "", + includeDirectories: !!options.includeDirectories, + limit: options.limit || 200, + cursor: options.cursor || 0, + }, + resolve, + (error) => reject(normalizeError(error)), + ); + }); +} + +/** + * Start a native streaming search. + * @param {object} options + * @param {(event: object) => void} [onEvent] + * @returns {{id: string, result: Promise, cancel: () => Promise}} + */ +export function search(options, onEvent = () => {}) { + if ( + typeof sdcard === "undefined" || + typeof sdcard.workspaceSearch !== "function" + ) { + const error = Promise.reject(new Error("Native file index is unavailable")); + return { id: "", result: error, cancel: () => Promise.resolve() }; + } + + const id = + options?.id || + `search-${Date.now()}-${Math.random().toString(36).slice(2)}`; + const result = new Promise((resolve, reject) => { + sdcard.workspaceSearch( + { + ...options, + id, + roots: options?.roots || [], + files: options?.files || [], + overlays: options?.overlays || {}, + batchResults: options?.batchResults ?? true, + defaultEncoding: + options?.defaultEncoding || settings.value.defaultFileEncoding, + }, + (event) => { + onEvent(event); + switch (event?.type || event?.action) { + case "done-searching": + case "done-replacing": + resolve(event); + break; + case "error": + reject(new Error(event.error || "Native search failed")); + break; + } + }, + (error) => reject(normalizeError(error)), + ); + }); + + return { id, result, cancel: () => cancel(id) }; +} + +/** + * Get one indexed entry by URL. + * @param {string} url + */ +export async function get(url) { + const { entries } = await query({ url, includeDirectories: true, limit: 1 }); + return entries?.[0] || null; +} + +/** + * Mark cached contents stale after an editor or filesystem change. + * @param {string[]} urls + */ +export function markDirty(urls) { + return callNative("workspaceMarkDirty", [urls || []]); +} + +/** + * Remove one or more native workspace indexes. + * @param {string[]} roots + */ +export function clear(roots = []) { + roots.forEach(cancelRootScan); + return callNative("workspaceClear", [roots]); +} + +/** + * Wait until all scans, or scans for selected roots, finish. + * @param {string[]} [roots] + */ +export function whenReady(roots) { + const scans = roots?.length + ? roots.map((root) => pendingScans.get(root)).filter(Boolean) + : [...pendingScans.values()]; + return Promise.allSettled(scans); +} + +export function subscribe(listener) { + listeners.add(listener); + return () => listeners.delete(listener); +} + +export function cancel(id) { + if (!id) return Promise.resolve(); + return callNative("workspaceCancel", [id]); +} + +function cancelRootScan(rootUrl) { + const id = scanIdsByRoot.get(rootUrl); + if (!id) return; + clearScanId(rootUrl, id); + try { + sdcard.workspaceCancel(id); + } catch (_) { + // Ignore cancellation failures; the replacement scan remains authoritative. + } +} + +function clearScanId(rootUrl, id) { + if (scanIdsByRoot.get(rootUrl) === id) { + scanIdsByRoot.delete(rootUrl); + } +} + +function emit(event) { + listeners.forEach((listener) => listener(event)); +} + +function callNative(method, args) { + if (typeof sdcard === "undefined" || typeof sdcard[method] !== "function") { + return Promise.reject(new Error("Native file index is unavailable")); + } + return new Promise((resolve, reject) => { + sdcard[method](...args, resolve, (error) => reject(normalizeError(error))); + }); +} + +function normalizeError(error) { + if (error instanceof Error) return error; + return new Error(error?.message || String(error)); +} + +const fileIndex = { + supports, + scan, + update, + query, + search, + get, + markDirty, + clear, + whenReady, + subscribe, + cancel, +}; + +export default fileIndex; diff --git a/src/lib/fileList.js b/src/lib/fileList.js index 39f4807dea..a83e9bde4f 100644 --- a/src/lib/fileList.js +++ b/src/lib/fileList.js @@ -2,10 +2,14 @@ import fsOperation from "fileSystem"; import toast from "components/toast"; import picomatch from "picomatch/posix"; import Url from "utils/Url"; +import fileIndex from "./fileIndex"; import { addedFolder } from "./openFolder"; import settings from "./settings"; /** + * @deprecated Native SAF and file:// workspaces are available through fileIndex. + * This module now maintains the compatibility index for non-native providers. + * * @typedef {import('fileSystem').File} File */ @@ -36,6 +40,16 @@ export function initFileList() { * @param {string} child file url */ export async function append(parent, child) { + const nativeRoot = findNativeRoot(parent); + if (nativeRoot) { + fileIndex + .update(nativeRoot, { + added: [{ url: child, parentUrl: parent }], + }) + .catch(logNativeIndexError); + return; + } + const tree = getTree(Object.values(filesTree), parent); if (!tree || !tree.children) return; @@ -50,6 +64,24 @@ export async function append(parent, child) { * @param {string} item url */ export function remove(item) { + const nativeRoot = findNativeRoot(item); + if (nativeRoot) { + if (nativeRoot.url === item) { + fileIndex.clear([item]).then( + () => emit("remove-folder", { url: item, native: true }), + (error) => { + logNativeIndexError(error); + emit("remove-folder", { url: item, native: true }); + }, + ); + } else { + fileIndex + .update(nativeRoot, { removed: [item] }) + .catch(logNativeIndexError); + } + return; + } + if (filesTree[item]) { removeRootTree(item); emit("remove-file", item); @@ -82,18 +114,24 @@ export async function refresh() { }); await Promise.all( - addedFolder.map(async ({ url, title }) => { - const tree = await Tree.createRoot(url, title); - filesTree[url] = tree; - trackScan(getAllFiles(tree)); - }), + addedFolder + .filter(({ listFiles }) => listFiles) + .map(async ({ url, title }) => { + if (fileIndex.supports(url)) { + await fileIndex.scan({ url, name: title }); + return; + } + const tree = await Tree.createRoot(url, title); + filesTree[url] = tree; + trackScan(getAllFiles(tree)); + }), ); emit("refresh", filesTree); } export async function whenReady() { - await Promise.all([...pendingScans]); + await Promise.allSettled([...pendingScans, fileIndex.whenReady()]); } /** @@ -103,6 +141,17 @@ export async function whenReady() { * @returns */ export function rename(oldUrl, newUrl) { + const nativeRoot = findNativeRoot(oldUrl) || findNativeRoot(newUrl); + if (nativeRoot) { + fileIndex + .update(nativeRoot, { + removed: [oldUrl], + added: [{ url: newUrl, parentUrl: Url.dirname(newUrl) }], + }) + .catch(logNativeIndexError); + return; + } + const tree = getTree(Object.values(filesTree), oldUrl); if (!tree) return; @@ -234,6 +283,11 @@ export async function addRoot({ url, name }) { "content://com.termux.documents/tree/%2Fdata%2Fdata%2Fcom.termux%2Ffiles%2Fhome::/data/data/com.termux/files/home/storage/shared"; if (url === TERMUX_STORAGE) return; if (url === TERMUX_SHARED) return; + if (fileIndex.supports(url)) { + await fileIndex.scan({ url, name }); + emit("add-folder", { url, name, native: true }); + return; + } const tree = await Tree.createRoot(url, name); filesTree[url] = tree; @@ -265,10 +319,6 @@ async function getAllFiles(parent, root, options = {}) { root = root || parent.root; if (!parent.children || !root.isConnected) return; - if (supportsNativeWorkspace(root.url)) { - return getAllFilesNative(parent, root, options); - } - try { const entries = await fsOperation(parent.url).lsDir(); const promises = []; @@ -295,93 +345,6 @@ async function getAllFiles(parent, root, options = {}) { } } -function supportsNativeWorkspace(url = "") { - return ( - typeof sdcard !== "undefined" && - typeof sdcard.workspaceScan === "function" && - (/^file:/.test(url) || /^content:/.test(url)) - ); -} - -async function getAllFilesNative(parent, root, options = {}) { - const id = `scan-${Date.now()}-${Math.random().toString(36).slice(2)}`; - - return new Promise((resolve, reject) => { - let settled = false; - - const finish = (fn, value) => { - if (settled) return; - settled = true; - fn(value); - }; - - const cancelIfDisconnected = () => { - if (root.isConnected) return false; - try { - sdcard.workspaceCancel(id); - } catch (_) { - // ignore cancellation failures - } - finish(resolve); - return true; - }; - - sdcard.workspaceScan( - { - id, - rootUrl: parent.url, - title: parent.name, - excludeFolders: settings.value.excludeFolders, - showHiddenFiles: !!settings.value.fileBrowser?.showHiddenFiles, - defaultEncoding: settings.value.defaultFileEncoding, - indexContent: !!options.indexContent, - }, - (event) => { - if (cancelIfDisconnected()) return; - switch (event?.type || event?.action) { - case "batch": - addNativeEntries(root, event.entries || []); - break; - case "done": - finish(resolve); - break; - case "error": - finish(reject, new Error(event.error || "Native scan failed")); - break; - } - }, - (error) => { - finish(reject, error); - }, - ); - }); -} - -function addNativeEntries(root, entries) { - for (const item of entries) { - const parentUrl = item.parentUrl || item.parent; - const parentTree = - parentUrl === root.url ? root : getTree([root], parentUrl); - if (!parentTree?.children) continue; - if (parentTree.children.find(({ url }) => url === item.url)) continue; - - const file = new Tree( - item.name, - item.url, - item.isDirectory, - item.mime || item.type, - item.size, - item.modifiedDate, - ); - parentTree.children.push(file); - - if (!file.children) { - emit("push-file", file); - emit("add-file", file); - } - } -} - /** * Emit an event * @param {string} event @@ -395,7 +358,8 @@ function emit(event, ...args) { function trackScan(scan) { pendingScans.add(scan); - scan.finally(() => pendingScans.delete(scan)); + const cleanup = () => pendingScans.delete(scan); + scan.then(cleanup, cleanup); return scan; } @@ -643,3 +607,21 @@ function normalizeModifiedDate(value) { const time = new Date(value).getTime(); return Number.isNaN(time) ? 0 : time; } + +function findNativeRoot(url) { + if (!url) return null; + return addedFolder.find(({ url: rootUrl, listFiles }) => { + if (!listFiles) return false; + if (!fileIndex.supports(rootUrl)) return false; + const prefix = rootUrl.endsWith("/") ? rootUrl : `${rootUrl}/`; + return ( + url === rootUrl || + url.startsWith(prefix) || + url.startsWith(`${rootUrl}::`) + ); + }); +} + +function logNativeIndexError(error) { + console.error("Native workspace index update failed:", error); +} diff --git a/src/lib/openFolder.js b/src/lib/openFolder.js index 21e21b4f82..5415f7a824 100644 --- a/src/lib/openFolder.js +++ b/src/lib/openFolder.js @@ -215,9 +215,9 @@ function openFolder(_path, opts = {}) { $root.remove(); } + FileList.remove(_path); const index = addedFolder.findIndex((folder) => folder.url === _path); if (index !== -1) addedFolder.splice(index, 1); - FileList.remove(_path); editorManager.emit("update", "remove-folder"); editorManager.onupdate("remove-folder", event); editorManager.emit("remove-folder", event); @@ -280,22 +280,6 @@ async function expandList($list) { } } -/** - * Gets weather the folder is collapsed or not - * @param {HTMLElement} $el - * @param {boolean} isFile - * @returns - */ -function collapsed($el, isFile) { - if (!$el.isConnected) return true; - $el = $el.parentElement; - if (!isFile) { - $el = $el.parentElement; - } - - return $el.previousElementSibling.collapsed; -} - /** * Handle click event * @param {Event} e @@ -692,7 +676,7 @@ function execOperation(type, action, url, $target, name) { if (isNestedPath) { await refreshOpenFolder(url); - await FileList.refresh(); + FileList.append(newUrl.parentUri, newUrl.uri); toast(strings.success); return; } @@ -736,16 +720,9 @@ function execOperation(type, action, url, $target, name) { } } - let CASE = ""; - const $src = clipBoard.$el; - const srcType = $src.dataset.type; + const srcType = clipBoard.$el.dataset.type; const IS_FILE = helpers.isFile(srcType); const IS_DIR = helpers.isDir(srcType); - const srcCollapsed = collapsed($src, IS_FILE); - - CASE += IS_FILE ? 1 : 0; - CASE += srcCollapsed ? 1 : 0; - CASE += $target.collapsed ? 1 : 0; startLoading(); try { @@ -801,91 +778,23 @@ function execOperation(type, action, url, $target, name) { } else { newUrl = await fs.copyTo(url); } - const { name: newName } = await fsOperation(newUrl).stat(); stopLoading(); - /** - * CASES: - * CASE 111: src is file and parent is collapsed where target is also collapsed - * CASE 110: src is file and parent is collapsed where target is unclasped - * CASE 101: src is file and parent is unclasped where target is collapsed - * CASE 100: src is file and parent is unclasped where target is also unclasped - * CASE 011: src is directory and parent is collapsed where target is also collapsed - * CASE 001: src is directory and parent is unclasped where target is also collapsed - * CASE 010: src is directory and parent is collapsed where target is also unclasped - * CASE 000: src is directory and parent is unclasped where target is also unclasped - */ if (clipBoard.action === "cut") { - //move - if (IS_FILE) { const file = editorManager.getFile(clipBoard.url, "uri"); if (file) file.uri = newUrl; } else if (IS_DIR) { helpers.updateUriOfAllActiveFiles(clipBoard.url, newUrl); + migrateOpenFolderStateUrls(clipBoard.url, newUrl); } - - switch (CASE) { - case "111": - case "011": - break; - - case "110": - appendTile($target, createFileTile(newName, newUrl)); - break; - - case "101": - $src.remove(); - break; - - case "100": - appendTile($target, createFileTile(newName, newUrl)); - $src.remove(); - break; - - case "001": - $src.parentElement.remove(); - break; - - case "010": - appendList($target, createFolderTile(newName, newUrl)); - break; - - case "000": - appendList($target, createFolderTile(newName, newUrl)); - $src.parentElement.remove(); - break; - - default: - break; - } - FileList.remove(clipBoard.url); + removeEntryFromOpenFolder(clipBoard.url); + FileList.rename(clipBoard.url, newUrl); } else { - //copy - - switch (CASE) { - case "111": - case "101": - case "011": - case "001": - break; - - case "110": - case "100": - appendTile($target, createFileTile(newName, newUrl)); - break; - - case "010": - case "000": - appendList($target, createFolderTile(newName, newUrl)); - break; - - default: - break; - } + FileList.append(url, newUrl); } - FileList.append(url, newUrl); + appendEntryToOpenFolder(url, newUrl, IS_DIR ? "folder" : "file"); toast(strings.success); clearClipboard(); } catch (error) { diff --git a/src/palettes/findFile/index.js b/src/palettes/findFile/index.js index 95dafb6427..ddb8454d08 100644 --- a/src/palettes/findFile/index.js +++ b/src/palettes/findFile/index.js @@ -1,6 +1,8 @@ import palette from "components/palette"; +import fileIndex from "lib/fileIndex"; import files from "lib/fileList"; import openFile from "lib/openFile"; +import { addedFolder } from "lib/openFolder"; import recents from "lib/recents"; import helpers from "utils/helpers"; @@ -12,10 +14,16 @@ import helpers from "utils/helpers"; let hintsModification; export default async function findFile() { - palette(generateHints, onselect, strings["type filename"], () => { - files.off("add-file", onAddFile); - files.off("remove-file", onRemoveFile); - }); + palette( + generateHints, + onselect, + strings["type filename"], + () => { + files.off("add-file", onAddFile); + files.off("remove-file", onRemoveFile); + }, + { dynamic: true }, + ); files.on("add-file", onAddFile); files.on("remove-file", onRemoveFile); @@ -24,22 +32,51 @@ export default async function findFile() { * Generates hint for inputhints * @param {HintModification} hints Hint modification object */ - async function generateHints(hints) { + async function generateHints(hints, query = "") { hintsModification = hints; const list = []; + const seen = new Set(); editorManager.files.forEach((file) => { const { uri, name } = file; + if (!matchesQuery(query, name, uri)) return; let { location = "" } = file; if (location) { location = helpers.getVirtualPath(location); } + if (uri) seen.add(uri); list.push(hintItem(name, location, uri)); }); - list.push(...files(hintItem)); + files().forEach((file) => { + if (seen.has(file.url)) return; + if (!matchesQuery(query, file.name, file.path)) return; + seen.add(file.url); + list.push(hintItem(file)); + }); + + const nativeRoots = addedFolder + .filter(({ listFiles }) => listFiles) + .map(({ url }) => url) + .filter((url) => fileIndex.supports(url)); + if (nativeRoots.length) { + try { + const { entries = [] } = await fileIndex.query({ + roots: nativeRoots, + text: query, + limit: 300, + }); + entries.forEach((file) => { + if (seen.has(file.url)) return; + seen.add(file.url); + list.push(hintItem(file)); + }); + } catch (error) { + console.warn("Unable to query native file index:", error); + } + } return list; } @@ -49,6 +86,16 @@ export default async function findFile() { } } +function matchesQuery(query, ...values) { + if (!query) return true; + const normalized = query.toLowerCase(); + return values.some((value) => + String(value || "") + .toLowerCase() + .includes(normalized), + ); +} + /** * Generates hint item for inputhints * @param {string|{name: string, path: string, url: string}} name Hint text diff --git a/src/plugins/sdcard/index.d.ts b/src/plugins/sdcard/index.d.ts index f726ac2633..f151eab349 100644 --- a/src/plugins/sdcard/index.d.ts +++ b/src/plugins/sdcard/index.d.ts @@ -59,6 +59,7 @@ type WorkspaceEvent = | { id: string; type: 'status'; action: 'status'; state: string; message: string; progress: number } | { id: string; type: 'batch'; action: 'batch'; entries: WorkspaceFileEntry[] } | { id: string; type: 'search-result'; action: 'search-result'; data: any } + | { id: string; type: 'search-results'; action: 'search-results'; data: any[] } | { id: string; type: 'replace-result'; action: 'replace-result'; file: WorkspaceFileEntry; text: string } | { id: string; type: 'progress'; action: 'progress'; data: number } | { id: string; type: 'done' | 'done-searching' | 'done-replacing' | 'error'; action: string; [key: string]: any }; @@ -286,11 +287,28 @@ interface SDcard { onEvent: (event: WorkspaceEvent) => void, onFail: (err: any) => void, ): void; + workspaceUpdate( + options: any, + onSuccess: (result: { + added: number; + removed: number; + }) => void, + onFail: (err: any) => void, + ): void; workspaceSearch( options: any, onEvent: (event: WorkspaceEvent) => void, onFail: (err: any) => void, ): void; + workspaceQuery( + options: any, + onSuccess: (result: { + entries: any[]; + cursor: number | null; + hasMore: boolean; + }) => void, + onFail: (err: any) => void, + ): void; workspaceCancel( id: string, onSuccess?: (res: 'OK') => void, diff --git a/src/plugins/sdcard/src/android/SDcard.java b/src/plugins/sdcard/src/android/SDcard.java index 508dca1a23..19482901a1 100644 --- a/src/plugins/sdcard/src/android/SDcard.java +++ b/src/plugins/sdcard/src/android/SDcard.java @@ -171,12 +171,24 @@ public boolean execute( callback ); break; + case "workspace update": + workspaceIndex.update( + args.optJSONObject(0) == null ? new JSONObject() : args.optJSONObject(0), + callback + ); + break; case "workspace search": workspaceIndex.search( args.optJSONObject(0) == null ? new JSONObject() : args.optJSONObject(0), callback ); break; + case "workspace query": + workspaceIndex.query( + args.optJSONObject(0) == null ? new JSONObject() : args.optJSONObject(0), + callback + ); + break; case "workspace cancel": workspaceIndex.cancel(arg1); callback.success("OK"); diff --git a/src/plugins/sdcard/src/android/WorkspaceIndex.java b/src/plugins/sdcard/src/android/WorkspaceIndex.java index 4af6987659..b8b867f156 100644 --- a/src/plugins/sdcard/src/android/WorkspaceIndex.java +++ b/src/plugins/sdcard/src/android/WorkspaceIndex.java @@ -7,6 +7,7 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.net.Uri; +import android.os.CancellationSignal; import android.provider.DocumentsContract; import android.provider.DocumentsContract.Document; import android.util.Log; @@ -41,7 +42,7 @@ class WorkspaceIndex { private static final String TAG = "WorkspaceIndex"; private static final String SEPARATOR = "::"; - private static final int DB_VERSION = 1; + private static final int DB_VERSION = 2; private static final int BATCH_SIZE = 200; private static final int MAX_INDEXED_CHARS = 512 * 1024; private static final int INDEX_READ_LIMIT_BYTES = MAX_INDEXED_CHARS * 4; @@ -49,6 +50,8 @@ class WorkspaceIndex { private static final int EXPLICIT_INCLUDE_READ_LIMIT_BYTES = 128 * 1024 * 1024; private static final int SAMPLE_BYTES = 8192; private static final int MAX_MATCHES_PER_FILE = 5000; + private static final int SEARCH_RESULT_BATCH_SIZE = 12; + private static final int SEARCH_RESULT_BATCH_MATCHES = 600; private static final Set BINARY_EXTENSIONS = new HashSet<>(); private static final Set TEXT_EXTENSIONS = new HashSet<>(); @@ -198,6 +201,7 @@ class WorkspaceIndex { private final Context context; private final ContentResolver resolver; + private final ExecutorService indexExecutor = Executors.newSingleThreadExecutor(); private final ExecutorService executor = Executors.newFixedThreadPool(2); private final Map jobs = new ConcurrentHashMap<>(); private final DB db; @@ -213,7 +217,7 @@ void scan(JSONObject options, CallbackContext callback) { final Job job = new Job(id); jobs.put(id, job); - executor.execute( + indexExecutor.execute( () -> { try { runScan(job, options, callback); @@ -226,6 +230,18 @@ void scan(JSONObject options, CallbackContext callback) { ); } + void update(JSONObject options, CallbackContext callback) { + indexExecutor.execute( + () -> { + try { + callback.success(runUpdate(options)); + } catch (Exception error) { + callback.error(error.getMessage() == null ? error.toString() : error.getMessage()); + } + } + ); + } + void search(JSONObject options, CallbackContext callback) { final String id = options.optString("id", UUID.randomUUID().toString()); final Job job = new Job(id); @@ -244,9 +260,21 @@ void search(JSONObject options, CallbackContext callback) { ); } + void query(JSONObject options, CallbackContext callback) { + executor.execute( + () -> { + try { + callback.success(runQuery(options)); + } catch (Exception error) { + callback.error(error.getMessage() == null ? error.toString() : error.getMessage()); + } + } + ); + } + void cancel(String id) { Job job = jobs.get(id); - if (job != null) job.cancelled = true; + if (job != null) job.cancel(); } void markDirty(JSONArray urls) { @@ -278,12 +306,18 @@ void clear(JSONArray roots) { private void runScan(Job job, JSONObject options, CallbackContext callback) throws Exception { + if (job.cancelled) { + send(callback, baseEvent(job.id, "cancelled"), false); + return; + } + String rootUrl = options.getString("rootUrl"); String title = options.optString("title", basename(rootUrl)); JSONArray exclude = options.optJSONArray("excludeFolders"); boolean showHiddenFiles = options.optBoolean("showHiddenFiles", false); String defaultEncoding = options.optString("defaultEncoding", "UTF-8"); boolean indexContent = options.optBoolean("indexContent", false); + boolean emitEntries = options.optBoolean("emitEntries", true); JSONArray batch = new JSONArray(); ScanStats stats = new ScanStats(); @@ -316,6 +350,7 @@ private void runScan(Job job, JSONObject options, CallbackContext callback) showHiddenFiles, defaultEncoding, indexContent, + emitEntries, batch, stats ); @@ -333,13 +368,17 @@ private void runScan(Job job, JSONObject options, CallbackContext callback) showHiddenFiles, defaultEncoding, indexContent, + emitEntries, batch, stats ); } - if (job.cancelled) return; - flushBatch(callback, job.id, batch); + if (job.cancelled) { + send(callback, baseEvent(job.id, "cancelled"), false); + return; + } + if (emitEntries) flushBatch(callback, job.id, batch); writable.setTransactionSuccessful(); } finally { writable.endTransaction(); @@ -352,6 +391,278 @@ private void runScan(Job job, JSONObject options, CallbackContext callback) send(callback, done, false); } + private JSONObject runUpdate(JSONObject options) throws Exception { + String rootUrl = options.getString("rootUrl"); + String title = options.optString("title", getWorkspaceTitle(rootUrl)); + JSONArray removed = options.optJSONArray("removed"); + JSONArray added = options.optJSONArray("added"); + JSONArray exclude = options.optJSONArray("excludeFolders"); + boolean showHiddenFiles = options.optBoolean("showHiddenFiles", false); + String defaultEncoding = options.optString("defaultEncoding", "UTF-8"); + SQLiteDatabase writable = db.getWritableDatabase(); + int removedCount = 0; + int addedCount = 0; + + writable.beginTransaction(); + try { + if (removed != null) { + for (int i = 0; i < removed.length(); i++) { + String url = removed.optString(i, ""); + if (url.length() == 0 || rootUrl.equals(url)) continue; + removedCount += deleteIndexedSubtree(writable, rootUrl, url); + } + } + + if (added != null) { + for (int i = 0; i < added.length(); i++) { + JSONObject change = added.optJSONObject(i); + if (change == null) continue; + String url = change.optString("url", ""); + String parentUrl = change.optString("parentUrl", ""); + if (url.length() == 0 || parentUrl.length() == 0) continue; + + removedCount += deleteIndexedSubtree(writable, rootUrl, url); + FileEntry entry = readEntry(rootUrl, parentUrl, url, title); + if (entry == null) continue; + if (!showHiddenFiles && entry.name.startsWith(".")) continue; + + saveFile(entry); + addedCount += 1; + if ( + entry.isDirectory && + !shouldSkipDirectory(rootUrl, entry.url, entry.path, exclude) + ) { + Job job = new Job("update-" + UUID.randomUUID()); + ScanStats stats = new ScanStats(); + if (isSafUrl(url)) { + SafUrl rootSafUrl = parseSafUrl(rootUrl); + scanSafDir( + job, + null, + rootSafUrl.treeUrl, + rootUrl, + parseSafUrl(url).docId, + url, + entry.path, + title, + exclude, + showHiddenFiles, + defaultEncoding, + false, + false, + new JSONArray(), + stats + ); + } else { + scanFileDir( + job, + null, + rootUrl, + fileFromUrl(url), + url, + entry.path, + title, + exclude, + showHiddenFiles, + defaultEncoding, + false, + false, + new JSONArray(), + stats + ); + } + addedCount += stats.files + stats.dirs; + } + } + } + + ContentValues workspace = new ContentValues(); + workspace.put("root_url", rootUrl); + workspace.put("title", title); + workspace.put("indexed_at", System.currentTimeMillis()); + int updated = writable.update( + "workspaces", + workspace, + "root_url = ?", + new String[] { rootUrl } + ); + if (updated == 0) writable.insert("workspaces", null, workspace); + writable.setTransactionSuccessful(); + } finally { + writable.endTransaction(); + } + + JSONObject result = new JSONObject(); + result.put("added", addedCount); + result.put("removed", removedCount); + return result; + } + + private FileEntry readEntry( + String rootUrl, + String parentUrl, + String url, + String title + ) { + String parentPath = getIndexedPath(rootUrl, parentUrl, title); + if (isSafUrl(url)) { + Cursor cursor = null; + try { + cursor = + resolver.query( + formatSafUri(url), + new String[] { + Document.COLUMN_DISPLAY_NAME, + Document.COLUMN_MIME_TYPE, + Document.COLUMN_SIZE, + Document.COLUMN_LAST_MODIFIED, + }, + null, + null, + null + ); + if (cursor == null || !cursor.moveToFirst()) return null; + String name = cursor.getString(0); + String mime = normalizeMime(name, cursor.getString(1)); + boolean isDirectory = Document.MIME_TYPE_DIR.equals(mime); + return new FileEntry( + rootUrl, + parentUrl, + url, + name, + joinPath(parentPath, name), + mime, + isDirectory, + safeLong(cursor, 2), + safeLong(cursor, 3) + ); + } catch (Exception error) { + Log.d(TAG, "Unable to refresh SAF index entry " + url, error); + return null; + } finally { + if (cursor != null) cursor.close(); + } + } + + File file = fileFromUrl(url); + if (!file.exists()) return null; + String name = file.getName(); + boolean isDirectory = file.isDirectory(); + return new FileEntry( + rootUrl, + parentUrl, + url, + name, + joinPath(parentPath, name), + isDirectory + ? Document.MIME_TYPE_DIR + : normalizeMime(name, guessMime(name)), + isDirectory, + file.length(), + file.lastModified() + ); + } + + private String getIndexedPath( + String rootUrl, + String url, + String fallbackTitle + ) { + if (rootUrl.equals(url)) return fallbackTitle; + Cursor cursor = null; + try { + cursor = + db + .getReadableDatabase() + .query( + "files", + new String[] { "path" }, + "root_url = ? AND url = ?", + new String[] { rootUrl, url }, + null, + null, + null, + "1" + ); + if (cursor.moveToFirst()) return cursor.getString(0); + } finally { + if (cursor != null) cursor.close(); + } + return fallbackTitle; + } + + private String getWorkspaceTitle(String rootUrl) { + Cursor cursor = null; + try { + cursor = + db + .getReadableDatabase() + .query( + "workspaces", + new String[] { "title" }, + "root_url = ?", + new String[] { rootUrl }, + null, + null, + null, + "1" + ); + if (cursor.moveToFirst()) return cursor.getString(0); + } finally { + if (cursor != null) cursor.close(); + } + return basename(rootUrl); + } + + private int deleteIndexedSubtree( + SQLiteDatabase writable, + String rootUrl, + String url + ) { + ArrayDeque directories = new ArrayDeque<>(); + Set visitedDirectories = new HashSet<>(); + Set urls = new HashSet<>(); + directories.add(url); + urls.add(url); + + while (!directories.isEmpty()) { + String parentUrl = directories.removeFirst(); + if (!visitedDirectories.add(parentUrl)) continue; + Cursor cursor = null; + try { + cursor = + writable.query( + "files", + new String[] { "url", "is_directory" }, + "root_url = ? AND parent_url = ?", + new String[] { rootUrl, parentUrl }, + null, + null, + null + ); + while (cursor.moveToNext()) { + String childUrl = cursor.getString(0); + urls.add(childUrl); + if (cursor.getInt(1) != 0) directories.add(childUrl); + } + } finally { + if (cursor != null) cursor.close(); + } + } + + int deleted = 0; + for (String entryUrl : urls) { + writable.delete("content", "url = ?", new String[] { entryUrl }); + deleted += + writable.delete( + "files", + "root_url = ? AND url = ?", + new String[] { rootUrl, entryUrl } + ); + } + return deleted; + } + private void scanFileDir( Job job, CallbackContext callback, @@ -364,11 +675,18 @@ private void scanFileDir( boolean showHiddenFiles, String defaultEncoding, boolean indexContent, + boolean emitEntries, JSONArray batch, ScanStats stats ) throws Exception { if (job.cancelled || dir == null) return; - File[] children = dir.listFiles(); + File[] children; + try { + children = dir.listFiles(); + } catch (Exception error) { + Log.d(TAG, "Skipping unreadable directory " + dir, error); + return; + } if (children == null) return; for (File child : children) { @@ -392,24 +710,29 @@ private void scanFileDir( child.lastModified() ); - addEntry(callback, job.id, batch, entry, stats); + addEntry(callback, job.id, batch, entry, stats, emitEntries); if (isDir) { - if (isExcluded(path, exclude)) continue; - scanFileDir( - job, - callback, - rootUrl, - child, - url, - path, - title, - exclude, - showHiddenFiles, - defaultEncoding, - indexContent, - batch, - stats - ); + if (shouldSkipDirectory(rootUrl, url, path, exclude)) continue; + try { + scanFileDir( + job, + callback, + rootUrl, + child, + url, + path, + title, + exclude, + showHiddenFiles, + defaultEncoding, + indexContent, + emitEntries, + batch, + stats + ); + } catch (Exception error) { + Log.d(TAG, "Skipping unreadable directory " + url, error); + } } else { if (indexContent) { indexFile(entry, defaultEncoding); @@ -432,6 +755,7 @@ private void scanSafDir( boolean showHiddenFiles, String defaultEncoding, boolean indexContent, + boolean emitEntries, JSONArray batch, ScanStats stats ) throws Exception { @@ -441,21 +765,29 @@ private void scanSafDir( parentDocId ); Cursor cursor = null; + CancellationSignal signal = new CancellationSignal(); + CancellationSignal previousSignal = job.setSignal(signal); try { - cursor = - resolver.query( - childrenUri, - new String[] { - Document.COLUMN_DOCUMENT_ID, - Document.COLUMN_DISPLAY_NAME, - Document.COLUMN_MIME_TYPE, - Document.COLUMN_SIZE, - Document.COLUMN_LAST_MODIFIED, - }, - null, - null, - null - ); + try { + cursor = + resolver.query( + childrenUri, + new String[] { + Document.COLUMN_DOCUMENT_ID, + Document.COLUMN_DISPLAY_NAME, + Document.COLUMN_MIME_TYPE, + Document.COLUMN_SIZE, + Document.COLUMN_LAST_MODIFIED, + }, + null, + null, + null, + signal + ); + } catch (Exception error) { + Log.d(TAG, "Skipping unreadable SAF directory " + parentUrl, error); + return; + } if (cursor == null) return; while (cursor.moveToNext()) { @@ -483,25 +815,30 @@ private void scanSafDir( modified ); - addEntry(callback, job.id, batch, entry, stats); + addEntry(callback, job.id, batch, entry, stats, emitEntries); if (isDir) { - if (isExcluded(path, exclude)) continue; - scanSafDir( - job, - callback, - treeUrl, - rootUrl, - docId, - url, - path, - title, - exclude, - showHiddenFiles, - defaultEncoding, - indexContent, - batch, - stats - ); + if (shouldSkipDirectory(rootUrl, url, path, exclude)) continue; + try { + scanSafDir( + job, + callback, + treeUrl, + rootUrl, + docId, + url, + path, + title, + exclude, + showHiddenFiles, + defaultEncoding, + indexContent, + emitEntries, + batch, + stats + ); + } catch (Exception error) { + Log.d(TAG, "Skipping unreadable SAF directory " + url, error); + } } else { if (indexContent) { indexFile(entry, defaultEncoding); @@ -509,8 +846,11 @@ private void scanSafDir( } } } + } catch (Exception error) { + Log.d(TAG, "Stopping unreadable SAF directory " + parentUrl, error); } finally { if (cursor != null) cursor.close(); + job.restoreSignal(signal, previousSignal); } } @@ -519,16 +859,86 @@ private void addEntry( String id, JSONArray batch, FileEntry entry, - ScanStats stats + ScanStats stats, + boolean emitEntries ) throws Exception { saveFile(entry); - batch.put(entry.toJSON()); if (entry.isDirectory) stats.dirs += 1; else stats.files += 1; + if (!emitEntries) return; + batch.put(entry.toJSON()); if (batch.length() >= BATCH_SIZE) { flushBatch(callback, id, batch); } } + private JSONObject runQuery(JSONObject options) throws Exception { + JSONArray roots = options.optJSONArray("roots"); + String text = options.optString("text", "").trim(); + String url = options.optString("url", ""); + boolean includeDirectories = options.optBoolean("includeDirectories", false); + int limit = Math.max(1, Math.min(options.optInt("limit", 200), 1000)); + int offset = Math.max(0, options.optInt("cursor", options.optInt("offset", 0))); + + StringBuilder where = new StringBuilder("1 = 1"); + List args = new ArrayList<>(); + appendRootsClause(where, args, roots); + if (url.length() > 0) { + where.append(" AND url = ?"); + args.add(url); + } + if (!includeDirectories) { + where.append(" AND is_directory = 0"); + } + if (text.length() > 0) { + where.append(" AND (name LIKE ? ESCAPE '\\' OR path LIKE ? ESCAPE '\\')"); + String pattern = "%" + escapeLike(text) + "%"; + args.add(pattern); + args.add(pattern); + } + + String order; + if (text.length() > 0) { + order = + "CASE WHEN name LIKE ? ESCAPE '\\' THEN 0 ELSE 1 END, " + + "name COLLATE NOCASE, path COLLATE NOCASE"; + args.add(escapeLike(text) + "%"); + } else { + order = "name COLLATE NOCASE, path COLLATE NOCASE"; + } + + String sql = + "SELECT root_url, parent_url, url, name, path, mime, is_directory, size, modified_date " + + "FROM files WHERE " + + where + + " ORDER BY " + + order + + " LIMIT ? OFFSET ?"; + args.add(String.valueOf(limit + 1)); + args.add(String.valueOf(offset)); + + JSONArray entries = new JSONArray(); + Cursor cursor = null; + boolean hasMore = false; + try { + cursor = db.getReadableDatabase().rawQuery(sql, args.toArray(new String[0])); + while (cursor.moveToNext()) { + if (entries.length() >= limit) { + hasMore = true; + break; + } + entries.put(fileEntryFromCursor(cursor).toJSON()); + } + } finally { + if (cursor != null) cursor.close(); + } + + JSONObject result = new JSONObject(); + result.put("entries", entries); + result.put("cursor", hasMore ? offset + entries.length() : JSONObject.NULL); + result.put("hasMore", hasMore); + return result; + } + private void flushBatch(CallbackContext callback, String id, JSONArray batch) throws JSONException { if (batch.length() == 0) return; @@ -542,6 +952,7 @@ private void runSearch(Job job, JSONObject options, CallbackContext callback) throws Exception { JSONArray files = options.optJSONArray("files"); if (files == null) files = new JSONArray(); + files = mergeIndexedFiles(files, options.optJSONArray("roots")); String search = options.optString("search", ""); String replace = options.optString("replace", null); String mode = options.optString("mode", "search"); @@ -551,25 +962,25 @@ private void runSearch(Job job, JSONObject options, CallbackContext callback) if (overlays == null) overlays = new JSONObject(); String defaultEncoding = options.optString("defaultEncoding", "UTF-8"); boolean useIndex = options.optBoolean("useIndex", false); + boolean batchResults = options.optBoolean("batchResults", false); Pattern pattern = compileSearchPattern(search, searchOptions); + JSONArray searchResultBatch = new JSONArray(); + int batchedMatches = 0; int total = files.length(); int processed = 0; + int lastProgress = -1; sendStatus(callback, job.id, "searching", "Searching files", 0, true); for (int i = 0; i < total; i++) { if (job.cancelled) return; JSONObject file = files.getJSONObject(i); - sendProgress(callback, job.id, total == 0 ? 100 : (processed * 100) / total); - sendStatus( - callback, - job.id, - "searching", - "Searching " + file.optString("name", "file"), - total == 0 ? 100 : (processed * 100) / total, - true - ); + int progress = total == 0 ? 100 : (processed * 100) / total; + if (progress != lastProgress) { + sendProgress(callback, job.id, progress); + lastProgress = progress; + } if (!isSupportedUrl(file.optString("url"))) { processed += 1; continue; @@ -580,20 +991,23 @@ private void runSearch(Job job, JSONObject options, CallbackContext callback) } boolean allowLargeFile = isExplicitlyIncluded(file, searchOptions); - String content = getFileContent( - file, - overlays, - defaultEncoding, - useIndex, - allowLargeFile, - callback, - job.id, - total, - processed - ); + String content; + try { + content = + getFileContent( + file, + overlays, + defaultEncoding, + useIndex, + allowLargeFile + ); + } catch (Exception error) { + Log.d(TAG, "Skipping unreadable search file " + file.optString("url"), error); + processed += 1; + continue; + } if (content == null) { processed += 1; - sendProgress(callback, job.id, total == 0 ? 100 : (processed * 100) / total); continue; } @@ -605,14 +1019,32 @@ private void runSearch(Job job, JSONObject options, CallbackContext callback) result.put("text", text); send(callback, result, true); } else { - JSONObject result = searchInContent(job.id, file, content, pattern); - if (result != null) send(callback, result, true); + JSONObject result = searchInContent(file, content, pattern); + if (result != null) { + if (batchResults) { + searchResultBatch.put(result); + batchedMatches += result.getJSONArray("matches").length(); + if ( + searchResultBatch.length() >= SEARCH_RESULT_BATCH_SIZE || + batchedMatches >= SEARCH_RESULT_BATCH_MATCHES + ) { + flushSearchResultBatch(callback, job.id, searchResultBatch); + batchedMatches = 0; + } + } else { + JSONObject event = baseEvent(job.id, "search-result"); + event.put("data", result); + send(callback, event, true); + } + } } processed += 1; - sendProgress(callback, job.id, total == 0 ? 100 : (processed * 100) / total); } + if (batchResults) { + flushSearchResultBatch(callback, job.id, searchResultBatch); + } sendProgress(callback, job.id, 100); send(callback, baseEvent(job.id, "replace".equals(mode) ? "done-replacing" : "done-searching"), false); } @@ -632,7 +1064,6 @@ private Pattern compileSearchPattern(String search, JSONObject options) } private JSONObject searchInContent( - String id, JSONObject file, String content, Pattern pattern @@ -698,10 +1129,19 @@ private JSONObject searchInContent( } data.put("limited", limited); data.put("text", text.toString()); + return data; + } - JSONObject event = baseEvent(id, "search-result"); - event.put("data", data); - return event; + private void flushSearchResultBatch( + CallbackContext callback, + String id, + JSONArray batch + ) throws JSONException { + if (batch.length() == 0) return; + JSONObject event = baseEvent(id, "search-results"); + event.put("data", new JSONArray(batch.toString())); + send(callback, event, true); + while (batch.length() > 0) batch.remove(0); } private String getFileContent( @@ -709,11 +1149,7 @@ private String getFileContent( JSONObject overlays, String defaultEncoding, boolean useIndex, - boolean allowLargeFile, - CallbackContext callback, - String jobId, - int totalFiles, - int processedFiles + boolean allowLargeFile ) throws Exception { String url = file.optString("url"); if (overlays.has(url)) return overlays.optString(url, ""); @@ -756,11 +1192,7 @@ private String getFileContent( entry, defaultEncoding, allowLargeFile ? EXPLICIT_INCLUDE_READ_LIMIT_BYTES : DIRECT_SEARCH_READ_LIMIT_BYTES, - allowLargeFile ? EXPLICIT_INCLUDE_READ_LIMIT_BYTES : DIRECT_SEARCH_READ_LIMIT_BYTES, - callback, - jobId, - totalFiles, - processedFiles + allowLargeFile ? EXPLICIT_INCLUDE_READ_LIMIT_BYTES : DIRECT_SEARCH_READ_LIMIT_BYTES ); } @@ -774,11 +1206,7 @@ private String indexFile(FileEntry entry, String defaultEncoding) { entry, defaultEncoding, INDEX_READ_LIMIT_BYTES, - MAX_INDEXED_CHARS, - null, - null, - 0, - 0 + MAX_INDEXED_CHARS ); if (text == null) return null; String encoding = normalizeEncoding(defaultEncoding); @@ -803,26 +1231,14 @@ private String readFileText( FileEntry entry, String defaultEncoding, int readLimitBytes, - int maxChars, - CallbackContext callback, - String jobId, - int totalFiles, - int processedFiles + int maxChars ) throws Exception { if (entry.isDirectory || isBinary(entry) || entry.size > readLimitBytes) { return null; } - byte[] bytes = readBytes( - entry.url, - readLimitBytes + 1, - callback, - jobId, - totalFiles, - processedFiles, - entry.size - ); + byte[] bytes = readBytes(entry.url, readLimitBytes + 1); if (bytes.length > readLimitBytes) return null; String encoding = detectEncoding(bytes, defaultEncoding); if (isSingleByteEncoding(encoding) && looksBinary(bytes)) return null; @@ -831,15 +1247,7 @@ private String readFileText( return text; } - private byte[] readBytes( - String url, - int limit, - CallbackContext callback, - String jobId, - int totalFiles, - int processedFiles, - long fileSize - ) throws Exception { + private byte[] readBytes(String url, int limit) throws Exception { InputStream input = null; try { if (isSafUrl(url)) { @@ -853,18 +1261,8 @@ private byte[] readBytes( byte[] buffer = new byte[8192]; int read; int total = 0; - int lastProgress = -1; while ((read = input.read(buffer)) != -1) { total += read; - if (callback != null && jobId != null && totalFiles > 0) { - long denominator = fileSize > 0 ? fileSize : limit; - int fileProgress = (int) Math.min(99, (total * 100L) / denominator); - int progress = ((processedFiles * 100) + fileProgress) / totalFiles; - if (progress != lastProgress) { - sendProgress(callback, jobId, progress); - lastProgress = progress; - } - } if (total > limit) { output.write(buffer, 0, read - (total - limit)); break; @@ -893,6 +1291,115 @@ private void saveFile(FileEntry entry) { db.getWritableDatabase().replace("files", null, values); } + private JSONArray mergeIndexedFiles(JSONArray explicitFiles, JSONArray roots) + throws JSONException { + JSONArray result = new JSONArray(); + Set seen = new HashSet<>(); + for (int i = 0; i < explicitFiles.length(); i++) { + JSONObject file = explicitFiles.optJSONObject(i); + if (file == null) continue; + String url = file.optString("url", ""); + if (url.length() == 0 || !seen.add(url)) continue; + result.put(file); + } + + if (roots == null || roots.length() == 0) return result; + + StringBuilder where = new StringBuilder("is_directory = 0"); + List args = new ArrayList<>(); + appendRootsClause(where, args, roots); + Cursor cursor = null; + try { + cursor = + db + .getReadableDatabase() + .query( + "files", + new String[] { + "root_url", + "parent_url", + "url", + "name", + "path", + "mime", + "is_directory", + "size", + "modified_date", + }, + where.toString(), + args.toArray(new String[0]), + null, + null, + null + ); + while (cursor.moveToNext()) { + FileEntry entry = fileEntryFromCursor(cursor); + if (seen.add(entry.url)) result.put(entry.toJSON()); + } + } finally { + if (cursor != null) cursor.close(); + } + return result; + } + + private FileEntry fileEntryFromCursor(Cursor cursor) { + return new FileEntry( + cursor.getString(0), + cursor.getString(1), + cursor.getString(2), + cursor.getString(3), + cursor.getString(4), + cursor.isNull(5) ? null : cursor.getString(5), + cursor.getInt(6) != 0, + safeLong(cursor, 7), + safeLong(cursor, 8) + ); + } + + private void appendRootsClause( + StringBuilder where, + List args, + JSONArray roots + ) { + if (roots == null || roots.length() == 0) return; + where.append(" AND root_url IN ("); + boolean added = false; + for (int i = 0; i < roots.length(); i++) { + String root = roots.optString(i, ""); + if (root.length() == 0) continue; + if (added) where.append(','); + where.append('?'); + args.add(root); + added = true; + } + if (!added) { + where.append("NULL"); + } + where.append(')'); + } + + private String escapeLike(String value) { + return value.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_"); + } + + private boolean shouldSkipDirectory( + String rootUrl, + String url, + String path, + JSONArray excludes + ) { + if (isExcluded(path, excludes) || isExcluded(path + "/", excludes)) { + return true; + } + + return ( + rootUrl != null && + rootUrl.startsWith("content://com.termux.documents/tree/") && + url != null && + url.matches(".*::/data/data/com\\.termux/files/home/storage(?:/)?$") + ); + } + private boolean shouldSkipSearchFile(JSONObject file, JSONObject options) { if (FileEntry.fromJSON(file).isBinary()) return true; String path = file.optString("path", ""); @@ -1253,10 +1760,33 @@ private String normalizeMime(String name, String mime) { private static class Job { final String id; volatile boolean cancelled = false; + volatile CancellationSignal signal; Job(String id) { this.id = id; } + + void cancel() { + cancelled = true; + CancellationSignal activeSignal = signal; + if (activeSignal != null) activeSignal.cancel(); + } + + CancellationSignal setSignal(CancellationSignal nextSignal) { + CancellationSignal previousSignal = signal; + signal = nextSignal; + if (cancelled) nextSignal.cancel(); + return previousSignal; + } + + void restoreSignal( + CancellationSignal currentSignal, + CancellationSignal previousSignal + ) { + if (signal != currentSignal) return; + signal = previousSignal; + if (cancelled && previousSignal != null) previousSignal.cancel(); + } } private static class ScanStats { @@ -1389,7 +1919,7 @@ public void onCreate(SQLiteDatabase db) { ); db.execSQL( "CREATE TABLE IF NOT EXISTS files (" + - "url TEXT PRIMARY KEY, " + + "url TEXT, " + "root_url TEXT, " + "parent_url TEXT, " + "path TEXT, " + @@ -1399,7 +1929,8 @@ public void onCreate(SQLiteDatabase db) { "size INTEGER, " + "modified_date INTEGER, " + "indexed_at INTEGER, " + - "skipped_reason TEXT" + + "skipped_reason TEXT, " + + "PRIMARY KEY (root_url, url)" + ")" ); db.execSQL( diff --git a/src/plugins/sdcard/www/plugin.js b/src/plugins/sdcard/www/plugin.js index a8d648d39a..7d994f8aa2 100644 --- a/src/plugins/sdcard/www/plugin.js +++ b/src/plugins/sdcard/www/plugin.js @@ -72,9 +72,15 @@ module.exports = { workspaceScan: function (options, onEvent, onFail) { cordova.exec(onEvent, onFail, 'SDcard', 'workspace scan', [options || {}]); }, + workspaceUpdate: function (options, onSuccess, onFail) { + cordova.exec(onSuccess, onFail, 'SDcard', 'workspace update', [options || {}]); + }, workspaceSearch: function (options, onEvent, onFail) { cordova.exec(onEvent, onFail, 'SDcard', 'workspace search', [options || {}]); }, + workspaceQuery: function (options, onSuccess, onFail) { + cordova.exec(onSuccess, onFail, 'SDcard', 'workspace query', [options || {}]); + }, workspaceCancel: function (id, onSuccess, onFail) { cordova.exec(onSuccess, onFail, 'SDcard', 'workspace cancel', [id]); }, diff --git a/src/sidebarApps/searchInFiles/index.js b/src/sidebarApps/searchInFiles/index.js index b6bc032a64..e0d66e97b2 100644 --- a/src/sidebarApps/searchInFiles/index.js +++ b/src/sidebarApps/searchInFiles/index.js @@ -8,8 +8,10 @@ import Sidebar, { preventSlide } from "components/sidebar"; import escapeStringRegexp from "escape-string-regexp"; import Reactive from "html-tag-js/reactive"; import Ref from "html-tag-js/ref"; +import fileIndex from "lib/fileIndex"; import files, { Tree, whenReady as waitForFileList } from "lib/fileList"; import openFile from "lib/openFile"; +import { addedFolder } from "lib/openFolder"; import settings from "lib/settings"; import helpers from "utils/helpers"; import { createSearchResultView } from "./cmResultView"; @@ -116,6 +118,10 @@ let searching = false; let searchVersion = 0; let pendingResultText = ""; let pendingResultFlush = 0; +let nativeResultQueue = []; +let nativeResultCursor = 0; +let nativeResultFrame = 0; +let pendingNativeSearchFinishVersion = null; let nativeSearchId = null; let activeSearchTasks = 0; let activeReplaceTasks = 0; @@ -433,6 +439,61 @@ function appendSearchResult(data) { } } +function enqueueNativeSearchResults(batch, version) { + if (!Array.isArray(batch) || version !== searchVersion) return; + nativeResultQueue.push(...batch); + scheduleNativeResultDrain(version); +} + +function scheduleNativeResultDrain(version) { + if (nativeResultFrame) return; + const schedule = + window.requestAnimationFrame || ((callback) => setTimeout(callback, 16)); + nativeResultFrame = schedule(() => drainNativeSearchResults(version)); +} + +function drainNativeSearchResults(version) { + nativeResultFrame = 0; + if (version !== searchVersion) { + clearNativeResultQueue(); + return; + } + + const start = performance.now(); + let processed = 0; + while ( + nativeResultCursor < nativeResultQueue.length && + processed < 4 && + performance.now() - start < 8 + ) { + appendSearchResult(nativeResultQueue[nativeResultCursor++]); + processed += 1; + } + + if (nativeResultCursor < nativeResultQueue.length) { + scheduleNativeResultDrain(version); + return; + } + + nativeResultQueue = []; + nativeResultCursor = 0; + if (pendingNativeSearchFinishVersion === version) { + pendingNativeSearchFinishVersion = null; + void finishSearchTask(version); + } +} + +function clearNativeResultQueue() { + if (nativeResultFrame) { + const cancel = window.cancelAnimationFrame || clearTimeout; + cancel(nativeResultFrame); + } + nativeResultFrame = 0; + nativeResultQueue = []; + nativeResultCursor = 0; + pendingNativeSearchFinishVersion = null; +} + function groupMatchesForDisplay(matches) { const rows = []; const seen = new Set(); @@ -545,6 +606,7 @@ function onInput(e) { resultOverview.reset(); resetResultScroll(); clearPendingResultText(); + clearNativeResultQueue(); searchResult.setValue(""); removeEvents(); if (!$search.value) { @@ -576,10 +638,17 @@ async function searchAll() { if (version !== searchVersion) return; const allFiles = files().filter((file) => !helpers.isBinary(file)); - const forceUrls = new Set(); + const nativeRoots = addedFolder + .filter(({ listFiles }) => listFiles) + .map(({ url }) => url) + .filter((url) => supportsNativeSearch(url)); + const nativeOpenFiles = []; editorManager.files.forEach((file) => { if (!file.uri || helpers.isBinary(file.uri)) return; - forceUrls.add(file.uri); + if (supportsNativeSearch(file.uri)) { + nativeOpenFiles.push(new Tree(file.name, file.uri, false)); + return; + } const exists = allFiles.find((f) => f.url === file.uri); if (exists) return; @@ -588,7 +657,7 @@ async function searchAll() { const filesToSearch = allFiles; - if (!filesToSearch.length) { + if (!filesToSearch.length && !nativeRoots.length && !nativeOpenFiles.length) { searchResult.setGhostText(strings["no result"], { row: 0, column: 0 }); $progress.value = 100; return; @@ -599,16 +668,20 @@ async function searchAll() { fileNames.length = 0; currentSearchRegex = regex; searchResult.setGhostText(strings["searching..."], { row: 0, column: 0 }); - const nativeFiles = filesToSearch.filter((file) => - supportsNativeSearch(file.url), - ); const workerFiles = filesToSearch.filter( (file) => !supportsNativeSearch(file.url), ); activeSearchTasks = 0; - if (nativeFiles.length) { + if (nativeRoots.length || nativeOpenFiles.length) { activeSearchTasks += 1; - sendNativeSearch("search", nativeFiles, search, options); + sendNativeSearch( + "search", + nativeOpenFiles, + search, + options, + undefined, + nativeRoots, + ); } if (workerFiles.length) { activeSearchTasks += 1; @@ -633,6 +706,7 @@ async function readSearchFileContent(uri) { function supportsNativeSearch(url = "") { return ( + fileIndex.supports(url) && typeof sdcard !== "undefined" && typeof sdcard.workspaceSearch === "function" && (/^file:/.test(url) || /^content:/.test(url)) @@ -649,7 +723,14 @@ function cancelNativeSearch() { nativeSearchId = null; } -function sendNativeSearch(mode, searchFiles, search, options, replace) { +function sendNativeSearch( + mode, + searchFiles, + search, + options, + replace, + roots = [], +) { const id = `search-${Date.now()}-${Math.random().toString(36).slice(2)}`; const version = searchVersion; nativeSearchId = id; @@ -658,12 +739,14 @@ function sendNativeSearch(mode, searchFiles, search, options, replace) { id, mode, files: searchFiles.map((file) => file.toJSON()), + roots, search, replace, options, - overlays: getOpenFileOverlays(searchFiles), + overlays: getOpenFileOverlays(), defaultEncoding: settings.value.defaultFileEncoding, useIndex: store.useIndex, + batchResults: true, }, async (event) => { if ( @@ -683,6 +766,9 @@ function sendNativeSearch(mode, searchFiles, search, options, replace) { case "search-result": appendSearchResult(event.data); break; + case "search-results": + enqueueNativeSearchResults(event.data, version); + break; case "replace-result": filesReplaced.push(event.file); openFile(event.file.url, { @@ -692,7 +778,14 @@ function sendNativeSearch(mode, searchFiles, search, options, replace) { break; case "done-searching": nativeSearchId = null; - await finishSearchTask(version); + if ( + nativeResultCursor < nativeResultQueue.length || + nativeResultFrame + ) { + pendingNativeSearchFinishVersion = version; + } else { + await finishSearchTask(version); + } break; case "done-replacing": nativeSearchId = null; @@ -702,6 +795,7 @@ function sendNativeSearch(mode, searchFiles, search, options, replace) { console.error(event.error); $error.value = event.error || "Native search failed"; nativeSearchId = null; + clearNativeResultQueue(); await (mode === "replace" ? finishReplaceTask(version) : finishSearchTask(version)); @@ -713,6 +807,7 @@ function sendNativeSearch(mode, searchFiles, search, options, replace) { console.error(error); $error.value = error?.message || String(error); nativeSearchId = null; + clearNativeResultQueue(); await (mode === "replace" ? finishReplaceTask(version) : finishSearchTask(version)); @@ -720,11 +815,10 @@ function sendNativeSearch(mode, searchFiles, search, options, replace) { ); } -function getOpenFileOverlays(searchFiles) { - const supportedUrls = new Set(searchFiles.map(({ url }) => url)); +function getOpenFileOverlays() { const overlays = {}; editorManager.files.forEach((file) => { - if (!file.uri || !supportedUrls.has(file.uri)) return; + if (!file.uri || !supportsNativeSearch(file.uri)) return; if (!file.session?.doc) return; try { overlays[file.uri] = getDocText(file.session.doc); @@ -743,16 +837,7 @@ async function waitForFileListIfReady() { } function markIndexDirty(urls) { - if ( - typeof sdcard !== "undefined" && - typeof sdcard.workspaceMarkDirty === "function" - ) { - try { - sdcard.workspaceMarkDirty(urls); - } catch (_) { - // ignore native dirty-mark failures - } - } + fileIndex.markDirty(urls).catch(() => {}); } function appendSearchResultText(text) { diff --git a/src/utils/helpers.js b/src/utils/helpers.js index 09c9232b8e..126ae476cd 100644 --- a/src/utils/helpers.js +++ b/src/utils/helpers.js @@ -474,6 +474,7 @@ export default { }; }; let firstCreatedPath = null; + let firstCreatedParentUri = null; let firstCreatedType = null; let firstTargetUri = uri; @@ -498,6 +499,7 @@ export default { if (entry.created && firstCreatedPath === null) { firstCreatedPath = entry.url; + firstCreatedParentUri = currentUri; firstCreatedType = expectedType; } @@ -506,6 +508,7 @@ export default { return { uri: firstCreatedPath || firstTargetUri, + parentUri: firstCreatedParentUri || uri, created: Boolean(firstCreatedPath), type: firstCreatedType || (isFile && parts.length === 1 ? "file" : "folder"), From 91de7620e384557316275f50b59e6fa40fb6a232 Mon Sep 17 00:00:00 2001 From: Anupam Mediratta Date: Tue, 28 Jul 2026 22:17:35 +0530 Subject: [PATCH 011/195] fix: upgrade tar to 7.5.19 (CVE-2026-59873) (#2544) * fix: CVE-2026-59873 security vulnerability Automated dependency upgrade by OrbisAI Security * fix: move tar override from dependencies to overrides tar is a transitive dependency, not a direct one. Use the npm overrides field to pin the version, matching the existing pattern for @codemirror/* packages. Co-Authored-By: Claude Sonnet 4.6 * fix: update bun.lock to reflect tar override Regenerate bun.lock after moving tar from dependencies to overrides, ensuring the lock file is consistent with package.json. Co-Authored-By: Claude Opus 4.6 --------- Co-authored-by: Claude Sonnet 4.6 --- bun.lock | 26 +++++--------------------- package-lock.json | 6 +++--- package.json | 3 ++- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/bun.lock b/bun.lock index 2e3f69e04f..bbd334c565 100644 --- a/bun.lock +++ b/bun.lock @@ -111,6 +111,7 @@ "com.foxdebug.acode.rk.plugin.plugincontext": "file:src/plugins/pluginContext", "cordova-android": "^15.0.0", "cordova-clipboard": "^1.3.0", + "cordova-plugin-acode-webview": "file:src/plugins/webview", "cordova-plugin-advanced-http": "file:src/plugins/cordova-plugin-advanced-http", "cordova-plugin-browser": "file:src/plugins/browser", "cordova-plugin-buildinfo": "file:src/plugins/cordova-plugin-buildinfo", @@ -150,6 +151,7 @@ "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.6.0", "@codemirror/view": "^6.43.4", + "tar": "^7.5.19", }, "packages": { "@antfu/install-pkg": ["@antfu/install-pkg@1.1.0", "", { "dependencies": { "package-manager-detector": "^1.3.0", "tinyexec": "^1.0.1" } }, "sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ=="], @@ -1026,6 +1028,8 @@ "cordova-lib": ["cordova-lib@13.0.0", "", { "dependencies": { "cordova-common": "^6.0.0", "cordova-fetch": "^5.0.0", "detect-indent": "^6.1.0", "detect-newline": "^3.1.0", "execa": "^5.1.1", "globby": "^11.1.0", "semver": "^7.7.2", "stringify-package": "^1.0.1", "write-file-atomic": "^7.0.0" } }, "sha512-y8WQ+J6JtiU9C72ujvI3p+ScFJkg0VJwNfaUCqk9nPAssw2C6HltHk+ik/WrLUn6uDmwAM6gmfGUIMU2iVrNxA=="], + "cordova-plugin-acode-webview": ["cordova-plugin-acode-webview@file:src/plugins/webview", {}], + "cordova-plugin-advanced-http": ["cordova-plugin-advanced-http@file:src/plugins/cordova-plugin-advanced-http", { "devDependencies": { "chai": "4.3.6", "colors": "1.4.0", "cordova": "11.0.0", "mocha": "9.2.2", "umd-tough-cookie": "3.0.0", "wd": "1.14.0", "xml2js": "0.4.23" } }], "cordova-plugin-browser": ["cordova-plugin-browser@file:src/plugins/browser", {}], @@ -2070,7 +2074,7 @@ "tapable": ["tapable@2.3.0", "", {}, "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg=="], - "tar": ["tar@7.5.15", "", { "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", "minizlib": "^3.1.0", "yallist": "^5.0.0" } }, "sha512-dzGK0boVlC4W5QFuQN1EFSl3bIDYsk7Tj40U6eIBnK2k/8ml7TZ5agbI5j5+qnoVcAA+rNtBml8SEiLxZpNqRQ=="], + "tar": ["tar@7.5.22", "", { "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", "minizlib": "^3.1.0", "yallist": "^5.0.0" } }, "sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA=="], "tar-stream": ["tar-stream@2.2.0", "", { "dependencies": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", "fs-constants": "^1.0.0", "inherits": "^2.0.3", "readable-stream": "^3.1.1" } }, "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="], @@ -2952,8 +2956,6 @@ "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/ssri": ["ssri@8.0.1", "", { "dependencies": { "minipass": "^3.1.1" } }, "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="], - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/tar": ["tar@6.2.1", "", { "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" } }, "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A=="], - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/which/isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], "cordova-plugin-advanced-http/cordova/cordova-create/npm-package-arg/hosted-git-info/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="], @@ -2986,8 +2988,6 @@ "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/ssri": ["ssri@8.0.1", "", { "dependencies": { "minipass": "^3.1.1" } }, "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="], - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/tar": ["tar@6.2.1", "", { "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" } }, "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A=="], - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/which/isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/git/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="], @@ -3024,12 +3024,6 @@ "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-registry-fetch/minizlib": ["minizlib@2.1.2", "", { "dependencies": { "minipass": "^3.0.0", "yallist": "^4.0.0" } }, "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="], - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/tar/minipass": ["minipass@5.0.0", "", {}, "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/tar/minizlib": ["minizlib@2.1.2", "", { "dependencies": { "minipass": "^3.0.0", "yallist": "^4.0.0" } }, "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/tar/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - "cordova-plugin-advanced-http/cordova/cordova-create/npm-package-arg/hosted-git-info/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/npm-package-arg/hosted-git-info/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="], @@ -3068,12 +3062,6 @@ "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-registry-fetch/minizlib": ["minizlib@2.1.2", "", { "dependencies": { "minipass": "^3.0.0", "yallist": "^4.0.0" } }, "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="], - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/tar/minipass": ["minipass@5.0.0", "", {}, "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/tar/minizlib": ["minizlib@2.1.2", "", { "dependencies": { "minipass": "^3.0.0", "yallist": "^4.0.0" } }, "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/tar/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/git/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script/node-gyp/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], @@ -3096,8 +3084,6 @@ "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-registry-fetch/minizlib/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/tar/minizlib/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="], - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/npm-package-arg/hosted-git-info/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/git/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], @@ -3122,8 +3108,6 @@ "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-registry-fetch/minizlib/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/tar/minizlib/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="], - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script/node-gyp/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script/node-gyp/request/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], diff --git a/package-lock.json b/package-lock.json index 07ef97f47d..e1e561c577 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16121,9 +16121,9 @@ } }, "node_modules/tar": { - "version": "7.5.16", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.16.tgz", - "integrity": "sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==", + "version": "7.5.19", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.19.tgz", + "integrity": "sha512-4LeEWl96twnS2Q7Bz4MGqgazLqO+hJN63GZxXoIqh1T3VweYD997gbU1ItNsQafqqXTXd5WFyFdReLtwvRBNiw==", "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", diff --git a/package.json b/package.json index 34b717ccee..210c0529c9 100644 --- a/package.json +++ b/package.json @@ -202,7 +202,8 @@ "@codemirror/lint": "^6.9.7", "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.6.0", - "@codemirror/view": "^6.43.4" + "@codemirror/view": "^6.43.4", + "tar": "^7.5.19" }, "browserslist": "cover 100%", "allowScripts": { From a0d84006decb7e946d059a3f3502fcd6bb211275 Mon Sep 17 00:00:00 2001 From: AuDevTist1C <114492072+AuDevTist1C@users.noreply.github.com> Date: Fri, 31 Jul 2026 04:18:37 +0200 Subject: [PATCH 012/195] fix: introduce non-selectable item handling to isolate system utility tiles during batch operations (#2545) Add non-selectable element safeguards across templates and touch selection handlers to prevent system utility tiles from being highlighted, checked, or included in multi-item batch actions. System notification tiles, such as "Add a storage" prompts and "Select document" system actions, reside in the same DOM list container as regular files and directories. Previously, initiating a "Select All" command or dragging across the file list would accidentally select these utility items, triggering runtime errors during batch operations like deletion or moving. * **Template Contract (`src/pages/fileBrowser/list.hbs`):** * Added support for the `data-not-selectable` HTML dataset attribute flag on list item nodes. * **Tile Configuration:** * Explicitly configured system utility tiles ("add a storage" and "Select document") with `notSelectable: true` in their template render context. * **Selection Safeguards (`src/pages/fileBrowser/fileBrowser.js`):** * Updated touch event delegation, long-press handlers, and "Select All" toggle utility functions to check for `dataset.notSelectable != null`. * Items flagged as non-selectable are automatically bypassed during selection count updates, bulk checkboxes, and context action payload generation. (AI generated commit message) --- src/pages/fileBrowser/fileBrowser.js | 11 +++++++---- src/pages/fileBrowser/list.hbs | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index 570cacee3d..036df96742 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -860,6 +860,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { $list .querySelectorAll(".tile:not(.selection-header)") .forEach((item) => { + if (item.dataset.notSelectable != null) return; const checkbox = Checkbox("", false); checkbox.onclick = () => { const url = item.querySelector("data-url").textContent; @@ -912,12 +913,12 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { const $el = e.target; if (isSelectionMode) { - const checkbox = $el.closest(".tile")?.querySelector(".input-checkbox"); + const $el2 = $el.closest(".tile"); + if ($el2?.dataset.notSelectable != null) return; + const checkbox = $el2?.querySelector(".input-checkbox"); if (checkbox && !$el.closest(".selection-header")) { checkbox.checked = !checkbox.checked; - const url = $el - .closest(".tile") - .querySelector("data-url").textContent; + const url = $el2.querySelector("data-url").textContent; if (checkbox.checked) { selectedItems.add(url); } else { @@ -1394,12 +1395,14 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { util.pushFolder(allStorages, strings["add a storage"], "", { storageType: "notification", uuid: "addstorage", + notSelectable: true, }); } if (IS_FILE_MODE) { util.pushFolder(allStorages, "Select document", null, { "open-doc": true, + notSelectable: true, }); } diff --git a/src/pages/fileBrowser/list.hbs b/src/pages/fileBrowser/list.hbs index a4ae772979..a8f118926b 100644 --- a/src/pages/fileBrowser/list.hbs +++ b/src/pages/fileBrowser/list.hbs @@ -7,6 +7,7 @@ type="{{type}}" name="{{name}}" {{#home}}home="{{.}}"{{/home}} + {{#notSelectable}}data-not-selectable{{/notSelectable}} {{#open-doc}}open-doc="true"{{/open-doc}} {{#ftp-account}}ftp-account{{/ftp-account}} {{#disabled}}disabled{{/disabled}} From 28f5bcc8474f680e80ffa1ed2a9f270a34fd1f4e Mon Sep 17 00:00:00 2001 From: AuDevTist1C <114492072+AuDevTist1C@users.noreply.github.com> Date: Fri, 31 Jul 2026 04:23:03 +0200 Subject: [PATCH 013/195] refactor(file-browser): extract reusable deletion helper and abstract Termux URL checking (#2548) Consolidate redundant file and directory deletion routines into a single reusable helper function to improve maintainability and reduce code duplication in fileBrowser. * **Deletion Logic Consolidation:** * Refactored duplicated recursive deletion routines across batch selection and individual item removal into a unified `deleteDirOrFile()` helper function. * Standardized post-deletion state cleanup including cache invalidation, recents removal, and active editor URI updates. * **Termux Traversal & Validation:** * Extracted Termux URI checking into a dedicated `isTermuxUrl()` helper function for cleaner reuse in rename and deletion handlers. * Streamlined recursive directory tree traversal for Termux storage backends by passing `fsOperation` instances directly. (AI generated commit message) --- src/pages/fileBrowser/fileBrowser.js | 120 +++++++++++---------------- 1 file changed, 47 insertions(+), 73 deletions(-) diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index 036df96742..9d658bbcee 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -603,43 +603,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { ); try { - for (const url of selectedItems) { - if ((await fsOperation(url).stat()).isDirectory) { - if (url.startsWith("content://com.termux.documents/tree/")) { - const fs = fsOperation(url); - const entries = await fs.lsDir(); - if (entries.length === 0) { - await fs.delete(); - } else { - const deleteRecursively = async (currentUrl) => { - const currentFs = fsOperation(currentUrl); - const currentEntries = await currentFs.lsDir(); - for (const entry of currentEntries) { - if (entry.isDirectory) { - await deleteRecursively(entry.url); - } else { - await fsOperation(entry.url).delete(); - } - } - await currentFs.delete(); - }; - await deleteRecursively(url); - } - } else { - await fsOperation(url).delete(); - } - helpers.updateUriOfAllActiveFiles(url); - recents.removeFolder(url); - } else { - const fs = fsOperation(url); - await fs.delete(); - const openedFile = editorManager.getFile(url, "uri"); - if (openedFile) openedFile.uri = null; - } - recents.removeFile(url); - openFolder.removeItem(url); - delete cachedDir[url]; - } + for (const url of selectedItems) await deleteDirOrFile(url); toast(strings.success); reload(); isSelectionMode = false; @@ -688,6 +652,50 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { $page.hide(); } + /** + * @param {string} url + */ + function isTermuxUrl(url) { + url = `${url ?? ""}`; + return url.startsWith("content://com.termux.documents/tree/"); + } + + /** + * @param {string} url + * @param {string} [type] + */ + async function deleteDirOrFile(url, type) { + const fs = fsOperation(url); + const isDir = type ? helpers.isDir(type) : (await fs.stat()).isDirectory; + + if (isDir && isTermuxUrl(url)) { + const deleteRecursively = async (currentFs) => { + const entries = await currentFs.lsDir(); + if (entries) { + for (const entry of entries) { + const fs = fsOperation(entry.url); + await (entry.isDirectory ? deleteRecursively(fs) : fs.delete()); + } + } + await currentFs.delete(); + }; + await deleteRecursively(fs); + } else { + await fs.delete(); + } + + if (isDir) { + helpers.updateUriOfAllActiveFiles(url); + recents.removeFolder(url); + } else { + const openedFile = editorManager.getFile(url, "uri"); + if (openedFile) openedFile.uri = null; + } + recents.removeFile(url); + openFolder.removeItem(url); + delete cachedDir[url]; + } + function updateSelectionCount($count) { if ($count) { $count.textContent = `${selectedItems.size} items selected`; @@ -1152,7 +1160,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { } async function renameFile(newname) { - if (url.startsWith("content://com.termux.documents/tree/")) { + if (isTermuxUrl(url)) { if (helpers.isDir(type)) { alert(strings.warning, strings["rename not supported"]); return; @@ -1204,42 +1212,8 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { async function removeFile() { try { - if (helpers.isDir(type)) { - if (url.startsWith("content://com.termux.documents/tree/")) { - const fs = fsOperation(url); - const entries = await fs.lsDir(); - if (entries.length === 0) { - await fs.delete(); - } else { - const deleteRecursively = async (currentUrl) => { - const currentFs = fsOperation(currentUrl); - const currentEntries = await currentFs.lsDir(); - for (const entry of currentEntries) { - if (entry.isDirectory) { - await deleteRecursively(entry.url); - } else { - await fsOperation(entry.url).delete(); - } - } - await currentFs.delete(); - }; - await deleteRecursively(url); - } - } else { - await fsOperation(url).delete(); - } - helpers.updateUriOfAllActiveFiles(url); - recents.removeFolder(url); - } else { - const fs = fsOperation(url); - await fs.delete(); - const openedFile = editorManager.getFile(url, "uri"); - if (openedFile) openedFile.uri = null; - } - recents.removeFile(url); - openFolder.removeItem(url); + await deleteDirOrFile(url, type); toast(strings.success); - delete cachedDir[url]; reload(); } catch (err) { window.log("error", err); From e228155cb4e434b9d6c21caac36ffd02e3249720 Mon Sep 17 00:00:00 2001 From: AuDevTist1C <114492072+AuDevTist1C@users.noreply.github.com> Date: Fri, 31 Jul 2026 04:28:42 +0200 Subject: [PATCH 014/195] feat: integrate file selection mode with application action stack for back navigation (#2546) Integrate the file browser's multi-item selection mode directly into the application's global `actionStack` navigation controller to provide native hardware and interface back-button support. When users enter multi-selection mode (e.g., long-pressing a file or checking multiple items), pressing the hardware back button or triggering back-gestures previously caused the application to navigate away from the current folder entirely, losing active context. This update registers selection mode as an isolated state layer within the global `actionStack`. * **Action Stack Registration:** * Upon entering selection mode, the file browser pushes a `fbSelection` state descriptor to `actionStack`. * The back action handler captures `fbSelection` events to intercept back navigation, clearing all checked items and exiting selection mode first before any folder pops occur. * **Stack Lifecycle Cleanup:** * Implemented automatic cleanup hooks to pop or unregister the `fbSelection` entry from `actionStack` whenever selection mode is dismissed through UI confirmation, cancel buttons, or batch execution tasks. (AI generated commit message) --- src/pages/fileBrowser/fileBrowser.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index 9d658bbcee..439ac15015 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -891,7 +891,19 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { if ($openFolder) { $openFolder.disabled = true; } + + if (!actionStack.has("fbSelection")) { + actionStack.push({ + id: "fbSelection", + action: () => { + isSelectionMode = false; + toggleSelectionMode(false); + }, + }); + } } else { + actionStack.remove("fbSelection"); + $list.classList.remove("selection-mode"); $list.querySelector(".selection-header")?.remove(); $list.querySelectorAll(".input-checkbox").forEach((cb) => cb.remove()); From 36b44d9945aac3c9a10c726aa0e4ad9c4669624a Mon Sep 17 00:00:00 2001 From: Rohit Kushvaha Date: Fri, 31 Jul 2026 08:19:41 +0530 Subject: [PATCH 015/195] feat: added unit tests (#2539) * feat: added unit tests * fix --------- Co-authored-by: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> --- package-lock.json | 1168 +++++++++++++++++++++++++-- package.json | 5 +- src/handlers/quickToolsState.js | 11 +- tests/unit/binaryExtensions.test.js | 81 ++ tests/unit/color.test.js | 103 +++ tests/unit/installSource.test.js | 23 + tests/unit/path.test.js | 122 +++ tests/unit/quickToolsState.test.js | 117 +++ tests/unit/taskManager.test.js | 78 ++ tests/unit/uri.test.js | 72 ++ tests/unit/url.test.js | 159 ++++ tests/unit/version.test.js | 24 + vitest.config.js | 36 + 13 files changed, 1928 insertions(+), 71 deletions(-) create mode 100644 tests/unit/binaryExtensions.test.js create mode 100644 tests/unit/color.test.js create mode 100644 tests/unit/installSource.test.js create mode 100644 tests/unit/path.test.js create mode 100644 tests/unit/quickToolsState.test.js create mode 100644 tests/unit/taskManager.test.js create mode 100644 tests/unit/uri.test.js create mode 100644 tests/unit/url.test.js create mode 100644 tests/unit/version.test.js create mode 100644 vitest.config.js diff --git a/package-lock.json b/package-lock.json index e1e561c577..60075d0657 100644 --- a/package-lock.json +++ b/package-lock.json @@ -142,6 +142,7 @@ "terminal": "^0.1.4", "ts-loader": "^9.5.7", "typescript": "^5.9.3", + "vitest": "^4.1.10", "vscode-languageserver-types": "^3.17.5", "ws": "^8.21.0" } @@ -4802,6 +4803,16 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/@oxc-project/types": { + "version": "0.142.0", + "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.142.0.tgz", + "integrity": "sha512-7W+2q5AKQVU36fkaryontrHn3YDt1RyUYXatw9i5H8ocYe2sPKSFB6eS8WNPeRKiN1qAWWZUPm7gwFzJGrccqQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/Boshen" + } + }, "node_modules/@parcel/watcher": { "version": "2.5.6", "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz", @@ -5112,6 +5123,323 @@ "url": "https://opencollective.com/parcel" } }, + "node_modules/@rolldown/binding-android-arm64": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.1.tgz", + "integrity": "sha512-02hOeOSryYxVrOIphmLAsqnCJWxwlzFk+pEt/N/i6OgT3lShHO7xGCU5cpgchRDHboAEbSjzgGh+O/u1GswQmA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-darwin-arm64": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.1.tgz", + "integrity": "sha512-fMsTOnN0OjFm3CyppWPitKnc8UlliVARUULW6cfU6AIqjdtgmSFWSk9vecHzZduv/yMWIHDlRhM1e8Iff9uAfA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-darwin-x64": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.1.tgz", + "integrity": "sha512-1wjKdz/XLGKHaTNHjQveQ/B23TKx4ItAqm1JbyVuvNPc4Ze0Fb48s49TAd/2zcplPl8okE/UbTgmlVfwT7eFeQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-freebsd-x64": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.1.tgz", + "integrity": "sha512-Fa0jHR07E7YBN4vOEsbVf2briYNsuOowfLJaXULZM0ldMlaCaj2LJgLMbMe4iacRyZmvR8efFhgR9wKuGclQUg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-linux-arm-gnueabihf": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.1.tgz", + "integrity": "sha512-pzkgu1SSHGgRRyRZ4fbmSgmajbVt+epaLP99NDjFft69v/ypfTi6swBMiVdh2EkQ0OSnHE1lZDM7DRGkyAzUpA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-linux-arm64-gnu": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.1.tgz", + "integrity": "sha512-QI5SEDY8cbiYWHx0VO4vIc3UlS6a32vXHjU8Qy/17adEmZIPuByJg13UEvo9c/UCiUkdcVWY83C+b+JrwnNyUg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-linux-arm64-musl": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.1.tgz", + "integrity": "sha512-Sm41FyCeXqmYcERoYOCbGIL5hNfd8w9LQ7Y61Bev48HkcjaJqV/iiVOaiDxjVTRMS+QKrZmD8cfPt4uMVnvM+A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-linux-ppc64-gnu": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.1.tgz", + "integrity": "sha512-2x+WhXTGl9yJYPbltW/BSEPTVz9OIWQyER4N+gJEDWkkn904eRcBzELqh/Hf7K0w/ubGbKNMv0ZC+94QK/IFEg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-linux-s390x-gnu": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.1.tgz", + "integrity": "sha512-eEjmQpuRQayHPWWnywaWHkFT3ToPbP3RYy42VVd/B9aBGDA+Ol25EIWHxKQST3IiWJjikCWUF7KtbfqwZrzVwQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-linux-x64-gnu": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.1.tgz", + "integrity": "sha512-/Orga1fZYkLc/56jBICcHrKchl8Z2UKdDSr3LG9ToWO1lQ6a4Livk9Xz+9WN91zsz5QR3XQz2NNoSDEvP6qadw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-linux-x64-musl": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.1.tgz", + "integrity": "sha512-xxBJRL+0q0Kce7orznGWLuylHDY65vuARXZRpX+hPdv+DqK2c3NlCsVA98tlWzWNEE7yPqA/1NQ5nnCrj49Y5A==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-openharmony-arm64": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.1.tgz", + "integrity": "sha512-M6AdXIXw3s+/8XpKMzdGDEXGS1S7kwUsy+rcTIUIOx5Ge4nXKCtAFHFV9YKkXvGcC5WMoTjAteLzlsQROVI0Yw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-wasm32-wasi": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.2.1.tgz", + "integrity": "sha512-/TX0SoRGojHzSAHpfVBbavRVSazg5U3h3Y3VXfcc0cdugq6kxdqw8LPGFiPr+/7gE/60zRcsOY2Vi9b9eT0jww==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/core": "2.0.0-alpha.3", + "@emnapi/runtime": "2.0.0-alpha.3", + "@napi-rs/wasm-runtime": "^1.2.0" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=23.5.0" + } + }, + "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/core": { + "version": "2.0.0-alpha.3", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-2.0.0-alpha.3.tgz", + "integrity": "sha512-AZypUeJ/yByuxyS7BlSNRDOMLMlROYtjYdIAuBmJssVz1UJDSeYxLrdizhXCFYhedC5bqd/ASy8EuNXbVVXp9g==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/wasi-threads": "2.0.1", + "tslib": "^2.4.0" + } + }, + "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/runtime": { + "version": "2.0.0-alpha.3", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-2.0.0-alpha.3.tgz", + "integrity": "sha512-hFPAhMUjJD9BSyCANEISPOogeXC9Zo9ZQl7L6vKnaVsMkCtzznaW/naYypeyl0Gv5rYfWYsZbpixTMpjDJzQeA==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/wasi-threads": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-2.0.1.tgz", + "integrity": "sha512-9DsSk+o5NBX0CCJT8s0EROGSGxjR/tKu6aBTaVyq+SjAEQH4XcdcRxPBRzsBLizTTJ49MJjF+jgu3qnO9GLQcQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.1.tgz", + "integrity": "sha512-KjZdi8Q1wh89gsVmghvbrMgWl6ZWmRmHV6wjB7/g4Zf0dyO+hH3neZUtuDNPO00qq5YE5RITVWvrIZKRaAmzGQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@tybys/wasm-util": "^0.10.3" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=23.5.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + }, + "peerDependencies": { + "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.3", + "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.3" + } + }, + "node_modules/@rolldown/binding-win32-arm64-msvc": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.1.tgz", + "integrity": "sha512-EvRrivJieyHG+AO9lleZWgq+g0+S7oV2C51yuqlcyU/R9net+sI4Pj0F+lUoP2bEr6TWX3SqFaaS0SzfLxSzkw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-win32-x64-msvc": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.1.tgz", + "integrity": "sha512-Z4eCmn5QJ/5+azF9knpLWKfVd9aidn0mAe9TpJgvBLId9Ax3t0+JVxBmT25Bv7NBbVW1TZyKjQjQReouMeH5UQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/pluginutils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz", + "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==", + "dev": true, + "license": "MIT" + }, "node_modules/@rspack/binding": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-2.0.3.tgz", @@ -5407,6 +5735,13 @@ "integrity": "sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw==", "license": "ISC" }, + "node_modules/@standard-schema/spec": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz", + "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==", + "dev": true, + "license": "MIT" + }, "node_modules/@szmarczak/http-timer": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", @@ -5453,9 +5788,9 @@ } }, "node_modules/@tybys/wasm-util": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz", - "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==", + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz", + "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==", "dev": true, "license": "MIT", "optional": true, @@ -5470,6 +5805,27 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/chai": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz", + "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/deep-eql": "*", + "assertion-error": "^2.0.1" + } + }, + "node_modules/@types/chai/node_modules/assertion-error": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + } + }, "node_modules/@types/cordova": { "version": "11.0.3", "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-11.0.3.tgz", @@ -5730,6 +6086,13 @@ "@types/d3-selection": "*" } }, + "node_modules/@types/deep-eql": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz", + "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/eslint": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", @@ -5759,8 +6122,7 @@ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/@types/gensync": { "version": "1.0.5", @@ -5862,6 +6224,129 @@ "d3-transition": "^3.0.1" } }, + "node_modules/@vitest/expect": { + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.10.tgz", + "integrity": "sha512-YsCn+qAk1GWjQOWFEsEcL2gNQ0zmVmQu3T03qP6UyjhtmdtwtbuI+DASn/7iQB3HGTXkdBwGddzxPlmiql5vlA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@standard-schema/spec": "^1.1.0", + "@types/chai": "^5.2.2", + "@vitest/spy": "4.1.10", + "@vitest/utils": "4.1.10", + "chai": "^6.2.2", + "tinyrainbow": "^3.1.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/expect/node_modules/chai": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz", + "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, + "node_modules/@vitest/mocker": { + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.10.tgz", + "integrity": "sha512-v0xaezt+DKEmKfaxg133ldzADrwLGd7Ze1MfQQTYfvs8OqZIwbxyxaYURivwV7sWy5fqn3rH5uOrSp07bp44Ow==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/spy": "4.1.10", + "estree-walker": "^3.0.3", + "magic-string": "^0.30.21" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "msw": "^2.4.9", + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "msw": { + "optional": true + }, + "vite": { + "optional": true + } + } + }, + "node_modules/@vitest/pretty-format": { + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.10.tgz", + "integrity": "sha512-W1HsjSH4MXQ9YfmmhLAoIYf1HRfekQCGngeIgcei6MP5QQGWUe0gkopdZQaVCFO+JDJMrAJGwa5pRpNpvy4P8Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "tinyrainbow": "^3.1.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/runner": { + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.10.tgz", + "integrity": "sha512-IKI6kpIH+LmpROplyLwBBaCfMgOZOMsygVa6BARD6ahA04VRuJSa6OaVG7kRvSEMD870Vd91rSSw0eegtWyLGg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/utils": "4.1.10", + "pathe": "^2.0.3" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/snapshot": { + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.10.tgz", + "integrity": "sha512-xRkfOT1qpTAi/Ti4Y1LtfRc3kEuqxGw59eN2jN9pRWMtS/XDevekhcFSqvQqjUNGksfjMJu3Y+oJ+4Ypn2OaJw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/pretty-format": "4.1.10", + "@vitest/utils": "4.1.10", + "magic-string": "^0.30.21", + "pathe": "^2.0.3" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/spy": { + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.10.tgz", + "integrity": "sha512-PLf/Ugvoq5wO/b4rwYCR1h2PSIdXz7wnkQFMiUpLdtM7l6pqVFcQIBEHyT1+l+cj7mNwAfZHzqXqDyjvOuwbDw==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/utils": { + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.10.tgz", + "integrity": "sha512-fy9am/HWxbaGt/Sawrp90vt6Y6jQwf1RX77cz3uwoJwJVMli/e1IEwRPnMNJ7vKfPTwo0diXifkpPvwH9v7nGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/pretty-format": "4.1.10", + "convert-source-map": "^2.0.0", + "tinyrainbow": "^3.1.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, "node_modules/@vscode/l10n": { "version": "0.0.18", "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", @@ -9379,7 +9864,6 @@ "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", "dev": true, "license": "Apache-2.0", - "optional": true, "engines": { "node": ">=8" } @@ -9727,8 +10211,7 @@ "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz", "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/es-object-atoms": { "version": "1.1.2", @@ -9855,6 +10338,16 @@ "node": ">=4.0" } }, + "node_modules/estree-walker": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0" + } + }, "node_modules/esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -9918,6 +10411,16 @@ "node": ">= 0.8.0" } }, + "node_modules/expect-type": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.4.0.tgz", + "integrity": "sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/exponential-backoff": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz", @@ -12102,64 +12605,325 @@ "dependencies": { "commander": "^8.3.0" }, - "bin": { - "katex": "cli.js" + "bin": { + "katex": "cli.js" + } + }, + "node_modules/keyv": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", + "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.0" + } + }, + "node_modules/khroma": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/khroma/-/khroma-2.1.0.tgz", + "integrity": "sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==" + }, + "node_modules/latest-version": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", + "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", + "dev": true, + "license": "MIT", + "dependencies": { + "package-json": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/layout-base": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-1.0.2.tgz", + "integrity": "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==", + "license": "MIT" + }, + "node_modules/lazystream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", + "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "readable-stream": "^2.0.5" + }, + "engines": { + "node": ">= 0.6.3" + } + }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "license": "MIT", + "dependencies": { + "immediate": "~3.0.5" + } + }, + "node_modules/lightningcss": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.33.0.tgz", + "integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==", + "dev": true, + "license": "MPL-2.0", + "dependencies": { + "detect-libc": "^2.0.3" + }, + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "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" + } + }, + "node_modules/lightningcss-android-arm64": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.33.0.tgz", + "integrity": "sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-darwin-arm64": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.33.0.tgz", + "integrity": "sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-darwin-x64": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.33.0.tgz", + "integrity": "sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-freebsd-x64": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.33.0.tgz", + "integrity": "sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm-gnueabihf": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.33.0.tgz", + "integrity": "sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm64-gnu": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.33.0.tgz", + "integrity": "sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/keyv": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", - "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", + "node_modules/lightningcss-linux-arm64-musl": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.33.0.tgz", + "integrity": "sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "json-buffer": "3.0.0" + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/khroma": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/khroma/-/khroma-2.1.0.tgz", - "integrity": "sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==" - }, - "node_modules/latest-version": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", - "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", + "node_modules/lightningcss-linux-x64-gnu": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.33.0.tgz", + "integrity": "sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "package-json": "^6.3.0" - }, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=8" + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/layout-base": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-1.0.2.tgz", - "integrity": "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==", - "license": "MIT" - }, - "node_modules/lazystream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", - "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", + "node_modules/lightningcss-linux-x64-musl": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.33.0.tgz", + "integrity": "sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "readable-stream": "^2.0.5" + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-win32-arm64-msvc": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.33.0.tgz", + "integrity": "sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": ">= 0.6.3" + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/lie": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", - "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", - "license": "MIT", - "dependencies": { - "immediate": "~3.0.5" + "node_modules/lightningcss-win32-x64-msvc": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.33.0.tgz", + "integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, "node_modules/lines-and-columns": { @@ -12361,6 +13125,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/magic-string": { + "version": "0.30.21", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", + "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.5" + } + }, "node_modules/make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -13339,9 +14113,9 @@ "license": "ISC" }, "node_modules/nanoid": { - "version": "3.3.12", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz", - "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==", + "version": "3.3.16", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz", + "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==", "dev": true, "funding": [ { @@ -14107,6 +14881,13 @@ "node": ">=8" } }, + "node_modules/pathe": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", + "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", + "dev": true, + "license": "MIT" + }, "node_modules/pathval": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", @@ -14132,9 +14913,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", - "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", + "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", "license": "MIT", "engines": { "node": ">=12" @@ -14263,9 +15044,9 @@ } }, "node_modules/postcss": { - "version": "8.5.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.14.tgz", - "integrity": "sha512-SoSL4+OSEtR99LHFZQiJLkT59C5B1amGO1NzTwj7TT1qCUgUO6hxOvzkOYxD+vMrXBM3XJIKzokoERdqQq/Zmg==", + "version": "8.5.25", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.25.tgz", + "integrity": "sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==", "dev": true, "funding": [ { @@ -14283,7 +15064,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.11", + "nanoid": "^3.3.16", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -15342,6 +16123,40 @@ "integrity": "sha512-NS3levdsRIUOmiJ8FZWCP7LG3QpJyrs/TE0Zpf1yvZu8cAJJ6QMW92H1c7kWpdIHo8RvmLxN/o2JXTKHp74lUA==", "license": "Unlicense" }, + "node_modules/rolldown": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.1.tgz", + "integrity": "sha512-4FKJhg8d3OiyQOA6Q1Q0hoFFpW9/OoX+VsHzpECsdsIZoOArrAK90gl59YK/Z+gnDel45bgJZK03ozH/9bCqEw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@oxc-project/types": "=0.142.0", + "@rolldown/pluginutils": "^1.0.0" + }, + "bin": { + "rolldown": "bin/cli.mjs" + }, + "engines": { + "node": "^20.19.0 || >=22.12.0" + }, + "optionalDependencies": { + "@rolldown/binding-android-arm64": "1.2.1", + "@rolldown/binding-darwin-arm64": "1.2.1", + "@rolldown/binding-darwin-x64": "1.2.1", + "@rolldown/binding-freebsd-x64": "1.2.1", + "@rolldown/binding-linux-arm-gnueabihf": "1.2.1", + "@rolldown/binding-linux-arm64-gnu": "1.2.1", + "@rolldown/binding-linux-arm64-musl": "1.2.1", + "@rolldown/binding-linux-ppc64-gnu": "1.2.1", + "@rolldown/binding-linux-s390x-gnu": "1.2.1", + "@rolldown/binding-linux-x64-gnu": "1.2.1", + "@rolldown/binding-linux-x64-musl": "1.2.1", + "@rolldown/binding-openharmony-arm64": "1.2.1", + "@rolldown/binding-wasm32-wasi": "1.2.1", + "@rolldown/binding-win32-arm64-msvc": "1.2.1", + "@rolldown/binding-win32-x64-msvc": "1.2.1" + } + }, "node_modules/roughjs": { "version": "4.6.6", "resolved": "https://registry.npmjs.org/roughjs/-/roughjs-4.6.6.tgz", @@ -15720,6 +16535,13 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/siginfo": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", + "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==", + "dev": true, + "license": "ISC" + }, "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", @@ -15926,6 +16748,13 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/stackback": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", + "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", + "dev": true, + "license": "MIT" + }, "node_modules/statuses": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", @@ -15936,6 +16765,13 @@ "node": ">= 0.8" } }, + "node_modules/std-env": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.2.0.tgz", + "integrity": "sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==", + "dev": true, + "license": "MIT" + }, "node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -16286,6 +17122,13 @@ "dev": true, "license": "MIT" }, + "node_modules/tinybench": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", + "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==", + "dev": true, + "license": "MIT" + }, "node_modules/tinyexec": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.1.2.tgz", @@ -16296,9 +17139,9 @@ } }, "node_modules/tinyglobby": { - "version": "0.2.16", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz", - "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==", + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", + "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", "license": "MIT", "dependencies": { "fdir": "^6.5.0", @@ -16311,6 +17154,16 @@ "url": "https://github.com/sponsors/SuperchupuDev" } }, + "node_modules/tinyrainbow": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.1.tgz", + "integrity": "sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/tmp": { "version": "0.2.7", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.7.tgz", @@ -16913,6 +17766,174 @@ "dev": true, "license": "MIT" }, + "node_modules/vite": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.2.0.tgz", + "integrity": "sha512-pn+CFpM0lwDeKwmOq1ZaBK/9sjorZcgqxki6MbY/jPEVd9vichIlmlD4HmQ5wdP5EgqQCFRaACBxMC7uEGc6lQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "lightningcss": "^1.33.0", + "picomatch": "^4.0.5", + "postcss": "^8.5.23", + "rolldown": "~1.2.0", + "tinyglobby": "^0.2.17" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^20.19.0 || >=22.12.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + }, + "peerDependencies": { + "@types/node": "^20.19.0 || >=22.12.0", + "@vitejs/devtools": "^0.4.0", + "esbuild": "^0.27.0 || ^0.28.0", + "jiti": ">=1.21.0", + "less": "^4.0.0", + "sass": "^1.70.0", + "sass-embedded": "^1.70.0", + "stylus": ">=0.54.8", + "sugarss": "^5.0.0", + "terser": "^5.16.0", + "tsx": "^4.8.1", + "yaml": "^2.4.2" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "@vitejs/devtools": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "jiti": { + "optional": true + }, + "less": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + }, + "tsx": { + "optional": true + }, + "yaml": { + "optional": true + } + } + }, + "node_modules/vitest": { + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.10.tgz", + "integrity": "sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/expect": "4.1.10", + "@vitest/mocker": "4.1.10", + "@vitest/pretty-format": "4.1.10", + "@vitest/runner": "4.1.10", + "@vitest/snapshot": "4.1.10", + "@vitest/spy": "4.1.10", + "@vitest/utils": "4.1.10", + "es-module-lexer": "^2.0.0", + "expect-type": "^1.3.0", + "magic-string": "^0.30.21", + "obug": "^2.1.1", + "pathe": "^2.0.3", + "picomatch": "^4.0.3", + "std-env": "^4.0.0-rc.1", + "tinybench": "^2.9.0", + "tinyexec": "^1.0.2", + "tinyglobby": "^0.2.15", + "tinyrainbow": "^3.1.0", + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0", + "why-is-node-running": "^2.3.0" + }, + "bin": { + "vitest": "vitest.mjs" + }, + "engines": { + "node": "^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "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.10", + "@vitest/browser-preview": "4.1.10", + "@vitest/browser-webdriverio": "4.1.10", + "@vitest/coverage-istanbul": "4.1.10", + "@vitest/coverage-v8": "4.1.10", + "@vitest/ui": "4.1.10", + "happy-dom": "*", + "jsdom": "*", + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "@edge-runtime/vm": { + "optional": true + }, + "@opentelemetry/api": { + "optional": true + }, + "@types/node": { + "optional": true + }, + "@vitest/browser-playwright": { + "optional": true + }, + "@vitest/browser-preview": { + "optional": true + }, + "@vitest/browser-webdriverio": { + "optional": true + }, + "@vitest/coverage-istanbul": { + "optional": true + }, + "@vitest/coverage-v8": { + "optional": true + }, + "@vitest/ui": { + "optional": true + }, + "happy-dom": { + "optional": true + }, + "jsdom": { + "optional": true + }, + "vite": { + "optional": false + } + } + }, "node_modules/vscode-css-languageservice": { "version": "6.3.10", "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.10.tgz", @@ -17122,6 +18143,23 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/why-is-node-running": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", + "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==", + "dev": true, + "license": "MIT", + "dependencies": { + "siginfo": "^2.0.0", + "stackback": "0.0.2" + }, + "bin": { + "why-is-node-running": "cli.js" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/wide-align": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", diff --git a/package.json b/package.json index 210c0529c9..0faaeef1f2 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,9 @@ "format": "biome format --write", "check": "biome check --write", "typecheck": "tsc --noEmit", - "updateAce": "node ./utils/updateAce.js" + "updateAce": "node ./utils/updateAce.js", + "test": "vitest run", + "test:watch": "vitest" }, "keywords": [ "ecosystem:cordova" @@ -112,6 +114,7 @@ "terminal": "^0.1.4", "ts-loader": "^9.5.7", "typescript": "^5.9.3", + "vitest": "^4.1.10", "vscode-languageserver-types": "^3.17.5", "ws": "^8.21.0" }, diff --git a/src/handlers/quickToolsState.js b/src/handlers/quickToolsState.js index 6b025c2e60..7301aed0ab 100644 --- a/src/handlers/quickToolsState.js +++ b/src/handlers/quickToolsState.js @@ -13,12 +13,13 @@ export function clearModifierState(state, events = {}) { } export function clearQuickToolsButtonFeedback(containers = []) { - const visited = new Set(); + const visitedContainers = new Set(); + const visitedButtons = new Set(); let cleared = 0; for (const container of containers) { - if (!container || visited.has(container)) continue; - visited.add(container); + if (!container || visitedContainers.has(container)) continue; + visitedContainers.add(container); const buttons = [ ...(container.matches?.(".active, .click, [data-timeout]") @@ -29,8 +30,8 @@ export function clearQuickToolsButtonFeedback(containers = []) { ]; for (const button of buttons) { - if (!button || visited.has(button)) continue; - visited.add(button); + if (!button || visitedButtons.has(button)) continue; + visitedButtons.add(button); if (button.dataset?.timeout) { clearTimeout(Number(button.dataset.timeout)); delete button.dataset.timeout; diff --git a/tests/unit/binaryExtensions.test.js b/tests/unit/binaryExtensions.test.js new file mode 100644 index 0000000000..1999c1d55b --- /dev/null +++ b/tests/unit/binaryExtensions.test.js @@ -0,0 +1,81 @@ +import { describe, expect, it } from "vitest"; +import { + isBinaryFile, + isBinaryMime, + isBinaryPath, + isTextPath, +} from "utils/binaryExtensions"; + +describe("isBinaryPath", () => { + it("detects binary extensions", () => { + expect(isBinaryPath("photo.jpg")).toBe(true); + expect(isBinaryPath("downloads/app.apk")).toBe(true); + }); + + it("is case-insensitive", () => { + expect(isBinaryPath("IMAGE.PNG")).toBe(true); + }); + + it("detects compound extensions", () => { + expect(isBinaryPath("archive.tar.gz")).toBe(true); + }); + + it("ignores query strings and hashes", () => { + expect(isBinaryPath("https://x.com/a.zip?dl=1")).toBe(true); + }); + + it("returns false for text or extensionless paths", () => { + expect(isBinaryPath("script.js")).toBe(false); + expect(isBinaryPath("README")).toBe(false); + }); +}); + +describe("isTextPath", () => { + it("detects text extensions", () => { + expect(isTextPath("notes.txt")).toBe(true); + expect(isTextPath("src/main.js")).toBe(true); + }); + + it("returns false for binary or extensionless paths", () => { + expect(isTextPath("app.apk")).toBe(false); + expect(isTextPath("Makefile")).toBe(false); + }); +}); + +describe("isBinaryMime", () => { + it("detects binary mime types", () => { + expect(isBinaryMime("application/zip")).toBe(true); + expect(isBinaryMime("application/octet-stream")).toBe(true); + }); + + it("returns false for text mime types", () => { + expect(isBinaryMime("text/plain")).toBe(false); + expect(isBinaryMime("text/html; charset=utf-8")).toBe(false); + }); + + it("returns false for empty input", () => { + expect(isBinaryMime("")).toBe(false); + expect(isBinaryMime(null)).toBe(false); + }); +}); + +describe("isBinaryFile", () => { + it("accepts a plain path string", () => { + expect(isBinaryFile("x.png")).toBe(true); + expect(isBinaryFile("x.txt")).toBe(false); + }); + + it("returns false for falsy input", () => { + expect(isBinaryFile(null)).toBe(false); + expect(isBinaryFile(undefined)).toBe(false); + }); + + it("detects binary files by extension", () => { + expect(isBinaryFile({ name: "photo.jpg" })).toBe(true); + }); + + it("gives text mime types precedence over the extension", () => { + expect(isBinaryFile({ mime: "text/csv", url: "file.apk" })).toBe(false); + expect(isBinaryFile({ type: "text/plain", name: "x.png" })).toBe(false); + }); +}); diff --git a/tests/unit/color.test.js b/tests/unit/color.test.js new file mode 100644 index 0000000000..d7e00acbbb --- /dev/null +++ b/tests/unit/color.test.js @@ -0,0 +1,103 @@ +import { describe, expect, it } from "vitest"; +import Hex from "utils/color/hex"; +import Hsl from "utils/color/hsl"; +import { isValidColor } from "utils/color/regex"; +import Rgb from "utils/color/rgb"; + +describe("Rgb", () => { + it("stringifies opaque colors as rgb()", () => { + expect(new Rgb(255, 0, 0).toString()).toBe("rgb(255, 0, 0)"); + }); + + it("stringifies translucent colors as rgba()", () => { + expect(new Rgb(255, 0, 0, 0.5).toString()).toBe("rgba(255, 0, 0, 0.5)"); + }); + + it("can force the alpha channel on or off", () => { + expect(new Rgb(255, 0, 0).toString(true)).toBe("rgba(255, 0, 0, 1)"); + expect(new Rgb(255, 0, 0, 0.5).toString(false)).toBe("rgb(255, 0, 0)"); + }); +}); + +describe("Hex", () => { + it("stringifies colors as uppercase hex", () => { + expect(new Hex(255, 0, 0, 255).toString()).toBe("#FF0000"); + expect(new Hex(0, 128, 255, 255).toString()).toBe("#0080FF"); + }); + + it("includes the alpha channel when it is not opaque", () => { + expect(new Hex(255, 0, 0, 128).toString()).toBe("#FF000080"); + }); + + it("can force the alpha channel on or off", () => { + expect(new Hex(255, 0, 0, 128).toString(false)).toBe("#FF0000"); + expect(new Hex(255, 0, 0, 255).toString(true)).toBe("#FF0000FF"); + }); + + it("pads single-digit channels", () => { + expect(new Hex(1, 2, 3, 255).toString()).toBe("#010203"); + }); + + it("converts to an Rgb instance", () => { + const rgb = new Hex(10, 20, 30, 40).rgb; + expect(rgb).toBeInstanceOf(Rgb); + expect([rgb.r, rgb.g, rgb.b, rgb.a]).toEqual([10, 20, 30, 40]); + }); +}); + +describe("Hsl", () => { + it("exposes degree/percentage getters", () => { + const hsl = new Hsl(0.5, 0.25, 1, 0.5); + expect(hsl.hue).toBe(180); + expect(hsl.saturation).toBe(25); + expect(hsl.lightness).toBe(100); + expect(hsl.toString()).toBe("hsla(180, 25%, 100%, 0.5)"); + }); + + it("converts pure red from rgb", () => { + const hsl = Hsl.fromRgb(new Rgb(255, 0, 0)); + expect(hsl.h).toBe(0); + expect(hsl.s).toBe(1); + expect(hsl.l).toBe(0.5); + expect(hsl.toString()).toBe("hsl(0, 100%, 50%)"); + }); + + it("round-trips primary colors through rgb", () => { + for (const [r, g, b] of [ + [255, 0, 0], + [0, 255, 0], + [0, 0, 255], + [255, 255, 255], + [0, 0, 0], + ]) { + const rgb = Hsl.fromRgb(new Rgb(r, g, b)).rgb; + expect([rgb.r, rgb.g, rgb.b]).toEqual([r, g, b]); + } + }); +}); + +describe("isValidColor", () => { + it("accepts hex colors", () => { + expect(isValidColor("#ff0000")).toBe(true); + expect(isValidColor("#FFF")).toBe(true); + expect(isValidColor("#FF000080")).toBe(true); + }); + + it("accepts functional notations", () => { + expect(isValidColor("rgb(255, 0, 0)")).toBe(true); + expect(isValidColor("rgba(255, 0, 0, 0.5)")).toBe(true); + expect(isValidColor("hsl(120, 50%, 50%)")).toBe(true); + }); + + it("accepts named colors", () => { + expect(isValidColor("red")).toBe(true); + expect(isValidColor("rebeccapurple")).toBe(true); + }); + + it("rejects invalid values", () => { + expect(isValidColor("not-a-color")).toBe(false); + expect(isValidColor("")).toBe(false); + expect(isValidColor("rgb(300, 0, 0)")).toBe(false); + expect(isValidColor("#gg0000")).toBe(false); + }); +}); diff --git a/tests/unit/installSource.test.js b/tests/unit/installSource.test.js new file mode 100644 index 0000000000..e5ec612610 --- /dev/null +++ b/tests/unit/installSource.test.js @@ -0,0 +1,23 @@ +import { afterEach, describe, expect, it, vi } from "vitest"; +import { INSTALL_SOURCE_PLAY, isPlayStoreInstall } from "utils/installSource"; + +afterEach(() => { + vi.unstubAllGlobals(); +}); + +describe("isPlayStoreInstall", () => { + it("returns true when the app was installed from the Play Store", () => { + vi.stubGlobal("window", { appInstallSource: INSTALL_SOURCE_PLAY }); + expect(isPlayStoreInstall()).toBe(true); + }); + + it("returns false for any other install source", () => { + vi.stubGlobal("window", { appInstallSource: "com.android.packageinstaller" }); + expect(isPlayStoreInstall()).toBe(false); + }); + + it("returns false when the install source is unknown", () => { + vi.stubGlobal("window", {}); + expect(isPlayStoreInstall()).toBe(false); + }); +}); diff --git a/tests/unit/path.test.js b/tests/unit/path.test.js new file mode 100644 index 0000000000..d465d0d7cc --- /dev/null +++ b/tests/unit/path.test.js @@ -0,0 +1,122 @@ +import { describe, expect, it } from "vitest"; +import Path from "utils/Path"; + +describe("Path.dirname", () => { + it("returns the parent directory", () => { + expect(Path.dirname("/foo/bar/baz.txt")).toBe("/foo/bar"); + expect(Path.dirname("/foo/bar")).toBe("/foo"); + }); + + it("ignores trailing separators", () => { + expect(Path.dirname("foo/bar/")).toBe("./foo"); + }); + + it("returns root for top-level absolute paths", () => { + expect(Path.dirname("/foo")).toBe("/"); + }); + + it("returns '.' for bare filenames", () => { + expect(Path.dirname("file.txt")).toBe("."); + }); +}); + +describe("Path.basename", () => { + it("returns the last portion of a path", () => { + expect(Path.basename("/foo/bar.txt")).toBe("bar.txt"); + expect(Path.basename("foo/bar/baz")).toBe("baz"); + }); + + it("strips the given extension", () => { + expect(Path.basename("/foo/bar.txt", ".txt")).toBe("bar"); + }); + + it("ignores trailing separators", () => { + expect(Path.basename("/foo/bar/")).toBe("bar"); + }); + + it("handles edge cases", () => { + expect(Path.basename("/")).toBe("/"); + expect(Path.basename("")).toBe(""); + }); +}); + +describe("Path.extname", () => { + it("returns the extension including the dot", () => { + expect(Path.extname("file.txt")).toBe(".txt"); + expect(Path.extname("archive.tar.gz")).toBe(".gz"); + }); + + it("returns empty string when there is no extension", () => { + expect(Path.extname("foo/bar")).toBe(""); + }); + + it("returns empty string for dotfiles", () => { + expect(Path.extname(".gitignore")).toBe(""); + }); +}); + +describe("Path.join / normalize", () => { + it("joins segments and normalizes", () => { + expect(Path.join("foo", "bar", "baz")).toBe("foo/bar/baz"); + expect(Path.join("/foo/", "/bar/")).toBe("/foo/bar/"); + }); + + it("resolves '..' segments", () => { + expect(Path.join("foo", "bar", "../baz")).toBe("foo/baz"); + }); + + it("collapses duplicate separators and '.' segments", () => { + expect(Path.normalize("/foo//bar/./baz/../qux")).toBe("/foo/bar/qux"); + }); +}); + +describe("Path.resolve", () => { + it("resolves relative segments against a base", () => { + expect(Path.resolve("path/to/some/dir/", "../../dir")).toBe( + "/path/to/dir", + ); + }); + + it("resets on absolute segments", () => { + expect(Path.resolve("/foo", "/bar")).toBe("/bar"); + }); + + it("throws without arguments", () => { + expect(() => Path.resolve()).toThrow(); + }); +}); + +describe("Path.parse / format", () => { + it("parses a path into its parts", () => { + expect(Path.parse("/foo/bar.txt")).toEqual({ + root: "/", + dir: "/foo", + base: "bar.txt", + ext: ".txt", + name: "bar", + }); + }); + + it("formats a path object back to a string", () => { + expect(Path.format({ dir: "/foo", name: "bar", ext: ".txt" })).toBe( + "/foo/bar.txt", + ); + }); + + it("ignores a malformed extension when formatting", () => { + expect(Path.format({ root: "/", name: "bar", ext: "txt" })).toBe("/bar"); + }); +}); + +describe("Path.isAbsolute / convertToRelative", () => { + it("detects absolute paths", () => { + expect(Path.isAbsolute("/foo")).toBe(true); + expect(Path.isAbsolute("foo/bar")).toBe(false); + }); + + it("computes a path relative to a base", () => { + expect(Path.convertToRelative("/foo/bar", "/foo/baz/qux")).toBe( + "baz/qux", + ); + }); +}); diff --git a/tests/unit/quickToolsState.test.js b/tests/unit/quickToolsState.test.js new file mode 100644 index 0000000000..14059d572a --- /dev/null +++ b/tests/unit/quickToolsState.test.js @@ -0,0 +1,117 @@ +import { describe, expect, it } from "vitest"; +import { + clearModifierState, + clearQuickToolsButtonFeedback, + modifierKeys, + removeActionStackEntries, +} from "handlers/quickToolsState"; + +describe("clearModifierState", () => { + it("clears all modifiers and reports the change", () => { + const state = { shift: true, alt: true, ctrl: true, meta: true }; + expect(clearModifierState(state)).toBe(true); + for (const key of modifierKeys) { + expect(state[key]).toBe(false); + } + }); + + it("emits false for every registered listener", () => { + const state = { shift: true, alt: false, ctrl: true, meta: false }; + const emitted = []; + const events = { + shift: [(value) => emitted.push(["shift", value])], + alt: [(value) => emitted.push(["alt", value])], + ctrl: [(value) => emitted.push(["ctrl", value])], + meta: [(value) => emitted.push(["meta", value])], + }; + + expect(clearModifierState(state, events)).toBe(true); + expect(emitted).toEqual([ + ["shift", false], + ["alt", false], + ["ctrl", false], + ["meta", false], + ]); + }); + + it("returns false when nothing was active", () => { + const state = { shift: false, alt: false, ctrl: false, meta: false }; + expect(clearModifierState(state)).toBe(false); + }); +}); + +describe("removeActionStackEntries", () => { + function fakeStack(initial) { + const entries = [...initial]; + return { + entries, + remove(id) { + const index = entries.indexOf(id); + if (index === -1) return false; + entries.splice(index, 1); + return true; + }, + }; + } + + it("removes duplicate entries and counts them", () => { + const stack = fakeStack(["search-bar", "other", "search-bar"]); + expect(removeActionStackEntries(stack, "search-bar")).toBe(2); + expect(stack.entries).toEqual(["other"]); + }); + + it("returns 0 when the id is not present", () => { + const stack = fakeStack(["other"]); + expect(removeActionStackEntries(stack, "search-bar")).toBe(0); + expect(stack.entries).toEqual(["other"]); + }); +}); + +describe("clearQuickToolsButtonFeedback", () => { + function fakeButton(initialClasses = [], timeoutId) { + const classes = new Set(initialClasses); + return { + classes, + dataset: timeoutId !== undefined ? { timeout: String(timeoutId) } : {}, + classList: { + contains: (c) => classes.has(c), + remove: (...cs) => cs.forEach((c) => classes.delete(c)), + }, + }; + } + + function fakeContainer(buttons, matchesItself = false) { + return { + matches: () => matchesItself, + querySelectorAll: () => buttons, + }; + } + + it("clears active/click state and pending timeouts", () => { + const active = fakeButton(["icon", "active", "click"], 123); + const plain = fakeButton(["icon"]); + const container = fakeContainer([active, plain]); + + expect(clearQuickToolsButtonFeedback([container])).toBe(1); + expect([...active.classes]).toEqual(["icon"]); + expect(active.dataset.timeout).toBeUndefined(); + expect([...plain.classes]).toEqual(["icon"]); + }); + + it("clears containers that match themselves", () => { + const container = fakeButton(["active"], 456); + container.matches = () => true; + container.querySelectorAll = () => []; + + expect(clearQuickToolsButtonFeedback([container])).toBe(1); + expect([...container.classes]).toEqual([]); + expect(container.dataset.timeout).toBeUndefined(); + }); + + it("does not process duplicate containers twice", () => { + const button = fakeButton(["active"]); + const container = fakeContainer([button]); + + expect(clearQuickToolsButtonFeedback([container, container])).toBe(1); + }); +}); diff --git a/tests/unit/taskManager.test.js b/tests/unit/taskManager.test.js new file mode 100644 index 0000000000..987689c2c9 --- /dev/null +++ b/tests/unit/taskManager.test.js @@ -0,0 +1,78 @@ +import { describe, expect, it } from "vitest"; +import TaskManager from "utils/taskManager"; + +const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)); + +describe("TaskManager (linear)", () => { + it("runs tasks one at a time in queue order", async () => { + const tm = new TaskManager("linear"); + const order = []; + + const task = (name, ms) => async () => { + await sleep(ms); + order.push(name); + return name; + }; + + const results = await Promise.all([ + tm.queueTask(task("a", 30)), + tm.queueTask(task("b", 10)), + tm.queueTask(task("c", 0)), + ]); + + expect(order).toEqual(["a", "b", "c"]); + expect(results).toEqual(["a", "b", "c"]); + }); + + it("passes an incrementing id to each task", async () => { + const tm = new TaskManager("linear"); + const ids = await Promise.all([ + tm.queueTask(async (id) => id), + tm.queueTask(async (id) => id), + tm.queueTask(async (id) => id), + ]); + + expect(ids).toEqual([0, 1, 2]); + }); + + it("rejects the failed task and continues with the queue", async () => { + const tm = new TaskManager("linear"); + + const failing = tm.queueTask(async () => { + throw new Error("boom"); + }); + const next = tm.queueTask(async () => "ok"); + + await expect(failing).rejects.toThrow("boom"); + await expect(next).resolves.toBe("ok"); + }); +}); + +describe("TaskManager (parallel)", () => { + it("runs tasks concurrently", async () => { + const tm = new TaskManager("parallel"); + const order = []; + + await Promise.all([ + tm.queueTask(async () => { + await sleep(30); + order.push("slow"); + }), + tm.queueTask(async () => { + order.push("fast"); + }), + ]); + + expect(order).toEqual(["fast", "slow"]); + }); + + it("propagates errors to the awaiting caller", async () => { + const tm = new TaskManager("parallel"); + + await expect( + tm.queueTask(async () => { + throw new Error("boom"); + }), + ).rejects.toThrow("boom"); + }); +}); diff --git a/tests/unit/uri.test.js b/tests/unit/uri.test.js new file mode 100644 index 0000000000..dd7fbfd6bf --- /dev/null +++ b/tests/unit/uri.test.js @@ -0,0 +1,72 @@ +import { describe, expect, it } from "vitest"; +import Uri from "utils/Uri"; + +const TREE_URI = + "content://com.android.externalstorage.documents/tree/primary%3ADCIM"; +const SINGLE_URI = + "content://com.android.externalstorage.documents/document/primary%3ADCIM%2Ffile.txt"; + +describe("Uri.parse", () => { + it("splits a tree uri containing '::'", () => { + expect(Uri.parse(`${TREE_URI}::primary:DCIM/file.txt`)).toEqual({ + rootUri: TREE_URI, + docId: "primary:DCIM/file.txt", + isFileUri: false, + }); + }); + + it("derives the docId from the last segment of a bare tree uri", () => { + expect(Uri.parse(TREE_URI)).toEqual({ + rootUri: TREE_URI, + docId: "primary:DCIM", + isFileUri: false, + }); + }); + + it("converts a single document uri into tree form", () => { + expect(Uri.parse(SINGLE_URI)).toEqual({ + rootUri: + "content://com.android.externalstorage.documents/tree/primary%3A", + docId: "primary:DCIM/file.txt", + isFileUri: false, + }); + }); + + it("throws on non-content uris", () => { + expect(() => Uri.parse("file:///sdcard/x")).toThrow("Invalid uri format"); + expect(() => Uri.parse("ftp://host/x")).toThrow("Invalid uri format"); + }); +}); + +describe("Uri.format", () => { + it("joins rootUri and docId with '::'", () => { + expect(Uri.format(TREE_URI, "primary:DCIM/file.txt")).toBe( + `${TREE_URI}::primary:DCIM/file.txt`, + ); + }); + + it("accepts an object", () => { + expect( + Uri.format({ rootUri: TREE_URI, docId: "primary:DCIM/file.txt" }), + ).toBe(`${TREE_URI}::primary:DCIM/file.txt`); + }); + + it("returns the rootUri when there is no docId", () => { + expect(Uri.format(TREE_URI)).toBe(TREE_URI); + }); +}); + +describe("Uri.getPrimaryAddress", () => { + it("returns the path after '::primary:'", () => { + expect(Uri.getPrimaryAddress(`${TREE_URI}::primary:DCIM/foo`)).toBe( + "DCIM/foo", + ); + }); +}); + +describe("Uri.getVirtualAddress", () => { + it("returns the url unchanged when no storage list is available", () => { + const url = `${TREE_URI}::primary:DCIM/foo`; + expect(Uri.getVirtualAddress(url)).toBe(url); + }); +}); diff --git a/tests/unit/url.test.js b/tests/unit/url.test.js new file mode 100644 index 0000000000..f2304b6597 --- /dev/null +++ b/tests/unit/url.test.js @@ -0,0 +1,159 @@ +import { describe, expect, it } from "vitest"; +import Url from "utils/Url"; + +describe("Url.getProtocol", () => { + it("extracts the protocol", () => { + expect(Url.getProtocol("ftp://localhost/foo")).toBe("ftp:"); + expect(Url.getProtocol("https://example.com")).toBe("https:"); + expect(Url.getProtocol("file:///sdcard")).toBe("file:"); + }); + + it("returns empty string when there is no protocol", () => { + expect(Url.getProtocol("/sdcard/foo")).toBe(""); + }); +}); + +describe("Url.basename / extname", () => { + it("returns the last segment of a url", () => { + expect(Url.basename("ftp://localhost/foo/bar/index.html")).toBe( + "index.html", + ); + }); + + it("ignores trailing slashes", () => { + expect(Url.basename("https://example.com/foo/")).toBe("foo"); + }); + + it("resolves basenames of content uris", () => { + expect( + Url.basename( + "content://com.android.externalstorage.documents/tree/primary%3ADCIM::primary:DCIM/file.txt", + ), + ).toBe("file.txt"); + }); + + it("returns the extension of the basename", () => { + expect(Url.extname("ftp://host/a/b.txt")).toBe(".txt"); + expect(Url.extname("https://example.com/foo")).toBe(""); + }); +}); + +describe("Url.join", () => { + it("joins path segments keeping the protocol", () => { + expect(Url.join("ftp://localhost/foo/", "bar", "baz.txt")).toBe( + "ftp://localhost/foo/bar/baz.txt", + ); + expect(Url.join("https://example.com", "/a/b")).toBe( + "https://example.com/a/b", + ); + }); + + it("requires at least two arguments", () => { + expect(() => Url.join("ftp://localhost")).toThrow(); + }); +}); + +describe("Url.parse / pathname / dirname", () => { + it("splits url and query", () => { + expect(Url.parse("ftp://host/a?x=1")).toEqual({ + url: "ftp://host/a", + query: "?x=1", + }); + expect(Url.parse("ftp://host/a")).toEqual({ + url: "ftp://host/a", + query: "", + }); + }); + + it("extracts the pathname", () => { + expect(Url.pathname("ftp://myhost.com/foo/bar")).toBe("/foo/bar"); + expect(Url.pathname("file:///sdcard/foo")).toBe("/sdcard/foo"); + }); + + it("returns the parent url", () => { + expect(Url.dirname("ftp://localhost/foo/bar")).toBe( + "ftp://localhost/foo/", + ); + }); +}); + +describe("Url.safe", () => { + it("encodes path segments but leaves the query untouched", () => { + expect(Url.safe("https://ex.com/a b/c?x=1 2")).toBe( + "https://ex.com/a%20b/c?x=1 2", + ); + }); +}); + +describe("Url.formate", () => { + it("builds a url from its parts", () => { + expect( + Url.formate({ + protocol: "ftp:", + hostname: "host", + username: "u", + password: "p", + path: "a/b", + port: 21, + query: { x: "1" }, + }), + ).toBe("ftp://u:p@host:21/a/b?x=1"); + }); + + it("builds a minimal url", () => { + expect(Url.formate({ protocol: "https:", hostname: "x.com" })).toBe( + "https://x.com", + ); + }); + + it("throws when protocol or hostname are missing", () => { + expect(() => Url.formate({ hostname: "x.com" })).toThrow(); + expect(() => Url.formate({ protocol: "ftp:" })).toThrow(); + }); +}); + +describe("Url.hidePassword / decodeUrl", () => { + it("strips the password from a url", () => { + expect(Url.hidePassword("ftp://user:secret@host.com/a")).toBe( + "ftp://user@host.com/a", + ); + }); + + it("leaves file urls untouched", () => { + expect(Url.hidePassword("file:///sdcard/x")).toBe("file:///sdcard/x"); + }); + + it("decodes credentials, port, path and query", () => { + // NOTE: url-parse only splits the port for special protocols + // (http/https/ws/...), so an http url is used to exercise the + // port decoding branch of decodeUrl. + expect( + Url.decodeUrl("http://user:p%40ss@host.com:8080/a%20b?x=1"), + ).toEqual({ + username: "user", + password: "p@ss", + hostname: "host.com", + pathname: "/a b", + port: 8080, + query: { x: "1" }, + }); + }); + + it("decodes credentials for ftp urls", () => { + const decoded = Url.decodeUrl("ftp://user:p%40ss@host.com/a%20b"); + expect(decoded.username).toBe("user"); + expect(decoded.password).toBe("p@ss"); + expect(decoded.hostname).toBe("host.com"); + expect(decoded.pathname).toBe("/a b"); + }); +}); + +describe("Url.areSame", () => { + it("ignores trailing slashes", () => { + expect(Url.areSame("ftp://a/", "ftp://a", "ftp://a/")).toBe(true); + }); + + it("detects different urls", () => { + expect(Url.areSame("ftp://a", "ftp://b")).toBe(false); + }); +}); diff --git a/tests/unit/version.test.js b/tests/unit/version.test.js new file mode 100644 index 0000000000..246522c952 --- /dev/null +++ b/tests/unit/version.test.js @@ -0,0 +1,24 @@ +import { describe, expect, it } from "vitest"; +import { compareVersions, isVersionGreater, parseVersion } from "utils/version"; + +describe("utils/version", () => { + it("parses strict x.y.z versions", () => { + expect(parseVersion("1.2.3")).toEqual([1, 2, 3]); + expect(parseVersion("v1.2.3")).toEqual([1, 2, 3]); + expect(parseVersion("1.2")).toBeNull(); + expect(parseVersion("1.2.x")).toBeNull(); + }); + + it("compares versions", () => { + expect(compareVersions("1.2.0", "1.1.9")).toBe(1); + expect(compareVersions("1.1.1", "1.1.1")).toBe(0); + expect(compareVersions("1.0.0", "1.1.1")).toBe(-1); + }); + + it("only treats newer versions as upgrades", () => { + expect(isVersionGreater("1.1.2", "1.1.1")).toBe(true); + expect(isVersionGreater("1.2.0", "1.1.9")).toBe(true); + expect(isVersionGreater("1.1.1", "1.1.1")).toBe(false); + expect(isVersionGreater("1.0.0", "1.1.1")).toBe(false); + }); +}); diff --git a/vitest.config.js b/vitest.config.js new file mode 100644 index 0000000000..c3c6a1e9dc --- /dev/null +++ b/vitest.config.js @@ -0,0 +1,36 @@ +import fs from "node:fs"; +import path from "node:path"; +import { fileURLToPath } from "node:url"; +import { configDefaults, defineConfig } from "vitest/config"; + +const srcDir = fileURLToPath(new URL("./src", import.meta.url)); + +// Mirror the bundler resolution (rspack `resolve.modules: ["node_modules", "src"]` +// and tsconfig `paths: { "*": ["./src/*"] }`) so unit tests can import app +// modules via bare paths like `utils/version` or `lib/settings`. +const srcAliases = fs + .readdirSync(srcDir, { withFileTypes: true }) + .filter((entry) => entry.isDirectory()) + .map((entry) => ({ + find: new RegExp(`^${entry.name}(?:/(.*))?$`), + replacement: `${path.join(srcDir, entry.name)}/$1`, + })); + +export default defineConfig({ + resolve: { + alias: srcAliases, + }, + test: { + // Vitest unit tests live ONLY under `tests/`. + // `src/test/` is Acode's in-app runtime test harness: it runs on-device + // inside the WebView (launched from the app commands) and depends on + // cordova/editorManager globals, so it must never be collected here. + include: ["tests/**/*.test.{js,ts}"], + exclude: [ + ...configDefaults.exclude, + "src/test/**", + "www/**", + "platforms/**", + ], + }, +}); From afe722e6c7ebca6a33e56263eafa73d141d1f310 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Fri, 31 Jul 2026 09:00:59 +0530 Subject: [PATCH 016/195] feat(files): skip excluded paths during copy operations (#2555) * feat(files): skip excluded paths during copy operations * new translation keys * fix the conflict case --- src/lang/ar-ye.json | 4 +- src/lang/be-by.json | 4 +- src/lang/bn-bd.json | 4 +- src/lang/cs-cz.json | 4 +- src/lang/de-de.json | 4 +- src/lang/en-us.json | 2 + src/lang/es-sv.json | 4 +- src/lang/fr-fr.json | 4 +- src/lang/he-il.json | 4 +- src/lang/hi-in.json | 4 +- src/lang/hu-hu.json | 4 +- src/lang/id-id.json | 4 +- src/lang/index.d.ts | 2 + src/lang/ir-fa.json | 4 +- src/lang/it-it.json | 4 +- src/lang/ja-jp.json | 4 +- src/lang/ko-kr.json | 4 +- src/lang/ml-in.json | 4 +- src/lang/mm-unicode.json | 4 +- src/lang/mm-zawgyi.json | 4 +- src/lang/pl-pl.json | 4 +- src/lang/pt-br.json | 4 +- src/lang/pu-in.json | 4 +- src/lang/ru-ru.json | 4 +- src/lang/tl-ph.json | 4 +- src/lang/tr-tr.json | 4 +- src/lang/uk-ua.json | 4 +- src/lang/uz-uz.json | 4 +- src/lang/vi-vn.json | 4 +- src/lang/zh-cn.json | 4 +- src/lang/zh-hant.json | 4 +- src/lang/zh-tw.json | 4 +- src/lib/openFolder.js | 15 ++- src/lib/settings.js | 1 + src/pages/fileBrowser/fileBrowser.js | 112 ++++++++--------- src/settings/appSettings.js | 11 ++ src/utils/copyEntry.js | 58 +++++++++ src/utils/fileOperationExclusions.js | 41 ++++++ tests/unit/copyEntry.test.js | 137 +++++++++++++++++++++ tests/unit/fileOperationExclusions.test.js | 77 ++++++++++++ 40 files changed, 483 insertions(+), 93 deletions(-) create mode 100644 src/utils/copyEntry.js create mode 100644 src/utils/fileOperationExclusions.js create mode 100644 tests/unit/copyEntry.test.js create mode 100644 tests/unit/fileOperationExclusions.test.js diff --git a/src/lang/ar-ye.json b/src/lang/ar-ye.json index 4a1c09c7ca..77d0cf9575 100644 --- a/src/lang/ar-ye.json +++ b/src/lang/ar-ye.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/be-by.json b/src/lang/be-by.json index 5d92508798..7c12976c30 100644 --- a/src/lang/be-by.json +++ b/src/lang/be-by.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/bn-bd.json b/src/lang/bn-bd.json index d2b354ad3b..f9ab374f3d 100644 --- a/src/lang/bn-bd.json +++ b/src/lang/bn-bd.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/cs-cz.json b/src/lang/cs-cz.json index 79492bb4eb..4021728586 100644 --- a/src/lang/cs-cz.json +++ b/src/lang/cs-cz.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/de-de.json b/src/lang/de-de.json index bd63f3bf04..8e1dc29646 100644 --- a/src/lang/de-de.json +++ b/src/lang/de-de.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/en-us.json b/src/lang/en-us.json index acd7938cd2..33a19d29ec 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -669,6 +669,8 @@ "settings-info-app-console": "Choose which debug console integration Acode uses.", "settings-info-app-default-file-encoding": "Default encoding when opening or creating files.", "settings-info-app-exclude-folders": "Skip folders and patterns while searching or scanning.", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "settings-info-app-floating-button": "Show the floating quick actions button.", "settings-info-app-font-manager": "Install, manage, or remove app fonts.", "settings-info-app-fullscreen": "Hide the system status bar while using Acode.", diff --git a/src/lang/es-sv.json b/src/lang/es-sv.json index 34f2a3a438..3672aac66e 100644 --- a/src/lang/es-sv.json +++ b/src/lang/es-sv.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/fr-fr.json b/src/lang/fr-fr.json index e1320be03c..16616d1da8 100644 --- a/src/lang/fr-fr.json +++ b/src/lang/fr-fr.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/he-il.json b/src/lang/he-il.json index 9ccb79ea86..d956ab77f9 100644 --- a/src/lang/he-il.json +++ b/src/lang/he-il.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/hi-in.json b/src/lang/hi-in.json index b73bbdb60d..4528b0c059 100644 --- a/src/lang/hi-in.json +++ b/src/lang/hi-in.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index ce9ac47fb0..1fc1a55fa7 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -831,5 +831,7 @@ "managed": "Kezelt", "acode service": "Acode-szolgáltatás", "info-terminal-show-scrollbar": "Az xterm görgetősávjának megjelenítése a terminál mellett.", - "terminal:show scrollbar": "Görgetősáv megjelenítése" + "terminal:show scrollbar": "Görgetősáv megjelenítése", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/id-id.json b/src/lang/id-id.json index 2763d37f83..10c860a652 100644 --- a/src/lang/id-id.json +++ b/src/lang/id-id.json @@ -831,5 +831,7 @@ "managed": "Dikelola", "acode service": "Layanan Acode", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/index.d.ts b/src/lang/index.d.ts index 447cc8052b..0302a017f9 100644 --- a/src/lang/index.d.ts +++ b/src/lang/index.d.ts @@ -672,6 +672,8 @@ declare type LangStrings = { "settings-info-app-console": string; "settings-info-app-default-file-encoding": string; "settings-info-app-exclude-folders": string; + "apply exclusions when copying": string; + "settings-info-app-use-file-operation-exclusions": string; "settings-info-app-floating-button": string; "settings-info-app-font-manager": string; "settings-info-app-fullscreen": string; diff --git a/src/lang/ir-fa.json b/src/lang/ir-fa.json index 8c2ac9da59..173b2625d5 100644 --- a/src/lang/ir-fa.json +++ b/src/lang/ir-fa.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/it-it.json b/src/lang/it-it.json index e338789274..7b6ecdc1e1 100644 --- a/src/lang/it-it.json +++ b/src/lang/it-it.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/ja-jp.json b/src/lang/ja-jp.json index c1d28ba356..5d2152ad37 100644 --- a/src/lang/ja-jp.json +++ b/src/lang/ja-jp.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/ko-kr.json b/src/lang/ko-kr.json index 42963a18f6..978e7ac4d4 100644 --- a/src/lang/ko-kr.json +++ b/src/lang/ko-kr.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/ml-in.json b/src/lang/ml-in.json index ee8052f1a3..8424f45d15 100644 --- a/src/lang/ml-in.json +++ b/src/lang/ml-in.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/mm-unicode.json b/src/lang/mm-unicode.json index e74101b9f1..0bbcd285fe 100644 --- a/src/lang/mm-unicode.json +++ b/src/lang/mm-unicode.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/mm-zawgyi.json b/src/lang/mm-zawgyi.json index 7726546895..6ae58e5d73 100644 --- a/src/lang/mm-zawgyi.json +++ b/src/lang/mm-zawgyi.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/pl-pl.json b/src/lang/pl-pl.json index 76f7e05b39..71f0c876e4 100644 --- a/src/lang/pl-pl.json +++ b/src/lang/pl-pl.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/pt-br.json b/src/lang/pt-br.json index facba76b0e..d47cf936db 100644 --- a/src/lang/pt-br.json +++ b/src/lang/pt-br.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/pu-in.json b/src/lang/pu-in.json index 2daa7dee96..5f43ef31fa 100644 --- a/src/lang/pu-in.json +++ b/src/lang/pu-in.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/ru-ru.json b/src/lang/ru-ru.json index 8e101865dc..6e24ed9e9b 100644 --- a/src/lang/ru-ru.json +++ b/src/lang/ru-ru.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/tl-ph.json b/src/lang/tl-ph.json index ddf0162be9..305b015043 100644 --- a/src/lang/tl-ph.json +++ b/src/lang/tl-ph.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/tr-tr.json b/src/lang/tr-tr.json index 6154499ba4..f49180969d 100644 --- a/src/lang/tr-tr.json +++ b/src/lang/tr-tr.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/uk-ua.json b/src/lang/uk-ua.json index 080ea08dd2..2801b4634c 100644 --- a/src/lang/uk-ua.json +++ b/src/lang/uk-ua.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/uz-uz.json b/src/lang/uz-uz.json index 15dc46c84a..f6ac1dbf08 100644 --- a/src/lang/uz-uz.json +++ b/src/lang/uz-uz.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/vi-vn.json b/src/lang/vi-vn.json index 14e338c470..47f030ca3e 100644 --- a/src/lang/vi-vn.json +++ b/src/lang/vi-vn.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index a517f4ecab..72fdd86287 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json index 68e3cb1ba6..4ad73928d2 100644 --- a/src/lang/zh-hant.json +++ b/src/lang/zh-hant.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index d42f8b7529..581198caa8 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -831,5 +831,7 @@ "managed": "Managed", "acode service": "Acode Service", "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar" + "terminal:show scrollbar": "Show Scrollbar", + "apply exclusions when copying": "Apply exclusions when copying", + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." } diff --git a/src/lib/openFolder.js b/src/lib/openFolder.js index 5415f7a824..741b6f583c 100644 --- a/src/lib/openFolder.js +++ b/src/lib/openFolder.js @@ -10,6 +10,7 @@ import confirm from "dialogs/confirm"; import prompt from "dialogs/prompt"; import select from "dialogs/select"; import escapeStringRegexp from "escape-string-regexp"; +import copyEntry from "utils/copyEntry"; import helpers from "utils/helpers"; import Path from "utils/Path"; import Uri from "utils/Uri"; @@ -776,7 +777,19 @@ function execOperation(type, action, url, $target, name) { newUrl = await fs.moveTo(url); } } else { - newUrl = await fs.copyTo(url); + if (appSettings.value.useFileOperationExclusions) { + const result = await copyEntry(clipBoard.url, url, { + excludePatterns: appSettings.value.excludeFolders, + }); + newUrl = result.url; + if (!newUrl) { + toast(strings.skipped); + clearClipboard(); + return; + } + } else { + newUrl = await fs.copyTo(url); + } } stopLoading(); diff --git a/src/lib/settings.js b/src/lib/settings.js index 6728c80b92..7421f3d2cd 100644 --- a/src/lib/settings.js +++ b/src/lib/settings.js @@ -192,6 +192,7 @@ class Settings { 16, 19, 17, 23, 24, 25, 26, 27, 28, 29, 30, 31, ], excludeFolders: this.#excludeFolders, + useFileOperationExclusions: true, defaultFileEncoding: "UTF-8", inlineAutoCompletion: true, colorPreview: true, diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index 439ac15015..30da2e8f00 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -26,6 +26,7 @@ import mimeTypes from "mime-types"; import mustache from "mustache"; import filesSettings from "settings/filesSettings"; import URLParse from "url-parse"; +import copyEntry from "utils/copyEntry"; import helpers from "utils/helpers"; import Url from "utils/Url"; import _addMenu from "./add-menu.hbs"; @@ -726,54 +727,64 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { ); let copiedCount = 0; + let skippedCount = 0; try { for (const url of copiedItems) { const fs = fsOperation(url); const stat = await fs.stat(); const name = stat.name || Url.basename(url); - const possibleConflictUrl = Url.join(targetDirUrl, name); - if (stat.isDirectory && isInsideDirectory(url, targetDirUrl)) { - alert( - strings.warning, - strings["cannot paste folder into itself"] || - "Cannot paste a folder into itself", - ); - continue; - } + const result = await copyEntry(url, targetDirUrl, { + name, + stat, + excludePatterns: appSettings.value.useFileOperationExclusions + ? appSettings.value.excludeFolders + : [], + async onBeforeCopy() { + if (stat.isDirectory && isInsideDirectory(url, targetDirUrl)) { + alert( + strings.warning, + strings["cannot paste folder into itself"] || + "Cannot paste a folder into itself", + ); + return false; + } - const doesExist = await fsOperation(possibleConflictUrl).exists(); - if (doesExist) { - if (Url.areSame(url, possibleConflictUrl)) { - continue; - } + const possibleConflictUrl = Url.join(targetDirUrl, name); + if (!(await fsOperation(possibleConflictUrl).exists())) { + return true; + } - const targetStat = await fsOperation(possibleConflictUrl).stat(); - if (stat.isDirectory || targetStat.isDirectory) { - alert( - strings.warning, - strings["folder already exists"] || "Folder already exists", - ); - continue; - } + if (Url.areSame(url, possibleConflictUrl)) return false; - const confirmation = await confirm( - strings.warning, - strings["file already exists force named"] - ? strings["file already exists force named"].replace( - "{name}", - name, - ) - : `"${name}" already exists in this location.`, - ); - if (!confirmation) continue; + const targetFs = fsOperation(possibleConflictUrl); + const targetStat = await targetFs.stat(); + if (stat.isDirectory || targetStat.isDirectory) { + alert( + strings.warning, + strings["folder already exists"] || "Folder already exists", + ); + return false; + } - await fsOperation(possibleConflictUrl).delete(); - } + const confirmation = await confirm( + strings.warning, + strings["file already exists force named"] + ? strings["file already exists force named"].replace( + "{name}", + name, + ) + : `"${name}" already exists in this location.`, + ); + if (!confirmation) return false; - await copyEntry(url, targetDirUrl, name, stat); - copiedCount++; + await targetFs.delete(); + return true; + }, + }); + if (result.url) copiedCount++; + skippedCount += result.skipped; } } catch (err) { helpers.error(err); @@ -781,39 +792,16 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { if (copiedCount) { toast(strings.success); reload(); + } else if (skippedCount) { + toast(strings.skipped); } + if (copiedCount || skippedCount) copiedItems = []; loadingDialog.destroy(); isPasting = false; updatePasteToggler(); } } - async function copyEntry(sourceUrl, targetDirUrl, name, sourceStat) { - const fs = fsOperation(sourceUrl); - const stat = sourceStat || (await fs.stat()); - const entryName = name || stat.name || Url.basename(sourceUrl); - - if (stat.isDirectory) { - const newDirUrl = - await fsOperation(targetDirUrl).createDirectory(entryName); - const entries = await fs.lsDir(); - - for (const entry of entries) { - await copyEntry( - entry.url, - newDirUrl, - entry.name || Url.basename(entry.url), - entry, - ); - } - - return newDirUrl; - } - - const content = await fs.readFile(); - return fsOperation(targetDirUrl).createFile(entryName, content); - } - function isInsideDirectory(sourceUrl, targetUrl) { let source = Url.parse(sourceUrl).url; let target = Url.parse(targetUrl).url; diff --git a/src/settings/appSettings.js b/src/settings/appSettings.js index d7d5248179..a7f912f74c 100644 --- a/src/settings/appSettings.js +++ b/src/settings/appSettings.js @@ -264,6 +264,17 @@ export default function otherSettings() { info: strings["settings-info-app-exclude-folders"], category: categories.filesSessions, }, + { + key: "useFileOperationExclusions", + text: + strings["apply exclusions when copying"] || + "Apply exclusions when copying", + checkbox: values.useFileOperationExclusions, + info: + strings["settings-info-app-use-file-operation-exclusions"] || + "Skip files and folders matching the exclusion patterns during copy and paste operations.", + category: categories.filesSessions, + }, { key: "defaultFileEncoding", text: strings["default file encoding"], diff --git a/src/utils/copyEntry.js b/src/utils/copyEntry.js new file mode 100644 index 0000000000..b910ba2623 --- /dev/null +++ b/src/utils/copyEntry.js @@ -0,0 +1,58 @@ +import fsOperation from "fileSystem"; +import { isExcludedFileOperationPath } from "./fileOperationExclusions"; +import Url from "./Url"; + +/** + * Recursively copy a file or directory while omitting excluded entries. + * + * @param {string} sourceUrl + * @param {string} targetDirUrl + * @param {object} [options] + * @param {string} [options.name] + * @param {object} [options.stat] + * @param {string[]} [options.excludePatterns] + * @param {(entry: {name: string, stat: object}) => Promise} [options.onBeforeCopy] + * @returns {Promise<{url: string|null, copied: number, skipped: number}>} + */ +export default async function copyEntry( + sourceUrl, + targetDirUrl, + { name, stat: sourceStat, excludePatterns = [], onBeforeCopy } = {}, +) { + if (isExcludedFileOperationPath(sourceUrl, excludePatterns)) { + return { url: null, copied: 0, skipped: 1 }; + } + + const sourceFs = fsOperation(sourceUrl); + const stat = sourceStat || (await sourceFs.stat()); + const entryName = name || stat.name || Url.basename(sourceUrl); + + if ( + typeof onBeforeCopy === "function" && + (await onBeforeCopy({ name: entryName, stat })) === false + ) { + return { url: null, copied: 0, skipped: 0 }; + } + + if (!stat.isDirectory) { + const content = await sourceFs.readFile(); + const url = await fsOperation(targetDirUrl).createFile(entryName, content); + return { url, copied: 1, skipped: 0 }; + } + + const url = await fsOperation(targetDirUrl).createDirectory(entryName); + const result = { url, copied: 1, skipped: 0 }; + const entries = await sourceFs.lsDir(); + + for (const entry of entries) { + const child = await copyEntry(entry.url, url, { + name: entry.name || Url.basename(entry.url), + stat: entry, + excludePatterns, + }); + result.copied += child.copied; + result.skipped += child.skipped; + } + + return result; +} diff --git a/src/utils/fileOperationExclusions.js b/src/utils/fileOperationExclusions.js new file mode 100644 index 0000000000..d59eed13ff --- /dev/null +++ b/src/utils/fileOperationExclusions.js @@ -0,0 +1,41 @@ +import picomatch from "picomatch/posix"; +import Url from "utils/Url"; + +/** + * Test whether a file-system URL matches one of the configured exclusion globs. + * Both the URL path and a directory-style version are checked so recursive + * glob patterns also match the excluded directory itself. + * + * @param {string} url + * @param {string[]} patterns + * @returns {boolean} + */ +export function isExcludedFileOperationPath(url, patterns = []) { + if (!url || !Array.isArray(patterns) || !patterns.length) return false; + + const parsedUrl = Url.parse(url).url; + const pathname = Url.pathname(parsedUrl) || parsedUrl; + const normalizedPath = pathname.replace(/\\/g, "/").replace(/\/+$/, ""); + const relativePath = normalizedPath.replace(/^\/+/, ""); + const candidates = [ + normalizedPath, + `${normalizedPath}/`, + relativePath, + `${relativePath}/`, + ]; + + return patterns.some((pattern) => { + if (typeof pattern !== "string" || !pattern.trim()) return false; + + try { + return candidates.some((candidate) => + picomatch.isMatch(candidate, pattern.trim(), { + matchBase: !pattern.includes("/") && !pattern.includes("\\"), + }), + ); + } catch (error) { + console.warn(`Invalid file exclusion pattern: ${pattern}`, error); + return false; + } + }); +} diff --git a/tests/unit/copyEntry.test.js b/tests/unit/copyEntry.test.js new file mode 100644 index 0000000000..136970d8c8 --- /dev/null +++ b/tests/unit/copyEntry.test.js @@ -0,0 +1,137 @@ +import { beforeEach, describe, expect, it, vi } from "vitest"; + +const fileSystem = vi.hoisted(() => { + const entries = new Map([ + [ + "/source", + { + name: "source", + isDirectory: true, + children: ["/source/src", "/source/node_modules"], + }, + ], + [ + "/source/src", + { + name: "src", + isDirectory: true, + children: ["/source/src/index.js"], + }, + ], + [ + "/source/src/index.js", + { + name: "index.js", + isDirectory: false, + content: "console.log('copied');", + }, + ], + [ + "/source/node_modules", + { + name: "node_modules", + isDirectory: true, + children: ["/source/node_modules/package.json"], + }, + ], + [ + "/source/node_modules/package.json", + { + name: "package.json", + isDirectory: false, + content: "{}", + }, + ], + ]); + + return { + entries, + created: [], + }; +}); + +vi.mock("fileSystem", () => ({ + default(url) { + const entry = fileSystem.entries.get(url); + + return { + async stat() { + return { ...entry, url }; + }, + async lsDir() { + return entry.children.map((childUrl) => ({ + ...fileSystem.entries.get(childUrl), + url: childUrl, + })); + }, + async readFile() { + return entry.content; + }, + async createDirectory(name) { + const createdUrl = `${url}/${name}`; + fileSystem.created.push({ type: "directory", url: createdUrl }); + return createdUrl; + }, + async createFile(name, content) { + const createdUrl = `${url}/${name}`; + fileSystem.created.push({ type: "file", url: createdUrl, content }); + return createdUrl; + }, + }; + }, +})); + +import copyEntry from "utils/copyEntry"; + +describe("copyEntry", () => { + beforeEach(() => { + fileSystem.created.length = 0; + }); + + it("prunes excluded directory subtrees", async () => { + const result = await copyEntry("/source", "/target", { + excludePatterns: ["**/node_modules/**"], + }); + + expect(result).toEqual({ + url: "/target/source", + copied: 3, + skipped: 1, + }); + expect(fileSystem.created).toEqual([ + { type: "directory", url: "/target/source" }, + { type: "directory", url: "/target/source/src" }, + { + type: "file", + url: "/target/source/src/index.js", + content: "console.log('copied');", + }, + ]); + }); + + it("copies excluded paths when no patterns are enabled", async () => { + const result = await copyEntry("/source/node_modules", "/target"); + + expect(result.skipped).toBe(0); + expect(fileSystem.created.map(({ url }) => url)).toEqual([ + "/target/node_modules", + "/target/node_modules/package.json", + ]); + }); + + it("does not prepare or replace the target for an excluded source", async () => { + const onBeforeCopy = vi.fn(); + const result = await copyEntry( + "/source/node_modules/package.json", + "/target", + { + excludePatterns: ["**/node_modules/**"], + onBeforeCopy, + }, + ); + + expect(result).toEqual({ url: null, copied: 0, skipped: 1 }); + expect(onBeforeCopy).not.toHaveBeenCalled(); + expect(fileSystem.created).toEqual([]); + }); +}); diff --git a/tests/unit/fileOperationExclusions.test.js b/tests/unit/fileOperationExclusions.test.js new file mode 100644 index 0000000000..65ec3bc40b --- /dev/null +++ b/tests/unit/fileOperationExclusions.test.js @@ -0,0 +1,77 @@ +import { describe, expect, it } from "vitest"; +import { isExcludedFileOperationPath } from "utils/fileOperationExclusions"; + +const patterns = [ + "**/node_modules/**", + "**/.git/**", + "**/*.egg-info/**", + "*.map", +]; + +describe("isExcludedFileOperationPath", () => { + it("matches an excluded directory itself", () => { + expect( + isExcludedFileOperationPath( + "file:///storage/emulated/0/project/node_modules", + patterns, + ), + ).toBe(true); + }); + + it("matches descendants and file basename patterns", () => { + expect( + isExcludedFileOperationPath( + "file:///storage/emulated/0/project/node_modules/pkg/index.js", + patterns, + ), + ).toBe(true); + expect( + isExcludedFileOperationPath( + "sftp://example.com/project/dist/app.js.map", + patterns, + ), + ).toBe(true); + }); + + it("normalizes Windows separators", () => { + expect( + isExcludedFileOperationPath( + "C:\\project\\package.egg-info", + patterns, + ), + ).toBe(true); + }); + + it("matches paths inside SAF tree URIs", () => { + const safRoot = + "content://com.android.externalstorage.documents/tree/primary%3AProjects"; + + expect( + isExcludedFileOperationPath( + `${safRoot}::primary:Projects/app/node_modules`, + patterns, + ), + ).toBe(true); + expect( + isExcludedFileOperationPath( + `${safRoot}::primary:Projects/app/src/index.js`, + patterns, + ), + ).toBe(false); + }); + + it("keeps paths that do not match an exclusion", () => { + expect( + isExcludedFileOperationPath( + "file:///storage/emulated/0/project/src/index.js", + patterns, + ), + ).toBe(false); + }); + + it("ignores empty and invalid patterns", () => { + expect( + isExcludedFileOperationPath("/project/src/index.js", ["", "[invalid"]), + ).toBe(false); + }); +}); From 17f6ad4f2069e780866f9e6efbd4c5d3f8edaece Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Fri, 31 Jul 2026 09:21:56 +0530 Subject: [PATCH 017/195] Refactor conditions for preview release triggers (#2550) * Refactor conditions for preview release triggers * Refactor conditions for on-demand preview releases * Update nightly-build.yml with additional comments * Clarify PR workflow execution and approval process Added comments to clarify workflow execution and approval requirements. * Update .github/workflows/on-demand-preview-releases-PR.yml Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --------- Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --- .github/workflows/nightly-build.yml | 5 ++++- .../workflows/on-demand-preview-releases-PR.yml | 16 +++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 4bc73c2ed0..b7812b4341 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -1,5 +1,7 @@ # Implement to use environment secrets someday, At the moment GH Actions doesn't support those in reusable workflows (ref: https://github.com/actions/runner/issues/1490) # at least that's what I found. +# This workflow executes PR Code when triggered from PR via workflow_call, +# MUST approve the PR code BEFORE triggering this workflow. name: Nightly Build @@ -101,6 +103,7 @@ jobs: fetch-depth: 0 # Required for tags persist-credentials: false ref: ${{ (inputs.is_PR && inputs.PR_NUMBER) && github.event.pull_request.head.sha || '' }} + allow-unsafe-pr-checkout: ${{ !!(inputs.is_PR && inputs.PR_NUMBER && github.event.pull_request.head.sha) }} - name: Setup Java uses: actions/setup-java@v5 @@ -204,4 +207,4 @@ jobs: echo "| Normal APK Artifact Name | ${{ steps.meta.outputs.normal_artifact_name }} |" >> $GITHUB_STEP_SUMMARY echo "| F-Droid APK Artifact Name | ${{ steps.meta.outputs.fdroid_artifact_name || 'N/A' }} |" >> $GITHUB_STEP_SUMMARY echo "| Normal APK Artifact SHA256 | ${{ steps.sha256.outputs.normal_apk_sha256 }} |" >> $GITHUB_STEP_SUMMARY - echo "| F-Droid APK Artifact SHA256 | ${{ steps.sha256.outputs.fdroid_apk_sha256 || 'N/A' }} |" >> $GITHUB_STEP_SUMMARY \ No newline at end of file + echo "| F-Droid APK Artifact SHA256 | ${{ steps.sha256.outputs.fdroid_apk_sha256 || 'N/A' }} |" >> $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/on-demand-preview-releases-PR.yml b/.github/workflows/on-demand-preview-releases-PR.yml index 5a584d40d2..8254116d6a 100644 --- a/.github/workflows/on-demand-preview-releases-PR.yml +++ b/.github/workflows/on-demand-preview-releases-PR.yml @@ -1,6 +1,9 @@ name: On Demand Preview Releases for PR # avoids paths like .md, and anything in .github folder on: + # This workflow executes PR Code by checkout later + # MUST approve the PR Code BEFORE using this workflow on PRs. + # Uses this trigger to keep up-to-date execution of the workflow (triggers from Default Branch) pull_request_target: paths-ignore: - '!*.md' @@ -23,13 +26,12 @@ jobs: contents: read pull-requests: write issues: write - if: | - github.event.pull_request.draft == false - && (github.repository_owner == 'Acode-Foundation' - && (!contains(github.event.pull_request.labels.*.name, 'DO NOT PREVIEW RELEASE') - && (contains(github.event.pull_request.labels.*.name, 'Bypass check - PREVIEW RELEASE') - || contains(github.event.pull_request.labels.*.name, 'CI: RUN ON-DEMAND PREVIEW RELEASES') - )) + if: >- + github.event.pull_request.draft == false && + github.repository_owner == 'Acode-Foundation' && + (!contains(github.event.pull_request.labels.*.name, 'DO NOT PREVIEW RELEASE') && + (github.event.action == 'labeled' && github.event.label.name == 'CI: RUN ON-DEMAND PREVIEW RELEASES' || + github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'Bypass check - PREVIEW RELEASE')) ) runs-on: ubuntu-latest From 213f87b9e668a020807eea51d4fa9378aebc5ada Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2026 09:28:34 +0530 Subject: [PATCH 018/195] chore(deps): bump actions/stale from 10 to 11 (#2554) Bumps [actions/stale](https://github.com/actions/stale) from 10 to 11. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v10...v11) --- updated-dependencies: - dependency-name: actions/stale dependency-version: '11' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/close-inactive-issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/close-inactive-issues.yml b/.github/workflows/close-inactive-issues.yml index 47569a04e1..7a85f97fe2 100644 --- a/.github/workflows/close-inactive-issues.yml +++ b/.github/workflows/close-inactive-issues.yml @@ -10,7 +10,7 @@ jobs: issues: write pull-requests: write steps: - - uses: actions/stale@v10 + - uses: actions/stale@v11 with: days-before-issue-stale: 60 days-before-issue-close: 14 From 5110e1f6744f90cac8f5218c34a945f1c07ffcdb Mon Sep 17 00:00:00 2001 From: Anupam Mediratta Date: Fri, 31 Jul 2026 10:11:34 +0530 Subject: [PATCH 019/195] fix: V-001 security vulnerability (#2557) Automated security fix generated by OrbisAI Security --- src/plugins/terminal/src/android/ProcessUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/terminal/src/android/ProcessUtils.java b/src/plugins/terminal/src/android/ProcessUtils.java index 428f3624a0..003084f81e 100644 --- a/src/plugins/terminal/src/android/ProcessUtils.java +++ b/src/plugins/terminal/src/android/ProcessUtils.java @@ -42,7 +42,7 @@ public static void killProcessTree(Process process) { try { long pid = getPid(process); if (pid > 0) { - Runtime.getRuntime().exec("kill -9 -" + pid); + Runtime.getRuntime().exec(new String[]{"kill", "-9", "-" + pid}); } } catch (Exception error) { Log.w("ProcessUtils", "Failed to kill process tree.", error); @@ -54,7 +54,7 @@ public static void killProcessTree(Process process) { * Forcefully kills a single process */ public static void killProcess(int pid) throws IOException, InterruptedException { - int exitCode = Runtime.getRuntime().exec("kill -9 " + pid).waitFor(); + int exitCode = Runtime.getRuntime().exec(new String[]{"kill", "-9", String.valueOf(pid)}).waitFor(); if (exitCode != 0) { throw new IOException("kill -9 " + pid + " exited with code " + exitCode); } From b0976763885f06b722aa6e2aad58cd398e9b99a1 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Fri, 31 Jul 2026 16:45:44 +0530 Subject: [PATCH 020/195] fix: sanitize input hints to prevent XSS (#2559) --- src/components/inputhints/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/inputhints/index.js b/src/components/inputhints/index.js index 9e8f5fad6f..d9395fea53 100644 --- a/src/components/inputhints/index.js +++ b/src/components/inputhints/index.js @@ -1,4 +1,5 @@ import "./style.scss"; +import DOMPurify from "dompurify"; /** * @typedef {Object} HintObj @@ -400,7 +401,7 @@ function Hint({ hint }) { className={active ? "active" : ""} attr-action="hint" attr-value={value} - innerHTML={text} + innerHTML={DOMPurify.sanitize(text)} > ); } From 5d5724b3cd24a3ddbd2d581988d4af9d8cff1370 Mon Sep 17 00:00:00 2001 From: summoner Date: Fri, 31 Jul 2026 13:31:53 +0200 Subject: [PATCH 021/195] Translation: Update hu-hu.json (#2558) Translate new strings --- src/lang/hu-hu.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index 1fc1a55fa7..bead63e01b 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -832,6 +832,6 @@ "acode service": "Acode-szolgáltatás", "info-terminal-show-scrollbar": "Az xterm görgetősávjának megjelenítése a terminál mellett.", "terminal:show scrollbar": "Görgetősáv megjelenítése", - "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "apply exclusions when copying": "Kizárások használata másoláskor", + "settings-info-app-use-file-operation-exclusions": "A kizárási mintáknak megfelelő fájlok és mappák kihagyása másoláskor és beillesztéskor." } From 92f6bef7ab8739e15b4b8903c9f6f99d73cfbfdb Mon Sep 17 00:00:00 2001 From: Rohit Kushvaha Date: Sat, 1 Aug 2026 10:36:47 +0530 Subject: [PATCH 022/195] feat: proot debug toggle (#2563) * feat: proot debug toggle * fix: persistence * fix: persistence --- src/components/terminal/terminal.js | 3 +++ src/components/terminal/terminalDefaults.js | 1 + .../src/android/BackgroundExecutor.java | 4 ++++ .../terminal/src/android/Executor.java | 7 +++++++ .../terminal/src/android/ProcessManager.java | 5 +++++ src/plugins/terminal/www/Executor.js | 6 ++++++ src/settings/terminalSettings.js | 21 +++++++++++++++++++ 7 files changed, 47 insertions(+) diff --git a/src/components/terminal/terminal.js b/src/components/terminal/terminal.js index a215453891..c4a436b43a 100644 --- a/src/components/terminal/terminal.js +++ b/src/components/terminal/terminal.js @@ -702,6 +702,9 @@ export default class TerminalComponent { const terminalValues = values.terminalSettings; + Executor.setProotDebug(terminalValues.prootDebug); + Executor.BackgroundExecutor.setProotDebug(terminalValues.prootDebug); + await Terminal.startAxs( false, () => {}, diff --git a/src/components/terminal/terminalDefaults.js b/src/components/terminal/terminalDefaults.js index c3e3d9be7a..d644145c27 100644 --- a/src/components/terminal/terminalDefaults.js +++ b/src/components/terminal/terminalDefaults.js @@ -17,6 +17,7 @@ export const DEFAULT_TERMINAL_SETTINGS = { fontLigatures: false, confirmTabClose: true, failsafeMode: false, + prootDebug: false, // Touch selection settings touchSelectionTapHoldDuration: 600, touchSelectionMoveThreshold: 8, diff --git a/src/plugins/terminal/src/android/BackgroundExecutor.java b/src/plugins/terminal/src/android/BackgroundExecutor.java index f8be3b3b09..3230473af2 100644 --- a/src/plugins/terminal/src/android/BackgroundExecutor.java +++ b/src/plugins/terminal/src/android/BackgroundExecutor.java @@ -52,6 +52,10 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo case "loadLibrary": loadLibrary(args.getString(0), callbackContext); return true; + case "setProotDebug": + ProcessManager.prootDebug = args.getBoolean(0); + callbackContext.success("PRoot debug " + (ProcessManager.prootDebug ? "enabled" : "disabled")); + return true; default: callbackContext.error("Unknown action: " + action); return false; diff --git a/src/plugins/terminal/src/android/Executor.java b/src/plugins/terminal/src/android/Executor.java index 5a6bdf89e8..0fd14cee8b 100644 --- a/src/plugins/terminal/src/android/Executor.java +++ b/src/plugins/terminal/src/android/Executor.java @@ -315,6 +315,13 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo return true; } + if (action.equals("setProotDebug")) { + boolean enabled = args.getBoolean(0); + ProcessManager.prootDebug = enabled; + callbackContext.success("PRoot debug " + (enabled ? "enabled" : "disabled")); + return true; + } + if (action.equals("listProcesses")) { if (!isServiceBound || serviceMessenger == null) { callbackContext.success(new org.json.JSONArray()); diff --git a/src/plugins/terminal/src/android/ProcessManager.java b/src/plugins/terminal/src/android/ProcessManager.java index ce08cb003d..51c94d25f7 100644 --- a/src/plugins/terminal/src/android/ProcessManager.java +++ b/src/plugins/terminal/src/android/ProcessManager.java @@ -14,6 +14,7 @@ public class ProcessManager { private final Context context; + public static boolean prootDebug = false; public ProcessManager(Context context) { this.context = context; @@ -90,6 +91,10 @@ private void setupEnvironment(Map env) { env.put("ANDROID_TZ", tz.getID()); env.put("FDROID", String.valueOf(isFdroidBuild())); + + if (prootDebug) { + env.put("PROOT_VERBOSE", "2"); + } } /** diff --git a/src/plugins/terminal/www/Executor.js b/src/plugins/terminal/www/Executor.js index 268b008ab5..541dcbdadc 100644 --- a/src/plugins/terminal/www/Executor.js +++ b/src/plugins/terminal/www/Executor.js @@ -262,6 +262,12 @@ class Executor { exec(resolve, reject, this.ExecutorType, "loadLibrary", [path]); }); } + + setProotDebug(enabled) { + return new Promise((resolve, reject) => { + exec(resolve, reject, this.ExecutorType, "setProotDebug", [enabled]); + }); + } } //backward compatibility diff --git a/src/settings/terminalSettings.js b/src/settings/terminalSettings.js index a7cfa75fa8..e8e07112b6 100644 --- a/src/settings/terminalSettings.js +++ b/src/settings/terminalSettings.js @@ -35,6 +35,9 @@ export default function terminalSettings() { const terminalValues = values.terminalSettings; + Executor.setProotDebug(terminalValues.prootDebug); + Executor.BackgroundExecutor.setProotDebug(terminalValues.prootDebug); + const items = [ { key: "all_file_access", @@ -232,6 +235,13 @@ export default function terminalSettings() { info: strings["terminal:failsafe-info"], category: categories.maintenance, }, + { + key: "prootDebug", + text: "PRoot Debug", + checkbox: terminalValues.prootDebug, + info: "Enable verbose PRoot logging (PROOT_VERBOSE=2). Useful for debugging sandbox issues.", + category: categories.maintenance, + }, { key: "backup", text: strings.backup, @@ -315,6 +325,17 @@ export default function terminalSettings() { } return; + case "prootDebug": + appSettings.update({ + terminalSettings: { + ...values.terminalSettings, + [key]: value, + }, + }); + Executor.setProotDebug(value); + Executor.BackgroundExecutor.setProotDebug(value); + break; + default: appSettings.update({ terminalSettings: { From 0dd1076ab119d0c5ffdeac17b9d9fd13becd3e73 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 2 Aug 2026 12:12:58 +0530 Subject: [PATCH 023/195] Improve recent dialog path readability (#2567) * feat: improve recent dialog path readability * fix --- src/dialogs/select.js | 38 ++++++++++++++++---- src/dialogs/style.scss | 73 +++++++++++++++++++++++++++++++++++++ src/lib/recents.js | 50 +++++++++++++++++--------- src/utils/Uri.js | 81 ++++++++++++++++++++++++++++++++++++++++++ tests/unit/uri.test.js | 60 +++++++++++++++++++++++++++++++ 5 files changed, 279 insertions(+), 23 deletions(-) diff --git a/src/dialogs/select.js b/src/dialogs/select.js index 9503e3de53..8aeb1c6d67 100644 --- a/src/dialogs/select.js +++ b/src/dialogs/select.js @@ -11,13 +11,17 @@ import restoreTheme from "lib/restoreTheme"; * @property {string} [default] * @property {function():void} [onCancel] * @property {function():void} [onHide] + * @property {string} [className] */ /** * @typedef {object} SelectItem * @property {string} [value] * @property {string} [text] + * @property {string} [subText] * @property {string} [icon] + * @property {string} [className] + * @property {string} [title] * @property {boolean} [disabled] * @property {string} [letters] * @property {boolean} [checkbox] @@ -52,7 +56,7 @@ function select(title, items, options = {}) { {title} ) : null; const $select = ( -
    +
    {$titleSpan ? [$titleSpan, $list] : $list}
    ); @@ -72,6 +76,9 @@ function select(title, items, options = {}) { checkbox: null, tailElement: null, ontailclick: null, + subText: null, + className: null, + title: null, }; // init item options @@ -113,18 +120,35 @@ function select(title, items, options = {}) { }); } + const $text = ( + + ); + if (itemOptions.subText) { + $text.classList.add("has-sub-text"); + $text.append( + + + {itemOptions.subText} + + , + ); + } + const $item = tile({ lead, tail, - text: ( - - ), + text: $text, }); $item.tabIndex = "0"; + if (itemOptions.className) $item.classList.add(itemOptions.className); + if (itemOptions.title) { + $item.title = itemOptions.title; + $item.setAttribute("aria-label", itemOptions.title); + } if (itemOptions.disabled) $item.classList.add("disabled"); if (options.default === itemOptions.value) { $item.classList.add("selected"); diff --git a/src/dialogs/style.scss b/src/dialogs/style.scss index d3ddeb7385..91fe9ab802 100644 --- a/src/dialogs/style.scss +++ b/src/dialogs/style.scss @@ -96,6 +96,79 @@ } } + &.select.recent-select { + width: calc(100vw - 32px); + min-width: 280px; + max-width: 420px; + + .title { + justify-content: flex-start; + min-height: 48px; + margin-inline: 18px; + } + + ul { + padding: 4px 10px 10px; + } + + .tile.recent-entry { + height: 60px; + justify-content: flex-start; + + > .icon { + width: 48px; + min-width: 48px; + height: 60px; + font-size: 1.45em; + } + + > .text.has-sub-text { + min-width: 0; + font-size: 1rem; + font-weight: 600; + line-height: 1.35; + + > .select-sub-text { + display: block; + overflow: hidden; + color: var(--secondary-text-color); + direction: rtl; + font-size: 0.72rem; + font-weight: 400; + opacity: 0.75; + text-align: left; + text-overflow: ellipsis; + white-space: nowrap; + + > .select-sub-text-content { + direction: ltr; + unicode-bidi: isolate; + } + } + } + + > .clearclose { + width: 48px; + min-width: 48px; + height: 48px; + font-size: 1.2em; + opacity: 0.72; + } + } + + .tile.recent-clear { + height: 48px; + justify-content: flex-start; + + > .icon { + width: 48px; + min-width: 48px; + height: 48px; + font-size: 1.2em; + } + } + } + ul { overflow-y: auto; padding: 10px; diff --git a/src/lib/recents.js b/src/lib/recents.js index c3d18436f6..816a374f55 100644 --- a/src/lib/recents.js +++ b/src/lib/recents.js @@ -1,6 +1,7 @@ import select from "dialogs/select"; import escapeStringRegexp from "escape-string-regexp"; import helpers from "utils/helpers"; +import Uri from "utils/Uri"; import Url from "utils/Url"; const recents = { @@ -78,20 +79,28 @@ const recents = { */ select(extra, type = "all", title = strings["open recent"]) { const all = []; - const MAX = 20; - const shortName = (name) => { - name = helpers.getVirtualPath(name); - - if (name.length > MAX) { - return "..." + name.substr(-MAX - 3); - } - return name; + const pathDetails = (url) => { + url = Url.parse(url).url; + const isSafUri = /^content:/.test(url); + const displayPath = isSafUri + ? Uri.getDisplayPath(url) + : helpers.getVirtualPath(url); + const documentPath = isSafUri ? Uri.getDisplayPath(url, []) : displayPath; + const name = Url.basename(displayPath) || Url.basename(documentPath); + const location = + Url.dirname(isSafUri ? documentPath : displayPath)?.replace( + /\/$/, + "", + ) || "/"; + + return { name, location, path: documentPath }; }; if (type === "dir" || type === "all") { let dirs = this.folders; for (let dir of dirs) { const { url } = dir; + const { name, location, path } = pathDetails(url); const dirValue = { type: "dir", @@ -107,8 +116,11 @@ const recents = { all.push({ value: dirValue, - text: shortName(url), + text: name, + subText: location, + title: path, icon: "folder", + className: "recent-entry", tailElement: tailElement, ontailclick: (e) => { const $item = e.currentTarget.closest(".tile"); @@ -123,7 +135,7 @@ const recents = { let files = this.files; for (let file of files) { if (!file) continue; - const name = shortName(Url.parse(file).url); + const { name, location, path } = pathDetails(Url.parse(file).url); const fileValue = { type: "file", @@ -139,7 +151,10 @@ const recents = { all.push({ value: fileValue, text: name, + subText: location, + title: path, icon: helpers.getIconForFile(name), + className: "recent-entry", tailElement: tailElement, ontailclick: (e) => { const $item = e.currentTarget.closest(".tile"); @@ -150,19 +165,22 @@ const recents = { } } - if (type === "all") all.push(["clear", strings.clear, "icon clearclose"]); - - if (extra) { - extra = extra.map((item) => { - item[1] = shortName(item[1]); - return item; + if (type === "all") { + all.push({ + value: "clear", + text: strings.clear, + icon: "clearclose", + className: "recent-clear", }); + } + if (extra) { all.push(...extra); } return select(title, all, { textTransform: false, + className: "recent-select", }); }, }; diff --git a/src/utils/Uri.js b/src/utils/Uri.js index 5ce203c79b..36a9a124e3 100644 --- a/src/utils/Uri.js +++ b/src/utils/Uri.js @@ -84,6 +84,87 @@ export default { if (docId) return [rootUri, docId].join("::"); else return rootUri; }, + /** + * Converts a SAF content URI into a readable path. When the URI belongs to + * an added storage, its configured name is used as the path root. + * + * @param {string} url + * @param {Array<{name?: string, uri?: string, url?: string}>} [storages] + * @returns {string} + */ + getDisplayPath(url, storages = parseStorageList()) { + try { + const { docId } = this.parse(url); + const document = splitDocId(docId); + let matchedStorage = null; + + for (const storage of storages) { + const storageUrl = storage.uri ?? storage.url; + if (!storageUrl) continue; + const isStorageRoot = url === storageUrl; + const isStorageDescendant = url.startsWith(`${storageUrl}::`); + if (!isStorageRoot && !isStorageDescendant) continue; + if (!matchedStorage || storageUrl.length > matchedStorage.url.length) { + matchedStorage = { storage, url: storageUrl }; + } + } + + if (matchedStorage) { + const root = splitDocId(this.parse(matchedStorage.url).docId); + let relativePath = document.path; + + if ( + document.volume === root.volume && + document.absolute === root.absolute + ) { + if (document.path === root.path) { + relativePath = ""; + } else if (root.path && document.path.startsWith(`${root.path}/`)) { + relativePath = document.path.slice(root.path.length + 1); + } + } + + return [matchedStorage.storage.name || document.volume, relativePath] + .filter(Boolean) + .join("/"); + } + + return formatDocumentPath(document) || url; + } catch (_) { + return url; + } + + function splitDocId(docId) { + if (docId.startsWith("/")) { + return { + absolute: true, + volume: "", + path: docId.replace(/^\/+/, ""), + }; + } + + const colonIndex = docId.indexOf(":"); + if (colonIndex >= 0) { + return { + absolute: false, + volume: docId.slice(0, colonIndex), + path: docId.slice(colonIndex + 1).replace(/^\/+/, ""), + }; + } + + const [volume = "", ...pathParts] = docId.split("/"); + return { + absolute: false, + volume, + path: pathParts.join("/"), + }; + } + + function formatDocumentPath(document) { + if (document.absolute) return `/${document.path}`; + return [document.volume, document.path].filter(Boolean).join("/"); + } + }, /** * Gets virtual address by replacing root with name i.e. added in file explorer * @param {string} url diff --git a/tests/unit/uri.test.js b/tests/unit/uri.test.js index dd7fbfd6bf..c13c7d317f 100644 --- a/tests/unit/uri.test.js +++ b/tests/unit/uri.test.js @@ -64,6 +64,66 @@ describe("Uri.getPrimaryAddress", () => { }); }); +describe("Uri.getDisplayPath", () => { + it("uses the storage name and a path relative to its SAF root", () => { + const url = `${TREE_URI}::primary:DCIM/Camera/photo.jpg`; + expect( + Uri.getDisplayPath(url, [{ name: "Pictures", url: TREE_URI }]), + ).toBe("Pictures/Camera/photo.jpg"); + }); + + it("does not match aliases from a prefix-sharing SAF root", () => { + const codesRoot = + "content://com.android.externalstorage.documents/tree/primary%3ACodes"; + const codesBackupRoot = + "content://com.android.externalstorage.documents/tree/primary%3ACodesBackup"; + + expect( + Uri.getDisplayPath(codesBackupRoot, [ + { name: "Codes", url: codesRoot }, + ]), + ).toBe("primary/CodesBackup"); + }); + + it("keeps direct children of a volume-root storage", () => { + const rootUri = + "content://com.android.externalstorage.documents/tree/primary%3A"; + const url = `${rootUri}::primary/file.txt`; + expect( + Uri.getDisplayPath(url, [{ name: "Internal", url: rootUri }]), + ).toBe("Internal/file.txt"); + }); + + it("falls back to a readable volume and document path", () => { + expect(Uri.getDisplayPath(SINGLE_URI, [])).toBe( + "primary/DCIM/file.txt", + ); + }); + + it("includes the selected folder in a bare primary tree path", () => { + const url = + "content://com.android.externalstorage.documents/tree/primary%3ACodes"; + expect(Uri.getDisplayPath(url, [])).toBe("primary/Codes"); + }); + + it("preserves an absolute Termux tree path", () => { + const url = + "content://com.termux.documents/tree/%2Fdata%2Fdata%2Fcom.termux%2Ffiles%2Fhome"; + expect(Uri.getDisplayPath(url, [])).toBe( + "/data/data/com.termux/files/home", + ); + }); + + it("preserves an absolute path appended to a Termux tree", () => { + const root = + "content://com.termux.documents/tree/%2Fdata%2Fdata%2Fcom.termux%2Ffiles%2Fhome"; + const url = `${root}::/data/data/com.termux/files/home/acode-site-ui`; + expect(Uri.getDisplayPath(url, [])).toBe( + "/data/data/com.termux/files/home/acode-site-ui", + ); + }); +}); + describe("Uri.getVirtualAddress", () => { it("returns the url unchanged when no storage list is available", () => { const url = `${TREE_URI}::primary:DCIM/foo`; From 6016e86cf9889c7446c08976d5fcdd13b0c1960d Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 2 Aug 2026 13:10:06 +0530 Subject: [PATCH 024/195] fix(editor): correct CodeMirror theme colors and add Catppuccin (#2568) --- src/cm/themes/catppuccin.js | 270 ++++++++++++++++++++++++++++++++ src/cm/themes/dracula.js | 2 +- src/cm/themes/githubDark.js | 60 +++---- src/cm/themes/githubLight.js | 60 +++---- src/cm/themes/index.js | 14 ++ src/cm/themes/solarizedDark.js | 23 +-- src/cm/themes/solarizedLight.js | 21 +-- src/cm/themes/tokyoNight.js | 31 ++-- src/cm/themes/tokyoNightDay.js | 2 +- src/cm/themes/vscodeDark.js | 22 ++- tests/unit/editorThemes.test.js | 64 ++++++++ 11 files changed, 466 insertions(+), 103 deletions(-) create mode 100644 src/cm/themes/catppuccin.js create mode 100644 tests/unit/editorThemes.test.js diff --git a/src/cm/themes/catppuccin.js b/src/cm/themes/catppuccin.js new file mode 100644 index 0000000000..d83e90f3a7 --- /dev/null +++ b/src/cm/themes/catppuccin.js @@ -0,0 +1,270 @@ +import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; +import { EditorView } from "@codemirror/view"; +import { tags as t } from "@lezer/highlight"; + +const palettes = { + latte: { + dark: false, + rosewater: "#dc8a78", + pink: "#ea76cb", + mauve: "#8839ef", + red: "#d20f39", + peach: "#fe640b", + yellow: "#df8e1d", + green: "#40a02b", + teal: "#179299", + sky: "#04a5e5", + blue: "#1e66f5", + lavender: "#7287fd", + text: "#4c4f69", + subtext0: "#6c6f85", + overlay2: "#7c7f93", + overlay1: "#8c8fa1", + overlay0: "#9ca0b0", + surface2: "#acb0be", + surface1: "#bcc0cc", + surface0: "#ccd0da", + base: "#eff1f5", + mantle: "#e6e9ef", + }, + frappe: { + dark: true, + rosewater: "#f2d5cf", + pink: "#f4b8e4", + mauve: "#ca9ee6", + red: "#e78284", + peach: "#ef9f76", + yellow: "#e5c890", + green: "#a6d189", + teal: "#81c8be", + sky: "#99d1db", + blue: "#8caaee", + lavender: "#babbf1", + text: "#c6d0f5", + subtext0: "#a5adce", + overlay2: "#949cbb", + overlay1: "#838ba7", + overlay0: "#737994", + surface2: "#626880", + surface1: "#51576d", + surface0: "#414559", + base: "#303446", + mantle: "#292c3c", + }, + macchiato: { + dark: true, + rosewater: "#f4dbd6", + pink: "#f5bde6", + mauve: "#c6a0f6", + red: "#ed8796", + peach: "#f5a97f", + yellow: "#eed49f", + green: "#a6da95", + teal: "#8bd5ca", + sky: "#91d7e3", + blue: "#8aadf4", + lavender: "#b7bdf8", + text: "#cad3f5", + subtext0: "#a5adcb", + overlay2: "#939ab7", + overlay1: "#8087a2", + overlay0: "#6e738d", + surface2: "#5b6078", + surface1: "#494d64", + surface0: "#363a4f", + base: "#24273a", + mantle: "#1e2030", + }, + mocha: { + dark: true, + rosewater: "#f5e0dc", + pink: "#f5c2e7", + mauve: "#cba6f7", + red: "#f38ba8", + peach: "#fab387", + yellow: "#f9e2af", + green: "#a6e3a1", + teal: "#94e2d5", + sky: "#89dceb", + blue: "#89b4fa", + lavender: "#b4befe", + text: "#cdd6f4", + subtext0: "#a6adc8", + overlay2: "#9399b2", + overlay1: "#7f849c", + overlay0: "#6c7086", + surface2: "#585b70", + surface1: "#45475a", + surface0: "#313244", + base: "#1e1e2e", + mantle: "#181825", + }, +}; + +function createConfig(name, caption, palette) { + return { + name, + caption, + dark: palette.dark, + background: palette.base, + foreground: palette.text, + selection: `${palette.overlay2}40`, + selectionMatch: `${palette.surface2}4d`, + cursor: palette.rosewater, + dropdownBackground: palette.mantle, + dropdownBorder: palette.overlay0, + activeLine: palette.surface0, + lineNumber: palette.subtext0, + lineNumberActive: palette.mauve, + matchingBracket: `${palette.surface2}47`, + keyword: palette.mauve, + variable: palette.text, + parameter: palette.text, + function: palette.blue, + string: palette.green, + constant: palette.peach, + type: palette.yellow, + class: palette.yellow, + number: palette.peach, + comment: palette.overlay2, + heading: palette.blue, + invalid: palette.red, + regexp: palette.pink, + tag: palette.blue, + operator: palette.sky, + palette, + }; +} + +export const configs = [ + createConfig("catppuccinLatte", "Catppuccin Latte", palettes.latte), + createConfig("catppuccinFrappe", "Catppuccin Frappé", palettes.frappe), + createConfig( + "catppuccinMacchiato", + "Catppuccin Macchiato", + palettes.macchiato, + ), + createConfig("catppuccinMocha", "Catppuccin Mocha", palettes.mocha), +]; + +function createCatppuccinTheme(config) { + const colors = config.palette; + const theme = EditorView.theme( + { + "&": { + color: config.foreground, + backgroundColor: config.background, + }, + ".cm-content": { caretColor: config.cursor }, + ".cm-cursor, .cm-dropCursor": { + borderLeftColor: config.cursor, + }, + "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection": + { backgroundColor: config.selection }, + ".cm-panels": { + backgroundColor: config.dropdownBackground, + color: config.foreground, + }, + ".cm-panels.cm-panels-top": { + borderBottom: `1px solid ${config.dropdownBorder}`, + }, + ".cm-panels.cm-panels-bottom": { + borderTop: `1px solid ${config.dropdownBorder}`, + }, + ".cm-searchMatch": { + backgroundColor: `${colors.blue}59`, + outline: `1px solid ${colors.blue}`, + }, + ".cm-searchMatch.cm-searchMatch-selected": { + backgroundColor: `${colors.blue}2f`, + }, + ".cm-activeLine": { backgroundColor: config.activeLine }, + ".cm-selectionMatch": { backgroundColor: config.selectionMatch }, + "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { + backgroundColor: config.matchingBracket, + color: config.foreground, + }, + ".cm-gutters": { + backgroundColor: config.background, + color: config.lineNumber, + border: "none", + }, + ".cm-activeLineGutter": { backgroundColor: config.activeLine }, + ".cm-lineNumbers .cm-gutterElement": { color: config.lineNumber }, + ".cm-lineNumbers .cm-activeLineGutter": { + color: config.lineNumberActive, + }, + ".cm-foldPlaceholder": { + backgroundColor: "transparent", + border: "none", + color: colors.overlay0, + }, + ".cm-placeholder": { color: colors.overlay1 }, + ".cm-tooltip": { + border: "none", + backgroundColor: colors.surface0, + color: config.foreground, + }, + ".cm-tooltip-autocomplete": { + "& > ul > li[aria-selected]": { + backgroundColor: colors.surface1, + color: config.foreground, + }, + }, + }, + { dark: config.dark }, + ); + + const highlightStyle = HighlightStyle.define([ + { tag: t.keyword, color: config.keyword }, + { + tag: [t.name, t.definition(t.name), t.deleted, t.character, t.macroName], + color: config.variable, + }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.propertyName, + t.labelName, + ], + color: config.function, + }, + { + tag: [t.color, t.constant(t.name), t.standard(t.name)], + color: config.constant, + }, + { tag: [t.self, t.atom], color: colors.red }, + { + tag: [t.typeName, t.className, t.changed, t.annotation, t.namespace], + color: config.type, + }, + { tag: t.operator, color: config.operator }, + { tag: t.url, color: colors.teal }, + { tag: [t.escape, t.regexp], color: config.regexp }, + { + tag: [t.meta, t.punctuation, t.separator, t.comment], + color: config.comment, + }, + { tag: t.strong, fontWeight: "bold" }, + { tag: t.emphasis, fontStyle: "italic" }, + { tag: t.strikethrough, textDecoration: "line-through" }, + { tag: t.link, color: config.function, textDecoration: "underline" }, + { tag: t.heading, fontWeight: "bold", color: config.heading }, + { tag: t.special(t.variableName), color: colors.lavender }, + { tag: [t.bool, t.number], color: config.number }, + { + tag: [t.processingInstruction, t.string, t.inserted], + color: config.string, + }, + { tag: t.invalid, color: config.invalid }, + ]); + + return [theme, syntaxHighlighting(highlightStyle)]; +} + +export const themes = new Map( + configs.map((config) => [config.name, createCatppuccinTheme(config)]), +); + +export default themes; diff --git a/src/cm/themes/dracula.js b/src/cm/themes/dracula.js index 3da64920da..8a02c06cbc 100644 --- a/src/cm/themes/dracula.js +++ b/src/cm/themes/dracula.js @@ -127,7 +127,7 @@ export const draculaHighlightStyle = HighlightStyle.define([ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: config.number, }, - { tag: [t.typeName], color: config.type, fontStyle: config.type }, + { tag: [t.typeName], color: config.type }, { tag: [t.operator, t.operatorKeyword], color: config.keyword }, { tag: [t.url, t.escape, t.regexp, t.link], color: config.regexp }, { tag: [t.meta, t.comment], color: config.comment }, diff --git a/src/cm/themes/githubDark.js b/src/cm/themes/githubDark.js index b08bbfb662..e1dcf76533 100644 --- a/src/cm/themes/githubDark.js +++ b/src/cm/themes/githubDark.js @@ -1,34 +1,37 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; -import { EditorView, lineNumbers } from "@codemirror/view"; +import { EditorView } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; export const config = { name: "githubDark", dark: true, - background: "#24292e", - foreground: "#d1d5da", + background: "#0d1117", + foreground: "#e6edf3", selection: "#3392FF44", - cursor: "#c8e1ff", - dropdownBackground: "#24292e", - dropdownBorder: "#1b1f23", - activeLine: "#4d566022", - lineNumber: "#444d56", - lineNumberActive: "#e1e4e8", - matchingBracket: "#17E5E650", - keyword: "#f97583", - storage: "#f97583", - variable: "#ffab70", - parameter: "#e1e4e8", - function: "#79b8ff", - string: "#9ecbff", - constant: "#79b8ff", - type: "#79b8ff", - class: "#b392f0", - number: "#79b8ff", - comment: "#6a737d", - heading: "#79b8ff", - invalid: "#f97583", - regexp: "#9ecbff", + cursor: "#e6edf3", + dropdownBackground: "#161b22", + dropdownBorder: "#30363d", + activeLine: "#6e76811a", + lineNumber: "#6e7681", + lineNumberActive: "#e6edf3", + matchingBracket: "#6e76811a", + keyword: "#ff7b72", + storage: "#ff7b72", + variable: "#e6edf3", + parameter: "#e6edf3", + function: "#d2a8ff", + string: "#a5d6ff", + constant: "#79c0ff", + type: "#79c0ff", + class: "#7ee787", + number: "#79c0ff", + comment: "#8b949e", + heading: "#ffa657", + invalid: "#f85149", + regexp: "#a5d6ff", + tag: "#7ee787", + property: "#79c0ff", + operator: "#79c0ff", }; export const githubDarkTheme = EditorView.theme( @@ -111,7 +114,7 @@ export const githubDarkHighlightStyle = HighlightStyle.define([ tag: [t.name, t.deleted, t.character, t.macroName], color: config.variable, }, - { tag: [t.propertyName], color: config.function }, + { tag: [t.propertyName], color: config.property }, { tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, @@ -127,15 +130,16 @@ export const githubDarkHighlightStyle = HighlightStyle.define([ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: config.number, }, - { tag: [t.typeName], color: config.type, fontStyle: config.type }, - { tag: [t.operator, t.operatorKeyword], color: config.keyword }, + { tag: [t.typeName], color: config.type }, + { tag: [t.operator, t.operatorKeyword], color: config.operator }, { tag: [t.url, t.escape, t.regexp, t.link], color: config.regexp }, { tag: [t.meta, t.comment], color: config.comment }, + { tag: t.tagName, color: config.tag }, { tag: t.strong, fontWeight: "bold" }, { tag: t.emphasis, fontStyle: "italic" }, { tag: t.link, textDecoration: "underline" }, { tag: t.heading, fontWeight: "bold", color: config.heading }, - { tag: [t.atom, t.bool, t.special(t.variableName)], color: config.variable }, + { tag: [t.atom, t.bool, t.special(t.variableName)], color: config.constant }, { tag: t.invalid, color: config.invalid }, { tag: t.strikethrough, textDecoration: "line-through" }, ]); diff --git a/src/cm/themes/githubLight.js b/src/cm/themes/githubLight.js index 92dcc83a53..e05b03bb27 100644 --- a/src/cm/themes/githubLight.js +++ b/src/cm/themes/githubLight.js @@ -5,30 +5,33 @@ import { tags as t } from "@lezer/highlight"; export const config = { name: "githubLight", dark: false, - background: "#fff", - foreground: "#444d56", - selection: "#0366d625", - cursor: "#044289", - dropdownBackground: "#fff", - dropdownBorder: "#e1e4e8", - activeLine: "#c6c6c622", - lineNumber: "#1b1f234d", - lineNumberActive: "#24292e", - matchingBracket: "#34d05840", - keyword: "#d73a49", - storage: "#d73a49", - variable: "#e36209", - parameter: "#24292e", - function: "#005cc5", - string: "#032f62", - constant: "#005cc5", - type: "#005cc5", - class: "#6f42c1", - number: "#005cc5", - comment: "#6a737d", - heading: "#005cc5", - invalid: "#cb2431", - regexp: "#032f62", + background: "#ffffff", + foreground: "#1f2328", + selection: "#0969da33", + cursor: "#0969da", + dropdownBackground: "#ffffff", + dropdownBorder: "#d0d7de", + activeLine: "#afb8c133", + lineNumber: "#8c959f", + lineNumberActive: "#1f2328", + matchingBracket: "#2da44e40", + keyword: "#cf222e", + storage: "#cf222e", + variable: "#1f2328", + parameter: "#1f2328", + function: "#8250df", + string: "#0a3069", + constant: "#0550ae", + type: "#0550ae", + class: "#116329", + number: "#0550ae", + comment: "#656d76", + heading: "#0550ae", + invalid: "#82071e", + regexp: "#0a3069", + tag: "#116329", + property: "#0550ae", + operator: "#0550ae", }; export const githubLightTheme = EditorView.theme( @@ -111,7 +114,7 @@ export const githubLightHighlightStyle = HighlightStyle.define([ tag: [t.name, t.deleted, t.character, t.macroName], color: config.variable, }, - { tag: [t.propertyName], color: config.function }, + { tag: [t.propertyName], color: config.property }, { tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, @@ -127,15 +130,16 @@ export const githubLightHighlightStyle = HighlightStyle.define([ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: config.number, }, - { tag: [t.typeName], color: config.type, fontStyle: config.type }, - { tag: [t.operator, t.operatorKeyword], color: config.keyword }, + { tag: [t.typeName], color: config.type }, + { tag: [t.operator, t.operatorKeyword], color: config.operator }, { tag: [t.url, t.escape, t.regexp, t.link], color: config.regexp }, { tag: [t.meta, t.comment], color: config.comment }, + { tag: t.tagName, color: config.tag }, { tag: t.strong, fontWeight: "bold" }, { tag: t.emphasis, fontStyle: "italic" }, { tag: t.link, textDecoration: "underline" }, { tag: t.heading, fontWeight: "bold", color: config.heading }, - { tag: [t.atom, t.bool, t.special(t.variableName)], color: config.variable }, + { tag: [t.atom, t.bool, t.special(t.variableName)], color: config.constant }, { tag: t.invalid, color: config.invalid }, { tag: t.strikethrough, textDecoration: "line-through" }, ]); diff --git a/src/cm/themes/index.js b/src/cm/themes/index.js index 342d1a0231..dbcd67eba1 100644 --- a/src/cm/themes/index.js +++ b/src/cm/themes/index.js @@ -2,6 +2,10 @@ import { EditorState } from "@codemirror/state"; import { oneDark } from "@codemirror/theme-one-dark"; import aura, { config as auraConfig } from "./aura"; import ayuDark, { config as ayuDarkConfig } from "./ayuDark"; +import { + configs as catppuccinConfigs, + themes as catppuccinThemes, +} from "./catppuccin"; import cobalt, { config as cobaltConfig } from "./cobalt"; import dracula, { config as draculaConfig } from "./dracula"; import githubDark, { config as githubDarkConfig } from "./githubDark"; @@ -276,6 +280,16 @@ addTheme( vscodeDarkConfig, ); +for (const config of catppuccinConfigs) { + addTheme( + config.name, + config.caption, + config.dark, + () => catppuccinThemes.get(config.name), + config, + ); +} + export default { getThemes, getThemeById, diff --git a/src/cm/themes/solarizedDark.js b/src/cm/themes/solarizedDark.js index aab15ece38..088a200a64 100644 --- a/src/cm/themes/solarizedDark.js +++ b/src/cm/themes/solarizedDark.js @@ -6,14 +6,15 @@ export const config = { name: "solarizedDark", dark: true, background: "#002B36", - foreground: "#93A1A1", - selection: "#274642", + foreground: "#839496", + selection: "#004454AA", + selectionMatch: "#005A6FAA", cursor: "#D30102", - dropdownBackground: "#002B36", + dropdownBackground: "#00212B", dropdownBorder: "#2AA19899", - activeLine: "#005b7022", - lineNumber: "#93A1A1", - lineNumberActive: "#949494", + activeLine: "#00CAFE11", + lineNumber: "#839496", + lineNumberActive: "#93A1A1", matchingBracket: "#073642", keyword: "#859900", storage: "#93A1A1", @@ -22,13 +23,14 @@ export const config = { function: "#268BD2", string: "#2AA198", constant: "#CB4B16", - type: "#CB4B16", - class: "#CB4B16", + type: "#859900", + class: "#268BD2", number: "#D33682", comment: "#586E75", heading: "#268BD2", invalid: "#DC322F", regexp: "#DC322F", + tag: "#268BD2", }; export const solarizedDarkTheme = EditorView.theme( @@ -60,7 +62,7 @@ export const solarizedDarkTheme = EditorView.theme( }, ".cm-activeLine": { backgroundColor: config.activeLine }, - ".cm-selectionMatch": { backgroundColor: config.selection }, + ".cm-selectionMatch": { backgroundColor: config.selectionMatch }, "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { backgroundColor: config.matchingBracket, @@ -127,10 +129,11 @@ export const solarizedDarkHighlightStyle = HighlightStyle.define([ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: config.number, }, - { tag: [t.typeName], color: config.type, fontStyle: config.type }, + { tag: [t.typeName], color: config.type }, { tag: [t.operator, t.operatorKeyword], color: config.keyword }, { tag: [t.url, t.escape, t.regexp, t.link], color: config.regexp }, { tag: [t.meta, t.comment], color: config.comment }, + { tag: t.tagName, color: config.tag }, { tag: t.strong, fontWeight: "bold" }, { tag: t.emphasis, fontStyle: "italic" }, { tag: t.link, textDecoration: "underline" }, diff --git a/src/cm/themes/solarizedLight.js b/src/cm/themes/solarizedLight.js index 022899460e..01dd678f5a 100644 --- a/src/cm/themes/solarizedLight.js +++ b/src/cm/themes/solarizedLight.js @@ -6,14 +6,15 @@ export const config = { name: "solarizedLight", dark: false, background: "#FDF6E3", - foreground: "#586E75", + foreground: "#657B83", selection: "#EEE8D5", + selectionMatch: "#EEE8D5", cursor: "#657B83", - dropdownBackground: "#FDF6E3", + dropdownBackground: "#EEE8D5", dropdownBorder: "#D3AF86", - activeLine: "#d5bd5c22", - lineNumber: "#586E75", - lineNumberActive: "#567983", + activeLine: "#3D392D11", + lineNumber: "#657B83", + lineNumberActive: "#586E75", matchingBracket: "#EEE8D5", keyword: "#859900", storage: "#586E75", @@ -22,13 +23,14 @@ export const config = { function: "#268BD2", string: "#2AA198", constant: "#CB4B16", - type: "#CB4B16", - class: "#CB4B16", + type: "#859900", + class: "#268BD2", number: "#D33682", comment: "#93A1A1", heading: "#268BD2", invalid: "#DC322F", regexp: "#DC322F", + tag: "#268BD2", }; export const solarizedLightTheme = EditorView.theme( @@ -60,7 +62,7 @@ export const solarizedLightTheme = EditorView.theme( }, ".cm-activeLine": { backgroundColor: config.activeLine }, - ".cm-selectionMatch": { backgroundColor: config.selection }, + ".cm-selectionMatch": { backgroundColor: config.selectionMatch }, "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { backgroundColor: config.matchingBracket, @@ -127,10 +129,11 @@ export const solarizedLightHighlightStyle = HighlightStyle.define([ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: config.number, }, - { tag: [t.typeName], color: config.type, fontStyle: config.type }, + { tag: [t.typeName], color: config.type }, { tag: [t.operator, t.operatorKeyword], color: config.keyword }, { tag: [t.url, t.escape, t.regexp, t.link], color: config.regexp }, { tag: [t.meta, t.comment], color: config.comment }, + { tag: t.tagName, color: config.tag }, { tag: t.strong, fontWeight: "bold" }, { tag: t.emphasis, fontStyle: "italic" }, { tag: t.link, textDecoration: "underline" }, diff --git a/src/cm/themes/tokyoNight.js b/src/cm/themes/tokyoNight.js index 33af938477..efc55889c4 100644 --- a/src/cm/themes/tokyoNight.js +++ b/src/cm/themes/tokyoNight.js @@ -6,29 +6,31 @@ export const config = { name: "tokyoNight", dark: true, background: "#1a1b26", - foreground: "#787c99", + foreground: "#a9b1d6", selection: "#515c7e40", cursor: "#c0caf5", dropdownBackground: "#1a1b26", - dropdownBorder: "#787c99", - activeLine: "#43455c22", - lineNumber: "#363b54", - lineNumberActive: "#737aa2", - matchingBracket: "#16161e", + dropdownBorder: "#414868", + activeLine: "#24283b", + lineNumber: "#414868", + lineNumberActive: "#a9b1d6", + matchingBracket: "#24283b", keyword: "#bb9af7", storage: "#bb9af7", variable: "#c0caf5", - parameter: "#c0caf5", + parameter: "#cfc9c2", function: "#7aa2f7", string: "#9ece6a", - constant: "#bb9af7", - type: "#0db9d7", + constant: "#ff9e64", + type: "#2ac3de", class: "#c0caf5", number: "#ff9e64", - comment: "#444b6a", - heading: "#89ddff", - invalid: "#ff5370", + comment: "#565f89", + heading: "#7dcfff", + invalid: "#f7768e", regexp: "#b4f9f8", + tag: "#f7768e", + operator: "#bb9af7", }; export const tokyoNightTheme = EditorView.theme( @@ -127,10 +129,11 @@ export const tokyoNightHighlightStyle = HighlightStyle.define([ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: config.number, }, - { tag: [t.typeName], color: config.type, fontStyle: config.type }, - { tag: [t.operator, t.operatorKeyword], color: config.keyword }, + { tag: [t.typeName], color: config.type }, + { tag: [t.operator, t.operatorKeyword], color: config.operator }, { tag: [t.url, t.escape, t.regexp, t.link], color: config.regexp }, { tag: [t.meta, t.comment], color: config.comment }, + { tag: t.tagName, color: config.tag }, { tag: t.strong, fontWeight: "bold" }, { tag: t.emphasis, fontStyle: "italic" }, { tag: t.link, textDecoration: "underline" }, diff --git a/src/cm/themes/tokyoNightDay.js b/src/cm/themes/tokyoNightDay.js index e9f948ffe6..75a9fcf820 100644 --- a/src/cm/themes/tokyoNightDay.js +++ b/src/cm/themes/tokyoNightDay.js @@ -127,7 +127,7 @@ export const tokyoNightDayHighlightStyle = HighlightStyle.define([ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: config.number, }, - { tag: [t.typeName], color: config.type, fontStyle: config.type }, + { tag: [t.typeName], color: config.type }, { tag: [t.operator, t.operatorKeyword], color: config.keyword }, { tag: [t.url, t.escape, t.regexp, t.link], color: config.regexp }, { tag: [t.meta, t.comment], color: config.comment }, diff --git a/src/cm/themes/vscodeDark.js b/src/cm/themes/vscodeDark.js index ee631e1752..2045621f5f 100644 --- a/src/cm/themes/vscodeDark.js +++ b/src/cm/themes/vscodeDark.js @@ -5,17 +5,17 @@ import { tags as t } from "@lezer/highlight"; export const config = { name: "vscodeDark", dark: true, - background: "#1e1e1e", - foreground: "#9cdcfe", + background: "#1f1f1f", + foreground: "#cccccc", selection: "#6199ff2f", selectionMatch: "#72a1ff59", cursor: "#c6c6c6", - dropdownBackground: "#1e1e1e", - dropdownBorder: "#3c3c3c", - activeLine: "#ffffff0f", - lineNumber: "#838383", - lineNumberActive: "#ffffff", - matchingBracket: "#515c6a", + dropdownBackground: "#202020", + dropdownBorder: "#454545", + activeLine: "#282828", + lineNumber: "#6e7681", + lineNumberActive: "#cccccc", + matchingBracket: "#add6ff26", keyword: "#569cd6", variable: "#9cdcfe", parameter: "#9cdcfe", @@ -157,10 +157,8 @@ export const vscodeDarkHighlightStyle = HighlightStyle.define([ color: config.variable, }, { tag: t.heading, fontWeight: "bold", color: config.heading }, - { - tag: [t.typeName, t.className, t.tagName, t.standard(t.tagName)], - color: config.type, - }, + { tag: [t.typeName, t.className], color: config.type }, + { tag: [t.tagName, t.standard(t.tagName)], color: config.keyword }, { tag: [t.function(t.variableName), t.function(t.propertyName)], color: config.function, diff --git a/tests/unit/editorThemes.test.js b/tests/unit/editorThemes.test.js new file mode 100644 index 0000000000..0b2dee35e0 --- /dev/null +++ b/tests/unit/editorThemes.test.js @@ -0,0 +1,64 @@ +import { EditorState } from "@codemirror/state"; +import { describe, expect, it } from "vitest"; +import { + getThemeConfig, + getThemeExtensions, + getThemes, +} from "cm/themes"; + +describe("built-in editor themes", () => { + it("uses the base editor foreground for plain VS Code text", () => { + expect(getThemeConfig("vscodeDark")).toMatchObject({ + background: "#1f1f1f", + foreground: "#cccccc", + variable: "#9cdcfe", + }); + }); + + it("uses the current GitHub Dark palette", () => { + expect(getThemeConfig("githubDark")).toMatchObject({ + background: "#0d1117", + foreground: "#e6edf3", + variable: "#e6edf3", + }); + }); + + it("uses current canonical foregrounds for the audited themes", () => { + expect(getThemeConfig("githubLight")).toMatchObject({ + background: "#ffffff", + foreground: "#1f2328", + }); + expect(getThemeConfig("solarizedDark")).toMatchObject({ + background: "#002B36", + foreground: "#839496", + }); + expect(getThemeConfig("solarizedLight")).toMatchObject({ + background: "#FDF6E3", + foreground: "#657B83", + }); + expect(getThemeConfig("tokyoNight")).toMatchObject({ + background: "#1a1b26", + foreground: "#a9b1d6", + }); + }); + + it("registers every official Catppuccin CodeMirror flavor", () => { + const ids = getThemes().map((theme) => theme.id); + for (const id of [ + "catppuccinlatte", + "catppuccinfrappe", + "catppuccinmacchiato", + "catppuccinmocha", + ]) { + expect(ids).toContain(id); + } + }); + + it("constructs every registered editor theme", () => { + for (const { id } of getThemes()) { + expect(() => + EditorState.create({ extensions: getThemeExtensions(id) }), + ).not.toThrow(); + } + }); +}); From d2bd3a1e1599c5427476718dc4861608f07c2812 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 2 Aug 2026 13:46:43 +0530 Subject: [PATCH 025/195] feat(editor): add configurable horizontal scroll margin to CodeMirror (#2569) * feat(editor): add configurable horizontal scroll margin to CodeMirror * translation keys * . --- bun.lock | 127 +++++++++++++++++++++++++++++++ src/cm/scrollPastEnd.ts | 19 +++++ src/lang/ar-ye.json | 4 +- src/lang/be-by.json | 4 +- src/lang/bn-bd.json | 4 +- src/lang/cs-cz.json | 4 +- src/lang/de-de.json | 4 +- src/lang/en-us.json | 4 +- src/lang/es-sv.json | 4 +- src/lang/fr-fr.json | 4 +- src/lang/he-il.json | 4 +- src/lang/hi-in.json | 4 +- src/lang/hu-hu.json | 4 +- src/lang/id-id.json | 4 +- src/lang/index.d.ts | 2 + src/lang/ir-fa.json | 4 +- src/lang/it-it.json | 4 +- src/lang/ja-jp.json | 4 +- src/lang/ko-kr.json | 4 +- src/lang/ml-in.json | 4 +- src/lang/mm-unicode.json | 4 +- src/lang/mm-zawgyi.json | 4 +- src/lang/pl-pl.json | 4 +- src/lang/pt-br.json | 4 +- src/lang/pu-in.json | 4 +- src/lang/ru-ru.json | 4 +- src/lang/tl-ph.json | 4 +- src/lang/tr-tr.json | 4 +- src/lang/uk-ua.json | 4 +- src/lang/uz-uz.json | 4 +- src/lang/vi-vn.json | 4 +- src/lang/zh-cn.json | 4 +- src/lang/zh-hant.json | 4 +- src/lang/zh-tw.json | 4 +- src/lib/editorManager.js | 25 +++--- src/settings/scrollSettings.js | 19 ++++- tests/unit/scrollPastEnd.test.js | 25 ++++++ 37 files changed, 295 insertions(+), 46 deletions(-) create mode 100644 tests/unit/scrollPastEnd.test.js diff --git a/bun.lock b/bun.lock index bbd334c565..3de02944ff 100644 --- a/bun.lock +++ b/bun.lock @@ -138,6 +138,7 @@ "terminal": "^0.1.4", "ts-loader": "^9.5.7", "typescript": "^5.9.3", + "vitest": "^4.1.10", "vscode-languageserver-types": "^3.17.5", "ws": "^8.21.0", }, @@ -554,6 +555,8 @@ "@npmcli/run-script": ["@npmcli/run-script@10.0.4", "", { "dependencies": { "@npmcli/node-gyp": "^5.0.0", "@npmcli/package-json": "^7.0.0", "@npmcli/promise-spawn": "^9.0.0", "node-gyp": "^12.1.0", "proc-log": "^6.0.0" } }, "sha512-mGUWr1uMnf0le2TwfOZY4SFxZGXGfm4Jtay/nwAa2FLNAKXUoUwaGwBMNH36UHPtinWfTSJ3nqFQr0091CxVGg=="], + "@oxc-project/types": ["@oxc-project/types@0.142.0", "", {}, "sha512-7W+2q5AKQVU36fkaryontrHn3YDt1RyUYXatw9i5H8ocYe2sPKSFB6eS8WNPeRKiN1qAWWZUPm7gwFzJGrccqQ=="], + "@parcel/watcher": ["@parcel/watcher@2.5.1", "", { "dependencies": { "detect-libc": "^1.0.3", "is-glob": "^4.0.3", "micromatch": "^4.0.5", "node-addon-api": "^7.0.0" }, "optionalDependencies": { "@parcel/watcher-android-arm64": "2.5.1", "@parcel/watcher-darwin-arm64": "2.5.1", "@parcel/watcher-darwin-x64": "2.5.1", "@parcel/watcher-freebsd-x64": "2.5.1", "@parcel/watcher-linux-arm-glibc": "2.5.1", "@parcel/watcher-linux-arm-musl": "2.5.1", "@parcel/watcher-linux-arm64-glibc": "2.5.1", "@parcel/watcher-linux-arm64-musl": "2.5.1", "@parcel/watcher-linux-x64-glibc": "2.5.1", "@parcel/watcher-linux-x64-musl": "2.5.1", "@parcel/watcher-win32-arm64": "2.5.1", "@parcel/watcher-win32-ia32": "2.5.1", "@parcel/watcher-win32-x64": "2.5.1" } }, "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg=="], "@parcel/watcher-android-arm64": ["@parcel/watcher-android-arm64@2.5.1", "", { "os": "android", "cpu": "arm64" }, "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA=="], @@ -582,6 +585,38 @@ "@parcel/watcher-win32-x64": ["@parcel/watcher-win32-x64@2.5.1", "", { "os": "win32", "cpu": "x64" }, "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA=="], + "@rolldown/binding-android-arm64": ["@rolldown/binding-android-arm64@1.2.1", "", { "os": "android", "cpu": "arm64" }, "sha512-02hOeOSryYxVrOIphmLAsqnCJWxwlzFk+pEt/N/i6OgT3lShHO7xGCU5cpgchRDHboAEbSjzgGh+O/u1GswQmA=="], + + "@rolldown/binding-darwin-arm64": ["@rolldown/binding-darwin-arm64@1.2.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-fMsTOnN0OjFm3CyppWPitKnc8UlliVARUULW6cfU6AIqjdtgmSFWSk9vecHzZduv/yMWIHDlRhM1e8Iff9uAfA=="], + + "@rolldown/binding-darwin-x64": ["@rolldown/binding-darwin-x64@1.2.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-1wjKdz/XLGKHaTNHjQveQ/B23TKx4ItAqm1JbyVuvNPc4Ze0Fb48s49TAd/2zcplPl8okE/UbTgmlVfwT7eFeQ=="], + + "@rolldown/binding-freebsd-x64": ["@rolldown/binding-freebsd-x64@1.2.1", "", { "os": "freebsd", "cpu": "x64" }, "sha512-Fa0jHR07E7YBN4vOEsbVf2briYNsuOowfLJaXULZM0ldMlaCaj2LJgLMbMe4iacRyZmvR8efFhgR9wKuGclQUg=="], + + "@rolldown/binding-linux-arm-gnueabihf": ["@rolldown/binding-linux-arm-gnueabihf@1.2.1", "", { "os": "linux", "cpu": "arm" }, "sha512-pzkgu1SSHGgRRyRZ4fbmSgmajbVt+epaLP99NDjFft69v/ypfTi6swBMiVdh2EkQ0OSnHE1lZDM7DRGkyAzUpA=="], + + "@rolldown/binding-linux-arm64-gnu": ["@rolldown/binding-linux-arm64-gnu@1.2.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-QI5SEDY8cbiYWHx0VO4vIc3UlS6a32vXHjU8Qy/17adEmZIPuByJg13UEvo9c/UCiUkdcVWY83C+b+JrwnNyUg=="], + + "@rolldown/binding-linux-arm64-musl": ["@rolldown/binding-linux-arm64-musl@1.2.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-Sm41FyCeXqmYcERoYOCbGIL5hNfd8w9LQ7Y61Bev48HkcjaJqV/iiVOaiDxjVTRMS+QKrZmD8cfPt4uMVnvM+A=="], + + "@rolldown/binding-linux-ppc64-gnu": ["@rolldown/binding-linux-ppc64-gnu@1.2.1", "", { "os": "linux", "cpu": "ppc64" }, "sha512-2x+WhXTGl9yJYPbltW/BSEPTVz9OIWQyER4N+gJEDWkkn904eRcBzELqh/Hf7K0w/ubGbKNMv0ZC+94QK/IFEg=="], + + "@rolldown/binding-linux-s390x-gnu": ["@rolldown/binding-linux-s390x-gnu@1.2.1", "", { "os": "linux", "cpu": "s390x" }, "sha512-eEjmQpuRQayHPWWnywaWHkFT3ToPbP3RYy42VVd/B9aBGDA+Ol25EIWHxKQST3IiWJjikCWUF7KtbfqwZrzVwQ=="], + + "@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.2.1", "", { "os": "linux", "cpu": "x64" }, "sha512-/Orga1fZYkLc/56jBICcHrKchl8Z2UKdDSr3LG9ToWO1lQ6a4Livk9Xz+9WN91zsz5QR3XQz2NNoSDEvP6qadw=="], + + "@rolldown/binding-linux-x64-musl": ["@rolldown/binding-linux-x64-musl@1.2.1", "", { "os": "linux", "cpu": "x64" }, "sha512-xxBJRL+0q0Kce7orznGWLuylHDY65vuARXZRpX+hPdv+DqK2c3NlCsVA98tlWzWNEE7yPqA/1NQ5nnCrj49Y5A=="], + + "@rolldown/binding-openharmony-arm64": ["@rolldown/binding-openharmony-arm64@1.2.1", "", { "os": "none", "cpu": "arm64" }, "sha512-M6AdXIXw3s+/8XpKMzdGDEXGS1S7kwUsy+rcTIUIOx5Ge4nXKCtAFHFV9YKkXvGcC5WMoTjAteLzlsQROVI0Yw=="], + + "@rolldown/binding-wasm32-wasi": ["@rolldown/binding-wasm32-wasi@1.2.1", "", { "dependencies": { "@emnapi/core": "2.0.0-alpha.3", "@emnapi/runtime": "2.0.0-alpha.3", "@napi-rs/wasm-runtime": "^1.2.0" } }, "sha512-/TX0SoRGojHzSAHpfVBbavRVSazg5U3h3Y3VXfcc0cdugq6kxdqw8LPGFiPr+/7gE/60zRcsOY2Vi9b9eT0jww=="], + + "@rolldown/binding-win32-arm64-msvc": ["@rolldown/binding-win32-arm64-msvc@1.2.1", "", { "os": "win32", "cpu": "arm64" }, "sha512-EvRrivJieyHG+AO9lleZWgq+g0+S7oV2C51yuqlcyU/R9net+sI4Pj0F+lUoP2bEr6TWX3SqFaaS0SzfLxSzkw=="], + + "@rolldown/binding-win32-x64-msvc": ["@rolldown/binding-win32-x64-msvc@1.2.1", "", { "os": "win32", "cpu": "x64" }, "sha512-Z4eCmn5QJ/5+azF9knpLWKfVd9aidn0mAe9TpJgvBLId9Ax3t0+JVxBmT25Bv7NBbVW1TZyKjQjQReouMeH5UQ=="], + + "@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.1", "", {}, "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw=="], + "@rspack/binding": ["@rspack/binding@2.0.2", "", { "optionalDependencies": { "@rspack/binding-darwin-arm64": "2.0.2", "@rspack/binding-darwin-x64": "2.0.2", "@rspack/binding-linux-arm64-gnu": "2.0.2", "@rspack/binding-linux-arm64-musl": "2.0.2", "@rspack/binding-linux-x64-gnu": "2.0.2", "@rspack/binding-linux-x64-musl": "2.0.2", "@rspack/binding-wasm32-wasi": "2.0.2", "@rspack/binding-win32-arm64-msvc": "2.0.2", "@rspack/binding-win32-ia32-msvc": "2.0.2", "@rspack/binding-win32-x64-msvc": "2.0.2" } }, "sha512-0kZPplW9GWx8mfC6DfsaRY3QBIYPuUs42JfmSM6aSb8tMHZAXQeLeMB8M+h8i4SeI+aFtCgO6UuYGtyWf7+L+A=="], "@rspack/binding-darwin-arm64": ["@rspack/binding-darwin-arm64@2.0.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-0o7lbgBBsDlICWdjIH0q3e0BsSco4GRiImHWVfZSVEG+q2+ykZJvSvYCVhPM1Co375Z0S3VMPa/8SjcY1FHwlw=="], @@ -624,6 +659,8 @@ "@sphinxxxx/color-conversion": ["@sphinxxxx/color-conversion@2.2.2", "", {}, "sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw=="], + "@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], + "@szmarczak/http-timer": ["@szmarczak/http-timer@1.1.2", "", { "dependencies": { "defer-to-connect": "^1.0.1" } }, "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="], "@tootallnate/once": ["@tootallnate/once@1.1.2", "", {}, "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="], @@ -636,6 +673,8 @@ "@types/ace": ["@types/ace@0.0.52", "", {}, "sha512-YPF9S7fzpuyrxru+sG/rrTpZkC6gpHBPF14W3x70kqVOD+ks6jkYLapk4yceh36xej7K4HYxcyz9ZDQ2lTvwgQ=="], + "@types/chai": ["@types/chai@5.2.3", "", { "dependencies": { "@types/deep-eql": "*", "assertion-error": "^2.0.1" } }, "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA=="], + "@types/cordova": ["@types/cordova@11.0.3", "", {}, "sha512-kyuRQ40/NWQVhqGIHq78Ehu2Bf9Mlg0LhmSmis6ZFJK7z933FRfYi8tHe/k/0fB+PGfCf95rJC6TO7dopaFvAg=="], "@types/d3": ["@types/d3@7.4.3", "", { "dependencies": { "@types/d3-array": "*", "@types/d3-axis": "*", "@types/d3-brush": "*", "@types/d3-chord": "*", "@types/d3-color": "*", "@types/d3-contour": "*", "@types/d3-delaunay": "*", "@types/d3-dispatch": "*", "@types/d3-drag": "*", "@types/d3-dsv": "*", "@types/d3-ease": "*", "@types/d3-fetch": "*", "@types/d3-force": "*", "@types/d3-format": "*", "@types/d3-geo": "*", "@types/d3-hierarchy": "*", "@types/d3-interpolate": "*", "@types/d3-path": "*", "@types/d3-polygon": "*", "@types/d3-quadtree": "*", "@types/d3-random": "*", "@types/d3-scale": "*", "@types/d3-scale-chromatic": "*", "@types/d3-selection": "*", "@types/d3-shape": "*", "@types/d3-time": "*", "@types/d3-time-format": "*", "@types/d3-timer": "*", "@types/d3-transition": "*", "@types/d3-zoom": "*" } }, "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww=="], @@ -700,6 +739,8 @@ "@types/d3-zoom": ["@types/d3-zoom@3.0.8", "", { "dependencies": { "@types/d3-interpolate": "*", "@types/d3-selection": "*" } }, "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw=="], + "@types/deep-eql": ["@types/deep-eql@4.0.2", "", {}, "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw=="], + "@types/eslint": ["@types/eslint@9.6.1", "", { "dependencies": { "@types/estree": "*", "@types/json-schema": "*" } }, "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag=="], "@types/eslint-scope": ["@types/eslint-scope@3.7.7", "", { "dependencies": { "@types/eslint": "*", "@types/estree": "*" } }, "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg=="], @@ -732,6 +773,20 @@ "@upsetjs/venn.js": ["@upsetjs/venn.js@2.0.0", "", { "optionalDependencies": { "d3-selection": "^3.0.0", "d3-transition": "^3.0.1" } }, "sha512-WbBhLrooyePuQ1VZxrJjtLvTc4NVfpOyKx0sKqioq9bX1C1m7Jgykkn8gLrtwumBioXIqam8DLxp88Adbue6Hw=="], + "@vitest/expect": ["@vitest/expect@4.1.10", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", "@vitest/spy": "4.1.10", "@vitest/utils": "4.1.10", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" } }, "sha512-YsCn+qAk1GWjQOWFEsEcL2gNQ0zmVmQu3T03qP6UyjhtmdtwtbuI+DASn/7iQB3HGTXkdBwGddzxPlmiql5vlA=="], + + "@vitest/mocker": ["@vitest/mocker@4.1.10", "", { "dependencies": { "@vitest/spy": "4.1.10", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, "peerDependencies": { "msw": "^2.4.9", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "optionalPeers": ["msw", "vite"] }, "sha512-v0xaezt+DKEmKfaxg133ldzADrwLGd7Ze1MfQQTYfvs8OqZIwbxyxaYURivwV7sWy5fqn3rH5uOrSp07bp44Ow=="], + + "@vitest/pretty-format": ["@vitest/pretty-format@4.1.10", "", { "dependencies": { "tinyrainbow": "^3.1.0" } }, "sha512-W1HsjSH4MXQ9YfmmhLAoIYf1HRfekQCGngeIgcei6MP5QQGWUe0gkopdZQaVCFO+JDJMrAJGwa5pRpNpvy4P8Q=="], + + "@vitest/runner": ["@vitest/runner@4.1.10", "", { "dependencies": { "@vitest/utils": "4.1.10", "pathe": "^2.0.3" } }, "sha512-IKI6kpIH+LmpROplyLwBBaCfMgOZOMsygVa6BARD6ahA04VRuJSa6OaVG7kRvSEMD870Vd91rSSw0eegtWyLGg=="], + + "@vitest/snapshot": ["@vitest/snapshot@4.1.10", "", { "dependencies": { "@vitest/pretty-format": "4.1.10", "@vitest/utils": "4.1.10", "magic-string": "^0.30.21", "pathe": "^2.0.3" } }, "sha512-xRkfOT1qpTAi/Ti4Y1LtfRc3kEuqxGw59eN2jN9pRWMtS/XDevekhcFSqvQqjUNGksfjMJu3Y+oJ+4Ypn2OaJw=="], + + "@vitest/spy": ["@vitest/spy@4.1.10", "", {}, "sha512-PLf/Ugvoq5wO/b4rwYCR1h2PSIdXz7wnkQFMiUpLdtM7l6pqVFcQIBEHyT1+l+cj7mNwAfZHzqXqDyjvOuwbDw=="], + + "@vitest/utils": ["@vitest/utils@4.1.10", "", { "dependencies": { "@vitest/pretty-format": "4.1.10", "convert-source-map": "^2.0.0", "tinyrainbow": "^3.1.0" } }, "sha512-fy9am/HWxbaGt/Sawrp90vt6Y6jQwf1RX77cz3uwoJwJVMli/e1IEwRPnMNJ7vKfPTwo0diXifkpPvwH9v7nGA=="], + "@vscode/l10n": ["@vscode/l10n@0.0.18", "", {}, "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ=="], "@webassemblyjs/ast": ["@webassemblyjs/ast@1.14.1", "", { "dependencies": { "@webassemblyjs/helper-numbers": "1.13.2", "@webassemblyjs/helper-wasm-bytecode": "1.13.2" } }, "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ=="], @@ -1280,6 +1335,8 @@ "estraverse": ["estraverse@4.3.0", "", {}, "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="], + "estree-walker": ["estree-walker@3.0.3", "", { "dependencies": { "@types/estree": "^1.0.0" } }, "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g=="], + "esutils": ["esutils@2.0.3", "", {}, "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="], "etag": ["etag@1.8.1", "", {}, "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="], @@ -1290,6 +1347,8 @@ "exit": ["exit@0.1.2", "", {}, "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="], + "expect-type": ["expect-type@1.4.0", "", {}, "sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA=="], + "exponential-backoff": ["exponential-backoff@3.1.3", "", {}, "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA=="], "express": ["express@4.22.2", "", { "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "~1.20.5", "content-disposition": "~0.5.4", "content-type": "~1.0.4", "cookie": "~0.7.1", "cookie-signature": "~1.0.6", "debug": "2.6.9", "depd": "2.0.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "finalhandler": "~1.3.1", "fresh": "~0.5.2", "http-errors": "~2.0.0", "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "~2.4.1", "parseurl": "~1.3.3", "path-to-regexp": "~0.1.12", "proxy-addr": "~2.0.7", "qs": "~6.15.1", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "~0.19.0", "serve-static": "~1.16.2", "setprototypeof": "1.2.0", "statuses": "~2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" } }, "sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q=="], @@ -1576,6 +1635,30 @@ "lie": ["lie@3.3.0", "", { "dependencies": { "immediate": "~3.0.5" } }, "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ=="], + "lightningcss": ["lightningcss@1.33.0", "", { "dependencies": { "detect-libc": "^2.0.3" }, "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" } }, "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA=="], + + "lightningcss-android-arm64": ["lightningcss-android-arm64@1.33.0", "", { "os": "android", "cpu": "arm64" }, "sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg=="], + + "lightningcss-darwin-arm64": ["lightningcss-darwin-arm64@1.33.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg=="], + + "lightningcss-darwin-x64": ["lightningcss-darwin-x64@1.33.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ=="], + + "lightningcss-freebsd-x64": ["lightningcss-freebsd-x64@1.33.0", "", { "os": "freebsd", "cpu": "x64" }, "sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg=="], + + "lightningcss-linux-arm-gnueabihf": ["lightningcss-linux-arm-gnueabihf@1.33.0", "", { "os": "linux", "cpu": "arm" }, "sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ=="], + + "lightningcss-linux-arm64-gnu": ["lightningcss-linux-arm64-gnu@1.33.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg=="], + + "lightningcss-linux-arm64-musl": ["lightningcss-linux-arm64-musl@1.33.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ=="], + + "lightningcss-linux-x64-gnu": ["lightningcss-linux-x64-gnu@1.33.0", "", { "os": "linux", "cpu": "x64" }, "sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg=="], + + "lightningcss-linux-x64-musl": ["lightningcss-linux-x64-musl@1.33.0", "", { "os": "linux", "cpu": "x64" }, "sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw=="], + + "lightningcss-win32-arm64-msvc": ["lightningcss-win32-arm64-msvc@1.33.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA=="], + + "lightningcss-win32-x64-msvc": ["lightningcss-win32-x64-msvc@1.33.0", "", { "os": "win32", "cpu": "x64" }, "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA=="], + "lines-and-columns": ["lines-and-columns@1.2.4", "", {}, "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="], "linkify-it": ["linkify-it@5.0.1", "", { "dependencies": { "uc.micro": "^2.0.0" } }, "sha512-wVoTjP4Q6R0NW5hiZkVJaFZPWgtXfoGF+6LucL3/FtiNjmcHhYjEr5f1Kqjirc1nBW07J/ZuRFumqr2oqccEWg=="], @@ -1614,6 +1697,8 @@ "macos-release": ["macos-release@2.5.1", "", {}, "sha512-DXqXhEM7gW59OjZO8NIjBCz9AQ1BEMrfiOAl4AYByHCtVHRF4KoGNO8mqQeM8lRCtQe/UnJ4imO/d2HdkKsd+A=="], + "magic-string": ["magic-string@0.30.21", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="], + "make-dir": ["make-dir@3.1.0", "", { "dependencies": { "semver": "^6.0.0" } }, "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="], "make-fetch-happen": ["make-fetch-happen@15.0.5", "", { "dependencies": { "@gar/promise-retry": "^1.0.0", "@npmcli/agent": "^4.0.0", "@npmcli/redact": "^4.0.0", "cacache": "^20.0.1", "http-cache-semantics": "^4.1.1", "minipass": "^7.0.2", "minipass-fetch": "^5.0.0", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "negotiator": "^1.0.0", "proc-log": "^6.0.0", "ssri": "^13.0.0" } }, "sha512-uCbIa8jWWmQZt4dSnEStkVC6gdakiinAm4PiGsywIkguF0eWMdcjDz0ECYhUolFU3pFLOev9VNPCEygydXnddg=="], @@ -1960,6 +2045,8 @@ "robust-predicates": ["robust-predicates@3.0.2", "", {}, "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="], + "rolldown": ["rolldown@1.2.1", "", { "dependencies": { "@oxc-project/types": "=0.142.0", "@rolldown/pluginutils": "^1.0.0" }, "optionalDependencies": { "@rolldown/binding-android-arm64": "1.2.1", "@rolldown/binding-darwin-arm64": "1.2.1", "@rolldown/binding-darwin-x64": "1.2.1", "@rolldown/binding-freebsd-x64": "1.2.1", "@rolldown/binding-linux-arm-gnueabihf": "1.2.1", "@rolldown/binding-linux-arm64-gnu": "1.2.1", "@rolldown/binding-linux-arm64-musl": "1.2.1", "@rolldown/binding-linux-ppc64-gnu": "1.2.1", "@rolldown/binding-linux-s390x-gnu": "1.2.1", "@rolldown/binding-linux-x64-gnu": "1.2.1", "@rolldown/binding-linux-x64-musl": "1.2.1", "@rolldown/binding-openharmony-arm64": "1.2.1", "@rolldown/binding-wasm32-wasi": "1.2.1", "@rolldown/binding-win32-arm64-msvc": "1.2.1", "@rolldown/binding-win32-x64-msvc": "1.2.1" }, "bin": { "rolldown": "./bin/cli.mjs" } }, "sha512-4FKJhg8d3OiyQOA6Q1Q0hoFFpW9/OoX+VsHzpECsdsIZoOArrAK90gl59YK/Z+gnDel45bgJZK03ozH/9bCqEw=="], + "roughjs": ["roughjs@4.6.6", "", { "dependencies": { "hachure-fill": "^0.5.2", "path-data-parser": "^0.1.0", "points-on-curve": "^0.2.0", "points-on-path": "^0.2.1" } }, "sha512-ZUz/69+SYpFN/g/lUlo2FXcIjRkSu3nDarreVdGGndHEBJ6cXPdKguS8JGxwj5HA5xIbVKSmLgr5b3AWxtRfvQ=="], "run-async": ["run-async@2.4.1", "", {}, "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="], @@ -2010,6 +2097,8 @@ "side-channel-weakmap": ["side-channel-weakmap@1.0.2", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.5", "object-inspect": "^1.13.3", "side-channel-map": "^1.0.1" } }, "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A=="], + "siginfo": ["siginfo@2.0.0", "", {}, "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g=="], + "signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="], "sigstore": ["sigstore@4.1.0", "", { "dependencies": { "@sigstore/bundle": "^4.0.0", "@sigstore/core": "^3.1.0", "@sigstore/protobuf-specs": "^0.5.0", "@sigstore/sign": "^4.1.0", "@sigstore/tuf": "^4.0.1", "@sigstore/verify": "^3.1.0" } }, "sha512-/fUgUhYghuLzVT/gaJoeVehLCgZiUxPCPMcyVNY0lIf/cTCz58K/WTI7PefDarXxp9nUKpEwg1yyz3eSBMTtgA=="], @@ -2042,8 +2131,12 @@ "ssri": ["ssri@13.0.1", "", { "dependencies": { "minipass": "^7.0.3" } }, "sha512-QUiRf1+u9wPTL/76GTYlKttDEBWV1ga9ZXW8BG6kfdeyyM8LGPix9gROyg9V2+P0xNyF3X2Go526xKFdMZrHSQ=="], + "stackback": ["stackback@0.0.2", "", {}, "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw=="], + "statuses": ["statuses@2.0.2", "", {}, "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw=="], + "std-env": ["std-env@4.2.0", "", {}, "sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw=="], + "string-argv": ["string-argv@0.3.2", "", {}, "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q=="], "string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="], @@ -2086,10 +2179,14 @@ "through": ["through@2.3.8", "", {}, "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="], + "tinybench": ["tinybench@2.9.0", "", {}, "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg=="], + "tinyexec": ["tinyexec@1.0.4", "", {}, "sha512-u9r3uZC0bdpGOXtlxUIdwf9pkmvhqJdrVCH9fapQtgy/OeTTMZ1nqH7agtvEfmGui6e1XxjcdrlxvxJvc3sMqw=="], "tinyglobby": ["tinyglobby@0.2.16", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg=="], + "tinyrainbow": ["tinyrainbow@3.1.1", "", {}, "sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw=="], + "tmp": ["tmp@0.2.5", "", {}, "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow=="], "to-readable-stream": ["to-readable-stream@1.0.0", "", {}, "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="], @@ -2186,6 +2283,10 @@ "verror": ["verror@1.10.0", "", { "dependencies": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", "extsprintf": "^1.2.0" } }, "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="], + "vite": ["vite@8.2.0", "", { "dependencies": { "lightningcss": "^1.33.0", "picomatch": "^4.0.5", "postcss": "^8.5.23", "rolldown": "~1.2.0", "tinyglobby": "^0.2.17" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "@vitejs/devtools": "^0.4.0", "esbuild": "^0.27.0 || ^0.28.0", "jiti": ">=1.21.0", "less": "^4.0.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "@vitejs/devtools", "esbuild", "jiti", "less", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-pn+CFpM0lwDeKwmOq1ZaBK/9sjorZcgqxki6MbY/jPEVd9vichIlmlD4HmQ5wdP5EgqQCFRaACBxMC7uEGc6lQ=="], + + "vitest": ["vitest@4.1.10", "", { "dependencies": { "@vitest/expect": "4.1.10", "@vitest/mocker": "4.1.10", "@vitest/pretty-format": "4.1.10", "@vitest/runner": "4.1.10", "@vitest/snapshot": "4.1.10", "@vitest/spy": "4.1.10", "@vitest/utils": "4.1.10", "es-module-lexer": "^2.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", "obug": "^2.1.1", "pathe": "^2.0.3", "picomatch": "^4.0.3", "std-env": "^4.0.0-rc.1", "tinybench": "^2.9.0", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", "tinyrainbow": "^3.1.0", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0", "why-is-node-running": "^2.3.0" }, "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.10", "@vitest/browser-preview": "4.1.10", "@vitest/browser-webdriverio": "4.1.10", "@vitest/coverage-istanbul": "4.1.10", "@vitest/coverage-v8": "4.1.10", "@vitest/ui": "4.1.10", "happy-dom": "*", "jsdom": "*" }, "optionalPeers": ["@edge-runtime/vm", "@opentelemetry/api", "@types/node", "@vitest/browser-playwright", "@vitest/browser-preview", "@vitest/browser-webdriverio", "@vitest/coverage-istanbul", "@vitest/coverage-v8", "@vitest/ui", "happy-dom", "jsdom"], "bin": { "vitest": "./vitest.mjs" } }, "sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw=="], + "vscode-css-languageservice": ["vscode-css-languageservice@6.3.10", "", { "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "3.17.5", "vscode-uri": "^3.1.0" } }, "sha512-eq5N9Er3fC4vA9zd9EFhyBG90wtCCuXgRSpAndaOgXMh1Wgep5lBgRIeDgjZBW9pa+332yC9+49cZMW8jcL3MA=="], "vscode-html-languageservice": ["vscode-html-languageservice@5.6.2", "", { "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "^3.17.5", "vscode-uri": "^3.1.0" } }, "sha512-ulCrSnFnfQ16YzvwnYUgEbUEl/ZG7u2eV27YhvLObSHKkb8fw1Z9cgsnUwjTEeDIdJDoTDTDpxuhQwoenoLNMg=="], @@ -2216,6 +2317,8 @@ "which": ["which@6.0.1", "", { "dependencies": { "isexe": "^4.0.0" }, "bin": { "node-which": "bin/which.js" } }, "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg=="], + "why-is-node-running": ["why-is-node-running@2.3.0", "", { "dependencies": { "siginfo": "^2.0.0", "stackback": "0.0.2" }, "bin": { "why-is-node-running": "cli.js" } }, "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w=="], + "wide-align": ["wide-align@1.1.5", "", { "dependencies": { "string-width": "^1.0.2 || 2 || 3 || 4" } }, "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="], "widest-line": ["widest-line@3.1.0", "", { "dependencies": { "string-width": "^4.0.0" } }, "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="], @@ -2342,8 +2445,18 @@ "@npmcli/package-json/spdx-expression-parse": ["spdx-expression-parse@4.0.0", "", { "dependencies": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" } }, "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ=="], + "@rolldown/binding-wasm32-wasi/@emnapi/core": ["@emnapi/core@2.0.0-alpha.3", "", { "dependencies": { "@emnapi/wasi-threads": "2.0.1", "tslib": "^2.4.0" } }, "sha512-AZypUeJ/yByuxyS7BlSNRDOMLMlROYtjYdIAuBmJssVz1UJDSeYxLrdizhXCFYhedC5bqd/ASy8EuNXbVVXp9g=="], + + "@rolldown/binding-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@2.0.0-alpha.3", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-hFPAhMUjJD9BSyCANEISPOogeXC9Zo9ZQl7L6vKnaVsMkCtzznaW/naYypeyl0Gv5rYfWYsZbpixTMpjDJzQeA=="], + + "@rolldown/binding-wasm32-wasi/@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.2.2", "", { "dependencies": { "@tybys/wasm-util": "^0.10.3" }, "peerDependencies": { "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.3", "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.3" } }, "sha512-JfB4kuJQjaoHuCTseIINHtHWeJnvgEcxjwA5t/Y00ZgaOO1Crz3fjT/p8kT28zA/Caz7oiUMn3d6H2yOVCVwuw=="], + "@tufjs/models/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], + "@types/chai/assertion-error": ["assertion-error@2.0.1", "", {}, "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA=="], + + "@vitest/expect/chai": ["chai@6.2.2", "", {}, "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg=="], + "accepts/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], "accepts/negotiator": ["negotiator@0.6.3", "", {}, "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="], @@ -2488,6 +2601,8 @@ "jsprim/extsprintf": ["extsprintf@1.3.0", "", {}, "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="], + "lightningcss/detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="], + "make-dir/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], "make-fetch-happen/negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="], @@ -2584,6 +2699,12 @@ "verror/core-util-is": ["core-util-is@1.0.2", "", {}, "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="], + "vite/picomatch": ["picomatch@4.0.5", "", {}, "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A=="], + + "vite/postcss": ["postcss@8.5.25", "", { "dependencies": { "nanoid": "^3.3.16", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw=="], + + "vite/tinyglobby": ["tinyglobby@0.2.17", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g=="], + "webpack/acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="], "webpack/browserslist": ["browserslist@4.28.1", "", { "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", "electron-to-chromium": "^1.5.263", "node-releases": "^2.0.27", "update-browserslist-db": "^1.2.0" }, "bin": { "browserslist": "cli.js" } }, "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA=="], @@ -2684,6 +2805,10 @@ "@npmcli/package-json/glob/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], + "@rolldown/binding-wasm32-wasi/@emnapi/core/@emnapi/wasi-threads": ["@emnapi/wasi-threads@2.0.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9DsSk+o5NBX0CCJT8s0EROGSGxjR/tKu6aBTaVyq+SjAEQH4XcdcRxPBRzsBLizTTJ49MJjF+jgu3qnO9GLQcQ=="], + + "@rolldown/binding-wasm32-wasi/@napi-rs/wasm-runtime/@tybys/wasm-util": ["@tybys/wasm-util@0.10.3", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg=="], + "@tufjs/models/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="], "accepts/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], @@ -2808,6 +2933,8 @@ "type-is/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], + "vite/postcss/nanoid": ["nanoid@3.3.16", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q=="], + "webpack/browserslist/baseline-browser-mapping": ["baseline-browser-mapping@2.9.13", "", { "bin": { "baseline-browser-mapping": "dist/cli.js" } }, "sha512-WhtvB2NG2wjr04+h77sg3klAIwrgOqnjS49GGudnUPGFFgg7G17y7Qecqp+2Dr5kUDxNRBca0SK7cG8JwzkWDQ=="], "webpack/browserslist/caniuse-lite": ["caniuse-lite@1.0.30001763", "", {}, "sha512-mh/dGtq56uN98LlNX9qdbKnzINhX0QzhiWBFEkFfsFO4QyCvL8YegrJAazCwXIeqkIob8BlZPGM3xdnY+sgmvQ=="], diff --git a/src/cm/scrollPastEnd.ts b/src/cm/scrollPastEnd.ts index 057c3cff7a..65b8b7819a 100644 --- a/src/cm/scrollPastEnd.ts +++ b/src/cm/scrollPastEnd.ts @@ -1,6 +1,25 @@ import { type Extension } from "@codemirror/state"; import { EditorView, ViewPlugin, type ViewUpdate } from "@codemirror/view"; +/** + * Adds space after the longest line so unwrapped text can scroll away from the + * right edge of the viewport. CodeMirror's line-wrapping class is placed on the + * content element, which lets the same extension disable the extra width when + * wrapping is enabled. + */ +export function horizontalScrollPastEnd(distance: number): Extension { + const width = Number.isFinite(distance) + ? Math.max(0, Math.round(distance)) + : 0; + if (width === 0) return []; + + return EditorView.theme({ + ".cm-content:not(.cm-lineWrapping)": { + paddingRight: `${width}px`, + }, + }); +} + /** * Returns an extension that adds a customizable bottom margin to the editor. * @param factor The scaling factor for the margin (e.g., 0.25 for small, 0.5 for medium, 1.0 for full). diff --git a/src/lang/ar-ye.json b/src/lang/ar-ye.json index 77d0cf9575..70ca153df6 100644 --- a/src/lang/ar-ye.json +++ b/src/lang/ar-ye.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/be-by.json b/src/lang/be-by.json index 7c12976c30..98f392e34e 100644 --- a/src/lang/be-by.json +++ b/src/lang/be-by.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/bn-bd.json b/src/lang/bn-bd.json index f9ab374f3d..36323c674a 100644 --- a/src/lang/bn-bd.json +++ b/src/lang/bn-bd.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/cs-cz.json b/src/lang/cs-cz.json index 4021728586..52e5bbb078 100644 --- a/src/lang/cs-cz.json +++ b/src/lang/cs-cz.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/de-de.json b/src/lang/de-de.json index 8e1dc29646..d1fb0ed422 100644 --- a/src/lang/de-de.json +++ b/src/lang/de-de.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/en-us.json b/src/lang/en-us.json index 33a19d29ec..fa275a3766 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -833,5 +833,7 @@ "diff sec": "{sec}s ago", "command": "Command", "managed": "Managed", - "acode service": "Acode Service" + "acode service": "Acode Service", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/es-sv.json b/src/lang/es-sv.json index 3672aac66e..8c3108cb68 100644 --- a/src/lang/es-sv.json +++ b/src/lang/es-sv.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/fr-fr.json b/src/lang/fr-fr.json index 16616d1da8..f4edc7a62f 100644 --- a/src/lang/fr-fr.json +++ b/src/lang/fr-fr.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/he-il.json b/src/lang/he-il.json index d956ab77f9..9d67df02ca 100644 --- a/src/lang/he-il.json +++ b/src/lang/he-il.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/hi-in.json b/src/lang/hi-in.json index 4528b0c059..794624bad6 100644 --- a/src/lang/hi-in.json +++ b/src/lang/hi-in.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index bead63e01b..2a4d4ae4c4 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Az xterm görgetősávjának megjelenítése a terminál mellett.", "terminal:show scrollbar": "Görgetősáv megjelenítése", "apply exclusions when copying": "Kizárások használata másoláskor", - "settings-info-app-use-file-operation-exclusions": "A kizárási mintáknak megfelelő fájlok és mappák kihagyása másoláskor és beillesztéskor." + "settings-info-app-use-file-operation-exclusions": "A kizárási mintáknak megfelelő fájlok és mappák kihagyása másoláskor és beillesztéskor.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/id-id.json b/src/lang/id-id.json index 10c860a652..e84a2db5db 100644 --- a/src/lang/id-id.json +++ b/src/lang/id-id.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/index.d.ts b/src/lang/index.d.ts index 0302a017f9..076f096961 100644 --- a/src/lang/index.d.ts +++ b/src/lang/index.d.ts @@ -837,6 +837,8 @@ declare type LangStrings = { "command": string; "managed": string; "acode service": string; + "horizontal scroll margin": string; + "settings-info-horizontal-scroll-margin": string; }; declare var strings: LangStrings; diff --git a/src/lang/ir-fa.json b/src/lang/ir-fa.json index 173b2625d5..b19d8c385d 100644 --- a/src/lang/ir-fa.json +++ b/src/lang/ir-fa.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/it-it.json b/src/lang/it-it.json index 7b6ecdc1e1..dbb883ce3c 100644 --- a/src/lang/it-it.json +++ b/src/lang/it-it.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/ja-jp.json b/src/lang/ja-jp.json index 5d2152ad37..ddd1e5b633 100644 --- a/src/lang/ja-jp.json +++ b/src/lang/ja-jp.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/ko-kr.json b/src/lang/ko-kr.json index 978e7ac4d4..20ae0a3146 100644 --- a/src/lang/ko-kr.json +++ b/src/lang/ko-kr.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/ml-in.json b/src/lang/ml-in.json index 8424f45d15..bcc5171dcf 100644 --- a/src/lang/ml-in.json +++ b/src/lang/ml-in.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/mm-unicode.json b/src/lang/mm-unicode.json index 0bbcd285fe..00262a2a54 100644 --- a/src/lang/mm-unicode.json +++ b/src/lang/mm-unicode.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/mm-zawgyi.json b/src/lang/mm-zawgyi.json index 6ae58e5d73..84cf0cfc9f 100644 --- a/src/lang/mm-zawgyi.json +++ b/src/lang/mm-zawgyi.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/pl-pl.json b/src/lang/pl-pl.json index 71f0c876e4..1634787b00 100644 --- a/src/lang/pl-pl.json +++ b/src/lang/pl-pl.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/pt-br.json b/src/lang/pt-br.json index d47cf936db..9f6552f768 100644 --- a/src/lang/pt-br.json +++ b/src/lang/pt-br.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/pu-in.json b/src/lang/pu-in.json index 5f43ef31fa..0cdbc0b314 100644 --- a/src/lang/pu-in.json +++ b/src/lang/pu-in.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/ru-ru.json b/src/lang/ru-ru.json index 6e24ed9e9b..4095204dc4 100644 --- a/src/lang/ru-ru.json +++ b/src/lang/ru-ru.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/tl-ph.json b/src/lang/tl-ph.json index 305b015043..509640d0c0 100644 --- a/src/lang/tl-ph.json +++ b/src/lang/tl-ph.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/tr-tr.json b/src/lang/tr-tr.json index f49180969d..327b4556db 100644 --- a/src/lang/tr-tr.json +++ b/src/lang/tr-tr.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/uk-ua.json b/src/lang/uk-ua.json index 2801b4634c..1f14b264af 100644 --- a/src/lang/uk-ua.json +++ b/src/lang/uk-ua.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/uz-uz.json b/src/lang/uz-uz.json index f6ac1dbf08..eec005214b 100644 --- a/src/lang/uz-uz.json +++ b/src/lang/uz-uz.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/vi-vn.json b/src/lang/vi-vn.json index 47f030ca3e..4c992e2502 100644 --- a/src/lang/vi-vn.json +++ b/src/lang/vi-vn.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index 72fdd86287..3a57d33e21 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json index 4ad73928d2..29acc3116a 100644 --- a/src/lang/zh-hant.json +++ b/src/lang/zh-hant.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index 581198caa8..734c10caf0 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -833,5 +833,7 @@ "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", "terminal:show scrollbar": "Show Scrollbar", "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations." + "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "horizontal scroll margin": "Horizontal scroll margin", + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js index 6c923f62a0..a3be985c60 100644 --- a/src/lib/editorManager.js +++ b/src/lib/editorManager.js @@ -76,7 +76,7 @@ import indentGuides from "cm/indentGuides"; import { lineBreakMarker } from "cm/lineBreakMarker"; import quickToolsModifierInput from "cm/quickToolsModifierInput"; import rainbowBrackets, { getRainbowBracketColors } from "cm/rainbowBrackets"; -import scrollPastEndCustom from "cm/scrollPastEnd"; +import scrollPastEndCustom, { horizontalScrollPastEnd } from "cm/scrollPastEnd"; import { isMultiCursorSelectionActive as resolveMultiCursorSelectionActive, isShiftSelectionActive as resolveShiftSelectionActive, @@ -1025,7 +1025,10 @@ async function EditorManager($header, $body) { } function makeWrapExtension() { - return appSettings?.value?.textWrap ? EditorView.lineWrapping : []; + if (appSettings?.value?.textWrap) return EditorView.lineWrapping; + return horizontalScrollPastEnd( + Number(appSettings?.value?.leftMargin ?? 50), + ); } function makeLineNumberExtension() { @@ -3400,6 +3403,10 @@ async function EditorManager($header, $body) { applyOptions(["textWrap"]); }); + appSettings.on("update:leftMargin", function () { + applyOptions(["textWrap"]); + }); + function updateEditorIndentationSettings() { applyOptions(["softTab", "tabSize"]); } @@ -4182,12 +4189,7 @@ async function EditorManager($header, $body) { const touchSelectionController = pane?.touchSelectionController; if (!pane || !editor) return; const settings = appSettings.value; - const { leftMargin, textWrap, colorPreview, fontSize, lineHeight } = - appSettings.value; - const scrollMarginTop = 0; - const scrollMarginLeft = 0; - const scrollMarginRight = textWrap ? 0 : leftMargin; - const scrollMarginBottom = 0; + const { colorPreview, fontSize, lineHeight } = appSettings.value; let scrollTimeout; let scrollSyncRaf = 0; @@ -5067,12 +5069,7 @@ async function EditorManager($header, $body) { const total = view.scrollDOM.scrollWidth || 0; const viewport = view.scrollDOM.clientWidth || 0; - let width = Math.max(total - viewport, 0); - if (!appSettings.value.textWrap) { - const { leftMargin = 0 } = appSettings.value; - width += leftMargin || 0; - } - return width; + return Math.max(total - viewport, 0); } catch (_) { return 0; } diff --git a/src/settings/scrollSettings.js b/src/settings/scrollSettings.js index 2fcdcf73f5..dbb72f4d30 100644 --- a/src/settings/scrollSettings.js +++ b/src/settings/scrollSettings.js @@ -67,6 +67,23 @@ export default function scrollSettings() { ["full", strings.full], ], }, + { + key: "leftMargin", + text: strings["horizontal scroll margin"], + value: values.leftMargin ?? 50, + valueText: (size) => `${size}px`, + prompt: strings["horizontal scroll margin"], + promptType: "number", + promptOptions: { + required: true, + test(value) { + if (!/^\d+$/.test(String(value).trim())) return false; + const size = Number(value); + return Number.isSafeInteger(size) && size >= 0; + }, + }, + info: strings["settings-info-horizontal-scroll-margin"], + }, ]; return settingsPage(title, items, callback, undefined, { @@ -80,7 +97,7 @@ export default function scrollSettings() { function callback(key, value) { appSettings.update({ - [key]: value, + [key]: key === "leftMargin" ? Number(value) : value, }); } } diff --git a/tests/unit/scrollPastEnd.test.js b/tests/unit/scrollPastEnd.test.js new file mode 100644 index 0000000000..9fd708ba6c --- /dev/null +++ b/tests/unit/scrollPastEnd.test.js @@ -0,0 +1,25 @@ +import { describe, expect, it } from "vitest"; +import { horizontalScrollPastEnd } from "cm/scrollPastEnd"; + +function themeRules(extension) { + return extension + .flatMap((part) => part?.value?.rules ?? []) + .join("\n"); +} + +describe("horizontal scroll past end", () => { + it("adds right-side space only to unwrapped editor content", () => { + const rules = themeRules(horizontalScrollPastEnd(50)); + + expect(rules).toContain(".cm-content:not(.cm-lineWrapping)"); + expect(rules).toContain("padding-right: 50px"); + }); + + it("normalizes invalid distances without adding a theme", () => { + expect(horizontalScrollPastEnd(0)).toEqual([]); + expect(horizontalScrollPastEnd(Number.NaN)).toEqual([]); + expect(themeRules(horizontalScrollPastEnd(12.6))).toContain( + "padding-right: 13px", + ); + }); +}); From 516744592001e67cbce69e89ad70eefab3946e3d Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 2 Aug 2026 14:07:12 +0530 Subject: [PATCH 026/195] fix(quick-tools): add visible close button to search when toggler is off (#2570) * fix(quick-tools): add visible close button to search when toggler is off * fix --- src/components/quickTools/footer.js | 1 + src/components/quickTools/style.scss | 11 +++++++++ src/handlers/quickTools.js | 34 ++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/src/components/quickTools/footer.js b/src/components/quickTools/footer.js index f95eedd41b..fcb133035d 100644 --- a/src/components/quickTools/footer.js +++ b/src/components/quickTools/footer.js @@ -45,6 +45,7 @@ export const SearchRow1 = ({ inputRef }) => ( +
    ); diff --git a/src/components/quickTools/style.scss b/src/components/quickTools/style.scss index 1a28e83b21..e14616ae34 100644 --- a/src/components/quickTools/style.scss +++ b/src/components/quickTools/style.scss @@ -1,6 +1,17 @@ @use '../../styles/mixins.scss'; #quick-tools { + #search_row1 { + [data-id="close"] { + display: none; + flex: 0 0 40px; + } + + &.inline-close [data-id="close"] { + display: inline-flex; + } + } + .icon.click:not([disabled]) { @include mixins.active-icon; transition: all 0.3s ease-in-out; diff --git a/src/handlers/quickTools.js b/src/handlers/quickTools.js index f1cbf27fc1..aff8f9009e 100644 --- a/src/handlers/quickTools.js +++ b/src/handlers/quickTools.js @@ -33,6 +33,8 @@ let input; /** @type {number} */ let quickToolUsedTimeout = null; let activeSearchState = null; +/** @type {MutationObserver | null} */ +let searchCloseVisibilityObserver = null; const state = { shift: false, @@ -438,6 +440,7 @@ function toggleSearch() { activeSearchState = { className, content: $content, footerHeight }; $toggler.className = "floating icon clearclose"; + startSearchCloseVisibilitySync(); $footer.content = [$searchRow1, $searchRow2]; clearSearchQuickToolsState($content); setRefValue($searchInput, selectedText || ""); @@ -469,6 +472,7 @@ function toggleSearch() { content: $content, footerHeight, }; + stopSearchCloseVisibilitySync(); clearSearchQuickToolsState(restoreState.content); removeSearch(); clearQuickToolsButtonFeedback(restoreState.content); @@ -493,6 +497,36 @@ function toggleSearch() { $searchInput.focus(); } +function startSearchCloseVisibilitySync() { + stopSearchCloseVisibilitySync(); + syncSearchCloseVisibility(); + + const { $toggler } = quickTools; + searchCloseVisibilityObserver = new MutationObserver( + syncSearchCloseVisibility, + ); + searchCloseVisibilityObserver.observe(root, { childList: true }); + searchCloseVisibilityObserver.observe($toggler, { + attributes: true, + attributeFilter: ["class"], + }); +} + +function stopSearchCloseVisibilitySync() { + searchCloseVisibilityObserver?.disconnect(); + searchCloseVisibilityObserver = null; + quickTools.$searchRow1.classList.remove("inline-close"); +} + +function syncSearchCloseVisibility() { + const { $searchRow1, $toggler } = quickTools; + const hasVisibleFloatingClose = + appSettings.value.floatingButton && + $toggler.isConnected && + !$toggler.classList.contains("hide"); + $searchRow1.classList.toggle("inline-close", !hasVisibleFloatingClose); +} + function toggle() { // if search is active, remove it const searchBar = actionStack.get("search-bar"); From f9f10878610985c6c8c3725c4163888cefdd3b34 Mon Sep 17 00:00:00 2001 From: Launch Lee <80872691+LaunchLee@users.noreply.github.com> Date: Sun, 2 Aug 2026 18:48:27 +0800 Subject: [PATCH 027/195] Update zh-cn.json and zh-hant.json (#2571) --- src/lang/zh-cn.json | 48 +++++++++++++++++++++---------------------- src/lang/zh-hant.json | 48 +++++++++++++++++++++---------------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index 3a57d33e21..377aa0f004 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -812,28 +812,28 @@ "min plural": "{count} 分钟前", "settings-category-builtin-servers": "内置服务器", "settings-category-plugin-servers": "插件服务器", - "new name": "New name", - "enter new name": "Enter new name", - "code actions": "Code Actions", - "active processes": "Active Processes", - "total memory": "Total Memory", - "uptime": "Uptime", - "note": "Note", - "acode main process": "Acode main process", - "ppid parent": "PPID (Parent)", - "unknown": "Unknown", - "just started": "Just Started", - "diff days": "{days}d {hr}h ago", - "diff hr": "{hr}h {min}m ago", - "diff min": "{min}m {sec}s ago", - "diff sec": "{sec}s ago", - "command": "Command", - "managed": "Managed", - "acode service": "Acode Service", - "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", - "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "new name": "新名称", + "enter new name": "输入新名称", + "code actions": "代码操作", + "active processes": "活动进程", + "total memory": "总内存", + "uptime": "运行时间", + "note": "提示", + "acode main process": "Acode 主进程", + "ppid parent": "PPID (父进程)", + "unknown": "未知", + "just started": "刚刚启动", + "diff days": "{days}天 {hr}小时前", + "diff hr": "{hr}小时 {min}分钟前", + "diff min": "{min}分钟 {sec}秒前", + "diff sec": "{sec}秒前", + "command": "命令", + "managed": "已托管", + "acode service": "Acode 服务", + "info-terminal-show-scrollbar": "在终端旁边显示 xterm 滚动条。", + "terminal:show scrollbar": "显示滚动条", + "apply exclusions when copying": "复制时应用排除项", + "settings-info-app-use-file-operation-exclusions": "在复制和粘贴操作期间,跳过符合排除规则的文件和文件夹。", + "horizontal scroll margin": "水平滚动边距", + "settings-info-horizontal-scroll-margin": "在关闭自动换行时,为最长行的末尾添加空白区域。请输入任意非负整数的像素值。" } diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json index 29acc3116a..2e450d79c3 100644 --- a/src/lang/zh-hant.json +++ b/src/lang/zh-hant.json @@ -812,28 +812,28 @@ "min plural": "{count} 分鐘前", "settings-category-builtin-servers": "內建伺服器", "settings-category-plugin-servers": "插件伺服器", - "new name": "New name", - "enter new name": "Enter new name", - "code actions": "Code Actions", - "active processes": "Active Processes", - "total memory": "Total Memory", - "uptime": "Uptime", - "note": "Note", - "acode main process": "Acode main process", - "ppid parent": "PPID (Parent)", - "unknown": "Unknown", - "just started": "Just Started", - "diff days": "{days}d {hr}h ago", - "diff hr": "{hr}h {min}m ago", - "diff min": "{min}m {sec}s ago", - "diff sec": "{sec}s ago", - "command": "Command", - "managed": "Managed", - "acode service": "Acode Service", - "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", - "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "new name": "新名稱", + "enter new name": "輸入新名稱", + "code actions": "代碼操作", + "active processes": "活動進程", + "total memory": "總內存", + "uptime": "運行時間", + "note": "提示", + "acode main process": "Acode 主進程", + "ppid parent": "PPID (父進程)", + "unknown": "未知", + "just started": "剛剛啓動", + "diff days": "{days}天 {hr}小時前", + "diff hr": "{hr}小時 {min}分鐘前", + "diff min": "{min}分鐘 {sec}秒前", + "diff sec": "{sec}秒前", + "command": "命令", + "managed": "已託管", + "acode service": "Acode 服務", + "info-terminal-show-scrollbar": "在終端旁邊顯示 xterm 滾動條。", + "terminal:show scrollbar": "顯示滾動條", + "apply exclusions when copying": "複製時應用排除項", + "settings-info-app-use-file-operation-exclusions": "在複製和粘貼操作期間,跳過符合排除規則的文件和文件夾。", + "horizontal scroll margin": "水平滾動邊距", + "settings-info-horizontal-scroll-margin": "在關閉自動換行時,爲最長行的末尾添加空白區域。請輸入任意非負整數的像素值。" } From 7d780742231d291ee2cc9ac2e1200232886535ef Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 2 Aug 2026 19:56:53 +0530 Subject: [PATCH 028/195] fix: plugin page ui for keywords, note, badge (#2573) * fix: plugin page ui for keywords and note * make badge a bit nicer --- src/pages/plugin/plugin.scss | 210 +++++++++++++++++++++++++------- src/pages/plugin/plugin.view.js | 35 +++--- 2 files changed, 190 insertions(+), 55 deletions(-) diff --git a/src/pages/plugin/plugin.scss b/src/pages/plugin/plugin.scss index 7c79840f69..cf88e1b229 100644 --- a/src/pages/plugin/plugin.scss +++ b/src/pages/plugin/plugin.scss @@ -24,6 +24,8 @@ } .plugin-info { + min-width: 0; + .title-wrapper { display: flex; align-items: center; @@ -34,6 +36,7 @@ .plugin-name { font-size: 24px; margin-bottom: 0; + overflow-wrap: anywhere; } .source-indicator { @@ -76,6 +79,9 @@ display: inline-flex; align-items: center; gap: 4px; + min-width: 0; + max-width: 100%; + overflow-wrap: anywhere; vertical-align: middle; .icon { @@ -114,6 +120,7 @@ display: flex; align-items: center; gap: 4px; + min-width: 0; .metric-value { color: var(--primary-text-color); @@ -135,9 +142,32 @@ } } + .keywords { + display: flex; + flex-wrap: wrap; + gap: 6px; + margin-top: 14px; + + .keyword { + max-width: min(220px, 100%); + padding: 5px 9px; + overflow: hidden; + border: 1px solid var(--link-text-color); + border-color: color-mix(in srgb, var(--link-text-color) 25%, transparent); + border-radius: 999px; + background: var(--popup-background-color); + background: color-mix(in srgb, var(--link-text-color) 10%, transparent); + color: var(--link-text-color); + font-size: 12px; + line-height: 1.25; + text-overflow: ellipsis; + white-space: nowrap; + } + } + .legacy-editor-warning { display: inline-flex; - align-items: center; + align-items: baseline; gap: 6px; max-width: 100%; margin-top: 12px; @@ -153,22 +183,27 @@ flex: 0 0 auto; color: var(--error-text-color); font-size: 15px; + line-height: 1; } } } .action-buttons { - grid-column: 1/-1; display: flex; flex-wrap: wrap; + justify-content: flex-end; + align-items: flex-start; gap: 8px; + width: max-content; + max-width: min(260px, 30vw); - .info:not(.icon), .error { display: flex; + max-width: 100%; color: rgb(255, 185, 92); color: var(--error-text-color); align-items: center; + overflow-wrap: anywhere; a { color: inherit; @@ -176,16 +211,11 @@ } } - .info:not(.icon) { - color: inherit; - align-items: start; - text-align: left; - gap: 5px; - opacity: 0.8; - width: 100%; - } - .btn { + flex: 0 1 auto; + justify-content: center; + min-width: 112px; + min-height: 40px; padding: 8px 16px; border-radius: 6px; border: none; @@ -197,6 +227,10 @@ align-items: center; gap: 6px; width: fit-content; + max-width: 100%; + line-height: 1.2; + text-align: center; + overflow-wrap: anywhere; &:hover { transform: translateY(-1px); @@ -225,8 +259,44 @@ } } + .plugin-action-details { + grid-column: 2 / -1; + display: flex; + flex-wrap: wrap; + align-items: flex-start; + justify-content: flex-end; + gap: 8px 20px; + min-width: 0; + margin-top: -8px; + + .info:not(.icon) { + display: flex; + flex: 1 1 320px; + align-items: center; + gap: 8px; + min-width: 0; + color: inherit; + font-size: 0.8rem; + line-height: 1.4; + text-align: left; + opacity: 0.72; + + .icon { + flex: 0 0 auto; + display: inline-flex; + align-items: center; + justify-content: center; + width: 18px; + height: 18px; + font-size: 15px; + line-height: 1; + } + } + } + .more-info-small { - text-align: center; + flex: 0 0 auto; + text-align: right; font-style: italic; font-size: 0.8rem; opacity: 0.8; @@ -255,28 +325,6 @@ padding: 0 0 24px; #overview { - .keywords { - display: flex; - gap: 6px; - flex-wrap: wrap; - margin-top: 16px; - position: relative; - - .keyword { - background: var(--popup-background-color); - background: color-mix(in srgb, - var(--link-text-color) 10%, - transparent); - color: var(--link-text-color); - padding: 6px 10px; - border-radius: 12px; - font-size: 13px; - transition: all 0.2s; - border: 1px solid var(--link-text-color); - border: 1px solid color-mix(in srgb, var(--link-text-color) 25%, transparent); - } - } - pre { margin: 16px 0; border-radius: 8px; @@ -445,15 +493,26 @@ @media (max-width: 768px) { .plugin-header { + position: relative; grid-template-columns: 1fr; justify-items: center; text-align: center; } - .source-indicator { + .plugin-header .plugin-info .title-wrapper .source-indicator { position: absolute; - top: 20px; - right: 20px; + top: 52px; + inset-inline-start: calc(50% + 10px); + z-index: 1; + max-width: calc(50% - 18px); + box-sizing: border-box; + box-shadow: 0 2px 8px var(--box-shadow-color); + + span { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } } .title-wrapper, @@ -463,9 +522,35 @@ justify-content: center; } - .btn { - flex: 1; + .plugin-info { + width: 100%; + } + + .plugin-header .action-buttons { + grid-column: 1; justify-content: center; + width: min(100%, 420px); + max-width: none; + + .btn { + flex: 1 1 140px; + width: auto; + } + } + + .plugin-header .plugin-action-details { + grid-column: 1; + width: 100%; + margin-top: -4px; + + .info:not(.icon) { + flex-basis: 100%; + } + + .more-info-small { + width: 100%; + text-align: center; + } } .tabs { @@ -474,6 +559,49 @@ padding: 0 24px; } } + + @media (max-width: 420px) { + padding-inline: 16px; + + .plugin-header { + gap: 16px; + + .plugin-icon { + width: 72px; + height: 72px; + border-radius: 14px; + } + + .plugin-info { + .title-wrapper { + gap: 8px; + + .plugin-name { + width: 100%; + font-size: 22px; + overflow-wrap: anywhere; + } + + } + + .plugin-meta, + .metrics-row { + column-gap: 12px; + row-gap: 8px; + } + } + + .action-buttons .btn { + flex-basis: 100%; + } + } + + #plugin-tab .options { + margin-inline: -16px; + padding-inline: 8px; + font-size: 0.9rem; + } + } } .reviews-container { @@ -593,4 +721,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/pages/plugin/plugin.view.js b/src/pages/plugin/plugin.view.js index 10e7c76de4..f93bc64943 100644 --- a/src/pages/plugin/plugin.view.js +++ b/src/pages/plugin/plugin.view.js @@ -80,6 +80,7 @@ export default (props) => { if (votesUp || votesDown) { rating = `${Math.round((votesUp / (votesUp + votesDown)) * 100)}%`; } + const showPurchaseWarning = !helpers.shouldAllowExternalPurchase(); const formatUpdatedDate = (dateString) => { if (!dateString) return null; @@ -173,20 +174,33 @@ export default (props) => { ) : null} + {Array.isArray(keywords) && keywords.length ? ( +
    + {keywords.map((keyword) => ( + + {keyword} + + ))} +
    + ) : null} {showEditorSupportWarning ? ( ) : null}
    - {!helpers.shouldAllowExternalPurchase() && ( - - - {strings["iap-plugin-purchase-warning"]} - - )}
    - + {showPurchaseWarning || props.purchased ? ( +
    + {showPurchaseWarning ? ( + + + {strings["iap-plugin-purchase-warning"]} + + ) : null} + +
    + ) : null}
    @@ -202,13 +216,6 @@ export default (props) => {
    - {Array.isArray(keywords) && keywords.length ? ( -
    - {keywords.map((keyword) => ( - {keyword} - ))} -
    - ) : null}
    From a42e68224cdeed406b74fd28c56d5d266ee92609 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 2 Aug 2026 20:05:05 +0530 Subject: [PATCH 029/195] chore: v1.12.7 --- CHANGELOG.md | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++ config.xml | 2 +- package.json | 2 +- 3 files changed, 85 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19e2c81eb6..c1980ebb9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,88 @@ # Change Log +## v1.12.7 + +* fix: scroll shift when tab switching by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2329 +* Fixes several small querks and inconsistencies to improve UI/UX by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2331 +* feat: add setting to toggle emmet by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2332 +* feat: add a ui to manage running Terminal (Executor) processes by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2333 +* fix(settings): preserve scroll state and avoid full rerenders by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2348 +* fix: removed annoying terminal dialog by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/2349 +* Better regex by @Palloxin in https://github.com/Acode-Foundation/Acode/pull/2325 +* fix(lsp): hover tooltip code highlighting by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2353 +* fix(lsp): scope cache fallback by runtime provider by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2354 +* feat: dont invoke acode service when uninstalling terminal by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/2350 +* fix: run new files even if marked saved by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/2360 +* perf(settings): lazy load sub-settings pages to optimize load time by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2358 +* fix: ignore files to be treated as plugin in src/plugins by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/2362 +* feat: add setting to toggle `language package completion` by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2361 +* feat(performance): removed double memory usage when reading/writing text files by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/2359 +* feat: add language-mode plugin recommendation system by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2368 +* feat(keybind): add code folds keybinds by @UnschooledGamer in https://github.com/Acode-Foundation/Acode/pull/2369 +* fix(editor): apply plugin language modes after restore (for plugin modes) by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2375 +* fix: Use inline themed SVG for loader spinner by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/2379 +* fix: wait for plugin load before recommendation trigger by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2383 +* fix: don't check for app updates from github when app is from playstore by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2385 +* feat: improved ux by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/2382 +* fix: Fixes bug in settings UI by @claycuy in https://github.com/Acode-Foundation/Acode/pull/2388 +* feat: lazy load things which are low-risk from main by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2386 +* fix(quicktools): preserve editor focus during rapid taps and stale issue by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2408 +* feat: new 'SEL' Command for Quick Tools by @Elitex07 in https://github.com/Acode-Foundation/Acode/pull/2414 +* feat(ui): use motion for page, tab, switch and press gestures animation by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2406 +* refactor(core): centralize plugin unmount error boundary and fix console telemetry by @AuDevTist1C in https://github.com/Acode-Foundation/Acode/pull/2422 +* fix: language mode mapping to add maps for paths which doesnt exists by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2430 +* fix(editor): preserve restored tab editability while loading by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2431 +* fix(quicktools): prevent editor blur when tapping toolbar immediately after typing by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2432 +* feat: add native app auth code login flow by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/2440 +* feat: improve CodeMirror quick tools modifier support by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/2435 +* fix(security) critical security issue by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/2442 +* fix: skip recommendation for binary file by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2446 +* feat(editor): implement multi-pane split layout by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2416 +* fix: plugin page ui for big screen by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/2448 +* fix(editor): prevent styling loss flash on custom page tabs when splitting/closing panes by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2449 +* feat(lsp): group language servers into built-in, plugin, and custom categories by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2452 +* refactor(ui): improved toast and notification animations using motion by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2453 +* feat: added native crash handler by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/2450 +* feat: make the clear command behave as reset by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/2458 +* feat: Add hover and long press tooltips to quicktools items by @gahanad in https://github.com/Acode-Foundation/Acode/pull/2456 +* fix: add missing autoclosebracket keymap(paired bracket deletion) by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2472 +* fix: implement editor tab history navigation (#1819) by @Elitex07 in https://github.com/Acode-Foundation/Acode/pull/2459 +* fix(lsp): refresh installation status on the correct settings page by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2482 +* fix(editor): sync replacement untitled file state by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2483 +* feat: add cobalt editor theme by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2484 +* fix: zip project import by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/2473 +* chore: update the xtermjs to v6 and fix session creation by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2487 +* fix(editor): improve wrapped line indentation and keep text wrap off by default by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2507 +* fix(editor): prevent syntax highlight color flicker on state recreation (#2304) by @Elitex07 in https://github.com/Acode-Foundation/Acode/pull/2457 +* Make line commands aware of folded blocks by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2508 +* fix: move bashrc sourcing to bottom of initrc so bashrc can override … by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/2523 +* fix(settings): sync global search switch behavior and animation by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2527 +* refactor(editor): centralize CodeMirror commands and keybindings by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2516 +* feat(lsp): add document color chips with regex fallback by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2533 +* feat(lsp): add pull diagnostics and native TypeScript 7 by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2537 +* feat(lsp): add web worker language servers as defaults by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2531 +* fix: system theme by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/2524 +* feat(editor): add indentation folding for legacy modes(as fallback) by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2538 +* feat: add WebView Plugin API by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/2525 +* feat(files): move workspace indexing and search to native for saf/files by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2529 +* fix: upgrade tar to 7.5.19 (CVE-2026-59873) by @anupamme in https://github.com/Acode-Foundation/Acode/pull/2544 +* fix(fileBrowser): exclude non-selectable system utility tiles from batch selection operations by @AuDevTist1C in https://github.com/Acode-Foundation/Acode/pull/2545 +* refactor(file-browser): extract reusable deletion logic and abstract Termux URI validation by @AuDevTist1C in https://github.com/Acode-Foundation/Acode/pull/2548 +* feat(file-browser): integrate selection mode state with `actionStack` for back navigation by @AuDevTist1C in https://github.com/Acode-Foundation/Acode/pull/2546 +* feat(files): skip excluded paths during copy operations by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2555 +* fix: the processutils in ProcessUtils.java by @anupamme in https://github.com/Acode-Foundation/Acode/pull/2557 +* fix: sanitize input hints to prevent XSS by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2559 +* feat: proot debug toggle by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/2563 +* Improve recent dialog path readability by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2567 +* Fix CodeMirror theme colors and add Catppuccin variants by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2568 +* feat(editor): add configurable horizontal scroll margin to CodeMirror by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2569 +* fix(quick-tools): add visible close button to search when toggler is off by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2570 +* i18n: update Hungarian translations by @summoner001 in https://github.com/Acode-Foundation/Acode/pull/2207, https://github.com/Acode-Foundation/Acode/pull/2387, https://github.com/Acode-Foundation/Acode/pull/2429, https://github.com/Acode-Foundation/Acode/pull/2478, https://github.com/Acode-Foundation/Acode/pull/2485, https://github.com/Acode-Foundation/Acode/pull/2542, https://github.com/Acode-Foundation/Acode/pull/2558 +* i18n: update Indonesian translations and localization strings by @claycuy in https://github.com/Acode-Foundation/Acode/pull/2330, https://github.com/Acode-Foundation/Acode/pull/2372, https://github.com/Acode-Foundation/Acode/pull/2417, https://github.com/Acode-Foundation/Acode/pull/2479 +* i18n: update Simplified and Traditional Chinese translations by @LaunchLee in https://github.com/Acode-Foundation/Acode/pull/2468, https://github.com/Acode-Foundation/Acode/pull/2571 +* i18n: update Yemeni Arabic translations by @mohamedElneser in https://github.com/Acode-Foundation/Acode/pull/2480 +* i18n: update Indonesian translations by @Elderellerser in https://github.com/Acode-Foundation/Acode/pull/2491 + ## v1.12.6 * Refactor boot script and add editor interaction handler by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/2216 diff --git a/config.xml b/config.xml index a5123ff8de..f71fe0c2df 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - diff --git a/package.json b/package.json index 0faaeef1f2..30516d10ae 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.foxdebug.acode", "displayName": "Acode", - "version": "1.12.3", + "version": "1.12.7", "description": "Acode is a code editor for android", "scripts": { "lang": "node ./utils/lang.js", From bcda8f42f1b65be2ebaf7a2971ecc8b0d0ebc69e Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 2 Aug 2026 20:08:27 +0530 Subject: [PATCH 030/195] update lock --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 60075d0657..f3da5995fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "com.foxdebug.acode", - "version": "1.12.3", + "version": "1.12.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "com.foxdebug.acode", - "version": "1.12.3", + "version": "1.12.7", "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.20.3", From 40cd339a428c081bfc7058c55b9ef36afe798c67 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Mon, 3 Aug 2026 06:55:15 +0530 Subject: [PATCH 031/195] fix: icon issue --- rspack.config.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/rspack.config.js b/rspack.config.js index 08d1b8dce1..a30e31154b 100644 --- a/rspack.config.js +++ b/rspack.config.js @@ -109,9 +109,21 @@ module.exports = (env, options) => { resourceQuery: { not: [/raw/, /inline/] }, type: 'asset/resource', }, - // Regular CSS/SCSS files + // Regular CSS files do not need Sass processing. Passing icon CSS through + // Sass converts escaped private-use code points into literal characters in + // production, which Cordova's asset WebView renders as missing glyphs. { - test: /\.(? Date: Mon, 3 Aug 2026 07:24:19 +0530 Subject: [PATCH 032/195] version code bump --- config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.xml b/config.xml index f71fe0c2df..8070a1f5db 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - From 95c08908563bddc7d9d23791662581dc2268131b Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Mon, 3 Aug 2026 15:08:25 +0530 Subject: [PATCH 033/195] fix defaults --- src/cm/lsp/servers/javascript.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/cm/lsp/servers/javascript.ts b/src/cm/lsp/servers/javascript.ts index 67253e7be3..e87480d89a 100644 --- a/src/cm/lsp/servers/javascript.ts +++ b/src/cm/lsp/servers/javascript.ts @@ -18,11 +18,6 @@ export const javascriptServers: LspServerManifest[] = [ runtimes: ["web-worker"], transport: { kind: "external" }, enabled: true, - clientConfig: { - builtinExtensions: { - inlayHints: true, - }, - }, resolveLanguageId: ({ languageId, languageName }) => resolveJsTsLanguageId(languageId, languageName), }), From a9e7a1a5ebd0c7ea054567c8b1850d47b8415dda Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Mon, 3 Aug 2026 19:57:19 +0530 Subject: [PATCH 034/195] fix(terminal): close tab on process end and speed up long-press select (#2587) * fix(terminal): close tab on process end and speed up long-press select Close the terminal tab when the PTY exits or the socket drops, not only when the AXS exit JSON arrives, so users no longer get a dead zombie tab after typing exit. Also lower the default touch selection hold from 600ms to 400ms so long-press select feels more responsive. * fix --- src/components/terminal/terminal.js | 53 +++++++---- src/components/terminal/terminalDefaults.js | 2 +- src/components/terminal/terminalManager.js | 89 ++++++++++++++----- .../terminal/terminalTouchSelection.js | 2 +- 4 files changed, 108 insertions(+), 38 deletions(-) diff --git a/src/components/terminal/terminal.js b/src/components/terminal/terminal.js index c4a436b43a..6b7504140d 100644 --- a/src/components/terminal/terminal.js +++ b/src/components/terminal/terminal.js @@ -74,6 +74,9 @@ export default class TerminalComponent { this.boundNativeSelectionMenuHandler = null; this.visibleScrollbarWidth = undefined; this.lastRequestedServerSize = null; + // Lifecycle flags so exit/disconnect/error don't race into zombie tabs + this.intentionalClose = false; + this.processExited = false; this.init(); } @@ -336,7 +339,7 @@ export default class TerminalComponent { this.container, { tapHoldDuration: - terminalSettings.touchSelectionTapHoldDuration || 600, + terminalSettings.touchSelectionTapHoldDuration || 400, moveThreshold: terminalSettings.touchSelectionMoveThreshold || 8, handleSize: terminalSettings.touchSelectionHandleSize || 24, hapticFeedback: @@ -853,19 +856,23 @@ export default class TerminalComponent { }; websocket.onmessage = (event) => { - // Handle text messages (exit events) - if (typeof event.data === "string") { - try { - const message = JSON.parse(event.data); - if (message.type === "exit") { - this.onProcessExit?.(message.data); - return; - } - } catch (error) { - // Not a JSON message, let attachAddon handle it + // Lifecycle control (AXS exit JSON) is always a text frame. + // Never decode binary frames as exit — ordinary PTY output can + // contain the same bytes and must not close the session. + // AttachAddon still receives frames via addEventListener for I/O. + if (typeof event.data !== "string") return; + // Cordova websocket may flag binary payloads even when decoded as string + if (event.binary === true) return; + + try { + const message = JSON.parse(event.data); + if (message?.type === "exit") { + this.processExited = true; + this.onProcessExit?.(message.data); } + } catch { + // Not a JSON control message — terminal I/O is handled by AttachAddon. } - // For binary data or non-exit text messages, let attachAddon handle them }; websocket.onclose = (event) => { @@ -881,7 +888,12 @@ export default class TerminalComponent { return; } - this.onDisconnect?.(); + this.onDisconnect?.({ + intentional: this.intentionalClose, + processExited: this.processExited, + code: event?.code, + reason: event?.reason, + }); }; websocket.onerror = (error) => { @@ -894,6 +906,9 @@ export default class TerminalComponent { return; } + // Ignore teardown noise from intentional close / already-handled exit + if (this.intentionalClose || this.processExited) return; + console.error("WebSocket error:", error); this.onError?.(error); }; @@ -1269,8 +1284,15 @@ export default class TerminalComponent { * Terminate terminal session */ async terminate() { + this.intentionalClose = true; + if (this.websocket) { - this.websocket.close(); + try { + this.websocket.close(); + } catch { + // Already closed + } + this.websocket = null; } if (this.pid && this.serverMode) { @@ -1296,6 +1318,7 @@ export default class TerminalComponent { * Dispose terminal */ dispose() { + this.intentionalClose = true; this.terminate(); // Dispose touch selection @@ -1334,7 +1357,7 @@ export default class TerminalComponent { // Event handlers (can be overridden) onConnect() {} - onDisconnect() {} + onDisconnect(_info) {} onError(error) {} onTitleChange(title) {} onBell() {} diff --git a/src/components/terminal/terminalDefaults.js b/src/components/terminal/terminalDefaults.js index d644145c27..2bde0aa88d 100644 --- a/src/components/terminal/terminalDefaults.js +++ b/src/components/terminal/terminalDefaults.js @@ -19,7 +19,7 @@ export const DEFAULT_TERMINAL_SETTINGS = { failsafeMode: false, prootDebug: false, // Touch selection settings - touchSelectionTapHoldDuration: 600, + touchSelectionTapHoldDuration: 400, touchSelectionMoveThreshold: 8, touchSelectionHandleSize: 24, touchSelectionHapticFeedback: true, diff --git a/src/components/terminal/terminalManager.js b/src/components/terminal/terminalManager.js index 01923d6e07..6326266582 100644 --- a/src/components/terminal/terminalManager.js +++ b/src/components/terminal/terminalManager.js @@ -765,24 +765,64 @@ class TerminalManager { } }, 200); + // Idempotent end-of-session path. Exit JSON, unexpected disconnect, and + // socket errors all funnel here so a missed exit message can't leave a + // zombie tab with a dead PTY. + let sessionFinished = false; + const finishTerminalSession = async ({ + message = null, + showToast = true, + errorAlert = null, + } = {}) => { + if (sessionFinished) return; + sessionFinished = true; + + try { + terminalComponent.intentionalClose = true; + await this.closeTerminal(terminalId, true); + } catch (error) { + console.error( + `Failed to finish terminal session ${terminalId}:`, + error, + ); + } + + if (showToast && message) { + toast(message); + } + if (errorAlert) { + alert(strings["error"], errorAlert); + } + }; + // Terminal event handlers terminalComponent.onConnect = () => { console.log(`Terminal ${terminalId} connected`); }; - terminalComponent.onDisconnect = () => { - console.log(`Terminal ${terminalId} disconnected`); + terminalComponent.onDisconnect = (info = {}) => { + console.log(`Terminal ${terminalId} disconnected`, info); + + // User/tab close and dispose intentionally close the socket. + if (info.intentional) return; + + // Exit message already drove finishTerminalSession (or is about to). + // Still call finish so a race can't leave the tab open; it's idempotent. + const message = info.processExited ? null : "Terminal session ended"; + void finishTerminalSession({ + message, + showToast: !info.processExited, + }); }; terminalComponent.onError = (error) => { console.error(`Terminal ${terminalId} error:`, error); - // Close the terminal and remove the tab - this.closeTerminal(terminalId, true); - - // Show alert for connection error const errorMessage = error?.message || "Connection lost"; - alert(strings["error"], `Terminal connection error: ${errorMessage}`); + void finishTerminalSession({ + showToast: false, + errorAlert: `Terminal connection error: ${errorMessage}`, + }); }; terminalComponent.onTitleChange = async (title) => { @@ -811,20 +851,21 @@ class TerminalManager { }; terminalComponent.onProcessExit = (exitData) => { - // Format exit message based on exit code and signal + const data = exitData && typeof exitData === "object" ? exitData : {}; let message; - if (exitData.signal) { - message = `Process terminated by signal ${exitData.signal}`; - } else if (exitData.exit_code === 0) { - message = `Process exited successfully (code ${exitData.exit_code})`; + if (data.signal) { + message = `Process terminated by signal ${data.signal}`; + } else if (data.exit_code === 0 || data.exit_code === "0") { + message = `Process exited successfully (code ${data.exit_code})`; + } else if (data.exit_code !== undefined && data.exit_code !== null) { + message = `Process exited with code ${data.exit_code}`; + } else if (typeof exitData === "string" || typeof exitData === "number") { + message = `Process exited with code ${exitData}`; } else { - message = `Process exited with code ${exitData.exit_code}`; + message = "Process exited"; } - this.closeTerminal(terminalId); - terminalFile._skipTerminalCloseConfirm = true; - terminalFile.remove(true, { ignorePinned: true }); - toast(message); + void finishTerminalSession({ message }); }; // Handle acode CLI open commands (OSC 7777) @@ -871,18 +912,24 @@ class TerminalManager { /** * Close a terminal session * @param {string} terminalId - Terminal ID + * @param {boolean} removeTab - Also remove the editor tab + * @returns {Promise} */ - closeTerminal(terminalId, removeTab = false) { + async closeTerminal(terminalId, removeTab = false) { const terminal = this.terminals.get(terminalId); if (!terminal) return; try { + if (terminal.component) { + terminal.component.intentionalClose = true; + } + if (terminal.component.serverMode && terminal.component.pid) { this.removePersistedSession(terminal.component.pid); } // Cleanup resize observer - if (terminal.file._resizeObserver) { + if (terminal.file?._resizeObserver) { terminal.file._resizeObserver.disconnect(); terminal.file._resizeObserver = null; } @@ -895,14 +942,14 @@ class TerminalManager { // Dispose terminal component terminal.component.dispose(); - // Remove from map + // Remove from map before tab removal so onclose re-entry is a no-op this.terminals.delete(terminalId); // Optionally remove the tab as well if (removeTab && terminal.file) { try { terminal.file._skipTerminalCloseConfirm = true; - terminal.file.remove(true, { ignorePinned: true }); + await terminal.file.remove(true, { ignorePinned: true }); } catch (removeError) { console.error("Error removing terminal tab:", removeError); } diff --git a/src/components/terminal/terminalTouchSelection.js b/src/components/terminal/terminalTouchSelection.js index 54d642cef2..b8bf98adc0 100644 --- a/src/components/terminal/terminalTouchSelection.js +++ b/src/components/terminal/terminalTouchSelection.js @@ -136,7 +136,7 @@ export default class TerminalTouchSelection { this.terminal = terminal; this.container = container; this.options = { - tapHoldDuration: 600, + tapHoldDuration: 400, moveThreshold: 8, handleSize: 24, hapticFeedback: true, From 89a836e3dca276c7aa6bfd1a16cf1905dbfb2766 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Tue, 4 Aug 2026 18:37:43 +0530 Subject: [PATCH 035/195] fix(editor): prevent false language mode recommendations (#2621) * fix(editor): prevent false language mode recommendations - recommend only language-mode plugins available in the registry - suppress built-in, extensionless, and arbitrary file false positives - remove the direct plugin-request issue action - add regression tests for unknown extensions * fix the stale network cache things --- src/lib/languageModeRecommendations.js | 106 ++++++++---------- src/test/sanity.tests.js | 35 +++++- .../unit/languageModeRecommendations.test.js | 93 +++++++++++++++ 3 files changed, 174 insertions(+), 60 deletions(-) create mode 100644 tests/unit/languageModeRecommendations.test.js diff --git a/src/lib/languageModeRecommendations.js b/src/lib/languageModeRecommendations.js index d534e2bf13..2783cc2b26 100644 --- a/src/lib/languageModeRecommendations.js +++ b/src/lib/languageModeRecommendations.js @@ -23,32 +23,12 @@ export function getLanguageModeRecommendationSearchKeyword(filename) { return keyword; } -function getIssueUrl(keyword) { - const params = new URLSearchParams({ - template: "1_feature_request.yml", - labels: "new plugin idea,enhancement", - title: `Plugin request: ${keyword} syntax highlighting`, - }); - - return `${config.GITHUB_URL}/issues/new?${params}`; -} - function formatString(value, replacements) { return String(value || "").replace(/\{(\w+)\}/g, (_, key) => { return replacements[key] ?? ""; }); } -async function openUrl(url) { - if (window.cordova?.exec) { - const { default: customTab } = await import("./customTab"); - await customTab(url); - return; - } - - window.open(url, "_blank", "noopener,noreferrer"); -} - async function openExtensions(keyword) { const { openWithSearch } = await import("sidebarApps/extensions"); openWithSearch(keyword); @@ -58,6 +38,19 @@ function hasPlainTextFallback(modeInfo, filename) { return modeInfo?.name === "text" && !modeInfo.supportsFile(filename); } +export function shouldRecommendLanguageModeExtension(filename, modeInfo) { + if (!hasPlainTextFallback(modeInfo, filename)) return false; + + const keyword = getLanguageModeRecommendationSearchKeyword(filename); + if (!keyword) return false; + + // Probe the normalized extension independently of the original filename. + // This prevents a strangely formatted path from producing requests for core + // modes such as HTML or Python. + const probeFilename = `file.${keyword}`; + return hasPlainTextFallback(getModeForPath(probeFilename), probeFilename); +} + class LanguageModeRecommendations { notifiedKeywords = new Set(); pendingKeywords = new Set(); @@ -76,9 +69,21 @@ class LanguageModeRecommendations { ), ), ) - .then((response) => (response.ok ? response.json() : [])) + .then((response) => { + if (!response.ok) { + throw new Error(`Plugin registry request failed: ${response.status}`); + } + return response.json(); + }) .then((plugins) => Array.isArray(plugins) && plugins.length > 0) - .catch(() => false); + .catch(() => { + // Do not let a temporary network or server failure suppress this + // recommendation for the rest of the app session. + if (this.availabilityCache.get(keyword) === availability) { + this.availabilityCache.delete(keyword); + } + return false; + }); this.availabilityCache.set(keyword, availability); return availability; @@ -88,7 +93,7 @@ class LanguageModeRecommendations { if (!file || file.type !== "editor") return; const filename = file.filename || ""; - if (!hasPlainTextFallback(modeInfo, filename)) return; + if (!shouldRecommendLanguageModeExtension(filename, modeInfo)) return; const keyword = getLanguageModeRecommendationSearchKeyword(filename); if ( @@ -116,52 +121,35 @@ class LanguageModeRecommendations { const hasPlugins = await this.getPluginAvailability(keyword); // If a plugin registered the mode while the lookup was pending, suppress // this stale recommendation and leave the keyword eligible for future checks. - if (!hasPlainTextFallback(getModeForPath(filename), filename)) return false; - - const displayExt = `.${keyword}`; - - if (hasPlugins) { - notificationManager.pushNotification({ - title: formatString(strings["extension recommendation title"], { - extension: displayExt, - keyword: `mode:${keyword}`, - }), - message: formatString(strings["extension recommendation message"], { - extension: displayExt, - keyword: `mode:${keyword}`, - }), - icon: "extension", - type: "info", - action: () => openExtensions(`mode:${keyword}`), - actions: [ - { - text: strings["search plugins"], - icon: "search", - action: () => openExtensions(`mode:${keyword}`), - }, - ], - }); - return true; + if ( + !shouldRecommendLanguageModeExtension(filename, getModeForPath(filename)) + ) { + return false; } - const issueUrl = getIssueUrl(keyword); + // An unknown extension is not enough evidence that the file contains a + // programming language. Stay silent unless the registry has a matching + // language-mode plugin to recommend. + if (!hasPlugins) return false; + + const displayExt = `.${keyword}`; notificationManager.pushNotification({ - title: formatString(strings["extension request title"], { + title: formatString(strings["extension recommendation title"], { extension: displayExt, - keyword, + keyword: `mode:${keyword}`, }), - message: formatString(strings["extension request message"], { + message: formatString(strings["extension recommendation message"], { extension: displayExt, - keyword, + keyword: `mode:${keyword}`, }), icon: "extension", - type: "warning", - action: () => openUrl(issueUrl), + type: "info", + action: () => openExtensions(`mode:${keyword}`), actions: [ { - text: strings["request plugin"], - icon: "open_in_new", - action: () => openUrl(issueUrl), + text: strings["search plugins"], + icon: "search", + action: () => openExtensions(`mode:${keyword}`), }, ], }); diff --git a/src/test/sanity.tests.js b/src/test/sanity.tests.js index 8fc86fca5b..63451a6d02 100644 --- a/src/test/sanity.tests.js +++ b/src/test/sanity.tests.js @@ -1,9 +1,13 @@ +import { getModeForPath } from "../cm/modelist"; import { clearModifierState, clearQuickToolsButtonFeedback, removeActionStackEntries, } from "../handlers/quickToolsState"; -import { getLanguageModeRecommendationSearchKeyword } from "../lib/languageModeRecommendations"; +import { + getLanguageModeRecommendationSearchKeyword, + shouldRecommendLanguageModeExtension, +} from "../lib/languageModeRecommendations"; import { isVersionGreater } from "../utils/version"; import { TestRunner } from "./tester"; @@ -86,6 +90,35 @@ export async function runSanityTests(writeOutput) { "", "Extensionless non-dotfiles should not request plugin recommendations", ); + test.assertEqual( + getLanguageModeRecommendationSearchKeyword("example"), + "", + "Arbitrary extensionless names should not request plugin recommendations", + ); + }); + + runner.test("Language mode recommendation candidates", (test) => { + test.assert( + !shouldRecommendLanguageModeExtension( + "example.html ", + getModeForPath("example.html "), + ), + "Built-in language extensions should not request plugins", + ); + test.assert( + !shouldRecommendLanguageModeExtension( + "example.py ", + getModeForPath("example.py "), + ), + "Built-in Python support should not request a plugin", + ); + test.assert( + shouldRecommendLanguageModeExtension( + "example.acode-unknown-mode", + getModeForPath("example.acode-unknown-mode"), + ), + "Unknown language extensions should remain eligible for recommendations", + ); }); runner.test("Quick tools modifier cleanup emits inactive state", (test) => { diff --git a/tests/unit/languageModeRecommendations.test.js b/tests/unit/languageModeRecommendations.test.js new file mode 100644 index 0000000000..c737c68e42 --- /dev/null +++ b/tests/unit/languageModeRecommendations.test.js @@ -0,0 +1,93 @@ +import { afterAll, beforeEach, describe, expect, it, vi } from "vitest"; +import "cm/supportedModes"; +import { getModeForPath } from "cm/modelist"; +import notificationManager from "lib/notificationManager"; +import recommendLanguageModeExtension from "lib/languageModeRecommendations"; + +vi.mock("lib/notificationManager", () => ({ + default: { + pushNotification: vi.fn(), + }, +})); + +const originalFetch = globalThis.fetch; + +globalThis.strings = { + "extension recommendation title": "Extensions available for {extension}", + "extension recommendation message": "Search for {keyword}", + "search plugins": "Search plugins", +}; + +function recommend(filename) { + recommendLanguageModeExtension( + { type: "editor", filename }, + getModeForPath(filename), + ); +} + +describe("language mode recommendations", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + + afterAll(() => { + globalThis.fetch = originalFetch; + }); + + it("stays silent for arbitrary extensions without a matching plugin", async () => { + globalThis.fetch = vi.fn().mockResolvedValue({ + ok: true, + json: async () => [], + }); + + for (const filename of ["test.random", "dhd.sdocx", "hdh.glsl"]) { + recommend(filename); + } + + await vi.waitFor(() => expect(globalThis.fetch).toHaveBeenCalled()); + await new Promise((resolve) => setTimeout(resolve, 0)); + + expect(notificationManager.pushNotification).not.toHaveBeenCalled(); + }); + + it("recommends a language-mode plugin that exists in the registry", async () => { + globalThis.fetch = vi.fn().mockResolvedValue({ + ok: true, + json: async () => [{ id: "example-language-mode" }], + }); + + recommend("test.acodepluginmode"); + + await vi.waitFor(() => { + expect(notificationManager.pushNotification).toHaveBeenCalledOnce(); + }); + }); + + it.each([ + ["network errors", () => Promise.reject(new Error("offline"))], + ["server errors", () => Promise.resolve({ ok: false, status: 503 })], + ])("retries after transient %s", async (_, failedResponse) => { + globalThis.fetch = vi + .fn() + .mockImplementationOnce(failedResponse) + .mockResolvedValueOnce({ + ok: true, + json: async () => [{ id: "recovered-language-mode" }], + }); + + const keyword = `retryable-${crypto.randomUUID()}`; + recommend(`test.${keyword}`); + + await vi.waitFor(() => { + expect(globalThis.fetch).toHaveBeenCalledOnce(); + }); + await new Promise((resolve) => setTimeout(resolve, 0)); + + recommend(`test.${keyword}`); + + await vi.waitFor(() => { + expect(globalThis.fetch).toHaveBeenCalledTimes(2); + expect(notificationManager.pushNotification).toHaveBeenCalledOnce(); + }); + }); +}); From 30877ec98e074f4fac33f545e8bccb869cfe8204 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Tue, 4 Aug 2026 20:43:37 +0530 Subject: [PATCH 036/195] fix(lsp): send workspace folders during initialization (#2623) --- src/cm/lsp/clientManager.ts | 42 +++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/src/cm/lsp/clientManager.ts b/src/cm/lsp/clientManager.ts index fce8e19503..94ecd40cfe 100644 --- a/src/cm/lsp/clientManager.ts +++ b/src/cm/lsp/clientManager.ts @@ -178,8 +178,11 @@ function connectClient( client: ExtendedLSPClient, transport: Transport, initializationOptions?: Record, + rootUri?: string | null, ): void { - if (!initializationOptions || !Object.keys(initializationOptions).length) { + const hasInitializationOptions = + !!initializationOptions && Object.keys(initializationOptions).length > 0; + if (!hasInitializationOptions && !rootUri) { client.connect(transport); return; } @@ -199,7 +202,14 @@ function connectClient( if (method === "initialize" && isPlainObject(params)) { params = { ...params, - initializationOptions, + ...(hasInitializationOptions ? { initializationOptions } : {}), + ...(rootUri + ? { + workspaceFolders: [ + { uri: rootUri, name: workspaceName(rootUri) }, + ], + } + : {}), } as Params; } return originalRequestInner(method, params, mapped); @@ -212,6 +222,16 @@ function connectClient( } } +function workspaceName(rootUri: string): string { + const trimmed = rootUri.replace(/\/+$/, ""); + const encodedName = trimmed.slice(trimmed.lastIndexOf("/") + 1); + try { + return decodeURIComponent(encodedName) || "workspace"; + } catch { + return encodedName || "workspace"; + } +} + interface BuiltinExtensionsResult { extensions: Extension[]; diagnosticsExtension: Extension | LSPClientExtension | null; @@ -764,6 +784,7 @@ export class LspClientManager { }, workspace: { configuration: true, + workspaceFolders: true, }, }, }; @@ -1010,7 +1031,14 @@ export class LspClientManager { await waitForInitialization(transportHandle.ready, signal, server.id); client = new LSPClient(clientConfig) as ExtendedLSPClient; client.__acodeServerId = server.id; - connectClient(client, transportHandle.transport, initializationOptions); + connectClient( + client, + transportHandle.transport, + initializationOptions, + scope === "workspace" && server.useWorkspaceFolders + ? null + : normalizedRootUri, + ); await waitForInitialization(client.initializing, signal, server.id); if (!client.__acodeLoggedInfo) { // Log root URI info to console @@ -1032,7 +1060,13 @@ export class LspClientManager { ); } logLspInfo(`[LSP:${server.id}] initialized`); - addLspLog(server.id, "info", "Initialized"); + addLspLog( + server.id, + "info", + normalizedRootUri + ? `Initialized workspace ${normalizedRootUri}` + : "Initialized without a workspace root", + ); client.__acodeLoggedInfo = true; } } catch (error) { From 706e936a928f4af93f51039fa2605471fef2af87 Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Wed, 5 Aug 2026 23:16:41 +0530 Subject: [PATCH 037/195] fix(admob): harden consent, banners, and variant builds (#2553) * fix(admob): harden consent, banners, and variant builds - integrate UMP consent handling and reactive privacy choices - serialize adaptive banner visibility across pages and keyboard changes - make free and paid Cordova variant configuration idempotent - commit and validate a deterministic self-contained AdMob bundle - remove vulnerable legacy toolchains and update affected lockfiles - replace the legacy soft-input workaround with adjustResize - add tests, lockfile checks, bundle freshness, and security auditing to CI * fix(admob): harden banner suppression and variant builds - make banner suppression reason-aware across Pro and rewarded passes - centralize reward state refresh, expiry scheduling, and failure handling - remove stale Cordova consent and persisted AdMob variant metadata - add ES2020-compatible access and Java 21 Android native CI coverage - enforce transient plugin setup and clean tracked build state - remove the obsolete large-screen quicktools tutorial * fix: dev * chore: remove CI workflow changes --------- Co-authored-by: Ajit Kumar Co-authored-by: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> --- .gitattributes | 1 + bun.lock | 6 +- config.xml | 183 +- hooks/post-process.js | 55 +- package-lock.json | 741 +- package.json | 8 +- src/cm/foldAwareLineCommands.ts | 4 +- src/components/settingsPage.js | 51 +- src/handlers/intent.js | 4 +- src/handlers/keyboard.js | 14 +- src/lib/adConsentCoordinator.mjs | 102 + src/lib/adRewardBannerPolicy.mjs | 158 + src/lib/adRewards.js | 95 +- src/lib/bannerVisibilityController.mjs | 161 + src/lib/privacyChoicesController.mjs | 38 + src/lib/removeAds.js | 4 +- src/lib/startAd.js | 183 +- src/main.js | 37 +- src/pages/about/about.js | 2 - src/pages/adRewards/index.js | 3 - src/pages/changelog/changelog.js | 2 - src/pages/customTheme/customTheme.js | 2 - src/pages/fileBrowser/fileBrowser.js | 2 - src/pages/fontManager/fontManager.js | 2 - src/pages/plugin/plugin.js | 3 +- src/pages/plugins/plugins.js | 2 - src/pages/problems/problems.js | 2 - src/pages/quickTools/quickTools.js | 2 - src/pages/themeSetting/themeSetting.js | 2 - src/plugins/admob/.gitignore | 3 +- src/plugins/admob/package-lock.json | 10880 +--------------- src/plugins/admob/package.json | 21 +- src/plugins/admob/plugin.xml | 14 +- src/plugins/admob/scripts/build.mjs | 70 + src/plugins/admob/scripts/clean.mjs | 7 + .../admob/src/android/admob-test.gradle | 3 + .../admob/src/android/cordova/AdMob.kt | 12 +- .../admob/src/android/cordova/Generated.kt | 5 + .../admob/src/android/cordova/Privacy.kt | 143 + .../admob/src/android/cordova/ads/AdBase.kt | 42 + .../admob/src/android/cordova/ads/AppOpen.kt | 2 + .../admob/src/android/cordova/ads/Banner.kt | 325 +- .../src/android/cordova/ads/Interstitial.kt | 2 + .../admob/src/android/cordova/ads/Native.kt | 7 +- .../admob/src/android/cordova/ads/Rewarded.kt | 2 + .../cordova/ads/RewardedInterstitial.kt | 4 + src/plugins/admob/src/android/core/util.kt | 78 +- .../admob/src/androidTest/AdDispatchTest.kt | 33 + .../admob/src/androidTest/BannerLayoutTest.kt | 156 + .../admob/src/androidTest/PrivacyStateTest.kt | 76 + src/plugins/admob/src/www/ads/banner.ts | 11 +- src/plugins/admob/src/www/common.ts | 21 + src/plugins/admob/src/www/cordova.d.ts | 32 +- src/plugins/admob/src/www/index.ts | 3 + src/plugins/admob/src/www/privacy.ts | 45 + src/plugins/admob/tsconfig.json | 13 +- src/plugins/admob/tsconfig.rollup.json | 10 + src/plugins/admob/www/admob.js | 538 + .../package-lock.json | 4161 ++++++ .../cordova-plugin-advanced-http/package.json | 6 +- .../com/foxdebug/system/SoftInputAssist.java | 28 - src/plugins/system/plugin.xml | 9 +- src/settings/mainSettings.js | 31 + src/utils/helpers.js | 6 +- tests/admob/adConsentCoordinator.test.js | 179 + tests/admob/adRewardBannerPolicy.test.js | 243 + .../admob/bannerVisibilityController.test.js | 236 + tests/admob/bannerWrapper.test.js | 83 + tests/admob/privacyChoicesController.test.js | 76 + tests/unit/checkAdmobBundle.test.js | 61 + tests/unit/config.test.js | 432 + tests/unit/dev.test.js | 18 + utils/config.js | 487 +- utils/scripts/checkAdmobBundle.js | 74 + utils/scripts/dev.js | 26 +- 75 files changed, 8647 insertions(+), 11936 deletions(-) create mode 100644 src/lib/adConsentCoordinator.mjs create mode 100644 src/lib/adRewardBannerPolicy.mjs create mode 100644 src/lib/bannerVisibilityController.mjs create mode 100644 src/lib/privacyChoicesController.mjs create mode 100644 src/plugins/admob/scripts/build.mjs create mode 100644 src/plugins/admob/scripts/clean.mjs create mode 100644 src/plugins/admob/src/android/admob-test.gradle create mode 100644 src/plugins/admob/src/android/cordova/Privacy.kt create mode 100644 src/plugins/admob/src/androidTest/AdDispatchTest.kt create mode 100644 src/plugins/admob/src/androidTest/BannerLayoutTest.kt create mode 100644 src/plugins/admob/src/androidTest/PrivacyStateTest.kt create mode 100644 src/plugins/admob/src/www/privacy.ts create mode 100644 src/plugins/admob/tsconfig.rollup.json create mode 100644 src/plugins/admob/www/admob.js create mode 100644 src/plugins/cordova-plugin-advanced-http/package-lock.json delete mode 100644 src/plugins/system/android/com/foxdebug/system/SoftInputAssist.java create mode 100644 tests/admob/adConsentCoordinator.test.js create mode 100644 tests/admob/adRewardBannerPolicy.test.js create mode 100644 tests/admob/bannerVisibilityController.test.js create mode 100644 tests/admob/bannerWrapper.test.js create mode 100644 tests/admob/privacyChoicesController.test.js create mode 100644 tests/unit/checkAdmobBundle.test.js create mode 100644 tests/unit/config.test.js create mode 100644 tests/unit/dev.test.js create mode 100644 utils/scripts/checkAdmobBundle.js diff --git a/.gitattributes b/.gitattributes index dfdb8b771c..d015b0d352 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ *.sh text eol=lf +config.xml text eol=lf diff --git a/bun.lock b/bun.lock index 3de02944ff..0e8b84d8c7 100644 --- a/bun.lock +++ b/bun.lock @@ -109,7 +109,7 @@ "com.foxdebug.acode.rk.exec.proot": "file:src/plugins/proot", "com.foxdebug.acode.rk.exec.terminal": "file:src/plugins/terminal", "com.foxdebug.acode.rk.plugin.plugincontext": "file:src/plugins/pluginContext", - "cordova-android": "^15.0.0", + "cordova-android": "^15.1.0", "cordova-clipboard": "^1.3.0", "cordova-plugin-acode-webview": "file:src/plugins/webview", "cordova-plugin-advanced-http": "file:src/plugins/cordova-plugin-advanced-http", @@ -152,7 +152,7 @@ "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.6.0", "@codemirror/view": "^6.43.4", - "tar": "^7.5.19", + "tar": "^7.5.22", }, "packages": { "@antfu/install-pkg": ["@antfu/install-pkg@1.1.0", "", { "dependencies": { "package-manager-detector": "^1.3.0", "tinyexec": "^1.0.1" } }, "sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ=="], @@ -1069,7 +1069,7 @@ "cordova": ["cordova@13.0.0", "", { "dependencies": { "configstore": "^5.0.1", "cordova-common": "^6.0.0", "cordova-create": "^6.0.0", "cordova-lib": "^13.0.0", "editor": "^1.0.0", "execa": "^5.1.1", "nopt": "^9.0.0", "semver": "^7.7.3", "systeminformation": "^5.27.11" }, "bin": { "cordova": "bin/cordova" } }, "sha512-QAIMwmYLL0jHo4vauWSnRd2fr9l+wajG+F5aUkrC6e4ZQGSTv0wAiRmpqQUkIc1ZdELisKDQws/BjHz5nP/sLw=="], - "cordova-android": ["cordova-android@15.0.0", "", { "dependencies": { "android-versions": "^2.1.1", "cordova-common": "^6.0.0", "dedent": "^1.7.1", "execa": "^5.1.1", "fast-glob": "^3.3.3", "is-path-inside": "^3.0.3", "nopt": "^9.0.0", "properties-parser": "^0.6.0", "semver": "^7.7.4", "string-argv": "^0.3.2", "untildify": "^4.0.0", "which": "^6.0.1" } }, "sha512-EpFSKUtBLJ7bTpuVD7NeC6toAooi5PI6VIR2jd8Ut5PJu7HSR5tPRwS87Q1DS03RSyDTlroB64JPUWC0pmAhnw=="], + "cordova-android": ["cordova-android@15.1.0", "", { "dependencies": { "android-versions": "^2.1.1", "cordova-common": "^6.0.0", "dedent": "^1.7.1", "execa": "^5.1.1", "fast-glob": "^3.3.3", "is-path-inside": "^3.0.3", "nopt": "^9.0.0", "properties-parser": "^0.6.0", "semver": "^7.7.4", "string-argv": "^0.3.2", "untildify": "^4.0.0", "which": "^6.0.1" } }, "sha512-mnOnOisYUVhyrLCPVlHJBKh4ro+X6nZA7nPqBrpVnyTpiiDiakNCfbBJjSs1MTBUJZ6dcmhhvNKZWPT9w6aGPA=="], "cordova-app-hello-world": ["cordova-app-hello-world@7.0.0", "", {}, "sha512-uDTncFkI73ko+wEf6IEO9bw8lQRMQGnfdi5pPMei4P8+plChNcRW5fxjKlhM/8ZrT8OAWiHsQRrP4pIAn3HQ4g=="], diff --git a/config.xml b/config.xml index 8070a1f5db..6c6ea35070 100644 --- a/config.xml +++ b/config.xml @@ -1,90 +1,93 @@ - - - Acode - - Light weight code editor and web IDE for android. - - - Foxdebug - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Acode + + Light weight code editor and web IDE for android. + + + Foxdebug + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hooks/post-process.js b/hooks/post-process.js index e7a175ac37..16f310469e 100644 --- a/hooks/post-process.js +++ b/hooks/post-process.js @@ -27,8 +27,8 @@ fs.copyFileSync(gradleFilePath, androidGradleFilePath); copyDirRecursively(localResPath, resPath); enableLegacyJni(); enableStaticContext(); +removeLegacyKeyboardWorkaround(); patchTargetSdkVersion(); -enableKeyboardWorkaround(); function getPackageName() { const configPath = path.resolve(__dirname, '../config.xml'); @@ -210,8 +210,8 @@ function enableStaticContext() { } } -function enableKeyboardWorkaround() { - try{ +function removeLegacyKeyboardWorkaround() { + try { const prefix = execSync('npm prefix').toString().trim(); const packageName = getPackageName(); const mainActivityPath = path.join( @@ -222,51 +222,30 @@ function enableKeyboardWorkaround() { ); if (!fs.existsSync(mainActivityPath)) { - console.warn('[Cordova Hook] ⚠️ MainActivity.java not found at', mainActivityPath); return; } - let content = fs.readFileSync(mainActivityPath, 'utf-8'); - - // Skip if already patched - if (content.includes('SoftInputAssist')) { - console.log('[Cordova Hook] ✅ Keyboard workaround already enabled, skipping'); - return; - } - - // Add import - if (!content.includes('import com.foxdebug.system.SoftInputAssist;')) { - content = content.replace( - /import java.lang.ref.WeakReference;|import org\.apache\.cordova\.\*;/, - match => - match + '\nimport com.foxdebug.system.SoftInputAssist;' + const content = fs.readFileSync(mainActivityPath, 'utf-8'); + const updatedContent = content + .replace(/\r?\nimport com\.foxdebug\.system\.SoftInputAssist;/, '') + .replace(/\r?\n\s*private SoftInputAssist softInputAssist;\r?\n/, '\n') + .replace( + /\r?\n\s*softInputAssist = new SoftInputAssist\(this\);/, + '' ); - } - // Declare field - if (!content.includes('private SoftInputAssist softInputAssist;')) { - content = content.replace( - /public class MainActivity extends CordovaActivity\s*\{/, - match => - match + - `\n\n private SoftInputAssist softInputAssist;\n` - ); + if (updatedContent !== content) { + fs.writeFileSync(mainActivityPath, updatedContent, 'utf-8'); + console.log('[Cordova Hook] ✅ Removed legacy keyboard workaround'); } - - // Initialize in onCreate - content = content.replace( - /loadUrl\(launchUrl\);/, - `loadUrl(launchUrl);\n\n softInputAssist = new SoftInputAssist(this);` - ); - - fs.writeFileSync(mainActivityPath, content, 'utf-8'); - console.log('[Cordova Hook] ✅ Enabled keyboard workaround'); } catch (err) { - console.error('[Cordova Hook] ❌ Failed to enable keyboard workaround:', err.message); + console.error( + '[Cordova Hook] ❌ Failed to remove legacy keyboard workaround:', + err.message + ); } } - /** * Copy directory recursively * @param {string} src Source directory diff --git a/package-lock.json b/package-lock.json index f3da5995fa..9fc4f157b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -113,7 +113,7 @@ "com.foxdebug.acode.rk.exec.proot": "file:src/plugins/proot", "com.foxdebug.acode.rk.exec.terminal": "file:src/plugins/terminal", "com.foxdebug.acode.rk.plugin.plugincontext": "file:src/plugins/pluginContext", - "cordova-android": "^15.0.0", + "cordova-android": "^15.1.0", "cordova-clipboard": "^1.3.0", "cordova-plugin-acode-webview": "file:src/plugins/webview", "cordova-plugin-advanced-http": "file:src/plugins/cordova-plugin-advanced-http", @@ -6093,30 +6093,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/eslint": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", - "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, "node_modules/@types/estree": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", @@ -6177,14 +6153,14 @@ "peer": true }, "node_modules/@types/node": { - "version": "25.8.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-25.8.0.tgz", - "integrity": "sha512-TCFSk8IZh+iLX1xtksoBVtdmgL+1IX0fC9BeU4QqFSuNdN/K+HUlhqOzEmSYYpZUVsLYcPqc9KX+60iDuninSQ==", + "version": "26.1.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.2.tgz", + "integrity": "sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "undici-types": ">=7.24.0 <7.24.7" + "undici-types": "~8.3.0" } }, "node_modules/@types/trusted-types": { @@ -6673,20 +6649,6 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-phases": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz", - "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=10.13.0" - }, - "peerDependencies": { - "acorn": "^8.14.0" - } - }, "node_modules/agent-base": { "version": "7.1.4", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", @@ -6772,9 +6734,9 @@ } }, "node_modules/android-versions": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-2.1.1.tgz", - "integrity": "sha512-dYeO3KHDO81WvEwZFK+OF0dJl/ESvxV3QZE/qo/AAnG/uijco6DOXJJla3CdoC8Eg53YBlbRIyobRGYqIAGw8Q==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-2.2.0.tgz", + "integrity": "sha512-lrad0HHmy9406sSmBHYIetx4n3WMnVVD+HMv7C+YJrByLFGPYWvlM1WcYrYL+e2s1GErvRF85nWsRY7RpwIGLw==", "dev": true, "license": "MIT", "dependencies": { @@ -6782,9 +6744,9 @@ } }, "node_modules/android-versions/node_modules/semver": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.3.tgz", - "integrity": "sha512-wnilbGyMxzbY7dNOl7jpKbLSjcfeweJWU5j4+u5qW+6/wuGD9KzIGOyZnQVSBM9E7DtWaaH3CyHkppYrKYoxwg==", + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", "dev": true, "license": "ISC", "bin": { @@ -6937,168 +6899,6 @@ "dev": true, "license": "ISC" }, - "node_modules/archiver": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/archiver/-/archiver-3.1.1.tgz", - "integrity": "sha512-5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg==", - "dev": true, - "license": "MIT", - "dependencies": { - "archiver-utils": "^2.1.0", - "async": "^2.6.3", - "buffer-crc32": "^0.2.1", - "glob": "^7.1.4", - "readable-stream": "^3.4.0", - "tar-stream": "^2.1.0", - "zip-stream": "^2.1.2" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/archiver-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz", - "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", - "dev": true, - "license": "MIT", - "dependencies": { - "glob": "^7.1.4", - "graceful-fs": "^4.2.0", - "lazystream": "^1.0.0", - "lodash.defaults": "^4.2.0", - "lodash.difference": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.union": "^4.6.0", - "normalize-path": "^3.0.0", - "readable-stream": "^2.0.0" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/archiver-utils/node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/archiver-utils/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/archiver-utils/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/archiver-utils/node_modules/minimatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", - "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/archiver/node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/archiver/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/archiver/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/archiver/node_modules/minimatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", - "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/archiver/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/are-we-there-yet": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", @@ -7436,33 +7236,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/bl/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/body-parser": { "version": "1.20.5", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.5.tgz", @@ -7698,41 +7471,6 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, - "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -8256,22 +7994,6 @@ "node": ">= 18" } }, - "node_modules/compress-commons": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-2.1.1.tgz", - "integrity": "sha512-eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer-crc32": "^0.2.13", - "crc32-stream": "^3.0.1", - "normalize-path": "^3.0.0", - "readable-stream": "^2.3.6" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", @@ -8538,9 +8260,9 @@ } }, "node_modules/cordova-android": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-15.0.0.tgz", - "integrity": "sha512-EpFSKUtBLJ7bTpuVD7NeC6toAooi5PI6VIR2jd8Ut5PJu7HSR5tPRwS87Q1DS03RSyDTlroB64JPUWC0pmAhnw==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-15.1.0.tgz", + "integrity": "sha512-mnOnOisYUVhyrLCPVlHJBKh4ro+X6nZA7nPqBrpVnyTpiiDiakNCfbBJjSs1MTBUJZ6dcmhhvNKZWPT9w6aGPA==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -8562,9 +8284,9 @@ } }, "node_modules/cordova-android/node_modules/semver": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.3.tgz", - "integrity": "sha512-wnilbGyMxzbY7dNOl7jpKbLSjcfeweJWU5j4+u5qW+6/wuGD9KzIGOyZnQVSBM9E7DtWaaH3CyHkppYrKYoxwg==", + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", "dev": true, "license": "ISC", "bin": { @@ -8970,45 +8692,6 @@ } } }, - "node_modules/crc": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", - "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer": "^5.1.0" - } - }, - "node_modules/crc32-stream": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-3.0.1.tgz", - "integrity": "sha512-mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w==", - "dev": true, - "license": "MIT", - "dependencies": { - "crc": "^3.4.4", - "readable-stream": "^3.4.0" - }, - "engines": { - "node": ">= 6.9.0" - } - }, - "node_modules/crc32-stream/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/crelt": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", @@ -10136,9 +9819,9 @@ "license": "MIT" }, "node_modules/enhanced-resolve": { - "version": "5.21.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.3.tgz", - "integrity": "sha512-QyL119InA+XXEkNLNTPCXPugSvOfhwv0JOlGNzvxs0hZaiHLNvXSpudUWsOlsXGWJh8G6ckCScEkVHfX3kw/2Q==", + "version": "5.24.5", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.24.5.tgz", + "integrity": "sha512-L1l8TNvomm6UVW5B253AGxQagSQr+vGwhMlrrfRS2qmhx46AMpMVJKQYLvWYbysTMY8VoicOvzHzoHMbyzB+4A==", "dev": true, "license": "MIT", "dependencies": { @@ -10881,13 +10564,6 @@ "node": ">= 0.6" } }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true, - "license": "MIT" - }, "node_modules/fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -11146,14 +10822,6 @@ "node": ">= 6" } }, - "node_modules/glob-to-regexp": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true, - "license": "BSD-2-Clause", - "peer": true - }, "node_modules/global-dirs": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", @@ -11561,27 +11229,6 @@ "postcss": "^8.1.0" } }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "BSD-3-Clause" - }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -12643,19 +12290,6 @@ "integrity": "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==", "license": "MIT" }, - "node_modules/lazystream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", - "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", - "dev": true, - "license": "MIT", - "dependencies": { - "readable-stream": "^2.0.5" - }, - "engines": { - "node": ">= 0.6.3" - } - }, "node_modules/lie": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", @@ -12952,21 +12586,6 @@ "uc.micro": "^2.0.0" } }, - "node_modules/loader-runner": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.2.tgz", - "integrity": "sha512-DFEqQ3ihfS9blba08cLfYf1NRAIEm+dDjic073DRDc3/JspI/8wYmtDsHwd3+4hwvdxSK7PGaElfTmm0awWJ4w==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=6.11.5" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, "node_modules/loader-utils": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", @@ -13017,41 +12636,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.defaults": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.difference": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", - "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.union": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", - "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==", - "dev": true, - "license": "MIT" - }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -13501,6 +13085,68 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/minimizer-webpack-plugin": { + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/minimizer-webpack-plugin/-/minimizer-webpack-plugin-5.6.1.tgz", + "integrity": "sha512-DoeAZz8Q1C1znwsUzej1fdoi4jCf7/+Em27ouLqfK/+3m8G+D7yDhUwrc3CNhjSzGUN1kn7Iv4sWmjflQHenpw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.25", + "jest-worker": "^27.4.5", + "schema-utils": "^4.3.0", + "terser": "^5.31.1" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@minify-html/node": { + "optional": true + }, + "@swc/core": { + "optional": true + }, + "@swc/css": { + "optional": true + }, + "@swc/html": { + "optional": true + }, + "clean-css": { + "optional": true + }, + "cssnano": { + "optional": true + }, + "csso": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "html-minifier-terser": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "postcss": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, "node_modules/minipass": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", @@ -13652,19 +13298,6 @@ "node": ">= 18" } }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "license": "MIT", - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, "node_modules/mocha": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz", @@ -16957,9 +16590,9 @@ } }, "node_modules/tar": { - "version": "7.5.19", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.19.tgz", - "integrity": "sha512-4LeEWl96twnS2Q7Bz4MGqgazLqO+hJN63GZxXoIqh1T3VweYD997gbU1ItNsQafqqXTXd5WFyFdReLtwvRBNiw==", + "version": "7.5.22", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.22.tgz", + "integrity": "sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA==", "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", @@ -16972,38 +16605,6 @@ "node": ">=18" } }, - "node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tar-stream/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/tar/node_modules/yallist": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", @@ -17026,9 +16627,9 @@ } }, "node_modules/terser": { - "version": "5.47.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.47.1.tgz", - "integrity": "sha512-tPbLXTI6ohPASb/1YViL428oEHu6/qv1OxqYnfaonVCFHqx4+wCd95pHrQWsL5X4pl90CTyW9piSAsS2L0VoMw==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.49.0.tgz", + "integrity": "sha512-SNiDnXyHSrxVcIOtVbULzcTmniUiwcV7Nwdyj1twVubeTmbjoa8p69KKDpfkdoOavuM4/GRm1+ykI8qqnavHoA==", "dev": true, "license": "BSD-2-Clause", "peer": true, @@ -17045,68 +16646,6 @@ "node": ">=10" } }, - "node_modules/terser-webpack-plugin": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.6.0.tgz", - "integrity": "sha512-Eum+5ajkaOhf5KbM26osvv21kLD7BaGqQ1UA4Ami4arYwylmGUQTgHFpHDdmJod1q4QXa66p0to/FBKID+J1vA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.25", - "jest-worker": "^27.4.5", - "schema-utils": "^4.3.0", - "terser": "^5.31.1" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" - }, - "peerDependenciesMeta": { - "@minify-html/node": { - "optional": true - }, - "@swc/core": { - "optional": true - }, - "@swc/css": { - "optional": true - }, - "@swc/html": { - "optional": true - }, - "clean-css": { - "optional": true - }, - "cssnano": { - "optional": true - }, - "csso": { - "optional": true - }, - "esbuild": { - "optional": true - }, - "html-minifier-terser": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "postcss": { - "optional": true - }, - "uglify-js": { - "optional": true - } - } - }, "node_modules/terser/node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -17431,9 +16970,9 @@ } }, "node_modules/undici-types": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz", - "integrity": "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz", + "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==", "dev": true, "license": "MIT", "peer": true @@ -17725,15 +17264,6 @@ "@sphinxxxx/color-conversion": "^2.2.2" } }, - "node_modules/vargs": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz", - "integrity": "sha512-d/j1kMUt0YjLCQPAI+VMZ7IKwNGjk8dSHMCrHq9txFOCcCIDoe8ck9FmPvABJgxIaZO1tabXmNojQG6mBkLLCw==", - "dev": true, - "engines": { - "node": ">=0.1.93" - } - }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -18024,43 +17554,19 @@ } }, "node_modules/watchpack": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz", - "integrity": "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.2.tgz", + "integrity": "sha512-6i/00NBjP4yGPs+caKSyRfpTF/8Torsu0MOW3mMzIbhgISFder8i7xbqgHlLMwJrdiN8ndBV3UA1/AfzPSr+jg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" }, "engines": { "node": ">=10.13.0" } }, - "node_modules/wd": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/wd/-/wd-1.14.0.tgz", - "integrity": "sha512-X7ZfGHHYlQ5zYpRlgP16LUsvYti+Al/6fz3T/ClVyivVCpCZQpESTDdz6zbK910O5OIvujO23Ym2DBBo3XsQlA==", - "dev": true, - "engines": [ - "node" - ], - "hasInstallScript": true, - "license": "Apache-2.0", - "dependencies": { - "archiver": "^3.0.0", - "async": "^2.0.0", - "lodash": "^4.0.0", - "mkdirp": "^0.5.1", - "q": "^1.5.1", - "request": "2.88.0", - "vargs": "^0.1.0" - }, - "bin": { - "wd": "lib/bin.js" - } - }, "node_modules/web-tree-sitter": { "version": "0.26.8", "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.26.8.tgz", @@ -18069,37 +17575,33 @@ "license": "MIT" }, "node_modules/webpack": { - "version": "5.106.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.106.2.tgz", - "integrity": "sha512-wGN3qcrBQIFmQ/c0AiOAQBvrZ5lmY8vbbMv4Mxfgzqd/B6+9pXtLo73WuS1dSGXM5QYY3hZnIbvx+K1xxe6FyA==", + "version": "5.109.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.109.2.tgz", + "integrity": "sha512-U9/cvLzxObKNEZ9+TtdqrHM5/9z3lgl2c+c4BzbqGxFQvQvBAq87yql5A8pQ+rrMbS496MZJeF5enVBndIy2hw==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", "@types/json-schema": "^7.0.15", "@webassemblyjs/ast": "^1.14.1", "@webassemblyjs/wasm-edit": "^1.14.1", "@webassemblyjs/wasm-parser": "^1.14.1", "acorn": "^8.16.0", - "acorn-import-phases": "^1.0.3", "browserslist": "^4.28.1", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.20.0", - "es-module-lexer": "^2.0.0", + "enhanced-resolve": "^5.24.4", + "es-module-lexer": "^2.1.0", "eslint-scope": "5.1.1", "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.2.11", - "loader-runner": "^4.3.1", "mime-db": "^1.54.0", + "minimizer-webpack-plugin": "^5.6.1", "neo-async": "^2.6.2", "schema-utils": "^4.3.3", "tapable": "^2.3.0", - "terser-webpack-plugin": "^5.3.17", - "watchpack": "^2.5.1", - "webpack-sources": "^3.3.4" + "watchpack": "^2.5.2", + "webpack-sources": "^3.5.1" }, "bin": { "webpack": "bin/webpack.js" @@ -18118,9 +17620,9 @@ } }, "node_modules/webpack-sources": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.4.1.tgz", - "integrity": "sha512-eACpxRN02yaawnt+uUNIF7Qje6A9zArxBbcAJjK1PK3S9Ycg5jIuJ8pW4q8EMnwNZCEGltcjkRx1QzOxOkKD8A==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.5.1.tgz", + "integrity": "sha512-jyuiGJdtvY434z5bUZrjz67v76/ePNvFZTp9Mdz29IlH4+GPsgyGjiv0fKI+M7BdkU6ADjulUcKAd3tUK3WlEw==", "dev": true, "license": "MIT", "peer": true, @@ -18543,36 +18045,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/zip-stream": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.3.tgz", - "integrity": "sha512-EkXc2JGcKhO5N5aZ7TmuNo45budRaFGHOmz24wtJR7znbNqDPmdZtUauKX6et8KAVseAMBOyWJqEpXcHTBsh7Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "archiver-utils": "^2.1.0", - "compress-commons": "^2.1.1", - "readable-stream": "^3.4.0" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/zip-stream/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "src/plugins/auth": { "name": "com.foxdebug.acode.rk.auth", "version": "1.0.0", @@ -18598,10 +18070,9 @@ "devDependencies": { "chai": "4.3.6", "colors": "1.4.0", - "cordova": "11.0.0", + "cordova": "13.0.0", "mocha": "9.2.2", "umd-tough-cookie": "3.0.0", - "wd": "1.14.0", "xml2js": "0.4.23" } }, diff --git a/package.json b/package.json index 30516d10ae..b04184f84a 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "scripts": { "lang": "node ./utils/lang.js", "build": "sh utils/scripts/build.sh", + "build:admob": "npm ci --prefix src/plugins/admob --no-audit --no-fund && npm run build --prefix src/plugins/admob", "start": "sh utils/scripts/start.sh", "dev": "node utils/scripts/dev.js", "dev:android": "node utils/scripts/dev.js android", @@ -15,9 +16,10 @@ "lint": "biome lint --write", "format": "biome format --write", "check": "biome check --write", + "check:admob-bundle": "node utils/scripts/checkAdmobBundle.js", + "test": "vitest run", "typecheck": "tsc --noEmit", "updateAce": "node ./utils/updateAce.js", - "test": "vitest run", "test:watch": "vitest" }, "keywords": [ @@ -85,7 +87,7 @@ "com.foxdebug.acode.rk.exec.proot": "file:src/plugins/proot", "com.foxdebug.acode.rk.exec.terminal": "file:src/plugins/terminal", "com.foxdebug.acode.rk.plugin.plugincontext": "file:src/plugins/pluginContext", - "cordova-android": "^15.0.0", + "cordova-android": "^15.1.0", "cordova-clipboard": "^1.3.0", "cordova-plugin-acode-webview": "file:src/plugins/webview", "cordova-plugin-advanced-http": "file:src/plugins/cordova-plugin-advanced-http", @@ -206,7 +208,7 @@ "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.6.0", "@codemirror/view": "^6.43.4", - "tar": "^7.5.19" + "tar": "^7.5.22" }, "browserslist": "cover 100%", "allowScripts": { diff --git a/src/cm/foldAwareLineCommands.ts b/src/cm/foldAwareLineCommands.ts index 11e849cf22..eea19207b9 100644 --- a/src/cm/foldAwareLineCommands.ts +++ b/src/cm/foldAwareLineCommands.ts @@ -63,7 +63,7 @@ function getFoldIndex(state: EditorState): FoldIndex { blockFrom: state.doc.lineAt(from).from, blockTo: state.doc.lineAt(to).to, }; - const previous = groups.at(-1); + const previous = groups[groups.length - 1]; if (previous && fold.blockFrom <= previous.blockTo) { previous.blockTo = Math.max(previous.blockTo, fold.blockTo); previous.folds.push(fold); @@ -135,7 +135,7 @@ function selectedLineBlocks(state: EditorState, index: FoldIndex): LineBlock[] { const merged: LineBlock[] = []; for (const block of blocks) { - const previous = merged.at(-1); + const previous = merged[merged.length - 1]; if (previous && block.from <= previous.to + 1) { previous.to = Math.max(previous.to, block.to); previous.rangeIndexes.push(...block.rangeIndexes); diff --git a/src/components/settingsPage.js b/src/components/settingsPage.js index 1203c595fe..25e2ce8aeb 100644 --- a/src/components/settingsPage.js +++ b/src/components/settingsPage.js @@ -5,7 +5,6 @@ import select from "dialogs/select"; import Ref from "html-tag-js/ref"; import actionStack from "lib/actionStack"; import appSettings from "lib/settings"; -import { hideAd } from "lib/startAd"; import { animate, hover, press } from "motion"; import FileBrowser from "pages/fileBrowser"; import { isValidColor } from "utils/color/regex"; @@ -22,6 +21,8 @@ import searchBar from "./searchbar"; * @property {(title:string)=>void} setTitle set title of settings page * @property {()=>void} restoreList restore list to original state * @property {()=>HTMLDivElement} getListElement get the page's list element + * @property {(key:string, visible:boolean)=>boolean} setItemVisibility show or hide one setting + * @property {(callback:()=>void)=>()=>void} onClose register cleanup for when the page closes */ /** @@ -53,6 +54,7 @@ export default function settingsPage( options = {}, ) { let hideSearchBar = () => {}; + const closeCallbacks = new Set(); const $page = Page(title); $page.id = "settings"; @@ -73,8 +75,15 @@ export default function settingsPage( /** DISCLAIMER: do not assign hideSearchBar directly because it can change */ $page.ondisconnect = () => hideSearchBar(); $page.onhide = () => { - hideAd(); actionStack.remove(title); + for (const callback of closeCallbacks) { + try { + callback(); + } catch (error) { + console.error("Settings page cleanup failed:", error); + } + } + closeCallbacks.clear(); }; const state = listItems($list, settings, callback, { @@ -137,7 +146,7 @@ export default function settingsPage( if (goTo) { const $item = $list.get(`[data-key="${goTo}"]`); - if (!$item) return; + if (!$item || $item.hidden) return; $item.scrollIntoView(); $item.click(); @@ -155,6 +164,7 @@ export default function settingsPage( */ search(key) { return searchableItems.filter((child) => { + if (child.hidden) return false; const text = child.textContent.toLowerCase(); return text.match(key, "i"); }); @@ -172,6 +182,33 @@ export default function settingsPage( setTitle(title) { $page.settitle(title); }, + /** + * Show or hide one setting without rebuilding the page. + * @param {string} key + * @param {boolean} visible + */ + setItemVisibility(key, visible) { + const $item = state.itemElements.get(key); + if (!$item) return false; + + $item.hidden = !visible; + $item.setAttribute("aria-hidden", String(!visible)); + if ($item.hidden && document.activeElement === $item) { + $list.focus(); + } + return true; + }, + /** + * Register cleanup that runs only when this settings page closes. + * @param {()=>void} callback + */ + onClose(callback) { + if (typeof callback !== "function") { + throw new TypeError("Settings page close callback must be a function."); + } + closeCallbacks.add(callback); + return () => closeCallbacks.delete(callback); + }, }; } @@ -188,6 +225,7 @@ export default function settingsPage( * @property {string} [searchGroup] * @property {boolean} [checkbox] * @property {boolean} [chevron] + * @property {boolean} [hidden] * @property {string} [prompt] * @property {string} [promptType] * @property {import('dialogs/prompt').PromptOptions} [promptOptions] @@ -203,6 +241,7 @@ export default function settingsPage( function listItems($list, items, callback, options = {}) { const renderedItems = []; const $searchItems = []; + const itemElements = new Map(); const useInfoAsDescription = options.infoAsDescription ?? Boolean(options.valueInTail); const itemByKey = new Map(items.map((item) => [item.key, item])); @@ -219,6 +258,7 @@ function listItems($list, items, callback, options = {}) { insertRenderedItem(renderedItems, item, $item); $item.addEventListener("click", onclick); $searchItems.push($item); + itemElements.set(item.key, $item); }); const topLevelChildren = buildListContent(renderedItems, options); @@ -227,6 +267,7 @@ function listItems($list, items, callback, options = {}) { return { children: topLevelChildren, + itemElements, searchItems: $searchItems, }; @@ -237,6 +278,7 @@ function listItems($list, items, callback, options = {}) { */ async function onclick(e) { const $target = e.currentTarget; + if ($target.hidden) return; const { key } = $target.dataset; const item = itemByKey.get(key); @@ -310,6 +352,7 @@ function createSearchHandler(type, searchItems) { } return searchItems.filter((item) => { + if (item.hidden) return false; const text = item.textContent.toLowerCase(); return text.match(key, "i"); }); @@ -376,6 +419,8 @@ function createListItemElement(item, options, useInfoAsDescription) { ); const searchGroup = item.searchGroup || item.category || options.defaultSearchGroup; + $item.hidden = item.hidden === true; + $item.setAttribute("aria-hidden", String($item.hidden)); if (searchGroup) { $item.dataset.searchGroup = searchGroup; diff --git a/src/handlers/intent.js b/src/handlers/intent.js index a929b46cfa..fc5f5b9cb1 100644 --- a/src/handlers/intent.js +++ b/src/handlers/intent.js @@ -2,7 +2,7 @@ import fsOperation from "fileSystem"; import auth from "lib/auth"; import config from "lib/config"; import openFile from "lib/openFile"; -import { hideAd } from "lib/startAd"; +import { BANNER_SUPPRESSION_REASON, setBannerSuppressed } from "lib/startAd"; import helpers from "utils/helpers"; const handlers = []; @@ -57,8 +57,8 @@ export default async function HandleIntent(intent = {}) { try { const user = await auth.getLoggedInUser(true); if (user.acode_pro) { - hideAd(); config.HAS_PRO = true; + setBannerSuppressed(BANNER_SUPPRESSION_REASON.PRO, true); const settings = document.querySelector( '[data-action="list-item"][data-key="removeads"', ); diff --git a/src/handlers/keyboard.js b/src/handlers/keyboard.js index 32cbb72da8..a41c288fc6 100644 --- a/src/handlers/keyboard.js +++ b/src/handlers/keyboard.js @@ -1,4 +1,4 @@ -import { bannerAd } from "lib/startAd"; +import { setBannerKeyboardVisible } from "lib/startAd"; import { getSystemConfiguration, HARDKEYBOARDHIDDEN_NO, @@ -212,15 +212,5 @@ function focusBlurEditor(keyboardHidden) { * @param {boolean} keyboardHidden */ function toggleBannerAd(keyboardHidden) { - const bannerIsActive = !!bannerAd?.active; - - if ( - !keyboardHidden && - bannerIsActive && - typeof bannerAd?.hide === "function" - ) { - bannerAd.hide(); - } else if (bannerIsActive && typeof bannerAd?.show === "function") { - bannerAd.show(); - } + setBannerKeyboardVisible(!keyboardHidden); } diff --git a/src/lib/adConsentCoordinator.mjs b/src/lib/adConsentCoordinator.mjs new file mode 100644 index 0000000000..5a23de1737 --- /dev/null +++ b/src/lib/adConsentCoordinator.mjs @@ -0,0 +1,102 @@ +export const EMPTY_PRIVACY_STATE = Object.freeze({ + consentStatus: "unknown", + canRequestAds: false, + privacyOptionsRequired: false, +}); + +const VALID_CONSENT_STATUSES = new Set([ + "unknown", + "required", + "notRequired", + "obtained", +]); + +function normalizePrivacyState(state) { + const consentStatus = VALID_CONSENT_STATUSES.has(state?.consentStatus) + ? state.consentStatus + : "unknown"; + + return { + consentStatus, + canRequestAds: state?.canRequestAds === true, + privacyOptionsRequired: state?.privacyOptionsRequired === true, + }; +} + +/** + * Coordinates UMP and ad initialization for one application launch. + * Consent is gathered once, ad initialization is idempotent, and a valid + * previous-session UMP state can be used when the network update fails. + */ +export class AdConsentCoordinator { + #privacy; + #initializeAds; + #onError; + #state = EMPTY_PRIVACY_STATE; + #consentPromise; + #adStartPromise; + #listeners = new Set(); + + constructor({ privacy, initializeAds, onError = console.error }) { + this.#privacy = privacy; + this.#initializeAds = initializeAds; + this.#onError = onError; + } + + get state() { + return { ...this.#state }; + } + + start() { + return (this.#consentPromise ??= this.#gatherAndStart()); + } + + async showPrivacyOptions() { + const state = await this.#privacy.showOptions(); + this.#setState(state); + await this.#startAdsIfAllowed(); + return this.state; + } + + subscribe(listener) { + this.#listeners.add(listener); + listener(this.state); + return () => this.#listeners.delete(listener); + } + + async #gatherAndStart() { + try { + this.#setState(await this.#privacy.gatherConsent()); + } catch (error) { + this.#onError(error); + try { + this.#setState(await this.#privacy.getState()); + } catch (stateError) { + this.#onError(stateError); + this.#setState(EMPTY_PRIVACY_STATE); + } + } + + await this.#startAdsIfAllowed(); + return this.state; + } + + async #startAdsIfAllowed() { + if (!this.#state.canRequestAds) return false; + this.#adStartPromise ??= Promise.resolve().then(this.#initializeAds); + try { + await this.#adStartPromise; + return true; + } catch (error) { + this.#adStartPromise = undefined; + throw error; + } + } + + #setState(state) { + this.#state = normalizePrivacyState(state); + for (const listener of this.#listeners) { + listener(this.state); + } + } +} diff --git a/src/lib/adRewardBannerPolicy.mjs b/src/lib/adRewardBannerPolicy.mjs new file mode 100644 index 0000000000..bc7824358e --- /dev/null +++ b/src/lib/adRewardBannerPolicy.mjs @@ -0,0 +1,158 @@ +import { BANNER_SUPPRESSION_REASON } from "./bannerVisibilityController.mjs"; + +const DEFAULT_MAX_TIMEOUT = 2_147_483_647; + +/** + * Returns whether a normalized reward state still grants ad-free time. + * The clock is injectable so expiry boundaries remain deterministic in tests. + * + * @param {{isActive?:boolean, adFreeUntil?:number} | null | undefined} state + * @param {number} [now] + */ +export function isRewardPassActive(state, now = Date.now()) { + return Boolean(state?.isActive && Number(state.adFreeUntil) > Number(now)); +} + +/** + * Synchronizes the rewarded-pass blocker without affecting any other reason. + * + * @param {{isActive?:boolean, adFreeUntil?:number} | null | undefined} state + * @param {(reason:string, suppressed:boolean)=>void} setBannerSuppressed + * @param {number} [now] + */ +export function syncRewardBannerSuppression( + state, + setBannerSuppressed, + now = Date.now(), +) { + if (typeof setBannerSuppressed !== "function") { + throw new TypeError("A banner suppression updater is required."); + } + + const active = isRewardPassActive(state, now); + setBannerSuppressed(BANNER_SUPPRESSION_REASON.REWARDED_PASS, active); + return active; +} + +/** + * Owns reward-state application, refreshes, and expiry scheduling. Callers keep + * the state storage so existing consumers can continue to read it directly. + * + * @template T + * @param {{ + * loadStatus:()=>Promise, + * normalizeStatus:(status:unknown)=>T, + * getCurrentState:()=>T, + * setCurrentState:(state:T)=>void, + * setBannerSuppressed:(reason:string,suppressed:boolean)=>void, + * emitChange:(state:T)=>void, + * onRefreshError?:(error:unknown)=>void, + * onListenerError?:(error:unknown)=>void, + * onExpiryNotice?:(state:T)=>void, + * now?:()=>number, + * setTimer?:(callback:()=>void,delay:number)=>unknown, + * clearTimer?:(timer:unknown)=>void, + * maxTimeout?:number + * }} options + */ +export function createRewardStateLifecycle({ + loadStatus, + normalizeStatus, + getCurrentState, + setCurrentState, + setBannerSuppressed, + emitChange, + onRefreshError = () => {}, + onListenerError = () => {}, + onExpiryNotice = () => {}, + now = Date.now, + setTimer = setTimeout, + clearTimer = clearTimeout, + maxTimeout = DEFAULT_MAX_TIMEOUT, +}) { + let expiryTimer = null; + let pendingRefresh = Promise.resolve(); + + function clearExpiryTimer() { + if (expiryTimer === null) return; + clearTimer(expiryTimer); + expiryTimer = null; + } + + function scheduleExpiryCheck() { + clearExpiryTimer(); + const currentState = getCurrentState(); + const currentTime = now(); + if (!isRewardPassActive(currentState, currentTime)) return; + + const remainingMs = Number(currentState.adFreeUntil) - currentTime; + expiryTimer = setTimer(() => { + expiryTimer = null; + void startRefresh({ notifyExpiry: true }); + }, Math.min(remainingMs, maxTimeout)); + } + + /** + * @param {T} nextState + * @returns {T} + */ + function applyNormalizedState(nextState) { + setCurrentState(nextState); + syncRewardBannerSuppression(nextState, setBannerSuppressed, now()); + + try { + emitChange(nextState); + } catch (error) { + onListenerError(error); + } + + scheduleExpiryCheck(); + return nextState; + } + + /** + * @param {unknown} status + * @returns {T} + */ + function applyStatus(status) { + return applyNormalizedState(normalizeStatus(status)); + } + + async function refresh({ notifyExpiry = false } = {}) { + let nextState; + try { + nextState = normalizeStatus(await loadStatus()); + } catch (error) { + onRefreshError(error); + return { state: getCurrentState(), refreshed: false }; + } + + applyNormalizedState(nextState); + if (notifyExpiry && nextState.hasPendingExpiryNotice) { + try { + onExpiryNotice(nextState); + } catch (error) { + onListenerError(error); + } + } + return { state: nextState, refreshed: true }; + } + + function startRefresh(options) { + const operation = refresh(options); + pendingRefresh = operation.then( + () => undefined, + () => undefined, + ); + return operation; + } + + return Object.freeze({ + applyStatus, + dispose: clearExpiryTimer, + initialize: () => startRefresh({ notifyExpiry: false }), + refresh: (options) => startRefresh(options), + resume: () => startRefresh({ notifyExpiry: true }), + whenIdle: () => pendingRefresh, + }); +} diff --git a/src/lib/adRewards.js b/src/lib/adRewards.js index 3fc6aff689..b5b0b22e48 100644 --- a/src/lib/adRewards.js +++ b/src/lib/adRewards.js @@ -1,11 +1,14 @@ import toast from "components/toast"; +import { + createRewardStateLifecycle, + isRewardPassActive, +} from "./adRewardBannerPolicy.mjs"; import auth from "./auth"; import config from "./config"; import secureAdRewardState from "./secureAdRewardState"; -import { adUnitIdRewarded, bannerAd } from "./startAd"; +import { adUnitIdRewarded, setBannerSuppressed } from "./startAd"; const ONE_HOUR = 60 * 60 * 1000; -const MAX_TIMEOUT = 2_147_483_647; const REWARDED_RESULT_TIMEOUT_MS = 90 * 1000; const OFFERS = [ @@ -30,7 +33,6 @@ const OFFERS = [ ]; let state = getDefaultState(); -let expiryTimer = null; let activeWatchPromise = null; const listeners = new Set(); @@ -86,13 +88,6 @@ function emitChange() { }); } -function hideActiveBanner() { - if (bannerAd?.active) { - bannerAd.active = false; - bannerAd.hide?.(); - } -} - function notify(title, message, type = "info") { toast(message, 4000); window.acode?.pushNotification?.(title, message, { @@ -127,52 +122,27 @@ function normalizeStatus(status) { }; } -function clearExpiryTimer() { - if (expiryTimer) { - clearTimeout(expiryTimer); - expiryTimer = null; - } -} - -async function refreshState({ notifyExpiry = false } = {}) { - try { - const nextState = normalizeStatus(await secureAdRewardState.getStatus()); +const rewardLifecycle = createRewardStateLifecycle({ + loadStatus: () => secureAdRewardState.getStatus(), + normalizeStatus, + getCurrentState: () => state, + setCurrentState: (nextState) => { state = nextState; - emitChange(); - scheduleExpiryCheck(); - - if (notifyExpiry && nextState.hasPendingExpiryNotice) { - notify( - "Ad-free pass ended", - "Your rewarded ad-free time has expired. You can watch another rewarded ad anytime.", - "warning", - ); - } - - return nextState; - } catch (error) { - console.warn("Failed to refresh rewarded ad state.", error); - return state; - } -} - -function scheduleExpiryCheck() { - clearExpiryTimer(); - if (!state.adFreeUntil) return; - - const remainingMs = state.adFreeUntil - Date.now(); - if (remainingMs <= 0) { - void refreshState({ notifyExpiry: true }); - return; - } - - expiryTimer = setTimeout( - () => { - void refreshState({ notifyExpiry: true }); - }, - Math.min(remainingMs, MAX_TIMEOUT), - ); -} + }, + setBannerSuppressed, + emitChange, + onRefreshError: (error) => + console.warn("Failed to refresh rewarded ad state.", error), + onListenerError: (error) => + console.error("Reward lifecycle listener failed.", error), + onExpiryNotice: () => { + notify( + "Ad-free pass ended", + "Your rewarded ad-free time has expired. You can watch another rewarded ad anytime.", + "warning", + ); + }, +}); async function getRewardIdentity() { try { @@ -259,14 +229,14 @@ async function showRewardedStep(offer, step, sessionId) { export default { async init() { - await refreshState({ notifyExpiry: false }); + await rewardLifecycle.initialize(); }, onChange(listener) { listeners.add(listener); return () => listeners.delete(listener); }, async handleResume() { - await refreshState({ notifyExpiry: true }); + await rewardLifecycle.resume(); }, getState() { return { @@ -309,7 +279,7 @@ export default { return expiryDate.toLocaleString(); }, isAdFreeActive() { - return Boolean(state.isActive && state.adFreeUntil > Date.now()); + return isRewardPassActive(state); }, canShowAds() { return Boolean(!config.HAS_PRO && !this.isAdFreeActive()); @@ -348,7 +318,7 @@ export default { throw new Error(this.getRewardedUnavailableReason()); } - await refreshState({ notifyExpiry: false }); + await rewardLifecycle.refresh({ notifyExpiry: false }); const redemptionStatus = this.canRedeemNow(); if (!redemptionStatus.ok) { throw new Error(redemptionStatus.reason); @@ -376,7 +346,7 @@ export default { } } - const redeemedState = normalizeStatus( + const redeemedState = rewardLifecycle.applyStatus( await secureAdRewardState.redeem(offer.id), ); const grantedDurationMs = @@ -384,11 +354,6 @@ export default { Number(redeemedState.grantedDurationMs) || 0; - state = redeemedState; - emitChange(); - hideActiveBanner(); - scheduleExpiryCheck(); - notify( "Ad-free pass started", `${formatDuration(grantedDurationMs)} unlocked. Ads will stay hidden until ${new Date(redeemedState.adFreeUntil).toLocaleString()}.`, diff --git a/src/lib/bannerVisibilityController.mjs b/src/lib/bannerVisibilityController.mjs new file mode 100644 index 0000000000..c02df5b80b --- /dev/null +++ b/src/lib/bannerVisibilityController.mjs @@ -0,0 +1,161 @@ +/** + * Keeps banner intent separate from transient native visibility. + * + * Pages register once when they request a banner. The active top page, keyboard + * state, and named suppression reasons then determine whether the native banner + * should be visible. + */ +export const BANNER_SUPPRESSION_REASON = Object.freeze({ + PRO: "pro", + REWARDED_PASS: "rewarded-pass", +}); + +export class BannerVisibilityController { + #banner = null; + #registeredPages = new WeakSet(); + #getActivePage; + #observePageChanges; + #stopObserving = null; + #keyboardVisible = false; + #suppressions = new Set(); + #nativeVisible = false; + #scheduledVisible = false; + #operation = Promise.resolve(); + #revision = 0; + #onError; + + constructor({ + getActivePage, + observePageChanges = () => () => {}, + onError = (error) => console.warn("Unable to update banner visibility:", error), + }) { + this.#getActivePage = getActivePage; + this.#observePageChanges = observePageChanges; + this.#onError = onError; + } + + setBanner(banner) { + this.#banner = banner; + this.#nativeVisible = false; + this.#scheduledVisible = false; + this.reconcile(); + } + + registerPage(page) { + if (!page || (typeof page !== "object" && typeof page !== "function")) { + return; + } + + this.#registeredPages.add(page); + this.#startObserving(); + this.reconcile(); + } + + setKeyboardVisible(visible) { + const nextValue = Boolean(visible); + if (this.#keyboardVisible === nextValue) return; + this.#keyboardVisible = nextValue; + this.reconcile(); + } + + setSuppressed(reason, suppressed) { + if (typeof reason !== "string" || !reason.trim()) { + throw new TypeError("Banner suppression reason must be a non-empty string."); + } + + const normalizedReason = reason.trim(); + const shouldSuppress = Boolean(suppressed); + const isSuppressed = this.#suppressions.has(normalizedReason); + if (isSuppressed === shouldSuppress) return; + + if (shouldSuppress) { + this.#suppressions.add(normalizedReason); + } else { + this.#suppressions.delete(normalizedReason); + } + this.reconcile(); + } + + reconcile() { + const activePage = this.#getActivePage?.() ?? null; + const pageRequestsBanner = + this.#suppressions.size === 0 && + activePage !== null && + this.#registeredPages.has(activePage); + const shouldShow = pageRequestsBanner && !this.#keyboardVisible; + + if (this.#banner) { + this.#banner.active = pageRequestsBanner; + } + + this.#queueNativeVisibility(shouldShow); + } + + whenIdle() { + return this.#operation; + } + + dispose() { + this.#stopObserving?.(); + this.#stopObserving = null; + this.#banner = null; + this.#revision++; + } + + #startObserving() { + if (this.#stopObserving) return; + this.#stopObserving = this.#observePageChanges(() => this.reconcile()); + } + + #queueNativeVisibility(shouldShow) { + const banner = this.#banner; + if (!banner || shouldShow === this.#scheduledVisible) return; + + this.#scheduledVisible = shouldShow; + const revision = ++this.#revision; + this.#operation = this.#operation + .catch(this.#onError) + .then(async () => { + if (revision !== this.#revision || banner !== this.#banner) return; + + try { + if (shouldShow) { + await banner.show?.(); + } else { + await banner.hide?.(); + } + this.#nativeVisible = shouldShow; + } catch (error) { + this.#nativeVisible = !shouldShow; + this.#scheduledVisible = !shouldShow; + this.#onError(error); + } + }); + } +} + +function getActivePage() { + if (typeof document === "undefined") return null; + const pages = document.querySelectorAll("wc-page:not(#root)"); + const connectedPages = [...pages].filter((page) => page.isConnected); + return connectedPages[connectedPages.length - 1] ?? null; +} + +function observePageChanges(onChange) { + if ( + typeof document === "undefined" || + !document.body || + typeof MutationObserver === "undefined" + ) { + return () => {}; + } + + const observer = new MutationObserver(onChange); + observer.observe(document.body, { childList: true }); + return () => observer.disconnect(); +} + +export const bannerVisibilityController = new BannerVisibilityController({ + getActivePage, + observePageChanges, +}); diff --git a/src/lib/privacyChoicesController.mjs b/src/lib/privacyChoicesController.mjs new file mode 100644 index 0000000000..9fb3cf9470 --- /dev/null +++ b/src/lib/privacyChoicesController.mjs @@ -0,0 +1,38 @@ +export const PRIVACY_CHOICES_KEY = "privacyChoices"; + +/** + * Keeps the Privacy Choices setting synchronized with the latest UMP state. + * + * @param {{ + * page: { + * setItemVisibility:(key:string, visible:boolean)=>boolean, + * onClose:(callback:()=>void)=>()=>void + * }, + * subscribe:(listener:(state:{privacyOptionsRequired:boolean})=>void)=>()=>void, + * key?:string + * }} options + */ +export function bindPrivacyChoices({ + page, + subscribe, + key = PRIVACY_CHOICES_KEY, +}) { + let active = true; + let unsubscribeState = () => {}; + let unsubscribeClose = () => {}; + + const dispose = () => { + if (!active) return; + active = false; + unsubscribeState(); + unsubscribeClose(); + }; + + unsubscribeState = subscribe((state) => { + if (!active) return; + page.setItemVisibility(key, state?.privacyOptionsRequired === true); + }); + unsubscribeClose = page.onClose(dispose); + + return dispose; +} diff --git a/src/lib/removeAds.js b/src/lib/removeAds.js index 8812ef5570..b825b7aeb0 100644 --- a/src/lib/removeAds.js +++ b/src/lib/removeAds.js @@ -1,6 +1,6 @@ import purchaseListener from "handlers/purchase"; import config from "./config.js"; -import { hideAd } from "./startAd.js"; +import { BANNER_SUPPRESSION_REASON, setBannerSuppressed } from "./startAd.js"; /** * Remove ads after purchase @@ -26,10 +26,10 @@ export default function removeAds() { function onpurchase() { resolve(null); - hideAd(true); // For caching, later verified so no need to worry about localStorage.setItem("acode_pro", "true"); config.HAS_PRO = true; + setBannerSuppressed(BANNER_SUPPRESSION_REASON.PRO, true); toast(strings["thank you :)"]); } }); diff --git a/src/lib/startAd.js b/src/lib/startAd.js index 6da0281d8f..a9dd6a74d5 100644 --- a/src/lib/startAd.js +++ b/src/lib/startAd.js @@ -1,5 +1,15 @@ +import { + AdConsentCoordinator, + EMPTY_PRIVACY_STATE, +} from "./adConsentCoordinator.mjs"; +import { + BANNER_SUPPRESSION_REASON, + bannerVisibilityController, +} from "./bannerVisibilityController.mjs"; import config from "./config"; +export { BANNER_SUPPRESSION_REASON }; + export let adUnitIdBanner = "ca-app-pub-5911839694379275/9157899592"; // Production export let adUnitIdInterstitial = "ca-app-pub-5911839694379275/9570937608"; // Production export let adUnitIdRewarded = "ca-app-pub-5911839694379275/1633667633"; // Production @@ -9,86 +19,139 @@ export let initialized = false; export let bannerAd = null; /** @type {import("plugins/admob/src/www").InterstitialAd} */ export let interstitialAd = null; +let consentCoordinator = null; export default async function startAd() { - if (config.HAS_PRO || typeof admob === "undefined") return; - - if (window.ANDROID_SDK_INT < 29) { - console.warn("AdMob not supported on this Android version, skipping ads"); + if (!canUseAdmob()) { + if ( + !config.HAS_PRO && + typeof admob !== "undefined" && + window.ANDROID_SDK_INT < 29 + ) { + console.warn("AdMob not supported on this Android version, skipping ads"); + } return; } try { - if (!initialized) { - initialized = true; - - if (BuildInfo.buildType === "debug") { - console.info("!!! Using test ads"); - adUnitIdBanner = "ca-app-pub-3940256099942544/6300978111"; // Test - adUnitIdInterstitial = "ca-app-pub-3940256099942544/1033173712"; // Test - adUnitIdRewarded = "ca-app-pub-3940256099942544/5224354917"; // Test - } - } - - const consentStatus = await consent.getConsentStatus(); - if (consentStatus === consent.ConsentStatus.Required) { - await consent.requestInfoUpdate(); - } + await getConsentCoordinator().start(); + } catch (error) { + console.error("Failed to initialize ads:", error); + } +} - const formStatus = await consent.getFormStatus(); - if (formStatus === consent.FormStatus.Available) { - const form = await consent.loadForm(); - form.show(); - } +export function getPrivacyState() { + return consentCoordinator?.state ?? { ...EMPTY_PRIVACY_STATE }; +} - await admob.start(); +/** + * Subscribes to normalized UMP state. The current state is emitted immediately. + * @param {(state:typeof EMPTY_PRIVACY_STATE)=>void} listener + * @returns {()=>void} + */ +export function subscribePrivacyState(listener) { + if (typeof listener !== "function") { + throw new TypeError("Privacy state listener must be a function."); + } - const currentHour = new Date().getHours(); - const isQuietHours = currentHour >= 22 || currentHour < 4; + if (!canUseAdmob()) { + listener(getPrivacyState()); + return () => {}; + } - await admob.configure({ - appMuted: isQuietHours, - appVolume: isQuietHours ? 0.0 : 1.0, - }); + return getConsentCoordinator().subscribe(listener); +} - const banner = new admob.BannerAd({ - adUnitId: adUnitIdBanner, - position: "bottom", - }); +export async function showPrivacyOptions() { + if (!canUseAdmob()) return getPrivacyState(); + return getConsentCoordinator().showPrivacyOptions(); +} - const interstitial = new admob.InterstitialAd({ - adUnitId: adUnitIdInterstitial, - }); +function canUseAdmob() { + return ( + !config.HAS_PRO && + typeof admob !== "undefined" && + window.ANDROID_SDK_INT >= 29 + ); +} - interstitial.load(); +function getConsentCoordinator() { + consentCoordinator ??= new AdConsentCoordinator({ + privacy: admob.privacy, + initializeAds, + onError: (error) => + console.warn("Unable to refresh AdMob consent information:", error), + }); + return consentCoordinator; +} - interstitial.on("dismiss", () => { - interstitial.load(); - }); +async function initializeAds() { + if (initialized) return; - bannerAd = banner; - interstitialAd = interstitial; - window.ad = banner; - window.iad = interstitial; - window.adRewardedUnitId = adUnitIdRewarded; - } catch (error) { - console.error("Failed to initialize ads:", error); - initialized = false; + if (BuildInfo.buildType === "debug") { + console.info("!!! Using test ads"); + adUnitIdBanner = "ca-app-pub-3940256099942544/6300978111"; + adUnitIdInterstitial = "ca-app-pub-3940256099942544/1033173712"; + adUnitIdRewarded = "ca-app-pub-3940256099942544/5224354917"; } + + await admob.start(); + + const currentHour = new Date().getHours(); + const isQuietHours = currentHour >= 22 || currentHour < 4; + + await admob.configure({ + appMuted: isQuietHours, + appVolume: isQuietHours ? 0.0 : 1.0, + }); + + const banner = new admob.BannerAd({ + adUnitId: adUnitIdBanner, + position: "bottom", + }); + const interstitial = new admob.InterstitialAd({ + adUnitId: adUnitIdInterstitial, + }); + + interstitial.load().catch((error) => { + console.warn("Failed to preload interstitial ad:", error); + }); + interstitial.on("dismiss", () => { + interstitial.load().catch((error) => { + console.warn("Failed to reload interstitial ad:", error); + }); + }); + + bannerAd = banner; + interstitialAd = interstitial; + bannerVisibilityController.setBanner(banner); + window.ad = banner; + window.iad = interstitial; + window.adRewardedUnitId = adUnitIdRewarded; + initialized = true; } /** - * Hides the ad - * @param {Boolean} [force=false] + * Adds or removes one independent reason for hiding banner ads. + * @param {string} reason + * @param {boolean} suppressed */ -export function hideAd(force = false) { - if (!bannerAd?.active || typeof bannerAd.hide !== "function") return; +export function setBannerSuppressed(reason, suppressed) { + bannerVisibilityController.setSuppressed(reason, suppressed); +} - const $pages = tag.getAll(".page-replacement"); - const hide = $pages.length === 1; +/** + * Registers a page as eligible to display the shared banner. + * @param {HTMLElement} page + */ +export function requestBannerForPage(page) { + bannerVisibilityController.registerPage(page); +} - if (force || hide) { - bannerAd.active = false; - bannerAd.hide(); - } +/** + * Temporarily suppresses the banner while the soft keyboard is visible. + * @param {boolean} visible + */ +export function setBannerKeyboardVisible(visible) { + bannerVisibilityController.setKeyboardVisible(visible); } diff --git a/src/main.js b/src/main.js index 20a1f52c5f..c29eee8711 100644 --- a/src/main.js +++ b/src/main.js @@ -53,7 +53,10 @@ import openFolder, { addedFolder } from "lib/openFolder"; import { registerPrettierFormatter } from "lib/registerPrettierFormatter"; import restoreFiles from "lib/restoreFiles"; import settings from "lib/settings"; -import startAd, { hideAd } from "lib/startAd"; +import startAd, { + BANNER_SUPPRESSION_REASON, + setBannerSuppressed, +} from "lib/startAd"; import mustache from "mustache"; import themes from "theme/list"; import { initHighlighting } from "utils/codeHighlight"; @@ -428,7 +431,7 @@ async function onLogin() { config.HAS_PRO = true; } if (config.HAS_PRO) { - hideAd(true); + setBannerSuppressed(BANNER_SUPPRESSION_REASON.PRO, true); } } catch (error) { console.error(error); @@ -622,7 +625,6 @@ async function loadApp() { navigator.app.overrideButton("menubutton", true); system.setIntentHandler(intentHandler, intentHandler.onError); system.getCordovaIntent(intentHandler, intentHandler.onError); - setTimeout(showTutorials, 1000); settings.on("update:openFileListPos", () => { setMainMenu(); setFileMenu(); @@ -880,35 +882,6 @@ function createFileMenu({ top, bottom, toggler }) { return $menu; } -async function showTutorials() { - if (window.innerWidth > 750) { - const [{ default: tutorial }, { default: otherSettings }] = - await Promise.all([ - import(/* webpackChunkName: "tutorial" */ "components/tutorial"), - import(/* webpackChunkName: "appSettings" */ "settings/appSettings"), - ]); - tutorial("quicktools-tutorials", (hide) => { - const onclick = () => { - otherSettings(); - hide(); - }; - - return ( -

    - Quicktools has been disabled because it seems like - you are on a bigger screen and probably using a keyboard. To enable - it,{" "} - - click here - {" "} - or press Ctrl + Shift + P and search for{" "} - quicktools. -

    - ); - }); - } -} - function backButtonHandler() { if (keydownState.esc) { keydownState.esc = false; diff --git a/src/pages/about/about.js b/src/pages/about/about.js index 244d97c0e9..2f431af558 100644 --- a/src/pages/about/about.js +++ b/src/pages/about/about.js @@ -4,7 +4,6 @@ import Page from "components/page"; import Reactive from "html-tag-js/reactive"; import actionStack from "lib/actionStack"; import config from "lib/config"; -import { hideAd } from "lib/startAd"; import helpers from "utils/helpers"; export default function AboutInclude() { const $page = Page(strings.about.capitalize()); @@ -115,7 +114,6 @@ export default function AboutInclude() { $page.onhide = function () { actionStack.remove("about"); - hideAd(); }; app.append($page); diff --git a/src/pages/adRewards/index.js b/src/pages/adRewards/index.js index fdf06d15ef..98b80c4331 100644 --- a/src/pages/adRewards/index.js +++ b/src/pages/adRewards/index.js @@ -5,7 +5,6 @@ import loader from "dialogs/loader"; import actionStack from "lib/actionStack"; import adRewards from "lib/adRewards"; import removeAds from "lib/removeAds"; -import { hideAd } from "lib/startAd"; import helpers from "utils/helpers"; let $rewardPage = null; @@ -171,7 +170,6 @@ export default function openAdRewardsPage() { $page.onhide = () => { unsubscribe(); actionStack.remove("ad-rewards"); - helpers.showAd(); $rewardPage = null; }; @@ -180,7 +178,6 @@ export default function openAdRewardsPage() { action: $page.hide, }); - hideAd(true); render(); app.append($page); $rewardPage = $page; diff --git a/src/pages/changelog/changelog.js b/src/pages/changelog/changelog.js index bce569e221..fc694b813b 100644 --- a/src/pages/changelog/changelog.js +++ b/src/pages/changelog/changelog.js @@ -6,7 +6,6 @@ import toast from "components/toast"; import DOMPurify from "dompurify"; import Ref from "html-tag-js/ref"; import actionStack from "lib/actionStack"; -import { hideAd } from "lib/startAd"; import markdownIt from "markdown-it"; import markdownItFootnote from "markdown-it-footnote"; import markdownItTaskLists from "markdown-it-task-lists"; @@ -74,7 +73,6 @@ export default async function Changelog() { $page.onhide = function () { actionStack.remove("changelog"); - hideAd(); }; actionStack.push({ diff --git a/src/pages/customTheme/customTheme.js b/src/pages/customTheme/customTheme.js index ebbd091139..62345166d8 100644 --- a/src/pages/customTheme/customTheme.js +++ b/src/pages/customTheme/customTheme.js @@ -6,7 +6,6 @@ import confirm from "dialogs/confirm"; import select from "dialogs/select"; import actionStack from "lib/actionStack"; import settings from "lib/settings"; -import { hideAd } from "lib/startAd"; import ThemeBuilder from "theme/builder"; import themes from "theme/list"; import { isValidColor } from "utils/color/regex"; @@ -35,7 +34,6 @@ export default function CustomThemeInclude() { $page.onhide = () => { actionStack.remove("custom-theme"); - hideAd(); }; $page.addEventListener("click", handleClick); diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index 30da2e8f00..e977eb59d9 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -21,7 +21,6 @@ import projects from "lib/projects"; import recents from "lib/recents"; import remoteStorage from "lib/remoteStorage"; import appSettings from "lib/settings"; -import { hideAd } from "lib/startAd"; import mimeTypes from "mime-types"; import mustache from "mustache"; import filesSettings from "settings/filesSettings"; @@ -630,7 +629,6 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { $page.onhide = function () { hideSearchBar(); - hideAd(); actionStack.clearFromMark(); actionStack.remove("filebrowser"); $content.removeEventListener("click", handleClick); diff --git a/src/pages/fontManager/fontManager.js b/src/pages/fontManager/fontManager.js index ba191625ac..d615aa1217 100644 --- a/src/pages/fontManager/fontManager.js +++ b/src/pages/fontManager/fontManager.js @@ -13,7 +13,6 @@ import Ref from "html-tag-js/ref"; import actionStack from "lib/actionStack"; import fonts from "lib/fonts"; import appSettings from "lib/settings"; -import { hideAd } from "lib/startAd"; import FileBrowser from "pages/fileBrowser"; import { updateActiveTerminals } from "settings/terminalSettings"; import helpers from "utils/helpers"; @@ -44,7 +43,6 @@ export default function fontManager() { }); $page.onhide = () => { - hideAd(); actionStack.remove("fontManager"); }; diff --git a/src/pages/plugin/plugin.js b/src/pages/plugin/plugin.js index 4788e0b1c7..2503ff9853 100644 --- a/src/pages/plugin/plugin.js +++ b/src/pages/plugin/plugin.js @@ -12,7 +12,7 @@ import customTab from "lib/customTab"; import installPlugin from "lib/installPlugin"; import InstallState from "lib/installState"; import settings from "lib/settings"; -import { hideAd, interstitialAd } from "lib/startAd"; +import { interstitialAd } from "lib/startAd"; import markdownIt from "markdown-it"; import anchor from "markdown-it-anchor"; import markdownItFootnote from "markdown-it-footnote"; @@ -67,7 +67,6 @@ export default async function PluginInclude( }); $page.onhide = function () { - hideAd(); actionStack.remove("plugin"); loader.removeTitleLoader(); cancelled = true; diff --git a/src/pages/plugins/plugins.js b/src/pages/plugins/plugins.js index 8baaa49721..4062a988f2 100644 --- a/src/pages/plugins/plugins.js +++ b/src/pages/plugins/plugins.js @@ -13,7 +13,6 @@ import config from "lib/config"; import installPlugin from "lib/installPlugin"; import loadPlugin from "lib/loadPlugin"; import settings from "lib/settings"; -import { hideAd } from "lib/startAd"; import FileBrowser from "pages/fileBrowser"; import Plugin from "pages/plugin"; import helpers from "utils/helpers"; @@ -233,7 +232,6 @@ export default function PluginsInclude(updates) { }); $page.onhide = function () { - hideAd(); actionStack.remove("plugins"); }; diff --git a/src/pages/problems/problems.js b/src/pages/problems/problems.js index 4471678683..a450cf0d6a 100644 --- a/src/pages/problems/problems.js +++ b/src/pages/problems/problems.js @@ -3,7 +3,6 @@ import { getLspDiagnostics } from "cm/lsp/diagnostics"; import Page from "components/page"; import actionStack from "lib/actionStack"; import EditorFile from "lib/editorFile"; -import { hideAd } from "lib/startAd"; import helpers from "utils/helpers"; export default function Problems() { @@ -54,7 +53,6 @@ export default function Problems() { helpers.showAd(); $page.onhide = function () { - hideAd(); actionStack.remove("problems"); }; diff --git a/src/pages/quickTools/quickTools.js b/src/pages/quickTools/quickTools.js index 6a413195ed..a8d7fee401 100644 --- a/src/pages/quickTools/quickTools.js +++ b/src/pages/quickTools/quickTools.js @@ -3,7 +3,6 @@ import Page from "components/page"; import items, { description } from "components/quickTools/items"; import actionStack from "lib/actionStack"; import settings from "lib/settings"; -import { hideAd } from "lib/startAd"; import helpers from "utils/helpers"; let availableToolsScrollTop = 0; @@ -33,7 +32,6 @@ export default function QuickTools() { $page.onhide = () => { actionStack.remove("quicktools-settings"); - hideAd(); availableToolsScrollTop = manager.getScrollTop(); // Cleanup manager manager.destroy(); diff --git a/src/pages/themeSetting/themeSetting.js b/src/pages/themeSetting/themeSetting.js index b5a3e05bd9..e22081a407 100644 --- a/src/pages/themeSetting/themeSetting.js +++ b/src/pages/themeSetting/themeSetting.js @@ -15,7 +15,6 @@ import actionStack from "lib/actionStack"; import config from "lib/config"; import removeAds from "lib/removeAds"; import appSettings from "lib/settings"; -import { hideAd } from "lib/startAd"; import CustomTheme from "pages/customTheme"; import { updateActiveTerminals } from "settings/terminalSettings"; import ThemeBuilder from "theme/builder"; @@ -72,7 +71,6 @@ export default function () { }); $page.onhide = () => { - hideAd(); actionStack.remove("appTheme"); }; diff --git a/src/plugins/admob/.gitignore b/src/plugins/admob/.gitignore index 39ce03c4bb..10629615dc 100644 --- a/src/plugins/admob/.gitignore +++ b/src/plugins/admob/.gitignore @@ -1,5 +1,6 @@ /esm/ /lib/ -/www/ +/www/* +!/www/admob.js /scripts/*.js /.idea/ diff --git a/src/plugins/admob/package-lock.json b/src/plugins/admob/package-lock.json index d5eab331bd..533c62d7ba 100644 --- a/src/plugins/admob/package-lock.json +++ b/src/plugins/admob/package-lock.json @@ -9,115 +9,18 @@ "version": "2.0.0-alpha.19", "license": "MIT", "devDependencies": { + "@rollup/plugin-commonjs": "25.0.8", + "@rollup/plugin-node-resolve": "15.3.1", + "@rollup/plugin-typescript": "11.1.6", "@types/cordova": "^11.0.3", - "cordova": "12.0.0", - "cordova-plus": "^0.9.4", - "del-cli": "^6.0.0", - "tslib": "^2.8.1" + "rollup": "3.30.0", + "tslib": "^2.8.1", + "typescript": "5.1.6" }, "funding": { "url": "https://admob-plus.github.io/funding" } }, - "node_modules/@frat/envinfo": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@frat/envinfo/-/envinfo-7.10.1.tgz", - "integrity": "sha512-VKnr+cPTohoGI8VBULsuk2Z4FrdhShWBtq40J3MeoFAqEq2sb0E6Lw9mQpVe1tZ3umpBcCDqY56cq2hn9XfVRw==", - "dev": true, - "license": "MIT", - "bin": { - "envinfo": "dist/cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", - "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.2.2" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@isaacs/string-locale-compare": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz", - "integrity": "sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==", - "dev": true, - "license": "ISC" - }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.5.5", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", @@ -125,294 +28,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@netflix/nerror": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@netflix/nerror/-/nerror-1.1.3.tgz", - "integrity": "sha512-b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==", - "dev": true, - "license": "MIT", - "dependencies": { - "assert-plus": "^1.0.0", - "extsprintf": "^1.4.0", - "lodash": "^4.17.15" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@npmcli/arborist": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-6.5.1.tgz", - "integrity": "sha512-cdV8pGurLK0CifZRilMJbm2CZ3H4Snk8PAqOngj5qmgFLjEllMLvScSZ3XKfd+CK8fo/hrPHO9zazy9OYdvmUg==", - "dev": true, - "license": "ISC", - "dependencies": { - "@isaacs/string-locale-compare": "^1.1.0", - "@npmcli/fs": "^3.1.0", - "@npmcli/installed-package-contents": "^2.0.2", - "@npmcli/map-workspaces": "^3.0.2", - "@npmcli/metavuln-calculator": "^5.0.0", - "@npmcli/name-from-folder": "^2.0.0", - "@npmcli/node-gyp": "^3.0.0", - "@npmcli/package-json": "^4.0.0", - "@npmcli/query": "^3.1.0", - "@npmcli/run-script": "^6.0.0", - "bin-links": "^4.0.1", - "cacache": "^17.0.4", - "common-ancestor-path": "^1.0.1", - "hosted-git-info": "^6.1.1", - "json-parse-even-better-errors": "^3.0.0", - "json-stringify-nice": "^1.1.4", - "minimatch": "^9.0.0", - "nopt": "^7.0.0", - "npm-install-checks": "^6.2.0", - "npm-package-arg": "^10.1.0", - "npm-pick-manifest": "^8.0.1", - "npm-registry-fetch": "^14.0.3", - "npmlog": "^7.0.1", - "pacote": "^15.0.8", - "parse-conflict-json": "^3.0.0", - "proc-log": "^3.0.0", - "promise-all-reject-late": "^1.0.0", - "promise-call-limit": "^1.0.2", - "read-package-json-fast": "^3.0.2", - "semver": "^7.3.7", - "ssri": "^10.0.1", - "treeverse": "^3.0.0", - "walk-up-path": "^3.0.1" - }, - "bin": { - "arborist": "bin/index.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/fs": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", - "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", - "dev": true, - "license": "ISC", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/git": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz", - "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/promise-spawn": "^6.0.0", - "lru-cache": "^7.4.4", - "npm-pick-manifest": "^8.0.0", - "proc-log": "^3.0.0", - "promise-inflight": "^1.0.1", - "promise-retry": "^2.0.1", - "semver": "^7.3.5", - "which": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/installed-package-contents": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz", - "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==", - "dev": true, - "license": "ISC", - "dependencies": { - "npm-bundled": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "bin": { - "installed-package-contents": "bin/index.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/map-workspaces": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-3.0.6.tgz", - "integrity": "sha512-tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/name-from-folder": "^2.0.0", - "glob": "^10.2.2", - "minimatch": "^9.0.0", - "read-package-json-fast": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/metavuln-calculator": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-5.0.1.tgz", - "integrity": "sha512-qb8Q9wIIlEPj3WeA1Lba91R4ZboPL0uspzV0F9uwP+9AYMVB2zOoa7Pbk12g6D2NHAinSbHh6QYmGuRyHZ874Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "cacache": "^17.0.0", - "json-parse-even-better-errors": "^3.0.0", - "pacote": "^15.0.0", - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "dev": true, - "license": "MIT", - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@npmcli/name-from-folder": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz", - "integrity": "sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/node-gyp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", - "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/package-json": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-4.0.1.tgz", - "integrity": "sha512-lRCEGdHZomFsURroh522YvA/2cVb9oPIJrjHanCJZkiasz1BzcnLr3tBJhlV7S86MBJBuAQ33is2D60YitZL2Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/git": "^4.1.0", - "glob": "^10.2.2", - "hosted-git-info": "^6.1.1", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", - "proc-log": "^3.0.0", - "semver": "^7.5.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/promise-spawn": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz", - "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==", - "dev": true, - "license": "ISC", - "dependencies": { - "which": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/query": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/query/-/query-3.1.0.tgz", - "integrity": "sha512-C/iR0tk7KSKGldibYIB9x8GtO/0Bd0I2mhOaDb8ucQL/bQVTmGoeREaFj64Z5+iCBRf3dQfed0CjJL7I8iTkiQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "postcss-selector-parser": "^6.0.10" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/run-script": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz", - "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/node-gyp": "^3.0.0", - "@npmcli/promise-spawn": "^6.0.0", - "node-gyp": "^9.0.0", - "read-package-json-fast": "^3.0.0", - "which": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=14" - } - }, "node_modules/@rollup/plugin-commonjs": { "version": "25.0.8", "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.8.tgz", @@ -439,6 +54,23 @@ } } }, + "node_modules/@rollup/plugin-commonjs/node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@rollup/plugin-commonjs/node_modules/brace-expansion": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.3.tgz", + "integrity": "sha512-DRdx5neNsG/QXbniLFWi2YmC/68oeOOmKz6zOjVk6ZS1ZLXgLIKqVEc6hWsmkjBbgii0SwaBTcJ5XKj5gzY/4A==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/@rollup/plugin-commonjs/node_modules/glob": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", @@ -526,9 +158,9 @@ } }, "node_modules/@rollup/pluginutils": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz", - "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.4.0.tgz", + "integrity": "sha512-MfPp06CjRLfXQ3wY0R8vJDYBy/MvVcc9OulEfR0B8Iv9ko+GCNaRZ+EpJYFl27LhKsZK0o420sYCRHCjfCgeUg==", "dev": true, "license": "MIT", "dependencies": { @@ -548,10409 +180,277 @@ } } }, - "node_modules/@sigstore/bundle": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz", - "integrity": "sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==", + "node_modules/@types/cordova": { + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-11.0.3.tgz", + "integrity": "sha512-kyuRQ40/NWQVhqGIHq78Ehu2Bf9Mlg0LhmSmis6ZFJK7z933FRfYi8tHe/k/0fB+PGfCf95rJC6TO7dopaFvAg==", "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@sigstore/protobuf-specs": "^0.2.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } + "license": "MIT" }, - "node_modules/@sigstore/protobuf-specs": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz", - "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==", + "node_modules/@types/estree": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", + "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } + "license": "MIT" }, - "node_modules/@sigstore/sign": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz", - "integrity": "sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==", + "node_modules/@types/resolve": { + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", + "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@sigstore/bundle": "^1.1.0", - "@sigstore/protobuf-specs": "^0.2.0", - "make-fetch-happen": "^11.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } + "license": "MIT" }, - "node_modules/@sigstore/sign/node_modules/make-fetch-happen": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", - "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "node_modules/commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } + "license": "MIT" }, - "node_modules/@sigstore/sign/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", "dev": true, - "license": "ISC", + "license": "MIT", "engines": { - "node": ">=8" + "node": ">=0.10.0" } }, - "node_modules/@sigstore/sign/node_modules/minipass-fetch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", - "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", "dev": true, "license": "MIT", - "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" + "node": ">= 0.4" } }, - "node_modules/@sigstore/sign/node_modules/minipass-fetch/node_modules/minipass": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", - "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", + "node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", "dev": true, - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=16 || 14 >=14.17" - } + "license": "MIT" }, - "node_modules/@sigstore/tuf": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz", - "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@sigstore/protobuf-specs": "^0.2.0", - "tuf-js": "^1.1.7" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sindresorhus/merge-streams": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz", - "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@socket.io/component-emitter": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz", - "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tootallnate/once": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.1.tgz", - "integrity": "sha512-HqmEUIGRJ5fSXchkVgR5F7qn48bDBzv0kWj/Kfu5e6uci4UlEeng4331LnBkWffb++Ei3FOVLxo8JJWMFBDMeQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tufjs/canonical-json": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz", - "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@tufjs/models": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz", - "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@tufjs/canonical-json": "1.0.0", - "minimatch": "^9.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@types/cordova": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-11.0.3.tgz", - "integrity": "sha512-kyuRQ40/NWQVhqGIHq78Ehu2Bf9Mlg0LhmSmis6ZFJK7z933FRfYi8tHe/k/0fB+PGfCf95rJC6TO7dopaFvAg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/cors": { - "version": "2.8.19", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz", - "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/estree": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", - "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/node": { - "version": "20.19.41", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.41.tgz", - "integrity": "sha512-ECymXOukMnOoVkC2bb1Vc/w/836DXncOg5m8Xj1RH7xSHZJWNYY6Zh7EH477vcnD5egKNNfy2RpNOmuChhFPgQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.21.0" - } - }, - "node_modules/@types/resolve": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", - "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/ws": { - "version": "8.18.1", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz", - "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@xmldom/xmldom": { - "version": "0.9.10", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.10.tgz", - "integrity": "sha512-A9gOqLdi6cV4ibazAjcQufGj0B1y/vDqYrcuP6d/6x8P27gRS8643Dj9o1dEKtB6O7fwxb2FgBmJS2mX7gpvdw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.6" - } - }, - "node_modules/abbrev": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "dev": true, - "license": "MIT", - "dependencies": { - "event-target-shim": "^5.0.0" - }, - "engines": { - "node": ">=6.5" - } - }, - "node_modules/accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/accepts/node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/agent-base/node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/agent-base/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/agentkeepalive": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz", - "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "humanize-ms": "^1.2.1" - }, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "license": "MIT", - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ajv": { - "version": "8.20.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", - "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ajv-formats": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", - "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^8.0.0" - }, - "peerDependencies": { - "ajv": "^8.0.0" - }, - "peerDependenciesMeta": { - "ajv": { - "optional": true - } - } - }, - "node_modules/android-versions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.9.0.tgz", - "integrity": "sha512-13O2B6PQMEM4ej9n13ePRQeckrCoKbZrvuzlLvK+9s2QmncpHDbYzZxhgapN32sJNoifN6VAHexLnd/6CYrs7Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.5.2" - } - }, - "node_modules/ansi": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz", - "integrity": "sha512-iFY7JCgHbepc0b82yLaw4IMortylNb6wG4kL+4R0C3iv6i+RHGHux/yUX5BTiRvSX/shMnngjR1YyNMnXEFh5A==", - "dev": true, - "license": "MIT" - }, - "node_modules/ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "license": "ISC", - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/anymatch/node_modules/picomatch": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", - "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/aproba": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz", - "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==", - "dev": true, - "license": "ISC" - }, - "node_modules/arch": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz", - "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/are-we-there-yet": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.2.tgz", - "integrity": "sha512-ncSWAawFhKMJDTdoAeOV+jyW1VCMj5QIAwULIBV0SSR7B/RLPPEQiknKcg/RIIZlUQrxELpsxMiTUoAQ4sIUyg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "dev": true, - "license": "MIT" - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/asn1": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", - "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": "~2.1.0" - } - }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "lodash": "^4.17.14" - } - }, - "node_modules/async-each-series": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz", - "integrity": "sha512-p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/atomic-sleep": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz", - "integrity": "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/atomically": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz", - "integrity": "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.12.0" - } - }, - "node_modules/aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "*" - } - }, - "node_modules/aws4": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz", - "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==", - "dev": true, - "license": "MIT" - }, - "node_modules/axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "dev": true, - "license": "MIT", - "dependencies": { - "follow-redirects": "^1.14.0" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/base64id": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", - "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^4.5.0 || >= 5.9" - } - }, - "node_modules/batch": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", - "dev": true, - "license": "MIT" - }, - "node_modules/bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "tweetnacl": "^0.14.3" - } - }, - "node_modules/big-integer": { - "version": "1.6.52", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz", - "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==", - "dev": true, - "license": "Unlicense", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/bin-links": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.4.tgz", - "integrity": "sha512-cMtq4W5ZsEwcutJrVId+a/tjt8GSbS+h0oNkdl6+6rBuEv8Ot33Bevj5KPm40t309zuhVic8NjpuL42QCiJWWA==", - "dev": true, - "license": "ISC", - "dependencies": { - "cmd-shim": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "read-cmd-shim": "^4.0.0", - "write-file-atomic": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/bin-links/node_modules/write-file-atomic": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", - "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/body-parser": { - "version": "1.20.5", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.5.tgz", - "integrity": "sha512-3grm+/2tUOvu2cjJkvsIxrv/wVpfXQW4PsQHYm7yk4vfpu7Ekl6nEsYBoJUL6qDwZUx8wUhQ8tR2qz+ad9c9OA==", - "dev": true, - "license": "MIT", - "dependencies": { - "bytes": "~3.1.2", - "content-type": "~1.0.5", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "~1.2.0", - "http-errors": "~2.0.1", - "iconv-lite": "~0.4.24", - "on-finished": "~2.4.1", - "qs": "~6.15.1", - "raw-body": "~2.5.3", - "type-is": "~1.6.18", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/bplist-creator": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.1.0.tgz", - "integrity": "sha512-sXaHZicyEEmY86WyueLTQesbeoH/mquvarJaQNbjuOQO+7gbFcDEWqKmcWA4cOTLzFlfgvkiVxolk1k5bBIpmg==", - "dev": true, - "license": "MIT", - "dependencies": { - "stream-buffers": "2.2.x" - } - }, - "node_modules/bplist-parser": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.2.tgz", - "integrity": "sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "big-integer": "1.6.x" - }, - "engines": { - "node": ">= 5.10.0" - } - }, - "node_modules/brace-expansion": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz", - "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "license": "MIT", - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/browser-sync": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.29.3.tgz", - "integrity": "sha512-NiM38O6XU84+MN+gzspVmXV2fTOoe+jBqIBx3IBdhZrdeURr6ZgznJr/p+hQ+KzkKEiGH/GcC4SQFSL0jV49bg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "browser-sync-client": "^2.29.3", - "browser-sync-ui": "^2.29.3", - "bs-recipes": "1.3.4", - "chalk": "4.1.2", - "chokidar": "^3.5.1", - "connect": "3.6.6", - "connect-history-api-fallback": "^1", - "dev-ip": "^1.0.1", - "easy-extender": "^2.3.4", - "eazy-logger": "^4.0.1", - "etag": "^1.8.1", - "fresh": "^0.5.2", - "fs-extra": "3.0.1", - "http-proxy": "^1.18.1", - "immutable": "^3", - "localtunnel": "^2.0.1", - "micromatch": "^4.0.2", - "opn": "5.3.0", - "portscanner": "2.2.0", - "raw-body": "^2.3.2", - "resp-modifier": "6.0.2", - "rx": "4.1.0", - "send": "0.16.2", - "serve-index": "1.9.1", - "serve-static": "1.13.2", - "server-destroy": "1.0.1", - "socket.io": "^4.4.1", - "ua-parser-js": "^1.0.33", - "yargs": "^17.3.1" - }, - "bin": { - "browser-sync": "dist/bin.js" - }, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/browser-sync-client": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.29.3.tgz", - "integrity": "sha512-4tK5JKCl7v/3aLbmCBMzpufiYLsB1+UI+7tUXCCp5qF0AllHy/jAqYu6k7hUF3hYtlClKpxExWaR+rH+ny07wQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "etag": "1.8.1", - "fresh": "0.5.2", - "mitt": "^1.1.3" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/browser-sync-ui": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.29.3.tgz", - "integrity": "sha512-kBYOIQjU/D/3kYtUIJtj82e797Egk1FB2broqItkr3i4eF1qiHbFCG6srksu9gWhfmuM/TNG76jMfzAdxEPakg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "async-each-series": "0.1.1", - "chalk": "4.1.2", - "connect-history-api-fallback": "^1", - "immutable": "^3", - "server-destroy": "1.0.1", - "socket.io-client": "^4.4.1", - "stream-throttle": "^0.1.3" - } - }, - "node_modules/browser-sync/node_modules/fs-extra": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", - "integrity": "sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.2", - "jsonfile": "^3.0.0", - "universalify": "^0.1.0" - } - }, - "node_modules/browser-sync/node_modules/jsonfile": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", - "integrity": "sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==", - "dev": true, - "license": "MIT", - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/browser-sync/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/bs-recipes": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz", - "integrity": "sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw==", - "dev": true, - "license": "ISC" - }, - "node_modules/buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, - "node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/cacache": { - "version": "17.1.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", - "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^7.0.3", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/call-bind": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.9.tgz", - "integrity": "sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==", - "dev": true, - "license": "MIT", - "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" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/call-bound": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", - "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "get-intrinsic": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true, - "license": "MIT" - }, - "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "dev": true, - "license": "MIT", - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "restore-cursor": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/cli-truncate": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", - "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "slice-ansi": "^5.0.0", - "string-width": "^5.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-truncate/node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/cli-truncate/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "license": "MIT" - }, - "node_modules/cli-truncate/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-truncate/node_modules/strip-ansi": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", - "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.2.2" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/cli-width": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", - "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", - "dev": true, - "license": "ISC" - }, - "node_modules/clipboardy": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-3.0.0.tgz", - "integrity": "sha512-Su+uU5sr1jkUy1sGRpLKjKrvEOVXgSgiSInwa/qeID6aJ07yh+5NWc3h2QfjHjBnfX4LhtFcuAWKUsJ3r+fjbg==", - "dev": true, - "license": "MIT", - "dependencies": { - "arch": "^2.2.0", - "execa": "^5.1.1", - "is-wsl": "^2.2.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/cliui/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/cmd-shim": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.3.tgz", - "integrity": "sha512-FMabTRlc5t5zjdenF6mS0MBeFZm0XqHqeOkcskKFb/LYCcRQ5fVgLOHVc4Lq9CqABd9zhjwPjMBCJvMCziSVtA==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "license": "MIT" - }, - "node_modules/color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true, - "license": "ISC", - "bin": { - "color-support": "bin.js" - } - }, - "node_modules/colorette": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", - "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", - "dev": true, - "license": "MIT" - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/common-ancestor-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz", - "integrity": "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==", - "dev": true, - "license": "ISC" - }, - "node_modules/common-path-prefix": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", - "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==", - "dev": true, - "license": "ISC" - }, - "node_modules/commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", - "dev": true, - "license": "MIT" - }, - "node_modules/compressible": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", - "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": ">= 1.43.0 < 2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/compression": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz", - "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==", - "dev": true, - "license": "MIT", - "dependencies": { - "bytes": "3.1.2", - "compressible": "~2.0.18", - "debug": "2.6.9", - "negotiator": "~0.6.4", - "on-headers": "~1.1.0", - "safe-buffer": "5.2.1", - "vary": "~1.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, - "license": "MIT" - }, - "node_modules/conf": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/conf/-/conf-10.2.0.tgz", - "integrity": "sha512-8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^8.6.3", - "ajv-formats": "^2.1.1", - "atomically": "^1.7.0", - "debounce-fn": "^4.0.0", - "dot-prop": "^6.0.1", - "env-paths": "^2.2.1", - "json-schema-typed": "^7.0.3", - "onetime": "^5.1.2", - "pkg-up": "^3.1.0", - "semver": "^7.3.5" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/conf/node_modules/dot-prop": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", - "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/configstore": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", - "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "dot-prop": "^5.2.0", - "graceful-fs": "^4.1.2", - "make-dir": "^3.0.0", - "unique-string": "^2.0.0", - "write-file-atomic": "^3.0.0", - "xdg-basedir": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/connect": { - "version": "3.6.6", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz", - "integrity": "sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "2.6.9", - "finalhandler": "1.1.0", - "parseurl": "~1.3.2", - "utils-merge": "1.0.1" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/connect-history-api-fallback": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", - "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "5.2.1" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", - "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie-signature": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", - "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", - "dev": true, - "license": "MIT" - }, - "node_modules/cordova": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/cordova/-/cordova-12.0.0.tgz", - "integrity": "sha512-D0gGDsaXlmafWxVZExJo6jO8AEVLYBe12Qghjx4zz8XfNhSUe3cInm4TyDZoxB2hFom73eLxIbomYOb0J6tutw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "configstore": "^5.0.1", - "cordova-common": "^5.0.0", - "cordova-create": "^5.0.0", - "cordova-lib": "^12.0.0", - "editor": "^1.0.0", - "execa": "^5.1.1", - "fs-extra": "^11.1.1", - "insight": "^0.11.1", - "loud-rejection": "^2.2.0", - "nopt": "^7.1.0", - "semver": "^7.5.0", - "systeminformation": "^5.17.12" - }, - "bin": { - "cordova": "bin/cordova" - }, - "engines": { - "node": ">=16.13.0" - } - }, - "node_modules/cordova-android": { - "version": "12.0.1", - "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-12.0.1.tgz", - "integrity": "sha512-6fXWoYb/X5AJlluhBg5RvOaX6iRxsvNH7yEOiXzUmLIflf5Ho7LtYCSKZaWMHh3f5cJe/sPCBKmFFBS+EWepVg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "android-versions": "^1.8.1", - "cordova-common": "^5.0.0", - "dedent": "^1.0.1", - "execa": "^5.1.1", - "fast-glob": "^3.2.12", - "fs-extra": "^11.1.1", - "is-path-inside": "^3.0.3", - "nopt": "^7.1.0", - "properties-parser": "^0.3.1", - "semver": "^7.3.8", - "string-argv": "^0.3.1", - "untildify": "^4.0.0", - "which": "^3.0.0" - }, - "engines": { - "node": ">=16.13.0" - } - }, - "node_modules/cordova-android/node_modules/untildify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/cordova-app-hello-world": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-6.0.0.tgz", - "integrity": "sha512-wPZsm+fzNUwdiTRODT+fQuPV410RNmd3Buiw63vT8BPxjC+cn6Bu8emrgwrDM4pbmU5sa5Unwu3xPcbQGQ3G3g==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/cordova-browser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-7.0.0.tgz", - "integrity": "sha512-gNrjlIdtZYaQInPisTpcUdtTSSaYOApa2ew6ALXT9r8ZdsczTAlJigbVzRpOm/EP1HQw6gnMkeQhFZS9RN6nJg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "cordova-common": "^5.0.0", - "cordova-serve": "^4.0.1", - "nopt": "^7.1.0", - "shelljs": "^0.8.5" - }, - "bin": { - "cordova-browser": "bin/create" - }, - "engines": { - "node": ">=16.13.0" - } - }, - "node_modules/cordova-common": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-5.0.1.tgz", - "integrity": "sha512-OA2NQ6wvhNz4GytPYwTdlA9xfG7Yf7ufkj4u97m3rUfoL/AECwwj0GVT2CYpk/0Fk6HyuHA3QYCxfDPYsKzI1A==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@netflix/nerror": "^1.1.3", - "ansi": "^0.3.1", - "bplist-parser": "^0.3.2", - "cross-spawn": "^7.0.6", - "elementtree": "^0.1.7", - "endent": "^2.1.0", - "fast-glob": "^3.3.3", - "lodash.zip": "^4.2.0", - "plist": "^3.1.0", - "q": "^1.5.1", - "read-chunk": "^3.2.0", - "strip-bom": "^4.0.0" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/cordova-create": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-5.0.0.tgz", - "integrity": "sha512-jFc+vbh6Xx2DciI0/RFzLOB0X7YOiiDv9kjDfoq+jqh+TRZDYOuES19F1ZkwgDTJGnwUO0HoMIswiiTy45Royw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "cordova-app-hello-world": "^6.0.0", - "cordova-common": "^5.0.0", - "cordova-fetch": "^4.0.0", - "fs-extra": "^11.1.1", - "globby": "^11.1.0", - "import-fresh": "^3.3.0", - "isobject": "^4.0.0", - "npm-package-arg": "^10.1.0", - "path-is-inside": "^1.0.2", - "tmp": "^0.2.1", - "valid-identifier": "0.0.2" - }, - "engines": { - "node": ">=16.13.0" - } - }, - "node_modules/cordova-fetch": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-4.0.0.tgz", - "integrity": "sha512-aymq5lEwv6Y1n+FYoeRK/fCsyrMP2CBh5lo2o8NUO4MG68ws2QC+C5Xwju9kezQzEatg+9Gg2wrw5kGI+nmhXA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@npmcli/arborist": "^6.2.5", - "cordova-common": "^5.0.0", - "execa": "^5.1.1", - "fs-extra": "^11.1.1", - "npm-package-arg": "^10.1.0", - "pacote": "^15.1.1", - "pify": "^5.0.0", - "resolve": "^1.22.1", - "semver": "^7.3.8", - "which": "^3.0.0" - }, - "engines": { - "node": ">=16.13.0", - "npm": ">=8.1.0" - } - }, - "node_modules/cordova-ios": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-6.3.0.tgz", - "integrity": "sha512-BZybgFzc7D0HmhkTYurFrRXiWgvYohmT7bwQsLPhf+VdiDjwGXbiSWgg3uP9MChvacCNcGXXUl2NhOaNC9UVaA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "cordova-common": "^4.0.2", - "fs-extra": "^9.1.0", - "ios-sim": "^8.0.2", - "nopt": "^5.0.0", - "plist": "^3.0.1", - "semver": "^7.3.4", - "unorm": "^1.6.0", - "which": "^2.0.2", - "xcode": "^3.0.1", - "xml-escape": "^1.1.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/cordova-ios/node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true, - "license": "ISC" - }, - "node_modules/cordova-ios/node_modules/bplist-parser": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", - "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", - "dev": true, - "license": "MIT", - "dependencies": { - "big-integer": "^1.6.44" - }, - "engines": { - "node": ">= 5.10.0" - } - }, - "node_modules/cordova-ios/node_modules/brace-expansion": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", - "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/cordova-ios/node_modules/cordova-common": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-4.1.0.tgz", - "integrity": "sha512-sYfOSfpYGQOmUDlsARUbpT/EvVKT/E+GI3zwTXt+C6DjZ7xs6ZQVHs3umHKSidjf9yVM2LLmvGFpGrGX7aGxug==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@netflix/nerror": "^1.1.3", - "ansi": "^0.3.1", - "bplist-parser": "^0.2.0", - "cross-spawn": "^7.0.1", - "elementtree": "^0.1.7", - "endent": "^1.4.1", - "fast-glob": "^3.2.2", - "fs-extra": "^9.0.0", - "glob": "^7.1.6", - "plist": "^3.0.1", - "q": "^1.5.1", - "read-chunk": "^3.2.0", - "strip-bom": "^4.0.0", - "underscore": "^1.9.2" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/cordova-ios/node_modules/dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true, - "license": "MIT" - }, - "node_modules/cordova-ios/node_modules/endent": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/endent/-/endent-1.4.1.tgz", - "integrity": "sha512-buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "dedent": "^0.7.0", - "fast-json-parse": "^1.0.3", - "objectorarray": "^1.0.4" - } - }, - "node_modules/cordova-ios/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/cordova-ios/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/cordova-ios/node_modules/minimatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", - "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/cordova-ios/node_modules/nopt": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", - "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/cordova-ios/node_modules/underscore": { - "version": "1.13.8", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.8.tgz", - "integrity": "sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/cordova-ios/node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/cordova-lib": { - "version": "12.0.2", - "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-12.0.2.tgz", - "integrity": "sha512-ewel8gaeJNwDr10QPL45tYrG6QPIiNZ25KLU6lb2IfaLeCPtwFTaPq0AvBN5uFpkGr0vRqYRcMX4+RSJ5iqmiw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "cordova-common": "^5.0.0", - "cordova-fetch": "^4.0.0", - "cordova-serve": "^4.0.1", - "dep-graph": "^1.1.0", - "detect-indent": "^6.1.0", - "detect-newline": "^3.1.0", - "elementtree": "^0.1.7", - "execa": "^5.1.1", - "globby": "^11.1.0", - "init-package-json": "^6.0.0", - "md5-file": "^5.0.0", - "semver": "^7.5.0", - "stringify-package": "^1.0.1", - "write-file-atomic": "^5.0.0" - }, - "engines": { - "node": ">=16.13.0" - } - }, - "node_modules/cordova-lib/node_modules/write-file-atomic": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", - "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/cordova-plus": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/cordova-plus/-/cordova-plus-0.9.4.tgz", - "integrity": "sha512-JXpChTMogzAMG4ZT15pfR7bvdhSobS4kF69pjDlwfij/up5/X5jTyxF/eGpXtnUVxgBbMu46IbS4w/+Z/tJQ4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@frat/envinfo": "^7.10.1", - "@npmcli/package-json": "^3.1.1", - "@rollup/plugin-commonjs": "^25.0.2", - "@rollup/plugin-node-resolve": "^15.1.0", - "@rollup/plugin-typescript": "^11.1.1", - "@types/cordova": "^11.0.0", - "@types/node": "^20.3.1", - "browser-sync": "^2.29.3", - "chokidar": "^3.5.3", - "clipboardy": "^3.0.0", - "cordova": "^12.0.0", - "cordova-android": "^12.0.0", - "cordova-browser": "^7.0.0", - "cordova-common": "^5.0.0", - "cordova-ios": "^6.3.0", - "cordova-lib": "^12.0.1", - "cordova-serve": "^4.0.1", - "elementtree": "^0.1.7", - "execa": "^7.1.1", - "fast-glob": "^3.2.12", - "find-cache-dir": "^4.0.0", - "fs-extra": "^11.1.1", - "json-stable-stringify": "^1.0.2", - "listr2": "^6.6.0", - "lodash": "^4.17.21", - "pino": "^8.14.1", - "pino-pretty": "^10.0.0", - "rollup": "^3.25.1", - "semver": "^7.5.2", - "serve-handler": "^6.1.5", - "signal-exit": "^4.0.2", - "tempy": "^3.0.0", - "tslib": "^2.5.3", - "typescript": "~5.1.3", - "ua-parser-js": "^1.0.35", - "untildify": "^5.0.0", - "yargs": "^17.7.2" - }, - "bin": { - "cordova-plus": "lib/cli.js" - }, - "engines": { - "node": ">= 12" - } - }, - "node_modules/cordova-plus/node_modules/@npmcli/package-json": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-3.1.1.tgz", - "integrity": "sha512-+UW0UWOYFKCkvszLoTwrYGrjNrT8tI5Ckeb/h+Z1y1fsNJEctl7HmerA5j2FgmoqFaLI2gsA1X9KgMFqx/bRmA==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/git": "^4.1.0", - "glob": "^10.2.2", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", - "npm-normalize-package-bin": "^3.0.1", - "proc-log": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/cordova-plus/node_modules/execa": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", - "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", - "dev": true, - "license": "MIT", - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.1", - "human-signals": "^4.3.0", - "is-stream": "^3.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^5.1.0", - "onetime": "^6.0.0", - "signal-exit": "^3.0.7", - "strip-final-newline": "^3.0.0" - }, - "engines": { - "node": "^14.18.0 || ^16.14.0 || >=18.0.0" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/cordova-plus/node_modules/execa/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/cordova-plus/node_modules/human-signals": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", - "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=14.18.0" - } - }, - "node_modules/cordova-plus/node_modules/is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cordova-plus/node_modules/mimic-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cordova-plus/node_modules/npm-run-path": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", - "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cordova-plus/node_modules/onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-fn": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cordova-plus/node_modules/path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cordova-plus/node_modules/strip-final-newline": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cordova-serve": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.1.tgz", - "integrity": "sha512-YbfXaZ60yr5dkqmDFQgrU7TSKnzCqYsxHgIUzDeX8RggZb6mz1F9jMfUBbaYyaU7JjcuJ0aoRPYLvwSGQVhGkw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "chalk": "^3.0.0", - "compression": "^1.7.4", - "express": "^4.17.1", - "open": "^7.0.3", - "which": "^2.0.2" - }, - "engines": { - "node": ">= 10", - "npm": ">= 5.6.0" - } - }, - "node_modules/cordova-serve/node_modules/chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cordova-serve/node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/cors": { - "version": "2.8.6", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.6.tgz", - "integrity": "sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==", - "dev": true, - "license": "MIT", - "dependencies": { - "object-assign": "^4", - "vary": "^1" - }, - "engines": { - "node": ">= 0.10" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/cross-spawn/node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/crypto-random-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", - "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true, - "license": "MIT", - "bin": { - "cssesc": "bin/cssesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==", - "dev": true, - "license": "MIT", - "dependencies": { - "array-find-index": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", - "dev": true, - "license": "MIT", - "dependencies": { - "assert-plus": "^1.0.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/dateformat": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz", - "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, - "node_modules/debounce-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz", - "integrity": "sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-fn": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/dedent": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.2.tgz", - "integrity": "sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "babel-plugin-macros": "^3.1.0" - }, - "peerDependenciesMeta": { - "babel-plugin-macros": { - "optional": true - } - } - }, - "node_modules/deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/define-data-property": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", - "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/del": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/del/-/del-8.0.1.tgz", - "integrity": "sha512-gPqh0mKTPvaUZGAuHbrBUYKZWBNAeHG7TU3QH5EhVwPMyKvmfJaNXhcD2jTcXsJRRcffuho4vaYweu80dRrMGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "globby": "^14.0.2", - "is-glob": "^4.0.3", - "is-path-cwd": "^3.0.0", - "is-path-inside": "^4.0.0", - "p-map": "^7.0.2", - "presentable-error": "^0.0.1", - "slash": "^5.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/del-cli": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/del-cli/-/del-cli-6.0.0.tgz", - "integrity": "sha512-9nitGV2W6KLFyya4qYt4+9AKQFL+c0Ehj5K7V7IwlxTc6RMCfQUGY9E9pLG6e8TQjtwXpuiWIGGZb3mfVxyZkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "del": "^8.0.0", - "meow": "^13.2.0" - }, - "bin": { - "del": "cli.js", - "del-cli": "cli.js" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/del/node_modules/globby": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz", - "integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sindresorhus/merge-streams": "^2.1.0", - "fast-glob": "^3.3.3", - "ignore": "^7.0.3", - "path-type": "^6.0.0", - "slash": "^5.1.0", - "unicorn-magic": "^0.3.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/del/node_modules/ignore": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", - "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/del/node_modules/is-path-inside": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz", - "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/del/node_modules/p-map": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz", - "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/del/node_modules/path-type": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz", - "integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/dep-graph": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz", - "integrity": "sha512-/6yUWlSH0Uevjj6HWvO86rDeFzuYfzbaKDqifTEemwfwEPyBrODTb3ox/jFzqmc2+UmgJ3IDMS88BKEBh1Nm2Q==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dev": true, - "dependencies": { - "underscore": "1.2.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/detect-indent": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", - "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/dev-ip": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz", - "integrity": "sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==", - "dev": true, - "bin": { - "dev-ip": "lib/dev-ip.js" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dot-prop": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", - "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true, - "license": "MIT" - }, - "node_modules/easy-extender": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz", - "integrity": "sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==", - "dev": true, - "dependencies": { - "lodash": "^4.17.10" - }, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/eazy-logger": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-4.1.0.tgz", - "integrity": "sha512-+mn7lRm+Zf1UT/YaH8WXtpU6PIV2iOjzP6jgKoiaq/VNrjYKp+OHZGe2znaLgDeFkw8cL9ffuaUm+nNnzcYyGw==", - "dev": true, - "dependencies": { - "chalk": "4.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", - "dev": true, - "license": "MIT", - "dependencies": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "node_modules/editor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz", - "integrity": "sha512-SoRmbGStwNYHgKfjOrX2L0mUvp9bUVv0uPppZSOMAntEbcFtoC3MKF5b3T6HQPXKIV+QGY3xPO3JK5it5lVkuw==", - "dev": true, - "license": "MIT" - }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true, - "license": "MIT" - }, - "node_modules/elementtree": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz", - "integrity": "sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "sax": "1.1.4" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "iconv-lite": "^0.6.2" - } - }, - "node_modules/encoding/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", - "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", - "dev": true, - "license": "MIT", - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/endent": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/endent/-/endent-2.1.0.tgz", - "integrity": "sha512-r8VyPX7XL8U01Xgnb1CjZ3XV+z90cXIJ9JPE/R9SEC9vpw2P6CfsRPJmp20DppC5N7ZAMCmjYkJIa744Iyg96w==", - "dev": true, - "license": "MIT", - "dependencies": { - "dedent": "^0.7.0", - "fast-json-parse": "^1.0.3", - "objectorarray": "^1.0.5" - } - }, - "node_modules/endent/node_modules/dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true, - "license": "MIT" - }, - "node_modules/engine.io": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.7.tgz", - "integrity": "sha512-DgOngfDKM2EviOH3Mr9m7ks1q8roetLy/IMmYthAYzbpInMbYc/GS+fWFA3rl1gvwKVsQrVV61fo5emD1y3OJQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/cors": "^2.8.12", - "@types/node": ">=10.0.0", - "@types/ws": "^8.5.12", - "accepts": "~1.3.4", - "base64id": "2.0.0", - "cookie": "~0.7.2", - "cors": "~2.8.5", - "debug": "~4.4.1", - "engine.io-parser": "~5.2.1", - "ws": "~8.18.3" - }, - "engines": { - "node": ">=10.2.0" - } - }, - "node_modules/engine.io-client": { - "version": "6.6.4", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.4.tgz", - "integrity": "sha512-+kjUJnZGwzewFDw951CDWcwj35vMNf2fcj7xQWOctq1F2i1jkDdVvdFG9kM/BEChymCH36KgjnW0NsL58JYRxw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@socket.io/component-emitter": "~3.1.0", - "debug": "~4.4.1", - "engine.io-parser": "~5.2.1", - "ws": "~8.18.3", - "xmlhttprequest-ssl": "~2.1.1" - } - }, - "node_modules/engine.io-client/node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/engine.io-client/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/engine.io-parser": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz", - "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/engine.io/node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/engine.io/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true, - "license": "MIT" - }, - "node_modules/es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true, - "license": "MIT" - }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true, - "license": "MIT" - }, - "node_modules/etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "dev": true, - "license": "MIT" - }, - "node_modules/events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.x" - } - }, - "node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "license": "MIT", - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/execa/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/exponential-backoff": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz", - "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/express": { - "version": "4.22.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.22.2.tgz", - "integrity": "sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "~1.20.5", - "content-disposition": "~0.5.4", - "content-type": "~1.0.4", - "cookie": "~0.7.1", - "cookie-signature": "~1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.3.1", - "fresh": "~0.5.2", - "http-errors": "~2.0.0", - "merge-descriptors": "1.0.3", - "methods": "~1.1.2", - "on-finished": "~2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "~0.1.12", - "proxy-addr": "~2.0.7", - "qs": "~6.15.1", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "~0.19.0", - "serve-static": "~1.16.2", - "setprototypeof": "1.2.0", - "statuses": "~2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "engines": { - "node": ">= 0.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/express/node_modules/finalhandler": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", - "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "on-finished": "~2.4.1", - "parseurl": "~1.3.3", - "statuses": "~2.0.2", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/express/node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true, - "license": "MIT", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/express/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/express/node_modules/send": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", - "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "~0.5.2", - "http-errors": "~2.0.1", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "~2.4.1", - "range-parser": "~1.2.1", - "statuses": "~2.0.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/express/node_modules/serve-static": { - "version": "1.16.3", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz", - "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", - "dev": true, - "license": "MIT", - "dependencies": { - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "~0.19.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true, - "license": "MIT" - }, - "node_modules/external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "license": "MIT", - "dependencies": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/external-editor/node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "license": "MIT", - "dependencies": { - "os-tmpdir": "~1.0.2" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/extsprintf": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", - "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "license": "MIT" - }, - "node_modules/fast-copy": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-3.0.2.tgz", - "integrity": "sha512-dl0O9Vhju8IrcLndv2eU4ldt1ftXMqqfgN4H1cpmGV7P6jeB9FwpN9a2c8DPGE1Ys88rNUJVYDHq73CGAGOPfQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-glob": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", - "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.8" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fast-json-parse": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz", - "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-redact": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.5.0.tgz", - "integrity": "sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/fast-safe-stringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", - "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", - "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fastify" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/fastify" - } - ], - "license": "BSD-3-Clause" - }, - "node_modules/fastq": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", - "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==", - "dev": true, - "license": "ISC", - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==", - "dev": true, - "license": "MIT", - "dependencies": { - "escape-string-regexp": "^1.0.5" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "license": "MIT", - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/finalhandler": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz", - "integrity": "sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~1.0.1", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "statuses": "~1.3.1", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/finalhandler/node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/finalhandler/node_modules/on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", - "dev": true, - "license": "MIT", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/finalhandler/node_modules/statuses": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", - "integrity": "sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/find-cache-dir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz", - "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==", - "dev": true, - "license": "MIT", - "dependencies": { - "common-path-prefix": "^3.0.0", - "pkg-dir": "^7.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/find-up": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", - "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^7.1.0", - "path-exists": "^5.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/follow-redirects": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz", - "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "license": "MIT", - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, - "node_modules/foreground-child": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", - "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", - "dev": true, - "license": "ISC", - "dependencies": { - "cross-spawn": "^7.0.6", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "*" - } - }, - "node_modules/form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 0.12" - } - }, - "node_modules/forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fs-extra": { - "version": "11.3.5", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.5.tgz", - "integrity": "sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/fs-minipass": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", - "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true, - "license": "ISC" - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gauge": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.2.tgz", - "integrity": "sha512-pMaFftXPtiGIHCJHdcUUx9Rby/rFT/Kkt3fIIGCs+9PMDIljSyRiqraTlxNtBReJRDfUefpa263RQ3vnp5G/LQ==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^4.0.1", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/gauge/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/gauge/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/gauge/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/gauge/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "license": "ISC", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, - "license": "MIT", - "dependencies": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", - "dev": true, - "license": "MIT", - "dependencies": { - "assert-plus": "^1.0.0" - } - }, - "node_modules/glob": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", - "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globby/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=4" - } - }, - "node_modules/har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "deprecated": "this library is no longer supported", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/har-validator/node_modules/ajv": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz", - "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/har-validator/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-define-property": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/hasown": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.3.tgz", - "integrity": "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/help-me": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz", - "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==", - "dev": true, - "license": "MIT" - }, - "node_modules/hosted-git-info": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.3.tgz", - "integrity": "sha512-HVJyzUrLIL1c0QmviVh5E8VGyUS7xCFPS6yydaVd1UegW+ibV/CohqTH9MkOLDp5o+rb82DMo77PTuc9F/8GKw==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/http-cache-semantics": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", - "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", - "dev": true, - "license": "BSD-2-Clause" - }, - "node_modules/http-errors": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", - "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "depd": "~2.0.0", - "inherits": "~2.0.4", - "setprototypeof": "~1.2.0", - "statuses": "~2.0.2", - "toidentifier": "~1.0.1" - }, - "engines": { - "node": ">= 0.8" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/http-proxy": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", - "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "eventemitter3": "^4.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/http-proxy-agent/node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/http-proxy-agent/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - }, - "engines": { - "node": ">=0.8", - "npm": ">=1.3.7" - } - }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/https-proxy-agent/node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/https-proxy-agent/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=10.17.0" - } - }, - "node_modules/humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.0.0" - } - }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "BSD-3-Clause" - }, - "node_modules/ignore": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", - "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/ignore-walk": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz", - "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==", - "dev": true, - "license": "ISC", - "dependencies": { - "minimatch": "^9.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/immutable": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.3.tgz", - "integrity": "sha512-AUY/VyX0E5XlibOmWt10uabJzam1zlYjwiEgQSDc5+UIkFNaF9WM0JxXKaNMGf+F/ffUF+7kRKXM9A7C0xXqMg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/import-fresh": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", - "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true, - "license": "ISC" - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, - "license": "ISC", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/ini": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz", - "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/init-package-json": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-6.0.3.tgz", - "integrity": "sha512-Zfeb5ol+H+eqJWHTaGca9BovufyGeIfr4zaaBorPmJBMrJ+KBnN+kQx2ZtXdsotUTgldHmHQV44xvUWOUA7E2w==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/package-json": "^5.0.0", - "npm-package-arg": "^11.0.0", - "promzard": "^1.0.0", - "read": "^3.0.1", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/init-package-json/node_modules/@npmcli/git": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz", - "integrity": "sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/promise-spawn": "^7.0.0", - "ini": "^4.1.3", - "lru-cache": "^10.0.1", - "npm-pick-manifest": "^9.0.0", - "proc-log": "^4.0.0", - "promise-inflight": "^1.0.1", - "promise-retry": "^2.0.1", - "semver": "^7.3.5", - "which": "^4.0.0" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/init-package-json/node_modules/@npmcli/package-json": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.1.tgz", - "integrity": "sha512-f7zYC6kQautXHvNbLEWgD/uGu1+xCn9izgqBfgItWSx22U0ZDekxN08A1vM8cTxj/cRVe0Q94Ode+tdoYmIOOQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/git": "^5.0.0", - "glob": "^10.2.2", - "hosted-git-info": "^7.0.0", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^6.0.0", - "proc-log": "^4.0.0", - "semver": "^7.5.3" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/init-package-json/node_modules/@npmcli/promise-spawn": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz", - "integrity": "sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "which": "^4.0.0" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/init-package-json/node_modules/hosted-git-info": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz", - "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^10.0.1" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/init-package-json/node_modules/isexe": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz", - "integrity": "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==", - "dev": true, - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=18" - } - }, - "node_modules/init-package-json/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/init-package-json/node_modules/normalize-package-data": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz", - "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "hosted-git-info": "^7.0.0", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/init-package-json/node_modules/npm-package-arg": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz", - "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^7.0.0", - "proc-log": "^4.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/init-package-json/node_modules/npm-pick-manifest": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz", - "integrity": "sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==", - "dev": true, - "license": "ISC", - "dependencies": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^11.0.0", - "semver": "^7.3.5" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/init-package-json/node_modules/proc-log": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", - "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/init-package-json/node_modules/which": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", - "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^3.1.1" - }, - "bin": { - "node-which": "bin/which.js" - }, - "engines": { - "node": "^16.13.0 || >=18.0.0" - } - }, - "node_modules/inquirer": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", - "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-escapes": "^3.2.0", - "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^2.1.0", - "strip-ansi": "^5.1.0", - "through": "^2.3.6" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/inquirer/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/inquirer/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/inquirer/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/inquirer/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true, - "license": "MIT" - }, - "node_modules/inquirer/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/inquirer/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/insight": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/insight/-/insight-0.11.1.tgz", - "integrity": "sha512-TBcZ0qC9dgdmcxL93OoqkY/RZXJtIi0i07phX/QyYk2ysmJtZex59dgTj4Doq50N9CG9dLRe/RIudc/5CCoFNw==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "async": "^2.6.2", - "chalk": "^4.1.1", - "conf": "^10.0.1", - "inquirer": "^6.3.1", - "lodash.debounce": "^4.0.8", - "os-name": "^4.0.1", - "request": "^2.88.0", - "tough-cookie": "^4.0.0", - "uuid": "^8.3.2" - }, - "engines": { - "node": ">=12.20" - } - }, - "node_modules/interpret": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/ios-sim": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/ios-sim/-/ios-sim-8.0.2.tgz", - "integrity": "sha512-P7nEG771bfd+JoMRjnis1gpZOkjTUUxu+4Ek1Z+eoaEEoT9byllU9pxfQ8Df7hL3gSkIQxNwTSLhos2I8tWUQA==", - "dev": true, - "license": "MIT", - "dependencies": { - "bplist-parser": "^0.0.6", - "nopt": "1.0.9", - "plist": "^3.0.1", - "simctl": "^2" - }, - "bin": { - "ios-sim": "bin/ios-sim" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/ios-sim/node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true, - "license": "ISC" - }, - "node_modules/ios-sim/node_modules/bplist-parser": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz", - "integrity": "sha512-fGeghPEH4Eytvf+Mi446aKcDqvkA/+eh6r7QGiZWMQG6TzqrnsToLP379XFfqRSZ41+676hhGIm++maNST1Apw==", - "dev": true, - "license": "MIT" - }, - "node_modules/ios-sim/node_modules/nopt": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.9.tgz", - "integrity": "sha512-CmUZ3rzN0/4kRHum5pGRiGkhmBMzgtEDxrZVHqRJDSv8qK6s+wzaig/xeyB22Due5aZQeTiEZg/nrmMH2tapDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "*" - } - }, - "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 12" - } - }, - "node_modules/ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "license": "MIT", - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-core-module": { - "version": "2.16.2", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz", - "integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==", - "dev": true, - "license": "MIT", - "dependencies": { - "hasown": "^2.0.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true, - "license": "MIT", - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", - "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-number-like": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz", - "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==", - "dev": true, - "license": "ISC", - "dependencies": { - "lodash.isfinite": "^3.3.2" - } - }, - "node_modules/is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-path-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-3.0.0.tgz", - "integrity": "sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-reference": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", - "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/estree": "*" - } - }, - "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-docker": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true, - "license": "MIT" - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, - "license": "ISC" - }, - "node_modules/isobject": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz", - "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==", - "dev": true, - "license": "MIT" - }, - "node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/joycon": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz", - "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - } - }, - "node_modules/jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-parse-even-better-errors": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz", - "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/json-schema": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", - "dev": true, - "license": "(AFL-2.1 OR BSD-3-Clause)" - }, - "node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-schema-typed": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz", - "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A==", - "dev": true, - "license": "BSD-2-Clause" - }, - "node_modules/json-stable-stringify": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.3.0.tgz", - "integrity": "sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind": "^1.0.8", - "call-bound": "^1.0.4", - "isarray": "^2.0.5", - "jsonify": "^0.0.1", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/json-stringify-nice": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz", - "integrity": "sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==", - "dev": true, - "license": "ISC", - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "dev": true, - "license": "ISC" - }, - "node_modules/jsonfile": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz", - "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/jsonify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", - "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", - "dev": true, - "license": "Public Domain", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/jsonparse": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", - "dev": true, - "engines": [ - "node >= 0.2.0" - ], - "license": "MIT" - }, - "node_modules/jsprim": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", - "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", - "dev": true, - "license": "MIT", - "dependencies": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.4.0", - "verror": "1.10.0" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/jsprim/node_modules/extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "license": "MIT" - }, - "node_modules/just-diff": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-6.0.2.tgz", - "integrity": "sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==", - "dev": true, - "license": "MIT" - }, - "node_modules/just-diff-apply": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.5.0.tgz", - "integrity": "sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==", - "dev": true, - "license": "MIT" - }, - "node_modules/limiter": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz", - "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==", - "dev": true - }, - "node_modules/listr2": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz", - "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "cli-truncate": "^3.1.0", - "colorette": "^2.0.20", - "eventemitter3": "^5.0.1", - "log-update": "^5.0.1", - "rfdc": "^1.3.0", - "wrap-ansi": "^8.1.0" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "enquirer": ">= 2.3.0 < 3" - }, - "peerDependenciesMeta": { - "enquirer": { - "optional": true - } - } - }, - "node_modules/listr2/node_modules/eventemitter3": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz", - "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==", - "dev": true, - "license": "MIT" - }, - "node_modules/localtunnel": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz", - "integrity": "sha512-n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug==", - "dev": true, - "license": "MIT", - "dependencies": { - "axios": "0.21.4", - "debug": "4.3.2", - "openurl": "1.1.1", - "yargs": "17.1.1" - }, - "bin": { - "lt": "bin/lt.js" - }, - "engines": { - "node": ">=8.3.0" - } - }, - "node_modules/localtunnel/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/localtunnel/node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "node_modules/localtunnel/node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/localtunnel/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/localtunnel/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "license": "MIT" - }, - "node_modules/localtunnel/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/localtunnel/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/localtunnel/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/localtunnel/node_modules/yargs": { - "version": "17.1.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz", - "integrity": "sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/localtunnel/node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/locate-path": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", - "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-locate": "^6.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lodash": { - "version": "4.18.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", - "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.isfinite": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz", - "integrity": "sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.zip": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz", - "integrity": "sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg==", - "dev": true, - "license": "MIT" - }, - "node_modules/log-update": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz", - "integrity": "sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-escapes": "^5.0.0", - "cli-cursor": "^4.0.0", - "slice-ansi": "^5.0.0", - "strip-ansi": "^7.0.1", - "wrap-ansi": "^8.0.1" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/ansi-escapes": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", - "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^1.0.2" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/log-update/node_modules/cli-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", - "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", - "dev": true, - "license": "MIT", - "dependencies": { - "restore-cursor": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/restore-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", - "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", - "dev": true, - "license": "MIT", - "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/log-update/node_modules/strip-ansi": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", - "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.2.2" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/log-update/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/loud-rejection": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.2.0.tgz", - "integrity": "sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/loud-rejection/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/macos-release": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.1.tgz", - "integrity": "sha512-DXqXhEM7gW59OjZO8NIjBCz9AQ1BEMrfiOAl4AYByHCtVHRF4KoGNO8mqQeM8lRCtQe/UnJ4imO/d2HdkKsd+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/magic-string": { - "version": "0.30.21", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", - "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.5" - } - }, - "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/make-fetch-happen/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/make-fetch-happen/node_modules/minimatch": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", - "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/make-fetch-happen/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/make-fetch-happen/node_modules/ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^3.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/md5-file": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-5.0.0.tgz", - "integrity": "sha512-xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw==", - "dev": true, - "license": "MIT", - "bin": { - "md5-file": "cli.js" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/meow": { - "version": "13.2.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz", - "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/merge-descriptors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", - "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, - "license": "MIT" - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, - "license": "MIT", - "dependencies": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/micromatch/node_modules/picomatch": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", - "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/mime": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", - "dev": true, - "license": "MIT", - "bin": { - "mime": "cli.js" - } - }, - "node_modules/mime-db": { - "version": "1.54.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", - "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types/node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-fn": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz", - "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/minimatch": { - "version": "9.0.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", - "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.2" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minipass": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", - "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", - "dev": true, - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-collect/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/minipass-fetch/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-flush": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.7.tgz", - "integrity": "sha512-TbqTz9cUwWyHS2Dy89P3ocAGUGxKjjLuR9z8w4WUTGAVgEj17/4nhgo2Du56i0Fm3Pm30g4iA8Lcqctc76jCzA==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-flush/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-json-stream": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz", - "integrity": "sha512-myxeeTm57lYs8pH2nxPzmEEg8DGIgW+9mv6D4JZD2pa81I/OBjeU7PtICXV6c9eRGTA5JMDsuIPUZRCyBMYNhg==", - "dev": true, - "license": "MIT", - "dependencies": { - "jsonparse": "^1.3.1", - "minipass": "^3.0.0" - } - }, - "node_modules/minipass-json-stream/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-pipeline/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-sized/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/mitt": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz", - "integrity": "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==", - "dev": true, - "license": "MIT" - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "license": "MIT", - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true, - "license": "MIT" - }, - "node_modules/mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/negotiator": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", - "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/node-gyp": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", - "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^12.13 || ^14.13 || >=16" - } - }, - "node_modules/node-gyp/node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true, - "license": "ISC" - }, - "node_modules/node-gyp/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/node-gyp/node_modules/are-we-there-yet": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", - "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/brace-expansion": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", - "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/node-gyp/node_modules/gauge": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", - "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/node-gyp/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/node-gyp/node_modules/minimatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", - "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/node-gyp/node_modules/nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "license": "ISC", - "dependencies": { - "abbrev": "^1.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/npmlog": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", - "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/node-gyp/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/node-gyp/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/node-gyp/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/node-gyp/node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/nopt": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", - "dev": true, - "license": "ISC", - "dependencies": { - "abbrev": "^2.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/normalize-package-data": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", - "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "hosted-git-info": "^6.0.0", - "is-core-module": "^2.8.1", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/npm-bundled": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", - "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-install-checks": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", - "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "semver": "^7.1.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-normalize-package-bin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", - "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-packlist": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz", - "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "ignore-walk": "^6.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-pick-manifest": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz", - "integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==", - "dev": true, - "license": "ISC", - "dependencies": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^10.0.0", - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch": { - "version": "14.0.5", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz", - "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==", - "dev": true, - "license": "ISC", - "dependencies": { - "make-fetch-happen": "^11.0.0", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-json-stream": "^1.0.1", - "minizlib": "^2.1.2", - "npm-package-arg": "^10.0.0", - "proc-log": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", - "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/npm-registry-fetch/node_modules/minipass-fetch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", - "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/npm-registry-fetch/node_modules/minipass-fetch/node_modules/minipass": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", - "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", - "dev": true, - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/npmlog": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-7.0.1.tgz", - "integrity": "sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "^4.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^5.0.0", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "*" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-inspect": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/objectorarray": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.5.tgz", - "integrity": "sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg==", - "dev": true, - "license": "ISC" - }, - "node_modules/on-exit-leak-free": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz", - "integrity": "sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/on-headers": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz", - "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/onetime/node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/open": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", - "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-docker": "^2.0.0", - "is-wsl": "^2.1.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/openurl": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz", - "integrity": "sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA==", - "dev": true, - "license": "MIT" - }, - "node_modules/opn": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz", - "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-wsl": "^1.1.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/opn/node_modules/is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/os-name": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz", - "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==", - "dev": true, - "license": "MIT", - "dependencies": { - "macos-release": "^2.5.0", - "windows-release": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/p-limit": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", - "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "yocto-queue": "^1.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", - "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/package-json-from-dist": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", - "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", - "dev": true, - "license": "BlueOak-1.0.0" - }, - "node_modules/pacote": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz", - "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/git": "^4.0.0", - "@npmcli/installed-package-contents": "^2.0.1", - "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/run-script": "^6.0.0", - "cacache": "^17.0.0", - "fs-minipass": "^3.0.0", - "minipass": "^5.0.0", - "npm-package-arg": "^10.0.0", - "npm-packlist": "^7.0.0", - "npm-pick-manifest": "^8.0.0", - "npm-registry-fetch": "^14.0.0", - "proc-log": "^3.0.0", - "promise-retry": "^2.0.1", - "read-package-json": "^6.0.0", - "read-package-json-fast": "^3.0.0", - "sigstore": "^1.3.0", - "ssri": "^10.0.0", - "tar": "^6.1.11" - }, - "bin": { - "pacote": "lib/bin.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "license": "MIT", - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-conflict-json": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz", - "integrity": "sha512-01TvEktc68vwbJOtWZluyWeVGWjP+bZwXtPDMQVbBKzbJ/vZBif0L69KH1+cHv1SZ6e0FKLvjyHe8mqsIqYOmw==", - "dev": true, - "license": "ISC", - "dependencies": { - "json-parse-even-better-errors": "^3.0.0", - "just-diff": "^6.0.0", - "just-diff-apply": "^5.2.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/path-exists": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", - "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==", - "dev": true, - "license": "(WTFPL OR MIT)" - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true, - "license": "MIT" - }, - "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/path-to-regexp": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz", - "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==", - "dev": true, - "license": "MIT" - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", - "dev": true, - "license": "MIT" - }, - "node_modules/picomatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", - "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz", - "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pino": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/pino/-/pino-8.21.0.tgz", - "integrity": "sha512-ip4qdzjkAyDDZklUaZkcRFb2iA118H9SgRh8yzTkSQK8HilsOJF7rSY8HoW5+I0M46AZgX/pxbprf2vvzQCE0Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "atomic-sleep": "^1.0.0", - "fast-redact": "^3.1.1", - "on-exit-leak-free": "^2.1.0", - "pino-abstract-transport": "^1.2.0", - "pino-std-serializers": "^6.0.0", - "process-warning": "^3.0.0", - "quick-format-unescaped": "^4.0.3", - "real-require": "^0.2.0", - "safe-stable-stringify": "^2.3.1", - "sonic-boom": "^3.7.0", - "thread-stream": "^2.6.0" - }, - "bin": { - "pino": "bin.js" - } - }, - "node_modules/pino-abstract-transport": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.2.0.tgz", - "integrity": "sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "readable-stream": "^4.0.0", - "split2": "^4.0.0" - } - }, - "node_modules/pino-pretty": { - "version": "10.3.1", - "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-10.3.1.tgz", - "integrity": "sha512-az8JbIYeN/1iLj2t0jR9DV48/LQ3RC6hZPpapKPkb84Q+yTidMCpgWxIT3N0flnBDilyBQ1luWNpOeJptjdp/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "colorette": "^2.0.7", - "dateformat": "^4.6.3", - "fast-copy": "^3.0.0", - "fast-safe-stringify": "^2.1.1", - "help-me": "^5.0.0", - "joycon": "^3.1.1", - "minimist": "^1.2.6", - "on-exit-leak-free": "^2.1.0", - "pino-abstract-transport": "^1.0.0", - "pump": "^3.0.0", - "readable-stream": "^4.0.0", - "secure-json-parse": "^2.4.0", - "sonic-boom": "^3.0.0", - "strip-json-comments": "^3.1.1" - }, - "bin": { - "pino-pretty": "bin.js" - } - }, - "node_modules/pino-std-serializers": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz", - "integrity": "sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA==", - "dev": true, - "license": "MIT" - }, - "node_modules/pkg-dir": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz", - "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==", - "dev": true, - "license": "MIT", - "dependencies": { - "find-up": "^6.3.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-up": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", - "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", - "dev": true, - "license": "MIT", - "dependencies": { - "find-up": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-up/node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-up/node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-up/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-up/node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-up/node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/plist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.1.tgz", - "integrity": "sha512-ZIfcLJC+7E7FBFnDxm9MPmt7D+DidyQ26lewieO75AdhA2ayMtsJSES0iWzqJQbcVRSrTufQoy0DR94xHue0oA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@xmldom/xmldom": "^0.9.10", - "base64-js": "^1.5.1", - "xmlbuilder": "^15.1.1" - }, - "engines": { - "node": ">=10.4.0" - } - }, - "node_modules/portscanner": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.2.0.tgz", - "integrity": "sha512-IFroCz/59Lqa2uBvzK3bKDbDDIEaAY8XJ1jFxcLWTqosrsc32//P4VuSB2vZXoHiHqOmx8B5L5hnKOxL/7FlPw==", - "dev": true, - "license": "MIT", - "dependencies": { - "async": "^2.6.0", - "is-number-like": "^1.0.3" - }, - "engines": { - "node": ">=0.4", - "npm": ">=1.0.0" - } - }, - "node_modules/postcss-selector-parser": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", - "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", - "dev": true, - "license": "MIT", - "dependencies": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/presentable-error": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/presentable-error/-/presentable-error-0.0.1.tgz", - "integrity": "sha512-E6rsNU1QNJgB3sjj7OANinGncFKuK+164sLXw1/CqBjj/EkXSoSdHCtWQGBNlREIGLnL7IEUEGa08YFVUbrhVg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/proc-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", - "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6.0" - } - }, - "node_modules/process-warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-3.0.0.tgz", - "integrity": "sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/promise-all-reject-late": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz", - "integrity": "sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==", - "dev": true, - "license": "ISC", - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/promise-call-limit": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-1.0.2.tgz", - "integrity": "sha512-1vTUnfI2hzui8AEIixbdAJlFY4LFDXqQswy/2eOlThAscXCY4It8FdVuI0fMJGAB2aWGbdQf/gv0skKYXmdrHA==", - "dev": true, - "license": "ISC", - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true, - "license": "ISC" - }, - "node_modules/promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/promzard": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/promzard/-/promzard-1.0.2.tgz", - "integrity": "sha512-2FPputGL+mP3jJ3UZg/Dl9YOkovB7DX0oOr+ck5QbZ5MtORtds8k/BZdn+02peDLI8/YWbmzx34k5fA+fHvCVQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "read": "^3.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/properties-parser": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz", - "integrity": "sha512-AkSQxQAviJ89x4FIxOyHGfO3uund0gvYo7lfD0E+Gp7gFQKrTNgtoYQklu8EhrfHVZUzTwKGZx2r/KDSfnljcA==", - "dev": true, - "license": "MIT", - "dependencies": { - "string.prototype.codepointat": "^0.2.0" - }, - "engines": { - "node": ">= 0.3.1" - } - }, - "node_modules/proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/psl": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz", - "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==", - "dev": true, - "license": "MIT", - "dependencies": { - "punycode": "^2.3.1" - }, - "funding": { - "url": "https://github.com/sponsors/lupomontero" - } - }, - "node_modules/pump": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz", - "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==", - "dev": true, - "license": "MIT", - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", - "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.6.0", - "teleport": ">=0.2.0" - } - }, - "node_modules/qs": { - "version": "6.15.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz", - "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "side-channel": "^1.1.0" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/quick-format-unescaped": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz", - "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==", - "dev": true, - "license": "MIT" - }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/raw-body": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz", - "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==", - "dev": true, - "license": "MIT", - "dependencies": { - "bytes": "~3.1.2", - "http-errors": "~2.0.1", - "iconv-lite": "~0.4.24", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/read": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/read/-/read-3.0.1.tgz", - "integrity": "sha512-SLBrDU/Srs/9EoWhU5GdbAoxG1GzpQHo/6qiGItaoLJ1thmYpcNIM1qISEUvyHBzfGlWIyd6p2DNi1oV1VmAuw==", - "dev": true, - "license": "ISC", - "dependencies": { - "mute-stream": "^1.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-chunk": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz", - "integrity": "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "pify": "^4.0.1", - "with-open-file": "^0.1.6" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/read-chunk/node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/read-cmd-shim": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz", - "integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz", - "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==", - "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^10.2.2", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json-fast": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", - "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", - "dev": true, - "license": "ISC", - "dependencies": { - "json-parse-even-better-errors": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read/node_modules/mute-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", - "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/readable-stream": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", - "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", - "dev": true, - "license": "MIT", - "dependencies": { - "abort-controller": "^3.0.0", - "buffer": "^6.0.3", - "events": "^3.3.0", - "process": "^0.11.10", - "string_decoder": "^1.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "license": "MIT", - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/readdirp/node_modules/picomatch": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", - "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/real-require": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/real-require/-/real-require-0.2.0.tgz", - "integrity": "sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 12.13.0" - } - }, - "node_modules/rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==", - "dev": true, - "dependencies": { - "resolve": "^1.1.6" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/request/node_modules/qs": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.5.tgz", - "integrity": "sha512-mzR4sElr1bfCaPJe7m8ilJ6ZXdDaGoObcYR0ZHSsktM/Lt21MVHj5De30GQH2eiZ1qGRTO7LCAzQsUeXTNexWQ==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/request/node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/request/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", - "dev": true, - "license": "MIT", - "bin": { - "uuid": "bin/uuid" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/resolve": { - "version": "1.22.12", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz", - "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "is-core-module": "^2.16.1", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/resp-modifier": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz", - "integrity": "sha512-U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw==", - "dev": true, - "dependencies": { - "debug": "^2.2.0", - "minimatch": "^3.0.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/resp-modifier/node_modules/brace-expansion": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", - "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/resp-modifier/node_modules/minimatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", - "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/restore-cursor/node_modules/mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/restore-cursor/node_modules/onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-fn": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/restore-cursor/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/reusify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", - "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", - "dev": true, - "license": "MIT", - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rfdc": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", - "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", - "dev": true, - "license": "MIT" - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/brace-expansion": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", - "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/rimraf/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/minimatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", - "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/rollup": { - "version": "3.30.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.30.0.tgz", - "integrity": "sha512-kQvGasUgN+AlWGliFn2POSajRQEsULVYFGTvOZmK06d7vCD+YhZztt70kGk3qaeAXeWYL5eO7zx+rAubBc55eA==", - "dev": true, - "license": "MIT", - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=14.18.0", - "npm": ">=8.0.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/rx": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz", - "integrity": "sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/rxjs/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true, - "license": "0BSD" - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/safe-stable-stringify": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz", - "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - } - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, - "license": "MIT" - }, - "node_modules/sax": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz", - "integrity": "sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg==", - "dev": true, - "license": "ISC" - }, - "node_modules/secure-json-parse": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz", - "integrity": "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/send": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", - "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "~1.6.2", - "mime": "1.4.1", - "ms": "2.0.0", - "on-finished": "~2.3.0", - "range-parser": "~1.2.0", - "statuses": "~1.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/send/node_modules/depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/send/node_modules/destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==", - "dev": true, - "license": "MIT" - }, - "node_modules/send/node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/send/node_modules/http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", - "dev": true, - "license": "MIT", - "dependencies": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/send/node_modules/inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", - "dev": true, - "license": "ISC" - }, - "node_modules/send/node_modules/on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", - "dev": true, - "license": "MIT", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/send/node_modules/setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/send/node_modules/statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/serve-handler": { - "version": "6.1.7", - "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.7.tgz", - "integrity": "sha512-CinAq1xWb0vR3twAv9evEU8cNWkXCb9kd5ePAHUKJBkOsUpR1wt/CvGdeca7vqumL1U5cSaeVQ6zZMxiJ3yWsg==", - "dev": true, - "license": "MIT", - "dependencies": { - "bytes": "3.0.0", - "content-disposition": "0.5.2", - "mime-types": "2.1.18", - "minimatch": "3.1.5", - "path-is-inside": "1.0.2", - "path-to-regexp": "3.3.0", - "range-parser": "1.2.0" - } - }, - "node_modules/serve-handler/node_modules/brace-expansion": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", - "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/serve-handler/node_modules/bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/serve-handler/node_modules/content-disposition": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "integrity": "sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/serve-handler/node_modules/mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/serve-handler/node_modules/mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "~1.33.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/serve-handler/node_modules/minimatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", - "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/serve-handler/node_modules/path-to-regexp": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.3.0.tgz", - "integrity": "sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==", - "dev": true, - "license": "MIT" - }, - "node_modules/serve-handler/node_modules/range-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "integrity": "sha512-kA5WQoNVo4t9lNx2kQNFCxKeBl5IbbSNBl1M/tLkw9WCn+hxNBAW5Qh8gdhs63CJnhjJ2zQWFoqPJP2sK1AV5A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==", - "dev": true, - "license": "MIT", - "dependencies": { - "accepts": "~1.3.4", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/serve-index/node_modules/depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/serve-index/node_modules/http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", - "dev": true, - "license": "MIT", - "dependencies": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/serve-index/node_modules/inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", - "dev": true, - "license": "ISC" - }, - "node_modules/serve-index/node_modules/setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/serve-index/node_modules/statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/serve-static": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", - "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", - "dev": true, - "license": "MIT", - "dependencies": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.2", - "send": "0.16.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/serve-static/node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/server-destroy": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz", - "integrity": "sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true, - "license": "ISC" - }, - "node_modules/set-function-length": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", - "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", - "dev": true, - "license": "MIT", - "dependencies": { - "define-data-property": "^1.1.4", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true, - "license": "ISC" - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/shelljs": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz", - "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" - }, - "bin": { - "shjs": "bin/shjs" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/shelljs/node_modules/brace-expansion": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", - "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/shelljs/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/shelljs/node_modules/minimatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", - "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/side-channel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3", - "side-channel-list": "^1.0.0", - "side-channel-map": "^1.0.1", - "side-channel-weakmap": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-list": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz", - "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", - "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-weakmap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", - "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3", - "side-channel-map": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/sigstore": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz", - "integrity": "sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@sigstore/bundle": "^1.1.0", - "@sigstore/protobuf-specs": "^0.2.0", - "@sigstore/sign": "^1.0.0", - "@sigstore/tuf": "^1.0.3", - "make-fetch-happen": "^11.0.1" - }, - "bin": { - "sigstore": "bin/sigstore.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sigstore/node_modules/make-fetch-happen": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", - "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sigstore/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/sigstore/node_modules/minipass-fetch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", - "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/sigstore/node_modules/minipass-fetch/node_modules/minipass": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", - "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", - "dev": true, - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/simctl": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/simctl/-/simctl-2.0.3.tgz", - "integrity": "sha512-kKCak0yszxHae5eVWcmrjV3ouUGac3sjlhjdLWpyPu4eiQcWoHsCrqS34kkgzHN8Ystqkh/LFjzrldk/g3BYJg==", - "dev": true, - "license": "MIT", - "dependencies": { - "shelljs": "^0.8.5", - "tail": "^0.4.0" - } - }, - "node_modules/simple-plist": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.3.1.tgz", - "integrity": "sha512-iMSw5i0XseMnrhtIzRb7XpQEXepa9xhWxGUojHBL43SIpQuDQkh3Wpy67ZbDzZVr6EKxvwVChnVpdl8hEVLDiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "bplist-creator": "0.1.0", - "bplist-parser": "0.3.1", - "plist": "^3.0.5" - } - }, - "node_modules/simple-plist/node_modules/bplist-parser": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz", - "integrity": "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA==", - "dev": true, - "license": "MIT", - "dependencies": { - "big-integer": "1.6.x" - }, - "engines": { - "node": ">= 5.10.0" - } - }, - "node_modules/slash": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", - "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/slice-ansi": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", - "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.0.0", - "is-fullwidth-code-point": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/slice-ansi/node_modules/ansi-styles": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/smart-buffer": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socket.io": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.3.tgz", - "integrity": "sha512-2Dd78bqzzjE6KPkD5fHZmDAKRNe3J15q+YHDrIsy9WEkqttc7GY+kT9OBLSMaPbQaEd0x1BjcmtMtXkfpc+T5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "accepts": "~1.3.4", - "base64id": "~2.0.0", - "cors": "~2.8.5", - "debug": "~4.4.1", - "engine.io": "~6.6.0", - "socket.io-adapter": "~2.5.2", - "socket.io-parser": "~4.2.4" - }, - "engines": { - "node": ">=10.2.0" - } - }, - "node_modules/socket.io-adapter": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.6.tgz", - "integrity": "sha512-DkkO/dz7MGln0dHn5bmN3pPy+JmywNICWrJqVWiVOyvXjWQFIv9c2h24JrQLLFJ2aQVQf/Cvl1vblnd4r2apLQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "~4.4.1", - "ws": "~8.18.3" - } - }, - "node_modules/socket.io-adapter/node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/socket.io-adapter/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/socket.io-client": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.3.tgz", - "integrity": "sha512-uP0bpjWrjQmUt5DTHq9RuoCBdFJF10cdX9X+a368j/Ft0wmaVgxlrjvK3kjvgCODOMMOz9lcaRzxmso0bTWZ/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@socket.io/component-emitter": "~3.1.0", - "debug": "~4.4.1", - "engine.io-client": "~6.6.1", - "socket.io-parser": "~4.2.4" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/socket.io-client/node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/socket.io-client/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/socket.io-parser": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.6.tgz", - "integrity": "sha512-asJqbVBDsBCJx0pTqw3WfesSY0iRX+2xzWEWzrpcH7L6fLzrhyF8WPI8UaeM4YCuDfpwA/cgsdugMsmtz8EJeg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@socket.io/component-emitter": "~3.1.0", - "debug": "~4.4.1" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/socket.io-parser/node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/socket.io-parser/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/socket.io/node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/socket.io/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/socks": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.9.tgz", - "integrity": "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==", - "dev": true, - "license": "MIT", - "dependencies": { - "ip-address": "^10.1.1", - "smart-buffer": "^4.2.0" - }, - "engines": { - "node": ">= 10.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/socks-proxy-agent/node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/socks-proxy-agent/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/sonic-boom": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.8.1.tgz", - "integrity": "sha512-y4Z8LCDBuum+PBP3lSV7RHrXscqksve/bi0as7mhwVnBW+/wUqKT/2Kb7um8yqcFy0duYbbPxzt89Zy2nOCaxg==", - "dev": true, - "license": "MIT", - "dependencies": { - "atomic-sleep": "^1.0.0" - } - }, - "node_modules/spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-exceptions": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", - "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", - "dev": true, - "license": "CC-BY-3.0" - }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.23", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz", - "integrity": "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==", - "dev": true, - "license": "CC0-1.0" - }, - "node_modules/split2": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", - "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">= 10.x" - } - }, - "node_modules/sshpk": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz", - "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "bin": { - "sshpk-conv": "bin/sshpk-conv", - "sshpk-sign": "bin/sshpk-sign", - "sshpk-verify": "bin/sshpk-verify" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ssri": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", - "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/statuses": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", - "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/stream-buffers": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz", - "integrity": "sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==", - "dev": true, - "license": "Unlicense", - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/stream-throttle": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz", - "integrity": "sha512-889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "commander": "^2.2.0", - "limiter": "^1.0.5" - }, - "bin": { - "throttleproxy": "bin/throttleproxy.js" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string-argv": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", - "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.6.19" - } - }, - "node_modules/string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width/node_modules/ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/string-width/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/string-width/node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/string.prototype.codepointat": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz", - "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==", - "dev": true, - "license": "MIT" - }, - "node_modules/stringify-package": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz", - "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==", - "deprecated": "This module is not used anymore, and has been replaced by @npmcli/package-json", - "dev": true, - "license": "ISC" - }, - "node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/systeminformation": { - "version": "5.31.6", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.31.6.tgz", - "integrity": "sha512-Uv2b2uGGM6ns+26czgW2cYRabYdnswM0ddSOOlryHOaelzsmDSet1iM/NT7VOYxW8x/BW+HkY+b1Ve2pLTSGSA==", - "dev": true, - "license": "MIT", - "os": [ - "darwin", - "linux", - "win32", - "freebsd", - "openbsd", - "netbsd", - "sunos", - "android" - ], - "bin": { - "systeminformation": "lib/cli.js" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "Buy me a coffee", - "url": "https://www.buymeacoffee.com/systeminfo" - } - }, - "node_modules/tail": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/tail/-/tail-0.4.0.tgz", - "integrity": "sha512-i5rOhX0PwkFSbjID14mmuoqrLUIqpJeBwg0esugSbb+6Y+dzgN/O3YZXzzPL7dnQJGbQLs8cwM8Zsak5kFJGcA==", - "dev": true, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/tar/node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/tar/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/temp-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-3.0.0.tgz", - "integrity": "sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.16" - } - }, - "node_modules/tempy": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/tempy/-/tempy-3.2.0.tgz", - "integrity": "sha512-d79HhZya5Djd7am0q+W4RTsSU+D/aJzM+4Y4AGJGuGlgM2L6sx5ZvOYTmZjqPhrDrV6xJTtRSm1JCLj6V6LHLQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-stream": "^3.0.0", - "temp-dir": "^3.0.0", - "type-fest": "^2.12.2", - "unique-string": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/tempy/node_modules/crypto-random-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz", - "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^1.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/tempy/node_modules/crypto-random-string/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/tempy/node_modules/is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/tempy/node_modules/unique-string": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz", - "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "crypto-random-string": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/thread-stream": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-2.7.0.tgz", - "integrity": "sha512-qQiRWsU/wvNolI6tbbCKd9iKaTnCXsTwVxhhKM6nctPdujTyztjlbUkUTUymidWcMnZ5pWR0ej4a0tjsW021vw==", - "dev": true, - "license": "MIT", - "dependencies": { - "real-require": "^0.2.0" - } - }, - "node_modules/through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true, - "license": "MIT" - }, - "node_modules/tmp": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz", - "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.14" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/tough-cookie": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", - "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tough-cookie/node_modules/universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/treeverse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz", - "integrity": "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/tslib": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "dev": true, - "license": "0BSD" - }, - "node_modules/tuf-js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz", - "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@tufjs/models": "1.0.4", - "debug": "^4.3.4", - "make-fetch-happen": "^11.1.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/tuf-js/node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/tuf-js/node_modules/make-fetch-happen": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", - "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/tuf-js/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/tuf-js/node_modules/minipass-fetch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", - "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/tuf-js/node_modules/minipass-fetch/node_modules/minipass": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", - "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", - "dev": true, - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/tuf-js/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", - "dev": true, - "license": "Unlicense" - }, - "node_modules/type-fest": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", - "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-typedarray": "^1.0.0" - } - }, - "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/ua-parser-js": { - "version": "1.0.41", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.41.tgz", - "integrity": "sha512-LbBDqdIC5s8iROCUjMbW1f5dJQTEFB1+KO9ogbvlb3nm9n4YHa5p4KTvFPWvh2Hs8gZMBuiB1/8+pdfe/tDPug==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/ua-parser-js" - }, - { - "type": "paypal", - "url": "https://paypal.me/faisalman" - }, - { - "type": "github", - "url": "https://github.com/sponsors/faisalman" - } - ], - "license": "MIT", - "bin": { - "ua-parser-js": "script/cli.js" - }, - "engines": { - "node": "*" - } - }, - "node_modules/underscore": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz", - "integrity": "sha512-HRhh6FYh5I5/zTt7L9MnHRA/nlSFPiwymMCXEremmzT7tHR+8CNP0FXHPaUpafAPwvAlNrvZiH91kQwoo/CqUA==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/undici-types": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", - "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/unicorn-magic": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz", - "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/unique-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", - "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", - "dev": true, - "license": "MIT", - "dependencies": { - "crypto-random-string": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/unorm": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz", - "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==", - "dev": true, - "license": "MIT or GPL-2.0", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/untildify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-5.0.0.tgz", - "integrity": "sha512-bOgQLUnd2G5rhzaTvh1VCI9Fo6bC5cLTpH17T5aFfamyXFYDbbdzN6IXdeoc3jBS7T9hNTmJtYUzJCJ2Xlc9gA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=16" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true, - "license": "MIT" - }, - "node_modules/utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", - "dev": true, - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/valid-identifier": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.2.tgz", - "integrity": "sha512-zaSmOW6ykXwrkX0YTuFUSoALNEKGaQHpxBJQLb3TXspRNDpBwbfrIQCZqAQ0LKBlKuyn2YOq7NNd6415hvZ33g==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "node_modules/validate-npm-package-name": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", - "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "license": "MIT", - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "node_modules/walk-up-path": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-3.0.1.tgz", - "integrity": "sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==", + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true, "license": "ISC" }, - "node_modules/which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, - "node_modules/windows-release": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz", - "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "execa": "^4.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/windows-release/node_modules/execa": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", - "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", - "dev": true, - "license": "MIT", - "dependencies": { - "cross-spawn": "^7.0.0", - "get-stream": "^5.0.0", - "human-signals": "^1.1.1", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.0", - "onetime": "^5.1.0", - "signal-exit": "^3.0.2", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/windows-release/node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, + "hasInstallScript": true, "license": "MIT", - "dependencies": { - "pump": "^3.0.0" - }, + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, - "node_modules/windows-release/node_modules/human-signals": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", - "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=8.12.0" + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/windows-release/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/with-open-file": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz", - "integrity": "sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==", + "node_modules/hasown": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz", + "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==", "dev": true, "license": "MIT", "dependencies": { - "p-finally": "^1.0.0", - "p-try": "^2.1.0", - "pify": "^4.0.1" + "function-bind": "^1.1.2" }, "engines": { - "node": ">=6" + "node": ">= 0.4" } }, - "node_modules/with-open-file/node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" } }, - "node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } + "license": "ISC" }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "node_modules/is-core-module": { + "version": "2.16.2", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz", + "integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==", "dev": true, "license": "MIT", "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "hasown": "^2.0.3" }, "engines": { - "node": ">=10" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "node_modules/is-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", + "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } + "license": "MIT" }, - "node_modules/wrap-ansi-cjs/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "node_modules/is-reference": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", + "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==", "dev": true, "license": "MIT", - "engines": { - "node": ">=8" + "dependencies": { + "@types/estree": "*" } }, - "node_modules/wrap-ansi-cjs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "node_modules/magic-string": { + "version": "0.30.21", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", + "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", "dev": true, "license": "MIT", "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" + "@jridgewell/sourcemap-codec": "^1.5.5" } }, - "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, - "license": "MIT", + "license": "ISC", "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" + "wrappy": "1" } }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } + "license": "MIT" }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "node_modules/picomatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", + "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", "dev": true, "license": "MIT", "engines": { "node": ">=12" }, "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "license": "MIT" - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "node_modules/resolve": { + "version": "1.22.12", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz", + "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==", "dev": true, "license": "MIT", "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" + "es-errors": "^1.3.0", + "is-core-module": "^2.16.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" }, "engines": { - "node": ">=12" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", - "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "node_modules/rollup": { + "version": "3.30.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.30.0.tgz", + "integrity": "sha512-kQvGasUgN+AlWGliFn2POSajRQEsULVYFGTvOZmK06d7vCD+YhZztt70kGk3qaeAXeWYL5eO7zx+rAubBc55eA==", "dev": true, "license": "MIT", - "dependencies": { - "ansi-regex": "^6.2.2" + "bin": { + "rollup": "dist/bin/rollup" }, "engines": { - "node": ">=12" + "node": ">=14.18.0", + "npm": ">=8.0.0" }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" + "optionalDependencies": { + "fsevents": "~2.3.2" } }, - "node_modules/write-file-atomic/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/ws": { - "version": "8.18.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz", - "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==", + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, "license": "MIT", "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" + "node": ">= 0.4" }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/xcode": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz", - "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==", + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true, - "license": "Apache-2.0", - "dependencies": { - "simple-plist": "^1.1.0", - "uuid": "^7.0.3" - }, - "engines": { - "node": ">=10.0.0" - } + "license": "0BSD" }, - "node_modules/xcode/node_modules/uuid": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz", - "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==", - "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", + "node_modules/typescript": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", + "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", "dev": true, - "license": "MIT", + "license": "Apache-2.0", "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/xdg-basedir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/xml-escape": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.1.0.tgz", - "integrity": "sha512-B/T4sDK8Z6aUh/qNr7mjKAwwncIljFuUP+DO/D5hloYFj+90O88z8Wf7oSucZTHxBAsC1/CTP4rtx/x1Uf72Mg==", - "dev": true, - "license": "MIT License" - }, - "node_modules/xmlbuilder": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", - "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.0" - } - }, - "node_modules/xmlhttprequest-ssl": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz", - "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "license": "ISC" - }, - "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" }, "engines": { - "node": ">=8" + "node": ">=14.17" } }, - "node_modules/yocto-queue": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.2.tgz", - "integrity": "sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==", + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } + "license": "ISC" } } } diff --git a/src/plugins/admob/package.json b/src/plugins/admob/package.json index 0694857b1d..1b6ef08748 100644 --- a/src/plugins/admob/package.json +++ b/src/plugins/admob/package.json @@ -6,18 +6,21 @@ "module": "esm/index.js", "types": "esm/index.d.ts", "scripts": { - "prepublishOnly": "turbo run build", - "build": "cordova-plus plugin build --input=./src/www/admob.ts --lib --esm", - "clean": "del esm lib www", - "version": "cordova-plus plugin version", - "test": "cordova-plus plugin test" + "prepublishOnly": "npm run build", + "build": "node ./scripts/build.mjs", + "clean": "node ./scripts/clean.mjs" }, "devDependencies": { + "@rollup/plugin-commonjs": "25.0.8", + "@rollup/plugin-node-resolve": "15.3.1", + "@rollup/plugin-typescript": "11.1.6", "@types/cordova": "^11.0.3", - "cordova": "12.0.0", - "cordova-plus": "^0.9.4", - "del-cli": "^6.0.0", - "tslib": "^2.8.1" + "rollup": "3.30.0", + "tslib": "^2.8.1", + "typescript": "5.1.6" + }, + "overrides": { + "tar": "^7.5.22" }, "author": "Ratson", "license": "MIT", diff --git a/src/plugins/admob/plugin.xml b/src/plugins/admob/plugin.xml index 71936fae56..9adfe43970 100644 --- a/src/plugins/admob/plugin.xml +++ b/src/plugins/admob/plugin.xml @@ -36,11 +36,15 @@ - + + + + + + + - \ No newline at end of file + diff --git a/src/plugins/admob/scripts/build.mjs b/src/plugins/admob/scripts/build.mjs new file mode 100644 index 0000000000..39e4704997 --- /dev/null +++ b/src/plugins/admob/scripts/build.mjs @@ -0,0 +1,70 @@ +import commonjs from "@rollup/plugin-commonjs"; +import { nodeResolve } from "@rollup/plugin-node-resolve"; +import typescript from "@rollup/plugin-typescript"; +import { execFile } from "node:child_process"; +import { mkdir, readFile, rm, writeFile } from "node:fs/promises"; +import { promisify } from "node:util"; +import { rollup } from "rollup"; + +const run = promisify(execFile); +const external = ["cordova", "cordova/channel", "cordova/exec"]; + +await Promise.all([ + rm("www", { force: true, recursive: true }), + rm("lib", { force: true, recursive: true }), + rm("esm", { force: true, recursive: true }), +]); +await mkdir("www", { recursive: true }); + +const bundle = await rollup({ + input: "./src/www/admob.ts", + external, + plugins: [ + nodeResolve(), + typescript({ + tsconfig: "./tsconfig.rollup.json", + noForceEmit: true, + }), + commonjs(), + ], +}); + +try { + await bundle.write({ + exports: "auto", + file: "www/admob.js", + format: "cjs", + sourcemap: false, + }); +} finally { + await bundle.close(); +} + +const runtimeBundle = await readFile("www/admob.js", "utf8"); +await writeFile("www/admob.js", runtimeBundle.replace(/\r\n?/g, "\n"), "utf8"); + +const tsc = "./node_modules/typescript/bin/tsc"; +await run(process.execPath, [ + tsc, + "-p", + "tsconfig.json", + "--declaration", + "--sourceMap", + "--outDir", + "lib", +]); +await run(process.execPath, [ + tsc, + "-p", + "tsconfig.json", + "--declaration", + "--sourceMap", + "--outDir", + "esm", + "--module", + "ES2022", +]); + +// Rollup 3's plugin graph can retain handles under newer Node releases. +// Every output has been awaited, so terminate deterministically for CI. +process.exit(0); diff --git a/src/plugins/admob/scripts/clean.mjs b/src/plugins/admob/scripts/clean.mjs new file mode 100644 index 0000000000..89d80273e5 --- /dev/null +++ b/src/plugins/admob/scripts/clean.mjs @@ -0,0 +1,7 @@ +import { rm } from "node:fs/promises"; + +await Promise.all( + ["www", "lib", "esm"].map((directory) => + rm(directory, { force: true, recursive: true }), + ), +); diff --git a/src/plugins/admob/src/android/admob-test.gradle b/src/plugins/admob/src/android/admob-test.gradle new file mode 100644 index 0000000000..04166a2b55 --- /dev/null +++ b/src/plugins/admob/src/android/admob-test.gradle @@ -0,0 +1,3 @@ +dependencies { + testImplementation 'junit:junit:4.13.2' +} diff --git a/src/plugins/admob/src/android/cordova/AdMob.kt b/src/plugins/admob/src/android/cordova/AdMob.kt index db3d465c6e..52ecec35d8 100644 --- a/src/plugins/admob/src/android/cordova/AdMob.kt +++ b/src/plugins/admob/src/android/cordova/AdMob.kt @@ -28,11 +28,17 @@ import org.json.JSONObject private const val TAG = "AdMobPlus" +internal fun shouldDispatchAdShow( + isLoaded: Boolean, + canShowWhileLoading: Boolean, +): Boolean = isLoaded || canShowWhileLoading + class AdMob : CordovaPlugin() { lateinit var context: CallbackContext private var readyCallbackContext: CallbackContext? = null private var sdkReady = false private val eventQueue: ArrayList = arrayListOf() + private val privacy: Privacy by lazy { Privacy(this) } private val actions = mapOf( Actions.READY to ::executeReady, @@ -43,6 +49,10 @@ class AdMob : CordovaPlugin() { Actions.AD_LOAD to ::executeAdLoad, Actions.AD_SHOW to ::executeAdShow, Actions.AD_HIDE to ::executeAdHide, + Actions.PRIVACY_GATHER_CONSENT to privacy::gatherConsent, + Actions.PRIVACY_GET_STATE to privacy::getState, + Actions.PRIVACY_RESET_FOR_TESTING to privacy::resetForTesting, + Actions.PRIVACY_SHOW_OPTIONS to privacy::showOptions, Actions.WEBVIEW_GOTO to ::executeWebviewGoto, ) @@ -149,7 +159,7 @@ class AdMob : CordovaPlugin() { private fun executeAdShow(ctx: ExecuteContext) { cordova.activity.runOnUiThread { ctx.optAdOrReject()?.let { ad -> - if (ad.isLoaded) { + if (shouldDispatchAdShow(ad.isLoaded, ad.canShowWhileLoading)) { ad.show(ctx) } else { ctx.resolve(false) diff --git a/src/plugins/admob/src/android/cordova/Generated.kt b/src/plugins/admob/src/android/cordova/Generated.kt index fb81bdccd9..53b3e11bde 100644 --- a/src/plugins/admob/src/android/cordova/Generated.kt +++ b/src/plugins/admob/src/android/cordova/Generated.kt @@ -9,6 +9,10 @@ object Actions { const val AD_SHOW = "adShow" const val BANNER_CONFIG = "bannerConfig" const val CONFIGURE = "configure" + const val PRIVACY_GATHER_CONSENT = "privacyGatherConsent" + const val PRIVACY_GET_STATE = "privacyGetState" + const val PRIVACY_RESET_FOR_TESTING = "privacyResetForTesting" + const val PRIVACY_SHOW_OPTIONS = "privacyShowOptions" const val READY = "ready" const val START = "start" const val WEBVIEW_GOTO = "webviewGoto" @@ -20,6 +24,7 @@ object Events { const val AD_IMPRESSION = "admob.ad.impression" const val AD_LOAD = "admob.ad.load" const val AD_LOAD_FAIL = "admob.ad.loadfail" + const val AD_PAID = "admob.ad.paid" const val AD_REWARD = "admob.ad.reward" const val AD_SHOW = "admob.ad.show" const val AD_SHOW_FAIL = "admob.ad.showfail" diff --git a/src/plugins/admob/src/android/cordova/Privacy.kt b/src/plugins/admob/src/android/cordova/Privacy.kt new file mode 100644 index 0000000000..0d34ccf3c6 --- /dev/null +++ b/src/plugins/admob/src/android/cordova/Privacy.kt @@ -0,0 +1,143 @@ +package admob.plus.cordova + +import admob.plus.core.jsonArray2stringList +import android.content.pm.ApplicationInfo +import com.google.android.ump.ConsentDebugSettings +import com.google.android.ump.ConsentInformation +import com.google.android.ump.ConsentRequestParameters +import com.google.android.ump.UserMessagingPlatform +import org.json.JSONObject + +internal data class PrivacyConsentState( + val consentStatus: String, + val canRequestAds: Boolean, + val privacyOptionsRequired: Boolean, +) { + fun toMap(): Map = mapOf( + "consentStatus" to consentStatus, + "canRequestAds" to canRequestAds, + "privacyOptionsRequired" to privacyOptionsRequired, + ) +} + +internal fun consentStatusName(status: Int): String = when (status) { + ConsentInformation.ConsentStatus.REQUIRED -> "required" + ConsentInformation.ConsentStatus.NOT_REQUIRED -> "notRequired" + ConsentInformation.ConsentStatus.OBTAINED -> "obtained" + else -> "unknown" +} + +internal fun isPrivacyOptionsRequired( + status: ConsentInformation.PrivacyOptionsRequirementStatus +): Boolean = + status == ConsentInformation.PrivacyOptionsRequirementStatus.REQUIRED + +internal fun requireDebugBuild(debuggable: Boolean, hasDebugOptions: Boolean) { + if (hasDebugOptions && !debuggable) { + throw IllegalStateException("UMP debug controls are unavailable in release builds") + } +} + +internal class Privacy(private val plugin: AdMob) { + private val consentInformation: ConsentInformation by lazy { + UserMessagingPlatform.getConsentInformation(plugin.activity) + } + + fun gatherConsent(ctx: ExecuteContext) { + plugin.activity.runOnUiThread { + val parameters = try { + buildRequestParameters(ctx.opts) + } catch (error: IllegalArgumentException) { + return@runOnUiThread ctx.reject(error.message) + } catch (error: IllegalStateException) { + return@runOnUiThread ctx.reject(error.message) + } + + consentInformation.requestConsentInfoUpdate( + plugin.activity, + parameters, + { + UserMessagingPlatform.loadAndShowConsentFormIfRequired( + plugin.activity + ) { formError -> + if (formError != null) { + ctx.reject("UMP ${formError.errorCode}: ${formError.message}") + } else { + ctx.resolve(currentState().toMap()) + } + } + }, + { requestError -> + ctx.reject("UMP ${requestError.errorCode}: ${requestError.message}") + }, + ) + } + } + + fun getState(ctx: ExecuteContext) { + ctx.resolve(currentState().toMap()) + } + + fun showOptions(ctx: ExecuteContext) { + plugin.activity.runOnUiThread { + UserMessagingPlatform.showPrivacyOptionsForm(plugin.activity) { formError -> + if (formError != null) { + ctx.reject("UMP ${formError.errorCode}: ${formError.message}") + } else { + ctx.resolve(currentState().toMap()) + } + } + } + } + + fun resetForTesting(ctx: ExecuteContext) { + try { + requireDebugBuild(isAppDebuggable(), hasDebugOptions = true) + } catch (error: IllegalStateException) { + return ctx.reject(error.message) + } + consentInformation.reset() + ctx.resolve() + } + + private fun currentState() = PrivacyConsentState( + consentStatus = consentStatusName(consentInformation.consentStatus), + canRequestAds = consentInformation.canRequestAds(), + privacyOptionsRequired = isPrivacyOptionsRequired( + consentInformation.privacyOptionsRequirementStatus + ), + ) + + private fun buildRequestParameters(opts: JSONObject): ConsentRequestParameters { + val debugGeography = opts.optString("debugGeography", "disabled") + val testDeviceIds = jsonArray2stringList(opts.optJSONArray("testDeviceIds")) + val hasDebugOptions = debugGeography != "disabled" || testDeviceIds.isNotEmpty() + requireDebugBuild(isAppDebuggable(), hasDebugOptions) + + val builder = ConsentRequestParameters.Builder() + if (hasDebugOptions) { + val debugBuilder = ConsentDebugSettings.Builder(plugin.activity) + val geography = when (debugGeography) { + "disabled" -> + ConsentDebugSettings.DebugGeography.DEBUG_GEOGRAPHY_DISABLED + + "eea" -> + ConsentDebugSettings.DebugGeography.DEBUG_GEOGRAPHY_EEA + + "notEea" -> + ConsentDebugSettings.DebugGeography.DEBUG_GEOGRAPHY_NOT_EEA + + else -> throw IllegalArgumentException( + "Unsupported UMP debug geography: $debugGeography" + ) + } + debugBuilder.setDebugGeography(geography) + testDeviceIds.forEach(debugBuilder::addTestDeviceHashedId) + builder.setConsentDebugSettings(debugBuilder.build()) + } + return builder.build() + } + + private fun isAppDebuggable(): Boolean = + plugin.activity.applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0 +} diff --git a/src/plugins/admob/src/android/cordova/ads/AdBase.kt b/src/plugins/admob/src/android/cordova/ads/AdBase.kt index 76defe4101..0f4a2d708a 100644 --- a/src/plugins/admob/src/android/cordova/ads/AdBase.kt +++ b/src/plugins/admob/src/android/cordova/ads/AdBase.kt @@ -1,6 +1,7 @@ package admob.plus.cordova.ads import admob.plus.cordova.AdMob +import admob.plus.cordova.Events import admob.plus.cordova.ExecuteContext import admob.plus.cordova.ads import admob.plus.core.buildAdRequest @@ -8,6 +9,9 @@ import android.content.res.Configuration import android.view.View import android.view.ViewGroup import com.google.android.gms.ads.AdError +import com.google.android.gms.ads.AdValue +import com.google.android.gms.ads.OnPaidEventListener +import com.google.android.gms.ads.ResponseInfo import com.google.android.gms.ads.rewarded.RewardItem import org.apache.cordova.CordovaWebView import org.json.JSONObject @@ -55,6 +59,9 @@ abstract class AdBase(ctx: ExecuteContext) { open val isLoaded: Boolean get() = TODO("Not yet implemented") + open val canShowWhileLoading: Boolean + get() = false + open fun load(ctx: ExecuteContext) { TODO("Not yet implemented") } @@ -91,4 +98,39 @@ abstract class AdBase(ctx: ExecuteContext) { ) ) } + + fun emitPaidEvent(adFormat: String, value: AdValue, responseInfo: ResponseInfo?) { + val data = mutableMapOf( + "adUnitId" to adUnitId, + "adFormat" to adFormat, + "valueMicros" to value.valueMicros, + "currencyCode" to value.currencyCode, + "precision" to value.precisionType, + ) + responseInfo?.loadedAdapterResponseInfo?.let { adapter -> + data["adSourceName"] = adapter.adSourceName + data["adSourceId"] = adapter.adSourceId + data["adSourceInstanceName"] = adapter.adSourceInstanceName + data["adSourceInstanceId"] = adapter.adSourceInstanceId + } + responseInfo?.responseExtras?.let { extras -> + listOf( + "mediation_group_name" to "mediationGroupName", + "mediation_ab_test_name" to "mediationABTestName", + "mediation_ab_test_variant" to "mediationABTestVariant", + ).forEach { (sourceKey, eventKey) -> + extras.getString(sourceKey)?.let { data[eventKey] = it } + } + } + emit(Events.AD_PAID, data) + } + + fun paidEventListener( + adFormat: String, + responseInfo: () -> ResponseInfo?, + ): OnPaidEventListener = object : OnPaidEventListener { + override fun onPaidEvent(value: AdValue) { + emitPaidEvent(adFormat, value, responseInfo()) + } + } } diff --git a/src/plugins/admob/src/android/cordova/ads/AppOpen.kt b/src/plugins/admob/src/android/cordova/ads/AppOpen.kt index 3443ff82a8..1d875aad57 100644 --- a/src/plugins/admob/src/android/cordova/ads/AppOpen.kt +++ b/src/plugins/admob/src/android/cordova/ads/AppOpen.kt @@ -27,6 +27,8 @@ class AppOpen(ctx: ExecuteContext) : AdBase(ctx) { object : AppOpenAdLoadCallback() { override fun onAdLoaded(ad: AppOpenAd) { mAd = ad + ad.onPaidEventListener = + paidEventListener("appOpen") { ad.responseInfo } ad.fullScreenContentCallback = object : FullScreenContentCallback() { override fun onAdDismissedFullScreenContent() { clear() diff --git a/src/plugins/admob/src/android/cordova/ads/Banner.kt b/src/plugins/admob/src/android/cordova/ads/Banner.kt index 57460f2b8a..79fde7f593 100644 --- a/src/plugins/admob/src/android/cordova/ads/Banner.kt +++ b/src/plugins/admob/src/android/cordova/ads/Banner.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.Gravity import android.view.View import android.view.ViewGroup -import android.view.ViewTreeObserver import android.widget.FrameLayout import android.widget.RelativeLayout import com.google.android.gms.ads.AdListener @@ -17,22 +16,18 @@ import com.google.android.gms.ads.AdSize import com.google.android.gms.ads.AdView import com.google.android.gms.ads.LoadAdError import org.json.JSONObject +import kotlin.math.max enum class AdSizeType { BANNER, LARGE_BANNER, MEDIUM_RECTANGLE, FULL_BANNER, LEADERBOARD, SMART_BANNER; - companion object { - @Suppress("DEPRECATION") - fun getAdSize(adSize: Int): AdSize? { - return when (values()[adSize]) { - BANNER -> AdSize.BANNER - LARGE_BANNER -> AdSize.LARGE_BANNER - MEDIUM_RECTANGLE -> AdSize.MEDIUM_RECTANGLE - FULL_BANNER -> AdSize.FULL_BANNER - LEADERBOARD -> AdSize.LEADERBOARD - SMART_BANNER -> AdSize.SMART_BANNER - } - } + fun getAdSize(): AdSize? = when (this) { + BANNER -> AdSize.BANNER + LARGE_BANNER -> AdSize.LARGE_BANNER + MEDIUM_RECTANGLE -> AdSize.MEDIUM_RECTANGLE + FULL_BANNER -> AdSize.FULL_BANNER + LEADERBOARD -> AdSize.LEADERBOARD + SMART_BANNER -> null } } @@ -46,35 +41,142 @@ fun buildOffset(opts: JSONObject): Int? { } else null } +internal fun resolveBannerBottomMargin( + originalMargin: Int, + requestedVisible: Boolean, + loaded: Boolean, + measuredHeight: Int, +): Int { + val bannerHeight = + if (requestedVisible && loaded) max(0, measuredHeight) else 0 + return originalMargin + bannerHeight +} + +internal enum class BannerLoadState { + IDLE, + LOADING, + LOADED, + FAILED, +} + +internal class BannerLifecycle { + var loadState = BannerLoadState.IDLE + private set + + var requestedVisible = false + private set + + val isLoaded: Boolean + get() = loadState == BannerLoadState.LOADED + + val shouldDisplay: Boolean + get() = requestedVisible && isLoaded + + val shouldKeepActive: Boolean + get() = requestedVisible && + (loadState == BannerLoadState.LOADING || loadState == BannerLoadState.LOADED) + + fun requestLoad(): Boolean { + if (loadState != BannerLoadState.IDLE && loadState != BannerLoadState.FAILED) { + return false + } + + loadState = BannerLoadState.LOADING + return true + } + + fun requestShow(): Boolean { + requestedVisible = true + return requestLoad() + } + + fun requestHide() { + requestedVisible = false + } + + fun markLoaded() { + loadState = BannerLoadState.LOADED + } + + fun markFailed() { + loadState = BannerLoadState.FAILED + } + + fun restartLoad() { + loadState = BannerLoadState.LOADING + } + + fun reset() { + requestedVisible = false + loadState = BannerLoadState.IDLE + } +} + class Banner(ctx: ExecuteContext) : AdBase(ctx) { - private val adSize: AdSize + private var adSize: AdSize private val gravity: Int private val offset: Int? private var mAdView: AdView? = null private var mRelativeLayout: RelativeLayout? = null private var mAdViewOld: AdView? = null + private var pendingLoadEventView: AdView? = null + private val lifecycle = BannerLifecycle() + private var containerWidthInPixels = 0 + private var marginTarget: View? = null + private var originalBottomMargin: Int? = null + private var lastReportedWidth = -1 + private var lastReportedHeight = -1 + + private val bannerLayoutChangeListener = + View.OnLayoutChangeListener { view, left, top, right, bottom, _, _, _, _ -> + val adView = view as? AdView ?: return@OnLayoutChangeListener + if (adView !== mAdView || !lifecycle.isLoaded) { + return@OnLayoutChangeListener + } + + val width = max(0, right - left) + val height = max(0, bottom - top) + updateWebViewBottomMargin(height) + emitMeasuredSize(adView, width, height) + } override val isLoaded: Boolean - get() = mAdView != null + get() = lifecycle.isLoaded + + override val canShowWhileLoading: Boolean + get() = true init { - adSize = buildAdSize(initOpts, ctx.activity) + containerWidthInPixels = currentContainerWidth() + adSize = buildAdSize(initOpts, ctx.activity, containerWidthInPixels) gravity = buildGravity(initOpts) offset = buildOffset(initOpts) } override fun load(ctx: ExecuteContext) { + startLoadIfNeeded(lifecycle.requestLoad()) + ctx.resolve() + } + + private fun startLoadIfNeeded(shouldLoad: Boolean) { + if (!shouldLoad) return + if (mAdView == null) { mAdView = createBannerView() } mAdView!!.loadAd(adRequest) - ctx.resolve() + if (lifecycle.shouldKeepActive) { + mAdView!!.resume() + } } private fun createBannerView(): AdView { val adView = AdView(plugin.activity) adView.adUnitId = adUnitId adView.setAdSize(adSize) + adView.visibility = View.INVISIBLE + adView.addOnLayoutChangeListener(bannerLayoutChangeListener) + adView.onPaidEventListener = paidEventListener("banner") { adView.responseInfo } adView.adListener = object : AdListener() { override fun onAdClicked() { emit(Events.AD_CLICK) @@ -85,6 +187,15 @@ class Banner(ctx: ExecuteContext) : AdBase(ctx) { } override fun onAdFailedToLoad(error: LoadAdError) { + if (adView !== mAdView) return + + lifecycle.markFailed() + pendingLoadEventView = null + if (mAdViewOld != null) { + removeBannerView(mAdViewOld!!) + mAdViewOld = null + } + applyBannerVisibility() emit(Events.AD_LOAD_FAIL, error) } @@ -93,14 +204,15 @@ class Banner(ctx: ExecuteContext) : AdBase(ctx) { } override fun onAdLoaded() { + if (adView !== mAdView) return + + lifecycle.markLoaded() + pendingLoadEventView = adView if (mAdViewOld != null) { removeBannerView(mAdViewOld!!) mAdViewOld = null } - runJustBeforeBeingDrawn(adView) { - emit(Events.BANNER_SIZE, computeAdSize()) - } - emit(Events.AD_LOAD, computeAdSize()) + applyBannerVisibility() } override fun onAdOpened() { @@ -110,59 +222,79 @@ class Banner(ctx: ExecuteContext) : AdBase(ctx) { return adView } - private fun computeAdSize(): Map { - val width = mAdView!!.width - val height = mAdView!!.height + private fun computeAdSize(width: Int, height: Int): Map { + val density = plugin.activity.resources.displayMetrics.density return mapOf( "size" to mapOf( - "width" to pxToDp(width), - "height" to pxToDp(height), + "width" to pxToDp(width, density), + "height" to pxToDp(height, density), "widthInPixels" to width, "heightInPixels" to height, ) ) } + private fun emitMeasuredSize(adView: AdView, width: Int, height: Int) { + if (width <= 0 || height <= 0) return + + val size = computeAdSize(width, height) + if (pendingLoadEventView === adView) { + pendingLoadEventView = null + emit(Events.AD_LOAD, size) + } + + if (width == lastReportedWidth && height == lastReportedHeight) return + lastReportedWidth = width + lastReportedHeight = height + emit(Events.BANNER_SIZE, size) + } + override fun show(ctx: ExecuteContext) { - if (mAdView!!.parent == null) { + startLoadIfNeeded(lifecycle.requestShow()) + if (mAdView?.parent == null) { addBannerView() - } else if (mAdView!!.visibility == View.GONE) { - mAdView!!.resume() - mAdView!!.visibility = View.VISIBLE - // Re-apply bottom margin in case it was reset by hide() - val wvParentView = getParentView(webView) - setBottomMargin(wvParentView) } + applyBannerVisibility() ctx.resolve() } override fun hide(ctx: ExecuteContext) { - if (mAdView != null) { - mAdView!!.pause() - mAdView!!.visibility = View.GONE - val wvParentView = getParentView(webView) - resetBottomMargin(wvParentView) - } + lifecycle.requestHide() + applyBannerVisibility() ctx.resolve() } override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) - val w = plugin.activity.resources.displayMetrics.widthPixels - if (w != screenWidth) { - screenWidth = w - plugin.activity.runOnUiThread { reloadBannerView() } + plugin.activity.runOnUiThread { + webView.post { + val width = currentContainerWidth() + if (width != containerWidthInPixels) { + containerWidthInPixels = width + adSize = buildAdSize(initOpts, plugin.activity, width) + reloadBannerView() + } else { + updateWebViewBottomMargin(mAdView?.height ?: 0) + } + } } } private fun reloadBannerView() { - if (mAdView == null || mAdView!!.visibility == View.GONE) return + if (mAdView == null) return pauseBannerViews() if (mAdViewOld != null) removeBannerView(mAdViewOld!!) mAdViewOld = mAdView + mAdViewOld!!.visibility = View.INVISIBLE + lifecycle.restartLoad() + pendingLoadEventView = null + lastReportedWidth = -1 + lastReportedHeight = -1 + resetWebViewBottomMargin() mAdView = createBannerView() mAdView!!.loadAd(adRequest) addBannerView() + applyBannerVisibility() } override fun onPause(multitasking: Boolean) { @@ -179,15 +311,12 @@ class Banner(ctx: ExecuteContext) : AdBase(ctx) { override fun onResume(multitasking: Boolean) { super.onResume(multitasking) - resumeBannerViews() - } - - private fun resumeBannerViews() { - if (mAdView != null) mAdView!!.resume() - if (mAdViewOld != null) mAdViewOld!!.resume() + applyBannerVisibility() } override fun onDestroy() { + lifecycle.reset() + resetWebViewBottomMargin() if (mAdView != null) { removeBannerView(mAdView!!) mAdView = null @@ -204,6 +333,7 @@ class Banner(ctx: ExecuteContext) : AdBase(ctx) { } private fun removeBannerView(adView: AdView) { + adView.removeOnLayoutChangeListener(bannerLayoutChangeListener) removeFromParentView(adView) adView.removeAllViews() adView.destroy() @@ -239,7 +369,6 @@ class Banner(ctx: ExecuteContext) : AdBase(ctx) { ) content.addView(mAdView, bannerParams) } - setBottomMargin(wvParentView) } private fun addBannerViewWithRelativeLayout() { @@ -270,36 +399,86 @@ class Banner(ctx: ExecuteContext) : AdBase(ctx) { private val isPositionTop: Boolean get() = gravity == Gravity.TOP - private fun setBottomMargin(view: View?) { - val lp = view?.layoutParams as? FrameLayout.LayoutParams ?: return - lp.bottomMargin = adSize.getHeightInPixels(plugin.activity) - view.layoutParams = lp + private fun applyBannerVisibility() { + val adView = mAdView ?: run { + resetWebViewBottomMargin() + return + } + + if (lifecycle.shouldDisplay) { + adView.visibility = View.VISIBLE + adView.resume() + adView.requestLayout() + adView.post { + if (adView === mAdView && lifecycle.shouldDisplay) { + updateWebViewBottomMargin(adView.height) + emitMeasuredSize(adView, adView.width, adView.height) + } + } + } else { + adView.visibility = View.INVISIBLE + resetWebViewBottomMargin() + if (lifecycle.shouldKeepActive) { + adView.resume() + } else { + adView.pause() + } + } + } + + private fun currentContainerWidth(): Int { + return sequenceOf( + getParentView(webView)?.width, + webView.width, + plugin.contentView?.width, + plugin.activity.resources.displayMetrics.widthPixels, + ).firstOrNull { it != null && it > 0 } + ?: plugin.activity.resources.displayMetrics.widthPixels + } + + private fun updateWebViewBottomMargin(measuredHeight: Int) { + if (offset != null) return + + val target = getParentView(webView) ?: return + if (marginTarget !== target) { + resetWebViewBottomMargin() + val params = target.layoutParams as? ViewGroup.MarginLayoutParams ?: return + marginTarget = target + originalBottomMargin = params.bottomMargin + } + + val params = target.layoutParams as? ViewGroup.MarginLayoutParams ?: return + val originalMargin = originalBottomMargin ?: params.bottomMargin + val nextMargin = resolveBannerBottomMargin( + originalMargin, + lifecycle.requestedVisible, + lifecycle.isLoaded, + measuredHeight, + ) + if (params.bottomMargin != nextMargin) { + params.bottomMargin = nextMargin + target.layoutParams = params + } } - private fun resetBottomMargin(view: View?) { - val lp = view?.layoutParams as? FrameLayout.LayoutParams ?: return - if (lp.bottomMargin > 0) { - lp.bottomMargin = 0 - view.layoutParams = lp + private fun resetWebViewBottomMargin() { + val target = marginTarget + val originalMargin = originalBottomMargin + if (target != null && originalMargin != null) { + val params = target.layoutParams as? ViewGroup.MarginLayoutParams + if (params != null && params.bottomMargin != originalMargin) { + params.bottomMargin = originalMargin + target.layoutParams = params + } } + + marginTarget = null + originalBottomMargin = null } companion object { private const val TAG = "AdMobPlus.Banner" - private var screenWidth = 0 fun destroyParentView() {} - - private fun runJustBeforeBeingDrawn(view: View, runnable: Runnable) { - val preDrawListener: ViewTreeObserver.OnPreDrawListener = - object : ViewTreeObserver.OnPreDrawListener { - override fun onPreDraw(): Boolean { - view.viewTreeObserver.removeOnPreDrawListener(this) - runnable.run() - return true - } - } - view.viewTreeObserver.addOnPreDrawListener(preDrawListener) - } } } diff --git a/src/plugins/admob/src/android/cordova/ads/Interstitial.kt b/src/plugins/admob/src/android/cordova/ads/Interstitial.kt index 4646c63832..c19d9591d3 100644 --- a/src/plugins/admob/src/android/cordova/ads/Interstitial.kt +++ b/src/plugins/admob/src/android/cordova/ads/Interstitial.kt @@ -23,6 +23,8 @@ class Interstitial(ctx: ExecuteContext) : AdBase(ctx) { InterstitialAd.load(ctx.activity, adUnitId, adRequest, object : InterstitialAdLoadCallback() { override fun onAdLoaded(interstitialAd: InterstitialAd) { mAd = interstitialAd + interstitialAd.onPaidEventListener = + paidEventListener("interstitial") { interstitialAd.responseInfo } mAd!!.fullScreenContentCallback = object : FullScreenContentCallback() { override fun onAdDismissedFullScreenContent() { emit(Events.AD_DISMISS) diff --git a/src/plugins/admob/src/android/cordova/ads/Native.kt b/src/plugins/admob/src/android/cordova/ads/Native.kt index 2fc5cd0d92..6b25a5a566 100644 --- a/src/plugins/admob/src/android/cordova/ads/Native.kt +++ b/src/plugins/admob/src/android/cordova/ads/Native.kt @@ -39,7 +39,12 @@ class Native(ctx: ExecuteContext) : AdBase(ctx) { override fun load(ctx: ExecuteContext) { clear() mLoader = AdLoader.Builder(plugin.activity, adUnitId) - .forNativeAd { nativeAd -> mAd = nativeAd } + .forNativeAd { nativeAd -> + nativeAd.setOnPaidEventListener( + paidEventListener("native") { nativeAd.responseInfo } + ) + mAd = nativeAd + } .withAdListener(object : AdListener() { override fun onAdFailedToLoad(adError: LoadAdError) { emit(Events.AD_LOAD_FAIL, adError) diff --git a/src/plugins/admob/src/android/cordova/ads/Rewarded.kt b/src/plugins/admob/src/android/cordova/ads/Rewarded.kt index 710a0fd168..89a7a9dce1 100644 --- a/src/plugins/admob/src/android/cordova/ads/Rewarded.kt +++ b/src/plugins/admob/src/android/cordova/ads/Rewarded.kt @@ -42,6 +42,8 @@ class Rewarded(ctx: ExecuteContext) : AdBase(ctx) { override fun onAdLoaded(rewardedAd: RewardedAd) { mAd = rewardedAd + rewardedAd.onPaidEventListener = + paidEventListener("rewarded") { rewardedAd.responseInfo } val ssv = buildServerSideVerificationOptions(initOpts) if (ssv != null) { mAd!!.setServerSideVerificationOptions(ssv) diff --git a/src/plugins/admob/src/android/cordova/ads/RewardedInterstitial.kt b/src/plugins/admob/src/android/cordova/ads/RewardedInterstitial.kt index 6a5056ce1e..bda6559a64 100644 --- a/src/plugins/admob/src/android/cordova/ads/RewardedInterstitial.kt +++ b/src/plugins/admob/src/android/cordova/ads/RewardedInterstitial.kt @@ -31,6 +31,10 @@ class RewardedInterstitial(ctx: ExecuteContext) : AdBase(ctx) { override fun onAdLoaded(rewardedAd: RewardedInterstitialAd) { mAd = rewardedAd + rewardedAd.onPaidEventListener = + paidEventListener("rewardedInterstitial") { + rewardedAd.responseInfo + } val ssv = buildServerSideVerificationOptions(initOpts) if (ssv != null) { mAd!!.setServerSideVerificationOptions(ssv) diff --git a/src/plugins/admob/src/android/core/util.kt b/src/plugins/admob/src/android/core/util.kt index 3b912dd7dd..6cd03cbf79 100644 --- a/src/plugins/admob/src/android/core/util.kt +++ b/src/plugins/admob/src/android/core/util.kt @@ -6,7 +6,6 @@ import android.app.Activity import android.content.res.Resources import android.os.Bundle import android.provider.Settings -import android.util.DisplayMetrics import com.google.ads.mediation.admob.AdMobAdapter import com.google.android.gms.ads.AdRequest import com.google.android.gms.ads.AdSize @@ -33,44 +32,64 @@ fun buildAdRequest(opts: JSONObject): AdRequest { return builder.addNetworkExtrasBundle(AdMobAdapter::class.java, extras).build() } -fun buildAdSize(opts: JSONObject, activity: Activity): AdSize { +fun buildAdSize( + opts: JSONObject, + activity: Activity, + availableWidthInPixels: Int = activity.resources.displayMetrics.widthPixels, +): AdSize { + val density = activity.resources.displayMetrics.density val name = "size" if (!opts.has(name)) { - @Suppress("DEPRECATION") - return AdSize.SMART_BANNER + return buildAnchoredAdaptiveAdSize( + activity, + pxToDp(availableWidthInPixels, density), + ) } val adSizeObj = opts.optJSONObject(name) - val adSize = AdSizeType.getAdSize(opts.optInt(name)) if (adSizeObj == null) { - @Suppress("DEPRECATION") - return adSize ?: AdSize.SMART_BANNER + val type = AdSizeType.entries.getOrNull(opts.optInt(name)) + if (type == AdSizeType.SMART_BANNER) { + return buildAnchoredAdaptiveAdSize( + activity, + pxToDp(availableWidthInPixels, density), + ) + } + return type?.let(AdSizeType::getAdSize) + ?: buildAnchoredAdaptiveAdSize( + activity, + pxToDp(availableWidthInPixels, density), + ) } val adaptive = adSizeObj.optString("adaptive") - val w = - pxToDp(if (adSizeObj.has("width")) adSizeObj.optInt("width") else Resources.getSystem().displayMetrics.widthPixels) + val widthInPixels = + if (adSizeObj.has("width")) adSizeObj.optInt("width") + else availableWidthInPixels + val w = pxToDp(widthInPixels, density) if ("inline" == adaptive) { if (adSizeObj.has("maxHeight")) { return AdSize.getInlineAdaptiveBannerAdSize( w, - pxToDp(adSizeObj.optInt("maxHeight")) - ) - } - } else { - return when (adSizeObj.optString("orientation")) { - "portrait" -> AdSize.getPortraitAnchoredAdaptiveBannerAdSize( - activity, w - ) - - "landscape" -> AdSize.getLandscapeAnchoredAdaptiveBannerAdSize( - activity, w - ) - - else -> AdSize.getCurrentOrientationAnchoredAdaptiveBannerAdSize( - activity, w + pxToDp(adSizeObj.optInt("maxHeight"), density) ) } + } else if ("anchored" == adaptive) { + return buildAnchoredAdaptiveAdSize( + activity, + w, + adSizeObj.optString("orientation"), + ) } - return AdSize(w, pxToDp(adSizeObj.optInt("height"))) + return AdSize(w, pxToDp(adSizeObj.optInt("height"), density)) +} + +private fun buildAnchoredAdaptiveAdSize( + activity: Activity, + width: Int, + orientation: String = "", +): AdSize = when (orientation) { + "portrait" -> AdSize.getLargePortraitAnchoredAdaptiveBannerAdSize(activity, width) + "landscape" -> AdSize.getLargeLandscapeAnchoredAdaptiveBannerAdSize(activity, width) + else -> AdSize.getLargeAnchoredAdaptiveBannerAdSize(activity, width) } fun optBooleanToInt(opts: JSONObject, name: String, vNull: Int, vTrue: Int, vFalse: Int): Int? { @@ -147,9 +166,12 @@ fun dpToPx(dp: Double): Double { return dp * Resources.getSystem().displayMetrics.density } -fun pxToDp(px: Int): Int { - val displayMetrics = Resources.getSystem().displayMetrics - return (px / (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)).roundToInt() +fun pxToDp( + px: Int, + density: Float = Resources.getSystem().displayMetrics.density, +): Int { + if (density <= 0f) return px + return (px / density).roundToInt() } fun jsonArray2stringList(a: JSONArray?): List { diff --git a/src/plugins/admob/src/androidTest/AdDispatchTest.kt b/src/plugins/admob/src/androidTest/AdDispatchTest.kt new file mode 100644 index 0000000000..bfd64338ba --- /dev/null +++ b/src/plugins/admob/src/androidTest/AdDispatchTest.kt @@ -0,0 +1,33 @@ +package admob.plus.cordova + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class AdDispatchTest { + @Test + fun permitsBannersToReceiveShowWhileLoading() { + assertTrue( + shouldDispatchAdShow( + isLoaded = false, + canShowWhileLoading = true, + ), + ) + } + + @Test + fun keepsOtherAdFormatsLoadedOnly() { + assertFalse( + shouldDispatchAdShow( + isLoaded = false, + canShowWhileLoading = false, + ), + ) + assertTrue( + shouldDispatchAdShow( + isLoaded = true, + canShowWhileLoading = false, + ), + ) + } +} diff --git a/src/plugins/admob/src/androidTest/BannerLayoutTest.kt b/src/plugins/admob/src/androidTest/BannerLayoutTest.kt new file mode 100644 index 0000000000..ff4ace6dbd --- /dev/null +++ b/src/plugins/admob/src/androidTest/BannerLayoutTest.kt @@ -0,0 +1,156 @@ +package admob.plus.cordova.ads + +import admob.plus.core.pxToDp +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class BannerLayoutTest { + @Test + fun convertsPixelsUsingLogicalDisplayDensity() { + assertEquals(360, pxToDp(1080, 3f)) + assertEquals(393, pxToDp(1080, 2.75f)) + assertEquals(1080, pxToDp(1080, 0f)) + } + + @Test + fun reservesOnlyTheMeasuredLoadedBannerHeight() { + assertEquals( + 74, + resolveBannerBottomMargin( + originalMargin = 8, + requestedVisible = true, + loaded = true, + measuredHeight = 66, + ), + ) + } + + @Test + fun preservesTheOriginalMarginUntilTheBannerCanDisplay() { + assertEquals( + 8, + resolveBannerBottomMargin( + originalMargin = 8, + requestedVisible = true, + loaded = false, + measuredHeight = 66, + ), + ) + assertEquals( + 8, + resolveBannerBottomMargin( + originalMargin = 8, + requestedVisible = false, + loaded = true, + measuredHeight = 66, + ), + ) + } + + @Test + fun clampsInvalidMeasuredHeights() { + assertEquals( + 8, + resolveBannerBottomMargin( + originalMargin = 8, + requestedVisible = true, + loaded = true, + measuredHeight = -20, + ), + ) + } + + @Test + fun followsMeasuredHeightChangesAfterRotation() { + assertEquals( + 58, + resolveBannerBottomMargin(8, true, true, 50), + ) + assertEquals( + 98, + resolveBannerBottomMargin(8, true, true, 90), + ) + } + + @Test + fun keepsAnInitiallyLoadingVisibleBannerActive() { + val lifecycle = BannerLifecycle() + + assertTrue(lifecycle.requestLoad()) + assertFalse(lifecycle.requestShow()) + assertEquals(BannerLoadState.LOADING, lifecycle.loadState) + assertTrue(lifecycle.shouldKeepActive) + assertFalse(lifecycle.shouldDisplay) + } + + @Test + fun ignoresRepeatedLoadAndShowRequests() { + val lifecycle = BannerLifecycle() + + assertTrue(lifecycle.requestLoad()) + assertFalse(lifecycle.requestLoad()) + assertFalse(lifecycle.requestShow()) + assertFalse(lifecycle.requestShow()) + assertEquals(BannerLoadState.LOADING, lifecycle.loadState) + } + + @Test + fun displaysOnlyAfterTheRequestedBannerLoads() { + val lifecycle = BannerLifecycle() + + assertTrue(lifecycle.requestShow()) + assertFalse(lifecycle.shouldDisplay) + + lifecycle.markLoaded() + + assertTrue(lifecycle.isLoaded) + assertTrue(lifecycle.shouldDisplay) + assertTrue(lifecycle.shouldKeepActive) + } + + @Test + fun remainsHiddenWhenLoadingCompletesAfterHide() { + val lifecycle = BannerLifecycle() + + lifecycle.requestShow() + lifecycle.requestHide() + assertFalse(lifecycle.shouldKeepActive) + + lifecycle.markLoaded() + + assertTrue(lifecycle.isLoaded) + assertFalse(lifecycle.shouldDisplay) + assertFalse(lifecycle.shouldKeepActive) + } + + @Test + fun retriesAFailedLoadOnTheNextLoadOrShow() { + val lifecycle = BannerLifecycle() + + lifecycle.requestShow() + lifecycle.markFailed() + assertEquals(BannerLoadState.FAILED, lifecycle.loadState) + assertFalse(lifecycle.shouldDisplay) + assertFalse(lifecycle.shouldKeepActive) + + assertTrue(lifecycle.requestLoad()) + assertEquals(BannerLoadState.LOADING, lifecycle.loadState) + assertTrue(lifecycle.shouldKeepActive) + } + + @Test + fun preservesVisibilityIntentDuringRotationReload() { + val lifecycle = BannerLifecycle() + + lifecycle.requestShow() + lifecycle.markLoaded() + lifecycle.restartLoad() + + assertTrue(lifecycle.requestedVisible) + assertEquals(BannerLoadState.LOADING, lifecycle.loadState) + assertTrue(lifecycle.shouldKeepActive) + assertFalse(lifecycle.shouldDisplay) + } +} diff --git a/src/plugins/admob/src/androidTest/PrivacyStateTest.kt b/src/plugins/admob/src/androidTest/PrivacyStateTest.kt new file mode 100644 index 0000000000..7989a15f00 --- /dev/null +++ b/src/plugins/admob/src/androidTest/PrivacyStateTest.kt @@ -0,0 +1,76 @@ +package admob.plus.cordova + +import com.google.android.ump.ConsentInformation +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertThrows +import org.junit.Assert.assertTrue +import org.junit.Test + +class PrivacyStateTest { + @Test + fun mapsConsentStatuses() { + assertEquals( + "required", + consentStatusName(ConsentInformation.ConsentStatus.REQUIRED), + ) + assertEquals( + "notRequired", + consentStatusName(ConsentInformation.ConsentStatus.NOT_REQUIRED), + ) + assertEquals( + "obtained", + consentStatusName(ConsentInformation.ConsentStatus.OBTAINED), + ) + assertEquals( + "unknown", + consentStatusName(ConsentInformation.ConsentStatus.UNKNOWN), + ) + assertEquals("unknown", consentStatusName(Int.MAX_VALUE)) + } + + @Test + fun mapsPrivacyOptionsRequirement() { + assertTrue( + isPrivacyOptionsRequired( + ConsentInformation.PrivacyOptionsRequirementStatus.REQUIRED + ) + ) + assertFalse( + isPrivacyOptionsRequired( + ConsentInformation.PrivacyOptionsRequirementStatus.NOT_REQUIRED + ) + ) + assertFalse( + isPrivacyOptionsRequired( + ConsentInformation.PrivacyOptionsRequirementStatus.UNKNOWN + ) + ) + } + + @Test + fun permitsDebugControlsOnlyInDebuggableBuilds() { + requireDebugBuild(debuggable = true, hasDebugOptions = true) + requireDebugBuild(debuggable = false, hasDebugOptions = false) + + assertThrows(IllegalStateException::class.java) { + requireDebugBuild(debuggable = false, hasDebugOptions = true) + } + } + + @Test + fun serializesStablePublicState() { + assertEquals( + mapOf( + "consentStatus" to "obtained", + "canRequestAds" to true, + "privacyOptionsRequired" to true, + ), + PrivacyConsentState( + consentStatus = "obtained", + canRequestAds = true, + privacyOptionsRequired = true, + ).toMap(), + ) + } +} diff --git a/src/plugins/admob/src/www/ads/banner.ts b/src/plugins/admob/src/www/ads/banner.ts index 09db33742c..c5cc86a2e7 100644 --- a/src/plugins/admob/src/www/ads/banner.ts +++ b/src/plugins/admob/src/www/ads/banner.ts @@ -9,6 +9,7 @@ export enum AdSizeType { MEDIUM_RECTANGLE = 2, FULL_BANNER = 3, LEADERBOARD = 4, + /** @deprecated Use an adaptive BannerSize object instead. */ SMART_BANNER = 5, } @@ -62,12 +63,10 @@ export interface BannerAdOptions extends MobileAdOptions { export class BannerAd extends MobileAd { static readonly cls = "BannerAd"; - private _loaded = false; - constructor(opts: BannerAdOptions) { super({ position: "bottom", - size: AdSizeType.SMART_BANNER, + size: { adaptive: "anchored" }, ...opts, }); } @@ -88,14 +87,10 @@ export class BannerAd extends MobileAd { public async load() { await super.load(); - this._loaded = true; } public async show() { - if (!this._loaded) { - await this.load(); - } - + await this.load(); return super.show(); } diff --git a/src/plugins/admob/src/www/common.ts b/src/plugins/admob/src/www/common.ts index 1de9a3ca18..bdd8ef81ae 100644 --- a/src/plugins/admob/src/www/common.ts +++ b/src/plugins/admob/src/www/common.ts @@ -8,6 +8,10 @@ export type CordovaAction = | "adShow" | "bannerConfig" | "configure" + | "privacyGatherConsent" + | "privacyGetState" + | "privacyResetForTesting" + | "privacyShowOptions" | "ready" | "start" | "webviewGoto"; @@ -18,6 +22,7 @@ export enum Events { adImpression = "admob.ad.impression", adLoad = "admob.ad.load", adLoadFail = "admob.ad.loadfail", + adPaid = "admob.ad.paid", adReward = "admob.ad.reward", adShow = "admob.ad.show", adShowFail = "admob.ad.showfail", @@ -25,6 +30,22 @@ export enum Events { ready = "admob.ready", } +export type AdPaidEvent = { + adId: string; + adUnitId: string; + adFormat: string; + valueMicros: number; + currencyCode: string; + precision: number; + adSourceName?: string; + adSourceId?: string; + adSourceInstanceName?: string; + adSourceInstanceId?: string; + mediationGroupName?: string; + mediationABTestName?: string; + mediationABTestVariant?: string; +}; + // biome-ignore lint/suspicious/noConstEnum: ignore export const enum Platform { android = "android", diff --git a/src/plugins/admob/src/www/cordova.d.ts b/src/plugins/admob/src/www/cordova.d.ts index a89e62122d..5d9ecc8f65 100644 --- a/src/plugins/admob/src/www/cordova.d.ts +++ b/src/plugins/admob/src/www/cordova.d.ts @@ -1 +1,31 @@ -/// +interface Cordova { + fireDocumentEvent(eventName: string, data?: unknown): void; +} + +declare module "cordova/channel" { + interface CordovaChannel { + createSticky(name: string): void; + initializationComplete(name: string): void; + onCordovaReady: { + subscribe(listener: () => void): void; + }; + waitForInitialization(name: string): void; + } + + const channel: CordovaChannel; + export default channel; +} + +declare module "cordova/exec" { + type Callback = (value: unknown) => unknown; + + function exec( + success: Callback, + fail: Callback, + service: string, + action: string, + args?: unknown[], + ): void; + + export default exec; +} diff --git a/src/plugins/admob/src/www/index.ts b/src/plugins/admob/src/www/index.ts index dda99da905..c30b9fb56e 100644 --- a/src/plugins/admob/src/www/index.ts +++ b/src/plugins/admob/src/www/index.ts @@ -1,8 +1,10 @@ import * as ads from "./ads"; import { type AdMobConfig, Events, execAsync } from "./common"; +import { Privacy } from "./privacy"; export * from "./ads"; export * from "./common"; +export * from "./privacy"; export class AdMob { public readonly AppOpenAd = ads.AppOpenAd; @@ -14,6 +16,7 @@ export class AdMob { public readonly WebViewAd = ads.WebViewAd; public readonly Events = Events; + public readonly privacy = new Privacy(); private _startPromise: ReturnType | undefined; diff --git a/src/plugins/admob/src/www/privacy.ts b/src/plugins/admob/src/www/privacy.ts new file mode 100644 index 0000000000..9c33e4357a --- /dev/null +++ b/src/plugins/admob/src/www/privacy.ts @@ -0,0 +1,45 @@ +import { execAsync } from "./common"; + +export type PrivacyConsentStatus = + | "unknown" + | "required" + | "notRequired" + | "obtained"; + +export type PrivacyConsentState = { + consentStatus: PrivacyConsentStatus; + canRequestAds: boolean; + privacyOptionsRequired: boolean; +}; + +export type ConsentDebugGeography = "disabled" | "eea" | "notEea"; + +export type GatherConsentOptions = { + /** + * Debug controls are rejected by native code in non-debuggable builds. + */ + debugGeography?: ConsentDebugGeography; + testDeviceIds?: string[]; +}; + +export class Privacy { + public gatherConsent(options: GatherConsentOptions = {}) { + return execAsync("privacyGatherConsent", [options]); + } + + public getState() { + return execAsync("privacyGetState", [{}]); + } + + public showOptions() { + return execAsync("privacyShowOptions", [{}]); + } + + /** + * Clears UMP state for first-install testing. Native code rejects this in + * non-debuggable builds. + */ + public resetForTesting() { + return execAsync("privacyResetForTesting", [{}]); + } +} diff --git a/src/plugins/admob/tsconfig.json b/src/plugins/admob/tsconfig.json index 026e4d4667..3aea297a18 100644 --- a/src/plugins/admob/tsconfig.json +++ b/src/plugins/admob/tsconfig.json @@ -1,9 +1,16 @@ { - "extends": "cordova-plus/plugin", "compilerOptions": { "composite": true, - "outDir": "www", - "rootDir": "src/www" + "outDir": "lib", + "rootDir": "src/www", + "target": "ES2015", + "module": "CommonJS", + "moduleResolution": "Node", + "lib": ["DOM", "ES2015"], + "strict": true, + "noImplicitAny": false, + "esModuleInterop": true, + "skipLibCheck": true }, "include": ["./src/www/cordova.d.ts", "./src/www/**/*"] } diff --git a/src/plugins/admob/tsconfig.rollup.json b/src/plugins/admob/tsconfig.rollup.json new file mode 100644 index 0000000000..5437793319 --- /dev/null +++ b/src/plugins/admob/tsconfig.rollup.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "composite": false, + "declaration": false, + "module": "ESNext", + "outDir": "./node_modules/.cache/admob-rollup", + "sourceMap": false + } +} diff --git a/src/plugins/admob/www/admob.js b/src/plugins/admob/www/admob.js new file mode 100644 index 0000000000..a586f5832a --- /dev/null +++ b/src/plugins/admob/www/admob.js @@ -0,0 +1,538 @@ +'use strict'; + +var cordova$1 = require('cordova'); +var channel = require('cordova/channel'); +var exec = require('cordova/exec'); + +function _interopNamespaceDefault(e) { + var n = Object.create(null); + if (e) { + Object.keys(e).forEach(function (k) { + if (k !== 'default') { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty(n, k, d.get ? d : { + enumerable: true, + get: function () { return e[k]; } + }); + } + }); + } + n.default = e; + return Object.freeze(n); +} + +var cordova__namespace = /*#__PURE__*/_interopNamespaceDefault(cordova$1); + +/****************************************************************************** +Copyright (c) Microsoft Corporation. + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. +***************************************************************************** */ +/* global Reflect, Promise, SuppressedError, Symbol, Iterator */ + + +function __awaiter(thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +} + +typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) { + var e = new Error(message); + return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e; +}; + +const CordovaService = "AdMob"; +var Events; +(function (Events) { + Events["adClick"] = "admob.ad.click"; + Events["adDismiss"] = "admob.ad.dismiss"; + Events["adImpression"] = "admob.ad.impression"; + Events["adLoad"] = "admob.ad.load"; + Events["adLoadFail"] = "admob.ad.loadfail"; + Events["adPaid"] = "admob.ad.paid"; + Events["adReward"] = "admob.ad.reward"; + Events["adShow"] = "admob.ad.show"; + Events["adShowFail"] = "admob.ad.showfail"; + Events["bannerSize"] = "admob.banner.size"; + Events["ready"] = "admob.ready"; +})(Events || (Events = {})); +/** @internal */ +function execAsync(action, args) { + return new Promise((resolve, reject) => { + cordova.exec(resolve, reject, CordovaService, action, args); + }); +} + +/** @internal */ +class MobileAd { + constructor(opts) { + var _a; + this.opts = opts; + this.id = (_a = opts.id) !== null && _a !== void 0 ? _a : opts.adUnitId; + MobileAd.allAds[this.id] = this; + } + static get allAds() { + const win = window; + if (typeof win.admobAds === "undefined") + win.admobAds = {}; + return win.admobAds; + } + static getAdById(id) { + return MobileAd.allAds[id]; + } + get adUnitId() { + return this.opts.adUnitId; + } + on(...args) { + const [eventName, cb, ...rest] = args; + const type = `admob.ad.${eventName.toLowerCase()}`; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + // biome-ignore lint/suspicious/noExplicitAny: + const listener = (evt) => { + if (evt.adId === this.id) { + cb(evt); + } + }; + document.addEventListener(type, listener, ...rest); + return () => { + document.removeEventListener(type, listener, ...rest); + }; + } + isLoaded() { + return __awaiter(this, void 0, void 0, function* () { + yield this.init(); + return execAsync("adIsLoaded", [{ id: this.id }]); + }); + } + load() { + return __awaiter(this, void 0, void 0, function* () { + yield this.init(); + // TODO read `opts` in native code? + yield execAsync("adLoad", [Object.assign(Object.assign({}, this.opts), { id: this.id })]); + }); + } + show(opts) { + return __awaiter(this, void 0, void 0, function* () { + yield this.init(); + return execAsync("adShow", [Object.assign(Object.assign({}, opts), { id: this.id })]); + }); + } + hide() { + return __awaiter(this, void 0, void 0, function* () { + yield this.init(); + return execAsync("adHide", [{ id: this.id }]); + }); + } + init() { + var _a; + return __awaiter(this, void 0, void 0, function* () { + // biome-ignore lint/suspicious/noAssignInExpressions: + return ((_a = this._initPromise) !== null && _a !== void 0 ? _a : (this._initPromise = this._init())); + }); + } + _init() { + var _a; + return __awaiter(this, void 0, void 0, function* () { + yield admob.start(); + const cls = (_a = this.constructor.cls) !== null && _a !== void 0 ? _a : this.constructor.name; + return execAsync("adCreate", [Object.assign(Object.assign({}, this.opts), { id: this.id, cls })]); + }); + } +} + +class AppOpenAd extends MobileAd { + isLoaded() { + return super.isLoaded(); + } + load() { + return super.load(); + } + show() { + const _super = Object.create(null, { + show: { get: () => super.show } + }); + return __awaiter(this, void 0, void 0, function* () { + return _super.show.call(this); + }); + } +} +AppOpenAd.cls = "AppOpenAd"; + +var AdSizeType; +(function (AdSizeType) { + AdSizeType[AdSizeType["BANNER"] = 0] = "BANNER"; + AdSizeType[AdSizeType["LARGE_BANNER"] = 1] = "LARGE_BANNER"; + AdSizeType[AdSizeType["MEDIUM_RECTANGLE"] = 2] = "MEDIUM_RECTANGLE"; + AdSizeType[AdSizeType["FULL_BANNER"] = 3] = "FULL_BANNER"; + AdSizeType[AdSizeType["LEADERBOARD"] = 4] = "LEADERBOARD"; + /** @deprecated Use an adaptive BannerSize object instead. */ + AdSizeType[AdSizeType["SMART_BANNER"] = 5] = "SMART_BANNER"; +})(AdSizeType || (AdSizeType = {})); +const colorToRGBA = (() => { + const canvas = document.createElement("canvas"); + canvas.width = canvas.height = 1; + const ctx = canvas.getContext("2d"); + if (!ctx) + return () => undefined; + return (col) => { + ctx.clearRect(0, 0, 1, 1); + // In order to detect invalid values, + // we can't rely on col being in the same format as what fillStyle is computed as, + // but we can ask it to implicitly compute a normalized value twice and compare. + ctx.fillStyle = "#000"; + ctx.fillStyle = col; + const computed = ctx.fillStyle; + ctx.fillStyle = "#fff"; + ctx.fillStyle = col; + if (computed !== ctx.fillStyle) { + return; // invalid color + } + ctx.fillRect(0, 0, 1, 1); + const { data } = ctx.getImageData(0, 0, 1, 1); + return { r: data[0], g: data[1], b: data[2], a: data[3] }; + }; +})(); +class BannerAd extends MobileAd { + constructor(opts) { + super(Object.assign({ position: "bottom", size: { adaptive: "anchored" } }, opts)); + } + static config(opts) { + if (cordova.platformId === "ios" /* Platform.ios */) { + const { backgroundColor: bgColor } = opts; + return execAsync("bannerConfig", [ + Object.assign(Object.assign({}, opts), { backgroundColor: bgColor ? colorToRGBA(bgColor) : bgColor }), + ]); + } + return false; + } + load() { + const _super = Object.create(null, { + load: { get: () => super.load } + }); + return __awaiter(this, void 0, void 0, function* () { + yield _super.load.call(this); + }); + } + show() { + const _super = Object.create(null, { + show: { get: () => super.show } + }); + return __awaiter(this, void 0, void 0, function* () { + yield this.load(); + return _super.show.call(this); + }); + } + hide() { + const _super = Object.create(null, { + hide: { get: () => super.hide } + }); + return __awaiter(this, void 0, void 0, function* () { + return _super.hide.call(this); + }); + } +} +BannerAd.cls = "BannerAd"; + +class InterstitialAd extends MobileAd { + isLoaded() { + return super.isLoaded(); + } + load() { + return super.load(); + } + show() { + return super.show(); + } +} +InterstitialAd.cls = "InterstitialAd"; + +class NativeAd extends MobileAd { + isLoaded() { + return super.isLoaded(); + } + hide() { + const _super = Object.create(null, { + hide: { get: () => super.hide } + }); + return __awaiter(this, void 0, void 0, function* () { + return _super.hide.call(this); + }); + } + load() { + return super.load(); + } + show(opts) { + const _super = Object.create(null, { + show: { get: () => super.show } + }); + return __awaiter(this, void 0, void 0, function* () { + return _super.show.call(this, Object.assign({ x: 0, y: 0, width: 0, height: 0 }, opts)); + }); + } + showWith(elm) { + return __awaiter(this, void 0, void 0, function* () { + const update = () => __awaiter(this, void 0, void 0, function* () { + const r = elm.getBoundingClientRect(); + yield this.show({ + x: r.x, + y: r.y, + width: r.width, + height: r.height, + }); + }); + const observer = new MutationObserver(update); + observer.observe(document.body, { + attributes: true, + childList: true, + subtree: true, + }); + document.addEventListener("scroll", update); + window.addEventListener("resize", update); + yield update(); + }); + } +} +NativeAd.cls = "NativeAd"; + +class RewardedAd extends MobileAd { + isLoaded() { + return super.isLoaded(); + } + load() { + return super.load(); + } + show() { + return super.show(); + } +} +RewardedAd.cls = "RewardedAd"; + +class RewardedInterstitialAd extends MobileAd { + isLoaded() { + return super.isLoaded(); + } + load() { + return super.load(); + } + show() { + return super.show(); + } +} +RewardedInterstitialAd.cls = "RewardedInterstitialAd"; + +class WebViewAd extends MobileAd { + static checkIntegration() { + return __awaiter(this, void 0, void 0, function* () { + yield execAsync("webviewGoto", [ + "https://webview-api-for-ads-test.glitch.me/", + ]); + }); + } + constructor(opts) { + var _a, _b, _c, _d, _e, _f, _g; + opts.adUnitId = ""; + super(opts); + this._loaded = false; + this._src = ""; + this._adsense = ""; + this._originalHref = window.location.href || ""; + this._historyCurrentHref = ""; + this._adsense = opts.adsense; + this._src = + opts.src || + "https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"; + // biome-ignore lint/suspicious/noExplicitAny: + const win = window; + if (typeof ((_a = win.gmaSdk) === null || _a === void 0 ? void 0 : _a.getQueryInfo) === "function" || + typeof ((_d = (_c = (_b = win.webkit) === null || _b === void 0 ? void 0 : _b.messageHandlers) === null || _c === void 0 ? void 0 : _c.getGmaQueryInfo) === null || _d === void 0 ? void 0 : _d.postMessage) === + "function" || + typeof ((_g = (_f = (_e = win.webkit) === null || _e === void 0 ? void 0 : _e.messageHandlers) === null || _f === void 0 ? void 0 : _f.getGmaSig) === null || _g === void 0 ? void 0 : _g.postMessage) === "function") { + const html = ` + + ${opts.npa + ? "" + : ""} + + + `; + const div = document.createElement("div"); + div.innerHTML = html; + document.head.appendChild(div); + this.nodeScriptReplace(div); + this._loaded = true; + } + else { + console.error("WebView does not appear to be setup correctly"); + } + document.addEventListener("pause", () => { + this._historyCurrentHref = this.historyCurrentHref(); + this.historyRestoreOriginalHref(); + }); + document.addEventListener("resume", () => { + if (this._historyCurrentHref) { + this.historyReplaceState(this._historyCurrentHref); + } + }); + } + addAd(options) { + const opts = Object.assign({ format: "auto", fullWidth: true }, options); + if (this._loaded) { + let html = opts.html || ""; + if (!opts.html) { + html = ` + + + + `; + } + if (opts.element) { + opts.element.innerHTML = html; + this.nodeScriptReplace(opts.element); + return true; + } + } + return false; + } + nodeScriptReplace(node) { + if (this.isNodeScript(node) === true) { + node.parentNode.replaceChild(this.nodeScriptClone(node), node); + } + else { + const children = node.childNodes; + for (let i = 0, len = children.length; i < len; i++) { + this.nodeScriptReplace(children[i]); + } + } + return node; + } + nodeScriptClone(node) { + const script = document.createElement("script"); + script.text = node.innerHTML; + const attrs = node.attributes; + for (let i = 0, len = attrs.length; i < len; i++) { + script.setAttribute(attrs[i].name, attrs[i].value); + } + return script; + } + isNodeScript(node) { + return node.tagName === "SCRIPT"; + } + historyReplaceState(url) { + if (!this._originalHref) { + this._originalHref = window.location.href; + } + if (this._loaded) { + window.history.replaceState(null, "", url); + } + } + historySetPage(page, parameters = {}) { + const _parameters = []; + for (const name in parameters) { + _parameters.push(`${name}=${encodeURI(parameters[name])}`); + } + const url = `${page}${_parameters.length > 0 ? `?${_parameters.join("&")}` : ""}`; + this.historyReplaceState(url); + return url; + } + historyOriginalHref() { + return this._originalHref || window.location.href; + } + historyCurrentHref() { + return window.location.href; + } + historyRestoreOriginalHref() { + this.historyReplaceState(this.historyOriginalHref()); + } + show() { + const _super = Object.create(null, { + show: { get: () => super.show } + }); + return __awaiter(this, void 0, void 0, function* () { + if (!this._loaded) { + yield this.load(); + } + return _super.show.call(this); + }); + } +} +WebViewAd.cls = "WebViewAd"; + +class Privacy { + gatherConsent(options = {}) { + return execAsync("privacyGatherConsent", [options]); + } + getState() { + return execAsync("privacyGetState", [{}]); + } + showOptions() { + return execAsync("privacyShowOptions", [{}]); + } + /** + * Clears UMP state for first-install testing. Native code rejects this in + * non-debuggable builds. + */ + resetForTesting() { + return execAsync("privacyResetForTesting", [{}]); + } +} + +class AdMob { + constructor() { + this.AppOpenAd = AppOpenAd; + this.BannerAd = BannerAd; + this.InterstitialAd = InterstitialAd; + this.NativeAd = NativeAd; + this.RewardedAd = RewardedAd; + this.RewardedInterstitialAd = RewardedInterstitialAd; + this.WebViewAd = WebViewAd; + this.Events = Events; + this.privacy = new Privacy(); + } + configure(config) { + return execAsync("configure", [config]); + } + start() { + var _a; + // biome-ignore lint/suspicious/noAssignInExpressions: ignore + return ((_a = this._startPromise) !== null && _a !== void 0 ? _a : (this._startPromise = this._start())); + } + _start() { + return execAsync("start"); + } +} + +const admob$1 = new AdMob(); +// biome-ignore lint/suspicious/noExplicitAny: ignore +function onMessageFromNative(event) { + const { data } = event; + if (data === null || data === void 0 ? void 0 : data.adId) { + data.ad = MobileAd.getAdById(data.adId); + } + cordova__namespace.fireDocumentEvent(event.type, data); +} +const feature = "onAdMobPlusReady"; +channel.createSticky(feature); +channel.waitForInitialization(feature); +channel.onCordovaReady.subscribe(() => { + const action = "ready"; + exec(onMessageFromNative, console.error, CordovaService, action, []); + channel.initializationComplete(feature); +}); + +module.exports = admob$1; diff --git a/src/plugins/cordova-plugin-advanced-http/package-lock.json b/src/plugins/cordova-plugin-advanced-http/package-lock.json new file mode 100644 index 0000000000..98346bf193 --- /dev/null +++ b/src/plugins/cordova-plugin-advanced-http/package-lock.json @@ -0,0 +1,4161 @@ +{ + "name": "cordova-plugin-advanced-http", + "version": "3.3.1", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "cordova-plugin-advanced-http", + "version": "3.3.1", + "engines": [ + { + "name": "cordova", + "version": ">=4.0.0" + } + ], + "license": "MIT", + "devDependencies": { + "chai": "4.3.6", + "colors": "1.4.0", + "cordova": "13.0.0", + "mocha": "9.2.2", + "umd-tough-cookie": "3.0.0", + "xml2js": "0.4.23" + } + }, + "node_modules/@gar/promise-retry": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@gar/promise-retry/-/promise-retry-1.0.3.tgz", + "integrity": "sha512-GmzA9ckNokPypTg10pgpeHNQe7ph+iIKKmhKu3Ob9ANkswreCx7R3cKmY781K8QK3AqVL3xVh9A42JvIAbkkSA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@isaacs/fs-minipass": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", + "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.4" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@isaacs/string-locale-compare": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz", + "integrity": "sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/@netflix/nerror": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@netflix/nerror/-/nerror-1.1.3.tgz", + "integrity": "sha512-b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==", + "dev": true, + "license": "MIT", + "dependencies": { + "assert-plus": "^1.0.0", + "extsprintf": "^1.4.0", + "lodash": "^4.17.15" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@npmcli/agent": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.2.tgz", + "integrity": "sha512-EUEuWAxnL07Sp5/iC/1X6Xj+XThUvnbei9zfRWZdEXa7lss9RTHMhAHBeg+MZ5To9s/gGaSI+UwZTPdYMvKSeg==", + "dev": true, + "license": "ISC", + "dependencies": { + "agent-base": "^7.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.1", + "lru-cache": "^11.2.1", + "socks-proxy-agent": "^8.0.3" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/arborist": { + "version": "9.9.0", + "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-9.9.0.tgz", + "integrity": "sha512-tzsb1R8mx0k0drlLDT/9ckEYaQHIaWnUti/ci2IaFoQqdqwfmYrc+90p1+QEZC/ocvqcxBep9P1xKw4FbAGofw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@gar/promise-retry": "^1.0.0", + "@isaacs/string-locale-compare": "^1.1.0", + "@npmcli/fs": "^5.0.0", + "@npmcli/installed-package-contents": "^4.0.0", + "@npmcli/map-workspaces": "^5.0.0", + "@npmcli/metavuln-calculator": "^9.0.2", + "@npmcli/name-from-folder": "^4.0.0", + "@npmcli/node-gyp": "^5.0.0", + "@npmcli/package-json": "^7.0.0", + "@npmcli/query": "^5.0.0", + "@npmcli/redact": "^4.0.0", + "@npmcli/run-script": "^10.0.0", + "bin-links": "^6.0.0", + "cacache": "^20.0.1", + "common-ancestor-path": "^2.0.0", + "hosted-git-info": "^9.0.0", + "json-stringify-nice": "^1.1.4", + "lru-cache": "^11.2.1", + "minimatch": "^10.0.3", + "nopt": "^9.0.0", + "npm-install-checks": "^8.0.0", + "npm-package-arg": "^13.0.0", + "npm-pick-manifest": "^11.0.1", + "npm-registry-fetch": "^19.0.0", + "pacote": "^21.0.2", + "parse-conflict-json": "^5.0.1", + "proc-log": "^6.0.0", + "proggy": "^4.0.0", + "promise-all-reject-late": "^1.0.0", + "promise-call-limit": "^3.0.1", + "semver": "^7.3.7", + "ssri": "^13.0.0", + "treeverse": "^3.0.0", + "walk-up-path": "^4.0.0" + }, + "bin": { + "arborist": "bin/index.js" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/arborist/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/@npmcli/arborist/node_modules/brace-expansion": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz", + "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/@npmcli/arborist/node_modules/minimatch": { + "version": "10.2.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", + "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "brace-expansion": "^5.0.8" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@npmcli/fs": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-5.0.0.tgz", + "integrity": "sha512-7OsC1gNORBEawOa5+j2pXN9vsicaIOH5cPXxoR6fJOmH6/EXpJB2CajXOu1fPRFun2m1lktEFX11+P89hqO/og==", + "dev": true, + "license": "ISC", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/git": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-7.0.2.tgz", + "integrity": "sha512-oeolHDjExNAJAnlYP2qzNjMX/Xi9bmu78C9dIGr4xjobrSKbuMYCph8lTzn4vnW3NjIqVmw/f8BCfouqyJXlRg==", + "dev": true, + "license": "ISC", + "dependencies": { + "@gar/promise-retry": "^1.0.0", + "@npmcli/promise-spawn": "^9.0.0", + "ini": "^6.0.0", + "lru-cache": "^11.2.1", + "npm-pick-manifest": "^11.0.1", + "proc-log": "^6.0.0", + "semver": "^7.3.5", + "which": "^6.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/git/node_modules/isexe": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz", + "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=20" + } + }, + "node_modules/@npmcli/git/node_modules/which": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz", + "integrity": "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^4.0.0" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/installed-package-contents": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-4.0.0.tgz", + "integrity": "sha512-yNyAdkBxB72gtZ4GrwXCM0ZUedo9nIbOMKfGjt6Cu6DXf0p8y1PViZAKDC8q8kv/fufx0WTjRBdSlyrvnP7hmA==", + "dev": true, + "license": "ISC", + "dependencies": { + "npm-bundled": "^5.0.0", + "npm-normalize-package-bin": "^5.0.0" + }, + "bin": { + "installed-package-contents": "bin/index.js" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/map-workspaces": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-5.0.3.tgz", + "integrity": "sha512-o2grssXo1e774E5OtEwwrgoszYRh0lqkJH+Pb9r78UcqdGJRDRfhpM8DvZPjzNLLNYeD/rNbjOKM3Ss5UABROw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/name-from-folder": "^4.0.0", + "@npmcli/package-json": "^7.0.0", + "glob": "^13.0.0", + "minimatch": "^10.0.3" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/map-workspaces/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/@npmcli/map-workspaces/node_modules/brace-expansion": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz", + "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/@npmcli/map-workspaces/node_modules/glob": { + "version": "13.0.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz", + "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "minimatch": "^10.2.2", + "minipass": "^7.1.3", + "path-scurry": "^2.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@npmcli/map-workspaces/node_modules/minimatch": { + "version": "10.2.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", + "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "brace-expansion": "^5.0.8" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@npmcli/metavuln-calculator": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-9.0.3.tgz", + "integrity": "sha512-94GLSYhLXF2t2LAC7pDwLaM4uCARzxShyAQKsirmlNcpidH89VA4/+K1LbJmRMgz5gy65E/QBBWQdUvGLe2Frg==", + "dev": true, + "license": "ISC", + "dependencies": { + "cacache": "^20.0.0", + "json-parse-even-better-errors": "^5.0.0", + "pacote": "^21.0.0", + "proc-log": "^6.0.0", + "semver": "^7.3.5" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/name-from-folder": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-4.0.0.tgz", + "integrity": "sha512-qfrhVlOSqmKM8i6rkNdZzABj8MKEITGFAY+4teqBziksCQAOLutiAxM1wY2BKEd8KjUSpWmWCYxvXr0y4VTlPg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/node-gyp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-5.0.0.tgz", + "integrity": "sha512-uuG5HZFXLfyFKqg8QypsmgLQW7smiRjVc45bqD/ofZZcR/uxEjgQU8qDPv0s9TEeMUiAAU/GC5bR6++UdTirIQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/package-json": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-7.0.5.tgz", + "integrity": "sha512-iVuTlG3ORq2iaVa1IWUxAO/jIp77tUKBhoMjuzYW2kL4MLN1bi/ofqkZ7D7OOwh8coAx1/S2ge0rMdGv8sLSOQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/git": "^7.0.0", + "glob": "^13.0.0", + "hosted-git-info": "^9.0.0", + "json-parse-even-better-errors": "^5.0.0", + "proc-log": "^6.0.0", + "semver": "^7.5.3", + "spdx-expression-parse": "^4.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/package-json/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/@npmcli/package-json/node_modules/brace-expansion": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz", + "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/@npmcli/package-json/node_modules/glob": { + "version": "13.0.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz", + "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "minimatch": "^10.2.2", + "minipass": "^7.1.3", + "path-scurry": "^2.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@npmcli/package-json/node_modules/minimatch": { + "version": "10.2.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", + "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "brace-expansion": "^5.0.8" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@npmcli/promise-spawn": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-9.0.1.tgz", + "integrity": "sha512-OLUaoqBuyxeTqUvjA3FZFiXUfYC1alp3Sa99gW3EUDz3tZ3CbXDdcZ7qWKBzicrJleIgucoWamWH1saAmH/l2Q==", + "dev": true, + "license": "ISC", + "dependencies": { + "which": "^6.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/promise-spawn/node_modules/isexe": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz", + "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=20" + } + }, + "node_modules/@npmcli/promise-spawn/node_modules/which": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz", + "integrity": "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^4.0.0" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/query": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/query/-/query-5.0.0.tgz", + "integrity": "sha512-8TZWfTQOsODpLqo9SVhVjHovmKXNpevHU0gO9e+y4V4fRIOneiXy0u0sMP9LmS71XivrEWfZWg50ReH4WRT4aQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "postcss-selector-parser": "^7.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/redact": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-4.0.0.tgz", + "integrity": "sha512-gOBg5YHMfZy+TfHArfVogwgfBeQnKbbGo3pSUyK/gSI0AVu+pEiDVcKlQb0D8Mg1LNRZILZ6XG8I5dJ4KuAd9Q==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/run-script": { + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-10.0.4.tgz", + "integrity": "sha512-mGUWr1uMnf0le2TwfOZY4SFxZGXGfm4Jtay/nwAa2FLNAKXUoUwaGwBMNH36UHPtinWfTSJ3nqFQr0091CxVGg==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/node-gyp": "^5.0.0", + "@npmcli/package-json": "^7.0.0", + "@npmcli/promise-spawn": "^9.0.0", + "node-gyp": "^12.1.0", + "proc-log": "^6.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@sigstore/bundle": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-4.0.0.tgz", + "integrity": "sha512-NwCl5Y0V6Di0NexvkTqdoVfmjTaQwoLM236r89KEojGmq/jMls8S+zb7yOwAPdXvbwfKDlP+lmXgAL4vKSQT+A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@sigstore/protobuf-specs": "^0.5.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@sigstore/core": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-3.2.1.tgz", + "integrity": "sha512-qRsxPnCrbC/puegGxKuynfnxgLiHqWStrSjxkoB4YKqq3Z3s4cyZyj42ZdWFAEblNP65C+rBH8EuREHIXoi83g==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@sigstore/protobuf-specs": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.5.1.tgz", + "integrity": "sha512-/ScWUhhoFasJsSRGTVBwId1loQjjnjAfE4djL6ZhrXRpNCmPTnUKF5Jokd58ILseOMjzET3UrMOtJPS9sYeI0g==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, + "node_modules/@sigstore/sign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-4.1.1.tgz", + "integrity": "sha512-Hf4xglukg0XXQ2RiD5vSoLjdPe8OBUPA8XeVjUObheuDcWdYWrnH/BNmxZCzkAy68MzmNCxXLeurJvs6hcP2OQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@gar/promise-retry": "^1.0.2", + "@sigstore/bundle": "^4.0.0", + "@sigstore/core": "^3.2.0", + "@sigstore/protobuf-specs": "^0.5.0", + "make-fetch-happen": "^15.0.4", + "proc-log": "^6.1.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@sigstore/tuf": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-4.0.2.tgz", + "integrity": "sha512-TCAzTy0xzdP79EnxSjq9KQ3eaR7+FmudLC6eRKknVKZbV7ZNlGLClAAQb/HMNJ5n2OBNk2GT1tEmU0xuPr+SLQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@sigstore/protobuf-specs": "^0.5.0", + "tuf-js": "^4.1.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@sigstore/verify": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-3.1.1.tgz", + "integrity": "sha512-qv7+G3J2cc6wwFj3yKvXOamzqhMwSk1ogPGmhpS8iXllcPrJaIIBA+4HbttlHVu1pqWTdmaCH/WE7UOC51kdoA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@sigstore/bundle": "^4.0.0", + "@sigstore/core": "^3.2.1", + "@sigstore/protobuf-specs": "^0.5.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@tufjs/canonical-json": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz", + "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@tufjs/models": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-4.1.0.tgz", + "integrity": "sha512-Y8cK9aggNRsqJVaKUlEYs4s7CvQ1b1ta2DVPyAimb0I2qhzjNk+A+mxvll/klL0RlfuIUei8BF7YWiua4kQqww==", + "dev": true, + "license": "MIT", + "dependencies": { + "@tufjs/canonical-json": "2.0.0", + "minimatch": "^10.1.1" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@tufjs/models/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/@tufjs/models/node_modules/brace-expansion": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz", + "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/@tufjs/models/node_modules/minimatch": { + "version": "10.2.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", + "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "brace-expansion": "^5.0.8" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@ungap/promise-all-settled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", + "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", + "dev": true, + "license": "ISC" + }, + "node_modules/@xmldom/xmldom": { + "version": "0.9.10", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.10.tgz", + "integrity": "sha512-A9gOqLdi6cV4ibazAjcQufGj0B1y/vDqYrcuP6d/6x8P27gRS8643Dj9o1dEKtB6O7fwxb2FgBmJS2mX7gpvdw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.6" + } + }, + "node_modules/abbrev": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-4.0.0.tgz", + "integrity": "sha512-a1wflyaL0tHtJSmLSOVybYhy22vRih4eduhhrkcjgrWGnRfrZtovJ2FRjxuTtkkj47O/baf0R86QU5OuYpz8fA==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/agent-base": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", + "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, + "node_modules/ansi": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz", + "integrity": "sha512-iFY7JCgHbepc0b82yLaw4IMortylNb6wG4kL+4R0C3iv6i+RHGHux/yUX5BTiRvSX/shMnngjR1YyNMnXEFh5A==", + "dev": true, + "license": "MIT" + }, + "node_modules/ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "dev": true, + "license": "MIT" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/big-integer": { + "version": "1.6.52", + "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz", + "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==", + "dev": true, + "license": "Unlicense", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/bin-links": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-6.0.2.tgz", + "integrity": "sha512-frE1t78WOwJ45PKV2cF2tNPjTcs9L1J9s6VkrV59wanRP4GlaomuxYPVma7BwthMg8WnfSory4w5PTE6FZZ81w==", + "dev": true, + "license": "ISC", + "dependencies": { + "cmd-shim": "^8.0.0", + "npm-normalize-package-bin": "^5.0.0", + "proc-log": "^6.0.0", + "read-cmd-shim": "^6.0.0", + "write-file-atomic": "^7.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/bin-links/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/bin-links/node_modules/write-file-atomic": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-7.0.1.tgz", + "integrity": "sha512-OTIk8iR8/aCRWBqvxrzxR0hgxWpnYBblY1S5hDWBQfk/VFmJwzmJgQFN3WsoUKHISv2eAwe+PpbUzyL1CKTLXg==", + "dev": true, + "license": "ISC", + "dependencies": { + "signal-exit": "^4.0.1" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/bplist-parser": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.2.tgz", + "integrity": "sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "big-integer": "1.6.x" + }, + "engines": { + "node": ">= 5.10.0" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.15", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true, + "license": "ISC" + }, + "node_modules/cacache": { + "version": "20.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-20.0.4.tgz", + "integrity": "sha512-M3Lab8NPYlZU2exsL3bMVvMrMqgwCnMWfdZbK28bn3pK6APT/Te/I8hjRPNu1uwORY9a1eEQoifXbKPQMfMTOA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^5.0.0", + "fs-minipass": "^3.0.0", + "glob": "^13.0.0", + "lru-cache": "^11.1.0", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^7.0.2", + "ssri": "^13.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/cacache/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/cacache/node_modules/brace-expansion": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz", + "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/cacache/node_modules/glob": { + "version": "13.0.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz", + "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "minimatch": "^10.2.2", + "minipass": "^7.1.3", + "path-scurry": "^2.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/cacache/node_modules/minimatch": { + "version": "10.2.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", + "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "brace-expansion": "^5.0.8" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/chai": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz", + "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.2", + "deep-eql": "^3.0.1", + "get-func-name": "^2.0.0", + "loupe": "^2.3.1", + "pathval": "^1.1.1", + "type-detect": "^4.0.5" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/check-error": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-func-name": "^2.0.2" + }, + "engines": { + "node": "*" + } + }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chownr": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", + "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cmd-shim": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-8.0.0.tgz", + "integrity": "sha512-Jk/BK6NCapZ58BKUxlSI+ouKRbjH1NLZCgJkYoab+vEHUY3f6OzpNBN9u7HFSv9J6TRDGs4PLOHezoKGaFRSCA==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/common-ancestor-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-2.0.0.tgz", + "integrity": "sha512-dnN3ibLeoRf2HNC+OlCiNc5d2zxbLJXOtiZUudNFSXZrNSydxcCsSpRzXwfu7BBWCIfHPw+xTayeBvJCP/D8Ng==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">= 18" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/configstore": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", + "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "dot-prop": "^5.2.0", + "graceful-fs": "^4.1.2", + "make-dir": "^3.0.0", + "unique-string": "^2.0.0", + "write-file-atomic": "^3.0.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cordova": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/cordova/-/cordova-13.0.0.tgz", + "integrity": "sha512-QAIMwmYLL0jHo4vauWSnRd2fr9l+wajG+F5aUkrC6e4ZQGSTv0wAiRmpqQUkIc1ZdELisKDQws/BjHz5nP/sLw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "configstore": "^5.0.1", + "cordova-common": "^6.0.0", + "cordova-create": "^6.0.0", + "cordova-lib": "^13.0.0", + "editor": "^1.0.0", + "execa": "^5.1.1", + "nopt": "^9.0.0", + "semver": "^7.7.3", + "systeminformation": "^5.27.11" + }, + "bin": { + "cordova": "bin/cordova" + }, + "engines": { + "node": ">=20.17.0 || >=22.9.0" + } + }, + "node_modules/cordova-app-hello-world": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-7.0.0.tgz", + "integrity": "sha512-uDTncFkI73ko+wEf6IEO9bw8lQRMQGnfdi5pPMei4P8+plChNcRW5fxjKlhM/8ZrT8OAWiHsQRrP4pIAn3HQ4g==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/cordova-common": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-6.0.0.tgz", + "integrity": "sha512-16WPC1DuxVdshV3RoQUXqhcJVdhxWGwiFysA4TkYuboqoev6mgt0JuIJFxmQbzR/DuyuONaVe0L0O0Hf1C08Mg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@netflix/nerror": "^1.1.3", + "ansi": "^0.3.1", + "bplist-parser": "^0.3.2", + "elementtree": "^0.1.7", + "endent": "^2.1.0", + "fast-glob": "^3.3.3", + "plist": "^3.1.0" + }, + "engines": { + "node": ">=20.9.0" + } + }, + "node_modules/cordova-create": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-6.0.0.tgz", + "integrity": "sha512-LD41sLn2GsmAlj3576R3xlUM3BP0rt0CYd5LdbzU82WBI3ApMrrhM6xcHDYJfe1nfSL89O/nb/u/h7+7DhPQeA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "cordova-app-hello-world": "^7.0.0", + "cordova-common": "^6.0.0", + "cordova-fetch": "^5.0.0", + "globby": "^11.1.0", + "import-fresh": "^3.3.1", + "isobject": "^4.0.0", + "npm-package-arg": "^13.0.0", + "path-is-inside": "^1.0.2", + "tmp": "^0.2.5", + "valid-identifier": "0.0.2" + }, + "engines": { + "node": ">=20.17.0 || >=22.9.0" + } + }, + "node_modules/cordova-fetch": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-5.0.0.tgz", + "integrity": "sha512-fsYnVfx32AOrFO6tw4EkzSig7WjNhze35dKIzdw20zTQetDKEfWA79PpCaoiSeahGi6O2MdnOFabLhEa8se6jg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@npmcli/arborist": "^9.1.3", + "cordova-common": "^6.0.0", + "execa": "^5.1.1", + "npm-package-arg": "^13.0.0", + "pacote": "^21.0.0", + "resolve": "^1.22.10", + "semver": "^7.7.2", + "which": "^5.0.0" + }, + "engines": { + "node": ">=20.9.0", + "npm": ">=8.1.0" + } + }, + "node_modules/cordova-fetch/node_modules/isexe": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz", + "integrity": "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } + }, + "node_modules/cordova-fetch/node_modules/which": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", + "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^3.1.1" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, + "node_modules/cordova-lib": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-13.0.0.tgz", + "integrity": "sha512-y8WQ+J6JtiU9C72ujvI3p+ScFJkg0VJwNfaUCqk9nPAssw2C6HltHk+ik/WrLUn6uDmwAM6gmfGUIMU2iVrNxA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "cordova-common": "^6.0.0", + "cordova-fetch": "^5.0.0", + "detect-indent": "^6.1.0", + "detect-newline": "^3.1.0", + "execa": "^5.1.1", + "globby": "^11.1.0", + "semver": "^7.7.2", + "stringify-package": "^1.0.1", + "write-file-atomic": "^7.0.0" + }, + "engines": { + "node": ">=20.17.0 || >=22.9.0" + } + }, + "node_modules/cordova-lib/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/cordova-lib/node_modules/write-file-atomic": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-7.0.1.tgz", + "integrity": "sha512-OTIk8iR8/aCRWBqvxrzxR0hgxWpnYBblY1S5hDWBQfk/VFmJwzmJgQFN3WsoUKHISv2eAwe+PpbUzyL1CKTLXg==", + "dev": true, + "license": "ISC", + "dependencies": { + "signal-exit": "^4.0.1" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/crypto-random-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", + "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "dev": true, + "license": "MIT", + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/dedent": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", + "dev": true, + "license": "MIT" + }, + "node_modules/deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-detect": "^4.0.0" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/detect-indent": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", + "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/dot-prop": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-obj": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/editor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz", + "integrity": "sha512-SoRmbGStwNYHgKfjOrX2L0mUvp9bUVv0uPppZSOMAntEbcFtoC3MKF5b3T6HQPXKIV+QGY3xPO3JK5it5lVkuw==", + "dev": true, + "license": "MIT" + }, + "node_modules/elementtree": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz", + "integrity": "sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "sax": "1.1.4" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/endent": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/endent/-/endent-2.1.0.tgz", + "integrity": "sha512-r8VyPX7XL8U01Xgnb1CjZ3XV+z90cXIJ9JPE/R9SEC9vpw2P6CfsRPJmp20DppC5N7ZAMCmjYkJIa744Iyg96w==", + "dev": true, + "license": "MIT", + "dependencies": { + "dedent": "^0.7.0", + "fast-json-parse": "^1.0.3", + "objectorarray": "^1.0.5" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/exponential-backoff": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz", + "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/extsprintf": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", + "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "license": "MIT" + }, + "node_modules/fast-glob": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.8" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-json-parse": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz", + "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", + "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "license": "BSD-3-Clause", + "bin": { + "flat": "cli.js" + } + }, + "node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-func-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4.x" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/hasown": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz", + "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "license": "MIT", + "bin": { + "he": "bin/he" + } + }, + "node_modules/hosted-git-info": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-9.0.3.tgz", + "integrity": "sha512-Hc+ghLoSt6QaYZUv0WBiIvmMDZuZZ7oaDvdH8MbfOO4lOsxdXLEvuC6ePoGs9H1X9oCLyq6+NVN0MKqD+ydxyg==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^11.1.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/http-cache-semantics": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", + "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/https-proxy-agent": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz", + "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/ignore-walk": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-8.0.0.tgz", + "integrity": "sha512-FCeMZT4NiRQGh+YkeKMtWrOmBgWjHjMJ26WQWrRQyoyzqevdaGSakUaJW5xQYmjLlUVk2qUnCjYVBax9EKKg8A==", + "dev": true, + "license": "ISC", + "dependencies": { + "minimatch": "^10.0.3" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/ignore-walk/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/ignore-walk/node_modules/brace-expansion": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz", + "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/ignore-walk/node_modules/minimatch": { + "version": "10.2.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", + "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "brace-expansion": "^5.0.8" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/ini": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-6.0.0.tgz", + "integrity": "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/ip-address": { + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.3.1.tgz", + "integrity": "sha512-1e9d3kb97NHJTIJDZW9rKqW2h6+dFa50Dy0fpPSMQp2ADje5gvKsXmdiK6dwY5t76TaTt5+P5N1Y/LoToIxP6g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 12" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-core-module": { + "version": "2.16.2", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz", + "integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/isobject": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz", + "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-parse-even-better-errors": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-5.0.0.tgz", + "integrity": "sha512-ZF1nxZ28VhQouRWhUcVlUIN3qwSgPuswK05s/HIaoetAoE/9tngVmCHjSxmSQPav1nd+lPtTL0YZ/2AFdR/iYQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/json-stringify-nice": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz", + "integrity": "sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==", + "dev": true, + "license": "ISC", + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/jsonparse": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", + "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", + "dev": true, + "engines": [ + "node >= 0.2.0" + ], + "license": "MIT" + }, + "node_modules/just-diff": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-6.0.2.tgz", + "integrity": "sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==", + "dev": true, + "license": "MIT" + }, + "node_modules/just-diff-apply": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.5.0.tgz", + "integrity": "sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==", + "dev": true, + "license": "MIT" + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash": { + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-symbols/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/loupe": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-func-name": "^2.0.1" + } + }, + "node_modules/lru-cache": { + "version": "11.5.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz", + "integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/make-fetch-happen": { + "version": "15.0.6", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.6.tgz", + "integrity": "sha512-Je0fLJ0F5atA7F+eIlLzk+Wkcl57JDf4kf+EW8xiP5E31xOQxkIxTbgf1Oi1Lw9tRI9UEMRdI5Vz2xTzoNU1Jw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@gar/promise-retry": "^1.0.0", + "@npmcli/agent": "^4.0.0", + "@npmcli/redact": "^4.0.0", + "cacache": "^20.0.1", + "http-cache-semantics": "^4.1.1", + "minipass": "^7.0.2", + "minipass-fetch": "^5.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^1.0.0", + "proc-log": "^6.0.0", + "ssri": "^13.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true, + "license": "MIT" + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/minipass": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", + "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-collect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-fetch": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-5.0.2.tgz", + "integrity": "sha512-2d0q2a8eCi2IRg/IGubCNRJoYbA1+YPXAzQVRFmB45gdGZafyivnZ5YSEfo3JikbjGxOdntGFvBQGqaSMXlAFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^2.0.0", + "minizlib": "^3.0.1" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + }, + "optionalDependencies": { + "iconv-lite": "^0.7.2" + } + }, + "node_modules/minipass-flush": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.7.tgz", + "integrity": "sha512-TbqTz9cUwWyHS2Dy89P3ocAGUGxKjjLuR9z8w4WUTGAVgEj17/4nhgo2Du56i0Fm3Pm30g4iA8Lcqctc76jCzA==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-flush/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-flush/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, + "node_modules/minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, + "node_modules/minipass-sized": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-2.0.0.tgz", + "integrity": "sha512-zSsHhto5BcUVM2m1LurnXY6M//cGhVaegT71OfOXoprxT6o780GZd792ea6FfrQkuU4usHZIUczAQMRUE2plzA==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.1.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", + "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^7.1.2" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/mocha": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz", + "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ungap/promise-all-settled": "1.1.2", + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.3", + "debug": "4.3.3", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.2.0", + "growl": "1.10.5", + "he": "1.2.0", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "4.2.1", + "ms": "2.1.3", + "nanoid": "3.3.1", + "serialize-javascript": "6.0.0", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "which": "2.0.2", + "workerpool": "6.2.0", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha" + }, + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mochajs" + } + }, + "node_modules/mocha/node_modules/debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/mocha/node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/mocha/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mocha/node_modules/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/mocha/node_modules/glob/node_modules/minimatch": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/mocha/node_modules/minimatch": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz", + "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/nanoid": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", + "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", + "dev": true, + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/negotiator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", + "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/node-gyp": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.4.0.tgz", + "integrity": "sha512-OMcPNvqTCFUnNaBlmdgq+lfNqY7gTiSmNRDjY3uAXRyudeKZEZxu3CLtjMQrx4zZxCX2b/mpNqTtwuCJgXhHkw==", + "dev": true, + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "graceful-fs": "^4.2.6", + "nopt": "^9.0.0", + "proc-log": "^6.0.0", + "semver": "^7.3.5", + "tar": "^7.5.4", + "tinyglobby": "^0.2.12", + "undici": "^6.25.0", + "which": "^6.0.0" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/node-gyp/node_modules/isexe": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz", + "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=20" + } + }, + "node_modules/node-gyp/node_modules/which": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz", + "integrity": "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^4.0.0" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/nopt": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-9.0.0.tgz", + "integrity": "sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw==", + "dev": true, + "license": "ISC", + "dependencies": { + "abbrev": "^4.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/npm-bundled": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-5.0.0.tgz", + "integrity": "sha512-JLSpbzh6UUXIEoqPsYBvVNVmyrjVZ1fzEFbqxKkTJQkWBO3xFzFT+KDnSKQWwOQNbuWRwt5LSD6HOTLGIWzfrw==", + "dev": true, + "license": "ISC", + "dependencies": { + "npm-normalize-package-bin": "^5.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/npm-install-checks": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-8.0.0.tgz", + "integrity": "sha512-ScAUdMpyzkbpxoNekQ3tNRdFI8SJ86wgKZSQZdUxT+bj0wVFpsEMWnkXP0twVe1gJyNF5apBWDJhhIbgrIViRA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "semver": "^7.1.1" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/npm-normalize-package-bin": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-5.0.0.tgz", + "integrity": "sha512-CJi3OS4JLsNMmr2u07OJlhcrPxCeOeP/4xq67aWNai6TNWWbTrlNDgl8NcFKVlcBKp18GPj+EzbNIgrBfZhsag==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/npm-package-arg": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-13.0.2.tgz", + "integrity": "sha512-IciCE3SY3uE84Ld8WZU23gAPPV9rIYod4F+rc+vJ7h7cwAJt9Vk6TVsK60ry7Uj3SRS3bqRRIGuTp9YVlk6WNA==", + "dev": true, + "license": "ISC", + "dependencies": { + "hosted-git-info": "^9.0.0", + "proc-log": "^6.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^7.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/npm-packlist": { + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-10.0.4.tgz", + "integrity": "sha512-uMW73iajD8hiH4ZBxEV3HC+eTnppIqwakjOYuvgddnalIw2lJguKviK1pcUJDlIWm1wSJkchpDZDSVVsZEYRng==", + "dev": true, + "license": "ISC", + "dependencies": { + "ignore-walk": "^8.0.0", + "proc-log": "^6.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/npm-pick-manifest": { + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-11.0.3.tgz", + "integrity": "sha512-buzyCfeoGY/PxKqmBqn1IUJrZnUi1VVJTdSSRPGI60tJdUhUoSQFhs0zycJokDdOznQentgrpf8LayEHyyYlqQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "npm-install-checks": "^8.0.0", + "npm-normalize-package-bin": "^5.0.0", + "npm-package-arg": "^13.0.0", + "semver": "^7.3.5" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/npm-registry-fetch": { + "version": "19.1.1", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-19.1.1.tgz", + "integrity": "sha512-TakBap6OM1w0H73VZVDf44iFXsOS3h+L4wVMXmbWOQroZgFhMch0juN6XSzBNlD965yIKvWg2dfu7NSiaYLxtw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/redact": "^4.0.0", + "jsonparse": "^1.3.1", + "make-fetch-happen": "^15.0.0", + "minipass": "^7.0.2", + "minipass-fetch": "^5.0.0", + "minizlib": "^3.0.1", + "npm-package-arg": "^13.0.0", + "proc-log": "^6.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/objectorarray": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.5.tgz", + "integrity": "sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg==", + "dev": true, + "license": "ISC" + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.6.tgz", + "integrity": "sha512-I4Prw6ivkd6p8PiYR1tXASOAOBzIJwu0TB7fqaX0c/8c3QAehNYmX57EijyGGGBt3c/BIowGwV03RVBtXvHEVg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pacote": { + "version": "21.5.1", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-21.5.1.tgz", + "integrity": "sha512-KvcJ9iy3crysCsgqc4+PknH/w6jkrp8JN36mpZBPwNaDRwTfMZD37YzRazNstiZUOhuF5pno9f78n9mEJBavwg==", + "dev": true, + "license": "ISC", + "dependencies": { + "@gar/promise-retry": "^1.0.0", + "@npmcli/git": "^7.0.0", + "@npmcli/installed-package-contents": "^4.0.0", + "@npmcli/package-json": "^7.0.0", + "@npmcli/promise-spawn": "^9.0.0", + "@npmcli/run-script": "^10.0.0", + "cacache": "^20.0.0", + "fs-minipass": "^3.0.0", + "minipass": "^7.0.2", + "npm-package-arg": "^13.0.0", + "npm-packlist": "^10.0.1", + "npm-pick-manifest": "^11.0.1", + "npm-registry-fetch": "^19.0.0", + "proc-log": "^6.0.0", + "sigstore": "^4.0.0", + "ssri": "^13.0.0", + "tar": "^7.4.3" + }, + "bin": { + "pacote": "bin/index.js" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-conflict-json": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-5.0.1.tgz", + "integrity": "sha512-ZHEmNKMq1wyJXNwLxyHnluPfRAFSIliBvbK/UiOceROt4Xh9Pz0fq49NytIaeaCUf5VR86hwQ/34FCcNU5/LKQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "json-parse-even-better-errors": "^5.0.0", + "just-diff": "^6.0.0", + "just-diff-apply": "^5.2.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==", + "dev": true, + "license": "(WTFPL OR MIT)" + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-scurry": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz", + "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/pathval": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/plist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.1.tgz", + "integrity": "sha512-ZIfcLJC+7E7FBFnDxm9MPmt7D+DidyQ26lewieO75AdhA2ayMtsJSES0iWzqJQbcVRSrTufQoy0DR94xHue0oA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@xmldom/xmldom": "^0.9.10", + "base64-js": "^1.5.1", + "xmlbuilder": "^15.1.1" + }, + "engines": { + "node": ">=10.4.0" + } + }, + "node_modules/postcss-selector-parser": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.4.tgz", + "integrity": "sha512-HeP7D2wyhkR+XaK6v4W8oRF62Dsz4flyuczALJp61GckGm42u1saSSJ/0auvcBqxs3jMRFEcPK34At/0JBKdOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/proc-log": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz", + "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/proggy": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/proggy/-/proggy-4.0.0.tgz", + "integrity": "sha512-MbA4R+WQT76ZBm/5JUpV9yqcJt92175+Y0Bodg3HgiXzrmKu7Ggq+bpn6y6wHH+gN9NcyKn3yg1+d47VaKwNAQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/promise-all-reject-late": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz", + "integrity": "sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==", + "dev": true, + "license": "ISC", + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/promise-call-limit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-3.0.2.tgz", + "integrity": "sha512-mRPQO2T1QQVw11E7+UdCJu7S61eJVWknzml9sC1heAdj1jxl0fWMBypIt9ZOcLFf8FkG995ZD7RnVk7HH72fZw==", + "dev": true, + "license": "ISC", + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/read-cmd-shim": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-6.0.0.tgz", + "integrity": "sha512-1zM5HuOfagXCBWMN83fuFI/x+T/UhZ7k+KIzhrHXcQoeX5+7gmaDYjELQHmmzIodumBHeByBJT4QYS7ufAgs7A==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.12", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz", + "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "is-core-module": "^2.16.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/sax": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz", + "integrity": "sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg==", + "dev": true, + "license": "ISC" + }, + "node_modules/semver": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/sigstore": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-4.1.1.tgz", + "integrity": "sha512-endqECJkfhozrXMK5ngu/UAA0xVcVEFdnHJCElGaExypjW+HK5i6zu3NteLoaX/iFbRUbC3+DjttQs0GARr+5w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@sigstore/bundle": "^4.0.0", + "@sigstore/core": "^3.2.1", + "@sigstore/protobuf-specs": "^0.5.0", + "@sigstore/sign": "^4.1.1", + "@sigstore/tuf": "^4.0.2", + "@sigstore/verify": "^3.1.1" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.9.tgz", + "integrity": "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==", + "dev": true, + "license": "MIT", + "dependencies": { + "ip-address": "^10.1.1", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks-proxy-agent": { + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", + "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.2", + "debug": "^4.3.4", + "socks": "^2.8.3" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "dev": true, + "license": "CC-BY-3.0" + }, + "node_modules/spdx-expression-parse": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz", + "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.23", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz", + "integrity": "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==", + "dev": true, + "license": "CC0-1.0" + }, + "node_modules/ssri": { + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-13.0.1.tgz", + "integrity": "sha512-QUiRf1+u9wPTL/76GTYlKttDEBWV1ga9ZXW8BG6kfdeyyM8LGPix9gROyg9V2+P0xNyF3X2Go526xKFdMZrHSQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/stringify-package": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz", + "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==", + "deprecated": "This module is not used anymore, and has been replaced by @npmcli/package-json", + "dev": true, + "license": "ISC" + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/systeminformation": { + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.33.1.tgz", + "integrity": "sha512-DEN6ICHk3Tk0Uf/hrAHh7xlt7iL5CJFBtPZinA0H62DrGG/KPKqq/Nzj6lCXPS4Ay/sf/14zNnk9LpqKzBIc+w==", + "dev": true, + "license": "MIT", + "os": [ + "darwin", + "linux", + "win32", + "freebsd", + "openbsd", + "netbsd", + "sunos", + "android" + ], + "bin": { + "systeminformation": "lib/cli.js" + }, + "engines": { + "node": ">=10.0.0" + }, + "funding": { + "type": "Buy me a coffee", + "url": "https://www.buymeacoffee.com/systeminfo" + } + }, + "node_modules/tar": { + "version": "7.5.22", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.22.tgz", + "integrity": "sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/fs-minipass": "^4.0.0", + "chownr": "^3.0.0", + "minipass": "^7.1.2", + "minizlib": "^3.1.0", + "yallist": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/tinyglobby": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", + "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fdir": "^6.5.0", + "picomatch": "^4.0.4" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/tinyglobby/node_modules/fdir": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/tinyglobby/node_modules/picomatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", + "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/tmp": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.7.tgz", + "integrity": "sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.14" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/treeverse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz", + "integrity": "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-4.1.0.tgz", + "integrity": "sha512-50QV99kCKH5P/Vs4E2Gzp7BopNV+KzTXqWeaxrfu5IQJBOULRsTIS9seSsOVT8ZnGXzCyx55nYWAi4qJzpZKEQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@tufjs/models": "4.1.0", + "debug": "^4.4.3", + "make-fetch-happen": "^15.0.1" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/type-detect": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-typedarray": "^1.0.0" + } + }, + "node_modules/umd-tough-cookie": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/umd-tough-cookie/-/umd-tough-cookie-3.0.0.tgz", + "integrity": "sha512-LgVV1jgzEPgC/zOj6T9OIDBTj7YCGEJkgoxV2gHYv1Crlst1X95lRIF48hFleGgv4v01Z86LxyyLyvl++M2Srg==", + "dev": true, + "license": "MIT" + }, + "node_modules/undici": { + "version": "6.28.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.28.0.tgz", + "integrity": "sha512-LIY910g9TI13YS95lrMFrs8Rm/u/irgHeTWoKCoteeJ04CUJ92eEfj0rVn+7VKMPBpUPiUoBKfhNyLI23EE/KA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18.17" + } + }, + "node_modules/unique-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", + "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", + "dev": true, + "license": "MIT", + "dependencies": { + "crypto-random-string": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/valid-identifier": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.2.tgz", + "integrity": "sha512-zaSmOW6ykXwrkX0YTuFUSoALNEKGaQHpxBJQLb3TXspRNDpBwbfrIQCZqAQ0LKBlKuyn2YOq7NNd6415hvZ33g==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/validate-npm-package-name": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-7.0.2.tgz", + "integrity": "sha512-hVDIBwsRruT73PbK7uP5ebUt+ezEtCmzZz3F59BSr2F6OVFnJ/6h8liuvdLrQ88Xmnk6/+xGGuq+pG9WwTuy3A==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/walk-up-path": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-4.0.0.tgz", + "integrity": "sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==", + "dev": true, + "license": "ISC", + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/workerpool": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz", + "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "node_modules/xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/xml2js": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz", + "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==", + "dev": true, + "license": "MIT", + "dependencies": { + "sax": ">=0.6.0", + "xmlbuilder": "~11.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/xml2js/node_modules/xmlbuilder": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/xmlbuilder": { + "version": "15.1.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", + "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.0" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/src/plugins/cordova-plugin-advanced-http/package.json b/src/plugins/cordova-plugin-advanced-http/package.json index 55715abaf4..ed9f655644 100644 --- a/src/plugins/cordova-plugin-advanced-http/package.json +++ b/src/plugins/cordova-plugin-advanced-http/package.json @@ -60,10 +60,12 @@ "devDependencies": { "chai": "4.3.6", "colors": "1.4.0", - "cordova": "11.0.0", + "cordova": "13.0.0", "mocha": "9.2.2", "umd-tough-cookie": "3.0.0", - "wd": "1.14.0", "xml2js": "0.4.23" + }, + "overrides": { + "tar": "^7.5.22" } } diff --git a/src/plugins/system/android/com/foxdebug/system/SoftInputAssist.java b/src/plugins/system/android/com/foxdebug/system/SoftInputAssist.java deleted file mode 100644 index 6f6fb14e40..0000000000 --- a/src/plugins/system/android/com/foxdebug/system/SoftInputAssist.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.foxdebug.system; - -import android.app.Activity; -import android.view.View; - -import androidx.core.graphics.Insets; -import androidx.core.view.ViewCompat; -import androidx.core.view.WindowInsetsCompat; - -public class SoftInputAssist { - - public SoftInputAssist(Activity activity) { - View contentView = activity.findViewById(android.R.id.content); - - ViewCompat.setOnApplyWindowInsetsListener(contentView, (v, insets) -> { - Insets ime = insets.getInsets(WindowInsetsCompat.Type.ime()); - Insets nav = insets.getInsets(WindowInsetsCompat.Type.navigationBars()); - - int keyboardHeight = Math.max(0, ime.bottom - nav.bottom); - - v.setPadding(0, 0, 0, keyboardHeight); - - return insets; - }); - - ViewCompat.requestApplyInsets(contentView); - } -} diff --git a/src/plugins/system/plugin.xml b/src/plugins/system/plugin.xml index caa34109fb..ed80bf0cb4 100644 --- a/src/plugins/system/plugin.xml +++ b/src/plugins/system/plugin.xml @@ -35,11 +35,10 @@ - - - - - + + + + diff --git a/src/settings/mainSettings.js b/src/settings/mainSettings.js index e83147c96a..2946f57c72 100644 --- a/src/settings/mainSettings.js +++ b/src/settings/mainSettings.js @@ -7,9 +7,11 @@ import auth from "lib/auth"; import config from "lib/config"; import customTab from "lib/customTab"; import openFile from "lib/openFile"; +import { bindPrivacyChoices } from "lib/privacyChoicesController.mjs"; import removeAds from "lib/removeAds"; import appSettings from "lib/settings"; import settings from "lib/settings"; +import { showPrivacyOptions, subscribePrivacyState } from "lib/startAd"; import openAdRewardsPage from "pages/adRewards"; import Changelog from "pages/changelog/changelog"; import plugins from "pages/plugins"; @@ -163,6 +165,21 @@ export default function mainSettings() { }, ]; + if (!config.HAS_PRO) { + const aboutIndex = items.findIndex((item) => item.key === "about"); + items.splice(aboutIndex, 0, { + key: "privacyChoices", + text: strings["privacy choices"] || "Privacy choices", + icon: "tune", + info: + strings["settings-info-main-privacy-choices"] || + "Manage your advertising privacy choices.", + category: categories.aboutAcode, + chevron: true, + hidden: true, + }); + } + if (!config.HAS_PRO) { items.push({ key: "adRewards", @@ -233,6 +250,14 @@ export default function mainSettings() { rateBox(); break; + case "privacyChoices": + try { + await showPrivacyOptions(); + } catch (error) { + helpers.error(error); + } + break; + case "plugins": plugins(); break; @@ -325,6 +350,12 @@ export default function mainSettings() { pageClassName: "main-settings-page", listClassName: "main-settings-list", }); + if (!config.HAS_PRO) { + bindPrivacyChoices({ + page, + subscribe: subscribePrivacyState, + }); + } page.show(); appSettings.uiSettings["main-settings"] = page; diff --git a/src/utils/helpers.js b/src/utils/helpers.js index 126ae476cd..d2b97f5328 100644 --- a/src/utils/helpers.js +++ b/src/utils/helpers.js @@ -4,7 +4,7 @@ import alert from "dialogs/alert"; import escapeStringRegexp from "escape-string-regexp"; import adRewards from "lib/adRewards"; import config from "lib/config"; -import { bannerAd, interstitialAd } from "lib/startAd"; +import { interstitialAd, requestBannerForPage } from "lib/startAd"; import { isBinaryFile } from "./binaryExtensions"; import { isPlayStoreInstall } from "./installSource"; import path from "./Path"; @@ -311,12 +311,10 @@ export default { showAd() { if (!this.canShowAds()) return; if (innerHeight * devicePixelRatio <= 600) return; - if (!bannerAd || typeof bannerAd.show !== "function") return; const $page = tag.getAll("wc-page:not(#root)").pop(); if ($page) { - bannerAd.active = true; - bannerAd.show(); + requestBannerForPage($page); } }, async toInternalUri(uri) { diff --git a/tests/admob/adConsentCoordinator.test.js b/tests/admob/adConsentCoordinator.test.js new file mode 100644 index 0000000000..cb4fe07c70 --- /dev/null +++ b/tests/admob/adConsentCoordinator.test.js @@ -0,0 +1,179 @@ +import assert from "node:assert/strict"; +import { test } from "vitest"; +import { + AdConsentCoordinator, + EMPTY_PRIVACY_STATE, +} from "../../src/lib/adConsentCoordinator.mjs"; + +function createHarness({ + gatherState, + previousState = EMPTY_PRIVACY_STATE, + gatherError, +}) { + let gatherCalls = 0; + let getStateCalls = 0; + let initializeCalls = 0; + const errors = []; + const privacy = { + async gatherConsent() { + gatherCalls++; + if (gatherError) throw gatherError; + return gatherState; + }, + async getState() { + getStateCalls++; + return previousState; + }, + async showOptions() { + return gatherState; + }, + }; + const coordinator = new AdConsentCoordinator({ + privacy, + initializeAds: async () => { + initializeCalls++; + }, + onError: (error) => errors.push(error), + }); + + return { + coordinator, + privacy, + errors, + get gatherCalls() { + return gatherCalls; + }, + get getStateCalls() { + return getStateCalls; + }, + get initializeCalls() { + return initializeCalls; + }, + }; +} + +test("starts ads after required consent is resolved", async () => { + const harness = createHarness({ + gatherState: { + consentStatus: "obtained", + canRequestAds: true, + privacyOptionsRequired: true, + }, + }); + + assert.deepEqual(await harness.coordinator.start(), { + consentStatus: "obtained", + canRequestAds: true, + privacyOptionsRequired: true, + }); + assert.equal(harness.gatherCalls, 1); + assert.equal(harness.initializeCalls, 1); +}); + +test("starts ads immediately when consent is not required", async () => { + const harness = createHarness({ + gatherState: { + consentStatus: "notRequired", + canRequestAds: true, + privacyOptionsRequired: false, + }, + }); + + await harness.coordinator.start(); + assert.equal(harness.initializeCalls, 1); +}); + +test("serves limited ads after a user records a non-consent choice", async () => { + const harness = createHarness({ + gatherState: { + consentStatus: "obtained", + canRequestAds: true, + privacyOptionsRequired: true, + }, + }); + + await harness.coordinator.start(); + assert.equal(harness.initializeCalls, 1); +}); + +test("uses valid previous-session consent after an update failure", async () => { + const updateError = new Error("offline"); + const harness = createHarness({ + gatherError: updateError, + previousState: { + consentStatus: "obtained", + canRequestAds: true, + privacyOptionsRequired: true, + }, + }); + + await harness.coordinator.start(); + assert.equal(harness.getStateCalls, 1); + assert.equal(harness.initializeCalls, 1); + assert.deepEqual(harness.errors, [updateError]); +}); + +test("does not request ads when update and cached consent are unavailable", async () => { + const harness = createHarness({ + gatherError: new Error("offline"), + previousState: EMPTY_PRIVACY_STATE, + }); + + await harness.coordinator.start(); + assert.equal(harness.initializeCalls, 0); +}); + +test("deduplicates consent collection and ad initialization", async () => { + const harness = createHarness({ + gatherState: { + consentStatus: "notRequired", + canRequestAds: true, + privacyOptionsRequired: false, + }, + }); + + await Promise.all([ + harness.coordinator.start(), + harness.coordinator.start(), + harness.coordinator.start(), + ]); + assert.equal(harness.gatherCalls, 1); + assert.equal(harness.initializeCalls, 1); +}); + +test("updates privacy-option visibility and keeps ads single-started", async () => { + const harness = createHarness({ + gatherState: { + consentStatus: "notRequired", + canRequestAds: true, + privacyOptionsRequired: false, + }, + }); + const states = []; + const unsubscribe = harness.coordinator.subscribe((state) => states.push(state)); + + await harness.coordinator.start(); + harness.privacy.showOptions = async () => ({ + consentStatus: "obtained", + canRequestAds: true, + privacyOptionsRequired: true, + }); + await harness.coordinator.showPrivacyOptions(); + unsubscribe(); + + assert.equal(harness.initializeCalls, 1); + assert.equal(states.at(-1).privacyOptionsRequired, true); +}); + +test("normalizes an invalid native state instead of starting ads", async () => { + const harness = createHarness({ + gatherState: { + consentStatus: "unexpected", + canRequestAds: "yes", + privacyOptionsRequired: 1, + }, + }); + + assert.deepEqual(await harness.coordinator.start(), EMPTY_PRIVACY_STATE); + assert.equal(harness.initializeCalls, 0); +}); diff --git a/tests/admob/adRewardBannerPolicy.test.js b/tests/admob/adRewardBannerPolicy.test.js new file mode 100644 index 0000000000..4de8d29d45 --- /dev/null +++ b/tests/admob/adRewardBannerPolicy.test.js @@ -0,0 +1,243 @@ +import assert from "node:assert/strict"; +import { test } from "vitest"; +import { + createRewardStateLifecycle, + isRewardPassActive, +} from "../../src/lib/adRewardBannerPolicy.mjs"; +import { BANNER_SUPPRESSION_REASON } from "../../src/lib/bannerVisibilityController.mjs"; + +function createHarness({ + initialState = { isActive: false, adFreeUntil: 0 }, + statuses = [], + now = 1_000, + throwOnEmit = false, + initialSuppressions = [], +} = {}) { + let state = initialState; + let currentTime = now; + let nextTimerId = 1; + const timers = new Map(); + const suppressions = new Set(initialSuppressions); + const events = []; + const refreshErrors = []; + const listenerErrors = []; + const expiryNotices = []; + const pendingStatuses = [...statuses]; + + const lifecycle = createRewardStateLifecycle({ + loadStatus: async () => { + const status = pendingStatuses.shift(); + if (status instanceof Error) throw status; + return status; + }, + normalizeStatus: (status) => { + const adFreeUntil = Number(status?.adFreeUntil) || 0; + return { + isActive: Boolean(status?.isActive && adFreeUntil > currentTime), + adFreeUntil, + hasPendingExpiryNotice: Boolean(status?.hasPendingExpiryNotice), + }; + }, + getCurrentState: () => state, + setCurrentState: (nextState) => { + state = nextState; + events.push(["state", nextState]); + }, + setBannerSuppressed: (reason, suppressed) => { + if (suppressed) suppressions.add(reason); + else suppressions.delete(reason); + events.push(["suppression", reason, suppressed, state]); + }, + emitChange: (nextState) => { + events.push(["emit", nextState]); + if (throwOnEmit) throw new Error("listener failed"); + }, + onRefreshError: (error) => refreshErrors.push(error), + onListenerError: (error) => listenerErrors.push(error), + onExpiryNotice: (nextState) => expiryNotices.push(nextState), + now: () => currentTime, + setTimer: (callback, delay) => { + const timerId = nextTimerId++; + timers.set(timerId, { callback, delay }); + events.push(["timer", delay]); + return timerId; + }, + clearTimer: (timerId) => timers.delete(timerId), + }); + + return { + events, + expiryNotices, + lifecycle, + listenerErrors, + refreshErrors, + suppressions, + get state() { + return state; + }, + get timers() { + return [...timers.values()]; + }, + setNow(value) { + currentTime = value; + }, + runNextTimer() { + const [timerId, timer] = timers.entries().next().value ?? []; + assert.ok(timer, "Expected a scheduled expiry timer."); + timers.delete(timerId); + timer.callback(); + }, + }; +} + +test("active startup stores state before suppressing and scheduling", async () => { + const active = { isActive: true, adFreeUntil: 61_000 }; + const harness = createHarness({ statuses: [active] }); + + const result = await harness.lifecycle.initialize(); + + assert.equal(result.refreshed, true); + assert.equal( + harness.suppressions.has(BANNER_SUPPRESSION_REASON.REWARDED_PASS), + true, + ); + assert.deepEqual( + harness.events.map(([event]) => event), + ["state", "suppression", "emit", "timer"], + ); + assert.equal(harness.events[1][3], harness.state); + assert.equal(harness.timers[0].delay, 60_000); +}); + +test("redemption applies rewarded suppression immediately", () => { + const harness = createHarness(); + + const redeemedState = harness.lifecycle.applyStatus({ + isActive: true, + adFreeUntil: 31_000, + }); + + assert.equal(redeemedState, harness.state); + assert.equal( + harness.suppressions.has(BANNER_SUPPRESSION_REASON.REWARDED_PASS), + true, + ); + assert.equal(harness.timers.length, 1); +}); + +test("expiry timer refresh clears rewarded suppression and notifies", async () => { + const harness = createHarness({ + statuses: [ + { isActive: true, adFreeUntil: 2_000 }, + { + isActive: false, + adFreeUntil: 2_000, + hasPendingExpiryNotice: true, + }, + ], + }); + await harness.lifecycle.initialize(); + + harness.setNow(2_000); + harness.runNextTimer(); + await harness.lifecycle.whenIdle(); + + assert.equal( + harness.suppressions.has(BANNER_SUPPRESSION_REASON.REWARDED_PASS), + false, + ); + assert.equal(harness.expiryNotices.length, 1); + assert.equal(harness.timers.length, 0); +}); + +test("resume after expiry clears rewarded suppression", async () => { + const harness = createHarness({ + statuses: [ + { isActive: true, adFreeUntil: 2_000 }, + { isActive: false, adFreeUntil: 2_000 }, + ], + }); + await harness.lifecycle.initialize(); + + harness.setNow(2_000); + await harness.lifecycle.resume(); + + assert.equal( + harness.suppressions.has(BANNER_SUPPRESSION_REASON.REWARDED_PASS), + false, + ); + assert.equal(harness.timers.length, 0); +}); + +test("refresh failure preserves state, suppression, and existing timer", async () => { + const failure = new Error("offline"); + const harness = createHarness({ + statuses: [ + { isActive: true, adFreeUntil: 61_000 }, + failure, + ], + }); + await harness.lifecycle.initialize(); + const activeState = harness.state; + const existingTimer = harness.timers[0]; + const eventCount = harness.events.length; + + const result = await harness.lifecycle.resume(); + + assert.deepEqual(result, { state: activeState, refreshed: false }); + assert.equal(harness.state, activeState); + assert.equal( + harness.suppressions.has(BANNER_SUPPRESSION_REASON.REWARDED_PASS), + true, + ); + assert.equal(harness.timers[0], existingTimer); + assert.equal(harness.events.length, eventCount); + assert.deepEqual(harness.refreshErrors, [failure]); +}); + +test("throwing change listeners cannot prevent expiry scheduling", async () => { + const harness = createHarness({ + statuses: [{ isActive: true, adFreeUntil: 61_000 }], + throwOnEmit: true, + }); + + const result = await harness.lifecycle.initialize(); + + assert.equal(result.refreshed, true); + assert.equal(harness.listenerErrors.length, 1); + assert.equal(harness.timers.length, 1); + assert.equal( + harness.suppressions.has(BANNER_SUPPRESSION_REASON.REWARDED_PASS), + true, + ); +}); + +test("clearing reward suppression leaves Pro suppression active", () => { + const harness = createHarness({ + initialSuppressions: [BANNER_SUPPRESSION_REASON.PRO], + }); + + harness.lifecycle.applyStatus({ + isActive: true, + adFreeUntil: 61_000, + }); + harness.lifecycle.applyStatus({ + isActive: false, + adFreeUntil: 0, + }); + + assert.deepEqual(harness.suppressions, new Set([BANNER_SUPPRESSION_REASON.PRO])); +}); + +test("uses the same expiry predicate exposed to ad eligibility checks", () => { + const now = 5_000; + assert.equal( + isRewardPassActive({ isActive: true, adFreeUntil: now + 1 }, now), + true, + ); + assert.equal( + isRewardPassActive({ isActive: true, adFreeUntil: now }, now), + false, + ); + assert.equal(isRewardPassActive(null, now), false); +}); diff --git a/tests/admob/bannerVisibilityController.test.js b/tests/admob/bannerVisibilityController.test.js new file mode 100644 index 0000000000..cb9d52c347 --- /dev/null +++ b/tests/admob/bannerVisibilityController.test.js @@ -0,0 +1,236 @@ +import assert from "node:assert/strict"; +import { test } from "vitest"; +import { + BANNER_SUPPRESSION_REASON, + BannerVisibilityController, +} from "../../src/lib/bannerVisibilityController.mjs"; + +function createHarness() { + let activePage = null; + let notifyPageChange = () => {}; + const calls = []; + const banner = { + active: false, + async show() { + calls.push("show"); + }, + async hide() { + calls.push("hide"); + }, + }; + const controller = new BannerVisibilityController({ + getActivePage: () => activePage, + observePageChanges(callback) { + notifyPageChange = callback; + return () => { + notifyPageChange = () => {}; + }; + }, + onError(error) { + throw error; + }, + }); + controller.setBanner(banner); + + return { + banner, + calls, + controller, + changePage(page) { + activePage = page; + notifyPageChange(); + }, + setActivePage(page) { + activePage = page; + }, + }; +} + +test("shows only for a registered active page and ignores repeated syncs", async () => { + const harness = createHarness(); + const page = {}; + harness.setActivePage(page); + + harness.controller.registerPage(page); + harness.controller.reconcile(); + await harness.controller.whenIdle(); + + assert.equal(harness.banner.active, true); + assert.deepEqual(harness.calls, ["show"]); +}); + +test("hides in the editor and restores for an underlying registered page", async () => { + const harness = createHarness(); + const adPage = {}; + const plainPage = {}; + harness.setActivePage(adPage); + harness.controller.registerPage(adPage); + await harness.controller.whenIdle(); + + harness.changePage(plainPage); + await harness.controller.whenIdle(); + assert.equal(harness.banner.active, false); + + harness.changePage(adPage); + await harness.controller.whenIdle(); + assert.equal(harness.banner.active, true); + + harness.changePage(null); + await harness.controller.whenIdle(); + assert.equal(harness.banner.active, false); + assert.deepEqual(harness.calls, ["show", "hide", "show", "hide"]); +}); + +test("keeps nested ad pages visible without redundant native operations", async () => { + const harness = createHarness(); + const parentPage = {}; + const childPage = {}; + harness.setActivePage(parentPage); + harness.controller.registerPage(parentPage); + await harness.controller.whenIdle(); + + harness.setActivePage(childPage); + harness.controller.registerPage(childPage); + await harness.controller.whenIdle(); + harness.changePage(parentPage); + await harness.controller.whenIdle(); + + assert.equal(harness.banner.active, true); + assert.deepEqual(harness.calls, ["show"]); +}); + +test("temporarily suppresses the banner while the keyboard is visible", async () => { + const harness = createHarness(); + const page = {}; + harness.setActivePage(page); + harness.controller.registerPage(page); + await harness.controller.whenIdle(); + + harness.controller.setKeyboardVisible(true); + await harness.controller.whenIdle(); + assert.equal(harness.banner.active, true); + + harness.controller.setKeyboardVisible(false); + await harness.controller.whenIdle(); + assert.deepEqual(harness.calls, ["show", "hide", "show"]); +}); + +test("restores the same registered page when reward suppression ends", async () => { + const harness = createHarness(); + const page = {}; + harness.setActivePage(page); + harness.controller.registerPage(page); + await harness.controller.whenIdle(); + + harness.controller.setSuppressed( + BANNER_SUPPRESSION_REASON.REWARDED_PASS, + true, + ); + await harness.controller.whenIdle(); + assert.equal(harness.banner.active, false); + + harness.controller.setSuppressed( + BANNER_SUPPRESSION_REASON.REWARDED_PASS, + false, + ); + await harness.controller.whenIdle(); + + assert.equal(harness.banner.active, true); + assert.deepEqual(harness.calls, ["show", "hide", "show"]); +}); + +test("page registration cannot clear an active suppression", async () => { + const harness = createHarness(); + const firstPage = {}; + const secondPage = {}; + harness.setActivePage(firstPage); + harness.controller.registerPage(firstPage); + await harness.controller.whenIdle(); + + harness.controller.setSuppressed( + BANNER_SUPPRESSION_REASON.REWARDED_PASS, + true, + ); + harness.setActivePage(secondPage); + harness.controller.registerPage(secondPage); + harness.controller.setKeyboardVisible(true); + harness.controller.setKeyboardVisible(false); + harness.changePage(null); + harness.changePage(secondPage); + await harness.controller.whenIdle(); + + assert.equal(harness.banner.active, false); + assert.deepEqual(harness.calls, ["show", "hide"]); +}); + +test("keeps overlapping suppressions independent of keyboard state", async () => { + const harness = createHarness(); + const page = {}; + harness.setActivePage(page); + harness.controller.registerPage(page); + await harness.controller.whenIdle(); + + harness.controller.setKeyboardVisible(true); + harness.controller.setSuppressed(BANNER_SUPPRESSION_REASON.PRO, true); + harness.controller.setSuppressed( + BANNER_SUPPRESSION_REASON.REWARDED_PASS, + true, + ); + harness.controller.setSuppressed( + BANNER_SUPPRESSION_REASON.REWARDED_PASS, + false, + ); + harness.controller.setKeyboardVisible(false); + await harness.controller.whenIdle(); + assert.equal(harness.banner.active, false); + + harness.controller.setSuppressed(BANNER_SUPPRESSION_REASON.PRO, false); + await harness.controller.whenIdle(); + + assert.equal(harness.banner.active, true); + assert.deepEqual(harness.calls, ["show", "hide", "show"]); +}); + +test("rejects empty suppression reasons", () => { + const harness = createHarness(); + assert.throws( + () => harness.controller.setSuppressed(" ", true), + /Banner suppression reason/, + ); +}); + +test("serializes an in-flight show before the latest hide request", async () => { + let finishShow; + const page = {}; + let activePage = page; + const calls = []; + const banner = { + active: false, + show() { + calls.push("show"); + return new Promise((resolve) => { + finishShow = resolve; + }); + }, + async hide() { + calls.push("hide"); + }, + }; + const controller = new BannerVisibilityController({ + getActivePage: () => activePage, + onError(error) { + throw error; + }, + }); + controller.setBanner(banner); + controller.registerPage(page); + await new Promise((resolve) => setImmediate(resolve)); + + activePage = null; + controller.reconcile(); + finishShow(); + await controller.whenIdle(); + + assert.equal(banner.active, false); + assert.deepEqual(calls, ["show", "hide"]); +}); diff --git a/tests/admob/bannerWrapper.test.js b/tests/admob/bannerWrapper.test.js new file mode 100644 index 0000000000..08f75bd86e --- /dev/null +++ b/tests/admob/bannerWrapper.test.js @@ -0,0 +1,83 @@ +import assert from "node:assert/strict"; +import { readFileSync } from "node:fs"; +import { fileURLToPath } from "node:url"; +import vm from "node:vm"; +import { transformSync } from "@babel/core"; +import { test } from "vitest"; + +function loadBannerModule() { + const sourcePath = fileURLToPath( + new URL("../../src/plugins/admob/src/www/ads/banner.ts", import.meta.url), + ); + const source = readFileSync(sourcePath, "utf8"); + const { code } = transformSync(source, { + filename: sourcePath, + presets: [ + ["@babel/preset-env", { modules: "commonjs", targets: { node: "current" } }], + "@babel/preset-typescript", + ], + }); + const calls = []; + + class MobileAd { + constructor(options) { + this.options = options; + } + + async load() { + calls.push("load"); + } + + async show() { + calls.push("show"); + return "shown"; + } + + async hide() { + calls.push("hide"); + } + } + + const module = { exports: {} }; + const context = { + console, + cordova: { platformId: "android" }, + document: { + createElement() { + return { + getContext() { + return {}; + }, + }; + }, + }, + exports: module.exports, + module, + require(specifier) { + if (specifier === "../common") { + return { + Platform: { ios: "ios" }, + execAsync() { + throw new Error("Unexpected native configuration call"); + }, + }; + } + if (specifier === "./base") { + return { MobileAd }; + } + throw new Error(`Unexpected module request: ${specifier}`); + }, + }; + + vm.runInNewContext(code, context, { filename: sourcePath }); + return { BannerAd: module.exports.BannerAd, calls }; +} + +test("every banner show uses the idempotent native load path", async () => { + const { BannerAd, calls } = loadBannerModule(); + const banner = new BannerAd({ adUnitId: "test-banner" }); + + assert.equal(await banner.show(), "shown"); + assert.equal(await banner.show(), "shown"); + assert.deepEqual(calls, ["load", "show", "load", "show"]); +}); diff --git a/tests/admob/privacyChoicesController.test.js b/tests/admob/privacyChoicesController.test.js new file mode 100644 index 0000000000..74ce715d77 --- /dev/null +++ b/tests/admob/privacyChoicesController.test.js @@ -0,0 +1,76 @@ +import assert from "node:assert/strict"; +import { test } from "vitest"; +import { + PRIVACY_CHOICES_KEY, + bindPrivacyChoices, +} from "../../src/lib/privacyChoicesController.mjs"; + +function createHarness() { + let listener; + let closeCallback; + let unsubscribeCalls = 0; + const visibility = []; + const page = { + setItemVisibility(key, visible) { + visibility.push({ key, visible }); + return true; + }, + onClose(callback) { + closeCallback = callback; + return () => { + closeCallback = undefined; + }; + }, + }; + + const dispose = bindPrivacyChoices({ + page, + subscribe(callback) { + listener = callback; + callback({ privacyOptionsRequired: false }); + return () => { + unsubscribeCalls++; + listener = undefined; + }; + }, + }); + + return { + dispose, + emit(state) { + listener?.(state); + }, + close() { + closeCallback?.(); + }, + get unsubscribeCalls() { + return unsubscribeCalls; + }, + visibility, + }; +} + +test("reacts to privacy requirement changes without rebuilding settings", () => { + const harness = createHarness(); + + harness.emit({ privacyOptionsRequired: true }); + harness.emit({ privacyOptionsRequired: false }); + + assert.deepEqual(harness.visibility, [ + { key: PRIVACY_CHOICES_KEY, visible: false }, + { key: PRIVACY_CHOICES_KEY, visible: true }, + { key: PRIVACY_CHOICES_KEY, visible: false }, + ]); +}); + +test("unsubscribes when the settings page closes", () => { + const harness = createHarness(); + harness.close(); + harness.emit({ privacyOptionsRequired: true }); + harness.dispose(); + + assert.equal(harness.unsubscribeCalls, 1); + assert.deepEqual(harness.visibility, [ + { key: PRIVACY_CHOICES_KEY, visible: false }, + ]); +}); diff --git a/tests/unit/checkAdmobBundle.test.js b/tests/unit/checkAdmobBundle.test.js new file mode 100644 index 0000000000..07a1ce5a1c --- /dev/null +++ b/tests/unit/checkAdmobBundle.test.js @@ -0,0 +1,61 @@ +import assert from "node:assert/strict"; +import fs from "node:fs"; +import { createRequire } from "node:module"; +import os from "node:os"; +import path from "node:path"; +import { onTestFinished, test } from "vitest"; + +const requireFromTest = createRequire(import.meta.url); +const { validateAdmobBundle } = requireFromTest( + "../../utils/scripts/checkAdmobBundle.js", +); + +function createFixture(bundle) { + const rootDir = fs.mkdtempSync(path.join(os.tmpdir(), "acode-admob-bundle-")); + const bundlePath = path.join(rootDir, "www/admob.js"); + const pluginXmlPath = path.join(rootDir, "plugin.xml"); + fs.mkdirSync(path.dirname(bundlePath), { recursive: true }); + fs.writeFileSync(bundlePath, bundle); + fs.writeFileSync( + pluginXmlPath, + '', + ); + + return { + bundlePath, + pluginXmlPath, + remove() { + fs.rmSync(rootDir, { recursive: true }); + }, + }; +} + +test("accepts a self-contained Cordova bundle with the privacy API", () => { + const fixture = createFixture(` + const cordova = require("cordova"); + const channel = require("cordova/channel"); + const exec = require("cordova/exec"); + function gatherConsent() {} + function showOptions() {} + `); + onTestFinished(fixture.remove); + + assert.deepEqual(validateAdmobBundle(fixture), { + bytes: fs.statSync(fixture.bundlePath).size, + imports: ["cordova", "cordova/channel", "cordova/exec"], + }); +}); + +test("rejects unresolved relative imports", () => { + const fixture = createFixture(` + require("./ads/base"); + function gatherConsent() {} + function showOptions() {} + `); + onTestFinished(fixture.remove); + + assert.throws( + () => validateAdmobBundle(fixture), + /unresolved imports: \.\/ads\/base/, + ); +}); diff --git a/tests/unit/config.test.js b/tests/unit/config.test.js new file mode 100644 index 0000000000..1fc2e272cf --- /dev/null +++ b/tests/unit/config.test.js @@ -0,0 +1,432 @@ +import assert from "node:assert/strict"; +import fs from "node:fs"; +import { createRequire } from "node:module"; +import os from "node:os"; +import path from "node:path"; +import { onTestFinished, test } from "vitest"; + +const requireFromTest = createRequire(import.meta.url); +const { + ADMOB_PLUGIN_ID, + ID_FREE, + ID_PAID, + LEGACY_CONSENT_PLUGIN_ID, + configureProject, + getAdmobSyncPlan, +} = requireFromTest("../../utils/config.js"); + +const TRACKED_VARIANT_FILES = [ + "package.json", + "package-lock.json", + "config.xml", + "res/android/values/ic_launcher_background.xml", +]; + +function createFixture({ + id, + admobInstalled = false, + legacyConsentInstalled = false, + dependencyPlugins = [], + cordovaPlugins = [], + configPlugins = [], + bundleExists = true, +}) { + const rootDir = fs.mkdtempSync(path.join(os.tmpdir(), "acode-config-")); + const write = (relativePath, contents = "") => { + const filePath = path.join(rootDir, relativePath); + fs.mkdirSync(path.dirname(filePath), { recursive: true }); + fs.writeFileSync(filePath, contents); + }; + const dependencies = Object.fromEntries( + dependencyPlugins.map((pluginId) => [pluginId, "1.0.0"]), + ); + const pluginDeclarations = configPlugins + .map((pluginId) => ` `) + .join("\n"); + + write( + "config.xml", + `\n${pluginDeclarations}\n\n`, + ); + write( + "package.json", + `${JSON.stringify( + { + name: "acode-config-test", + cordova: { + plugins: Object.fromEntries( + cordovaPlugins.map((pluginId) => [pluginId, {}]), + ), + }, + dependencies, + }, + undefined, + 2, + )}\n`, + ); + write( + "package-lock.json", + `${JSON.stringify( + { + name: "acode-config-test", + lockfileVersion: 3, + packages: { + "": { + name: "acode-config-test", + dependencies: { ...dependencies }, + }, + ...Object.fromEntries( + dependencyPlugins.map((pluginId) => [ + `node_modules/${pluginId}`, + { version: "1.0.0" }, + ]), + ), + }, + }, + undefined, + 2, + )}\n`, + ); + write(".babelrc", '{"compact":false}\n'); + write( + "res/android/values/ic_launcher_background.xml", + id === ID_FREE + ? ` + + #ffffff + #313131 +` + : ` + + #3a3e54 + #3a3e54 +`, + ); + if (bundleExists) write("src/plugins/admob/www/admob.js", "bundle"); + if (admobInstalled) write(`plugins/${ADMOB_PLUGIN_ID}/plugin.xml`, "plugin"); + if (legacyConsentInstalled) { + write(`plugins/${LEGACY_CONSENT_PLUGIN_ID}/plugin.xml`, "plugin"); + } + + function removeDependency(pluginId) { + const packagePath = path.join(rootDir, "package.json"); + const packageJson = JSON.parse(fs.readFileSync(packagePath, "utf8")); + for (const sectionName of [ + "dependencies", + "devDependencies", + "optionalDependencies", + ]) { + delete packageJson[sectionName]?.[pluginId]; + } + write("package.json", `${JSON.stringify(packageJson, undefined, 2)}\n`); + + const lockPath = path.join(rootDir, "package-lock.json"); + const packageLock = JSON.parse(fs.readFileSync(lockPath, "utf8")); + for (const sectionName of [ + "dependencies", + "devDependencies", + "optionalDependencies", + ]) { + delete packageLock.packages?.[""]?.[sectionName]?.[pluginId]; + } + delete packageLock.packages?.[`node_modules/${pluginId}`]; + write( + "package-lock.json", + `${JSON.stringify(packageLock, undefined, 2)}\n`, + ); + } + + return { + rootDir, + commandRunner(commands) { + return async (command, args) => { + commands.push([command, ...args]); + if (command === "npm" && args[0] === "uninstall") { + removeDependency(args[1]); + return; + } + if (command !== "cordova" || args[0] !== "plugin") return; + + if (args[1] === "remove") { + fs.rmSync(path.join(rootDir, "plugins", args[2]), { + recursive: true, + force: true, + }); + if (args.includes("--save")) removeDependency(args[2]); + } else if (args[1] === "add") { + write(`plugins/${ADMOB_PLUGIN_ID}/plugin.xml`, "plugin"); + } + }; + }, + read(relativePath) { + return fs.readFileSync(path.join(rootDir, relativePath), "utf8"); + }, + snapshot() { + return Object.fromEntries( + TRACKED_VARIANT_FILES.map((relativePath) => [ + relativePath, + fs.readFileSync(path.join(rootDir, relativePath), "utf8"), + ]), + ); + }, + remove() { + fs.rmSync(rootDir, { recursive: true }); + }, + }; +} + +function pluginState(overrides = {}) { + return { + installed: false, + dependencyDeclared: false, + cordovaPackageDeclared: false, + configDeclared: false, + ...overrides, + }; +} + +test("plans transient AdMob removal without saving metadata", () => { + const actions = getAdmobSyncPlan({ + variant: "free", + bundleExists: true, + admobState: pluginState({ installed: true }), + }); + + assert.deepEqual( + actions.map(({ command, args }) => [command, ...args]), + [ + ["cordova", "plugin", "remove", ADMOB_PLUGIN_ID, "--nosave"], + ["cordova", "plugin", "add", "src/plugins/admob", "--nosave"], + ], + ); +}); + +test("plans saved removal only for installed dependency state", () => { + const actions = getAdmobSyncPlan({ + variant: "paid", + bundleExists: true, + admobState: pluginState({ + installed: true, + dependencyDeclared: true, + }), + legacyConsentState: pluginState({ + installed: true, + dependencyDeclared: true, + }), + }); + + assert.deepEqual( + actions.map(({ command, args }) => [command, ...args]), + [ + ["cordova", "plugin", "remove", LEGACY_CONSENT_PLUGIN_ID, "--save"], + ["cordova", "plugin", "remove", ADMOB_PLUGIN_ID, "--save"], + ], + ); +}); + +test("free builds reinstall transient AdMob without changing tracked metadata", async () => { + const fixture = createFixture({ + id: ID_FREE, + admobInstalled: true, + }); + onTestFinished(fixture.remove); + const before = fixture.snapshot(); + const commands = []; + + const result = await configureProject({ + rootDir: fixture.rootDir, + variant: "free", + commandRunner: fixture.commandRunner(commands), + }); + + assert.equal(result.identityChanged, false); + assert.deepEqual(commands, [ + ["cordova", "plugin", "remove", ADMOB_PLUGIN_ID, "--nosave"], + ["cordova", "plugin", "add", "src/plugins/admob", "--nosave"], + ]); + assert.deepEqual(fixture.snapshot(), before); + assert.equal( + result.actions.every( + (action) => action.env?.NPM_CONFIG_LEGACY_PEER_DEPS === "true", + ), + true, + ); +}); + +test("paid builds remove transient AdMob and refresh changed identity", async () => { + const fixture = createFixture({ + id: ID_FREE, + admobInstalled: true, + }); + onTestFinished(fixture.remove); + fs.mkdirSync(path.join(fixture.rootDir, "platforms/android"), { + recursive: true, + }); + const commands = []; + + const result = await configureProject({ + rootDir: fixture.rootDir, + variant: "paid", + commandRunner: fixture.commandRunner(commands), + }); + + assert.equal(result.identityChanged, true); + assert.match(fixture.read("config.xml"), new RegExp(`id="${ID_PAID}"`)); + assert.deepEqual(commands, [ + ["cordova", "plugin", "remove", ADMOB_PLUGIN_ID, "--nosave"], + ["npm", "run", "clean"], + ]); +}); + +test("free and paid builds remove installed saved legacy consent", async () => { + for (const variant of ["free", "paid"]) { + const fixture = createFixture({ + id: variant === "free" ? ID_FREE : ID_PAID, + legacyConsentInstalled: true, + dependencyPlugins: [LEGACY_CONSENT_PLUGIN_ID], + cordovaPlugins: [LEGACY_CONSENT_PLUGIN_ID], + configPlugins: [LEGACY_CONSENT_PLUGIN_ID], + }); + onTestFinished(fixture.remove); + const commands = []; + + await configureProject({ + rootDir: fixture.rootDir, + variant, + commandRunner: fixture.commandRunner(commands), + }); + + assert.deepEqual(commands[0], [ + "cordova", + "plugin", + "remove", + LEGACY_CONSENT_PLUGIN_ID, + "--save", + ]); + assert.doesNotMatch( + `${fixture.read("package.json")}${fixture.read("package-lock.json")}${fixture.read("config.xml")}`, + /cordova-plugin-consent/, + ); + } +}); + +test("dependency-only plugin state is removed through npm", async () => { + const fixture = createFixture({ + id: ID_PAID, + dependencyPlugins: [LEGACY_CONSENT_PLUGIN_ID, ADMOB_PLUGIN_ID], + }); + onTestFinished(fixture.remove); + const commands = []; + + await configureProject({ + rootDir: fixture.rootDir, + variant: "paid", + commandRunner: fixture.commandRunner(commands), + }); + + assert.deepEqual(commands, [ + [ + "npm", + "uninstall", + LEGACY_CONSENT_PLUGIN_ID, + "--save", + "--ignore-scripts", + "--no-audit", + "--no-fund", + ], + [ + "npm", + "uninstall", + ADMOB_PLUGIN_ID, + "--save", + "--ignore-scripts", + "--no-audit", + "--no-fund", + ], + ]); + assert.doesNotMatch( + `${fixture.read("package.json")}${fixture.read("package-lock.json")}`, + /cordova-plugin-consent|admob-plus-cordova/, + ); +}); + +test("declaration-only state is cleaned without package commands", async () => { + const fixture = createFixture({ + id: ID_PAID, + cordovaPlugins: [LEGACY_CONSENT_PLUGIN_ID, ADMOB_PLUGIN_ID], + configPlugins: [LEGACY_CONSENT_PLUGIN_ID, ADMOB_PLUGIN_ID], + }); + onTestFinished(fixture.remove); + const packageLockBefore = fixture.read("package-lock.json"); + const commands = []; + + await configureProject({ + rootDir: fixture.rootDir, + variant: "paid", + commandRunner: fixture.commandRunner(commands), + }); + + assert.deepEqual(commands, []); + assert.doesNotMatch( + `${fixture.read("package.json")}${fixture.read("config.xml")}`, + /cordova-plugin-consent|admob-plus-cordova/, + ); + assert.equal(fixture.read("package-lock.json"), packageLockBefore); +}); + +test("repeated free configuration converges to identical tracked files", async () => { + const fixture = createFixture({ id: ID_FREE }); + onTestFinished(fixture.remove); + + await configureProject({ + rootDir: fixture.rootDir, + variant: "free", + commandRunner: fixture.commandRunner([]), + }); + const converged = fixture.snapshot(); + const secondCommands = []; + + await configureProject({ + rootDir: fixture.rootDir, + variant: "free", + commandRunner: fixture.commandRunner(secondCommands), + }); + + assert.deepEqual(fixture.snapshot(), converged); + assert.deepEqual(secondCommands, [ + ["cordova", "plugin", "remove", ADMOB_PLUGIN_ID, "--nosave"], + ["cordova", "plugin", "add", "src/plugins/admob", "--nosave"], + ]); + assert.equal( + fs.existsSync(path.join(fixture.rootDir, "plugins", ADMOB_PLUGIN_ID)), + true, + ); +}); + +test("fails when a successful command leaves dependency state behind", async () => { + const fixture = createFixture({ + id: ID_PAID, + dependencyPlugins: [ADMOB_PLUGIN_ID], + }); + onTestFinished(fixture.remove); + + await assert.rejects( + configureProject({ + rootDir: fixture.rootDir, + variant: "paid", + commandRunner: async () => {}, + }), + /AdMob must not remain persisted/, + ); +}); + +test("free builds fail clearly when the committed runtime bundle is missing", () => { + assert.throws( + () => + getAdmobSyncPlan({ + variant: "free", + bundleExists: false, + }), + /Run `npm run build:admob`/, + ); +}); diff --git a/tests/unit/dev.test.js b/tests/unit/dev.test.js new file mode 100644 index 0000000000..2c287f9873 --- /dev/null +++ b/tests/unit/dev.test.js @@ -0,0 +1,18 @@ +import assert from "node:assert/strict"; +import { createRequire } from "node:module"; +import { test } from "vitest"; + +const requireFromTest = createRequire(import.meta.url); +const { getAppVariant } = requireFromTest("../../utils/scripts/dev.js"); + +test("recognizes the explicit free variant case-insensitively", () => { + assert.equal(getAppVariant(["android", "free"]), "free"); + assert.equal(getAppVariant(["FREE", "--emulator"]), "free"); +}); + +test("defaults to paid when free is not specified", () => { + assert.equal(getAppVariant([]), "paid"); + assert.equal(getAppVariant(["android", "--emulator"]), "paid"); + assert.equal(getAppVariant(["android", "paid"]), "paid"); + assert.equal(getAppVariant(["PAID", "--emulator"]), "paid"); +}); diff --git a/utils/config.js b/utils/config.js index 85d98137bb..c771fc2480 100755 --- a/utils/config.js +++ b/utils/config.js @@ -1,120 +1,395 @@ -const path = require("node:path"); const fs = require("node:fs"); +const path = require("node:path"); +const { execFile: execFileCallback } = require("node:child_process"); const { promisify } = require("node:util"); -const exec = promisify(require("node:child_process").exec); - -(async () => { - const AD_APP_ID = "ca-app-pub-5911839694379275~4255791238"; - const CONFIG_ID = /id="([a-z.]+")/; - const HTML_ID = /[a-z.]+<\/title>/; - const ID_PAID = "com.foxdebug.acode"; - const ID_FREE = "com.foxdebug.acodefree"; - const arg = process.argv[2]; - const arg2 = process.argv[3]; - const platformsDir = path.resolve(__dirname, "../platforms/"); - const babelrcpath = path.resolve(__dirname, "../.babelrc"); - const configpath = path.resolve(__dirname, "../config.xml"); - const htmlpath = path.resolve(__dirname, "../www/index.html"); - const logopath = path.resolve( - __dirname, - "../res/android/values/ic_launcher_background.xml", - ); - - const logoTextPaid = `<?xml version="1.0" encoding="utf-8"?> + +const execFile = promisify(execFileCallback); + +const ADMOB_PLUGIN_ID = "admob-plus-cordova"; +const LEGACY_CONSENT_PLUGIN_ID = "cordova-plugin-consent"; +const ID_PAID = "com.foxdebug.acode"; +const ID_FREE = "com.foxdebug.acodefree"; +const VARIANTS = new Set(["free", "paid"]); +const VARIANT_PLUGIN_IDS = [ADMOB_PLUGIN_ID, LEGACY_CONSENT_PLUGIN_ID]; +const PACKAGE_DEPENDENCY_SECTIONS = [ + "dependencies", + "devDependencies", + "optionalDependencies", +]; +const PLUGIN_COMMAND_ENV = Object.freeze({ + NPM_CONFIG_LEGACY_PEER_DEPS: "true", +}); + +const LOGO_TEXT = { + paid: `<?xml version="1.0" encoding="utf-8"?> <resources> <color name="ic_launcher_background">#3a3e54</color> <color name="ic_splash_background">#3a3e54</color> -</resources>`; - const logoTextFree = `<?xml version="1.0" encoding="utf-8"?> +</resources>`, + free: `<?xml version="1.0" encoding="utf-8"?> <resources> <color name="ic_launcher_background">#ffffff</color> <color name="ic_splash_background">#313131</color> -</resources>`; - - try { - let babelrcText = fs.readFileSync(babelrcpath, "utf-8"); - let config = fs.readFileSync(configpath, "utf-8"); - let html = fs.readFileSync(htmlpath, "utf-8"); - let platforms = fs - .readdirSync(platformsDir) - .filter((file) => !file.startsWith(".")); - let logo, id, currentId; - - currentId = /id="([a-z.]+)"/.exec(config)[1]; - babelrc = JSON.parse(babelrcText); - - if (arg === "d") { - babelrc.compact = false; - } else if (arg === "p") { - babelrc.compact = true; +</resources>`, +}; + +/** + * Returns the Cordova operations required to converge the AdMob plugin state. + * Free builds always reinstall the vendored plugin so native and web sources + * cannot remain stale after a source change. + * + * @param {{ + * variant:"free"|"paid", + * bundleExists:boolean, + * admobState?:PluginState, + * legacyConsentState?:PluginState + * }} state + */ +function getAdmobSyncPlan({ + variant, + bundleExists, + admobState = {}, + legacyConsentState = {}, +}) { + if (!VARIANTS.has(variant)) { + throw new Error(`Unsupported app variant: ${variant}`); + } + + if (variant === "free" && !bundleExists) { + throw new Error( + "Missing src/plugins/admob/www/admob.js. Run `npm run build:admob` before building the free app.", + ); + } + + const actions = []; + addRemoval(LEGACY_CONSENT_PLUGIN_ID, legacyConsentState); + addRemoval(ADMOB_PLUGIN_ID, admobState); + + if (variant === "free") { + actions.push({ + command: "cordova", + args: ["plugin", "add", "src/plugins/admob", "--nosave"], + env: PLUGIN_COMMAND_ENV, + }); + } + + return actions; + + /** + * @param {string} pluginId + * @param {Partial<PluginState>} state + */ + function addRemoval(pluginId, state) { + const { installed = false, dependencyDeclared = false } = state; + + if (installed) { + actions.push({ + command: "cordova", + args: [ + "plugin", + "remove", + pluginId, + dependencyDeclared ? "--save" : "--nosave", + ], + env: PLUGIN_COMMAND_ENV, + }); + return; } - if (arg2 === "free") { - logo = logoTextFree; - id = ID_FREE; - } else { - logo = logoTextPaid; - id = ID_PAID; + if (!dependencyDeclared) return; + + actions.push({ + command: "npm", + args: [ + "uninstall", + pluginId, + "--save", + "--ignore-scripts", + "--no-audit", + "--no-fund", + ], + env: PLUGIN_COMMAND_ENV, + }); + } +} + +/** + * @typedef {{ + * installed:boolean, + * dependencyDeclared:boolean, + * cordovaPackageDeclared:boolean, + * configDeclared:boolean + * }} PluginState + */ + +function readPackageJson(packagePath, fsImpl) { + if (!fsImpl.existsSync(packagePath)) return {}; + return JSON.parse(fsImpl.readFileSync(packagePath, "utf8")); +} + +function getConfigPluginPattern(pluginId, flags = "i") { + const escapedId = pluginId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); + return new RegExp(`<plugin\\b(?=[^>]*\\bname=["']${escapedId}["'])`, flags); +} + +/** + * @param {{ + * pluginId:string, + * pluginPath:string, + * packageJson:Record<string, unknown>, + * config:string, + * fsImpl:typeof fs + * }} options + * @returns {PluginState} + */ +function getPluginState({ pluginId, pluginPath, packageJson, config, fsImpl }) { + return { + installed: fsImpl.existsSync(pluginPath), + dependencyDeclared: PACKAGE_DEPENDENCY_SECTIONS.some((sectionName) => { + const section = packageJson[sectionName]; + return ( + section && + typeof section === "object" && + Object.hasOwn(section, pluginId) + ); + }), + cordovaPackageDeclared: Boolean( + packageJson.cordova?.plugins && + Object.hasOwn(packageJson.cordova.plugins, pluginId), + ), + configDeclared: getConfigPluginPattern(pluginId).test(config), + }; +} + +function removeCordovaPluginDeclarations({ configPath, packagePath, fsImpl }) { + const packageJson = readPackageJson(packagePath, fsImpl); + let packageChanged = false; + const cordovaPlugins = packageJson.cordova?.plugins; + + if (cordovaPlugins && typeof cordovaPlugins === "object") { + for (const pluginId of VARIANT_PLUGIN_IDS) { + if (!Object.hasOwn(cordovaPlugins, pluginId)) continue; + delete cordovaPlugins[pluginId]; + packageChanged = true; } + } + + if (packageChanged) { + fsImpl.writeFileSync( + packagePath, + `${JSON.stringify(packageJson, undefined, 2)}\n`, + "utf8", + ); + } - fs.writeFileSync(babelrcpath, babelrcText, "utf8"); - - if (currentId !== id) { - const promises = []; - - html = html.replace(HTML_ID, `<title>${id}`); - config = config.replace(CONFIG_ID, `id="${id}"`); - babelrcText = JSON.stringify(babelrc, undefined, 2); - - fs.writeFileSync(htmlpath, html, "utf8"); - fs.writeFileSync(logopath, logo, "utf8"); - fs.writeFileSync(configpath, config, "utf8"); - - for (let platform of platforms) { - if (!platform) continue; - - promises.push( - (async () => { - console.log( - `|--- Preparing platform ${platform.toUpperCase()} ---|`, - ); - - if (id === ID_FREE) { - console.log(`|--- Installing Admob ---|`); - await exec( - `cordova plugin add cordova-plugin-consent@2.4.0 --save`, - ); - - if ( - !fs.existsSync(path.join(__dirname, "src/plugins/admob/lib")) - ) { - await exec( - "cd src/plugins/admob && npm install && npm run build", - ); - } - - await exec("cordova plugin add src/plugins/admob"); - console.log("DONE! Installing admob-plus-cordova"); - } else { - console.log(`|--- Removing Admob ---|`); - await exec(`cordova plugin remove cordova-plugin-consent --save`); - await exec(`cordova plugin remove admob-plus-cordova --save`); - console.log("DONE! Removing admob-plus-cordova"); - } - - console.log(`|--- Reinstalling platform ---|`); - const { stderr } = await exec(`npm run clean`); - if (stderr) console.error(stderr); - else console.log("DONE! Reinstalling platform"); - })(), - ); - } - - await Promise.all(promises); + const config = fsImpl.readFileSync(configPath, "utf8"); + let nextConfig = config; + for (const pluginId of VARIANT_PLUGIN_IDS) { + const pluginPattern = new RegExp( + `\\s*${getConfigPluginPattern(pluginId).source}[^>]*(?:\\/\\s*>|>[\\s\\S]*?<\\/plugin\\s*>)`, + "gi", + ); + nextConfig = nextConfig.replace(pluginPattern, ""); + } + + if (nextConfig !== config) { + fsImpl.writeFileSync(configPath, nextConfig, "utf8"); + } +} + +function assertPluginState({ variant, paths, fsImpl }) { + const config = fsImpl.readFileSync(paths.config, "utf8"); + const packageJson = readPackageJson(paths.package, fsImpl); + const admobState = getPluginState({ + pluginId: ADMOB_PLUGIN_ID, + pluginPath: paths.admobPlugin, + packageJson, + config, + fsImpl, + }); + const legacyConsentState = getPluginState({ + pluginId: LEGACY_CONSENT_PLUGIN_ID, + pluginPath: paths.legacyConsentPlugin, + packageJson, + config, + fsImpl, + }); + const expectedAdmobInstalled = variant === "free"; + + if (Object.values(legacyConsentState).some(Boolean)) { + throw new Error("Failed to remove the legacy Cordova consent plugin."); + } + if ( + admobState.dependencyDeclared || + admobState.cordovaPackageDeclared || + admobState.configDeclared + ) { + throw new Error( + "AdMob must not remain persisted in Cordova project metadata.", + ); + } + if (admobState.installed !== expectedAdmobInstalled) { + throw new Error( + expectedAdmobInstalled + ? "Failed to install the vendored AdMob plugin." + : "Failed to remove the AdMob plugin from the paid variant.", + ); + } +} + +/** + * @param {string} command + * @param {string[]} args + * @param {{cwd:string}} options + */ +async function runCommand(command, args, options) { + const { stdout, stderr } = await execFile(command, args, { + ...options, + maxBuffer: 10 * 1024 * 1024, + }); + if (stdout) process.stdout.write(stdout); + if (stderr) process.stderr.write(stderr); +} + +/** + * @param {{ + * mode?:string, + * variant?:"free"|"paid", + * rootDir?:string, + * fsImpl?:typeof fs, + * commandRunner?:(command:string,args:string[],options:{ + * cwd:string, + * env?:NodeJS.ProcessEnv + * })=>Promise + * }} options + */ +async function configureProject({ + mode = "d", + variant = "paid", + rootDir = path.resolve(__dirname, ".."), + fsImpl = fs, + commandRunner = runCommand, +} = {}) { + if (!VARIANTS.has(variant)) { + throw new Error(`Unsupported app variant: ${variant}`); + } + + const paths = { + babel: path.join(rootDir, ".babelrc"), + bundle: path.join(rootDir, "src/plugins/admob/www/admob.js"), + config: path.join(rootDir, "config.xml"), + logo: path.join(rootDir, "res/android/values/ic_launcher_background.xml"), + package: path.join(rootDir, "package.json"), + platforms: path.join(rootDir, "platforms"), + admobPlugin: path.join(rootDir, "plugins", ADMOB_PLUGIN_ID), + legacyConsentPlugin: path.join( + rootDir, + "plugins", + LEGACY_CONSENT_PLUGIN_ID, + ), + }; + + const config = fsImpl.readFileSync(paths.config, "utf8"); + const packageJson = readPackageJson(paths.package, fsImpl); + const currentId = /]*?\sid=["']([^"']+)["']/.exec(config)?.[1]; + if (!currentId) { + throw new Error(`Unable to read the widget id from ${paths.config}.`); + } + + const targetId = variant === "free" ? ID_FREE : ID_PAID; + const identityChanged = currentId !== targetId; + const actions = getAdmobSyncPlan({ + variant, + bundleExists: fsImpl.existsSync(paths.bundle), + admobState: getPluginState({ + pluginId: ADMOB_PLUGIN_ID, + pluginPath: paths.admobPlugin, + packageJson, + config, + fsImpl, + }), + legacyConsentState: getPluginState({ + pluginId: LEGACY_CONSENT_PLUGIN_ID, + pluginPath: paths.legacyConsentPlugin, + packageJson, + config, + fsImpl, + }), + }); + + const babelConfig = JSON.parse(fsImpl.readFileSync(paths.babel, "utf8")); + const compact = mode === "p" || mode === "prod"; + if (babelConfig.compact !== compact) { + babelConfig.compact = compact; + fsImpl.writeFileSync( + paths.babel, + `${JSON.stringify(babelConfig, undefined, 2)}\n`, + "utf8", + ); + } + + if (identityChanged) { + fsImpl.writeFileSync( + paths.config, + config.replace(/(]*?\sid=["'])[^"']+(["'])/, `$1${targetId}$2`), + "utf8", + ); + } + + fsImpl.writeFileSync(paths.logo, LOGO_TEXT[variant], "utf8"); + + for (const action of actions) { + console.log(`|--- ${action.command} ${action.args.join(" ")} ---|`); + const commandOptions = { cwd: rootDir }; + if (action.env) { + commandOptions.env = { ...process.env, ...action.env }; } - process.exit(0); - } catch (error) { - console.error(error); - process.exit(1); + await commandRunner(action.command, action.args, commandOptions); + } + + removeCordovaPluginDeclarations({ + configPath: paths.config, + packagePath: paths.package, + fsImpl, + }); + assertPluginState({ variant, paths, fsImpl }); + + const hasPlatforms = + fsImpl.existsSync(paths.platforms) && + fsImpl + .readdirSync(paths.platforms) + .some((entry) => entry && !entry.startsWith(".")); + + if (identityChanged && hasPlatforms) { + console.log("|--- Reinstalling platforms for the new app identity ---|"); + await commandRunner("npm", ["run", "clean"], { cwd: rootDir }); } -})(); + + return { + actions, + identityChanged, + targetId, + }; +} + +async function main() { + const mode = process.argv[2] || "d"; + const variant = process.argv[3] === "free" ? "free" : "paid"; + await configureProject({ mode, variant }); +} + +if (require.main === module) { + main().catch((error) => { + console.error(error); + process.exitCode = 1; + }); +} + +module.exports = { + ADMOB_PLUGIN_ID, + ID_FREE, + ID_PAID, + LEGACY_CONSENT_PLUGIN_ID, + configureProject, + getAdmobSyncPlan, +}; diff --git a/utils/scripts/checkAdmobBundle.js b/utils/scripts/checkAdmobBundle.js new file mode 100644 index 0000000000..e55e2a9d17 --- /dev/null +++ b/utils/scripts/checkAdmobBundle.js @@ -0,0 +1,74 @@ +const fs = require("node:fs"); +const path = require("node:path"); + +const ALLOWED_IMPORTS = new Set(["cordova", "cordova/channel", "cordova/exec"]); +const REQUIRE_PATTERN = /\brequire\(\s*["']([^"']+)["']\s*\)/g; + +/** + * Validates that the Cordova runtime artifact is a self-contained bundle. + * + * @param {{bundlePath:string, pluginXmlPath:string, fsImpl?:typeof fs}} options + */ +function validateAdmobBundle({ bundlePath, pluginXmlPath, fsImpl = fs }) { + if (!fsImpl.existsSync(bundlePath)) { + throw new Error(`Missing AdMob runtime bundle: ${bundlePath}`); + } + + const pluginXml = fsImpl.readFileSync(pluginXmlPath, "utf8"); + const relativeBundlePath = path + .relative(path.dirname(pluginXmlPath), bundlePath) + .split(path.sep) + .join("/"); + if (!pluginXml.includes(`src="${relativeBundlePath}"`)) { + throw new Error( + `plugin.xml does not reference the runtime bundle at ${relativeBundlePath}.`, + ); + } + + const bundle = fsImpl.readFileSync(bundlePath, "utf8"); + const imports = [...bundle.matchAll(REQUIRE_PATTERN)].map( + (match) => match[1], + ); + const unsupportedImports = imports.filter( + (specifier) => !ALLOWED_IMPORTS.has(specifier), + ); + + if (unsupportedImports.length) { + throw new Error( + `AdMob runtime bundle contains unresolved imports: ${[ + ...new Set(unsupportedImports), + ].join(", ")}`, + ); + } + + if (!bundle.includes("showOptions") || !bundle.includes("gatherConsent")) { + throw new Error("AdMob runtime bundle does not include the privacy API."); + } + + return { + bytes: Buffer.byteLength(bundle), + imports: [...new Set(imports)], + }; +} + +function main() { + const rootDir = path.resolve(__dirname, "../.."); + const result = validateAdmobBundle({ + bundlePath: path.join(rootDir, "src/plugins/admob/www/admob.js"), + pluginXmlPath: path.join(rootDir, "src/plugins/admob/plugin.xml"), + }); + console.log( + `AdMob bundle is valid (${result.bytes} bytes; imports: ${result.imports.join(", ")}).`, + ); +} + +if (require.main === module) { + try { + main(); + } catch (error) { + console.error(error.message); + process.exitCode = 1; + } +} + +module.exports = { validateAdmobBundle }; diff --git a/utils/scripts/dev.js b/utils/scripts/dev.js index b2212cc896..d7f51965ca 100644 --- a/utils/scripts/dev.js +++ b/utils/scripts/dev.js @@ -124,6 +124,10 @@ function buildSpawnEnv(extra = {}) { return sanitized; } +function getAppVariant(args) { + return args.some((arg) => arg.toLowerCase() === "free") ? "free" : "paid"; +} + function spawnAsync(command, args, options) { return new Promise((resolve, reject) => { const mergedOptions = { @@ -500,12 +504,22 @@ async function main() { const args = process.argv.slice(2); const platform = args.find((a) => /^(android|ios|browser)$/i.test(a)) || "android"; + const appVariant = getAppVariant(args); const target = args.find((a) => a.startsWith("--target="))?.split("=")[1] || null; const emulator = args.includes("--emulator") || args.includes("-e"); console.log("\n ⚡ Acode Dev Mode\n"); + if (appVariant) { + log("info", `Configuring ${appVariant} app variant...`); + await spawnAsync( + process.execPath, + [path.join(ROOT, "utils", "config.js"), "d", appVariant], + { cwd: ROOT }, + ); + } + const host = getLocalIP(); const port = await getFreePort(); @@ -557,7 +571,11 @@ async function main() { }); } -main().catch((err) => { - console.error(err); - process.exit(1); -}); +if (require.main === module) { + main().catch((err) => { + console.error(err); + process.exit(1); + }); +} + +module.exports = { getAppVariant }; From 9a162bf755220c32d4008680a6bdb7ad23050668 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Wed, 5 Aug 2026 23:47:50 +0530 Subject: [PATCH 038/195] feat(lsp): add multi-server support to CodeMirror LSP client (#2627) * feat(lsp): support multiple language servers per editor * fix: spell * fix(lsp): honor diagnostics provider opt-out * refactor(lsp): consume standalone multi-server client * fix --- _typos.toml | 1 + bun.lock | 19 +- package-lock.json | 85 +++++++- package.json | 7 +- src/cm/colorChip.ts | 16 +- src/cm/lsp/clientManager.ts | 49 ++++- src/cm/lsp/codeActions.ts | 117 ++++++----- src/cm/lsp/diagnostics.ts | 172 ++++++++++------ src/cm/lsp/documentColors.ts | 96 ++++++--- src/cm/lsp/documentSymbols.ts | 16 +- src/cm/lsp/inlayHints.ts | 74 ++++--- src/cm/lsp/references.ts | 58 +++--- src/cm/lsp/rename.ts | 13 +- src/cm/lsp/serverRegistry.ts | 15 +- src/cm/lsp/tooltipExtensions.ts | 106 +++++++--- src/cm/lsp/types.ts | 4 + src/cm/lsp/workspace.ts | 2 +- tests/unit/lspMultiClient.test.js | 328 ++++++++++++++++++++++++++++++ 18 files changed, 909 insertions(+), 269 deletions(-) create mode 100644 tests/unit/lspMultiClient.test.js diff --git a/_typos.toml b/_typos.toml index ee6489a24c..0b501dc4c1 100644 --- a/_typos.toml +++ b/_typos.toml @@ -54,3 +54,4 @@ IZ = "IZ" shft = "shft" multline = "multline" sav = "sav" +ist = "ist" diff --git a/bun.lock b/bun.lock index 0e8b84d8c7..069d269005 100644 --- a/bun.lock +++ b/bun.lock @@ -32,7 +32,7 @@ "@codemirror/language-data": "^6.5.2", "@codemirror/legacy-modes": "^6.5.3", "@codemirror/lint": "^6.9.7", - "@codemirror/lsp-client": "^6.2.5", + "@codemirror/lsp-client": "github:Acode-Foundation/codemirror-lsp-client#db6930c2b6db67e14978f08ae8f5aeb149d29468", "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.6.0", "@codemirror/theme-one-dark": "^6.1.3", @@ -126,6 +126,7 @@ "cordova-plugin-system": "file:src/plugins/system", "cordova-plugin-websocket": "file:src/plugins/websocket", "css-loader": "^7.1.4", + "happy-dom": "^20.11.1", "mini-css-extract-plugin": "^2.10.2", "path-browserify": "^1.0.1", "postcss-loader": "^8.2.1", @@ -425,7 +426,7 @@ "@codemirror/lint": ["@codemirror/lint@6.9.7", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.42.0", "crelt": "^1.0.5" } }, "sha512-28/+iWLYxKxsvGYhSYL7zaCZqLz5+FFFDq9tVsvGv9kv8RY4fFAchJ5WX9M3YrrRlTIsECjsXPqeNgnSmNP2dg=="], - "@codemirror/lsp-client": ["@codemirror/lsp-client@6.2.5", "", { "dependencies": { "@codemirror/autocomplete": "^6.20.0", "@codemirror/language": "^6.11.0", "@codemirror/lint": "^6.8.5", "@codemirror/state": "^6.5.2", "@codemirror/view": "^6.37.0", "@lezer/highlight": "^1.2.1", "marked": "^15.0.12", "vscode-languageserver-protocol": "^3.17.5" } }, "sha512-1EqhGRmCZOV7Me+rRuwwkTuvkNoD4Nz6UcE1yx5gdwTVTLD4D9xIy48MJc0LeBQGFLn/HNRW/pHmet4EAEkJFQ=="], + "@codemirror/lsp-client": ["@codemirror/lsp-client@github:Acode-Foundation/codemirror-lsp-client#db6930c", { "dependencies": { "@codemirror/autocomplete": "^6.20.0", "@codemirror/language": "^6.11.0", "@codemirror/lint": "^6.8.5", "@codemirror/state": "^6.5.2", "@codemirror/view": "^6.37.0", "@lezer/highlight": "^1.2.1", "marked": "^15.0.12", "vscode-languageserver-protocol": "^3.17.5" } }, "Acode-Foundation-codemirror-lsp-client-db6930c", "sha512-yENf3NqsXGERWcvUL98FziXbUgkB1R4jU2kTQGYxwcZ6HwTP8+uwebs/j+HDRD7VbxRyemYJClvMNU8n0p8UPg=="], "@codemirror/search": ["@codemirror/search@6.7.1", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.37.0", "crelt": "^1.0.5" } }, "sha512-uMe5UO6PamJtSHrXhhHOzSX3ReWtiJrva6GnPMwSOrZtiExb5X5eExhr2OUZQVvdxPsKpY3Ro2mFbQadpPWmHA=="], @@ -767,6 +768,10 @@ "@types/url-parse": ["@types/url-parse@1.4.11", "", {}, "sha512-FKvKIqRaykZtd4n47LbK/W/5fhQQ1X7cxxzG9A48h0BGN+S04NH7ervcCjM8tyR0lyGru83FAHSmw2ObgKoESg=="], + "@types/whatwg-mimetype": ["@types/whatwg-mimetype@3.0.2", "", {}, "sha512-c2AKvDT8ToxLIOUlN51gTiHXflsfIFisS4pO7pDPoKouJCESkhZnEy623gwP9laCy5lnLDAw1vAzu2vM2YLOrA=="], + + "@types/ws": ["@types/ws@8.18.1", "", { "dependencies": { "@types/node": "*" } }, "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg=="], + "@ungap/custom-elements": ["@ungap/custom-elements@1.3.0", "", {}, "sha512-f4q/s76+8nOy+fhrNHyetuoPDR01lmlZB5czfCG+OOnBw/Wf+x48DcCDPmMQY7oL8xYFL8qfenMoiS8DUkKBUw=="], "@ungap/promise-all-settled": ["@ungap/promise-all-settled@1.1.2", "", {}, "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="], @@ -957,6 +962,8 @@ "buffer-from": ["buffer-from@1.1.2", "", {}, "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="], + "buffer-image-size": ["buffer-image-size@0.6.4", "", { "dependencies": { "@types/node": "*" } }, "sha512-nEh+kZOPY1w+gcCMobZ6ETUp9WfibndnosbpwB1iJk/8Gt5ZF2bhS6+B6bPYz424KtwsR6Rflc3tCz1/ghX2dQ=="], + "builtins": ["builtins@1.0.3", "", {}, "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ=="], "bytes": ["bytes@3.1.2", "", {}, "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="], @@ -1301,7 +1308,7 @@ "enhanced-resolve": ["enhanced-resolve@5.19.0", "", { "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.3.0" } }, "sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg=="], - "entities": ["entities@4.5.0", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="], + "entities": ["entities@7.0.1", "", {}, "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA=="], "env-paths": ["env-paths@2.2.1", "", {}, "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="], @@ -1447,6 +1454,8 @@ "hachure-fill": ["hachure-fill@0.5.2", "", {}, "sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg=="], + "happy-dom": ["happy-dom@20.11.1", "", { "dependencies": { "@types/node": ">=20.0.0", "@types/whatwg-mimetype": "^3.0.2", "@types/ws": "^8.18.1", "buffer-image-size": "^0.6.4", "entities": "^7.0.1", "whatwg-mimetype": "^3.0.0", "ws": "^8.21.0" } }, "sha512-XSt8tMzbW9ymE7687xztkO1ckR7qJNQ3LywY9vlYGhGi3zXrGBHuUo2Cl1ztZaICW+1eAGdkLbj6iwVqDT33kg=="], + "har-schema": ["har-schema@2.0.0", "", {}, "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="], "har-validator": ["har-validator@5.1.5", "", { "dependencies": { "ajv": "^6.12.3", "har-schema": "^2.0.0" } }, "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="], @@ -2315,6 +2324,8 @@ "webpack-sources": ["webpack-sources@3.3.3", "", {}, "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg=="], + "whatwg-mimetype": ["whatwg-mimetype@3.0.0", "", {}, "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q=="], + "which": ["which@6.0.1", "", { "dependencies": { "isexe": "^4.0.0" }, "bin": { "node-which": "bin/which.js" } }, "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg=="], "why-is-node-running": ["why-is-node-running@2.3.0", "", { "dependencies": { "siginfo": "^2.0.0", "stackback": "0.0.2" }, "bin": { "why-is-node-running": "cli.js" } }, "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w=="], @@ -2607,6 +2618,8 @@ "make-fetch-happen/negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="], + "markdown-it/entities": ["entities@4.5.0", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="], + "mermaid/dompurify": ["dompurify@3.4.2", "", { "optionalDependencies": { "@types/trusted-types": "^2.0.7" } }, "sha512-lHeS9SA/IKeIFFyYciHBr2n0v1VMPlSj843HdLOwjb2OxNwdq9Xykxqhk+FE42MzAdHvInbAolSE4mhahPpjXA=="], "mermaid/marked": ["marked@16.4.2", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-TI3V8YYWvkVf3KJe1dRkpnjs68JUPyEa5vjKrp1XEEJUAOaQc+Qj+L1qWbPd0SJuAdQkFU0h73sXXqwDYxsiDA=="], diff --git a/package-lock.json b/package-lock.json index 9fc4f157b4..7d61a6c9f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "@codemirror/language-data": "^6.5.2", "@codemirror/legacy-modes": "^6.5.3", "@codemirror/lint": "^6.9.7", - "@codemirror/lsp-client": "^6.2.5", + "@codemirror/lsp-client": "github:Acode-Foundation/codemirror-lsp-client#db6930c2b6db67e14978f08ae8f5aeb149d29468", "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.6.0", "@codemirror/theme-one-dark": "^6.1.3", @@ -130,6 +130,7 @@ "cordova-plugin-system": "file:src/plugins/system", "cordova-plugin-websocket": "file:src/plugins/websocket", "css-loader": "^7.1.4", + "happy-dom": "^20.11.1", "mini-css-extract-plugin": "^2.10.2", "path-browserify": "^1.0.1", "postcss-loader": "^8.2.1", @@ -3964,9 +3965,9 @@ } }, "node_modules/@codemirror/lsp-client": { - "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@codemirror/lsp-client/-/lsp-client-6.2.5.tgz", - "integrity": "sha512-1EqhGRmCZOV7Me+rRuwwkTuvkNoD4Nz6UcE1yx5gdwTVTLD4D9xIy48MJc0LeBQGFLn/HNRW/pHmet4EAEkJFQ==", + "version": "6.2.5-acode.1", + "resolved": "git+ssh://git@github.com/Acode-Foundation/codemirror-lsp-client.git#db6930c2b6db67e14978f08ae8f5aeb149d29468", + "integrity": "sha512-rmtrQojm4rSJCmqZhoskG4UeEth+lzrcGsmrlnKqSU0EJCeRYE1kjZKhjI+XsMVD5YFgup31IGN+NsxfOirDMg==", "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.20.0", @@ -6158,7 +6159,6 @@ "integrity": "sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "undici-types": "~8.3.0" } @@ -6177,6 +6177,23 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/whatwg-mimetype": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/whatwg-mimetype/-/whatwg-mimetype-3.0.2.tgz", + "integrity": "sha512-c2AKvDT8ToxLIOUlN51gTiHXflsfIFisS4pO7pDPoKouJCESkhZnEy623gwP9laCy5lnLDAw1vAzu2vM2YLOrA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/ws": { + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz", + "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@ungap/custom-elements": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@ungap/custom-elements/-/custom-elements-1.3.0.tgz", @@ -7479,6 +7496,19 @@ "license": "MIT", "peer": true }, + "node_modules/buffer-image-size": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/buffer-image-size/-/buffer-image-size-0.6.4.tgz", + "integrity": "sha512-nEh+kZOPY1w+gcCMobZ6ETUp9WfibndnosbpwB1iJk/8Gt5ZF2bhS6+B6bPYz424KtwsR6Rflc3tCz1/ghX2dQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + }, + "engines": { + "node": ">=4.0" + } + }, "node_modules/builtins": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", @@ -10939,6 +10969,38 @@ "integrity": "sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==", "license": "MIT" }, + "node_modules/happy-dom": { + "version": "20.11.1", + "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-20.11.1.tgz", + "integrity": "sha512-XSt8tMzbW9ymE7687xztkO1ckR7qJNQ3LywY9vlYGhGi3zXrGBHuUo2Cl1ztZaICW+1eAGdkLbj6iwVqDT33kg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": ">=20.0.0", + "@types/whatwg-mimetype": "^3.0.2", + "@types/ws": "^8.18.1", + "buffer-image-size": "^0.6.4", + "entities": "^7.0.1", + "whatwg-mimetype": "^3.0.0", + "ws": "^8.21.0" + }, + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/happy-dom/node_modules/entities": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz", + "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", @@ -16974,8 +17036,7 @@ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz", "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.1", @@ -17630,6 +17691,16 @@ "node": ">=10.13.0" } }, + "node_modules/whatwg-mimetype": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", + "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + } + }, "node_modules/which": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz", diff --git a/package.json b/package.json index b04184f84a..04e258c206 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,9 @@ "plugins": { "cordova-clipboard": {}, "cordova-plugin-device": {}, - "cordova-plugin-file": {}, + "cordova-plugin-file": { + "ANDROIDX_WEBKIT_VERSION": "1.4.0" + }, "cordova-plugin-server": {}, "cordova-plugin-ftp": {}, "cordova-plugin-sdcard": {}, @@ -104,6 +106,7 @@ "cordova-plugin-system": "file:src/plugins/system", "cordova-plugin-websocket": "file:src/plugins/websocket", "css-loader": "^7.1.4", + "happy-dom": "^20.11.1", "mini-css-extract-plugin": "^2.10.2", "path-browserify": "^1.0.1", "postcss-loader": "^8.2.1", @@ -148,7 +151,7 @@ "@codemirror/language-data": "^6.5.2", "@codemirror/legacy-modes": "^6.5.3", "@codemirror/lint": "^6.9.7", - "@codemirror/lsp-client": "^6.2.5", + "@codemirror/lsp-client": "github:Acode-Foundation/codemirror-lsp-client#db6930c2b6db67e14978f08ae8f5aeb149d29468", "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.6.0", "@codemirror/theme-one-dark": "^6.1.3", diff --git a/src/cm/colorChip.ts b/src/cm/colorChip.ts index 91f43133e0..3f055cfa58 100644 --- a/src/cm/colorChip.ts +++ b/src/cm/colorChip.ts @@ -1,3 +1,4 @@ +import type { LSPClient } from "@codemirror/lsp-client"; import { LSPPlugin } from "@codemirror/lsp-client"; import type { Range } from "@codemirror/state"; import { Decoration, EditorView, WidgetType } from "@codemirror/view"; @@ -16,6 +17,8 @@ export interface ColorChipPayload { css: string; pickerSeed?: string; source: ColorChipSource; + /** Originating provider for LSP color-presentation requests. */ + lspClient?: LSPClient; } const chipState = new WeakMap(); @@ -43,6 +46,7 @@ export class ColorChipWidget extends WidgetType { other.payload.to === this.payload.to && other.payload.css === this.payload.css && other.payload.source === this.payload.source && + other.payload.lspClient === this.payload.lspClient && (other.payload.pickerSeed || "") === (this.payload.pickerSeed || "") ); } @@ -90,14 +94,10 @@ export function isViewEditable(view: EditorView): boolean { } export function hasLspColorProvider(view: EditorView): boolean { - const lsp = LSPPlugin.get(view) as { - client?: { - connected?: boolean; - serverCapabilities?: { colorProvider?: boolean | object } | null; - }; - } | null; - return !!( - lsp?.client?.connected && lsp.client.serverCapabilities?.colorProvider + return LSPPlugin.getAll(view, "documentColor").some( + (lsp) => + lsp.client.connected && + !!lsp.client.serverCapabilities?.colorProvider, ); } diff --git a/src/cm/lsp/clientManager.ts b/src/cm/lsp/clientManager.ts index 94ecd40cfe..59eae1966d 100644 --- a/src/cm/lsp/clientManager.ts +++ b/src/cm/lsp/clientManager.ts @@ -1,5 +1,8 @@ import { getIndentUnit, indentUnit } from "@codemirror/language"; -import type { LSPClientExtension } from "@codemirror/lsp-client"; +import type { + LSPClientExtension, + LSPPluginOptions, +} from "@codemirror/lsp-client"; import { LSPClient, LSPPlugin, @@ -272,6 +275,22 @@ function buildBuiltinExtensions( return { extensions, diagnosticsExtension }; } +function buildPluginOptions(server: LspServerDefinition): LSPPluginOptions { + const builtin = server.clientConfig?.builtinExtensions ?? {}; + return { + priority: server.priority, + features: { + completion: builtin.completion !== false, + hover: builtin.hover !== false, + signatureHelp: builtin.signature !== false, + diagnostics: builtin.diagnostics !== false, + formatting: builtin.formatting !== false, + inlayHint: builtin.inlayHints === true, + documentColor: builtin.documentColors !== false, + }, + }; +} + interface InitContext { key: string; normalizedRootUri: string | null; @@ -434,6 +453,7 @@ export class LspClientManager { const plugin = clientState.client.plugin( normalizedUri, targetLanguageId, + buildPluginOptions(server), ); if (server.clientConfig?.builtinExtensions?.completion !== false) { lspExtensions.push(lspCompletionEnabled.of(true)); @@ -442,14 +462,6 @@ export class LspClientManager { originalUri && originalUri !== normalizedUri ? [originalUri] : []; clientState.attach(normalizedUri, view as EditorView, aliases); lspExtensions.push(plugin); - if (diagnosticsUiExtension) { - lspExtensions.push( - lspDiagnosticsAutoSyncExtension( - clientState.client, - normalizedUri, - ), - ); - } } catch (error) { console.error( `Failed to initialize LSP client for ${server.id}`, @@ -459,6 +471,7 @@ export class LspClientManager { } if (diagnosticsUiExtension && lspExtensions.length) { + lspExtensions.push(lspDiagnosticsAutoSyncExtension()); lspExtensions.push(...asArray(diagnosticsUiExtension)); } @@ -508,7 +521,7 @@ export class LspClientManager { const capabilities = state.client.serverCapabilities; if (!capabilities?.documentFormattingProvider) continue; state.attach(normalizedUri, view); - const plugin = LSPPlugin.get(view); + const plugin = LSPPlugin.get(view, state.client); if (!plugin) continue; plugin.client.sync(); const edits = await state.client.request< @@ -1140,11 +1153,22 @@ export class LspClientManager { logLspInfo(`[LSP:${server.id}] attached to ${uri}${suffix}`); }; + const clearClientDiagnostics = (view: EditorView): void => { + try { + view.dispatch({ effects: clearDiagnosticsEffect(client) }); + } catch { + /* View may already be destroyed or may not have diagnostics state. */ + } + }; + const dispose = async (): Promise => { if (disposed) return; disposed = true; disposePullDiagnostics(client); this.#clients.delete(key); + for (const views of fileRefs.values()) { + for (const view of views) clearClientDiagnostics(view); + } try { client.disconnect(); } catch (error) { @@ -1161,7 +1185,10 @@ export class LspClientManager { const actualUri = uriAliases.get(uri) ?? uri; const existing = fileRefs.get(actualUri); if (!existing) return; - if (view) existing.delete(view); + if (view) { + existing.delete(view); + clearClientDiagnostics(view); + } if (!view || !existing.size) { fileRefs.delete(actualUri); for (const [alias, target] of uriAliases.entries()) { diff --git a/src/cm/lsp/codeActions.ts b/src/cm/lsp/codeActions.ts index 736909dbd5..7022e5f1e1 100644 --- a/src/cm/lsp/codeActions.ts +++ b/src/cm/lsp/codeActions.ts @@ -197,12 +197,9 @@ async function applyChangesToFile( } async function applyWorkspaceEdit( - view: EditorView, + plugin: LSPPlugin, edit: WorkspaceEdit, ): Promise { - const plugin = LSPPlugin.get(view); - if (!plugin) return false; - const workspace = plugin.client.workspace as AcodeWorkspace; if (!workspace) return false; @@ -248,12 +245,9 @@ async function applyWorkspaceEdit( * "If both edit and command are supplied, first the edit is applied, then the command is executed" */ async function applyCodeAction( - view: EditorView, + plugin: LSPPlugin, action: CodeAction, ): Promise { - const plugin = LSPPlugin.get(view); - if (!plugin) return false; - plugin.client.sync(); // Resolve to get the edit if not already present @@ -262,7 +256,7 @@ async function applyCodeAction( // Step 1: Apply workspace edit if present if (resolved.edit) { - success = await applyWorkspaceEdit(view, resolved.edit); + success = await applyWorkspaceEdit(plugin, resolved.edit); } // Step 2: Execute command if present (after edit per LSP spec) @@ -283,46 +277,70 @@ export interface CodeActionItem { disabled?: boolean; disabledReason?: string; action: CodeAction | Command; + /** Client binding that produced this action; resolution must use it. */ + plugin: LSPPlugin; } export async function fetchCodeActions( view: EditorView, ): Promise { - const plugin = LSPPlugin.get(view); - if (!plugin) return []; - - const capabilities = plugin.client.serverCapabilities; - if (!capabilities?.codeActionProvider) return []; + const plugins = LSPPlugin.getAll(view, "codeAction").filter( + (plugin) => !!plugin.client.serverCapabilities?.codeActionProvider, + ); + if (!plugins.length) return []; const { from, to } = view.state.selection.main; - const range: LspRange = { - start: plugin.toPosition(from), - end: plugin.toPosition(to), - }; - - plugin.client.sync(); - - try { - const response = await requestCodeActions(plugin, range); - if (!response?.length) return []; - - const items: CodeActionItem[] = response.map((item) => { - if (isCommand(item)) { - return { title: item.title, icon: "terminal", action: item }; - } - return { - title: item.title, - kind: item.kind, - icon: getCodeActionIcon(item.kind), - isPreferred: item.isPreferred, - disabled: !!item.disabled, - disabledReason: item.disabled?.reason, - action: item, + const settled = await Promise.allSettled( + plugins.map(async (plugin): Promise => { + const range: LspRange = { + start: plugin.toPosition(from), + end: plugin.toPosition(to), }; - }); + plugin.client.sync(); + const response = await requestCodeActions(plugin, range); + if (!response?.length) return []; + return response.map((item) => { + if (isCommand(item)) { + return { + title: item.title, + icon: "terminal", + action: item, + plugin, + }; + } + return { + title: item.title, + kind: item.kind, + icon: getCodeActionIcon(item.kind), + isPreferred: item.isPreferred, + disabled: !!item.disabled, + disabledReason: item.disabled?.reason, + action: item, + plugin, + }; + }); + }), + ); - // Sort: preferred first, then quickfixes, then alphabetically - items.sort((a, b) => { + const items: CodeActionItem[] = []; + for (let index = 0; index < settled.length; index++) { + const result = settled[index]; + if (result.status === "fulfilled") { + items.push(...result.value); + } else { + addLspLogFor( + plugins[index], + "error", + "Code action fetch failed", + result.reason, + ); + console.error("[LSP:CodeAction] Provider failed:", result.reason); + } + } + + // Sort: preferred first, then quickfixes, then alphabetically. Stable + // sorting preserves server priority for otherwise identical actions. + items.sort((a, b) => { if (a.isPreferred && !b.isPreferred) return -1; if (!a.isPreferred && b.isPreferred) return 1; if (a.kind?.startsWith("quickfix") && !b.kind?.startsWith("quickfix")) @@ -330,21 +348,15 @@ export async function fetchCodeActions( if (!a.kind?.startsWith("quickfix") && b.kind?.startsWith("quickfix")) return 1; return a.title.localeCompare(b.title); - }); - - return items; - } catch (error) { - addLspLogFor(plugin, "error", "Code action fetch failed", error); - console.error("[LSP:CodeAction] Failed to fetch:", error); - return []; - } + }); + return items; } export async function executeCodeAction( view: EditorView, item: CodeActionItem, ): Promise { - const plugin = LSPPlugin.get(view); + const plugin = LSPPlugin.get(view, item.plugin.client); if (!plugin) return false; try { @@ -356,7 +368,7 @@ export async function executeCodeAction( } // Handle CodeAction - return applyCodeAction(view, item.action); + return applyCodeAction(plugin, item.action); } catch (error) { addLspLogFor(plugin, "error", "Code action execution failed", error); console.error("[LSP:CodeAction] Failed to execute:", error); @@ -365,8 +377,9 @@ export async function executeCodeAction( } export function supportsCodeActions(view: EditorView): boolean { - const plugin = LSPPlugin.get(view); - return !!plugin?.client.serverCapabilities?.codeActionProvider; + return LSPPlugin.getAll(view, "codeAction").some( + (plugin) => !!plugin.client.serverCapabilities?.codeActionProvider, + ); } export async function showCodeActionsMenu(view: EditorView): Promise { diff --git a/src/cm/lsp/diagnostics.ts b/src/cm/lsp/diagnostics.ts index 53aec8eb3b..906c505167 100644 --- a/src/cm/lsp/diagnostics.ts +++ b/src/cm/lsp/diagnostics.ts @@ -20,7 +20,14 @@ import type { RawDiagnostic, } from "./types"; -const setPublishedDiagnostics = StateEffect.define(); +interface PublishedDiagnosticsUpdate { + client?: LSPClient; + diagnostics?: LspDiagnostic[]; + clearAll?: boolean; +} + +const setPublishedDiagnostics = + StateEffect.define(); let diagnosticsEventTimer: ReturnType | null = null; let diagnosticsViewCount = 0; @@ -54,6 +61,13 @@ function supportsPullDiagnostics(client: LSPClient): boolean { return !!client.serverCapabilities?.diagnosticProvider; } +function diagnosticsEnabledForFile(client: LSPClient, uri: string): boolean { + const file = client.workspace.getFile(uri); + const view = file?.getView(); + const plugin = view && LSPPlugin.get(view, client); + return !!plugin?.featureEnabled("diagnostics"); +} + function isCoarsePointerDevice(): boolean { if (typeof window !== "undefined") { try { @@ -105,17 +119,52 @@ function clearScheduledDiagnosticsUpdated(): void { diagnosticsEventTimer = null; } -const lspPublishedDiagnostics = StateField.define({ - create(): LspDiagnostic[] { - return []; +const lspPublishedDiagnostics = StateField.define< + ReadonlyMap +>({ + create(): ReadonlyMap { + return new Map(); }, - update(value: LspDiagnostic[], tr): LspDiagnostic[] { + update(value: ReadonlyMap, tr) { + let next = value; + if (tr.docChanged && value.size) { + next = new Map(); + for (const [client, diagnostics] of value) { + const mapped: LspDiagnostic[] = []; + for (const diagnostic of diagnostics) { + const from = tr.changes.mapPos( + diagnostic.from, + 1, + MapMode.TrackDel, + ); + const to = tr.changes.mapPos( + diagnostic.to, + -1, + MapMode.TrackDel, + ); + if (from != null && to != null) { + mapped.push({ ...diagnostic, from, to }); + } + } + (next as Map).set(client, mapped); + } + } for (const effect of tr.effects) { if (effect.is(setPublishedDiagnostics)) { - value = effect.value; + if (effect.value.clearAll) { + next = new Map(); + } else if (effect.value.client) { + const updated = new Map(next); + if (effect.value.diagnostics?.length) { + updated.set(effect.value.client, effect.value.diagnostics); + } else { + updated.delete(effect.value.client); + } + next = updated; + } } } - return value; + return next; }, }); @@ -133,8 +182,6 @@ function collectLspDiagnostics( diagnostics: RawDiagnostic[], ): LspDiagnostic[] { const items: LspDiagnostic[] = []; - const { syncedDoc } = plugin; - for (const diagnostic of diagnostics) { let from: number; let to: number; @@ -155,7 +202,7 @@ function collectLspDiagnostics( } catch (_) { continue; } - if (to > syncedDoc.length) continue; + if (to > plugin.unsyncedChanges.newLength) continue; const severity = severities[diagnostic.severity ?? 0] ?? "info"; const source = diagnostic.code @@ -175,9 +222,10 @@ function collectLspDiagnostics( } function storeLspDiagnostics( + client: LSPClient, items: LspDiagnostic[], -): StateEffect { - return setPublishedDiagnostics.of(items); +): StateEffect { + return setPublishedDiagnostics.of({ client, diagnostics: items }); } function sameDiagnostics( @@ -214,17 +262,21 @@ function applyDiagnostics( } const view = file.getView(); if (!view) return false; - const plugin = LSPPlugin.get(view) as LSPPluginAPI | null; - if (!plugin) return false; + const plugin = LSPPlugin.get(view, client); + if (!plugin || !plugin.featureEnabled("diagnostics")) return false; - const diagnostics = collectLspDiagnostics(plugin, rawDiagnostics); - const current = view.state.field(lspPublishedDiagnostics, false) ?? []; + const diagnostics = collectLspDiagnostics( + plugin as unknown as LSPPluginAPI, + rawDiagnostics, + ); + const current = + view.state.field(lspPublishedDiagnostics, false)?.get(client) ?? []; if (sameDiagnostics(current, diagnostics)) { return true; } view.dispatch({ - effects: storeLspDiagnostics(diagnostics), + effects: storeLspDiagnostics(client, diagnostics), }); scheduleDiagnosticsUpdated(); return true; @@ -235,7 +287,12 @@ async function pullDiagnostics( uri: string, generation: number, ): Promise { - if (!supportsPullDiagnostics(client)) return; + if ( + !supportsPullDiagnostics(client) || + !diagnosticsEnabledForFile(client, uri) + ) { + return; + } client.sync(); const clientWithWorkspace = client as unknown as LSPClientWithWorkspace; @@ -312,6 +369,7 @@ export function schedulePullDiagnostics( uri: string, delay = PULL_DIAGNOSTICS_DELAY, ): void { + if (!diagnosticsEnabledForFile(client, uri)) return; if (!supportsPullDiagnostics(client)) { if (client.connected && !client.serverCapabilities) { void client.initializing @@ -370,26 +428,33 @@ export function disposePullDiagnostics(client: LSPClient): void { pullDiagnosticsStates.delete(client); } -export function lspDiagnosticsAutoSyncExtension( - client: LSPClient, - uri: string, -): Extension { +export function lspDiagnosticsAutoSyncExtension(): Extension { return ViewPlugin.fromClass( class { pending: ReturnType | null = null; + view: EditorView; - constructor() { - schedulePullDiagnostics(client, uri, 0); + constructor(view: EditorView) { + this.view = view; + this.schedule(0); } update(update: ViewUpdate): void { if (!update.docChanged) return; + this.schedule(500); + } + + schedule(delay: number): void { if (this.pending != null) clearTimeout(this.pending); - this.pending = setTimeout(() => { - this.pending = null; - client.sync(); - schedulePullDiagnostics(client, uri, 0); - }, 500); + this.pending = setTimeout(() => this.flush(), delay); + } + + flush(): void { + this.pending = null; + for (const plugin of LSPPlugin.getAll(this.view, "diagnostics")) { + plugin.client.sync(); + schedulePullDiagnostics(plugin.client, plugin.uri, 0); + } } destroy(): void { @@ -424,35 +489,14 @@ const diagnosticsLifecyclePlugin = ViewPlugin.fromClass( }, ); -function mapDiagnostics( - plugin: LSPPluginAPI, - state: EditorState, -): Diagnostic[] { - const stored = state.field(lspPublishedDiagnostics); - const changes = plugin.unsyncedChanges; - const mapped: Diagnostic[] = []; - - for (const diagnostic of stored) { - let from: number | null; - let to: number | null; - try { - from = changes.mapPos(diagnostic.from, 1, MapMode.TrackDel); - to = changes.mapPos(diagnostic.to, -1, MapMode.TrackDel); - } catch (_) { - continue; - } - if (from != null && to != null) { - mapped.push({ ...diagnostic, from, to }); - } - } - - return mapped; -} - function lspLinterSource(view: EditorView): Diagnostic[] { - const plugin = LSPPlugin.get(view) as LSPPluginAPI | null; - if (!plugin) return []; - return mapDiagnostics(plugin, view.state); + const stored = view.state.field(lspPublishedDiagnostics); + const diagnostics: Diagnostic[] = []; + for (const [client, items] of stored) { + const plugin = LSPPlugin.get(view, client); + if (plugin?.featureEnabled("diagnostics")) diagnostics.push(...items); + } + return diagnostics; } export function lspDiagnosticsClientExtension(): { @@ -552,16 +596,22 @@ export function lspDiagnosticsExtension( export default lspDiagnosticsExtension; -export function clearDiagnosticsEffect(): StateEffect { - return setPublishedDiagnostics.of([]); +export function clearDiagnosticsEffect( + client?: LSPClient, +): StateEffect { + return setPublishedDiagnostics.of( + client ? { client, diagnostics: [] } : { clearAll: true }, + ); } export function getLspDiagnostics(state: EditorState | null): LspDiagnostic[] { if (!state || typeof state.field !== "function") return []; try { const stored = state.field(lspPublishedDiagnostics, false); - if (!stored || !Array.isArray(stored)) return []; - return stored.map((diagnostic) => ({ ...diagnostic })); + if (!stored) return []; + return Array.from(stored.values()).flatMap((diagnostics) => + diagnostics.map((diagnostic) => ({ ...diagnostic })), + ); } catch (_) { return []; } diff --git a/src/cm/lsp/documentColors.ts b/src/cm/lsp/documentColors.ts index 3717acb681..99bc055c9d 100644 --- a/src/cm/lsp/documentColors.ts +++ b/src/cm/lsp/documentColors.ts @@ -1,4 +1,7 @@ -import type { LSPClientExtension } from "@codemirror/lsp-client"; +import type { + LSPClient, + LSPClientExtension, +} from "@codemirror/lsp-client"; import { LSPPlugin } from "@codemirror/lsp-client"; import type { Extension, Range } from "@codemirror/state"; import { MapMode, StateEffect, StateField } from "@codemirror/state"; @@ -47,6 +50,7 @@ export interface LspDocumentColor { to: number; color: Color; css: string; + client: LSPClient; } interface DocumentColorParams { @@ -146,6 +150,7 @@ function toChipPayload(c: LspDocumentColor): ColorChipPayload { css: c.css, pickerSeed: lspColorToHex(c.color), source: "lsp", + lspClient: c.client, }; } @@ -289,8 +294,10 @@ function createPlugin(config: DocumentColorsConfig) { return; } - const lsp = LSPPlugin.get(this.view) as LSPPluginAPI | null; - if (!lsp?.client.connected) { + const bindings = LSPPlugin.getAll(this.view, "documentColor") as + readonly LSPPluginAPI[]; + const connected = bindings.filter((lsp) => lsp.client.connected); + if (!connected.length) { if (this.hasProvider || this.providerKnown) { this.hasProvider = false; this.providerKnown = false; @@ -305,12 +312,7 @@ function createPlugin(config: DocumentColorsConfig) { } this.connectRetries = 0; - const caps = lsp.client.serverCapabilities as - | { colorProvider?: boolean | object } - | null - | undefined; - - if (!caps) { + if (connected.some((lsp) => !lsp.client.serverCapabilities)) { if (this.capRetries < MAX_CAP_RETRIES) { this.capRetries++; this.schedule(false); @@ -319,9 +321,11 @@ function createPlugin(config: DocumentColorsConfig) { } this.capRetries = 0; - const provider = !!caps.colorProvider; + const providers = connected.filter( + (lsp) => !!lsp.client.serverCapabilities?.colorProvider, + ); this.providerKnown = true; - if (!provider) { + if (!providers.length) { if (this.hasProvider) { this.hasProvider = false; this.clearColors(); @@ -330,28 +334,39 @@ function createPlugin(config: DocumentColorsConfig) { } this.hasProvider = true; - lsp.client.sync(); const id = ++this.reqId; - - try { - const result = await lsp.client.request< - DocumentColorParams, - ColorInformation[] | null - >("textDocument/documentColor", { - textDocument: { uri: lsp.uri }, - }); - - if (id !== this.reqId) return; - - const stored = this.process( - lsp, - result ?? [], - this.view.state.doc.length, - ); - this.view.dispatch({ effects: setColors.of(stored) }); - } catch { - /* keep previous chips */ + const settled = await Promise.allSettled( + providers.map(async (lsp) => { + lsp.client.sync(); + const result = await lsp.client.request< + DocumentColorParams, + ColorInformation[] | null + >("textDocument/documentColor", { + textDocument: { uri: lsp.uri }, + }); + return this.process( + lsp, + result ?? [], + this.view.state.doc.length, + ); + }), + ); + if (id !== this.reqId) return; + const stored: LspDocumentColor[] = []; + const seen = new Set(); + for (const result of settled) { + if (result.status !== "fulfilled") continue; + for (const color of result.value) { + const key = `${color.from}:${color.to}:${color.css}`; + if (seen.has(key)) continue; + seen.add(key); + stored.push(color); + if (stored.length >= maxColors) break; + } + if (stored.length >= maxColors) break; } + stored.sort((a, b) => a.from - b.from || a.to - b.to); + this.view.dispatch({ effects: setColors.of(stored) }); } process( @@ -377,6 +392,7 @@ function createPlugin(config: DocumentColorsConfig) { to: mapped.to, color, css: lspColorToCss(color), + client: lsp.client, }); if (out.length >= maxColors) break; @@ -422,7 +438,9 @@ async function handleColorPick( view: EditorView, payload: ColorChipPayload, ): Promise { - const lsp = LSPPlugin.get(view) as LSPPluginAPI | null; + const lsp = (payload.lspClient + ? LSPPlugin.get(view, payload.lspClient) + : LSPPlugin.getForFeature(view, "documentColor")) as LSPPluginAPI | null; if (!lsp?.client.connected) return; const doc = view.state.doc; @@ -436,7 +454,9 @@ async function handleColorPick( const picked = await openColorPicker(seed); if (!picked) return; - const lsp2 = LSPPlugin.get(view) as LSPPluginAPI | null; + const lsp2 = (payload.lspClient + ? LSPPlugin.get(view, payload.lspClient) + : LSPPlugin.getForFeature(view, "documentColor")) as LSPPluginAPI | null; if (!lsp2?.client.connected) return; const live = findLiveColor(view, payload, currentText); @@ -520,10 +540,20 @@ export function documentColorsClientExtension(): LSPClientExtension { }; } +let defaultDocumentColorsEditorExtension: Extension | null = null; + export function documentColorsEditorExtension( config: DocumentColorsConfig = {}, ): Extension { if (config.enabled === false) return []; + if (!Object.keys(config).length) { + defaultDocumentColorsEditorExtension ??= [ + lspDocumentColorsField, + createPlugin({}), + colorChipTheme, + ]; + return defaultDocumentColorsEditorExtension; + } return [lspDocumentColorsField, createPlugin(config), colorChipTheme]; } diff --git a/src/cm/lsp/documentSymbols.ts b/src/cm/lsp/documentSymbols.ts index 8e4dc3d922..6d973f1175 100644 --- a/src/cm/lsp/documentSymbols.ts +++ b/src/cm/lsp/documentSymbols.ts @@ -215,7 +215,10 @@ function flattenSymbols( export async function fetchDocumentSymbols( view: EditorView, ): Promise { - const plugin = LSPPlugin.get(view) as LSPPluginAPI | null; + const plugin = LSPPlugin.getAll(view, "documentSymbol").find( + (candidate) => + !!candidate.client.serverCapabilities?.documentSymbolProvider, + ) as LSPPluginAPI | undefined; if (!plugin) { return null; } @@ -308,12 +311,11 @@ export async function navigateToSymbol( } export function supportsDocumentSymbols(view: EditorView): boolean { - const plugin = LSPPlugin.get(view) as LSPPluginAPI | null; - if (!plugin?.client.connected) { - return false; - } - - return !!plugin.client.serverCapabilities?.documentSymbolProvider; + return LSPPlugin.getAll(view, "documentSymbol").some( + (plugin) => + plugin.client.connected && + !!plugin.client.serverCapabilities?.documentSymbolProvider, + ); } export interface DocumentSymbolsResult { diff --git a/src/cm/lsp/inlayHints.ts b/src/cm/lsp/inlayHints.ts index b680806659..477c82d1b2 100644 --- a/src/cm/lsp/inlayHints.ts +++ b/src/cm/lsp/inlayHints.ts @@ -171,13 +171,14 @@ function createPlugin(config: InlayHintsConfig) { } async fetch(): Promise { - const lsp = LSPPlugin.get(this.view) as LSPPluginAPI | null; - if (!lsp?.client.connected) return; - - const caps = lsp.client.serverCapabilities; - if (!caps?.inlayHintProvider) return; - - lsp.client.sync(); + const providers = ( + LSPPlugin.getAll(this.view, "inlayHint") as readonly LSPPluginAPI[] + ).filter( + (lsp) => + lsp.client.connected && + !!lsp.client.serverCapabilities?.inlayHintProvider, + ); + if (!providers.length) return; const id = ++this.reqId; const doc = this.view.state.doc; @@ -190,25 +191,38 @@ function createPlugin(config: InlayHintsConfig) { doc.lineAt(Math.min(doc.length, to)).number + buf, ); - try { - const hints = await lsp.client.request< - InlayHintParams, - InlayHint[] | null - >("textDocument/inlayHint", { - textDocument: { uri: lsp.uri }, - range: { - start: lsp.toPosition(doc.line(startLn).from), - end: lsp.toPosition(doc.line(endLn).to), - }, - }); - - if (id !== this.reqId) return; - - const processed = this.process(lsp, hints ?? [], doc.length); - this.view.dispatch({ effects: setHints.of(processed) }); - } catch { - // Non-critical - silently ignore + const settled = await Promise.allSettled( + providers.map(async (lsp) => { + lsp.client.sync(); + const hints = await lsp.client.request< + InlayHintParams, + InlayHint[] | null + >("textDocument/inlayHint", { + textDocument: { uri: lsp.uri }, + range: { + start: lsp.toPosition(doc.line(startLn).from), + end: lsp.toPosition(doc.line(endLn).to), + }, + }); + return this.process(lsp, hints ?? [], doc.length); + }), + ); + if (id !== this.reqId) return; + const processed: ProcessedHint[] = []; + const seen = new Set(); + for (const result of settled) { + if (result.status !== "fulfilled") continue; + for (const hint of result.value) { + const key = `${hint.pos}:${hint.label}`; + if (seen.has(key)) continue; + seen.add(key); + processed.push(hint); + } } + processed.sort((a, b) => a.pos - b.pos); + this.view.dispatch({ + effects: setHints.of(processed.slice(0, max)), + }); } process( @@ -326,10 +340,20 @@ export function inlayHintsClientExtension(): LSPClientExtension { }; } +let defaultInlayHintsEditorExtension: Extension | null = null; + export function inlayHintsEditorExtension( config: InlayHintsConfig = {}, ): Extension { if (config.enabled === false) return []; + if (!Object.keys(config).length) { + defaultInlayHintsEditorExtension ??= [ + hintsField, + createPlugin({}), + styles, + ]; + return defaultInlayHintsEditorExtension; + } return [hintsField, createPlugin(config), styles]; } diff --git a/src/cm/lsp/references.ts b/src/cm/lsp/references.ts index 79bc31cc65..def69288c3 100644 --- a/src/cm/lsp/references.ts +++ b/src/cm/lsp/references.ts @@ -102,15 +102,10 @@ function getWordAtCursor(view: EditorView): string { async function fetchReferences( view: EditorView, ): Promise<{ symbolName: string; references: ReferenceWithContext[] } | null> { - const plugin = LSPPlugin.get(view); - if (!plugin) { - return null; - } - - const client = plugin.client; - const capabilities = client.serverCapabilities; - - if (!capabilities?.referencesProvider) { + const plugins = LSPPlugin.getAll(view, "references").filter( + (plugin) => !!plugin.client.serverCapabilities?.referencesProvider, + ); + if (!plugins.length) { const toast = (globalThis as Record).toast as | ((msg: string) => void) | undefined; @@ -123,24 +118,37 @@ async function fetchReferences( const line = state.doc.lineAt(pos); const lineNumber = line.number - 1; const character = pos - line.from; - const uri = plugin.uri; - const symbolName = getWordAtCursor(view); - - client.sync(); - - const params: ReferenceParams = { - textDocument: { uri }, - position: { line: lineNumber, character }, - context: { includeDeclaration: true }, - }; - - const locations = await client.request( - "textDocument/references", - params, + const settled = await Promise.allSettled( + plugins.map(async (plugin) => { + plugin.client.sync(); + return ( + (await plugin.client.request( + "textDocument/references", + { + textDocument: { uri: plugin.uri }, + position: { line: lineNumber, character }, + context: { includeDeclaration: true }, + }, + )) ?? [] + ); + }), ); - - if (!locations || locations.length === 0) { + const locations: Location[] = []; + const seen = new Set(); + for (const result of settled) { + if (result.status === "rejected") { + console.warn("[LSP:References] Provider failed", result.reason); + continue; + } + for (const location of result.value) { + const key = `${location.uri}:${location.range.start.line}:${location.range.start.character}:${location.range.end.line}:${location.range.end.character}`; + if (seen.has(key)) continue; + seen.add(key); + locations.push(location); + } + } + if (!locations.length) { return { symbolName, references: [] }; } diff --git a/src/cm/lsp/rename.ts b/src/cm/lsp/rename.ts index 6ce0ff2124..75b89693cb 100644 --- a/src/cm/lsp/rename.ts +++ b/src/cm/lsp/rename.ts @@ -55,7 +55,9 @@ function getPrepareRename(plugin: LSPPlugin, pos: number) { async function performRename(view: EditorView): Promise { const wordRange = view.state.wordAt(view.state.selection.main.head); - const plugin = LSPPlugin.get(view); + const plugin = LSPPlugin.getAll(view, "rename").find( + (candidate) => !!candidate.client.serverCapabilities?.renameProvider, + ); if (!plugin) { return false; @@ -133,7 +135,7 @@ async function performRename(view: EditorView): Promise { } try { - await doRename(view, String(newName), wordRange.from); + await doRename(plugin, String(newName), wordRange.from); } catch (error) { addLspLogFor(plugin, "error", "Rename failed", error); console.error("[LSP:Rename] Rename failed:", error); @@ -198,13 +200,10 @@ async function applyChangesToFile( } async function doRename( - view: EditorView, + plugin: LSPPlugin, newName: string, position: number, ): Promise { - const plugin = LSPPlugin.get(view); - if (!plugin) return; - plugin.client.sync(); const response = await plugin.client.withMapping((mapping) => @@ -265,7 +264,7 @@ async function doRename( export const renameSymbol: Command = (view) => { performRename(view).catch((error) => { - const plugin = LSPPlugin.get(view); + const plugin = LSPPlugin.getForFeature(view, "rename"); addLspLogFor(plugin, "error", "Rename command failed", error); console.error("[LSP:Rename] Rename command failed:", error); }); diff --git a/src/cm/lsp/serverRegistry.ts b/src/cm/lsp/serverRegistry.ts index 155ab31522..24b255630a 100644 --- a/src/cm/lsp/serverRegistry.ts +++ b/src/cm/lsp/serverRegistry.ts @@ -299,6 +299,11 @@ function sanitizeDefinition( id, label: definition.label ?? id, enabled: definition.enabled !== false, + priority: + typeof definition.priority === "number" && + Number.isFinite(definition.priority) + ? definition.priority + : 0, languages: sanitizeLanguages(definition.languages), transport: sanitizedTransport, initializationOptions: clone(definition.initializationOptions), @@ -417,10 +422,12 @@ export function getServersForLanguage( const langKey = toKey(languageId); if (!langKey) return []; - return listServers().filter((server) => { - if (!includeDisabled && !server.enabled) return false; - return server.languages.includes(langKey); - }); + return listServers() + .filter((server) => { + if (!includeDisabled && !server.enabled) return false; + return server.languages.includes(langKey); + }) + .sort((left, right) => right.priority - left.priority); } export function onRegistryChange(listener: RegistryEventListener): () => void { diff --git a/src/cm/lsp/tooltipExtensions.ts b/src/cm/lsp/tooltipExtensions.ts index 5e54537bcc..2a9a157ea0 100644 --- a/src/cm/lsp/tooltipExtensions.ts +++ b/src/cm/lsp/tooltipExtensions.ts @@ -5,6 +5,7 @@ import { language as languageFacet, } from "@codemirror/language"; import { languages } from "@codemirror/language-data"; +import type { LSPClient } from "@codemirror/lsp-client"; import { LSPPlugin } from "@codemirror/lsp-client"; import { type Extension, @@ -28,6 +29,7 @@ import { import { highlightCode } from "@lezer/highlight"; import type { HoverParams, + ServerCapabilities, SignatureHelpContext, SignatureHelpParams, } from "vscode-languageserver-protocol"; @@ -43,7 +45,6 @@ interface LspClientInternals { config?: { highlightLanguage?: (language: string) => Language | null | undefined; }; - hasCapability?: (name: string) => boolean; } const SIGNATURE_TRIGGER_DELAY = 120; @@ -55,6 +56,13 @@ const pluginHoverLanguageLoads = new WeakMap< Promise >(); +function clientHasCapability( + client: LSPClient, + name: keyof ServerCapabilities, +): boolean { + return !client.serverCapabilities || !!client.serverCapabilities[name]; +} + function normalizeLanguageName(value: string): string { return String(value ?? "") .trim() @@ -349,8 +357,7 @@ function closeHoverIfNeeded(view: EditorView): void { } function hoverRequest(plugin: LSPPlugin, pos: number) { - const client = plugin.client as typeof plugin.client & LspClientInternals; - if (client.hasCapability?.("hoverProvider") === false) { + if (!clientHasCapability(plugin.client, "hoverProvider")) { return Promise.resolve(null); } @@ -368,22 +375,50 @@ function lspTooltipSource( view: EditorView, pos: number, ): Promise { - const plugin = LSPPlugin.get(view); - if (!plugin) return Promise.resolve(null); + const plugins = LSPPlugin.getAll(view, "hover").filter( + (plugin) => clientHasCapability(plugin.client, "hoverProvider"), + ); + if (!plugins.length) return Promise.resolve(null); + + return Promise.allSettled( + plugins.map((plugin) => hoverRequest(plugin, pos)), + ).then(async (settled) => { + const results: Array<{ plugin: LSPPlugin; result: Hover }> = []; + for (let index = 0; index < settled.length; index++) { + const item = settled[index]; + if (item.status === "fulfilled" && item.value) { + results.push({ plugin: plugins[index], result: item.value }); + } else if (item.status === "rejected") { + console.warn("[LSP:Hover] Provider failed", item.reason); + } + } + if (!results.length) return null; + await Promise.all( + results.map(({ result }) => loadHoverContentLanguages(result.contents)), + ); - return hoverRequest(plugin, pos).then(async (result) => { - if (!result) return null; - await loadHoverContentLanguages(result.contents); + let from = pos; + let to = pos; + for (const { result } of results) { + if (!result.range) continue; + from = Math.min(from, fromPosition(view.state.doc, result.range.start)); + to = Math.max(to, fromPosition(view.state.doc, result.range.end)); + } return { - pos: result.range - ? fromPosition(view.state.doc, result.range.start) - : pos, - end: result.range ? fromPosition(view.state.doc, result.range.end) : pos, + pos: from, + end: to, create() { const dom = document.createElement("div"); dom.className = "cm-lsp-hover-tooltip cm-lsp-documentation"; - dom.innerHTML = renderTooltipContent(plugin, result.contents); + for (let index = 0; index < results.length; index++) { + if (index) dom.appendChild(document.createElement("hr")); + const section = dom.appendChild(document.createElement("div")); + section.innerHTML = renderTooltipContent( + results[index].plugin, + results[index].result.contents, + ); + } return { dom }; }, above: true, @@ -418,8 +453,7 @@ function getSignatureHelp( pos: number, context: SignatureHelpContext, ) { - const client = plugin.client as typeof plugin.client & LspClientInternals; - if (client.hasCapability?.("signatureHelpProvider") === false) { + if (!clientHasCapability(plugin.client, "signatureHelpProvider")) { return Promise.resolve(null); } @@ -461,6 +495,7 @@ class SignatureState { readonly data: LspSignatureHelp, readonly active: number, readonly tooltip: Tooltip, + readonly client: LSPClient, ) {} } @@ -468,17 +503,19 @@ const signatureEffect = StateEffect.define<{ data: LspSignatureHelp; active: number; pos: number; + client: LSPClient; } | null>(); function signatureTooltip( data: LspSignatureHelp, active: number, pos: number, + client: LSPClient, ): Tooltip { return { pos, above: true, - create: (view) => drawSignatureTooltip(view, data, active), + create: (view) => drawSignatureTooltip(view, data, active, client), }; } @@ -497,7 +534,9 @@ const signatureState = StateField.define({ effect.value.data, effect.value.active, effect.value.pos, + effect.value.client, ), + effect.value.client, ); } return null; @@ -505,10 +544,15 @@ const signatureState = StateField.define({ } if (value && tr.docChanged) { - return new SignatureState(value.data, value.active, { - ...value.tooltip, - pos: tr.changes.mapPos(value.tooltip.pos), - }); + return new SignatureState( + value.data, + value.active, + { + ...value.tooltip, + pos: tr.changes.mapPos(value.tooltip.pos), + }, + value.client, + ); } return value; @@ -521,6 +565,7 @@ function drawSignatureTooltip( view: EditorView, data: LspSignatureHelp, active: number, + client: LSPClient, ) { const dom = document.createElement("div"); dom.className = "cm-lsp-signature-tooltip"; @@ -570,7 +615,7 @@ function drawSignatureTooltip( } if (signature.documentation) { - const plugin = LSPPlugin.get(view); + const plugin = LSPPlugin.get(view, client); if (plugin) { const docs = dom.appendChild(document.createElement("div")); docs.className = "cm-lsp-signature-documentation cm-lsp-documentation"; @@ -602,7 +647,10 @@ const signaturePlugin = ViewPlugin.fromClass( } } - const plugin = LSPPlugin.get(update.view); + const plugin = LSPPlugin.getAll(update.view, "signatureHelp").find( + (candidate) => + clientHasCapability(candidate.client, "signatureHelpProvider"), + ); if (!plugin) return; const sigState = update.view.state.field(signatureState); @@ -700,6 +748,7 @@ const signaturePlugin = ViewPlugin.fromClass( data: result, active, pos: same ? current!.tooltip.pos : request.pos, + client: plugin.client, }), }); } else if (view.state.field(signatureState, false)) { @@ -760,7 +809,10 @@ export const showSignatureHelp: Command = (view) => { const field = view.state.field(signatureState); if (!plugin || field === undefined) return false; - const lspPlugin = LSPPlugin.get(view); + const lspPlugin = LSPPlugin.getAll(view, "signatureHelp").find( + (candidate) => + clientHasCapability(candidate.client, "signatureHelpProvider"), + ); if (!lspPlugin) return false; plugin.startRequest(lspPlugin, { @@ -780,6 +832,7 @@ export const nextSignature: Command = (view) => { data: field.data, active: field.active + 1, pos: field.tooltip.pos, + client: field.client, }), }); } @@ -795,6 +848,7 @@ export const prevSignature: Command = (view) => { data: field.data, active: field.active - 1, pos: field.tooltip.pos, + client: field.client, }), }); } @@ -807,7 +861,13 @@ export const signatureKeymap: readonly KeyBinding[] = [ { key: "Mod-Shift-ArrowDown", run: nextSignature }, ]; +const defaultHoverTooltipsExtension: Extension = [ + hoverTooltip(lspTooltipSource, { hideOnChange: true }), + closeHoverOnInteraction, +]; + export function hoverTooltips(config: { hoverTime?: number } = {}): Extension { + if (config.hoverTime == null) return defaultHoverTooltipsExtension; return [ hoverTooltip(lspTooltipSource, { hideOnChange: true, diff --git a/src/cm/lsp/types.ts b/src/cm/lsp/types.ts index 3fa29bdadf..6927624624 100644 --- a/src/cm/lsp/types.ts +++ b/src/cm/lsp/types.ts @@ -282,6 +282,8 @@ export interface LspServerManifest { id?: string; label?: string; enabled?: boolean; + /** Higher-priority servers own single-provider features such as formatting. */ + priority?: number; languages?: string[]; transport?: TransportDescriptor; initializationOptions?: Record; @@ -338,6 +340,7 @@ export interface LspServerDefinition { id: string; label: string; enabled: boolean; + priority: number; languages: string[]; transport: TransportDescriptor; initializationOptions?: Record; @@ -635,6 +638,7 @@ export interface LSPPluginAPI { unsyncedChanges: { mapPos: (pos: number, assoc?: number, mode?: MapMode) => number | null; empty: boolean; + newLength: number; }; /** Clear pending changes */ clear: () => void; diff --git a/src/cm/lsp/workspace.ts b/src/cm/lsp/workspace.ts index 23fd9588bd..e570928f53 100644 --- a/src/cm/lsp/workspace.ts +++ b/src/cm/lsp/workspace.ts @@ -137,7 +137,7 @@ export default class AcodeWorkspace extends Workspace { for (const file of this.files) { const view = file.getView(); if (!view) continue; - const plugin = LSPPlugin.get(view); + const plugin = LSPPlugin.get(view, this.client); if (!plugin) continue; const { unsyncedChanges } = plugin; if (unsyncedChanges.empty) continue; diff --git a/tests/unit/lspMultiClient.test.js b/tests/unit/lspMultiClient.test.js new file mode 100644 index 0000000000..d118a31340 --- /dev/null +++ b/tests/unit/lspMultiClient.test.js @@ -0,0 +1,328 @@ +// @vitest-environment happy-dom + +import {CompletionContext} from "@codemirror/autocomplete"; +import {forEachDiagnostic} from "@codemirror/lint"; +import {Compartment} from "@codemirror/state"; +import {EditorView} from "@codemirror/view"; +import { + LSPClient, + LSPPlugin, + Workspace, + serverCompletionSource, + serverDiagnostics, +} from "@codemirror/lsp-client"; +import { + getLspDiagnostics, + lspDiagnosticsAutoSyncExtension, + lspDiagnosticsClientExtension, + lspDiagnosticsUiExtension, + schedulePullDiagnostics, +} from "cm/lsp/diagnostics"; +import {afterEach, describe, expect, it, vi} from "vitest"; + +const views = []; + +afterEach(() => { + while (views.length) views.pop().destroy(); + document.body.replaceChildren(); + vi.useRealTimers(); + vi.restoreAllMocks(); +}); + +class TestWorkspace extends Workspace { + files = []; + opened = 0; + closed = 0; + + openFile(uri, languageId, view) { + this.opened++; + this.files.push({ + uri, + languageId, + version: 0, + doc: view.state.doc, + getView: () => view, + }); + } + + closeFile(uri, view) { + const index = this.files.findIndex( + (file) => file.uri === uri && file.getView() === view, + ); + if (index >= 0) { + this.closed++; + this.files.splice(index, 1); + } + } + + syncFiles() { + const updates = []; + for (const file of this.files) { + const view = file.getView(); + const plugin = LSPPlugin.get(view, this.client); + if (!plugin) continue; + const changes = plugin.unsyncedChanges; + if (changes.empty) continue; + const prevDoc = file.doc; + file.doc = changes.apply(prevDoc); + file.version++; + plugin.clear(); + updates.push({file, prevDoc, changes}); + } + return updates; + } +} + +function client() { + return new LSPClient({workspace: (lspClient) => new TestWorkspace(lspClient)}); +} + +function editor(doc, extensions) { + const view = new EditorView({ + doc, + extensions, + parent: document.body, + }); + views.push(view); + return view; +} + +describe("multiple LSP clients on one editor", () => { + it("tracks one change stream with an independent sync checkpoint per client", () => { + const primary = client(); + const supplemental = client(); + const bindings = new Compartment(); + const uri = "file:///workspace/example.ts"; + const primaryBinding = primary.plugin(uri, "typescript", {priority: 100}); + const supplementalBinding = supplemental.plugin(uri, "typescript", { + priority: 20, + features: {formatting: false, rename: false}, + }); + const view = editor( + "const value = 1", + bindings.of([supplementalBinding, primaryBinding]), + ); + + expect(LSPPlugin.getAll(view).map((plugin) => plugin.client)).toEqual([ + primary, + supplemental, + ]); + expect(LSPPlugin.getForFeature(view, "formatting")?.client).toBe(primary); + expect(LSPPlugin.get(view, supplemental)?.client).toBe(supplemental); + + view.dispatch({changes: {from: view.state.doc.length, insert: ";"}}); + const firstText = view.state.doc.toString(); + expect(LSPPlugin.get(view, primary).unsyncedChanges.apply( + primary.workspace.files[0].doc, + ).toString()).toBe(firstText); + expect(LSPPlugin.get(view, supplemental).unsyncedChanges.apply( + supplemental.workspace.files[0].doc, + ).toString()).toBe(firstText); + + expect(primary.workspace.syncFiles()).toHaveLength(1); + expect(LSPPlugin.get(view, primary).unsyncedChanges.empty).toBe(true); + expect(LSPPlugin.get(view, supplemental).unsyncedChanges.empty).toBe(false); + + view.dispatch({changes: {from: 0, insert: "export "}}); + expect(LSPPlugin.get(view, supplemental).unsyncedChanges.apply( + supplemental.workspace.files[0].doc, + ).toString()).toBe(view.state.doc.toString()); + expect(supplemental.workspace.syncFiles()).toHaveLength(1); + expect(LSPPlugin.get(view, supplemental).unsyncedChanges.empty).toBe(true); + + view.dispatch({ + effects: bindings.reconfigure(primaryBinding), + }); + expect(LSPPlugin.getAll(view)).toHaveLength(1); + expect(supplemental.workspace.closed).toBe(1); + expect(primary.workspace.closed).toBe(0); + + view.destroy(); + views.pop(); + expect(primary.workspace.closed).toBe(1); + }); + + it("merges completion providers by priority and isolates failures", async () => { + const warn = vi.spyOn(console, "warn").mockImplementation(() => {}); + const primary = client(); + const supplemental = client(); + const failing = client(); + primary.serverCapabilities = {completionProvider: {}}; + supplemental.serverCapabilities = {completionProvider: {}}; + failing.serverCapabilities = {completionProvider: {}}; + primary.sync = vi.fn(); + supplemental.sync = vi.fn(); + failing.sync = vi.fn(); + primary.request = vi.fn().mockResolvedValue([ + {label: "typescriptItem", detail: "TypeScript"}, + {label: "sharedItem"}, + ]); + supplemental.request = vi.fn().mockResolvedValue([ + {label: "tailwindItem", detail: "Tailwind CSS"}, + {label: "sharedItem"}, + ]); + failing.request = vi.fn().mockRejectedValue(new Error("server unavailable")); + + const view = editor("di", [ + primary.plugin("file:///workspace/example.tsx", "typescriptreact", { + priority: 100, + }), + supplemental.plugin("file:///workspace/example.tsx", "typescriptreact", { + priority: 50, + }), + failing.plugin("file:///workspace/example.tsx", "typescriptreact", { + priority: 10, + }), + ]); + const context = new CompletionContext( + view.state, + view.state.doc.length, + true, + view, + ); + + const result = await serverCompletionSource(context); + expect(result.options.map((option) => option.label)).toEqual([ + "typescriptItem", + "sharedItem", + "tailwindItem", + ]); + expect(primary.request).toHaveBeenCalledOnce(); + expect(supplemental.request).toHaveBeenCalledOnce(); + expect(failing.request).toHaveBeenCalledOnce(); + expect(warn).toHaveBeenCalledWith( + "[lsp] Completion provider failed", + expect.objectContaining({message: "server unavailable"}), + ); + }); + + it("does not query a client when completion is disabled for its binding", async () => { + const primary = client(); + const diagnosticsOnly = client(); + primary.serverCapabilities = {completionProvider: {}}; + diagnosticsOnly.serverCapabilities = {completionProvider: {}}; + primary.sync = vi.fn(); + diagnosticsOnly.sync = vi.fn(); + primary.request = vi.fn().mockResolvedValue([{label: "primaryItem"}]); + diagnosticsOnly.request = vi.fn().mockResolvedValue([{label: "wrongItem"}]); + const view = editor("x", [ + primary.plugin("file:///workspace/example.ts", "typescript"), + diagnosticsOnly.plugin("file:///workspace/example.ts", "typescript", { + features: {completion: false}, + }), + ]); + + const result = await serverCompletionSource( + new CompletionContext(view.state, 1, true, view), + ); + expect(result.options.map((option) => option.label)).toEqual(["primaryItem"]); + expect(diagnosticsOnly.request).not.toHaveBeenCalled(); + }); + + it("keeps diagnostics from each server when another server publishes", () => { + const primary = client(); + const supplemental = client(); + const diagnosticsExtension = serverDiagnostics(); + const view = editor("const x = 1", [ + primary.plugin("file:///workspace/example.ts", "typescript"), + supplemental.plugin("file:///workspace/example.ts", "typescript"), + diagnosticsExtension.editorExtension, + ]); + const publish = + diagnosticsExtension.notificationHandlers[ + "textDocument/publishDiagnostics" + ]; + const diagnostic = (message, character) => ({ + message, + severity: 2, + range: { + start: {line: 0, character}, + end: {line: 0, character: character + 1}, + }, + }); + + publish(primary, { + uri: "file:///workspace/example.ts", + version: 0, + diagnostics: [diagnostic("TypeScript", 6)], + }); + publish(supplemental, { + uri: "file:///workspace/example.ts", + version: 0, + diagnostics: [diagnostic("Tailwind CSS", 8)], + }); + const messages = []; + forEachDiagnostic(view.state, (item) => messages.push(item.message)); + expect(messages).toEqual(["TypeScript", "Tailwind CSS"]); + + publish(primary, { + uri: "file:///workspace/example.ts", + version: 0, + diagnostics: [], + }); + const remaining = []; + forEachDiagnostic(view.state, (item) => remaining.push(item.message)); + expect(remaining).toEqual(["Tailwind CSS"]); + }); + + it("does not synchronize a server whose diagnostics feature is disabled", async () => { + vi.useFakeTimers(); + const enabled = client(); + const disabled = client(); + enabled.sync = vi.fn(); + disabled.sync = vi.fn(); + const uri = "file:///workspace/example.ts"; + const view = editor("const x = 1", [ + enabled.plugin(uri, "typescript"), + disabled.plugin(uri, "typescript", { + features: {diagnostics: false}, + }), + lspDiagnosticsAutoSyncExtension(), + ]); + + await vi.advanceTimersByTimeAsync(0); + expect(enabled.sync).toHaveBeenCalledOnce(); + expect(disabled.sync).not.toHaveBeenCalled(); + + view.dispatch({changes: {from: view.state.doc.length, insert: ";"}}); + await vi.advanceTimersByTimeAsync(500); + expect(enabled.sync).toHaveBeenCalledTimes(2); + expect(disabled.sync).not.toHaveBeenCalled(); + }); + + it("rejects pull and push diagnostics from a disabled provider", () => { + const disabled = client(); + disabled.serverCapabilities = {diagnosticProvider: {}}; + disabled.request = vi.fn(); + const uri = "file:///workspace/example.ts"; + const view = editor("const x = 1", [ + disabled.plugin(uri, "typescript", { + features: {diagnostics: false}, + }), + lspDiagnosticsUiExtension(false), + ]); + + schedulePullDiagnostics(disabled, uri, 0); + expect(disabled.request).not.toHaveBeenCalled(); + + const publish = + lspDiagnosticsClientExtension().notificationHandlers[ + "textDocument/publishDiagnostics" + ]; + publish(disabled, { + uri, + version: 0, + diagnostics: [ + { + message: "must stay hidden", + severity: 2, + range: { + start: {line: 0, character: 6}, + end: {line: 0, character: 7}, + }, + }, + ], + }); + expect(getLspDiagnostics(view.state)).toEqual([]); + }); +}); From 93ca9bb8b97247235fe3d2572144497fdfd6e0f2 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Wed, 5 Aug 2026 23:54:14 +0530 Subject: [PATCH 039/195] chore: v1.12.8 --- CHANGELOG.md | 8 ++++++++ config.xml | 2 +- package-lock.json | 4 ++-- package.json | 6 ++---- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1980ebb9c..839eaa92ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## v1.12.8 + +* fix(terminal): close tab on process end and speed up long-press select by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2587 +* fix(editor): prevent false language mode recommendations by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2621 +* fix(lsp): send workspace folders during initialization by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2623 +* fix(admob): harden consent, banners, and variant builds by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/2553 +* feat(lsp): add multi-server support to CodeMirror LSP client by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2627 + ## v1.12.7 * fix: scroll shift when tab switching by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2329 diff --git a/config.xml b/config.xml index 6c6ea35070..51ae513145 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - diff --git a/package-lock.json b/package-lock.json index 7d61a6c9f8..795065ad45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "com.foxdebug.acode", - "version": "1.12.7", + "version": "1.12.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "com.foxdebug.acode", - "version": "1.12.7", + "version": "1.12.8", "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.20.3", diff --git a/package.json b/package.json index 04e258c206..4932a15f2f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.foxdebug.acode", "displayName": "Acode", - "version": "1.12.7", + "version": "1.12.8", "description": "Acode is a code editor for android", "scripts": { "lang": "node ./utils/lang.js", @@ -31,9 +31,7 @@ "plugins": { "cordova-clipboard": {}, "cordova-plugin-device": {}, - "cordova-plugin-file": { - "ANDROIDX_WEBKIT_VERSION": "1.4.0" - }, + "cordova-plugin-file": {}, "cordova-plugin-server": {}, "cordova-plugin-ftp": {}, "cordova-plugin-sdcard": {}, From f41064fda39ec15f23731b7ec9cb9b1b26d2d4a6 Mon Sep 17 00:00:00 2001 From: claycuy <155298405+claycuy@users.noreply.github.com> Date: Fri, 7 Aug 2026 09:56:31 +0800 Subject: [PATCH 040/195] i18n(id): Update new string translations (#2682) * i18n(id): Update new string translations * refactor: Remove bulk.json --- src/lang/id-id.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lang/id-id.json b/src/lang/id-id.json index e84a2db5db..4f2baf5c81 100644 --- a/src/lang/id-id.json +++ b/src/lang/id-id.json @@ -830,10 +830,10 @@ "command": "Perintah", "managed": "Dikelola", "acode service": "Layanan Acode", - "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", - "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "info-terminal-show-scrollbar": "Tampilkan bilah gulir xterm di samping terminal.", + "terminal:show scrollbar": "Tampilkan Bilah Gulir", + "apply exclusions when copying": "Terapkan pengecualian saat menyalin", + "settings-info-app-use-file-operation-exclusions": "Lewati file dan folder yang cocok dengan pola pengecualian selama operasi salin dan tempel.", + "horizontal scroll margin": "Margin gulir horizontal", + "settings-info-horizontal-scroll-margin": "Menambahkan ruang kosong setelah baris terpanjang saat pembungkusan kata (word wrap) nonaktif. Masukkan nilai piksel utuh non-negatif apa pun." } From 341c027384fa0f80c6dd706e6f1ecfc28d0827aa Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Fri, 7 Aug 2026 17:53:06 +0530 Subject: [PATCH 041/195] fix: admob (#2684) Co-authored-by: Ajit Kumar --- CHANGELOG.md | 4 ++ config.xml | 2 +- package-lock.json | 4 +- package.json | 2 +- src/lib/actionStack.js | 3 - tests/unit/actionStack.test.js | 126 +++++++++++++++++++++++++++++++++ 6 files changed, 134 insertions(+), 7 deletions(-) create mode 100644 tests/unit/actionStack.test.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 839eaa92ff..60ee76afad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## v1.12.9 + +* fix(admob): remove the policy-prohibited interstitial shown while exiting the app + ## v1.12.8 * fix(terminal): close tab on process end and speed up long-press select by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2587 diff --git a/config.xml b/config.xml index 51ae513145..1667557e80 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - diff --git a/package-lock.json b/package-lock.json index 795065ad45..2facaba1c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "com.foxdebug.acode", - "version": "1.12.8", + "version": "1.12.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "com.foxdebug.acode", - "version": "1.12.8", + "version": "1.12.9", "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.20.3", diff --git a/package.json b/package.json index 4932a15f2f..30297fa42a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.foxdebug.acode", "displayName": "Acode", - "version": "1.12.8", + "version": "1.12.9", "description": "Acode is a code editor for android", "scripts": { "lang": "node ./utils/lang.js", diff --git a/src/lib/actionStack.js b/src/lib/actionStack.js index 9158980562..2f2215ba65 100644 --- a/src/lib/actionStack.js +++ b/src/lib/actionStack.js @@ -1,6 +1,5 @@ import confirm from "dialogs/confirm"; import appSettings from "lib/settings"; -import helpers from "utils/helpers"; const stack = []; let mark = null; @@ -94,8 +93,6 @@ export default { } } - helpers.showInterstitialIfReady(); - exitApp(); } }, diff --git a/tests/unit/actionStack.test.js b/tests/unit/actionStack.test.js new file mode 100644 index 0000000000..7bfe827c03 --- /dev/null +++ b/tests/unit/actionStack.test.js @@ -0,0 +1,126 @@ +import { afterAll, beforeEach, describe, expect, it, vi } from "vitest"; + +const mocks = vi.hoisted(() => ({ + confirm: vi.fn(), + exitApp: vi.fn(), + settings: { + value: { + confirmOnExit: false, + }, + }, + showInterstitialIfReady: vi.fn(), +})); + +vi.mock("dialogs/confirm", () => ({ + default: mocks.confirm, +})); + +vi.mock("lib/settings", () => ({ + default: mocks.settings, +})); + +// Keep this mock as a policy regression guard. If the exit flow starts importing +// the ad helper again, the assertions below will catch the prohibited placement. +vi.mock("utils/helpers", () => ({ + default: { + showInterstitialIfReady: mocks.showInterstitialIfReady, + }, +})); + +import actionStack from "lib/actionStack"; + +const originalNavigatorDescriptor = Object.getOwnPropertyDescriptor( + globalThis, + "navigator", +); +const originalAcode = globalThis.acode; +const originalStrings = globalThis.strings; + +function setNavigator() { + Object.defineProperty(globalThis, "navigator", { + configurable: true, + value: { + app: { + exitApp: mocks.exitApp, + }, + }, + }); +} + +describe("actionStack app exit", () => { + beforeEach(() => { + vi.clearAllMocks(); + mocks.settings.value.confirmOnExit = false; + actionStack.onCloseApp = undefined; + actionStack.unfreeze(); + globalThis.acode = { exitAppMessage: "Close Acode?" }; + globalThis.strings = { warning: "Warning" }; + setNavigator(); + }); + + afterAll(() => { + actionStack.onCloseApp = undefined; + globalThis.acode = originalAcode; + globalThis.strings = originalStrings; + + if (originalNavigatorDescriptor) { + Object.defineProperty( + globalThis, + "navigator", + originalNavigatorDescriptor, + ); + } else { + Reflect.deleteProperty(globalThis, "navigator"); + } + }); + + it("exits without showing an interstitial after confirmation", async () => { + mocks.settings.value.confirmOnExit = true; + mocks.confirm.mockResolvedValue(true); + + await actionStack.pop(); + + expect(mocks.confirm).toHaveBeenCalledWith("WARNING", "Close Acode?"); + expect(mocks.showInterstitialIfReady).not.toHaveBeenCalled(); + expect(mocks.exitApp).toHaveBeenCalledOnce(); + }); + + it("does not show an interstitial or exit when confirmation is cancelled", async () => { + mocks.settings.value.confirmOnExit = true; + mocks.confirm.mockResolvedValue(false); + + await actionStack.pop(); + + expect(mocks.showInterstitialIfReady).not.toHaveBeenCalled(); + expect(mocks.exitApp).not.toHaveBeenCalled(); + }); + + it("runs a synchronous close callback before exiting", async () => { + const onClose = vi.fn(); + actionStack.onCloseApp = onClose; + + await actionStack.pop(); + + expect(onClose).toHaveBeenCalledOnce(); + expect(mocks.showInterstitialIfReady).not.toHaveBeenCalled(); + expect(mocks.exitApp).toHaveBeenCalledOnce(); + }); + + it("waits for an asynchronous close callback before exiting", async () => { + let finishClose; + const closeComplete = new Promise((resolve) => { + finishClose = resolve; + }); + actionStack.onCloseApp = vi.fn(() => closeComplete); + + await actionStack.pop(); + + expect(mocks.exitApp).not.toHaveBeenCalled(); + finishClose(); + await closeComplete; + await Promise.resolve(); + + expect(mocks.showInterstitialIfReady).not.toHaveBeenCalled(); + expect(mocks.exitApp).toHaveBeenCalledOnce(); + }); +}); From b07c857903dde26bf591014b589ba1437f29e924 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Sat, 8 Aug 2026 16:28:19 +0530 Subject: [PATCH 042/195] CI: run `npm run test` on pull requests in existing workflow (#2697) * Initial plan * Add PR-only unit test job to CI workflow Co-authored-by: UnschooledGamer <76094069+UnschooledGamer@users.noreply.github.com> * Set read-only token permissions for unit test job Co-authored-by: UnschooledGamer <76094069+UnschooledGamer@users.noreply.github.com> * Update CI workflow to trigger on main branch only Restrict CI workflow to run on pushes to the main branch. * Update ci.yml --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: UnschooledGamer <76094069+UnschooledGamer@users.noreply.github.com> --- .github/workflows/ci.yml | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 96efd139dd..27c08194ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,11 @@ name: CI on: push: + branches: + - main pull_request: + branches: + - '**' merge_group: jobs: @@ -13,7 +17,7 @@ jobs: steps: - name: Checkout Actions Repository - uses: actions/checkout@v7 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Check spelling uses: crate-ci/typos@master @@ -27,14 +31,37 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v7 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Setup Biome - uses: biomejs/setup-biome@v2 + uses: biomejs/setup-biome@4c91541eaada48f67d7dbd7833600ce162b68f51 # v2.7.1 - name: Run Biome run: biome ci . + unit-tests: + name: Unit Tests (On PR Only) + timeout-minutes: 10 + runs-on: ubuntu-latest + permissions: + contents: read + if: github.event_name == 'pull_request' + steps: + - name: Checkout Repository + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + + - name: Use Node.js + uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 + with: + cache: npm + cache-dependency-path: '**/package-lock.json' + + - name: Install dependencies + run: npm ci --no-audit --no-fund + + - name: Run unit tests + run: npm run test + translation-check: name: Translation Check (On PR Only) timeout-minutes: 5 @@ -45,9 +72,9 @@ jobs: if: github.event_name == 'pull_request' steps: - name: Checkout Repository - uses: actions/checkout@v7 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Use Node.js - uses: actions/setup-node@v7 + uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: cache: npm cache-dependency-path: '**/package-lock.json' From 880d81f30d6a5f952045a6361f96c04d29e776d0 Mon Sep 17 00:00:00 2001 From: summoner Date: Sun, 9 Aug 2026 11:40:56 +0200 Subject: [PATCH 043/195] Translation: Update hu-hu.json (#2572) * Transltion: Update hu-hu.json Translate new strings * Fix deleted comma * Update src/lang/hu-hu.json Fixing incorrect capitalization. Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --------- Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --- src/lang/hu-hu.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index 2a4d4ae4c4..769ce29a00 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -834,6 +834,6 @@ "terminal:show scrollbar": "Görgetősáv megjelenítése", "apply exclusions when copying": "Kizárások használata másoláskor", "settings-info-app-use-file-operation-exclusions": "A kizárási mintáknak megfelelő fájlok és mappák kihagyása másoláskor és beillesztéskor.", - "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "horizontal scroll margin": "Vízszintes görgetési margó", + "settings-info-horizontal-scroll-margin": "A leghosszabb sor után egy üres hely lesz hozzáadva a képernyő széléhez, ha a sorok tördelése ki van kapcsolva. Adjon meg egy nem negatív egész pixelértéket." } From 3ee26092bc577f380332790f6de7ed67ba481945 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 9 Aug 2026 16:25:07 +0530 Subject: [PATCH 044/195] fix(sdcard): prevent crash when listing non-tree SAF URIs (#2708) --- src/plugins/sdcard/src/android/SDcard.java | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/plugins/sdcard/src/android/SDcard.java b/src/plugins/sdcard/src/android/SDcard.java index 19482901a1..1b33e7edef 100644 --- a/src/plugins/sdcard/src/android/SDcard.java +++ b/src/plugins/sdcard/src/android/SDcard.java @@ -940,23 +940,28 @@ private void listDir(String src, String parentId, CallbackContext callback) { .execute( new Runnable() { public void run() { - Uri srcUri = Uri.parse(src); ContentResolver contentResolver = context.getContentResolver(); String parentDocId = parentId; - - if (parentDocId == null) { - parentDocId = DocumentsContract.getTreeDocumentId(srcUri); - } - - Uri childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree( - srcUri, - parentDocId - ); - JSONArray result = new JSONArray(); Cursor cursor = null; try { + Uri srcUri = Uri.parse(src); + + if (parentDocId == null) { + if (!DocumentsContract.isTreeUri(srcUri)) { + Log.w("sdCard", "Cannot list non-tree URI: " + src); + callback.error("Cannot read directory."); + return; + } + parentDocId = DocumentsContract.getTreeDocumentId(srcUri); + } + + Uri childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree( + srcUri, + parentDocId + ); + cursor = contentResolver.query( childrenUri, new String[] { From 0c6676e395381932a614a6cfcd14fc76c679224b Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Tue, 11 Aug 2026 17:36:03 +0530 Subject: [PATCH 045/195] fix(editor): preserve active files position after restart (#2721) --- src/lib/editorManager.js | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js index a3be985c60..67d800bbb7 100644 --- a/src/lib/editorManager.js +++ b/src/lib/editorManager.js @@ -247,6 +247,7 @@ async function EditorManager($header, $body) { const primaryPane = createPaneShell($container); paneLayoutRoot = createPaneNode(primaryPane); $paneRoot.append(paneLayoutRoot.element); + applyOpenFileListLayout(); const problemButton = SideButton({ text: strings.problems, icon: "warningreport_problem", @@ -3941,8 +3942,8 @@ async function EditorManager($header, $body) { } function syncOpenFileList() { + applyOpenFileListLayout(); if (isPaneTabLayout()) { - $paneRoot.classList.remove("hide-pane-tabs"); panes.forEach((pane) => { const preserveCurrentTabOrder = !!pane.tabList.querySelector( '[data-editor-tab-dragging="true"]', @@ -3958,7 +3959,6 @@ async function EditorManager($header, $body) { return; } - $paneRoot.classList.add("hide-pane-tabs"); if (!$openFileList || $openFileList === $globalOpenFileList) { initFileTabContainer(); } @@ -4180,6 +4180,26 @@ async function EditorManager($header, $body) { ); } + function applyOpenFileListLayout( + openFileListPos = appSettings.value.openFileListPos, + ) { + const showPaneTabs = + openFileListPos === appSettings.OPEN_FILE_LIST_POS_HEADER || + openFileListPos === appSettings.OPEN_FILE_LIST_POS_BOTTOM; + + $paneRoot.classList.toggle("hide-pane-tabs", !showPaneTabs); + if (openFileListPos === appSettings.OPEN_FILE_LIST_POS_BOTTOM) { + $paneRoot.dataset.tabsPosition = "bottom"; + } else if (openFileListPos === appSettings.OPEN_FILE_LIST_POS_HEADER) { + // Header mode is rendered as the pane's top tab bar. + $paneRoot.dataset.tabsPosition = "top"; + } else { + // Sidebar mode has no pane tab placement. + delete $paneRoot.dataset.tabsPosition; + } + root.setAttribute("open-file-list-pos", openFileListPos); + } + /** * Sets up the editor with various configurations and event listeners. * @returns {Promise} A promise that resolves once the editor is set up. @@ -4977,10 +4997,6 @@ async function EditorManager($header, $body) { const { openFileListPos } = appSettings.value; if (isPaneTabLayout()) { $openFileList = $globalOpenFileList; - $paneRoot.dataset.tabsPosition = - openFileListPos === appSettings.OPEN_FILE_LIST_POS_BOTTOM - ? "bottom" - : "top"; root.classList.remove("top-bar"); syncOpenFileList(); } else { @@ -5000,7 +5016,6 @@ async function EditorManager($header, $body) { syncOpenFileList(); } - root.setAttribute("open-file-list-pos", openFileListPos); manager.emit("int-open-file-list", openFileListPos); } From 498835fda19dffb2265ea765745369b676f363f6 Mon Sep 17 00:00:00 2001 From: simyo <8723725+simyo@users.noreply.github.com> Date: Thu, 13 Aug 2026 03:42:21 +0000 Subject: [PATCH 046/195] fix(terminal): stop Ctrl+Shift+V pasting twice (#2728) xterm.js calls attachCustomKeyEventHandler on both keydown and keyup, but the handler didn't check event.type, so paste/copy/font-zoom ran twice per keypress. Gate the side-effecting calls to keydown only. Co-authored-by: simyo --- src/components/terminal/terminal.js | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/components/terminal/terminal.js b/src/components/terminal/terminal.js index 6b7504140d..ca77d45814 100644 --- a/src/components/terminal/terminal.js +++ b/src/components/terminal/terminal.js @@ -439,17 +439,22 @@ export default class TerminalComponent { setupCopyPasteHandlers() { // Add keyboard event listener to terminal element this.terminal.attachCustomKeyEventHandler((event) => { + // xterm.js invokes this handler for both "keydown" and "keyup", so + // any side-effecting action must only run once, on keydown, or it + // fires twice per keypress (e.g. paste happening twice). + const isKeyDown = event.type === "keydown"; + // Check for Ctrl+Shift+C (copy) if (event.ctrlKey && event.shiftKey && event.key === "C") { event.preventDefault(); - this.copySelection(); + if (isKeyDown) this.copySelection(); return false; } // Check for Ctrl+Shift+V (paste) if (event.ctrlKey && event.shiftKey && event.key === "V") { event.preventDefault(); - this.pasteFromClipboard(); + if (isKeyDown) this.pasteFromClipboard(); return false; } @@ -462,7 +467,7 @@ export default class TerminalComponent { (event.key === "+" || event.key === "=") ) { event.preventDefault(); - this.increaseFontSize(); + if (isKeyDown) this.increaseFontSize(); return false; } @@ -474,7 +479,7 @@ export default class TerminalComponent { event.key === "-" ) { event.preventDefault(); - this.decreaseFontSize(); + if (isKeyDown) this.decreaseFontSize(); return false; } @@ -494,8 +499,13 @@ export default class TerminalComponent { binding.key === eventKey, ); - if (binding && executeCommand(binding.name)) { - return false; + if (binding) { + if (isKeyDown) { + this._lastAppKeybindingHandled = executeCommand(binding.name); + } + if (this._lastAppKeybindingHandled) { + return false; + } } } From 1f24aae484c56b246527bde5cf86080140b118c6 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Fri, 14 Aug 2026 04:10:19 +0000 Subject: [PATCH 047/195] fix: editor horizontal scrollbar regression (#2733) --- src/cm/scrollPastEnd.ts | 8 ++++++-- src/lib/editorManager.js | 18 ++++++++++++++++-- tests/unit/scrollPastEnd.test.js | 11 ++++++++--- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/cm/scrollPastEnd.ts b/src/cm/scrollPastEnd.ts index 65b8b7819a..63c9dc4426 100644 --- a/src/cm/scrollPastEnd.ts +++ b/src/cm/scrollPastEnd.ts @@ -14,8 +14,12 @@ export function horizontalScrollPastEnd(distance: number): Extension { if (width === 0) return []; return EditorView.theme({ - ".cm-content:not(.cm-lineWrapping)": { - paddingRight: `${width}px`, + ".cm-content:not(.cm-lineWrapping) .cm-line": { + boxSizing: "border-box", + minWidth: "100%", + // Preserve CodeMirror's default 2px line-end padding. + paddingRight: `${width + 2}px`, + width: "fit-content", }, }); } diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js index 67d800bbb7..b58231e0ea 100644 --- a/src/lib/editorManager.js +++ b/src/lib/editorManager.js @@ -4221,9 +4221,14 @@ async function EditorManager($header, $body) { function syncScrollUi() { if (pane !== activePane) return; scrollSyncRaf = 0; + if (pane.activeFile?.type !== "editor") { + $hScrollbar.hideImmediately(); + $vScrollbar.hideImmediately(); + return; + } editor.requestMeasure({ read: () => readScrollMetrics(), - write: updateScrollbarsFromMetrics, + write: (metrics) => updateScrollbarsFromMetrics(metrics, pane), }); } @@ -4565,8 +4570,15 @@ async function EditorManager($header, $body) { }; } - function updateScrollbarsFromMetrics(metrics) { + function updateScrollbarsFromMetrics(metrics, sourcePane) { if (!metrics) return; + if (sourcePane !== activePane || sourcePane.activeFile?.type !== "editor") { + if (sourcePane === activePane) { + $hScrollbar.hideImmediately(); + $vScrollbar.hideImmediately(); + } + return; + } const maxScrollTop = Math.max( metrics.scrollHeight - metrics.clientHeight, @@ -4886,6 +4898,8 @@ async function EditorManager($header, $body) { } else { pane.touchSelectionController?.setEnabled(false); pane.editorContainer.style.display = "none"; + $hScrollbar.hideImmediately(); + $vScrollbar.hideImmediately(); if (file.content) { file.content.style.display = "block"; if (file.content.parentElement !== pane.content) { diff --git a/tests/unit/scrollPastEnd.test.js b/tests/unit/scrollPastEnd.test.js index 9fd708ba6c..11edc5fdb3 100644 --- a/tests/unit/scrollPastEnd.test.js +++ b/tests/unit/scrollPastEnd.test.js @@ -11,15 +11,20 @@ describe("horizontal scroll past end", () => { it("adds right-side space only to unwrapped editor content", () => { const rules = themeRules(horizontalScrollPastEnd(50)); - expect(rules).toContain(".cm-content:not(.cm-lineWrapping)"); - expect(rules).toContain("padding-right: 50px"); + expect(rules).toContain( + ".cm-content:not(.cm-lineWrapping) .cm-line", + ); + expect(rules).toContain("box-sizing: border-box"); + expect(rules).toContain("min-width: 100%"); + expect(rules).toContain("padding-right: 52px"); + expect(rules).toContain("width: fit-content"); }); it("normalizes invalid distances without adding a theme", () => { expect(horizontalScrollPastEnd(0)).toEqual([]); expect(horizontalScrollPastEnd(Number.NaN)).toEqual([]); expect(themeRules(horizontalScrollPastEnd(12.6))).toContain( - "padding-right: 13px", + "padding-right: 15px", ); }); }); From bd4a7880d62663f765d0aa1a89dedf3e6e29639b Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Fri, 14 Aug 2026 08:18:58 +0000 Subject: [PATCH 048/195] fix: sidebar tree ui (#2739) Co-authored-by: Ajit Kumar --- src/sidebarApps/files/style.scss | 7 ++++ tests/unit/fileSidebarStyles.test.js | 58 ++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 tests/unit/fileSidebarStyles.test.js diff --git a/src/sidebarApps/files/style.scss b/src/sidebarApps/files/style.scss index 906d1d6470..4b3a8b7faa 100644 --- a/src/sidebarApps/files/style.scss +++ b/src/sidebarApps/files/style.scss @@ -64,6 +64,13 @@ } } + > .list > .tile[data-type="root"] > .text { + min-width: 0; + width: auto !important; + overflow: hidden !important; + text-overflow: ellipsis !important; + } + /* Add indent guides for folders (excluding first level) */ .list.collapsible > ul > .collapsible > ul { position: relative; diff --git a/tests/unit/fileSidebarStyles.test.js b/tests/unit/fileSidebarStyles.test.js new file mode 100644 index 0000000000..3f0f39046a --- /dev/null +++ b/tests/unit/fileSidebarStyles.test.js @@ -0,0 +1,58 @@ +import { fileURLToPath } from "node:url"; +import { Window } from "happy-dom"; +import * as sass from "sass"; +import { describe, expect, it } from "vitest"; + +const stylesheetPath = fileURLToPath( + new URL("../../src/sidebarApps/files/style.scss", import.meta.url), +); + +function renderFileTreeStyles() { + const window = new Window(); + const { document } = window; + const style = document.createElement("style"); + + style.textContent = sass.compile(stylesheetPath).css; + document.head.append(style); + document.body.innerHTML = ` +
    +
    +
    + + A-VERY-LONG-ROOT-FOLDER-NAME + +
    +
      +
    • + + A-VERY-LONG-NESTED-FILE-NAME.js + +
    • +
    +
    +
    + `; + + return { document, window }; +} + +describe("file sidebar label overflow", () => { + it("truncates root folder names without changing nested row scrolling", () => { + const { document, window } = renderFileTreeStyles(); + const rootStyles = window.getComputedStyle( + document.getElementById("root-folder-name"), + ); + const nestedStyles = window.getComputedStyle( + document.getElementById("nested-file-name"), + ); + + expect(rootStyles.minWidth).toBe("0"); + expect(rootStyles.width).toBe("auto"); + expect(rootStyles.overflow).toBe("hidden"); + expect(rootStyles.textOverflow).toBe("ellipsis"); + + expect(nestedStyles.width).toBe("max-content"); + expect(nestedStyles.overflow).toBe("visible"); + expect(nestedStyles.textOverflow).toBe("clip"); + }); +}); From baa6f8ed4e662ed574c902544a8ec7c98bb8eab2 Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Fri, 14 Aug 2026 14:03:00 +0000 Subject: [PATCH 049/195] fix: issue #2738 (#2743) * fix: issue 2738, show cancel button instantly when loading files for remote files. * fix: syntax issue, preview loading delay feedback --------- Co-authored-by: Ajit Kumar --- src/lib/editorFile.js | 52 +++++++++++++++++++-- src/lib/editorManager.js | 17 ++++++- src/pages/fileBrowser/fileBrowser.js | 7 ++- src/styles/codemirror.scss | 6 +++ src/utils/remoteFilePreview.js | 38 +++++++++++++++ tests/unit/remoteFilePreview.test.js | 70 ++++++++++++++++++++++++++++ 6 files changed, 183 insertions(+), 7 deletions(-) create mode 100644 src/utils/remoteFilePreview.js create mode 100644 tests/unit/remoteFilePreview.test.js diff --git a/src/lib/editorFile.js b/src/lib/editorFile.js index b151fda805..4649e3f046 100644 --- a/src/lib/editorFile.js +++ b/src/lib/editorFile.js @@ -21,6 +21,7 @@ import tag from "html-tag-js"; import mimeTypes from "mime-types"; import helpers from "utils/helpers"; import Path from "utils/Path"; +import { readRemoteFilePreview } from "utils/remoteFilePreview"; import Url from "utils/Url"; import config from "./config"; import { isInitialPluginLoadComplete } from "./loadPlugins"; @@ -1762,6 +1763,8 @@ export default class EditorFile { async #loadText() { if (this.#type !== "editor") return; let value = ""; + const protocol = this.uri ? Url.getProtocol(this.uri) : ""; + const isRemoteFile = protocol === "ftp:" || protocol === "sftp:"; const { cursorPos, scrollLeft, scrollTop, folds, editable } = this.#loadOptions; @@ -1774,20 +1777,49 @@ export default class EditorFile { } this.loading = true; this.markChanged = false; + if (isRemoteFile) this.#setRemoteLoading(true); this.#emit("loadstart", createFileEvent(this)); try { const cacheFs = fsOperation(this.cacheFile); - const cacheExists = await cacheFs.exists(); + let file = null; + let cacheExists; let loadedMtime = this.savedMtime; let savedDoc = null; - if (cacheExists) { - value = await cacheFs.readFile(this.encoding); + if (isRemoteFile) { + file = fsOperation(this.uri); + let transportCache = null; + try { + const localName = file?.localName; + if (localName) { + transportCache = fsOperation(localName); + } + } catch (_error) { + // Transport cache access is optional; continue with the remote load. + } + + const preview = await readRemoteFilePreview({ + editorCache: cacheFs, + transportCache, + encoding: this.encoding, + }); + cacheExists = preview.editorCacheExists; + if (cacheExists) value = preview.text; + + if (preview.text !== null) { + this.session = EditorState.create({ doc: preview.text }); + editorManager.emit("file-loading-preview", this, preview.text); + } + } else { + cacheExists = await cacheFs.exists(); + if (cacheExists) { + value = await cacheFs.readFile(this.encoding); + } } if (this.uri) { - const file = fsOperation(this.uri); + file ||= fsOperation(this.uri); const fileExists = await file.exists(); if (!fileExists && cacheExists) { this.deletedFile = true; @@ -1842,10 +1874,22 @@ export default class EditorFile { window.log("error", "Unable to load: " + this.filename); window.log("error", error); } finally { + if (isRemoteFile) this.#setRemoteLoading(false); this.#emit("loadend", createFileEvent(this)); } } + #setRemoteLoading(loading) { + if (!this.#tab) return; + + this.#tab.classList.toggle("loading", loading); + if (loading) { + this.#tab.setAttribute("aria-busy", "true"); + } else { + this.#tab.removeAttribute("aria-busy"); + } + } + // TODO: Implement CodeMirror equivalents for folding and scroll events // static #onfold(e) { // editorManager.editor._emit("fold", e); diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js index b58231e0ea..118aeef50b 100644 --- a/src/lib/editorManager.js +++ b/src/lib/editorManager.js @@ -205,6 +205,7 @@ async function EditorManager($header, $body) { "rename-file": [], "save-file": [], "file-loaded": [], + "file-loading-preview": [], "file-content-changed": [], "add-folder": [], "remove-folder": [], @@ -2828,9 +2829,9 @@ async function EditorManager($header, $body) { } } - function showLoadingEditor(file) { + function showLoadingEditor(file, text = "") { const loadingState = EditorState.create({ - doc: "", + doc: text, extensions: [ themeCompartment.of(getConfiguredThemeExtension()), ...getBaseExtensionsFromOptions(), @@ -3670,6 +3671,18 @@ async function EditorManager($header, $body) { } }); + manager.on(["file-loading-preview"], (file, text) => { + if (!file || file.type !== "editor" || !file.loading) return; + const pane = getFilePane(file); + if (!pane?.editor || pane.activeFile?.id !== file.id) return; + + if (pane === getActivePane()) { + showLoadingEditor(file, text); + } else { + withPaneEditorContext(pane, () => showLoadingEditor(file, text)); + } + }); + manager.on( ["file-content-changed", "rename-file", "save-file", "update:pin-tab"], markGlobalOpenFileListMirrorDirty, diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index e977eb59d9..4ee9e5bd02 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -1399,11 +1399,16 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { list = await listAllStorages(); } else { const id = helpers.uuid(); + let loaderTimeout = 10000; + + if (["ftp:", "sftp:"].includes(Url.getProtocol(url))) { + loaderTimeout = 0; + } progress[id] = true; const timeout = setTimeout(() => { loader.create(name, strings.loading + "...", { - timeout: 10000, + timeout: loaderTimeout, callback() { loader.destroy(); navigate("/", "/"); diff --git a/src/styles/codemirror.scss b/src/styles/codemirror.scss index 19fd31694d..959f03237d 100644 --- a/src/styles/codemirror.scss +++ b/src/styles/codemirror.scss @@ -1,3 +1,5 @@ +@use "./mixins.scss"; + .editor-container { position: relative; } @@ -141,6 +143,10 @@ body.resizing-editor-pane { li.tile { min-width: min(var(--file-tab-width), 44%); max-width: var(--file-tab-width); + + &.loading { + @include mixins.bar-loader(30%, 2px); + } } } diff --git a/src/utils/remoteFilePreview.js b/src/utils/remoteFilePreview.js new file mode 100644 index 0000000000..d022383ef9 --- /dev/null +++ b/src/utils/remoteFilePreview.js @@ -0,0 +1,38 @@ +/** + * Read the best available local preview for a remote editor file. + * Editor recovery data takes precedence because it can contain unsaved changes. + * The transport cache is optional and must never block the remote load. + * + * @param {Object} options + * @param {import("fileSystem").FileSystem} options.editorCache + * @param {import("fileSystem").FileSystem | null} options.transportCache + * @param {string} [options.encoding] + * @returns {Promise<{editorCacheExists: boolean, text: string | null}>} + */ +export async function readRemoteFilePreview({ + editorCache, + transportCache, + encoding, +}) { + const editorCacheExists = await editorCache.exists(); + + if (editorCacheExists) { + return { + editorCacheExists, + text: await editorCache.readFile(encoding), + }; + } + + try { + if (transportCache && (await transportCache.exists())) { + return { + editorCacheExists, + text: await transportCache.readFile(encoding), + }; + } + } catch (_error) { + // The transport cache is only a preview; continue with the remote load. + } + + return { editorCacheExists, text: null }; +} diff --git a/tests/unit/remoteFilePreview.test.js b/tests/unit/remoteFilePreview.test.js new file mode 100644 index 0000000000..f82fe47f6c --- /dev/null +++ b/tests/unit/remoteFilePreview.test.js @@ -0,0 +1,70 @@ +import { describe, expect, it, vi } from "vitest"; +import { readRemoteFilePreview } from "utils/remoteFilePreview"; + +function createCache({ exists = false, text = "", error = null } = {}) { + return { + exists: vi.fn().mockResolvedValue(exists), + readFile: error + ? vi.fn().mockRejectedValue(error) + : vi.fn().mockResolvedValue(text), + }; +} + +describe("readRemoteFilePreview", () => { + it("prefers editor recovery data over the transport cache", async () => { + const editorCache = createCache({ exists: true, text: "unsaved" }); + const transportCache = createCache({ exists: true, text: "downloaded" }); + + await expect( + readRemoteFilePreview({ + editorCache, + transportCache, + encoding: "UTF-8", + }), + ).resolves.toEqual({ editorCacheExists: true, text: "unsaved" }); + expect(editorCache.readFile).toHaveBeenCalledWith("UTF-8"); + expect(transportCache.exists).not.toHaveBeenCalled(); + }); + + it("falls back to the transport cache", async () => { + const editorCache = createCache(); + const transportCache = createCache({ exists: true, text: "downloaded" }); + + await expect( + readRemoteFilePreview({ editorCache, transportCache }), + ).resolves.toEqual({ editorCacheExists: false, text: "downloaded" }); + }); + + it("returns no preview when the transport cache is missing", async () => { + const editorCache = createCache(); + const transportCache = createCache(); + + await expect( + readRemoteFilePreview({ editorCache, transportCache }), + ).resolves.toEqual({ editorCacheExists: false, text: null }); + expect(transportCache.readFile).not.toHaveBeenCalled(); + }); + + it("ignores an unreadable transport cache", async () => { + const editorCache = createCache(); + const transportCache = createCache({ + exists: true, + error: new Error("unreadable"), + }); + + await expect( + readRemoteFilePreview({ editorCache, transportCache }), + ).resolves.toEqual({ editorCacheExists: false, text: null }); + }); + + it("preserves editor recovery cache read failures", async () => { + const error = new Error("recovery cache failed"); + const editorCache = createCache({ exists: true, error }); + const transportCache = createCache({ exists: true, text: "downloaded" }); + + await expect( + readRemoteFilePreview({ editorCache, transportCache }), + ).rejects.toBe(error); + expect(transportCache.exists).not.toHaveBeenCalled(); + }); +}); From e5fa7d592ec75207ecacb954c536abc462eee4b0 Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Fri, 14 Aug 2026 14:03:15 +0000 Subject: [PATCH 050/195] fix: read-only mode (#2740) Co-authored-by: Ajit Kumar --- src/cm/commandRegistry.js | 3 +- src/cm/editorReadOnly.ts | 187 ++++++++++++++++++++++ src/cm/lineNumberSelection.ts | 3 +- src/cm/lsp/codeActions.ts | 5 +- src/cm/lsp/documentSymbols.ts | 3 +- src/cm/quickToolsModifierInput.ts | 38 ++++- src/cm/quickToolsNavigation.ts | 5 +- src/cm/selectionMenuUtils.ts | 25 +++ src/cm/touchSelectionMenu.js | 154 +++++++++++++++--- src/components/palette/index.js | 3 +- src/components/referencesPanel/utils.js | 3 +- src/components/symbolsPanel/index.js | 3 +- src/handlers/editorFileTab.js | 3 +- src/handlers/quickTools.js | 186 ++++++++++++++++------ src/handlers/quickToolsInit.js | 6 +- src/lib/commands.js | 3 +- src/lib/editorFile.js | 18 ++- src/lib/editorManager.js | 142 ++++++++++++++--- src/lib/selectionMenu.js | 3 +- src/pages/problems/problems.js | 3 +- src/palettes/commandPalette/index.js | 3 +- src/res/file-icons/style.css | 9 +- tests/unit/editorReadOnly.test.ts | 202 ++++++++++++++++++++++++ tests/unit/fileIcons.test.js | 29 ++++ tests/unit/quickToolsReadOnly.test.ts | 114 +++++++++++++ tests/unit/selectionMenuUtils.test.ts | 43 +++++ 26 files changed, 1077 insertions(+), 119 deletions(-) create mode 100644 src/cm/editorReadOnly.ts create mode 100644 src/cm/selectionMenuUtils.ts create mode 100644 tests/unit/editorReadOnly.test.ts create mode 100644 tests/unit/fileIcons.test.js create mode 100644 tests/unit/quickToolsReadOnly.test.ts create mode 100644 tests/unit/selectionMenuUtils.test.ts diff --git a/src/cm/commandRegistry.js b/src/cm/commandRegistry.js index a4577f7cd5..1446027cbb 100644 --- a/src/cm/commandRegistry.js +++ b/src/cm/commandRegistry.js @@ -73,6 +73,7 @@ import { } from "@codemirror/lsp-client"; import { Compartment, EditorSelection } from "@codemirror/state"; import { keymap } from "@codemirror/view"; +import { focusEditorIfEditable } from "cm/editorReadOnly"; import { copyLineDownFoldAware, copyLineUpFoldAware, @@ -175,7 +176,7 @@ function registerCoreCommands() { requiresView: false, run(view) { const resolvedView = resolveView(view); - resolvedView?.focus(); + if (resolvedView) focusEditorIfEditable(resolvedView); return true; }, }); diff --git a/src/cm/editorReadOnly.ts b/src/cm/editorReadOnly.ts new file mode 100644 index 0000000000..c5e94acd45 --- /dev/null +++ b/src/cm/editorReadOnly.ts @@ -0,0 +1,187 @@ +import { + Compartment, + EditorSelection, + EditorState, + Transaction, + type Extension, + type SelectionRange, +} from "@codemirror/state"; +import { EditorView } from "@codemirror/view"; + +interface PointerTapSnapshot { + pointerId: number; + x: number; + y: number; + timeStamp: number; + isPrimary?: boolean; + button?: number; + cancelled?: boolean; +} + +interface PointerTapEnd { + pointerId: number; + x: number; + y: number; + timeStamp: number; + isPrimary?: boolean; + button?: number; +} + +interface PointerTapOptions { + maxDelay?: number; + maxDistance?: number; +} + +const readOnlyUserChangePattern = /^(?:input|delete|move|undo|redo)(?:\.|$)/; + +const readOnlyInputGuard = EditorView.inputHandler.of((view) => { + return view.state.readOnly; +}); + +const readOnlyUserChangeFilter = EditorState.transactionFilter.of( + (transaction) => { + if (!transaction.startState.readOnly || !transaction.docChanged) { + return transaction; + } + + const userEvent = transaction.annotation(Transaction.userEvent); + return isReadOnlyUserChange(userEvent) ? [] : transaction; + }, +); + +const readOnlyFocusGuard = EditorView.domEventHandlers({ + focus(event, view) { + event.preventDefault(); + blurEditorIfReadOnly(view, view.state.readOnly); + return true; + }, + beforeinput(event, view) { + if (!view.state.readOnly) return false; + event.preventDefault(); + blurEditorIfReadOnly(view, true); + return true; + }, +}); + +/** + * Keep CodeMirror's document and DOM editability in sync. + */ +export function createEditorReadOnlyExtension(readOnly: boolean): Extension { + return [ + EditorState.readOnly.of(readOnly), + EditorView.editable.of(!readOnly), + ...(readOnly + ? [readOnlyFocusGuard, readOnlyInputGuard, readOnlyUserChangeFilter] + : []), + ]; +} + +/** Identify document-changing transactions produced by user interaction. */ +export function isReadOnlyUserChange(userEvent: string | undefined): boolean { + return !!userEvent && readOnlyUserChangePattern.test(userEvent); +} + +/** Dismiss an active soft keyboard when an editor becomes read-only. */ +export function blurEditorIfReadOnly( + view: EditorView, + readOnly: boolean, +): void { + if (!readOnly) return; + const activeElement = document.activeElement; + if ( + activeElement instanceof HTMLElement && + view.dom.contains(activeElement) + ) { + activeElement.blur(); + } + view.contentDOM.blur(); +} + +/** Atomically update all read-only behavior controlled by the compartment. */ +export function reconfigureEditorReadOnly( + view: EditorView, + compartment: Compartment, + readOnly: boolean, +): void { + view.dispatch({ + effects: compartment.reconfigure(createEditorReadOnlyExtension(readOnly)), + }); + blurEditorIfReadOnly(view, readOnly); +} + +/** Focus editable editors and actively settle read-only editors unfocused. */ +export function focusEditorIfEditable(view: EditorView): boolean { + if (view.state.readOnly) { + blurEditorIfReadOnly(view, true); + return false; + } + view.focus(); + return true; +} + +/** Classify a completed pointer gesture as a short primary tap. */ +export function shouldCommitReadOnlyTap( + start: PointerTapSnapshot, + end: PointerTapEnd, + options: PointerTapOptions = {}, +): boolean { + const { maxDelay = 500, maxDistance = 20 } = options; + if (start.cancelled) return false; + if (start.pointerId !== end.pointerId) return false; + if (start.isPrimary === false || end.isPrimary === false) return false; + if ((start.button ?? 0) !== 0 || (end.button ?? 0) !== 0) return false; + const duration = end.timeStamp - start.timeStamp; + if (!Number.isFinite(duration) || duration < 0 || duration > maxDelay) { + return false; + } + return Math.hypot(end.x - start.x, end.y - start.y) <= maxDistance; +} + +/** Collapse an existing read-only selection without focusing or editing. */ +export function collapseReadOnlySelection( + view: EditorView, + pos: number, +): boolean { + if (!view.state.readOnly || view.state.selection.main.empty) return false; + const position = Math.max(0, Math.min(pos, view.state.doc.length)); + view.dispatch({ + selection: EditorSelection.cursor(position), + userEvent: "select.pointer", + }); + blurEditorIfReadOnly(view, true); + return true; +} + +/** Resolve the text selected by a read-only long-press. */ +export function resolveReadOnlyContextSelection( + state: EditorState, + pos: number, +): SelectionRange { + const docLength = state.doc.length; + const position = Math.max( + 0, + Math.min(Number.isFinite(pos) ? pos : state.selection.main.head, docLength), + ); + const current = state.selection.main; + + if (!current.empty && position >= current.from && position <= current.to) { + return current; + } + + const word = state.wordAt(position); + if (word) return word; + if (docLength === 0) return EditorSelection.cursor(0); + + let from = Math.min(position, docLength - 1); + const unit = state.doc.sliceString(from, from + 1).charCodeAt(0); + if (unit >= 0xdc00 && unit <= 0xdfff && from > 0) { + const previousUnit = state.doc.sliceString(from - 1, from).charCodeAt(0); + if (previousUnit >= 0xd800 && previousUnit <= 0xdbff) from -= 1; + } + + const codePoint = state.doc + .sliceString(from, Math.min(from + 2, docLength)) + .codePointAt(0); + const width = codePoint != null && codePoint > 0xffff ? 2 : 1; + return EditorSelection.range(from, Math.min(from + width, docLength)); +} diff --git a/src/cm/lineNumberSelection.ts b/src/cm/lineNumberSelection.ts index e7a2624610..6b05a1af73 100644 --- a/src/cm/lineNumberSelection.ts +++ b/src/cm/lineNumberSelection.ts @@ -1,5 +1,6 @@ import { EditorSelection } from "@codemirror/state"; import type { BlockInfo, EditorView } from "@codemirror/view"; +import { focusEditorIfEditable } from "cm/editorReadOnly"; type LineInfo = Pick | null | undefined; @@ -115,7 +116,7 @@ export function handleLineNumberClick( : createLineSelection(range), userEvent: extendSelection ? "select.extend.pointer" : "select.pointer", }); - view.focus(); + focusEditorIfEditable(view); return true; } diff --git a/src/cm/lsp/codeActions.ts b/src/cm/lsp/codeActions.ts index 7022e5f1e1..89811ac560 100644 --- a/src/cm/lsp/codeActions.ts +++ b/src/cm/lsp/codeActions.ts @@ -1,5 +1,6 @@ import { LSPPlugin } from "@codemirror/lsp-client"; import { EditorView } from "@codemirror/view"; +import { focusEditorIfEditable } from "cm/editorReadOnly"; import toast from "components/toast"; import select from "dialogs/select"; import type { @@ -409,7 +410,7 @@ export async function showCodeActionsMenu(view: EditorView): Promise { const index = Number.parseInt(String(result), 10); if (!Number.isNaN(index) && index >= 0 && index < items.length) { await executeCodeAction(view, items[index]); - view.focus(); + focusEditorIfEditable(view); return true; } } @@ -417,7 +418,7 @@ export async function showCodeActionsMenu(view: EditorView): Promise { // User cancelled selection } - view.focus(); + focusEditorIfEditable(view); return false; } diff --git a/src/cm/lsp/documentSymbols.ts b/src/cm/lsp/documentSymbols.ts index 6d973f1175..942ac13355 100644 --- a/src/cm/lsp/documentSymbols.ts +++ b/src/cm/lsp/documentSymbols.ts @@ -6,6 +6,7 @@ import { LSPPlugin } from "@codemirror/lsp-client"; import type { EditorView } from "@codemirror/view"; +import { focusEditorIfEditable } from "cm/editorReadOnly"; import type { DocumentSymbol, Position, @@ -302,7 +303,7 @@ export async function navigateToSymbol( scrollIntoView: true, }); - view.focus(); + focusEditorIfEditable(view); return true; } catch (error) { console.warn("Failed to navigate to symbol:", error); diff --git a/src/cm/quickToolsModifierInput.ts b/src/cm/quickToolsModifierInput.ts index 52792a50cb..741cd80e83 100644 --- a/src/cm/quickToolsModifierInput.ts +++ b/src/cm/quickToolsModifierInput.ts @@ -1,5 +1,9 @@ import type { Extension } from "@codemirror/state"; -import { EditorView, type EditorView as CodeMirrorEditorView } from "@codemirror/view"; +import { + EditorView, + type EditorView as CodeMirrorEditorView, +} from "@codemirror/view"; +import { blurEditorIfReadOnly, focusEditorIfEditable } from "cm/editorReadOnly"; type QuickToolsModifierInputHandler = ( view: CodeMirrorEditorView, @@ -14,8 +18,38 @@ export function setQuickToolsModifierInputHandler( handleTextInput = typeof handler === "function" ? handler : () => false; } +export function canQuickToolsEdit(view: CodeMirrorEditorView): boolean { + return !view.state.readOnly; +} + +/** Use the capture input for read-only shortcuts without focusing the editor. */ +export function focusQuickToolsModifierInput( + view: CodeMirrorEditorView, + captureInput: HTMLElement, +): boolean { + if (!view.state.readOnly) { + focusEditorIfEditable(view); + return false; + } + blurEditorIfReadOnly(view, true); + captureInput.focus(); + return true; +} + +/** Close a read-only shortcut capture without disturbing intentional UI focus. */ +export function finishQuickToolsModifierInput( + view: CodeMirrorEditorView, + captureInput: HTMLElement, +): boolean { + if (!view.state.readOnly) return false; + captureInput.blur(); + blurEditorIfReadOnly(view, true); + return true; +} + export default function quickToolsModifierInput(): Extension { return EditorView.inputHandler.of((view, _from, _to, text) => { - return !!handleTextInput(view, text); + const handled = !!handleTextInput(view, text); + return view.state.readOnly || handled; }); } diff --git a/src/cm/quickToolsNavigation.ts b/src/cm/quickToolsNavigation.ts index 9159268572..bc3d8e6c23 100644 --- a/src/cm/quickToolsNavigation.ts +++ b/src/cm/quickToolsNavigation.ts @@ -35,6 +35,7 @@ import { type EditorView as CodeMirrorEditorView, runScopeHandlers, } from "@codemirror/view"; +import { focusEditorIfEditable } from "cm/editorReadOnly"; import createKeyboardEvent from "utils/keyboardEvent"; interface QuickToolKeyModifiers { @@ -146,7 +147,7 @@ export function runQuickToolKey( const event = createQuickToolKeyEvent(keyCode, modifiers); if (runScopeHandlers(view, event, "editor")) { - view.focus(); + focusEditorIfEditable(view); return true; } @@ -154,7 +155,7 @@ export function runQuickToolKey( if (!command) return false; const handled = command(view); if (handled !== false) { - view.focus(); + focusEditorIfEditable(view); return true; } diff --git a/src/cm/selectionMenuUtils.ts b/src/cm/selectionMenuUtils.ts new file mode 100644 index 0000000000..414dbfa836 --- /dev/null +++ b/src/cm/selectionMenuUtils.ts @@ -0,0 +1,25 @@ +export interface SelectionMenuItem { + mode?: "selected" | "all"; + readOnly?: boolean; +} + +export interface SelectionMenuFilterOptions { + readOnly: boolean; + hasSelection: boolean; +} + +/** Filter selection actions using Acode's read-only and selection rules. */ +export function filterSelectionMenuItems( + items: readonly T[], + options: SelectionMenuFilterOptions, +): T[] { + const { readOnly, hasSelection } = options; + return items.filter((item) => { + if (readOnly && !item.readOnly) return false; + if (hasSelection && !["selected", "all"].includes(item.mode ?? "all")) { + return false; + } + if (!hasSelection && item.mode === "selected") return false; + return true; + }); +} diff --git a/src/cm/touchSelectionMenu.js b/src/cm/touchSelectionMenu.js index 4b8767f69a..3e98096573 100644 --- a/src/cm/touchSelectionMenu.js +++ b/src/cm/touchSelectionMenu.js @@ -1,6 +1,15 @@ import { EditorSelection } from "@codemirror/state"; +import { + collapseReadOnlySelection, + focusEditorIfEditable, + resolveReadOnlyContextSelection, + shouldCommitReadOnlyTap, +} from "cm/editorReadOnly"; +import { filterSelectionMenuItems } from "cm/selectionMenuUtils"; import selectionMenu from "lib/selectionMenu"; +export { filterSelectionMenuItems } from "cm/selectionMenuUtils"; + const TAP_MAX_DELAY = 500; const TAP_MAX_DISTANCE = 20; const EDGE_SCROLL_GAP = 40; @@ -73,21 +82,6 @@ export function clampMenuPosition(menuRect, containerRect) { }; } -/** - * Filter menu items using Ace-compatible rules. - * @param {ReturnType} items - * @param {{readOnly:boolean,hasSelection:boolean}} options - */ -export function filterSelectionMenuItems(items, options) { - const { readOnly, hasSelection } = options; - return items.filter((item) => { - if (readOnly && !item.readOnly) return false; - if (hasSelection && !["selected", "all"].includes(item.mode)) return false; - if (!hasSelection && item.mode === "selected") return false; - return true; - }); -} - /** * Detect which edge(s) should trigger drag auto-scroll. * @param {{ @@ -147,6 +141,7 @@ class TouchSelectionMenuController { #isScrolling = false; #isPointerInteracting = false; #pointerSelectionSession = null; + #readOnlyTapSession = null; #pendingPointerSelectionClick = null; #menuActive = false; #menuRequested = false; @@ -173,6 +168,7 @@ class TouchSelectionMenuController { const root = this.#view.dom; root.addEventListener("contextmenu", this.#onContextMenu, true); document.addEventListener("pointerdown", this.#onGlobalPointerDown, true); + document.addEventListener("pointermove", this.#onGlobalPointerMove, true); document.addEventListener("pointerup", this.#onGlobalPointerUp, true); document.addEventListener("pointercancel", this.#onGlobalPointerUp, true); @@ -204,6 +200,11 @@ class TouchSelectionMenuController { true, ); document.removeEventListener("pointerup", this.#onGlobalPointerUp, true); + document.removeEventListener( + "pointermove", + this.#onGlobalPointerMove, + true, + ); document.removeEventListener( "pointercancel", this.#onGlobalPointerUp, @@ -213,6 +214,7 @@ class TouchSelectionMenuController { cancelAnimationFrame(this.#stateSyncRaf); this.#stateSyncRaf = 0; this.#pointerSelectionSession = null; + this.#readOnlyTapSession = null; this.#pendingPointerSelectionClick = null; this.#tooltipObserver?.disconnect(); this.#hideMenu(true); @@ -222,6 +224,7 @@ class TouchSelectionMenuController { this.#enabled = !!enabled; if (this.#enabled) return; this.#pointerSelectionSession = null; + this.#readOnlyTapSession = null; this.#pendingPointerSelectionClick = null; this.#menuRequested = false; this.#isPointerInteracting = false; @@ -263,6 +266,7 @@ class TouchSelectionMenuController { if (this.#isScrolling) return; this.#clearMenuShowTimer(); this.#isScrolling = true; + this.#cancelReadOnlyTap(); this.#hideMenu(); } @@ -274,6 +278,7 @@ class TouchSelectionMenuController { onStateChanged(meta = {}) { if (!this.#enabled) return; + if (meta.selectionChanged) this.#cancelReadOnlyTap(); if (this.#handlingMenuAction) return; if (!this.#shouldShowMenu()) { if (!this.#hasSelection()) { @@ -291,6 +296,7 @@ class TouchSelectionMenuController { onSessionChanged() { if (!this.#enabled) return; this.#pointerSelectionSession = null; + this.#readOnlyTapSession = null; this.#pendingPointerSelectionClick = null; this.#menuRequested = false; this.#isPointerInteracting = false; @@ -302,6 +308,17 @@ class TouchSelectionMenuController { #onContextMenu = (event) => { if (!this.#enabled) return; if (this.#isIgnoredPointerTarget(event.target)) return; + this.#cancelReadOnlyTap(); + if (this.#isReadOnly()) { + const pos = this.#safePosAtCoords(event.clientX, event.clientY); + if (pos != null) { + const range = resolveReadOnlyContextSelection(this.#view.state, pos); + this.#view.dispatch({ + selection: EditorSelection.create([range]), + userEvent: "select.pointer", + }); + } + } event.preventDefault(); event.stopPropagation(); this.#menuRequested = true; @@ -310,28 +327,47 @@ class TouchSelectionMenuController { #onGlobalPointerDown = (event) => { const target = event.target; - if (this.$menu.contains(target)) return; + if (this.$menu.contains(target)) { + this.#readOnlyTapSession = null; + return; + } if (this.#isIgnoredPointerTarget(target)) { this.#pointerSelectionSession = null; + this.#readOnlyTapSession = null; return; } if (target instanceof Node && this.#view.dom.contains(target)) { this.#capturePointerSelection(event); + this.#captureReadOnlyTap(event); this.#isPointerInteracting = true; this.#clearMenuShowTimer(); return; } this.#pointerSelectionSession = null; + this.#readOnlyTapSession = null; this.#isPointerInteracting = false; this.#menuRequested = false; this.#hideMenu(); }; + #onGlobalPointerMove = (event) => { + const session = this.#readOnlyTapSession; + if (!session || session.pointerId !== event.pointerId) return; + if ( + Math.hypot(event.clientX - session.x, event.clientY - session.y) > + TAP_MAX_DISTANCE + ) { + this.#cancelReadOnlyTap(); + } + }; + #onGlobalPointerUp = (event) => { if (event.type === "pointerup") { this.#commitPointerSelection(event); + this.#commitReadOnlyTap(event); } else { this.#pointerSelectionSession = null; + this.#readOnlyTapSession = null; } if (!this.#isPointerInteracting) return; this.#isPointerInteracting = false; @@ -346,6 +382,78 @@ class TouchSelectionMenuController { this.#hideMenu(); }; + #captureReadOnlyTap(event) { + this.#readOnlyTapSession = null; + if (!this.#enabled || !this.#isReadOnly() || !this.#hasSelection()) { + return; + } + if (!(event.isTrusted && event.isPrimary)) return; + if (typeof event.button === "number" && event.button !== 0) return; + if (this.#canExtendSelection(event) || this.#canAddSelectionRange(event)) { + return; + } + + this.#readOnlyTapSession = { + pointerId: event.pointerId, + x: event.clientX, + y: event.clientY, + timeStamp: event.timeStamp, + isPrimary: event.isPrimary, + button: event.button, + selection: this.#view.state.selection, + cancelled: false, + }; + } + + #cancelReadOnlyTap() { + if (this.#readOnlyTapSession) { + this.#readOnlyTapSession.cancelled = true; + } + } + + #commitReadOnlyTap(event) { + const session = this.#readOnlyTapSession; + this.#readOnlyTapSession = null; + if (!session || !this.#enabled || !this.#isReadOnly()) return false; + if (!this.#view.state.selection.eq(session.selection)) return false; + if ( + !shouldCommitReadOnlyTap( + session, + { + pointerId: event.pointerId, + x: event.clientX, + y: event.clientY, + timeStamp: event.timeStamp, + isPrimary: event.isPrimary, + button: event.button, + }, + { maxDelay: TAP_MAX_DELAY, maxDistance: TAP_MAX_DISTANCE }, + ) + ) { + return false; + } + const target = event.target; + if (!(target instanceof Node) || !this.#view.dom.contains(target)) { + return false; + } + if (this.#isIgnoredPointerTarget(target)) return false; + + const pos = this.#safePosAtCoords(event.clientX, event.clientY); + if (pos == null) return false; + if (!collapseReadOnlySelection(this.#view, pos)) return false; + this.#menuRequested = false; + this.#clearMenuShowTimer(); + this.#hideMenu(true); + try { + document.getSelection()?.removeAllRanges(); + } catch (error) { + console.warn("Failed to clear native read-only selection.", error); + } + event.preventDefault(); + focusEditorIfEditable(this.#view); + return true; + } + #capturePointerSelection(event) { if (!this.#canHandlePointerSelection(event)) { this.#pointerSelectionSession = null; @@ -441,8 +549,8 @@ class TouchSelectionMenuController { } #shouldShowMenu() { - if (this.#isScrolling || this.#isPointerInteracting || !this.#view.hasFocus) - return false; + if (this.#isScrolling || this.#isPointerInteracting) return false; + if (!this.#view.hasFocus && !this.#isReadOnly()) return false; return this.#hasSelection() || this.#menuRequested; } @@ -475,6 +583,14 @@ class TouchSelectionMenuController { } } + #safePosAtCoords(x, y) { + try { + return this.#view.posAtCoords({ x, y }, false); + } catch { + return null; + } + } + #getMenuAnchor(selection = this.#hasSelection()) { const range = this.#view.state.selection.main; if (!selection) { @@ -535,7 +651,7 @@ class TouchSelectionMenuController { this.#handlingMenuAction = false; this.#menuRequested = false; this.#hideMenu(); - this.#view.focus(); + focusEditorIfEditable(this.#view); } }; $item.addEventListener("pointerdown", runAction); diff --git a/src/components/palette/index.js b/src/components/palette/index.js index fe68530699..52d06a08db 100644 --- a/src/components/palette/index.js +++ b/src/components/palette/index.js @@ -1,4 +1,5 @@ import "./style.scss"; +import { focusEditorIfEditable } from "cm/editorReadOnly"; import inputhints from "components/inputhints"; import keyboardHandler from "handlers/keyboard"; import actionStack from "lib/actionStack"; @@ -179,7 +180,7 @@ export default function palette( if (!isChained) { const { activeFile, editor } = editorManager; if (activeFile.wasFocused) { - editor.focus(); + focusEditorIfEditable(editor); } } diff --git a/src/components/referencesPanel/utils.js b/src/components/referencesPanel/utils.js index 828cd0d377..d88a9ca84f 100644 --- a/src/components/referencesPanel/utils.js +++ b/src/components/referencesPanel/utils.js @@ -1,4 +1,5 @@ import { EditorView } from "@codemirror/view"; +import { focusEditorIfEditable } from "cm/editorReadOnly"; import Sidebar from "components/sidebar"; import DOMPurify from "dompurify"; import openFile from "lib/openFile"; @@ -128,7 +129,7 @@ export async function navigateToReference(ref) { selection: { anchor: from, head: to }, effects: EditorView.scrollIntoView(from, { y: "center" }), }); - editor.focus(); + focusEditorIfEditable(editor); } catch (error) { console.error("Failed to navigate to reference:", error); } diff --git a/src/components/symbolsPanel/index.js b/src/components/symbolsPanel/index.js index 5265f09b3f..987f80c3ca 100644 --- a/src/components/symbolsPanel/index.js +++ b/src/components/symbolsPanel/index.js @@ -1,4 +1,5 @@ import "./styles.scss"; +import { focusEditorIfEditable } from "cm/editorReadOnly"; import { fetchDocumentSymbols, navigateToSymbol } from "cm/lsp"; import actionStack from "lib/actionStack"; @@ -417,7 +418,7 @@ function createSymbolsPanel() { } if (state.editorView) { - state.editorView.focus(); + focusEditorIfEditable(state.editorView); } } diff --git a/src/handlers/editorFileTab.js b/src/handlers/editorFileTab.js index ffbf9f629b..77ea649ea4 100644 --- a/src/handlers/editorFileTab.js +++ b/src/handlers/editorFileTab.js @@ -1,3 +1,4 @@ +import { focusEditorIfEditable } from "cm/editorReadOnly"; import config from "lib/config"; import settings from "lib/settings"; import { animate } from "motion"; @@ -96,7 +97,7 @@ export default function startDrag(e) { const { editor, activeFile } = editorManager; if (activeFile.focusedBefore) { - editor.focus(); + focusEditorIfEditable(editor); } if (settings.value.vibrateOnTap) { diff --git a/src/handlers/quickTools.js b/src/handlers/quickTools.js index aff8f9009e..4c56e91f86 100644 --- a/src/handlers/quickTools.js +++ b/src/handlers/quickTools.js @@ -8,7 +8,13 @@ import { setSearchQuery, } from "@codemirror/search"; import { executeCommand, getRegisteredCommands } from "cm/commandRegistry"; -import { setQuickToolsModifierInputHandler } from "cm/quickToolsModifierInput"; +import { focusEditorIfEditable } from "cm/editorReadOnly"; +import { + canQuickToolsEdit, + finishQuickToolsModifierInput, + focusQuickToolsModifierInput, + setQuickToolsModifierInputHandler, +} from "cm/quickToolsModifierInput"; import { findQuickToolCommand, mapQuickToolShiftText, @@ -62,6 +68,16 @@ quickTools.$input.addEventListener("input", (e) => { quickTools.$input.value = ""; if (!key || key.length > 1) return; const keyCombination = getKeys({ key }); + const target = getInput(); + + if (isCodeMirrorEditorInput(target)) { + handleCodeMirrorQuickToolsTextInput( + editorManager.editor, + key, + keyCombination, + ); + return; + } if ( keyCombination.shiftKey && @@ -75,7 +91,7 @@ quickTools.$input.addEventListener("input", (e) => { } resetKeys(); - getInput().dispatchEvent(KeyboardEvent("keydown", keyCombination)); + target.dispatchEvent(KeyboardEvent("keydown", keyCombination)); setQuicktoolsUsed(); }); @@ -92,6 +108,15 @@ quickTools.$input.addEventListener("keydown", (e) => { e.preventDefault(); let target = getInput(); + if (isCodeMirrorEditorInput(target)) { + try { + runCodeMirrorQuickToolKey(keyCode, keyCombination); + } finally { + resetKeys(); + dismissReadOnlyQuickToolsInput(editorManager.editor); + } + return; + } if (target === quickTools.$input) { target = editorManager.editor.contentDOM; } @@ -121,8 +146,8 @@ function setupHistoryNavigation() { $searchInput.el.addEventListener("keydown", (e) => { if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "f") { e.preventDefault(); - const { editor, activeFile } = editorManager; - editor.focus(); + const { editor } = editorManager; + focusEditorIfEditable(editor); actionStack.get("search-bar")?.action(); } else if (e.key === "ArrowUp") { e.preventDefault(); @@ -211,7 +236,15 @@ export const key = { export function clearQuickToolsModifierState({ restoreFocus = false } = {}) { const changed = clearModifierState(state, events); - if (restoreFocus) input?.focus?.(); + if (restoreFocus) restoreQuickToolsTargetFocus(); + return changed; +} + +export function cancelQuickToolsModifierInput() { + const changed = clearQuickToolsModifierState(); + quickTools.$input.value = ""; + quickTools.$input.blur(); + dismissReadOnlyQuickToolsInput(editorManager.editor); return changed; } @@ -234,14 +267,12 @@ export default function actions(action, value) { events[action].forEach((cb) => cb(value)); if (Object.values(state).includes(true)) { if (isCodeMirrorEditorInput(input)) { - editor?.focus(); + focusQuickToolsModifierInput(editor, $input); } else { $input.focus(); } - } else if (input) { - input.focus(); } else { - $input.blur(); + restoreQuickToolsTargetFocus(); } return value; @@ -255,7 +286,11 @@ export default function actions(action, value) { const commandName = typeof value === "string" ? value : String(value ?? ""); if (!commandName) return false; - return executeCommand(commandName, editor); + try { + return executeCommand(commandName, editor); + } finally { + if (editor?.state?.readOnly) cancelQuickToolsModifierInput(); + } } case "key": { @@ -267,10 +302,12 @@ export default function actions(action, value) { if (runCodeMirrorQuickToolKey(value, keyCombination)) { return true; } + if (isReadOnlyCodeMirrorInput(input)) return true; getInput().dispatchEvent(KeyboardEvent("keydown", keyCombination)); return true; } finally { if (shouldResetKeys) resetKeys(); + dismissReadOnlyQuickToolsInput(editor); } } @@ -309,6 +346,7 @@ export default function actions(action, value) { return true; case "search-replace": + if (blockReadOnlyQuickToolsEdit(editor)) return false; if ($replaceInput.value) { searchHistory.addToHistory($replaceInput.value); } @@ -327,6 +365,7 @@ export default function actions(action, value) { return true; case "search-replace-all": + if (blockReadOnlyQuickToolsEdit(editor)) return false; if ($replaceInput.value) { searchHistory.addToHistory($replaceInput.value); } @@ -360,9 +399,15 @@ function setInput() { if ( !activeElement || activeElement === quickTools.$input || - activeElement === document.body - ) + activeElement === document.body || + quickTools.$footer.contains(activeElement) + ) { + const { activeFile, editor } = editorManager; + if (activeFile?.type === "editor" && editor?.state?.readOnly) { + input = editor.contentDOM; + } return; + } input = activeElement; } @@ -378,48 +423,68 @@ function runCodeMirrorQuickToolKey(keyCode, keyCombination) { return runQuickToolKey(editorManager.editor, keyCode, keyCombination); } -export function handleCodeMirrorQuickToolsTextInput(view, text) { - if (!Object.values(state).includes(true)) return false; +export function handleCodeMirrorQuickToolsTextInput( + view, + text, + modifiers = null, +) { if (!view?.state || !view.contentDOM) return false; if (!text || text.length !== 1) return false; - const keyCombination = getKeys({ key: text }); + const keyCombination = modifiers || getKeys({ key: text }); + if (!hasQuickToolsModifier(keyCombination)) return false; + const canEdit = canQuickToolsEdit(view); + resetKeys(); - if ( - keyCombination.shiftKey && - !keyCombination.ctrlKey && - !keyCombination.altKey && - !keyCombination.metaKey - ) { - resetKeys(); - view.dispatch(view.state.replaceSelection(mapQuickToolShiftText(text))); - setQuicktoolsUsed(); - return true; - } + try { + if ( + keyCombination.shiftKey && + !keyCombination.ctrlKey && + !keyCombination.altKey && + !keyCombination.metaKey + ) { + if (canEdit) { + view.dispatch({ + ...view.state.replaceSelection(mapQuickToolShiftText(text)), + userEvent: "input.quicktools", + }); + } + return true; + } - if ( - !keyCombination.ctrlKey && - !keyCombination.altKey && - !keyCombination.metaKey - ) { - return false; - } + if ( + !keyCombination.ctrlKey && + !keyCombination.altKey && + !keyCombination.metaKey + ) { + return false; + } - resetKeys(); + const command = findQuickToolCommand( + getRegisteredCommands(), + text, + keyCombination, + ); + if (command && executeCommand(command.name, view)) { + return true; + } - const command = findQuickToolCommand( - getRegisteredCommands(), - text, - keyCombination, - ); - if (command && executeCommand(command.name, view)) { - setQuicktoolsUsed(); + if (!canEdit) return true; + view.contentDOM.dispatchEvent(KeyboardEvent("keydown", keyCombination)); return true; + } finally { + setQuicktoolsUsed(); + dismissReadOnlyQuickToolsInput(view); } +} - view.contentDOM.dispatchEvent(KeyboardEvent("keydown", keyCombination)); - setQuicktoolsUsed(); - return true; +function hasQuickToolsModifier(modifiers) { + return !!( + modifiers.shiftKey || + modifiers.ctrlKey || + modifiers.altKey || + modifiers.metaKey + ); } function toggleSearch() { @@ -766,7 +831,7 @@ function focusEditor() { } if (editor) { - editor.focus(); + focusEditorIfEditable(editor); } } @@ -845,9 +910,40 @@ function insertText(value) { } const { editor } = editorManager; + if (blockReadOnlyQuickToolsEdit(editor)) return false; return editor ? editor.insert(text) : false; } +function blockReadOnlyQuickToolsEdit(view) { + if (!view?.state?.readOnly) return false; + cancelQuickToolsModifierInput(); + return true; +} + +function isReadOnlyCodeMirrorInput(target) { + const { editor } = editorManager; + return isCodeMirrorEditorInput(target) && !!editor?.state?.readOnly; +} + +function dismissReadOnlyQuickToolsInput(view) { + if (!view?.state?.readOnly) return false; + return finishQuickToolsModifierInput(view, quickTools.$input); +} + +function restoreQuickToolsTargetFocus() { + const { editor } = editorManager; + if (isCodeMirrorEditorInput(input) && editor) { + if (dismissReadOnlyQuickToolsInput(editor)) return; + focusEditorIfEditable(editor); + return; + } + if (input) { + input.focus?.(); + } else { + quickTools.$input.blur(); + } +} + function shiftKeyMapping(char) { return mapQuickToolShiftText(char); } diff --git a/src/handlers/quickToolsInit.js b/src/handlers/quickToolsInit.js index 811f49043f..330cd7d197 100644 --- a/src/handlers/quickToolsInit.js +++ b/src/handlers/quickToolsInit.js @@ -1,10 +1,11 @@ import { redoDepth, undoDepth } from "@codemirror/commands"; +import { focusEditorIfEditable } from "cm/editorReadOnly"; import quickTools from "components/quickTools"; import { description } from "components/quickTools/items"; import { hideTooltip, showTooltip } from "components/tooltip"; import config from "lib/config"; import appSettings from "lib/settings"; -import actions, { key } from "./quickTools"; +import actions, { cancelQuickToolsModifierInput, key } from "./quickTools"; const CONTEXT_MENU_TIMEOUT = 500; const MOVE_X_THRESHOLD = 50; @@ -101,6 +102,7 @@ export default function init() { }); editorManager.on("editor-state-changed", updateHistoryButtons); + editorManager.on("switch-file", cancelQuickToolsModifierInput); appSettings.on("update:quicktoolsItems:after", () => { setTimeout(updateHistoryButtons, 100); @@ -360,7 +362,7 @@ function oncontextmenu(e) { }; if (activeFile.focused) { - editor.focus(); + focusEditorIfEditable(editor); } dispatchEventWithTimeout(); } diff --git a/src/lib/commands.js b/src/lib/commands.js index 9c20cf0385..ac3ed5dd69 100644 --- a/src/lib/commands.js +++ b/src/lib/commands.js @@ -1,5 +1,6 @@ import fsOperation from "fileSystem"; import { selectAll } from "@codemirror/commands"; +import { focusEditorIfEditable } from "cm/editorReadOnly"; import Sidebar from "components/sidebar"; import confirm from "dialogs/confirm"; import prompt from "dialogs/prompt"; @@ -565,7 +566,7 @@ export default { ); res = await color(defaultColor, () => { if (wasFocused) { - editor.focus(); + focusEditorIfEditable(editor); } }); } catch (_) { diff --git a/src/lib/editorFile.js b/src/lib/editorFile.js index 4649e3f046..449d8ea4b2 100644 --- a/src/lib/editorFile.js +++ b/src/lib/editorFile.js @@ -1,6 +1,10 @@ import fsOperation from "fileSystem"; // CodeMirror imports for document state management import { EditorState } from "@codemirror/state"; +import { + focusEditorIfEditable, + reconfigureEditorReadOnly, +} from "cm/editorReadOnly"; import { clearSelection, getDocText, @@ -1420,11 +1424,13 @@ export default class EditorFile { : editorManager.activeFile?.id === this.id ? editorManager.editor : null; - targetEditor?.dispatch({ - effects: readOnlyCompartment.reconfigure( - EditorState.readOnly.of(readOnly), - ), - }); + if (targetEditor) { + reconfigureEditorReadOnly( + targetEditor, + readOnlyCompartment, + readOnly, + ); + } } } catch (error) { console.warn( @@ -1513,7 +1519,7 @@ export default class EditorFile { if (this.type === "editor") { editorManager.container.style.display = "block"; if (this.focused && editorHadDomFocus && !isTouchDevice()) { - editor.focus(); + focusEditorIfEditable(editor); } else { editor.contentDOM.blur(); // Ensure any native DOM selection is cleared on blur to avoid sticky selection handles diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js index 118aeef50b..d719add426 100644 --- a/src/lib/editorManager.js +++ b/src/lib/editorManager.js @@ -38,6 +38,12 @@ import { registerExternalCommand, removeExternalCommand, } from "cm/commandRegistry"; +import { + blurEditorIfReadOnly, + createEditorReadOnlyExtension, + focusEditorIfEditable, + reconfigureEditorReadOnly, +} from "cm/editorReadOnly"; import { handleLineNumberClick } from "cm/lineNumberSelection"; import localWordCompletions, { localWordCompletionSource, @@ -865,7 +871,7 @@ async function EditorManager($header, $body) { selection: EditorSelection.cursor(pos), userEvent: "select.pointer", }); - view.focus(); + focusEditorIfEditable(view); event.preventDefault(); return true; }, @@ -1663,7 +1669,7 @@ async function EditorManager($header, $body) { searchExtension: search(), // Ensure read-only can be toggled later via compartment readOnlyExtension: readOnlyCompartment.of( - EditorState.readOnly.of(false), + createEditorReadOnlyExtension(false), ), // Editor options driven by settings via compartments optionExtensions: getBaseExtensionsFromOptions(), @@ -1849,7 +1855,7 @@ async function EditorManager($header, $body) { selection: { anchor: pos, head: pos }, effects: EditorView.scrollIntoView(pos, { y: "center" }), }); - editor.focus(); + focusEditorIfEditable(editor); return true; } catch (error) { console.error("Error in gotoLine:", error); @@ -2179,7 +2185,7 @@ async function EditorManager($header, $body) { selection: { anchor: pos, head: pos }, effects: EditorView.scrollIntoView(pos, { y: "center" }), }); - targetEditor.focus(); + focusEditorIfEditable(targetEditor); return true; } catch (error) { console.error("Error in gotoLine:", error); @@ -2816,9 +2822,7 @@ async function EditorManager($header, $body) { } try { const ro = !file.editable || !!file.loading; - targetEditor.dispatch({ - effects: readOnlyCompartment.reconfigure(EditorState.readOnly.of(ro)), - }); + reconfigureEditorReadOnly(targetEditor, readOnlyCompartment, ro); file.session = targetEditor.state; } catch (error) { warnRecoverable( @@ -2837,12 +2841,12 @@ async function EditorManager($header, $body) { ...getBaseExtensionsFromOptions(), languageCompartment.of([]), lspCompartment.of([]), - readOnlyCompartment.of(EditorState.readOnly.of(true)), - EditorView.editable.of(false), + readOnlyCompartment.of(createEditorReadOnlyExtension(true)), placeholder(`Loading ${file.filename || "file"}...`), ], }); editor.setState(loadingState); + blurEditorIfReadOnly(editor, true); touchSelectionController?.onSessionChanged(); } @@ -2972,7 +2976,7 @@ async function EditorManager($header, $body) { // Apply read-only state based on file.editable/loading using Compartment try { const ro = !file.editable || !!file.loading; - exts.push(readOnlyCompartment.of(EditorState.readOnly.of(ro))); + exts.push(readOnlyCompartment.of(createEditorReadOnlyExtension(ro))); } catch (e) { // safe to ignore; editor will remain editable by default } @@ -3693,9 +3697,7 @@ async function EditorManager($header, $body) { if (file?.type !== "editor") return; try { const ro = !file.editable || !!file.loading; - editor.dispatch({ - effects: readOnlyCompartment.reconfigure(EditorState.readOnly.of(ro)), - }); + reconfigureEditorReadOnly(editor, readOnlyCompartment, ro); touchSelectionController?.onStateChanged(); } catch (error) { warnRecoverable( @@ -4280,6 +4282,56 @@ async function EditorManager($header, $body) { // Attach native DOM event listeners directly to the editor's contentDOM const contentDOM = editor.contentDOM; + let readOnlyNativeContextActive = false; + let readOnlyNativeContextResetTimer = null; + const isReadOnlyEditor = () => { + const activeFile = pane.activeFile; + return ( + editor.state.readOnly || + activeFile?.editable === false || + !!activeFile?.loading + ); + }; + const clearFileFocusState = () => { + const activeFile = pane.activeFile; + if (!activeFile) return; + activeFile.focused = false; + activeFile.focusedBefore = false; + }; + const clearPendingKeyboardHideBlur = () => { + if (!pendingKeyboardHideBlur) return; + keyboardHandler.off("keyboardHide", pendingKeyboardHideBlur); + pendingKeyboardHideBlur = null; + }; + const releaseReadOnlyNativeContext = () => { + clearTimeout(readOnlyNativeContextResetTimer); + readOnlyNativeContextResetTimer = null; + if (!readOnlyNativeContextActive) return; + readOnlyNativeContextActive = false; + setNativeContextMenuDisabled(false); + }; + const scheduleReadOnlyNativeContextRelease = () => { + if (!readOnlyNativeContextActive) return; + clearTimeout(readOnlyNativeContextResetTimer); + readOnlyNativeContextResetTimer = setTimeout( + releaseReadOnlyNativeContext, + 800, + ); + }; + function handleContentPointerDown() { + if (!isReadOnlyEditor()) return; + clearTimeout(readOnlyNativeContextResetTimer); + readOnlyNativeContextResetTimer = null; + readOnlyNativeContextActive = true; + setNativeContextMenuDisabled(true); + } + function handleDocumentPointerDown(event) { + if (!readOnlyNativeContextActive) return; + if (event.target instanceof Node && editor.dom.contains(event.target)) { + return; + } + releaseReadOnlyNativeContext(); + } const isFocused = contentDOM === document.activeElement || contentDOM.contains(document.activeElement); @@ -4287,6 +4339,16 @@ async function EditorManager($header, $body) { function handleContentFocus(_event) { setActivePane(pane); + if (isReadOnlyEditor()) { + if (!readOnlyNativeContextActive) { + setNativeContextMenuDisabled(false); + } + clearPendingKeyboardHideBlur(); + clearFileFocusState(); + blurEditorIfReadOnly(editor, true); + touchSelectionController?.onStateChanged(); + return; + } setNativeContextMenuDisabled(true); const activeFile = pane.activeFile; if (activeFile) { @@ -4296,17 +4358,18 @@ async function EditorManager($header, $body) { } async function handleContentBlur(_event) { - setNativeContextMenuDisabled(false); + if (!readOnlyNativeContextActive) { + setNativeContextMenuDisabled(false); + } touchSelectionController?.setMenu(false); + if (isReadOnlyEditor()) { + clearPendingKeyboardHideBlur(); + clearFileFocusState(); + return; + } const { hardKeyboardHidden, keyboardHeight } = await getSystemConfiguration(); - const blur = () => { - const activeFile = pane.activeFile; - if (activeFile) { - activeFile.focused = false; - activeFile.focusedBefore = false; - } - }; + const blur = clearFileFocusState; if ( hardKeyboardHidden === HARDKEYBOARDHIDDEN_NO && keyboardHeight < 100 @@ -4323,9 +4386,7 @@ async function EditorManager($header, $body) { } blur(); }; - if (pendingKeyboardHideBlur) { - keyboardHandler.off("keyboardHide", pendingKeyboardHideBlur); - } + clearPendingKeyboardHideBlur(); pendingKeyboardHideBlur = onKeyboardHide; keyboardHandler.on("keyboardHide", onKeyboardHide); } @@ -4339,6 +4400,18 @@ async function EditorManager($header, $body) { contentDOM.addEventListener("focus", handleContentFocus); contentDOM.addEventListener("blur", handleContentBlur); contentDOM.addEventListener("keydown", handleContentKeydown); + contentDOM.addEventListener("pointerdown", handleContentPointerDown, true); + document.addEventListener("pointerdown", handleDocumentPointerDown, true); + document.addEventListener( + "pointerup", + scheduleReadOnlyNativeContextRelease, + true, + ); + document.addEventListener( + "pointercancel", + scheduleReadOnlyNativeContextRelease, + true, + ); pane.cleanupEditorListeners = () => { scroller?.removeEventListener("scroll", handleEditorScroll); @@ -4348,6 +4421,27 @@ async function EditorManager($header, $body) { contentDOM.removeEventListener("focus", handleContentFocus); contentDOM.removeEventListener("blur", handleContentBlur); contentDOM.removeEventListener("keydown", handleContentKeydown); + contentDOM.removeEventListener( + "pointerdown", + handleContentPointerDown, + true, + ); + document.removeEventListener( + "pointerdown", + handleDocumentPointerDown, + true, + ); + document.removeEventListener( + "pointerup", + scheduleReadOnlyNativeContextRelease, + true, + ); + document.removeEventListener( + "pointercancel", + scheduleReadOnlyNativeContextRelease, + true, + ); + releaseReadOnlyNativeContext(); clearTimeout(scrollTimeout); if (scrollSyncRaf) { cancelAnimationFrame(scrollSyncRaf); diff --git a/src/lib/selectionMenu.js b/src/lib/selectionMenu.js index b54dc193d0..e697802e6c 100644 --- a/src/lib/selectionMenu.js +++ b/src/lib/selectionMenu.js @@ -1,3 +1,4 @@ +import { focusEditorIfEditable } from "cm/editorReadOnly"; import appSettings from "lib/settings"; const exec = (command) => { @@ -9,7 +10,7 @@ const exec = (command) => { editor.setSelection(true); editor.setMenu(true); } - editor.focus(); + focusEditorIfEditable(editor); }; const showCodeActions = async () => { diff --git a/src/pages/problems/problems.js b/src/pages/problems/problems.js index a450cf0d6a..3cf07b4b60 100644 --- a/src/pages/problems/problems.js +++ b/src/pages/problems/problems.js @@ -1,4 +1,5 @@ import "./style.scss"; +import { focusEditorIfEditable } from "cm/editorReadOnly"; import { getLspDiagnostics } from "cm/lsp/diagnostics"; import Page from "components/page"; import actionStack from "lib/actionStack"; @@ -82,7 +83,7 @@ export default function Problems() { $page.hide(); setTimeout(() => { - editorManager.editor.focus(); + focusEditorIfEditable(editorManager.editor); }, 100); } } diff --git a/src/palettes/commandPalette/index.js b/src/palettes/commandPalette/index.js index 92ae750f50..7d4efe443e 100644 --- a/src/palettes/commandPalette/index.js +++ b/src/palettes/commandPalette/index.js @@ -1,4 +1,5 @@ import { executeCommand, getRegisteredCommands } from "cm/commandRegistry"; +import { focusEditorIfEditable } from "cm/editorReadOnly"; import palette from "components/palette"; import helpers from "utils/helpers"; @@ -8,7 +9,7 @@ export default async function commandPalette() { const wasFocused = editor?.hasFocus ?? false; palette(generateHints, onselect, strings["type command"], () => { - if (wasFocused) editor?.focus(); + if (wasFocused && editor) focusEditorIfEditable(editor); }); function generateHints() { diff --git a/src/res/file-icons/style.css b/src/res/file-icons/style.css index 2d9e4eaa19..0b527ec4c1 100644 --- a/src/res/file-icons/style.css +++ b/src/res/file-icons/style.css @@ -1565,12 +1565,9 @@ color: #78dc50; } -.file_type_typescript:before { - content: "\e98a"; - color: #007acc; -} - -.file_type_ts:before { +.file_type_typescript:before, +.file_type_ts:before, +.file_type_tsx:before { content: "\e98a"; color: #007acc; } diff --git a/tests/unit/editorReadOnly.test.ts b/tests/unit/editorReadOnly.test.ts new file mode 100644 index 0000000000..64f9524aa8 --- /dev/null +++ b/tests/unit/editorReadOnly.test.ts @@ -0,0 +1,202 @@ +// @vitest-environment happy-dom + +import { Compartment, EditorSelection, EditorState } from "@codemirror/state"; +import { EditorView } from "@codemirror/view"; +import { + collapseReadOnlySelection, + createEditorReadOnlyExtension, + focusEditorIfEditable, + isReadOnlyUserChange, + reconfigureEditorReadOnly, + resolveReadOnlyContextSelection, + shouldCommitReadOnlyTap, +} from "cm/editorReadOnly"; +import { afterEach, describe, expect, it } from "vitest"; + +const views: EditorView[] = []; + +afterEach(() => { + while (views.length) views.pop()?.destroy(); + document.body.replaceChildren(); +}); + +function createEditor(readOnly = false) { + const compartment = new Compartment(); + const state = EditorState.create({ + doc: "read only content", + extensions: [compartment.of(createEditorReadOnlyExtension(readOnly))], + }); + const view = new EditorView({ state, parent: document.body }); + views.push(view); + return { compartment, view }; +} + +function expectEditable(view: EditorView) { + expect(view.state.readOnly).toBe(false); + expect(view.state.facet(EditorView.editable)).toBe(true); + expect(view.contentDOM.getAttribute("contenteditable")).toBe("true"); + expect(view.contentDOM.hasAttribute("aria-readonly")).toBe(false); + expect(view.contentDOM.hasAttribute("tabindex")).toBe(false); +} + +function expectReadOnly(view: EditorView) { + expect(view.state.readOnly).toBe(true); + expect(view.state.facet(EditorView.editable)).toBe(false); + expect(view.contentDOM.getAttribute("contenteditable")).toBe("false"); + expect(view.contentDOM.getAttribute("aria-readonly")).toBe("true"); + expect(view.contentDOM.hasAttribute("tabindex")).toBe(false); +} + +describe("editor read-only configuration", () => { + it("keeps an editable editor focusable for text input", () => { + const { view } = createEditor(); + + expectEditable(view); + view.focus(); + expect(view.hasFocus).toBe(true); + }); + + it("uses a non-editable DOM while preserving state selection", () => { + const { view } = createEditor(true); + const originalDocument = view.state.doc.toString(); + + expectReadOnly(view); + view.dispatch({ selection: EditorSelection.range(0, 4) }); + expect(view.state.selection.main.from).toBe(0); + expect(view.state.selection.main.to).toBe(4); + expect(view.state.doc.toString()).toBe(originalDocument); + }); + + it("blocks user document changes but permits internal synchronization", () => { + const { view } = createEditor(true); + view.dispatch({ selection: EditorSelection.range(0, 4) }); + view.dispatch({ + changes: { from: 0, to: 4, insert: "EDIT" }, + userEvent: "input.quicktools", + }); + expect(view.state.doc.toString()).toBe("read only content"); + expect([ + view.state.selection.main.from, + view.state.selection.main.to, + ]).toEqual([0, 4]); + + view.dispatch({ changes: { from: 0, to: 4, insert: "SYNC" } }); + expect(view.state.doc.toString()).toBe("SYNC only content"); + }); + + it("classifies only editing user events as read-only mutations", () => { + expect(isReadOnlyUserChange("input.quicktools")).toBe(true); + expect(isReadOnlyUserChange("delete.backward")).toBe(true); + expect(isReadOnlyUserChange("undo")).toBe(true); + expect(isReadOnlyUserChange("select.pointer")).toBe(false); + expect(isReadOnlyUserChange(undefined)).toBe(false); + }); + + it("rejects later focus attempts and never restores read-only focus", () => { + const { view } = createEditor(true); + view.focus(); + expect(view.hasFocus).toBe(false); + focusEditorIfEditable(view); + expect(view.hasFocus).toBe(false); + }); + + it("blurs on entry and fully restores editable mode", () => { + const { compartment, view } = createEditor(); + view.focus(); + expect(view.hasFocus).toBe(true); + + reconfigureEditorReadOnly(view, compartment, true); + expectReadOnly(view); + expect(view.hasFocus).toBe(false); + + reconfigureEditorReadOnly(view, compartment, false); + expectEditable(view); + view.focus(); + expect(view.hasFocus).toBe(true); + }); + + it("restores focus after selection actions only for editable files", () => { + const readOnly = createEditor(true).view; + const editable = createEditor(false).view; + + focusEditorIfEditable(readOnly); + expect(readOnly.hasFocus).toBe(false); + focusEditorIfEditable(editable); + expect(editable.hasFocus).toBe(true); + }); + + it("collapses a read-only selection without editing or focusing", () => { + const { view } = createEditor(true); + view.dispatch({ selection: EditorSelection.range(0, 4) }); + const originalDocument = view.state.doc.toString(); + + expect(collapseReadOnlySelection(view, 7)).toBe(true); + expect(view.state.selection.main.empty).toBe(true); + expect(view.state.selection.main.head).toBe(7); + expect(view.state.doc.toString()).toBe(originalDocument); + expect(view.hasFocus).toBe(false); + expect(collapseReadOnlySelection(view, 2)).toBe(false); + }); + + it("accepts only uncancelled short primary taps", () => { + const start = { + pointerId: 1, + x: 10, + y: 20, + timeStamp: 100, + isPrimary: true, + button: 0, + }; + const end = { + pointerId: 1, + x: 14, + y: 24, + timeStamp: 180, + isPrimary: true, + button: 0, + }; + + expect(shouldCommitReadOnlyTap(start, end)).toBe(true); + expect(shouldCommitReadOnlyTap({ ...start, cancelled: true }, end)).toBe( + false, + ); + expect(shouldCommitReadOnlyTap(start, { ...end, x: 50 })).toBe(false); + expect(shouldCommitReadOnlyTap(start, { ...end, timeStamp: 700 })).toBe( + false, + ); + expect(shouldCommitReadOnlyTap(start, { ...end, pointerId: 2 })).toBe( + false, + ); + expect(shouldCommitReadOnlyTap(start, { ...end, isPrimary: false })).toBe( + false, + ); + }); + + it("resolves words and preserves an existing long-press selection", () => { + let state = EditorState.create({ + doc: "alpha beta", + selection: EditorSelection.range(0, 5), + }); + let range = resolveReadOnlyContextSelection(state, 3); + expect([range.from, range.to]).toEqual([0, 5]); + + state = EditorState.create({ doc: "alpha beta" }); + range = resolveReadOnlyContextSelection(state, 7); + expect([range.from, range.to]).toEqual([6, 10]); + }); + + it("uses character and empty-document fallbacks for long-press", () => { + let state = EditorState.create({ doc: "alpha + beta" }); + let range = resolveReadOnlyContextSelection(state, 6); + expect(state.sliceDoc(range.from, range.to)).toBe("+"); + + state = EditorState.create({ doc: "alpha 💡 beta" }); + range = resolveReadOnlyContextSelection(state, 6); + expect(state.sliceDoc(range.from, range.to)).toBe("💡"); + + state = EditorState.create({ doc: "" }); + range = resolveReadOnlyContextSelection(state, 0); + expect(range.empty).toBe(true); + expect(range.from).toBe(0); + }); +}); diff --git a/tests/unit/fileIcons.test.js b/tests/unit/fileIcons.test.js new file mode 100644 index 0000000000..87f05de24c --- /dev/null +++ b/tests/unit/fileIcons.test.js @@ -0,0 +1,29 @@ +import fs from "node:fs"; +import { fileURLToPath } from "node:url"; +import { describe, expect, it } from "vitest"; + +const stylesheetPath = fileURLToPath( + new URL("../../src/res/file-icons/style.css", import.meta.url), +); +const stylesheet = fs.readFileSync(stylesheetPath, "utf8"); + +function getDeclarations(selector) { + for (const match of stylesheet.matchAll(/([^{}]+)\{([^{}]*)\}/g)) { + const selectors = match[1].split(",").map((value) => value.trim()); + if (selectors.includes(selector)) return match[2].trim(); + } + return null; +} + +describe("TypeScript file icons", () => { + it("uses the TypeScript glyph and color for TSX files", () => { + const typescript = getDeclarations(".file_type_typescript:before"); + const ts = getDeclarations(".file_type_ts:before"); + const tsx = getDeclarations(".file_type_tsx:before"); + + expect(typescript).toContain('content: "\\e98a"'); + expect(typescript).toContain("color: #007acc"); + expect(ts).toBe(typescript); + expect(tsx).toBe(typescript); + }); +}); diff --git a/tests/unit/quickToolsReadOnly.test.ts b/tests/unit/quickToolsReadOnly.test.ts new file mode 100644 index 0000000000..5a89cb861c --- /dev/null +++ b/tests/unit/quickToolsReadOnly.test.ts @@ -0,0 +1,114 @@ +// @vitest-environment happy-dom + +import { selectAll } from "@codemirror/commands"; +import { EditorSelection, EditorState } from "@codemirror/state"; +import { EditorView, keymap } from "@codemirror/view"; +import { createEditorReadOnlyExtension } from "cm/editorReadOnly"; +import quickToolsModifierInput, { + canQuickToolsEdit, + finishQuickToolsModifierInput, + focusQuickToolsModifierInput, + setQuickToolsModifierInputHandler, +} from "cm/quickToolsModifierInput"; +import { runQuickToolKey } from "cm/quickToolsNavigation"; +import { afterEach, describe, expect, it, vi } from "vitest"; + +vi.mock("utils/keyboardEvent", () => ({ + default: (type: string, init: KeyboardEventInit) => + new KeyboardEvent(type, init), +})); + +const views: EditorView[] = []; + +afterEach(() => { + setQuickToolsModifierInputHandler(() => false); + while (views.length) views.pop()?.destroy(); + document.body.replaceChildren(); +}); + +function createEditor(readOnly: boolean, extensions = []) { + const state = EditorState.create({ + doc: "alpha beta", + extensions: [createEditorReadOnlyExtension(readOnly), ...extensions], + }); + const view = new EditorView({ state, parent: document.body }); + views.push(view); + return view; +} + +describe("read-only QuickTools interaction", () => { + it("selects all without focusing or changing the document", () => { + const view = createEditor(true, [ + keymap.of([{ key: "Ctrl-a", run: selectAll }]), + ]); + const originalDocument = view.state.doc.toString(); + + expect(runQuickToolKey(view, 65, { ctrlKey: true })).toBe(true); + expect(view.state.selection.main.from).toBe(0); + expect(view.state.selection.main.to).toBe(view.state.doc.length); + expect(view.state.doc.toString()).toBe(originalDocument); + expect(view.hasFocus).toBe(false); + }); + + it("allows selection navigation but blocks deletion", () => { + const view = createEditor(true); + view.dispatch({ selection: EditorSelection.cursor(0) }); + + expect(runQuickToolKey(view, 39, { shiftKey: true })).toBe(true); + expect(view.state.selection.main.to).toBe(1); + const originalDocument = view.state.doc.toString(); + expect(runQuickToolKey(view, 8)).toBe(false); + expect(view.state.doc.toString()).toBe(originalDocument); + expect(view.hasFocus).toBe(false); + }); + + it("uses and dismisses the capture input for read-only shortcuts", () => { + const view = createEditor(true); + const captureInput = document.createElement("input"); + document.body.append(captureInput); + + expect(focusQuickToolsModifierInput(view, captureInput)).toBe(true); + expect(document.activeElement).toBe(captureInput); + expect(view.hasFocus).toBe(false); + expect(finishQuickToolsModifierInput(view, captureInput)).toBe(true); + expect(document.activeElement).not.toBe(captureInput); + expect(view.hasFocus).toBe(false); + }); + + it("preserves ordinary editable focus behavior", () => { + const view = createEditor(false); + const captureInput = document.createElement("input"); + document.body.append(captureInput); + + expect(canQuickToolsEdit(view)).toBe(true); + expect(focusQuickToolsModifierInput(view, captureInput)).toBe(false); + expect(view.hasFocus).toBe(true); + expect(finishQuickToolsModifierInput(view, captureInput)).toBe(false); + expect(view.hasFocus).toBe(true); + }); + + it("consumes leaked text input in read-only mode", () => { + const handler = vi.fn(() => false); + setQuickToolsModifierInputHandler(handler); + const view = createEditor(true, [quickToolsModifierInput()]); + const inputHandlers = view.state.facet(EditorView.inputHandler); + const quickToolsHandler = inputHandlers.at(-1); + + expect(quickToolsHandler?.(view, 0, 0, "X", () => null)).toBe(true); + expect(handler).toHaveBeenCalledWith(view, "X"); + expect(view.state.doc.toString()).toBe("alpha beta"); + }); + + it("the user-change filter prevents selected text replacement", () => { + const view = createEditor(true); + view.dispatch({ selection: EditorSelection.range(0, 5) }); + view.dispatch({ + ...view.state.replaceSelection("X"), + userEvent: "input.quicktools", + }); + + expect(view.state.doc.toString()).toBe("alpha beta"); + expect(view.state.selection.main.from).toBe(0); + expect(view.state.selection.main.to).toBe(5); + }); +}); diff --git a/tests/unit/selectionMenuUtils.test.ts b/tests/unit/selectionMenuUtils.test.ts new file mode 100644 index 0000000000..962f912e94 --- /dev/null +++ b/tests/unit/selectionMenuUtils.test.ts @@ -0,0 +1,43 @@ +import { filterSelectionMenuItems } from "cm/selectionMenuUtils"; +import { describe, expect, it } from "vitest"; + +const items = [ + { id: "copy", mode: "selected", readOnly: true }, + { id: "cut", mode: "selected", readOnly: false }, + { id: "paste", mode: "all", readOnly: false }, + { id: "select-all", mode: "all", readOnly: true }, +] as const; + +describe("selection menu filtering", () => { + it("keeps only read-only actions that apply to a selection", () => { + const visible = filterSelectionMenuItems(items, { + readOnly: true, + hasSelection: true, + }); + + expect(visible.map((item) => item.id)).toEqual(["copy", "select-all"]); + }); + + it("hides selection-only actions when no text is selected", () => { + const visible = filterSelectionMenuItems(items, { + readOnly: true, + hasSelection: false, + }); + + expect(visible.map((item) => item.id)).toEqual(["select-all"]); + }); + + it("keeps editable actions under the existing mode rules", () => { + const visible = filterSelectionMenuItems(items, { + readOnly: false, + hasSelection: true, + }); + + expect(visible.map((item) => item.id)).toEqual([ + "copy", + "cut", + "paste", + "select-all", + ]); + }); +}); From 50b37031ba69b0c7ec2c215058da2d54928e165d Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Fri, 14 Aug 2026 14:28:36 +0000 Subject: [PATCH 051/195] fix: quicktools ctrl+c not working properly (#2737) Co-authored-by: Ajit Kumar --- src/cm/quickToolsModifierInput.ts | 31 ++- src/handlers/quickTools.js | 98 ++++--- src/handlers/quickToolsState.js | 12 + src/test/editor.tests.js | 309 +++++++++++++++++++++ tests/unit/quickToolsModifierInput.test.ts | 187 +++++++++++++ tests/unit/quickToolsReadOnly.test.ts | 11 +- tests/unit/quickToolsState.test.js | 48 ++++ 7 files changed, 656 insertions(+), 40 deletions(-) create mode 100644 tests/unit/quickToolsModifierInput.test.ts diff --git a/src/cm/quickToolsModifierInput.ts b/src/cm/quickToolsModifierInput.ts index 741cd80e83..d71969a87a 100644 --- a/src/cm/quickToolsModifierInput.ts +++ b/src/cm/quickToolsModifierInput.ts @@ -5,9 +5,15 @@ import { } from "@codemirror/view"; import { blurEditorIfReadOnly, focusEditorIfEditable } from "cm/editorReadOnly"; +export interface QuickToolsModifierInputContext { + from: number; + to: number; + text: string; +} + type QuickToolsModifierInputHandler = ( view: CodeMirrorEditorView, - text: string, + input: QuickToolsModifierInputContext, ) => boolean | void; let handleTextInput: QuickToolsModifierInputHandler = () => false; @@ -18,6 +24,21 @@ export function setQuickToolsModifierInputHandler( handleTextInput = typeof handler === "function" ? handler : () => false; } +/** + * Android may report typing over a selection as an empty deletion followed by + * a separate insertion. Quick-tools modifiers must hold that deletion until + * the character arrives, otherwise shortcuts such as Ctrl+C copy only after + * the selected text has already been removed. + */ +export function isSelectedRangeDeletion( + view: CodeMirrorEditorView, + input: QuickToolsModifierInputContext, +): boolean { + const selection = view?.state?.selection?.main; + if (!selection || selection.empty || input.text !== "") return false; + return input.from <= selection.from && input.to >= selection.to; +} + export function canQuickToolsEdit(view: CodeMirrorEditorView): boolean { return !view.state.readOnly; } @@ -48,8 +69,12 @@ export function finishQuickToolsModifierInput( } export default function quickToolsModifierInput(): Extension { - return EditorView.inputHandler.of((view, _from, _to, text) => { - const handled = !!handleTextInput(view, text); + return EditorView.inputHandler.of((view, from, to, text) => { + // When a DOM-derived input is handled without changing state, CodeMirror's + // DOM observer performs its own view.update([]) reconciliation. Dispatching + // here would make that observer think state changed and can leave Android's + // native replacement in the content DOM. + const handled = !!handleTextInput(view, { from, to, text }); return view.state.readOnly || handled; }); } diff --git a/src/handlers/quickTools.js b/src/handlers/quickTools.js index 4c56e91f86..42a8b9f382 100644 --- a/src/handlers/quickTools.js +++ b/src/handlers/quickTools.js @@ -7,12 +7,14 @@ import { SearchQuery, setSearchQuery, } from "@codemirror/search"; +import { EditorView } from "@codemirror/view"; import { executeCommand, getRegisteredCommands } from "cm/commandRegistry"; import { focusEditorIfEditable } from "cm/editorReadOnly"; import { canQuickToolsEdit, finishQuickToolsModifierInput, focusQuickToolsModifierInput, + isSelectedRangeDeletion, setQuickToolsModifierInputHandler, } from "cm/quickToolsModifierInput"; import { @@ -30,6 +32,7 @@ import { clearModifierState, clearQuickToolsButtonFeedback, removeActionStackEntries, + shouldCaptureModifierInput, } from "./quickToolsState"; export let quickToolUsed = false; @@ -69,13 +72,12 @@ quickTools.$input.addEventListener("input", (e) => { if (!key || key.length > 1) return; const keyCombination = getKeys({ key }); const target = getInput(); + const codeMirrorView = getCodeMirrorInputView(target); - if (isCodeMirrorEditorInput(target)) { - handleCodeMirrorQuickToolsTextInput( - editorManager.editor, - key, - keyCombination, - ); + if ( + codeMirrorView && + runCodeMirrorQuickToolsTextKey(codeMirrorView, key, keyCombination) + ) { return; } @@ -108,20 +110,27 @@ quickTools.$input.addEventListener("keydown", (e) => { e.preventDefault(); let target = getInput(); - if (isCodeMirrorEditorInput(target)) { + const codeMirrorView = getCodeMirrorInputView(target); + if (codeMirrorView) { try { - runCodeMirrorQuickToolKey(keyCode, keyCombination); + const handled = runQuickToolKey(codeMirrorView, keyCode, keyCombination); + if (!handled && !codeMirrorView.state.readOnly) { + target.dispatchEvent(KeyboardEvent("keydown", keyCombination)); + } } finally { - resetKeys(); - dismissReadOnlyQuickToolsInput(editorManager.editor); + if (codeMirrorView.state.readOnly) { + resetKeys(); + dismissReadOnlyQuickToolsInput(codeMirrorView); + } + setQuicktoolsUsed(); } return; } if (target === quickTools.$input) { - target = editorManager.editor.contentDOM; + target = editorManager.editor?.contentDOM; } - target.dispatchEvent(KeyboardEvent("keydown", keyCombination)); + target?.dispatchEvent(KeyboardEvent("keydown", keyCombination)); setQuicktoolsUsed(); }); @@ -244,7 +253,9 @@ export function cancelQuickToolsModifierInput() { const changed = clearQuickToolsModifierState(); quickTools.$input.value = ""; quickTools.$input.blur(); - dismissReadOnlyQuickToolsInput(editorManager.editor); + dismissReadOnlyQuickToolsInput( + getCodeMirrorInputView(input) || editorManager.editor, + ); return changed; } @@ -266,10 +277,19 @@ export default function actions(action, value) { state[action] = value; events[action].forEach((cb) => cb(value)); if (Object.values(state).includes(true)) { - if (isCodeMirrorEditorInput(input)) { - focusQuickToolsModifierInput(editor, $input); + const codeMirrorView = getCodeMirrorInputView(input); + const shouldCapture = + codeMirrorView?.state.readOnly || + shouldCaptureModifierInput(state, Boolean(codeMirrorView)); + if (shouldCapture) { + $input.value = ""; + if (codeMirrorView?.state.readOnly) { + focusQuickToolsModifierInput(codeMirrorView, $input); + } else { + $input.focus(); + } } else { - $input.focus(); + if (codeMirrorView) focusEditorIfEditable(codeMirrorView); } } else { restoreQuickToolsTargetFocus(); @@ -411,27 +431,36 @@ function setInput() { input = activeElement; } -function isCodeMirrorEditorInput(target) { - const { editor, activeFile } = editorManager; - if (!editor || activeFile?.type !== "editor") return false; - const contentDOM = editor.contentDOM; - return target === contentDOM || (contentDOM?.contains?.(target) ?? false); +function getCodeMirrorInputView(target) { + if (!(target instanceof HTMLElement)) return null; + const view = EditorView.findFromDOM(target); + if (!view?.contentDOM) return null; + return target === view.contentDOM || view.contentDOM.contains(target) + ? view + : null; } function runCodeMirrorQuickToolKey(keyCode, keyCombination) { - if (!isCodeMirrorEditorInput(input)) return false; - return runQuickToolKey(editorManager.editor, keyCode, keyCombination); + const view = getCodeMirrorInputView(input); + return view ? runQuickToolKey(view, keyCode, keyCombination) : false; } -export function handleCodeMirrorQuickToolsTextInput( - view, - text, - modifiers = null, -) { +export function handleCodeMirrorQuickToolsTextInput(view, input) { + if (!Object.values(state).includes(true)) return false; if (!view?.state || !view.contentDOM) return false; + if (isSelectedRangeDeletion(view, input)) { + setQuicktoolsUsed(); + return true; + } + + const { text } = input; if (!text || text.length !== 1) return false; - const keyCombination = modifiers || getKeys({ key: text }); + const keyCombination = getKeys({ key: text }); + return runCodeMirrorQuickToolsTextKey(view, text, keyCombination); +} + +function runCodeMirrorQuickToolsTextKey(view, text, keyCombination) { if (!hasQuickToolsModifier(keyCombination)) return false; const canEdit = canQuickToolsEdit(view); resetKeys(); @@ -921,8 +950,7 @@ function blockReadOnlyQuickToolsEdit(view) { } function isReadOnlyCodeMirrorInput(target) { - const { editor } = editorManager; - return isCodeMirrorEditorInput(target) && !!editor?.state?.readOnly; + return !!getCodeMirrorInputView(target)?.state.readOnly; } function dismissReadOnlyQuickToolsInput(view) { @@ -931,10 +959,10 @@ function dismissReadOnlyQuickToolsInput(view) { } function restoreQuickToolsTargetFocus() { - const { editor } = editorManager; - if (isCodeMirrorEditorInput(input) && editor) { - if (dismissReadOnlyQuickToolsInput(editor)) return; - focusEditorIfEditable(editor); + const codeMirrorView = getCodeMirrorInputView(input); + if (codeMirrorView) { + if (dismissReadOnlyQuickToolsInput(codeMirrorView)) return; + focusEditorIfEditable(codeMirrorView); return; } if (input) { diff --git a/src/handlers/quickToolsState.js b/src/handlers/quickToolsState.js index 7301aed0ab..fa9f67a0b9 100644 --- a/src/handlers/quickToolsState.js +++ b/src/handlers/quickToolsState.js @@ -1,5 +1,17 @@ export const modifierKeys = ["shift", "alt", "ctrl", "meta"]; +/** + * CodeMirror can safely receive Shift-only text because replacing the current + * selection is intentional. Command modifiers must capture text outside the + * contenteditable so Android keyboards cannot mutate the document first. + */ +export function shouldCaptureModifierInput(state, isCodeMirrorTarget) { + const hasActiveModifier = modifierKeys.some((key) => Boolean(state[key])); + if (!hasActiveModifier) return false; + if (!isCodeMirrorTarget) return true; + return Boolean(state.ctrl || state.alt || state.meta); +} + export function clearModifierState(state, events = {}) { let changed = false; diff --git a/src/test/editor.tests.js b/src/test/editor.tests.js index e9a6928494..2c712ac1ad 100644 --- a/src/test/editor.tests.js +++ b/src/test/editor.tests.js @@ -21,6 +21,10 @@ import { highlightSelectionMatches, searchKeymap } from "@codemirror/search"; import { Compartment, EditorSelection, EditorState } from "@codemirror/state"; import { EditorView, keymap, runScopeHandlers } from "@codemirror/view"; import createBaseExtensions from "cm/baseExtensions"; +import { + createEditorReadOnlyExtension, + reconfigureEditorReadOnly, +} from "cm/editorReadOnly"; import { copyLineDownFoldAware, copyLineUpFoldAware, @@ -35,6 +39,7 @@ import { keyBindingsConflict, toCodeMirrorKey, } from "cm/keyBindingUtils"; +import quickToolsModifierInput from "cm/quickToolsModifierInput"; import { findQuickToolCommand, getShortcutAlternatives, @@ -53,6 +58,11 @@ import { addPointerSelectionRange, getEdgeScrollDirections, } from "cm/touchSelectionMenu"; +import quickTools from "components/quickTools"; +import quickToolsActions, { + clearQuickToolsModifierState, + key as quickToolsKey, +} from "handlers/quickTools"; import keyBindings, { CODEMIRROR_COMMAND_NAMES } from "lib/keyBindings"; import { TestRunner } from "./tester"; @@ -116,6 +126,27 @@ export async function runCodeMirrorTests(writeOutput) { } } + function applyDetectedTextInput(view, { from, to, text }) { + let defaultTransaction; + const getDefaultTransaction = () => { + defaultTransaction ||= view.state.update({ + changes: { from, to, insert: text }, + selection: { anchor: from + text.length }, + }); + return defaultTransaction; + }; + const handled = view.state + .facet(EditorView.inputHandler) + .some((handler) => handler(view, from, to, text, getDefaultTransaction)); + if (!handled) view.dispatch(getDefaultTransaction()); + return handled; + } + + function dispatchQuickToolsTextInput(text) { + quickTools.$input.value = text; + quickTools.$input.dispatchEvent(new Event("input", { bubbles: true })); + } + // ========================================= // BASIC EDITOR TESTS // ========================================= @@ -631,6 +662,284 @@ export async function runCodeMirrorTests(writeOutput) { ); }); + runner.test( + "Quick tools Ctrl+C captures Android input outside CodeMirror", + async (test) => { + const doc = 'import { history } from "@codemirror/commands";'; + await withEditor( + test, + async (view) => { + const clipboard = cordova?.plugins?.clipboard; + test.assert( + typeof clipboard?.copy === "function", + "Cordova clipboard should be available", + ); + const originalCopy = clipboard.copy; + let copied = ""; + + try { + clipboard.copy = (text) => { + copied = text; + }; + clearQuickToolsModifierState(); + const from = doc.indexOf("codemirror"); + const to = from + "codemirror".length; + view.dispatch({ selection: { anchor: from, head: to } }); + view.focus(); + quickToolsActions("ctrl"); + + test.assert(quickToolsKey.ctrl, "Ctrl should be armed"); + test.assert( + document.activeElement === quickTools.$input, + "Command modifiers should focus the capture input", + ); + + dispatchQuickToolsTextInput("cc"); + test.assertEqual(view.state.doc.toString(), doc); + test.assertEqual(view.state.selection.main.from, from); + test.assertEqual(view.state.selection.main.to, to); + test.assert( + quickToolsKey.ctrl, + "Invalid captured input should leave Ctrl armed", + ); + + dispatchQuickToolsTextInput("c"); + test.assertEqual(copied, "codemirror"); + test.assertEqual(view.state.doc.toString(), doc); + test.assertEqual(view.state.selection.main.from, from); + test.assertEqual(view.state.selection.main.to, to); + test.assert(!quickToolsKey.ctrl, "Ctrl should reset after Copy"); + test.assert( + document.activeElement === view.contentDOM, + "Editor focus should be restored before Copy runs", + ); + + view.dispatch({ selection: { anchor: 0, head: doc.length } }); + quickToolsActions("ctrl"); + dispatchQuickToolsTextInput("c"); + test.assertEqual(copied, doc); + test.assertEqual(view.state.doc.toString(), doc); + test.assertEqual(view.state.selection.main.from, 0); + test.assertEqual(view.state.selection.main.to, doc.length); + + quickToolsActions("shift"); + test.assert( + document.activeElement === view.contentDOM, + "Shift-only input should stay in CodeMirror", + ); + quickToolsActions("ctrl"); + test.assert( + document.activeElement === quickTools.$input, + "Ctrl+Shift should use the capture input", + ); + quickToolsActions("ctrl"); + test.assert( + document.activeElement === view.contentDOM, + "Turning Ctrl off should restore Shift-only editor focus", + ); + } finally { + clipboard.copy = originalCopy; + clearQuickToolsModifierState(); + } + }, + doc, + [quickToolsModifierInput()], + ); + }, + ); + + runner.test( + "Quick tools modifier fallback holds Android split replacements", + async (test) => { + const doc = 'import { history } from "@codemirror/commands";'; + await withEditor( + test, + async (view) => { + const clipboard = cordova?.plugins?.clipboard; + test.assert( + typeof clipboard?.copy === "function", + "Cordova clipboard should be available", + ); + const originalCopy = clipboard.copy; + let copied = ""; + + try { + clipboard.copy = (text) => { + copied = text; + }; + view.dispatch({ selection: { anchor: 0, head: doc.length } }); + view.focus(); + clearQuickToolsModifierState(); + quickToolsActions("ctrl"); + view.focus(); + + test.assert( + applyDetectedTextInput(view, { + from: 0, + to: doc.length, + text: "", + }), + "Queued Android deletion should be held", + ); + test.assertEqual(view.state.doc.toString(), doc); + test.assert(quickToolsKey.ctrl, "Ctrl should remain armed"); + + test.assert( + applyDetectedTextInput(view, { + from: 0, + to: doc.length, + text: "c", + }), + "Queued Ctrl+C insertion should be handled", + ); + test.assertEqual(copied, doc); + test.assertEqual(view.state.doc.toString(), doc); + test.assertEqual(view.state.selection.main.from, 0); + test.assertEqual(view.state.selection.main.to, doc.length); + test.assert(!quickToolsKey.ctrl, "Ctrl should reset after Copy"); + } finally { + clipboard.copy = originalCopy; + clearQuickToolsModifierState(); + } + }, + doc, + [quickToolsModifierInput()], + ); + }, + ); + + runner.test( + "Quick tools capture keeps read-only selections unchanged", + async (test) => { + const doc = 'import { history } from "@codemirror/commands";'; + const readOnlyCompartment = new Compartment(); + await withEditor( + test, + async (view) => { + const clipboard = cordova?.plugins?.clipboard; + test.assert( + typeof clipboard?.copy === "function", + "Cordova clipboard should be available", + ); + const originalCopy = clipboard.copy; + const from = doc.indexOf("codemirror"); + const to = from + "codemirror".length; + let copied = ""; + + try { + clipboard.copy = (text) => { + copied = text; + }; + view.dispatch({ selection: { anchor: from, head: to } }); + view.focus(); + clearQuickToolsModifierState(); + quickToolsActions("ctrl"); + reconfigureEditorReadOnly(view, readOnlyCompartment, true); + + dispatchQuickToolsTextInput("c"); + test.assertEqual(copied, "codemirror"); + test.assertEqual(view.state.doc.toString(), doc); + test.assertEqual(view.state.selection.main.from, from); + test.assertEqual(view.state.selection.main.to, to); + test.assert(!view.hasFocus, "Read-only Copy must not focus the editor"); + + quickToolsActions("ctrl"); + dispatchQuickToolsTextInput("x"); + test.assertEqual(view.state.doc.toString(), doc); + test.assertEqual(view.state.selection.main.from, from); + test.assertEqual(view.state.selection.main.to, to); + test.assert(!view.hasFocus, "Read-only Cut must remain unfocused"); + + quickToolsActions("shift"); + dispatchQuickToolsTextInput("b"); + test.assertEqual(view.state.doc.toString(), doc); + test.assertEqual(view.state.selection.main.from, from); + test.assertEqual(view.state.selection.main.to, to); + test.assert(!view.hasFocus, "Read-only Shift must remain unfocused"); + } finally { + clipboard.copy = originalCopy; + clearQuickToolsModifierState(); + } + }, + doc, + [ + quickToolsModifierInput(), + readOnlyCompartment.of(createEditorReadOnlyExtension(false)), + ], + ); + }, + ); + + runner.test( + "Quick tools modifier input preserves Copy, Cut, Shift, and multi-selection", + async (test) => { + const doc = 'import { history } from "@codemirror/commands";'; + await withEditor( + test, + async (view) => { + const clipboard = cordova?.plugins?.clipboard; + const originalCopy = clipboard.copy; + let copied = ""; + + try { + clipboard.copy = (text) => { + copied = text; + }; + + const wordFrom = doc.indexOf("codemirror"); + const wordTo = wordFrom + "codemirror".length; + view.dispatch({ selection: { anchor: wordFrom, head: wordTo } }); + view.focus(); + clearQuickToolsModifierState(); + quickToolsActions("ctrl"); + dispatchQuickToolsTextInput("c"); + test.assertEqual(copied, "codemirror"); + test.assertEqual(view.state.doc.toString(), doc); + + view.dispatch({ selection: { anchor: 0, head: 6 } }); + quickToolsActions("ctrl"); + dispatchQuickToolsTextInput("x"); + test.assertEqual(copied, "import"); + test.assertEqual(view.state.doc.toString(), doc.slice(6)); + + quickToolsActions("ctrl"); + dispatchQuickToolsTextInput("z"); + test.assertEqual(view.state.doc.toString(), doc); + + view.dispatch({ + changes: { + from: 0, + to: view.state.doc.length, + insert: "one two three", + }, + selection: EditorSelection.create([ + EditorSelection.range(0, 3), + EditorSelection.range(8, 13), + ]), + }); + quickToolsActions("ctrl"); + dispatchQuickToolsTextInput("c"); + test.assertEqual(copied, "one\nthree"); + test.assertEqual(view.state.doc.toString(), "one two three"); + + view.dispatch({ + changes: { from: 0, to: view.state.doc.length, insert: "abc" }, + selection: { anchor: 1, head: 2 }, + }); + quickToolsActions("shift"); + applyDetectedTextInput(view, { from: 1, to: 2, text: "b" }); + test.assertEqual(view.state.doc.toString(), "aBc"); + } finally { + clipboard.copy = originalCopy; + clearQuickToolsModifierState(); + } + }, + doc, + [quickToolsModifierInput()], + ); + }, + ); + runner.test("Every CodeMirror command can be assigned a key", (test) => { const missingCommands = Array.from(CODEMIRROR_COMMAND_NAMES).filter( (name) => !keyBindings[name], diff --git a/tests/unit/quickToolsModifierInput.test.ts b/tests/unit/quickToolsModifierInput.test.ts new file mode 100644 index 0000000000..48742f7752 --- /dev/null +++ b/tests/unit/quickToolsModifierInput.test.ts @@ -0,0 +1,187 @@ +// @vitest-environment happy-dom + +import { javascript } from "@codemirror/lang-javascript"; +import { + defaultHighlightStyle, + syntaxHighlighting, +} from "@codemirror/language"; +import { EditorState } from "@codemirror/state"; +import { EditorView } from "@codemirror/view"; +import { afterEach, describe, expect, it } from "vitest"; +import quickToolsModifierInput, { + isSelectedRangeDeletion, + setQuickToolsModifierInputHandler, + type QuickToolsModifierInputContext, +} from "cm/quickToolsModifierInput"; + +function createView( + doc = "abcdef", + selection = { anchor: 1, head: 4 }, + extraExtensions = [], +) { + const parent = document.createElement("div"); + document.body.append(parent); + const state = EditorState.create({ + doc, + selection, + extensions: [quickToolsModifierInput(), ...extraExtensions], + }); + const view = new EditorView({ state, parent }); + return { view, parent }; +} + +function applyInput( + view: EditorView, + input: QuickToolsModifierInputContext, +): boolean { + const defaultInsert = () => + view.state.update({ + changes: { + from: input.from, + to: input.to, + insert: input.text, + }, + selection: { anchor: input.from + input.text.length }, + }); + const handled = view.state + .facet(EditorView.inputHandler) + .some((handler) => + handler( + view, + input.from, + input.to, + input.text, + defaultInsert, + ), + ); + if (!handled) view.dispatch(defaultInsert()); + return handled; +} + +afterEach(() => { + setQuickToolsModifierInputHandler(() => false); + document.body.replaceChildren(); +}); + +describe("quick-tools modifier input", () => { + it("recognizes only empty changes that cover the active selection", () => { + const { view } = createView(); + + expect( + isSelectedRangeDeletion(view, { from: 1, to: 4, text: "" }), + ).toBe(true); + expect( + isSelectedRangeDeletion(view, { from: 2, to: 4, text: "" }), + ).toBe(false); + expect( + isSelectedRangeDeletion(view, { from: 1, to: 4, text: "c" }), + ).toBe(false); + + view.dispatch({ selection: { anchor: 2 } }); + expect( + isSelectedRangeDeletion(view, { from: 1, to: 4, text: "" }), + ).toBe(false); + view.destroy(); + }); + + it("preserves selection across Android delete-then-copy input", () => { + const doc = 'import { history } from "@codemirror/commands";'; + const { view } = createView(doc, { anchor: 0, head: doc.length }); + let ctrlArmed = true; + let copied = ""; + + setQuickToolsModifierInputHandler((target, input) => { + if (!ctrlArmed) return false; + if (isSelectedRangeDeletion(target, input)) return true; + if (input.text !== "c") return false; + copied = target.state.sliceDoc( + target.state.selection.main.from, + target.state.selection.main.to, + ); + ctrlArmed = false; + return true; + }); + + expect(applyInput(view, { from: 0, to: doc.length, text: "" })).toBe( + true, + ); + expect(view.state.doc.toString()).toBe(doc); + expect(view.state.selection.main.from).toBe(0); + expect(view.state.selection.main.to).toBe(doc.length); + expect(ctrlArmed).toBe(true); + + expect(applyInput(view, { from: 0, to: doc.length, text: "c" })).toBe( + true, + ); + expect(copied).toBe(doc); + expect(view.state.doc.toString()).toBe(doc); + expect(view.state.selection.main.from).toBe(0); + expect(view.state.selection.main.to).toBe(doc.length); + expect(ctrlArmed).toBe(false); + view.destroy(); + }); + + it("lets CodeMirror restore a handled syntax-highlighted DOM replacement", async () => { + const doc = 'import { history } from "@codemirror/commands";'; + const from = doc.indexOf("codemirror"); + const to = from + "codemirror".length; + const { view } = createView(doc, { anchor: from, head: to }, [ + javascript(), + syntaxHighlighting(defaultHighlightStyle), + ]); + let receivedInput: QuickToolsModifierInputContext | null = null; + setQuickToolsModifierInputHandler((_target, input) => { + receivedInput = input; + return true; + }); + view.focus(); + await new Promise((resolve) => setTimeout(resolve, 10)); + const startState = view.state; + const stringSpan = Array.from(view.contentDOM.querySelectorAll("span")).find( + (element) => element.textContent?.includes("codemirror"), + ); + const textNode = stringSpan?.firstChild; + expect(textNode).not.toBeNull(); + + if (textNode) textNode.nodeValue = '"@c/commands"'; + await new Promise((resolve) => setTimeout(resolve, 20)); + + expect(receivedInput).toEqual({ from, to, text: "c" }); + expect(view.state).toBe(startState); + expect(view.state.doc.toString()).toBe(doc); + expect(view.contentDOM.textContent).toBe(doc); + expect(view.state.selection.main.from).toBe(from); + expect(view.state.selection.main.to).toBe(to); + view.destroy(); + }); + + it("does not add an extra transaction after an editing command", () => { + const updates = []; + const { view } = createView("abcdef", { anchor: 1, head: 4 }, [ + EditorView.updateListener.of((update) => updates.push(update)), + ]); + setQuickToolsModifierInputHandler((target, input) => { + target.dispatch({ + changes: { from: input.from, to: input.to, insert: "" }, + selection: { anchor: input.from }, + }); + return true; + }); + + expect(applyInput(view, { from: 1, to: 4, text: "x" })).toBe(true); + expect(view.state.doc.toString()).toBe("aef"); + expect(updates).toHaveLength(1); + view.destroy(); + }); + + it("allows normal unmodified deletion and typing", () => { + const { view } = createView(); + setQuickToolsModifierInputHandler(() => false); + + expect(applyInput(view, { from: 1, to: 4, text: "" })).toBe(false); + expect(view.state.doc.toString()).toBe("aef"); + expect(applyInput(view, { from: 1, to: 1, text: "z" })).toBe(false); + expect(view.state.doc.toString()).toBe("azef"); + view.destroy(); + }); +}); diff --git a/tests/unit/quickToolsReadOnly.test.ts b/tests/unit/quickToolsReadOnly.test.ts index 5a89cb861c..472c4b2a87 100644 --- a/tests/unit/quickToolsReadOnly.test.ts +++ b/tests/unit/quickToolsReadOnly.test.ts @@ -91,12 +91,19 @@ describe("read-only QuickTools interaction", () => { const handler = vi.fn(() => false); setQuickToolsModifierInputHandler(handler); const view = createEditor(true, [quickToolsModifierInput()]); + view.dispatch({ selection: EditorSelection.range(0, 5) }); const inputHandlers = view.state.facet(EditorView.inputHandler); const quickToolsHandler = inputHandlers.at(-1); - expect(quickToolsHandler?.(view, 0, 0, "X", () => null)).toBe(true); - expect(handler).toHaveBeenCalledWith(view, "X"); + expect(quickToolsHandler?.(view, 0, 5, "X", () => null)).toBe(true); + expect(handler).toHaveBeenCalledWith(view, { + from: 0, + to: 5, + text: "X", + }); expect(view.state.doc.toString()).toBe("alpha beta"); + expect(view.state.selection.main.from).toBe(0); + expect(view.state.selection.main.to).toBe(5); }); it("the user-change filter prevents selected text replacement", () => { diff --git a/tests/unit/quickToolsState.test.js b/tests/unit/quickToolsState.test.js index 14059d572a..8b0981d3e4 100644 --- a/tests/unit/quickToolsState.test.js +++ b/tests/unit/quickToolsState.test.js @@ -4,8 +4,56 @@ import { clearQuickToolsButtonFeedback, modifierKeys, removeActionStackEntries, + shouldCaptureModifierInput, } from "handlers/quickToolsState"; +describe("shouldCaptureModifierInput", () => { + const modifiers = (overrides = {}) => ({ + shift: false, + alt: false, + ctrl: false, + meta: false, + ...overrides, + }); + + it("captures command modifiers outside CodeMirror", () => { + expect( + shouldCaptureModifierInput(modifiers({ shift: true }), false), + ).toBe(true); + expect( + shouldCaptureModifierInput(modifiers({ ctrl: true }), false), + ).toBe(true); + }); + + it("keeps Shift-only text in CodeMirror", () => { + expect( + shouldCaptureModifierInput(modifiers({ shift: true }), true), + ).toBe(false); + }); + + it.each(["ctrl", "alt", "meta"])( + "captures CodeMirror input when %s is active", + (key) => { + expect( + shouldCaptureModifierInput(modifiers({ [key]: true }), true), + ).toBe(true); + }, + ); + + it("captures Shift combined with a command modifier", () => { + expect( + shouldCaptureModifierInput( + modifiers({ shift: true, ctrl: true }), + true, + ), + ).toBe(true); + }); + + it("does not capture when every modifier is cleared", () => { + expect(shouldCaptureModifierInput(modifiers(), true)).toBe(false); + }); +}); + describe("clearModifierState", () => { it("clears all modifiers and reports the change", () => { const state = { shift: true, alt: true, ctrl: true, meta: true }; From 78f5d44fb14f9ebb70738ba58937534269c6b25c Mon Sep 17 00:00:00 2001 From: Rohit Kushvaha Date: Fri, 14 Aug 2026 14:40:52 +0000 Subject: [PATCH 052/195] fix: migration (#2741) * fix: migration * Update src/plugins/terminal/www/Terminal.js Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --------- Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --- src/pages/fileBrowser/fileBrowser.js | 7 +++ src/plugins/terminal/scripts/init-sandbox.sh | 20 -------- src/plugins/terminal/www/Terminal.js | 52 ++++++++++++++++++++ 3 files changed, 59 insertions(+), 20 deletions(-) diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index 4ee9e5bd02..ee56da6a1e 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -1332,6 +1332,13 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { uuid: "terminal-public", }); } + + // Migrate any files left in the legacy alpine/home and + // alpine/root directories into public/MIGRATE so they are + // not hidden after the home/root/public merge. + if (typeof Terminal !== "undefined" && Terminal.migrateLegacyHome) { + Terminal.migrateLegacyHome(); + } } catch (err) { console.error("Error while adding public directory", err); } diff --git a/src/plugins/terminal/scripts/init-sandbox.sh b/src/plugins/terminal/scripts/init-sandbox.sh index b16096f12b..5e100ef9e4 100644 --- a/src/plugins/terminal/scripts/init-sandbox.sh +++ b/src/plugins/terminal/scripts/init-sandbox.sh @@ -4,26 +4,6 @@ mkdir -p "$PREFIX/tmp" mkdir -p "$PREFIX/alpine/tmp" mkdir -p "$PREFIX/public" -SRC1="$PREFIX/alpine/home" -SRC2="$PREFIX/alpine/root" -DEST="$PREFIX/public" - -mkdir -p "$DEST" - -move_all() { - SRC="$1" - - [ -d "$SRC" ] || return 0 - - # Only continue if directory is not empty - [ "$(find "$SRC" -mindepth 1 -maxdepth 1 | head -n 1)" ] || return 0 - - find "$SRC" -mindepth 1 -maxdepth 1 -exec mv -f {} "$DEST"/ \; -} - -move_all "$SRC1" -move_all "$SRC2" - export PROOT_TMP_DIR=$PREFIX/tmp if [ "$FDROID" = "true" ]; then diff --git a/src/plugins/terminal/www/Terminal.js b/src/plugins/terminal/www/Terminal.js index e6332b32fe..21ffde3755 100644 --- a/src/plugins/terminal/www/Terminal.js +++ b/src/plugins/terminal/www/Terminal.js @@ -21,6 +21,8 @@ const Terminal = { readAsset("init-sandbox.sh"), ]); + await this.migrateLegacyHome(); + const isFdroid = await Executor.execute("echo $FDROID"); if(isFdroid !== "true"){ @@ -567,6 +569,56 @@ const Terminal = { }); }, + /** + * Migrates the legacy terminal home directories into public/MIGRATE. + * Older builds stored user files under alpine/home and alpine/root. + * After /home, /root and /public were merged into a single public + * directory, any files still left in the old locations are copied + * into public/MIGRATE (keeping their source structure) so nothing is + * hidden or lost. This is a no-op once the migration has run. + * @returns {Promise} + */ + async migrateLegacyHome() { + if (this._legacyHomeMigrated) return; + try { + const cmd = ` + MIGRATE="$PREFIX/public/MIGRATE" + + # Already migrated + [ -e "$MIGRATE/.migrated" ] && exit 0 + + COPIED=false + + if [ -d "$PREFIX/alpine/home" ] && [ -n "$(find "$PREFIX/alpine/home" -mindepth 1 -maxdepth 1 2>/dev/null | head -n 1)" ]; then + mkdir -p "$MIGRATE/home" + if cp -a "$PREFIX/alpine/home/." "$MIGRATE/home/"; then + COPIED=true + else + exit 1 + fi + fi + + if [ -d "$PREFIX/alpine/root" ] && [ -n "$(find "$PREFIX/alpine/root" -mindepth 1 -maxdepth 1 2>/dev/null | head -n 1)" ]; then + mkdir -p "$MIGRATE/root" + if cp -a "$PREFIX/alpine/root/." "$MIGRATE/root/"; then + COPIED=true + else + exit 1 + fi + fi + + # Mark as migrated so this only runs once + if [ "$COPIED" = "true" ]; then + touch "$MIGRATE/.migrated" + fi + `; + await Executor.BackgroundExecutor.execute(cmd); + this._legacyHomeMigrated = true; + } catch (error) { + console.error("Failed to migrate legacy terminal home:", formatError(error)); + } + }, + formatError }; From 1123cecdb9f3b9b447e6948230ff202709dfa674 Mon Sep 17 00:00:00 2001 From: Brainlessnoobcoder Date: Fri, 14 Aug 2026 14:53:49 +0000 Subject: [PATCH 053/195] Hindi translation branch (#2742) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * hi-in translation, translated lines form line: 613 - line: 637. * Translate hi-in.json to Hindi (partial automated updates) What I changed: - Created and switched to branch 'ai_translation'. - Updated many remaining English values in src/lang/hi-in.json to Hindi translations. - Examples: "Commit message" → "कमिट संदेश", "branch" → "शाखा", "Header" → "हेडर", "Inapp" → "इन-ऐप", "Hard wrap" → "हार्ड रैप", "Line height" → "लाइन ऊँचाई", "App font" → "ऐप फ़ॉन्ट", "Just now" → "अभी", "Unknown" → "अज्ञात", "Command" → "कमांड", and several LSP / terminal labels translated. - Made a backup of the original file at src/lang/hi-in.json.bak before applying in-place edits. Notes and next steps: - The file contained a large number of strings; this commit applies focused replacements for many common English values and short phrases that remained. Some longer English sentences and niche keys may still be in English and may need a human review to ensure idiomatic Hindi and context-appropriate translations. - Request a review pass to finalize translations (edge cases, technical terms, and consistency with app UI). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * added .pnmp store to the .gitignore : line 26 also did hindi translation in hi-in.json files translated words randomly * Update src/lang/hi-in.json added missing comma to line 826! Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --------- Co-authored-by: Dnyaneshwar Waghmare Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> Co-authored-by: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> --- .gitignore | 4 +- src/lang/hi-in.json | 102 ++++++++++++++++++++++---------------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index e283a6fa2a..99babd15df 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,6 @@ local.properties tsconfig.tsbuildinfo .dev-cert.pem .dev-key.pem - /www/cordova.js -/www/cordova_plugins.js \ No newline at end of file +/www/cordova_plugins.js +.pnpm-store/ \ No newline at end of file diff --git a/src/lang/hi-in.json b/src/lang/hi-in.json index 794624bad6..bd1a21d6b5 100644 --- a/src/lang/hi-in.json +++ b/src/lang/hi-in.json @@ -12,7 +12,7 @@ "create folder error": "क्षमा करें, नया फ़ोल्डर बनाने में असमर्थ", "clear": "साफ करें", "close app": "एप्लिकेशन बंद करें?", - "commit message": "Commit message", + "commit message": "कमिट संदेश", "console": "कंसोल", "conflict error": "कॉन्फ्लिक्ट! अगली कमिट करने से पहले प्रतीक्षा करें।", "copy": "कापी", @@ -105,7 +105,7 @@ "create new branch": "नई शाखा बनाएं", "use branch": "शाखा का उपयोग करें", "new branch": "नई शाखा", - "branch": "branch", + "branch": "शाखा", "key bindings": "की बिंडिंग्स", "edit": "संपादित करें", "reset": "रीसेट", @@ -120,7 +120,7 @@ "unsupported device": "आपका डिवाइस थीम का समर्थन नहीं करता है।", "vibrate on tap": "टैप पर कंपन करें", "copy command is not supported by ftp.": "कॉपी कमांड एफ़टीपी द्वारा समर्थित नहीं है।", - "support title": "Support Acode", + "support title": "Acode का समर्थन", "fullscreen": "पूर्ण स्क्रीन", "animation": "एनीमेशन", "backup": "बैकअप", @@ -189,7 +189,7 @@ "feature not available": "यह सुविधा उपलब्ध नहीं है।", "feature available in paid version": "यह सुविधा ऐप के केवल भुगतान किए गए संस्करण में उपलब्ध है।", "deleted file": "हटाई गई फ़ाइल", - "line height": "Line height", + "line height": "लाइन ऊँचाई", "preview info": "यदि आप सक्रिय फ़ाइल चलाना चाहते हैं, तो प्ले आइकन पर टैप करके रखें।", "manage all files": "एकोड एडिटर को अपने उपकरण पर फाइल आसानी से मैनेज करने के लिए सेटिंग्स से अनुमति दे।", "close file": "फ़ाइल बंद करें", @@ -225,9 +225,9 @@ "loading plugins": "प्लगइन्स लोड हो रहा है", "faqs": "पूछे जाने वाले प्रश्न", "feedback": "प्रतिपुष्टि", - "header": "Header", + "header": "हेडर", "sidebar": "साइडबार", - "inapp": "Inapp", + "inapp": "इन-ऐप", "browser": "ब्राउज़र", "diagonal scrolling": "विकर्ण स्क्रॉलिंग", "reverse scrolling": "रिवर्स स्क्रॉलिंग", @@ -282,7 +282,7 @@ "relative line numbers": "सापेक्ष पंक्ति संख्या", "elastic tabstops": "इलास्टिक टैबस्टॉप्स", "line based rtl switching": "लाइन आधारित RTL स्विचिंग", - "hard wrap": "Hard wrap", + "hard wrap": "हार्ड रैप", "spellcheck": "Spellcheck", "wrap method": "Wrap Method", "use textarea for ime": "IME के लिए टेक्स्टएरिया इस्तेमाल करें", @@ -405,7 +405,7 @@ "bug_report": "बग रिपोर्ट सबमिट करें", "verified publisher": "सत्यापित प्रकाशक", "most_downloaded": "सर्वाधिक डाउनलोड", - "newly_added": "नया नया़ा", + "newly_added": "नया जोड़ा गया", "top_rated": "टॉप रेटेड", "rename not supported": "Termux डायरेक्टरी में रीनेम करना संभव नहीं है", "compress": "कम्प्रेस करें", @@ -588,7 +588,7 @@ "lsp-startup-timeout-set": "स्टार्टअप टाइमआउट {timeout} ms पर सेट किया गया", "lsp-state-disabled": "अक्षम", "lsp-state-enabled": "सक्षम", - "lsp-status": "Status", + "lsp-status": "स्थिति", "lsp-status-check-failed": "जांच विफल रही", "lsp-status-installed": "इंस्टॉल हो गया", "lsp-status-installed-version": "इंस्टॉल हो गया ({version})", @@ -610,31 +610,31 @@ "settings-category-assistance": "सहायता", "settings-category-core": "मुख्य सेटिंग्स", "settings-category-cursor": "कर्सर", - "settings-category-cursor-selection": "Cursor & selection", - "settings-category-custom-servers": "Custom servers", - "settings-category-customization-tools": "Customization & tools", - "settings-category-display": "Display", - "settings-category-editing": "Editing", - "settings-category-features": "Features", - "settings-category-files-sessions": "Files & sessions", - "settings-category-fonts": "Fonts", - "settings-category-general": "General", - "settings-category-guides-indicators": "Guides & indicators", - "settings-category-installation": "Installation", - "settings-category-interface": "Interface", - "settings-category-maintenance": "Maintenance", - "settings-category-permissions": "Permissions", - "settings-category-preview": "Preview", - "settings-category-scrolling": "Scrolling", - "settings-category-server": "Server", - "settings-category-servers": "Servers", - "settings-category-session": "Session", - "settings-category-support-acode": "Support Acode", - "settings-category-text-layout": "Text & layout", - "settings-info-app-animation": "Control transition animations across the app.", - "settings-info-app-check-files": "Refresh editors when files change outside Acode.", - "settings-info-app-clean-install-state": "Clear stored install state used by onboarding and setup flows.", - "settings-info-app-confirm-on-exit": "Ask before closing the app.", + "settings-category-cursor-selection": "कर्सर और चयन", + "settings-category-custom-servers": "कस्टम सर्वर्स", + "settings-category-customization-tools": "कस्टमाइज़ेशन और टूल्स", + "settings-category-display": "डिस्प्ले", + "settings-category-editing": "संपादन", + "settings-category-features": "फ़ीचर्स", + "settings-category-files-sessions": "फ़ाइल्स और सेशन्स।", + "settings-category-fonts": "फ़ॉन्ट्स", + "settings-category-general": "सामान्य", + "settings-category-guides-indicators": "गाइड और इंडिकेटर्स", + "settings-category-installation": "इंस्टॉलेशन", + "settings-category-interface": "इंटरफ़ेस", + "settings-category-maintenance": "मेंटेनेंस", + "settings-category-permissions": "अनुमतियाँ", + "settings-category-preview": "पूर्वावलोकन", + "settings-category-scrolling": "स्क्रॉलिंग", + "settings-category-server": "सर्वर", + "settings-category-servers": "सर्वर्स", + "settings-category-session": "सेशन", + "settings-category-support-acode": "एकोड का समर्थन करें", + "settings-category-text-layout": "टेक्स्ट और लेआउट", + "settings-info-app-animation": "पूरे ऐप में ट्रांज़िशन एनिमेशन को नियंत्रित करें।", + "settings-info-app-check-files": "जब फ़ाइलें एकोड के बाहर बदलें, तब एडिटर्स को रिफ़्रेश करें।", + "settings-info-app-clean-install-state": "ऑनबोर्डिंग और सेटअप फ़्लो द्वारा उपयोग की जाने वाली संग्रहीत इंस्टॉल स्थिति को साफ़ करें।", + "settings-info-app-confirm-on-exit": "ऐप बंद करने से पहले पूछें।", "settings-info-app-console": "Choose which debug console integration Acode uses.", "settings-info-app-default-file-encoding": "Default encoding when opening or creating files.", "settings-info-app-exclude-folders": "Skip folders and patterns while searching or scanning.", @@ -712,11 +712,11 @@ "settings-note-lsp-settings": "Language servers add autocomplete, diagnostics, hover details, and more. They work best with folders that Acode's built-in terminal can access directly, such as terminal/public folders. SAF, external, and remote locations are skipped by default because they may use cached or virtual paths; enable the compatibility option only if you want to try them.", "search result label singular": "result", "search result label plural": "results", - "pin tab": "Pin tab", - "unpin tab": "Unpin tab", - "pinned tab": "Pinned tab", + "pin tab": "टैब पिन करें", + "unpin tab": "टैब अनपिन करें", + "pinned tab": "पिन किया गया टैब", "unpin tab before closing": "Unpin the tab before closing it.", - "app font": "App font", + "app font": "ऐप फ़ॉन्ट", "settings-info-app-font-family": "Choose the font used across the app interface.", "lsp-transport-method-stdio": "STDIO (launch a binary command)", "lsp-transport-method-websocket": "WebSocket (connect to a ws/wss URL)", @@ -764,7 +764,7 @@ "settings-info-lsp-allow-non-terminal-workspace": "Allow language servers for SAF, external, and remote locations. LSP runs in Acode's built-in terminal, which cannot access those locations, so features may not work correctly. As it will connect to a virtual path or cache location.", "don't ask again": "Don't ask again", "scrollbar height": "Scrollbar height", - "full": "Full", + "full": "पूर्ण", "scroll past end": "Scroll past end", "settings-info-scroll-past-end": "Adds extra empty space at the bottom of the editor, allowing you to scroll the last line to the top.", "compact": "संक्षिप्त", @@ -787,8 +787,8 @@ "terminal:inactive underline": "Underline", "terminal:inactive bar": "Bar", "terminal:inactive none": "None", - "terminal:normal": "Normal", - "terminal:bold": "Bold", + "terminal:normal": "सामान्य", + "terminal:bold": "बोल्ड", "quicktools-trigger:click": "Click", "quicktools-trigger:touch": "Touch", "settings-info-terminal-uninstall": "Are you sure you want to uninstall the terminal?", @@ -803,7 +803,7 @@ "plugin updates": "Plugin Updates", "plugin updates singular": "1 plugin has a new version available.", "plugin updates plural": "{count} plugins have new versions available.", - "just now": "Just now", + "just now": "अभी", "day singular": "{count} day ago", "hour singular": "{count} hour ago", "min singular": "{count} minute ago", @@ -821,19 +821,19 @@ "note": "Note", "acode main process": "Acode main process", "ppid parent": "PPID (Parent)", - "unknown": "Unknown", - "just started": "Just Started", + "unknown": "अज्ञात", + "just started": "अभी शुरू हुआ", "diff days": "{days}d {hr}h ago", "diff hr": "{hr}h {min}m ago", "diff min": "{min}m {sec}s ago", "diff sec": "{sec}s ago", - "command": "Command", - "managed": "Managed", - "acode service": "Acode Service", - "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", + "command": "कमांड", + "managed": "मैनेज्ड", + "acode service": "Acode सेवा", + "info-terminal-show-scrollbar": "टर्मिनल के बगल में xterm स्क्रॉलबार दिखाएँ।", + "terminal:show scrollbar": "स्क्रॉलबार दिखाएँ", + "apply exclusions when copying": "कॉपी करते टाइम एक्सक्लूज़न्स अप्लाई करें", + "settings-info-app-use-file-operation-exclusions": "कॉपी और पेस्ट ऑपरेशन्स के दौरान एक्सक्लूज़न पैटर्न्स से मैच करने वाले फ़ाइल्स और फ़ोल्डर्स स्किप कर।", "horizontal scroll margin": "Horizontal scroll margin", "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." } From 99dd7be35dec4cf2134b8504e77b87e3069dbda6 Mon Sep 17 00:00:00 2001 From: AuDevTist1C <114492072+AuDevTist1C@users.noreply.github.com> Date: Fri, 14 Aug 2026 15:28:55 +0000 Subject: [PATCH 054/195] style: Fix "File content differs from formatting output" (#2744) --- src/test/editor.tests.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/test/editor.tests.js b/src/test/editor.tests.js index 2c712ac1ad..4003dfc8c2 100644 --- a/src/test/editor.tests.js +++ b/src/test/editor.tests.js @@ -841,7 +841,10 @@ export async function runCodeMirrorTests(writeOutput) { test.assertEqual(view.state.doc.toString(), doc); test.assertEqual(view.state.selection.main.from, from); test.assertEqual(view.state.selection.main.to, to); - test.assert(!view.hasFocus, "Read-only Copy must not focus the editor"); + test.assert( + !view.hasFocus, + "Read-only Copy must not focus the editor", + ); quickToolsActions("ctrl"); dispatchQuickToolsTextInput("x"); @@ -855,7 +858,10 @@ export async function runCodeMirrorTests(writeOutput) { test.assertEqual(view.state.doc.toString(), doc); test.assertEqual(view.state.selection.main.from, from); test.assertEqual(view.state.selection.main.to, to); - test.assert(!view.hasFocus, "Read-only Shift must remain unfocused"); + test.assert( + !view.hasFocus, + "Read-only Shift must remain unfocused", + ); } finally { clipboard.copy = originalCopy; clearQuickToolsModifierState(); From 9a50ac8c53868b951e8e615848e2420fd46931db Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Fri, 14 Aug 2026 15:54:05 +0000 Subject: [PATCH 055/195] bump: version to 1.13.0 (#2745) Co-authored-by: Ajit Kumar --- .babelrc | 40 ++++++++++++++++++++-------------------- bun.lock | 6 +++--- config.xml | 4 ++-- package-lock.json | 16 ++++++++-------- package.json | 2 +- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.babelrc b/.babelrc index 493f22b9ce..d505023162 100644 --- a/.babelrc +++ b/.babelrc @@ -1,20 +1,20 @@ -{ - "presets": [ - [ - "@babel/preset-env", - { - "useBuiltIns": "entry", - "corejs": "3.22" - } - ], - "@babel/preset-typescript" - ], - "plugins": [ - "html-tag-js/jsx/jsx-to-tag.js", - "html-tag-js/jsx/syntax-parser.js", - "@babel/plugin-transform-runtime", - "@babel/plugin-transform-block-scoping" - ], - "compact": false, - "sourceMaps": "inline" -} \ No newline at end of file +{ + "presets": [ + [ + "@babel/preset-env", + { + "useBuiltIns": "entry", + "corejs": "3.22" + } + ], + "@babel/preset-typescript" + ], + "plugins": [ + "html-tag-js/jsx/jsx-to-tag.js", + "html-tag-js/jsx/syntax-parser.js", + "@babel/plugin-transform-runtime", + "@babel/plugin-transform-block-scoping" + ], + "compact": true, + "sourceMaps": "inline" +} diff --git a/bun.lock b/bun.lock index 069d269005..33528b9faf 100644 --- a/bun.lock +++ b/bun.lock @@ -426,7 +426,7 @@ "@codemirror/lint": ["@codemirror/lint@6.9.7", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.42.0", "crelt": "^1.0.5" } }, "sha512-28/+iWLYxKxsvGYhSYL7zaCZqLz5+FFFDq9tVsvGv9kv8RY4fFAchJ5WX9M3YrrRlTIsECjsXPqeNgnSmNP2dg=="], - "@codemirror/lsp-client": ["@codemirror/lsp-client@github:Acode-Foundation/codemirror-lsp-client#db6930c", { "dependencies": { "@codemirror/autocomplete": "^6.20.0", "@codemirror/language": "^6.11.0", "@codemirror/lint": "^6.8.5", "@codemirror/state": "^6.5.2", "@codemirror/view": "^6.37.0", "@lezer/highlight": "^1.2.1", "marked": "^15.0.12", "vscode-languageserver-protocol": "^3.17.5" } }, "Acode-Foundation-codemirror-lsp-client-db6930c", "sha512-yENf3NqsXGERWcvUL98FziXbUgkB1R4jU2kTQGYxwcZ6HwTP8+uwebs/j+HDRD7VbxRyemYJClvMNU8n0p8UPg=="], + "@codemirror/lsp-client": ["@codemirror/lsp-client@github:Acode-Foundation/codemirror-lsp-client#db6930c", { "dependencies": { "@codemirror/autocomplete": "^6.20.0", "@codemirror/language": "^6.11.0", "@codemirror/lint": "^6.8.5", "@codemirror/state": "^6.5.2", "@codemirror/view": "^6.37.0", "@lezer/highlight": "^1.2.1", "marked": "^15.0.12", "vscode-languageserver-protocol": "^3.17.5" } }, "Acode-Foundation-codemirror-lsp-client-db6930c"], "@codemirror/search": ["@codemirror/search@6.7.1", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.37.0", "crelt": "^1.0.5" } }, "sha512-uMe5UO6PamJtSHrXhhHOzSX3ReWtiJrva6GnPMwSOrZtiExb5X5eExhr2OUZQVvdxPsKpY3Ro2mFbQadpPWmHA=="], @@ -866,7 +866,7 @@ "ajv-keywords": ["ajv-keywords@5.1.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3" }, "peerDependencies": { "ajv": "^8.8.2" } }, "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="], - "android-versions": ["android-versions@2.1.1", "", { "dependencies": { "semver": "^7.5.2" } }, "sha512-dYeO3KHDO81WvEwZFK+OF0dJl/ESvxV3QZE/qo/AAnG/uijco6DOXJJla3CdoC8Eg53YBlbRIyobRGYqIAGw8Q=="], + "android-versions": ["android-versions@2.2.1", "", { "dependencies": { "semver": "^7.5.2" } }, "sha512-FSSdICv/djaE7TuMpv6IWjbv2JwZxJJVQUGz0/9omi1cmdjrKC8tBFo8BZrUFMzZpGien0zQ6KGc4LtC+AC8jA=="], "ansi": ["ansi@0.3.1", "", {}, "sha512-iFY7JCgHbepc0b82yLaw4IMortylNb6wG4kL+4R0C3iv6i+RHGHux/yUX5BTiRvSX/shMnngjR1YyNMnXEFh5A=="], @@ -1234,7 +1234,7 @@ "decompress-response": ["decompress-response@3.3.0", "", { "dependencies": { "mimic-response": "^1.0.0" } }, "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA=="], - "dedent": ["dedent@1.7.1", "", { "peerDependencies": { "babel-plugin-macros": "^3.1.0" }, "optionalPeers": ["babel-plugin-macros"] }, "sha512-9JmrhGZpOlEgOLdQgSm0zxFaYoQon408V1v49aqTWuXENVlnCuY9JBZcXZiCsZQWDjTm5Qf/nIvAy77mXDAjEg=="], + "dedent": ["dedent@1.7.2", "", { "peerDependencies": { "babel-plugin-macros": "^3.1.0" }, "optionalPeers": ["babel-plugin-macros"] }, "sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA=="], "deep-eql": ["deep-eql@3.0.1", "", { "dependencies": { "type-detect": "^4.0.0" } }, "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="], diff --git a/config.xml b/config.xml index 1667557e80..d18556ae7d 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - @@ -90,4 +90,4 @@ - +
    \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2facaba1c1..55c54c8d89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "com.foxdebug.acode", - "version": "1.12.9", + "version": "1.13.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "com.foxdebug.acode", - "version": "1.12.9", + "version": "1.13.0", "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.20.3", @@ -6751,9 +6751,9 @@ } }, "node_modules/android-versions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-2.2.0.tgz", - "integrity": "sha512-lrad0HHmy9406sSmBHYIetx4n3WMnVVD+HMv7C+YJrByLFGPYWvlM1WcYrYL+e2s1GErvRF85nWsRY7RpwIGLw==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-2.2.1.tgz", + "integrity": "sha512-FSSdICv/djaE7TuMpv6IWjbv2JwZxJJVQUGz0/9omi1cmdjrKC8tBFo8BZrUFMzZpGien0zQ6KGc4LtC+AC8jA==", "dev": true, "license": "MIT", "dependencies": { @@ -16689,9 +16689,9 @@ } }, "node_modules/terser": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.49.0.tgz", - "integrity": "sha512-SNiDnXyHSrxVcIOtVbULzcTmniUiwcV7Nwdyj1twVubeTmbjoa8p69KKDpfkdoOavuM4/GRm1+ykI8qqnavHoA==", + "version": "5.50.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.50.0.tgz", + "integrity": "sha512-CN9BVxWhgS/hRxtUMjtC2uRWSTcSfQFHMDWma6sKKfIivCD91sM+FOPfvwoaRMqCSrUpe1nv3jDamd9eEQ4y+w==", "dev": true, "license": "BSD-2-Clause", "peer": true, diff --git a/package.json b/package.json index 30297fa42a..186eaf5205 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.foxdebug.acode", "displayName": "Acode", - "version": "1.12.9", + "version": "1.13.0", "description": "Acode is a code editor for android", "scripts": { "lang": "node ./utils/lang.js", From 60cd223d34fe8ffda45adf0870e208cf7639c270 Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Fri, 14 Aug 2026 17:48:38 +0000 Subject: [PATCH 056/195] fix: quicktools behaviour in read only more (#2747) Co-authored-by: Ajit Kumar --- .babelrc | 2 +- src/cm/editorReadOnly.ts | 39 ++- src/cm/touchSelectionMenu.js | 8 +- src/handlers/quickTools.js | 88 +++++++ src/handlers/readOnlyQuickToolsCapture.ts | 130 ++++++++++ tests/unit/editorReadOnly.test.ts | 53 +++- tests/unit/quickToolsReadOnly.test.ts | 56 +++++ tests/unit/readOnlyQuickToolsCapture.test.ts | 248 +++++++++++++++++++ 8 files changed, 599 insertions(+), 25 deletions(-) create mode 100644 src/handlers/readOnlyQuickToolsCapture.ts create mode 100644 tests/unit/readOnlyQuickToolsCapture.test.ts diff --git a/.babelrc b/.babelrc index d505023162..e5efe292f9 100644 --- a/.babelrc +++ b/.babelrc @@ -15,6 +15,6 @@ "@babel/plugin-transform-runtime", "@babel/plugin-transform-block-scoping" ], - "compact": true, + "compact": false, "sourceMaps": "inline" } diff --git a/src/cm/editorReadOnly.ts b/src/cm/editorReadOnly.ts index c5e94acd45..927b7a8e73 100644 --- a/src/cm/editorReadOnly.ts +++ b/src/cm/editorReadOnly.ts @@ -63,6 +63,18 @@ const readOnlyFocusGuard = EditorView.domEventHandlers({ }, }); +const readOnlyCursor = [ + EditorView.editorAttributes.of({ class: "cm-read-only" }), + EditorView.theme({ + "&.cm-read-only > .cm-scroller > .cm-cursorLayer": { + animation: "none", + }, + "&.cm-read-only > .cm-scroller > .cm-cursorLayer .cm-cursor": { + display: "block", + }, + }), +]; + /** * Keep CodeMirror's document and DOM editability in sync. */ @@ -71,7 +83,12 @@ export function createEditorReadOnlyExtension(readOnly: boolean): Extension { EditorState.readOnly.of(readOnly), EditorView.editable.of(!readOnly), ...(readOnly - ? [readOnlyFocusGuard, readOnlyInputGuard, readOnlyUserChangeFilter] + ? [ + readOnlyFocusGuard, + readOnlyInputGuard, + readOnlyUserChangeFilter, + readOnlyCursor, + ] : []), ]; } @@ -137,17 +154,17 @@ export function shouldCommitReadOnlyTap( return Math.hypot(end.x - start.x, end.y - start.y) <= maxDistance; } -/** Collapse an existing read-only selection without focusing or editing. */ -export function collapseReadOnlySelection( - view: EditorView, - pos: number, -): boolean { - if (!view.state.readOnly || view.state.selection.main.empty) return false; +/** Place the visual read-only cursor without focusing or editing. */ +export function placeReadOnlyCursor(view: EditorView, pos: number): boolean { + if (!view.state.readOnly) return false; const position = Math.max(0, Math.min(pos, view.state.doc.length)); - view.dispatch({ - selection: EditorSelection.cursor(position), - userEvent: "select.pointer", - }); + const selection = EditorSelection.single(position); + if (!view.state.selection.eq(selection)) { + view.dispatch({ + selection, + userEvent: "select.pointer", + }); + } blurEditorIfReadOnly(view, true); return true; } diff --git a/src/cm/touchSelectionMenu.js b/src/cm/touchSelectionMenu.js index 3e98096573..f99badae35 100644 --- a/src/cm/touchSelectionMenu.js +++ b/src/cm/touchSelectionMenu.js @@ -1,7 +1,7 @@ import { EditorSelection } from "@codemirror/state"; import { - collapseReadOnlySelection, focusEditorIfEditable, + placeReadOnlyCursor, resolveReadOnlyContextSelection, shouldCommitReadOnlyTap, } from "cm/editorReadOnly"; @@ -384,9 +384,7 @@ class TouchSelectionMenuController { #captureReadOnlyTap(event) { this.#readOnlyTapSession = null; - if (!this.#enabled || !this.#isReadOnly() || !this.#hasSelection()) { - return; - } + if (!this.#enabled || !this.#isReadOnly()) return; if (!(event.isTrusted && event.isPrimary)) return; if (typeof event.button === "number" && event.button !== 0) return; if (this.#canExtendSelection(event) || this.#canAddSelectionRange(event)) { @@ -440,7 +438,7 @@ class TouchSelectionMenuController { const pos = this.#safePosAtCoords(event.clientX, event.clientY); if (pos == null) return false; - if (!collapseReadOnlySelection(this.#view, pos)) return false; + if (!placeReadOnlyCursor(this.#view, pos)) return false; this.#menuRequested = false; this.#clearMenuShowTimer(); this.#hideMenu(true); diff --git a/src/handlers/quickTools.js b/src/handlers/quickTools.js index 42a8b9f382..00bcad9aa4 100644 --- a/src/handlers/quickTools.js +++ b/src/handlers/quickTools.js @@ -34,6 +34,10 @@ import { removeActionStackEntries, shouldCaptureModifierInput, } from "./quickToolsState"; +import { + captureReadOnlyQuickToolsKey, + createReadOnlyQuickToolsCaptureSession, +} from "./readOnlyQuickToolsCapture"; export let quickToolUsed = false; @@ -44,6 +48,8 @@ let quickToolUsedTimeout = null; let activeSearchState = null; /** @type {MutationObserver | null} */ let searchCloseVisibilityObserver = null; +/** @type {import("./readOnlyQuickToolsCapture").ReadOnlyQuickToolsCaptureSession | null} */ +let readOnlyCaptureSession = null; const state = { shift: false, @@ -66,7 +72,16 @@ setQuickToolsModifierInputHandler(handleCodeMirrorQuickToolsTextInput); * @typedef {(value: boolean)=>void} QuickToolsEventListener */ +quickTools.$input.addEventListener("beforeinput", (event) => { + handleReadOnlyQuickToolsCaptureEvent(event); +}); + +quickTools.$input.addEventListener("compositionend", (event) => { + handleReadOnlyQuickToolsCaptureEvent(event); +}); + quickTools.$input.addEventListener("input", (e) => { + if (handleReadOnlyQuickToolsCaptureEvent(e)) return; const key = e.target.value.toUpperCase(); quickTools.$input.value = ""; if (!key || key.length > 1) return; @@ -98,6 +113,7 @@ quickTools.$input.addEventListener("input", (e) => { }); quickTools.$input.addEventListener("keydown", (e) => { + if (handleReadOnlyQuickToolsCaptureEvent(e)) return; const { keyCode, key, which } = e; const keyCombination = getKeys({ keyCode, key, which }); @@ -245,11 +261,15 @@ export const key = { export function clearQuickToolsModifierState({ restoreFocus = false } = {}) { const changed = clearModifierState(state, events); + if (!restoreFocus || !readOnlyCaptureSession?.consumed) { + clearReadOnlyCaptureSession(); + } if (restoreFocus) restoreQuickToolsTargetFocus(); return changed; } export function cancelQuickToolsModifierInput() { + clearReadOnlyCaptureSession(); const changed = clearQuickToolsModifierState(); quickTools.$input.value = ""; quickTools.$input.blur(); @@ -284,14 +304,21 @@ export default function actions(action, value) { if (shouldCapture) { $input.value = ""; if (codeMirrorView?.state.readOnly) { + readOnlyCaptureSession = createReadOnlyQuickToolsCaptureSession( + codeMirrorView, + getQuickToolsModifierSnapshot(), + ); focusQuickToolsModifierInput(codeMirrorView, $input); } else { + clearReadOnlyCaptureSession(); $input.focus(); } } else { + clearReadOnlyCaptureSession(); if (codeMirrorView) focusEditorIfEditable(codeMirrorView); } } else { + clearReadOnlyCaptureSession(); restoreQuickToolsTargetFocus(); } @@ -440,6 +467,67 @@ function getCodeMirrorInputView(target) { : null; } +function handleReadOnlyQuickToolsCaptureEvent(event) { + const session = readOnlyCaptureSession; + if (!session) return false; + + const view = session.target; + if ( + !view?.state?.readOnly || + !view.contentDOM?.isConnected || + !view.dom?.isConnected + ) { + cancelQuickToolsModifierInput(); + preventCaptureInput(event); + return true; + } + + const result = captureReadOnlyQuickToolsKey(session, { + type: event.type, + key: event.key, + data: event.data, + value: quickTools.$input.value, + inputType: event.inputType, + isComposing: event.isComposing, + }); + readOnlyCaptureSession = result.session; + + if (result.outcome.kind === "pass") return false; + if (result.outcome.kind === "pending") { + if (!event.isComposing) { + quickTools.$input.value = ""; + if (event.type === "beforeinput") preventCaptureInput(event); + } + return true; + } + + quickTools.$input.value = ""; + preventCaptureInput(event); + if (result.outcome.kind === "duplicate") return true; + + const key = result.outcome.key.toUpperCase(); + const keyCombination = { key, ...session.modifiers }; + runCodeMirrorQuickToolsTextKey(view, key, keyCombination); + return true; +} + +function preventCaptureInput(event) { + if (event.cancelable) event.preventDefault(); +} + +function getQuickToolsModifierSnapshot() { + return { + shiftKey: state.shift, + altKey: state.alt, + ctrlKey: state.ctrl, + metaKey: state.meta, + }; +} + +function clearReadOnlyCaptureSession() { + readOnlyCaptureSession = null; +} + function runCodeMirrorQuickToolKey(keyCode, keyCombination) { const view = getCodeMirrorInputView(input); return view ? runQuickToolKey(view, keyCode, keyCombination) : false; diff --git a/src/handlers/readOnlyQuickToolsCapture.ts b/src/handlers/readOnlyQuickToolsCapture.ts new file mode 100644 index 0000000000..3b7c96b720 --- /dev/null +++ b/src/handlers/readOnlyQuickToolsCapture.ts @@ -0,0 +1,130 @@ +interface ReadOnlyCaptureTarget { + state?: { + readOnly?: boolean; + }; +} + +export interface QuickToolsModifierSnapshot { + shiftKey: boolean; + altKey: boolean; + ctrlKey: boolean; + metaKey: boolean; +} + +export interface ReadOnlyQuickToolsCaptureSession< + Target extends ReadOnlyCaptureTarget = ReadOnlyCaptureTarget, +> { + target: Target; + modifiers: QuickToolsModifierSnapshot; + consumed: boolean; +} + +export interface ReadOnlyQuickToolsCaptureEvent { + type: "keydown" | "beforeinput" | "input" | "compositionend"; + key?: string | null; + data?: string | null; + value?: string | null; + inputType?: string | null; + isComposing?: boolean; +} + +export type ReadOnlyQuickToolsCaptureOutcome = + | { kind: "key"; key: string } + | { kind: "pending" } + | { kind: "duplicate" } + | { kind: "pass" }; + +export interface ReadOnlyQuickToolsCaptureResult< + Target extends ReadOnlyCaptureTarget = ReadOnlyCaptureTarget, +> { + session: ReadOnlyQuickToolsCaptureSession; + outcome: ReadOnlyQuickToolsCaptureOutcome; +} + +/** + * Create a one-shot soft-keyboard capture only for a read-only CodeMirror + * target. Editable editors intentionally stay on the established QuickTools + * input path. + */ +export function createReadOnlyQuickToolsCaptureSession< + Target extends ReadOnlyCaptureTarget, +>( + target: Target | null | undefined, + modifiers: Partial, +): ReadOnlyQuickToolsCaptureSession | null { + if (!target?.state?.readOnly) return null; + return { + target, + modifiers: { + shiftKey: !!modifiers.shiftKey, + altKey: !!modifiers.altKey, + ctrlKey: !!modifiers.ctrlKey, + metaKey: !!modifiers.metaKey, + }, + consumed: false, + }; +} + +/** + * Normalize the event variants emitted by Android keyboards. A session is + * consumed by the first unambiguous character and then absorbs duplicate DOM + * events generated for that same keystroke. + */ +export function captureReadOnlyQuickToolsKey< + Target extends ReadOnlyCaptureTarget, +>( + session: ReadOnlyQuickToolsCaptureSession, + event: ReadOnlyQuickToolsCaptureEvent, +): ReadOnlyQuickToolsCaptureResult { + if (session.consumed) { + return { session, outcome: { kind: "duplicate" } }; + } + + if (event.type === "keydown") { + if (isCompositionKey(event.key)) { + return { session, outcome: { kind: "pending" } }; + } + // Gboard can mark a real printable key as composing. Waiting for + // compositionend here leaves the shortcut armed until the IME is dismissed. + const key = getSingleCharacter(event.key); + if (!key) return { session, outcome: { kind: "pass" } }; + return consumeSession(session, key); + } + + if (event.inputType?.startsWith("delete")) { + return { session, outcome: { kind: "pending" } }; + } + + if (event.data !== null && event.data !== undefined) { + // A single composition update is already an unambiguous shortcut key. + const key = getSingleCharacter(event.data); + return key + ? consumeSession(session, key) + : { session, outcome: { kind: "pending" } }; + } + + const key = getSingleCharacter(event.value); + return key + ? consumeSession(session, key) + : { session, outcome: { kind: "pending" } }; +} + +function consumeSession( + session: ReadOnlyQuickToolsCaptureSession, + key: string, +): ReadOnlyQuickToolsCaptureResult { + return { + session: { ...session, consumed: true }, + outcome: { kind: "key", key }, + }; +} + +function getSingleCharacter(value: string | null | undefined): string | null { + if (!value) return null; + const characters = Array.from(value); + return characters.length === 1 ? characters[0] : null; +} + +function isCompositionKey(key: string | null | undefined): boolean { + return key === "Dead" || key === "Process" || key === "Unidentified"; +} diff --git a/tests/unit/editorReadOnly.test.ts b/tests/unit/editorReadOnly.test.ts index 64f9524aa8..0ae77e8409 100644 --- a/tests/unit/editorReadOnly.test.ts +++ b/tests/unit/editorReadOnly.test.ts @@ -1,12 +1,12 @@ // @vitest-environment happy-dom import { Compartment, EditorSelection, EditorState } from "@codemirror/state"; -import { EditorView } from "@codemirror/view"; +import { drawSelection, EditorView } from "@codemirror/view"; import { - collapseReadOnlySelection, createEditorReadOnlyExtension, focusEditorIfEditable, isReadOnlyUserChange, + placeReadOnlyCursor, reconfigureEditorReadOnly, resolveReadOnlyContextSelection, shouldCommitReadOnlyTap, @@ -20,11 +20,14 @@ afterEach(() => { document.body.replaceChildren(); }); -function createEditor(readOnly = false) { +function createEditor(readOnly = false, doc = "read only content") { const compartment = new Compartment(); const state = EditorState.create({ - doc: "read only content", - extensions: [compartment.of(createEditorReadOnlyExtension(readOnly))], + doc, + extensions: [ + drawSelection(), + compartment.of(createEditorReadOnlyExtension(readOnly)), + ], }); const view = new EditorView({ state, parent: document.body }); views.push(view); @@ -37,6 +40,7 @@ function expectEditable(view: EditorView) { expect(view.contentDOM.getAttribute("contenteditable")).toBe("true"); expect(view.contentDOM.hasAttribute("aria-readonly")).toBe(false); expect(view.contentDOM.hasAttribute("tabindex")).toBe(false); + expect(view.dom.classList.contains("cm-read-only")).toBe(false); } function expectReadOnly(view: EditorView) { @@ -45,6 +49,7 @@ function expectReadOnly(view: EditorView) { expect(view.contentDOM.getAttribute("contenteditable")).toBe("false"); expect(view.contentDOM.getAttribute("aria-readonly")).toBe("true"); expect(view.contentDOM.hasAttribute("tabindex")).toBe(false); + expect(view.dom.classList.contains("cm-read-only")).toBe(true); } describe("editor read-only configuration", () => { @@ -67,6 +72,22 @@ describe("editor read-only configuration", () => { expect(view.state.doc.toString()).toBe(originalDocument); }); + it("reveals CodeMirror's static cursor only in read-only mode", () => { + const { compartment, view } = createEditor(true); + const cursorLayer = view.dom.querySelector(".cm-cursorLayer"); + expect(cursorLayer).not.toBeNull(); + const cursor = document.createElement("span"); + cursor.className = "cm-cursor cm-cursor-primary"; + cursorLayer!.append(cursor); + + expect(getComputedStyle(cursor).display).toBe("block"); + expect(view.hasFocus).toBe(false); + + reconfigureEditorReadOnly(view, compartment, false); + expect(view.dom.classList.contains("cm-read-only")).toBe(false); + expect(getComputedStyle(cursor).display).toBe("none"); + }); + it("blocks user document changes but permits internal synchronization", () => { const { view } = createEditor(true); view.dispatch({ selection: EditorSelection.range(0, 4) }); @@ -125,17 +146,33 @@ describe("editor read-only configuration", () => { expect(editable.hasFocus).toBe(true); }); - it("collapses a read-only selection without editing or focusing", () => { + it("places a read-only cursor without editing or focusing", () => { const { view } = createEditor(true); view.dispatch({ selection: EditorSelection.range(0, 4) }); const originalDocument = view.state.doc.toString(); - expect(collapseReadOnlySelection(view, 7)).toBe(true); + expect(placeReadOnlyCursor(view, 7)).toBe(true); expect(view.state.selection.main.empty).toBe(true); expect(view.state.selection.main.head).toBe(7); expect(view.state.doc.toString()).toBe(originalDocument); expect(view.hasFocus).toBe(false); - expect(collapseReadOnlySelection(view, 2)).toBe(false); + + expect(placeReadOnlyCursor(view, 2)).toBe(true); + expect(view.state.selection.main.head).toBe(2); + expect(placeReadOnlyCursor(view, 2)).toBe(true); + expect(view.state.doc.toString()).toBe(originalDocument); + }); + + it("clamps cursor placement in an empty document and declines editable views", () => { + const readOnly = createEditor(true, "").view; + const editable = createEditor(false).view; + + expect(placeReadOnlyCursor(readOnly, 10)).toBe(true); + expect(readOnly.state.selection.main.head).toBe(0); + expect(readOnly.hasFocus).toBe(false); + + expect(placeReadOnlyCursor(editable, 5)).toBe(false); + expect(editable.state.selection.main.head).toBe(0); }); it("accepts only uncancelled short primary taps", () => { diff --git a/tests/unit/quickToolsReadOnly.test.ts b/tests/unit/quickToolsReadOnly.test.ts index 472c4b2a87..bfc01870d0 100644 --- a/tests/unit/quickToolsReadOnly.test.ts +++ b/tests/unit/quickToolsReadOnly.test.ts @@ -11,6 +11,10 @@ import quickToolsModifierInput, { setQuickToolsModifierInputHandler, } from "cm/quickToolsModifierInput"; import { runQuickToolKey } from "cm/quickToolsNavigation"; +import { + captureReadOnlyQuickToolsKey, + createReadOnlyQuickToolsCaptureSession, +} from "handlers/readOnlyQuickToolsCapture"; import { afterEach, describe, expect, it, vi } from "vitest"; vi.mock("utils/keyboardEvent", () => ({ @@ -50,6 +54,58 @@ describe("read-only QuickTools interaction", () => { expect(view.hasFocus).toBe(false); }); + it("executes a captured Ctrl+A once across duplicate Android events", () => { + const view = createEditor(true, [ + keymap.of([{ key: "Ctrl-a", run: selectAll }]), + ]); + const captureInput = document.createElement("textarea"); + document.body.append(captureInput); + const originalDocument = view.state.doc.toString(); + let session = createReadOnlyQuickToolsCaptureSession(view, { + ctrlKey: true, + }); + let commandRuns = 0; + + expect(session).not.toBeNull(); + expect(focusQuickToolsModifierInput(view, captureInput)).toBe(true); + if (!session) return; + + for (const event of [ + { + type: "keydown" as const, + key: "Process", + isComposing: true, + }, + { + type: "beforeinput" as const, + data: "a", + inputType: "insertCompositionText", + isComposing: true, + }, + { + type: "input" as const, + data: "a", + value: "a", + isComposing: true, + }, + { type: "compositionend" as const, data: "a" }, + ]) { + const result = captureReadOnlyQuickToolsKey(session, event); + session = result.session; + if (result.outcome.kind !== "key") continue; + commandRuns += 1; + runQuickToolKey(view, 65, session.modifiers); + finishQuickToolsModifierInput(view, captureInput); + } + + expect(commandRuns).toBe(1); + expect(view.state.selection.main.from).toBe(0); + expect(view.state.selection.main.to).toBe(view.state.doc.length); + expect(view.state.doc.toString()).toBe(originalDocument); + expect(document.activeElement).not.toBe(captureInput); + expect(view.hasFocus).toBe(false); + }); + it("allows selection navigation but blocks deletion", () => { const view = createEditor(true); view.dispatch({ selection: EditorSelection.cursor(0) }); diff --git a/tests/unit/readOnlyQuickToolsCapture.test.ts b/tests/unit/readOnlyQuickToolsCapture.test.ts new file mode 100644 index 0000000000..c11395c90e --- /dev/null +++ b/tests/unit/readOnlyQuickToolsCapture.test.ts @@ -0,0 +1,248 @@ +import { describe, expect, it } from "vitest"; +import { + captureReadOnlyQuickToolsKey, + createReadOnlyQuickToolsCaptureSession, +} from "handlers/readOnlyQuickToolsCapture"; + +const modifiers = { + shiftKey: false, + altKey: false, + ctrlKey: true, + metaKey: false, +}; + +function readOnlyTarget() { + return { state: { readOnly: true } }; +} + +describe("read-only QuickTools capture", () => { + it("declines editable targets", () => { + expect( + createReadOnlyQuickToolsCaptureSession( + { state: { readOnly: false } }, + modifiers, + ), + ).toBeNull(); + }); + + it.each([ + ["keydown", { key: "a" }], + ["beforeinput", { data: "a", inputType: "insertText" }], + ["input", { data: "a", inputType: "insertText" }], + ["compositionend", { data: "a" }], + ])("captures one key from %s", (type, event) => { + const session = createReadOnlyQuickToolsCaptureSession( + readOnlyTarget(), + modifiers, + ); + expect(session).not.toBeNull(); + + if (session) { + const result = captureReadOnlyQuickToolsKey(session, { + type: type as "keydown" | "beforeinput" | "input" | "compositionend", + ...event, + }); + expect(result.outcome).toEqual({ kind: "key", key: "a" }); + expect(result.session.consumed).toBe(true); + } + }); + + it("prefers event data over a stale textarea value", () => { + const session = createReadOnlyQuickToolsCaptureSession( + readOnlyTarget(), + modifiers, + ); + expect(session).not.toBeNull(); + + if (session) { + const result = captureReadOnlyQuickToolsKey(session, { + type: "input", + data: "a", + value: "stale-a", + }); + expect(result.outcome).toEqual({ kind: "key", key: "a" }); + } + }); + + it("uses the textarea only when event data is unavailable", () => { + const session = createReadOnlyQuickToolsCaptureSession( + readOnlyTarget(), + modifiers, + ); + expect(session).not.toBeNull(); + + if (session) { + const result = captureReadOnlyQuickToolsKey(session, { + type: "input", + data: null, + value: "a", + }); + expect(result.outcome).toEqual({ kind: "key", key: "a" }); + } + }); + + it.each([ + { type: "input", data: "", value: "a" }, + { type: "input", data: "aa", value: "a" }, + { type: "input", data: null, value: "aa" }, + { + type: "beforeinput", + data: null, + value: "a", + inputType: "deleteContentBackward", + }, + ])("keeps ambiguous or deletion-only input armed", (event) => { + const session = createReadOnlyQuickToolsCaptureSession( + readOnlyTarget(), + modifiers, + ); + expect(session).not.toBeNull(); + + if (session) { + const result = captureReadOnlyQuickToolsKey(session, { + ...event, + type: event.type as "beforeinput" | "input", + }); + expect(result.outcome).toEqual({ kind: "pending" }); + expect(result.session.consumed).toBe(false); + } + }); + + it("accepts a valid key after an ambiguous event", () => { + const session = createReadOnlyQuickToolsCaptureSession( + readOnlyTarget(), + modifiers, + ); + expect(session).not.toBeNull(); + + if (session) { + const ambiguous = captureReadOnlyQuickToolsKey(session, { + type: "input", + data: null, + value: "aa", + }); + expect(ambiguous.outcome).toEqual({ kind: "pending" }); + + const valid = captureReadOnlyQuickToolsKey(ambiguous.session, { + type: "input", + data: "a", + value: "a", + }); + expect(valid.outcome).toEqual({ kind: "key", key: "a" }); + expect(valid.session.consumed).toBe(true); + } + }); + + it("captures the first usable character from an Android composition", () => { + const session = createReadOnlyQuickToolsCaptureSession( + readOnlyTarget(), + modifiers, + ); + expect(session).not.toBeNull(); + + if (session) { + const processKey = captureReadOnlyQuickToolsKey(session, { + type: "keydown", + key: "Process", + isComposing: true, + }); + expect(processKey.outcome).toEqual({ kind: "pending" }); + + const beforeInput = captureReadOnlyQuickToolsKey(processKey.session, { + type: "beforeinput", + data: "a", + inputType: "insertCompositionText", + isComposing: true, + }); + expect(beforeInput.outcome).toEqual({ kind: "key", key: "a" }); + + const input = captureReadOnlyQuickToolsKey(beforeInput.session, { + type: "input", + data: "a", + inputType: "insertCompositionText", + isComposing: true, + }); + expect(input.outcome).toEqual({ kind: "duplicate" }); + + const completed = captureReadOnlyQuickToolsKey(input.session, { + type: "compositionend", + data: "a", + }); + expect(completed.outcome).toEqual({ kind: "duplicate" }); + } + }); + + it("accepts a printable composing keydown immediately", () => { + const session = createReadOnlyQuickToolsCaptureSession( + readOnlyTarget(), + modifiers, + ); + expect(session).not.toBeNull(); + + if (session) { + const result = captureReadOnlyQuickToolsKey(session, { + type: "keydown", + key: "a", + isComposing: true, + }); + expect(result.outcome).toEqual({ kind: "key", key: "a" }); + } + }); + + it("uses a single textarea character during composition when data is null", () => { + const session = createReadOnlyQuickToolsCaptureSession( + readOnlyTarget(), + modifiers, + ); + expect(session).not.toBeNull(); + + if (session) { + const result = captureReadOnlyQuickToolsKey(session, { + type: "input", + data: null, + value: "a", + isComposing: true, + }); + expect(result.outcome).toEqual({ kind: "key", key: "a" }); + } + }); + + it("passes non-printable keydown events to existing navigation handling", () => { + const session = createReadOnlyQuickToolsCaptureSession( + readOnlyTarget(), + modifiers, + ); + expect(session).not.toBeNull(); + + if (session) { + const result = captureReadOnlyQuickToolsKey(session, { + type: "keydown", + key: "ArrowRight", + }); + expect(result.outcome).toEqual({ kind: "pass" }); + expect(result.session.consumed).toBe(false); + } + }); + + it("absorbs duplicate events after the first captured key", () => { + const session = createReadOnlyQuickToolsCaptureSession( + readOnlyTarget(), + modifiers, + ); + expect(session).not.toBeNull(); + + if (session) { + const first = captureReadOnlyQuickToolsKey(session, { + type: "beforeinput", + data: "a", + }); + const duplicate = captureReadOnlyQuickToolsKey(first.session, { + type: "input", + data: "a", + value: "a", + }); + expect(duplicate.outcome).toEqual({ kind: "duplicate" }); + expect(duplicate.session.consumed).toBe(true); + } + }); +}); From 18a106abcdea257fa7b58445afd6b90417dabab3 Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Fri, 14 Aug 2026 18:13:51 +0000 Subject: [PATCH 057/195] bump: version to 1.13.1 (#2749) * bump: version to 1.13.1 * Update config.xml Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> * revert launcher icon --------- Co-authored-by: Ajit Kumar Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --- .babelrc | 2 +- config.xml | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.babelrc b/.babelrc index e5efe292f9..d505023162 100644 --- a/.babelrc +++ b/.babelrc @@ -15,6 +15,6 @@ "@babel/plugin-transform-runtime", "@babel/plugin-transform-block-scoping" ], - "compact": false, + "compact": true, "sourceMaps": "inline" } diff --git a/config.xml b/config.xml index d18556ae7d..45f6f86385 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - diff --git a/package-lock.json b/package-lock.json index 55c54c8d89..4cdb90b9e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "com.foxdebug.acode", - "version": "1.13.0", + "version": "1.13.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "com.foxdebug.acode", - "version": "1.13.0", + "version": "1.13.1", "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.20.3", diff --git a/package.json b/package.json index 186eaf5205..f34c2faf1b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.foxdebug.acode", "displayName": "Acode", - "version": "1.13.0", + "version": "1.13.1", "description": "Acode is a code editor for android", "scripts": { "lang": "node ./utils/lang.js", From 6abb2b77c779c92dd9a5d73d751d5f20e8c508e9 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Mon, 17 Aug 2026 12:40:09 +0000 Subject: [PATCH 058/195] feat: stabilize SFTP and add secure SSH terminal integration (#2694) * fix(sftp): stabilize connections and storage cleanup * feat(ssh): add remote terminal sessions * feat(sftp): secure profiles and verify host keys * refactor(sftp): keep SSH secrets in native storage * perf(sftp): run legacy profile migration once * fix(sftp): restore secure native profile flow * refactor(sftp): use themed secure profile form * fix(sftp): prevent crash on interrupted listings * perf(files): stabilize remote workspace indexing * fix(ssh): open terminal in selected remote directory --- src/components/terminal/terminal.js | 138 +++ src/components/terminal/terminalManager.js | 65 +- src/dialogs/multiPrompt.js | 22 +- src/fileSystem/sftp.js | 144 ++- src/lib/fileList.js | 202 +++- src/lib/openFolder.js | 34 +- src/lib/recents.js | 2 +- src/lib/remoteStorage.js | 279 +++-- src/lib/sftpProfiles.js | 213 ++++ src/main.js | 4 + src/pages/fileBrowser/fileBrowser.js | 70 +- .../android/EncryptedPreferenceManager.java | 38 +- src/plugins/sftp/index.d.ts | 57 +- src/plugins/sftp/plugin.xml | 3 +- .../sftp/src/com/foxdebug/sftp/Sftp.java | 1056 ++++++++++++++--- .../com/foxdebug/sftp/SftpSecurityStore.java | 75 ++ src/plugins/sftp/www/sftp.js | 51 +- src/utils/Url.js | 18 + src/utils/shell.js | 13 + tests/unit/sftpProfiles.test.js | 135 +++ tests/unit/shell.test.js | 22 + tests/unit/url.test.js | 26 + 22 files changed, 2148 insertions(+), 519 deletions(-) create mode 100644 src/lib/sftpProfiles.js create mode 100644 src/plugins/sftp/src/com/foxdebug/sftp/SftpSecurityStore.java create mode 100644 src/utils/shell.js create mode 100644 tests/unit/sftpProfiles.test.js create mode 100644 tests/unit/shell.test.js diff --git a/src/components/terminal/terminal.js b/src/components/terminal/terminal.js index ca77d45814..dca6f15b44 100644 --- a/src/components/terminal/terminal.js +++ b/src/components/terminal/terminal.js @@ -19,6 +19,7 @@ import { import confirm from "dialogs/confirm"; import fonts from "lib/fonts"; import appSettings from "lib/settings"; +import { quotePosixShellArg } from "utils/shell"; import LigaturesAddon from "./ligatures"; import { DEFAULT_TERMINAL_SETTINGS, @@ -67,6 +68,9 @@ export default class TerminalComponent { this.pid = null; this.isConnected = false; this.serverMode = options.serverMode !== false; // Default true + this.remoteSsh = options.remoteSsh || null; + this.remoteShellId = null; + this.remoteInputDisposable = null; this.touchSelection = null; this.touchScrolling = null; this.parsedAppKeybindings = []; @@ -811,6 +815,9 @@ export default class TerminalComponent { "Terminal is in local mode, cannot connect to server session", ); } + if (this.remoteSsh) { + return this.connectToRemoteShell(); + } if (!pid) { pid = await this.createSession(); @@ -925,6 +932,102 @@ export default class TerminalComponent { }); } + /** + * Connect xterm to an interactive Maverick SSH shell. + */ + connectToRemoteShell() { + const profile = this.remoteSsh; + if (!profile) throw new Error("SSH profile is required"); + + return new Promise((resolve, reject) => { + let settled = false; + const finishConnecting = (event) => { + this.remoteInputDisposable = this.terminal.onData((data) => { + if (!this.isConnected || !this.remoteShellId) return; + sftp.writeShell( + this.remoteShellId, + data, + () => {}, + (error) => this.onError?.(error), + ); + }); + this.terminal.unicode.activeVersion = "11"; + this.terminal.focus(); + void this.fitAndResizeTerminal(true); + this.onConnect?.(); + settled = true; + resolve(event.sessionId); + }; + const onEvent = (event) => { + switch (event?.type) { + case "ready": + this.remoteShellId = event.sessionId; + this.pid = `ssh:${event.sessionId}`; + this.isConnected = true; + if (profile.initialDirectory && profile.initialDirectory !== "/") { + try { + sftp.writeShell( + event.sessionId, + `cd ${quotePosixShellArg(profile.initialDirectory)}\n`, + () => finishConnecting(event), + onFailure, + ); + } catch (error) { + onFailure(error?.message); + } + break; + } + finishConnecting(event); + break; + + case "data": { + const binary = atob(event.data || ""); + const bytes = Uint8Array.from(binary, (char) => char.charCodeAt(0)); + this.terminal.write(bytes); + break; + } + + case "exit": + this.isConnected = false; + this.processExited = true; + if (!this.intentionalClose) { + this.onProcessExit?.({ exit_code: event.exitCode }); + } + break; + + case "error": { + const error = new Error(event.message || "SSH shell error"); + this.isConnected = false; + if (!settled) reject(error); + else if (!this.intentionalClose) this.onError?.(error); + break; + } + } + }; + + const onFailure = (message) => { + const error = new Error( + typeof message === "string" ? message : "Failed to open SSH shell", + ); + this.isConnected = false; + if (!settled) reject(error); + else if (!this.intentionalClose) this.onError?.(error); + }; + + const openShell = () => { + sftp.openShellUsingProfile( + profile.profileId, + this.terminal.cols, + this.terminal.rows, + onEvent, + onFailure, + ); + }; + + openShell(); + }); + } + /** * Resize terminal * @param {number} cols - Number of columns @@ -936,6 +1039,20 @@ export default class TerminalComponent { const resizeKey = `${cols}x${rows}`; if (!force && this.lastRequestedServerSize === resizeKey) return; this.lastRequestedServerSize = resizeKey; + if (this.remoteSsh) { + if (!this.remoteShellId) return; + sftp.resizeShell( + this.remoteShellId, + cols, + rows, + () => {}, + (error) => { + this.lastRequestedServerSize = null; + this.onError?.(error); + }, + ); + return; + } try { await new Promise((resolve, reject) => { @@ -997,6 +1114,15 @@ export default class TerminalComponent { * @param {string} data - Data to write */ write(data) { + if (this.remoteSsh && this.isConnected && this.remoteShellId) { + sftp.writeShell( + this.remoteShellId, + data, + () => {}, + (error) => this.onError?.(error), + ); + return; + } if ( this.serverMode && this.isConnected && @@ -1295,6 +1421,18 @@ export default class TerminalComponent { */ async terminate() { this.intentionalClose = true; + this.remoteInputDisposable?.dispose?.(); + this.remoteInputDisposable = null; + + if (this.remoteShellId) { + const shellID = this.remoteShellId; + this.remoteShellId = null; + this.isConnected = false; + await new Promise((resolve) => { + sftp.closeShell(shellID, resolve, resolve); + }); + return; + } if (this.websocket) { try { diff --git a/src/components/terminal/terminalManager.js b/src/components/terminal/terminalManager.js index 6326266582..63f05d44a0 100644 --- a/src/components/terminal/terminalManager.js +++ b/src/components/terminal/terminalManager.js @@ -13,6 +13,7 @@ import openFile from "lib/openFile"; import openFolder from "lib/openFolder"; import appSettings from "lib/settings"; import helpers from "utils/helpers"; +import Url from "utils/Url"; import TerminalComponent from "./terminal"; import TerminalTouchSelection from "./terminalTouchSelection"; @@ -276,6 +277,7 @@ class TerminalManager { const shouldRender = render !== false; const isServerMode = serverMode !== false; const isReconnecting = reconnecting === true; + const isRemoteSsh = !!terminalOptions.remoteSsh; const terminalId = `terminal_${++this.terminalCounter}`; const providedName = @@ -289,7 +291,7 @@ class TerminalManager { : terminalName; // Check if terminal is installed before proceeding - if (isServerMode) { + if (isServerMode && !isRemoteSsh) { const installationResult = await this.checkAndInstallTerminal(); if (!installationResult.success) { throw new Error(installationResult.error); @@ -369,7 +371,11 @@ class TerminalManager { this.terminals.set(uniqueId, instance); - if (terminalComponent.serverMode && terminalComponent.pid) { + if ( + terminalComponent.serverMode && + !terminalComponent.remoteSsh && + terminalComponent.pid + ) { await this.persistTerminalSession( terminalComponent.pid, terminalName, @@ -399,7 +405,7 @@ class TerminalManager { } // Show alert for terminal creation failure - if (!isReconnecting) { + if (!isReconnecting && !error?.reported) { const errorMessage = error?.message || "Unknown error"; alert( strings["error"], @@ -831,7 +837,11 @@ class TerminalManager { const formattedTitle = `${titlePrefix} - ${title}`; terminalFile.filename = formattedTitle; - if (terminalComponent.serverMode && terminalComponent.pid) { + if ( + terminalComponent.serverMode && + !terminalComponent.remoteSsh && + terminalComponent.pid + ) { await this.persistTerminalSession( terminalComponent.pid, formattedTitle, @@ -870,6 +880,9 @@ class TerminalManager { // Handle acode CLI open commands (OSC 7777) terminalComponent.onOscOpen = async (type, path) => { + // OSC 7777 is an Acode-local CLI protocol. Remote hosts must not use it + // to request access to paths on the Android device. + if (terminalComponent.remoteSsh) return; if (!path) return; // Convert proot path @@ -899,6 +912,10 @@ class TerminalManager { // Set up custom title function for terminal const getTerminalTitle = () => { + if (terminalComponent.remoteSsh) { + const { username, hostname, displayName } = terminalComponent.remoteSsh; + return displayName || `${username}@${hostname}`; + } if (terminalComponent.pid) { return `PID: ${terminalComponent.pid}`; } @@ -924,7 +941,11 @@ class TerminalManager { terminal.component.intentionalClose = true; } - if (terminal.component.serverMode && terminal.component.pid) { + if ( + terminal.component.serverMode && + !terminal.component.remoteSsh && + terminal.component.pid + ) { this.removePersistedSession(terminal.component.pid); } @@ -1091,6 +1112,40 @@ class TerminalManager { }); } + /** + * Create an SSH terminal using credentials from an SFTP storage URL. + * @param {string|{url: string, name?: string}} storage - SFTP storage + * @param {object} options - Terminal options + * @returns {Promise} Terminal instance + */ + async createRemoteTerminal(storage, options = {}) { + const url = typeof storage === "string" ? storage : storage?.url; + const storageName = typeof storage === "object" ? storage?.name : null; + + if (!url || !/^sftp:/.test(url)) { + throw new Error("A valid SFTP storage is required"); + } + + const { hostname, pathname } = Url.decodeUrl(url); + const profileId = hostname?.startsWith("profile-") ? hostname : null; + if (!profileId) { + throw new Error( + "The SFTP storage has not been migrated to a native profile", + ); + } + + return this.createTerminal({ + ...options, + name: options.name || `SSH - ${storageName || hostname}`, + serverMode: true, + remoteSsh: { + profileId, + displayName: storageName || "SSH", + initialDirectory: pathname || "/", + }, + }); + } + /** * Handle keyboard resize events for all terminals * This is called when the virtual keyboard opens/closes on mobile diff --git a/src/dialogs/multiPrompt.js b/src/dialogs/multiPrompt.js index 1ddba8f64e..538702e6c2 100644 --- a/src/dialogs/multiPrompt.js +++ b/src/dialogs/multiPrompt.js @@ -22,6 +22,7 @@ import alert from "./alert"; * @property {boolean} [readOnly] Is read only * @property {boolean} [autofocus] Is autofocus * @property {boolean} [hidden] Is hidden + * @property {boolean} [sensitive] Clear the input when the prompt closes */ /** @@ -66,8 +67,9 @@ export default function multiPrompt(message, inputs, help) { return; } } + const values = getValue(); hide(); - resolve(getValue()); + resolve(values); }, }); const cancelBtn = tag("button", { @@ -88,7 +90,9 @@ export default function multiPrompt(message, inputs, help) { onsubmit: (e) => { e.preventDefault(); if (!okBtn.disabled) { - resolve(getValue()); + const values = getValue(); + hide(); + resolve(values); } }, children: [ @@ -136,6 +140,7 @@ export default function multiPrompt(message, inputs, help) { if ($focusEl) $focusEl.focus(); function hidePrompt() { + clearSensitiveInputs(); $promptDiv.classList.add("hide"); restoreTheme(); setTimeout(() => { @@ -158,10 +163,19 @@ export default function multiPrompt(message, inputs, help) { values[$input.id] = $input.checked; else values[$input.id] = $input.value; }); + clearSensitiveInputs(inputAr); return values; } + function clearSensitiveInputs(inputs = [...$body.getAll("input")]) { + for (const $input of inputs) { + if ($input.type === "password" || $input.isSensitive) { + $input.value = ""; + } + } + } + /** * Creates a group of inputs * @param {Array} inputs Array of inputs @@ -211,6 +225,7 @@ export default function multiPrompt(message, inputs, help) { readOnly, autofocus, hidden, + sensitive, } = input; const inputType = type === "textarea" ? "textarea" : "input"; @@ -277,6 +292,9 @@ export default function multiPrompt(message, inputs, help) { Object.defineProperty($input, "prompt", { value: { $body, hide }, }); + Object.defineProperty($input, "isSensitive", { + value: Boolean(sensitive), + }); Object.defineProperty($input, "setError", { value(message) { diff --git a/src/fileSystem/sftp.js b/src/fileSystem/sftp.js index 7c4b729800..41bff24af7 100644 --- a/src/fileSystem/sftp.js +++ b/src/fileSystem/sftp.js @@ -6,49 +6,33 @@ import Path from "utils/Path"; import Url from "utils/Url"; import internalFs from "./internalFs"; +let pendingConnection = null; +let pendingConnectionID = null; + class SftpClient { #MAX_TRY = 3; - #hostname; - #port; - #username; - #authenticationType; - #password; - #keyFile; - #passPhrase; + #profileID; #base; #connectionID; #path; #stat; - #retry = 0; /** * * @param {String} hostname * @param {Number} port * @param {String} username - * @param {{password?: String, passPhrase?: String, keyFile?: String}} authentication + * @param {{profileID: String}} authentication */ constructor(hostname, port = 22, username, authentication) { - this.#hostname = hostname; - this.#port = port; - this.#username = username; - this.#authenticationType = !!authentication.keyFile ? "key" : "password"; - this.#keyFile = authentication.keyFile; - this.#passPhrase = authentication.passPhrase; - this.#password = authentication.password; - this.#base = Url.formate({ - protocol: "sftp:", - hostname: this.#hostname, - port: this.#port, - username: this.#username, - password: this.#password, - query: { - passPhrase: this.#passPhrase, - keyFile: this.#keyFile, - }, - }); + authentication ||= {}; + this.#profileID = authentication.profileID; + if (!this.#profileID) { + throw new Error("A native SFTP profile is required"); + } + this.#base = Url.formate({ protocol: "sftp:", hostname: this.#profileID }); - this.#connectionID = `${this.#username}@${this.#hostname}`; + this.#connectionID = this.#profileID; } setPath(path) { @@ -398,41 +382,56 @@ class SftpClient { } async connect() { - await new Promise((resolve, reject) => { - const retry = (err) => { - if (settings.value.retryRemoteFsAfterFail) { - if (++this.#retry > this.#MAX_TRY) { - this.#retry = 0; - reject(err); - } else { - this.connect().then(resolve).catch(reject); - } - } else { - reject(err); - } - }; - - if (this.#authenticationType === "key") { - sftp.connectUsingKeyFile( - this.#hostname, - this.#port, - this.#username, - this.#keyFile, - this.#passPhrase, - resolve, - retry, - ); - return; + if (pendingConnection) { + if (pendingConnectionID === this.#connectionID) { + return pendingConnection; } + try { + await pendingConnection; + } catch { + // The next profile should still get its own connection attempt. + } + return this.connect(); + } + + pendingConnectionID = this.#connectionID; + pendingConnection = this.#connectWithRetry(); - sftp.connectUsingPassword( - this.#hostname, - this.#port, - this.#username, - this.#password, - resolve, - retry, - ); + try { + return await pendingConnection; + } finally { + if (pendingConnectionID === this.#connectionID) { + pendingConnection = null; + pendingConnectionID = null; + } + } + } + + async #connectWithRetry() { + const attempts = settings.value.retryRemoteFsAfterFail + ? this.#MAX_TRY + 1 + : 1; + let lastError; + + for (let attempt = 0; attempt < attempts; attempt++) { + try { + return await this.#connectWithHostVerification(); + } catch (error) { + if (error?.nonRetryable) throw error; + lastError = error; + } + } + + throw lastError; + } + + async #connectWithHostVerification() { + return this.#connectOnce(); + } + + #connectOnce() { + return new Promise((resolve, reject) => { + sftp.connectUsingProfile(this.#profileID, resolve, reject); }); } @@ -581,25 +580,22 @@ class SftpClient { * @param {String} host * @param {Number} port * @param {String} username - * @param {{password?: String, passPhrase?: String, keyFile?: String}} authentication + * @param {{profileID: String}} authentication */ function Sftp(host, port, username, authentication) { return new SftpClient(host, port, username, authentication); } Sftp.fromUrl = (url) => { - const { username, password, hostname, pathname, port, query } = - Url.decodeUrl(url); - const { keyFile, passPhrase } = query; - - const sftp = new SftpClient(hostname, port || 22, username, { - password, - keyFile, - passPhrase, - }); - - sftp.setPath(pathname); - return createFs(sftp); + const { hostname, pathname } = Url.decodeUrl(url); + if (hostname?.startsWith("profile-")) { + const sftp = new SftpClient(null, 22, null, { profileID: hostname }); + sftp.setPath(pathname); + return createFs(sftp); + } + throw new Error( + "Legacy SFTP credentials must be migrated to a native profile", + ); }; Sftp.test = (url) => /^sftp:/.test(url); diff --git a/src/lib/fileList.js b/src/lib/fileList.js index a83e9bde4f..694c19b9f3 100644 --- a/src/lib/fileList.js +++ b/src/lib/fileList.js @@ -15,6 +15,9 @@ import settings from "./settings"; const filesTree = {}; const pendingScans = new Set(); +const activeChildUrls = new WeakMap(); +const FALLBACK_SCAN_BATCH_SIZE = 64; +let fallbackScanTail = Promise.resolve(); const events = { "add-file": [], "push-file": [], @@ -164,7 +167,7 @@ export function rename(oldUrl, newUrl) { * @returns {Tree[]} */ export default function files(dir) { - const listedDirs = []; + const listedDirs = new Set(); let transform = (item) => item; if (typeof dir === "string") { for (const item of Object.values(filesTree)) { @@ -178,7 +181,7 @@ export default function files(dir) { const allFiles = []; Object.values(filesTree).forEach((item) => { - allFiles.push(...flattenTree(item, transform, listedDirs)); + flattenTree(item, transform, listedDirs, allFiles); }); return allFiles; } @@ -215,13 +218,14 @@ files.off = function (event, callback) { */ function getTree(treeList, dir) { if (!treeList) return; - let tree = treeList.find(({ url }) => url === dir); - if (tree) return tree; - for (const item of treeList) { - tree = getTree(item.children, dir); - if (tree) return tree; + const pending = [...treeList]; + while (pending.length) { + const tree = pending.pop(); + if (tree.url === dir) return tree; + if (tree.children?.length) { + for (const child of tree.children) pending.push(child); + } } - return null; } @@ -235,15 +239,13 @@ function getTree(treeList, dir) { * @param {Tree} tree - Files tree */ function getFile(path, tree) { - const { children } = tree; - let { url } = tree; - if (url === path) return tree; - if (!children) return null; - const len = children.length; - for (let i = 0; i < len; i++) { - const item = children[i]; - const result = getFile(path, item); - if (result) return result; + const pending = [tree]; + while (pending.length) { + const item = pending.pop(); + if (item.url === path) return item; + if (item.children?.length) { + for (const child of item.children) pending.push(child); + } } return null; } @@ -253,21 +255,20 @@ function getFile(path, tree) { * @param {Tree} tree * @param {(item:Tree)=>object} transform */ -function flattenTree(tree, transform, listedDirs) { - const list = []; - const { children } = tree; - if (!children) { - return [transform(tree)]; +function flattenTree(tree, transform, listedDirs, list = []) { + const pending = [tree]; + while (pending.length) { + const item = pending.pop(); + if (!item.children) { + list.push(transform(item)); + continue; + } + if (listedDirs.has(item.url)) continue; + listedDirs.add(item.url); + for (let i = item.children.length - 1; i >= 0; i -= 1) { + pending.push(item.children[i]); + } } - - if (listedDirs.includes(tree.url)) return list; - - listedDirs.push(tree.url); - - children.forEach((item) => { - if (item.children) list.push(...flattenTree(item, transform, listedDirs)); - else list.push(transform(item)); - }); return list; } @@ -316,35 +317,105 @@ function onRemoveFolder({ url }) { * @param {Tree} [root] - Root path */ async function getAllFiles(parent, root, options = {}) { - root = root || parent.root; - if (!parent.children || !root.isConnected) return; + const previousScan = fallbackScanTail; + let releaseScan; + fallbackScanTail = new Promise((resolve) => { + releaseScan = resolve; + }); + await previousScan.catch(() => {}); try { - const entries = await fsOperation(parent.url).lsDir(); - const promises = []; + return await scanAllFiles(parent, root, options); + } finally { + releaseScan(); + } +} + +async function scanAllFiles(parent, root, options = {}) { + root = root || parent.root; + if (!parent.children || !isFallbackScanActive(root)) return; + + // Compatibility providers such as FTP and SFTP are indexed in JavaScript. + // Keep one directory request in flight and periodically yield so a large + // remote workspace cannot monopolize the WebView event loop. + const directories = [parent]; + const queuedDirectories = new Set([parent.url]); + let directoryIndex = 0; + let processedSinceYield = 0; + + while (directoryIndex < directories.length && isFallbackScanActive(root)) { + const directory = directories[directoryIndex++]; + const entries = await listDirectoryWithRetry(directory, root); + if (!entries) continue; + const knownChildren = new Set(directory.children.map((child) => child.url)); + activeChildUrls.set(directory, knownChildren); + + try { + for (const item of entries) { + if (!isFallbackScanActive(root)) return; + const child = await createChildTree(directory, item, root, { + ...options, + deferDirectories: true, + knownChildren, + }); + if (child?.children && !queuedDirectories.has(child.url)) { + queuedDirectories.add(child.url); + directories.push(child); + } - for (const item of entries) { - promises.push(createChildTree(parent, item, root)); + processedSinceYield += 1; + if (processedSinceYield >= FALLBACK_SCAN_BATCH_SIZE) { + processedSinceYield = 0; + await yieldToMainThread(); + } + } + } finally { + if (activeChildUrls.get(directory) === knownChildren) { + activeChildUrls.delete(directory); + } } - await Promise.all(promises); - } catch (error) { - // retry after 3s - parent.retriedCount += 1; - if (parent.retriedCount > settings.value.maxRetryCount) return; - if (settings.value.showRetryToast) { - toast(`retrying: ${parent.path}`); + await yieldToMainThread(); + } +} + +async function listDirectoryWithRetry(parent, root) { + while (isFallbackScanActive(root)) { + try { + const entries = await fsOperation(parent.url).lsDir(); + parent.retriedCount = 0; + return entries || []; + } catch (error) { + parent.retriedCount += 1; + if (parent.retriedCount > settings.value.maxRetryCount) return null; + if (settings.value.showRetryToast) { + toast(`retrying: ${parent.path}`); + } + await waitForRetry(root, 3000); } + } + return null; +} - setTimeout(() => { - // why not outside? because parent may be removed - if (!root.isConnected) return; - parent.children.length = 0; - getAllFiles(parent, root, options); - }, 3000); +async function waitForRetry(root, duration) { + const deadline = Date.now() + duration; + while (isFallbackScanActive(root) && Date.now() < deadline) { + await delay(Math.min(250, deadline - Date.now())); } } +function isFallbackScanActive(root) { + return root.isConnected && filesTree[root.url] === root; +} + +function delay(duration) { + return new Promise((resolve) => setTimeout(resolve, duration)); +} + +function yieldToMainThread() { + return delay(0); +} + /** * Emit an event * @param {string} event @@ -369,11 +440,16 @@ function trackScan(scan) { * @param {File} item * @param {Tree} root */ -async function createChildTree(parent, item, root) { - if (!root.isConnected) return; - const { name, url, isDirectory, mime, type, size, modifiedDate } = item; - const exists = parent.children.findIndex((child) => child.url === url); - if (exists > -1) { +async function createChildTree(parent, item, root, options = {}) { + if (!isFallbackScanActive(root)) return; + const { name, url, isDirectory, isLink, mime, type, size, modifiedDate } = + item; + const knownChildren = + options.knownChildren || activeChildUrls.get(parent) || null; + const exists = knownChildren + ? knownChildren.has(url) + : parent.children.some((child) => child.url === url); + if (exists) { return; } @@ -385,18 +461,23 @@ async function createChildTree(parent, item, root) { size, modifiedDate, ); - if (!root.isConnected) return; + if (!isFallbackScanActive(root)) return; - const existingTree = getTree(Object.values(filesTree), file.url); + const existingTree = filesTree[file.url]; if (existingTree) { file.children = existingTree.children; parent.children.push(file); + knownChildren?.add(file.url); return; } parent.children.push(file); + knownChildren?.add(file.url); if (isDirectory) { + // Keep links visible in the tree, but do not recursively index them. Remote + // links can point back to an ancestor and otherwise create an endless scan. + if (isLink) return; const ignore = picomatch.isMatch( Url.join(file.path, ""), settings.value.excludeFolders, @@ -404,12 +485,15 @@ async function createChildTree(parent, item, root) { ); if (ignore) return; - await getAllFiles(file, root); - return; + if (!options.deferDirectories) { + await getAllFiles(file, root, options); + } + return file; } emit("push-file", file); emit("add-file", file); + return file; } export class Tree { diff --git a/src/lib/openFolder.js b/src/lib/openFolder.js index 741b6f583c..927606a926 100644 --- a/src/lib/openFolder.js +++ b/src/lib/openFolder.js @@ -335,6 +335,11 @@ async function handleContextmenu(type, url, name, $target) { strings["install as plugin"] || "Install as Plugin", "extension", ]; + const OPEN_SSH_TERMINAL = [ + "open-ssh-terminal", + strings["open ssh terminal"] || "Open SSH Terminal", + "terminal", + ]; let options; @@ -364,6 +369,8 @@ async function handleContextmenu(type, url, name, $target) { "terminal", ]; options.push(OPEN_IN_TERMINAL); + } else if (/^sftp:/.test(url)) { + options.push(OPEN_SSH_TERMINAL); } } else if (type === "root") { options = []; @@ -381,6 +388,8 @@ async function handleContextmenu(type, url, name, $target) { "terminal", ]; options.push(OPEN_IN_TERMINAL); + } else if (/^sftp:/.test(url)) { + options.push(OPEN_SSH_TERMINAL); } options.push(CLOSE_FOLDER); @@ -401,7 +410,7 @@ async function handleContextmenu(type, url, name, $target) { /** * @param {"dir"|"file"|"root"} type - * @param {"copy"|"cut"|"delete"|"rename"|"paste"|"new file"|"new folder"|"cancel"|"open-folder"|"install-plugin"} action + * @param {"copy"|"cut"|"delete"|"rename"|"paste"|"new file"|"new folder"|"cancel"|"open-folder"|"install-plugin"|"open-in-terminal"|"open-ssh-terminal"|"copy-relative-path"} action * @param {string} url target url * @param {HTMLElement} $target target element * @param {string} name Name of file or folder @@ -447,6 +456,9 @@ function execOperation(type, action, url, $target, name) { case "open-in-terminal": return openInTerminal(); + case "open-ssh-terminal": + return openSshTerminal(); + case "copy-relative-path": return copyRelativePath(); } @@ -557,6 +569,19 @@ function execOperation(type, action, url, $target, name) { } } + async function openSshTerminal() { + try { + const { TerminalManager } = await import( + /* webpackChunkName: "terminal" */ "components/terminal" + ); + await TerminalManager.createRemoteTerminal({ url, name }); + Sidebar.hide(); + } catch (error) { + console.error("Failed to open SSH terminal:", error); + toast(`Failed to open SSH terminal: ${error.message || "Unknown error"}`); + } + } + async function deleteFile() { const msg = strings["delete entry"].replace("{name}", name); const confirmation = await confirm(strings.warning, msg); @@ -1192,9 +1217,10 @@ openFolder.removeItem = (url) => { openFolder.removeFolders = (url) => { ({ url } = Url.parse(url)); - const regex = new RegExp("^" + escapeStringRegexp(url)); - addedFolder.forEach((folder) => { - if (regex.test(folder.url)) { + // remove() mutates addedFolder, so iterate over a snapshot to avoid skipping + // adjacent folders that belong to the same remote storage. + [...addedFolder].forEach((folder) => { + if (Url.isSameOrDescendant(folder.url, url)) { folder.remove(); } }); diff --git a/src/lib/recents.js b/src/lib/recents.js index 816a374f55..1f583a8a07 100644 --- a/src/lib/recents.js +++ b/src/lib/recents.js @@ -55,7 +55,7 @@ const recents = { removeFolder(url) { ({ url } = Url.parse(url)); this.folders = this.folders.filter((folder) => { - return !new RegExp("^" + escapeStringRegexp(folder.url)).test(url); + return !Url.isSameOrDescendant(folder.url, url); }); }, diff --git a/src/lib/remoteStorage.js b/src/lib/remoteStorage.js index 5185de0ce6..83c8077b7f 100644 --- a/src/lib/remoteStorage.js +++ b/src/lib/remoteStorage.js @@ -1,4 +1,3 @@ -import fsOperation from "fileSystem"; import Ftp from "fileSystem/ftp"; import Sftp from "fileSystem/sftp"; import loader from "dialogs/loader"; @@ -6,6 +5,12 @@ import multiPrompt from "dialogs/multiPrompt"; import URLParse from "url-parse"; import helpers from "utils/helpers"; import Url from "utils/Url"; +import { + createSftpProfileUrl, + editSftpProfile, + getSftpProfileId, + getSftpProfileInfo, +} from "./sftpProfiles"; import { interstitialAd } from "./startAd"; export default { @@ -161,23 +166,80 @@ export default { ]); } }, - /** - * @param {...any} args [hostname, username, keyFile, password, passphrase, port, name] - */ - async addSftp(...args) { + /** Persist credentials natively and retain only an opaque profile URL. */ + async addSftp({ + hostname = "", + username = "", + port = 22, + alias: initialAlias = "", + authType = "password", + existingProfile = null, + } = {}) { let stopConnection = false; + if (existingProfile?.profileId) { + try { + const saved = await getSftpProfileInfo(existingProfile.profileId); + hostname = saved.hostname; + username = saved.username; + port = saved.port; + authType = saved.authType; + } catch (error) { + await helpers.error(error); + return null; + } + } - const { - hostname, - username, - keyFile, - password, - passPhrase, - port, - alias, - usePassword, - } = await prompt(...args); - const authType = usePassword ? "password" : "keyFile"; + let values; + try { + values = await prompt({ + hostname, + username, + port, + alias: initialAlias || existingProfile?.name || "", + authType: authType === "keyFile" ? "key" : authType, + hasSavedKey: existingProfile?.profileId && authType === "key", + }); + } catch { + return null; + } + + const retryDetails = { + hostname: values.hostname, + username: values.username, + port: values.port, + alias: values.alias, + authType: values.usePassword ? "password" : "key", + existingProfile, + }; + let profile; + let saveError; + try { + profile = await editSftpProfile({ + profileId: existingProfile?.profileId, + hostname: values.hostname, + username: values.username, + port: values.port, + authType: values.usePassword ? "password" : "key", + password: values.password, + keyFile: values.keyFile, + passPhrase: values.passPhrase, + }); + } catch (error) { + saveError = error; + } finally { + // Drop all WebView references as soon as the native store has consumed them. + values.password = ""; + values.keyFile = ""; + values.passPhrase = ""; + } + if (saveError) { + values = null; + await helpers.error(saveError); + return this.addSftp(retryDetails); + } + const alias = values.alias; + values = null; + const url = createSftpProfileUrl(profile.profileId); loader.create(strings["add sftp"], strings["connecting..."], { timeout: 10000, @@ -185,10 +247,8 @@ export default { stopConnection = true; }, }); - const connection = Sftp(hostname, Number.parseInt(port), username, { - password, - keyFile, - passPhrase, + const connection = Sftp(null, 22, null, { + profileID: profile.profileId, }); try { @@ -199,37 +259,6 @@ export default { return; } - let localKeyFile = ""; - if (keyFile) { - let fs = fsOperation(keyFile); - const text = await fs.readFile("utf8"); - - //Original key file sometimes gives permission error - //To solve permission error - const filename = keyFile.hashCode(); - localKeyFile = Url.join(DATA_STORAGE, filename); - fs = fsOperation(localKeyFile); - const exists = await fs.exists(); - if (exists) { - await fs.writeFile(text); - } else { - let fs = fsOperation(DATA_STORAGE); - await fs.createFile(filename, text); - } - } - - const url = Url.formate({ - protocol: "sftp:", - hostname, - username, - password, - port, - path: "/", - query: { - keyFile: localKeyFile, - passPhrase, - }, - }); loader.destroy(); await helpers.showInterstitialIfReady(); return { @@ -246,52 +275,51 @@ export default { } loader.destroy(); - await helpers.error(err); - return await this.addSftp( - hostname, - username, - keyFile, - password, - passPhrase, - port, + if (!err?.reported) await helpers.error(err); + return await this.addSftp({ + hostname: profile.hostname, + username: profile.username, + port: profile.port, alias, - authType, - ); + authType: profile.authType, + existingProfile: { + ...profile, + url, + home: existingProfile?.home, + }, + }); } - function prompt( + function prompt({ hostname, username, - keyFile, - password, - passPhrase, port, alias, - authType = "password", - ) { - port = port || 22; - - const MODE_PASS = authType === "password"; - const inputs = [ + authType, + hasSavedKey, + }) { + const usePassword = authType !== "key"; + return multiPrompt(strings["add sftp"], [ { id: "alias", placeholder: strings.name, type: "text", - value: alias ? alias : "", + value: alias, required: true, }, { id: "username", - placeholder: `${strings.username} (${strings.optional})`, + placeholder: strings.username, type: "text", value: username, + required: true, }, { id: "hostname", placeholder: strings.hostname, type: "text", - required: true, value: hostname, + required: true, }, [ "Authentication type: ", @@ -300,13 +328,12 @@ export default { placeholder: strings.password, name: "authType", type: "radio", - value: MODE_PASS, + value: usePassword, onchange() { - if (!!this.value) { - this.prompt.$body.get("#password").hidden = false; - this.prompt.$body.get("#keyFile").hidden = true; - this.prompt.$body.get("#passPhrase").hidden = true; - } + if (!this.checked) return; + this.prompt.$body.get("#password").hidden = false; + this.prompt.$body.get("#keyFile").hidden = true; + this.prompt.$body.get("#passPhrase").hidden = true; }, }, { @@ -314,59 +341,75 @@ export default { placeholder: strings["key file"], name: "authType", type: "radio", - value: !MODE_PASS, + value: !usePassword, onchange() { - if (!!this.value) { - const $password = this.prompt.$body.get("#password"); - $password.hidden = true; - $password.value = ""; - this.prompt.$body.get("#keyFile").hidden = false; - this.prompt.$body.get("#passPhrase").hidden = false; - } + if (!this.checked) return; + const password = this.prompt.$body.get("#password"); + password.hidden = true; + password.value = ""; + this.prompt.$body.get("#keyFile").hidden = false; + this.prompt.$body.get("#passPhrase").hidden = false; }, }, ], { id: "password", - placeholder: strings.password, - name: "password", + placeholder: existingProfile?.profileId + ? `${strings.password} (leave blank to keep saved)` + : strings.password, type: "password", - value: password, - hidden: !MODE_PASS, + hidden: !usePassword, }, { id: "keyFile", - placeholder: strings["select key file"], - name: "keyFile", - hidden: MODE_PASS, - value: keyFile, + placeholder: hasSavedKey + ? `${strings["select key file"]} (leave blank to keep saved)` + : strings["select key file"], type: "text", + readOnly: true, + sensitive: true, + hidden: usePassword, onclick() { - sdcard.openDocumentFile((res) => { - this.value = res.uri; + sdcard.openDocumentFile((result) => { + this.value = result.uri; }); }, }, { id: "passPhrase", placeholder: `${strings.passphrase} (${strings.optional})`, - name: "passPhrase", type: "password", - hidden: MODE_PASS, - value: passPhrase, + hidden: usePassword, }, { id: "port", - placeholder: `${strings.port} (${strings.optional})`, + placeholder: strings.port, type: "number", - value: port, + value: port || 22, + required: true, }, - ]; - - return multiPrompt(strings["add sftp"], inputs); + ]); } }, - edit({ name, storageType, url }) { + async edit({ name, storageType, url, home }) { + const profileId = getSftpProfileId(url); + if (storageType === "sftp" && profileId) { + return this.addSftp({ + alias: name, + existingProfile: { profileId, url, home, name }, + }); + } + if (storageType === "sftp") { + const { username, hostname, port, query } = URLParse(url, true); + return this.addSftp({ + hostname, + username: username ? decodeURIComponent(username) : "", + port: port || 22, + alias: name, + authType: query?.keyFile ? "key" : "password", + }); + } + let { username, password, hostname, port, query } = URLParse(url, true); if (username) { @@ -398,28 +441,6 @@ export default { ); } - if (storageType === "sftp") { - let { passPhrase, keyFile } = query; - if (passPhrase) { - passPhrase = decodeURIComponent(passPhrase); - } - - if (keyFile) { - keyFile = decodeURIComponent(keyFile); - } - - return this.addSftp( - hostname, - username, - keyFile, - password, - passPhrase, - port, - name, - password ? "password" : "key", - ); - } - return null; }, }; diff --git a/src/lib/sftpProfiles.js b/src/lib/sftpProfiles.js new file mode 100644 index 0000000000..6d5aeb0b22 --- /dev/null +++ b/src/lib/sftpProfiles.js @@ -0,0 +1,213 @@ +import fsOperation from "fileSystem"; +import Url from "utils/Url"; + +const PROFILE_PREFIX = "profile-"; +const MIGRATION_MARKER = "sftpNativeProfileMigration"; +const MIGRATION_VERSION = "1"; +const MIGRATED_STORAGE_KEYS = [ + "storageList", + "folders", + "files", + "recentFiles", + "recentFolders", + "fileBrowserState", +]; + +export function getSftpProfileId(url) { + if (!/^sftp:/.test(url || "")) return null; + const { hostname } = Url.decodeUrl(url); + return hostname?.startsWith(PROFILE_PREFIX) ? hostname : null; +} + +export function createSftpProfileUrl(profileId, pathname = "/") { + return Url.formate({ + protocol: "sftp:", + hostname: profileId, + path: pathname || "/", + }); +} + +function saveSftpProfile({ + profileId = null, + hostname, + port = 22, + username, + authType, + password = "", + keyFile = "", + passPhrase = "", +}) { + return new Promise((resolve, reject) => { + sftp.saveProfile( + profileId, + hostname, + Number.parseInt(port, 10) || 22, + username, + authType, + password, + keyFile, + passPhrase, + resolve, + reject, + ); + }); +} + +export function editSftpProfile({ + profileId = null, + hostname = "", + port = 22, + username = "", + authType = "password", + password = "", + keyFile = "", + passPhrase = "", +} = {}) { + return new Promise((resolve, reject) => { + sftp.editProfile( + profileId, + hostname, + Number.parseInt(port, 10) || 22, + username, + authType, + password, + keyFile, + passPhrase, + resolve, + reject, + ); + }); +} + +export function getSftpProfileInfo(profileId) { + return new Promise((resolve, reject) => { + sftp.getProfileInfo(profileId, resolve, reject); + }); +} + +export function deleteSftpProfile(profileId) { + return new Promise((resolve) => { + sftp.deleteProfile(profileId, resolve, resolve); + }); +} + +/** + * Moves legacy credential-bearing SFTP URLs into encrypted native profiles. + * Migration fails closed before third-party plugins load if encryption is unavailable. + */ +export async function migrateLegacySftpProfiles() { + if (localStorage.getItem(MIGRATION_MARKER) === MIGRATION_VERSION) return; + + const profileCache = new Map(); + const copiedKeys = new Set(); + let migrationError = null; + + for (const storageKey of MIGRATED_STORAGE_KEYS) { + const raw = localStorage.getItem(storageKey); + if (!raw) continue; + let value; + try { + value = JSON.parse(raw); + } catch { + continue; + } + + const migrated = await migrateValue(value); + if (migrated.changed) { + localStorage.setItem(storageKey, JSON.stringify(migrated.value)); + } + } + + for (const keyFile of copiedKeys) { + if (!keyFile.startsWith(globalThis.DATA_STORAGE || "\0")) continue; + try { + await fsOperation(keyFile).delete(); + } catch (error) { + console.warn("Could not remove migrated SFTP key copy", error); + } + } + + if (migrationError) { + throw new Error( + "SFTP credentials could not be moved to encrypted native storage", + { cause: migrationError }, + ); + } + + localStorage.setItem(MIGRATION_MARKER, MIGRATION_VERSION); + + async function migrateValue(value) { + if (typeof value === "string") return migrateUrl(value); + if (Array.isArray(value)) { + let changed = false; + const next = []; + for (const item of value) { + const migrated = await migrateValue(item); + changed ||= migrated.changed; + next.push(migrated.value); + } + return { value: next, changed }; + } + if (value && typeof value === "object") { + let changed = false; + const next = {}; + for (const [key, item] of Object.entries(value)) { + const migrated = await migrateValue(item); + changed ||= migrated.changed; + next[key] = migrated.value; + } + return { value: next, changed }; + } + return { value, changed: false }; + } + + async function migrateUrl(value) { + if (!/^sftp:/.test(value) || getSftpProfileId(value)) { + return { value, changed: false }; + } + + try { + const { username, password, hostname, pathname, port, query } = + Url.decodeUrl(value); + if (!hostname || !username) return { value, changed: false }; + const keyFile = normalizeLegacyValue(query?.keyFile); + const passPhrase = normalizeLegacyValue(query?.passPhrase); + const authType = keyFile ? "key" : "password"; + const signature = JSON.stringify({ + hostname, + port: port || 22, + username, + password: password || "", + keyFile, + passPhrase, + }); + + let profileId = profileCache.get(signature); + if (!profileId) { + profileId = await saveSftpProfile({ + hostname, + port: port || 22, + username, + authType, + password: password || "", + keyFile, + passPhrase, + }); + profileCache.set(signature, profileId); + if (keyFile) copiedKeys.add(keyFile); + } + return { + value: createSftpProfileUrl(profileId, pathname || "/"), + changed: true, + }; + } catch (error) { + console.warn("Could not migrate legacy SFTP URL", error); + migrationError ||= error; + return { value, changed: false }; + } + } +} + +function normalizeLegacyValue(value) { + return value && value !== "undefined" && value !== "null" ? value : ""; +} diff --git a/src/main.js b/src/main.js index c29eee8711..0717578039 100644 --- a/src/main.js +++ b/src/main.js @@ -53,6 +53,7 @@ import openFolder, { addedFolder } from "lib/openFolder"; import { registerPrettierFormatter } from "lib/registerPrettierFormatter"; import restoreFiles from "lib/restoreFiles"; import settings from "lib/settings"; +import { migrateLegacySftpProfiles } from "lib/sftpProfiles"; import startAd, { BANNER_SUPPRESSION_REASON, setBannerSuppressed, @@ -266,6 +267,9 @@ async function onDeviceReady() { acode.setLoadingMessage("Loading language..."); await lang.set(settings.value.lang); + acode.setLoadingMessage("Securing SFTP profiles..."); + await migrateLegacySftpProfiles(); + if (settings.value.developerMode) { try { const devTools = (await import("lib/devTools")).default; diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index ee56da6a1e..9d25cbe965 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -21,6 +21,7 @@ import projects from "lib/projects"; import recents from "lib/recents"; import remoteStorage from "lib/remoteStorage"; import appSettings from "lib/settings"; +import { deleteSftpProfile, getSftpProfileId } from "lib/sftpProfiles"; import mimeTypes from "mime-types"; import mustache from "mustache"; import filesSettings from "settings/filesSettings"; @@ -478,6 +479,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { case "addFtp": case "addSftp": { const storage = await remoteStorage[action](); + if (!storage) break; updateStorage(storage); break; } @@ -1066,6 +1068,14 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { options.push(["edit", strings.edit, "edit"]); } + if (storageType === "sftp" && uuid) { + options.push([ + "ssh_terminal", + strings["open ssh terminal"] || "Open SSH Terminal", + "terminal", + ]); + } + if (helpers.isFile(type)) { options.push(["info", strings.info, "info"]); options.push(["open_with", strings["open with"], "open_in_browser"]); @@ -1087,7 +1097,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { const confirmation = await confirm(strings.warning, message); if (!confirmation) break; - deleteFunction(); + await deleteFunction(); break; } @@ -1114,6 +1124,15 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { break; } + case "ssh_terminal": { + const { TerminalManager } = await import( + /* webpackChunkName: "terminal" */ "components/terminal" + ); + await TerminalManager.createRemoteTerminal({ url, name }); + $page.hide(); + break; + } + case "info": acode.exec("file-info", url); break; @@ -1219,28 +1238,61 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { } } - function removeStorage() { - if (url) { - recents.removeFolder(url); - recents.removeFile(url); + async function removeStorage() { + const removedStorage = storageList.find( + (storage) => storage.uuid === uuid, + ); + const storageUrl = removedStorage?.url || url; + + if (storageUrl) { + recents.removeFolder(storageUrl); + recents.removeFile(storageUrl); + openFolder.removeFolders(storageUrl); + helpers.updateUriOfAllActiveFiles(storageUrl, null); + } + if ( + storageUrl && + removedStorage && + (removedStorage.storageType === "sftp" || + removedStorage.type === "sftp") + ) { + const profileId = getSftpProfileId(storageUrl); + const { username, hostname, port = 22 } = Url.decodeUrl(storageUrl); + const connectionID = profileId || `${username}@${hostname}:${port}`; + await new Promise((resolve) => { + sftp.isConnected((activeConnectionID) => { + if (activeConnectionID !== connectionID) { + resolve(); + return; + } + sftp.close(resolve, resolve); + }, resolve); + }); + const profileStillUsed = storageList.some( + (storage) => + storage.uuid !== uuid && + getSftpProfileId(storage.url) === profileId, + ); + if (profileId && !profileStillUsed) { + await deleteSftpProfile(profileId); + } } storageList = storageList.filter((storage) => { if (storage.uuid !== uuid) { return true; } - if (storage.url) { + if (storage.url && !getSftpProfileId(storage.url)) { const parsedUrl = URLParse(storage.url, true); const keyFile = decodeURIComponent( parsedUrl.query["keyFile"] || "", ); - if (keyFile) { - fsOperation(keyFile).delete(); - } + if (keyFile) fsOperation(keyFile).delete().catch(console.warn); } return false; }); localStorage.storageList = JSON.stringify(storageList); + acode.exec("save-state"); reload(); } diff --git a/src/plugins/auth/src/android/EncryptedPreferenceManager.java b/src/plugins/auth/src/android/EncryptedPreferenceManager.java index f14a4cd559..51a32a19ff 100644 --- a/src/plugins/auth/src/android/EncryptedPreferenceManager.java +++ b/src/plugins/auth/src/android/EncryptedPreferenceManager.java @@ -8,18 +8,33 @@ import java.security.GeneralSecurityException; public class EncryptedPreferenceManager { - private SharedPreferences sharedPreferences; + private final SharedPreferences sharedPreferences; /** * @param context The Android Context * @param prefName The custom name for your preference file (e.g., "user_session") */ public EncryptedPreferenceManager(Context context, String prefName) { + this(context, prefName, true); + } + + /** + * @param context The Android Context + * @param prefName The custom name for your preference file + * @param allowPlaintextFallback Whether storage may fall back to ordinary + * SharedPreferences when encryption is unavailable + */ + public EncryptedPreferenceManager( + Context context, + String prefName, + boolean allowPlaintextFallback + ) { + SharedPreferences preferences; try { String masterKeyAlias = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC); // EncryptedSharedPreferences handles encryption of both Keys and Values - sharedPreferences = EncryptedSharedPreferences.create( + preferences = EncryptedSharedPreferences.create( prefName, masterKeyAlias, context, @@ -27,9 +42,14 @@ public EncryptedPreferenceManager(Context context, String prefName) { EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM ); } catch (GeneralSecurityException | IOException e) { - // Fallback to standard private preferences if hardware-backed encryption fails - sharedPreferences = context.getSharedPreferences(prefName, Context.MODE_PRIVATE); + if (!allowPlaintextFallback) { + throw new IllegalStateException("Encrypted preferences are unavailable", e); + } + + // Preserve the existing behavior for legacy callers unless strict mode is requested. + preferences = context.getSharedPreferences(prefName, Context.MODE_PRIVATE); } + sharedPreferences = preferences; } // --- Reusable Methods --- @@ -38,6 +58,10 @@ public void setString(String key, String value) { sharedPreferences.edit().putString(key, value).apply(); } + public boolean setStringSync(String key, String value) { + return sharedPreferences.edit().putString(key, value).commit(); + } + public String getString(String key, String defaultValue) { return sharedPreferences.getString(key, defaultValue); } @@ -62,6 +86,10 @@ public void remove(String key) { sharedPreferences.edit().remove(key).apply(); } + public boolean removeSync(String key) { + return sharedPreferences.edit().remove(key).commit(); + } + public boolean exists(String key) { return sharedPreferences.contains(key); } @@ -69,4 +97,4 @@ public boolean exists(String key) { public void clear() { sharedPreferences.edit().clear().apply(); } -} \ No newline at end of file +} diff --git a/src/plugins/sftp/index.d.ts b/src/plugins/sftp/index.d.ts index 62d0afeedf..dc75b35360 100644 --- a/src/plugins/sftp/index.d.ts +++ b/src/plugins/sftp/index.d.ts @@ -12,10 +12,25 @@ interface Stats { uri: string; } -interface ExecResult{ +interface ExecResult{ code: Number; result: String; -} +} + +interface ShellEvent { + type: "ready" | "data" | "exit" | "error"; + sessionId?: string; + data?: string; + exitCode?: number; + message?: string; +} + +interface SftpProfileInfo { + hostname: string; + port: number; + username: string; + authType: "password" | "key"; +} interface Sftp { /** @@ -25,28 +40,12 @@ interface Sftp { * @param onFail */ exec(command: String, onSucess: (res: ExecResult)=>void, onFail: (err: any) => void): void; - /** - * Connects to SFTP server - * @param host Hostname of the server - * @param port port numer - * @param username Username - * @param password Password or private key file to authenticate the server - * @param onSuccess Callback function on success returns url of copied file/dir - * @param onFail Callback function on error returns error object - */ - connectUsingPassoword(host: String, port: Number, username: String, password: String, onSuccess: () => void, onFail: (err: any) => void): void; - - /** - * Connects to SFTP server - * @param host Hostname of the server - * @param port port numer - * @param username Username - * @param keyFile Password or private key file to authenticate the server - * @param passphrase Passphrase for keyfile - * @param onSuccess Callback function on success returns url of copied file/dir - * @param onFail Callback function on error returns error object - */ - connectUsingKeyFile(host: String, port: Number, username: String, keyFile: String, passphrase: String, onSuccess: () => void, onFail: (err: any) => void): void; + /** Connects using credentials held by the native profile store. */ + connectUsingProfile(profileId: String, onSuccess: () => void, onFail: (err: any) => void): void; + saveProfile(profileId: String | null, host: String, port: Number, username: String, authType: String, password: String, keyFile: String, passphrase: String, onSuccess: (profileId: String) => void, onFail: (err: any) => void): void; + editProfile(profileId: String | null, host: String, port: Number, username: String, authType: String, password: String, keyFile: String, passphrase: String, onSuccess: (profile: SftpProfileInfo & {profileId: string}) => void, onFail: (err: any) => void): void; + getProfileInfo(profileId: String, onSuccess: (profile: SftpProfileInfo & {profileId: string}) => void, onFail: (err: any) => void): void; + deleteProfile(profileId: String, onSuccess: () => void, onFail: (err: any) => void): void; /** * Gets file from the server. @@ -78,7 +77,11 @@ interface Sftp { * @param onSuccess * @param onFail */ - isConnected(onSuccess: (connectionId: String) => void, onFail: (err: any) => void): void; -} + isConnected(onSuccess: (connectionId: String) => void, onFail: (err: any) => void): void; + openShellUsingProfile(profileId: String, cols: Number, rows: Number, onEvent: (event: ShellEvent) => void, onFail: (err: any) => void): void; + writeShell(sessionId: String, data: String, onSuccess: () => void, onFail: (err: any) => void): void; + resizeShell(sessionId: String, cols: Number, rows: Number, onSuccess: () => void, onFail: (err: any) => void): void; + closeShell(sessionId: String, onSuccess: () => void, onFail: (err: any) => void): void; +} -declare var sftp: Sftp; \ No newline at end of file +declare var sftp: Sftp; diff --git a/src/plugins/sftp/plugin.xml b/src/plugins/sftp/plugin.xml index ed1e75ccc5..527d729b33 100644 --- a/src/plugins/sftp/plugin.xml +++ b/src/plugins/sftp/plugin.xml @@ -21,7 +21,8 @@ - + + diff --git a/src/plugins/sftp/src/com/foxdebug/sftp/Sftp.java b/src/plugins/sftp/src/com/foxdebug/sftp/Sftp.java index 25b3737424..b676c1f059 100644 --- a/src/plugins/sftp/src/com/foxdebug/sftp/Sftp.java +++ b/src/plugins/sftp/src/com/foxdebug/sftp/Sftp.java @@ -1,26 +1,38 @@ package com.foxdebug.sftp; import android.app.Activity; +import android.app.AlertDialog; import android.content.ContentResolver; import android.content.Context; import android.net.Uri; +import android.util.Base64; import android.util.Log; import androidx.documentfile.provider.DocumentFile; import com.sshtools.client.SshClient; import com.sshtools.client.SshClient.SshClientBuilder; +import com.sshtools.client.SshClientContext; +import com.sshtools.client.SessionChannelNG; import com.sshtools.client.sftp.SftpClient; import com.sshtools.client.sftp.SftpClient.SftpClientBuilder; import com.sshtools.client.sftp.SftpFile; import com.sshtools.client.sftp.TransferCancelledException; +import com.sshtools.common.knownhosts.HostKeyVerification; import com.sshtools.common.permissions.PermissionDeniedException; +import com.sshtools.common.policy.FileSystemPolicy; import com.sshtools.common.publickey.InvalidPassphraseException; import com.sshtools.common.publickey.SshKeyUtils; import com.sshtools.common.sftp.SftpFileAttributes; import com.sshtools.common.sftp.SftpStatusException; import com.sshtools.common.ssh.SshException; +import com.sshtools.common.ssh.Channel; +import com.sshtools.common.ssh.ChannelEventListener; +import com.sshtools.common.ssh.RequestFuture; import com.sshtools.common.ssh.components.SshKeyPair; +import com.sshtools.common.ssh.components.SshPublicKey; import com.sshtools.common.ssh.components.jce.JCEProvider; -import com.sshtools.common.util.FileUtils; +import com.sshtools.common.util.UnsignedInteger32; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -31,241 +43,894 @@ import java.net.URISyntaxException; import java.net.URLDecoder; import java.net.URLEncoder; +import java.nio.ByteBuffer; import java.nio.channels.UnresolvedAddressException; import java.nio.charset.StandardCharsets; import java.security.Security; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.atomic.AtomicBoolean; import org.apache.cordova.CallbackContext; import org.apache.cordova.CordovaInterface; import org.apache.cordova.CordovaPlugin; import org.apache.cordova.CordovaWebView; +import org.apache.cordova.PluginResult; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import java.util.Arrays; import org.bouncycastle.jce.provider.BouncyCastleProvider; public class Sftp extends CordovaPlugin { private static final String TAG = "SFTP"; + // Maverick's 16 MB default is allocated in full for every SFTP subsystem. + // A smaller mobile window prevents connection bursts from exhausting the heap. + private static final long SFTP_MAX_WINDOW_SIZE = 1024L * 1024L; + private static final long SFTP_MIN_WINDOW_SIZE = 128L * 1024L; + private static boolean cryptoProviderConfigured; + private final Object connectionLock = new Object(); + private final Map remoteShells = new ConcurrentHashMap<>(); private SshClient ssh; private SftpClient sftp; private Context context; private Activity activity; private String connectionID; + private SftpSecurityStore securityStore; + + private final class ConnectionSecurity { + + private final String hostname; + private final int port; + private volatile JSONObject failure; + + private ConnectionSecurity(String hostname, int port) { + this.hostname = hostname; + this.port = port; + } + + private void configure(SshClientContext sshContext) { + configureClient(sshContext); + sshContext.setHostKeyVerification( + new HostKeyVerification() { + @Override + public boolean verifyHost(String host, SshPublicKey publicKey) + throws SshException { + try { + String fingerprint = publicKey.getFingerprint(); + String algorithm = publicKey.getAlgorithm(); + String encodedKey = Base64.encodeToString( + publicKey.getEncoded(), + Base64.NO_WRAP + ); + String endpoint = hostname + ":" + port; + JSONObject trusted = securityStore.getKnownHost(endpoint); + if (trusted == null) { + if ( + confirmUnknownHost(endpoint, algorithm, fingerprint) + ) { + securityStore.trustHost( + endpoint, + algorithm, + fingerprint, + encodedKey + ); + return true; + } + failure = hostKeyFailure( + "HOST_KEY_REJECTED", + endpoint, + fingerprint, + null + ); + return false; + } + + String expected = trusted.optString("fingerprint"); + String expectedKey = trusted.optString("publicKey"); + if ( + (!expectedKey.isEmpty() && !encodedKey.equals(expectedKey)) || + (expectedKey.isEmpty() && !fingerprint.equals(expected)) + ) { + failure = hostKeyFailure( + "HOST_KEY_CHANGED", + endpoint, + fingerprint, + expected + ); + showChangedHostKey(endpoint, expected, fingerprint); + return false; + } + return true; + } catch (JSONException | InterruptedException e) { + if (e instanceof InterruptedException) { + Thread.currentThread().interrupt(); + } + throw new SshException( + "Could not verify the SSH host key", + SshException.HOST_KEY_ERROR, + e + ); + } + } + } + ); + } + + private boolean report(CallbackContext callback) { + JSONObject error = failure; + failure = null; + if (error == null) return false; + callback.error(error); + return true; + } + } + + private final class RemoteShell { + + private final String id; + private final SshClient client; + private final SessionChannelNG channel; + private final CallbackContext streamCallback; + private final AtomicBoolean finished = new AtomicBoolean(false); + private final ExecutorService inputWriter = Executors.newSingleThreadExecutor(); + + private RemoteShell( + String id, + SshClient client, + SessionChannelNG channel, + CallbackContext streamCallback + ) { + this.id = id; + this.client = client; + this.channel = channel; + this.streamCallback = streamCallback; + } + + private void sendData(ByteBuffer source) { + if (finished.get() || source == null || !source.hasRemaining()) return; + + ByteBuffer data = source.asReadOnlyBuffer(); + byte[] bytes = new byte[data.remaining()]; + data.get(bytes); + try { + JSONObject event = new JSONObject(); + event.put("type", "data"); + event.put("data", Base64.encodeToString(bytes, Base64.NO_WRAP)); + sendShellEvent(streamCallback, event, true); + } catch (JSONException e) { + finish(null, e.getMessage()); + } + } + + private void finish(Integer exitCode, String error) { + if (!finished.compareAndSet(false, true)) return; + remoteShells.remove(id, this); + inputWriter.shutdownNow(); + + try { + channel.close(); + } catch (Exception e) { + Log.w(TAG, "Failed to close SSH shell channel " + id, e); + } + try { + client.close(); + } catch (IOException e) { + Log.w(TAG, "Failed to close SSH shell connection " + id, e); + } + + try { + JSONObject event = new JSONObject(); + event.put("type", error == null ? "exit" : "error"); + if (exitCode != null) event.put("exitCode", exitCode); + if (error != null) event.put("message", error); + sendShellEvent(streamCallback, event, false); + } catch (JSONException e) { + streamCallback.error(errMessage(e)); + } + } + + private void write(String input, CallbackContext callback) { + if (finished.get()) { + callback.error("SSH shell is not connected"); + return; + } + + try { + inputWriter.execute( + new Runnable() { + @Override + public void run() { + try { + byte[] data = input.getBytes(StandardCharsets.UTF_8); + channel.getOutputStream().write(data); + channel.getOutputStream().flush(); + callback.success(); + } catch (IOException e) { + finish(null, errMessage(e)); + callback.error(errMessage(e)); + } + } + } + ); + } catch (RejectedExecutionException e) { + callback.error("SSH shell is not connected"); + } + } + } public void initialize(CordovaInterface cordova, CordovaWebView webView) { super.initialize(cordova, webView); context = cordova.getContext(); activity = cordova.getActivity(); + securityStore = new SftpSecurityStore(context); System.setProperty("maverick.log.nothread", "true"); + configureCryptoProvider(); } - public boolean execute( - String action, - JSONArray args, - CallbackContext callback + private static synchronized void configureCryptoProvider() { + if (cryptoProviderConfigured) return; + + Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME); + Security.insertProviderAt(new BouncyCastleProvider(), 1); + JCEProvider.enableBouncyCastle(true); + cryptoProviderConfigured = true; + } + + private static void configureClient(SshClientContext sshContext) { + FileSystemPolicy policy = sshContext.getPolicy(FileSystemPolicy.class); + policy.setSftpMaxWindowSize( + new UnsignedInteger32(SFTP_MAX_WINDOW_SIZE) + ); + policy.setSftpMinWindowSize( + new UnsignedInteger32(SFTP_MIN_WINDOW_SIZE) + ); + policy.setMaximumNumberofAsyncSFTPRequests(4); + } + + private void closeConnectionQuietly() { + SftpClient previousSftp = sftp; + SshClient previousSsh = ssh; + sftp = null; + ssh = null; + connectionID = null; + + if (previousSftp != null) { + try { + previousSftp.quit(); + } catch (Exception e) { + Log.w(TAG, "Failed to close the SFTP subsystem", e); + } + } + if (previousSsh != null) { + try { + previousSsh.close(); + } catch (Exception e) { + Log.w(TAG, "Failed to close the SSH connection", e); + } + } + } + + private boolean establishConnection( + SshClientBuilder builder, + String newConnectionID, + ConnectionSecurity security + ) throws IOException, SshException, PermissionDeniedException { + synchronized (connectionLock) { + closeConnectionQuietly(); + ssh = builder.onConfigure(security::configure).build(); + if (!ssh.isConnected()) { + closeConnectionQuietly(); + return false; + } + + connectionID = newConnectionID; + try { + sftp = SftpClientBuilder.create().withClient(ssh).build(); + } catch (IOException | SshException | PermissionDeniedException e) { + closeConnectionQuietly(); + throw e; + } + + try { + sftp.getSubsystemChannel().setCharsetEncoding("UTF-8"); + } catch (UnsupportedEncodingException | SshException e) { + Log.w(TAG, "Failed to set UTF-8 encoding, using the default", e); + } + return true; + } + } + + private static void sendShellEvent( + CallbackContext callback, + JSONObject event, + boolean keepCallback + ) { + PluginResult result = new PluginResult(PluginResult.Status.OK, event); + result.setKeepCallback(keepCallback); + callback.sendPluginResult(result); + } + + private static JSONObject hostKeyFailure( + String code, + String host, + String fingerprint, + String expectedFingerprint + ) throws JSONException { + JSONObject error = new JSONObject(); + error.put("code", code); + error.put("host", host); + error.put("fingerprint", fingerprint); + if (expectedFingerprint != null) { + error.put("expectedFingerprint", expectedFingerprint); + } + return error; + } + + private boolean confirmUnknownHost( + String endpoint, + String algorithm, + String fingerprint + ) throws InterruptedException { + if (activity == null || activity.isFinishing()) return false; + + CountDownLatch decision = new CountDownLatch(1); + AtomicBoolean trusted = new AtomicBoolean(false); + activity.runOnUiThread( + () -> { + AlertDialog dialog = new AlertDialog.Builder(activity) + .setTitle("Unknown SSH host") + .setMessage( + "This is the first connection to " + + endpoint + + ".\n\nKey type: " + + algorithm + + "\nFingerprint: " + + fingerprint + + "\n\nVerify this fingerprint before trusting the host." + ) + .setNegativeButton("Cancel", (ignored, which) -> decision.countDown()) + .setPositiveButton( + "Trust and connect", + (ignored, which) -> { + trusted.set(true); + decision.countDown(); + } + ) + .create(); + dialog.setOnCancelListener(ignored -> decision.countDown()); + dialog.show(); + } + ); + decision.await(); + return trusted.get(); + } + + private void showChangedHostKey( + String endpoint, + String expectedFingerprint, + String receivedFingerprint ) { + if (activity == null || activity.isFinishing()) return; + activity.runOnUiThread( + () -> + new AlertDialog.Builder(activity) + .setTitle("SSH host key changed") + .setMessage( + "The identity of " + + endpoint + + " has changed. The connection was blocked.\n\nExpected: " + + expectedFingerprint + + "\nReceived: " + + receivedFingerprint + ) + .setPositiveButton("Close", null) + .show() + ); + } + + private void closeRemoteShells() { + for (RemoteShell shell : remoteShells.values()) { + shell.finish(null, null); + } + remoteShells.clear(); + } + + @Override + public void onReset() { + closeRemoteShells(); + super.onReset(); + } + + @Override + public void onDestroy() { + closeRemoteShells(); + super.onDestroy(); + } + + private SshClientBuilder buildProfileBuilder(JSONObject profile) + throws IOException, InvalidPassphraseException, JSONException { + SshClientBuilder builder = SshClientBuilder.create() + .withHostname(profile.getString("hostname")) + .withPort(profile.optInt("port", 22)) + .withUsername(profile.getString("username")); + + if ("key".equals(profile.optString("authType"))) { + byte[] privateKey = Base64.decode( + profile.getString("privateKey"), + Base64.NO_WRAP + ); + SshKeyPair keyPair = SshKeyUtils.getPrivateKey( + new ByteArrayInputStream(privateKey), + profile.optString("passphrase") + ); + builder.withIdentities(keyPair); + } else { + builder.withPassword(profile.optString("password")); + } + return builder; + } + + private byte[] readUri(String uriString) throws IOException { + if (uriString == null || uriString.isEmpty()) { + throw new IOException("Private key file is required"); + } + try ( + InputStream input = context + .getContentResolver() + .openInputStream(Uri.parse(uriString)); + ByteArrayOutputStream output = new ByteArrayOutputStream() + ) { + if (input == null) throw new IOException("Could not open key file"); + byte[] buffer = new byte[8192]; + int read; + while ((read = input.read(buffer)) != -1) { + output.write(buffer, 0, read); + } + return output.toByteArray(); + } + } + + private void openRemoteShell( + SshClient shellClient, + int columns, + int rows, + CallbackContext callback + ) throws SshException, JSONException, IOException { + if (!shellClient.isConnected()) { + shellClient.close(); + throw new IOException("Failed to establish SSH connection"); + } + + String shellID = UUID.randomUUID().toString(); + SessionChannelNG channel; try { - Method method = getClass() - .getDeclaredMethod(action, JSONArray.class, CallbackContext.class); + channel = shellClient.openSessionChannel(true); + } catch (SshException e) { + shellClient.close(); + throw e; + } + RemoteShell shell = new RemoteShell(shellID, shellClient, channel, callback); + remoteShells.put(shellID, shell); - if (method != null) { - method.invoke(this, args, callback); - return true; + channel.addEventListener( + new ChannelEventListener() { + @Override + public void onChannelDataIn(Channel source, ByteBuffer data) { + shell.sendData(data); + } + + @Override + public void onChannelExtendedData( + Channel source, + ByteBuffer data, + int type + ) { + shell.sendData(data); + } + + @Override + public void onChannelClose(Channel source) { + int exitCode = channel.getExitCode(); + shell.finish( + exitCode == SessionChannelNG.EXITCODE_NOT_RECEIVED ? null : exitCode, + null + ); + } + + @Override + public void onChannelError(Channel source, Throwable error) { + shell.finish(null, error == null ? "SSH shell error" : error.toString()); + } } - } catch (NoSuchMethodException e) { - callback.error("Method not found: " + action); - return false; - } catch (SecurityException e) { - callback.error("Security exception: " + e.getMessage()); - return false; - } catch (Exception e) { - callback.error("Exception: " + e.getMessage()); - return false; + ); + + RequestFuture pty = channel + .allocatePseudoTerminal("xterm-256color", columns, rows) + .waitFor(30000L); + if (!pty.isSuccess()) { + shell.finish(null, "Remote server rejected PTY allocation"); + return; } + if (shell.finished.get()) return; - return false; + RequestFuture start = channel.startShell().waitFor(30000L); + if (!start.isSuccess()) { + shell.finish(null, "Remote server rejected the interactive shell"); + return; + } + if (shell.finished.get()) return; + + JSONObject ready = new JSONObject(); + ready.put("type", "ready"); + ready.put("sessionId", shellID); + sendShellEvent(callback, ready, true); } - public void connectUsingPassword(JSONArray args, CallbackContext callback) { + public void openShellUsingProfile(JSONArray args, CallbackContext callback) { cordova .getThreadPool() .execute( new Runnable() { public void run() { + ConnectionSecurity security = null; try { - String host = args.optString(0); - int port = args.optInt(1); - String username = args.optString(2); - String password = args.optString(3); - JCEProvider.enableBouncyCastle(true); - Log.d( - TAG, - "Connecting to " + host + ":" + port + " as " + username + String profileID = args.optString(0); + int columns = Math.max(1, args.optInt(1, 80)); + int rows = Math.max(1, args.optInt(2, 24)); + JSONObject profile = securityStore.getProfile(profileID); + ConnectionSecurity profileSecurity = new ConnectionSecurity( + profile.getString("hostname"), + profile.optInt("port", 22) ); - ssh = SshClientBuilder.create() - .withHostname(host) - .withPort(port) - .withUsername(username) - .withPassword(password) - .build(); + security = profileSecurity; + openRemoteShell( + buildProfileBuilder(profile) + .onConfigure(profileSecurity::configure) + .build(), + columns, + rows, + callback + ); + } catch (InvalidPassphraseException e) { + callback.error("Invalid passphrase for stored key"); + } catch (Exception e) { + if (security != null && security.report(callback)) return; + callback.error("Failed to open SSH shell: " + errMessage(e)); + Log.e(TAG, "Failed to open SSH shell from profile", e); + } + } + } + ); + } - if (ssh.isConnected()) { - connectionID = username + "@" + host; + public void saveProfile(JSONArray args, CallbackContext callback) { + cordova + .getThreadPool() + .execute( + new Runnable() { + public void run() { + try { + String requestedID = args.optString(0, null); + if (requestedID != null && !requestedID.isEmpty()) { + callback.error("Legacy profile import cannot replace a saved profile"); + return; + } + String authType = args.optString(4, "password"); + JSONObject profile = new JSONObject(); + profile.put("hostname", args.getString(1)); + profile.put("port", args.optInt(2, 22)); + profile.put("username", args.getString(3)); + profile.put("authType", authType); + if ("key".equals(authType)) { + profile.put( + "privateKey", + Base64.encodeToString(readUri(args.optString(6)), Base64.NO_WRAP) + ); + profile.put("passphrase", args.optString(7)); + } else { + profile.put("password", args.optString(5)); + } + callback.success(securityStore.saveProfile(requestedID, profile)); + } catch (Exception e) { + callback.error("Could not securely save SFTP profile: " + errMessage(e)); + Log.e(TAG, "Could not save SFTP profile", e); + } + } + } + ); + } - try { - sftp = SftpClientBuilder.create().withClient(ssh).build(); - } catch (IOException | SshException e) { - ssh.close(); - callback.error( - "Failed to initialize SFTP subsystem: " + errMessage(e) - ); - Log.e(TAG, "Failed to initialize SFTP subsystem", e); - return; - } + public void editProfile(JSONArray args, CallbackContext callback) { + cordova + .getThreadPool() + .execute( + new Runnable() { + public void run() { + try { + String requestedID = nullableProfileID(args); + JSONObject existing = requestedID == null + ? null + : securityStore.getProfile(requestedID); + String hostname = args.getString(1).trim(); + int port = args.optInt(2, 22); + String username = args.getString(3).trim(); + String authType = args.optString(4, "password"); + if (hostname.isEmpty()) { + throw new IllegalArgumentException("Hostname is required"); + } + if (username.isEmpty()) { + throw new IllegalArgumentException("Username is required"); + } + if (port < 1 || port > 65535) { + throw new IllegalArgumentException( + "Port must be between 1 and 65535" + ); + } - try { - sftp.getSubsystemChannel().setCharsetEncoding("UTF-8"); - } catch (UnsupportedEncodingException | SshException e) { - // Fallback to default encoding if UTF-8 fails - Log.w( - TAG, - "Failed to set UTF-8 encoding, falling back to default", - e + JSONObject profile = new JSONObject(); + profile.put("hostname", hostname); + profile.put("port", port); + profile.put("username", username); + profile.put("authType", authType); + if ("key".equals(authType)) { + String keyFile = args.optString(6); + if (!keyFile.isEmpty()) { + profile.put( + "privateKey", + Base64.encodeToString(readUri(keyFile), Base64.NO_WRAP) + ); + profile.put("passphrase", args.optString(7)); + } else if ( + existing != null && + "key".equals(existing.optString("authType")) + ) { + profile.put("privateKey", existing.getString("privateKey")); + profile.put("passphrase", existing.optString("passphrase")); + } else { + throw new IllegalArgumentException( + "Select a private key file" ); } - callback.success(); - Log.d(TAG, "Connected successfully to " + connectionID); - return; + } else { + String password = args.optString(5); + if ( + password.isEmpty() && + existing != null && + "password".equals(existing.optString("authType")) + ) { + password = existing.optString("password"); + } + profile.put("password", password); } - callback.error("Failed to establish SSH connection"); - } catch (UnresolvedAddressException e) { - callback.error("Cannot resolve host address"); - Log.e(TAG, "Cannot resolve host address", e); - } catch (PermissionDeniedException e) { - callback.error("Authentication failed: " + e.getMessage()); - Log.e(TAG, "Authentication failed", e); - } catch (SshException e) { - callback.error("SSH error: " + errMessage(e)); - Log.e(TAG, "SSH error", e); - } catch (IOException e) { - callback.error("I/O error: " + errMessage(e)); - Log.e(TAG, "I/O error", e); + String profileID = securityStore.saveProfile( + requestedID, + profile + ); + callback.success(profileInfo(profileID, profile)); } catch (Exception e) { - callback.error("Unexpected error: " + errMessage(e)); - Log.e(TAG, "Unexpected error", e); + callback.error( + "Could not securely save SFTP profile: " + errMessage(e) + ); + Log.e(TAG, "Could not save SFTP profile", e); } } } ); } - public void connectUsingKeyFile(JSONArray args, CallbackContext callback) { + public void getProfileInfo(JSONArray args, CallbackContext callback) { cordova .getThreadPool() .execute( new Runnable() { public void run() { try { - String host = args.optString(0); - int port = args.optInt(1); - String username = args.optString(2); - String keyFile = args.optString(3); - String passphrase = args.optString(4); - DocumentFile file = DocumentFile.fromSingleUri( - context, - Uri.parse(keyFile) + String profileID = args.getString(0); + callback.success( + profileInfo(profileID, securityStore.getProfile(profileID)) ); - Uri uri = file.getUri(); - ContentResolver contentResolver = context.getContentResolver(); - InputStream in = contentResolver.openInputStream(uri); - -// for `appDataDirectory`, Ref: https://developer.android.com/reference/android/content/Context#getExternalFilesDir(java.lang.String) -// the absolute path to application-specific directory. May return *null* if shared storage is not currently available. - File appDataDirectory = context.getExternalFilesDir(null); - if (appDataDirectory != null) { - com.sshtools.common.logger.Log.getDefaultContext().enableFile(com.sshtools.common.logger.Log.Level.DEBUG, new File(appDataDirectory,"synergy.log")); - } -// JCEProvider.enableBouncyCastle(false); + } catch (Exception e) { + callback.error("Could not read SFTP profile: " + errMessage(e)); + } + } + } + ); + } - Log.i(TAG, "All Available Security Providers (Security.getProviders() : " + Arrays.toString(Security.getProviders())); - Log.i(TAG, "All Available Security Providers for ED25519 (Security.getProviders(\"KeyPairGenerator.Ed25519\"\") : " + Arrays.toString(Security.getProviders("KeyPairGenerator.Ed25519"))); - Log.i(TAG, "BC Security Provider Name (`Security.getProvider(BouncyCastleProvider.PROVIDER_NAME)`) : " + Security.getProvider(BouncyCastleProvider.PROVIDER_NAME)); - Security.removeProvider("BC"); - Security.insertProviderAt(new BouncyCastleProvider(), 1); + private static JSONObject profileInfo(String profileID, JSONObject profile) + throws JSONException { + JSONObject info = new JSONObject(); + info.put("profileId", profileID); + info.put("hostname", profile.getString("hostname")); + info.put("port", profile.optInt("port", 22)); + info.put("username", profile.getString("username")); + info.put("authType", profile.optString("authType", "password")); + return info; + } - Log.i(TAG, "(After Inserting BC) All Available Security Providers (Security.getProviders() : " + Arrays.toString(Security.getProviders())); - Log.i(TAG, "(After Inserting BC) All Available Security Providers for ED25519 (Security.getProviders(\"KeyPairGenerator.Ed25519\"\") : " + Arrays.toString(Security.getProviders("KeyPairGenerator.Ed25519"))); - Log.i(TAG, "(After Inserting BC) BC Security Provider Name (`Security.getProvider(BouncyCastleProvider.PROVIDER_NAME)`) : " + Security.getProvider(BouncyCastleProvider.PROVIDER_NAME)); + private static String nullableProfileID(JSONArray args) { + if (args.length() == 0 || args.isNull(0)) return null; + String value = args.optString(0, null); + if (value == null) return null; + value = value.trim(); + if ( + value.isEmpty() || + "null".equalsIgnoreCase(value) || + "undefined".equalsIgnoreCase(value) + ) return null; + return value; + } - SshKeyPair keyPair = null; - try { - keyPair = SshKeyUtils.getPrivateKey(in, passphrase); - } catch (InvalidPassphraseException e) { - callback.error("Invalid passphrase for key file"); - Log.e(TAG, "Invalid passphrase for key file", e); - return; - } catch (IOException e) { - callback.error("Could not read key file: " + errMessage(e)); - Log.e(TAG, "Could not read key file", e); - return; + public void deleteProfile(JSONArray args, CallbackContext callback) { + String profileID = args.optString(0); + try { + JSONObject profile = securityStore.getProfile(profileID); + String label = profile.optString("username") + "@" + profile.optString("hostname"); + activity.runOnUiThread( + () -> { + AlertDialog confirmation = new AlertDialog.Builder(activity) + .setTitle("Delete saved SSH credentials?") + .setMessage( + "Remove the encrypted SFTP/SSH profile for " + label + "?" + ) + .setNegativeButton( + "Cancel", + (ignored, which) -> callback.error("Profile deletion was cancelled") + ) + .setPositiveButton( + "Delete", + (ignored, which) -> { + securityStore.deleteProfile(profileID); + callback.success(); } + ) + .create(); + confirmation.setOnCancelListener( + ignored -> callback.error("Profile deletion was cancelled") + ); + confirmation.show(); + } + ); + } catch (Exception e) { + callback.error("Could not delete SFTP profile: " + errMessage(e)); + } + } - ssh = SshClientBuilder.create() - .withHostname(host) - .withPort(port) - .withUsername(username) - .withIdentities(keyPair) - .build(); + public void writeShell(JSONArray args, CallbackContext callback) { + RemoteShell shell = remoteShells.get(args.optString(0)); + if (shell == null || shell.finished.get()) { + callback.error("SSH shell is not connected"); + return; + } + shell.write(args.optString(1), callback); + } - if (ssh.isConnected()) { - connectionID = username + "@" + host; - try { - sftp = SftpClientBuilder.create().withClient(ssh).build(); - } catch (IOException | SshException e) { - ssh.close(); - callback.error( - "Failed to initialize SFTP subsystem: " + errMessage(e) - ); - Log.e(TAG, "Failed to initialize SFTP subsystem", e); - return; - } + public void resizeShell(JSONArray args, CallbackContext callback) { + String shellID = args.optString(0); + RemoteShell shell = remoteShells.get(shellID); + if (shell == null || shell.finished.get()) { + callback.error("SSH shell is not connected"); + return; + } + shell.channel.changeTerminalDimensions( + Math.max(1, args.optInt(1, 80)), + Math.max(1, args.optInt(2, 24)), + 0, + 0 + ); + callback.success(); + } - try { - sftp.getSubsystemChannel().setCharsetEncoding("UTF-8"); - } catch (UnsupportedEncodingException | SshException e) { - // Fallback to default encoding if UTF-8 fails - Log.w( - TAG, - "Failed to set UTF-8 encoding, falling back to default", - e - ); - } + public void closeShell(JSONArray args, CallbackContext callback) { + RemoteShell shell = remoteShells.get(args.optString(0)); + if (shell != null) shell.finish(null, null); + callback.success(); + } + + public boolean execute( + String action, + JSONArray args, + CallbackContext callback + ) { + if (!isAllowedAction(action)) { + callback.error("SFTP action is not available: " + action); + return false; + } + try { + Method method = getClass() + .getDeclaredMethod(action, JSONArray.class, CallbackContext.class); + + if (method != null) { + method.invoke(this, args, callback); + return true; + } + } catch (NoSuchMethodException e) { + callback.error("Method not found: " + action); + return false; + } catch (SecurityException e) { + callback.error("Security exception: " + e.getMessage()); + return false; + } catch (Exception e) { + callback.error("Exception: " + e.getMessage()); + return false; + } + + return false; + } + + private static boolean isAllowedAction(String action) { + switch (action) { + case "exec": + case "connectUsingProfile": + case "saveProfile": + case "editProfile": + case "getProfileInfo": + case "deleteProfile": + case "getFile": + case "putFile": + case "lsDir": + case "stat": + case "mkdir": + case "rm": + case "createFile": + case "rename": + case "pwd": + case "close": + case "isConnected": + case "openShellUsingProfile": + case "writeShell": + case "resizeShell": + case "closeShell": + return true; + default: + return false; + } + } + + public void connectUsingProfile(JSONArray args, CallbackContext callback) { + cordova + .getThreadPool() + .execute( + new Runnable() { + public void run() { + ConnectionSecurity security = null; + String profileID = args.optString(0); + try { + JSONObject profile = securityStore.getProfile(profileID); + ConnectionSecurity profileSecurity = new ConnectionSecurity( + profile.getString("hostname"), + profile.optInt("port", 22) + ); + security = profileSecurity; + if ( + establishConnection( + buildProfileBuilder(profile), + profileID, + profileSecurity + ) + ) { callback.success(); - Log.d(TAG, "Connected successfully to " + connectionID); return; } - + if (security.report(callback)) return; callback.error("Failed to establish SSH connection"); - } catch (UnresolvedAddressException e) { - callback.error("Cannot resolve host address"); - Log.e(TAG, "Cannot resolve host address", e); - } catch (PermissionDeniedException e) { - callback.error("Authentication failed: " + e.getMessage()); - Log.e(TAG, "Authentication failed", e); - } catch (SshException e) { - callback.error("SSH error: " + errMessage(e)); - Log.e(TAG, "SSH error", e); - } catch (IOException e) { - callback.error("I/O error: " + errMessage(e)); - Log.e(TAG, "I/O error", e); - } catch (SecurityException e) { - callback.error("Security error: " + errMessage(e)); - Log.e(TAG, "Security error", e); + } catch (InvalidPassphraseException e) { + callback.error("Invalid passphrase for stored key"); } catch (Exception e) { - callback.error("Unexpected error: " + errMessage(e)); - Log.e(TAG, "Unexpected error", e); + if (security != null && security.report(callback)) return; + callback.error("Failed to connect SFTP profile: " + errMessage(e)); + Log.e(TAG, "Failed to connect SFTP profile", e); + } catch (OutOfMemoryError e) { + synchronized (connectionLock) { + closeConnectionQuietly(); + } + callback.error("Not enough memory to initialize SFTP"); } } } @@ -412,11 +1077,22 @@ public void lsDir(JSONArray args, CallbackContext callback) { .execute( new Runnable() { public void run() { + SftpClient activeSftp = null; try { String path = args.optString(0); - if (ssh != null && sftp != null) { + synchronized (connectionLock) { + activeSftp = sftp; + if ( + ssh == null || + !ssh.isConnected() || + activeSftp == null || + activeSftp.isClosed() + ) { + callback.error("Not connected"); + return; + } JSONArray files = new JSONArray(); - for (SftpFile file : sftp.ls(path)) { + for (SftpFile file : activeSftp.ls(path)) { String filename = file.getFilename(); if (filename.equals(".") || filename.equals("..")) { continue; @@ -443,11 +1119,11 @@ public void run() { if (permissions.charAt(0) == 'l') { fileInfo.put("isLink", true); try { - String linkTarget = sftp.getSymbolicLinkTarget( + String linkTarget = activeSftp.getSymbolicLinkTarget( file.getAbsolutePath() ); fileInfo.put("linkTarget", linkTarget); - SftpFileAttributes linkAttributes = sftp.stat( + SftpFileAttributes linkAttributes = activeSftp.stat( linkTarget ); fileInfo.put("isFile", linkAttributes.isFile()); @@ -473,15 +1149,30 @@ public void run() { callback.success(files); return; } - callback.error("Not connected"); - } catch (SftpStatusException | JSONException | SshException e) { + } catch (SftpStatusException | JSONException e) { callback.error(errMessage(e)); + } catch (SshException | RuntimeException e) { + invalidateSftpConnection(activeSftp, e); + callback.error( + "SFTP connection was interrupted. Reconnect and try again." + ); } } } ); } + private void invalidateSftpConnection( + SftpClient failedSftp, + Exception failure + ) { + synchronized (connectionLock) { + if (failedSftp == null || sftp != failedSftp) return; + Log.w(TAG, "Invalidating failed SFTP connection", failure); + closeConnectionQuietly(); + } + } + public void stat(JSONArray args, CallbackContext callback) { cordova .getThreadPool() @@ -728,16 +1419,13 @@ public void close(JSONArray args, CallbackContext callback) { .execute( new Runnable() { public void run() { - try { - if (ssh != null) { - ssh.close(); - sftp.quit(); + synchronized (connectionLock) { + if (ssh != null || sftp != null) { + closeConnectionQuietly(); callback.success(); return; } - callback.error("Not connected"); - } catch (IOException | SshException e) { - callback.error(errMessage(e)); + callback.success(); } } } @@ -750,17 +1438,19 @@ public void isConnected(JSONArray args, CallbackContext callback) { .execute( new Runnable() { public void run() { - if ( - ssh != null && - ssh.isConnected() && - sftp != null && - !sftp.isClosed() - ) { - callback.success(connectionID); - return; - } + synchronized (connectionLock) { + if ( + ssh != null && + ssh.isConnected() && + sftp != null && + !sftp.isClosed() + ) { + callback.success(connectionID); + return; + } - callback.success(0); + callback.success(0); + } } } ); diff --git a/src/plugins/sftp/src/com/foxdebug/sftp/SftpSecurityStore.java b/src/plugins/sftp/src/com/foxdebug/sftp/SftpSecurityStore.java new file mode 100644 index 0000000000..9951566fcc --- /dev/null +++ b/src/plugins/sftp/src/com/foxdebug/sftp/SftpSecurityStore.java @@ -0,0 +1,75 @@ +package com.foxdebug.sftp; + +import android.content.Context; +import com.foxdebug.acode.rk.auth.EncryptedPreferenceManager; +import java.security.GeneralSecurityException; +import java.util.UUID; +import org.json.JSONException; +import org.json.JSONObject; + +final class SftpSecurityStore { + + static final String PROFILE_PREFIX = "profile-"; + private static final String PROFILE_PREFS = "acode_sftp_profiles_v1"; + private static final String HOST_PREFS = "acode_ssh_known_hosts_v1"; + + private final EncryptedPreferenceManager profiles; + private final EncryptedPreferenceManager knownHosts; + + SftpSecurityStore(Context context) { + // SSH credentials and trusted-host records must never fall back to plaintext. + profiles = new EncryptedPreferenceManager(context, PROFILE_PREFS, false); + knownHosts = new EncryptedPreferenceManager(context, HOST_PREFS, false); + } + + static boolean isProfileID(String value) { + return value != null && value.startsWith(PROFILE_PREFIX); + } + + synchronized String saveProfile(String requestedID, JSONObject profile) + throws GeneralSecurityException, JSONException { + String profileID = isProfileID(requestedID) + ? requestedID + : PROFILE_PREFIX + UUID.randomUUID(); + if (!profiles.setStringSync(profileID, profile.toString())) { + throw new GeneralSecurityException("Could not persist SFTP profile"); + } + return profileID; + } + + synchronized JSONObject getProfile(String profileID) + throws GeneralSecurityException, JSONException { + if (!isProfileID(profileID)) throw new GeneralSecurityException( + "Invalid SFTP profile ID" + ); + String storedProfile = profiles.getString(profileID, null); + if (storedProfile == null) throw new GeneralSecurityException( + "SFTP profile was not found" + ); + return new JSONObject(storedProfile); + } + + synchronized void deleteProfile(String profileID) { + if (isProfileID(profileID)) profiles.removeSync(profileID); + } + + synchronized JSONObject getKnownHost(String host) throws JSONException { + String value = knownHosts.getString(host, null); + return value == null ? null : new JSONObject(value); + } + + synchronized void trustHost( + String host, + String algorithm, + String fingerprint, + String publicKey + ) throws JSONException { + JSONObject record = new JSONObject(); + record.put("algorithm", algorithm); + record.put("fingerprint", fingerprint); + record.put("publicKey", publicKey); + if (!knownHosts.setStringSync(host, record.toString())) { + throw new JSONException("Could not persist trusted SSH host"); + } + } +} diff --git a/src/plugins/sftp/www/sftp.js b/src/plugins/sftp/www/sftp.js index cd1859ea68..1fbbb76e31 100644 --- a/src/plugins/sftp/www/sftp.js +++ b/src/plugins/sftp/www/sftp.js @@ -2,22 +2,21 @@ module.exports = { exec: function (command, onSuccess, onFail) { cordova.exec(onSuccess, onFail, 'Sftp', 'exec', [command]); }, - connectUsingPassword: function (host, port, username, password, onSuccess, onFail) { - if (typeof port != 'number') { - throw new Error('Port must be number'); - } - - port = Number.parseInt(port); - cordova.exec(onSuccess, onFail, 'Sftp', 'connectUsingPassword', [host, port, username, password]); - }, - connectUsingKeyFile: function (host, port, username, keyFile, passphrase, onSuccess, onFail) { - if (typeof port != 'number') { - throw new Error('Port must be number'); - } - - port = Number.parseInt(port); - cordova.exec(onSuccess, onFail, 'Sftp', 'connectUsingKeyFile', [host, port, username, keyFile, passphrase]); - }, + connectUsingProfile: function (profileId, onSuccess, onFail) { + cordova.exec(onSuccess, onFail, 'Sftp', 'connectUsingProfile', [profileId]); + }, + saveProfile: function (profileId, host, port, username, authType, password, keyFile, passphrase, onSuccess, onFail) { + cordova.exec(onSuccess, onFail, 'Sftp', 'saveProfile', [profileId, host, port, username, authType, password, keyFile, passphrase]); + }, + editProfile: function (profileId, host, port, username, authType, password, keyFile, passphrase, onSuccess, onFail) { + cordova.exec(onSuccess, onFail, 'Sftp', 'editProfile', [profileId, host, port, username, authType, password, keyFile, passphrase]); + }, + getProfileInfo: function (profileId, onSuccess, onFail) { + cordova.exec(onSuccess, onFail, 'Sftp', 'getProfileInfo', [profileId]); + }, + deleteProfile: function (profileId, onSuccess, onFail) { + cordova.exec(onSuccess, onFail, 'Sftp', 'deleteProfile', [profileId]); + }, getFile: function (filename, localFilename, onSuccess, onFail) { cordova.exec(onSuccess, onFail, 'Sftp', 'getFile', [filename, localFilename]); }, @@ -48,7 +47,19 @@ module.exports = { close: function (onSuccess, onFail) { cordova.exec(onSuccess, onFail, 'Sftp', 'close', []); }, - isConnected: function (onSuccess, onFail) { - cordova.exec(onSuccess, onFail, 'Sftp', 'isConnected', []); - } -}; + isConnected: function (onSuccess, onFail) { + cordova.exec(onSuccess, onFail, 'Sftp', 'isConnected', []); + }, + openShellUsingProfile: function (profileId, cols, rows, onEvent, onFail) { + cordova.exec(onEvent, onFail, 'Sftp', 'openShellUsingProfile', [profileId, cols, rows]); + }, + writeShell: function (sessionId, data, onSuccess, onFail) { + cordova.exec(onSuccess, onFail, 'Sftp', 'writeShell', [sessionId, data]); + }, + resizeShell: function (sessionId, cols, rows, onSuccess, onFail) { + cordova.exec(onSuccess, onFail, 'Sftp', 'resizeShell', [sessionId, cols, rows]); + }, + closeShell: function (sessionId, onSuccess, onFail) { + cordova.exec(onSuccess, onFail, 'Sftp', 'closeShell', [sessionId]); + } +}; diff --git a/src/utils/Url.js b/src/utils/Url.js index 9485031294..f79e69be00 100644 --- a/src/utils/Url.js +++ b/src/utils/Url.js @@ -43,6 +43,24 @@ export default { }); }, + /** + * Checks whether a URL is the same as, or nested below, a parent URL. + * Query parameters are ignored and path segment boundaries are preserved. + * @param {string} candidate + * @param {string} parent + * @returns {boolean} + */ + isSameOrDescendant(candidate, parent) { + const normalize = (value) => { + value = this.parse(value).url; + return value.endsWith("/") ? value.slice(0, -1) : value; + }; + candidate = normalize(candidate); + parent = normalize(parent); + if (candidate === parent) return true; + return candidate.startsWith(`${parent}/`); + }, + /** * * @param {String} url diff --git a/src/utils/shell.js b/src/utils/shell.js new file mode 100644 index 0000000000..434ad922c5 --- /dev/null +++ b/src/utils/shell.js @@ -0,0 +1,13 @@ +/** + * Quote one value for use as a literal argument in a POSIX shell command. + * Control characters are rejected because terminal input is line-oriented. + * @param {unknown} value + * @returns {string} + */ +export function quotePosixShellArg(value) { + const argument = String(value); + if (/\0|\r|\n/.test(argument)) { + throw new Error("Shell arguments cannot contain control characters"); + } + return `'${argument.replaceAll("'", `'"'"'`)}'`; +} diff --git a/tests/unit/sftpProfiles.test.js b/tests/unit/sftpProfiles.test.js new file mode 100644 index 0000000000..eb160a629e --- /dev/null +++ b/tests/unit/sftpProfiles.test.js @@ -0,0 +1,135 @@ +import { beforeEach, describe, expect, it, vi } from "vitest"; + +const { deleteMock } = vi.hoisted(() => ({ deleteMock: vi.fn() })); + +vi.mock("fileSystem", () => ({ + default: () => ({ delete: deleteMock }), +})); + +import { + createSftpProfileUrl, + editSftpProfile, + getSftpProfileId, + getSftpProfileInfo, + migrateLegacySftpProfiles, +} from "lib/sftpProfiles"; + +describe("SFTP secure profiles", () => { + beforeEach(() => { + const values = new Map(); + globalThis.localStorage = { + getItem: (key) => values.get(key) ?? null, + setItem: (key, value) => values.set(key, String(value)), + removeItem: (key) => values.delete(key), + }; + globalThis.DATA_STORAGE = "file:///data/"; + deleteMock.mockReset(); + }); + + it("creates and recognizes opaque profile URLs", () => { + const url = createSftpProfileUrl("profile-123", "/project/file.js"); + expect(url).toBe("sftp://profile-123/project/file.js"); + expect(getSftpProfileId(url)).toBe("profile-123"); + expect(getSftpProfileId("sftp://user:secret@example.com/project")).toBeNull(); + }); + + it("passes transient form credentials to the encrypted native profile store", async () => { + const editProfile = vi.fn((...args) => { + args.at(-2)({ profileId: "profile-native" }); + }); + globalThis.sftp = { editProfile }; + + await editSftpProfile({ + hostname: "example.com", + port: 2222, + username: "user", + authType: "key", + keyFile: "content://private-key", + passPhrase: "key secret", + }); + + expect(editProfile).toHaveBeenCalledWith( + null, + "example.com", + 2222, + "user", + "key", + "", + "content://private-key", + "key secret", + expect.any(Function), + expect.any(Function), + ); + }); + + it("reads only non-secret profile metadata from native storage", async () => { + const getProfileInfo = vi.fn((profileId, resolve) => { + resolve({ + profileId, + hostname: "example.com", + port: 22, + username: "user", + authType: "password", + }); + }); + globalThis.sftp = { getProfileInfo }; + + const profile = await getSftpProfileInfo("profile-native"); + + expect(profile).not.toHaveProperty("password"); + expect(profile).not.toHaveProperty("privateKey"); + }); + + it("migrates repeated credential URLs once and removes credentials", async () => { + const saveProfile = vi.fn((...args) => { + const onSuccess = args.at(-2); + onSuccess("profile-abcd"); + }); + globalThis.sftp = { saveProfile }; + const root = "sftp://user:p%40ss@example.com:2222/"; + const file = "sftp://user:p%40ss@example.com:2222/project/app.js"; + localStorage.setItem( + "storageList", + JSON.stringify([{ storageType: "sftp", url: root }]), + ); + localStorage.setItem("recentFiles", JSON.stringify([file])); + + await migrateLegacySftpProfiles(); + + expect(saveProfile).toHaveBeenCalledTimes(1); + expect(JSON.parse(localStorage.getItem("storageList"))[0].url).toBe( + "sftp://profile-abcd/", + ); + expect(JSON.parse(localStorage.getItem("recentFiles"))[0]).toBe( + "sftp://profile-abcd/project/app.js", + ); + expect(localStorage.getItem("storageList")).not.toContain("p%40ss"); + expect(localStorage.getItem("sftpNativeProfileMigration")).toBe("1"); + + const restoredLegacy = "sftp://other:secret@example.net/"; + localStorage.setItem("recentFolders", JSON.stringify([restoredLegacy])); + await migrateLegacySftpProfiles(); + expect(saveProfile).toHaveBeenCalledTimes(1); + expect(JSON.parse(localStorage.getItem("recentFolders"))[0]).toBe( + restoredLegacy, + ); + }); + + it("fails closed when a legacy URL cannot be encrypted", async () => { + globalThis.sftp = { + saveProfile: (...args) => args.at(-1)("Keystore unavailable"), + }; + const legacy = "sftp://user:secret@example.com/"; + localStorage.setItem( + "storageList", + JSON.stringify([{ storageType: "sftp", url: legacy }]), + ); + + await expect(migrateLegacySftpProfiles()).rejects.toThrow( + "SFTP credentials could not be moved to encrypted native storage", + ); + + expect(JSON.parse(localStorage.getItem("storageList"))[0].url).toBe(legacy); + expect(localStorage.getItem("sftpNativeProfileMigration")).toBeNull(); + }); +}); diff --git a/tests/unit/shell.test.js b/tests/unit/shell.test.js new file mode 100644 index 0000000000..6a7f5ef6d1 --- /dev/null +++ b/tests/unit/shell.test.js @@ -0,0 +1,22 @@ +import { describe, expect, it } from "vitest"; +import { quotePosixShellArg } from "utils/shell"; + +describe("quotePosixShellArg", () => { + it("quotes spaces and shell metacharacters as literal text", () => { + expect(quotePosixShellArg("/srv/project $(touch bad)")).toBe( + "'/srv/project $(touch bad)'", + ); + }); + + it("escapes embedded single quotes", () => { + expect(quotePosixShellArg("/srv/user's project")).toBe( + `'/srv/user'"'"'s project'`, + ); + }); + + it("rejects line-oriented control characters", () => { + expect(() => quotePosixShellArg("/srv/project\ncommand")).toThrow( + "control characters", + ); + }); +}); diff --git a/tests/unit/url.test.js b/tests/unit/url.test.js index f2304b6597..0334ab0a0c 100644 --- a/tests/unit/url.test.js +++ b/tests/unit/url.test.js @@ -85,6 +85,32 @@ describe("Url.safe", () => { }); }); +describe("Url.isSameOrDescendant", () => { + it("matches a remote root and its descendants", () => { + expect( + Url.isSameOrDescendant( + "sftp://user@host:22/project/src?keyFile=secret", + "sftp://user@host:22/project", + ), + ).toBe(true); + expect( + Url.isSameOrDescendant( + "sftp://user@host:22/project/", + "sftp://user@host:22/project", + ), + ).toBe(true); + }); + + it("preserves path segment boundaries", () => { + expect( + Url.isSameOrDescendant( + "sftp://user@host:22/project-copy", + "sftp://user@host:22/project", + ), + ).toBe(false); + }); +}); + describe("Url.formate", () => { it("builds a url from its parts", () => { expect( From 2d3ba930f161f8be37e1f1d5f8f6f3d6a5490bef Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Mon, 17 Aug 2026 12:51:18 +0000 Subject: [PATCH 059/195] fix(lsp): correct workspace and document color capabilities and add tailwind lsp (#2736) * fix(lsp): correct workspace and document color capabilities * feat(lsp): add Tailwind CSS server * fix --- src/cm/lsp/clientManager.ts | 11 +++--- src/cm/lsp/documentColors.ts | 2 +- src/cm/lsp/serverRegistry.ts | 19 ++++++++-- src/cm/lsp/servers/index.ts | 3 ++ src/cm/lsp/servers/shared.ts | 34 +++++++++++++++++ src/cm/lsp/servers/tailwind.ts | 51 ++++++++++++++++++++++++++ src/cm/lsp/types.ts | 2 + src/cm/lsp/workspace.ts | 3 ++ tests/unit/lspTailwindServer.test.js | 24 ++++++++++++ tests/unit/lspWorkspaceFolders.test.js | 44 ++++++++++++++++++++++ 10 files changed, 184 insertions(+), 9 deletions(-) create mode 100644 src/cm/lsp/servers/tailwind.ts create mode 100644 tests/unit/lspTailwindServer.test.js create mode 100644 tests/unit/lspWorkspaceFolders.test.js diff --git a/src/cm/lsp/clientManager.ts b/src/cm/lsp/clientManager.ts index 59eae1966d..b4d3373be7 100644 --- a/src/cm/lsp/clientManager.ts +++ b/src/cm/lsp/clientManager.ts @@ -742,6 +742,9 @@ export class LspClientManager { displayFile: this.options.displayFile, openFile: this.options.openFile, resolveLanguageId: this.options.resolveLanguageId, + // Track the first folder advertised during `initialize` so it is not + // sent again as a workspace-folder change after the client connects. + initialFolders: runtimeRootUri ? [runtimeRootUri] : undefined, }; const clientConfig = { ...(server.clientConfig ?? {}) }; @@ -1048,9 +1051,7 @@ export class LspClientManager { client, transportHandle.transport, initializationOptions, - scope === "workspace" && server.useWorkspaceFolders - ? null - : normalizedRootUri, + runtimeRootUri, ); await waitForInitialization(client.initializing, signal, server.id); if (!client.__acodeLoggedInfo) { @@ -1076,8 +1077,8 @@ export class LspClientManager { addLspLog( server.id, "info", - normalizedRootUri - ? `Initialized workspace ${normalizedRootUri}` + runtimeRootUri + ? `Initialized workspace ${runtimeRootUri}` : "Initialized without a workspace root", ); client.__acodeLoggedInfo = true; diff --git a/src/cm/lsp/documentColors.ts b/src/cm/lsp/documentColors.ts index 99bc055c9d..11496259fd 100644 --- a/src/cm/lsp/documentColors.ts +++ b/src/cm/lsp/documentColors.ts @@ -533,7 +533,7 @@ export function documentColorsClientExtension(): LSPClientExtension { clientCapabilities: { textDocument: { colorProvider: { - dynamicRegistration: true, + dynamicRegistration: false, }, }, }, diff --git a/src/cm/lsp/serverRegistry.ts b/src/cm/lsp/serverRegistry.ts index 24b255630a..faaeaa9494 100644 --- a/src/cm/lsp/serverRegistry.ts +++ b/src/cm/lsp/serverRegistry.ts @@ -15,6 +15,11 @@ import type { TransportDescriptor, WebSocketTransportOptions, } from "./types"; +import { + addJsTsLanguageAliases, + isTailwindCssServer, + resolveJsTsLanguageId, +} from "./servers/shared"; const registry = new Map(); const listeners = new Set(); @@ -176,6 +181,11 @@ function sanitizeDefinition( const id = toKey(definition.id); if (!id) throw new Error("LSP server definition requires a non-empty id"); + const tailwindCss = isTailwindCssServer(definition); + const declaredLanguages = sanitizeLanguages(definition.languages); + const languages = tailwindCss + ? addJsTsLanguageAliases(declaredLanguages) + : declaredLanguages; const transport: RawTransportDescriptor = definition.transport ?? {}; const kind = (transport.kind ?? "stdio") as @@ -189,7 +199,7 @@ function sanitizeDefinition( if ( !("languages" in definition) || - !sanitizeLanguages(definition.languages).length + !languages.length ) { throw new Error(`LSP server ${id} must declare supported languages`); } @@ -304,7 +314,7 @@ function sanitizeDefinition( Number.isFinite(definition.priority) ? definition.priority : 0, - languages: sanitizeLanguages(definition.languages), + languages, transport: sanitizedTransport, initializationOptions: clone(definition.initializationOptions), workspaceConfiguration: clone(definition.workspaceConfiguration), @@ -323,7 +333,10 @@ function sanitizeDefinition( resolveLanguageId: typeof definition.resolveLanguageId === "function" ? definition.resolveLanguageId - : null, + : tailwindCss + ? ({ languageId, languageName }) => + resolveJsTsLanguageId(languageId, languageName) + : null, launcher, runtimes: sanitizeRuntimeIds(definition.runtimes), useWorkspaceFolders: definition.useWorkspaceFolders === true, diff --git a/src/cm/lsp/servers/index.ts b/src/cm/lsp/servers/index.ts index 9164ea1a8c..dd45399401 100644 --- a/src/cm/lsp/servers/index.ts +++ b/src/cm/lsp/servers/index.ts @@ -3,6 +3,7 @@ import { javascriptBundle, javascriptServers } from "./javascript"; import { luauBundle, luauServers } from "./luau"; import { pythonBundle, pythonServers } from "./python"; import { systemsBundle, systemsServers } from "./systems"; +import { tailwindBundle, tailwindServers } from "./tailwind"; import { webBundle, webServers } from "./web"; export const builtinServers: LspServerManifest[] = [ @@ -11,6 +12,7 @@ export const builtinServers: LspServerManifest[] = [ ...luauServers, ...webServers, ...systemsServers, + ...tailwindServers, ]; export const builtinServerBundles: LspServerBundle[] = [ @@ -19,4 +21,5 @@ export const builtinServerBundles: LspServerBundle[] = [ luauBundle, webBundle, systemsBundle, + tailwindBundle, ]; diff --git a/src/cm/lsp/servers/shared.ts b/src/cm/lsp/servers/shared.ts index 5b0d84e8c7..10227fd888 100644 --- a/src/cm/lsp/servers/shared.ts +++ b/src/cm/lsp/servers/shared.ts @@ -1,3 +1,5 @@ +import type { LspServerManifest } from "../types"; + export function normalizeServerLanguageKey( value: string | undefined | null, ): string { @@ -6,6 +8,38 @@ export function normalizeServerLanguageKey( .toLowerCase(); } +export function isTailwindCssServer(server: LspServerManifest): boolean { + const identifiers = [ + server.id, + server.label, + server.transport?.command, + ...(server.transport?.args ?? []), + server.launcher?.command, + ...(server.launcher?.args ?? []), + server.launcher?.bridge?.command, + ...(server.launcher?.bridge?.args ?? []), + ]; + return identifiers.some((value) => + normalizeServerLanguageKey(value).includes("tailwindcss"), + ); +} + +export function addJsTsLanguageAliases(languages: string[]): string[] { + const aliases = new Set(languages.map(normalizeServerLanguageKey)); + const pairs = [ + ["js", "javascript"], + ["jsx", "javascriptreact"], + ["ts", "typescript"], + ["tsx", "typescriptreact"], + ]; + for (const [short, standard] of pairs) { + if (!aliases.has(short) && !aliases.has(standard)) continue; + aliases.add(short); + aliases.add(standard); + } + return [...aliases].filter(Boolean); +} + export function resolveJsTsLanguageId( languageId: string | undefined, languageName: string | undefined, diff --git a/src/cm/lsp/servers/tailwind.ts b/src/cm/lsp/servers/tailwind.ts new file mode 100644 index 0000000000..ef299228e6 --- /dev/null +++ b/src/cm/lsp/servers/tailwind.ts @@ -0,0 +1,51 @@ +import { defineBundle, defineServer, installers } from "../providerUtils"; +import type { LspServerBundle, LspServerManifest } from "../types"; +import { resolveJsTsLanguageId } from "./shared"; + +export const tailwindServers: LspServerManifest[] = [ + defineServer({ + id: "tailwindcss", + label: "Tailwind CSS", + languages: [ + "html", + "css", + "scss", + "less", + "javascript", + "javascriptreact", + "typescript", + "typescriptreact", + "jsx", + "tsx", + "vue", + "svelte", + "astro", + "php", + "mdx", + ], + runtimes: ["builtin-alpine"], + command: "tailwindcss-language-server", + args: ["--stdio"], + checkCommand: "which tailwindcss-language-server", + installer: installers.npm({ + executable: "tailwindcss-language-server", + packages: ["@tailwindcss/language-server"], + }), + clientConfig: { + builtinExtensions: { + formatting: false, + signature: false, + }, + }, + resolveLanguageId: ({ languageId, languageName }) => + resolveJsTsLanguageId(languageId, languageName), + useWorkspaceFolders: true, + enabled: false, + }), +]; + +export const tailwindBundle: LspServerBundle = defineBundle({ + id: "builtin-tailwindcss", + label: "Tailwind CSS", + servers: tailwindServers, +}); diff --git a/src/cm/lsp/types.ts b/src/cm/lsp/types.ts index 6927624624..1ffa6c4bd5 100644 --- a/src/cm/lsp/types.ts +++ b/src/cm/lsp/types.ts @@ -519,6 +519,8 @@ export interface WorkspaceOptions { displayFile?: (uri: string) => Promise; openFile?: (uri: string) => Promise; resolveLanguageId?: (uri: string) => string | null; + /** Folders already advertised in `initialize`; do not re-notify. */ + initialFolders?: string[]; } // ============================================================================ diff --git a/src/cm/lsp/workspace.ts b/src/cm/lsp/workspace.ts index e570928f53..b3d02e36f3 100644 --- a/src/cm/lsp/workspace.ts +++ b/src/cm/lsp/workspace.ts @@ -58,6 +58,9 @@ export default class AcodeWorkspace extends Workspace { this.#versions = Object.create(null) as Record; this.#workspaceFolders = new Set(); this.options = options; + for (const folder of options.initialFolders ?? []) { + if (folder) this.#workspaceFolders.add(folder); + } } #log(level: LspLogLevel, message: string, details?: unknown): void { diff --git a/tests/unit/lspTailwindServer.test.js b/tests/unit/lspTailwindServer.test.js new file mode 100644 index 0000000000..3ba677e859 --- /dev/null +++ b/tests/unit/lspTailwindServer.test.js @@ -0,0 +1,24 @@ +import { describe, expect, it } from "vitest"; +import { tailwindServers } from "cm/lsp/servers/tailwind"; + +describe("built-in Tailwind CSS language server", () => { + it("is available but disabled by default", () => { + const server = tailwindServers.find(({ id }) => id === "tailwindcss"); + + expect(server).toBeDefined(); + expect(server.enabled).toBe(false); + expect(server.useWorkspaceFolders).toBe(true); + expect(server.launcher.bridge).toMatchObject({ + command: "tailwindcss-language-server", + args: ["--stdio"], + }); + expect(server.launcher.install).toMatchObject({ + kind: "npm", + executable: "tailwindcss-language-server", + packages: ["@tailwindcss/language-server"], + }); + expect( + server.resolveLanguageId({ languageId: "tsx", languageName: "TSX" }), + ).toBe("typescriptreact"); + }); +}); diff --git a/tests/unit/lspWorkspaceFolders.test.js b/tests/unit/lspWorkspaceFolders.test.js new file mode 100644 index 0000000000..e5e8db62d1 --- /dev/null +++ b/tests/unit/lspWorkspaceFolders.test.js @@ -0,0 +1,44 @@ +// @vitest-environment happy-dom + +import { describe, expect, it } from "vitest"; +import { + addJsTsLanguageAliases, + isTailwindCssServer, + resolveJsTsLanguageId, +} from "cm/lsp/servers/shared"; + +describe("Tailwind document language IDs", () => { + it("recognizes a custom server and supplies its standard aliases", () => { + const server = { + id: "custom-tailwind-test", + languages: ["tsx"], + transport: { + kind: "stdio", + command: "tailwindcss-language-server", + }, + }; + + expect(isTailwindCssServer(server)).toBe(true); + expect(addJsTsLanguageAliases(server.languages)).toEqual( + expect.arrayContaining(["tsx", "typescriptreact"]), + ); + expect(resolveJsTsLanguageId("tsx", "TSX")).toBe("typescriptreact"); + }); +}); + +describe("workspace folder initialization", () => { + it("does not notify the server twice for the initial folder", async () => { + const { default: AcodeWorkspace } = await import("cm/lsp/workspace"); + const workspace = new AcodeWorkspace( + { connected: false }, + { initialFolders: ["file:///data/user/0/app/project/"] }, + ); + + expect( + workspace.hasWorkspaceFolder("file:///data/user/0/app/project/"), + ).toBe(true); + expect( + workspace.addWorkspaceFolder("file:///data/user/0/app/project/"), + ).toBe(false); + }); +}); From de25d05c0a11b1af450a5f138676cca6366ade2b Mon Sep 17 00:00:00 2001 From: AuDevTist1C <114492072+AuDevTist1C@users.noreply.github.com> Date: Mon, 17 Aug 2026 18:30:30 +0000 Subject: [PATCH 060/195] refactor: standardize DOM element dataset attributes across file browser component (#2543) Standardize DOM element attribute naming across the file browser component by converting legacy custom attributes to standard HTML5 `data-*` dataset attributes. Previously, template elements mixed standard properties with proprietary, non-standard DOM attributes (such as `action`, `type`, `name`, `home`, `open-doc`, `ftp-account`, `uuid`, and `storageType`). This led to non-compliant HTML markup, required explicit `getAttribute()` and `setAttribute()` DOM calls, and increased the risk of attribute collision with future web standards. This change enforces a uniform contract using the standard HTML5 `dataset` API (`data-*`), improving rendering consistency, type predictability, and JS-to-DOM binding efficiency. * **Template Refactoring (`src/pages/fileBrowser/list.hbs`):** * Converted legacy inline attributes to standard dataset equivalents: `data-action`, `data-type`, `data-name`, `data-home`, `data-open-doc`, `data-ftp-account`, `data-uuid`, and `data-storage-type`. * Ensured boolean and string dataset values comply with template engine rendering rules. * **Script Adaptations (`src/pages/fileBrowser/fileBrowser.js`):** * Refactored event delegation and element lookup handlers to utilize standard camelCase JavaScript `dataset` properties (e.g., replacing `el.getAttribute('open-doc')` with `el.dataset.openDoc`, along with `dataset.action`, `dataset.uuid`, `dataset.type`, and `dataset.storageType`). * Simplified property checks across list selection handlers and navigation logic. * **Stylesheet Selectors (`src/pages/fileBrowser/fileBrowser.scss`):** * Updated CSS attribute selectors from `[storageType="notification"]` to `[data-storage-type="notification"]` to maintain tight visual styling coupling without relying on invalid HTML attributes. (AI generated commit message) --- src/pages/fileBrowser/fileBrowser.js | 26 +++++++++++++------------- src/pages/fileBrowser/fileBrowser.scss | 6 +++--- src/pages/fileBrowser/list.hbs | 18 +++++++++--------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index 9d25cbe965..c7c6ffaf9f 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -938,16 +938,16 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { return; } - let action = $el.getAttribute("action") || $el.dataset.action; + let action = $el.dataset.action; if (!action) return; let url = $el.dataset.url; - let name = $el.dataset.name || $el.getAttribute("name"); - const idOpenDoc = $el.hasAttribute("open-doc"); - const uuid = $el.getAttribute("uuid"); - const type = $el.getAttribute("type"); - const storageType = $el.getAttribute("storageType"); - const home = $el.getAttribute("home"); + let name = $el.dataset.name; + const isOpenDoc = $el.dataset.openDoc != null; + const uuid = $el.dataset.uuid; + const type = $el.dataset.type; + const storageType = $el.dataset.storageType; + const home = $el.dataset.home; const isDir = ["dir", "directory", "folder"].includes(type); if (!url) { @@ -969,7 +969,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { return; } - if (!url && action === "open" && isDir && !idOpenDoc && !isContextMenu) { + if (!url && action === "open" && isDir && !isOpenDoc && !isContextMenu) { loader.hide(); util.addPath(name, uuid).then((res) => { const storage = allStorages.find((storage) => storage.uuid === uuid); @@ -984,7 +984,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { } if (isContextMenu) action = "contextmenu"; - else if (idOpenDoc) action = "open-doc"; + else if (isOpenDoc) action = "openDoc"; switch (action) { case "navigation": @@ -997,7 +997,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { if (isDir) folder(); else if (!$el.hasAttribute("disabled")) file(); break; - case "open-doc": + case "openDoc": openDoc(); break; } @@ -1055,7 +1055,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { if (appSettings.value.vibrateOnTap) { navigator.vibrate(config.VIBRATION_TIME); } - if ($el.getAttribute("open-doc") === "true") return; + if (isOpenDoc) return; const deleteText = currentDir.url === "/" ? strings.remove : strings.delete; @@ -1432,7 +1432,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { if (IS_FILE_MODE) { util.pushFolder(allStorages, "Select document", null, { - "open-doc": true, + openDoc: true, notSelectable: true, }); } @@ -1685,7 +1685,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { className="nav" data-url={url} data-name={displayName} - attr-action="navigation" + data-action="navigation" attr-text={displayName} tabIndex={-1} >, diff --git a/src/pages/fileBrowser/fileBrowser.scss b/src/pages/fileBrowser/fileBrowser.scss index 8e64a96221..769090e05d 100644 --- a/src/pages/fileBrowser/fileBrowser.scss +++ b/src/pages/fileBrowser/fileBrowser.scss @@ -4,7 +4,7 @@ } .tile { - &[storageType="notification"] { + &[data-storage-type="notification"] { background-color: rgb(153, 153, 255); background-color: var(--primary-color); color: rgb(255, 255, 255); @@ -22,11 +22,11 @@ position: relative; color: rgb(65, 85, 133); - &[storageType]::after { + &[data-storage-type]::after { position: absolute; top: 50%; left: 50%; - content: attr(storageType); + content: attr(data-storage-type); transform: translate(-50%, -50%); color: rgb(255, 255, 255); font-size: 0.6rem; diff --git a/src/pages/fileBrowser/list.hbs b/src/pages/fileBrowser/list.hbs index a8f118926b..0eac429756 100644 --- a/src/pages/fileBrowser/list.hbs +++ b/src/pages/fileBrowser/list.hbs @@ -3,20 +3,20 @@
  • From 85106aa0d2a95f4e53361a0daa693468628a7ca2 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Tue, 18 Aug 2026 01:00:19 +0000 Subject: [PATCH 061/195] fix(lsp): preserve websocket clients across tab switches (#2764) * fix(lsp): preserve websocket clients across tab switches Keep externally managed WebSocket runtimes alive when editor views detach, retain eager cleanup for owned runtimes * fix(lsp): dispose idle clients after grace period --- src/cm/lsp/clientManager.ts | 25 +- src/cm/lsp/types.ts | 2 + .../lspExternalWebSocketLifecycle.test.js | 305 ++++++++++++++++++ 3 files changed, 330 insertions(+), 2 deletions(-) create mode 100644 tests/unit/lspExternalWebSocketLifecycle.test.js diff --git a/src/cm/lsp/clientManager.ts b/src/cm/lsp/clientManager.ts index b4d3373be7..11bb6f5401 100644 --- a/src/cm/lsp/clientManager.ts +++ b/src/cm/lsp/clientManager.ts @@ -53,6 +53,8 @@ import type { } from "./types"; import AcodeWorkspace from "./workspace"; +export const DEFAULT_CLIENT_IDLE_GRACE_PERIOD_MS = 15_000; + export const lspCompletionEnabled = Facet.define({ // File-level marker used by the autocomplete override path. If any attached // server exposes completion, keep the shared LSP completion source available. @@ -1136,12 +1138,20 @@ export class LspClientManager { const uriAliases = new Map(); const effectiveRoot = normalizedRootUri ?? originalRootUri ?? null; let disposed = false; + let idleTimer: ReturnType | null = null; + + const cancelIdleTimer = (): void => { + if (idleTimer === null) return; + clearTimeout(idleTimer); + idleTimer = null; + }; const attach = ( uri: string, view: EditorView, aliases: string[] = [], ): void => { + cancelIdleTimer(); const existing = fileRefs.get(uri) ?? new Set(); existing.add(view); fileRefs.set(uri, existing); @@ -1165,6 +1175,7 @@ export class LspClientManager { const dispose = async (): Promise => { if (disposed) return; disposed = true; + cancelIdleTimer(); disposePullDiagnostics(client); this.#clients.delete(key); for (const views of fileRefs.values()) { @@ -1206,14 +1217,24 @@ export class LspClientManager { } } - if (!fileRefs.size) { + if (fileRefs.size || idleTimer !== null) return; + + const configuredGracePeriod = this.options.clientIdleGracePeriodMs; + const gracePeriod = + typeof configuredGracePeriod === "number" && + Number.isFinite(configuredGracePeriod) + ? Math.max(0, configuredGracePeriod) + : DEFAULT_CLIENT_IDLE_GRACE_PERIOD_MS; + idleTimer = setTimeout(() => { + idleTimer = null; + if (disposed || fileRefs.size) return; this.options.onClientIdle?.({ server, client, rootUri: effectiveRoot, dispose, }); - } + }, gracePeriod); }; return { diff --git a/src/cm/lsp/types.ts b/src/cm/lsp/types.ts index 1ffa6c4bd5..ad47e72df0 100644 --- a/src/cm/lsp/types.ts +++ b/src/cm/lsp/types.ts @@ -411,6 +411,8 @@ export interface ClientManagerOptions { displayFile?: (uri: string) => Promise; openFile?: (uri: string) => Promise; resolveLanguageId?: (uri: string) => string | null; + /** Delay before an unreferenced client is reported as idle. */ + clientIdleGracePeriodMs?: number; onClientIdle?: (info: ClientIdleInfo) => void; allowNonTerminalWorkspace?: boolean; } diff --git a/tests/unit/lspExternalWebSocketLifecycle.test.js b/tests/unit/lspExternalWebSocketLifecycle.test.js new file mode 100644 index 0000000000..65b66dbcbc --- /dev/null +++ b/tests/unit/lspExternalWebSocketLifecycle.test.js @@ -0,0 +1,305 @@ +// @vitest-environment happy-dom + +import {StateEffect} from "@codemirror/state"; +import {EditorView} from "@codemirror/view"; +import {afterEach, beforeEach, describe, expect, it, vi} from "vitest"; + +const registry = vi.hoisted(() => ({servers: []})); + +// Keep the lifecycle test independent of app UI modules that use JSX in .js +// files, which Vitest's native import analysis does not transform. +vi.mock("cm/lsp/serverRegistry", () => ({ + default: { + getServersForLanguage: (languageId) => + registry.servers.filter( + (server) => server.enabled !== false && server.languages.includes(languageId), + ), + }, +})); + +vi.mock("components/lspStatusBar", () => ({ + default: { + show: vi.fn(), + update: vi.fn(), + hideById: vi.fn(), + }, +})); + +vi.mock("components/settingsPage", () => ({default: vi.fn()})); +vi.mock("components/checkbox", () => ({ + default: vi.fn(), + updateSwitchHandle: vi.fn(), +})); + +vi.mock("lib/notificationManager", () => ({ + default: {add: vi.fn()}, +})); + +vi.mock("lib/settings", () => ({ + default: {value: {lsp: {}}}, +})); + +vi.mock("cm/lsp/diagnostics", () => ({ + clearDiagnosticsEffect: StateEffect.define(), + disposePullDiagnostics: vi.fn(), + lspDiagnosticsAutoSyncExtension: () => [], +})); + +vi.mock("cm/lsp/documentColors", () => ({ + documentColorsExtension: () => [], +})); + +vi.mock("cm/lsp/formattingSupport", () => ({ + supportsBuiltinFormatting: () => false, +})); + +vi.mock("cm/lsp/inlayHints", () => ({ + inlayHintsExtension: () => [], +})); + +vi.mock("cm/lsp/logs", () => ({addLspLog: vi.fn()})); + +vi.mock("cm/lsp/tooltipExtensions", () => ({ + hoverTooltips: () => [], + resolveLspHoverHighlightLanguage: vi.fn(), + signatureHelp: () => [], +})); + +import { + DEFAULT_CLIENT_IDLE_GRACE_PERIOD_MS, + LspClientManager, +} from "cm/lsp/clientManager"; +import { + registerRuntimeProvider, + unregisterRuntimeProvider, +} from "cm/lsp/runtimeProviders"; +import externalWebSocketRuntimeProvider from "cm/lsp/runtimes/externalWebSocket"; + +const SERVER_ID = "external-websocket-lifecycle-test"; +const LANGUAGE_ID = "external-websocket-lifecycle-test"; +const TRANSPORT_RUNTIME_ID = "transport-lifecycle-test"; + +class TestWebSocket { + static CONNECTING = 0; + static OPEN = 1; + static CLOSING = 2; + static CLOSED = 3; + static instances = []; + + readyState = TestWebSocket.CONNECTING; + onopen = null; + onmessage = null; + onerror = null; + onclose = null; + sent = []; + closeCalls = 0; + + constructor(url) { + this.url = url; + TestWebSocket.instances.push(this); + queueMicrotask(() => { + this.readyState = TestWebSocket.OPEN; + this.onopen?.({type: "open"}); + }); + } + + send(data) { + if (this.readyState !== TestWebSocket.OPEN) { + throw new Error("socket is not open"); + } + this.sent.push(data); + const message = JSON.parse(data); + if (message.method !== "initialize") return; + queueMicrotask(() => { + this.onmessage?.({ + data: JSON.stringify({ + jsonrpc: "2.0", + id: message.id, + result: {capabilities: {}}, + }), + }); + }); + } + + close(code = 1000) { + this.closeCalls++; + this.readyState = TestWebSocket.CLOSED; + this.onclose?.({code, wasClean: code === 1000}); + } +} + +class TestTransport { + handler = null; + disposeCalls = 0; + + send(data) { + const message = JSON.parse(data); + if (message.method !== "initialize") return; + queueMicrotask(() => { + this.handler?.( + JSON.stringify({ + jsonrpc: "2.0", + id: message.id, + result: {capabilities: {}}, + }), + ); + }); + } + + subscribe(handler) { + this.handler = handler; + } + + unsubscribe(handler) { + if (this.handler === handler) this.handler = null; + } + + dispose() { + this.disposeCalls++; + } +} + +let originalWebSocket; +let manager; +let view; +let testTransport; + +beforeEach(() => { + originalWebSocket = globalThis.WebSocket; + globalThis.WebSocket = TestWebSocket; + TestWebSocket.instances = []; + registerRuntimeProvider(externalWebSocketRuntimeProvider, {replace: true}); + registry.servers = [ + { + id: SERVER_ID, + label: SERVER_ID, + enabled: true, + priority: 0, + languages: [LANGUAGE_ID], + transport: { + kind: "websocket", + url: "ws://localhost:3030", + }, + }, + ]; + view = new EditorView({doc: "fn main() {}", parent: document.body}); +}); + +afterEach(async () => { + await manager?.dispose(); + view?.destroy(); + registry.servers = []; + unregisterRuntimeProvider(TRANSPORT_RUNTIME_ID); + globalThis.WebSocket = originalWebSocket; + document.body.replaceChildren(); + vi.useRealTimers(); + vi.restoreAllMocks(); +}); + +describe("LSP client idle lifecycle", () => { + it("reuses an external WebSocket client when a file attaches during the grace period", async () => { + const onClientIdle = vi.fn(({dispose}) => void dispose()); + manager = new LspClientManager({onClientIdle}); + const rootUri = "file:///workspace"; + + await manager.getExtensionsForFile({ + uri: `${rootUri}/first.rs`, + rootUri, + languageId: LANGUAGE_ID, + view, + }); + vi.useFakeTimers(); + manager.detach(`${rootUri}/first.rs`, view); + await vi.advanceTimersByTimeAsync(DEFAULT_CLIENT_IDLE_GRACE_PERIOD_MS - 1); + + await manager.getExtensionsForFile({ + uri: `${rootUri}/second.rs`, + rootUri, + languageId: LANGUAGE_ID, + view, + }); + await vi.advanceTimersByTimeAsync(DEFAULT_CLIENT_IDLE_GRACE_PERIOD_MS + 1); + + expect(onClientIdle).not.toHaveBeenCalled(); + expect(manager.getActiveClients()).toHaveLength(1); + expect(TestWebSocket.instances).toHaveLength(1); + expect(TestWebSocket.instances[0].closeCalls).toBe(0); + }); + + it("disposes an unused external WebSocket client after the grace period", async () => { + const onClientIdle = vi.fn(({dispose}) => void dispose()); + manager = new LspClientManager({onClientIdle}); + const rootUri = "file:///workspace-one"; + const uri = `${rootUri}/only.rs`; + + await manager.getExtensionsForFile({ + uri, + rootUri, + languageId: LANGUAGE_ID, + view, + }); + vi.useFakeTimers(); + manager.detach(uri, view); + await vi.advanceTimersByTimeAsync(DEFAULT_CLIENT_IDLE_GRACE_PERIOD_MS - 1); + + expect(onClientIdle).not.toHaveBeenCalled(); + expect(manager.getActiveClients()).toHaveLength(1); + expect(TestWebSocket.instances[0].closeCalls).toBe(0); + + await vi.advanceTimersByTimeAsync(1); + + expect(onClientIdle).toHaveBeenCalledOnce(); + expect(manager.getActiveClients()).toHaveLength(0); + expect(TestWebSocket.instances[0].closeCalls).toBe(1); + }); + + it("applies the same grace period to other runtimes", async () => { + registerRuntimeProvider( + { + id: TRANSPORT_RUNTIME_ID, + label: "Transport test runtime", + priority: 100, + canHandle: () => true, + start: async () => { + testTransport = new TestTransport(); + return { + kind: "transport", + providerId: TRANSPORT_RUNTIME_ID, + transport: { + transport: testTransport, + ready: Promise.resolve(), + dispose: () => testTransport.dispose(), + }, + }; + }, + }, + {replace: true}, + ); + registry.servers[0].runtimes = [TRANSPORT_RUNTIME_ID]; + const onClientIdle = vi.fn(({dispose}) => void dispose()); + manager = new LspClientManager({onClientIdle}); + const rootUri = "file:///workspace"; + const uri = `${rootUri}/only.rs`; + + await manager.getExtensionsForFile({ + uri, + rootUri, + languageId: LANGUAGE_ID, + view, + }); + vi.useFakeTimers(); + manager.detach(uri, view); + await vi.advanceTimersByTimeAsync(DEFAULT_CLIENT_IDLE_GRACE_PERIOD_MS - 1); + + expect(onClientIdle).not.toHaveBeenCalled(); + expect(manager.getActiveClients()).toHaveLength(1); + expect(TestWebSocket.instances).toHaveLength(0); + expect(testTransport.disposeCalls).toBe(0); + + await vi.advanceTimersByTimeAsync(1); + + expect(onClientIdle).toHaveBeenCalledOnce(); + expect(manager.getActiveClients()).toHaveLength(0); + expect(testTransport.disposeCalls).toBe(1); + }); +}); From b143d7ec28d2f1a2dbe892451e7cae6f06308562 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Wed, 19 Aug 2026 06:59:56 +0000 Subject: [PATCH 062/195] feat(plugins): expose static CodeMirror highlighter (#2769) * feat(plugins): expose static CodeMirror highlighter * fix --- .babelrc | 2 +- src/lib/acode.js | 22 ++++ src/lib/editorFile.js | 6 + src/test/editor.tests.js | 66 +++++++++++ src/utils/codeHighlight.js | 182 ++++++++++++++++++++++++++++--- tests/unit/codeHighlight.test.js | 181 ++++++++++++++++++++++++++++++ 6 files changed, 442 insertions(+), 17 deletions(-) create mode 100644 tests/unit/codeHighlight.test.js diff --git a/.babelrc b/.babelrc index d505023162..e5efe292f9 100644 --- a/.babelrc +++ b/.babelrc @@ -15,6 +15,6 @@ "@babel/plugin-transform-runtime", "@babel/plugin-transform-block-scoping" ], - "compact": true, + "compact": false, "sourceMaps": "inline" } diff --git a/src/lib/acode.js b/src/lib/acode.js index 15cc4b6f93..6d9310d245 100644 --- a/src/lib/acode.js +++ b/src/lib/acode.js @@ -69,6 +69,15 @@ import appSettings from "lib/settings"; import FileBrowser from "pages/fileBrowser"; import ThemeBuilder from "theme/builder"; import themes from "theme/list"; +import { + applyHighlightStyles, + clearHighlightCache, + getHighlightStyleSheet, + getHighlightStyles, + HIGHLIGHT_CLASS, + highlightCodeBlock, + highlightLine, +} from "utils/codeHighlight"; import Color from "utils/color"; import encodings, { decode, encode } from "utils/encodings"; import helpers from "utils/helpers"; @@ -312,6 +321,17 @@ class Acode { }, }; + const codeHighlightModule = Object.freeze({ + highlightLine, + highlightCodeBlock, + highlight: highlightCodeBlock, + clearCache: clearHighlightCache, + applyStyles: applyHighlightStyles, + getStyles: getHighlightStyles, + getStyleSheet: getHighlightStyleSheet, + HIGHLIGHT_CLASS, + }); + const codemirrorModule = Object.freeze({ autocomplete: cmAutocomplete, commands: cmCommands, @@ -326,6 +346,7 @@ class Acode { search: cmSearch, state: cmState, view: cmView, + highlight: codeHighlightModule, }); const configProxy = new Proxy(config, { @@ -414,6 +435,7 @@ class Acode { this.define("terminal", terminalModule); this.define("webview", webview); this.define("codemirror", codemirrorModule); + this.define("codeHighlight", codeHighlightModule); this.define("@codemirror/autocomplete", cmAutocomplete); this.define("@codemirror/commands", cmCommands); this.define("@codemirror/language", cmLanguage); diff --git a/src/lib/editorFile.js b/src/lib/editorFile.js index 449d8ea4b2..2aee9b500f 100644 --- a/src/lib/editorFile.js +++ b/src/lib/editorFile.js @@ -23,6 +23,7 @@ import startDrag from "handlers/editorFileTab"; import actions from "handlers/quickTools"; import tag from "html-tag-js"; import mimeTypes from "mime-types"; +import { applyHighlightStyles } from "utils/codeHighlight"; import helpers from "utils/helpers"; import Path from "utils/Path"; import { readRemoteFilePreview } from "utils/remoteFilePreview"; @@ -329,6 +330,7 @@ function maybeRecommendLanguageModeExtension(file, modeInfo) { * @property {string} [paneId] target editor pane id * @property {object} [pane] target editor pane * @property {boolean} [isPanePlaceholder] temporary empty tab for an empty pane + * @property {boolean} [highlightStyles] adopt static CodeMirror highlight CSS into the custom tab shadow root */ export default class EditorFile { @@ -590,6 +592,10 @@ export default class EditorFile { this.#addCustomStyles(options.stylesheets, shadow); } + if (options.highlightStyles) { + applyHighlightStyles(shadow); + } + const content =
    ; if (typeof options.content === "string") { diff --git a/src/test/editor.tests.js b/src/test/editor.tests.js index 4003dfc8c2..4af037e888 100644 --- a/src/test/editor.tests.js +++ b/src/test/editor.tests.js @@ -213,6 +213,72 @@ export async function runCodeMirrorTests(writeOutput) { ); }); + runner.test( + "Acode exposes the static CodeMirror highlighter", + async (test) => { + const codeHighlight = acode.require("codeHighlight"); + const codemirror = acode.require("codemirror"); + + test.assert(codeHighlight != null, "codeHighlight module should exist"); + test.assertEqual( + typeof codeHighlight.highlightCodeBlock, + "function", + "highlightCodeBlock should be a function", + ); + test.assertEqual( + typeof codeHighlight.highlightLine, + "function", + "highlightLine should be a function", + ); + test.assertEqual( + typeof codeHighlight.applyStyles, + "function", + "applyStyles should be a function", + ); + test.assertEqual( + typeof codeHighlight.getStyles, + "function", + "getStyles should be a function", + ); + test.assertEqual( + codeHighlight.HIGHLIGHT_CLASS, + "cm-highlighted", + "HIGHLIGHT_CLASS should match the internal token wrapper", + ); + test.assertEqual( + codemirror.highlight, + codeHighlight, + "codemirror.highlight should be the same highlighter module", + ); + + const css = codeHighlight.getStyles(); + test.assert( + typeof css === "string" && css.includes(".tok-keyword"), + "getStyles should return token CSS", + ); + + const highlighted = await codeHighlight.highlightCodeBlock( + 'const value = "acode";', + "javascript", + ); + test.assert( + highlighted.includes("value") && !highlighted.includes(" { const { view, container } = createEditor(); test.assert(view != null, "EditorView instance should be created"); diff --git a/src/utils/codeHighlight.js b/src/utils/codeHighlight.js index 1b587dfc39..3734157b3f 100644 --- a/src/utils/codeHighlight.js +++ b/src/utils/codeHighlight.js @@ -6,9 +6,16 @@ import settings from "lib/settings"; const highlightCache = new Map(); const MAX_CACHE_SIZE = 500; +const STYLE_ID = "cm-static-highlight-styles"; + +export const HIGHLIGHT_CLASS = "cm-highlighted"; +export const REF_PREVIEW_CLASS = "ref-preview"; let styleElement = null; +let constructedSheet = null; let currentThemeId = null; +let initialized = false; +const fallbackStyleElements = new Set(); export function sanitize(text) { if (!text) return ""; @@ -42,6 +49,17 @@ function setCache(key, value) { highlightCache.set(key, value); } +function canUseConstructedStyleSheets() { + return ( + typeof CSSStyleSheet !== "undefined" && + typeof CSSStyleSheet.prototype.replaceSync === "function" + ); +} + +function currentEditorThemeId() { + return settings?.value?.editorTheme || "one_dark"; +} + /** * Generates CSS styles for syntax highlighting tokens * @param {Object} config - Theme config with color values @@ -106,25 +124,149 @@ ${selector} .tok-changed { color: ${number}; } } /** - * Injects dynamic CSS for syntax highlighting based on current editor theme + * CSS for the current editor theme. Token classes come from Lezer's + * `classHighlighter` (e.g. `.tok-keyword`). + * @returns {string} */ -function injectStyles() { - const themeId = settings?.value?.editorTheme || "one_dark"; - const config = getThemeConfig(themeId); +export function getHighlightStyles() { + const config = getThemeConfig(currentEditorThemeId()); + const codeBlockStyles = generateStyles(config, `.${HIGHLIGHT_CLASS}`, true); + const refPreviewStyles = generateStyles( + config, + `.${REF_PREVIEW_CLASS}`, + false, + ); + return `${codeBlockStyles}\n${refPreviewStyles}`; +} + +function ensureConstructedSheet(css) { + if (!canUseConstructedStyleSheets()) return null; + if (!constructedSheet) { + constructedSheet = new CSSStyleSheet(); + } + constructedSheet.replaceSync(css); + return constructedSheet; +} - // Code blocks need background, references panel uses parent's background - const codeBlockStyles = generateStyles(config, ".cm-highlighted", true); - const refPreviewStyles = generateStyles(config, ".ref-preview", false); - const allStyles = `${codeBlockStyles}\n${refPreviewStyles}`; +function syncFallbackStyleElements(css) { + for (const style of fallbackStyleElements) { + // `isConnected` is false while a custom-tab host is still detached. + // Keep updating those nodes; only drop styles that have been removed. + if (!style.parentNode) { + fallbackStyleElements.delete(style); + continue; + } + style.textContent = css; + } +} - if (!styleElement) { +function injectDocumentStyleElement(css) { + if (typeof document === "undefined") return null; + if (!styleElement || !styleElement.isConnected) { styleElement = document.createElement("style"); - styleElement.id = "cm-static-highlight-styles"; - document.head.appendChild(styleElement); + styleElement.id = STYLE_ID; + (document.head || document.documentElement).appendChild(styleElement); + } + styleElement.textContent = css; + return styleElement; +} + +/** + * Rebuilds the shared highlight stylesheet from the current editor theme. + * Constructed-sheet adopters update automatically via `replaceSync`. + */ +function syncHighlightStyles() { + const css = getHighlightStyles(); + currentThemeId = currentEditorThemeId(); + ensureConstructedSheet(css); + injectDocumentStyleElement(css); + syncFallbackStyleElements(css); + return css; +} + +function resolveStyleRoot(root) { + if (!root || root === document) return document; + if (typeof ShadowRoot !== "undefined" && root instanceof ShadowRoot) { + return root; + } + if (root.shadowRoot) return root.shadowRoot; + return root; +} + +function adoptSheet(root, sheet) { + if (!sheet || !root || !("adoptedStyleSheets" in root)) return false; + try { + const sheets = Array.from(root.adoptedStyleSheets || []); + if (sheets.includes(sheet)) return true; + root.adoptedStyleSheets = [...sheets, sheet]; + return true; + } catch (e) { + console.warn("Failed to adopt highlight stylesheet", e); + return false; + } +} + +function injectFallbackStyle(root, css) { + const owner = + root === document ? document.head || document.documentElement : root; + if (!owner || typeof owner.appendChild !== "function") return null; + + let style = null; + if (typeof owner.querySelector === "function") { + style = owner.querySelector(`#${STYLE_ID}`); + } + + if (!style) { + style = document.createElement("style"); + style.id = STYLE_ID; + owner.appendChild(style); + } + + style.textContent = css; + fallbackStyleElements.add(style); + return style; +} + +/** + * Shared constructed stylesheet used for document + shadow roots. + * @returns {CSSStyleSheet|null} + */ +export function getHighlightStyleSheet() { + syncHighlightStyles(); + return constructedSheet; +} + +/** + * Applies current-theme highlight CSS to a document or shadow root. + * Custom editor tabs opt in with `highlightStyles: true`. Call this + * for other shadow roots (dialogs, custom elements) that insert + * highlighted HTML. + * + * Prefers `adoptedStyleSheets` so theme changes update in place. + * + * @param {Document|ShadowRoot|ParentNode|null} [root=document] + * @returns {CSSStyleSheet|HTMLStyleElement|null} + */ +export function applyHighlightStyles(root = document) { + const css = syncHighlightStyles(); + const target = resolveStyleRoot(root); + + if (constructedSheet && adoptSheet(target, constructedSheet)) { + return constructedSheet; } - styleElement.textContent = allStyles; - currentThemeId = themeId; + if (target === document) { + return styleElement; + } + + return injectFallbackStyle(target, css); +} + +/** + * Injects dynamic CSS for syntax highlighting based on current editor theme + */ +function injectStyles() { + applyHighlightStyles(document); } /** @@ -193,7 +335,7 @@ async function getParserForLanguage(langName) { export async function highlightLine(text, uri, symbolName = null) { if (!text || !text.trim()) return ""; - const themeId = settings?.value?.editorTheme || "one_dark"; + const themeId = currentEditorThemeId(); const cacheKey = `line:${themeId}:${uri}:${text}:${symbolName || ""}`; if (highlightCache.has(cacheKey)) { @@ -250,7 +392,7 @@ export async function highlightLine(text, uri, symbolName = null) { export async function highlightCodeBlock(code, language) { if (!code) return ""; - const themeId = settings?.value?.editorTheme || "one_dark"; + const themeId = currentEditorThemeId(); const langKey = (language || "text").toLowerCase(); const cacheKey = `block:${themeId}:${langKey}:${code}`; @@ -305,8 +447,11 @@ export function clearHighlightCache() { export function initHighlighting() { injectStyles(); + if (initialized) return; + initialized = true; + settings.on("update:editorTheme:after", () => { - const newThemeId = settings?.value?.editorTheme || "one_dark"; + const newThemeId = currentEditorThemeId(); if (newThemeId !== currentThemeId) { injectStyles(); highlightCache.clear(); @@ -320,4 +465,9 @@ export default { highlightCodeBlock, clearHighlightCache, initHighlighting, + applyHighlightStyles, + getHighlightStyles, + getHighlightStyleSheet, + HIGHLIGHT_CLASS, + REF_PREVIEW_CLASS, }; diff --git a/tests/unit/codeHighlight.test.js b/tests/unit/codeHighlight.test.js new file mode 100644 index 0000000000..b434faa8cd --- /dev/null +++ b/tests/unit/codeHighlight.test.js @@ -0,0 +1,181 @@ +// @vitest-environment happy-dom + +import { beforeEach, describe, expect, it, vi } from "vitest"; + +const themeListeners = []; + +vi.mock("lib/settings", () => ({ + default: { + value: { editorTheme: "one_dark" }, + on(event, callback) { + if (event === "update:editorTheme:after") { + themeListeners.push(callback); + } + }, + }, +})); + +import "cm/supportedModes"; +import settings from "lib/settings"; +import { + HIGHLIGHT_CLASS, + applyHighlightStyles, + clearHighlightCache, + getHighlightStyleSheet, + getHighlightStyles, + highlightCodeBlock, + highlightLine, + initHighlighting, +} from "utils/codeHighlight"; + +function adoptCount(root, sheet) { + return Array.from(root.adoptedStyleSheets || []).filter( + (entry) => entry === sheet, + ).length; +} + +describe("codeHighlight", () => { + beforeEach(() => { + settings.value.editorTheme = "one_dark"; + clearHighlightCache(); + document + .querySelectorAll("#cm-static-highlight-styles") + .forEach((node) => node.remove()); + }); + + it("emits token CSS for the current editor theme", () => { + const css = getHighlightStyles(); + expect(css).toContain(`.${HIGHLIGHT_CLASS}`); + expect(css).toContain(".tok-keyword"); + expect(css).toContain(".tok-string"); + expect(css).toContain("#c678dd"); + }); + + it("highlights a JavaScript code block with token spans", async () => { + const html = await highlightCodeBlock( + 'const answer = "forty-two";', + "javascript", + ); + expect(html).toContain("tok-"); + expect(html).toContain("answer"); + expect(html).toContain("forty-two"); + expect(html).not.toContain(" { + const html = await highlightCodeBlock( + '', + "not-a-real-language", + ); + expect(html).toContain("<img"); + expect(html).not.toContain(" { + const html = await highlightLine( + "export function greet() {}", + "file:///tmp/hello.js", + "greet", + ); + expect(html).toContain("greet"); + expect(html).toContain("symbol-match"); + }); + + it("returns empty string for blank input", async () => { + expect(await highlightCodeBlock("")).toBe(""); + expect(await highlightLine(" ", "file.js")).toBe(""); + }); + + it("adopts the highlight stylesheet into a shadow root", () => { + initHighlighting(); + const host = document.createElement("div"); + const shadow = host.attachShadow({ mode: "open" }); + + const applied = applyHighlightStyles(shadow); + const sheet = getHighlightStyleSheet(); + + expect(sheet).toBeTruthy(); + expect(applied).toBe(sheet); + expect(adoptCount(shadow, sheet)).toBe(1); + }); + + it("does not duplicate the adopted sheet on repeated apply", () => { + const host = document.createElement("div"); + const shadow = host.attachShadow({ mode: "open" }); + applyHighlightStyles(shadow); + applyHighlightStyles(shadow); + applyHighlightStyles(host); + + const sheet = getHighlightStyleSheet(); + expect(adoptCount(shadow, sheet)).toBe(1); + }); + + it("resolves a host element to its shadow root", () => { + const host = document.createElement("div"); + const shadow = host.attachShadow({ mode: "open" }); + applyHighlightStyles(host); + + const sheet = getHighlightStyleSheet(); + expect(adoptCount(shadow, sheet)).toBe(1); + }); + + it("keeps highlight colors after the host replaces adoptedStyleSheets", () => { + const host = document.createElement("div"); + const shadow = host.attachShadow({ mode: "open" }); + const other = new CSSStyleSheet(); + other.replaceSync(":host { display: block; }"); + shadow.adoptedStyleSheets = [other]; + + applyHighlightStyles(shadow); + + const sheet = getHighlightStyleSheet(); + expect(shadow.adoptedStyleSheets).toContain(other); + expect(shadow.adoptedStyleSheets).toContain(sheet); + }); + + it("updates fallback styles while the shadow host is still detached", () => { + initHighlighting(); + const host = document.createElement("div"); + const shadow = host.attachShadow({ mode: "open" }); + Object.defineProperty(shadow, "adoptedStyleSheets", { + configurable: true, + get() { + throw new Error("adoptedStyleSheets unavailable"); + }, + set() { + throw new Error("adoptedStyleSheets unavailable"); + }, + }); + + applyHighlightStyles(shadow); + const style = shadow.querySelector("#cm-static-highlight-styles"); + expect(style).toBeTruthy(); + expect(style.isConnected).toBe(false); + expect(style.textContent).toContain("#c678dd"); + + settings.value.editorTheme = "githubLight"; + for (const listener of themeListeners) listener(); + + expect(style.parentNode).toBe(shadow); + expect(style.textContent).toContain("#cf222e"); + }); + + it("updates adopted shadow styles when the editor theme changes", () => { + initHighlighting(); + const host = document.createElement("div"); + const shadow = host.attachShadow({ mode: "open" }); + applyHighlightStyles(shadow); + + const sheet = getHighlightStyleSheet(); + const before = getHighlightStyles(); + expect(before).toContain("#c678dd"); + + settings.value.editorTheme = "githubLight"; + for (const listener of themeListeners) listener(); + + const after = getHighlightStyles(); + expect(after).toContain("#cf222e"); + expect(after).not.toBe(before); + expect(shadow.adoptedStyleSheets).toContain(sheet); + }); +}); From bb1dc90659c064108da3f555d083279e3d1add2f Mon Sep 17 00:00:00 2001 From: AuDevTist1C <114492072+AuDevTist1C@users.noreply.github.com> Date: Fri, 21 Aug 2026 01:52:36 +0000 Subject: [PATCH 063/195] refactor(loader): Extract `tailSpin` SVG component (#2776) Extract the SVG generator logic for the `tailSpin` loader into a dedicated, reusable component. Create `tailSpin` component (`src/components/tailSpin.js`): - Export `createTailSpinSvg` helper function - Generate unique gradient IDs dynamically to prevent SVG gradient collisions across multiple loader instances - Explicitly set function `name` property on exported SVG creator Refactor loader dialog (`src/dialogs/loader.js`): - Import `createTailSpinSvg` from component path - Remove redundant local `createTailSpinSvg` implementation and SVG gradient tracking logic (AI generated commit message) --- src/components/tailSpin.js | 15 +++++++++++++++ src/dialogs/loader.js | 9 +-------- 2 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 src/components/tailSpin.js diff --git a/src/components/tailSpin.js b/src/components/tailSpin.js new file mode 100644 index 0000000000..157339e4f3 --- /dev/null +++ b/src/components/tailSpin.js @@ -0,0 +1,15 @@ +import tailSpinSvg from "res/tail-spin.svg?raw"; + +const tailSpinGradientId = "tail-spin-gradient"; +let tailSpinSvgId = 0; + +const createTailSpinSvg = () => { + const gradientId = `${tailSpinGradientId}-${tailSpinSvgId++}`; + return tailSpinSvg.replaceAll(tailSpinGradientId, gradientId); +}; + +Object.defineProperty(createTailSpinSvg, "name", { + value: "createTailSpinSvg", +}); + +export default createTailSpinSvg; diff --git a/src/dialogs/loader.js b/src/dialogs/loader.js index 133b982bd0..e7a34cea40 100644 --- a/src/dialogs/loader.js +++ b/src/dialogs/loader.js @@ -1,21 +1,14 @@ +import createTailSpinSvg from "components/tailSpin.js"; import DOMPurify from "dompurify"; import Ref from "html-tag-js/ref"; import actionStack from "lib/actionStack"; import restoreTheme from "lib/restoreTheme"; -import tailSpinSvg from "res/tail-spin.svg?raw"; let loaderIsImmortal = false; let onCancelCallback = null; let $currentDialog = null; let $currentMask = null; const titleLoaderId = "__title-loader"; -const tailSpinGradientId = "tail-spin-gradient"; -let tailSpinSvgId = 0; - -function createTailSpinSvg() { - const gradientId = `${tailSpinGradientId}-${tailSpinSvgId++}`; - return tailSpinSvg.split(tailSpinGradientId).join(gradientId); -} /** * @typedef {object} LoaderOptions From f788005f7f782c55ae056dc9cc5caf4601610ad2 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Fri, 21 Aug 2026 04:49:48 +0000 Subject: [PATCH 064/195] fix(quick-tools): prevent scrollbars during editor gestures (#2777) --- src/handlers/editorWorkaround.js | 30 ++++++++--- src/lib/editorInteractionGuard.ts | 40 ++++++++++++++ src/main.scss | 11 ---- tests/unit/editorInteractionGuard.test.js | 63 +++++++++++++++++++++++ 4 files changed, 126 insertions(+), 18 deletions(-) create mode 100644 src/lib/editorInteractionGuard.ts create mode 100644 tests/unit/editorInteractionGuard.test.js diff --git a/src/handlers/editorWorkaround.js b/src/handlers/editorWorkaround.js index b7278a5b8b..75866d8cb0 100644 --- a/src/handlers/editorWorkaround.js +++ b/src/handlers/editorWorkaround.js @@ -1,7 +1,8 @@ +import { createEditorInteractionGuard } from "lib/editorInteractionGuard"; import { quickToolUsed } from "./quickTools"; -let debounceTimer; let lastInput = null; +const interactionGuard = createEditorInteractionGuard(); const setKeyboardInput = () => { lastInput = "keyboard"; @@ -13,22 +14,37 @@ document.addEventListener("input", setKeyboardInput, true); document.addEventListener("compositionstart", setKeyboardInput, true); function setTouched() { - clearTimeout(debounceTimer); - document.body.setAttribute("data-editor-touched", "true"); - debounceTimer = setTimeout(() => { - document.body.removeAttribute("data-editor-touched"); - }, 200); + interactionGuard.markActive(); } document.addEventListener( "pointerdown", (e) => { lastInput = "pointer"; - if (e.target.closest(".editor-container")) setTouched(); + if (e.target.closest(".editor-container")) { + setTouched(); + return; + } + interactionGuard.suppress(e); }, true, ); +// Avoid toggling pointer-events on the scrollable quick-tools container. Older +// Android WebViews repaint its normally hidden horizontal scrollbar each time. +for (const eventName of [ + "touchstart", + "mousedown", + "click", + "contextmenu", + "wheel", +]) { + document.addEventListener(eventName, (e) => interactionGuard.suppress(e), { + capture: true, + passive: false, + }); +} + document.addEventListener("selectionchange", () => { if (lastInput !== "pointer" || quickToolUsed) return; const sel = document.getSelection(); diff --git a/src/lib/editorInteractionGuard.ts b/src/lib/editorInteractionGuard.ts new file mode 100644 index 0000000000..e741011b5d --- /dev/null +++ b/src/lib/editorInteractionGuard.ts @@ -0,0 +1,40 @@ +const GUARDED_TARGETS = "#quick-tools, .notification-item-container"; + +export const EDITOR_INTERACTION_GUARD_DURATION = 200; + +interface EditorInteractionGuardOptions { + now?: () => number; + duration?: number; +} + +interface ClosestEventTarget extends EventTarget { + closest?: (selector: string) => Element | null; +} + +export function createEditorInteractionGuard({ + now = () => performance.now(), + duration = EDITOR_INTERACTION_GUARD_DURATION, +}: EditorInteractionGuardOptions = {}) { + let activeUntil = 0; + + return { + markActive() { + activeUntil = now() + duration; + }, + + suppress(event: Event) { + const target = event.target as ClosestEventTarget | null; + if ( + now() >= activeUntil || + typeof target?.closest !== "function" || + !target.closest(GUARDED_TARGETS) + ) { + return false; + } + + if (event.cancelable) event.preventDefault(); + event.stopImmediatePropagation(); + return true; + }, + }; +} diff --git a/src/main.scss b/src/main.scss index e4dfb3357f..d49def88b5 100644 --- a/src/main.scss +++ b/src/main.scss @@ -92,16 +92,6 @@ body { } } - &[data-editor-touched] { - #quick-tools { - pointer-events: none; - } - - .notification-item-container { - pointer-events: none; - } - } - .main { position: relative; } @@ -770,4 +760,3 @@ input[type="search"]::-webkit-search-results-decoration { } } - diff --git a/tests/unit/editorInteractionGuard.test.js b/tests/unit/editorInteractionGuard.test.js new file mode 100644 index 0000000000..9247aadc24 --- /dev/null +++ b/tests/unit/editorInteractionGuard.test.js @@ -0,0 +1,63 @@ +import assert from "node:assert/strict"; +import { test } from "vitest"; +import { createEditorInteractionGuard } from "../../src/lib/editorInteractionGuard"; + +function createEvent(matchesGuardedTarget, cancelable = true) { + let defaultPrevented = false; + let propagationStopped = false; + + return { + cancelable, + target: { + closest() { + return matchesGuardedTarget ? {} : null; + }, + }, + preventDefault() { + defaultPrevented = true; + }, + stopImmediatePropagation() { + propagationStopped = true; + }, + get defaultPrevented() { + return defaultPrevented; + }, + get propagationStopped() { + return propagationStopped; + }, + }; +} + +test("suppresses guarded controls briefly after an editor interaction", () => { + let time = 100; + const guard = createEditorInteractionGuard({ now: () => time }); + guard.markActive(); + const event = createEvent(true); + + assert.equal(guard.suppress(event), true); + assert.equal(event.defaultPrevented, true); + assert.equal(event.propagationStopped, true); + + time = 300; + assert.equal(guard.suppress(createEvent(true)), false); +}); + +test("does not suppress editor or unrelated events", () => { + const guard = createEditorInteractionGuard({ now: () => 100 }); + guard.markActive(); + const event = createEvent(false); + + assert.equal(guard.suppress(event), false); + assert.equal(event.defaultPrevented, false); + assert.equal(event.propagationStopped, false); +}); + +test("stops non-cancelable guarded events without calling preventDefault", () => { + const guard = createEditorInteractionGuard({ now: () => 100 }); + guard.markActive(); + const event = createEvent(true, false); + + assert.equal(guard.suppress(event), true); + assert.equal(event.defaultPrevented, false); + assert.equal(event.propagationStopped, true); +}); From 5893a9ff7bc32e6cec9a047642dddd46b437d691 Mon Sep 17 00:00:00 2001 From: Amr Ayman <48989143+ulite-Amr@users.noreply.github.com> Date: Sat, 22 Aug 2026 02:34:10 +0000 Subject: [PATCH 065/195] fix: fall back to internal storage when external storage is unavailable (#2781) * fix: fall back to internal storage when external storage is unavailable The app used to pick the external data directory unconditionally and then create the plugins directory without guarding against failures. On devices where the external filesystem cannot be created (e.g. Android/data dir is not creatable), the unhandled rejection aborted startup, leaving users stuck on the splash screen with a misleading "Update Android System WebView or Chrome" message. - Probe external storage with fs.stat() and fall back to internal storage - Wrap plugins directory creation in try/catch and fall back to internal - Request storage permissions only on SDK < 33, guarded by hasPermission - Guard editorManager.hasUnsavedFiles() access in exitAppMessage - Show an honest "storage is unavailable" startup message for storage errors * fix: detect storage errors via FileError instanceof instead of numeric code range --- src/lib/acode.js | 2 +- src/main.js | 66 +++++++++++++++++++++++++++++++++++++++++++----- www/index.html | 25 +++++++++++++++--- 3 files changed, 82 insertions(+), 11 deletions(-) diff --git a/src/lib/acode.js b/src/lib/acode.js index 6d9310d245..d5a0f2de62 100644 --- a/src/lib/acode.js +++ b/src/lib/acode.js @@ -718,7 +718,7 @@ class Acode { } get exitAppMessage() { - const numFiles = editorManager.hasUnsavedFiles(); + const numFiles = editorManager?.hasUnsavedFiles?.() ?? 0; if (numFiles) { return strings["unsaved files close app"]; } diff --git a/src/main.js b/src/main.js index 0717578039..ebc2871227 100644 --- a/src/main.js +++ b/src/main.js @@ -100,6 +100,20 @@ document.addEventListener("deviceready", onDeviceReady); document.addEventListener("backbutton", backButtonHandler); document.addEventListener("menubutton", menuButtonHandler); +async function ensurePermission(permission) { + try { + const granted = await helpers.promisify(system.hasPermission, permission); + if (!granted) { + await helpers.promisify(system.requestPermission, permission); + } + } catch (error) { + logger.log( + "error", + `Failed to request permission ${permission}: ${error.message || error}`, + ); + } +} + async function onDeviceReady() { await initEncodings(); // important to load encodings before anything else @@ -112,14 +126,37 @@ async function onDeviceReady() { dataDirectory, } = cordova.file; + async function resolveStorageDir(preferred, fallback) { + if (!preferred) return fallback; + const fs = fsOperation(preferred); + if (!fs) return fallback; + try { + await fs.stat(); + return preferred; + } catch (error) { + logger.log( + "warn", + `Storage dir unavailable (${preferred}), falling back to ${fallback}: ${error.message || error}`, + ); + return fallback; + } + } + window.app = document.body; window.root = tag.get("#root"); window.addedFolder = addedFolder; window.editorManager = null; window.toast = toast; window.ASSETS_DIRECTORY = Url.join(cordova.file.applicationDirectory, "www"); - window.DATA_STORAGE = externalDataDirectory || dataDirectory; - window.CACHE_STORAGE = externalCacheDirectory || cacheDirectory; + window.DATA_STORAGE = await resolveStorageDir( + externalDataDirectory, + dataDirectory, + ); + window.CACHE_STORAGE = await resolveStorageDir( + externalCacheDirectory, + cacheDirectory, + ); + window.PLUGIN_DIR = Url.join(DATA_STORAGE, "plugins"); window.KEYBINDING_FILE = Url.join(DATA_STORAGE, ".key-bindings.json"); window.log = logger.log.bind(logger); @@ -212,9 +249,11 @@ async function onDeviceReady() { await adRewards.init(); ensureAceCompatApi(); - system.requestPermission("android.permission.READ_EXTERNAL_STORAGE"); - system.requestPermission("android.permission.WRITE_EXTERNAL_STORAGE"); - system.requestPermission("android.permission.POST_NOTIFICATIONS"); + if (Number.isInteger(window.ANDROID_SDK_INT) && window.ANDROID_SDK_INT < 33) { + await ensurePermission("android.permission.READ_EXTERNAL_STORAGE"); + await ensurePermission("android.permission.WRITE_EXTERNAL_STORAGE"); + } + await ensurePermission("android.permission.POST_NOTIFICATIONS"); const { versionCode } = BuildInfo; @@ -227,7 +266,22 @@ async function onDeviceReady() { } if (!(await fsOperation(PLUGIN_DIR).exists())) { - await fsOperation(DATA_STORAGE).createDirectory("plugins"); + try { + await fsOperation(DATA_STORAGE).createDirectory("plugins"); + } catch (error) { + logger.log( + "error", + `Failed to create plugins directory, falling back to internal storage: ${error.message || error}`, + ); + window.DATA_STORAGE = dataDirectory; + window.CACHE_STORAGE = cacheDirectory; + window.PLUGIN_DIR = Url.join(window.DATA_STORAGE, "plugins"); + window.KEYBINDING_FILE = Url.join( + window.DATA_STORAGE, + ".key-bindings.json", + ); + await fsOperation(window.DATA_STORAGE).createDirectory("plugins"); + } } localStorage.versionCode = versionCode; diff --git a/www/index.html b/www/index.html index 07f170909f..78fbbfd2b2 100644 --- a/www/index.html +++ b/www/index.html @@ -141,12 +141,26 @@ ); } + function isStorageError(reason) { + if (!reason) return false; + return ( + reason.name === "FileError" || + reason.name === "NotFoundError" || + reason.name === "SecurityError" || + (typeof window.FileError !== "undefined" && + reason instanceof window.FileError) + ); + } + function handleStartupError(event) { if (!isStartupLoading()) return; var message = event && event.message ? event.message : "Startup error"; setStartupMessage( - "Acode failed to start. Update Android System WebView or Chrome. " + - message + isStorageError(event && event.error) + ? "Acode failed to start: storage is unavailable. Try restarting your device, or clearing the app data. " + + message + : "Acode failed to start. Update Android System WebView or Chrome. " + + message ); } @@ -156,8 +170,11 @@ var message = reason && reason.message ? reason.message : "Startup promise failed"; setStartupMessage( - "Acode failed to start. Update Android System WebView or Chrome. " + - message + isStorageError(reason) + ? "Acode failed to start: storage is unavailable. Try restarting your device, or clearing the app data. " + + message + : "Acode failed to start. Update Android System WebView or Chrome. " + + message ); } From d1a62491430ee73d10f77b3a8ad0c822d66742e6 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sat, 22 Aug 2026 02:49:37 +0000 Subject: [PATCH 066/195] fix(theme): prevent freeze when switching to system theme (#2790) --- src/theme/list.js | 14 +++++++++++--- src/theme/preInstalled.js | 5 +++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/theme/list.js b/src/theme/list.js index fca3f9c2cd..890ea6cd94 100644 --- a/src/theme/list.js +++ b/src/theme/list.js @@ -87,6 +87,11 @@ export async function apply(id, init) { if (!DOES_SUPPORT_THEME) { id = "default"; } + if (id.toLowerCase() === "system") { + // Refresh the mutable System theme before reading its preferred editor + // theme. Do not re-enter apply() while appTheme is being updated below. + updateSystemTheme(isDeviceDarkTheme(), false); + } themeApplied = true; const theme = get(id); @@ -164,10 +169,10 @@ export function update(theme) { }); } -function syncSystemTheme(event) { +function syncSystemTheme(event, applyTheme = true) { if (settings.value.appTheme.toLowerCase() !== "system") return; const isDark = event ? event.matches : darkModeMediaQuery.matches; - updateSystemTheme(isDark); + updateSystemTheme(isDark, applyTheme); } function startSystemThemeWatcher() { @@ -197,7 +202,10 @@ function stopSystemThemeWatcher() { export function updateSystemThemeWatcher(theme) { if (String(theme).toLowerCase() === "system") { startSystemThemeWatcher(); - syncSystemTheme(); + // Starting the watcher happens from the appTheme update listener. Applying + // the theme here would update appTheme again before the first settings + // update is saved, causing unbounded synchronous recursion. + syncSystemTheme(undefined, false); return; } stopSystemThemeWatcher(); diff --git a/src/theme/preInstalled.js b/src/theme/preInstalled.js index 8eb266e962..76120a1b16 100644 --- a/src/theme/preInstalled.js +++ b/src/theme/preInstalled.js @@ -243,8 +243,9 @@ export function getSystemEditorTheme(darkTheme) { /** * Update the system theme based on the user's preference. * @param {boolean} darkTheme Whether the user prefers a dark theme. + * @param {boolean} applyTheme Whether to apply the refreshed theme immediately. */ -export function updateSystemTheme(darkTheme) { +export function updateSystemTheme(darkTheme, applyTheme = true) { if (darkTheme) { system.type = "dark"; system.primaryColor = "rgb(35, 39, 42)"; @@ -278,7 +279,7 @@ export function updateSystemTheme(darkTheme) { system.preferredEditorTheme = getSystemEditorTheme(darkTheme); - if (appSettings?.value?.appTheme === "system") { + if (applyTheme && appSettings?.value?.appTheme === "system") { apply(system.id); appSettings.update({ editorTheme: system.preferredEditorTheme }, false); } From f90fc1d9d35b9096f0d4279410d7fa3d7cbf3835 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sat, 22 Aug 2026 03:41:23 +0000 Subject: [PATCH 067/195] fix(sftp): cancel stalled connections and prevent delayed errors (#2791) * fix(sftp): cancel stalled connections and prevent delayed errors * fix race cases --- src/dialogs/loader.js | 34 ++- src/fileSystem/sftp.js | 17 ++ src/lib/remoteStorage.js | 16 +- src/pages/fileBrowser/fileBrowser.js | 3 +- src/plugins/sftp/index.d.ts | 4 + .../sftp/src/com/foxdebug/sftp/Sftp.java | 259 +++++++++++++++--- src/plugins/sftp/www/sftp.js | 6 + 7 files changed, 282 insertions(+), 57 deletions(-) diff --git a/src/dialogs/loader.js b/src/dialogs/loader.js index e7a34cea40..dfb98946fe 100644 --- a/src/dialogs/loader.js +++ b/src/dialogs/loader.js @@ -6,14 +6,15 @@ import restoreTheme from "lib/restoreTheme"; let loaderIsImmortal = false; let onCancelCallback = null; +let cancelButtonTimeout = null; let $currentDialog = null; let $currentMask = null; const titleLoaderId = "__title-loader"; /** * @typedef {object} LoaderOptions - * @property {number} timeout Timeout in milliseconds after which the loader will be shown - * @property {function():void} oncancel Callback function to be called when the loader is shown + * @property {number} timeout Delay before the cancel button is shown, in milliseconds + * @property {function():void} oncancel Callback invoked only when the user cancels */ /** @@ -64,19 +65,21 @@ function create(titleText, message = "", options = {}) {
    ); - const { timeout, oncancel } = options; - if (typeof oncancel === "function") { - onCancelCallback = oncancel; - } + clearTimeout(cancelButtonTimeout); + cancelButtonTimeout = null; + onCancelCallback = + typeof options.oncancel === "function" ? options.oncancel : null; - if (typeof timeout === "number") { - setTimeout(() => { + if (typeof options.timeout === "number") { + cancelButtonTimeout = setTimeout(() => { + cancelButtonTimeout = null; + if (!$dialog.isConnected) return; $dialog.append(
    - +
    , ); - }, timeout); + }, options.timeout); } if (!$oldLoader) { @@ -98,6 +101,13 @@ function create(titleText, message = "", options = {}) { }; } +function cancel() { + const callback = onCancelCallback; + onCancelCallback = null; + destroy(); + callback?.(); +} + function createTitleLoader() { const $titleLoader = tag.get(`#${titleLoaderId}`) || ( @@ -116,6 +126,9 @@ function createTitleLoader() { function destroy() { const loaderDiv = tag.get("#__loader"); const mask = tag.get("#__loader-mask"); + clearTimeout(cancelButtonTimeout); + cancelButtonTimeout = null; + onCancelCallback = null; restoreTheme(); if (!loaderDiv && !mask) { @@ -128,7 +141,6 @@ function destroy() { actionStack.unfreeze(); if (loaderDiv?.isConnected) loaderDiv.remove(); if (mask?.isConnected) mask.remove(); - onCancelCallback?.(); }, 300); } diff --git a/src/fileSystem/sftp.js b/src/fileSystem/sftp.js index 41bff24af7..803be8af45 100644 --- a/src/fileSystem/sftp.js +++ b/src/fileSystem/sftp.js @@ -407,6 +407,23 @@ class SftpClient { } } + /** + * Tests a profile once without the normal remote-filesystem retry policy. + * @param {string} requestID Native request ID used for cancellation + */ + testConnection(requestID) { + return new Promise((resolve, reject) => { + sftp.testProfile(this.#profileID, requestID, 10000, resolve, reject); + }); + } + + /** Cancel an in-flight profile test. */ + cancelConnection(requestID) { + return new Promise((resolve) => { + sftp.cancelConnection(requestID, resolve, resolve); + }); + } + async #connectWithRetry() { const attempts = settings.value.retryRemoteFsAfterFail ? this.#MAX_TRY + 1 diff --git a/src/lib/remoteStorage.js b/src/lib/remoteStorage.js index 83c8077b7f..967f5fcb5d 100644 --- a/src/lib/remoteStorage.js +++ b/src/lib/remoteStorage.js @@ -35,7 +35,7 @@ export default { try { loader.create(strings["add ftp"], strings["connecting..."], { timeout: 10000, - callback() { + oncancel() { stopConnection = true; }, }); @@ -176,6 +176,8 @@ export default { existingProfile = null, } = {}) { let stopConnection = false; + let connection; + const connectionRequestID = `add-sftp-${helpers.uuid()}`; if (existingProfile?.profileId) { try { const saved = await getSftpProfileInfo(existingProfile.profileId); @@ -242,17 +244,21 @@ export default { const url = createSftpProfileUrl(profile.profileId); loader.create(strings["add sftp"], strings["connecting..."], { - timeout: 10000, - callback() { + timeout: 0, + oncancel() { stopConnection = true; + connection?.cancelConnection(connectionRequestID); }, }); - const connection = Sftp(null, 22, null, { + connection = Sftp(null, 22, null, { profileID: profile.profileId, }); try { - const [home] = await Promise.all([connection.pwd(), loadAd()]); + const [home] = await Promise.all([ + connection.testConnection(connectionRequestID), + loadAd(), + ]); if (stopConnection) { stopConnection = false; diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index c7c6ffaf9f..b26758b189 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -1468,8 +1468,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { const timeout = setTimeout(() => { loader.create(name, strings.loading + "...", { timeout: loaderTimeout, - callback() { - loader.destroy(); + oncancel() { navigate("/", "/"); progress[id] = false; }, diff --git a/src/plugins/sftp/index.d.ts b/src/plugins/sftp/index.d.ts index dc75b35360..ca7db1d098 100644 --- a/src/plugins/sftp/index.d.ts +++ b/src/plugins/sftp/index.d.ts @@ -42,6 +42,10 @@ interface Sftp { exec(command: String, onSucess: (res: ExecResult)=>void, onFail: (err: any) => void): void; /** Connects using credentials held by the native profile store. */ connectUsingProfile(profileId: String, onSuccess: () => void, onFail: (err: any) => void): void; + /** Tests a profile once and returns its remote working directory. */ + testProfile(profileId: String, requestId: String, timeout: Number, onSuccess: (home: String) => void, onFail: (err: any) => void): void; + /** Cancels an in-flight profile connection or test. */ + cancelConnection(requestId: String, onSuccess: () => void, onFail: (err: any) => void): void; saveProfile(profileId: String | null, host: String, port: Number, username: String, authType: String, password: String, keyFile: String, passphrase: String, onSuccess: (profileId: String) => void, onFail: (err: any) => void): void; editProfile(profileId: String | null, host: String, port: Number, username: String, authType: String, password: String, keyFile: String, passphrase: String, onSuccess: (profile: SftpProfileInfo & {profileId: string}) => void, onFail: (err: any) => void): void; getProfileInfo(profileId: String, onSuccess: (profile: SftpProfileInfo & {profileId: string}) => void, onFail: (err: any) => void): void; diff --git a/src/plugins/sftp/src/com/foxdebug/sftp/Sftp.java b/src/plugins/sftp/src/com/foxdebug/sftp/Sftp.java index b676c1f059..a72466607d 100644 --- a/src/plugins/sftp/src/com/foxdebug/sftp/Sftp.java +++ b/src/plugins/sftp/src/com/foxdebug/sftp/Sftp.java @@ -53,6 +53,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.FutureTask; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.cordova.CallbackContext; @@ -72,8 +74,13 @@ public class Sftp extends CordovaPlugin { // A smaller mobile window prevents connection bursts from exhausting the heap. private static final long SFTP_MAX_WINDOW_SIZE = 1024L * 1024L; private static final long SFTP_MIN_WINDOW_SIZE = 128L * 1024L; + private static final long DEFAULT_CONNECT_TIMEOUT_MS = 10000L; + private static final long MIN_CONNECT_TIMEOUT_MS = 1000L; + private static final long MAX_CONNECT_TIMEOUT_MS = 30000L; private static boolean cryptoProviderConfigured; private final Object connectionLock = new Object(); + private final Map connectionAttempts = + new ConcurrentHashMap<>(); private final Map remoteShells = new ConcurrentHashMap<>(); private SshClient ssh; private SftpClient sftp; @@ -82,6 +89,50 @@ public class Sftp extends CordovaPlugin { private String connectionID; private SftpSecurityStore securityStore; + private final class ConnectionAttempt { + + private final CallbackContext callback; + private final AtomicBoolean cancelled = new AtomicBoolean(false); + private final AtomicBoolean completed = new AtomicBoolean(false); + private volatile Future future; + + private ConnectionAttempt(CallbackContext callback) { + this.callback = callback; + } + + private void setFuture(Future future) { + this.future = future; + if (cancelled.get()) future.cancel(true); + } + + private boolean isCancelled() { + return cancelled.get(); + } + + private void cancel() { + cancelled.set(true); + Future current = future; + if (current != null) current.cancel(true); + error(connectionCancelledError()); + } + + private void success() { + if (completed.compareAndSet(false, true)) callback.success(); + } + + private void success(String value) { + if (completed.compareAndSet(false, true)) callback.success(value); + } + + private void error(String message) { + if (completed.compareAndSet(false, true)) callback.error(message); + } + + private void error(JSONObject error) { + if (completed.compareAndSet(false, true)) callback.error(error); + } + } + private final class ConnectionSecurity { private final String hostname; @@ -162,12 +213,17 @@ public boolean verifyHost(String host, SshPublicKey publicKey) } private boolean report(CallbackContext callback) { - JSONObject error = failure; - failure = null; + JSONObject error = takeFailure(); if (error == null) return false; callback.error(error); return true; } + + private JSONObject takeFailure() { + JSONObject error = failure; + failure = null; + return error; + } } private final class RemoteShell { @@ -318,11 +374,16 @@ private void closeConnectionQuietly() { private boolean establishConnection( SshClientBuilder builder, String newConnectionID, - ConnectionSecurity security + ConnectionSecurity security, + ConnectionAttempt attempt ) throws IOException, SshException, PermissionDeniedException { synchronized (connectionLock) { closeConnectionQuietly(); ssh = builder.onConfigure(security::configure).build(); + if (attempt.isCancelled()) { + closeConnectionQuietly(); + return false; + } if (!ssh.isConnected()) { closeConnectionQuietly(); return false; @@ -336,6 +397,11 @@ private boolean establishConnection( throw e; } + if (attempt.isCancelled()) { + closeConnectionQuietly(); + return false; + } + try { sftp.getSubsystemChannel().setCharsetEncoding("UTF-8"); } catch (UnsupportedEncodingException | SshException e) { @@ -371,6 +437,17 @@ private static JSONObject hostKeyFailure( return error; } + private static JSONObject connectionCancelledError() { + JSONObject error = new JSONObject(); + try { + error.put("code", "SFTP_CONNECT_CANCELLED"); + error.put("message", "SFTP connection cancelled"); + error.put("cancelled", true); + error.put("nonRetryable", true); + } catch (JSONException ignored) {} + return error; + } + private boolean confirmUnknownHost( String endpoint, String algorithm, @@ -440,23 +517,40 @@ private void closeRemoteShells() { remoteShells.clear(); } + private void cancelConnectionAttempts() { + for (ConnectionAttempt attempt : connectionAttempts.values()) { + attempt.cancel(); + } + connectionAttempts.clear(); + } + @Override public void onReset() { + cancelConnectionAttempts(); closeRemoteShells(); super.onReset(); } @Override public void onDestroy() { + cancelConnectionAttempts(); closeRemoteShells(); super.onDestroy(); } private SshClientBuilder buildProfileBuilder(JSONObject profile) throws IOException, InvalidPassphraseException, JSONException { + return buildProfileBuilder(profile, DEFAULT_CONNECT_TIMEOUT_MS); + } + + private SshClientBuilder buildProfileBuilder( + JSONObject profile, + long connectTimeout + ) throws IOException, InvalidPassphraseException, JSONException { SshClientBuilder builder = SshClientBuilder.create() .withHostname(profile.getString("hostname")) .withPort(profile.optInt("port", 22)) + .withConnectTimeout(connectTimeout) .withUsername(profile.getString("username")); if ("key".equals(profile.optString("authType"))) { @@ -868,6 +962,8 @@ private static boolean isAllowedAction(String action) { switch (action) { case "exec": case "connectUsingProfile": + case "testProfile": + case "cancelConnection": case "saveProfile": case "editProfile": case "getProfileInfo": @@ -894,47 +990,132 @@ private static boolean isAllowedAction(String action) { } public void connectUsingProfile(JSONArray args, CallbackContext callback) { - cordova - .getThreadPool() - .execute( - new Runnable() { - public void run() { - ConnectionSecurity security = null; - String profileID = args.optString(0); - try { - JSONObject profile = securityStore.getProfile(profileID); - ConnectionSecurity profileSecurity = new ConnectionSecurity( - profile.getString("hostname"), - profile.optInt("port", 22) + startProfileConnection(args, callback, false); + } + + public void testProfile(JSONArray args, CallbackContext callback) { + startProfileConnection(args, callback, true); + } + + public void cancelConnection(JSONArray args, CallbackContext callback) { + ConnectionAttempt attempt = connectionAttempts.get(args.optString(0)); + if (attempt != null) attempt.cancel(); + callback.success(); + } + + private void startProfileConnection( + JSONArray args, + CallbackContext callback, + boolean returnWorkingDirectory + ) { + String suppliedRequestID = args.optString(1); + String requestID = suppliedRequestID.isEmpty() + ? UUID.randomUUID().toString() + : suppliedRequestID; + long requestedTimeout = args.optLong(2, DEFAULT_CONNECT_TIMEOUT_MS); + long connectTimeout = Math.max( + MIN_CONNECT_TIMEOUT_MS, + Math.min(requestedTimeout, MAX_CONNECT_TIMEOUT_MS) + ); + ConnectionAttempt attempt = new ConnectionAttempt(callback); + if (connectionAttempts.putIfAbsent(requestID, attempt) != null) { + callback.error("An SFTP connection with this request ID is already running"); + return; + } + + FutureTask task = new FutureTask( + () -> { + ConnectionSecurity security = null; + String profileID = args.optString(0); + try { + JSONObject profile = securityStore.getProfile(profileID); + ConnectionSecurity profileSecurity = new ConnectionSecurity( + profile.getString("hostname"), + profile.optInt("port", 22) + ); + security = profileSecurity; + SshClientBuilder builder = buildProfileBuilder( + profile, + connectTimeout + ); + boolean connected; + String workingDirectory = null; + if (returnWorkingDirectory) { + synchronized (connectionLock) { + connected = establishConnection( + builder, + profileID, + profileSecurity, + attempt ); - security = profileSecurity; - if ( - establishConnection( - buildProfileBuilder(profile), - profileID, - profileSecurity - ) - ) { - callback.success(); - return; - } - if (security.report(callback)) return; - callback.error("Failed to establish SSH connection"); - } catch (InvalidPassphraseException e) { - callback.error("Invalid passphrase for stored key"); - } catch (Exception e) { - if (security != null && security.report(callback)) return; - callback.error("Failed to connect SFTP profile: " + errMessage(e)); - Log.e(TAG, "Failed to connect SFTP profile", e); - } catch (OutOfMemoryError e) { - synchronized (connectionLock) { - closeConnectionQuietly(); + if (connected && !attempt.isCancelled()) { + SftpClient activeSftp = sftp; + if (activeSftp == null) { + throw new IOException( + "SFTP connection was closed before validation" + ); + } + workingDirectory = activeSftp.pwd(); } - callback.error("Not enough memory to initialize SFTP"); } + } else { + connected = establishConnection( + builder, + profileID, + profileSecurity, + attempt + ); + } + if (connected) { + if (attempt.isCancelled()) return null; + if (returnWorkingDirectory) { + attempt.success(workingDirectory); + } else { + attempt.success(); + } + return null; + } + if (attempt.isCancelled()) return null; + JSONObject securityError = security.takeFailure(); + if (securityError != null) { + attempt.error(securityError); + return null; + } + attempt.error("Failed to establish SSH connection"); + } catch (InvalidPassphraseException e) { + if (!attempt.isCancelled()) { + attempt.error("Invalid passphrase for stored key"); + } + } catch (Exception e) { + if (attempt.isCancelled()) return null; + JSONObject securityError = security == null + ? null + : security.takeFailure(); + if (securityError != null) { + attempt.error(securityError); + return null; + } + attempt.error("Failed to connect SFTP profile: " + errMessage(e)); + Log.e(TAG, "Failed to connect SFTP profile", e); + } catch (OutOfMemoryError e) { + synchronized (connectionLock) { + closeConnectionQuietly(); + } + if (!attempt.isCancelled()) { + attempt.error("Not enough memory to initialize SFTP"); } } - ); + return null; + } + ) { + @Override + protected void done() { + connectionAttempts.remove(requestID, attempt); + } + }; + + attempt.setFuture(task); + cordova.getThreadPool().execute(task); } public void exec(JSONArray args, CallbackContext callback) { diff --git a/src/plugins/sftp/www/sftp.js b/src/plugins/sftp/www/sftp.js index 1fbbb76e31..855cf1cdf6 100644 --- a/src/plugins/sftp/www/sftp.js +++ b/src/plugins/sftp/www/sftp.js @@ -5,6 +5,12 @@ module.exports = { connectUsingProfile: function (profileId, onSuccess, onFail) { cordova.exec(onSuccess, onFail, 'Sftp', 'connectUsingProfile', [profileId]); }, + testProfile: function (profileId, requestId, timeout, onSuccess, onFail) { + cordova.exec(onSuccess, onFail, 'Sftp', 'testProfile', [profileId, requestId, timeout]); + }, + cancelConnection: function (requestId, onSuccess, onFail) { + cordova.exec(onSuccess, onFail, 'Sftp', 'cancelConnection', [requestId]); + }, saveProfile: function (profileId, host, port, username, authType, password, keyFile, passphrase, onSuccess, onFail) { cordova.exec(onSuccess, onFail, 'Sftp', 'saveProfile', [profileId, host, port, username, authType, password, keyFile, passphrase]); }, From 9c3e86911107ebb1520c7aa83e46514d83d08e68 Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Mon, 24 Aug 2026 09:51:12 +0000 Subject: [PATCH 068/195] fix: admob issues (#2800) * fix: admob issues * fix: restore Android build commands --------- Co-authored-by: Ajit Kumar --- src/components/settingsPage.scss | 5 + src/lib/adConsentCoordinator.mjs | 10 +- src/lib/bannerVisibilityController.mjs | 99 ++++++++- src/lib/startAd.js | 4 +- .../admob/src/android/cordova/Privacy.kt | 24 ++- src/settings/mainSettings.js | 11 +- src/sidebarApps/extensions/index.js | 21 +- tests/admob/adConsentCoordinator.test.js | 73 ++++++- .../admob/bannerVisibilityController.test.js | 202 +++++++++++++++++- 9 files changed, 420 insertions(+), 29 deletions(-) diff --git a/src/components/settingsPage.scss b/src/components/settingsPage.scss index bfe722e73e..e0e9f34b55 100644 --- a/src/components/settingsPage.scss +++ b/src/components/settingsPage.scss @@ -60,6 +60,11 @@ wc-page.main-settings-page { .main-settings-list>.list-item, .settings-section-card>.list-item { display: flex; + + &[hidden] { + display: none; + } + width: 100%; min-height: 64px; margin: 0; diff --git a/src/lib/adConsentCoordinator.mjs b/src/lib/adConsentCoordinator.mjs index 5a23de1737..4391e22aac 100644 --- a/src/lib/adConsentCoordinator.mjs +++ b/src/lib/adConsentCoordinator.mjs @@ -35,6 +35,7 @@ export class AdConsentCoordinator { #state = EMPTY_PRIVACY_STATE; #consentPromise; #adStartPromise; + #privacyOptionsPromise; #listeners = new Set(); constructor({ privacy, initializeAds, onError = console.error }) { @@ -51,7 +52,14 @@ export class AdConsentCoordinator { return (this.#consentPromise ??= this.#gatherAndStart()); } - async showPrivacyOptions() { + showPrivacyOptions() { + this.#privacyOptionsPromise ??= this.#showPrivacyOptions().finally(() => { + this.#privacyOptionsPromise = undefined; + }); + return this.#privacyOptionsPromise; + } + + async #showPrivacyOptions() { const state = await this.#privacy.showOptions(); this.#setState(state); await this.#startAdsIfAllowed(); diff --git a/src/lib/bannerVisibilityController.mjs b/src/lib/bannerVisibilityController.mjs index c02df5b80b..517e914d02 100644 --- a/src/lib/bannerVisibilityController.mjs +++ b/src/lib/bannerVisibilityController.mjs @@ -10,6 +10,9 @@ export const BANNER_SUPPRESSION_REASON = Object.freeze({ REWARDED_PASS: "rewarded-pass", }); +const DEFAULT_RETRY_DELAY_MS = 500; +const TRANSIENT_LOAD_ERROR_CODES = new Set([0, 2, 3, 9]); + export class BannerVisibilityController { #banner = null; #registeredPages = new WeakSet(); @@ -20,9 +23,13 @@ export class BannerVisibilityController { #suppressions = new Set(); #nativeVisible = false; #scheduledVisible = false; + #desiredVisible = false; #operation = Promise.resolve(); #revision = 0; #onError; + #retryTimer = null; + #retryUsed = false; + #stopBannerListeners = []; constructor({ getActivePage, @@ -35,9 +42,13 @@ export class BannerVisibilityController { } setBanner(banner) { + this.#stopListeningToBanner(); + this.#resetRetry(); + this.#revision++; this.#banner = banner; this.#nativeVisible = false; this.#scheduledVisible = false; + this.#listenToBanner(banner); this.reconcile(); } @@ -83,6 +94,12 @@ export class BannerVisibilityController { activePage !== null && this.#registeredPages.has(activePage); const shouldShow = pageRequestsBanner && !this.#keyboardVisible; + const eligibilityChanged = shouldShow !== this.#desiredVisible; + this.#desiredVisible = shouldShow; + + if (!shouldShow || eligibilityChanged) { + this.#resetRetry(); + } if (this.#banner) { this.#banner.active = pageRequestsBanner; @@ -98,7 +115,12 @@ export class BannerVisibilityController { dispose() { this.#stopObserving?.(); this.#stopObserving = null; + this.#stopListeningToBanner(); + this.#resetRetry(); this.#banner = null; + this.#desiredVisible = false; + this.#nativeVisible = false; + this.#scheduledVisible = false; this.#revision++; } @@ -107,9 +129,16 @@ export class BannerVisibilityController { this.#stopObserving = this.#observePageChanges(() => this.reconcile()); } - #queueNativeVisibility(shouldShow) { + #queueNativeVisibility(shouldShow, isRetry = false) { const banner = this.#banner; - if (!banner || shouldShow === this.#scheduledVisible) return; + if ( + !banner || + shouldShow === this.#scheduledVisible || + (shouldShow && + (this.#retryTimer !== null || (this.#retryUsed && !isRetry))) + ) { + return; + } this.#scheduledVisible = shouldShow; const revision = ++this.#revision; @@ -124,14 +153,80 @@ export class BannerVisibilityController { } else { await banner.hide?.(); } + if (revision !== this.#revision || banner !== this.#banner) return; this.#nativeVisible = shouldShow; } catch (error) { + if (revision !== this.#revision || banner !== this.#banner) return; this.#nativeVisible = !shouldShow; this.#scheduledVisible = !shouldShow; this.#onError(error); + if (shouldShow) this.#scheduleRetry(); } }); } + + #listenToBanner(banner) { + if (typeof banner?.on !== "function") return; + + for (const [eventName, listener] of [ + ["load", () => this.#handleBannerLoad()], + ["loadfail", (event) => this.#handleBannerLoadFailure(event)], + ]) { + const stopListening = banner.on(eventName, listener); + if (typeof stopListening === "function") { + this.#stopBannerListeners.push(stopListening); + } + } + } + + #stopListeningToBanner() { + for (const stopListening of this.#stopBannerListeners.splice(0)) { + stopListening(); + } + } + + #handleBannerLoad() { + this.#resetRetry(); + if (!this.#desiredVisible) return; + + this.#nativeVisible = true; + this.#scheduledVisible = true; + } + + #handleBannerLoadFailure(event) { + this.#nativeVisible = false; + this.#scheduledVisible = false; + this.#onError(event); + + const errorCode = Number(event?.code); + if (TRANSIENT_LOAD_ERROR_CODES.has(errorCode)) { + this.#scheduleRetry(); + } else { + this.#retryUsed = true; + } + } + + #scheduleRetry() { + if (!this.#desiredVisible || this.#retryTimer !== null || this.#retryUsed) { + return; + } + + this.#retryUsed = true; + const banner = this.#banner; + this.#retryTimer = setTimeout(() => { + this.#retryTimer = null; + if (!this.#desiredVisible || banner !== this.#banner) return; + this.#queueNativeVisibility(true, true); + }, DEFAULT_RETRY_DELAY_MS); + } + + #resetRetry() { + if (this.#retryTimer !== null) { + clearTimeout(this.#retryTimer); + this.#retryTimer = null; + } + this.#retryUsed = false; + } } function getActivePage() { diff --git a/src/lib/startAd.js b/src/lib/startAd.js index a9dd6a74d5..757dc69429 100644 --- a/src/lib/startAd.js +++ b/src/lib/startAd.js @@ -63,7 +63,9 @@ export function subscribePrivacyState(listener) { } export async function showPrivacyOptions() { - if (!canUseAdmob()) return getPrivacyState(); + if (!canUseAdmob()) { + throw new Error("AdMob Privacy Choices are unavailable."); + } return getConsentCoordinator().showPrivacyOptions(); } diff --git a/src/plugins/admob/src/android/cordova/Privacy.kt b/src/plugins/admob/src/android/cordova/Privacy.kt index 0d34ccf3c6..b2c2264a53 100644 --- a/src/plugins/admob/src/android/cordova/Privacy.kt +++ b/src/plugins/admob/src/android/cordova/Privacy.kt @@ -80,12 +80,26 @@ internal class Privacy(private val plugin: AdMob) { fun showOptions(ctx: ExecuteContext) { plugin.activity.runOnUiThread { - UserMessagingPlatform.showPrivacyOptionsForm(plugin.activity) { formError -> - if (formError != null) { - ctx.reject("UMP ${formError.errorCode}: ${formError.message}") - } else { - ctx.resolve(currentState().toMap()) + val activity = plugin.activity + val state = currentState() + if (!state.privacyOptionsRequired) { + return@runOnUiThread ctx.resolve(state.toMap()) + } + + if (activity.isFinishing || activity.isDestroyed) { + return@runOnUiThread ctx.reject("Privacy Choices are temporarily unavailable") + } + + try { + UserMessagingPlatform.showPrivacyOptionsForm(activity) { formError -> + if (formError != null) { + ctx.reject("UMP ${formError.errorCode}: ${formError.message}") + } else { + ctx.resolve(currentState().toMap()) + } } + } catch (error: Exception) { + ctx.reject(error.message ?: "Unable to open Privacy Choices") } } } diff --git a/src/settings/mainSettings.js b/src/settings/mainSettings.js index 2946f57c72..7ce6cf196b 100644 --- a/src/settings/mainSettings.js +++ b/src/settings/mainSettings.js @@ -251,10 +251,19 @@ export default function mainSettings() { break; case "privacyChoices": + loader.create( + strings["privacy choices"] || "Privacy Choices", + strings["loading..."] || "Loading...", + ); try { await showPrivacyOptions(); } catch (error) { - helpers.error(error); + console.warn("Unable to open AdMob Privacy Choices:", error); + helpers.error( + "Unable to open Privacy Choices. Check your connection and try again.", + ); + } finally { + loader.destroy(); } break; diff --git a/src/sidebarApps/extensions/index.js b/src/sidebarApps/extensions/index.js index e83360dcf8..72ed4378e7 100644 --- a/src/sidebarApps/extensions/index.js +++ b/src/sidebarApps/extensions/index.js @@ -836,11 +836,14 @@ function ListItem({ }); const { default: installPlugin } = await import("lib/installPlugin"); - await installPlugin( - id, - remotePlugin.name, - purchaseToken ? purchaseToken : undefined, - ); + await Promise.all([ + loadAd(), + installPlugin( + id, + remotePlugin.name, + purchaseToken ? purchaseToken : undefined, + ), + ]); const searchInput = container.querySelector('input[name="search-ext"]'); if (searchInput) { @@ -862,6 +865,7 @@ function ListItem({ if (!$installed.collapsed) { $installed.ontoggle(); } + await helpers.showInterstitialIfReady(); async function getPurchase(sku) { const purchases = await helpers.promisify(iap.getPurchases); @@ -910,14 +914,11 @@ function ListItem({ return $el; } -async function loadAd(el) { +async function loadAd() { if (!helpers.canShowAds()) return; try { if (!(await interstitialAd?.isLoaded())) { - const oldText = el.textContent; - el.textContent = strings["loading..."]; await interstitialAd?.load(); - el.textContent = oldText; } } catch (error) { console.error(error); @@ -929,7 +930,7 @@ async function uninstall(id) { const pluginDir = Url.join(PLUGIN_DIR, id); const state = await InstallState.new(id); await Promise.all([ - loadAd(this), + loadAd(), fsOperation(pluginDir).delete(), state.delete(state.storeUrl), ]); diff --git a/tests/admob/adConsentCoordinator.test.js b/tests/admob/adConsentCoordinator.test.js index cb4fe07c70..ecd5a2f7fc 100644 --- a/tests/admob/adConsentCoordinator.test.js +++ b/tests/admob/adConsentCoordinator.test.js @@ -9,6 +9,7 @@ function createHarness({ gatherState, previousState = EMPTY_PRIVACY_STATE, gatherError, + showOptions, }) { let gatherCalls = 0; let getStateCalls = 0; @@ -25,6 +26,7 @@ function createHarness({ return previousState; }, async showOptions() { + if (showOptions) return showOptions(); return gatherState; }, }; @@ -141,12 +143,12 @@ test("deduplicates consent collection and ad initialization", async () => { assert.equal(harness.initializeCalls, 1); }); -test("updates privacy-option visibility and keeps ads single-started", async () => { +test("hides a stale privacy-option entry and keeps ads single-started", async () => { const harness = createHarness({ gatherState: { - consentStatus: "notRequired", + consentStatus: "obtained", canRequestAds: true, - privacyOptionsRequired: false, + privacyOptionsRequired: true, }, }); const states = []; @@ -154,15 +156,15 @@ test("updates privacy-option visibility and keeps ads single-started", async () await harness.coordinator.start(); harness.privacy.showOptions = async () => ({ - consentStatus: "obtained", + consentStatus: "notRequired", canRequestAds: true, - privacyOptionsRequired: true, + privacyOptionsRequired: false, }); await harness.coordinator.showPrivacyOptions(); unsubscribe(); assert.equal(harness.initializeCalls, 1); - assert.equal(states.at(-1).privacyOptionsRequired, true); + assert.equal(states.at(-1).privacyOptionsRequired, false); }); test("normalizes an invalid native state instead of starting ads", async () => { @@ -177,3 +179,62 @@ test("normalizes an invalid native state instead of starting ads", async () => { assert.deepEqual(await harness.coordinator.start(), EMPTY_PRIVACY_STATE); assert.equal(harness.initializeCalls, 0); }); + +test("deduplicates concurrent privacy-option requests", async () => { + let resolveOptions; + let showOptionsCalls = 0; + const optionsResult = new Promise((resolve) => { + resolveOptions = resolve; + }); + const harness = createHarness({ + gatherState: { + consentStatus: "obtained", + canRequestAds: true, + privacyOptionsRequired: true, + }, + showOptions() { + showOptionsCalls++; + return optionsResult; + }, + }); + await harness.coordinator.start(); + + const firstRequest = harness.coordinator.showPrivacyOptions(); + const secondRequest = harness.coordinator.showPrivacyOptions(); + assert.equal(firstRequest, secondRequest); + resolveOptions({ + consentStatus: "obtained", + canRequestAds: true, + privacyOptionsRequired: false, + }); + + assert.deepEqual(await firstRequest, { + consentStatus: "obtained", + canRequestAds: true, + privacyOptionsRequired: false, + }); + assert.equal(showOptionsCalls, 1); +}); + +test("preserves consent state when privacy options reject", async () => { + const gatherState = { + consentStatus: "obtained", + canRequestAds: true, + privacyOptionsRequired: true, + }; + const optionsError = new Error("native failure"); + const harness = createHarness({ + gatherState, + showOptions: async () => { + throw optionsError; + }, + }); + await harness.coordinator.start(); + + await assert.rejects( + harness.coordinator.showPrivacyOptions(), + (error) => error === optionsError, + ); + assert.deepEqual(harness.coordinator.state, gatherState); + assert.equal(harness.initializeCalls, 1); +}); diff --git a/tests/admob/bannerVisibilityController.test.js b/tests/admob/bannerVisibilityController.test.js index cb9d52c347..1ad63d396c 100644 --- a/tests/admob/bannerVisibilityController.test.js +++ b/tests/admob/bannerVisibilityController.test.js @@ -1,21 +1,34 @@ import assert from "node:assert/strict"; -import { test } from "vitest"; +import { afterEach, test, vi } from "vitest"; import { BANNER_SUPPRESSION_REASON, BannerVisibilityController, } from "../../src/lib/bannerVisibilityController.mjs"; -function createHarness() { +function createHarness({ show, hide } = {}) { let activePage = null; let notifyPageChange = () => {}; const calls = []; + const errors = []; + const listeners = new Map(); const banner = { active: false, async show() { calls.push("show"); + return show?.(); }, async hide() { calls.push("hide"); + return hide?.(); + }, + on(eventName, listener) { + let eventListeners = listeners.get(eventName); + if (!eventListeners) { + eventListeners = new Set(); + listeners.set(eventName, eventListeners); + } + eventListeners.add(listener); + return () => eventListeners.delete(listener); }, }; const controller = new BannerVisibilityController({ @@ -27,7 +40,7 @@ function createHarness() { }; }, onError(error) { - throw error; + errors.push(error); }, }); controller.setBanner(banner); @@ -36,6 +49,10 @@ function createHarness() { banner, calls, controller, + emit(eventName, event = {}) { + for (const listener of listeners.get(eventName) ?? []) listener(event); + }, + errors, changePage(page) { activePage = page; notifyPageChange(); @@ -46,6 +63,19 @@ function createHarness() { }; } +async function createEligibleHarness(options) { + const harness = createHarness(options); + const page = {}; + harness.setActivePage(page); + harness.controller.registerPage(page); + await harness.controller.whenIdle(); + return { harness, page }; +} + +afterEach(() => { + vi.useRealTimers(); +}); + test("shows only for a registered active page and ignores repeated syncs", async () => { const harness = createHarness(); const page = {}; @@ -234,3 +264,169 @@ test("serializes an in-flight show before the latest hide request", async () => assert.equal(banner.active, false); assert.deepEqual(calls, ["show", "hide"]); }); + +test("retries one transient failure after 500ms and caps requests at two", async () => { + vi.useFakeTimers(); + const { harness } = await createEligibleHarness(); + + harness.emit("loadfail", { code: 3 }); + harness.emit("loadfail", { code: 3 }); + await vi.advanceTimersByTimeAsync(499); + assert.deepEqual(harness.calls, ["show"]); + await vi.advanceTimersByTimeAsync(1); + await harness.controller.whenIdle(); + + harness.emit("loadfail", { code: 3 }); + harness.controller.reconcile(); + await vi.advanceTimersByTimeAsync(500); + await harness.controller.whenIdle(); + + assert.deepEqual(harness.calls, ["show", "show"]); + assert.equal(harness.errors.length, 3); +}); + +test("successful load restores the retry allowance", async () => { + vi.useFakeTimers(); + const { harness } = await createEligibleHarness(); + + harness.emit("loadfail", { code: 3 }); + await vi.advanceTimersByTimeAsync(500); + await harness.controller.whenIdle(); + harness.emit("load"); + harness.emit("loadfail", { code: 3 }); + await vi.advanceTimersByTimeAsync(500); + await harness.controller.whenIdle(); + + assert.deepEqual(harness.calls, ["show", "show", "show"]); +}); + +test("cancels a retry on navigation and restores it when the page returns", async () => { + vi.useFakeTimers(); + const { harness, page } = await createEligibleHarness(); + + harness.emit("loadfail", { code: 3 }); + harness.changePage({}); + await harness.controller.whenIdle(); + await vi.advanceTimersByTimeAsync(500); + assert.deepEqual(harness.calls, ["show"]); + + harness.changePage(page); + await harness.controller.whenIdle(); + harness.emit("loadfail", { code: 3 }); + await vi.advanceTimersByTimeAsync(500); + await harness.controller.whenIdle(); + + assert.deepEqual(harness.calls, ["show", "show", "show"]); +}); + +test("does not retry non-transient load failures", async () => { + vi.useFakeTimers(); + const { harness } = await createEligibleHarness(); + + harness.emit("loadfail", { code: 1 }); + harness.controller.reconcile(); + await vi.advanceTimersByTimeAsync(500); + await harness.controller.whenIdle(); + + assert.deepEqual(harness.calls, ["show"]); +}); + +test("retries a rejected native show call", async () => { + vi.useFakeTimers(); + let showCalls = 0; + const { harness } = await createEligibleHarness({ + show() { + showCalls++; + if (showCalls === 1) throw new Error("bridge failure"); + }, + }); + + await vi.advanceTimersByTimeAsync(500); + await harness.controller.whenIdle(); + + assert.deepEqual(harness.calls, ["show", "show"]); + assert.equal(harness.errors.length, 1); +}); + +test("keeps a rejected hide operation eligible for reconciliation", async () => { + let hideCalls = 0; + const { harness } = await createEligibleHarness({ + hide() { + hideCalls++; + if (hideCalls === 1) throw new Error("bridge failure"); + }, + }); + + harness.controller.setKeyboardVisible(true); + await harness.controller.whenIdle(); + harness.controller.reconcile(); + await harness.controller.whenIdle(); + + assert.deepEqual(harness.calls, ["show", "hide", "hide"]); + assert.equal(harness.errors.length, 1); +}); + +test("replacement and disposal cancel retries and detach listeners", async () => { + vi.useFakeTimers(); + const { harness } = await createEligibleHarness(); + harness.emit("loadfail", { code: 3 }); + + const replacementCalls = []; + const replacementListeners = new Map(); + harness.controller.setBanner({ + active: false, + async hide() { + replacementCalls.push("hide"); + }, + on(eventName, listener) { + replacementListeners.set(eventName, listener); + return () => replacementListeners.delete(eventName); + }, + async show() { + replacementCalls.push("show"); + }, + }); + await harness.controller.whenIdle(); + const errorsBeforeStaleEvent = harness.errors.length; + harness.emit("loadfail", { code: 3 }); + replacementListeners.get("loadfail")({ code: 3 }); + harness.controller.dispose(); + replacementListeners.get("loadfail")?.({ code: 3 }); + await vi.advanceTimersByTimeAsync(500); + + assert.deepEqual(replacementCalls, ["show"]); + assert.equal(harness.errors.length, errorsBeforeStaleEvent + 1); +}); + +test("ignores a stale show rejection after replacing the banner", async () => { + let rejectOldShow; + const harness = createHarness({ + show: () => + new Promise((_, reject) => { + rejectOldShow = reject; + }), + }); + const page = {}; + harness.setActivePage(page); + harness.controller.registerPage(page); + await new Promise((resolve) => setImmediate(resolve)); + + const replacementCalls = []; + harness.controller.setBanner({ + active: false, + async hide() { + replacementCalls.push("hide"); + }, + on() { + return () => {}; + }, + async show() { + replacementCalls.push("show"); + }, + }); + rejectOldShow(new Error("stale bridge failure")); + await harness.controller.whenIdle(); + + assert.deepEqual(replacementCalls, ["show"]); + assert.deepEqual(harness.errors, []); +}); From 4ee4fa382b2c2ad89525e8403587d0921fa1fe37 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Tue, 25 Aug 2026 14:25:08 +0000 Subject: [PATCH 069/195] fix(android): avoid splash surface crash on realme Android 13 (#2805) --- hooks/post-process.js | 74 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/hooks/post-process.js b/hooks/post-process.js index 16f310469e..51bd6b3901 100644 --- a/hooks/post-process.js +++ b/hooks/post-process.js @@ -27,6 +27,7 @@ fs.copyFileSync(gradleFilePath, androidGradleFilePath); copyDirRecursively(localResPath, resPath); enableLegacyJni(); enableStaticContext(); +disableSplashFadeOnRealmeAndroid13(); removeLegacyKeyboardWorkaround(); patchTargetSdkVersion(); @@ -210,6 +211,79 @@ function enableStaticContext() { } } +function disableSplashFadeOnRealmeAndroid13() { + try { + const prefix = execSync('npm prefix').toString().trim(); + const packageName = getPackageName(); + const mainActivityPath = path.join( + prefix, + 'platforms/android/app/src/main/java', + packageName.replace(/\./g, '/'), + 'MainActivity.java' + ); + + if (!fs.existsSync(mainActivityPath)) { + console.warn('[Cordova Hook] ⚠️ MainActivity.java not found at', mainActivityPath); + return; + } + + let content = fs.readFileSync(mainActivityPath, 'utf-8'); + + if ( + content.includes('hasBrokenRealmeSplashTransfer()') && + content.includes('preferences.set("FadeSplashScreen", false);') + ) { + console.log('[Cordova Hook] ✅ realme splash workaround already enabled, skipping'); + return; + } + + if (!content.includes('import android.os.Build;')) { + content = content.replace( + /import android\.os\.Bundle;/, + 'import android.os.Build;\nimport android.os.Bundle;' + ); + } + + content = content.replace( + /\n\s*@Override\n\s*public void onCreate\(Bundle savedInstanceState\)/, + ` + + private static boolean hasBrokenRealmeSplashTransfer() { + return Build.VERSION.SDK_INT == Build.VERSION_CODES.TIRAMISU + && ("realme".equalsIgnoreCase(Build.MANUFACTURER) + || "realme".equalsIgnoreCase(Build.BRAND)); + } + + @Override + protected void loadConfig() { + super.loadConfig(); + + // Some realme Android 13 builds pass a null SurfaceControl while handing the + // splash view to an app-provided exit animation. Avoid only that handoff. + if (hasBrokenRealmeSplashTransfer()) { + preferences.set("FadeSplashScreen", false); + } + } + + @Override + public void onCreate(Bundle savedInstanceState)` + ); + + if (!content.includes('preferences.set("FadeSplashScreen", false);')) { + console.warn('[Cordova Hook] ⚠️ Unable to inject realme splash workaround'); + return; + } + + fs.writeFileSync(mainActivityPath, content, 'utf-8'); + console.log('[Cordova Hook] ✅ Disabled splash fade on realme Android 13'); + } catch (err) { + console.error( + '[Cordova Hook] ❌ Failed to patch realme splash workaround:', + err.message + ); + } +} + function removeLegacyKeyboardWorkaround() { try { const prefix = execSync('npm prefix').toString().trim(); From 8d7148a6d5f8640e78f90290d6f1a5131a22d0ca Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Wed, 26 Aug 2026 06:43:45 +0000 Subject: [PATCH 070/195] fix(session): restore picker documents and skip intent files tab (#2809) * fix(session): restore picker documents and skip intent files tab * feat(file-browser): expose document picker(icon) from nested folders * fix --- src/handlers/intent.js | 23 +-- src/lib/editorFile.js | 3 + src/lib/fileSessionPersistence.js | 13 ++ src/lib/openFile.js | 15 +- src/lib/saveState.js | 2 +- src/pages/fileBrowser/fileBrowser.js | 64 +++++--- src/pages/fileBrowser/index.js | 7 +- src/plugins/sdcard/index.d.ts | 1 + src/plugins/sdcard/src/android/SDcard.java | 36 +++-- tests/unit/sessionPersistence.test.js | 165 +++++++++++++++++++++ 10 files changed, 284 insertions(+), 45 deletions(-) create mode 100644 src/lib/fileSessionPersistence.js create mode 100644 tests/unit/sessionPersistence.test.js diff --git a/src/handlers/intent.js b/src/handlers/intent.js index fc5f5b9cb1..78c0009ab6 100644 --- a/src/handlers/intent.js +++ b/src/handlers/intent.js @@ -17,11 +17,14 @@ const pendingIntents = []; * @param {Intent} intent */ export default async function HandleIntent(intent = {}) { - const type = intent.action.split(".").slice(-1)[0]; + const type = intent.action?.split(".").slice(-1)[0]; if (["SEND", "VIEW", "EDIT"].includes(type)) { /**@type {string} */ - const url = intent.fileUri || intent.data; + const url = + intent.fileUri || + intent.data || + intent.extras?.["android.intent.extra.STREAM"]; if (!url) return; if (url.startsWith("acode://")) { @@ -72,19 +75,19 @@ export default async function HandleIntent(intent = {}) { return; } + const options = { + mode: "single", + render: true, + persistInSession: false, + }; + if (sessionStorage.getItem("isfilesRestored") === "true") { - await openFile(url, { - mode: "single", - render: true, - }); + await openFile(url, options); } else { // Store the intent for later processing when files are restored pendingIntents.push({ url, - options: { - mode: "single", - render: true, - }, + options, }); } } diff --git a/src/lib/editorFile.js b/src/lib/editorFile.js index 2aee9b500f..df7abed821 100644 --- a/src/lib/editorFile.js +++ b/src/lib/editorFile.js @@ -330,6 +330,7 @@ function maybeRecommendLanguageModeExtension(file, modeInfo) { * @property {string} [paneId] target editor pane id * @property {object} [pane] target editor pane * @property {boolean} [isPanePlaceholder] temporary empty tab for an empty pane + * @property {boolean} [persistInSession] restore the tab in a future app session * @property {boolean} [highlightStyles] adopt static CodeMirror highlight CSS into the custom tab shadow root */ @@ -500,6 +501,7 @@ export default class EditorFile { diskMtime = null; hasDiskConflict = false; isPanePlaceholder = false; + persistInSession = true; /** * @@ -513,6 +515,7 @@ export default class EditorFile { this.hideQuickTools = options?.hideQuickTools || false; this.paneId = options?.paneId || options?.pane?.id || null; this.isPanePlaceholder = !!options?.isPanePlaceholder; + this.persistInSession = options?.persistInSession !== false; // if options are passed if (options) { diff --git a/src/lib/fileSessionPersistence.js b/src/lib/fileSessionPersistence.js new file mode 100644 index 0000000000..e14c639402 --- /dev/null +++ b/src/lib/fileSessionPersistence.js @@ -0,0 +1,13 @@ +/** + * Promote an open file to durable session persistence when a later open source + * proves that its URI will remain accessible. Less durable sources, such as + * external intents, must not revoke an existing durable grant. + * + * @param {{persistInSession?: boolean}} file + * @param {boolean | undefined} requestedPersistence + */ +export function promoteSessionPersistence(file, requestedPersistence) { + if (requestedPersistence === true) { + file.persistInSession = true; + } +} diff --git a/src/lib/openFile.js b/src/lib/openFile.js index bbb5e5812f..020c028558 100644 --- a/src/lib/openFile.js +++ b/src/lib/openFile.js @@ -8,6 +8,7 @@ import { reopenWithNewEncoding } from "palettes/changeEncoding"; import { decode, detectEncoding } from "utils/encodings"; import helpers from "utils/helpers"; import EditorFile from "./editorFile"; +import { promoteSessionPersistence } from "./fileSessionPersistence"; import fileTypeHandler from "./fileTypeHandler"; import recents from "./recents"; import appSettings from "./settings"; @@ -22,6 +23,7 @@ import appSettings from "./settings"; * @property {string} mode * @property {string} uri * @property {string} paneId + * @property {boolean} persistInSession */ /** @@ -37,9 +39,19 @@ export default async function openFile(file, options = {}) { /**@type {EditorFile} */ const existingFile = editorManager.getFile(uri, "uri"); - const { cursorPos, render, onsave, text, mode, encoding, paneId } = options; + const { + cursorPos, + render, + onsave, + text, + mode, + encoding, + paneId, + persistInSession, + } = options; if (existingFile) { + promoteSessionPersistence(existingFile, persistInSession); // If file is already opened and new text is provided const incomingDoc = text != null ? Text.of(String(text).split("\n")) : null; @@ -120,6 +132,7 @@ export default async function openFile(file, options = {}) { savedMtime: helpers.getStatMtime(fileInfo), diskMtime: helpers.getStatMtime(fileInfo), paneId, + persistInSession, }); }; diff --git a/src/lib/saveState.js b/src/lib/saveState.js index 784304d475..7e0ea6790b 100644 --- a/src/lib/saveState.js +++ b/src/lib/saveState.js @@ -14,7 +14,7 @@ export default () => { files.forEach((file) => { if (file.type !== "editor") return; if (file.id === config.DEFAULT_FILE_SESSION) return; - if (file.SAFMode === "single") return; + if (file.persistInSession === false) return; // Selection per file: // - Active file uses live EditorView selection diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index b26758b189..ef9c59ce28 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -60,6 +60,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { const IS_FOLDER_MODE = ["folder", "both"].includes(mode); const IS_FILE_MODE = ["file", "both"].includes(mode); + const SELECT_DOCUMENT_LABEL = "Select document"; const storedState = helpers.parseJSON(localStorage.fileBrowserState) || []; /**@type {Array} */ const state = []; @@ -106,6 +107,16 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { ); const $search = ; + const $selectDocument = ( + + ); const $lead = ; const $page = Page(strings["file browser"].capitalize(), { lead: $lead, @@ -178,8 +189,9 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { $content.addEventListener("click", handleClick); $content.addEventListener("contextmenu", handleContextMenu, true); $page.body = $content; + $page.header.append($search); + if (IS_FILE_MODE) $page.header.append($selectDocument); $page.header.append( - $search, $pasteToggler, $selectionModeToggler, $addMenuToggler, @@ -222,6 +234,12 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { }; $pasteToggler.onclick = pasteCopiedItems; + $selectDocument.onclick = selectDocument; + $selectDocument.onkeydown = (event) => { + if (event.key !== "Enter" && event.key !== " ") return; + event.preventDefault(); + selectDocument(); + }; $fbMenu.onclick = function (e) { $fbMenu.hide(); @@ -653,6 +671,25 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { $page.hide(); } + function selectDocument() { + checkFiles.check = false; + sdcard.openDocumentFile( + (res) => { + res.url = res.uri; + resolve({ + type: "file", + ...res, + name: res.filename, + mode: "single", + }); + $page.hide(); + }, + (err) => { + helpers.error(err); + }, + ); + } + /** * @param {string} url */ @@ -872,6 +909,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { $addMenuToggler.style.display = "none"; $menuToggler.style.display = "none"; + $selectDocument.style.display = "none"; $selectionMenuToggler.style.display = ""; updatePasteToggler(); @@ -899,6 +937,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { $addMenuToggler.style.display = ""; $menuToggler.style.display = ""; + $selectDocument.style.display = ""; $selectionMenuToggler.style.display = "none"; updatePasteToggler(); @@ -998,7 +1037,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { else if (!$el.hasAttribute("disabled")) file(); break; case "openDoc": - openDoc(); + selectDocument(); break; } @@ -1304,25 +1343,6 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { localStorage.storageList = JSON.stringify(storageList); reload(); } - - function openDoc() { - checkFiles.check = false; - sdcard.openDocumentFile( - (res) => { - res.url = res.uri; - resolve({ - type: "file", - ...res, - name: res.filename, - mode: "single", - }); - $page.hide(); - }, - (err) => { - helpers.error(err); - }, - ); - } } function handleContextMenu(e) { @@ -1431,7 +1451,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { } if (IS_FILE_MODE) { - util.pushFolder(allStorages, "Select document", null, { + util.pushFolder(allStorages, SELECT_DOCUMENT_LABEL, null, { openDoc: true, notSelectable: true, }); diff --git a/src/pages/fileBrowser/index.js b/src/pages/fileBrowser/index.js index 63becfb329..bd46f597c8 100644 --- a/src/pages/fileBrowser/index.js +++ b/src/pages/fileBrowser/index.js @@ -31,7 +31,7 @@ function FileBrowser(mode, info, doesOpenLast, ...args) { } FileBrowser.openFile = (res) => { - const { url, name, mode } = res; + const { url, name, mode, persistedUriPermission } = res; const createOption = { uri: url, name, @@ -41,8 +41,11 @@ FileBrowser.openFile = (res) => { if (mode) { createOption.mode = mode; } + if (mode === "single") { + createOption.persistInSession = persistedUriPermission !== false; + } - openFile(url, createOption); + return openFile(url, createOption); }; FileBrowser.openFileError = (err) => { diff --git a/src/plugins/sdcard/index.d.ts b/src/plugins/sdcard/index.d.ts index f151eab349..fd6a6b7db8 100644 --- a/src/plugins/sdcard/index.d.ts +++ b/src/plugins/sdcard/index.d.ts @@ -35,6 +35,7 @@ interface DocumentFile { canWrite: boolean; filename: string; length: number; + persistedUriPermission: boolean; type: string; uri: string; } diff --git a/src/plugins/sdcard/src/android/SDcard.java b/src/plugins/sdcard/src/android/SDcard.java index 1b33e7edef..578d33dda3 100644 --- a/src/plugins/sdcard/src/android/SDcard.java +++ b/src/plugins/sdcard/src/android/SDcard.java @@ -266,6 +266,11 @@ public void openDocumentFile(String mimeType, CallbackContext callback) { intent.setAction(Intent.ACTION_OPEN_DOCUMENT); intent.addCategory(Intent.CATEGORY_OPENABLE); intent.setType(mimeType); + intent.addFlags( + Intent.FLAG_GRANT_READ_URI_PERMISSION | + Intent.FLAG_GRANT_WRITE_URI_PERMISSION | + Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION + ); activityResultCallback = callback; cordova.startActivityForResult(this, intent, this.OPEN_DOCUMENT); } @@ -409,7 +414,10 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { return; } - takePermission(uri); + boolean persistedUriPermission = takePermission( + uri, + data.getFlags() + ); DocumentFile file = DocumentFile.fromSingleUri(context, uri); JSONObject res = new JSONObject(); @@ -418,6 +426,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { res.put("filename", file.getName()); res.put("canWrite", canWrite(file.getUri())); res.put("uri", uri.toString()); + res.put("persistedUriPermission", persistedUriPermission); activityResultCallback.success(res); } catch (JSONException e) { activityResultCallback.error(e.toString()); @@ -447,7 +456,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { return; } - takePermission(uri); + takePermission(uri, data.getFlags()); DocumentFile file = DocumentFile.fromTreeUri(context, uri); if (file != null && file.canWrite()) { activityResultCallback.success(uri.toString()); @@ -1152,13 +1161,22 @@ private DocumentFile getFile(String filePath) { return documentFile; } - private void takePermission(Uri uri) { - contentResolver = context.getContentResolver(); - contentResolver.takePersistableUriPermission( - uri, - Intent.FLAG_GRANT_WRITE_URI_PERMISSION | - Intent.FLAG_GRANT_READ_URI_PERMISSION - ); + private boolean takePermission(Uri uri, int intentFlags) { + int permissionFlags = + intentFlags & + (Intent.FLAG_GRANT_WRITE_URI_PERMISSION | + Intent.FLAG_GRANT_READ_URI_PERMISSION); + + if (permissionFlags == 0) return false; + + try { + contentResolver = context.getContentResolver(); + contentResolver.takePersistableUriPermission(uri, permissionFlags); + return true; + } catch (SecurityException | IllegalArgumentException error) { + Log.w("SDcard", "Unable to persist URI permission for " + uri, error); + return false; + } } public boolean canWrite(Uri uri) { diff --git a/tests/unit/sessionPersistence.test.js b/tests/unit/sessionPersistence.test.js new file mode 100644 index 0000000000..938cc63a60 --- /dev/null +++ b/tests/unit/sessionPersistence.test.js @@ -0,0 +1,165 @@ +// @vitest-environment happy-dom + +import { beforeEach, describe, expect, it, vi } from "vitest"; + +const runtime = vi.hoisted(() => { + const settings = { + value: { + rememberFiles: true, + rememberFolders: false, + }, + }; + + return { + settings, + openFile: vi.fn(), + }; +}); + +vi.mock("cm/editorUtils", () => ({ + getAllFolds: vi.fn(() => []), + getScrollPosition: vi.fn(() => ({ scrollTop: 0, scrollLeft: 0 })), + getSelection: vi.fn(() => ({ + ranges: [{ from: 0, to: 0 }], + mainIndex: 0, + })), +})); +vi.mock("dialogs/alert", () => ({ default: vi.fn() })); +vi.mock("fileSystem", () => ({ default: vi.fn() })); +vi.mock("lib/auth", () => ({ default: {} })); +vi.mock("lib/config", () => ({ + default: { DEFAULT_FILE_SESSION: "default-session" }, +})); +vi.mock("lib/openFile", () => ({ default: runtime.openFile })); +vi.mock("lib/openFolder", () => ({ + default: vi.fn(), + addedFolder: [], +})); +vi.mock("lib/settings", () => ({ default: runtime.settings })); +vi.mock("lib/startAd", () => ({ + BANNER_SUPPRESSION_REASON: {}, + setBannerSuppressed: vi.fn(), +})); +vi.mock("utils/helpers", () => ({ + default: { error: vi.fn(), errorMessage: vi.fn() }, +})); + +import HandleIntent from "handlers/intent"; +import { promoteSessionPersistence } from "lib/fileSessionPersistence"; +import saveState from "lib/saveState"; +import FileBrowser from "pages/fileBrowser"; + +describe("file session persistence", () => { + beforeEach(() => { + runtime.openFile.mockReset(); + localStorage.clear(); + sessionStorage.clear(); + sessionStorage.setItem("isfilesRestored", "true"); + globalThis.editorManager = { + editor: {}, + files: [], + activeFile: null, + getFile(value, type = "id") { + return this.files.find((file) => file[type] === value); + }, + }; + runtime.openFile.mockImplementation(async (uri, options = {}) => { + const existingFile = globalThis.editorManager.getFile(uri, "uri"); + if (existingFile) { + promoteSessionPersistence(existingFile, options.persistInSession); + globalThis.editorManager.activeFile = existingFile; + return; + } + + const file = createOpenFile(uri, options); + globalThis.editorManager.files.push(file); + globalThis.editorManager.activeFile = file; + }); + }); + + it("persists only a picker document with durable URI access", async () => { + const selectedUri = "content://documents/document/selected"; + const unpersistableUri = "content://documents/document/no-grant"; + const intentUri = "content://external-app/shared/temporary"; + + await FileBrowser.openFile({ + type: "file", + url: selectedUri, + name: "selected.js", + mode: "single", + persistedUriPermission: true, + }); + await FileBrowser.openFile({ + type: "file", + url: unpersistableUri, + name: "no-grant.js", + mode: "single", + persistedUriPermission: false, + }); + await HandleIntent({ + action: "android.intent.action.VIEW", + data: intentUri, + }); + await HandleIntent({ + action: "android.intent.action.VIEW", + data: selectedUri, + }); + + saveState(); + + const restoredUris = JSON.parse(localStorage.files).map( + (file) => file.uri, + ); + expect(restoredUris).toEqual([selectedUri]); + }); + + it("promotes an intent tab when the same document is later selected", async () => { + const uri = "content://documents/document/shared"; + + await HandleIntent({ + action: "android.intent.action.VIEW", + data: uri, + }); + await FileBrowser.openFile({ + type: "file", + url: uri, + name: "shared.js", + mode: "single", + persistedUriPermission: true, + }); + + saveState(); + + expect(JSON.parse(localStorage.files).map((file) => file.uri)).toEqual([ + uri, + ]); + }); +}); + +function createOpenFile(uri, options) { + return { + id: `file-${globalThis.editorManager.files.length + 1}`, + uri, + type: "editor", + filename: options.name || uri.split("/").pop(), + pinned: false, + isUnsaved: false, + docVersion: 0, + savedVersion: 0, + cacheVersion: 0, + savedMtime: 1, + diskMtime: 1, + hasDiskConflict: false, + readOnly: false, + SAFMode: options.mode, + deletedFile: false, + session: { + selection: { ranges: [{ from: 0, to: 0 }], mainIndex: 0 }, + }, + lastScrollTop: 0, + lastScrollLeft: 0, + editable: true, + encoding: "UTF-8", + persistInSession: options.persistInSession, + }; +} From ad016a43d4e26ad6b9e237d26a742e84ba4b20aa Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Wed, 26 Aug 2026 13:22:32 +0000 Subject: [PATCH 071/195] feat(console): isolate execution and improve mobile REPL UX (#2808) * feat(console): isolate execution and improve mobile REPL UX - run console JavaScript in a cancellable Web Worker - protect the app from infinite loops and recursion - preserve history with variable-height virtualization - restore the inline REPL layout - fix mobile keyboard resizing and viewport gaps - add clear and stop controls * fix(console): address execution context and bottom pinning * address the pinning regression * remove stop, run btn --- rspack.config.js | 1 + src/components/virtualList/index.js | 2 + src/components/virtualList/style.scss | 10 + src/components/virtualList/variable.js | 411 +++++++++++++++++ src/lib/console.js | 238 ++++++++-- src/lib/consoleRuntime.js | 186 ++++++++ src/lib/consoleWorker.js | 168 +++++++ src/lib/run.js | 10 +- .../com/foxdebug/browser/BrowserActivity.java | 38 +- src/styles/console.m.scss | 419 ++++++++++-------- src/views/console.hbs | 11 +- tests/unit/consoleExecutionContext.test.js | 52 +++ tests/unit/consoleExecutor.test.js | 134 ++++++ tests/unit/consoleViewport.test.js | 41 ++ tests/unit/variableVirtualList.test.js | 194 ++++++++ webpack.config.js | 1 + 16 files changed, 1676 insertions(+), 240 deletions(-) create mode 100644 src/components/virtualList/variable.js create mode 100644 src/lib/consoleRuntime.js create mode 100644 src/lib/consoleWorker.js create mode 100644 tests/unit/consoleExecutionContext.test.js create mode 100644 tests/unit/consoleExecutor.test.js create mode 100644 tests/unit/consoleViewport.test.js create mode 100644 tests/unit/variableVirtualList.test.js diff --git a/rspack.config.js b/rspack.config.js index a30e31154b..9efbf30197 100644 --- a/rspack.config.js +++ b/rspack.config.js @@ -144,6 +144,7 @@ module.exports = (env, options) => { boot: './src/boot.js', main: './src/main.js', console: './src/lib/console.js', + consoleWorker: './src/lib/consoleWorker.js', searchInFilesWorker: './src/sidebarApps/searchInFiles/worker.js', searchIndexWorker: './src/sidebarApps/searchInFiles/indexWorker.js', htmlLspWorker: './src/cm/lsp/workers/html.worker.ts', diff --git a/src/components/virtualList/index.js b/src/components/virtualList/index.js index bf7b7db4b1..c1ff5bafcf 100644 --- a/src/components/virtualList/index.js +++ b/src/components/virtualList/index.js @@ -1,6 +1,8 @@ import "./style.scss"; import tag from "html-tag-js"; +export { default as VariableVirtualList } from "./variable"; + /** * @typedef {object} VirtualListOptions * @property {number} [itemHeight=30] - Height of each item in pixels diff --git a/src/components/virtualList/style.scss b/src/components/virtualList/style.scss index 9af4e0df05..3ef86ce953 100644 --- a/src/components/virtualList/style.scss +++ b/src/components/virtualList/style.scss @@ -7,3 +7,13 @@ position: relative; min-width: 100%; } + +.variable-virtual-spacer { + width: 100%; + pointer-events: none; +} + +.variable-virtual-items { + position: relative; + min-width: 100%; +} diff --git a/src/components/virtualList/variable.js b/src/components/virtualList/variable.js new file mode 100644 index 0000000000..e2cf193c6d --- /dev/null +++ b/src/components/virtualList/variable.js @@ -0,0 +1,411 @@ +const DEFAULT_ESTIMATED_HEIGHT = 52; +const DEFAULT_OVERSCAN = 360; +const BOTTOM_THRESHOLD = 48; + +/** + * Variable-height virtual list for retained HTMLElement items. + * + * Every item stays in the model, while only the visible window and a small pixel + * overscan are mounted. ResizeObserver keeps changing item heights measured + * without losing the reader's scroll anchor. + */ +export default class VariableVirtualList { + constructor( + container, + { + estimatedHeight = DEFAULT_ESTIMATED_HEIGHT, + overscan = DEFAULT_OVERSCAN, + activeOverscan = overscan * 4, + maxOverscan = overscan * 10, + footer = null, + } = {}, + ) { + this.container = container; + this.estimatedHeight = estimatedHeight; + this.overscan = overscan; + this.activeOverscan = Math.max(overscan, activeOverscan); + this.maxOverscan = Math.max(this.activeOverscan, maxOverscan); + this.dynamicOverscan = overscan; + this.footer = footer; + this.footerHeight = 0; + this.viewportHeight = this.container.clientHeight; + this.items = []; + this.itemByElement = new WeakMap(); + this.offsets = [0]; + this.offsetsDirty = false; + this.renderedRange = { start: 0, end: 0 }; + this.frame = null; + this.stickToBottom = true; + this.lastScrollTop = this.container.scrollTop; + this.lastScrollTime = this.now(); + this.touching = false; + this.releaseTimer = null; + this.destroyed = false; + + this.topSpacer = document.createElement("div"); + this.topSpacer.className = "variable-virtual-spacer"; + this.itemContainer = document.createElement("div"); + this.itemContainer.className = "variable-virtual-items"; + this.bottomSpacer = document.createElement("div"); + this.bottomSpacer.className = "variable-virtual-spacer"; + this.container.append( + this.topSpacer, + this.itemContainer, + this.bottomSpacer, + ); + if (this.footer) this.container.append(this.footer); + + this.onScroll = () => { + this.stickToBottom = this.isNearBottom(); + const now = this.now(); + const elapsed = Math.max(8, now - this.lastScrollTime); + const distance = Math.abs(this.container.scrollTop - this.lastScrollTop); + const projectedDistance = distance * (32 / elapsed); + this.dynamicOverscan = Math.min( + this.maxOverscan, + this.activeOverscan + projectedDistance * 2, + ); + this.lastScrollTop = this.container.scrollTop; + this.lastScrollTime = now; + // Scroll rendering is intentionally synchronous. Android WebView can move + // the compositor several rows before the next animation frame. + this.render(); + this.scheduleOverscanRelease(); + }; + this.onTouchStart = () => { + this.touching = true; + this.clearOverscanRelease(); + this.dynamicOverscan = this.activeOverscan; + // Pre-paint the fling guard before compositor scrolling begins. + this.render(); + }; + this.onTouchEnd = () => { + this.touching = false; + this.scheduleOverscanRelease(); + }; + this.container.addEventListener("scroll", this.onScroll, { passive: true }); + this.container.addEventListener("touchstart", this.onTouchStart, { + passive: true, + }); + this.container.addEventListener("touchend", this.onTouchEnd, { + passive: true, + }); + this.container.addEventListener("touchcancel", this.onTouchEnd, { + passive: true, + }); + + this.resizeObserver = + typeof ResizeObserver === "function" + ? new ResizeObserver((entries) => this.onResize(entries)) + : null; + this.resizeObserver?.observe(this.container); + } + + now() { + return ( + this.container.ownerDocument.defaultView?.performance?.now?.() ?? + Date.now() + ); + } + + scheduleOverscanRelease() { + this.clearOverscanRelease(); + this.releaseTimer = this.container.ownerDocument.defaultView?.setTimeout( + () => { + this.releaseTimer = null; + if (this.destroyed || this.touching) return; + this.dynamicOverscan = this.overscan; + this.render(); + }, + 500, + ); + } + + clearOverscanRelease() { + if (this.releaseTimer === null) return; + this.container.ownerDocument.defaultView?.clearTimeout(this.releaseTimer); + this.releaseTimer = null; + } + + get length() { + return this.items.length; + } + + get mountedCount() { + return this.itemContainer.childElementCount; + } + + append(element) { + const wasNearBottom = this.isNearBottom(); + const item = { + element, + height: this.estimatedHeight, + index: this.items.length, + }; + this.items.push(item); + this.itemByElement.set(element, item); + this.offsetsDirty = true; + if (wasNearBottom || this.items.length === 1) this.stickToBottom = true; + this.scheduleRender(); + } + + clear() { + this.items = []; + this.itemByElement = new WeakMap(); + this.offsets = [0]; + this.offsetsDirty = false; + this.renderedRange = { start: 0, end: 0 }; + this.stickToBottom = true; + this.dynamicOverscan = this.overscan; + this.topSpacer.style.height = "0px"; + this.bottomSpacer.style.height = "0px"; + this.itemContainer.replaceChildren(); + this.container.scrollTop = 0; + this.footerHeight = this.getFooterHeight(); + this.observeResizeTargets(); + } + + invalidate() { + this.scheduleRender(); + } + + scrollToBottom() { + this.stickToBottom = true; + this.scheduleRender(); + } + + scheduleRender() { + if (this.frame !== null || this.destroyed) return; + this.frame = requestAnimationFrame(() => { + this.frame = null; + this.render(); + }); + } + + rebuildOffsets() { + if (!this.offsetsDirty) return; + + const offsets = new Array(this.items.length + 1); + offsets[0] = 0; + for (let index = 0; index < this.items.length; index++) { + offsets[index + 1] = offsets[index] + this.items[index].height; + } + this.offsets = offsets; + this.offsetsDirty = false; + } + + findIndexAt(offset) { + let low = 0; + let high = this.items.length; + while (low < high) { + const middle = Math.floor((low + high + 1) / 2); + if (this.offsets[middle] <= offset) low = middle; + else high = middle - 1; + } + return Math.min(low, Math.max(0, this.items.length - 1)); + } + + getFooterHeight() { + if (!this.footer) return 0; + return Math.ceil( + this.footer.getBoundingClientRect().height || + this.footer.offsetHeight || + 0, + ); + } + + observeResizeTargets() { + if (!this.resizeObserver) return; + this.resizeObserver.disconnect(); + this.resizeObserver.observe(this.container); + for (const element of this.itemContainer.children) { + this.resizeObserver.observe(element); + } + if (this.footer) this.resizeObserver.observe(this.footer); + } + + render() { + if (this.destroyed) return; + this.rebuildOffsets(); + if (!this.items.length) { + this.footerHeight = this.getFooterHeight(); + this.itemContainer.replaceChildren(); + this.topSpacer.style.height = "0px"; + this.bottomSpacer.style.height = "0px"; + this.renderedRange = { start: 0, end: 0 }; + this.observeResizeTargets(); + return; + } + + const viewportHeight = Math.max( + 1, + this.container.clientHeight || window.innerHeight, + ); + this.viewportHeight = viewportHeight; + const totalHeight = this.offsets[this.items.length]; + this.footerHeight = this.getFooterHeight(); + const targetScrollTop = this.stickToBottom + ? Math.max(0, totalHeight + this.footerHeight - viewportHeight) + : this.container.scrollTop; + const start = this.findIndexAt( + Math.max(0, targetScrollTop - this.dynamicOverscan), + ); + const end = Math.min( + this.items.length, + this.findIndexAt( + targetScrollTop + viewportHeight + this.dynamicOverscan, + ) + 1, + ); + + this.updateMountedRange(start, end); + this.observeResizeTargets(); + this.topSpacer.style.height = `${this.offsets[start]}px`; + this.bottomSpacer.style.height = `${Math.max( + 0, + totalHeight - this.offsets[end], + )}px`; + this.renderedRange = { start, end }; + + if (this.stickToBottom) { + this.container.scrollTop = Math.max( + 0, + this.container.scrollHeight - viewportHeight, + ); + } + if (!this.resizeObserver) this.measureMountedItems(); + } + + updateMountedRange(start, end) { + let oldStart = this.renderedRange.start; + let oldEnd = this.renderedRange.end; + const rangesOverlap = oldStart < end && start < oldEnd; + + if (!this.itemContainer.childElementCount || !rangesOverlap) { + const fragment = document.createDocumentFragment(); + for (let index = start; index < end; index++) { + fragment.append(this.items[index].element); + } + this.itemContainer.replaceChildren(fragment); + return; + } + + while (oldStart < start) { + this.itemContainer.firstElementChild?.remove(); + oldStart++; + } + while (oldEnd > end) { + this.itemContainer.lastElementChild?.remove(); + oldEnd--; + } + + if (start < oldStart) { + const leading = document.createDocumentFragment(); + for (let index = start; index < oldStart; index++) { + leading.append(this.items[index].element); + } + this.itemContainer.insertBefore(leading, this.itemContainer.firstChild); + } + if (end > oldEnd) { + const trailing = document.createDocumentFragment(); + for (let index = oldEnd; index < end; index++) { + trailing.append(this.items[index].element); + } + this.itemContainer.append(trailing); + } + } + + measureMountedItems() { + for (const element of this.itemContainer.children) { + const item = this.itemByElement.get(element); + if (item) this.updateHeight(item, element.getBoundingClientRect().height); + } + } + + onResize(entries) { + const wasNearBottom = this.stickToBottom || this.isNearBottom(); + let footerChanged = false; + let viewportChanged = false; + for (const entry of entries) { + if (entry.target === this.container) { + const borderBox = Array.isArray(entry.borderBoxSize) + ? entry.borderBoxSize[0] + : entry.borderBoxSize; + const height = Math.ceil( + borderBox?.blockSize || + entry.contentRect?.height || + this.container.clientHeight, + ); + viewportChanged = Math.abs(height - this.viewportHeight) >= 1; + this.viewportHeight = height; + continue; + } + if (entry.target === this.footer) { + const borderBox = Array.isArray(entry.borderBoxSize) + ? entry.borderBoxSize[0] + : entry.borderBoxSize; + const height = Math.ceil( + borderBox?.blockSize || + entry.contentRect?.height || + this.getFooterHeight(), + ); + footerChanged = Math.abs(height - this.footerHeight) >= 1; + this.footerHeight = height; + continue; + } + const item = this.itemByElement.get(entry.target); + if (!item) continue; + const borderBox = Array.isArray(entry.borderBoxSize) + ? entry.borderBoxSize[0] + : entry.borderBoxSize; + this.updateHeight( + item, + borderBox?.blockSize || + entry.contentRect?.height || + entry.target.offsetHeight, + ); + } + if (wasNearBottom) this.stickToBottom = true; + if (viewportChanged || (wasNearBottom && footerChanged)) { + this.scheduleRender(); + } + } + + updateHeight(item, measuredHeight) { + const height = Math.max(1, Math.ceil(measuredHeight || 0)); + if (Math.abs(height - item.height) < 1) return; + + const delta = height - item.height; + item.height = height; + this.offsetsDirty = true; + if (!this.stickToBottom && item.index < this.renderedRange.start) { + this.container.scrollTop += delta; + } + this.scheduleRender(); + } + + isNearBottom() { + if (!this.items.length) return true; + return ( + this.container.scrollHeight - + this.container.scrollTop - + this.container.clientHeight <= + BOTTOM_THRESHOLD + ); + } + + destroy() { + this.destroyed = true; + if (this.frame !== null) cancelAnimationFrame(this.frame); + this.frame = null; + this.clearOverscanRelease(); + this.resizeObserver?.disconnect(); + this.container.removeEventListener("scroll", this.onScroll); + this.container.removeEventListener("touchstart", this.onTouchStart); + this.container.removeEventListener("touchend", this.onTouchEnd); + this.container.removeEventListener("touchcancel", this.onTouchEnd); + this.topSpacer.remove(); + this.itemContainer.remove(); + this.bottomSpacer.remove(); + this.items = []; + } +} diff --git a/src/lib/console.js b/src/lib/console.js index 3e10948585..8d399ea315 100644 --- a/src/lib/console.js +++ b/src/lib/console.js @@ -1,24 +1,102 @@ import "core-js/stable"; import "html-tag-js/dist/polyfill"; import { parse } from "acorn"; +import { VariableVirtualList } from "components/virtualList"; import css from "styles/console.m.scss"; import loadPolyFill from "utils/polyfill"; +import ConsoleExecutor, { + applyConsoleViewport, + executeConsoleCommand, + resolveConsoleExecutionContext, +} from "./consoleRuntime"; (function () { loadPolyFill.apply(window); let consoleVisible = false; + let isFocused = false; + let isExecuting = false; + let viewportFrame = null; + let viewportObserver = null; + const isStandaloneConsole = sessionStorage.getItem("__mode") === "console"; const originalConsole = console; const $input = tag("textarea", { id: "__c-input", + attr: { + rows: "1", + placeholder: "Run JavaScript…", + "aria-label": "JavaScript console input", + spellcheck: "false", + autocomplete: "off", + autocapitalize: "off", + }, + oninput: resizeInput, + onfocus() { + isFocused = true; + virtualMessages.scrollToBottom(); + }, onblur() { setTimeout(() => { isFocused = false; }, 0); }, }); + const $stopExecution = tag("button", { + className: "__c-action __c-action-danger", + textContent: "Stop", + attr: { + type: "button", + "aria-label": "Stop JavaScript execution", + }, + onclick() { + executor.cancel(); + }, + }); + $stopExecution.hidden = true; + const $executionContext = tag("select", { + className: "__c-context", + attr: { + "aria-label": "JavaScript execution context", + title: "Choose isolated Worker execution or live page access", + }, + children: [ + tag("option", { + textContent: "Worker", + attr: { value: "worker" }, + }), + tag("option", { + textContent: "Page (unsafe)", + attr: { value: "page" }, + }), + ], + onchange() { + if (this.value !== "page") return; + log( + "warn", + {}, + "Page mode can access window and document, but it runs on the preview thread and cannot stop infinite code.", + ); + }, + }); + const $output = tag("c-output", { + attr: { + role: "region", + "aria-label": "JavaScript console", + }, + }); const $inputContainer = tag("c-input", { - child: $input, + children: [ + $input, + tag("c-input-actions", { + children: [ + ...(isStandaloneConsole ? [] : [$executionContext]), + $stopExecution, + ], + }), + ], + }); + const virtualMessages = new VariableVirtualList($output, { + footer: $inputContainer, }); const $toggler = tag("c-toggler", { style: { @@ -46,9 +124,13 @@ import loadPolyFill from "utils/polyfill"; }, }); const $console = tag("c-console", { - child: $inputContainer, + child: $output, + attr: { + role: "dialog", + "aria-label": "JavaScript console", + }, onclick(e) { - const el = e.target; + const el = e.target.closest?.("[action]") || e.target; const action = el.getAttribute("action"); switch (action) { @@ -64,9 +146,22 @@ import loadPolyFill from "utils/polyfill"; } }, }); + if (isStandaloneConsole) { + $console.setAttribute("standalone", ""); + document.documentElement.setAttribute("console-only", ""); + } const counter = {}; const timers = {}; - let isFocused = false; + const executor = new ConsoleExecutor({ + workerUrl: window.__consoleWorkerScript || "build/consoleWorker.js", + onConsole(message) { + if (message.action === "clear") { + window.console.clear(); + return; + } + log(message.level, {}, ...message.args); + }, + }); if (!window.__objs) window.__objs = {}; @@ -77,13 +172,12 @@ import loadPolyFill from "utils/polyfill"; window.addEventListener("error", onError); assignCustomConsole(); - if (sessionStorage.getItem("__mode") === "console") { + if (isStandaloneConsole) { showConsole(); return; } tag.get("html").append($toggler); - $console.setAttribute("title", "Console"); sessionStorage.setItem("__console_available", true); document.addEventListener("showconsole", showConsole); document.addEventListener("hideconsole", hideConsole); @@ -105,10 +199,7 @@ import loadPolyFill from "utils/polyfill"; } }, clear() { - originalConsole.clear(); - if (isFocused) $input.focus(); - $console.textContent = ""; - $console.appendChild($inputContainer); + clearConsole(); }, count(hash = "default") { originalConsole.count(hash); @@ -207,35 +298,104 @@ import loadPolyFill from "utils/polyfill"; function showConsole() { tag.get("html").append($console); $input.addEventListener("keydown", onCodeInput); + if (!isStandaloneConsole) { + bindViewportListeners(); + updateConsoleViewport(); + } + virtualMessages.invalidate(); } function hideConsole() { $console.remove(); $input.removeEventListener("keydown", onCodeInput); + unbindViewportListeners(); + } + + function bindViewportListeners() { + window.addEventListener("resize", updateConsoleViewport); + window.visualViewport?.addEventListener("resize", updateConsoleViewport); + window.visualViewport?.addEventListener("scroll", updateConsoleViewport); + if (typeof ResizeObserver === "function") { + viewportObserver = new ResizeObserver(updateConsoleViewport); + viewportObserver.observe(document.documentElement); + } + } + + function unbindViewportListeners() { + window.removeEventListener("resize", updateConsoleViewport); + window.visualViewport?.removeEventListener("resize", updateConsoleViewport); + window.visualViewport?.removeEventListener("scroll", updateConsoleViewport); + viewportObserver?.disconnect(); + viewportObserver = null; + if (viewportFrame !== null) cancelAnimationFrame(viewportFrame); + viewportFrame = null; + } + + function updateConsoleViewport() { + if (viewportFrame !== null) cancelAnimationFrame(viewportFrame); + viewportFrame = requestAnimationFrame(() => { + viewportFrame = null; + applyConsoleViewport($console); + virtualMessages.invalidate(); + }); } function onCodeInput(e) { - const key = e.key; isFocused = true; - if (key === "Enter") { - const regex = /[\[|{\(\)\}\]]/g; - let code = this.value.trim(); - let isOdd = (code.length - code.replace(regex, "").length) % 2; - - if (!code || isOdd) return; - e.preventDefault(); - e.stopPropagation(); - e.stopImmediatePropagation(); - - log("code", {}, code); - $input.value = ""; - const res = execute(code); - if (res.type === "error") { - log("error", getStack(new Error()), res.value); - } else { - log("log", getStack(new Error()), res.value); - } + if (e.key !== "Enter" || e.shiftKey) return; + + const code = $input.value.trim(); + const brackets = /[\[|{\(\)\}\]]/g; + const isIncomplete = + (code.length - code.replace(brackets, "").length) % 2 !== 0; + if (!code || isIncomplete) return; + + e.preventDefault(); + e.stopPropagation(); + e.stopImmediatePropagation(); + runInputCode(); + } + + async function runInputCode() { + const code = $input.value.trim(); + if (!code) return; + if (isExecuting) { + log("warn", {}, "Another console command is still running."); + return; + } + + log("code", {}, code); + $input.value = ""; + resizeInput(); + setExecutionState(true); + const res = await executeCommand(code); + setExecutionState(false); + + if (res.type === "error") { + log("error", getStack(new Error()), res.value); + } else { + log("log", getStack(new Error()), res.value); } + $input.focus(); + } + + function setExecutionState(running) { + isExecuting = running; + $console.toggleAttribute("running", running); + $stopExecution.hidden = !running || $executionContext.value !== "worker"; + $input.disabled = running; + $executionContext.disabled = running; + } + + function resizeInput() { + $input.style.height = "0px"; + $input.style.height = `${Math.min(120, Math.max(38, $input.scrollHeight))}px`; + } + + function clearConsole() { + originalConsole.clear(); + virtualMessages.clear(); + if (isFocused) $input.focus(); } function getBody(obj, ...keys) { @@ -454,7 +614,7 @@ import loadPolyFill from "utils/polyfill"; let $msg; if (mode === "code") { $msg = tag("c-code"); - $msg.textContent = arg.length > 50 ? arg.substring(0, 50) + "..." : arg; + $msg.textContent = arg; $msg.setAttribute("data-code", arg); $msg.setAttribute("action", "use code"); } else { @@ -486,11 +646,7 @@ import loadPolyFill from "utils/polyfill"; $messages.appendChild($stack); } - $console.insertBefore($messages, $inputContainer); - - while ($console.childElementCount > 100) { - $console.firstElementChild.remove(); - } + virtualMessages.append($messages); } /** @@ -634,6 +790,18 @@ import loadPolyFill from "utils/polyfill"; }; } + function executeCommand(code) { + return executeConsoleCommand({ + context: resolveConsoleExecutionContext( + isStandaloneConsole, + $executionContext.value, + ), + code, + workerExecutor: executor, + pageExecutor: execute, + }); + } + function execute(code) { let res = null; try { diff --git a/src/lib/consoleRuntime.js b/src/lib/consoleRuntime.js new file mode 100644 index 0000000000..383ddd0946 --- /dev/null +++ b/src/lib/consoleRuntime.js @@ -0,0 +1,186 @@ +export const DEFAULT_CONSOLE_TIMEOUT = 30000; + +/** + * Runs console commands in a worker so user code can never block the page UI. + */ +export default class ConsoleExecutor { + constructor({ + workerUrl, + timeout = DEFAULT_CONSOLE_TIMEOUT, + onConsole = () => {}, + WorkerClass = globalThis.Worker, + } = {}) { + this.workerUrl = workerUrl; + this.timeout = timeout; + this.onConsole = onConsole; + this.WorkerClass = WorkerClass; + this.worker = null; + this.pending = null; + this.nextId = 0; + } + + execute(code) { + if (this.pending) { + return Promise.resolve({ + type: "error", + value: new Error("Another console command is still running."), + }); + } + + if (!this.WorkerClass) { + return Promise.resolve({ + type: "error", + value: new Error( + "This WebView does not support isolated console execution.", + ), + }); + } + + let worker; + try { + worker = this.getWorker(); + } catch (error) { + return Promise.resolve({ type: "error", value: error }); + } + const id = ++this.nextId; + + return new Promise((resolve) => { + const timer = setTimeout(() => { + this.finish(id, { + type: "error", + value: new Error( + `Execution stopped after ${this.timeout / 1000} seconds.`, + ), + }); + this.resetWorker(); + }, this.timeout); + + this.pending = { id, resolve, timer }; + try { + worker.postMessage({ id, code }); + } catch (error) { + this.finish(id, { type: "error", value: error }); + this.resetWorker(); + } + }); + } + + getWorker() { + if (this.worker) return this.worker; + + const worker = new this.WorkerClass(this.workerUrl); + worker.onmessage = ({ data }) => this.handleMessage(data); + worker.onerror = (event) => { + const error = new Error(event.message || "Console worker failed."); + this.finish(this.pending?.id, { type: "error", value: error }); + this.resetWorker(); + }; + this.worker = worker; + return worker; + } + + handleMessage(message) { + if (message.type === "console") { + this.onConsole(message); + return; + } + + if (message.type === "result") { + this.finish(message.id, { type: "result", value: message.value }); + return; + } + + if (message.type === "error") { + const error = new Error( + message.error?.message || "Console command failed.", + ); + error.name = message.error?.name || "Error"; + if (message.error?.stack) error.stack = message.error.stack; + this.finish(message.id, { type: "error", value: error }); + } + } + + finish(id, result) { + if (!this.pending || this.pending.id !== id) return; + + const { resolve, timer } = this.pending; + this.pending = null; + clearTimeout(timer); + resolve(result); + } + + resetWorker() { + this.worker?.terminate(); + this.worker = null; + } + + cancel() { + if (!this.pending) return false; + + this.finish(this.pending.id, { + type: "error", + value: new Error("Execution stopped."), + }); + this.resetWorker(); + return true; + } + + destroy() { + if (this.pending) { + this.finish(this.pending.id, { + type: "error", + value: new Error("Console execution was cancelled."), + }); + } + this.resetWorker(); + } +} + +/** + * Returns the actually visible browser rectangle. On mobile this shrinks with + * the software keyboard even when the layout viewport remains full height. + */ +export function getConsoleViewportRect(windowObject = window) { + const viewport = windowObject.visualViewport; + const documentHeight = windowObject.document?.documentElement?.clientHeight; + const visibleHeights = [ + viewport?.height, + windowObject.innerHeight, + documentHeight, + ].filter((height) => Number.isFinite(height) && height > 0); + return { + height: Math.round(Math.min(...visibleHeights)), + width: Math.round(viewport?.width || windowObject.innerWidth), + top: Math.round(viewport?.offsetTop || 0), + left: Math.round(viewport?.offsetLeft || 0), + }; +} + +export function applyConsoleViewport(element, windowObject = window) { + const { height, width, top, left } = getConsoleViewportRect(windowObject); + element.style.setProperty("--console-viewport-height", `${height}px`); + element.style.setProperty("--console-viewport-width", `${width}px`); + element.style.setProperty("--console-viewport-top", `${top}px`); + element.style.setProperty("--console-viewport-left", `${left}px`); +} + +export function resolveConsoleExecutionContext( + isStandaloneConsole, + selectedContext, +) { + return isStandaloneConsole ? "worker" : selectedContext; +} + +/** + * Routes a console command to the isolated worker or the live preview page. + * Page execution is deliberately opt-in because it runs on the preview thread. + */ +export function executeConsoleCommand({ + context, + code, + workerExecutor, + pageExecutor, +}) { + if (context === "page") return Promise.resolve(pageExecutor(code)); + return workerExecutor.execute(code); +} diff --git a/src/lib/consoleWorker.js b/src/lib/consoleWorker.js new file mode 100644 index 0000000000..c5d911fe8c --- /dev/null +++ b/src/lib/consoleWorker.js @@ -0,0 +1,168 @@ +const MAX_MESSAGES_PER_SECOND = 100; +const MESSAGE_WINDOW_MS = 1000; +const MAX_PROPERTIES = 100; +const MAX_DEPTH = 4; +const MAX_SNAPSHOT_VALUES = 500; + +let activeCommandId = 0; +let messageWindowStartedAt = 0; +let emittedInWindow = 0; +let suppressedInWindow = 0; +const counts = new Map(); +const timers = new Map(); + +function snapshot( + value, + depth = 0, + seen = new WeakSet(), + budget = { remaining: MAX_SNAPSHOT_VALUES }, +) { + const type = typeof value; + + if ( + value === null || + ["boolean", "number", "string", "undefined"].includes(type) + ) { + return value; + } + if (type === "bigint") return `${value}n`; + if (type === "symbol") return value.toString(); + if (type === "function") + return `[Function${value.name ? `: ${value.name}` : ""}]`; + if (budget.remaining-- <= 0) return "[Truncated]"; + if (value instanceof Error) return snapshotError(value); + if (value instanceof Date) return value.toISOString(); + if (value instanceof RegExp) return value.toString(); + if (value instanceof Promise) return "Promise { }"; + if (depth >= MAX_DEPTH) return `[${value.constructor?.name || "Object"}]`; + if (seen.has(value)) return "[Circular]"; + + seen.add(value); + if (Array.isArray(value)) { + const result = value + .slice(0, MAX_PROPERTIES) + .map((item) => snapshot(item, depth + 1, seen, budget)); + if (value.length > MAX_PROPERTIES) result.push("…"); + return result; + } + + const result = {}; + let keys; + try { + keys = Reflect.ownKeys(value).slice(0, MAX_PROPERTIES); + } catch (error) { + return `[Uninspectable: ${error.message}]`; + } + + for (const key of keys) { + const outputKey = typeof key === "symbol" ? key.toString() : key; + try { + result[outputKey] = snapshot(value[key], depth + 1, seen, budget); + } catch (error) { + result[outputKey] = `[Thrown: ${error.message}]`; + } + } + if (Reflect.ownKeys(value).length > MAX_PROPERTIES) result["…"] = "…"; + return result; +} + +function snapshotError(error) { + return { + name: error?.name || "Error", + message: error?.message || String(error), + stack: error?.stack || "", + }; +} + +function discardSuppressedMessages() { + suppressedInWindow = 0; +} + +function emitMessage(message) { + const now = performance.now(); + if (now - messageWindowStartedAt >= MESSAGE_WINDOW_MS) { + discardSuppressedMessages(); + messageWindowStartedAt = now; + emittedInWindow = 0; + } + + if (emittedInWindow >= MAX_MESSAGES_PER_SECOND) { + suppressedInWindow++; + return; + } + + emittedInWindow++; + self.postMessage({ type: "console", id: activeCommandId, ...message }); +} + +function emit(level, args) { + emitMessage({ + level, + args: args.map((value) => snapshot(value)), + }); +} + +self.console = { + assert(condition, ...args) { + if (!condition) emit("error", args.length ? args : ["Assertion failed"]); + }, + clear() { + emitMessage({ action: "clear" }); + }, + count(label = "default") { + const value = (counts.get(label) || 0) + 1; + counts.set(label, value); + emit("log", [`${label}: ${value}`]); + }, + countReset(label = "default") { + counts.delete(label); + }, + debug: (...args) => emit("log", args), + dir: (...args) => emit("log", args), + dirxml: (...args) => emit("log", args), + error: (...args) => emit("error", args), + group: (...args) => emit("log", args), + groupCollapsed: (...args) => emit("log", args), + groupEnd() {}, + info: (...args) => emit("info", args), + log: (...args) => emit("log", args), + table: (...args) => emit("table", args), + time(label = "default") { + timers.set(label, performance.now()); + }, + timeEnd(label = "default") { + if (!timers.has(label)) return emit("warn", [`No such label: ${label}`]); + emit("log", [ + `${label}: ${(performance.now() - timers.get(label)).toFixed(2)}ms`, + ]); + timers.delete(label); + }, + timeLog(label = "default") { + if (!timers.has(label)) return emit("warn", [`No such label: ${label}`]); + emit("log", [ + `${label}: ${(performance.now() - timers.get(label)).toFixed(2)}ms`, + ]); + }, + trace(...args) { + emit("trace", [...args, new Error().stack]); + }, + warn: (...args) => emit("warn", args), +}; + +self.onmessage = ({ data: { id, code } }) => { + activeCommandId = id; + messageWindowStartedAt = performance.now(); + emittedInWindow = 0; + suppressedInWindow = 0; + + try { + // Intentional: this local REPL runs the command in its isolated worker. + // codeql[js/code-injection] + const value = (0, eval)(code); + discardSuppressedMessages(); + self.postMessage({ type: "result", id, value: snapshot(value) }); + } catch (error) { + discardSuppressedMessages(); + self.postMessage({ type: "error", id, error: snapshotError(error) }); + } +}; diff --git a/src/lib/run.js b/src/lib/run.js index 7978c4b6a7..a92a085c52 100644 --- a/src/lib/run.js +++ b/src/lib/run.js @@ -72,6 +72,7 @@ async function run( let EXECUTING_SCRIPT = uuid + "_script.js"; const MIMETYPE_HTML = mimeType.lookup("html"); const CONSOLE_SCRIPT = uuid + "_console.js"; + const CONSOLE_WORKER_SCRIPT = uuid + "_console_worker.js"; const MARKDOWN_STYLE = uuid + "_md.css"; const queue = []; @@ -205,6 +206,11 @@ async function run( sendFileContent(url, reqId, "application/javascript"); break; + case CONSOLE_WORKER_SCRIPT: + url = `${ASSETS_DIRECTORY}/build/consoleWorker.js`; + sendFileContent(url, reqId, "application/javascript"); + break; + case EXECUTING_SCRIPT: { const text = getDocText(activeFile?.session?.doc); sendText(text, reqId, "application/javascript"); @@ -228,6 +234,7 @@ async function run( sendText( mustache.render($_console, { CONSOLE_SCRIPT, + CONSOLE_WORKER_SCRIPT, EXECUTING_SCRIPT, }), reqId, @@ -384,7 +391,8 @@ async function run( * @param {string} id */ function sendHTML(text, id) { - const js = ` + const js = ` + + - \ No newline at end of file + diff --git a/tests/unit/consoleExecutionContext.test.js b/tests/unit/consoleExecutionContext.test.js new file mode 100644 index 0000000000..ab92a29872 --- /dev/null +++ b/tests/unit/consoleExecutionContext.test.js @@ -0,0 +1,52 @@ +import { describe, expect, it } from "vitest"; +import { + executeConsoleCommand, + resolveConsoleExecutionContext, +} from "lib/consoleRuntime"; + +describe("console execution context", () => { + it("forces standalone menu consoles to use the worker", () => { + expect(resolveConsoleExecutionContext(true, "page")).toBe("worker"); + expect(resolveConsoleExecutionContext(false, "page")).toBe("page"); + }); + + it("uses isolated worker execution by default", async () => { + const calls = []; + const result = await executeConsoleCommand({ + context: "worker", + code: "document.title", + workerExecutor: { + execute(code) { + calls.push(["worker", code]); + return Promise.resolve({ type: "result", value: "isolated" }); + }, + }, + pageExecutor(code) { + calls.push(["page", code]); + }, + }); + + expect(calls).toEqual([["worker", "document.title"]]); + expect(result.value).toBe("isolated"); + }); + + it("restores live page execution when explicitly selected", async () => { + const calls = []; + const result = await executeConsoleCommand({ + context: "page", + code: 'document.querySelector("main")', + workerExecutor: { + execute(code) { + calls.push(["worker", code]); + }, + }, + pageExecutor(code) { + calls.push(["page", code]); + return { type: "result", value: "live page" }; + }, + }); + + expect(calls).toEqual([["page", 'document.querySelector("main")']]); + expect(result.value).toBe("live page"); + }); +}); diff --git a/tests/unit/consoleExecutor.test.js b/tests/unit/consoleExecutor.test.js new file mode 100644 index 0000000000..7dcd45e645 --- /dev/null +++ b/tests/unit/consoleExecutor.test.js @@ -0,0 +1,134 @@ +import { beforeEach, describe, expect, it, vi } from "vitest"; +import ConsoleExecutor from "lib/consoleRuntime"; + +class FakeWorker { + static instances = []; + + constructor(url) { + this.url = url; + this.terminate = vi.fn(); + this.postMessage = vi.fn(); + FakeWorker.instances.push(this); + } + + respond(data) { + this.onmessage({ data }); + } +} + +describe("ConsoleExecutor", () => { + beforeEach(() => { + FakeWorker.instances = []; + vi.useRealTimers(); + }); + + it("returns a worker result and reuses the isolated context", async () => { + const executor = new ConsoleExecutor({ + workerUrl: "/console-worker.js", + WorkerClass: FakeWorker, + }); + + const firstResult = executor.execute("1 + 1"); + const worker = FakeWorker.instances[0]; + expect(worker.url).toBe("/console-worker.js"); + expect(worker.postMessage).toHaveBeenCalledWith({ id: 1, code: "1 + 1" }); + + worker.respond({ type: "result", id: 1, value: 2 }); + await expect(firstResult).resolves.toEqual({ type: "result", value: 2 }); + + const secondResult = executor.execute("3 + 4"); + expect(FakeWorker.instances).toHaveLength(1); + worker.respond({ type: "result", id: 2, value: 7 }); + await expect(secondResult).resolves.toEqual({ type: "result", value: 7 }); + }); + + it("forwards console messages from the worker", async () => { + const onConsole = vi.fn(); + const executor = new ConsoleExecutor({ + workerUrl: "/console-worker.js", + WorkerClass: FakeWorker, + onConsole, + }); + + const result = executor.execute("console.log('hello')"); + const worker = FakeWorker.instances[0]; + const message = { + type: "console", + id: 1, + level: "log", + args: ["hello"], + }; + worker.respond(message); + worker.respond({ type: "result", id: 1 }); + + expect(onConsole).toHaveBeenCalledWith(message); + await expect(result).resolves.toEqual({ type: "result", value: undefined }); + }); + + it("terminates and replaces a worker when execution times out", async () => { + vi.useFakeTimers(); + const executor = new ConsoleExecutor({ + workerUrl: "/console-worker.js", + WorkerClass: FakeWorker, + timeout: 50, + }); + + const timedOutResult = executor.execute("while (true) {}"); + const blockedWorker = FakeWorker.instances[0]; + await vi.advanceTimersByTimeAsync(50); + + const result = await timedOutResult; + expect(result.type).toBe("error"); + expect(result.value.message).toBe("Execution stopped after 0.05 seconds."); + expect(blockedWorker.terminate).toHaveBeenCalledOnce(); + + const nextResult = executor.execute("42"); + expect(FakeWorker.instances).toHaveLength(2); + FakeWorker.instances[1].respond({ type: "result", id: 2, value: 42 }); + await expect(nextResult).resolves.toEqual({ type: "result", value: 42 }); + }); + + it("allows a running command to be stopped immediately", async () => { + const executor = new ConsoleExecutor({ + workerUrl: "/console-worker.js", + WorkerClass: FakeWorker, + }); + + const stoppedResult = executor.execute("while (true) {}"); + const blockedWorker = FakeWorker.instances[0]; + + expect(executor.cancel()).toBe(true); + await expect(stoppedResult).resolves.toMatchObject({ + type: "error", + value: { message: "Execution stopped." }, + }); + expect(blockedWorker.terminate).toHaveBeenCalledOnce(); + expect(executor.cancel()).toBe(false); + }); + + it("turns worker errors into console errors", async () => { + const executor = new ConsoleExecutor({ + workerUrl: "/console-worker.js", + WorkerClass: FakeWorker, + }); + + const result = executor.execute("missingName"); + FakeWorker.instances[0].respond({ + type: "error", + id: 1, + error: { + name: "ReferenceError", + message: "missingName is not defined", + stack: "worker stack", + }, + }); + + const errorResult = await result; + expect(errorResult.type).toBe("error"); + expect(errorResult.value).toMatchObject({ + name: "ReferenceError", + message: "missingName is not defined", + stack: "worker stack", + }); + }); +}); diff --git a/tests/unit/consoleViewport.test.js b/tests/unit/consoleViewport.test.js new file mode 100644 index 0000000000..218a5bad69 --- /dev/null +++ b/tests/unit/consoleViewport.test.js @@ -0,0 +1,41 @@ +// @vitest-environment happy-dom + +import { describe, expect, it } from "vitest"; +import { + applyConsoleViewport, + getConsoleViewportRect, +} from "lib/consoleRuntime"; + +describe("console visual viewport", () => { + it("uses the visual viewport when the mobile keyboard shrinks the screen", () => { + const windowObject = { + innerHeight: 800, + innerWidth: 400, + visualViewport: { + height: 476.4, + width: 400, + offsetTop: 12.2, + offsetLeft: 0, + }, + }; + + expect(getConsoleViewportRect(windowObject)).toEqual({ + height: 476, + width: 400, + top: 12, + left: 0, + }); + + const element = document.createElement("div"); + applyConsoleViewport(element, windowObject); + expect(element.style.getPropertyValue("--console-viewport-height")).toBe( + "476px", + ); + }); + + it("falls back to the layout viewport", () => { + expect( + getConsoleViewportRect({ innerHeight: 720, innerWidth: 360 }), + ).toEqual({ height: 720, width: 360, top: 0, left: 0 }); + }); +}); diff --git a/tests/unit/variableVirtualList.test.js b/tests/unit/variableVirtualList.test.js new file mode 100644 index 0000000000..ed1e0c70d7 --- /dev/null +++ b/tests/unit/variableVirtualList.test.js @@ -0,0 +1,194 @@ +// @vitest-environment happy-dom + +import { describe, expect, it } from "vitest"; +import VariableVirtualList from "components/virtualList/variable"; + +function createList() { + const container = document.createElement("div"); + Object.defineProperty(container, "clientHeight", { + configurable: true, + value: 200, + }); + document.body.append(container); + return { container, list: new VariableVirtualList(container) }; +} + +describe("VariableVirtualList", () => { + it("retains all items while mounting only the viewport window", () => { + const { container, list } = createList(); + const elements = Array.from({ length: 1000 }, (_, index) => { + const element = document.createElement("div"); + element.textContent = `message-${index}`; + list.append(element); + return element; + }); + + list.render(); + + expect(list.length).toBe(1000); + expect(list.mountedCount).toBeLessThan(40); + expect(elements[999].isConnected).toBe(true); + expect(elements[0].isConnected).toBe(false); + + list.stickToBottom = false; + container.scrollTop = 0; + list.render(); + expect(elements[0].isConnected).toBe(true); + expect(elements[999].isConnected).toBe(false); + + list.destroy(); + container.remove(); + }); + + it("updates variable measurements and clears the retained model", () => { + const { container, list } = createList(); + const element = document.createElement("div"); + list.append(element); + list.render(); + + list.updateHeight(list.items[0], 96); + list.rebuildOffsets(); + expect(list.offsets).toEqual([0, 96]); + + list.clear(); + expect(list.length).toBe(0); + expect(list.mountedCount).toBe(0); + expect(container.scrollTop).toBe(0); + + list.destroy(); + container.remove(); + }); + + it("preserves an inline footer outside the virtualized rows", () => { + const container = document.createElement("div"); + Object.defineProperty(container, "clientHeight", { + configurable: true, + value: 200, + }); + document.body.append(container); + const footer = document.createElement("form"); + footer.textContent = "REPL prompt"; + const list = new VariableVirtualList(container, { footer }); + + list.append(document.createElement("div")); + list.render(); + expect(container.lastElementChild).toBe(footer); + + list.clear(); + expect(container.lastElementChild).toBe(footer); + expect(footer.isConnected).toBe(true); + + list.destroy(); + container.remove(); + }); + + it("includes the footer height when pinning and rendering the bottom", () => { + const container = document.createElement("div"); + Object.defineProperties(container, { + clientHeight: { configurable: true, value: 200 }, + scrollHeight: { configurable: true, value: 5304 }, + }); + document.body.append(container); + const footer = document.createElement("form"); + footer.getBoundingClientRect = () => ({ height: 104 }); + const list = new VariableVirtualList(container, { + footer, + overscan: 0, + }); + for (let index = 0; index < 100; index++) { + list.append(document.createElement("div")); + } + + list.render(); + + expect(list.renderedRange.start).toBe(98); + expect(list.renderedRange.end).toBe(100); + expect(container.scrollTop).toBe(5104); + expect(container.lastElementChild).toBe(footer); + + list.destroy(); + container.remove(); + }); + + it("keeps a pinned footer visible when the viewport height changes", () => { + let viewportHeight = 200; + const container = document.createElement("div"); + Object.defineProperties(container, { + clientHeight: { + configurable: true, + get: () => viewportHeight, + }, + scrollHeight: { configurable: true, value: 5304 }, + }); + document.body.append(container); + const footer = document.createElement("form"); + footer.getBoundingClientRect = () => ({ height: 104 }); + const list = new VariableVirtualList(container, { footer }); + for (let index = 0; index < 100; index++) { + list.append(document.createElement("div")); + } + list.render(); + expect(container.scrollTop).toBe(5104); + + viewportHeight = 100; + list.onResize([ + { + target: container, + contentRect: { height: viewportHeight }, + }, + ]); + list.render(); + + expect(list.stickToBottom).toBe(true); + expect(container.scrollTop).toBe(5204); + + list.destroy(); + container.remove(); + }); + + it("pre-paints a larger guard before touch momentum starts", () => { + const { container, list } = createList(); + for (let index = 0; index < 1000; index++) { + list.append(document.createElement("div")); + } + list.stickToBottom = false; + container.scrollTop = 10000; + list.render(); + const idleCount = list.mountedCount; + + container.dispatchEvent(new Event("touchstart")); + + expect(list.dynamicOverscan).toBe(list.activeOverscan); + expect(list.mountedCount).toBeGreaterThan(idleCount); + + list.destroy(); + container.remove(); + }); + + it("keeps overlapping rows mounted during incremental scrolling", () => { + const { container, list } = createList(); + Object.defineProperty(container, "scrollHeight", { + configurable: true, + value: 10400, + }); + const elements = Array.from({ length: 200 }, () => { + const element = document.createElement("div"); + list.append(element); + return element; + }); + list.stickToBottom = false; + container.scrollTop = 520; + list.render(); + const retained = elements[10]; + expect(retained.isConnected).toBe(true); + + container.scrollTop = 624; + container.dispatchEvent(new Event("scroll")); + + expect(retained.isConnected).toBe(true); + expect(list.dynamicOverscan).toBeGreaterThan(list.overscan); + + list.destroy(); + container.remove(); + }); +}); diff --git a/webpack.config.js b/webpack.config.js index 8767eaa8f6..2fbead728b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -110,6 +110,7 @@ module.exports = (env, options) => { entry: { main: './src/main.js', console: './src/lib/console.js', + consoleWorker: './src/lib/consoleWorker.js', searchInFilesWorker: './src/sidebarApps/searchInFiles/worker.js', searchIndexWorker: './src/sidebarApps/searchInFiles/indexWorker.js', }, From 99bf969fedf4fa0c3a317e92732dd84c72e7b082 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Wed, 26 Aug 2026 14:40:34 +0000 Subject: [PATCH 072/195] feat(console): follow active Acode theme (#2814) * feat(console): follow active Acode theme * fix * fix --- src/lib/console.js | 53 +++++++++++++++ src/lib/run.js | 26 ++++++++ src/styles/console.m.scss | 131 +++++++++++++++++++++++++++++--------- src/views/console.hbs | 10 +-- 4 files changed, 186 insertions(+), 34 deletions(-) diff --git a/src/lib/console.js b/src/lib/console.js index 8d399ea315..05ca41fa6a 100644 --- a/src/lib/console.js +++ b/src/lib/console.js @@ -18,7 +18,13 @@ import ConsoleExecutor, { let isExecuting = false; let viewportFrame = null; let viewportObserver = null; + let themeSyncTimer = null; + let themeSyncPending = false; + let themeSignature = null; const isStandaloneConsole = sessionStorage.getItem("__mode") === "console"; + const themeEndpoint = document.querySelector( + 'meta[name="acode-console-theme-endpoint"]', + )?.content; const originalConsole = console; const $input = tag("textarea", { id: "__c-input", @@ -149,6 +155,10 @@ import ConsoleExecutor, { if (isStandaloneConsole) { $console.setAttribute("standalone", ""); document.documentElement.setAttribute("console-only", ""); + startThemeSync(); + window.addEventListener("pagehide", stopThemeSync, { + once: true, + }); } const counter = {}; const timers = {}; @@ -183,6 +193,49 @@ import ConsoleExecutor, { document.addEventListener("hideconsole", hideConsole); } + function startThemeSync() { + if (!themeEndpoint || themeSyncTimer !== null) return; + void syncTheme(); + themeSyncTimer = setInterval(syncTheme, 1000); + } + + function stopThemeSync() { + if (themeSyncTimer === null) return; + clearInterval(themeSyncTimer); + themeSyncTimer = null; + } + + async function syncTheme() { + if (themeSyncPending) return; + themeSyncPending = true; + + try { + const response = await fetch(themeEndpoint, { cache: "no-store" }); + if (!response.ok) return; + const snapshot = await response.json(); + if (typeof snapshot.css !== "string") return; + + const signature = JSON.stringify([snapshot.type, snapshot.css]); + if (signature === themeSignature) return; + + let $theme = document.getElementById("console-live-theme"); + if (!$theme) { + $theme = tag("style", { id: "console-live-theme" }); + document.head.append($theme); + } + $theme.textContent = snapshot.css; + document.documentElement.setAttribute( + "theme-type", + snapshot.type === "light" ? "light" : "dark", + ); + themeSignature = signature; + } catch { + // Keep the last valid theme if the local endpoint is briefly unavailable. + } finally { + themeSyncPending = false; + } + } + function touchmove(e) { e.preventDefault(); $toggler.style.transform = "translate(" diff --git a/src/lib/run.js b/src/lib/run.js index a92a085c52..d130c11bae 100644 --- a/src/lib/run.js +++ b/src/lib/run.js @@ -22,6 +22,9 @@ import appSettings from "./settings"; /**@type {Server} */ let webServer; +// An open console may outlive the server instance that created it. +const CONSOLE_THEME_STATE = "__acode_console_theme.json"; + /** * Starts the server and run the active file in browser * @param {Boolean} isConsole @@ -73,6 +76,7 @@ async function run( const MIMETYPE_HTML = mimeType.lookup("html"); const CONSOLE_SCRIPT = uuid + "_console.js"; const CONSOLE_WORKER_SCRIPT = uuid + "_console_worker.js"; + const CONSOLE_THEME_STYLE = uuid + "_console_theme.css"; const MARKDOWN_STYLE = uuid + "_md.css"; const queue = []; @@ -211,6 +215,18 @@ async function run( sendFileContent(url, reqId, "application/javascript"); break; + case CONSOLE_THEME_STYLE: + sendText(getConsoleThemeSnapshot().css, reqId, "text/css"); + break; + + case CONSOLE_THEME_STATE: + sendText( + JSON.stringify(getConsoleThemeSnapshot()), + reqId, + "application/json", + ); + break; + case EXECUTING_SCRIPT: { const text = getDocText(activeFile?.session?.doc); sendText(text, reqId, "application/javascript"); @@ -235,7 +251,10 @@ async function run( mustache.render($_console, { CONSOLE_SCRIPT, CONSOLE_WORKER_SCRIPT, + CONSOLE_THEME_STYLE, + CONSOLE_THEME_STATE, EXECUTING_SCRIPT, + APP_THEME_TYPE: getConsoleThemeSnapshot().type, }), reqId, MIMETYPE_HTML, @@ -364,6 +383,13 @@ async function run( } } + function getConsoleThemeSnapshot() { + return { + css: document.head.querySelector("style#app-theme")?.textContent || "", + type: document.body.getAttribute("theme-type") || "dark", + }; + } + /** * Sends 404 error * @param {string} id diff --git a/src/styles/console.m.scss b/src/styles/console.m.scss index 47dbe4dbb8..e39f763605 100644 --- a/src/styles/console.m.scss +++ b/src/styles/console.m.scss @@ -4,10 +4,31 @@ html[console-only] body { height: 100%; margin: 0; overflow: hidden; - background: #313131 !important; + background: var(--primary-color, #313131) !important; } c-console { + --console-background: #313131; + --console-background-text: #eee; + --console-surface: #313131; + --console-surface-text: #eee; + --console-control: #414141; + --console-control-text: #d6d3d3; + --console-active: #555; + --console-active-text: #fff; + --console-border: rgba(204, 204, 204, 0.35); + --console-muted: #aaa; + --console-placeholder: #929292; + --console-scrollbar: #666; + --console-danger: #ff9b9b; + --console-danger-fill: #a00000; + --console-warning-fill: #ffb95c; + --console-error-surface: #422; + --console-warning-surface: #633; + --console-link: #99f; + --console-accent: rgb(120, 105, 225); + --console-function: rgb(145, 136, 168); + --console-success: rgb(59, 161, 59); box-sizing: border-box; display: flex; flex-direction: column; @@ -19,12 +40,47 @@ c-console { min-height: 0; overflow: hidden; z-index: 99998; - background: #313131; - color: #eee; + background: var(--console-background); + color: var(--console-background-text); font-family: var(--app-font-family, Verdana, Geneva, Tahoma, sans-serif); color-scheme: dark; } +html[console-only] c-console { + --console-background: var(--primary-color, #313131); + --console-background-text: var(--primary-text-color, #eee); + --console-surface: var(--secondary-color, var(--primary-color, #313131)); + --console-surface-text: var( + --secondary-text-color, + var(--primary-text-color, #eee) + ); + --console-control: var( + --popup-background-color, + var(--secondary-color, #414141) + ); + --console-control-text: var( + --popup-text-color, + var(--secondary-text-color, #d6d3d3) + ); + --console-active: var(--active-color, #555); + --console-active-text: var(--active-text-color, #fff); + --console-border: var(--border-color, rgba(204, 204, 204, 0.35)); + --console-muted: var(--secondary-text-color, #aaa); + --console-placeholder: var(--secondary-text-color, #929292); + --console-scrollbar: var(--scrollbar-color, #666); + --console-danger: var(--error-text-color, #ff9b9b); + --console-danger-fill: var(--danger-color, #a00000); + --console-warning-fill: var(--error-text-color, #ffb95c); + --console-link: var(--link-text-color, #99f); + --console-accent: var(--active-color, rgb(120, 105, 225)); + --console-function: var(--secondary-text-color, rgb(145, 136, 168)); + --console-success: var(--success-text-color, rgb(59, 161, 59)); +} + +html[theme-type="light"] c-console { + color-scheme: light; +} + // The console-only Activity already resizes its WebView for the keyboard. // Filling that layout directly avoids stale visualViewport pixels after the // keyboard closes; the floating page overlay still uses measured CSS variables. @@ -41,18 +97,19 @@ c-console[standalone] { border: 0; border-radius: 3px; background: transparent; - color: #d6d3d3; + color: var(--console-surface-text); font: inherit; font-size: 0.76rem; touch-action: manipulation; } .__c-action:active { - background: #555; + background: var(--console-active); + color: var(--console-active-text); } .__c-action-danger { - color: #ff9b9b; + color: var(--console-danger); } .__c-context { @@ -63,14 +120,14 @@ c-console[standalone] { border: 0; border-radius: 3px; outline: none; - background: #414141; - color: #d6d3d3; + background: var(--console-control); + color: var(--console-control-text); font: inherit; font-size: 0.7rem; } .__c-context:focus-visible { - outline: 1px solid #929292; + outline: 1px solid var(--console-active); outline-offset: -1px; } @@ -85,7 +142,7 @@ c-output { overflow: auto; overscroll-behavior: contain; scrollbar-width: thin; - scrollbar-color: #666 transparent; + scrollbar-color: var(--console-scrollbar) transparent; } c-output > .variable-virtual-spacer, @@ -102,14 +159,15 @@ c-input { width: 100%; min-height: 96px; padding: 7px 7px max(8px, env(safe-area-inset-bottom)); - background: #313131; + background: var(--console-surface); + color: var(--console-surface-text); } c-input::before { content: ">>"; align-self: flex-start; padding-top: 9px; - color: #d6d3d3; + color: var(--console-accent); font: italic 13px/1 "Courier New", Courier, monospace; } @@ -128,7 +186,7 @@ c-input::before { resize: none; overflow-y: auto; background: transparent; - color: #fff; + color: var(--console-surface-text); caret-color: currentColor !important; font: 13px/1.45 "Courier New", Courier, monospace; } @@ -142,7 +200,8 @@ c-input-actions { } #__c-input::placeholder { - color: #929292; + color: var(--console-placeholder); + opacity: 0.75; } #__c-input:disabled { @@ -156,17 +215,28 @@ c-message { flex-wrap: wrap; min-height: 45px; padding: 5px 7px 4px; - border-bottom: 1px solid rgba(204, 204, 204, 0.35); - background: #313131; + border-bottom: 1px solid var(--console-border); + background: var(--console-surface); + color: var(--console-surface-text); font-size: 0.9rem; } c-message[log-level="error"] { - background: #422; + background: var(--console-error-surface); + background: color-mix( + in srgb, + var(--console-danger-fill) 16%, + var(--console-surface) + ); } c-message[log-level="warn"] { - background: #633; + background: var(--console-warning-surface); + background: color-mix( + in srgb, + var(--console-warning-fill) 20%, + var(--console-surface) + ); } c-text, @@ -185,7 +255,7 @@ c-code { position: relative; padding-right: 42px; overflow-x: auto; - color: #d6d3d3; + color: var(--console-surface-text); font-family: "Courier New", Courier, monospace; white-space: pre-wrap; cursor: pointer; @@ -204,8 +274,8 @@ c-code::after { right: 1px; padding: 1px 6px; border-radius: 3px; - background: #666; - color: inherit; + background: var(--console-active); + color: var(--console-active-text); font: 0.62rem/1.4 var(--app-font-family, sans-serif); } @@ -218,7 +288,8 @@ c-stack { min-width: 0; margin-top: 3px; padding: 3px 4px 0; - color: #aaa; + color: var(--console-muted); + opacity: 0.8; font-size: 0.7rem; } @@ -236,7 +307,7 @@ c-trace { } c-object { - color: #99f; + color: var(--console-link); text-decoration: underline; } @@ -246,28 +317,28 @@ c-line { c-key { margin-right: 5px; - color: #c6f; + color: var(--console-accent); font-size: 0.9rem; } c-text.__c-boolean, c-text.__c-number, c-text.__c-symbol { - color: rgb(120, 105, 225); + color: var(--console-accent); } c-text.__c-function { - color: rgb(145, 136, 168); + color: var(--console-function); font-family: "Courier New", Courier, monospace; } c-text.__c-object, c-text.__c-undefined { - color: rgb(118, 163, 118); + color: var(--console-success); } c-text.__c-string { - color: rgb(59, 161, 59); + color: var(--console-success); } c-text.__c-string:not(.no-quotes)::before { @@ -316,12 +387,12 @@ c-table { display: table; width: 100%; border-collapse: collapse; - color: #d6d3d3; + color: var(--console-surface-text); } c-table c-row { display: table-row; - border-bottom: 1px solid rgba(204, 204, 204, 0.4); + border-bottom: 1px solid var(--console-border); } c-table c-cell { diff --git a/src/views/console.hbs b/src/views/console.hbs index b4589af735..40068d74c8 100644 --- a/src/views/console.hbs +++ b/src/views/console.hbs @@ -1,9 +1,11 @@ - + - + + + Console - - + + From 47f45b8c02ff2755b89aefb1dc0c42176985671f Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Wed, 26 Aug 2026 20:55:52 +0530 Subject: [PATCH 073/195] chore: update deps --- bun.lock | 50 +++++++++++++++++++++++++++++++++-------------- package-lock.json | 48 ++++++++++++++++++++++----------------------- package.json | 18 ++++++++--------- 3 files changed, 68 insertions(+), 48 deletions(-) diff --git a/bun.lock b/bun.lock index 33528b9faf..a52d31d962 100644 --- a/bun.lock +++ b/bun.lock @@ -6,12 +6,12 @@ "name": "com.foxdebug.acode", "dependencies": { "@codemirror/autocomplete": "^6.20.3", - "@codemirror/commands": "^6.10.3", + "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", "@codemirror/lang-cpp": "^6.0.3", "@codemirror/lang-css": "^6.3.1", "@codemirror/lang-go": "^6.0.1", - "@codemirror/lang-html": "^6.4.11", + "@codemirror/lang-html": "^6.4.12", "@codemirror/lang-java": "^6.0.2", "@codemirror/lang-javascript": "^6.2.5", "@codemirror/lang-jinja": "^6.0.1", @@ -28,15 +28,15 @@ "@codemirror/lang-wast": "^6.0.2", "@codemirror/lang-xml": "^6.1.0", "@codemirror/lang-yaml": "^6.1.3", - "@codemirror/language": "^6.12.3", + "@codemirror/language": "^6.12.4", "@codemirror/language-data": "^6.5.2", "@codemirror/legacy-modes": "^6.5.3", "@codemirror/lint": "^6.9.7", "@codemirror/lsp-client": "github:Acode-Foundation/codemirror-lsp-client#db6930c2b6db67e14978f08ae8f5aeb149d29468", "@codemirror/search": "^6.7.1", - "@codemirror/state": "^6.6.0", + "@codemirror/state": "^6.7.1", "@codemirror/theme-one-dark": "^6.1.3", - "@codemirror/view": "^6.43.4", + "@codemirror/view": "^6.43.9", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", "@lezer/common": "^1.5.0", @@ -147,12 +147,12 @@ }, "overrides": { "@codemirror/autocomplete": "^6.20.3", - "@codemirror/commands": "^6.10.3", - "@codemirror/language": "^6.12.3", + "@codemirror/commands": "^6.11.0", + "@codemirror/language": "^6.12.4", "@codemirror/lint": "^6.9.7", "@codemirror/search": "^6.7.1", - "@codemirror/state": "^6.6.0", - "@codemirror/view": "^6.43.4", + "@codemirror/state": "^6.7.1", + "@codemirror/view": "^6.43.9", "tar": "^7.5.22", }, "packages": { @@ -374,7 +374,7 @@ "@codemirror/autocomplete": ["@codemirror/autocomplete@6.20.3", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0" } }, "sha512-tlosUqb+3BbxCxZdu4tKeRghPFC+QM7q4X5YhKV2eCmPG+1r2F3f4AaSz5sCrFqUtX4Jh20VFTKecl16MgiV9g=="], - "@codemirror/commands": ["@codemirror/commands@6.10.3", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.6.0", "@codemirror/view": "^6.27.0", "@lezer/common": "^1.1.0" } }, "sha512-JFRiqhKu+bvSkDLI+rUhJwSxQxYb759W5GBezE8Uc8mHLqC9aV/9aTC7yJSqCtB3F00pylrLCwnyS91Ap5ej4Q=="], + "@codemirror/commands": ["@codemirror/commands@6.11.0", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.7.0", "@codemirror/view": "^6.27.0", "@lezer/common": "^1.1.0" } }, "sha512-/K4Rl5BN0OtTiPWmJCdqODu38XnDMsDxKY5rgrPnCkutPTJf2wVbkoixLfealF5Kwse/s8P8M5jAiURiwSwnFA=="], "@codemirror/lang-angular": ["@codemirror/lang-angular@0.1.4", "", { "dependencies": { "@codemirror/lang-html": "^6.0.0", "@codemirror/lang-javascript": "^6.1.2", "@codemirror/language": "^6.0.0", "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.3.3" } }, "sha512-oap+gsltb/fzdlTQWD6BFF4bSLKcDnlxDsLdePiJpCVNKWXSTAbiiQeYI3UmES+BLAdkmIC1WjyztC1pi/bX4g=="], @@ -384,7 +384,7 @@ "@codemirror/lang-go": ["@codemirror/lang-go@6.0.1", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/state": "^6.0.0", "@lezer/common": "^1.0.0", "@lezer/go": "^1.0.0" } }, "sha512-7fNvbyNylvqCphW9HD6WFnRpcDjr+KXX/FgqXy5H5ZS0eC5edDljukm/yNgYkwTsgp2busdod50AOTIy6Jikfg=="], - "@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + "@codemirror/lang-html": ["@codemirror/lang-html@6.4.12", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-pw2ReWKUqSkbvh76RAT4NYxiogRu+PWkR2ukAwO9uOgrm8uipkzjtKKtNpyeAQwHOqxEeSvAXZ6vr3AfyB9y/w=="], "@codemirror/lang-java": ["@codemirror/lang-java@6.0.2", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@lezer/java": "^1.0.0" } }, "sha512-m5Nt1mQ/cznJY7tMfQTJchmrjdjQ71IDs+55d1GAa8DGaB8JXWsVCkVT284C3RTASaY43YknrK2X3hPO/J3MOQ=="], @@ -418,7 +418,7 @@ "@codemirror/lang-yaml": ["@codemirror/lang-yaml@6.1.3", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.2.0", "@lezer/lr": "^1.0.0", "@lezer/yaml": "^1.0.0" } }, "sha512-AZ8DJBuXGVHybpBQhmZtgew5//4hv3tdkXnr3vDmOUMJRuB6vn/uuwtmTOTlqEaQFg3hQSVeA90NmvIQyUV6FQ=="], - "@codemirror/language": ["@codemirror/language@6.12.3", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.23.0", "@lezer/common": "^1.5.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", "style-mod": "^4.0.0" } }, "sha512-QwCZW6Tt1siP37Jet9Tb02Zs81TQt6qQrZR2H+eGMcFsL1zMrk2/b9CLC7/9ieP1fjIUMgviLWMmgiHoJrj+ZA=="], + "@codemirror/language": ["@codemirror/language@6.12.4", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.23.0", "@lezer/common": "^1.5.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", "style-mod": "^4.0.0" } }, "sha512-1q4PaT+o6PbgpkJt4Q8Fv5XJxTy4FUZ4MWETtyiDw3J0Pyr9E2vqcKL+k9wcvjNTIsauxvE7OfmWj3FRPHQ76A=="], "@codemirror/language-data": ["@codemirror/language-data@6.5.2", "", { "dependencies": { "@codemirror/lang-angular": "^0.1.0", "@codemirror/lang-cpp": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-go": "^6.0.0", "@codemirror/lang-html": "^6.0.0", "@codemirror/lang-java": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/lang-jinja": "^6.0.0", "@codemirror/lang-json": "^6.0.0", "@codemirror/lang-less": "^6.0.0", "@codemirror/lang-liquid": "^6.0.0", "@codemirror/lang-markdown": "^6.0.0", "@codemirror/lang-php": "^6.0.0", "@codemirror/lang-python": "^6.0.0", "@codemirror/lang-rust": "^6.0.0", "@codemirror/lang-sass": "^6.0.0", "@codemirror/lang-sql": "^6.0.0", "@codemirror/lang-vue": "^0.1.1", "@codemirror/lang-wast": "^6.0.0", "@codemirror/lang-xml": "^6.0.0", "@codemirror/lang-yaml": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/legacy-modes": "^6.4.0" } }, "sha512-CPkWBKrNS8stYbEU5kwBwTf3JB1kghlbh4FSAwzGW2TEscdeHHH4FGysREW86Mqnj3Qn09s0/6Ea/TutmoTobg=="], @@ -430,11 +430,11 @@ "@codemirror/search": ["@codemirror/search@6.7.1", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.37.0", "crelt": "^1.0.5" } }, "sha512-uMe5UO6PamJtSHrXhhHOzSX3ReWtiJrva6GnPMwSOrZtiExb5X5eExhr2OUZQVvdxPsKpY3Ro2mFbQadpPWmHA=="], - "@codemirror/state": ["@codemirror/state@6.6.0", "", { "dependencies": { "@marijn/find-cluster-break": "^1.0.0" } }, "sha512-4nbvra5R5EtiCzr9BTHiTLc+MLXK2QGiAVYMyi8PkQd3SR+6ixar/Q/01Fa21TBIDOZXgeWV4WppsQolSreAPQ=="], + "@codemirror/state": ["@codemirror/state@6.7.1", "", { "dependencies": { "@marijn/find-cluster-break": "^1.0.0" } }, "sha512-9QzNDgE4EYDnAHfrTlR2lwiPciiOymLtwKK+8yHQzCc7GXhAP9xdEbEJFy2IWB1j9UGUl9BsgMmTo/ImA02T7A=="], "@codemirror/theme-one-dark": ["@codemirror/theme-one-dark@6.1.3", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", "@lezer/highlight": "^1.0.0" } }, "sha512-NzBdIvEJmx6fjeremiGp3t/okrLPYT0d9orIc7AFun8oZcRk58aejkqhv6spnz4MLAevrKNPMQYXEWMg4s+sKA=="], - "@codemirror/view": ["@codemirror/view@6.43.4", "", { "dependencies": { "@codemirror/state": "^6.7.0", "crelt": "^1.0.6", "style-mod": "^4.1.0", "w3c-keyname": "^2.2.4" } }, "sha512-YImu23iyKfncJzT7sRy+rEqEhSc8RhOHqDxwy4WzXRKJwYm6iwf/9OJk5ctCAdZ6yi2ZqaGEvmf55fSVqMDrgg=="], + "@codemirror/view": ["@codemirror/view@6.43.9", "", { "dependencies": { "@codemirror/state": "^6.7.0", "crelt": "^1.0.6", "style-mod": "^4.1.0", "w3c-keyname": "^2.2.4" } }, "sha512-sTuUzTpPMFebRhg6dawChoKKgndIwfjmJgKVxBefPElcU2NwQ6AFroupk0SFqEerQyZOGRfDNnSN8Dw/lMAsXw=="], "@deadlyjack/ajax": ["@deadlyjack/ajax@1.2.6", "", {}, "sha512-VwZU8YUflO2/V/dl3dluu+3jg8Ghz/W5fwxD5Z21OZXKeV73d+vStKVBe4wi+Av2KbTR35K7Z+5Q3iIpjB41MA=="], @@ -2416,12 +2416,24 @@ "@chevrotain/gast/lodash-es": ["lodash-es@4.17.21", "", {}, "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="], + "@codemirror/lang-angular/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + "@codemirror/lang-angular/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], - "@codemirror/lang-html/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], + "@codemirror/lang-jinja/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + + "@codemirror/lang-liquid/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + + "@codemirror/lang-markdown/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + + "@codemirror/lang-php/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + + "@codemirror/lang-vue/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], "@codemirror/lang-vue/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], + "@codemirror/language-data/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + "@codemirror/language-data/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], "@codemirror/language-data/@codemirror/lang-jinja": ["@codemirror/lang-jinja@6.0.0", "", { "dependencies": { "@codemirror/lang-html": "^6.0.0", "@codemirror/language": "^6.0.0", "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.2.0", "@lezer/lr": "^1.4.0" } }, "sha512-47MFmRcR8UAxd8DReVgj7WJN1WSAMT7OJnewwugZM4XiHWkOjgJQqvEM1NpMj9ALMPyxmlziEI1opH9IaEvmaw=="], @@ -2812,6 +2824,14 @@ "@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.28.5", "", {}, "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q=="], + "@codemirror/lang-jinja/@codemirror/lang-html/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], + + "@codemirror/lang-liquid/@codemirror/lang-html/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], + + "@codemirror/lang-markdown/@codemirror/lang-html/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], + + "@codemirror/lang-php/@codemirror/lang-html/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], + "@npmcli/arborist/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="], "@npmcli/map-workspaces/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="], diff --git a/package-lock.json b/package-lock.json index 4cdb90b9e3..967b1b41bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,12 +10,12 @@ "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.20.3", - "@codemirror/commands": "^6.10.3", + "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", "@codemirror/lang-cpp": "^6.0.3", "@codemirror/lang-css": "^6.3.1", "@codemirror/lang-go": "^6.0.1", - "@codemirror/lang-html": "^6.4.11", + "@codemirror/lang-html": "^6.4.12", "@codemirror/lang-java": "^6.0.2", "@codemirror/lang-javascript": "^6.2.5", "@codemirror/lang-jinja": "^6.0.1", @@ -32,15 +32,15 @@ "@codemirror/lang-wast": "^6.0.2", "@codemirror/lang-xml": "^6.1.0", "@codemirror/lang-yaml": "^6.1.3", - "@codemirror/language": "^6.12.3", + "@codemirror/language": "^6.12.4", "@codemirror/language-data": "^6.5.2", "@codemirror/legacy-modes": "^6.5.3", "@codemirror/lint": "^6.9.7", "@codemirror/lsp-client": "github:Acode-Foundation/codemirror-lsp-client#db6930c2b6db67e14978f08ae8f5aeb149d29468", "@codemirror/search": "^6.7.1", - "@codemirror/state": "^6.6.0", + "@codemirror/state": "^6.7.1", "@codemirror/theme-one-dark": "^6.1.3", - "@codemirror/view": "^6.43.4", + "@codemirror/view": "^6.43.9", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", "@lezer/common": "^1.5.0", @@ -3608,13 +3608,13 @@ } }, "node_modules/@codemirror/commands": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.10.3.tgz", - "integrity": "sha512-JFRiqhKu+bvSkDLI+rUhJwSxQxYb759W5GBezE8Uc8mHLqC9aV/9aTC7yJSqCtB3F00pylrLCwnyS91Ap5ej4Q==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.11.0.tgz", + "integrity": "sha512-/K4Rl5BN0OtTiPWmJCdqODu38XnDMsDxKY5rgrPnCkutPTJf2wVbkoixLfealF5Kwse/s8P8M5jAiURiwSwnFA==", "license": "MIT", "dependencies": { "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.6.0", + "@codemirror/state": "^6.7.0", "@codemirror/view": "^6.27.0", "@lezer/common": "^1.1.0" } @@ -3670,9 +3670,9 @@ } }, "node_modules/@codemirror/lang-html": { - "version": "6.4.11", - "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.11.tgz", - "integrity": "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw==", + "version": "6.4.12", + "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.12.tgz", + "integrity": "sha512-pw2ReWKUqSkbvh76RAT4NYxiogRu+PWkR2ukAwO9uOgrm8uipkzjtKKtNpyeAQwHOqxEeSvAXZ6vr3AfyB9y/w==", "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.0.0", @@ -3900,9 +3900,9 @@ } }, "node_modules/@codemirror/language": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.12.3.tgz", - "integrity": "sha512-QwCZW6Tt1siP37Jet9Tb02Zs81TQt6qQrZR2H+eGMcFsL1zMrk2/b9CLC7/9ieP1fjIUMgviLWMmgiHoJrj+ZA==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.12.4.tgz", + "integrity": "sha512-1q4PaT+o6PbgpkJt4Q8Fv5XJxTy4FUZ4MWETtyiDw3J0Pyr9E2vqcKL+k9wcvjNTIsauxvE7OfmWj3FRPHQ76A==", "license": "MIT", "dependencies": { "@codemirror/state": "^6.0.0", @@ -3992,9 +3992,9 @@ } }, "node_modules/@codemirror/state": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.6.0.tgz", - "integrity": "sha512-4nbvra5R5EtiCzr9BTHiTLc+MLXK2QGiAVYMyi8PkQd3SR+6ixar/Q/01Fa21TBIDOZXgeWV4WppsQolSreAPQ==", + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.7.1.tgz", + "integrity": "sha512-9QzNDgE4EYDnAHfrTlR2lwiPciiOymLtwKK+8yHQzCc7GXhAP9xdEbEJFy2IWB1j9UGUl9BsgMmTo/ImA02T7A==", "license": "MIT", "dependencies": { "@marijn/find-cluster-break": "^1.0.0" @@ -4013,9 +4013,9 @@ } }, "node_modules/@codemirror/view": { - "version": "6.43.4", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.43.4.tgz", - "integrity": "sha512-YImu23iyKfncJzT7sRy+rEqEhSc8RhOHqDxwy4WzXRKJwYm6iwf/9OJk5ctCAdZ6yi2ZqaGEvmf55fSVqMDrgg==", + "version": "6.43.9", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.43.9.tgz", + "integrity": "sha512-sTuUzTpPMFebRhg6dawChoKKgndIwfjmJgKVxBefPElcU2NwQ6AFroupk0SFqEerQyZOGRfDNnSN8Dw/lMAsXw==", "license": "MIT", "dependencies": { "@codemirror/state": "^6.7.0", @@ -4410,9 +4410,9 @@ } }, "node_modules/@marijn/find-cluster-break": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz", - "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.4.tgz", + "integrity": "sha512-Wy0V7+SGUjnF9/TkiM1hKVDPj7jKXduPNboMVtHTA8dySMURWqfg/JZ9E2Sq8JgSJmkl7k7Qe9FLeMSrSraWmQ==", "license": "MIT" }, "node_modules/@mermaid-js/parser": { diff --git a/package.json b/package.json index f34c2faf1b..dcf2e77743 100644 --- a/package.json +++ b/package.json @@ -123,12 +123,12 @@ }, "dependencies": { "@codemirror/autocomplete": "^6.20.3", - "@codemirror/commands": "^6.10.3", + "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", "@codemirror/lang-cpp": "^6.0.3", "@codemirror/lang-css": "^6.3.1", "@codemirror/lang-go": "^6.0.1", - "@codemirror/lang-html": "^6.4.11", + "@codemirror/lang-html": "^6.4.12", "@codemirror/lang-java": "^6.0.2", "@codemirror/lang-javascript": "^6.2.5", "@codemirror/lang-jinja": "^6.0.1", @@ -145,15 +145,15 @@ "@codemirror/lang-wast": "^6.0.2", "@codemirror/lang-xml": "^6.1.0", "@codemirror/lang-yaml": "^6.1.3", - "@codemirror/language": "^6.12.3", + "@codemirror/language": "^6.12.4", "@codemirror/language-data": "^6.5.2", "@codemirror/legacy-modes": "^6.5.3", "@codemirror/lint": "^6.9.7", "@codemirror/lsp-client": "github:Acode-Foundation/codemirror-lsp-client#db6930c2b6db67e14978f08ae8f5aeb149d29468", "@codemirror/search": "^6.7.1", - "@codemirror/state": "^6.6.0", + "@codemirror/state": "^6.7.1", "@codemirror/theme-one-dark": "^6.1.3", - "@codemirror/view": "^6.43.4", + "@codemirror/view": "^6.43.9", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", "@lezer/common": "^1.5.0", @@ -203,12 +203,12 @@ }, "overrides": { "@codemirror/autocomplete": "^6.20.3", - "@codemirror/commands": "^6.10.3", - "@codemirror/language": "^6.12.3", + "@codemirror/commands": "^6.11.0", + "@codemirror/language": "^6.12.4", "@codemirror/lint": "^6.9.7", "@codemirror/search": "^6.7.1", - "@codemirror/state": "^6.6.0", - "@codemirror/view": "^6.43.4", + "@codemirror/state": "^6.7.1", + "@codemirror/view": "^6.43.9", "tar": "^7.5.22" }, "browserslist": "cover 100%", From 2e7aeadd83ba08a04ca69da6e322bca025e18bd4 Mon Sep 17 00:00:00 2001 From: TM Date: Wed, 26 Aug 2026 15:39:52 +0000 Subject: [PATCH 074/195] Enhanced: Indonesian (id) language translations (#2798) --- src/lang/id-id.json | 256 ++++++++++++++++++++++---------------------- 1 file changed, 128 insertions(+), 128 deletions(-) diff --git a/src/lang/id-id.json b/src/lang/id-id.json index 4f2baf5c81..13dda67747 100644 --- a/src/lang/id-id.json +++ b/src/lang/id-id.json @@ -8,18 +8,18 @@ "autosave": "Simpan Otomatis", "cancel": "Batal", "change language": "Ubah Bahasa", - "choose color": "Pilih warna", + "choose color": "Pilih Warna", "clear": "Kosongkan", - "close app": "Tutup aplikasi?", - "commit message": "Pesan komit", + "close app": "Tutup Aplikasi?", + "commit message": "Pesan Komit", "console": "Konsol", "conflict error": "Terjadi konflik! Harap tunggu sebelum melakukan komit lain.", "copy": "Salin", - "create folder error": "Maaf, tidak dapat membuat folder baru", + "create folder error": "Maaf, tidak dapat membuat folder baru.", "cut": "Potong", "delete": "Hapus", - "dependencies": "Ketergantungan", - "delay": "Waktu dalam milidetik", + "dependencies": "Dependensi", + "delay": "Waktu dalam Milidetik", "editor settings": "Pengaturan Editor", "editor theme": "Tema Editor", "enter file name": "Masukkan nama berkas", @@ -34,13 +34,13 @@ "file deleted": "Berkas dihapus", "file is not supported": "Berkas tidak didukung", "file not supported": "Jenis berkas ini tidak didukung.", - "file too large": "Berkas terlalu besar untuk ditangani. Ukuran maksimal berkas yang diizinkan adalah {size}", + "file too large": "Berkas terlalu besar untuk ditangani. Ukuran maksimal berkas yang diizinkan adalah {size}.", "file renamed": "Berkas berganti nama", "file saved": "Berkas disimpan", "folder added": "Folder ditambahkan", "folder already added": "Folder sudah ditambahkan", "font size": "Ukuran Font", - "goto": "Pergi ke baris", + "goto": "Pergi ke Baris", "icons definition": "Definisi ikon", "info": "Info", "invalid value": "Nilai tidak valid", @@ -48,23 +48,23 @@ "linting": "Cek kesalahan sintaks", "logout": "Keluar", "loading": "Memuat", - "my profile": "Profil saya", + "my profile": "Profil Saya", "new file": "Berkas baru", "new folder": "Folder baru", "no": "Tidak", - "no editor message": "Buka atau buat berkas dan folder baru dari menu", + "no editor message": "Buka atau buat berkas dan folder baru dari menu.", "not set": "Tidak diatur", "unsaved files close app": "Ada berkas yang belum disimpan. Tutup Aplikasi?", "notice": "Pemberitahuan", "open file": "Buka berkas", "open files and folders": "Buka berkas dan folder", "open folder": "Buka folder", - "open recent": "Buka baru-baru ini", + "open recent": "Buka Yang Baru-Baru Ini", "ok": "OK", "overwrite": "Timpa", "paste": "Tempel", "preview mode": "Mode Pratinjau", - "read only file": "Tidak dapat menyimpan berkas hanya baca. Silakan coba simpan sebagai", + "read only file": "Tidak dapat menyimpan berkas hanya-baca. Silakan coba simpan sebagai.", "reload": "Muat Ulang", "rename": "Ubah Nama", "replace": "Ganti", @@ -73,7 +73,7 @@ "save": "Simpan", "saving": "Menyimpan", "save as": "Simpan sebagai", - "save file to run": "Silakan simpan berkas ini untuk berjalan di peramban", + "save file to run": "Silakan simpan berkas ini agar dapat berjalan di peramban.", "search": "Cari", "see logs and errors": "Lihat log dan kesalahan", "select folder": "Pilih folder", @@ -160,7 +160,7 @@ "dark": "Gelap", "file browser": "Penjelajah Berkas", "operation not permitted": "Operasi tidak diizinkan", - "no such file or directory": "Tidak ada berkas atau direktori seperti itu", + "no such file or directory": "Tidak ada berkas atau direktori seperti itu.", "input/output error": "Kesalahan masukan/keluaran", "permission denied": "Izin ditolak", "bad address": "Alamat tidak valid", @@ -177,7 +177,7 @@ "too many users": "Terlalu banyak pengguna", "connection timed out": "Waktu koneksi habis", "connection refused": "Koneksi ditolak", - "owner died": "Proses induk terhenti", + "owner died": "Proses induk berhenti.", "an error occurred": "Terjadi kesalahan", "add ftp": "Tambahkan FTP", "add sftp": "Tambahkan SFTP", @@ -191,7 +191,7 @@ "deleted file": "Berkas yang dihapus", "line height": "Tinggi baris", "preview info": "Jika Anda ingin menjalankan berkas aktif, ketuk dan tahan ikon Putar.", - "manage all files": "Izinkan Acode Editor untuk mengelola semua berkas dalam pengaturan untuk mengedit berkas di perangkat Anda dengan mudah.", + "manage all files": "Izinkan Acode Editor untuk mengelola semua berkas di pengaturan agar dapat mengedit berkas di perangkat Anda dengan mudah.", "close file": "Tutup berkas", "reset connections": "Atur ulang koneksi", "check file changes": "Periksa perubahan berkas", @@ -252,25 +252,25 @@ "select key file": "Pilih berkas kunci", "passphrase": "Frasa sandi", "connecting...": "Menghubungkan...", - "type filename": "Jenis nama berkas", + "type filename": "Ketik nama berkas", "unable to load files": "Tidak dapat memuat berkas", "preview port": "Port pratinjau", "find file": "Temukan berkas", "system": "Sistem", "please select a formatter": "Mohon pilih pemformat", "case sensitive": "Sensitif huruf besar", - "regular expression": "Ekspresi Regular", + "regular expression": "Ekspresi Reguler", "whole word": "Seluruh kata", "edit with": "Edit dengan", "open with": "Buka dengan", "no app found to handle this file": "Tidak ditemukan aplikasi untuk menangani berkas ini", - "restore default settings": "Kembalikan pengaturan default", + "restore default settings": "Kembalikan Pengaturan Bawaan", "server port": "Port server", "preview settings": "Pengaturan pratinjau", - "preview settings note": "Jika port pratinjau dan port server berbeda, aplikasi tidak akan memulai server dan sebaliknya akan membuka https://: di peramban atau peramban-dalam-aplikasi. Ini berguna ketika Anda menjalankan server di tempat lain.", + "preview settings note": "Jika port pratinjau dan port server berbeda, aplikasi tidak akan memulai server dan sebaliknya akan membuka https://: di peramban atau peramban-dalam-aplikasi. Ini berguna ketika Anda menjalankan server di tempat lain.", "backup/restore note": "Ini hanya akan membuat cadangan pengaturan Anda, tema khusus, plugin yang dipasang, dan pemetaan tombol. Ini tidak akan membuat cadangan FTP/SFTP atau status aplikasi Anda.", "host": "Host", - "retry ftp/sftp when fail": "Ulangi FTP/SFTP ketika gagal", + "retry ftp/sftp when fail": "Ulangi FTP/SFTP saat gagal", "more": "Lebih banyak", "thank you :)": "Terima kasih :)", "purchase pending": "Pembelian Tertunda", @@ -292,42 +292,42 @@ "quicktools trigger mode": "Mode Pemicu Alat Cepat", "print margin": "Cetak margin", "touch move threshold": "Ambang pergerakan sentuh", - "info-retryremotefsafterfail": "Ulangi koneksi FTP/SFTP ketika gagal.", - "info-fullscreen": "Sembunyikan Bilah Judul di Layar Beranda.", - "info-checkfiles": "Periksa perubahan berkas ketika aplikasi di latar belakang.", - "info-console": "Pilih konsol JavaScript. Legacy adalah konsol default, Eruda adalah konsol pihak ketiga.", - "info-keyboardmode": "Mode keyboard untuk input teks, tidak ada saran akan menyembunyikan saran dan koreksi otomatis. Jika tidak ada saran tidak berfungsi, cobalah untuk mengubah nilai ke tanpa saran yang agresif.", - "info-rememberfiles": "Ingat berkas yang dibuka ketika aplikasi ditutup.", - "info-rememberfolders": "Ingat folder yang dibuka ketika aplikasi ditutup.", + "info-retryremotefsafterfail": "Ulangi koneksi FTP/SFTP saat gagal.", + "info-fullscreen": "Sembunyikan bilah judul di layar beranda.", + "info-checkfiles": "Periksa perubahan berkas saat aplikasi berjalan di latar belakang.", + "info-console": "Pilih konsol JavaScript. Legacy adalah konsol bawaan, Eruda adalah konsol pihak ketiga.", + "info-keyboardmode": "Mode papan ketik untuk input teks. Pilihan tanpa saran akan menyembunyikan saran dan koreksi otomatis. Jika tidak ada saran tidak berfungsi, coba ubah nilainya ke tanpa saran yang agresif.", + "info-rememberfiles": "Ingat berkas yang dibuka saat aplikasi ditutup.", + "info-rememberfolders": "Ingat folder yang dibuka saat aplikasi ditutup.", "info-floatingbutton": "Tampilkan atau sembunyikan tombol apung Alat Cepat.", - "info-openfilelistpos": "Di mana untuk menampilkan daftar berkas aktif.", + "info-openfilelistpos": "Lokasi untuk menampilkan daftar berkas aktif.", "info-touchmovethreshold": "Jika sensitivitas sentuhan perangkat Anda terlalu tinggi, Anda dapat meningkatkan nilai ini untuk mencegah gerakan sentuh yang tidak disengaja.", - "info-scroll-settings": "Pengaturan ini berisi pengaturan gulir termasuk bungkus teks.", + "info-scroll-settings": "Pengaturan ini mencakup pengaturan gulir termasuk bungkus teks.", "info-animation": "Jika aplikasi terasa lag, nonaktifkan animasi.", - "info-quicktoolstriggermode": "Jika tombol dalam alat cepat tidak berfungsi, cobalah untuk mengubah nilai ini.", + "info-quicktoolstriggermode": "Jika tombol dalam alat cepat tidak berfungsi, coba ubah nilai ini.", "info-checkForAppUpdates": "Periksa pembaruan aplikasi secara otomatis.", "info-quickTools": "Tampilkan atau sembunyikan alat cepat.", - "info-showHiddenFiles": "Tampilkan berkas dan folder tersembunyi. (Berawal dengan .)", - "info-listFiles": "Otomatis daftarkan semua berkas saat folder dibuka", + "info-showHiddenFiles": "Tampilkan berkas dan folder tersembunyi. (Diawali dengan .)", + "info-listFiles": "Secara otomatis daftarkan semua berkas saat folder dibuka.", "info-all_file_access": "Aktifkan akses ke /sdcard dan /storage di terminal.", "info-fontSize": "Ukuran font yang digunakan untuk menampilkan teks.", "info-fontFamily": "Jenis font yang digunakan untuk menampilkan teks.", "info-theme": "Tema warna terminal.", "info-cursorStyle": "Gaya kursor saat terminal sedang aktif.", "info-cursorInactiveStyle": "Gaya kursor saat terminal tidak terfokus.", - "info-fontWeight": "Ketebalan font yang digunakan untuk menampilkan teks tidak tebal.", + "info-fontWeight": "Ketebalan font yang digunakan untuk menampilkan teks biasa.", "info-cursorBlink": "Apakah kursor berkedip.", - "info-scrollback": "Jumlah scrollback di terminal. Scrollback adalah jumlah baris yang dipertahankan ketika baris digulirkan melampaui tampilan awal.", - "info-tabStopWidth": "Ukuran tab berhenti di terminal.", + "info-scrollback": "Jumlah gulir balik di terminal. Gulir balik adalah jumlah baris yang dipertahankan saat baris digulirkan melampaui tampilan awal.", + "info-tabStopWidth": "Ukuran hentian tab di terminal.", "info-letterSpacing": "Jarak antar karakter dalam piksel penuh.", "info-imageSupport": "Apakah gambar didukung di terminal.", "info-fontLigatures": "Apakah ligatur font diaktifkan di terminal.", - "info-confirmTabClose": "Mintalah konfirmasi sebelum menutup tab terminal.", + "info-confirmTabClose": "Minta konfirmasi sebelum menutup tab terminal.", "info-backup": "Membuat cadangan instalasi terminal.", "info-restore": "Memulihkan cadangan instalasi terminal.", "info-uninstall": "Menghapus instalasi terminal.", "owned": "Dimiliki", - "api_error": "API server turun, silakan coba setelah beberapa waktu.", + "api_error": "Server API sedang down, silakan coba beberapa saat lagi.", "installed": "Terpasang", "all": "Semua", "medium": "Sedang", @@ -345,10 +345,10 @@ "bottom": "Bawah", "save all": "Simpan semua", "close all": "Tutup semua", - "unsaved files warning": "Beberapa berkas tidak disimpan. Klik 'Oke' pilih apa yang harus dilakukan atau tekan 'Batal' untuk kembali.", - "save all warning": "Apakah Anda yakin ingin menyimpan semua berkas dan tutup? Tindakan ini tidak dapat dibalik.", + "unsaved files warning": "Beberapa berkas belum disimpan. Klik 'Oke' untuk memilih tindakan atau tekan 'Batal' untuk kembali.", + "save all warning": "Apakah Anda yakin ingin menyimpan semua berkas dan menutupnya? Tindakan ini tidak dapat diurungkan.", "save all changes warning": "Apakah Anda yakin ingin menyimpan semua berkas?", - "close all warning": "Apakah Anda yakin ingin menutup semua berkas? Anda akan kehilangan perubahan yang belum disimpan dan tindakan ini tidak dapat dibalik.", + "close all warning": "Apakah Anda yakin ingin menutup semua berkas? Anda akan kehilangan perubahan yang belum disimpan dan tindakan ini tidak dapat diurungkan.", "refresh": "Segarkan", "shortcut buttons": "Tombol pintasan", "no result": "Tidak ada hasil", @@ -387,17 +387,17 @@ "quicktools:search-settings": "Pengaturan Pencarian", "quicktools:search-replace": "Mengganti", "quicktools:search-replace-all": "Ganti Semua", - "info-quicktoolssettings": "Kustomisasi tombol pintas dan tombol keyboard dalam wadah alat cepat di bawah editor untuk meningkatkan pengalaman pengkodean Anda.", - "info-excludefolders": "Gunakan pola **/node_modules/** untuk mengabaikan semua berkas dari folder node_modules. Ini akan mengecualikan berkas dari terdaftar dan juga akan mencegah mereka dimasukkan dalam pencarian berkas.", - "missed files": "Memindai {count} berkas setelah pencarian dimulai dan tidak akan dimasukkan dalam pencarian.", + "info-quicktoolssettings": "Sesuaikan tombol pintasan dan tombol papan ketik dalam wadah alat cepat di bawah editor untuk meningkatkan pengalaman pengkodean Anda.", + "info-excludefolders": "Gunakan pola **/node_modules/** untuk mengabaikan semua berkas dari folder node_modules. Ini akan mengecualikan berkas dari daftar dan juga mencegahnya diikutsertakan dalam pencarian berkas.", + "missed files": "Memindai {count} berkas setelah pencarian dimulai dan tidak akan dimasukkan dalam hasil pencarian.", "remove": "Hapus", "quicktools:command-palette": "Palet perintah", "default file encoding": "Enkoding berkas default", - "remove entry": "Apakah Anda yakin ingin menghapus '{name}' dari jalur yang disimpan? Harap dicatat bahwa menghapusnya tidak akan menghapus jalur itu sendiri.", - "delete entry": "Konfirmasikan penghapusan: '{name}'. Tindakan ini tidak dapat diurungkan. Melanjutkan?", - "change encoding": "Buka kembali '{file}' dengan enkoding '{encoding}'? Tindakan ini akan mengakibatkan hilangnya perubahan yang belum disimpan yang dilakukan pada berkas. Apakah Anda ingin melanjutkan pembukaan kembali?", - "reopen file": "Apakah Anda yakin ingin membuka kembali '{file}'? Setiap perubahan yang belum disimpan akan hilang.", - "plugin min version": "{name} hanya tersedia dalam Acode - {v-code} dan di atas. Klik di sini untuk memperbarui.", + "remove entry": "Apakah Anda yakin ingin menghapus '{name}' dari jalur yang disimpan? Perlu diketahui bahwa menghapusnya tidak akan menghapus jalur itu sendiri.", + "delete entry": "Konfirmasi penghapusan: '{name}'. Tindakan ini tidak dapat diurungkan. Lanjutkan?", + "change encoding": "Buka kembali '{file}' dengan enkoding '{encoding}'? Tindakan ini akan mengakibatkan hilangnya perubahan yang belum disimpan pada berkas ini. Apakah Anda ingin melanjutkan?", + "reopen file": "Apakah Anda yakin ingin membuka kembali '{file}'? Semua perubahan yang belum disimpan akan hilang.", + "plugin min version": "{name} hanya tersedia di Acode - {v-code} ke atas. Klik di sini untuk memperbarui.", "color preview": "Pratinjau warna", "confirm": "Konfirmasi", "problems": "Masalah", @@ -407,16 +407,16 @@ "most_downloaded": "Paling Banyak Diunduh", "newly_added": "Baru Ditambahkan", "top_rated": "Peringkat Teratas", - "rename not supported": "Mengganti nama pada direktori Termux tidak didukung", + "rename not supported": "Mengganti nama pada direktori Termux tidak didukung.", "compress": "Kompres", "copy uri": "Salin Uri", "delete entries": "Apakah Anda yakin ingin menghapus {count} item?", - "deleting items": "menghapus {count} item...", + "deleting items": "Menghapus {count} item...", "import project zip": "Impor Proyek (zip)", "changelog": "Catatan Perubahan", "notifications": "Notifikasi", "no_unread_notifications": "Tidak ada pemberitahuan yang belum dibaca", - "should_use_current_file_for_preview": "Harus menggunakan berkas saat ini untuk pratinjau alih-alih default (index.html)", + "should_use_current_file_for_preview": "Gunakan berkas saat ini untuk pratinjau, alih-alih default (index.html).", "fade fold widgets": "Widget Lipat Pudar", "quicktools:home-key": "Kunci Home", "quicktools:end-key": "Kunci End", @@ -513,7 +513,7 @@ "add to home screen": "Tambah ke layar beranda", "pin shortcuts not supported": "Pintasan layar beranda tidak didukung di perangkat ini.", "save file before home shortcut": "Simpan berkas sebelum menambahkannya ke layar beranda.", - "terminal_required_message_for_lsp": "Terminal tidak terpasang. Mohon pasang Terminal terlebih dahulu untuk menggunakan server LSP.", + "terminal_required_message_for_lsp": "Terminal belum terpasang. Mohon pasang Terminal terlebih dahulu untuk menggunakan server LSP.", "shift click selection": "Pemilihan Shift + tekan/klik", "earn ad-free time": "Ambil waktu bebas iklan", "indent guides": "Panduan indentasi", @@ -534,7 +534,7 @@ "lsp-empty": "Kosong", "lsp-enabled": "Diaktifkan", "lsp-error-add-server-failed": "Gagal menambahkan server", - "lsp-error-args-must-be-array": "Argumen harus berupa sebuah senarai JSON", + "lsp-error-args-must-be-array": "Argumen harus berupa senarai JSON.", "lsp-error-binary-command-required": "Perintah biner diperlukan", "lsp-error-language-id-required": "Setidaknya satu ID bahasa diperlukan", "lsp-error-package-required": "Setidaknya satu paket diperlukan", @@ -552,14 +552,14 @@ "lsp-feature-signature": "Bantuan parameter fungsi", "lsp-feature-signature-info": "Tampilkan petunjuk parameter fungsi saat mengetik.", "lsp-feature-state-toast": "{feature} {state}", - "lsp-initialization-options": "Opsi inisiasi", - "lsp-initialization-options-json": "Opsi inisiasi (JSON)", - "lsp-initialization-options-updated": "Opsi inisiasi diperbarui", - "lsp-install-command": "Perintah pasang", - "lsp-install-command-unavailable": "Perintah pasang tidak tersedia", + "lsp-initialization-options": "Opsi Inisialisasi", + "lsp-initialization-options-json": "Opsi Inisialisasi (JSON)", + "lsp-initialization-options-updated": "Opsi inisialisasi diperbarui.", + "lsp-install-command": "Perintah Pasang", + "lsp-install-command-unavailable": "Perintah pasang tidak tersedia.", "lsp-install-info-check-failed": "Acode tidak dapat memverifikasi status pemasangan.", - "lsp-install-info-missing": "Server bahasa tidak terpasang di dalam lingkungan terminal.", - "lsp-install-info-ready": "Server bahasa terpasang dan siap.", + "lsp-install-info-missing": "Server bahasa belum terpasang di dalam lingkungan terminal.", + "lsp-install-info-ready": "Server bahasa terpasang dan siap digunakan.", "lsp-install-info-unknown": "Status pemasangan tidak dapat diperiksa secara otomatis.", "lsp-install-info-version-available": "Versi {version} tersedia.", "lsp-install-notification": "{server} belum terpasang. Ketuk untuk memasang.", @@ -570,8 +570,8 @@ "lsp-install-method-pip": "Paket pip", "lsp-install-method-shell": "Shell kustom", "lsp-install-method-title": "Metode pasang", - "lsp-install-repair": "Pasang / perbaiki", - "lsp-installation-status": "Status pemasangan", + "lsp-install-repair": "Pasang / Perbaiki", + "lsp-installation-status": "Status Pemasangan", "lsp-installed": "Terpasang", "lsp-invalid-timeout": "Nilai timeout tidak valid", "lsp-language-ids": "ID bahasa (dipisah koma)", @@ -582,10 +582,10 @@ "lsp-server-id": "ID server", "lsp-server-label": "Label server", "lsp-server-not-found": "Server tidak ditemukan", - "lsp-server-uninstalled": "Server dicopot pemasangannya", - "lsp-startup-timeout": "Batas waktu mulai", - "lsp-startup-timeout-ms": "Batas waktu mulai (milidetik)", - "lsp-startup-timeout-set": "Batas waktu mulai diatur ke {timeout} ms", + "lsp-server-uninstalled": "Server dicopot pemasangannya.", + "lsp-startup-timeout": "Batas Waktu Mulai", + "lsp-startup-timeout-ms": "Batas Waktu Mulai (Milidetik)", + "lsp-startup-timeout-set": "Batas waktu mulai diatur ke {timeout} ms.", "lsp-state-disabled": "dinonaktifkan", "lsp-state-enabled": "diaktifkan", "lsp-status": "Status", @@ -596,14 +596,14 @@ "lsp-status-not-installed": "Tidak terpasang", "lsp-status-unknown": "Tidak diketahui", "lsp-timeout-ms": "{timeout} ms", - "lsp-uninstall-command-unavailable": "Perintah copot pemasangan tidak tersedia", + "lsp-uninstall-command-unavailable": "Perintah copot pemasangan tidak tersedia.", "lsp-uninstall-notification": "Ketuk untuk menghapus {server}.", - "lsp-uninstall-server": "Copot pemasangan server", + "lsp-uninstall-server": "Copot Pemasangan Server", "lsp-update-command-optional": "Perintah perbarui (opsional)", "lsp-update-command-unavailable": "Perintah perbarui tidak tersedia", - "lsp-update-server": "Perbarui server", + "lsp-update-server": "Perbarui Server", "lsp-version-line": "Versi: {version}", - "lsp-view-initialization-options": "Lihat opsi inisiasi", + "lsp-view-initialization-options": "Lihat Opsi Inisialisasi", "settings-category-about-acode": "Tentang Acode", "settings-category-discover-apps": "Temukan lebih banyak aplikasi", "settings-category-advanced": "Lanjutan", @@ -632,63 +632,63 @@ "settings-category-support-acode": "Dukung Acode", "settings-category-text-layout": "Teks & tampilan", "settings-info-app-animation": "Kendalikan animasi transisi di seluruh aplikasi.", - "settings-info-app-check-files": "Segarkan ulang editor ketika berkas berubah di luar Acode.", + "settings-info-app-check-files": "Segarkan editor saat berkas berubah di luar Acode.", "settings-info-app-clean-install-state": "Hapus status instalasi yang tersimpan yang digunakan oleh alur orientasi dan pengaturan.", "settings-info-app-confirm-on-exit": "Tanyakan sebelum menutup aplikasi.", - "settings-info-app-console": "Pilih mana integrasi konsol debug yang Acode gunakan.", + "settings-info-app-console": "Pilih integrasi konsol debug yang digunakan Acode.", "settings-info-app-default-file-encoding": "Enkoding bawaan ketika membuka atau membuat berkas.", "settings-info-app-exclude-folders": "Lewati folder dan pola ketika mencari atau memindai.", "settings-info-app-floating-button": "Tampilkan tombol aksi cepat yang melayang.", - "settings-info-app-font-manager": "Pasang, kelola, atau menghapus font aplikasi.", - "settings-info-app-fullscreen": "Sembunyikan bar status sistem ketika menggunakan Acode.", + "settings-info-app-font-manager": "Pasang, kelola, atau hapus font aplikasi.", + "settings-info-app-fullscreen": "Sembunyikan bilah status sistem saat menggunakan Acode.", "settings-info-app-keybindings": "Edit berkas pemetaan tombol atau atur ulang pintasan.", - "settings-info-app-keyboard-mode": "Pilih bagaimana papan ketik perangkat lunak berperilaku ketika mengedit.", + "settings-info-app-keyboard-mode": "Pilih perilaku papan ketik perangkat lunak saat mengedit.", "settings-info-app-language": "Pilih bahasa aplikasi dan label yang diterjemahkan.", - "settings-info-app-open-file-list-position": "Pilih dimana daftar berkas aktif muncul.", - "settings-info-app-quick-tools-settings": "Urutkan ulang dan kustomisaikan pintasan alat cepat.", - "settings-info-app-quick-tools-trigger-mode": "Pilih bagaimana alat cepat terbuka saat ditekan atau disentuh.", - "settings-info-app-remember-files": "Buka ulang berkas yang dibuka terakhir kali.", - "settings-info-app-remember-folders": "Buka ulang folder dari sesi sebelumnya.", - "settings-info-app-retry-remote-fs": "Ulangi lagi operasi berkas jarak jauh setelah transfer gagal.", + "settings-info-app-open-file-list-position": "Pilih di mana daftar berkas aktif muncul.", + "settings-info-app-quick-tools-settings": "Urutkan ulang dan sesuaikan pintasan alat cepat.", + "settings-info-app-quick-tools-trigger-mode": "Pilih cara alat cepat terbuka saat ditekan atau disentuh.", + "settings-info-app-remember-files": "Buka kembali berkas yang terakhir dibuka.", + "settings-info-app-remember-folders": "Buka kembali folder dari sesi sebelumnya.", + "settings-info-app-retry-remote-fs": "Ulangi operasi berkas jarak jauh setelah transfer gagal.", "settings-info-app-side-buttons": "Tampilkan tombol aksi ekstra di samping editor.", "settings-info-app-sponsor-sidebar": "Tampilkan entri sponsor di bar samping.", - "settings-info-app-touch-move-threshold": "Pergerakan minimum sebelum penyeretan sentuh terdeteksi.", - "settings-info-app-vibrate-on-tap": "Aktifkan umpan balik getar untuk tekan dan kendali.", + "settings-info-app-touch-move-threshold": "Pergerakan minimum sebelum gestur seret sentuh terdeteksi.", + "settings-info-app-vibrate-on-tap": "Aktifkan umpan balik getar untuk ketukan dan kontrol.", "settings-info-editor-autosave": "Simpan perubahan secara otomatis setelah jeda.", - "settings-info-editor-color-preview": "Pratinjau nilai warna langsung di dalam editor.", - "settings-info-editor-fade-fold-widgets": "Redupkan penanda lipatan hingga dibutuhkan.", + "settings-info-editor-color-preview": "Pratinjau nilai warna secara langsung di dalam editor.", + "settings-info-editor-fade-fold-widgets": "Redupkan penanda lipatan hingga diperlukan.", "settings-info-editor-font-family": "Pilih tipe font yang digunakan di dalam editor.", "settings-info-editor-font-size": "Atur ukuran teks di editor.", - "settings-info-editor-format-on-save": "Jalankan pemformat ketika sebuah berkas tersimpan.", - "settings-info-editor-hard-wrap": "Masukkan pemotong baris asli daripada hanya membungkusnya secara visual.", - "settings-info-editor-indent-guides": "Tampilkan baris panduan indentasi.", - "settings-info-editor-line-height": "Atur jarak vertikal diantara baris.", + "settings-info-editor-format-on-save": "Jalankan pemformat saat berkas disimpan.", + "settings-info-editor-hard-wrap": "Sisipkan pemotong baris asli daripada hanya membungkusnya secara visual.", + "settings-info-editor-indent-guides": "Tampilkan garis panduan indentasi.", + "settings-info-editor-line-height": "Atur jarak vertikal antarbaris.", "settings-info-editor-line-numbers": "Tampilkan nomor baris di dalam gutter.", "settings-info-editor-lint-gutter": "Tampilkan alat diagnostik dan penanda lint di gutter.", "settings-info-editor-live-autocomplete": "Tampilkan saran ketika Anda mengetik.", - "settings-info-editor-rainbow-brackets": "Warna menyamakan kurung dari kedalaman bersarang.", + "settings-info-editor-rainbow-brackets": "Warnai tanda kurung berdasarkan kedalaman bersarang.", "settings-info-editor-relative-line-numbers": "Tampilkan jarak dari baris saat ini.", - "settings-info-editor-rtl-text": "Ganti perilaku kanan-ke-kiri setiap baris.", - "settings-info-editor-scroll-settings": "Atur ukuran bar gulir, kecepatan, dan perilaku gestur.", - "settings-info-editor-shift-click-selection": "Perluas pemilihan dengan Shift + tekan atau klik.", - "settings-info-editor-show-spaces": "Tampilkan penanda spasi dan jeda baris yang terlihat.", - "settings-info-editor-soft-tab": "Masukkan spasi daripada karakter tab.", - "settings-info-editor-tab-size": "Atur seberapa banyak spasi setiap langkah tab digunakan.", + "settings-info-editor-rtl-text": "Ganti perilaku kanan-ke-kiri per baris.", + "settings-info-editor-scroll-settings": "Atur ukuran bilah gulir, kecepatan, dan perilaku gestur.", + "settings-info-editor-shift-click-selection": "Perluas pemilihan dengan Shift + ketuk atau klik.", + "settings-info-editor-show-spaces": "Tampilkan penanda spasi dan pemotong baris yang terlihat.", + "settings-info-editor-soft-tab": "Sisipkan spasi sebagai pengganti karakter tab.", + "settings-info-editor-tab-size": "Atur jumlah spasi yang digunakan setiap langkah tab.", "settings-info-editor-teardrop-size": "Atur ukuran penangan kursor untuk pengeditan sentuh.", "settings-info-editor-text-wrap": "Bungkus baris panjang di dalam editor.", - "settings-info-lsp-add-custom-server": "Daftarkan server bahasa kustom dengan perintah pasang, perbarui, dan luncur.", - "settings-info-lsp-edit-init-options": "Edit opsi inisiasi sebagai JSON.", + "settings-info-lsp-add-custom-server": "Daftarkan server bahasa kustom dengan perintah pasang, perbarui, dan luncurkan.", + "settings-info-lsp-edit-init-options": "Edit opsi inisialisasi sebagai JSON.", "settings-info-lsp-install-server": "Pasang atau perbaiki server bahasa ini.", "settings-info-lsp-server-enabled": "Aktifkan atau nonaktifkan server bahasa ini.", - "settings-info-lsp-startup-timeout": "Atur seberapa lama Acode menunggu untuk server memulai.", + "settings-info-lsp-startup-timeout": "Atur durasi tunggu Acode untuk server mulai.", "settings-info-lsp-uninstall-server": "Hapus paket terpasang atau biner dari server ini.", - "settings-info-lsp-update-server": "Perbarui server bahasa ini jika alur pembaruan tersedia.", - "settings-info-lsp-view-init-options": "Lihat opsi inisiasi efektif sebagai JSON.", + "settings-info-lsp-update-server": "Perbarui server bahasa ini jika jalur pembaruan tersedia.", + "settings-info-lsp-view-init-options": "Lihat opsi inisialisasi efektif sebagai JSON.", "settings-info-main-ad-rewards": "Tonton iklan untuk membuka akses bebas iklan sementara.", "settings-info-main-app-settings": "Bahasa, perilaku aplikasi, dan alat akses cepat.", - "settings-info-main-backup-restore": "Ekspor pengaturan ke pencadangan atau atur ulang mereka nanti.", - "settings-info-main-changelog": "Lihat perbaruan saat ini dan catatan rilis.", - "settings-info-main-edit-settings": "Edit berkas mentah settings.json secara langsung.", + "settings-info-main-backup-restore": "Ekspor pengaturan ke cadangan atau pulihkan nanti.", + "settings-info-main-changelog": "Lihat pembaruan saat ini dan catatan rilis.", + "settings-info-main-edit-settings": "Edit berkas settings.json secara langsung.", "settings-info-main-editor-settings": "Font, tab, saran, dan tampilan editor.", "settings-info-main-formatter": "Pilih pemformat untuk setiap bahasa yang didukung.", "settings-info-main-lsp-settings": "Konfigurasi server bahasa dan kecerdasan editor.", @@ -697,76 +697,76 @@ "settings-info-main-rateapp": "Nilai Acode di Google Play.", "settings-info-main-remove-ads": "Buka akses permanen bebas iklan.", "settings-info-main-reset": "Atur ulang Acode ke konfigurasi bawaannya.", - "settings-info-main-sponsors": "Mendukung pengembangan Acode yang berkelanjutan.", + "settings-info-main-sponsors": "Dukung pengembangan Acode secara berkelanjutan.", "settings-info-main-terminal-settings": "Tema Terminal, font, kursor, dan perilaku sesi.", "settings-info-main-theme": "Tema aplikasi, kontras, dan warna kustom.", "settings-info-preview-disable-cache": "Selalu muat ulang konten di dalam peramban-dalam-aplikasi.", "settings-info-preview-host": "Nama host yang digunakan ketika membuka URL pratinjau.", - "settings-info-preview-mode": "Pilih dimana pratinjau dibuka ketika Anda meluncurkannya.", + "settings-info-preview-mode": "Pilih di mana pratinjau dibuka saat Anda meluncurkannya.", "settings-info-preview-preview-port": "Port yang digunakan oleh server pratinjau langsung.", "settings-info-preview-server-port": "Port yang digunakan oleh server internal aplikasi.", "settings-info-preview-show-console-toggler": "Tampilkan tombol konsol di dalam pratinjau.", "settings-info-preview-use-current-file": "Utamakan berkas saat ini ketika memulai pratinjau.", - "settings-info-terminal-convert-eol": "Konversikan akhiran baris saat menempelkan atau menampilkan output terminal.", + "settings-info-terminal-convert-eol": "Konversikan akhir baris saat menempel atau menampilkan keluaran terminal.", "settings-note-formatter-settings": "Tetapkan pemformat untuk setiap bahasa. Pasang plugin pemformat untuk membuka lebih banyak opsi.", - "settings-note-lsp-settings": "Server bahasa menambahkan penyelesaian otomatis, diagnostik, detail melayang, dan sebagainya. Mereka bekerja lebih baik dengan folder yang bisa diakses langsung oleh terminal bawaan Acode, seperti folder terminal/publik. Lokasi SAF, eksternal, dan jarak jauh dilewati secara default karena mereka mungkin menggunakan jalur yang di-cache atau virtual; aktifkan opsi kompatibilitas hanya jika Anda ingin mencobanya.", + "settings-note-lsp-settings": "Server bahasa menambahkan penyelesaian otomatis, diagnostik, informasi saat kursor diarahkan, dan sebagainya. Server bekerja lebih baik dengan folder yang dapat diakses langsung oleh terminal bawaan Acode, seperti folder terminal/publik. Lokasi SAF, eksternal, dan jarak jauh dilewati secara bawaan karena mungkin menggunakan jalur yang di-cache atau virtual; aktifkan opsi kompatibilitas hanya jika Anda ingin mencobanya.", "search result label singular": "hasil", "search result label plural": "hasil", "pin tab": "Sematkan tab", "unpin tab": "Lepas sematan tab", "pinned tab": "Tab yang tersematkan", - "unpin tab before closing": "Lepas sematan tab sebelum ditutup.", + "unpin tab before closing": "Lepas sematan tab sebelum menutupnya.", "app font": "Font Aplikasi", "settings-info-app-font-family": "Pilih font yang digunakan di seluruh antarmuka aplikasi.", "lsp-transport-method-stdio": "STDIO (luncurkan perintah biner)", "lsp-transport-method-websocket": "WebSocket (hubungkan ke sebuah URL ws/wss)", "lsp-websocket-url": "URL WebSocket", - "lsp-websocket-server-managed-externally": "Server ini dikelola secara eksternal lewat WebSocket.", - "lsp-error-websocket-url-invalid": "URL WebSocket harus berawalan ws:// atau wss://", - "lsp-error-websocket-url-required": "URL WebSocket diperlukan", + "lsp-websocket-server-managed-externally": "Server ini dikelola secara eksternal melalui WebSocket.", + "lsp-error-websocket-url-invalid": "URL WebSocket harus diawali dengan ws:// atau wss://.", + "lsp-error-websocket-url-required": "URL WebSocket diperlukan.", "lsp-remove-custom-server": "Hapus server kustom", "lsp-remove-custom-server-confirm": "Hapus server bahasa kustom {server}?", "lsp-custom-server-removed": "Server kustom dihapus", "settings-info-lsp-remove-custom-server": "Hapus server bahasa kustom ini dari Acode.", - "unsaved selected tabs warning": "Beberapa tab terpilih tidak disimpan. Pilih apa yang harus dilakukan.", + "unsaved selected tabs warning": "Beberapa tab yang dipilih belum disimpan. Pilih tindakan yang akan dilakukan.", "save selected tabs": "Simpan tab terpilih", "close selected tabs": "Tutup tab terpilih", - "save selected tabs warning": "Apakah Anda yakin ingin menyimpan dan menutup tab terpilih?", - "close selected tabs warning": "Apakah Anda yakin ingin menutup tab terpilih? Anda akan kehilangan perubahan yang belum disimpan dan aksi ini tidak dapat dibatalkan.", + "save selected tabs warning": "Apakah Anda yakin ingin menyimpan dan menutup tab yang dipilih?", + "close selected tabs warning": "Apakah Anda yakin ingin menutup tab yang dipilih? Anda akan kehilangan perubahan yang belum disimpan dan tindakan ini tidak dapat diurungkan.", "close tabs to right": "Tutup Kanan", "close tabs to left": "Tutup Kiri", "close other tabs": "Tutup Lainnya", "auto close tags": "Penutup tag otomatis", - "settings-info-editor-auto-close-tags": "Menyisipkan tag penutup di berkas HTML, XML, Vue, Angular, dan templat PHP secara otomatis.", + "settings-info-editor-auto-close-tags": "Sisipkan tag penutup secara otomatis di berkas HTML, XML, Vue, Angular, dan templat PHP.", "ui zoom": "Pembesaran UI", "settings-info-app-ui-zoom": "Skalakan teks di seluruh antarmuka Acode.", "show share button": "Tampilkan tombol bagikan", "settings-info-editor-show-share-button": "Tampilkan tombol bagikan di menu pemilihan.", "plugin-not-supported": "Plugin tidak didukung", "plugin-not-supported-info": "Plugin dibuat untuk versi lama dari Acode.", - "login-to-view": "Mohon login untuk melihat ini...", + "login-to-view": "Mohon masuk untuk melihat ini...", "iap-plugin-purchase-warning": "Plugin yang dibeli tidak disinkronkan ke akun Acode Anda. Gunakan akun Google yang sama di Play Store untuk memulihkan pembelian Anda.", "iap-pro-purchase-warning": "Pembelian ini tidak akan disinkronkan ke akun Acode Anda. Gunakan akun Google yang sama di Play Store untuk memulihkan pembelian Anda.", "confirm-login": "Anda belum masuk ke Acode, masuk sekarang?", "local word completion": "Penyelesaian kata lokal", "language package completion": "Penyelesaian paket bahasa", "settings-info-editor-local-word-completion": "Sarankan kata dari berkas saat ini.", - "settings-info-editor-language-completion": "Sarankan kata kunci, snippet, dan penyelesaian lainnya dari paket bahasa CodeMirror.", + "settings-info-editor-language-completion": "Sarankan kata kunci, cuplikan, dan penyelesaian lainnya dari paket bahasa CodeMirror.", "terminal:failsafe": "Mode FailSafe", - "terminal:failsafe-info": "Mulai terminal dengan shell sistem", + "terminal:failsafe-info": "Mulai terminal dengan shell sistem.", "auto rename tags": "Ubah nama tag otomatis", - "settings-info-editor-auto-rename-tags": "Ubah nama tag pembuka atau penutup yang sama ketika mengedit tag yang mirip HTML.", + "settings-info-editor-auto-rename-tags": "Ubah nama tag pembuka atau penutup yang berpasangan saat mengedit tag mirip HTML.", "copying items": "Menyalin {count} item...", - "cannot paste folder into itself": "Tidak bisa menempelkan folder ke dalam dirinya sendiri", + "cannot paste folder into itself": "Tidak dapat menempelkan folder ke dalam dirinya sendiri.", "folder already exists": "Folder sudah ada", "file already exists force named": "'{name}' sudah ada. Timpa?", "lsp-allow-non-terminal-workspace": "Jalankan LSP di folder eksternal", - "settings-info-lsp-allow-non-terminal-workspace": "Izinkan server bahasa untuk lokasi SAF, eksternal, dan jarak jauh. LSP berjalan di terminal bawaan Acode, yang tidak dapat mengakses lokasi tersebut, jadi fitur-fitur mungkin tidak dapat bekerja dengan benar. Karena itu akan terhubung ke jalur virtual atau lokasi cache.", + "settings-info-lsp-allow-non-terminal-workspace": "Izinkan server bahasa untuk lokasi SAF, eksternal, dan jarak jauh. LSP berjalan di terminal bawaan Acode yang tidak dapat mengakses lokasi tersebut, sehingga beberapa fitur mungkin tidak dapat bekerja dengan benar karena akan terhubung ke jalur virtual atau lokasi cache.", "don't ask again": "Jangan tanyakan lagi", "scrollbar height": "Tinggi bilah gulir", "full": "Penuh", "scroll past end": "Gulir melewati akhir", - "settings-info-scroll-past-end": "Menambahkan spasi kosong ekstra di bawah editor, memungkinkan Anda untuk gulir baris terakhir ke atas.", + "settings-info-scroll-past-end": "Menambahkan ruang kosong tambahan di bawah editor, sehingga Anda dapat menggulirkan baris terakhir ke atas.", "compact": "Ringkas", "off": "Mati", "quick tools height": "Tinggi alat cepat", @@ -775,9 +775,9 @@ "recommend extensions": "Rekomendasikan ekstensi", "settings-info-editor-recommend-extensions": "Sarankan plugin saat file dibuka sebagai teks biasa karena mode bahasa tidak tersedia.", "extension recommendation title": "Ekstensi yang tersedia untuk {extension}", - "extension recommendation message": "Tidak ada mode sintaksis yang diinstal untuk {extension}. Cari plugin untuk \"{keyword}\".", + "extension recommendation message": "Tidak ada mode sintaksis yang terpasang untuk {extension}. Cari plugin untuk \"{keyword}\".", "extension request title": "Ekstensi tidak ditemukan untuk {extension}", - "extension request message": "Minta plugin agar Acode dapat menyoroti jenis file ini.", + "extension request message": "Minta plugin agar Acode dapat menyoroti jenis berkas ini.", "search plugins": "Cari plugin", "request plugin": "Minta plugin", "terminal:block": "Blok", @@ -833,7 +833,7 @@ "info-terminal-show-scrollbar": "Tampilkan bilah gulir xterm di samping terminal.", "terminal:show scrollbar": "Tampilkan Bilah Gulir", "apply exclusions when copying": "Terapkan pengecualian saat menyalin", - "settings-info-app-use-file-operation-exclusions": "Lewati file dan folder yang cocok dengan pola pengecualian selama operasi salin dan tempel.", + "settings-info-app-use-file-operation-exclusions": "Lewati berkas dan folder yang cocok dengan pola pengecualian selama operasi salin dan tempel.", "horizontal scroll margin": "Margin gulir horizontal", - "settings-info-horizontal-scroll-margin": "Menambahkan ruang kosong setelah baris terpanjang saat pembungkusan kata (word wrap) nonaktif. Masukkan nilai piksel utuh non-negatif apa pun." + "settings-info-horizontal-scroll-margin": "Menambahkan ruang kosong setelah baris terpanjang saat pembungkus kata (word wrap) dinonaktifkan. Masukkan nilai piksel bilangan bulat non-negatif." } From 4c5b3cb8c4cc41feed1bc5ecfbe38eefc4ed63eb Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Wed, 26 Aug 2026 21:18:34 +0530 Subject: [PATCH 075/195] update deps --- bun.lock | 1284 ++++++--------------------------------------- package-lock.json | 1049 +++++++++++++++++++----------------- package.json | 54 +- 3 files changed, 750 insertions(+), 1637 deletions(-) diff --git a/bun.lock b/bun.lock index a52d31d962..308c5a1031 100644 --- a/bun.lock +++ b/bun.lock @@ -18,7 +18,7 @@ "@codemirror/lang-json": "^6.0.2", "@codemirror/lang-less": "^6.0.2", "@codemirror/lang-liquid": "^6.3.2", - "@codemirror/lang-markdown": "^6.5.0", + "@codemirror/lang-markdown": "^6.5.2", "@codemirror/lang-php": "^6.0.2", "@codemirror/lang-python": "^6.2.1", "@codemirror/lang-rust": "^6.0.2", @@ -51,57 +51,57 @@ "@xterm/addon-web-links": "^0.12.0", "@xterm/addon-webgl": "^0.19.0", "@xterm/xterm": "^6.0.0", - "acorn": "^8.16.0", + "acorn": "^8.18.0", "autosize": "^6.0.1", "codemirror": "^6.0.2", "cordova": "13.0.0", - "core-js": "^3.49.0", - "dayjs": "^1.11.20", - "dompurify": "^3.4.11", + "core-js": "^3.50.0", + "dayjs": "^1.11.23", + "dompurify": "^3.4.14", "escape-string-regexp": "^5.0.0", "esprima": "^4.0.1", - "filesize": "^11.0.17", + "filesize": "^11.0.22", "html-tag-js": "^2.4.16", "jszip": "^3.10.1", - "katex": "^0.16.45", - "markdown-it": "^14.2.0", - "markdown-it-anchor": "^9.2.0", - "markdown-it-emoji": "^3.0.0", + "katex": "^0.16.47", + "markdown-it": "^14.3.0", + "markdown-it-anchor": "^9.2.1", + "markdown-it-emoji": "^3.1.0", "markdown-it-footnote": "^4.0.0", "markdown-it-github-alerts": "^1.0.1", "markdown-it-task-lists": "^2.1.1", "markdown-it-texmath": "^1.0.0", "mermaid": "^11.14.0", "mime-types": "^3.0.2", - "motion": "^12.42.0", + "motion": "^12.43.0", "mustache": "^4.2.0", - "picomatch": "^4.0.4", + "picomatch": "^4.0.7", "url-parse": "^1.5.10", "vanilla-picker": "^2.12.3", "vscode-css-languageservice": "6.3.10", "vscode-html-languageservice": "5.6.2", "vscode-json-languageservice": "5.7.2", "vscode-languageserver-textdocument": "1.0.12", - "yargs": "^18.0.0", + "yargs": "^18.1.0", }, "devDependencies": { "@babel/core": "^8.0.1", - "@babel/generator": "^7.29.1", - "@babel/parser": "^7.29.3", + "@babel/generator": "^7.29.8", + "@babel/parser": "^7.29.8", "@babel/plugin-transform-runtime": "^8.0.1", - "@babel/preset-env": "^8.0.1", + "@babel/preset-env": "^8.0.2", "@babel/preset-typescript": "^8.0.1", - "@babel/runtime": "^7.29.2", - "@babel/runtime-corejs3": "^7.29.2", - "@babel/traverse": "^7.29.0", + "@babel/runtime": "^7.29.7", + "@babel/runtime-corejs3": "^7.29.7", + "@babel/traverse": "^7.29.8", "@biomejs/biome": "2.4.11", "@lezer/generator": "^1.8.0", - "@rspack/cli": "^2.0.0", - "@rspack/core": "^2.0.0", + "@rspack/cli": "^2.2.0", + "@rspack/core": "^2.2.0", "@types/ace": "^0.0.52", "@types/cordova": "^11.0.3", "@types/url-parse": "^1.4.11", - "autoprefixer": "^10.5.0", + "autoprefixer": "^10.5.4", "babel-loader": "^10.1.1", "chokidar": "^4.0.3", "com.foxdebug.acode.rk.auth": "file:src/plugins/auth", @@ -126,22 +126,22 @@ "cordova-plugin-system": "file:src/plugins/system", "cordova-plugin-websocket": "file:src/plugins/websocket", "css-loader": "^7.1.4", - "happy-dom": "^20.11.1", + "happy-dom": "^20.11.6", "mini-css-extract-plugin": "^2.10.2", "path-browserify": "^1.0.1", "postcss-loader": "^8.2.1", "prettier": "^3.8.3", "prettier-plugin-java": "^2.8.1", "raw-loader": "^4.0.2", - "sass": "^1.99.0", + "sass": "^1.103.1", "sass-loader": "^16.0.8", "style-loader": "^4.0.0", "terminal": "^0.1.4", - "ts-loader": "^9.5.7", + "ts-loader": "^9.6.2", "typescript": "^5.9.3", - "vitest": "^4.1.10", + "vitest": "^4.1.11", "vscode-languageserver-types": "^3.17.5", - "ws": "^8.21.0", + "ws": "^8.21.3", }, }, }, @@ -164,7 +164,7 @@ "@babel/core": ["@babel/core@8.0.1", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-compilation-targets": "^8.0.0", "@babel/helpers": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/traverse": "^8.0.0", "@babel/types": "^8.0.0", "@types/gensync": "^1.0.5", "convert-source-map": "^2.0.0", "empathic": "^2.0.1", "gensync": "^1.0.0-beta.2", "import-meta-resolve": "^4.2.0", "json5": "^2.2.3", "obug": "^2.1.1", "semver": "^7.7.3" } }, "sha512-5FgxM4dLQpMJHSiVATk8foW263dVHQHBVpXYiimNECVWG01f4nFyEbQixeT6Mwvg7TayREJ2gpKl3o2RoMdnqw=="], - "@babel/generator": ["@babel/generator@7.29.1", "", { "dependencies": { "@babel/parser": "^7.29.0", "@babel/types": "^7.29.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" } }, "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw=="], + "@babel/generator": ["@babel/generator@7.29.8", "", { "dependencies": { "@babel/parser": "^7.29.8", "@babel/types": "^7.29.8", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" } }, "sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg=="], "@babel/helper-annotate-as-pure": ["@babel/helper-annotate-as-pure@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" } }, "sha512-NSpMkMsvvZqzThJ0p1B02cbtA2ObEyfBvq950bmNkyxsxvcxwhvvCB036rKhlEnuBBo30bOrk13u3FzlKSoRrw=="], @@ -176,7 +176,7 @@ "@babel/helper-define-polyfill-provider": ["@babel/helper-define-polyfill-provider@1.0.0", "", { "dependencies": { "@babel/helper-compilation-targets": "^8.0.0", "@babel/helper-plugin-utils": "^8.0.0", "lodash.debounce": "^4.0.8" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0" } }, "sha512-9jzVaTeZyXRDKTgUnNzcPQMO8y0ga3o+Z4fKjNet9Fcx7slgKa83qRbz0EwROSd6qO6CoEe/HQszqSPKb5lhkw=="], - "@babel/helper-globals": ["@babel/helper-globals@7.28.0", "", {}, "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw=="], + "@babel/helper-globals": ["@babel/helper-globals@7.29.7", "", {}, "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA=="], "@babel/helper-member-expression-to-functions": ["@babel/helper-member-expression-to-functions@8.0.0", "", { "dependencies": { "@babel/traverse": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-xkXrMbtk87Gk7+oKBVmBc6EORg/Qwx++AHESldmHkpvG8wgccdhJJFwrzqlF382Fk8wfXhJHWE/g/43QvEGNPQ=="], @@ -204,7 +204,7 @@ "@babel/helpers": ["@babel/helpers@8.0.0", "", { "dependencies": { "@babel/template": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-wfbi91pM3py96oIiJEz7qIpyXDytgr9zQC1HEWwlGNVRAEmItuU/0a41ZUKu1sJGyhhOIpc4t5vk4PYzt8wpsg=="], - "@babel/parser": ["@babel/parser@7.29.3", "", { "dependencies": { "@babel/types": "^7.29.0" }, "bin": "./bin/babel-parser.js" }, "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA=="], + "@babel/parser": ["@babel/parser@7.29.8", "", { "dependencies": { "@babel/types": "^7.29.8" }, "bin": "./bin/babel-parser.js" }, "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA=="], "@babel/plugin-bugfix-firefox-class-in-computed-class-key": ["@babel/plugin-bugfix-firefox-class-in-computed-class-key@8.0.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^8.0.1" }, "peerDependencies": { "@babel/core": "^8.0.0" } }, "sha512-Ytgjjne4RnG3Oig7ik+NfY4ebRY30BPptVkkyu1f72eINJXRM3/bkU++tIc5aPvyLmo4KH20avq0xJ2o+9aEnw=="], @@ -332,13 +332,13 @@ "@babel/preset-typescript": ["@babel/preset-typescript@8.0.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^8.0.1", "@babel/helper-validator-option": "^8.0.0", "@babel/plugin-transform-modules-commonjs": "^8.0.1", "@babel/plugin-transform-typescript": "^8.0.1" }, "peerDependencies": { "@babel/core": "^8.0.0" } }, "sha512-qrPhQIN1NLrPmzgazF9XKQqXrOcp/WJly+K+6ReFonn24FZqRJO7clxOJo6Ni75L+2vAqI3cHVU2OJLBxoPp5A=="], - "@babel/runtime": ["@babel/runtime@7.29.2", "", {}, "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g=="], + "@babel/runtime": ["@babel/runtime@7.29.7", "", {}, "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw=="], - "@babel/runtime-corejs3": ["@babel/runtime-corejs3@7.29.2", "", { "dependencies": { "core-js-pure": "^3.48.0" } }, "sha512-Lc94FOD5+0aXhdb0Tdg3RUtqT6yWbI/BbFWvlaSJ3gAb9Ks+99nHRDKADVqC37er4eCB0fHyWT+y+K3QOvJKbw=="], + "@babel/runtime-corejs3": ["@babel/runtime-corejs3@7.29.7", "", { "dependencies": { "core-js-pure": "^3.48.0" } }, "sha512-ppj9ouYku+RX0ljtgZd+KMO5mkM2bCqg8H2PYAFWnLsHEIKIdRojqbJ2i3eVHrisuxy7nOFCmngTDdWtUCdXUQ=="], "@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - "@babel/traverse": ["@babel/traverse@7.29.0", "", { "dependencies": { "@babel/code-frame": "^7.29.0", "@babel/generator": "^7.29.0", "@babel/helper-globals": "^7.28.0", "@babel/parser": "^7.29.0", "@babel/template": "^7.28.6", "@babel/types": "^7.29.0", "debug": "^4.3.1" } }, "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA=="], + "@babel/traverse": ["@babel/traverse@7.29.8", "", { "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/generator": "^7.29.8", "@babel/helper-globals": "^7.29.7", "@babel/parser": "^7.29.8", "@babel/template": "^7.29.7", "@babel/types": "^7.29.8", "debug": "^4.3.1" } }, "sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg=="], "@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], @@ -398,7 +398,7 @@ "@codemirror/lang-liquid": ["@codemirror/lang-liquid@6.3.2", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-html": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.3.1" } }, "sha512-6PDVU3ZnfeYyz1at1E/ttorErZvZFXXt1OPhtfe1EZJ2V2iDFa0CwPqPgG5F7NXN0yONGoBogKmFAafKTqlwIw=="], - "@codemirror/lang-markdown": ["@codemirror/lang-markdown@6.5.0", "", { "dependencies": { "@codemirror/autocomplete": "^6.7.1", "@codemirror/lang-html": "^6.0.0", "@codemirror/language": "^6.3.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", "@lezer/common": "^1.2.1", "@lezer/markdown": "^1.0.0" } }, "sha512-0K40bZ35jpHya6FriukbgaleaqzBLZfOh7HuzqbMxBXkbYMJDxfF39c23xOgxFezR+3G+tR2/Mup+Xk865OMvw=="], + "@codemirror/lang-markdown": ["@codemirror/lang-markdown@6.5.2", "", { "dependencies": { "@codemirror/autocomplete": "^6.7.1", "@codemirror/lang-html": "^6.0.0", "@codemirror/language": "^6.3.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", "@lezer/common": "^1.2.1", "@lezer/markdown": "^1.0.0" } }, "sha512-AwBOdkWYuA//WcM0xO5PfHPUcmz/O2i5o0Nsg1U69SII/loCJlFI1Romd9xp2HYb1kYJRGZotyqRghuHH5n8Kw=="], "@codemirror/lang-php": ["@codemirror/lang-php@6.0.2", "", { "dependencies": { "@codemirror/lang-html": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@lezer/common": "^1.0.0", "@lezer/php": "^1.0.0" } }, "sha512-ZKy2v1n8Fc8oEXj0Th0PUMXzQJ0AIR6TaZU+PbDHExFwdu+guzOA4jmCHS1Nz4vbFezwD7LyBdDnddSJeScMCA=="], @@ -426,7 +426,7 @@ "@codemirror/lint": ["@codemirror/lint@6.9.7", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.42.0", "crelt": "^1.0.5" } }, "sha512-28/+iWLYxKxsvGYhSYL7zaCZqLz5+FFFDq9tVsvGv9kv8RY4fFAchJ5WX9M3YrrRlTIsECjsXPqeNgnSmNP2dg=="], - "@codemirror/lsp-client": ["@codemirror/lsp-client@github:Acode-Foundation/codemirror-lsp-client#db6930c", { "dependencies": { "@codemirror/autocomplete": "^6.20.0", "@codemirror/language": "^6.11.0", "@codemirror/lint": "^6.8.5", "@codemirror/state": "^6.5.2", "@codemirror/view": "^6.37.0", "@lezer/highlight": "^1.2.1", "marked": "^15.0.12", "vscode-languageserver-protocol": "^3.17.5" } }, "Acode-Foundation-codemirror-lsp-client-db6930c"], + "@codemirror/lsp-client": ["@codemirror/lsp-client@github:Acode-Foundation/codemirror-lsp-client#db6930c", { "dependencies": { "@codemirror/autocomplete": "^6.20.0", "@codemirror/language": "^6.11.0", "@codemirror/lint": "^6.8.5", "@codemirror/state": "^6.5.2", "@codemirror/view": "^6.37.0", "@lezer/highlight": "^1.2.1", "marked": "^15.0.12", "vscode-languageserver-protocol": "^3.17.5" } }, "Acode-Foundation-codemirror-lsp-client-db6930c", "sha512-yENf3NqsXGERWcvUL98FziXbUgkB1R4jU2kTQGYxwcZ6HwTP8+uwebs/j+HDRD7VbxRyemYJClvMNU8n0p8UPg=="], "@codemirror/search": ["@codemirror/search@6.7.1", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.37.0", "crelt": "^1.0.5" } }, "sha512-uMe5UO6PamJtSHrXhhHOzSX3ReWtiJrva6GnPMwSOrZtiExb5X5eExhr2OUZQVvdxPsKpY3Ro2mFbQadpPWmHA=="], @@ -448,16 +448,14 @@ "@emmetio/scanner": ["@emmetio/scanner@1.0.4", "", {}, "sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA=="], - "@emnapi/core": ["@emnapi/core@1.10.0", "", { "dependencies": { "@emnapi/wasi-threads": "1.2.1", "tslib": "^2.4.0" } }, "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw=="], + "@emnapi/core": ["@emnapi/core@1.11.3", "", { "dependencies": { "@emnapi/wasi-threads": "1.2.3", "tslib": "^2.4.0" } }, "sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg=="], - "@emnapi/runtime": ["@emnapi/runtime@1.10.0", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA=="], + "@emnapi/runtime": ["@emnapi/runtime@1.11.3", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA=="], - "@emnapi/wasi-threads": ["@emnapi/wasi-threads@1.2.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w=="], + "@emnapi/wasi-threads": ["@emnapi/wasi-threads@1.2.3", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g=="], "@gar/promise-retry": ["@gar/promise-retry@1.0.3", "", {}, "sha512-GmzA9ckNokPypTg10pgpeHNQe7ph+iIKKmhKu3Ob9ANkswreCx7R3cKmY781K8QK3AqVL3xVh9A42JvIAbkkSA=="], - "@gar/promisify": ["@gar/promisify@1.1.3", "", {}, "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="], - "@iconify/types": ["@iconify/types@2.0.0", "", {}, "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg=="], "@iconify/utils": ["@iconify/utils@3.1.0", "", { "dependencies": { "@antfu/install-pkg": "^1.1.0", "@iconify/types": "^2.0.0", "mlly": "^1.8.0" } }, "sha512-Zlzem1ZXhI1iHeeERabLNzBHdOa4VhQbqAcOQaMKuTuyZCpwKbC2R4Dd0Zo3g9EAc+Y4fiarO8HIHRAth7+skw=="], @@ -514,9 +512,9 @@ "@marijn/find-cluster-break": ["@marijn/find-cluster-break@1.0.2", "", {}, "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g=="], - "@mermaid-js/parser": ["@mermaid-js/parser@1.1.1", "", { "dependencies": { "@chevrotain/types": "~11.1.1" } }, "sha512-VuHdsYMK1bT6X2JbcAaWAhugTRvRBRyuZgd+c22swUeI9g/ntaxF7CY7dYarhZovofCbUNO0G7JesfmNtjYOCw=="], + "@mermaid-js/parser": ["@mermaid-js/parser@1.2.1", "", { "dependencies": { "@chevrotain/types": "~11.1.2" } }, "sha512-n12NohV3mrUyUL2o93IgG/ifeW9FTyeJn3zDxkhwa8MJ9Fxg3HQMlA3RiGmD/3UnJvheztkjjQAjA2T4LmUcpw=="], - "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.1.4", "", { "dependencies": { "@tybys/wasm-util": "^0.10.1" }, "peerDependencies": { "@emnapi/core": "^1.7.1", "@emnapi/runtime": "^1.7.1" } }, "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow=="], + "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.1.6", "", { "dependencies": { "@tybys/wasm-util": "^0.10.3" }, "peerDependencies": { "@emnapi/core": "^1.7.1", "@emnapi/runtime": "^1.7.1" } }, "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg=="], "@netflix/nerror": ["@netflix/nerror@1.1.3", "", { "dependencies": { "assert-plus": "^1.0.0", "extsprintf": "^1.4.0", "lodash": "^4.17.15" } }, "sha512-b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="], @@ -540,8 +538,6 @@ "@npmcli/metavuln-calculator": ["@npmcli/metavuln-calculator@9.0.3", "", { "dependencies": { "cacache": "^20.0.0", "json-parse-even-better-errors": "^5.0.0", "pacote": "^21.0.0", "proc-log": "^6.0.0", "semver": "^7.3.5" } }, "sha512-94GLSYhLXF2t2LAC7pDwLaM4uCARzxShyAQKsirmlNcpidH89VA4/+K1LbJmRMgz5gy65E/QBBWQdUvGLe2Frg=="], - "@npmcli/move-file": ["@npmcli/move-file@1.1.2", "", { "dependencies": { "mkdirp": "^1.0.4", "rimraf": "^3.0.2" } }, "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="], - "@npmcli/name-from-folder": ["@npmcli/name-from-folder@4.0.0", "", {}, "sha512-qfrhVlOSqmKM8i6rkNdZzABj8MKEITGFAY+4teqBziksCQAOLutiAxM1wY2BKEd8KjUSpWmWCYxvXr0y4VTlPg=="], "@npmcli/node-gyp": ["@npmcli/node-gyp@5.0.0", "", {}, "sha512-uuG5HZFXLfyFKqg8QypsmgLQW7smiRjVc45bqD/ofZZcR/uxEjgQU8qDPv0s9TEeMUiAAU/GC5bR6++UdTirIQ=="], @@ -618,31 +614,39 @@ "@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.1", "", {}, "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw=="], - "@rspack/binding": ["@rspack/binding@2.0.2", "", { "optionalDependencies": { "@rspack/binding-darwin-arm64": "2.0.2", "@rspack/binding-darwin-x64": "2.0.2", "@rspack/binding-linux-arm64-gnu": "2.0.2", "@rspack/binding-linux-arm64-musl": "2.0.2", "@rspack/binding-linux-x64-gnu": "2.0.2", "@rspack/binding-linux-x64-musl": "2.0.2", "@rspack/binding-wasm32-wasi": "2.0.2", "@rspack/binding-win32-arm64-msvc": "2.0.2", "@rspack/binding-win32-ia32-msvc": "2.0.2", "@rspack/binding-win32-x64-msvc": "2.0.2" } }, "sha512-0kZPplW9GWx8mfC6DfsaRY3QBIYPuUs42JfmSM6aSb8tMHZAXQeLeMB8M+h8i4SeI+aFtCgO6UuYGtyWf7+L+A=="], + "@rspack/binding": ["@rspack/binding@2.2.0", "", { "optionalDependencies": { "@rspack/binding-darwin-arm64": "2.2.0", "@rspack/binding-darwin-x64": "2.2.0", "@rspack/binding-linux-arm64-gnu": "2.2.0", "@rspack/binding-linux-arm64-musl": "2.2.0", "@rspack/binding-linux-ppc64-gnu": "2.2.0", "@rspack/binding-linux-riscv64-gnu": "2.2.0", "@rspack/binding-linux-riscv64-musl": "2.2.0", "@rspack/binding-linux-s390x-gnu": "2.2.0", "@rspack/binding-linux-x64-gnu": "2.2.0", "@rspack/binding-linux-x64-musl": "2.2.0", "@rspack/binding-wasm32-wasi": "2.2.0", "@rspack/binding-win32-arm64-msvc": "2.2.0", "@rspack/binding-win32-ia32-msvc": "2.2.0", "@rspack/binding-win32-x64-msvc": "2.2.0" } }, "sha512-nxZzJqqB0EmEKp6qjzFNkBb/SgGt0k0DSENrLvAJgvVvrm3waVsubD0cfxtPlZY/rd5SzadzxWGEHRyFcds5nA=="], + + "@rspack/binding-darwin-arm64": ["@rspack/binding-darwin-arm64@2.2.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-KAVVT7hp3NBjtc/RY2UtOjzzc8i+s4pIhW1p52UV+Aev6ywQCu3dXwkHTonpPvJO3hqLXc4zIMH5l4HbMqBm4g=="], + + "@rspack/binding-darwin-x64": ["@rspack/binding-darwin-x64@2.2.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-rzyJCX99aFwl540trsVMNZOgK4+IFm2d5+YeP+RdNo9Uprxloz8vHz0J4dYtaq6MRiCAyM60dAwEa3wJMwqWAQ=="], - "@rspack/binding-darwin-arm64": ["@rspack/binding-darwin-arm64@2.0.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-0o7lbgBBsDlICWdjIH0q3e0BsSco4GRiImHWVfZSVEG+q2+ykZJvSvYCVhPM1Co375Z0S3VMPa/8SjcY1FHwlw=="], + "@rspack/binding-linux-arm64-gnu": ["@rspack/binding-linux-arm64-gnu@2.2.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-0t8QOiOMcBV7RvPSsTJ5DQ4QCK6FIyUZy77qbxnS6asGTOXPZZn7V5cL26IxEv/wuHdQ6tQOXheau1fi+gGyBQ=="], - "@rspack/binding-darwin-x64": ["@rspack/binding-darwin-x64@2.0.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-tOwxZpoPlTlRs/w6UyUinXJ4TYRVHMlR7+eQxO1R3muKpixvhXQjtvoaY16HuFyTVky5F0IfOoWr3x9FEsgdLg=="], + "@rspack/binding-linux-arm64-musl": ["@rspack/binding-linux-arm64-musl@2.2.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-BAvCukqcuHxUdE294ITCohvhVkEklW8RbkKkR36Uo0WyIiMPGrnvPjARPn0/4Q4xMAz7lUmC60sZrvJHlAOKMw=="], - "@rspack/binding-linux-arm64-gnu": ["@rspack/binding-linux-arm64-gnu@2.0.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-1ZD4YFhG1rmgqj+W8hfwHyKV8xDxGsc/3KgU0FwmiVEX7JfzhCkgBO/xlCG79kRKSrzuVzt4icO/G3cCKn0pag=="], + "@rspack/binding-linux-ppc64-gnu": ["@rspack/binding-linux-ppc64-gnu@2.2.0", "", { "os": "linux", "cpu": "ppc64" }, "sha512-nCHqZLv/E8nm2ccGkb00F5DQtXxzGy3W3X73ArA+N0+zXJUnzRcSRSwr7AE8pVgP/FYfX4yMFgUXy0g0YxYGRA=="], - "@rspack/binding-linux-arm64-musl": ["@rspack/binding-linux-arm64-musl@2.0.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-/PtTkM/DsDLjeuXTmeJeRfbjCDbcL9jvoVgZrgxYFZ28y2cdLvbChbW9uigOzs5dQEs1CIBQXMTTj7KhdBTuQg=="], + "@rspack/binding-linux-riscv64-gnu": ["@rspack/binding-linux-riscv64-gnu@2.2.0", "", { "os": "linux", "cpu": "none" }, "sha512-CA3WEqKFDI6FAZTnCho2n9pmdPWZYAW/S8mqgxd0cx2Jix43at3VyLxhCC7ED5A9WBSFn/AdHaIbVtgoQHVhWA=="], - "@rspack/binding-linux-x64-gnu": ["@rspack/binding-linux-x64-gnu@2.0.2", "", { "os": "linux", "cpu": "x64" }, "sha512-bBjsZxMHRaPo6X9SokApm6ucs+UhXtAJFyJJyuk2BH4XJsLeCU9Dz1vMwioeohFbJUUeTASVPm6/BL+RhSaunw=="], + "@rspack/binding-linux-riscv64-musl": ["@rspack/binding-linux-riscv64-musl@2.2.0", "", { "os": "linux", "cpu": "none" }, "sha512-kHB960oClkoPRPZ6sdkhRvqbdRIlbpIMYd/Tbxfmn3DWQahiCk1pkUFJbOtFq3EgESxZISV4THl442W2Y57HvQ=="], - "@rspack/binding-linux-x64-musl": ["@rspack/binding-linux-x64-musl@2.0.2", "", { "os": "linux", "cpu": "x64" }, "sha512-HjlpInqzabDNkhVsUJpsHPqa9QYVWBViJoyWNjzXCAW0vKMDvwaphyUvokSinX8FGTlZi/sr5UEaHJo6XtQ35g=="], + "@rspack/binding-linux-s390x-gnu": ["@rspack/binding-linux-s390x-gnu@2.2.0", "", { "os": "linux", "cpu": "s390x" }, "sha512-lVBdiffVo1jq0P0jT36jNou2suLB4ueQI4aWUs+HM+h67YPBtVKWu/mo5Wh59+8nowgcZmYaFM5hdH69963I9w=="], - "@rspack/binding-wasm32-wasi": ["@rspack/binding-wasm32-wasi@2.0.2", "", { "dependencies": { "@emnapi/core": "1.10.0", "@emnapi/runtime": "1.10.0", "@napi-rs/wasm-runtime": "1.1.4" }, "cpu": "none" }, "sha512-YaRYNFLJRpkGfYjSWR7n9f+nQKtrlmrrffpAn/blc2geHcRvXoBc5SCs1idPtsLhj7H9qWWhs7ucjyHy4csWFg=="], + "@rspack/binding-linux-x64-gnu": ["@rspack/binding-linux-x64-gnu@2.2.0", "", { "os": "linux", "cpu": "x64" }, "sha512-M49UaWspE0YJ3268DsquD8idEQTfjBDMvO/I8qccV/Z5T+Q98FJ+kIs5liUaTWb48OIbDEK+8ZKx5QzLbfVN6g=="], - "@rspack/binding-win32-arm64-msvc": ["@rspack/binding-win32-arm64-msvc@2.0.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-d/3kTEKq+asLjRFPO96t+wfWiM7DLN76VQEPDD9bc1kdsZXlVJBuvyXfsgK8bbEvKplWXYcSsokhmEnuXrLOpg=="], + "@rspack/binding-linux-x64-musl": ["@rspack/binding-linux-x64-musl@2.2.0", "", { "os": "linux", "cpu": "x64" }, "sha512-YYbs0wmey+5blhEQDE4Dax3TwJtqfGwe2QBm3OLphlBHo/fcZVvimzKkMV0/pVrZTLy2z5ZAwNhGMY64bNr77w=="], - "@rspack/binding-win32-ia32-msvc": ["@rspack/binding-win32-ia32-msvc@2.0.2", "", { "os": "win32", "cpu": "ia32" }, "sha512-161cWineq3RW+Jdm1FAfSpXeUtYWvhB3kAbm46vNT9h/YYz+spwsFMvveAZ1nsVSVL0IC5lDBGUte7yUAY8K2g=="], + "@rspack/binding-wasm32-wasi": ["@rspack/binding-wasm32-wasi@2.2.0", "", { "dependencies": { "@emnapi/core": "1.11.3", "@emnapi/runtime": "1.11.3", "@napi-rs/wasm-runtime": "1.1.6" }, "cpu": "none" }, "sha512-rerLPTN/HD4EvLNWs3O2N+Eb37eGvLRIP3dXXc3n+UzTebOepAsahNn44vXeRBsE4m/pHkpDJjwgWTytgQ2gBw=="], - "@rspack/binding-win32-x64-msvc": ["@rspack/binding-win32-x64-msvc@2.0.2", "", { "os": "win32", "cpu": "x64" }, "sha512-y7Q0S1FE+OlkL5GMqLG0PwxrPw6E1r892KhGrGKE1Vdufe5YTEx6xTPxzZ+b7N2KPD7s9G1/iJmWHQxb1+Bjkg=="], + "@rspack/binding-win32-arm64-msvc": ["@rspack/binding-win32-arm64-msvc@2.2.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-JUAmnbOQYGTRyX28vls/MOMonZWcmcCi5YtEq6YMc8Xqh3Qx0HUwaLM/I1xr/N9BX3b8CV0dQDOpNuBc2ei+CA=="], - "@rspack/cli": ["@rspack/cli@2.0.2", "", { "peerDependencies": { "@rspack/core": "^2.0.0-0", "@rspack/dev-server": "^2.0.0-0" }, "optionalPeers": ["@rspack/dev-server"], "bin": { "rspack": "bin/rspack.js" } }, "sha512-rwuzo/V59ck/ChNkxMEEjuXLFs8nPJ37K0PMuUeIMmzFJNdUcPLxSV3qaV9azDLGcyq4XwcyQvexH3okWbfUfQ=="], + "@rspack/binding-win32-ia32-msvc": ["@rspack/binding-win32-ia32-msvc@2.2.0", "", { "os": "win32", "cpu": "ia32" }, "sha512-wOmQRUaOG0eWH/fnfslA9yK9xKfaq9X+3Xa1TdTJnTqlo0ARJYs6A+Lzjbs7cxdY/o1f12Xe00BG3nQozReUOg=="], - "@rspack/core": ["@rspack/core@2.0.2", "", { "dependencies": { "@rspack/binding": "2.0.2" }, "peerDependencies": { "@module-federation/runtime-tools": "^0.24.1 || ^2.0.0", "@swc/helpers": ">=0.5.1" }, "optionalPeers": ["@module-federation/runtime-tools", "@swc/helpers"] }, "sha512-VM3UHOo26uC+4QSqY5tU1ybI7KuXY5rTof8nhFOaBY9SYau0Smvr+hMSAPmrmHwknB6dXT8yaNVxrj7I+qxE1Q=="], + "@rspack/binding-win32-x64-msvc": ["@rspack/binding-win32-x64-msvc@2.2.0", "", { "os": "win32", "cpu": "x64" }, "sha512-v6/3bFr9+i7hRpgulL9b5qCvZL0VgR4vQGQNqOWezUzZmPUj9LYpvB0L9xZIVwDQ2ug/xBiA58bfg5IbESgoyw=="], + + "@rspack/cli": ["@rspack/cli@2.2.0", "", { "peerDependencies": { "@rspack/core": "^2.0.0-0", "@rspack/dev-server": "^2.0.0-0" }, "optionalPeers": ["@rspack/dev-server"], "bin": { "rspack": "./bin/rspack.js" } }, "sha512-GSiQPG5v5tN8vYJdUMYX44sPiwVVG8H25fq3LWRydVB4WswDAD/N3qNgWZtFVliQdLH3ZWzFdFUoCyZmea0TMA=="], + + "@rspack/core": ["@rspack/core@2.2.0", "", { "dependencies": { "@rspack/binding": "2.2.0" }, "peerDependencies": { "@module-federation/runtime-tools": "^0.24.1 || ^2.0.0", "@swc/helpers": "^0.5.23" }, "optionalPeers": ["@module-federation/runtime-tools", "@swc/helpers"] }, "sha512-3W7oX0BAHbK4VlknH3lfyfRvupzxdZtyEa+DfKmdjzmIAcqYtHnFd0nLqp5dzitDPyDI1TIKkDhpB0AZJn0pVg=="], "@sigstore/bundle": ["@sigstore/bundle@4.0.0", "", { "dependencies": { "@sigstore/protobuf-specs": "^0.5.0" } }, "sha512-NwCl5Y0V6Di0NexvkTqdoVfmjTaQwoLM236r89KEojGmq/jMls8S+zb7yOwAPdXvbwfKDlP+lmXgAL4vKSQT+A=="], @@ -656,21 +660,15 @@ "@sigstore/verify": ["@sigstore/verify@3.1.0", "", { "dependencies": { "@sigstore/bundle": "^4.0.0", "@sigstore/core": "^3.1.0", "@sigstore/protobuf-specs": "^0.5.0" } }, "sha512-mNe0Iigql08YupSOGv197YdHpPPr+EzDZmfCgMc7RPNaZTw5aLN01nBl6CHJOh3BGtnMIj83EeN4butBchc8Ag=="], - "@sindresorhus/is": ["@sindresorhus/is@0.14.0", "", {}, "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="], - "@sphinxxxx/color-conversion": ["@sphinxxxx/color-conversion@2.2.2", "", {}, "sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw=="], "@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - "@szmarczak/http-timer": ["@szmarczak/http-timer@1.1.2", "", { "dependencies": { "defer-to-connect": "^1.0.1" } }, "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="], - - "@tootallnate/once": ["@tootallnate/once@1.1.2", "", {}, "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="], - "@tufjs/canonical-json": ["@tufjs/canonical-json@2.0.0", "", {}, "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA=="], "@tufjs/models": ["@tufjs/models@4.1.0", "", { "dependencies": { "@tufjs/canonical-json": "2.0.0", "minimatch": "^10.1.1" } }, "sha512-Y8cK9aggNRsqJVaKUlEYs4s7CvQ1b1ta2DVPyAimb0I2qhzjNk+A+mxvll/klL0RlfuIUei8BF7YWiua4kQqww=="], - "@tybys/wasm-util": ["@tybys/wasm-util@0.10.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg=="], + "@tybys/wasm-util": ["@tybys/wasm-util@0.10.3", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg=="], "@types/ace": ["@types/ace@0.0.52", "", {}, "sha512-YPF9S7fzpuyrxru+sG/rrTpZkC6gpHBPF14W3x70kqVOD+ks6jkYLapk4yceh36xej7K4HYxcyz9ZDQ2lTvwgQ=="], @@ -778,19 +776,19 @@ "@upsetjs/venn.js": ["@upsetjs/venn.js@2.0.0", "", { "optionalDependencies": { "d3-selection": "^3.0.0", "d3-transition": "^3.0.1" } }, "sha512-WbBhLrooyePuQ1VZxrJjtLvTc4NVfpOyKx0sKqioq9bX1C1m7Jgykkn8gLrtwumBioXIqam8DLxp88Adbue6Hw=="], - "@vitest/expect": ["@vitest/expect@4.1.10", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", "@vitest/spy": "4.1.10", "@vitest/utils": "4.1.10", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" } }, "sha512-YsCn+qAk1GWjQOWFEsEcL2gNQ0zmVmQu3T03qP6UyjhtmdtwtbuI+DASn/7iQB3HGTXkdBwGddzxPlmiql5vlA=="], + "@vitest/expect": ["@vitest/expect@4.1.11", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", "@vitest/spy": "4.1.11", "@vitest/utils": "4.1.11", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" } }, "sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw=="], - "@vitest/mocker": ["@vitest/mocker@4.1.10", "", { "dependencies": { "@vitest/spy": "4.1.10", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, "peerDependencies": { "msw": "^2.4.9", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "optionalPeers": ["msw", "vite"] }, "sha512-v0xaezt+DKEmKfaxg133ldzADrwLGd7Ze1MfQQTYfvs8OqZIwbxyxaYURivwV7sWy5fqn3rH5uOrSp07bp44Ow=="], + "@vitest/mocker": ["@vitest/mocker@4.1.11", "", { "dependencies": { "@vitest/spy": "4.1.11", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, "peerDependencies": { "msw": "^2.4.9", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "optionalPeers": ["msw", "vite"] }, "sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ=="], - "@vitest/pretty-format": ["@vitest/pretty-format@4.1.10", "", { "dependencies": { "tinyrainbow": "^3.1.0" } }, "sha512-W1HsjSH4MXQ9YfmmhLAoIYf1HRfekQCGngeIgcei6MP5QQGWUe0gkopdZQaVCFO+JDJMrAJGwa5pRpNpvy4P8Q=="], + "@vitest/pretty-format": ["@vitest/pretty-format@4.1.11", "", { "dependencies": { "tinyrainbow": "^3.1.0" } }, "sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw=="], - "@vitest/runner": ["@vitest/runner@4.1.10", "", { "dependencies": { "@vitest/utils": "4.1.10", "pathe": "^2.0.3" } }, "sha512-IKI6kpIH+LmpROplyLwBBaCfMgOZOMsygVa6BARD6ahA04VRuJSa6OaVG7kRvSEMD870Vd91rSSw0eegtWyLGg=="], + "@vitest/runner": ["@vitest/runner@4.1.11", "", { "dependencies": { "@vitest/utils": "4.1.11", "pathe": "^2.0.3" } }, "sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw=="], - "@vitest/snapshot": ["@vitest/snapshot@4.1.10", "", { "dependencies": { "@vitest/pretty-format": "4.1.10", "@vitest/utils": "4.1.10", "magic-string": "^0.30.21", "pathe": "^2.0.3" } }, "sha512-xRkfOT1qpTAi/Ti4Y1LtfRc3kEuqxGw59eN2jN9pRWMtS/XDevekhcFSqvQqjUNGksfjMJu3Y+oJ+4Ypn2OaJw=="], + "@vitest/snapshot": ["@vitest/snapshot@4.1.11", "", { "dependencies": { "@vitest/pretty-format": "4.1.11", "@vitest/utils": "4.1.11", "magic-string": "^0.30.21", "pathe": "^2.0.3" } }, "sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog=="], - "@vitest/spy": ["@vitest/spy@4.1.10", "", {}, "sha512-PLf/Ugvoq5wO/b4rwYCR1h2PSIdXz7wnkQFMiUpLdtM7l6pqVFcQIBEHyT1+l+cj7mNwAfZHzqXqDyjvOuwbDw=="], + "@vitest/spy": ["@vitest/spy@4.1.11", "", {}, "sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA=="], - "@vitest/utils": ["@vitest/utils@4.1.10", "", { "dependencies": { "@vitest/pretty-format": "4.1.10", "convert-source-map": "^2.0.0", "tinyrainbow": "^3.1.0" } }, "sha512-fy9am/HWxbaGt/Sawrp90vt6Y6jQwf1RX77cz3uwoJwJVMli/e1IEwRPnMNJ7vKfPTwo0diXifkpPvwH9v7nGA=="], + "@vitest/utils": ["@vitest/utils@4.1.11", "", { "dependencies": { "@vitest/pretty-format": "4.1.11", "convert-source-map": "^2.0.0", "tinyrainbow": "^3.1.0" } }, "sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ=="], "@vscode/l10n": ["@vscode/l10n@0.0.18", "", {}, "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ=="], @@ -848,18 +846,12 @@ "abbrev": ["abbrev@4.0.0", "", {}, "sha512-a1wflyaL0tHtJSmLSOVybYhy22vRih4eduhhrkcjgrWGnRfrZtovJ2FRjxuTtkkj47O/baf0R86QU5OuYpz8fA=="], - "accepts": ["accepts@1.3.8", "", { "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" } }, "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="], - - "acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="], + "acorn": ["acorn@8.18.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ=="], "acorn-import-phases": ["acorn-import-phases@1.0.4", "", { "peerDependencies": { "acorn": "^8.14.0" } }, "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ=="], "agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="], - "agentkeepalive": ["agentkeepalive@4.6.0", "", { "dependencies": { "humanize-ms": "^1.2.1" } }, "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ=="], - - "aggregate-error": ["aggregate-error@3.1.0", "", { "dependencies": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" } }, "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="], - "ajv": ["ajv@8.17.1", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="], "ajv-formats": ["ajv-formats@2.1.1", "", { "dependencies": { "ajv": "^8.0.0" } }, "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="], @@ -870,56 +862,26 @@ "ansi": ["ansi@0.3.1", "", {}, "sha512-iFY7JCgHbepc0b82yLaw4IMortylNb6wG4kL+4R0C3iv6i+RHGHux/yUX5BTiRvSX/shMnngjR1YyNMnXEFh5A=="], - "ansi-align": ["ansi-align@3.0.1", "", { "dependencies": { "string-width": "^4.1.0" } }, "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="], - "ansi-colors": ["ansi-colors@4.1.1", "", {}, "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="], - "ansi-escapes": ["ansi-escapes@3.2.0", "", {}, "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="], - "ansi-regex": ["ansi-regex@6.2.2", "", {}, "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="], "ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], "anymatch": ["anymatch@3.1.3", "", { "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" } }, "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="], - "aproba": ["aproba@1.2.0", "", {}, "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="], - - "archiver": ["archiver@3.1.1", "", { "dependencies": { "archiver-utils": "^2.1.0", "async": "^2.6.3", "buffer-crc32": "^0.2.1", "glob": "^7.1.4", "readable-stream": "^3.4.0", "tar-stream": "^2.1.0", "zip-stream": "^2.1.2" } }, "sha512-5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg=="], - - "archiver-utils": ["archiver-utils@2.1.0", "", { "dependencies": { "glob": "^7.1.4", "graceful-fs": "^4.2.0", "lazystream": "^1.0.0", "lodash.defaults": "^4.2.0", "lodash.difference": "^4.5.0", "lodash.flatten": "^4.4.0", "lodash.isplainobject": "^4.0.6", "lodash.union": "^4.6.0", "normalize-path": "^3.0.0", "readable-stream": "^2.0.0" } }, "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw=="], - - "are-we-there-yet": ["are-we-there-yet@1.1.7", "", { "dependencies": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" } }, "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="], - "argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="], - "array-find-index": ["array-find-index@1.0.2", "", {}, "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw=="], - - "array-flatten": ["array-flatten@1.1.1", "", {}, "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="], - "array-union": ["array-union@2.1.0", "", {}, "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="], - "asn1": ["asn1@0.2.6", "", { "dependencies": { "safer-buffer": "~2.1.0" } }, "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="], - "assert-plus": ["assert-plus@1.0.0", "", {}, "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="], "assertion-error": ["assertion-error@1.1.0", "", {}, "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="], - "async": ["async@2.6.4", "", { "dependencies": { "lodash": "^4.17.14" } }, "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="], - - "asynckit": ["asynckit@0.4.0", "", {}, "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="], - - "at-least-node": ["at-least-node@1.0.0", "", {}, "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="], - - "atomically": ["atomically@1.7.0", "", {}, "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w=="], - - "autoprefixer": ["autoprefixer@10.5.0", "", { "dependencies": { "browserslist": "^4.28.2", "caniuse-lite": "^1.0.30001787", "fraction.js": "^5.3.4", "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" }, "peerDependencies": { "postcss": "^8.1.0" }, "bin": { "autoprefixer": "bin/autoprefixer" } }, "sha512-FMhOoZV4+qR6aTUALKX2rEqGG+oyATvwBt9IIzVR5rMa2HRWPkxf+P+PAJLD1I/H5/II+HuZcBJYEFBpq39ong=="], + "autoprefixer": ["autoprefixer@10.5.4", "", { "dependencies": { "browserslist": "^4.28.6", "caniuse-lite": "^1.0.30001806", "fraction.js": "^5.3.4", "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" }, "peerDependencies": { "postcss": "^8.1.0" }, "bin": { "autoprefixer": "bin/autoprefixer" } }, "sha512-MaU0U/za7N3r6brxD4YB/l4NSrFzLPlANv6wEuQVaIPlD3L4W9rFcQPbL/EilY9BHhHvhfcz3gInDLrEtWT4EA=="], "autosize": ["autosize@6.0.1", "", {}, "sha512-f86EjiUKE6Xvczc4ioP1JBlWG7FKrE13qe/DxBCpe8GCipCq2nFw73aO8QEBKHfSbYGDN5eB9jXWKen7tspDqQ=="], - "aws-sign2": ["aws-sign2@0.7.0", "", {}, "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="], - - "aws4": ["aws4@1.13.2", "", {}, "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="], - "babel-loader": ["babel-loader@10.1.1", "", { "dependencies": { "find-up": "^5.0.0" }, "peerDependencies": { "@babel/core": "^7.12.0 || ^8.0.0-beta.1", "@rspack/core": "^1.0.0 || ^2.0.0-0", "webpack": ">=5.61.0" }, "optionalPeers": ["@rspack/core", "webpack"] }, "sha512-JwKSzk2kjIe7mgPK+/lyZ2QAaJcpahNAdM+hgR2HI8D0OJVkdj8Rl6J3kaLYki9pwF7P2iWnD8qVv80Lq1ABtg=="], "babel-plugin-polyfill-corejs3": ["babel-plugin-polyfill-corejs3@1.0.0", "", { "dependencies": { "@babel/helper-define-polyfill-provider": "^1.0.0", "core-js-compat": "^3.48.0" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0" } }, "sha512-yIkslVjbmml2Xjb6XhFW7lISXHsqk6cesxTdDsXoMom4Lnb99DbD3OQbSOoM5Z+ASh8YXYaLAsRQrU2Jeh3Qig=="], @@ -928,9 +890,7 @@ "base64-js": ["base64-js@1.5.1", "", {}, "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="], - "baseline-browser-mapping": ["baseline-browser-mapping@2.10.29", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-Asa2krT+XTPZINCS+2QcyS8WTkObE77RwkydwF7h6DmnKqbvlalz93m/dnphUyCa6SWSP51VgtEUf2FN+gelFQ=="], - - "bcrypt-pbkdf": ["bcrypt-pbkdf@1.0.2", "", { "dependencies": { "tweetnacl": "^0.14.3" } }, "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w=="], + "baseline-browser-mapping": ["baseline-browser-mapping@2.11.19", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-Grytf1xOxOEMTGRwx6rLGKkTabd4vMg3VrKdj/7joCmV0qgh4QwMMO6xh34YEXQqirAuUdgQGa5orJQQ+69RBw=="], "big-integer": ["big-integer@1.6.52", "", {}, "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg=="], @@ -940,12 +900,6 @@ "binary-extensions": ["binary-extensions@2.3.0", "", {}, "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="], - "bl": ["bl@4.1.0", "", { "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", "readable-stream": "^3.4.0" } }, "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="], - - "body-parser": ["body-parser@1.20.5", "", { "dependencies": { "bytes": "~3.1.2", "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "~1.2.0", "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "on-finished": "~2.4.1", "qs": "~6.15.1", "raw-body": "~2.5.3", "type-is": "~1.6.18", "unpipe": "~1.0.0" } }, "sha512-3grm+/2tUOvu2cjJkvsIxrv/wVpfXQW4PsQHYm7yk4vfpu7Ekl6nEsYBoJUL6qDwZUx8wUhQ8tR2qz+ad9c9OA=="], - - "boxen": ["boxen@5.1.2", "", { "dependencies": { "ansi-align": "^3.0.0", "camelcase": "^6.2.0", "chalk": "^4.1.0", "cli-boxes": "^2.2.1", "string-width": "^4.2.2", "type-fest": "^0.20.2", "widest-line": "^3.1.0", "wrap-ansi": "^7.0.0" } }, "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="], - "bplist-parser": ["bplist-parser@0.3.2", "", { "dependencies": { "big-integer": "1.6.x" } }, "sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ=="], "brace-expansion": ["brace-expansion@1.1.12", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg=="], @@ -954,42 +908,24 @@ "browser-stdout": ["browser-stdout@1.3.1", "", {}, "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="], - "browserslist": ["browserslist@4.28.2", "", { "dependencies": { "baseline-browser-mapping": "^2.10.12", "caniuse-lite": "^1.0.30001782", "electron-to-chromium": "^1.5.328", "node-releases": "^2.0.36", "update-browserslist-db": "^1.2.3" }, "bin": { "browserslist": "cli.js" } }, "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg=="], - - "buffer": ["buffer@5.7.1", "", { "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" } }, "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="], - - "buffer-crc32": ["buffer-crc32@0.2.13", "", {}, "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="], + "browserslist": ["browserslist@4.28.8", "", { "dependencies": { "baseline-browser-mapping": "^2.11.12", "caniuse-lite": "^1.0.30001809", "electron-to-chromium": "^1.5.402", "node-releases": "^2.0.53", "update-browserslist-db": "^1.3.0" }, "bin": { "browserslist": "cli.js" } }, "sha512-V2NpofLblG64mfOtSgDhOJESZEGogzDMBv/q+W6oc4LXWP/q75eOXoOaaOu1EOadB9U4Bwx/e0yzbvwKH8zalA=="], "buffer-from": ["buffer-from@1.1.2", "", {}, "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="], "buffer-image-size": ["buffer-image-size@0.6.4", "", { "dependencies": { "@types/node": "*" } }, "sha512-nEh+kZOPY1w+gcCMobZ6ETUp9WfibndnosbpwB1iJk/8Gt5ZF2bhS6+B6bPYz424KtwsR6Rflc3tCz1/ghX2dQ=="], - "builtins": ["builtins@1.0.3", "", {}, "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ=="], - - "bytes": ["bytes@3.1.2", "", {}, "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="], - "cacache": ["cacache@20.0.4", "", { "dependencies": { "@npmcli/fs": "^5.0.0", "fs-minipass": "^3.0.0", "glob": "^13.0.0", "lru-cache": "^11.1.0", "minipass": "^7.0.3", "minipass-collect": "^2.0.1", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "p-map": "^7.0.2", "ssri": "^13.0.0" } }, "sha512-M3Lab8NPYlZU2exsL3bMVvMrMqgwCnMWfdZbK28bn3pK6APT/Te/I8hjRPNu1uwORY9a1eEQoifXbKPQMfMTOA=="], - "cacheable-request": ["cacheable-request@6.1.0", "", { "dependencies": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", "http-cache-semantics": "^4.0.0", "keyv": "^3.0.0", "lowercase-keys": "^2.0.0", "normalize-url": "^4.1.0", "responselike": "^1.0.2" } }, "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="], - - "call-bind-apply-helpers": ["call-bind-apply-helpers@1.0.2", "", { "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" } }, "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ=="], - - "call-bound": ["call-bound@1.0.4", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.2", "get-intrinsic": "^1.3.0" } }, "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg=="], - "callsites": ["callsites@3.1.0", "", {}, "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="], "camelcase": ["camelcase@6.3.0", "", {}, "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="], - "caniuse-lite": ["caniuse-lite@1.0.30001792", "", {}, "sha512-hVLMUZFgR4JJ6ACt1uEESvQN1/dBVqPAKY0hgrV70eN3391K6juAfTjKZLKvOMsx8PxA7gsY1/tLMMTcfFLLpw=="], - - "caseless": ["caseless@0.12.0", "", {}, "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="], + "caniuse-lite": ["caniuse-lite@1.0.30001810", "", {}, "sha512-TITQPUkaz+aVk5GL6NhOdwk1aEaNTSDPsGFWrTuhKGtjTF70jL/Oht2W4c6rXUe5fu7Ie19VIahAXHIIiWWNeg=="], "chai": ["chai@4.3.6", "", { "dependencies": { "assertion-error": "^1.1.0", "check-error": "^1.0.2", "deep-eql": "^3.0.1", "get-func-name": "^2.0.0", "loupe": "^2.3.1", "pathval": "^1.1.1", "type-detect": "^4.0.5" } }, "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q=="], "chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], - "chardet": ["chardet@0.7.0", "", {}, "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="], - "check-error": ["check-error@1.0.3", "", { "dependencies": { "get-func-name": "^2.0.2" } }, "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg=="], "chevrotain": ["chevrotain@11.0.3", "", { "dependencies": { "@chevrotain/cst-dts-gen": "11.0.3", "@chevrotain/gast": "11.0.3", "@chevrotain/regexp-to-ast": "11.0.3", "@chevrotain/types": "11.0.3", "@chevrotain/utils": "11.0.3", "lodash-es": "4.17.21" } }, "sha512-ci2iJH6LeIkvP9eJW6gpueU8cnZhv85ELY8w8WiFtNjMHA5ad6pQLaJo9mEly/9qUyCpvqX8/POVUTf18/HFdw=="], @@ -998,30 +934,16 @@ "chokidar": ["chokidar@4.0.3", "", { "dependencies": { "readdirp": "^4.0.1" } }, "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA=="], - "chownr": ["chownr@2.0.0", "", {}, "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="], + "chownr": ["chownr@3.0.0", "", {}, "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g=="], "chrome-trace-event": ["chrome-trace-event@1.0.4", "", {}, "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ=="], - "ci-info": ["ci-info@2.0.0", "", {}, "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="], - - "clean-stack": ["clean-stack@2.2.0", "", {}, "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="], - "cli": ["cli@1.0.1", "", { "dependencies": { "exit": "0.1.2", "glob": "^7.1.1" } }, "sha512-41U72MB56TfUMGndAKK8vJ78eooOD4Z5NOL4xEfjc0c23s+6EYKXlXsmACBVclLP1yOfWCgEganVzddVrSNoTg=="], - "cli-boxes": ["cli-boxes@2.2.1", "", {}, "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="], - - "cli-cursor": ["cli-cursor@2.1.0", "", { "dependencies": { "restore-cursor": "^2.0.0" } }, "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw=="], - - "cli-width": ["cli-width@2.2.1", "", {}, "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="], - "cliui": ["cliui@9.0.1", "", { "dependencies": { "string-width": "^7.2.0", "strip-ansi": "^7.1.0", "wrap-ansi": "^9.0.0" } }, "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w=="], - "clone-response": ["clone-response@1.0.3", "", { "dependencies": { "mimic-response": "^1.0.0" } }, "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA=="], - "cmd-shim": ["cmd-shim@8.0.0", "", {}, "sha512-Jk/BK6NCapZ58BKUxlSI+ouKRbjH1NLZCgJkYoab+vEHUY3f6OzpNBN9u7HFSv9J6TRDGs4PLOHezoKGaFRSCA=="], - "code-point-at": ["code-point-at@1.1.0", "", {}, "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA=="], - "codemirror": ["codemirror@6.0.2", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/commands": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/lint": "^6.0.0", "@codemirror/search": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0" } }, "sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw=="], "color-convert": ["color-convert@2.0.1", "", { "dependencies": { "color-name": "~1.1.4" } }, "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="], @@ -1040,40 +962,20 @@ "com.foxdebug.acode.rk.plugin.plugincontext": ["com.foxdebug.acode.rk.plugin.plugincontext@file:src/plugins/pluginContext", {}], - "combined-stream": ["combined-stream@1.0.8", "", { "dependencies": { "delayed-stream": "~1.0.0" } }, "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="], - "commander": ["commander@8.3.0", "", {}, "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="], "common-ancestor-path": ["common-ancestor-path@2.0.0", "", {}, "sha512-dnN3ibLeoRf2HNC+OlCiNc5d2zxbLJXOtiZUudNFSXZrNSydxcCsSpRzXwfu7BBWCIfHPw+xTayeBvJCP/D8Ng=="], - "compress-commons": ["compress-commons@2.1.1", "", { "dependencies": { "buffer-crc32": "^0.2.13", "crc32-stream": "^3.0.1", "normalize-path": "^3.0.0", "readable-stream": "^2.3.6" } }, "sha512-eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q=="], - - "compressible": ["compressible@2.0.18", "", { "dependencies": { "mime-db": ">= 1.43.0 < 2" } }, "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="], - - "compression": ["compression@1.8.1", "", { "dependencies": { "bytes": "3.1.2", "compressible": "~2.0.18", "debug": "2.6.9", "negotiator": "~0.6.4", "on-headers": "~1.1.0", "safe-buffer": "5.2.1", "vary": "~1.1.2" } }, "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w=="], - "concat-map": ["concat-map@0.0.1", "", {}, "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="], - "conf": ["conf@10.2.0", "", { "dependencies": { "ajv": "^8.6.3", "ajv-formats": "^2.1.1", "atomically": "^1.7.0", "debounce-fn": "^4.0.0", "dot-prop": "^6.0.1", "env-paths": "^2.2.1", "json-schema-typed": "^7.0.3", "onetime": "^5.1.2", "pkg-up": "^3.1.0", "semver": "^7.3.5" } }, "sha512-8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg=="], - "confbox": ["confbox@0.1.8", "", {}, "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w=="], "configstore": ["configstore@5.0.1", "", { "dependencies": { "dot-prop": "^5.2.0", "graceful-fs": "^4.1.2", "make-dir": "^3.0.0", "unique-string": "^2.0.0", "write-file-atomic": "^3.0.0", "xdg-basedir": "^4.0.0" } }, "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="], "console-browserify": ["console-browserify@1.1.0", "", { "dependencies": { "date-now": "^0.1.4" } }, "sha512-duS7VP5pvfsNLDvL1O4VOEbw37AI3A4ZUQYemvDlnpGrNu9tprR7BYWpDYwC0Xia0Zxz5ZupdiIrUp0GH1aXfg=="], - "console-control-strings": ["console-control-strings@1.1.0", "", {}, "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="], - - "content-disposition": ["content-disposition@0.5.4", "", { "dependencies": { "safe-buffer": "5.2.1" } }, "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="], - - "content-type": ["content-type@1.0.5", "", {}, "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="], - "convert-source-map": ["convert-source-map@2.0.0", "", {}, "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="], - "cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="], - - "cookie-signature": ["cookie-signature@1.0.7", "", {}, "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA=="], - "cordova": ["cordova@13.0.0", "", { "dependencies": { "configstore": "^5.0.1", "cordova-common": "^6.0.0", "cordova-create": "^6.0.0", "cordova-lib": "^13.0.0", "editor": "^1.0.0", "execa": "^5.1.1", "nopt": "^9.0.0", "semver": "^7.7.3", "systeminformation": "^5.27.11" }, "bin": { "cordova": "bin/cordova" } }, "sha512-QAIMwmYLL0jHo4vauWSnRd2fr9l+wajG+F5aUkrC6e4ZQGSTv0wAiRmpqQUkIc1ZdELisKDQws/BjHz5nP/sLw=="], "cordova-android": ["cordova-android@15.1.0", "", { "dependencies": { "android-versions": "^2.1.1", "cordova-common": "^6.0.0", "dedent": "^1.7.1", "execa": "^5.1.1", "fast-glob": "^3.3.3", "is-path-inside": "^3.0.3", "nopt": "^9.0.0", "properties-parser": "^0.6.0", "semver": "^7.7.4", "string-argv": "^0.3.2", "untildify": "^4.0.0", "which": "^6.0.1" } }, "sha512-mnOnOisYUVhyrLCPVlHJBKh4ro+X6nZA7nPqBrpVnyTpiiDiakNCfbBJjSs1MTBUJZ6dcmhhvNKZWPT9w6aGPA=="], @@ -1092,7 +994,7 @@ "cordova-plugin-acode-webview": ["cordova-plugin-acode-webview@file:src/plugins/webview", {}], - "cordova-plugin-advanced-http": ["cordova-plugin-advanced-http@file:src/plugins/cordova-plugin-advanced-http", { "devDependencies": { "chai": "4.3.6", "colors": "1.4.0", "cordova": "11.0.0", "mocha": "9.2.2", "umd-tough-cookie": "3.0.0", "wd": "1.14.0", "xml2js": "0.4.23" } }], + "cordova-plugin-advanced-http": ["cordova-plugin-advanced-http@file:src/plugins/cordova-plugin-advanced-http", { "devDependencies": { "chai": "4.3.6", "colors": "1.4.0", "cordova": "13.0.0", "mocha": "9.2.2", "umd-tough-cookie": "3.0.0", "xml2js": "0.4.23" } }], "cordova-plugin-browser": ["cordova-plugin-browser@file:src/plugins/browser", {}], @@ -1118,9 +1020,7 @@ "cordova-plugin-websocket": ["cordova-plugin-websocket@file:src/plugins/websocket", {}], - "cordova-serve": ["cordova-serve@4.0.1", "", { "dependencies": { "chalk": "^3.0.0", "compression": "^1.7.4", "express": "^4.17.1", "open": "^7.0.3", "which": "^2.0.2" } }, "sha512-YbfXaZ60yr5dkqmDFQgrU7TSKnzCqYsxHgIUzDeX8RggZb6mz1F9jMfUBbaYyaU7JjcuJ0aoRPYLvwSGQVhGkw=="], - - "core-js": ["core-js@3.49.0", "", {}, "sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg=="], + "core-js": ["core-js@3.50.0", "", {}, "sha512-BRWgOLKkFeCgRudR6zrs8p9XJZcE14grzKMMssoYrk6krtuEZ7MTKPIY5RzOnqsEKIR9kst7wNzphttraT+Yqw=="], "core-js-compat": ["core-js-compat@3.49.0", "", { "dependencies": { "browserslist": "^4.28.1" } }, "sha512-VQXt1jr9cBz03b331DFDCCP90b3fanciLkgiOoy8SBHy06gNf+vQ1A3WFLqG7I8TipYIKeYK9wxd0tUrvHcOZA=="], @@ -1132,10 +1032,6 @@ "cosmiconfig": ["cosmiconfig@9.0.0", "", { "dependencies": { "env-paths": "^2.2.1", "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", "parse-json": "^5.2.0" }, "peerDependencies": { "typescript": ">=4.9.5" }, "optionalPeers": ["typescript"] }, "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg=="], - "crc": ["crc@3.8.0", "", { "dependencies": { "buffer": "^5.1.0" } }, "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="], - - "crc32-stream": ["crc32-stream@3.0.1", "", { "dependencies": { "crc": "^3.4.4", "readable-stream": "^3.4.0" } }, "sha512-mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w=="], - "crelt": ["crelt@1.0.6", "", {}, "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="], "cross-spawn": ["cross-spawn@7.0.6", "", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA=="], @@ -1146,9 +1042,7 @@ "cssesc": ["cssesc@3.0.0", "", { "bin": { "cssesc": "bin/cssesc" } }, "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="], - "currently-unhandled": ["currently-unhandled@0.4.1", "", { "dependencies": { "array-find-index": "^1.0.1" } }, "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng=="], - - "cytoscape": ["cytoscape@3.33.1", "", {}, "sha512-iJc4TwyANnOGR1OmWhsS9ayRS3s+XQ185FmuHObThD+5AeJCakAAbWv8KimMTt08xCCLNgneQwFp+JRJOr9qGQ=="], + "cytoscape": ["cytoscape@3.34.2", "", {}, "sha512-Cm2jaj1X/PBNlzV9yH8zcfGOxO7U+CJ/+mxSBVPSchLaugdp4jtlGx5qaHtPRZ6tgiZ5P+o1XoRfJA+ba6KM3g=="], "cytoscape-cose-bilkent": ["cytoscape-cose-bilkent@4.1.0", "", { "dependencies": { "cose-base": "^1.0.0" }, "peerDependencies": { "cytoscape": "^3.2.0" } }, "sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ=="], @@ -1220,40 +1114,20 @@ "dagre-d3-es": ["dagre-d3-es@7.0.14", "", { "dependencies": { "d3": "^7.9.0", "lodash-es": "^4.17.21" } }, "sha512-P4rFMVq9ESWqmOgK+dlXvOtLwYg0i7u0HBGJER0LZDJT2VHIPAMZ/riPxqJceWMStH5+E61QxFra9kIS3AqdMg=="], - "dashdash": ["dashdash@1.14.1", "", { "dependencies": { "assert-plus": "^1.0.0" } }, "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="], - "date-now": ["date-now@0.1.4", "", {}, "sha512-AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw=="], - "dayjs": ["dayjs@1.11.20", "", {}, "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ=="], - - "debounce-fn": ["debounce-fn@4.0.0", "", { "dependencies": { "mimic-fn": "^3.0.0" } }, "sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ=="], + "dayjs": ["dayjs@1.11.23", "", {}, "sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ=="], "debug": ["debug@4.4.3", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="], "decamelize": ["decamelize@4.0.0", "", {}, "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="], - "decompress-response": ["decompress-response@3.3.0", "", { "dependencies": { "mimic-response": "^1.0.0" } }, "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA=="], - "dedent": ["dedent@1.7.2", "", { "peerDependencies": { "babel-plugin-macros": "^3.1.0" }, "optionalPeers": ["babel-plugin-macros"] }, "sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA=="], "deep-eql": ["deep-eql@3.0.1", "", { "dependencies": { "type-detect": "^4.0.0" } }, "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="], - "deep-extend": ["deep-extend@0.6.0", "", {}, "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="], - - "defer-to-connect": ["defer-to-connect@1.1.3", "", {}, "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="], - "delaunator": ["delaunator@5.0.1", "", { "dependencies": { "robust-predicates": "^3.0.2" } }, "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw=="], - "delayed-stream": ["delayed-stream@1.0.0", "", {}, "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="], - - "delegates": ["delegates@1.0.0", "", {}, "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="], - - "dep-graph": ["dep-graph@1.1.0", "", { "dependencies": { "underscore": "1.2.1" } }, "sha512-/6yUWlSH0Uevjj6HWvO86rDeFzuYfzbaKDqifTEemwfwEPyBrODTb3ox/jFzqmc2+UmgJ3IDMS88BKEBh1Nm2Q=="], - - "depd": ["depd@2.0.0", "", {}, "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="], - - "destroy": ["destroy@1.2.0", "", {}, "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="], - "detect-indent": ["detect-indent@6.1.0", "", {}, "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA=="], "detect-libc": ["detect-libc@1.0.3", "", { "bin": { "detect-libc": "./bin/detect-libc.js" } }, "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="], @@ -1270,23 +1144,15 @@ "domhandler": ["domhandler@2.3.0", "", { "dependencies": { "domelementtype": "1" } }, "sha512-q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ=="], - "dompurify": ["dompurify@3.4.11", "", { "optionalDependencies": { "@types/trusted-types": "^2.0.7" } }, "sha512-zhlUV12GsaRzMsf9q5M254YhA4+VuF0fG+QFqu6aYpoGlKtz+w8//jBcGVYBgQkR5GHjUomejY84AV+/uPbWdw=="], + "dompurify": ["dompurify@3.4.14", "", { "optionalDependencies": { "@types/trusted-types": "^2.0.7" } }, "sha512-dVoH9z+MY+C9IilgGCk3YfFqjLi3fChm2OiKJMzh6axrJ5qwxqWaZamgmHrpv22CN/KdbZJuGEGgfQoL00LTdg=="], "domutils": ["domutils@1.5.1", "", { "dependencies": { "dom-serializer": "0", "domelementtype": "1" } }, "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw=="], "dot-prop": ["dot-prop@5.3.0", "", { "dependencies": { "is-obj": "^2.0.0" } }, "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="], - "dunder-proto": ["dunder-proto@1.0.1", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", "gopd": "^1.2.0" } }, "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A=="], - - "duplexer3": ["duplexer3@0.1.5", "", {}, "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA=="], - - "ecc-jsbn": ["ecc-jsbn@0.1.2", "", { "dependencies": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" } }, "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="], - "editor": ["editor@1.0.0", "", {}, "sha512-SoRmbGStwNYHgKfjOrX2L0mUvp9bUVv0uPppZSOMAntEbcFtoC3MKF5b3T6HQPXKIV+QGY3xPO3JK5it5lVkuw=="], - "ee-first": ["ee-first@1.1.1", "", {}, "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="], - - "electron-to-chromium": ["electron-to-chromium@1.5.353", "", {}, "sha512-kOrWphBi8TOZyiJZqsgqIle0lw+tzmnQK83pV9dZUd01Nm2POECSyFQMAuarzZdYqQW7FH9RaYOuaRo3h+bQ3w=="], + "electron-to-chromium": ["electron-to-chromium@1.5.415", "", {}, "sha512-958V+Kbhtgz+SxXeEVKBjrlKRBIDAYvUJfwhjxMZ5S6ut9jAl7l9ZKBkBrvjyjZE36PabLUo2L8kEeV5O4vgJg=="], "elementtree": ["elementtree@0.1.7", "", { "dependencies": { "sax": "1.1.4" } }, "sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg=="], @@ -1298,12 +1164,6 @@ "empathic": ["empathic@2.0.1", "", {}, "sha512-YGRs8knHhKHVShLkFET/rWAU8kmHbOV5LwN938RHI0pljAJ1Gf6SzXsSmRaEzcXTtOOmVqJ5+WtQPL5uigY50Q=="], - "encodeurl": ["encodeurl@2.0.0", "", {}, "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="], - - "encoding": ["encoding@0.1.13", "", { "dependencies": { "iconv-lite": "^0.6.2" } }, "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="], - - "end-of-stream": ["end-of-stream@1.4.5", "", { "dependencies": { "once": "^1.4.0" } }, "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg=="], - "endent": ["endent@2.1.0", "", { "dependencies": { "dedent": "^0.7.0", "fast-json-parse": "^1.0.3", "objectorarray": "^1.0.5" } }, "sha512-r8VyPX7XL8U01Xgnb1CjZ3XV+z90cXIJ9JPE/R9SEC9vpw2P6CfsRPJmp20DppC5N7ZAMCmjYkJIa744Iyg96w=="], "enhanced-resolve": ["enhanced-resolve@5.19.0", "", { "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.3.0" } }, "sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg=="], @@ -1312,26 +1172,14 @@ "env-paths": ["env-paths@2.2.1", "", {}, "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="], - "err-code": ["err-code@2.0.3", "", {}, "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="], - "error-ex": ["error-ex@1.3.4", "", { "dependencies": { "is-arrayish": "^0.2.1" } }, "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ=="], - "es-define-property": ["es-define-property@1.0.1", "", {}, "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g=="], - - "es-errors": ["es-errors@1.3.0", "", {}, "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="], - "es-module-lexer": ["es-module-lexer@2.0.0", "", {}, "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw=="], - "es-object-atoms": ["es-object-atoms@1.1.2", "", { "dependencies": { "es-errors": "^1.3.0" } }, "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw=="], - - "es-toolkit": ["es-toolkit@1.46.1", "", {}, "sha512-5eNtXOs3tbfxXOj04tjjseeWkRWaoCjdEI+96DgwzZoe6c9juL49pXlzAFTI72aWC9Y8p7168g6XIKjh7k6pyQ=="], + "es-toolkit": ["es-toolkit@1.51.0", "", {}, "sha512-zC2lQGkM7QX+Gm6iM3+WIdZJzthsEd14LvRNJneSO2hzyz/zNBENR8+YXWo1cKxgPBtV6ksPYHELbcwBRzmdCw=="], "escalade": ["escalade@3.2.0", "", {}, "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="], - "escape-goat": ["escape-goat@2.1.1", "", {}, "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="], - - "escape-html": ["escape-html@1.0.3", "", {}, "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="], - "escape-string-regexp": ["escape-string-regexp@5.0.0", "", {}, "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="], "eslint-scope": ["eslint-scope@5.1.1", "", { "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" } }, "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="], @@ -1346,8 +1194,6 @@ "esutils": ["esutils@2.0.3", "", {}, "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="], - "etag": ["etag@1.8.1", "", {}, "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="], - "events": ["events@3.3.0", "", {}, "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="], "execa": ["execa@5.1.1", "", { "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", "human-signals": "^2.1.0", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^4.0.1", "onetime": "^5.1.2", "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" } }, "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="], @@ -1358,12 +1204,6 @@ "exponential-backoff": ["exponential-backoff@3.1.3", "", {}, "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA=="], - "express": ["express@4.22.2", "", { "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "~1.20.5", "content-disposition": "~0.5.4", "content-type": "~1.0.4", "cookie": "~0.7.1", "cookie-signature": "~1.0.6", "debug": "2.6.9", "depd": "2.0.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "finalhandler": "~1.3.1", "fresh": "~0.5.2", "http-errors": "~2.0.0", "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "~2.4.1", "parseurl": "~1.3.3", "path-to-regexp": "~0.1.12", "proxy-addr": "~2.0.7", "qs": "~6.15.1", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "~0.19.0", "serve-static": "~1.16.2", "setprototypeof": "1.2.0", "statuses": "~2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" } }, "sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q=="], - - "extend": ["extend@3.0.2", "", {}, "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="], - - "external-editor": ["external-editor@3.1.0", "", { "dependencies": { "chardet": "^0.7.0", "iconv-lite": "^0.4.24", "tmp": "^0.0.33" } }, "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="], - "extsprintf": ["extsprintf@1.4.1", "", {}, "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA=="], "fast-deep-equal": ["fast-deep-equal@3.1.3", "", {}, "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="], @@ -1380,33 +1220,17 @@ "fdir": ["fdir@6.5.0", "", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="], - "figures": ["figures@2.0.0", "", { "dependencies": { "escape-string-regexp": "^1.0.5" } }, "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA=="], - - "filesize": ["filesize@11.0.17", "", {}, "sha512-oHLTvMLw6imZUl1se/RBQrFlyy50nXce4sU7yGR6Qc0JgCwqnfiFsAnEwotdGmfKLD7SArGUk2/5STU0k8LOBQ=="], + "filesize": ["filesize@11.0.22", "", {}, "sha512-RlCVs9CY+oSsRnNZn95J9vDXjNjOwddKyTFjOYtA4yxYVIxBnwiVVGJX+TFhsmu3uUf81JDGyijtYL9xgawlTw=="], "fill-range": ["fill-range@7.1.1", "", { "dependencies": { "to-regex-range": "^5.0.1" } }, "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg=="], - "finalhandler": ["finalhandler@1.3.2", "", { "dependencies": { "debug": "2.6.9", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "~2.4.1", "parseurl": "~1.3.3", "statuses": "~2.0.2", "unpipe": "~1.0.0" } }, "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg=="], - "find-up": ["find-up@5.0.0", "", { "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" } }, "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="], "flat": ["flat@5.0.2", "", { "bin": { "flat": "cli.js" } }, "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="], - "forever-agent": ["forever-agent@0.6.1", "", {}, "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="], - - "form-data": ["form-data@2.3.3", "", { "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", "mime-types": "^2.1.12" } }, "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="], - - "forwarded": ["forwarded@0.2.0", "", {}, "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="], - "fraction.js": ["fraction.js@5.3.4", "", {}, "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ=="], - "framer-motion": ["framer-motion@12.42.0", "", { "dependencies": { "motion-dom": "^12.42.0", "motion-utils": "^12.39.0", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-wp7EJnfWaaEScVygKv3e20udoRz+LbtxScsuTkakAxfXmt+ReC6WyPW2nINRAGvd+hG9odwcjBLyOTPjH5pBRA=="], - - "fresh": ["fresh@0.5.2", "", {}, "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="], - - "fs-constants": ["fs-constants@1.0.0", "", {}, "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="], - - "fs-extra": ["fs-extra@10.1.0", "", { "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="], + "framer-motion": ["framer-motion@12.43.0", "", { "dependencies": { "motion-dom": "^12.43.0", "motion-utils": "^12.39.0", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-1eaL3RvR/kAlbG7UYcpMptEyzPoENO0c6w7ZnB3/hh2vSAz/6uGAFn6fdoqTBguNstf3MsFhJHsD/0DHiclG+g=="], "fs-minipass": ["fs-minipass@3.0.3", "", { "dependencies": { "minipass": "^7.0.3" } }, "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw=="], @@ -1416,58 +1240,34 @@ "function-bind": ["function-bind@1.1.2", "", {}, "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="], - "gauge": ["gauge@2.7.4", "", { "dependencies": { "aproba": "^1.0.3", "console-control-strings": "^1.0.0", "has-unicode": "^2.0.0", "object-assign": "^4.1.0", "signal-exit": "^3.0.0", "string-width": "^1.0.1", "strip-ansi": "^3.0.1", "wide-align": "^1.1.0" } }, "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg=="], - "gensync": ["gensync@1.0.0-beta.2", "", {}, "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="], "get-caller-file": ["get-caller-file@2.0.5", "", {}, "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="], - "get-east-asian-width": ["get-east-asian-width@1.4.0", "", {}, "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q=="], + "get-east-asian-width": ["get-east-asian-width@1.6.0", "", {}, "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA=="], "get-func-name": ["get-func-name@2.0.2", "", {}, "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ=="], - "get-intrinsic": ["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.1", "function-bind": "^1.1.2", "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", "math-intrinsics": "^1.1.0" } }, "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ=="], - - "get-proto": ["get-proto@1.0.1", "", { "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" } }, "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g=="], - "get-stream": ["get-stream@6.0.1", "", {}, "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="], - "getpass": ["getpass@0.1.7", "", { "dependencies": { "assert-plus": "^1.0.0" } }, "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="], - "glob": ["glob@7.2.0", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="], "glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="], "glob-to-regexp": ["glob-to-regexp@0.4.1", "", {}, "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="], - "global-dirs": ["global-dirs@3.0.1", "", { "dependencies": { "ini": "2.0.0" } }, "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA=="], - "globby": ["globby@11.1.0", "", { "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", "fast-glob": "^3.2.9", "ignore": "^5.2.0", "merge2": "^1.4.1", "slash": "^3.0.0" } }, "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="], - "gopd": ["gopd@1.2.0", "", {}, "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg=="], - - "got": ["got@9.6.0", "", { "dependencies": { "@sindresorhus/is": "^0.14.0", "@szmarczak/http-timer": "^1.1.2", "cacheable-request": "^6.0.0", "decompress-response": "^3.3.0", "duplexer3": "^0.1.4", "get-stream": "^4.1.0", "lowercase-keys": "^1.0.1", "mimic-response": "^1.0.1", "p-cancelable": "^1.0.0", "to-readable-stream": "^1.0.0", "url-parse-lax": "^3.0.0" } }, "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="], - "graceful-fs": ["graceful-fs@4.2.11", "", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="], "growl": ["growl@1.10.5", "", {}, "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="], "hachure-fill": ["hachure-fill@0.5.2", "", {}, "sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg=="], - "happy-dom": ["happy-dom@20.11.1", "", { "dependencies": { "@types/node": ">=20.0.0", "@types/whatwg-mimetype": "^3.0.2", "@types/ws": "^8.18.1", "buffer-image-size": "^0.6.4", "entities": "^7.0.1", "whatwg-mimetype": "^3.0.0", "ws": "^8.21.0" } }, "sha512-XSt8tMzbW9ymE7687xztkO1ckR7qJNQ3LywY9vlYGhGi3zXrGBHuUo2Cl1ztZaICW+1eAGdkLbj6iwVqDT33kg=="], - - "har-schema": ["har-schema@2.0.0", "", {}, "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="], - - "har-validator": ["har-validator@5.1.5", "", { "dependencies": { "ajv": "^6.12.3", "har-schema": "^2.0.0" } }, "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="], + "happy-dom": ["happy-dom@20.11.6", "", { "dependencies": { "@types/node": ">=20.0.0", "@types/whatwg-mimetype": "^3.0.2", "@types/ws": "^8.18.1", "buffer-image-size": "^0.6.4", "entities": "^7.0.1", "whatwg-mimetype": "^3.0.0", "ws": "^8.21.0" } }, "sha512-Hldbg8AdAa5a5oDcZpjqnGitp7JB0hqWmfv/8qr+kft4vzSD8BHsbdRfzYvL/0QcbKcURC/yyoygbeDQarPvYg=="], "has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="], - "has-symbols": ["has-symbols@1.1.0", "", {}, "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ=="], - - "has-unicode": ["has-unicode@2.0.1", "", {}, "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="], - - "has-yarn": ["has-yarn@2.1.0", "", {}, "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="], - "hasown": ["hasown@2.0.2", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="], "he": ["he@1.2.0", "", { "bin": { "he": "bin/he" } }, "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="], @@ -1480,24 +1280,16 @@ "http-cache-semantics": ["http-cache-semantics@4.2.0", "", {}, "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ=="], - "http-errors": ["http-errors@2.0.1", "", { "dependencies": { "depd": "~2.0.0", "inherits": "~2.0.4", "setprototypeof": "~1.2.0", "statuses": "~2.0.2", "toidentifier": "~1.0.1" } }, "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ=="], + "http-proxy-agent": ["http-proxy-agent@7.0.2", "", { "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" } }, "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig=="], - "http-proxy-agent": ["http-proxy-agent@4.0.1", "", { "dependencies": { "@tootallnate/once": "1", "agent-base": "6", "debug": "4" } }, "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="], - - "http-signature": ["http-signature@1.2.0", "", { "dependencies": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", "sshpk": "^1.7.0" } }, "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="], - - "https-proxy-agent": ["https-proxy-agent@5.0.1", "", { "dependencies": { "agent-base": "6", "debug": "4" } }, "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="], + "https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="], "human-signals": ["human-signals@2.1.0", "", {}, "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="], - "humanize-ms": ["humanize-ms@1.2.1", "", { "dependencies": { "ms": "^2.0.0" } }, "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="], - "iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="], "icss-utils": ["icss-utils@5.1.0", "", { "peerDependencies": { "postcss": "^8.1.0" } }, "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="], - "ieee754": ["ieee754@1.2.1", "", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="], - "ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="], "ignore-walk": ["ignore-walk@8.0.0", "", { "dependencies": { "minimatch": "^10.0.3" } }, "sha512-FCeMZT4NiRQGh+YkeKMtWrOmBgWjHjMJ26WQWrRQyoyzqevdaGSakUaJW5xQYmjLlUVk2qUnCjYVBax9EKKg8A=="], @@ -1508,56 +1300,32 @@ "import-fresh": ["import-fresh@3.3.1", "", { "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" } }, "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ=="], - "import-lazy": ["import-lazy@2.1.0", "", {}, "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A=="], - "import-meta-resolve": ["import-meta-resolve@4.2.0", "", {}, "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg=="], "imurmurhash": ["imurmurhash@0.1.4", "", {}, "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="], - "indent-string": ["indent-string@4.0.0", "", {}, "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="], - - "infer-owner": ["infer-owner@1.0.4", "", {}, "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="], - "inflight": ["inflight@1.0.6", "", { "dependencies": { "once": "^1.3.0", "wrappy": "1" } }, "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="], "inherits": ["inherits@2.0.4", "", {}, "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="], - "ini": ["ini@2.0.0", "", {}, "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="], - - "init-package-json": ["init-package-json@2.0.5", "", { "dependencies": { "npm-package-arg": "^8.1.5", "promzard": "^0.3.0", "read": "~1.0.1", "read-package-json": "^4.1.1", "semver": "^7.3.5", "validate-npm-package-license": "^3.0.4", "validate-npm-package-name": "^3.0.0" } }, "sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA=="], - - "inquirer": ["inquirer@6.5.2", "", { "dependencies": { "ansi-escapes": "^3.2.0", "chalk": "^2.4.2", "cli-cursor": "^2.1.0", "cli-width": "^2.0.0", "external-editor": "^3.0.3", "figures": "^2.0.0", "lodash": "^4.17.12", "mute-stream": "0.0.7", "run-async": "^2.2.0", "rxjs": "^6.4.0", "string-width": "^2.1.0", "strip-ansi": "^5.1.0", "through": "^2.3.6" } }, "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="], - - "insight": ["insight@0.11.1", "", { "dependencies": { "async": "^2.6.2", "chalk": "^4.1.1", "conf": "^10.0.1", "inquirer": "^6.3.1", "lodash.debounce": "^4.0.8", "os-name": "^4.0.1", "request": "^2.88.0", "tough-cookie": "^4.0.0", "uuid": "^8.3.2" } }, "sha512-TBcZ0qC9dgdmcxL93OoqkY/RZXJtIi0i07phX/QyYk2ysmJtZex59dgTj4Doq50N9CG9dLRe/RIudc/5CCoFNw=="], + "ini": ["ini@6.0.0", "", {}, "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ=="], "internmap": ["internmap@1.0.1", "", {}, "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw=="], "ip-address": ["ip-address@10.2.0", "", {}, "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA=="], - "ipaddr.js": ["ipaddr.js@1.9.1", "", {}, "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="], - "is-arrayish": ["is-arrayish@0.2.1", "", {}, "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="], "is-binary-path": ["is-binary-path@2.1.0", "", { "dependencies": { "binary-extensions": "^2.0.0" } }, "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="], - "is-ci": ["is-ci@2.0.0", "", { "dependencies": { "ci-info": "^2.0.0" }, "bin": { "is-ci": "bin.js" } }, "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="], - "is-core-module": ["is-core-module@2.16.1", "", { "dependencies": { "hasown": "^2.0.2" } }, "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w=="], - "is-docker": ["is-docker@2.2.1", "", { "bin": { "is-docker": "cli.js" } }, "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="], - "is-extglob": ["is-extglob@2.1.1", "", {}, "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="], "is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="], "is-glob": ["is-glob@4.0.3", "", { "dependencies": { "is-extglob": "^2.1.1" } }, "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="], - "is-installed-globally": ["is-installed-globally@0.4.0", "", { "dependencies": { "global-dirs": "^3.0.0", "is-path-inside": "^3.0.2" } }, "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="], - - "is-lambda": ["is-lambda@1.0.1", "", {}, "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="], - - "is-npm": ["is-npm@5.0.0", "", {}, "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="], - "is-number": ["is-number@7.0.0", "", {}, "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="], "is-obj": ["is-obj@2.0.0", "", {}, "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="], @@ -1572,18 +1340,12 @@ "is-unicode-supported": ["is-unicode-supported@0.1.0", "", {}, "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="], - "is-wsl": ["is-wsl@2.2.0", "", { "dependencies": { "is-docker": "^2.0.0" } }, "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="], - - "is-yarn-global": ["is-yarn-global@0.3.0", "", {}, "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="], - "isarray": ["isarray@1.0.0", "", {}, "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="], "isexe": ["isexe@4.0.0", "", {}, "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw=="], "isobject": ["isobject@4.0.0", "", {}, "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="], - "isstream": ["isstream@0.1.2", "", {}, "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="], - "java-parser": ["java-parser@3.0.1", "", { "dependencies": { "chevrotain": "11.0.3", "chevrotain-allstar": "0.3.1", "lodash": "4.17.21" } }, "sha512-sDIR7u9b7O2JViNUxiZRhnRz7URII/eE7g2B+BmGxDeS6Ex3OYAcCyz5oh0H4LQ+hL/BS8OJTz8apMy9xtGmrQ=="], "jest-worker": ["jest-worker@27.5.1", "", { "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", "supports-color": "^8.0.0" } }, "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="], @@ -1594,54 +1356,34 @@ "js-yaml": ["js-yaml@4.1.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="], - "jsbn": ["jsbn@0.1.1", "", {}, "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="], - "jsesc": ["jsesc@3.1.0", "", { "bin": { "jsesc": "bin/jsesc" } }, "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA=="], "jshint": ["jshint@2.13.6", "", { "dependencies": { "cli": "~1.0.0", "console-browserify": "1.1.x", "exit": "0.1.x", "htmlparser2": "3.8.x", "lodash": "~4.17.21", "minimatch": "~3.0.2", "strip-json-comments": "1.0.x" }, "bin": { "jshint": "bin/jshint" } }, "sha512-IVdB4G0NTTeQZrBoM8C5JFVLjV2KtZ9APgybDA1MK73xb09qFs0jCXyQLnCOp1cSZZZbvhq/6mfXHUTaDkffuQ=="], - "json-buffer": ["json-buffer@3.0.0", "", {}, "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="], - "json-parse-even-better-errors": ["json-parse-even-better-errors@2.3.1", "", {}, "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="], - "json-schema": ["json-schema@0.4.0", "", {}, "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="], - "json-schema-traverse": ["json-schema-traverse@1.0.0", "", {}, "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="], - "json-schema-typed": ["json-schema-typed@7.0.3", "", {}, "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="], - "json-stringify-nice": ["json-stringify-nice@1.1.4", "", {}, "sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw=="], - "json-stringify-safe": ["json-stringify-safe@5.0.1", "", {}, "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="], - "json5": ["json5@2.2.3", "", { "bin": { "json5": "lib/cli.js" } }, "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="], "jsonc-parser": ["jsonc-parser@3.3.1", "", {}, "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ=="], - "jsonfile": ["jsonfile@6.2.1", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q=="], - "jsonparse": ["jsonparse@1.3.1", "", {}, "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg=="], - "jsprim": ["jsprim@1.4.2", "", { "dependencies": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", "json-schema": "0.4.0", "verror": "1.10.0" } }, "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="], - "jszip": ["jszip@3.10.1", "", { "dependencies": { "lie": "~3.3.0", "pako": "~1.0.2", "readable-stream": "~2.3.6", "setimmediate": "^1.0.5" } }, "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g=="], "just-diff": ["just-diff@6.0.2", "", {}, "sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA=="], "just-diff-apply": ["just-diff-apply@5.5.0", "", {}, "sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw=="], - "katex": ["katex@0.16.45", "", { "dependencies": { "commander": "^8.3.0" }, "bin": { "katex": "cli.js" } }, "sha512-pQpZbdBu7wCTmQUh7ufPmLr0pFoObnGUoL/yhtwJDgmmQpbkg/0HSVti25Fu4rmd1oCR6NGWe9vqTWuWv3GcNA=="], - - "keyv": ["keyv@3.1.0", "", { "dependencies": { "json-buffer": "3.0.0" } }, "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="], + "katex": ["katex@0.16.47", "", { "dependencies": { "commander": "^8.3.0" }, "bin": { "katex": "cli.js" } }, "sha512-Eeo8Ys1doU1z+x8AZsPpQu+p/QcZBI5PeOo7QGQdy2x2m0MU/hYagBbGOmXwr5KVbEfVuWv9LpnQWeehogurjg=="], "khroma": ["khroma@2.1.0", "", {}, "sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw=="], - "latest-version": ["latest-version@5.1.0", "", { "dependencies": { "package-json": "^6.3.0" } }, "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="], - "layout-base": ["layout-base@1.0.2", "", {}, "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg=="], - "lazystream": ["lazystream@1.0.1", "", { "dependencies": { "readable-stream": "^2.0.5" } }, "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw=="], - "lie": ["lie@3.3.0", "", { "dependencies": { "immediate": "~3.0.5" } }, "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ=="], "lightningcss": ["lightningcss@1.33.0", "", { "dependencies": { "detect-libc": "^2.0.3" }, "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" } }, "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA=="], @@ -1670,7 +1412,7 @@ "lines-and-columns": ["lines-and-columns@1.2.4", "", {}, "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="], - "linkify-it": ["linkify-it@5.0.1", "", { "dependencies": { "uc.micro": "^2.0.0" } }, "sha512-wVoTjP4Q6R0NW5hiZkVJaFZPWgtXfoGF+6LucL3/FtiNjmcHhYjEr5f1Kqjirc1nBW07J/ZuRFumqr2oqccEWg=="], + "linkify-it": ["linkify-it@5.0.2", "", { "dependencies": { "uc.micro": "^2.0.0" } }, "sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q=="], "loader-runner": ["loader-runner@4.3.1", "", {}, "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q=="], @@ -1684,39 +1426,23 @@ "lodash.debounce": ["lodash.debounce@4.0.8", "", {}, "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="], - "lodash.defaults": ["lodash.defaults@4.2.0", "", {}, "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="], - - "lodash.difference": ["lodash.difference@4.5.0", "", {}, "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA=="], - - "lodash.flatten": ["lodash.flatten@4.4.0", "", {}, "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="], - - "lodash.isplainobject": ["lodash.isplainobject@4.0.6", "", {}, "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="], - - "lodash.union": ["lodash.union@4.6.0", "", {}, "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="], - "log-symbols": ["log-symbols@4.1.0", "", { "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" } }, "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="], - "loud-rejection": ["loud-rejection@2.2.0", "", { "dependencies": { "currently-unhandled": "^0.4.1", "signal-exit": "^3.0.2" } }, "sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ=="], - "loupe": ["loupe@2.3.7", "", { "dependencies": { "get-func-name": "^2.0.1" } }, "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA=="], - "lowercase-keys": ["lowercase-keys@1.0.1", "", {}, "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="], - "lru-cache": ["lru-cache@11.3.6", "", {}, "sha512-Gf/KoL3C/MlI7Bt0PGI9I+TeTC/I6r/csU58N4BSNc4lppLBeKsOdFYkK+dX0ABDUMJNfCHTyPpzwwO21Awd3A=="], - "macos-release": ["macos-release@2.5.1", "", {}, "sha512-DXqXhEM7gW59OjZO8NIjBCz9AQ1BEMrfiOAl4AYByHCtVHRF4KoGNO8mqQeM8lRCtQe/UnJ4imO/d2HdkKsd+A=="], - "magic-string": ["magic-string@0.30.21", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="], "make-dir": ["make-dir@3.1.0", "", { "dependencies": { "semver": "^6.0.0" } }, "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="], "make-fetch-happen": ["make-fetch-happen@15.0.5", "", { "dependencies": { "@gar/promise-retry": "^1.0.0", "@npmcli/agent": "^4.0.0", "@npmcli/redact": "^4.0.0", "cacache": "^20.0.1", "http-cache-semantics": "^4.1.1", "minipass": "^7.0.2", "minipass-fetch": "^5.0.0", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "negotiator": "^1.0.0", "proc-log": "^6.0.0", "ssri": "^13.0.0" } }, "sha512-uCbIa8jWWmQZt4dSnEStkVC6gdakiinAm4PiGsywIkguF0eWMdcjDz0ECYhUolFU3pFLOev9VNPCEygydXnddg=="], - "markdown-it": ["markdown-it@14.2.0", "", { "dependencies": { "argparse": "^2.0.1", "entities": "^4.4.0", "linkify-it": "^5.0.1", "mdurl": "^2.0.0", "punycode.js": "^2.3.1", "uc.micro": "^2.1.0" }, "bin": { "markdown-it": "bin/markdown-it.mjs" } }, "sha512-1TGiQiJVRQ3NPmZH6sx5Cfnmg6GQm9jvC1ch4TK511NjSJvjzKLzn5pPfZRNZkRPZP0HqCioSndqH8v2nRaWVQ=="], + "markdown-it": ["markdown-it@14.3.0", "", { "dependencies": { "argparse": "^2.0.1", "entities": "^4.5.0", "linkify-it": "^5.0.2", "mdurl": "^2.0.0", "punycode.js": "^2.3.1", "uc.micro": "^2.1.0" }, "bin": { "markdown-it": "bin/markdown-it.mjs" } }, "sha512-RCEsPjR+sr0x+AuYp601tKTkgFG4YEPLCzHST3cQ/fhlJkqAkz1L2/Qbp1j9qw5SBwQHFBoW8+hoN5xssOF0Tw=="], - "markdown-it-anchor": ["markdown-it-anchor@9.2.0", "", { "peerDependencies": { "@types/markdown-it": "*", "markdown-it": "*" } }, "sha512-sa2ErMQ6kKOA4l31gLGYliFQrMKkqSO0ZJgGhDHKijPf0pNFM9vghjAh3gn26pS4JDRs7Iwa9S36gxm3vgZTzg=="], + "markdown-it-anchor": ["markdown-it-anchor@9.2.1", "", { "peerDependencies": { "@types/markdown-it": "*", "markdown-it": "*" } }, "sha512-p6APiLJDFAW2GEvaavDvhIBn7jrX2jLv77NkBGgNacFTurbORYc4pyYySg/mI6mpR6cHQuAtzKtmqgQr4K8dsQ=="], - "markdown-it-emoji": ["markdown-it-emoji@3.0.0", "", {}, "sha512-+rUD93bXHubA4arpEZO3q80so0qgoFJEKRkRbjKX8RTdca89v2kfyF+xR3i2sQTwql9tpPZPOQN5B+PunspXRg=="], + "markdown-it-emoji": ["markdown-it-emoji@3.1.0", "", {}, "sha512-NhmMEH2ywduD4Nty1E8uB5NqfLhAT1VR0dyvoJyStKOqCzbZmVdn/+8wj7zpDsb/fLBikpCPsWwxqKlvMmbz4g=="], "markdown-it-footnote": ["markdown-it-footnote@4.0.0", "", {}, "sha512-WYJ7urf+khJYl3DqofQpYfEYkZKbmXmwxQV8c8mO/hGIhgZ1wOe7R4HLFNwqx7TjILbnC98fuyeSsin19JdFcQ=="], @@ -1728,42 +1454,26 @@ "marked": ["marked@15.0.12", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA=="], - "math-intrinsics": ["math-intrinsics@1.1.0", "", {}, "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="], - - "md5-file": ["md5-file@5.0.0", "", { "bin": { "md5-file": "cli.js" } }, "sha512-xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw=="], - "mdurl": ["mdurl@2.0.0", "", {}, "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w=="], - "media-typer": ["media-typer@0.3.0", "", {}, "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="], - - "merge-descriptors": ["merge-descriptors@1.0.3", "", {}, "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="], - "merge-stream": ["merge-stream@2.0.0", "", {}, "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="], "merge2": ["merge2@1.4.1", "", {}, "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="], "mermaid": ["mermaid@11.15.0", "", { "dependencies": { "@braintree/sanitize-url": "^7.1.1", "@iconify/utils": "^3.0.2", "@mermaid-js/parser": "^1.1.1", "@types/d3": "^7.4.3", "@upsetjs/venn.js": "^2.0.0", "cytoscape": "^3.33.1", "cytoscape-cose-bilkent": "^4.1.0", "cytoscape-fcose": "^2.2.0", "d3": "^7.9.0", "d3-sankey": "^0.12.3", "dagre-d3-es": "7.0.14", "dayjs": "^1.11.19", "dompurify": "^3.3.1", "es-toolkit": "^1.45.1", "katex": "^0.16.25", "khroma": "^2.1.0", "marked": "^16.3.0", "roughjs": "^4.6.6", "stylis": "^4.3.6", "ts-dedent": "^2.2.0", "uuid": "^11.1.0 || ^12 || ^13 || ^14.0.0" } }, "sha512-pTMbcf3rWdtLiYGpmoTjHEpeY8seiy6sR+9nD7LOs8KfUbHE4lOUAprTRqRAcWSQ6MQpdX+YEsxShtGsINtPtw=="], - "methods": ["methods@1.1.2", "", {}, "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="], - "micromatch": ["micromatch@4.0.8", "", { "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" } }, "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="], - "mime": ["mime@1.6.0", "", { "bin": { "mime": "cli.js" } }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="], - "mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="], "mime-types": ["mime-types@3.0.2", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A=="], "mimic-fn": ["mimic-fn@2.1.0", "", {}, "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="], - "mimic-response": ["mimic-response@1.0.1", "", {}, "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="], - "mini-css-extract-plugin": ["mini-css-extract-plugin@2.10.2", "", { "dependencies": { "schema-utils": "^4.0.0", "tapable": "^2.2.1" }, "peerDependencies": { "webpack": "^5.0.0" } }, "sha512-AOSS0IdEB95ayVkxn5oGzNQwqAi2J0Jb/kKm43t7H73s8+f5873g0yuj0PNvK4dO75mu5DHg4nlgp4k6Kga8eg=="], "minimatch": ["minimatch@4.2.1", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g=="], - "minimist": ["minimist@1.2.8", "", {}, "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="], - "minipass": ["minipass@7.1.3", "", {}, "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A=="], "minipass-collect": ["minipass-collect@2.0.1", "", { "dependencies": { "minipass": "^7.0.3" } }, "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw=="], @@ -1772,23 +1482,19 @@ "minipass-flush": ["minipass-flush@1.0.7", "", { "dependencies": { "minipass": "^3.0.0" } }, "sha512-TbqTz9cUwWyHS2Dy89P3ocAGUGxKjjLuR9z8w4WUTGAVgEj17/4nhgo2Du56i0Fm3Pm30g4iA8Lcqctc76jCzA=="], - "minipass-json-stream": ["minipass-json-stream@1.0.2", "", { "dependencies": { "jsonparse": "^1.3.1", "minipass": "^3.0.0" } }, "sha512-myxeeTm57lYs8pH2nxPzmEEg8DGIgW+9mv6D4JZD2pa81I/OBjeU7PtICXV6c9eRGTA5JMDsuIPUZRCyBMYNhg=="], - "minipass-pipeline": ["minipass-pipeline@1.2.4", "", { "dependencies": { "minipass": "^3.0.0" } }, "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="], "minipass-sized": ["minipass-sized@2.0.0", "", { "dependencies": { "minipass": "^7.1.2" } }, "sha512-zSsHhto5BcUVM2m1LurnXY6M//cGhVaegT71OfOXoprxT6o780GZd792ea6FfrQkuU4usHZIUczAQMRUE2plzA=="], "minizlib": ["minizlib@3.1.0", "", { "dependencies": { "minipass": "^7.1.2" } }, "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw=="], - "mkdirp": ["mkdirp@0.5.6", "", { "dependencies": { "minimist": "^1.2.6" }, "bin": { "mkdirp": "bin/cmd.js" } }, "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="], - "mlly": ["mlly@1.8.1", "", { "dependencies": { "acorn": "^8.16.0", "pathe": "^2.0.3", "pkg-types": "^1.3.1", "ufo": "^1.6.3" } }, "sha512-SnL6sNutTwRWWR/vcmCYHSADjiEesp5TGQQ0pXyLhW5IoeibRlF/CbSLailbB3CNqJUk9cVJ9dUDnbD7GrcHBQ=="], "mocha": ["mocha@9.2.2", "", { "dependencies": { "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", "chokidar": "3.5.3", "debug": "4.3.3", "diff": "5.0.0", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", "glob": "7.2.0", "growl": "1.10.5", "he": "1.2.0", "js-yaml": "4.1.0", "log-symbols": "4.1.0", "minimatch": "4.2.1", "ms": "2.1.3", "nanoid": "3.3.1", "serialize-javascript": "6.0.0", "strip-json-comments": "3.1.1", "supports-color": "8.1.1", "which": "2.0.2", "workerpool": "6.2.0", "yargs": "16.2.0", "yargs-parser": "20.2.4", "yargs-unparser": "2.0.0" }, "bin": { "mocha": "bin/mocha", "_mocha": "bin/_mocha" } }, "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g=="], - "motion": ["motion@12.42.0", "", { "dependencies": { "framer-motion": "^12.42.0", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-Qhwvu9sVl5/URSq5CNzwMCpSKK8Uhnrwb6VO977kZyj/wOCS7mWebJUnBoHx5cZU1Zv8a9BD5CSICWKAlrLJgA=="], + "motion": ["motion@12.43.0", "", { "dependencies": { "framer-motion": "^12.43.0", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-BQgQbSa9Hn3/mtbib0MK53y6JSANa+YKUKlaYnWzAVDH424RYQ5LVpV3pNiWH00BA2z4ojsSdMzqT7g2FQwjuQ=="], - "motion-dom": ["motion-dom@12.42.0", "", { "dependencies": { "motion-utils": "^12.39.0" } }, "sha512-M63h4n8R+quJdNhBwuLlgxM+OLYa9+I/T2pzDRboB9fLXRdbou+Gw7Zury+SkpaCyACP1JHSjHgZ1EgTkBr30w=="], + "motion-dom": ["motion-dom@12.43.0", "", { "dependencies": { "motion-utils": "^12.39.0" } }, "sha512-azKON4d9S65PEoFUiQTMTgPheEmzf2QngdRc50AKfJp9Q9mmcBVw22c8eMq9k8kxOFHdL7+WZY7N/5F/lwiDag=="], "motion-utils": ["motion-utils@12.39.0", "", {}, "sha512-8nadJAJjTtqRkmRF36FoJTrywK9nnFmnPwnSMyxaOCU7GDjN9RTMJIxx9De8ErM+vpPhMccr/6fo5WciyQLnMQ=="], @@ -1796,11 +1502,9 @@ "mustache": ["mustache@4.2.0", "", { "bin": { "mustache": "bin/mustache" } }, "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ=="], - "mute-stream": ["mute-stream@0.0.7", "", {}, "sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ=="], + "nanoid": ["nanoid@3.3.16", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q=="], - "nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], - - "negotiator": ["negotiator@0.6.4", "", {}, "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w=="], + "negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="], "neo-async": ["neo-async@2.6.2", "", {}, "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="], @@ -1808,21 +1512,17 @@ "node-gyp": ["node-gyp@12.3.0", "", { "dependencies": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", "graceful-fs": "^4.2.6", "nopt": "^9.0.0", "proc-log": "^6.0.0", "semver": "^7.3.5", "tar": "^7.5.4", "tinyglobby": "^0.2.12", "undici": "^6.25.0", "which": "^6.0.0" }, "bin": { "node-gyp": "bin/node-gyp.js" } }, "sha512-QNcUWM+HgJplcPzBvFBZ9VXacyGZ4+VTOb80PwWR+TlVzoHbRKULNEzpRsnaoxG3Wzr7Qh7BYxGDU3CbKib2Yg=="], - "node-releases": ["node-releases@2.0.38", "", {}, "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw=="], + "node-releases": ["node-releases@2.0.53", "", {}, "sha512-D9UOmYG3UH1V+ENW56t5QXBwJw1YEY18ruVeus89Rw+SyIgjPkCO84bRzO3uNIYosJbNwiabWVn48o3uJLjxFQ=="], "nopt": ["nopt@9.0.0", "", { "dependencies": { "abbrev": "^4.0.0" }, "bin": { "nopt": "bin/nopt.js" } }, "sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw=="], - "normalize-package-data": ["normalize-package-data@3.0.3", "", { "dependencies": { "hosted-git-info": "^4.0.1", "is-core-module": "^2.5.0", "semver": "^7.3.4", "validate-npm-package-license": "^3.0.1" } }, "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="], - "normalize-path": ["normalize-path@3.0.0", "", {}, "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="], - "normalize-url": ["normalize-url@4.5.1", "", {}, "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="], - "npm-bundled": ["npm-bundled@5.0.0", "", { "dependencies": { "npm-normalize-package-bin": "^5.0.0" } }, "sha512-JLSpbzh6UUXIEoqPsYBvVNVmyrjVZ1fzEFbqxKkTJQkWBO3xFzFT+KDnSKQWwOQNbuWRwt5LSD6HOTLGIWzfrw=="], "npm-install-checks": ["npm-install-checks@8.0.0", "", { "dependencies": { "semver": "^7.1.1" } }, "sha512-ScAUdMpyzkbpxoNekQ3tNRdFI8SJ86wgKZSQZdUxT+bj0wVFpsEMWnkXP0twVe1gJyNF5apBWDJhhIbgrIViRA=="], - "npm-normalize-package-bin": ["npm-normalize-package-bin@1.0.1", "", {}, "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="], + "npm-normalize-package-bin": ["npm-normalize-package-bin@5.0.0", "", {}, "sha512-CJi3OS4JLsNMmr2u07OJlhcrPxCeOeP/4xq67aWNai6TNWWbTrlNDgl8NcFKVlcBKp18GPj+EzbNIgrBfZhsag=="], "npm-package-arg": ["npm-package-arg@13.0.2", "", { "dependencies": { "hosted-git-info": "^9.0.0", "proc-log": "^6.0.0", "semver": "^7.3.5", "validate-npm-package-name": "^7.0.0" } }, "sha512-IciCE3SY3uE84Ld8WZU23gAPPV9rIYod4F+rc+vJ7h7cwAJt9Vk6TVsK60ry7Uj3SRS3bqRRIGuTp9YVlk6WNA=="], @@ -1834,48 +1534,20 @@ "npm-run-path": ["npm-run-path@4.0.1", "", { "dependencies": { "path-key": "^3.0.0" } }, "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="], - "npmlog": ["npmlog@4.1.2", "", { "dependencies": { "are-we-there-yet": "~1.1.2", "console-control-strings": "~1.1.0", "gauge": "~2.7.3", "set-blocking": "~2.0.0" } }, "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="], - - "number-is-nan": ["number-is-nan@1.0.1", "", {}, "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="], - - "oauth-sign": ["oauth-sign@0.9.0", "", {}, "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="], - - "object-assign": ["object-assign@4.1.1", "", {}, "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="], - - "object-inspect": ["object-inspect@1.13.4", "", {}, "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew=="], - "objectorarray": ["objectorarray@1.0.5", "", {}, "sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg=="], "obug": ["obug@2.1.3", "", {}, "sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg=="], - "on-finished": ["on-finished@2.4.1", "", { "dependencies": { "ee-first": "1.1.1" } }, "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="], - - "on-headers": ["on-headers@1.1.0", "", {}, "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A=="], - "once": ["once@1.4.0", "", { "dependencies": { "wrappy": "1" } }, "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="], "onetime": ["onetime@5.1.2", "", { "dependencies": { "mimic-fn": "^2.1.0" } }, "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="], - "open": ["open@7.4.2", "", { "dependencies": { "is-docker": "^2.0.0", "is-wsl": "^2.1.1" } }, "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="], - - "os-name": ["os-name@4.0.1", "", { "dependencies": { "macos-release": "^2.5.0", "windows-release": "^4.0.0" } }, "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw=="], - - "os-tmpdir": ["os-tmpdir@1.0.2", "", {}, "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="], - - "p-cancelable": ["p-cancelable@1.1.0", "", {}, "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="], - - "p-finally": ["p-finally@1.0.0", "", {}, "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="], - "p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="], "p-locate": ["p-locate@5.0.0", "", { "dependencies": { "p-limit": "^3.0.2" } }, "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="], "p-map": ["p-map@7.0.4", "", {}, "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ=="], - "p-try": ["p-try@2.2.0", "", {}, "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="], - - "package-json": ["package-json@6.5.0", "", { "dependencies": { "got": "^9.6.0", "registry-auth-token": "^4.0.0", "registry-url": "^5.0.0", "semver": "^6.2.0" } }, "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="], - "package-manager-detector": ["package-manager-detector@1.6.0", "", {}, "sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA=="], "pacote": ["pacote@21.5.0", "", { "dependencies": { "@gar/promise-retry": "^1.0.0", "@npmcli/git": "^7.0.0", "@npmcli/installed-package-contents": "^4.0.0", "@npmcli/package-json": "^7.0.0", "@npmcli/promise-spawn": "^9.0.0", "@npmcli/run-script": "^10.0.0", "cacache": "^20.0.0", "fs-minipass": "^3.0.0", "minipass": "^7.0.2", "npm-package-arg": "^13.0.0", "npm-packlist": "^10.0.1", "npm-pick-manifest": "^11.0.1", "npm-registry-fetch": "^19.0.0", "proc-log": "^6.0.0", "sigstore": "^4.0.0", "ssri": "^13.0.0", "tar": "^7.4.3" }, "bin": { "pacote": "bin/index.js" } }, "sha512-VtZ0SB8mb5Tzw3dXDfVAIjhyVKUHZkS/ZH9/5mpKenwC9sFOXNI0JI7kEF7IMkwOnsWMFrvAZHzx1T5fmrp9FQ=="], @@ -1888,8 +1560,6 @@ "parse-json": ["parse-json@5.2.0", "", { "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", "json-parse-even-better-errors": "^2.3.0", "lines-and-columns": "^1.1.6" } }, "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="], - "parseurl": ["parseurl@1.3.3", "", {}, "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="], - "path-browserify": ["path-browserify@1.0.1", "", {}, "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="], "path-data-parser": ["path-data-parser@0.1.0", "", {}, "sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w=="], @@ -1906,33 +1576,25 @@ "path-scurry": ["path-scurry@2.0.2", "", { "dependencies": { "lru-cache": "^11.0.0", "minipass": "^7.1.2" } }, "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg=="], - "path-to-regexp": ["path-to-regexp@0.1.13", "", {}, "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA=="], - "path-type": ["path-type@4.0.0", "", {}, "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="], "pathe": ["pathe@2.0.3", "", {}, "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="], "pathval": ["pathval@1.1.1", "", {}, "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="], - "performance-now": ["performance-now@2.1.0", "", {}, "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="], - "picocolors": ["picocolors@1.1.1", "", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="], - "picomatch": ["picomatch@4.0.4", "", {}, "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A=="], - - "pify": ["pify@5.0.0", "", {}, "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA=="], + "picomatch": ["picomatch@4.0.7", "", {}, "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA=="], "pkg-types": ["pkg-types@1.3.1", "", { "dependencies": { "confbox": "^0.1.8", "mlly": "^1.7.4", "pathe": "^2.0.1" } }, "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ=="], - "pkg-up": ["pkg-up@3.1.0", "", { "dependencies": { "find-up": "^3.0.0" } }, "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA=="], - "plist": ["plist@3.1.0", "", { "dependencies": { "@xmldom/xmldom": "^0.8.8", "base64-js": "^1.5.1", "xmlbuilder": "^15.1.1" } }, "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ=="], "points-on-curve": ["points-on-curve@0.2.0", "", {}, "sha512-0mYKnYYe9ZcqMCWhUjItv/oHjvgEsfKvnUTg8sAtnHr3GVy7rGkXCb6d5cSyqrWqL4k81b9CPg3urd+T7aop3A=="], "points-on-path": ["points-on-path@0.2.1", "", { "dependencies": { "path-data-parser": "0.1.0", "points-on-curve": "0.2.0" } }, "sha512-25ClnWWuw7JbWZcgqY/gJ4FQWadKxGWk+3kR/7kD0tCaDtPPMj7oHu2ToLaVhfpnHrZzYby2w6tUA0eOIuUg8g=="], - "postcss": ["postcss@8.5.6", "", { "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg=="], + "postcss": ["postcss@8.5.25", "", { "dependencies": { "nanoid": "^3.3.16", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw=="], "postcss-loader": ["postcss-loader@8.2.1", "", { "dependencies": { "cosmiconfig": "^9.0.0", "jiti": "^2.5.1", "semver": "^7.6.2" }, "peerDependencies": { "@rspack/core": "0.x || ^1.0.0 || ^2.0.0-0", "postcss": "^7.0.0 || ^8.0.1", "webpack": "^5.0.0" }, "optionalPeers": ["@rspack/core", "webpack"] }, "sha512-k98jtRzthjj3f76MYTs9JTpRqV1RaaMhEU0Lpw9OTmQZQdppg4B30VZ74BojuBHt3F4KyubHJoXCMUeM8Bqeow=="], @@ -1948,8 +1610,6 @@ "postcss-value-parser": ["postcss-value-parser@4.2.0", "", {}, "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="], - "prepend-http": ["prepend-http@2.0.0", "", {}, "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="], - "prettier": ["prettier@3.8.3", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw=="], "prettier-plugin-java": ["prettier-plugin-java@2.8.1", "", { "dependencies": { "java-parser": "3.0.1" }, "peerDependencies": { "prettier": "^3.0.0" } }, "sha512-tkteH5OSCEb0E7wKnhhUSitr1pGUCUt9M//CwerSNhoalL/qv0jXTeSVBPZ36KC+kZl3nbq4dxh144NuGchACg=="], @@ -1964,54 +1624,22 @@ "promise-call-limit": ["promise-call-limit@3.0.2", "", {}, "sha512-mRPQO2T1QQVw11E7+UdCJu7S61eJVWknzml9sC1heAdj1jxl0fWMBypIt9ZOcLFf8FkG995ZD7RnVk7HH72fZw=="], - "promise-inflight": ["promise-inflight@1.0.1", "", {}, "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="], - - "promise-retry": ["promise-retry@2.0.1", "", { "dependencies": { "err-code": "^2.0.2", "retry": "^0.12.0" } }, "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="], - - "promzard": ["promzard@0.3.0", "", { "dependencies": { "read": "1" } }, "sha512-JZeYqd7UAcHCwI+sTOeUDYkvEU+1bQ7iE0UT1MgB/tERkAPkesW46MrpIySzODi+owTjZtiF8Ay5j9m60KmMBw=="], - "properties-parser": ["properties-parser@0.6.0", "", {}, "sha512-qvr2cSmoA0dln0MARAKwBzPkkXn7FqwX+RVVNpMdMJc7rt9mqO2cXwluxtux9fHrLhjnPFaQkS8BM0kFrTCnSw=="], - "proxy-addr": ["proxy-addr@2.0.7", "", { "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" } }, "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="], - - "psl": ["psl@1.15.0", "", { "dependencies": { "punycode": "^2.3.1" } }, "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w=="], - - "pump": ["pump@3.0.4", "", { "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" } }, "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA=="], - "punycode": ["punycode@2.3.1", "", {}, "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="], "punycode.js": ["punycode.js@2.3.1", "", {}, "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA=="], - "pupa": ["pupa@2.1.1", "", { "dependencies": { "escape-goat": "^2.0.0" } }, "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="], - - "q": ["q@1.5.1", "", {}, "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="], - - "qs": ["qs@6.5.5", "", {}, "sha512-mzR4sElr1bfCaPJe7m8ilJ6ZXdDaGoObcYR0ZHSsktM/Lt21MVHj5De30GQH2eiZ1qGRTO7LCAzQsUeXTNexWQ=="], - "querystringify": ["querystringify@2.2.0", "", {}, "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="], "queue-microtask": ["queue-microtask@1.2.3", "", {}, "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="], "randombytes": ["randombytes@2.1.0", "", { "dependencies": { "safe-buffer": "^5.1.0" } }, "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="], - "range-parser": ["range-parser@1.2.1", "", {}, "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="], - - "raw-body": ["raw-body@2.5.3", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "unpipe": "~1.0.0" } }, "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA=="], - "raw-loader": ["raw-loader@4.0.2", "", { "dependencies": { "loader-utils": "^2.0.0", "schema-utils": "^3.0.0" }, "peerDependencies": { "webpack": "^4.0.0 || ^5.0.0" } }, "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA=="], - "rc": ["rc@1.2.8", "", { "dependencies": { "deep-extend": "^0.6.0", "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" }, "bin": { "rc": "./cli.js" } }, "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="], - - "read": ["read@1.0.7", "", { "dependencies": { "mute-stream": "~0.0.4" } }, "sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ=="], - - "read-chunk": ["read-chunk@3.2.0", "", { "dependencies": { "pify": "^4.0.1", "with-open-file": "^0.1.6" } }, "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ=="], - "read-cmd-shim": ["read-cmd-shim@6.0.0", "", {}, "sha512-1zM5HuOfagXCBWMN83fuFI/x+T/UhZ7k+KIzhrHXcQoeX5+7gmaDYjELQHmmzIodumBHeByBJT4QYS7ufAgs7A=="], - "read-package-json": ["read-package-json@4.1.2", "", { "dependencies": { "glob": "^7.1.1", "json-parse-even-better-errors": "^2.3.0", "normalize-package-data": "^3.0.0", "npm-normalize-package-bin": "^1.0.0" } }, "sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ=="], - - "read-package-json-fast": ["read-package-json-fast@2.0.3", "", { "dependencies": { "json-parse-even-better-errors": "^2.3.0", "npm-normalize-package-bin": "^1.0.1" } }, "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ=="], - "readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="], "readdirp": ["readdirp@4.1.2", "", {}, "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg=="], @@ -2022,16 +1650,10 @@ "regexpu-core": ["regexpu-core@6.4.0", "", { "dependencies": { "regenerate": "^1.4.2", "regenerate-unicode-properties": "^10.2.2", "regjsgen": "^0.8.0", "regjsparser": "^0.13.0", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.2.1" } }, "sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA=="], - "registry-auth-token": ["registry-auth-token@4.2.2", "", { "dependencies": { "rc": "1.2.8" } }, "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg=="], - - "registry-url": ["registry-url@5.1.0", "", { "dependencies": { "rc": "^1.2.8" } }, "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="], - "regjsgen": ["regjsgen@0.8.0", "", {}, "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q=="], "regjsparser": ["regjsparser@0.13.0", "", { "dependencies": { "jsesc": "~3.1.0" }, "bin": { "regjsparser": "bin/parser" } }, "sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q=="], - "request": ["request@2.88.0", "", { "dependencies": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", "caseless": "~0.12.0", "combined-stream": "~1.0.6", "extend": "~3.0.2", "forever-agent": "~0.6.1", "form-data": "~2.3.2", "har-validator": "~5.1.0", "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "oauth-sign": "~0.9.0", "performance-now": "^2.1.0", "qs": "~6.5.2", "safe-buffer": "^5.1.2", "tough-cookie": "~2.4.3", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" } }, "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="], - "require-directory": ["require-directory@2.1.1", "", {}, "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="], "require-from-string": ["require-from-string@2.0.2", "", {}, "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="], @@ -2042,35 +1664,23 @@ "resolve-from": ["resolve-from@4.0.0", "", {}, "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="], - "responselike": ["responselike@1.0.2", "", { "dependencies": { "lowercase-keys": "^1.0.0" } }, "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="], - - "restore-cursor": ["restore-cursor@2.0.0", "", { "dependencies": { "onetime": "^2.0.0", "signal-exit": "^3.0.2" } }, "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q=="], - - "retry": ["retry@0.12.0", "", {}, "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="], - "reusify": ["reusify@1.1.0", "", {}, "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw=="], - "rimraf": ["rimraf@3.0.2", "", { "dependencies": { "glob": "^7.1.3" }, "bin": { "rimraf": "bin.js" } }, "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="], - "robust-predicates": ["robust-predicates@3.0.2", "", {}, "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="], "rolldown": ["rolldown@1.2.1", "", { "dependencies": { "@oxc-project/types": "=0.142.0", "@rolldown/pluginutils": "^1.0.0" }, "optionalDependencies": { "@rolldown/binding-android-arm64": "1.2.1", "@rolldown/binding-darwin-arm64": "1.2.1", "@rolldown/binding-darwin-x64": "1.2.1", "@rolldown/binding-freebsd-x64": "1.2.1", "@rolldown/binding-linux-arm-gnueabihf": "1.2.1", "@rolldown/binding-linux-arm64-gnu": "1.2.1", "@rolldown/binding-linux-arm64-musl": "1.2.1", "@rolldown/binding-linux-ppc64-gnu": "1.2.1", "@rolldown/binding-linux-s390x-gnu": "1.2.1", "@rolldown/binding-linux-x64-gnu": "1.2.1", "@rolldown/binding-linux-x64-musl": "1.2.1", "@rolldown/binding-openharmony-arm64": "1.2.1", "@rolldown/binding-wasm32-wasi": "1.2.1", "@rolldown/binding-win32-arm64-msvc": "1.2.1", "@rolldown/binding-win32-x64-msvc": "1.2.1" }, "bin": { "rolldown": "./bin/cli.mjs" } }, "sha512-4FKJhg8d3OiyQOA6Q1Q0hoFFpW9/OoX+VsHzpECsdsIZoOArrAK90gl59YK/Z+gnDel45bgJZK03ozH/9bCqEw=="], "roughjs": ["roughjs@4.6.6", "", { "dependencies": { "hachure-fill": "^0.5.2", "path-data-parser": "^0.1.0", "points-on-curve": "^0.2.0", "points-on-path": "^0.2.1" } }, "sha512-ZUz/69+SYpFN/g/lUlo2FXcIjRkSu3nDarreVdGGndHEBJ6cXPdKguS8JGxwj5HA5xIbVKSmLgr5b3AWxtRfvQ=="], - "run-async": ["run-async@2.4.1", "", {}, "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="], - "run-parallel": ["run-parallel@1.2.0", "", { "dependencies": { "queue-microtask": "^1.2.2" } }, "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="], "rw": ["rw@1.3.3", "", {}, "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="], - "rxjs": ["rxjs@6.6.7", "", { "dependencies": { "tslib": "^1.9.0" } }, "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="], - "safe-buffer": ["safe-buffer@5.1.2", "", {}, "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="], "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="], - "sass": ["sass@1.99.0", "", { "dependencies": { "chokidar": "^4.0.0", "immutable": "^5.1.5", "source-map-js": ">=0.6.2 <2.0.0" }, "optionalDependencies": { "@parcel/watcher": "^2.4.1" }, "bin": { "sass": "sass.js" } }, "sha512-kgW13M54DUB7IsIRM5LvJkNlpH+WhMpooUcaWGFARkF1Tc82v9mIWkCbCYf+MBvpIUBSeSOTilpZjEPr2VYE6Q=="], + "sass": ["sass@1.103.1", "", { "dependencies": { "chokidar": "^5.0.0", "immutable": "^5.1.5", "source-map-js": ">=0.6.2 <2.0.0" }, "optionalDependencies": { "@parcel/watcher": "^2.4.1" }, "bin": { "sass": "sass.js" } }, "sha512-9icZURbP51S6S0QGoyaeqk9uB06GNWxsFYWfH5RgpFgqK5FA8tJcM3AdVxrZEVJ7dz+L87nG95gBKf4VuaMHGw=="], "sass-loader": ["sass-loader@16.0.8", "", { "dependencies": { "neo-async": "^2.6.2" }, "peerDependencies": { "@rspack/core": "0.x || ^1.0.0 || ^2.0.0-0", "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", "sass": "^1.3.0", "sass-embedded": "*", "webpack": "^5.0.0" }, "optionalPeers": ["@rspack/core", "node-sass", "sass", "sass-embedded", "webpack"] }, "sha512-hcov4ZwZJIGbEuyNr9EmiTmZueyrxSToE6GOzoZnq5JM7ecRO7ttyvilPn+VmRsqiP16+VYZzVnGZj/hzZgKBA=="], @@ -2080,32 +1690,14 @@ "semver": ["semver@7.7.4", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA=="], - "semver-diff": ["semver-diff@3.1.1", "", { "dependencies": { "semver": "^6.3.0" } }, "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="], - - "send": ["send@0.19.2", "", { "dependencies": { "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "~0.5.2", "http-errors": "~2.0.1", "mime": "1.6.0", "ms": "2.1.3", "on-finished": "~2.4.1", "range-parser": "~1.2.1", "statuses": "~2.0.2" } }, "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg=="], - "serialize-javascript": ["serialize-javascript@6.0.0", "", { "dependencies": { "randombytes": "^2.1.0" } }, "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="], - "serve-static": ["serve-static@1.16.3", "", { "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", "send": "~0.19.1" } }, "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA=="], - - "set-blocking": ["set-blocking@2.0.0", "", {}, "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="], - "setimmediate": ["setimmediate@1.0.5", "", {}, "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="], - "setprototypeof": ["setprototypeof@1.2.0", "", {}, "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="], - "shebang-command": ["shebang-command@2.0.0", "", { "dependencies": { "shebang-regex": "^3.0.0" } }, "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="], "shebang-regex": ["shebang-regex@3.0.0", "", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="], - "side-channel": ["side-channel@1.1.1", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.4", "side-channel-list": "^1.0.1", "side-channel-map": "^1.0.1", "side-channel-weakmap": "^1.0.2" } }, "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ=="], - - "side-channel-list": ["side-channel-list@1.0.1", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.4" } }, "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w=="], - - "side-channel-map": ["side-channel-map@1.0.1", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.5", "object-inspect": "^1.13.3" } }, "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA=="], - - "side-channel-weakmap": ["side-channel-weakmap@1.0.2", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.5", "object-inspect": "^1.13.3", "side-channel-map": "^1.0.1" } }, "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A=="], - "siginfo": ["siginfo@2.0.0", "", {}, "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g=="], "signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="], @@ -2118,7 +1710,7 @@ "socks": ["socks@2.8.9", "", { "dependencies": { "ip-address": "^10.1.1", "smart-buffer": "^4.2.0" } }, "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw=="], - "socks-proxy-agent": ["socks-proxy-agent@6.2.1", "", { "dependencies": { "agent-base": "^6.0.2", "debug": "^4.3.3", "socks": "^2.6.2" } }, "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ=="], + "socks-proxy-agent": ["socks-proxy-agent@8.0.5", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "^4.3.4", "socks": "^2.8.3" } }, "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw=="], "source-map": ["source-map@0.7.6", "", {}, "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ=="], @@ -2126,29 +1718,23 @@ "source-map-support": ["source-map-support@0.5.21", "", { "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" } }, "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="], - "spdx-correct": ["spdx-correct@3.2.0", "", { "dependencies": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" } }, "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA=="], - "spdx-exceptions": ["spdx-exceptions@2.5.0", "", {}, "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w=="], - "spdx-expression-parse": ["spdx-expression-parse@3.0.1", "", { "dependencies": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" } }, "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="], + "spdx-expression-parse": ["spdx-expression-parse@4.0.0", "", { "dependencies": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" } }, "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ=="], "spdx-license-ids": ["spdx-license-ids@3.0.23", "", {}, "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw=="], "sprintf": ["sprintf@0.1.5", "", {}, "sha512-4X5KsuXFQ7f+d7Y+bi4qSb6eI+YoifDTGr0MQJXRoYO7BO7evfRCjds6kk3z7l5CiJYxgDN1x5Er4WiyCt+zTQ=="], - "sshpk": ["sshpk@1.18.0", "", { "dependencies": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", "bcrypt-pbkdf": "^1.0.0", "dashdash": "^1.12.0", "ecc-jsbn": "~0.1.1", "getpass": "^0.1.1", "jsbn": "~0.1.0", "safer-buffer": "^2.0.2", "tweetnacl": "~0.14.0" }, "bin": { "sshpk-conv": "bin/sshpk-conv", "sshpk-sign": "bin/sshpk-sign", "sshpk-verify": "bin/sshpk-verify" } }, "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ=="], - "ssri": ["ssri@13.0.1", "", { "dependencies": { "minipass": "^7.0.3" } }, "sha512-QUiRf1+u9wPTL/76GTYlKttDEBWV1ga9ZXW8BG6kfdeyyM8LGPix9gROyg9V2+P0xNyF3X2Go526xKFdMZrHSQ=="], "stackback": ["stackback@0.0.2", "", {}, "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw=="], - "statuses": ["statuses@2.0.2", "", {}, "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw=="], - "std-env": ["std-env@4.2.0", "", {}, "sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw=="], "string-argv": ["string-argv@0.3.2", "", {}, "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q=="], - "string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="], + "string-width": ["string-width@8.2.2", "", { "dependencies": { "get-east-asian-width": "^1.5.0", "strip-ansi": "^7.1.2" } }, "sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg=="], "string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="], @@ -2156,8 +1742,6 @@ "strip-ansi": ["strip-ansi@7.1.2", "", { "dependencies": { "ansi-regex": "^6.0.1" } }, "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA=="], - "strip-bom": ["strip-bom@4.0.0", "", {}, "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="], - "strip-final-newline": ["strip-final-newline@2.0.0", "", {}, "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="], "strip-json-comments": ["strip-json-comments@3.1.1", "", {}, "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="], @@ -2178,54 +1762,36 @@ "tar": ["tar@7.5.22", "", { "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", "minizlib": "^3.1.0", "yallist": "^5.0.0" } }, "sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA=="], - "tar-stream": ["tar-stream@2.2.0", "", { "dependencies": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", "fs-constants": "^1.0.0", "inherits": "^2.0.3", "readable-stream": "^3.1.1" } }, "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="], - "terminal": ["terminal@0.1.4", "", { "dependencies": { "sprintf": ">= 0.1.1" } }, "sha512-w6OAFpUO+TimZUdQ46dK3fYYOCCBIsS2QUfIEkzX21oJ8tvJOJvJkcmrbleLH5KG02SNohYFDj81bL3VPaULsQ=="], "terser": ["terser@5.44.1", "", { "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.15.0", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, "bin": { "terser": "bin/terser" } }, "sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw=="], "terser-webpack-plugin": ["terser-webpack-plugin@5.3.16", "", { "dependencies": { "@jridgewell/trace-mapping": "^0.3.25", "jest-worker": "^27.4.5", "schema-utils": "^4.3.0", "serialize-javascript": "^6.0.2", "terser": "^5.31.1" }, "peerDependencies": { "webpack": "^5.1.0" } }, "sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q=="], - "through": ["through@2.3.8", "", {}, "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="], - "tinybench": ["tinybench@2.9.0", "", {}, "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg=="], "tinyexec": ["tinyexec@1.0.4", "", {}, "sha512-u9r3uZC0bdpGOXtlxUIdwf9pkmvhqJdrVCH9fapQtgy/OeTTMZ1nqH7agtvEfmGui6e1XxjcdrlxvxJvc3sMqw=="], - "tinyglobby": ["tinyglobby@0.2.16", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg=="], + "tinyglobby": ["tinyglobby@0.2.17", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g=="], "tinyrainbow": ["tinyrainbow@3.1.1", "", {}, "sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw=="], "tmp": ["tmp@0.2.5", "", {}, "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow=="], - "to-readable-stream": ["to-readable-stream@1.0.0", "", {}, "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="], - "to-regex-range": ["to-regex-range@5.0.1", "", { "dependencies": { "is-number": "^7.0.0" } }, "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="], - "toidentifier": ["toidentifier@1.0.1", "", {}, "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="], - - "tough-cookie": ["tough-cookie@4.1.4", "", { "dependencies": { "psl": "^1.1.33", "punycode": "^2.1.1", "universalify": "^0.2.0", "url-parse": "^1.5.3" } }, "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag=="], - "treeverse": ["treeverse@3.0.0", "", {}, "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ=="], "ts-dedent": ["ts-dedent@2.2.0", "", {}, "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ=="], - "ts-loader": ["ts-loader@9.5.7", "", { "dependencies": { "chalk": "^4.1.0", "enhanced-resolve": "^5.0.0", "micromatch": "^4.0.0", "semver": "^7.3.4", "source-map": "^0.7.4" }, "peerDependencies": { "typescript": "*", "webpack": "^5.0.0" } }, "sha512-/ZNrKgA3K3PtpMYOC71EeMWIloGw3IYEa5/t1cyz2r5/PyUwTXGzYJvcD3kfUvmhlfpz1rhV8B2O6IVTQ0avsg=="], + "ts-loader": ["ts-loader@9.6.2", "", { "dependencies": { "chalk": "^4.1.0", "picomatch": "^4.0.0", "source-map": "^0.7.4" }, "peerDependencies": { "loader-utils": "*", "typescript": "*", "webpack": "^4.0.0 || ^5.0.0" }, "optionalPeers": ["loader-utils"] }, "sha512-R4iuczmtgxvtuI556s+hTZ6/7Ee03VCAk/l/M8LY1OAsUgB7YydsCxkgq9D9pKRaD7GJqUi2u8fp9zZP/ufjKA=="], "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], "tuf-js": ["tuf-js@4.1.0", "", { "dependencies": { "@tufjs/models": "4.1.0", "debug": "^4.4.3", "make-fetch-happen": "^15.0.1" } }, "sha512-50QV99kCKH5P/Vs4E2Gzp7BopNV+KzTXqWeaxrfu5IQJBOULRsTIS9seSsOVT8ZnGXzCyx55nYWAi4qJzpZKEQ=="], - "tunnel-agent": ["tunnel-agent@0.6.0", "", { "dependencies": { "safe-buffer": "^5.0.1" } }, "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="], - - "tweetnacl": ["tweetnacl@0.14.5", "", {}, "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="], - "type-detect": ["type-detect@4.1.0", "", {}, "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw=="], - "type-fest": ["type-fest@0.20.2", "", {}, "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="], - - "type-is": ["type-is@1.6.18", "", { "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" } }, "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="], - "typedarray-to-buffer": ["typedarray-to-buffer@3.1.5", "", { "dependencies": { "is-typedarray": "^1.0.0" } }, "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="], "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], @@ -2236,8 +1802,6 @@ "umd-tough-cookie": ["umd-tough-cookie@3.0.0", "", {}, "sha512-LgVV1jgzEPgC/zOj6T9OIDBTj7YCGEJkgoxV2gHYv1Crlst1X95lRIF48hFleGgv4v01Z86LxyyLyvl++M2Srg=="], - "underscore": ["underscore@1.13.8", "", {}, "sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ=="], - "undici": ["undici@6.25.0", "", {}, "sha512-ZgpWDC5gmNiuY9CnLVXEH8rl50xhRCuLNA97fAUnKi8RRuV4E6KG31pDTsLVUKnohJE0I3XDrTeEydAXRw47xg=="], "undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="], @@ -2250,51 +1814,29 @@ "unicode-property-aliases-ecmascript": ["unicode-property-aliases-ecmascript@2.2.0", "", {}, "sha512-hpbDzxUY9BFwX+UeBnxv3Sh1q7HFxj48DTmXchNgRa46lO8uj3/1iEn3MiNUYTg1g9ctIqXCCERn8gYZhHC5lQ=="], - "unique-filename": ["unique-filename@1.1.1", "", { "dependencies": { "unique-slug": "^2.0.0" } }, "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="], - - "unique-slug": ["unique-slug@2.0.2", "", { "dependencies": { "imurmurhash": "^0.1.4" } }, "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="], - "unique-string": ["unique-string@2.0.0", "", { "dependencies": { "crypto-random-string": "^2.0.0" } }, "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="], - "universalify": ["universalify@2.0.1", "", {}, "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="], - - "unpipe": ["unpipe@1.0.0", "", {}, "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="], - "untildify": ["untildify@4.0.0", "", {}, "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="], - "update-browserslist-db": ["update-browserslist-db@1.2.3", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w=="], - - "update-notifier": ["update-notifier@5.1.0", "", { "dependencies": { "boxen": "^5.0.0", "chalk": "^4.1.0", "configstore": "^5.0.1", "has-yarn": "^2.1.0", "import-lazy": "^2.1.0", "is-ci": "^2.0.0", "is-installed-globally": "^0.4.0", "is-npm": "^5.0.0", "is-yarn-global": "^0.3.0", "latest-version": "^5.1.0", "pupa": "^2.1.1", "semver": "^7.3.4", "semver-diff": "^3.1.1", "xdg-basedir": "^4.0.0" } }, "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="], + "update-browserslist-db": ["update-browserslist-db@1.3.1", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-ZZ61DsRsOnakl74HAmp3oSN4aXUmEWXf+i/yv0h7tIBfICc3VdrFErQKUUKPgu3AMsTUMbcongALEN4l6GSUrQ=="], "uri-js": ["uri-js@4.4.1", "", { "dependencies": { "punycode": "^2.1.0" } }, "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="], "url-parse": ["url-parse@1.5.10", "", { "dependencies": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" } }, "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="], - "url-parse-lax": ["url-parse-lax@3.0.0", "", { "dependencies": { "prepend-http": "^2.0.0" } }, "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ=="], - "util-deprecate": ["util-deprecate@1.0.2", "", {}, "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="], - "utils-merge": ["utils-merge@1.0.1", "", {}, "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="], - "uuid": ["uuid@11.1.0", "", { "bin": { "uuid": "dist/esm/bin/uuid" } }, "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A=="], "valid-identifier": ["valid-identifier@0.0.2", "", {}, "sha512-zaSmOW6ykXwrkX0YTuFUSoALNEKGaQHpxBJQLb3TXspRNDpBwbfrIQCZqAQ0LKBlKuyn2YOq7NNd6415hvZ33g=="], - "validate-npm-package-license": ["validate-npm-package-license@3.0.4", "", { "dependencies": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" } }, "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="], - "validate-npm-package-name": ["validate-npm-package-name@7.0.2", "", {}, "sha512-hVDIBwsRruT73PbK7uP5ebUt+ezEtCmzZz3F59BSr2F6OVFnJ/6h8liuvdLrQ88Xmnk6/+xGGuq+pG9WwTuy3A=="], "vanilla-picker": ["vanilla-picker@2.12.3", "", { "dependencies": { "@sphinxxxx/color-conversion": "^2.2.2" } }, "sha512-qVkT1E7yMbUsB2mmJNFmaXMWE2hF8ffqzMMwe9zdAikd8u2VfnsVY2HQcOUi2F38bgbxzlJBEdS1UUhOXdF9GQ=="], - "vargs": ["vargs@0.1.0", "", {}, "sha512-d/j1kMUt0YjLCQPAI+VMZ7IKwNGjk8dSHMCrHq9txFOCcCIDoe8ck9FmPvABJgxIaZO1tabXmNojQG6mBkLLCw=="], - - "vary": ["vary@1.1.2", "", {}, "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="], - - "verror": ["verror@1.10.0", "", { "dependencies": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", "extsprintf": "^1.2.0" } }, "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="], - "vite": ["vite@8.2.0", "", { "dependencies": { "lightningcss": "^1.33.0", "picomatch": "^4.0.5", "postcss": "^8.5.23", "rolldown": "~1.2.0", "tinyglobby": "^0.2.17" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "@vitejs/devtools": "^0.4.0", "esbuild": "^0.27.0 || ^0.28.0", "jiti": ">=1.21.0", "less": "^4.0.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "@vitejs/devtools", "esbuild", "jiti", "less", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-pn+CFpM0lwDeKwmOq1ZaBK/9sjorZcgqxki6MbY/jPEVd9vichIlmlD4HmQ5wdP5EgqQCFRaACBxMC7uEGc6lQ=="], - "vitest": ["vitest@4.1.10", "", { "dependencies": { "@vitest/expect": "4.1.10", "@vitest/mocker": "4.1.10", "@vitest/pretty-format": "4.1.10", "@vitest/runner": "4.1.10", "@vitest/snapshot": "4.1.10", "@vitest/spy": "4.1.10", "@vitest/utils": "4.1.10", "es-module-lexer": "^2.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", "obug": "^2.1.1", "pathe": "^2.0.3", "picomatch": "^4.0.3", "std-env": "^4.0.0-rc.1", "tinybench": "^2.9.0", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", "tinyrainbow": "^3.1.0", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0", "why-is-node-running": "^2.3.0" }, "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.10", "@vitest/browser-preview": "4.1.10", "@vitest/browser-webdriverio": "4.1.10", "@vitest/coverage-istanbul": "4.1.10", "@vitest/coverage-v8": "4.1.10", "@vitest/ui": "4.1.10", "happy-dom": "*", "jsdom": "*" }, "optionalPeers": ["@edge-runtime/vm", "@opentelemetry/api", "@types/node", "@vitest/browser-playwright", "@vitest/browser-preview", "@vitest/browser-webdriverio", "@vitest/coverage-istanbul", "@vitest/coverage-v8", "@vitest/ui", "happy-dom", "jsdom"], "bin": { "vitest": "./vitest.mjs" } }, "sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw=="], + "vitest": ["vitest@4.1.11", "", { "dependencies": { "@vitest/expect": "4.1.11", "@vitest/mocker": "4.1.11", "@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.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", "obug": "^2.1.1", "pathe": "^2.0.3", "picomatch": "^4.0.3", "std-env": "^4.0.0-rc.1", "tinybench": "^2.9.0", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", "tinyrainbow": "^3.1.0", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0", "why-is-node-running": "^2.3.0" }, "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.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": "*" }, "optionalPeers": ["@edge-runtime/vm", "@opentelemetry/api", "@types/node", "@vitest/browser-playwright", "@vitest/browser-preview", "@vitest/browser-webdriverio", "@vitest/coverage-istanbul", "@vitest/coverage-v8", "@vitest/ui", "happy-dom", "jsdom"], "bin": { "vitest": "./vitest.mjs" } }, "sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw=="], "vscode-css-languageservice": ["vscode-css-languageservice@6.3.10", "", { "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "3.17.5", "vscode-uri": "^3.1.0" } }, "sha512-eq5N9Er3fC4vA9zd9EFhyBG90wtCCuXgRSpAndaOgXMh1Wgep5lBgRIeDgjZBW9pa+332yC9+49cZMW8jcL3MA=="], @@ -2318,8 +1860,6 @@ "watchpack": ["watchpack@2.5.1", "", { "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" } }, "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg=="], - "wd": ["wd@1.14.0", "", { "dependencies": { "archiver": "^3.0.0", "async": "^2.0.0", "lodash": "^4.0.0", "mkdirp": "^0.5.1", "q": "^1.5.1", "request": "2.88.0", "vargs": "^0.1.0" }, "bin": { "wd": "lib/bin.js" } }, "sha512-X7ZfGHHYlQ5zYpRlgP16LUsvYti+Al/6fz3T/ClVyivVCpCZQpESTDdz6zbK910O5OIvujO23Ym2DBBo3XsQlA=="], - "webpack": ["webpack@5.105.0", "", { "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", "@types/json-schema": "^7.0.15", "@webassemblyjs/ast": "^1.14.1", "@webassemblyjs/wasm-edit": "^1.14.1", "@webassemblyjs/wasm-parser": "^1.14.1", "acorn": "^8.15.0", "acorn-import-phases": "^1.0.3", "browserslist": "^4.28.1", "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^5.19.0", "es-module-lexer": "^2.0.0", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.3.1", "mime-types": "^2.1.27", "neo-async": "^2.6.2", "schema-utils": "^4.3.3", "tapable": "^2.3.0", "terser-webpack-plugin": "^5.3.16", "watchpack": "^2.5.1", "webpack-sources": "^3.3.3" }, "bin": { "webpack": "bin/webpack.js" } }, "sha512-gX/dMkRQc7QOMzgTe6KsYFM7DxeIONQSui1s0n/0xht36HvrgbxtM1xBlgx596NbpHuQU8P7QpKwrZYwUX48nw=="], "webpack-sources": ["webpack-sources@3.3.3", "", {}, "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg=="], @@ -2330,14 +1870,6 @@ "why-is-node-running": ["why-is-node-running@2.3.0", "", { "dependencies": { "siginfo": "^2.0.0", "stackback": "0.0.2" }, "bin": { "why-is-node-running": "cli.js" } }, "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w=="], - "wide-align": ["wide-align@1.1.5", "", { "dependencies": { "string-width": "^1.0.2 || 2 || 3 || 4" } }, "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="], - - "widest-line": ["widest-line@3.1.0", "", { "dependencies": { "string-width": "^4.0.0" } }, "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="], - - "windows-release": ["windows-release@4.0.0", "", { "dependencies": { "execa": "^4.0.2" } }, "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg=="], - - "with-open-file": ["with-open-file@0.1.7", "", { "dependencies": { "p-finally": "^1.0.0", "p-try": "^2.1.0", "pify": "^4.0.1" } }, "sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA=="], - "workerpool": ["workerpool@6.2.0", "", {}, "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A=="], "wrap-ansi": ["wrap-ansi@9.0.2", "", { "dependencies": { "ansi-styles": "^6.2.1", "string-width": "^7.0.0", "strip-ansi": "^7.1.0" } }, "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww=="], @@ -2346,7 +1878,7 @@ "write-file-atomic": ["write-file-atomic@3.0.3", "", { "dependencies": { "imurmurhash": "^0.1.4", "is-typedarray": "^1.0.0", "signal-exit": "^3.0.2", "typedarray-to-buffer": "^3.1.5" } }, "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="], - "ws": ["ws@8.21.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g=="], + "ws": ["ws@8.21.3", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw=="], "xdg-basedir": ["xdg-basedir@4.0.0", "", {}, "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="], @@ -2358,7 +1890,7 @@ "yallist": ["yallist@5.0.0", "", {}, "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="], - "yargs": ["yargs@18.0.0", "", { "dependencies": { "cliui": "^9.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "string-width": "^7.2.0", "y18n": "^5.0.5", "yargs-parser": "^22.0.0" } }, "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg=="], + "yargs": ["yargs@18.1.0", "", { "dependencies": { "cliui": "^9.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "string-width": "^8.2.1", "y18n": "^5.0.5", "yargs-parser": "^22.0.0" } }, "sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg=="], "yargs-parser": ["yargs-parser@22.0.0", "", {}, "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw=="], @@ -2366,15 +1898,15 @@ "yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="], - "zip-stream": ["zip-stream@2.1.3", "", { "dependencies": { "archiver-utils": "^2.1.0", "compress-commons": "^2.1.1", "readable-stream": "^3.4.0" } }, "sha512-EkXc2JGcKhO5N5aZ7TmuNo45budRaFGHOmz24wtJR7znbNqDPmdZtUauKX6et8KAVseAMBOyWJqEpXcHTBsh7Q=="], - "@babel/core/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/core/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], "@babel/core/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - "@babel/generator/@babel/types": ["@babel/types@7.29.0", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.28.5" } }, "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A=="], + "@babel/generator/@babel/types": ["@babel/types@7.29.8", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg=="], + + "@babel/helper-compilation-targets/browserslist": ["browserslist@4.28.2", "", { "dependencies": { "baseline-browser-mapping": "^2.10.12", "caniuse-lite": "^1.0.30001782", "electron-to-chromium": "^1.5.328", "node-releases": "^2.0.36", "update-browserslist-db": "^1.2.3" }, "bin": { "browserslist": "cli.js" } }, "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg=="], "@babel/helper-create-class-features-plugin/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], @@ -2392,7 +1924,7 @@ "@babel/helper-wrap-function/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - "@babel/parser/@babel/types": ["@babel/types@7.29.0", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.28.5" } }, "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A=="], + "@babel/parser/@babel/types": ["@babel/types@7.29.8", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg=="], "@babel/plugin-transform-async-generator-functions/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], @@ -2402,11 +1934,11 @@ "@babel/template/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@babel/traverse/@babel/code-frame": ["@babel/code-frame@7.29.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.28.5", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw=="], + "@babel/traverse/@babel/code-frame": ["@babel/code-frame@7.29.7", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw=="], - "@babel/traverse/@babel/template": ["@babel/template@7.28.6", "", { "dependencies": { "@babel/code-frame": "^7.28.6", "@babel/parser": "^7.28.6", "@babel/types": "^7.28.6" } }, "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ=="], + "@babel/traverse/@babel/template": ["@babel/template@7.29.7", "", { "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/parser": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg=="], - "@babel/traverse/@babel/types": ["@babel/types@7.29.0", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.28.5" } }, "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A=="], + "@babel/traverse/@babel/types": ["@babel/types@7.29.8", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg=="], "@chevrotain/cst-dts-gen/@chevrotain/types": ["@chevrotain/types@11.0.3", "", {}, "sha512-gsiM3G8b58kZC2HaWR50gu6Y1440cHiJ+i3JUvcp/35JchYejb2+5MVeJK0iKThYpAa/P2PYFV4hoi44HD+aHQ=="], @@ -2424,7 +1956,7 @@ "@codemirror/lang-liquid/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], - "@codemirror/lang-markdown/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + "@codemirror/lang-markdown/@lezer/common": ["@lezer/common@1.5.2", "", {}, "sha512-sxQE460fPZyU3sdc8lafxiPwJHBzZRy/udNFynGQky1SePYBdhkBl1kOagA9uT3pxR8K09bOrmTUqA9wb/PjSQ=="], "@codemirror/lang-php/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], @@ -2440,34 +1972,22 @@ "@codemirror/language-data/@codemirror/lang-liquid": ["@codemirror/lang-liquid@6.3.1", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-html": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.3.1" } }, "sha512-S/jE/D7iij2Pu70AC65ME6AYWxOOcX20cSJvaPgY5w7m2sfxsArAcUAuUgm/CZCVmqoi9KiOlS7gj/gyLipABw=="], - "@codemirror/language-data/@codemirror/lang-yaml": ["@codemirror/lang-yaml@6.1.2", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.2.0", "@lezer/lr": "^1.0.0", "@lezer/yaml": "^1.0.0" } }, "sha512-dxrfG8w5Ce/QbT7YID7mWZFKhdhsaTNOYjOkSIMt1qmC4VQnXSDSYVHHHn8k6kJUfIhtLo8t1JJgltlxWdsITw=="], - - "@npmcli/agent/http-proxy-agent": ["http-proxy-agent@7.0.2", "", { "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" } }, "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig=="], - - "@npmcli/agent/https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="], + "@codemirror/language-data/@codemirror/lang-markdown": ["@codemirror/lang-markdown@6.5.0", "", { "dependencies": { "@codemirror/autocomplete": "^6.7.1", "@codemirror/lang-html": "^6.0.0", "@codemirror/language": "^6.3.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", "@lezer/common": "^1.2.1", "@lezer/markdown": "^1.0.0" } }, "sha512-0K40bZ35jpHya6FriukbgaleaqzBLZfOh7HuzqbMxBXkbYMJDxfF39c23xOgxFezR+3G+tR2/Mup+Xk865OMvw=="], - "@npmcli/agent/socks-proxy-agent": ["socks-proxy-agent@8.0.5", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "^4.3.4", "socks": "^2.8.3" } }, "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw=="], + "@codemirror/language-data/@codemirror/lang-yaml": ["@codemirror/lang-yaml@6.1.2", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.2.0", "@lezer/lr": "^1.0.0", "@lezer/yaml": "^1.0.0" } }, "sha512-dxrfG8w5Ce/QbT7YID7mWZFKhdhsaTNOYjOkSIMt1qmC4VQnXSDSYVHHHn8k6kJUfIhtLo8t1JJgltlxWdsITw=="], "@npmcli/arborist/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], - "@npmcli/git/ini": ["ini@6.0.0", "", {}, "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ=="], - - "@npmcli/installed-package-contents/npm-normalize-package-bin": ["npm-normalize-package-bin@5.0.0", "", {}, "sha512-CJi3OS4JLsNMmr2u07OJlhcrPxCeOeP/4xq67aWNai6TNWWbTrlNDgl8NcFKVlcBKp18GPj+EzbNIgrBfZhsag=="], - "@npmcli/map-workspaces/glob": ["glob@13.0.6", "", { "dependencies": { "minimatch": "^10.2.2", "minipass": "^7.1.3", "path-scurry": "^2.0.2" } }, "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw=="], "@npmcli/map-workspaces/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], "@npmcli/metavuln-calculator/json-parse-even-better-errors": ["json-parse-even-better-errors@5.0.0", "", {}, "sha512-ZF1nxZ28VhQouRWhUcVlUIN3qwSgPuswK05s/HIaoetAoE/9tngVmCHjSxmSQPav1nd+lPtTL0YZ/2AFdR/iYQ=="], - "@npmcli/move-file/mkdirp": ["mkdirp@1.0.4", "", { "bin": { "mkdirp": "bin/cmd.js" } }, "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="], - "@npmcli/package-json/glob": ["glob@13.0.6", "", { "dependencies": { "minimatch": "^10.2.2", "minipass": "^7.1.3", "path-scurry": "^2.0.2" } }, "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw=="], "@npmcli/package-json/json-parse-even-better-errors": ["json-parse-even-better-errors@5.0.0", "", {}, "sha512-ZF1nxZ28VhQouRWhUcVlUIN3qwSgPuswK05s/HIaoetAoE/9tngVmCHjSxmSQPav1nd+lPtTL0YZ/2AFdR/iYQ=="], - "@npmcli/package-json/spdx-expression-parse": ["spdx-expression-parse@4.0.0", "", { "dependencies": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" } }, "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ=="], - "@rolldown/binding-wasm32-wasi/@emnapi/core": ["@emnapi/core@2.0.0-alpha.3", "", { "dependencies": { "@emnapi/wasi-threads": "2.0.1", "tslib": "^2.4.0" } }, "sha512-AZypUeJ/yByuxyS7BlSNRDOMLMlROYtjYdIAuBmJssVz1UJDSeYxLrdizhXCFYhedC5bqd/ASy8EuNXbVVXp9g=="], "@rolldown/binding-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@2.0.0-alpha.3", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-hFPAhMUjJD9BSyCANEISPOogeXC9Zo9ZQl7L6vKnaVsMkCtzznaW/naYypeyl0Gv5rYfWYsZbpixTMpjDJzQeA=="], @@ -2480,76 +2000,34 @@ "@vitest/expect/chai": ["chai@6.2.2", "", {}, "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg=="], - "accepts/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], - - "accepts/negotiator": ["negotiator@0.6.3", "", {}, "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="], - - "ansi-align/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], - "anymatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], - "archiver/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - - "archiver/readable-stream": ["readable-stream@3.6.2", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="], - - "archiver-utils/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - - "bin-links/npm-normalize-package-bin": ["npm-normalize-package-bin@5.0.0", "", {}, "sha512-CJi3OS4JLsNMmr2u07OJlhcrPxCeOeP/4xq67aWNai6TNWWbTrlNDgl8NcFKVlcBKp18GPj+EzbNIgrBfZhsag=="], - "bin-links/write-file-atomic": ["write-file-atomic@7.0.1", "", { "dependencies": { "signal-exit": "^4.0.1" } }, "sha512-OTIk8iR8/aCRWBqvxrzxR0hgxWpnYBblY1S5hDWBQfk/VFmJwzmJgQFN3WsoUKHISv2eAwe+PpbUzyL1CKTLXg=="], - "bl/readable-stream": ["readable-stream@3.6.2", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="], - - "body-parser/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="], - - "body-parser/iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="], - - "body-parser/qs": ["qs@6.15.3", "", { "dependencies": { "es-define-property": "^1.0.1", "side-channel": "^1.1.1" } }, "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A=="], - - "boxen/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], - - "boxen/wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="], - "cacache/glob": ["glob@13.0.6", "", { "dependencies": { "minimatch": "^10.2.2", "minipass": "^7.1.3", "path-scurry": "^2.0.2" } }, "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw=="], - "cacheable-request/get-stream": ["get-stream@5.2.0", "", { "dependencies": { "pump": "^3.0.0" } }, "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="], - - "cacheable-request/lowercase-keys": ["lowercase-keys@2.0.0", "", {}, "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="], - "chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], "chevrotain/@chevrotain/types": ["@chevrotain/types@11.0.3", "", {}, "sha512-gsiM3G8b58kZC2HaWR50gu6Y1440cHiJ+i3JUvcp/35JchYejb2+5MVeJK0iKThYpAa/P2PYFV4hoi44HD+aHQ=="], "chevrotain/lodash-es": ["lodash-es@4.17.21", "", {}, "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="], - "chevrotain-allstar/lodash-es": ["lodash-es@4.17.21", "", {}, "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="], - "cli/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - "compression/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="], - - "compression/safe-buffer": ["safe-buffer@5.2.1", "", {}, "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="], - - "conf/dot-prop": ["dot-prop@6.0.1", "", { "dependencies": { "is-obj": "^2.0.0" } }, "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA=="], - - "content-disposition/safe-buffer": ["safe-buffer@5.2.1", "", {}, "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="], + "cliui/string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="], "cordova-fetch/which": ["which@5.0.0", "", { "dependencies": { "isexe": "^3.1.1" }, "bin": { "node-which": "bin/which.js" } }, "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ=="], "cordova-lib/write-file-atomic": ["write-file-atomic@7.0.1", "", { "dependencies": { "signal-exit": "^4.0.1" } }, "sha512-OTIk8iR8/aCRWBqvxrzxR0hgxWpnYBblY1S5hDWBQfk/VFmJwzmJgQFN3WsoUKHISv2eAwe+PpbUzyL1CKTLXg=="], - "cordova-plugin-advanced-http/cordova": ["cordova@11.0.0", "", { "dependencies": { "configstore": "^5.0.1", "cordova-common": "^4.0.2", "cordova-create": "^4.0.0", "cordova-lib": "^11.0.0", "editor": "^1.0.0", "execa": "^5.1.1", "fs-extra": "^10.0.0", "insight": "^0.11.1", "loud-rejection": "^2.2.0", "nopt": "^5.0.0", "semver": "^7.3.5", "systeminformation": "^5.9.17", "update-notifier": "^5.1.0" }, "bin": { "cordova": "bin/cordova" } }, "sha512-Hu2YeT0naeP/1sEm/xfJYUsXN48XV6zagxbi1+4q0Ei9c5TKsIq8v4EWukvSHF4UO2pnh+9ViaDlGMcS1Wrnfg=="], - - "cordova-serve/chalk": ["chalk@3.0.0", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="], - - "cordova-serve/which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="], + "core-js-compat/browserslist": ["browserslist@4.28.2", "", { "dependencies": { "baseline-browser-mapping": "^2.10.12", "caniuse-lite": "^1.0.30001782", "electron-to-chromium": "^1.5.328", "node-releases": "^2.0.36", "update-browserslist-db": "^1.2.3" }, "bin": { "browserslist": "cli.js" } }, "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg=="], "cosmiconfig/js-yaml": ["js-yaml@4.1.1", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA=="], - "crc32-stream/readable-stream": ["readable-stream@3.6.2", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="], - "cross-spawn/which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="], + "css-loader/postcss": ["postcss@8.5.6", "", { "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg=="], + "cytoscape-fcose/cose-base": ["cose-base@2.2.0", "", { "dependencies": { "layout-base": "^2.0.0" } }, "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g=="], "d3-dsv/commander": ["commander@7.2.0", "", {}, "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="], @@ -2558,10 +2036,6 @@ "d3-sankey/d3-shape": ["d3-shape@1.3.7", "", { "dependencies": { "d3-path": "1" } }, "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw=="], - "debounce-fn/mimic-fn": ["mimic-fn@3.1.0", "", {}, "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ=="], - - "dep-graph/underscore": ["underscore@1.2.1", "", {}, "sha512-HRhh6FYh5I5/zTt7L9MnHRA/nlSFPiwymMCXEremmzT7tHR+8CNP0FXHPaUpafAPwvAlNrvZiH91kQwoo/CqUA=="], - "dom-serializer/domelementtype": ["domelementtype@2.3.0", "", {}, "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="], "dom-serializer/entities": ["entities@2.2.0", "", {}, "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="], @@ -2570,70 +2044,24 @@ "esrecurse/estraverse": ["estraverse@5.3.0", "", {}, "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="], - "express/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="], - - "express/qs": ["qs@6.15.3", "", { "dependencies": { "es-define-property": "^1.0.1", "side-channel": "^1.1.1" } }, "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A=="], - - "express/safe-buffer": ["safe-buffer@5.2.1", "", {}, "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="], - - "external-editor/iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="], - - "external-editor/tmp": ["tmp@0.0.33", "", { "dependencies": { "os-tmpdir": "~1.0.2" } }, "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="], - - "figures/escape-string-regexp": ["escape-string-regexp@1.0.5", "", {}, "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="], - - "finalhandler/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="], - - "form-data/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], - - "gauge/string-width": ["string-width@1.0.2", "", { "dependencies": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" } }, "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw=="], - - "gauge/strip-ansi": ["strip-ansi@3.0.1", "", { "dependencies": { "ansi-regex": "^2.0.0" } }, "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="], - "glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - "got/get-stream": ["get-stream@4.1.0", "", { "dependencies": { "pump": "^3.0.0" } }, "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="], - - "har-validator/ajv": ["ajv@6.12.6", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="], - "htmlparser2/entities": ["entities@1.0.0", "", {}, "sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ=="], "htmlparser2/readable-stream": ["readable-stream@1.1.14", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.1", "isarray": "0.0.1", "string_decoder": "~0.10.x" } }, "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="], - "http-proxy-agent/agent-base": ["agent-base@6.0.2", "", { "dependencies": { "debug": "4" } }, "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="], - - "https-proxy-agent/agent-base": ["agent-base@6.0.2", "", { "dependencies": { "debug": "4" } }, "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="], - "ignore-walk/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], - "init-package-json/npm-package-arg": ["npm-package-arg@8.1.5", "", { "dependencies": { "hosted-git-info": "^4.0.1", "semver": "^7.3.4", "validate-npm-package-name": "^3.0.0" } }, "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q=="], - - "init-package-json/validate-npm-package-name": ["validate-npm-package-name@3.0.0", "", { "dependencies": { "builtins": "^1.0.3" } }, "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw=="], - - "inquirer/chalk": ["chalk@2.4.2", "", { "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" } }, "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="], - - "inquirer/string-width": ["string-width@2.1.1", "", { "dependencies": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" } }, "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="], - - "inquirer/strip-ansi": ["strip-ansi@5.2.0", "", { "dependencies": { "ansi-regex": "^4.1.0" } }, "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="], - - "insight/uuid": ["uuid@8.3.2", "", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="], - "jshint/minimatch": ["minimatch@3.0.8", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q=="], "jshint/strip-json-comments": ["strip-json-comments@1.0.4", "", { "bin": { "strip-json-comments": "cli.js" } }, "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg=="], - "jsprim/extsprintf": ["extsprintf@1.3.0", "", {}, "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="], - "lightningcss/detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="], "make-dir/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], - "make-fetch-happen/negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="], - "markdown-it/entities": ["entities@4.5.0", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="], - "mermaid/dompurify": ["dompurify@3.4.2", "", { "optionalDependencies": { "@types/trusted-types": "^2.0.7" } }, "sha512-lHeS9SA/IKeIFFyYciHBr2n0v1VMPlSj843HdLOwjb2OxNwdq9Xykxqhk+FE42MzAdHvInbAolSE4mhahPpjXA=="], - "mermaid/marked": ["marked@16.4.2", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-TI3V8YYWvkVf3KJe1dRkpnjs68JUPyEa5vjKrp1XEEJUAOaQc+Qj+L1qWbPd0SJuAdQkFU0h73sXXqwDYxsiDA=="], "micromatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], @@ -2642,10 +2070,10 @@ "minipass-flush/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="], - "minipass-json-stream/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="], - "minipass-pipeline/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="], + "mlly/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="], + "mocha/chokidar": ["chokidar@3.5.3", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="], "mocha/debug": ["debug@4.3.3", "", { "dependencies": { "ms": "2.1.2" } }, "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="], @@ -2660,99 +2088,55 @@ "mocha/yargs-parser": ["yargs-parser@20.2.4", "", {}, "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA=="], - "normalize-package-data/hosted-git-info": ["hosted-git-info@4.1.0", "", { "dependencies": { "lru-cache": "^6.0.0" } }, "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="], - - "npm-bundled/npm-normalize-package-bin": ["npm-normalize-package-bin@5.0.0", "", {}, "sha512-CJi3OS4JLsNMmr2u07OJlhcrPxCeOeP/4xq67aWNai6TNWWbTrlNDgl8NcFKVlcBKp18GPj+EzbNIgrBfZhsag=="], - - "npm-pick-manifest/npm-normalize-package-bin": ["npm-normalize-package-bin@5.0.0", "", {}, "sha512-CJi3OS4JLsNMmr2u07OJlhcrPxCeOeP/4xq67aWNai6TNWWbTrlNDgl8NcFKVlcBKp18GPj+EzbNIgrBfZhsag=="], - - "package-json/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], + "node-gyp/tinyglobby": ["tinyglobby@0.2.16", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg=="], "parse-conflict-json/json-parse-even-better-errors": ["json-parse-even-better-errors@5.0.0", "", {}, "sha512-ZF1nxZ28VhQouRWhUcVlUIN3qwSgPuswK05s/HIaoetAoE/9tngVmCHjSxmSQPav1nd+lPtTL0YZ/2AFdR/iYQ=="], "parse-json/@babel/code-frame": ["@babel/code-frame@7.27.1", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.27.1", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg=="], - "pkg-up/find-up": ["find-up@3.0.0", "", { "dependencies": { "locate-path": "^3.0.0" } }, "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="], - "plist/xmlbuilder": ["xmlbuilder@15.1.1", "", {}, "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="], - "raw-body/iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="], - "raw-loader/schema-utils": ["schema-utils@3.3.0", "", { "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" } }, "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg=="], - "rc/ini": ["ini@1.3.8", "", {}, "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="], - - "rc/strip-json-comments": ["strip-json-comments@2.0.1", "", {}, "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="], - - "read-chunk/pify": ["pify@4.0.1", "", {}, "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="], - - "read-package-json/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - - "request/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], - - "request/tough-cookie": ["tough-cookie@2.4.3", "", { "dependencies": { "psl": "^1.1.24", "punycode": "^1.4.1" } }, "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="], - - "request/uuid": ["uuid@3.4.0", "", { "bin": { "uuid": "./bin/uuid" } }, "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="], - - "restore-cursor/onetime": ["onetime@2.0.1", "", { "dependencies": { "mimic-fn": "^1.0.0" } }, "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ=="], - - "rimraf/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - - "rxjs/tslib": ["tslib@1.14.1", "", {}, "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="], - - "semver-diff/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], - - "send/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="], - - "socks-proxy-agent/agent-base": ["agent-base@6.0.2", "", { "dependencies": { "debug": "4" } }, "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="], + "sass/chokidar": ["chokidar@5.0.0", "", { "dependencies": { "readdirp": "^5.0.0" } }, "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw=="], "source-map-support/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="], - "tar/chownr": ["chownr@3.0.0", "", {}, "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g=="], - - "tar-stream/readable-stream": ["readable-stream@3.6.2", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="], - "terser/acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="], "terser/commander": ["commander@2.20.3", "", {}, "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="], "terser-webpack-plugin/serialize-javascript": ["serialize-javascript@6.0.2", "", { "dependencies": { "randombytes": "^2.1.0" } }, "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g=="], - "tough-cookie/universalify": ["universalify@0.2.0", "", {}, "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="], - - "type-is/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], - - "verror/core-util-is": ["core-util-is@1.0.2", "", {}, "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="], + "tinyglobby/picomatch": ["picomatch@4.0.5", "", {}, "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A=="], "vite/picomatch": ["picomatch@4.0.5", "", {}, "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A=="], - "vite/postcss": ["postcss@8.5.25", "", { "dependencies": { "nanoid": "^3.3.16", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw=="], - - "vite/tinyglobby": ["tinyglobby@0.2.17", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g=="], - "webpack/acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="], "webpack/browserslist": ["browserslist@4.28.1", "", { "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", "electron-to-chromium": "^1.5.263", "node-releases": "^2.0.27", "update-browserslist-db": "^1.2.0" }, "bin": { "browserslist": "cli.js" } }, "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA=="], "webpack/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], - "wide-align/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], + "wrap-ansi/ansi-styles": ["ansi-styles@6.2.3", "", {}, "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="], + + "wrap-ansi/string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="], - "widest-line/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], + "@babel/core/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], - "windows-release/execa": ["execa@4.1.0", "", { "dependencies": { "cross-spawn": "^7.0.0", "get-stream": "^5.0.0", "human-signals": "^1.1.1", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^4.0.0", "onetime": "^5.1.0", "signal-exit": "^3.0.2", "strip-final-newline": "^2.0.0" } }, "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="], + "@babel/generator/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@7.29.7", "", {}, "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw=="], - "with-open-file/pify": ["pify@4.0.1", "", {}, "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="], + "@babel/generator/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], - "wrap-ansi/ansi-styles": ["ansi-styles@6.2.3", "", {}, "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="], + "@babel/helper-compilation-targets/browserslist/baseline-browser-mapping": ["baseline-browser-mapping@2.10.29", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-Asa2krT+XTPZINCS+2QcyS8WTkObE77RwkydwF7h6DmnKqbvlalz93m/dnphUyCa6SWSP51VgtEUf2FN+gelFQ=="], - "zip-stream/readable-stream": ["readable-stream@3.6.2", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="], + "@babel/helper-compilation-targets/browserslist/caniuse-lite": ["caniuse-lite@1.0.30001792", "", {}, "sha512-hVLMUZFgR4JJ6ACt1uEESvQN1/dBVqPAKY0hgrV70eN3391K6juAfTjKZLKvOMsx8PxA7gsY1/tLMMTcfFLLpw=="], - "@babel/core/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], + "@babel/helper-compilation-targets/browserslist/electron-to-chromium": ["electron-to-chromium@1.5.353", "", {}, "sha512-kOrWphBi8TOZyiJZqsgqIle0lw+tzmnQK83pV9dZUd01Nm2POECSyFQMAuarzZdYqQW7FH9RaYOuaRo3h+bQ3w=="], - "@babel/generator/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@7.27.1", "", {}, "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA=="], + "@babel/helper-compilation-targets/browserslist/node-releases": ["node-releases@2.0.38", "", {}, "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw=="], - "@babel/generator/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.28.5", "", {}, "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q=="], + "@babel/helper-compilation-targets/browserslist/update-browserslist-db": ["update-browserslist-db@1.2.3", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w=="], "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], @@ -2802,9 +2186,9 @@ "@babel/helper-wrap-function/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@babel/parser/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@7.27.1", "", {}, "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA=="], + "@babel/parser/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@7.29.7", "", {}, "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw=="], - "@babel/parser/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.28.5", "", {}, "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q=="], + "@babel/parser/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], @@ -2816,20 +2200,18 @@ "@babel/plugin-transform-classes/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.28.5", "", {}, "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q=="], + "@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], "@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], - "@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@7.27.1", "", {}, "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA=="], + "@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@7.29.7", "", {}, "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw=="], - "@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.28.5", "", {}, "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q=="], + "@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], "@codemirror/lang-jinja/@codemirror/lang-html/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], "@codemirror/lang-liquid/@codemirror/lang-html/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], - "@codemirror/lang-markdown/@codemirror/lang-html/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], - "@codemirror/lang-php/@codemirror/lang-html/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], "@npmcli/arborist/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="], @@ -2840,94 +2222,46 @@ "@rolldown/binding-wasm32-wasi/@emnapi/core/@emnapi/wasi-threads": ["@emnapi/wasi-threads@2.0.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9DsSk+o5NBX0CCJT8s0EROGSGxjR/tKu6aBTaVyq+SjAEQH4XcdcRxPBRzsBLizTTJ49MJjF+jgu3qnO9GLQcQ=="], - "@rolldown/binding-wasm32-wasi/@napi-rs/wasm-runtime/@tybys/wasm-util": ["@tybys/wasm-util@0.10.3", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg=="], - "@tufjs/models/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="], - "accepts/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], - - "ansi-align/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], - - "ansi-align/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], - - "archiver-utils/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - - "archiver/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - "bin-links/write-file-atomic/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], - "body-parser/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], - - "boxen/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], - - "boxen/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], - - "boxen/wrap-ansi/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], - "cacache/glob/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], "cli/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - "compression/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], + "cliui/string-width/get-east-asian-width": ["get-east-asian-width@1.4.0", "", {}, "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q=="], "cordova-fetch/which/isexe": ["isexe@3.1.5", "", {}, "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w=="], "cordova-lib/write-file-atomic/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], - "cordova-plugin-advanced-http/cordova/cordova-common": ["cordova-common@4.1.0", "", { "dependencies": { "@netflix/nerror": "^1.1.3", "ansi": "^0.3.1", "bplist-parser": "^0.2.0", "cross-spawn": "^7.0.1", "elementtree": "^0.1.7", "endent": "^1.4.1", "fast-glob": "^3.2.2", "fs-extra": "^9.0.0", "glob": "^7.1.6", "plist": "^3.0.1", "q": "^1.5.1", "read-chunk": "^3.2.0", "strip-bom": "^4.0.0", "underscore": "^1.9.2" } }, "sha512-sYfOSfpYGQOmUDlsARUbpT/EvVKT/E+GI3zwTXt+C6DjZ7xs6ZQVHs3umHKSidjf9yVM2LLmvGFpGrGX7aGxug=="], - - "cordova-plugin-advanced-http/cordova/cordova-create": ["cordova-create@4.1.0", "", { "dependencies": { "cordova-app-hello-world": "^6.0.0", "cordova-common": "^4.1.0", "cordova-fetch": "^3.1.0", "fs-extra": "^10.1.0", "globby": "^11.1.0", "import-fresh": "^3.3.0", "isobject": "^4.0.0", "npm-package-arg": "^8.1.5", "path-is-inside": "^1.0.2", "tmp": "^0.2.1", "valid-identifier": "0.0.2" } }, "sha512-8VQohB5w5WwuxurQJ+2L+lAFVhBr//kFvlxLOmF0P3SzTdfIU02pNalbOeLalC0DXD7rfBXJZOxJ+KSM5TOq+Q=="], + "core-js-compat/browserslist/baseline-browser-mapping": ["baseline-browser-mapping@2.10.29", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-Asa2krT+XTPZINCS+2QcyS8WTkObE77RwkydwF7h6DmnKqbvlalz93m/dnphUyCa6SWSP51VgtEUf2FN+gelFQ=="], - "cordova-plugin-advanced-http/cordova/cordova-lib": ["cordova-lib@11.1.0", "", { "dependencies": { "cordova-common": "^4.1.0", "cordova-fetch": "^3.1.0", "cordova-serve": "^4.0.0", "dep-graph": "^1.1.0", "detect-indent": "^6.1.0", "detect-newline": "^3.1.0", "elementtree": "^0.1.7", "execa": "^5.1.1", "fs-extra": "^10.1.0", "globby": "^11.1.0", "init-package-json": "^2.0.5", "md5-file": "^5.0.0", "pify": "^5.0.0", "semver": "^7.3.8", "stringify-package": "^1.0.1", "write-file-atomic": "^3.0.3" } }, "sha512-/XM+/wFag72bD4SNSxwX8b3OWatHNNlnmJpgb5pepp2Pobb957nWyR0GPwIkKyOyszdZesWM3Vv8uH9e2Z1k2w=="], + "core-js-compat/browserslist/caniuse-lite": ["caniuse-lite@1.0.30001792", "", {}, "sha512-hVLMUZFgR4JJ6ACt1uEESvQN1/dBVqPAKY0hgrV70eN3391K6juAfTjKZLKvOMsx8PxA7gsY1/tLMMTcfFLLpw=="], - "cordova-plugin-advanced-http/cordova/nopt": ["nopt@5.0.0", "", { "dependencies": { "abbrev": "1" }, "bin": { "nopt": "bin/nopt.js" } }, "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="], + "core-js-compat/browserslist/electron-to-chromium": ["electron-to-chromium@1.5.353", "", {}, "sha512-kOrWphBi8TOZyiJZqsgqIle0lw+tzmnQK83pV9dZUd01Nm2POECSyFQMAuarzZdYqQW7FH9RaYOuaRo3h+bQ3w=="], - "cordova-serve/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], + "core-js-compat/browserslist/node-releases": ["node-releases@2.0.38", "", {}, "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw=="], - "cordova-serve/which/isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], + "core-js-compat/browserslist/update-browserslist-db": ["update-browserslist-db@1.2.3", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w=="], "cross-spawn/which/isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], + "css-loader/postcss/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], + "cytoscape-fcose/cose-base/layout-base": ["layout-base@2.0.1", "", {}, "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg=="], "d3-sankey/d3-shape/d3-path": ["d3-path@1.0.9", "", {}, "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="], - "express/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], - - "finalhandler/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], - - "form-data/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], - - "gauge/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@1.0.0", "", { "dependencies": { "number-is-nan": "^1.0.0" } }, "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw=="], - - "gauge/strip-ansi/ansi-regex": ["ansi-regex@2.1.1", "", {}, "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="], - - "har-validator/ajv/json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="], - "htmlparser2/readable-stream/isarray": ["isarray@0.0.1", "", {}, "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="], "htmlparser2/readable-stream/string_decoder": ["string_decoder@0.10.31", "", {}, "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="], "ignore-walk/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="], - "init-package-json/npm-package-arg/hosted-git-info": ["hosted-git-info@4.1.0", "", { "dependencies": { "lru-cache": "^6.0.0" } }, "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="], - - "inquirer/chalk/ansi-styles": ["ansi-styles@3.2.1", "", { "dependencies": { "color-convert": "^1.9.0" } }, "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="], - - "inquirer/chalk/escape-string-regexp": ["escape-string-regexp@1.0.5", "", {}, "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="], - - "inquirer/chalk/supports-color": ["supports-color@5.5.0", "", { "dependencies": { "has-flag": "^3.0.0" } }, "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="], - - "inquirer/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@2.0.0", "", {}, "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="], - - "inquirer/string-width/strip-ansi": ["strip-ansi@4.0.0", "", { "dependencies": { "ansi-regex": "^3.0.0" } }, "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow=="], - - "inquirer/strip-ansi/ansi-regex": ["ansi-regex@4.1.1", "", {}, "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="], - "minipass-flush/minipass/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - "minipass-json-stream/minipass/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - "minipass-pipeline/minipass/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], "mocha/chokidar/readdirp": ["readdirp@3.6.0", "", { "dependencies": { "picomatch": "^2.2.1" } }, "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="], @@ -2940,33 +2274,17 @@ "mocha/yargs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], - "normalize-package-data/hosted-git-info/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="], + "node-gyp/tinyglobby/picomatch": ["picomatch@4.0.4", "", {}, "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A=="], "parse-json/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.28.5", "", {}, "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q=="], "parse-json/@babel/code-frame/js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], - "pkg-up/find-up/locate-path": ["locate-path@3.0.0", "", { "dependencies": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" } }, "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="], - "raw-loader/schema-utils/ajv": ["ajv@6.12.6", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="], "raw-loader/schema-utils/ajv-keywords": ["ajv-keywords@3.5.2", "", { "peerDependencies": { "ajv": "^6.9.1" } }, "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="], - "read-package-json/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - - "request/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], - - "request/tough-cookie/punycode": ["punycode@1.4.1", "", {}, "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="], - - "restore-cursor/onetime/mimic-fn": ["mimic-fn@1.2.0", "", {}, "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="], - - "rimraf/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - - "send/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], - - "type-is/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], - - "vite/postcss/nanoid": ["nanoid@3.3.16", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q=="], + "sass/chokidar/readdirp": ["readdirp@5.1.1", "", {}, "sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA=="], "webpack/browserslist/baseline-browser-mapping": ["baseline-browser-mapping@2.9.13", "", { "bin": { "baseline-browser-mapping": "dist/cli.js" } }, "sha512-WhtvB2NG2wjr04+h77sg3klAIwrgOqnjS49GGudnUPGFFgg7G17y7Qecqp+2Dr5kUDxNRBca0SK7cG8JwzkWDQ=="], @@ -2976,19 +2294,11 @@ "webpack/browserslist/node-releases": ["node-releases@2.0.27", "", {}, "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA=="], - "webpack/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], + "webpack/browserslist/update-browserslist-db": ["update-browserslist-db@1.2.3", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w=="], - "wide-align/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], - - "wide-align/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], - - "widest-line/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], - - "widest-line/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], - - "windows-release/execa/get-stream": ["get-stream@5.2.0", "", { "dependencies": { "pump": "^3.0.0" } }, "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="], + "webpack/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], - "windows-release/execa/human-signals": ["human-signals@1.1.1", "", {}, "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="], + "wrap-ansi/string-width/get-east-asian-width": ["get-east-asian-width@1.4.0", "", {}, "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q=="], "@npmcli/arborist/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], @@ -2998,42 +2308,10 @@ "@tufjs/models/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], - "ansi-align/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], - - "boxen/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], - - "boxen/wrap-ansi/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], - "cacache/glob/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="], - "cordova-plugin-advanced-http/cordova/cordova-common/bplist-parser": ["bplist-parser@0.2.0", "", { "dependencies": { "big-integer": "^1.6.44" } }, "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw=="], - - "cordova-plugin-advanced-http/cordova/cordova-common/endent": ["endent@1.4.1", "", { "dependencies": { "dedent": "^0.7.0", "fast-json-parse": "^1.0.3", "objectorarray": "^1.0.4" } }, "sha512-buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-common/fs-extra": ["fs-extra@9.1.0", "", { "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-common/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-app-hello-world": ["cordova-app-hello-world@6.0.0", "", {}, "sha512-wPZsm+fzNUwdiTRODT+fQuPV410RNmd3Buiw63vT8BPxjC+cn6Bu8emrgwrDM4pbmU5sa5Unwu3xPcbQGQ3G3g=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch": ["cordova-fetch@3.1.0", "", { "dependencies": { "cordova-common": "^4.1.0", "fs-extra": "^9.1.0", "npm-package-arg": "^8.1.5", "pacote": "^11.3.5", "pify": "^5.0.0", "resolve": "^1.22.1", "semver": "^7.3.8", "which": "^2.0.2" } }, "sha512-qOT3HlNzVWbsCZVvbkZ6PdvAG1byiK8vWG+/Z+7s+8ZB76rOYKdzMvrmmMwrTTX6nglDnz5uJ/4XjQHJB770GQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/npm-package-arg": ["npm-package-arg@8.1.5", "", { "dependencies": { "hosted-git-info": "^4.0.1", "semver": "^7.3.4", "validate-npm-package-name": "^3.0.0" } }, "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch": ["cordova-fetch@3.1.0", "", { "dependencies": { "cordova-common": "^4.1.0", "fs-extra": "^9.1.0", "npm-package-arg": "^8.1.5", "pacote": "^11.3.5", "pify": "^5.0.0", "resolve": "^1.22.1", "semver": "^7.3.8", "which": "^2.0.2" } }, "sha512-qOT3HlNzVWbsCZVvbkZ6PdvAG1byiK8vWG+/Z+7s+8ZB76rOYKdzMvrmmMwrTTX6nglDnz5uJ/4XjQHJB770GQ=="], - - "cordova-plugin-advanced-http/cordova/nopt/abbrev": ["abbrev@1.1.1", "", {}, "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="], - "ignore-walk/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], - "init-package-json/npm-package-arg/hosted-git-info/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="], - - "inquirer/chalk/ansi-styles/color-convert": ["color-convert@1.9.3", "", { "dependencies": { "color-name": "1.1.3" } }, "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="], - - "inquirer/chalk/supports-color/has-flag": ["has-flag@3.0.0", "", {}, "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="], - - "inquirer/string-width/strip-ansi/ansi-regex": ["ansi-regex@3.0.1", "", {}, "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="], - "mocha/chokidar/readdirp/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], "mocha/yargs/cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], @@ -3044,256 +2322,14 @@ "mocha/yargs/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], - "normalize-package-data/hosted-git-info/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "pkg-up/find-up/locate-path/p-locate": ["p-locate@3.0.0", "", { "dependencies": { "p-limit": "^2.0.0" } }, "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="], - - "pkg-up/find-up/locate-path/path-exists": ["path-exists@3.0.0", "", {}, "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="], - "raw-loader/schema-utils/ajv/json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="], - "wide-align/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], - - "widest-line/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], - "@npmcli/package-json/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], "cacache/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], - "cordova-plugin-advanced-http/cordova/cordova-common/endent/dedent": ["dedent@0.7.0", "", {}, "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="], - - "cordova-plugin-advanced-http/cordova/cordova-common/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/fs-extra": ["fs-extra@9.1.0", "", { "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote": ["pacote@11.3.5", "", { "dependencies": { "@npmcli/git": "^2.1.0", "@npmcli/installed-package-contents": "^1.0.6", "@npmcli/promise-spawn": "^1.2.0", "@npmcli/run-script": "^1.8.2", "cacache": "^15.0.5", "chownr": "^2.0.0", "fs-minipass": "^2.1.0", "infer-owner": "^1.0.4", "minipass": "^3.1.3", "mkdirp": "^1.0.3", "npm-package-arg": "^8.0.1", "npm-packlist": "^2.1.4", "npm-pick-manifest": "^6.0.0", "npm-registry-fetch": "^11.0.0", "promise-retry": "^2.0.1", "read-package-json-fast": "^2.0.1", "rimraf": "^3.0.2", "ssri": "^8.0.1", "tar": "^6.1.0" }, "bin": { "pacote": "lib/bin.js" } }, "sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/npm-package-arg/hosted-git-info": ["hosted-git-info@4.1.0", "", { "dependencies": { "lru-cache": "^6.0.0" } }, "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/npm-package-arg/validate-npm-package-name": ["validate-npm-package-name@3.0.0", "", { "dependencies": { "builtins": "^1.0.3" } }, "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/fs-extra": ["fs-extra@9.1.0", "", { "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/npm-package-arg": ["npm-package-arg@8.1.5", "", { "dependencies": { "hosted-git-info": "^4.0.1", "semver": "^7.3.4", "validate-npm-package-name": "^3.0.0" } }, "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote": ["pacote@11.3.5", "", { "dependencies": { "@npmcli/git": "^2.1.0", "@npmcli/installed-package-contents": "^1.0.6", "@npmcli/promise-spawn": "^1.2.0", "@npmcli/run-script": "^1.8.2", "cacache": "^15.0.5", "chownr": "^2.0.0", "fs-minipass": "^2.1.0", "infer-owner": "^1.0.4", "minipass": "^3.1.3", "mkdirp": "^1.0.3", "npm-package-arg": "^8.0.1", "npm-packlist": "^2.1.4", "npm-pick-manifest": "^6.0.0", "npm-registry-fetch": "^11.0.0", "promise-retry": "^2.0.1", "read-package-json-fast": "^2.0.1", "rimraf": "^3.0.2", "ssri": "^8.0.1", "tar": "^6.1.0" }, "bin": { "pacote": "lib/bin.js" } }, "sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="], - - "init-package-json/npm-package-arg/hosted-git-info/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "inquirer/chalk/ansi-styles/color-convert/color-name": ["color-name@1.1.3", "", {}, "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="], - "mocha/yargs/cliui/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], "mocha/yargs/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], - - "pkg-up/find-up/locate-path/p-locate/p-limit": ["p-limit@2.3.0", "", { "dependencies": { "p-try": "^2.0.0" } }, "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/git": ["@npmcli/git@2.1.0", "", { "dependencies": { "@npmcli/promise-spawn": "^1.3.2", "lru-cache": "^6.0.0", "mkdirp": "^1.0.4", "npm-pick-manifest": "^6.1.1", "promise-inflight": "^1.0.1", "promise-retry": "^2.0.1", "semver": "^7.3.5", "which": "^2.0.2" } }, "sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/installed-package-contents": ["@npmcli/installed-package-contents@1.0.7", "", { "dependencies": { "npm-bundled": "^1.1.1", "npm-normalize-package-bin": "^1.0.1" }, "bin": { "installed-package-contents": "index.js" } }, "sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/promise-spawn": ["@npmcli/promise-spawn@1.3.2", "", { "dependencies": { "infer-owner": "^1.0.4" } }, "sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script": ["@npmcli/run-script@1.8.6", "", { "dependencies": { "@npmcli/node-gyp": "^1.0.2", "@npmcli/promise-spawn": "^1.3.2", "node-gyp": "^7.1.0", "read-package-json-fast": "^2.0.1" } }, "sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/cacache": ["cacache@15.3.0", "", { "dependencies": { "@npmcli/fs": "^1.0.0", "@npmcli/move-file": "^1.0.1", "chownr": "^2.0.0", "fs-minipass": "^2.0.0", "glob": "^7.1.4", "infer-owner": "^1.0.4", "lru-cache": "^6.0.0", "minipass": "^3.1.1", "minipass-collect": "^1.0.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.2", "mkdirp": "^1.0.3", "p-map": "^4.0.0", "promise-inflight": "^1.0.1", "rimraf": "^3.0.2", "ssri": "^8.0.1", "tar": "^6.0.2", "unique-filename": "^1.1.1" } }, "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/fs-minipass": ["fs-minipass@2.1.0", "", { "dependencies": { "minipass": "^3.0.0" } }, "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/mkdirp": ["mkdirp@1.0.4", "", { "bin": { "mkdirp": "bin/cmd.js" } }, "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-packlist": ["npm-packlist@2.2.2", "", { "dependencies": { "glob": "^7.1.6", "ignore-walk": "^3.0.3", "npm-bundled": "^1.1.1", "npm-normalize-package-bin": "^1.0.1" }, "bin": { "npm-packlist": "bin/index.js" } }, "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-pick-manifest": ["npm-pick-manifest@6.1.1", "", { "dependencies": { "npm-install-checks": "^4.0.0", "npm-normalize-package-bin": "^1.0.1", "npm-package-arg": "^8.1.2", "semver": "^7.3.4" } }, "sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-registry-fetch": ["npm-registry-fetch@11.0.0", "", { "dependencies": { "make-fetch-happen": "^9.0.1", "minipass": "^3.1.3", "minipass-fetch": "^1.3.0", "minipass-json-stream": "^1.0.1", "minizlib": "^2.0.0", "npm-package-arg": "^8.0.0" } }, "sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/ssri": ["ssri@8.0.1", "", { "dependencies": { "minipass": "^3.1.1" } }, "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/which/isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/npm-package-arg/hosted-git-info/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/npm-package-arg/hosted-git-info": ["hosted-git-info@4.1.0", "", { "dependencies": { "lru-cache": "^6.0.0" } }, "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/npm-package-arg/validate-npm-package-name": ["validate-npm-package-name@3.0.0", "", { "dependencies": { "builtins": "^1.0.3" } }, "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/git": ["@npmcli/git@2.1.0", "", { "dependencies": { "@npmcli/promise-spawn": "^1.3.2", "lru-cache": "^6.0.0", "mkdirp": "^1.0.4", "npm-pick-manifest": "^6.1.1", "promise-inflight": "^1.0.1", "promise-retry": "^2.0.1", "semver": "^7.3.5", "which": "^2.0.2" } }, "sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/installed-package-contents": ["@npmcli/installed-package-contents@1.0.7", "", { "dependencies": { "npm-bundled": "^1.1.1", "npm-normalize-package-bin": "^1.0.1" }, "bin": { "installed-package-contents": "index.js" } }, "sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/promise-spawn": ["@npmcli/promise-spawn@1.3.2", "", { "dependencies": { "infer-owner": "^1.0.4" } }, "sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/run-script": ["@npmcli/run-script@1.8.6", "", { "dependencies": { "@npmcli/node-gyp": "^1.0.2", "@npmcli/promise-spawn": "^1.3.2", "node-gyp": "^7.1.0", "read-package-json-fast": "^2.0.1" } }, "sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/cacache": ["cacache@15.3.0", "", { "dependencies": { "@npmcli/fs": "^1.0.0", "@npmcli/move-file": "^1.0.1", "chownr": "^2.0.0", "fs-minipass": "^2.0.0", "glob": "^7.1.4", "infer-owner": "^1.0.4", "lru-cache": "^6.0.0", "minipass": "^3.1.1", "minipass-collect": "^1.0.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.2", "mkdirp": "^1.0.3", "p-map": "^4.0.0", "promise-inflight": "^1.0.1", "rimraf": "^3.0.2", "ssri": "^8.0.1", "tar": "^6.0.2", "unique-filename": "^1.1.1" } }, "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/fs-minipass": ["fs-minipass@2.1.0", "", { "dependencies": { "minipass": "^3.0.0" } }, "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/mkdirp": ["mkdirp@1.0.4", "", { "bin": { "mkdirp": "bin/cmd.js" } }, "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-packlist": ["npm-packlist@2.2.2", "", { "dependencies": { "glob": "^7.1.6", "ignore-walk": "^3.0.3", "npm-bundled": "^1.1.1", "npm-normalize-package-bin": "^1.0.1" }, "bin": { "npm-packlist": "bin/index.js" } }, "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-pick-manifest": ["npm-pick-manifest@6.1.1", "", { "dependencies": { "npm-install-checks": "^4.0.0", "npm-normalize-package-bin": "^1.0.1", "npm-package-arg": "^8.1.2", "semver": "^7.3.4" } }, "sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-registry-fetch": ["npm-registry-fetch@11.0.0", "", { "dependencies": { "make-fetch-happen": "^9.0.1", "minipass": "^3.1.3", "minipass-fetch": "^1.3.0", "minipass-json-stream": "^1.0.1", "minizlib": "^2.0.0", "npm-package-arg": "^8.0.0" } }, "sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/ssri": ["ssri@8.0.1", "", { "dependencies": { "minipass": "^3.1.1" } }, "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/which/isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/git/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/installed-package-contents/npm-bundled": ["npm-bundled@1.1.2", "", { "dependencies": { "npm-normalize-package-bin": "^1.0.1" } }, "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script/@npmcli/node-gyp": ["@npmcli/node-gyp@1.0.3", "", {}, "sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script/node-gyp": ["node-gyp@7.1.2", "", { "dependencies": { "env-paths": "^2.2.0", "glob": "^7.1.4", "graceful-fs": "^4.2.3", "nopt": "^5.0.0", "npmlog": "^4.1.2", "request": "^2.88.2", "rimraf": "^3.0.2", "semver": "^7.3.2", "tar": "^6.0.2", "which": "^2.0.2" }, "bin": { "node-gyp": "bin/node-gyp.js" } }, "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/cacache/@npmcli/fs": ["@npmcli/fs@1.1.1", "", { "dependencies": { "@gar/promisify": "^1.0.1", "semver": "^7.3.5" } }, "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/cacache/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/cacache/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/cacache/minipass-collect": ["minipass-collect@1.0.2", "", { "dependencies": { "minipass": "^3.0.0" } }, "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/cacache/p-map": ["p-map@4.0.0", "", { "dependencies": { "aggregate-error": "^3.0.0" } }, "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/minipass/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-packlist/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-packlist/ignore-walk": ["ignore-walk@3.0.4", "", { "dependencies": { "minimatch": "^3.0.4" } }, "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-packlist/npm-bundled": ["npm-bundled@1.1.2", "", { "dependencies": { "npm-normalize-package-bin": "^1.0.1" } }, "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-pick-manifest/npm-install-checks": ["npm-install-checks@4.0.0", "", { "dependencies": { "semver": "^7.1.1" } }, "sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-registry-fetch/make-fetch-happen": ["make-fetch-happen@9.1.0", "", { "dependencies": { "agentkeepalive": "^4.1.3", "cacache": "^15.2.0", "http-cache-semantics": "^4.1.0", "http-proxy-agent": "^4.0.1", "https-proxy-agent": "^5.0.0", "is-lambda": "^1.0.1", "lru-cache": "^6.0.0", "minipass": "^3.1.3", "minipass-collect": "^1.0.2", "minipass-fetch": "^1.3.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "negotiator": "^0.6.2", "promise-retry": "^2.0.1", "socks-proxy-agent": "^6.0.0", "ssri": "^8.0.0" } }, "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-registry-fetch/minipass-fetch": ["minipass-fetch@1.4.1", "", { "dependencies": { "minipass": "^3.1.0", "minipass-sized": "^1.0.3", "minizlib": "^2.0.0" }, "optionalDependencies": { "encoding": "^0.1.12" } }, "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-registry-fetch/minizlib": ["minizlib@2.1.2", "", { "dependencies": { "minipass": "^3.0.0", "yallist": "^4.0.0" } }, "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/npm-package-arg/hosted-git-info/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/npm-package-arg/hosted-git-info/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/git/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/installed-package-contents/npm-bundled": ["npm-bundled@1.1.2", "", { "dependencies": { "npm-normalize-package-bin": "^1.0.1" } }, "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/run-script/@npmcli/node-gyp": ["@npmcli/node-gyp@1.0.3", "", {}, "sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/run-script/node-gyp": ["node-gyp@7.1.2", "", { "dependencies": { "env-paths": "^2.2.0", "glob": "^7.1.4", "graceful-fs": "^4.2.3", "nopt": "^5.0.0", "npmlog": "^4.1.2", "request": "^2.88.2", "rimraf": "^3.0.2", "semver": "^7.3.2", "tar": "^6.0.2", "which": "^2.0.2" }, "bin": { "node-gyp": "bin/node-gyp.js" } }, "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/cacache/@npmcli/fs": ["@npmcli/fs@1.1.1", "", { "dependencies": { "@gar/promisify": "^1.0.1", "semver": "^7.3.5" } }, "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/cacache/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/cacache/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/cacache/minipass-collect": ["minipass-collect@1.0.2", "", { "dependencies": { "minipass": "^3.0.0" } }, "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/cacache/p-map": ["p-map@4.0.0", "", { "dependencies": { "aggregate-error": "^3.0.0" } }, "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/minipass/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-packlist/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-packlist/ignore-walk": ["ignore-walk@3.0.4", "", { "dependencies": { "minimatch": "^3.0.4" } }, "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-packlist/npm-bundled": ["npm-bundled@1.1.2", "", { "dependencies": { "npm-normalize-package-bin": "^1.0.1" } }, "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-pick-manifest/npm-install-checks": ["npm-install-checks@4.0.0", "", { "dependencies": { "semver": "^7.1.1" } }, "sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-registry-fetch/make-fetch-happen": ["make-fetch-happen@9.1.0", "", { "dependencies": { "agentkeepalive": "^4.1.3", "cacache": "^15.2.0", "http-cache-semantics": "^4.1.0", "http-proxy-agent": "^4.0.1", "https-proxy-agent": "^5.0.0", "is-lambda": "^1.0.1", "lru-cache": "^6.0.0", "minipass": "^3.1.3", "minipass-collect": "^1.0.2", "minipass-fetch": "^1.3.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "negotiator": "^0.6.2", "promise-retry": "^2.0.1", "socks-proxy-agent": "^6.0.0", "ssri": "^8.0.0" } }, "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-registry-fetch/minipass-fetch": ["minipass-fetch@1.4.1", "", { "dependencies": { "minipass": "^3.1.0", "minipass-sized": "^1.0.3", "minizlib": "^2.0.0" }, "optionalDependencies": { "encoding": "^0.1.12" } }, "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-registry-fetch/minizlib": ["minizlib@2.1.2", "", { "dependencies": { "minipass": "^3.0.0", "yallist": "^4.0.0" } }, "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/git/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script/node-gyp/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script/node-gyp/request": ["request@2.88.2", "", { "dependencies": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", "caseless": "~0.12.0", "combined-stream": "~1.0.6", "extend": "~3.0.2", "forever-agent": "~0.6.1", "form-data": "~2.3.2", "har-validator": "~5.1.3", "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "oauth-sign": "~0.9.0", "performance-now": "^2.1.0", "qs": "~6.5.2", "safe-buffer": "^5.1.2", "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" } }, "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/cacache/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/cacache/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-packlist/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-packlist/ignore-walk/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-registry-fetch/make-fetch-happen/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-registry-fetch/make-fetch-happen/minipass-collect": ["minipass-collect@1.0.2", "", { "dependencies": { "minipass": "^3.0.0" } }, "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-registry-fetch/minipass-fetch/minipass-sized": ["minipass-sized@1.0.3", "", { "dependencies": { "minipass": "^3.0.0" } }, "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-registry-fetch/minizlib/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/npm-package-arg/hosted-git-info/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/git/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/run-script/node-gyp/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/run-script/node-gyp/request": ["request@2.88.2", "", { "dependencies": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", "caseless": "~0.12.0", "combined-stream": "~1.0.6", "extend": "~3.0.2", "forever-agent": "~0.6.1", "form-data": "~2.3.2", "har-validator": "~5.1.3", "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "oauth-sign": "~0.9.0", "performance-now": "^2.1.0", "qs": "~6.5.2", "safe-buffer": "^5.1.2", "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" } }, "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/cacache/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/cacache/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-packlist/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-packlist/ignore-walk/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-registry-fetch/make-fetch-happen/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-registry-fetch/make-fetch-happen/minipass-collect": ["minipass-collect@1.0.2", "", { "dependencies": { "minipass": "^3.0.0" } }, "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-registry-fetch/minipass-fetch/minipass-sized": ["minipass-sized@1.0.3", "", { "dependencies": { "minipass": "^3.0.0" } }, "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-registry-fetch/minizlib/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script/node-gyp/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script/node-gyp/request/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script/node-gyp/request/safe-buffer": ["safe-buffer@5.2.1", "", {}, "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script/node-gyp/request/tough-cookie": ["tough-cookie@2.5.0", "", { "dependencies": { "psl": "^1.1.28", "punycode": "^2.1.1" } }, "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script/node-gyp/request/uuid": ["uuid@3.4.0", "", { "bin": { "uuid": "./bin/uuid" } }, "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/npm-registry-fetch/make-fetch-happen/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/run-script/node-gyp/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/run-script/node-gyp/request/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/run-script/node-gyp/request/safe-buffer": ["safe-buffer@5.2.1", "", {}, "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/run-script/node-gyp/request/tough-cookie": ["tough-cookie@2.5.0", "", { "dependencies": { "psl": "^1.1.28", "punycode": "^2.1.1" } }, "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/run-script/node-gyp/request/uuid": ["uuid@3.4.0", "", { "bin": { "uuid": "./bin/uuid" } }, "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/npm-registry-fetch/make-fetch-happen/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - - "cordova-plugin-advanced-http/cordova/cordova-create/cordova-fetch/pacote/@npmcli/run-script/node-gyp/request/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], - - "cordova-plugin-advanced-http/cordova/cordova-lib/cordova-fetch/pacote/@npmcli/run-script/node-gyp/request/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], } } diff --git a/package-lock.json b/package-lock.json index 967b1b41bf..ca419ccda3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "@codemirror/lang-json": "^6.0.2", "@codemirror/lang-less": "^6.0.2", "@codemirror/lang-liquid": "^6.3.2", - "@codemirror/lang-markdown": "^6.5.0", + "@codemirror/lang-markdown": "^6.5.2", "@codemirror/lang-php": "^6.0.2", "@codemirror/lang-python": "^6.2.1", "@codemirror/lang-rust": "^6.0.2", @@ -55,57 +55,57 @@ "@xterm/addon-web-links": "^0.12.0", "@xterm/addon-webgl": "^0.19.0", "@xterm/xterm": "^6.0.0", - "acorn": "^8.16.0", + "acorn": "^8.18.0", "autosize": "^6.0.1", "codemirror": "^6.0.2", "cordova": "13.0.0", - "core-js": "^3.49.0", - "dayjs": "^1.11.20", - "dompurify": "^3.4.11", + "core-js": "^3.50.0", + "dayjs": "^1.11.23", + "dompurify": "^3.4.14", "escape-string-regexp": "^5.0.0", "esprima": "^4.0.1", - "filesize": "^11.0.17", + "filesize": "^11.0.22", "html-tag-js": "^2.4.16", "jszip": "^3.10.1", - "katex": "^0.16.45", - "markdown-it": "^14.2.0", - "markdown-it-anchor": "^9.2.0", - "markdown-it-emoji": "^3.0.0", + "katex": "^0.16.47", + "markdown-it": "^14.3.0", + "markdown-it-anchor": "^9.2.1", + "markdown-it-emoji": "^3.1.0", "markdown-it-footnote": "^4.0.0", "markdown-it-github-alerts": "^1.0.1", "markdown-it-task-lists": "^2.1.1", "markdown-it-texmath": "^1.0.0", "mermaid": "^11.14.0", "mime-types": "^3.0.2", - "motion": "^12.42.0", + "motion": "^12.43.0", "mustache": "^4.2.0", - "picomatch": "^4.0.4", + "picomatch": "^4.0.7", "url-parse": "^1.5.10", "vanilla-picker": "^2.12.3", "vscode-css-languageservice": "6.3.10", "vscode-html-languageservice": "5.6.2", "vscode-json-languageservice": "5.7.2", "vscode-languageserver-textdocument": "1.0.12", - "yargs": "^18.0.0" + "yargs": "^18.1.0" }, "devDependencies": { "@babel/core": "^8.0.1", - "@babel/generator": "^7.29.1", - "@babel/parser": "^7.29.3", + "@babel/generator": "^7.29.8", + "@babel/parser": "^7.29.8", "@babel/plugin-transform-runtime": "^8.0.1", - "@babel/preset-env": "^8.0.1", + "@babel/preset-env": "^8.0.2", "@babel/preset-typescript": "^8.0.1", - "@babel/runtime": "^7.29.2", - "@babel/runtime-corejs3": "^7.29.2", - "@babel/traverse": "^7.29.0", + "@babel/runtime": "^7.29.7", + "@babel/runtime-corejs3": "^7.29.7", + "@babel/traverse": "^7.29.8", "@biomejs/biome": "2.4.11", "@lezer/generator": "^1.8.0", - "@rspack/cli": "^2.0.0", - "@rspack/core": "^2.0.0", + "@rspack/cli": "^2.2.0", + "@rspack/core": "^2.2.0", "@types/ace": "^0.0.52", "@types/cordova": "^11.0.3", "@types/url-parse": "^1.4.11", - "autoprefixer": "^10.5.0", + "autoprefixer": "^10.5.4", "babel-loader": "^10.1.1", "chokidar": "^4.0.3", "com.foxdebug.acode.rk.auth": "file:src/plugins/auth", @@ -130,22 +130,22 @@ "cordova-plugin-system": "file:src/plugins/system", "cordova-plugin-websocket": "file:src/plugins/websocket", "css-loader": "^7.1.4", - "happy-dom": "^20.11.1", + "happy-dom": "^20.11.6", "mini-css-extract-plugin": "^2.10.2", "path-browserify": "^1.0.1", "postcss-loader": "^8.2.1", "prettier": "^3.8.3", "prettier-plugin-java": "^2.8.1", "raw-loader": "^4.0.2", - "sass": "^1.99.0", + "sass": "^1.103.1", "sass-loader": "^16.0.8", "style-loader": "^4.0.0", "terminal": "^0.1.4", - "ts-loader": "^9.5.7", + "ts-loader": "^9.6.2", "typescript": "^5.9.3", - "vitest": "^4.1.10", + "vitest": "^4.1.11", "vscode-languageserver-types": "^3.17.5", - "ws": "^8.21.0" + "ws": "^8.21.3" } }, "node_modules/@antfu/install-pkg": { @@ -162,13 +162,13 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", - "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", + "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.28.5", + "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" }, @@ -365,14 +365,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.29.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz", - "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==", + "version": "7.29.8", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.8.tgz", + "integrity": "sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.29.0", - "@babel/types": "^7.29.0", + "@babel/parser": "^7.29.8", + "@babel/types": "^7.29.8", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -676,9 +676,9 @@ } }, "node_modules/@babel/helper-globals": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", - "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz", + "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==", "dev": true, "license": "MIT", "engines": { @@ -1640,9 +1640,9 @@ "license": "MIT" }, "node_modules/@babel/helper-string-parser": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", - "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", + "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", "dev": true, "license": "MIT", "engines": { @@ -1650,9 +1650,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", - "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", "dev": true, "license": "MIT", "engines": { @@ -1918,13 +1918,13 @@ "license": "MIT" }, "node_modules/@babel/parser": { - "version": "7.29.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.3.tgz", - "integrity": "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==", + "version": "7.29.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.8.tgz", + "integrity": "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.29.0" + "@babel/types": "^7.29.8" }, "bin": { "parser": "bin/babel-parser.js" @@ -2979,9 +2979,9 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-8.0.1.tgz", - "integrity": "sha512-1WjCi/45Mn5e0uvz26FdvRe6bTAvN6WAtkHgIjl0w/LkBvrv4Y5bDR+8YY72r7cefXBfwYUXIHSoxQkrIfnjXQ==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-8.0.2.tgz", + "integrity": "sha512-aFfsjCRYducRV4dPnpsBbdRkLjboca9FVDg6HZCgy0Ahvk2ZQ/2exmCRC5qS9P6rsWwrmIheNaIM6A1j2F8KMA==", "dev": true, "license": "MIT", "dependencies": { @@ -3213,9 +3213,9 @@ } }, "node_modules/@babel/preset-env": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-8.0.1.tgz", - "integrity": "sha512-tiwl69ZQGIbPif28GK8vI/Nm1nYdP+UHXWRnqXl0fjfBS7DWmAs2XvlpVkZyZjVVDxcprcbzCnN93SbuSgz8WQ==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-8.0.2.tgz", + "integrity": "sha512-CUGLn9hNBCF/eXnwdFAWERbniCcXCRvnKwLV9fegeUEIqv7YlU2MepsWMMM54GcILx5XYMnRh+JAL+K5G+mK6g==", "dev": true, "license": "MIT", "dependencies": { @@ -3268,7 +3268,7 @@ "@babel/plugin-transform-private-methods": "^8.0.1", "@babel/plugin-transform-private-property-in-object": "^8.0.1", "@babel/plugin-transform-property-literals": "^8.0.1", - "@babel/plugin-transform-regenerator": "^8.0.1", + "@babel/plugin-transform-regenerator": "^8.0.2", "@babel/plugin-transform-regexp-modifiers": "^8.0.1", "@babel/plugin-transform-reserved-words": "^8.0.1", "@babel/plugin-transform-shorthand-properties": "^8.0.1", @@ -3280,8 +3280,8 @@ "@babel/plugin-transform-unicode-property-regex": "^8.0.1", "@babel/plugin-transform-unicode-regex": "^8.0.1", "@babel/plugin-transform-unicode-sets-regex": "^8.0.1", - "@babel/preset-modules": "0.1.6-no-external-plugins", - "babel-plugin-polyfill-corejs3": "^1.0.0-rc.2", + "@babel/preset-modules": "^0.2.0", + "babel-plugin-polyfill-corejs3": "^1.0.0", "core-js-compat": "^3.48.0", "semver": "^7.7.3" }, @@ -3306,28 +3306,54 @@ } }, "node_modules/@babel/preset-modules": { - "version": "0.1.6-no-external-plugins", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", - "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.2.0.tgz", + "integrity": "sha512-yz0RBN2fx4fjCeFcTWsWgL7PxSRltvTa0Qg14HkWCU3qS8MO7ZSJlBVbGceynd5C9NsJwwUHNQD3dc6tYO+jqQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/types": "^7.4.4", + "@babel/helper-plugin-utils": "^8.0.1", + "@babel/plugin-transform-dotall-regex": "^8.0.1", + "@babel/plugin-transform-unicode-property-regex": "^8.0.1", + "@babel/types": "^8.0.0", "esutils": "^2.0.2" }, "peerDependencies": { - "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" + "@babel/core": "^8.0.0" } }, - "node_modules/@babel/preset-modules/node_modules/@babel/helper-plugin-utils": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz", - "integrity": "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==", + "node_modules/@babel/preset-modules/node_modules/@babel/helper-string-parser": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz", + "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==", "dev": true, "license": "MIT", "engines": { - "node": ">=6.9.0" + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/preset-modules/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.4.tgz", + "integrity": "sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/@babel/preset-modules/node_modules/@babel/types": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.4.tgz", + "integrity": "sha512-eY+Yn3dCqTGmyiq2QRU66lA5FL8lqqqvecHt0fF3uHONIa7ToYsaCiWV8lOKqAs0Rb2SjixiKFROngnulPtt2g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^8.0.0", + "@babel/helper-validator-identifier": "^8.0.4" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" } }, "node_modules/@babel/preset-typescript": { @@ -3350,9 +3376,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.29.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz", - "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz", + "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==", "dev": true, "license": "MIT", "engines": { @@ -3360,9 +3386,9 @@ } }, "node_modules/@babel/runtime-corejs3": { - "version": "7.29.2", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.29.2.tgz", - "integrity": "sha512-Lc94FOD5+0aXhdb0Tdg3RUtqT6yWbI/BbFWvlaSJ3gAb9Ks+99nHRDKADVqC37er4eCB0fHyWT+y+K3QOvJKbw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.29.7.tgz", + "integrity": "sha512-ppj9ouYku+RX0ljtgZd+KMO5mkM2bCqg8H2PYAFWnLsHEIKIdRojqbJ2i3eVHrisuxy7nOFCmngTDdWtUCdXUQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3373,33 +3399,33 @@ } }, "node_modules/@babel/template": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz", - "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz", + "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.28.6", - "@babel/parser": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/code-frame": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz", - "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==", + "version": "7.29.8", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.8.tgz", + "integrity": "sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.29.0", - "@babel/generator": "^7.29.0", - "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.29.0", - "@babel/template": "^7.28.6", - "@babel/types": "^7.29.0", + "@babel/code-frame": "^7.29.7", + "@babel/generator": "^7.29.8", + "@babel/helper-globals": "^7.29.7", + "@babel/parser": "^7.29.8", + "@babel/template": "^7.29.7", + "@babel/types": "^7.29.8", "debug": "^4.3.1" }, "engines": { @@ -3407,14 +3433,14 @@ } }, "node_modules/@babel/types": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", - "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", + "version": "7.29.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz", + "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.27.1", - "@babel/helper-validator-identifier": "^7.28.5" + "@babel/helper-string-parser": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -3767,9 +3793,9 @@ } }, "node_modules/@codemirror/lang-markdown": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.5.0.tgz", - "integrity": "sha512-0K40bZ35jpHya6FriukbgaleaqzBLZfOh7HuzqbMxBXkbYMJDxfF39c23xOgxFezR+3G+tR2/Mup+Xk865OMvw==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.5.2.tgz", + "integrity": "sha512-AwBOdkWYuA//WcM0xO5PfHPUcmz/O2i5o0Nsg1U69SII/loCJlFI1Romd9xp2HYb1kYJRGZotyqRghuHH5n8Kw==", "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.7.1", @@ -4083,21 +4109,21 @@ "license": "MIT" }, "node_modules/@emnapi/core": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz", - "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==", + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.3.tgz", + "integrity": "sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@emnapi/wasi-threads": "1.2.1", + "@emnapi/wasi-threads": "1.2.3", "tslib": "^2.4.0" } }, "node_modules/@emnapi/runtime": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz", - "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==", + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz", + "integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==", "dev": true, "license": "MIT", "optional": true, @@ -4106,9 +4132,9 @@ } }, "node_modules/@emnapi/wasi-threads": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz", - "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz", + "integrity": "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==", "dev": true, "license": "MIT", "optional": true, @@ -4219,9 +4245,9 @@ } }, "node_modules/@lezer/common": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.2.tgz", - "integrity": "sha512-sxQE460fPZyU3sdc8lafxiPwJHBzZRy/udNFynGQky1SePYBdhkBl1kOagA9uT3pxR8K09bOrmTUqA9wb/PjSQ==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.0.tgz", + "integrity": "sha512-PNGcolp9hr4PJdXR4ix7XtixDrClScvtSCYW3rQG106oVMOOI+jFb+0+J3mbeL/53g1Zd6s0kJzaw6Ri68GmAA==", "license": "MIT" }, "node_modules/@lezer/cpp": { @@ -4325,9 +4351,9 @@ } }, "node_modules/@lezer/lr": { - "version": "1.4.10", - "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.10.tgz", - "integrity": "sha512-rnCpTIBafOx4mRp43xOxDJbFipJm/c0cia/V5TiGlhmMa+wsSdoGmUN3w5Bqrks/09Q/D4tNAmWaT8p6NRi77A==", + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.7.tgz", + "integrity": "sha512-wNIFWdSUfX9Jc6ePMzxSPVgTVB4EOfDIwLQLWASyiUdHKaMsiilj9bYiGkGQCKVodd0x6bgQCV207PILGFCF9Q==", "license": "MIT", "dependencies": { "@lezer/common": "^1.0.0" @@ -4416,23 +4442,23 @@ "license": "MIT" }, "node_modules/@mermaid-js/parser": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.1.1.tgz", - "integrity": "sha512-VuHdsYMK1bT6X2JbcAaWAhugTRvRBRyuZgd+c22swUeI9g/ntaxF7CY7dYarhZovofCbUNO0G7JesfmNtjYOCw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.2.1.tgz", + "integrity": "sha512-n12NohV3mrUyUL2o93IgG/ifeW9FTyeJn3zDxkhwa8MJ9Fxg3HQMlA3RiGmD/3UnJvheztkjjQAjA2T4LmUcpw==", "license": "MIT", "dependencies": { - "@chevrotain/types": "~11.1.1" + "@chevrotain/types": "~11.1.2" } }, "node_modules/@napi-rs/wasm-runtime": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz", - "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz", + "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@tybys/wasm-util": "^0.10.1" + "@tybys/wasm-util": "^0.10.3" }, "funding": { "type": "github", @@ -4805,9 +4831,9 @@ } }, "node_modules/@oxc-project/types": { - "version": "0.142.0", - "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.142.0.tgz", - "integrity": "sha512-7W+2q5AKQVU36fkaryontrHn3YDt1RyUYXatw9i5H8ocYe2sPKSFB6eS8WNPeRKiN1qAWWZUPm7gwFzJGrccqQ==", + "version": "0.147.0", + "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.147.0.tgz", + "integrity": "sha512-IJ3s6ltHLp45S0bh7phkX+gJO7A1Wuz2EaqpAhb8WjqDwbzMiWKHhyyT42tskaWjEYXtHtVCPpnBJVT9+dcRLg==", "dev": true, "license": "MIT", "funding": { @@ -5124,10 +5150,27 @@ "url": "https://opencollective.com/parcel" } }, + "node_modules/@rolldown/binding-android-arm-eabi": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.6.tgz", + "integrity": "sha512-b+jTcARdTiFLI6jB4a5XjTm0RWd6KcRfQj/I2356fxUZemiho9zQLxo0RtCuMDAyKcLo6cEltkgbQp6d1+sjjQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, "node_modules/@rolldown/binding-android-arm64": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.1.tgz", - "integrity": "sha512-02hOeOSryYxVrOIphmLAsqnCJWxwlzFk+pEt/N/i6OgT3lShHO7xGCU5cpgchRDHboAEbSjzgGh+O/u1GswQmA==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.6.tgz", + "integrity": "sha512-lkWU8ZJaRk9q3CIEY1Tc7vIFALp3Xw5NfGJo2hQg5oIqNgxWi1zI+IiDEK3r70BF5Dzol1tcXsnzsRc8NLhG+Q==", "cpu": [ "arm64" ], @@ -5142,9 +5185,9 @@ } }, "node_modules/@rolldown/binding-darwin-arm64": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.1.tgz", - "integrity": "sha512-fMsTOnN0OjFm3CyppWPitKnc8UlliVARUULW6cfU6AIqjdtgmSFWSk9vecHzZduv/yMWIHDlRhM1e8Iff9uAfA==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.6.tgz", + "integrity": "sha512-dgR56NYnvAszm7Ob1B2/Vn0e8bUQYZH2UjVaMMtMVOCKFSfjhfLmuA/9+O+F+ajUdG6B/bSssrKW6JJYASa8jA==", "cpu": [ "arm64" ], @@ -5159,9 +5202,9 @@ } }, "node_modules/@rolldown/binding-darwin-x64": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.1.tgz", - "integrity": "sha512-1wjKdz/XLGKHaTNHjQveQ/B23TKx4ItAqm1JbyVuvNPc4Ze0Fb48s49TAd/2zcplPl8okE/UbTgmlVfwT7eFeQ==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.6.tgz", + "integrity": "sha512-vpVxFvUCFioJqug7OTvqptkc4yb8UX0AwfDmJpaR/0sWz+BUmqSVAf7c8JkUgnN8YLspb4a/N6NhTyMAmdyQ7Q==", "cpu": [ "x64" ], @@ -5176,9 +5219,9 @@ } }, "node_modules/@rolldown/binding-freebsd-x64": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.1.tgz", - "integrity": "sha512-Fa0jHR07E7YBN4vOEsbVf2briYNsuOowfLJaXULZM0ldMlaCaj2LJgLMbMe4iacRyZmvR8efFhgR9wKuGclQUg==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.6.tgz", + "integrity": "sha512-h1wG6Y6K3JlRswxsI64qQJqBAy4vrLuHgRbc8CZMGSWTOFRY6ghMApM1NKzB2I0n5xV1fjkE18SuVl2QpLeNpA==", "cpu": [ "x64" ], @@ -5193,9 +5236,9 @@ } }, "node_modules/@rolldown/binding-linux-arm-gnueabihf": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.1.tgz", - "integrity": "sha512-pzkgu1SSHGgRRyRZ4fbmSgmajbVt+epaLP99NDjFft69v/ypfTi6swBMiVdh2EkQ0OSnHE1lZDM7DRGkyAzUpA==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.6.tgz", + "integrity": "sha512-tbCiqub0q2MVWJKgF5PoAlNWCtQydiOYSLIkd8sByqK/6MMYLJRcSXSYodqYtd0O+Fw7QaVmKKlS4oL94YRZ0w==", "cpu": [ "arm" ], @@ -5210,9 +5253,9 @@ } }, "node_modules/@rolldown/binding-linux-arm64-gnu": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.1.tgz", - "integrity": "sha512-QI5SEDY8cbiYWHx0VO4vIc3UlS6a32vXHjU8Qy/17adEmZIPuByJg13UEvo9c/UCiUkdcVWY83C+b+JrwnNyUg==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.6.tgz", + "integrity": "sha512-oxK9+baEBPhZG5HB4URY+uU04zJWeZlH6Tb9rB5DK4DF9XR1uXNLXt5Q5ZsugTKayNCNLhkcwz/ye74hRI98dg==", "cpu": [ "arm64" ], @@ -5227,9 +5270,9 @@ } }, "node_modules/@rolldown/binding-linux-arm64-musl": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.1.tgz", - "integrity": "sha512-Sm41FyCeXqmYcERoYOCbGIL5hNfd8w9LQ7Y61Bev48HkcjaJqV/iiVOaiDxjVTRMS+QKrZmD8cfPt4uMVnvM+A==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.6.tgz", + "integrity": "sha512-muWCk27FVBEZtv0MsK8gnfSmgczA8KQ0uRVJbTABKhkRfQc38aUrcb7fhi3BNiyseFmgcRsoMfQsSNJ+DbZdSw==", "cpu": [ "arm64" ], @@ -5244,9 +5287,9 @@ } }, "node_modules/@rolldown/binding-linux-ppc64-gnu": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.1.tgz", - "integrity": "sha512-2x+WhXTGl9yJYPbltW/BSEPTVz9OIWQyER4N+gJEDWkkn904eRcBzELqh/Hf7K0w/ubGbKNMv0ZC+94QK/IFEg==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.6.tgz", + "integrity": "sha512-eWDoSfU7Co2qj3vgB3Dt4lj1mG6CoWbcJQkRMP3XJplyCMtuaq3LHvPFjS9QIPvMGWVadJC04Xiy0IdcVPtnwQ==", "cpu": [ "ppc64" ], @@ -5261,9 +5304,9 @@ } }, "node_modules/@rolldown/binding-linux-s390x-gnu": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.1.tgz", - "integrity": "sha512-eEjmQpuRQayHPWWnywaWHkFT3ToPbP3RYy42VVd/B9aBGDA+Ol25EIWHxKQST3IiWJjikCWUF7KtbfqwZrzVwQ==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.6.tgz", + "integrity": "sha512-2bWNjRSIayvupRKxXUY2tWG9fYdoUlTqWywHRvE8Eq3GvuQ+f2HeIkve697fIt+IQs/PV8yFsdWuhp1aJ1PdnA==", "cpu": [ "s390x" ], @@ -5278,9 +5321,9 @@ } }, "node_modules/@rolldown/binding-linux-x64-gnu": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.1.tgz", - "integrity": "sha512-/Orga1fZYkLc/56jBICcHrKchl8Z2UKdDSr3LG9ToWO1lQ6a4Livk9Xz+9WN91zsz5QR3XQz2NNoSDEvP6qadw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.6.tgz", + "integrity": "sha512-KekI0gS0wLxe1UBSQSjenBVwou/JkcQPDzBPICGZjxUv9k3RteHDPBQaiOicZUFKRIH2wKEimGwVpnJsbPzu7w==", "cpu": [ "x64" ], @@ -5295,9 +5338,9 @@ } }, "node_modules/@rolldown/binding-linux-x64-musl": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.1.tgz", - "integrity": "sha512-xxBJRL+0q0Kce7orznGWLuylHDY65vuARXZRpX+hPdv+DqK2c3NlCsVA98tlWzWNEE7yPqA/1NQ5nnCrj49Y5A==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.6.tgz", + "integrity": "sha512-TvtPnfVr+HtyGiDmPK4VWmlNm7QhNNAcK5Q9A7aOXsI8545yCyaoMaicXrFZ72JzeYjaUVk7yT243zT0jzjFKQ==", "cpu": [ "x64" ], @@ -5312,9 +5355,9 @@ } }, "node_modules/@rolldown/binding-openharmony-arm64": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.1.tgz", - "integrity": "sha512-M6AdXIXw3s+/8XpKMzdGDEXGS1S7kwUsy+rcTIUIOx5Ge4nXKCtAFHFV9YKkXvGcC5WMoTjAteLzlsQROVI0Yw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.6.tgz", + "integrity": "sha512-iOo0VEay2XFhaCcH0sps5XIimkSuOnNaZrf6+ZkoSOQBJPKNU48RkmJv0/lSpipexu5P+ouFgafe5IGr/DiQfg==", "cpu": [ "arm64" ], @@ -5328,82 +5371,10 @@ "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@rolldown/binding-wasm32-wasi": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.2.1.tgz", - "integrity": "sha512-/TX0SoRGojHzSAHpfVBbavRVSazg5U3h3Y3VXfcc0cdugq6kxdqw8LPGFiPr+/7gE/60zRcsOY2Vi9b9eT0jww==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/core": "2.0.0-alpha.3", - "@emnapi/runtime": "2.0.0-alpha.3", - "@napi-rs/wasm-runtime": "^1.2.0" - }, - "engines": { - "node": "^20.19.0 || ^22.13.0 || >=23.5.0" - } - }, - "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/core": { - "version": "2.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-2.0.0-alpha.3.tgz", - "integrity": "sha512-AZypUeJ/yByuxyS7BlSNRDOMLMlROYtjYdIAuBmJssVz1UJDSeYxLrdizhXCFYhedC5bqd/ASy8EuNXbVVXp9g==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/wasi-threads": "2.0.1", - "tslib": "^2.4.0" - } - }, - "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/runtime": { - "version": "2.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-2.0.0-alpha.3.tgz", - "integrity": "sha512-hFPAhMUjJD9BSyCANEISPOogeXC9Zo9ZQl7L6vKnaVsMkCtzznaW/naYypeyl0Gv5rYfWYsZbpixTMpjDJzQeA==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, - "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/wasi-threads": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-2.0.1.tgz", - "integrity": "sha512-9DsSk+o5NBX0CCJT8s0EROGSGxjR/tKu6aBTaVyq+SjAEQH4XcdcRxPBRzsBLizTTJ49MJjF+jgu3qnO9GLQcQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, - "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.1.tgz", - "integrity": "sha512-KjZdi8Q1wh89gsVmghvbrMgWl6ZWmRmHV6wjB7/g4Zf0dyO+hH3neZUtuDNPO00qq5YE5RITVWvrIZKRaAmzGQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@tybys/wasm-util": "^0.10.3" - }, - "engines": { - "node": "^20.19.0 || ^22.13.0 || >=23.5.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/Brooooooklyn" - }, - "peerDependencies": { - "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.3", - "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.3" - } - }, "node_modules/@rolldown/binding-win32-arm64-msvc": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.1.tgz", - "integrity": "sha512-EvRrivJieyHG+AO9lleZWgq+g0+S7oV2C51yuqlcyU/R9net+sI4Pj0F+lUoP2bEr6TWX3SqFaaS0SzfLxSzkw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.6.tgz", + "integrity": "sha512-y5NTmmasMS455JlOCO4ZM9krIchv3Mvm1crL1iUPGOPgEzSkves9n0SdC5Sjz6+qWDFhd8/JpfWMH8NSWNHe+A==", "cpu": [ "arm64" ], @@ -5418,9 +5389,9 @@ } }, "node_modules/@rolldown/binding-win32-x64-msvc": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.1.tgz", - "integrity": "sha512-Z4eCmn5QJ/5+azF9knpLWKfVd9aidn0mAe9TpJgvBLId9Ax3t0+JVxBmT25Bv7NBbVW1TZyKjQjQReouMeH5UQ==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.6.tgz", + "integrity": "sha512-np8iZSLfXlAD4kWhiyq/u0Yt8oZDtRQ8lGhQaCXo2rl37KNjeU0GjJuwr4P3oeZ++ROfofsKNBqR5LTO8aXyWQ==", "cpu": [ "x64" ], @@ -5442,28 +5413,32 @@ "license": "MIT" }, "node_modules/@rspack/binding": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-2.0.3.tgz", - "integrity": "sha512-4exVNhGhW5RFHjK87XeTKbkA/qAgI5NHJlT1jNqiJv0gcUXLqTOEU3w7f8+f9zUo4JMFvPc0c9veOi4M19YYTg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-2.2.0.tgz", + "integrity": "sha512-nxZzJqqB0EmEKp6qjzFNkBb/SgGt0k0DSENrLvAJgvVvrm3waVsubD0cfxtPlZY/rd5SzadzxWGEHRyFcds5nA==", "dev": true, "license": "MIT", "optionalDependencies": { - "@rspack/binding-darwin-arm64": "2.0.3", - "@rspack/binding-darwin-x64": "2.0.3", - "@rspack/binding-linux-arm64-gnu": "2.0.3", - "@rspack/binding-linux-arm64-musl": "2.0.3", - "@rspack/binding-linux-x64-gnu": "2.0.3", - "@rspack/binding-linux-x64-musl": "2.0.3", - "@rspack/binding-wasm32-wasi": "2.0.3", - "@rspack/binding-win32-arm64-msvc": "2.0.3", - "@rspack/binding-win32-ia32-msvc": "2.0.3", - "@rspack/binding-win32-x64-msvc": "2.0.3" + "@rspack/binding-darwin-arm64": "2.2.0", + "@rspack/binding-darwin-x64": "2.2.0", + "@rspack/binding-linux-arm64-gnu": "2.2.0", + "@rspack/binding-linux-arm64-musl": "2.2.0", + "@rspack/binding-linux-ppc64-gnu": "2.2.0", + "@rspack/binding-linux-riscv64-gnu": "2.2.0", + "@rspack/binding-linux-riscv64-musl": "2.2.0", + "@rspack/binding-linux-s390x-gnu": "2.2.0", + "@rspack/binding-linux-x64-gnu": "2.2.0", + "@rspack/binding-linux-x64-musl": "2.2.0", + "@rspack/binding-wasm32-wasi": "2.2.0", + "@rspack/binding-win32-arm64-msvc": "2.2.0", + "@rspack/binding-win32-ia32-msvc": "2.2.0", + "@rspack/binding-win32-x64-msvc": "2.2.0" } }, "node_modules/@rspack/binding-darwin-arm64": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-2.0.3.tgz", - "integrity": "sha512-4UyCjLJwU/WxR6K1/gG4u3+jUsoaRHJ5rNu9fto/UbvrItwdlVNULChAApqZFw6mcSetMddSjSICeuj5pSB6sA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-2.2.0.tgz", + "integrity": "sha512-KAVVT7hp3NBjtc/RY2UtOjzzc8i+s4pIhW1p52UV+Aev6ywQCu3dXwkHTonpPvJO3hqLXc4zIMH5l4HbMqBm4g==", "cpu": [ "arm64" ], @@ -5475,9 +5450,9 @@ ] }, "node_modules/@rspack/binding-darwin-x64": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-2.0.3.tgz", - "integrity": "sha512-K3evrbTgZNa8emEqk+AjDtbuoXZp5tPZz3pcEgETxuu3KanW8Zu+Fb+TUp1DEUcL0xOmHPPox8H2cZ3pF4Zmug==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-2.2.0.tgz", + "integrity": "sha512-rzyJCX99aFwl540trsVMNZOgK4+IFm2d5+YeP+RdNo9Uprxloz8vHz0J4dYtaq6MRiCAyM60dAwEa3wJMwqWAQ==", "cpu": [ "x64" ], @@ -5489,9 +5464,9 @@ ] }, "node_modules/@rspack/binding-linux-arm64-gnu": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-2.0.3.tgz", - "integrity": "sha512-aPLDaaTtX1wqjLYAIHc2MGDQZtv1Hbjx47oaaefbWz5GbAnSA4P8jdYIeeGRyrqvQ0WqJXIWXgT0d/iXtes00A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-2.2.0.tgz", + "integrity": "sha512-0t8QOiOMcBV7RvPSsTJ5DQ4QCK6FIyUZy77qbxnS6asGTOXPZZn7V5cL26IxEv/wuHdQ6tQOXheau1fi+gGyBQ==", "cpu": [ "arm64" ], @@ -5503,9 +5478,9 @@ ] }, "node_modules/@rspack/binding-linux-arm64-musl": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-2.0.3.tgz", - "integrity": "sha512-0WulUQPop6vmSDfrTxghmVlm+6crU8/XqD2f0dOWbEniZVuDZJ5/Y/cBqTRyk3rjl0vrmUv3lc87/t7UgQJQSw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-2.2.0.tgz", + "integrity": "sha512-BAvCukqcuHxUdE294ITCohvhVkEklW8RbkKkR36Uo0WyIiMPGrnvPjARPn0/4Q4xMAz7lUmC60sZrvJHlAOKMw==", "cpu": [ "arm64" ], @@ -5516,10 +5491,66 @@ "linux" ] }, + "node_modules/@rspack/binding-linux-ppc64-gnu": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-2.2.0.tgz", + "integrity": "sha512-nCHqZLv/E8nm2ccGkb00F5DQtXxzGy3W3X73ArA+N0+zXJUnzRcSRSwr7AE8pVgP/FYfX4yMFgUXy0g0YxYGRA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rspack/binding-linux-riscv64-gnu": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-2.2.0.tgz", + "integrity": "sha512-CA3WEqKFDI6FAZTnCho2n9pmdPWZYAW/S8mqgxd0cx2Jix43at3VyLxhCC7ED5A9WBSFn/AdHaIbVtgoQHVhWA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rspack/binding-linux-riscv64-musl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-2.2.0.tgz", + "integrity": "sha512-kHB960oClkoPRPZ6sdkhRvqbdRIlbpIMYd/Tbxfmn3DWQahiCk1pkUFJbOtFq3EgESxZISV4THl442W2Y57HvQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rspack/binding-linux-s390x-gnu": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-2.2.0.tgz", + "integrity": "sha512-lVBdiffVo1jq0P0jT36jNou2suLB4ueQI4aWUs+HM+h67YPBtVKWu/mo5Wh59+8nowgcZmYaFM5hdH69963I9w==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@rspack/binding-linux-x64-gnu": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-2.0.3.tgz", - "integrity": "sha512-fAhiMuV5omT53YMft+f3Y9euAFgspuyBAk9ZpeW2buL2TkuUMwP07adhhvQfKdQ5gpELfzmjQaRDGqaIT8UWiA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-2.2.0.tgz", + "integrity": "sha512-M49UaWspE0YJ3268DsquD8idEQTfjBDMvO/I8qccV/Z5T+Q98FJ+kIs5liUaTWb48OIbDEK+8ZKx5QzLbfVN6g==", "cpu": [ "x64" ], @@ -5531,9 +5562,9 @@ ] }, "node_modules/@rspack/binding-linux-x64-musl": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-2.0.3.tgz", - "integrity": "sha512-0kcuFoZ8vy2iNWoISFOZt+/Ujo7LRLrzE7h07AV5r+oN/mv+/v14Sd/8NUtDIScCkrYOszYq/QS31e6t0UrVfw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-2.2.0.tgz", + "integrity": "sha512-YYbs0wmey+5blhEQDE4Dax3TwJtqfGwe2QBm3OLphlBHo/fcZVvimzKkMV0/pVrZTLy2z5ZAwNhGMY64bNr77w==", "cpu": [ "x64" ], @@ -5545,9 +5576,9 @@ ] }, "node_modules/@rspack/binding-wasm32-wasi": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-2.0.3.tgz", - "integrity": "sha512-x2fsw7GzNZEnw444ikj4/b8kVjM0Y0TllxmizHpYZ9gmaQrOk5OXo9RQdz+l4zzoGors0l2IZP5Cc4GJNCaSoQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-2.2.0.tgz", + "integrity": "sha512-rerLPTN/HD4EvLNWs3O2N+Eb37eGvLRIP3dXXc3n+UzTebOepAsahNn44vXeRBsE4m/pHkpDJjwgWTytgQ2gBw==", "cpu": [ "wasm32" ], @@ -5555,15 +5586,15 @@ "license": "MIT", "optional": true, "dependencies": { - "@emnapi/core": "1.10.0", - "@emnapi/runtime": "1.10.0", - "@napi-rs/wasm-runtime": "1.1.4" + "@emnapi/core": "1.11.3", + "@emnapi/runtime": "1.11.3", + "@napi-rs/wasm-runtime": "1.1.6" } }, "node_modules/@rspack/binding-win32-arm64-msvc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-2.0.3.tgz", - "integrity": "sha512-jqlxuVPdrgMuwj/HEjSkC/jmhl4fAuKyob36zJXq2uAusn2FRJ4kClGe1fLFpfxRXFVQAWwlAOwLJg8T0suuaA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-2.2.0.tgz", + "integrity": "sha512-JUAmnbOQYGTRyX28vls/MOMonZWcmcCi5YtEq6YMc8Xqh3Qx0HUwaLM/I1xr/N9BX3b8CV0dQDOpNuBc2ei+CA==", "cpu": [ "arm64" ], @@ -5575,9 +5606,9 @@ ] }, "node_modules/@rspack/binding-win32-ia32-msvc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-2.0.3.tgz", - "integrity": "sha512-QM4JEuyk5QaZ5gnvnAIaCwVQzCkrD2E4Sud77kx/MVGDsRkcOlMx3blMC5QNHPDamRmWGk+7314YOQvRhKuWyg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-2.2.0.tgz", + "integrity": "sha512-wOmQRUaOG0eWH/fnfslA9yK9xKfaq9X+3Xa1TdTJnTqlo0ARJYs6A+Lzjbs7cxdY/o1f12Xe00BG3nQozReUOg==", "cpu": [ "ia32" ], @@ -5589,9 +5620,9 @@ ] }, "node_modules/@rspack/binding-win32-x64-msvc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-2.0.3.tgz", - "integrity": "sha512-vSQNnAy0wswG6AfNRuArTHQBiXOXl+A9ddQxBFup4PMHUzXxKtsBLQzw7BgFC0EgrPeHbt+30j7sXVZKYukj4A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-2.2.0.tgz", + "integrity": "sha512-v6/3bFr9+i7hRpgulL9b5qCvZL0VgR4vQGQNqOWezUzZmPUj9LYpvB0L9xZIVwDQ2ug/xBiA58bfg5IbESgoyw==", "cpu": [ "x64" ], @@ -5603,9 +5634,9 @@ ] }, "node_modules/@rspack/cli": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/cli/-/cli-2.0.3.tgz", - "integrity": "sha512-h/Xbkupx82UaPr5Ye3hNORi5eXmpEGSPri7WkEOrKIcT+Y3h603kujCQziNIPX3G4UURWPiksIArp1GBTF+A9w==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/cli/-/cli-2.2.0.tgz", + "integrity": "sha512-GSiQPG5v5tN8vYJdUMYX44sPiwVVG8H25fq3LWRydVB4WswDAD/N3qNgWZtFVliQdLH3ZWzFdFUoCyZmea0TMA==", "dev": true, "license": "MIT", "bin": { @@ -5622,20 +5653,20 @@ } }, "node_modules/@rspack/core": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@rspack/core/-/core-2.0.3.tgz", - "integrity": "sha512-2ufO/8FHIA/lX6UOgSsKPhpDvHr0sh9lYq/n/LsIZsTwu3973BGbu2fg1Akvuu3rEnskPqXjsqH2EPBzEA42uA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@rspack/core/-/core-2.2.0.tgz", + "integrity": "sha512-3W7oX0BAHbK4VlknH3lfyfRvupzxdZtyEa+DfKmdjzmIAcqYtHnFd0nLqp5dzitDPyDI1TIKkDhpB0AZJn0pVg==", "dev": true, "license": "MIT", "dependencies": { - "@rspack/binding": "2.0.3" + "@rspack/binding": "2.2.0" }, "engines": { "node": "^20.19.0 || >=22.12.0" }, "peerDependencies": { "@module-federation/runtime-tools": "^0.24.1 || ^2.0.0", - "@swc/helpers": ">=0.5.1" + "@swc/helpers": "^0.5.23" }, "peerDependenciesMeta": { "@module-federation/runtime-tools": { @@ -6218,16 +6249,16 @@ } }, "node_modules/@vitest/expect": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.10.tgz", - "integrity": "sha512-YsCn+qAk1GWjQOWFEsEcL2gNQ0zmVmQu3T03qP6UyjhtmdtwtbuI+DASn/7iQB3HGTXkdBwGddzxPlmiql5vlA==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.11.tgz", + "integrity": "sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==", "dev": true, "license": "MIT", "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", - "@vitest/spy": "4.1.10", - "@vitest/utils": "4.1.10", + "@vitest/spy": "4.1.11", + "@vitest/utils": "4.1.11", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" }, @@ -6246,13 +6277,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.10.tgz", - "integrity": "sha512-v0xaezt+DKEmKfaxg133ldzADrwLGd7Ze1MfQQTYfvs8OqZIwbxyxaYURivwV7sWy5fqn3rH5uOrSp07bp44Ow==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.11.tgz", + "integrity": "sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "4.1.10", + "@vitest/spy": "4.1.11", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, @@ -6273,9 +6304,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.10.tgz", - "integrity": "sha512-W1HsjSH4MXQ9YfmmhLAoIYf1HRfekQCGngeIgcei6MP5QQGWUe0gkopdZQaVCFO+JDJMrAJGwa5pRpNpvy4P8Q==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.11.tgz", + "integrity": "sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==", "dev": true, "license": "MIT", "dependencies": { @@ -6286,13 +6317,13 @@ } }, "node_modules/@vitest/runner": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.10.tgz", - "integrity": "sha512-IKI6kpIH+LmpROplyLwBBaCfMgOZOMsygVa6BARD6ahA04VRuJSa6OaVG7kRvSEMD870Vd91rSSw0eegtWyLGg==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.11.tgz", + "integrity": "sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "4.1.10", + "@vitest/utils": "4.1.11", "pathe": "^2.0.3" }, "funding": { @@ -6300,14 +6331,14 @@ } }, "node_modules/@vitest/snapshot": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.10.tgz", - "integrity": "sha512-xRkfOT1qpTAi/Ti4Y1LtfRc3kEuqxGw59eN2jN9pRWMtS/XDevekhcFSqvQqjUNGksfjMJu3Y+oJ+4Ypn2OaJw==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.11.tgz", + "integrity": "sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.1.10", - "@vitest/utils": "4.1.10", + "@vitest/pretty-format": "4.1.11", + "@vitest/utils": "4.1.11", "magic-string": "^0.30.21", "pathe": "^2.0.3" }, @@ -6316,9 +6347,9 @@ } }, "node_modules/@vitest/spy": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.10.tgz", - "integrity": "sha512-PLf/Ugvoq5wO/b4rwYCR1h2PSIdXz7wnkQFMiUpLdtM7l6pqVFcQIBEHyT1+l+cj7mNwAfZHzqXqDyjvOuwbDw==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.11.tgz", + "integrity": "sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==", "dev": true, "license": "MIT", "funding": { @@ -6326,13 +6357,13 @@ } }, "node_modules/@vitest/utils": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.10.tgz", - "integrity": "sha512-fy9am/HWxbaGt/Sawrp90vt6Y6jQwf1RX77cz3uwoJwJVMli/e1IEwRPnMNJ7vKfPTwo0diXifkpPvwH9v7nGA==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.11.tgz", + "integrity": "sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.1.10", + "@vitest/pretty-format": "4.1.11", "convert-source-map": "^2.0.0", "tinyrainbow": "^3.1.0" }, @@ -6655,9 +6686,9 @@ } }, "node_modules/acorn": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", - "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz", + "integrity": "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -7027,9 +7058,9 @@ } }, "node_modules/autoprefixer": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.0.tgz", - "integrity": "sha512-FMhOoZV4+qR6aTUALKX2rEqGG+oyATvwBt9IIzVR5rMa2HRWPkxf+P+PAJLD1I/H5/II+HuZcBJYEFBpq39ong==", + "version": "10.5.4", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.4.tgz", + "integrity": "sha512-MaU0U/za7N3r6brxD4YB/l4NSrFzLPlANv6wEuQVaIPlD3L4W9rFcQPbL/EilY9BHhHvhfcz3gInDLrEtWT4EA==", "dev": true, "funding": [ { @@ -7047,8 +7078,8 @@ ], "license": "MIT", "dependencies": { - "browserslist": "^4.28.2", - "caniuse-lite": "^1.0.30001787", + "browserslist": "^4.28.6", + "caniuse-lite": "^1.0.30001806", "fraction.js": "^5.3.4", "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" @@ -7159,9 +7190,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.10.30", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.30.tgz", - "integrity": "sha512-xjOFN16Ha1+Rz4nFYKqHU/LSB+gx/Vi3yQLX7r7sAW+Wa+8hhF2h4pvqTrTMc8+WcDBEunnUurr46Jvv0jk3Vg==", + "version": "2.11.19", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.19.tgz", + "integrity": "sha512-Grytf1xOxOEMTGRwx6rLGKkTabd4vMg3VrKdj/7joCmV0qgh4QwMMO6xh34YEXQqirAuUdgQGa5orJQQ+69RBw==", "dev": true, "license": "Apache-2.0", "bin": { @@ -7455,9 +7486,9 @@ "license": "ISC" }, "node_modules/browserslist": { - "version": "4.28.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz", - "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==", + "version": "4.28.8", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.8.tgz", + "integrity": "sha512-V2NpofLblG64mfOtSgDhOJESZEGogzDMBv/q+W6oc4LXWP/q75eOXoOaaOu1EOadB9U4Bwx/e0yzbvwKH8zalA==", "dev": true, "funding": [ { @@ -7475,11 +7506,11 @@ ], "license": "MIT", "dependencies": { - "baseline-browser-mapping": "^2.10.12", - "caniuse-lite": "^1.0.30001782", - "electron-to-chromium": "^1.5.328", - "node-releases": "^2.0.36", - "update-browserslist-db": "^1.2.3" + "baseline-browser-mapping": "^2.11.12", + "caniuse-lite": "^1.0.30001809", + "electron-to-chromium": "^1.5.402", + "node-releases": "^2.0.53", + "update-browserslist-db": "^1.3.0" }, "bin": { "browserslist": "cli.js" @@ -7646,9 +7677,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001793", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz", - "integrity": "sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==", + "version": "1.0.30001810", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001810.tgz", + "integrity": "sha512-TITQPUkaz+aVk5GL6NhOdwk1aEaNTSDPsGFWrTuhKGtjTF70jL/Oht2W4c6rXUe5fu7Ie19VIahAXHIIiWWNeg==", "dev": true, "funding": [ { @@ -8644,11 +8675,14 @@ } }, "node_modules/core-js": { - "version": "3.49.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.49.0.tgz", - "integrity": "sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==", + "version": "3.50.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.50.0.tgz", + "integrity": "sha512-BRWgOLKkFeCgRudR6zrs8p9XJZcE14grzKMMssoYrk6krtuEZ7MTKPIY5RzOnqsEKIR9kst7wNzphttraT+Yqw==", "hasInstallScript": true, "license": "MIT", + "engines": { + "node": "*" + }, "funding": { "type": "opencollective", "url": "https://opencollective.com/core-js" @@ -8847,9 +8881,9 @@ } }, "node_modules/cytoscape": { - "version": "3.33.3", - "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.3.tgz", - "integrity": "sha512-Gej7U+OKR+LZ8kvX7rb2HhCYJ0IhvEFsnkud4SB1PR+BUY/TsSO0dmOW59WEVLu51b1Rm+gQRKoz4bLYxGSZ2g==", + "version": "3.34.2", + "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.34.2.tgz", + "integrity": "sha512-Cm2jaj1X/PBNlzV9yH8zcfGOxO7U+CJ/+mxSBVPSchLaugdp4jtlGx5qaHtPRZ6tgiZ5P+o1XoRfJA+ba6KM3g==", "license": "MIT", "engines": { "node": ">=0.10" @@ -9374,9 +9408,9 @@ "dev": true }, "node_modules/dayjs": { - "version": "1.11.20", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.20.tgz", - "integrity": "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==", + "version": "1.11.23", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.23.tgz", + "integrity": "sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ==", "license": "MIT" }, "node_modules/debounce-fn": { @@ -9663,9 +9697,9 @@ } }, "node_modules/dompurify": { - "version": "3.4.11", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.11.tgz", - "integrity": "sha512-zhlUV12GsaRzMsf9q5M254YhA4+VuF0fG+QFqu6aYpoGlKtz+w8//jBcGVYBgQkR5GHjUomejY84AV+/uPbWdw==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.14.tgz", + "integrity": "sha512-dVoH9z+MY+C9IilgGCk3YfFqjLi3fChm2OiKJMzh6axrJ5qwxqWaZamgmHrpv22CN/KdbZJuGEGgfQoL00LTdg==", "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { "@types/trusted-types": "^2.0.7" @@ -9740,9 +9774,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.357", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.357.tgz", - "integrity": "sha512-NHlTIQDK8fmVwHwuIzmXYEJ1Ewq3D9wDNc0cWXxDGysP6Pb21giwGNkxiTifyKy/4SoPuN5l6GLP1W9Sv7zB2g==", + "version": "1.5.415", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.415.tgz", + "integrity": "sha512-958V+Kbhtgz+SxXeEVKBjrlKRBIDAYvUJfwhjxMZ5S6ut9jAl7l9ZKBkBrvjyjZE36PabLUo2L8kEeV5O4vgJg==", "dev": true, "license": "ISC" }, @@ -9854,6 +9888,7 @@ "integrity": "sha512-L1l8TNvomm6UVW5B253AGxQagSQr+vGwhMlrrfRS2qmhx46AMpMVJKQYLvWYbysTMY8VoicOvzHzoHMbyzB+4A==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.3.3" @@ -9940,13 +9975,15 @@ } }, "node_modules/es-toolkit": { - "version": "1.46.1", - "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.46.1.tgz", - "integrity": "sha512-5eNtXOs3tbfxXOj04tjjseeWkRWaoCjdEI+96DgwzZoe6c9juL49pXlzAFTI72aWC9Y8p7168g6XIKjh7k6pyQ==", + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.51.0.tgz", + "integrity": "sha512-zC2lQGkM7QX+Gm6iM3+WIdZJzthsEd14LvRNJneSO2hzyz/zNBENR8+YXWo1cKxgPBtV6ksPYHELbcwBRzmdCw==", "license": "MIT", "workspaces": [ "docs", - "benchmarks" + "benchmarks", + "tests/types", + "tests/browser-compat" ] }, "node_modules/escalade": { @@ -10402,9 +10439,9 @@ } }, "node_modules/filesize": { - "version": "11.0.17", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-11.0.17.tgz", - "integrity": "sha512-oHLTvMLw6imZUl1se/RBQrFlyy50nXce4sU7yGR6Qc0JgCwqnfiFsAnEwotdGmfKLD7SArGUk2/5STU0k8LOBQ==", + "version": "11.0.22", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-11.0.22.tgz", + "integrity": "sha512-RlCVs9CY+oSsRnNZn95J9vDXjNjOwddKyTFjOYtA4yxYVIxBnwiVVGJX+TFhsmu3uUf81JDGyijtYL9xgawlTw==", "license": "BSD-3-Clause", "engines": { "node": ">= 10.8.0" @@ -10558,12 +10595,12 @@ } }, "node_modules/framer-motion": { - "version": "12.42.0", - "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.42.0.tgz", - "integrity": "sha512-wp7EJnfWaaEScVygKv3e20udoRz+LbtxScsuTkakAxfXmt+ReC6WyPW2nINRAGvd+hG9odwcjBLyOTPjH5pBRA==", + "version": "12.43.0", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.43.0.tgz", + "integrity": "sha512-1eaL3RvR/kAlbG7UYcpMptEyzPoENO0c6w7ZnB3/hh2vSAz/6uGAFn6fdoqTBguNstf3MsFhJHsD/0DHiclG+g==", "license": "MIT", "dependencies": { - "motion-dom": "^12.42.0", + "motion-dom": "^12.43.0", "motion-utils": "^12.39.0", "tslib": "^2.4.0" }, @@ -10970,9 +11007,9 @@ "license": "MIT" }, "node_modules/happy-dom": { - "version": "20.11.1", - "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-20.11.1.tgz", - "integrity": "sha512-XSt8tMzbW9ymE7687xztkO1ckR7qJNQ3LywY9vlYGhGi3zXrGBHuUo2Cl1ztZaICW+1eAGdkLbj6iwVqDT33kg==", + "version": "20.11.6", + "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-20.11.6.tgz", + "integrity": "sha512-Hldbg8AdAa5a5oDcZpjqnGitp7JB0hqWmfv/8qr+kft4vzSD8BHsbdRfzYvL/0QcbKcURC/yyoygbeDQarPvYg==", "dev": true, "license": "MIT", "dependencies": { @@ -12630,9 +12667,9 @@ "license": "MIT" }, "node_modules/linkify-it": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.1.tgz", - "integrity": "sha512-wVoTjP4Q6R0NW5hiZkVJaFZPWgtXfoGF+6LucL3/FtiNjmcHhYjEr5f1Kqjirc1nBW07J/ZuRFumqr2oqccEWg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.2.tgz", + "integrity": "sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q==", "funding": [ { "type": "github", @@ -12820,9 +12857,9 @@ } }, "node_modules/markdown-it": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.2.0.tgz", - "integrity": "sha512-1TGiQiJVRQ3NPmZH6sx5Cfnmg6GQm9jvC1ch4TK511NjSJvjzKLzn5pPfZRNZkRPZP0HqCioSndqH8v2nRaWVQ==", + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.3.0.tgz", + "integrity": "sha512-RCEsPjR+sr0x+AuYp601tKTkgFG4YEPLCzHST3cQ/fhlJkqAkz1L2/Qbp1j9qw5SBwQHFBoW8+hoN5xssOF0Tw==", "funding": [ { "type": "github", @@ -12836,8 +12873,8 @@ "license": "MIT", "dependencies": { "argparse": "^2.0.1", - "entities": "^4.4.0", - "linkify-it": "^5.0.1", + "entities": "^4.5.0", + "linkify-it": "^5.0.2", "mdurl": "^2.0.0", "punycode.js": "^2.3.1", "uc.micro": "^2.1.0" @@ -12847,9 +12884,9 @@ } }, "node_modules/markdown-it-anchor": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-9.2.0.tgz", - "integrity": "sha512-sa2ErMQ6kKOA4l31gLGYliFQrMKkqSO0ZJgGhDHKijPf0pNFM9vghjAh3gn26pS4JDRs7Iwa9S36gxm3vgZTzg==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-9.2.1.tgz", + "integrity": "sha512-p6APiLJDFAW2GEvaavDvhIBn7jrX2jLv77NkBGgNacFTurbORYc4pyYySg/mI6mpR6cHQuAtzKtmqgQr4K8dsQ==", "license": "Unlicense", "peerDependencies": { "@types/markdown-it": "*", @@ -12857,9 +12894,9 @@ } }, "node_modules/markdown-it-emoji": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-3.0.0.tgz", - "integrity": "sha512-+rUD93bXHubA4arpEZO3q80so0qgoFJEKRkRbjKX8RTdca89v2kfyF+xR3i2sQTwql9tpPZPOQN5B+PunspXRg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-3.1.0.tgz", + "integrity": "sha512-NhmMEH2ywduD4Nty1E8uB5NqfLhAT1VR0dyvoJyStKOqCzbZmVdn/+8wj7zpDsb/fLBikpCPsWwxqKlvMmbz4g==", "license": "MIT" }, "node_modules/markdown-it-footnote": { @@ -13745,12 +13782,12 @@ } }, "node_modules/motion": { - "version": "12.42.0", - "resolved": "https://registry.npmjs.org/motion/-/motion-12.42.0.tgz", - "integrity": "sha512-Qhwvu9sVl5/URSq5CNzwMCpSKK8Uhnrwb6VO977kZyj/wOCS7mWebJUnBoHx5cZU1Zv8a9BD5CSICWKAlrLJgA==", + "version": "12.43.0", + "resolved": "https://registry.npmjs.org/motion/-/motion-12.43.0.tgz", + "integrity": "sha512-BQgQbSa9Hn3/mtbib0MK53y6JSANa+YKUKlaYnWzAVDH424RYQ5LVpV3pNiWH00BA2z4ojsSdMzqT7g2FQwjuQ==", "license": "MIT", "dependencies": { - "framer-motion": "^12.42.0", + "framer-motion": "^12.43.0", "tslib": "^2.4.0" }, "peerDependencies": { @@ -13771,9 +13808,9 @@ } }, "node_modules/motion-dom": { - "version": "12.42.0", - "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.42.0.tgz", - "integrity": "sha512-M63h4n8R+quJdNhBwuLlgxM+OLYa9+I/T2pzDRboB9fLXRdbou+Gw7Zury+SkpaCyACP1JHSjHgZ1EgTkBr30w==", + "version": "12.43.0", + "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.43.0.tgz", + "integrity": "sha512-azKON4d9S65PEoFUiQTMTgPheEmzf2QngdRc50AKfJp9Q9mmcBVw22c8eMq9k8kxOFHdL7+WZY7N/5F/lwiDag==", "license": "MIT", "dependencies": { "motion-utils": "^12.39.0" @@ -13808,9 +13845,9 @@ "license": "ISC" }, "node_modules/nanoid": { - "version": "3.3.16", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz", - "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==", + "version": "3.3.18", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.18.tgz", + "integrity": "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==", "dev": true, "funding": [ { @@ -13887,11 +13924,14 @@ } }, "node_modules/node-releases": { - "version": "2.0.44", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.44.tgz", - "integrity": "sha512-5WUyunoPMsvvEhS8AxHtRzP+oA8UCkJ7YRxatWKjngndhDGLiqEVAQKWjFAiAiuL8zMRGzGSJxFnLetoa43qGQ==", + "version": "2.0.53", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.53.tgz", + "integrity": "sha512-D9UOmYG3UH1V+ENW56t5QXBwJw1YEY18ruVeus89Rw+SyIgjPkCO84bRzO3uNIYosJbNwiabWVn48o3uJLjxFQ==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">=18" + } }, "node_modules/nopt": { "version": "9.0.0", @@ -14608,9 +14648,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", - "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz", + "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==", "license": "MIT", "engines": { "node": ">=12" @@ -14739,9 +14779,9 @@ } }, "node_modules/postcss": { - "version": "8.5.25", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.25.tgz", - "integrity": "sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==", + "version": "8.5.26", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.26.tgz", + "integrity": "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==", "dev": true, "funding": [ { @@ -14759,7 +14799,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.16", + "nanoid": "^3.3.17", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -15819,13 +15859,13 @@ "license": "Unlicense" }, "node_modules/rolldown": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.1.tgz", - "integrity": "sha512-4FKJhg8d3OiyQOA6Q1Q0hoFFpW9/OoX+VsHzpECsdsIZoOArrAK90gl59YK/Z+gnDel45bgJZK03ozH/9bCqEw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.6.tgz", + "integrity": "sha512-vMM4q3aixf46GiF1Kok8jDPFsEpXgFWGjUHXNkNHNm+Y2adXAG2dbX91jkti3i0ZRsOlcmbuzAz1poObSHCmUA==", "dev": true, "license": "MIT", "dependencies": { - "@oxc-project/types": "=0.142.0", + "@oxc-project/types": "=0.147.0", "@rolldown/pluginutils": "^1.0.0" }, "bin": { @@ -15835,21 +15875,21 @@ "node": "^20.19.0 || >=22.12.0" }, "optionalDependencies": { - "@rolldown/binding-android-arm64": "1.2.1", - "@rolldown/binding-darwin-arm64": "1.2.1", - "@rolldown/binding-darwin-x64": "1.2.1", - "@rolldown/binding-freebsd-x64": "1.2.1", - "@rolldown/binding-linux-arm-gnueabihf": "1.2.1", - "@rolldown/binding-linux-arm64-gnu": "1.2.1", - "@rolldown/binding-linux-arm64-musl": "1.2.1", - "@rolldown/binding-linux-ppc64-gnu": "1.2.1", - "@rolldown/binding-linux-s390x-gnu": "1.2.1", - "@rolldown/binding-linux-x64-gnu": "1.2.1", - "@rolldown/binding-linux-x64-musl": "1.2.1", - "@rolldown/binding-openharmony-arm64": "1.2.1", - "@rolldown/binding-wasm32-wasi": "1.2.1", - "@rolldown/binding-win32-arm64-msvc": "1.2.1", - "@rolldown/binding-win32-x64-msvc": "1.2.1" + "@rolldown/binding-android-arm-eabi": "1.2.6", + "@rolldown/binding-android-arm64": "1.2.6", + "@rolldown/binding-darwin-arm64": "1.2.6", + "@rolldown/binding-darwin-x64": "1.2.6", + "@rolldown/binding-freebsd-x64": "1.2.6", + "@rolldown/binding-linux-arm-gnueabihf": "1.2.6", + "@rolldown/binding-linux-arm64-gnu": "1.2.6", + "@rolldown/binding-linux-arm64-musl": "1.2.6", + "@rolldown/binding-linux-ppc64-gnu": "1.2.6", + "@rolldown/binding-linux-s390x-gnu": "1.2.6", + "@rolldown/binding-linux-x64-gnu": "1.2.6", + "@rolldown/binding-linux-x64-musl": "1.2.6", + "@rolldown/binding-openharmony-arm64": "1.2.6", + "@rolldown/binding-win32-arm64-msvc": "1.2.6", + "@rolldown/binding-win32-x64-msvc": "1.2.6" } }, "node_modules/roughjs": { @@ -15936,13 +15976,13 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.99.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.99.0.tgz", - "integrity": "sha512-kgW13M54DUB7IsIRM5LvJkNlpH+WhMpooUcaWGFARkF1Tc82v9mIWkCbCYf+MBvpIUBSeSOTilpZjEPr2VYE6Q==", + "version": "1.103.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.103.1.tgz", + "integrity": "sha512-9icZURbP51S6S0QGoyaeqk9uB06GNWxsFYWfH5RgpFgqK5FA8tJcM3AdVxrZEVJ7dz+L87nG95gBKf4VuaMHGw==", "dev": true, "license": "MIT", "dependencies": { - "chokidar": "^4.0.0", + "chokidar": "^5.0.0", "immutable": "^5.1.5", "source-map-js": ">=0.6.2 <2.0.0" }, @@ -15950,7 +15990,7 @@ "sass": "sass.js" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.19.0" }, "optionalDependencies": { "@parcel/watcher": "^2.4.1" @@ -15997,6 +16037,36 @@ } } }, + "node_modules/sass/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/sass/node_modules/readdirp": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.1.1.tgz", + "integrity": "sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/sax": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz", @@ -16846,37 +16916,28 @@ } }, "node_modules/ts-loader": { - "version": "9.5.7", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.7.tgz", - "integrity": "sha512-/ZNrKgA3K3PtpMYOC71EeMWIloGw3IYEa5/t1cyz2r5/PyUwTXGzYJvcD3kfUvmhlfpz1rhV8B2O6IVTQ0avsg==", + "version": "9.6.2", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.6.2.tgz", + "integrity": "sha512-R4iuczmtgxvtuI556s+hTZ6/7Ee03VCAk/l/M8LY1OAsUgB7YydsCxkgq9D9pKRaD7GJqUi2u8fp9zZP/ufjKA==", "dev": true, "license": "MIT", "dependencies": { "chalk": "^4.1.0", - "enhanced-resolve": "^5.0.0", - "micromatch": "^4.0.0", - "semver": "^7.3.4", + "picomatch": "^4.0.0", "source-map": "^0.7.4" }, "engines": { "node": ">=12.0.0" }, "peerDependencies": { + "loader-utils": "*", "typescript": "*", - "webpack": "^5.0.0" - } - }, - "node_modules/ts-loader/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" + "webpack": "^4.0.0 || ^5.0.0" }, - "engines": { - "node": ">=10" + "peerDependenciesMeta": { + "loader-utils": { + "optional": true + } } }, "node_modules/tslib": { @@ -17145,9 +17206,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz", - "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.1.tgz", + "integrity": "sha512-ZZ61DsRsOnakl74HAmp3oSN4aXUmEWXf+i/yv0h7tIBfICc3VdrFErQKUUKPgu3AMsTUMbcongALEN4l6GSUrQ==", "dev": true, "funding": [ { @@ -17267,16 +17328,16 @@ } }, "node_modules/uuid": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.0.tgz", - "integrity": "sha512-Qo+uWgilfSmAhXCMav1uYFynlQO7fMFiMVZsQqZRMIXp0O7rR7qjkj+cPvBHLgBqi960QCoo/PH2/6ZtVqKvrg==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.1.tgz", + "integrity": "sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], "license": "MIT", "bin": { - "uuid": "dist-node/bin/uuid" + "uuid": "dist/esm/bin/uuid" } }, "node_modules/valid-identifier": { @@ -17358,16 +17419,16 @@ "license": "MIT" }, "node_modules/vite": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-8.2.0.tgz", - "integrity": "sha512-pn+CFpM0lwDeKwmOq1ZaBK/9sjorZcgqxki6MbY/jPEVd9vichIlmlD4HmQ5wdP5EgqQCFRaACBxMC7uEGc6lQ==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.2.2.tgz", + "integrity": "sha512-cFKLV/PRgAUlIRm5WjMjJ86jrftzpqcgH+Us+DS8mI3CDNiH30Whrz8uHL3+MOLPAgqbMBAqWdAHAphOAM+z/Q==", "dev": true, "license": "MIT", "dependencies": { "lightningcss": "^1.33.0", "picomatch": "^4.0.5", - "postcss": "^8.5.23", - "rolldown": "~1.2.0", + "postcss": "^8.5.26", + "rolldown": "~1.2.4", "tinyglobby": "^0.2.17" }, "bin": { @@ -17384,7 +17445,7 @@ }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", - "@vitejs/devtools": "^0.4.0", + "@vitejs/devtools": "^0.4.0 || ^0.5.0", "esbuild": "^0.27.0 || ^0.28.0", "jiti": ">=1.21.0", "less": "^4.0.0", @@ -17436,19 +17497,19 @@ } }, "node_modules/vitest": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.10.tgz", - "integrity": "sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.11.tgz", + "integrity": "sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/expect": "4.1.10", - "@vitest/mocker": "4.1.10", - "@vitest/pretty-format": "4.1.10", - "@vitest/runner": "4.1.10", - "@vitest/snapshot": "4.1.10", - "@vitest/spy": "4.1.10", - "@vitest/utils": "4.1.10", + "@vitest/expect": "4.1.11", + "@vitest/mocker": "4.1.11", + "@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.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", @@ -17476,12 +17537,12 @@ "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", - "@vitest/browser-playwright": "4.1.10", - "@vitest/browser-preview": "4.1.10", - "@vitest/browser-webdriverio": "4.1.10", - "@vitest/coverage-istanbul": "4.1.10", - "@vitest/coverage-v8": "4.1.10", - "@vitest/ui": "4.1.10", + "@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" @@ -17983,9 +18044,9 @@ } }, "node_modules/ws": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz", - "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==", + "version": "8.21.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.3.tgz", + "integrity": "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==", "dev": true, "license": "MIT", "engines": { @@ -18062,15 +18123,15 @@ "license": "ISC" }, "node_modules/yargs": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", - "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", + "version": "18.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.1.0.tgz", + "integrity": "sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg==", "license": "MIT", "dependencies": { "cliui": "^9.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", - "string-width": "^7.2.0", + "string-width": "^8.2.1", "y18n": "^5.0.5", "yargs-parser": "^22.0.0" }, @@ -18103,6 +18164,22 @@ "node": ">=10" } }, + "node_modules/yargs/node_modules/string-width": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.2.tgz", + "integrity": "sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==", + "license": "MIT", + "dependencies": { + "get-east-asian-width": "^1.5.0", + "strip-ansi": "^7.1.2" + }, + "engines": { + "node": ">=20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index dcf2e77743..c1cf55d0d7 100644 --- a/package.json +++ b/package.json @@ -64,22 +64,22 @@ "homepage": "https://github.com/deadlyjack/acode#readme", "devDependencies": { "@babel/core": "^8.0.1", - "@babel/generator": "^7.29.1", - "@babel/parser": "^7.29.3", + "@babel/generator": "^7.29.8", + "@babel/parser": "^7.29.8", "@babel/plugin-transform-runtime": "^8.0.1", - "@babel/preset-env": "^8.0.1", + "@babel/preset-env": "^8.0.2", "@babel/preset-typescript": "^8.0.1", - "@babel/runtime": "^7.29.2", - "@babel/runtime-corejs3": "^7.29.2", - "@babel/traverse": "^7.29.0", + "@babel/runtime": "^7.29.7", + "@babel/runtime-corejs3": "^7.29.7", + "@babel/traverse": "^7.29.8", "@biomejs/biome": "2.4.11", "@lezer/generator": "^1.8.0", - "@rspack/cli": "^2.0.0", - "@rspack/core": "^2.0.0", + "@rspack/cli": "^2.2.0", + "@rspack/core": "^2.2.0", "@types/ace": "^0.0.52", "@types/cordova": "^11.0.3", "@types/url-parse": "^1.4.11", - "autoprefixer": "^10.5.0", + "autoprefixer": "^10.5.4", "babel-loader": "^10.1.1", "chokidar": "^4.0.3", "com.foxdebug.acode.rk.auth": "file:src/plugins/auth", @@ -104,22 +104,22 @@ "cordova-plugin-system": "file:src/plugins/system", "cordova-plugin-websocket": "file:src/plugins/websocket", "css-loader": "^7.1.4", - "happy-dom": "^20.11.1", + "happy-dom": "^20.11.6", "mini-css-extract-plugin": "^2.10.2", "path-browserify": "^1.0.1", "postcss-loader": "^8.2.1", "prettier": "^3.8.3", "prettier-plugin-java": "^2.8.1", "raw-loader": "^4.0.2", - "sass": "^1.99.0", + "sass": "^1.103.1", "sass-loader": "^16.0.8", "style-loader": "^4.0.0", "terminal": "^0.1.4", - "ts-loader": "^9.5.7", + "ts-loader": "^9.6.2", "typescript": "^5.9.3", - "vitest": "^4.1.10", + "vitest": "^4.1.11", "vscode-languageserver-types": "^3.17.5", - "ws": "^8.21.0" + "ws": "^8.21.3" }, "dependencies": { "@codemirror/autocomplete": "^6.20.3", @@ -135,7 +135,7 @@ "@codemirror/lang-json": "^6.0.2", "@codemirror/lang-less": "^6.0.2", "@codemirror/lang-liquid": "^6.3.2", - "@codemirror/lang-markdown": "^6.5.0", + "@codemirror/lang-markdown": "^6.5.2", "@codemirror/lang-php": "^6.0.2", "@codemirror/lang-python": "^6.2.1", "@codemirror/lang-rust": "^6.0.2", @@ -168,38 +168,38 @@ "@xterm/addon-web-links": "^0.12.0", "@xterm/addon-webgl": "^0.19.0", "@xterm/xterm": "^6.0.0", - "acorn": "^8.16.0", + "acorn": "^8.18.0", "autosize": "^6.0.1", "codemirror": "^6.0.2", "cordova": "13.0.0", - "core-js": "^3.49.0", - "dayjs": "^1.11.20", - "dompurify": "^3.4.11", + "core-js": "^3.50.0", + "dayjs": "^1.11.23", + "dompurify": "^3.4.14", "escape-string-regexp": "^5.0.0", "esprima": "^4.0.1", - "filesize": "^11.0.17", + "filesize": "^11.0.22", "html-tag-js": "^2.4.16", "jszip": "^3.10.1", - "katex": "^0.16.45", - "markdown-it": "^14.2.0", - "markdown-it-anchor": "^9.2.0", - "markdown-it-emoji": "^3.0.0", + "katex": "^0.16.47", + "markdown-it": "^14.3.0", + "markdown-it-anchor": "^9.2.1", + "markdown-it-emoji": "^3.1.0", "markdown-it-footnote": "^4.0.0", "markdown-it-github-alerts": "^1.0.1", "markdown-it-task-lists": "^2.1.1", "markdown-it-texmath": "^1.0.0", "mermaid": "^11.14.0", "mime-types": "^3.0.2", - "motion": "^12.42.0", + "motion": "^12.43.0", "mustache": "^4.2.0", - "picomatch": "^4.0.4", + "picomatch": "^4.0.7", "url-parse": "^1.5.10", "vanilla-picker": "^2.12.3", "vscode-css-languageservice": "6.3.10", "vscode-html-languageservice": "5.6.2", "vscode-json-languageservice": "5.7.2", "vscode-languageserver-textdocument": "1.0.12", - "yargs": "^18.0.0" + "yargs": "^18.1.0" }, "overrides": { "@codemirror/autocomplete": "^6.20.3", From e27eb1a877df53079a9a5e2806559ed15253e03e Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Thu, 27 Aug 2026 15:27:33 +0000 Subject: [PATCH 076/195] fix: preserve MIME type for plugin icons on plugin details page (#2818) * fix: preserve MIME type for plugin icons on plugin details page * fix --- src/pages/plugin/plugin.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/plugin/plugin.js b/src/pages/plugin/plugin.js index 2503ff9853..f4c91d74ba 100644 --- a/src/pages/plugin/plugin.js +++ b/src/pages/plugin/plugin.js @@ -18,6 +18,7 @@ import anchor from "markdown-it-anchor"; import markdownItFootnote from "markdown-it-footnote"; import MarkdownItGitHubAlerts from "markdown-it-github-alerts"; import markdownItTaskLists from "markdown-it-task-lists"; +import mimeTypes from "mime-types"; import { highlightCodeBlock, initHighlighting } from "utils/codeHighlight"; import helpers from "utils/helpers"; import Url from "utils/Url"; @@ -120,8 +121,10 @@ export default async function PluginInclude( Url.join(PLUGIN_DIR, id, installedPlugin.icon), ); const iconData = await fsOperation(iconUrl).readFile(); + const iconMimeType = + mimeTypes.lookup(installedPlugin.icon) || "image/png"; const icon = URL.createObjectURL( - new Blob([iconData], { type: "image/png" }), + new Blob([iconData], { type: iconMimeType }), ); plugin = { id, From 5612038a220fbd4d17c09d908b962f1f1fccad31 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Thu, 27 Aug 2026 17:34:32 +0000 Subject: [PATCH 077/195] fix(console): run JavaScript files in isolated worker (#2819) * fix(console): run JavaScript files in isolated worker * fix --- src/lib/console.js | 20 ++++++++ src/lib/consoleRuntime.js | 31 ++++++++++++ src/lib/run.js | 9 ++-- src/views/console.hbs | 8 +-- tests/unit/consoleExecutionContext.test.js | 59 ++++++++++++++++++++++ 5 files changed, 121 insertions(+), 6 deletions(-) diff --git a/src/lib/console.js b/src/lib/console.js index 05ca41fa6a..35a32cb2b9 100644 --- a/src/lib/console.js +++ b/src/lib/console.js @@ -7,6 +7,7 @@ import loadPolyFill from "utils/polyfill"; import ConsoleExecutor, { applyConsoleViewport, executeConsoleCommand, + executeConsoleScript, resolveConsoleExecutionContext, } from "./consoleRuntime"; @@ -25,6 +26,9 @@ import ConsoleExecutor, { const themeEndpoint = document.querySelector( 'meta[name="acode-console-theme-endpoint"]', )?.content; + const startupScriptUrl = document.querySelector( + 'meta[name="acode-console-executing-script"]', + )?.content; const originalConsole = console; const $input = tag("textarea", { id: "__c-input", @@ -184,6 +188,7 @@ import ConsoleExecutor, { if (isStandaloneConsole) { showConsole(); + void runStartupScript(); return; } @@ -205,6 +210,21 @@ import ConsoleExecutor, { themeSyncTimer = null; } + async function runStartupScript() { + if (!startupScriptUrl) return; + + setExecutionState(true); + const result = await executeConsoleScript({ + scriptUrl: startupScriptUrl, + workerExecutor: executor, + }); + setExecutionState(false); + + if (result?.type === "error") { + log("error", getStack(new Error()), result.value); + } + } + async function syncTheme() { if (themeSyncPending) return; themeSyncPending = true; diff --git a/src/lib/consoleRuntime.js b/src/lib/consoleRuntime.js index 383ddd0946..5e45e25236 100644 --- a/src/lib/consoleRuntime.js +++ b/src/lib/consoleRuntime.js @@ -184,3 +184,34 @@ export function executeConsoleCommand({ if (context === "page") return Promise.resolve(pageExecutor(code)); return workerExecutor.execute(code); } + +/** + * Loads a standalone JavaScript file and executes it in the isolated console + * worker. The file is fetched first so it is never inserted as a page script. + */ +export async function executeConsoleScript({ + scriptUrl, + workerExecutor, + fetchScript = globalThis.fetch, +}) { + if (!scriptUrl) return null; + + try { + if (typeof fetchScript !== "function") { + throw new Error("This WebView cannot load the JavaScript file."); + } + + const response = await fetchScript(scriptUrl, { cache: "no-store" }); + if (!response.ok) { + const status = response.status ? ` (${response.status})` : ""; + throw new Error(`Failed to load JavaScript file${status}.`); + } + + return workerExecutor.execute(await response.text()); + } catch (error) { + return { + type: "error", + value: error instanceof Error ? error : new Error(String(error)), + }; + } +} diff --git a/src/lib/run.js b/src/lib/run.js index d130c11bae..beb5346433 100644 --- a/src/lib/run.js +++ b/src/lib/run.js @@ -72,10 +72,13 @@ async function run( let isLoading = false; let filename, pathName, extension; let port = appSettings.value.serverPort; - let EXECUTING_SCRIPT = uuid + "_script.js"; + let shouldExecuteScript = false; const MIMETYPE_HTML = mimeType.lookup("html"); const CONSOLE_SCRIPT = uuid + "_console.js"; const CONSOLE_WORKER_SCRIPT = uuid + "_console_worker.js"; + // Keep this route independent of the filename because characters such as + // "#" and "?" change how browsers parse a URL. + const EXECUTING_SCRIPT = uuid + "_script.js"; const CONSOLE_THEME_STYLE = uuid + "_console_theme.css"; const MARKDOWN_STYLE = uuid + "_md.css"; const queue = []; @@ -143,7 +146,7 @@ async function run( } function runConsole() { - if (!isConsole) EXECUTING_SCRIPT = activeFile.filename; + if (!isConsole) shouldExecuteScript = true; isConsole = true; target = "inapp"; filename = "console.html"; @@ -253,7 +256,7 @@ async function run( CONSOLE_WORKER_SCRIPT, CONSOLE_THEME_STYLE, CONSOLE_THEME_STATE, - EXECUTING_SCRIPT, + EXECUTING_SCRIPT: shouldExecuteScript ? EXECUTING_SCRIPT : null, APP_THEME_TYPE: getConsoleThemeSnapshot().type, }), reqId, diff --git a/src/views/console.hbs b/src/views/console.hbs index 40068d74c8..69ba1eca4e 100644 --- a/src/views/console.hbs +++ b/src/views/console.hbs @@ -6,15 +6,17 @@ + {{#EXECUTING_SCRIPT}} + + {{/EXECUTING_SCRIPT}} Console - - - + + diff --git a/tests/unit/consoleExecutionContext.test.js b/tests/unit/consoleExecutionContext.test.js index ab92a29872..3d6a6519e9 100644 --- a/tests/unit/consoleExecutionContext.test.js +++ b/tests/unit/consoleExecutionContext.test.js @@ -1,6 +1,7 @@ import { describe, expect, it } from "vitest"; import { executeConsoleCommand, + executeConsoleScript, resolveConsoleExecutionContext, } from "lib/consoleRuntime"; @@ -49,4 +50,62 @@ describe("console execution context", () => { expect(calls).toEqual([["page", 'document.querySelector("main")']]); expect(result.value).toBe("live page"); }); + + it("loads Run-button scripts and executes them in the worker", async () => { + const calls = []; + const result = await executeConsoleScript({ + scriptUrl: "example.js", + fetchScript: async (url, options) => { + calls.push(["fetch", url, options]); + return { + ok: true, + text: async () => "while (true) {}", + }; + }, + workerExecutor: { + execute(code) { + calls.push(["worker", code]); + return Promise.resolve({ type: "result" }); + }, + }, + }); + + expect(calls).toEqual([ + ["fetch", "example.js", { cache: "no-store" }], + ["worker", "while (true) {}"], + ]); + expect(result).toEqual({ type: "result" }); + }); + + it("does not load a script for an empty menu console", async () => { + let fetched = false; + const result = await executeConsoleScript({ + scriptUrl: null, + fetchScript: async () => { + fetched = true; + }, + }); + + expect(fetched).toBe(false); + expect(result).toBeNull(); + }); + + it("returns a console error when a Run-button script cannot be loaded", async () => { + let executed = false; + const result = await executeConsoleScript({ + scriptUrl: "missing.js", + fetchScript: async () => ({ ok: false, status: 404 }), + workerExecutor: { + execute() { + executed = true; + }, + }, + }); + + expect(executed).toBe(false); + expect(result).toMatchObject({ + type: "error", + value: { message: "Failed to load JavaScript file (404)." }, + }); + }); }); From ae67e3b75c0a9d2064282fb0b09a7367f55d7ea6 Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Sat, 29 Aug 2026 08:36:30 +0000 Subject: [PATCH 078/195] feat: plugin review (#2826) * feat: plugin commit Allow logged in user to review plugins from the app. * fix: api url --------- Co-authored-by: Ajit Kumar --- src/dialogs/confirm.js | 5 +- src/dialogs/style.scss | 8 + src/lang/ar-ye.json | 34 +- src/lang/be-by.json | 34 +- src/lang/bn-bd.json | 34 +- src/lang/cs-cz.json | 34 +- src/lang/de-de.json | 34 +- src/lang/en-us.json | 34 +- src/lang/es-sv.json | 34 +- src/lang/fr-fr.json | 34 +- src/lang/he-il.json | 34 +- src/lang/hi-in.json | 34 +- src/lang/hu-hu.json | 34 +- src/lang/id-id.json | 34 +- src/lang/index.d.ts | 32 ++ src/lang/ir-fa.json | 34 +- src/lang/it-it.json | 34 +- src/lang/ja-jp.json | 34 +- src/lang/ko-kr.json | 34 +- src/lang/ml-in.json | 34 +- src/lang/mm-unicode.json | 34 +- src/lang/mm-zawgyi.json | 34 +- src/lang/pl-pl.json | 34 +- src/lang/pt-br.json | 34 +- src/lang/pu-in.json | 34 +- src/lang/ru-ru.json | 34 +- src/lang/tl-ph.json | 34 +- src/lang/tr-tr.json | 34 +- src/lang/uk-ua.json | 34 +- src/lang/uz-uz.json | 34 +- src/lang/vi-vn.json | 34 +- src/lang/zh-cn.json | 34 +- src/lang/zh-hant.json | 34 +- src/lang/zh-tw.json | 34 +- src/lib/lang.js | 28 ++ src/pages/plugin/plugin.scss | 504 +++++++++++++++++--- src/pages/plugin/plugin.view.js | 792 ++++++++++++++++++++++++++++---- src/pages/plugin/reviewUtils.js | 180 ++++++++ tests/unit/confirm.test.js | 103 +++++ tests/unit/pluginReview.test.js | 183 ++++++++ 40 files changed, 2724 insertions(+), 165 deletions(-) create mode 100644 src/pages/plugin/reviewUtils.js create mode 100644 tests/unit/confirm.test.js create mode 100644 tests/unit/pluginReview.test.js diff --git a/src/dialogs/confirm.js b/src/dialogs/confirm.js index e42e360458..393dd592a0 100644 --- a/src/dialogs/confirm.js +++ b/src/dialogs/confirm.js @@ -8,7 +8,7 @@ import restoreTheme from "lib/restoreTheme"; * @param {string} titleText Title text * @param {string} [message] Alert message * @param {boolean} [isHTML] Whether the message is HTML - * @param {{checkboxText?: string, returnState?: boolean}} [options] + * @param {{checkboxText?: string, returnState?: boolean, direction?: "ltr" | "rtl", aboveOverlay?: boolean}} [options] * @returns {Promise} */ function confirm(titleText, message, isHTML, options = {}) { @@ -55,7 +55,8 @@ function confirm(titleText, message, isHTML, options = {}) { }, }); const confirmDiv = tag("div", { - className: "prompt confirm", + className: `prompt confirm${options.aboveOverlay ? " above-overlay" : ""}`, + dir: options.direction, children: [ titleSpan, messageSpan, diff --git a/src/dialogs/style.scss b/src/dialogs/style.scss index 91fe9ab802..0380b5c0d5 100644 --- a/src/dialogs/style.scss +++ b/src/dialogs/style.scss @@ -49,6 +49,14 @@ z-index: 113; } + &.above-overlay { + z-index: 1001; + + & + .mask { + z-index: 1000; + } + } + &.multi { textarea:not(:first-of-type) { margin-top: 20px; diff --git a/src/lang/ar-ye.json b/src/lang/ar-ye.json index 70ca153df6..9149ce9f1b 100644 --- a/src/lang/ar-ye.json +++ b/src/lang/ar-ye.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "تقييمات الإضافة", + "plugin-review:account-check-failed": "تعذّر التحقق من حسابك. حاول مرة أخرى.", + "plugin-review:sign-in": "سجّل الدخول لكتابة تقييم", + "plugin-review:edit": "عدّل تقييمك", + "plugin-review:add": "أضف تقييمًا...", + "plugin-review:placeholder": "شارك تجربتك...", + "plugin-review:input-label": "تقييم الإضافة", + "plugin-review:vote-group-label": "التصويت", + "plugin-review:thumbs-up": "أعجبني", + "plugin-review:thumbs-down": "لم يعجبني", + "plugin-review:delete": "حذف التقييم", + "plugin-review:load-failed": "تعذّر تحميل التقييمات.", + "plugin-review:retry": "إعادة المحاولة", + "plugin-review:empty-title": "لا توجد تقييمات بعد", + "plugin-review:empty-description": "كن أول من يشارك تجربته.", + "plugin-review:yours": "تقييمك", + "plugin-review:community": "تقييمات المجتمع", + "plugin-review:no-other-reviews": "لا توجد تقييمات أخرى بعد.", + "plugin-review:login-incomplete": "لم يكتمل تسجيل الدخول.", + "plugin-review:sign-in-failed": "تعذّر تسجيل الدخول.", + "plugin-review:session-expired-review": "انتهت جلستك. سجّل الدخول مجددًا لكتابة تقييم.", + "plugin-review:save-failed": "تعذّر حفظ التقييم.", + "plugin-review:delete-confirmation": "هل تريد حذف تقييمك؟ لا يمكن التراجع عن هذا الإجراء.", + "plugin-review:session-expired-continue": "انتهت جلستك. سجّل الدخول مجددًا للمتابعة.", + "plugin-review:delete-failed": "تعذّر حذف التقييم.", + "plugin-review:you": "أنت", + "plugin-review:edit-action": "تعديل التقييم", + "plugin-review:recommended": "أوصى بهذه الإضافة", + "plugin-review:error-max-length": "يجب ألا يتجاوز التقييم {max} حرفًا.", + "plugin-review:error-downvote-comment": "أخبر المطوّر بما يمكن تحسينه.", + "plugin-review:error-empty": "أضف تعليقًا أو اختر «أعجبني».", + "plugin-review:unrated": "غير مقيّم" } diff --git a/src/lang/be-by.json b/src/lang/be-by.json index 98f392e34e..240f92549a 100644 --- a/src/lang/be-by.json +++ b/src/lang/be-by.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Водгукі пра плагін", + "plugin-review:account-check-failed": "Не ўдалося праверыць ваш уліковы запіс. Паспрабуйце яшчэ раз.", + "plugin-review:sign-in": "Увайсці, каб пакінуць водгук", + "plugin-review:edit": "Рэдагаваць свой водгук", + "plugin-review:add": "Дадаць водгук…", + "plugin-review:placeholder": "Падзяліцеся сваім досведам…", + "plugin-review:input-label": "Водгук пра плагін", + "plugin-review:vote-group-label": "Ацэнка", + "plugin-review:thumbs-up": "Падабаецца", + "plugin-review:thumbs-down": "Не падабаецца", + "plugin-review:delete": "Выдаліць водгук", + "plugin-review:load-failed": "Не ўдалося загрузіць водгукі.", + "plugin-review:retry": "Паспрабаваць яшчэ раз", + "plugin-review:empty-title": "Водгукаў пакуль няма", + "plugin-review:empty-description": "Падзяліцеся сваім досведам першымі.", + "plugin-review:yours": "Ваш водгук", + "plugin-review:community": "Водгукі супольнасці", + "plugin-review:no-other-reviews": "Іншых водгукаў пакуль няма.", + "plugin-review:login-incomplete": "Уваход не быў завершаны.", + "plugin-review:sign-in-failed": "Не ўдалося ўвайсці.", + "plugin-review:session-expired-review": "Сеанс скончыўся. Увайдзіце зноў, каб пакінуць водгук.", + "plugin-review:save-failed": "Не ўдалося захаваць водгук.", + "plugin-review:delete-confirmation": "Выдаліць ваш водгук? Гэта дзеянне нельга скасаваць.", + "plugin-review:session-expired-continue": "Сеанс скончыўся. Увайдзіце зноў, каб працягнуць.", + "plugin-review:delete-failed": "Не ўдалося выдаліць водгук.", + "plugin-review:you": "Вы", + "plugin-review:edit-action": "Рэдагаваць водгук", + "plugin-review:recommended": "Рэкамендуе гэты плагін", + "plugin-review:error-max-length": "Водгук павінен змяшчаць не больш за {max} сімвалаў.", + "plugin-review:error-downvote-comment": "Раскажыце распрацоўшчыку, што можна палепшыць.", + "plugin-review:error-empty": "Дадайце каментарый або выберыце «Падабаецца».", + "plugin-review:unrated": "Без ацэнкі" } diff --git a/src/lang/bn-bd.json b/src/lang/bn-bd.json index 36323c674a..3dad218691 100644 --- a/src/lang/bn-bd.json +++ b/src/lang/bn-bd.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "প্লাগইন পর্যালোচনা", + "plugin-review:account-check-failed": "আপনার অ্যাকাউন্ট যাচাই করা যায়নি। আবার চেষ্টা করুন।", + "plugin-review:sign-in": "পর্যালোচনা দিতে সাইন ইন করুন", + "plugin-review:edit": "আপনার পর্যালোচনা সম্পাদনা করুন", + "plugin-review:add": "পর্যালোচনা যোগ করুন...", + "plugin-review:placeholder": "আপনার অভিজ্ঞতা শেয়ার করুন...", + "plugin-review:input-label": "প্লাগইন পর্যালোচনা", + "plugin-review:vote-group-label": "ভোট", + "plugin-review:thumbs-up": "পছন্দ", + "plugin-review:thumbs-down": "অপছন্দ", + "plugin-review:delete": "পর্যালোচনা মুছুন", + "plugin-review:load-failed": "পর্যালোচনাগুলো লোড করা যায়নি।", + "plugin-review:retry": "আবার চেষ্টা করুন", + "plugin-review:empty-title": "এখনও কোনো পর্যালোচনা নেই", + "plugin-review:empty-description": "সবার আগে আপনার অভিজ্ঞতা শেয়ার করুন।", + "plugin-review:yours": "আপনার পর্যালোচনা", + "plugin-review:community": "কমিউনিটির পর্যালোচনা", + "plugin-review:no-other-reviews": "এখনও অন্য কোনো পর্যালোচনা নেই।", + "plugin-review:login-incomplete": "সাইন ইন সম্পন্ন হয়নি।", + "plugin-review:sign-in-failed": "সাইন ইন করা যায়নি।", + "plugin-review:session-expired-review": "আপনার সেশনের মেয়াদ শেষ। পর্যালোচনা দিতে আবার সাইন ইন করুন।", + "plugin-review:save-failed": "পর্যালোচনা সংরক্ষণ করা যায়নি।", + "plugin-review:delete-confirmation": "আপনার পর্যালোচনা মুছবেন? এটি আর ফিরিয়ে আনা যাবে না।", + "plugin-review:session-expired-continue": "আপনার সেশনের মেয়াদ শেষ। চালিয়ে যেতে আবার সাইন ইন করুন।", + "plugin-review:delete-failed": "পর্যালোচনা মোছা যায়নি।", + "plugin-review:you": "আপনি", + "plugin-review:edit-action": "পর্যালোচনা সম্পাদনা করুন", + "plugin-review:recommended": "এই প্লাগইনটি সুপারিশ করেছেন", + "plugin-review:error-max-length": "পর্যালোচনা {max} অক্ষর বা তার কম হতে হবে।", + "plugin-review:error-downvote-comment": "কী উন্নত করা যায় তা ডেভেলপারকে জানান।", + "plugin-review:error-empty": "একটি মন্তব্য যোগ করুন বা পছন্দ নির্বাচন করুন।", + "plugin-review:unrated": "এখনও মূল্যায়ন নেই" } diff --git a/src/lang/cs-cz.json b/src/lang/cs-cz.json index 52e5bbb078..6e3070fffb 100644 --- a/src/lang/cs-cz.json +++ b/src/lang/cs-cz.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Recenze pluginu", + "plugin-review:account-check-failed": "Váš účet se nepodařilo ověřit. Zkuste to znovu.", + "plugin-review:sign-in": "Přihlásit se a napsat recenzi", + "plugin-review:edit": "Upravit vaši recenzi", + "plugin-review:add": "Přidat recenzi…", + "plugin-review:placeholder": "Podělte se o své zkušenosti…", + "plugin-review:input-label": "Recenze pluginu", + "plugin-review:vote-group-label": "Hlas", + "plugin-review:thumbs-up": "Líbí se mi", + "plugin-review:thumbs-down": "Nelíbí se mi", + "plugin-review:delete": "Smazat recenzi", + "plugin-review:load-failed": "Recenze se nepodařilo načíst.", + "plugin-review:retry": "Zkusit znovu", + "plugin-review:empty-title": "Zatím žádné recenze", + "plugin-review:empty-description": "Podělte se o zkušenost jako první.", + "plugin-review:yours": "Vaše recenze", + "plugin-review:community": "Recenze komunity", + "plugin-review:no-other-reviews": "Zatím žádné další recenze.", + "plugin-review:login-incomplete": "Přihlášení nebylo dokončeno.", + "plugin-review:sign-in-failed": "Přihlášení se nezdařilo.", + "plugin-review:session-expired-review": "Vaše relace vypršela. Chcete-li napsat recenzi, přihlaste se znovu.", + "plugin-review:save-failed": "Recenzi se nepodařilo uložit.", + "plugin-review:delete-confirmation": "Smazat vaši recenzi? Tuto akci nelze vrátit zpět.", + "plugin-review:session-expired-continue": "Vaše relace vypršela. Chcete-li pokračovat, přihlaste se znovu.", + "plugin-review:delete-failed": "Recenzi se nepodařilo smazat.", + "plugin-review:you": "Vy", + "plugin-review:edit-action": "Upravit recenzi", + "plugin-review:recommended": "Doporučuje tento plugin", + "plugin-review:error-max-length": "Recenze může mít nejvýše {max} znaků.", + "plugin-review:error-downvote-comment": "Sdělte vývojáři, co by se dalo zlepšit.", + "plugin-review:error-empty": "Přidejte komentář nebo zvolte Líbí se mi.", + "plugin-review:unrated": "Nehodnoceno" } diff --git a/src/lang/de-de.json b/src/lang/de-de.json index d1fb0ed422..157c1e985d 100644 --- a/src/lang/de-de.json +++ b/src/lang/de-de.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Plugin-Bewertungen", + "plugin-review:account-check-failed": "Dein Konto konnte nicht überprüft werden. Versuche es erneut.", + "plugin-review:sign-in": "Zum Bewerten anmelden", + "plugin-review:edit": "Deine Bewertung bearbeiten", + "plugin-review:add": "Bewertung hinzufügen…", + "plugin-review:placeholder": "Teile deine Erfahrung…", + "plugin-review:input-label": "Plugin-Bewertung", + "plugin-review:vote-group-label": "Stimme", + "plugin-review:thumbs-up": "Gefällt mir", + "plugin-review:thumbs-down": "Gefällt mir nicht", + "plugin-review:delete": "Bewertung löschen", + "plugin-review:load-failed": "Bewertungen konnten nicht geladen werden.", + "plugin-review:retry": "Erneut versuchen", + "plugin-review:empty-title": "Noch keine Bewertungen", + "plugin-review:empty-description": "Teile als Erste oder Erster deine Erfahrung.", + "plugin-review:yours": "Deine Bewertung", + "plugin-review:community": "Bewertungen der Community", + "plugin-review:no-other-reviews": "Noch keine weiteren Bewertungen.", + "plugin-review:login-incomplete": "Die Anmeldung wurde nicht abgeschlossen.", + "plugin-review:sign-in-failed": "Anmeldung nicht möglich.", + "plugin-review:session-expired-review": "Deine Sitzung ist abgelaufen. Melde dich erneut an, um eine Bewertung abzugeben.", + "plugin-review:save-failed": "Bewertung konnte nicht gespeichert werden.", + "plugin-review:delete-confirmation": "Deine Bewertung löschen? Dies kann nicht rückgängig gemacht werden.", + "plugin-review:session-expired-continue": "Deine Sitzung ist abgelaufen. Melde dich erneut an, um fortzufahren.", + "plugin-review:delete-failed": "Bewertung konnte nicht gelöscht werden.", + "plugin-review:you": "Du", + "plugin-review:edit-action": "Bewertung bearbeiten", + "plugin-review:recommended": "Empfiehlt dieses Plugin", + "plugin-review:error-max-length": "Die Bewertung darf höchstens {max} Zeichen lang sein.", + "plugin-review:error-downvote-comment": "Sage dem Entwickler, was verbessert werden könnte.", + "plugin-review:error-empty": "Füge einen Kommentar hinzu oder wähle „Gefällt mir“.", + "plugin-review:unrated": "Nicht bewertet" } diff --git a/src/lang/en-us.json b/src/lang/en-us.json index fa275a3766..23ae1c2679 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -835,5 +835,37 @@ "managed": "Managed", "acode service": "Acode Service", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Plugin reviews", + "plugin-review:account-check-failed": "Unable to check your account. Try again.", + "plugin-review:sign-in": "Sign in to review", + "plugin-review:edit": "Edit your review", + "plugin-review:add": "Add a review...", + "plugin-review:placeholder": "Share your experience...", + "plugin-review:input-label": "Plugin review", + "plugin-review:vote-group-label": "Vote", + "plugin-review:thumbs-up": "Thumbs up", + "plugin-review:thumbs-down": "Thumbs down", + "plugin-review:delete": "Delete review", + "plugin-review:load-failed": "Unable to load reviews.", + "plugin-review:retry": "Retry", + "plugin-review:empty-title": "No reviews yet", + "plugin-review:empty-description": "Be the first to share your experience.", + "plugin-review:yours": "Your review", + "plugin-review:community": "Community reviews", + "plugin-review:no-other-reviews": "No other reviews yet.", + "plugin-review:login-incomplete": "Login was not completed.", + "plugin-review:sign-in-failed": "Unable to sign in.", + "plugin-review:session-expired-review": "Your session expired. Sign in again to review.", + "plugin-review:save-failed": "Unable to save review.", + "plugin-review:delete-confirmation": "Delete your review? This cannot be undone.", + "plugin-review:session-expired-continue": "Your session expired. Sign in again to continue.", + "plugin-review:delete-failed": "Unable to delete review.", + "plugin-review:you": "You", + "plugin-review:edit-action": "Edit review", + "plugin-review:recommended": "Recommended this plugin", + "plugin-review:error-max-length": "Review must be {max} characters or less.", + "plugin-review:error-downvote-comment": "Tell the developer what could be improved.", + "plugin-review:error-empty": "Add a comment or choose thumbs up.", + "plugin-review:unrated": "Unrated" } diff --git a/src/lang/es-sv.json b/src/lang/es-sv.json index 8c3108cb68..18ee5d6146 100644 --- a/src/lang/es-sv.json +++ b/src/lang/es-sv.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Reseñas del complemento", + "plugin-review:account-check-failed": "No se pudo verificar tu cuenta. Inténtalo de nuevo.", + "plugin-review:sign-in": "Inicia sesión para opinar", + "plugin-review:edit": "Editar tu reseña", + "plugin-review:add": "Agregar una reseña...", + "plugin-review:placeholder": "Comparte tu experiencia...", + "plugin-review:input-label": "Reseña del complemento", + "plugin-review:vote-group-label": "Voto", + "plugin-review:thumbs-up": "Me gusta", + "plugin-review:thumbs-down": "No me gusta", + "plugin-review:delete": "Eliminar reseña", + "plugin-review:load-failed": "No se pudieron cargar las reseñas.", + "plugin-review:retry": "Reintentar", + "plugin-review:empty-title": "Aún no hay reseñas", + "plugin-review:empty-description": "Sé la primera persona en compartir tu experiencia.", + "plugin-review:yours": "Tu reseña", + "plugin-review:community": "Reseñas de la comunidad", + "plugin-review:no-other-reviews": "Aún no hay otras reseñas.", + "plugin-review:login-incomplete": "No se completó el inicio de sesión.", + "plugin-review:sign-in-failed": "No se pudo iniciar sesión.", + "plugin-review:session-expired-review": "Tu sesión venció. Inicia sesión de nuevo para opinar.", + "plugin-review:save-failed": "No se pudo guardar la reseña.", + "plugin-review:delete-confirmation": "¿Eliminar tu reseña? Esta acción no se puede deshacer.", + "plugin-review:session-expired-continue": "Tu sesión venció. Inicia sesión de nuevo para continuar.", + "plugin-review:delete-failed": "No se pudo eliminar la reseña.", + "plugin-review:you": "Tú", + "plugin-review:edit-action": "Editar reseña", + "plugin-review:recommended": "Recomendó este complemento", + "plugin-review:error-max-length": "La reseña debe tener {max} caracteres o menos.", + "plugin-review:error-downvote-comment": "Dile al desarrollador qué podría mejorar.", + "plugin-review:error-empty": "Agrega un comentario o elige Me gusta.", + "plugin-review:unrated": "Sin calificar" } diff --git a/src/lang/fr-fr.json b/src/lang/fr-fr.json index f4edc7a62f..4f7b96c83e 100644 --- a/src/lang/fr-fr.json +++ b/src/lang/fr-fr.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Avis sur l’extension", + "plugin-review:account-check-failed": "Impossible de vérifier votre compte. Réessayez.", + "plugin-review:sign-in": "Se connecter pour donner un avis", + "plugin-review:edit": "Modifier votre avis", + "plugin-review:add": "Ajouter un avis…", + "plugin-review:placeholder": "Partagez votre expérience…", + "plugin-review:input-label": "Avis sur l’extension", + "plugin-review:vote-group-label": "Vote", + "plugin-review:thumbs-up": "J’aime", + "plugin-review:thumbs-down": "Je n’aime pas", + "plugin-review:delete": "Supprimer l’avis", + "plugin-review:load-failed": "Impossible de charger les avis.", + "plugin-review:retry": "Réessayer", + "plugin-review:empty-title": "Aucun avis pour le moment", + "plugin-review:empty-description": "Soyez la première personne à partager votre expérience.", + "plugin-review:yours": "Votre avis", + "plugin-review:community": "Avis de la communauté", + "plugin-review:no-other-reviews": "Aucun autre avis pour le moment.", + "plugin-review:login-incomplete": "La connexion n’a pas abouti.", + "plugin-review:sign-in-failed": "Impossible de se connecter.", + "plugin-review:session-expired-review": "Votre session a expiré. Reconnectez-vous pour donner un avis.", + "plugin-review:save-failed": "Impossible d’enregistrer l’avis.", + "plugin-review:delete-confirmation": "Supprimer votre avis ? Cette action est irréversible.", + "plugin-review:session-expired-continue": "Votre session a expiré. Reconnectez-vous pour continuer.", + "plugin-review:delete-failed": "Impossible de supprimer l’avis.", + "plugin-review:you": "Vous", + "plugin-review:edit-action": "Modifier l’avis", + "plugin-review:recommended": "Recommande cette extension", + "plugin-review:error-max-length": "L’avis doit contenir au maximum {max} caractères.", + "plugin-review:error-downvote-comment": "Indiquez au développeur ce qui pourrait être amélioré.", + "plugin-review:error-empty": "Ajoutez un commentaire ou choisissez J’aime.", + "plugin-review:unrated": "Non évalué" } diff --git a/src/lang/he-il.json b/src/lang/he-il.json index 9d67df02ca..5e65d36f14 100644 --- a/src/lang/he-il.json +++ b/src/lang/he-il.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "ביקורות על התוסף", + "plugin-review:account-check-failed": "לא ניתן לבדוק את החשבון שלך. נסה שוב.", + "plugin-review:sign-in": "יש להתחבר כדי לכתוב ביקורת", + "plugin-review:edit": "עריכת הביקורת שלך", + "plugin-review:add": "הוספת ביקורת...", + "plugin-review:placeholder": "שתף את החוויה שלך...", + "plugin-review:input-label": "ביקורת על התוסף", + "plugin-review:vote-group-label": "הצבעה", + "plugin-review:thumbs-up": "אהבתי", + "plugin-review:thumbs-down": "לא אהבתי", + "plugin-review:delete": "מחיקת ביקורת", + "plugin-review:load-failed": "לא ניתן לטעון את הביקורות.", + "plugin-review:retry": "נסה שוב", + "plugin-review:empty-title": "אין עדיין ביקורות", + "plugin-review:empty-description": "היה הראשון לשתף את החוויה שלך.", + "plugin-review:yours": "הביקורת שלך", + "plugin-review:community": "ביקורות הקהילה", + "plugin-review:no-other-reviews": "אין עדיין ביקורות נוספות.", + "plugin-review:login-incomplete": "ההתחברות לא הושלמה.", + "plugin-review:sign-in-failed": "לא ניתן להתחבר.", + "plugin-review:session-expired-review": "פג תוקף ההפעלה שלך. התחבר שוב כדי לכתוב ביקורת.", + "plugin-review:save-failed": "לא ניתן לשמור את הביקורת.", + "plugin-review:delete-confirmation": "למחוק את הביקורת שלך? לא ניתן לבטל פעולה זו.", + "plugin-review:session-expired-continue": "פג תוקף ההפעלה שלך. התחבר שוב כדי להמשיך.", + "plugin-review:delete-failed": "לא ניתן למחוק את הביקורת.", + "plugin-review:you": "אתה", + "plugin-review:edit-action": "עריכת ביקורת", + "plugin-review:recommended": "המליץ על התוסף הזה", + "plugin-review:error-max-length": "הביקורת צריכה להכיל עד {max} תווים.", + "plugin-review:error-downvote-comment": "ספר למפתח מה אפשר לשפר.", + "plugin-review:error-empty": "הוסף תגובה או בחר באהבתי.", + "plugin-review:unrated": "ללא דירוג" } diff --git a/src/lang/hi-in.json b/src/lang/hi-in.json index bd1a21d6b5..f1ff016551 100644 --- a/src/lang/hi-in.json +++ b/src/lang/hi-in.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "कॉपी करते टाइम एक्सक्लूज़न्स अप्लाई करें", "settings-info-app-use-file-operation-exclusions": "कॉपी और पेस्ट ऑपरेशन्स के दौरान एक्सक्लूज़न पैटर्न्स से मैच करने वाले फ़ाइल्स और फ़ोल्डर्स स्किप कर।", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "प्लगइन समीक्षाएँ", + "plugin-review:account-check-failed": "आपके खाते की जाँच नहीं हो सकी। फिर से कोशिश करें।", + "plugin-review:sign-in": "समीक्षा देने के लिए साइन इन करें", + "plugin-review:edit": "अपनी समीक्षा संपादित करें", + "plugin-review:add": "समीक्षा जोड़ें...", + "plugin-review:placeholder": "अपना अनुभव साझा करें...", + "plugin-review:input-label": "प्लगइन समीक्षा", + "plugin-review:vote-group-label": "वोट", + "plugin-review:thumbs-up": "पसंद", + "plugin-review:thumbs-down": "नापसंद", + "plugin-review:delete": "समीक्षा हटाएँ", + "plugin-review:load-failed": "समीक्षाएँ लोड नहीं हो सकीं।", + "plugin-review:retry": "फिर से कोशिश करें", + "plugin-review:empty-title": "अभी कोई समीक्षा नहीं है", + "plugin-review:empty-description": "अपना अनुभव साझा करने वाले पहले व्यक्ति बनें।", + "plugin-review:yours": "आपकी समीक्षा", + "plugin-review:community": "समुदाय की समीक्षाएँ", + "plugin-review:no-other-reviews": "अभी कोई अन्य समीक्षा नहीं है।", + "plugin-review:login-incomplete": "साइन इन पूरा नहीं हुआ।", + "plugin-review:sign-in-failed": "साइन इन नहीं हो सका।", + "plugin-review:session-expired-review": "आपका सत्र समाप्त हो गया। समीक्षा देने के लिए फिर से साइन इन करें।", + "plugin-review:save-failed": "समीक्षा सहेजी नहीं जा सकी।", + "plugin-review:delete-confirmation": "अपनी समीक्षा हटाएँ? इसे वापस नहीं किया जा सकता।", + "plugin-review:session-expired-continue": "आपका सत्र समाप्त हो गया। जारी रखने के लिए फिर से साइन इन करें।", + "plugin-review:delete-failed": "समीक्षा हटाई नहीं जा सकी।", + "plugin-review:you": "आप", + "plugin-review:edit-action": "समीक्षा संपादित करें", + "plugin-review:recommended": "इस प्लगइन की सिफ़ारिश की", + "plugin-review:error-max-length": "समीक्षा {max} वर्णों या उससे कम की होनी चाहिए।", + "plugin-review:error-downvote-comment": "डेवलपर को बताएँ कि क्या बेहतर किया जा सकता है।", + "plugin-review:error-empty": "टिप्पणी जोड़ें या पसंद चुनें।", + "plugin-review:unrated": "अभी रेटिंग नहीं" } diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index 769ce29a00..061b674d7b 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Kizárások használata másoláskor", "settings-info-app-use-file-operation-exclusions": "A kizárási mintáknak megfelelő fájlok és mappák kihagyása másoláskor és beillesztéskor.", "horizontal scroll margin": "Vízszintes görgetési margó", - "settings-info-horizontal-scroll-margin": "A leghosszabb sor után egy üres hely lesz hozzáadva a képernyő széléhez, ha a sorok tördelése ki van kapcsolva. Adjon meg egy nem negatív egész pixelértéket." + "settings-info-horizontal-scroll-margin": "A leghosszabb sor után egy üres hely lesz hozzáadva a képernyő széléhez, ha a sorok tördelése ki van kapcsolva. Adjon meg egy nem negatív egész pixelértéket.", + "plugin-review:dialog-label": "Bővítményértékelések", + "plugin-review:account-check-failed": "Nem sikerült ellenőrizni a fiókodat. Próbáld újra.", + "plugin-review:sign-in": "Jelentkezz be az értékeléshez", + "plugin-review:edit": "Értékelésed szerkesztése", + "plugin-review:add": "Értékelés hozzáadása…", + "plugin-review:placeholder": "Oszd meg a tapasztalataidat…", + "plugin-review:input-label": "Bővítmény értékelése", + "plugin-review:vote-group-label": "Szavazat", + "plugin-review:thumbs-up": "Tetszik", + "plugin-review:thumbs-down": "Nem tetszik", + "plugin-review:delete": "Értékelés törlése", + "plugin-review:load-failed": "Nem sikerült betölteni az értékeléseket.", + "plugin-review:retry": "Újrapróbálkozás", + "plugin-review:empty-title": "Még nincsenek értékelések", + "plugin-review:empty-description": "Oszd meg elsőként a tapasztalataidat.", + "plugin-review:yours": "Saját értékelésed", + "plugin-review:community": "Közösségi értékelések", + "plugin-review:no-other-reviews": "Még nincsenek további értékelések.", + "plugin-review:login-incomplete": "A bejelentkezés nem fejeződött be.", + "plugin-review:sign-in-failed": "Nem sikerült bejelentkezni.", + "plugin-review:session-expired-review": "A munkameneted lejárt. Jelentkezz be újra az értékeléshez.", + "plugin-review:save-failed": "Nem sikerült menteni az értékelést.", + "plugin-review:delete-confirmation": "Törlöd az értékelésedet? Ez nem vonható vissza.", + "plugin-review:session-expired-continue": "A munkameneted lejárt. Jelentkezz be újra a folytatáshoz.", + "plugin-review:delete-failed": "Nem sikerült törölni az értékelést.", + "plugin-review:you": "Te", + "plugin-review:edit-action": "Értékelés szerkesztése", + "plugin-review:recommended": "Ajánlja ezt a bővítményt", + "plugin-review:error-max-length": "Az értékelés legfeljebb {max} karakter lehet.", + "plugin-review:error-downvote-comment": "Írd meg a fejlesztőnek, min lehetne javítani.", + "plugin-review:error-empty": "Adj hozzá megjegyzést, vagy válaszd a Tetszik lehetőséget.", + "plugin-review:unrated": "Nincs értékelve" } diff --git a/src/lang/id-id.json b/src/lang/id-id.json index 13dda67747..f2560fd6d8 100644 --- a/src/lang/id-id.json +++ b/src/lang/id-id.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Terapkan pengecualian saat menyalin", "settings-info-app-use-file-operation-exclusions": "Lewati berkas dan folder yang cocok dengan pola pengecualian selama operasi salin dan tempel.", "horizontal scroll margin": "Margin gulir horizontal", - "settings-info-horizontal-scroll-margin": "Menambahkan ruang kosong setelah baris terpanjang saat pembungkus kata (word wrap) dinonaktifkan. Masukkan nilai piksel bilangan bulat non-negatif." + "settings-info-horizontal-scroll-margin": "Menambahkan ruang kosong setelah baris terpanjang saat pembungkus kata (word wrap) dinonaktifkan. Masukkan nilai piksel bilangan bulat non-negatif.", + "plugin-review:dialog-label": "Ulasan plugin", + "plugin-review:account-check-failed": "Akun Anda tidak dapat diperiksa. Coba lagi.", + "plugin-review:sign-in": "Masuk untuk memberi ulasan", + "plugin-review:edit": "Edit ulasan Anda", + "plugin-review:add": "Tambahkan ulasan...", + "plugin-review:placeholder": "Bagikan pengalaman Anda...", + "plugin-review:input-label": "Ulasan plugin", + "plugin-review:vote-group-label": "Suara", + "plugin-review:thumbs-up": "Suka", + "plugin-review:thumbs-down": "Tidak suka", + "plugin-review:delete": "Hapus ulasan", + "plugin-review:load-failed": "Ulasan tidak dapat dimuat.", + "plugin-review:retry": "Coba lagi", + "plugin-review:empty-title": "Belum ada ulasan", + "plugin-review:empty-description": "Jadilah yang pertama membagikan pengalaman Anda.", + "plugin-review:yours": "Ulasan Anda", + "plugin-review:community": "Ulasan komunitas", + "plugin-review:no-other-reviews": "Belum ada ulasan lain.", + "plugin-review:login-incomplete": "Proses masuk tidak selesai.", + "plugin-review:sign-in-failed": "Tidak dapat masuk.", + "plugin-review:session-expired-review": "Sesi Anda telah berakhir. Masuk lagi untuk memberi ulasan.", + "plugin-review:save-failed": "Ulasan tidak dapat disimpan.", + "plugin-review:delete-confirmation": "Hapus ulasan Anda? Tindakan ini tidak dapat dibatalkan.", + "plugin-review:session-expired-continue": "Sesi Anda telah berakhir. Masuk lagi untuk melanjutkan.", + "plugin-review:delete-failed": "Ulasan tidak dapat dihapus.", + "plugin-review:you": "Anda", + "plugin-review:edit-action": "Edit ulasan", + "plugin-review:recommended": "Merekomendasikan plugin ini", + "plugin-review:error-max-length": "Ulasan harus terdiri dari {max} karakter atau kurang.", + "plugin-review:error-downvote-comment": "Beri tahu developer apa yang dapat ditingkatkan.", + "plugin-review:error-empty": "Tambahkan komentar atau pilih Suka.", + "plugin-review:unrated": "Belum dinilai" } diff --git a/src/lang/index.d.ts b/src/lang/index.d.ts index 076f096961..5777e10477 100644 --- a/src/lang/index.d.ts +++ b/src/lang/index.d.ts @@ -839,6 +839,38 @@ declare type LangStrings = { "acode service": string; "horizontal scroll margin": string; "settings-info-horizontal-scroll-margin": string; + "plugin-review:dialog-label": string; + "plugin-review:account-check-failed": string; + "plugin-review:sign-in": string; + "plugin-review:edit": string; + "plugin-review:add": string; + "plugin-review:placeholder": string; + "plugin-review:input-label": string; + "plugin-review:vote-group-label": string; + "plugin-review:thumbs-up": string; + "plugin-review:thumbs-down": string; + "plugin-review:delete": string; + "plugin-review:load-failed": string; + "plugin-review:retry": string; + "plugin-review:empty-title": string; + "plugin-review:empty-description": string; + "plugin-review:yours": string; + "plugin-review:community": string; + "plugin-review:no-other-reviews": string; + "plugin-review:login-incomplete": string; + "plugin-review:sign-in-failed": string; + "plugin-review:session-expired-review": string; + "plugin-review:save-failed": string; + "plugin-review:delete-confirmation": string; + "plugin-review:session-expired-continue": string; + "plugin-review:delete-failed": string; + "plugin-review:you": string; + "plugin-review:edit-action": string; + "plugin-review:recommended": string; + "plugin-review:error-max-length": string; + "plugin-review:error-downvote-comment": string; + "plugin-review:error-empty": string; + "plugin-review:unrated": string; }; declare var strings: LangStrings; diff --git a/src/lang/ir-fa.json b/src/lang/ir-fa.json index b19d8c385d..7d9cbedea2 100644 --- a/src/lang/ir-fa.json +++ b/src/lang/ir-fa.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "نظرهای افزونه", + "plugin-review:account-check-failed": "امکان بررسی حساب شما نبود. دوباره تلاش کنید.", + "plugin-review:sign-in": "برای ثبت نظر وارد شوید", + "plugin-review:edit": "نظر خود را ویرایش کنید", + "plugin-review:add": "افزودن نظر...", + "plugin-review:placeholder": "تجربهٔ خود را به اشتراک بگذارید...", + "plugin-review:input-label": "نظر افزونه", + "plugin-review:vote-group-label": "رأی", + "plugin-review:thumbs-up": "پسندیدم", + "plugin-review:thumbs-down": "نپسندیدم", + "plugin-review:delete": "حذف نظر", + "plugin-review:load-failed": "بارگیری نظرها ممکن نبود.", + "plugin-review:retry": "تلاش دوباره", + "plugin-review:empty-title": "هنوز نظری ثبت نشده است", + "plugin-review:empty-description": "نخستین نفری باشید که تجربهٔ خود را به اشتراک می‌گذارد.", + "plugin-review:yours": "نظر شما", + "plugin-review:community": "نظرهای کاربران", + "plugin-review:no-other-reviews": "هنوز نظر دیگری ثبت نشده است.", + "plugin-review:login-incomplete": "ورود کامل نشد.", + "plugin-review:sign-in-failed": "ورود ممکن نبود.", + "plugin-review:session-expired-review": "نشست شما منقضی شده است. برای ثبت نظر دوباره وارد شوید.", + "plugin-review:save-failed": "ذخیرهٔ نظر ممکن نبود.", + "plugin-review:delete-confirmation": "نظر شما حذف شود؟ این کار قابل بازگشت نیست.", + "plugin-review:session-expired-continue": "نشست شما منقضی شده است. برای ادامه دوباره وارد شوید.", + "plugin-review:delete-failed": "حذف نظر ممکن نبود.", + "plugin-review:you": "شما", + "plugin-review:edit-action": "ویرایش نظر", + "plugin-review:recommended": "این افزونه را پیشنهاد کرده است", + "plugin-review:error-max-length": "نظر باید حداکثر {max} نویسه باشد.", + "plugin-review:error-downvote-comment": "به توسعه‌دهنده بگویید چه چیزی می‌تواند بهتر شود.", + "plugin-review:error-empty": "یک دیدگاه بنویسید یا «پسندیدم» را انتخاب کنید.", + "plugin-review:unrated": "بدون امتیاز" } diff --git a/src/lang/it-it.json b/src/lang/it-it.json index dbb883ce3c..28c6ba3bd0 100644 --- a/src/lang/it-it.json +++ b/src/lang/it-it.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Recensioni del plugin", + "plugin-review:account-check-failed": "Impossibile verificare il tuo account. Riprova.", + "plugin-review:sign-in": "Accedi per lasciare una recensione", + "plugin-review:edit": "Modifica la tua recensione", + "plugin-review:add": "Aggiungi una recensione…", + "plugin-review:placeholder": "Condividi la tua esperienza…", + "plugin-review:input-label": "Recensione del plugin", + "plugin-review:vote-group-label": "Voto", + "plugin-review:thumbs-up": "Mi piace", + "plugin-review:thumbs-down": "Non mi piace", + "plugin-review:delete": "Elimina recensione", + "plugin-review:load-failed": "Impossibile caricare le recensioni.", + "plugin-review:retry": "Riprova", + "plugin-review:empty-title": "Ancora nessuna recensione", + "plugin-review:empty-description": "Condividi per primo la tua esperienza.", + "plugin-review:yours": "La tua recensione", + "plugin-review:community": "Recensioni della community", + "plugin-review:no-other-reviews": "Ancora nessun'altra recensione.", + "plugin-review:login-incomplete": "Accesso non completato.", + "plugin-review:sign-in-failed": "Impossibile accedere.", + "plugin-review:session-expired-review": "La sessione è scaduta. Accedi di nuovo per lasciare una recensione.", + "plugin-review:save-failed": "Impossibile salvare la recensione.", + "plugin-review:delete-confirmation": "Eliminare la tua recensione? Questa azione non può essere annullata.", + "plugin-review:session-expired-continue": "La sessione è scaduta. Accedi di nuovo per continuare.", + "plugin-review:delete-failed": "Impossibile eliminare la recensione.", + "plugin-review:you": "Tu", + "plugin-review:edit-action": "Modifica recensione", + "plugin-review:recommended": "Consiglia questo plugin", + "plugin-review:error-max-length": "La recensione deve contenere al massimo {max} caratteri.", + "plugin-review:error-downvote-comment": "Spiega allo sviluppatore cosa potrebbe essere migliorato.", + "plugin-review:error-empty": "Aggiungi un commento o scegli Mi piace.", + "plugin-review:unrated": "Non valutato" } diff --git a/src/lang/ja-jp.json b/src/lang/ja-jp.json index ddd1e5b633..2329d81b84 100644 --- a/src/lang/ja-jp.json +++ b/src/lang/ja-jp.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "プラグインのレビュー", + "plugin-review:account-check-failed": "アカウントを確認できませんでした。もう一度お試しください。", + "plugin-review:sign-in": "ログインしてレビュー", + "plugin-review:edit": "レビューを編集", + "plugin-review:add": "レビューを追加…", + "plugin-review:placeholder": "使用した感想を共有…", + "plugin-review:input-label": "プラグインのレビュー", + "plugin-review:vote-group-label": "評価", + "plugin-review:thumbs-up": "高評価", + "plugin-review:thumbs-down": "低評価", + "plugin-review:delete": "レビューを削除", + "plugin-review:load-failed": "レビューを読み込めませんでした。", + "plugin-review:retry": "再試行", + "plugin-review:empty-title": "まだレビューはありません", + "plugin-review:empty-description": "最初のレビューを投稿しましょう。", + "plugin-review:yours": "あなたのレビュー", + "plugin-review:community": "コミュニティのレビュー", + "plugin-review:no-other-reviews": "ほかのレビューはまだありません。", + "plugin-review:login-incomplete": "ログインが完了しませんでした。", + "plugin-review:sign-in-failed": "ログインできませんでした。", + "plugin-review:session-expired-review": "セッションの有効期限が切れました。もう一度ログインしてレビューしてください。", + "plugin-review:save-failed": "レビューを保存できませんでした。", + "plugin-review:delete-confirmation": "レビューを削除しますか?この操作は元に戻せません。", + "plugin-review:session-expired-continue": "セッションの有効期限が切れました。続行するにはもう一度ログインしてください。", + "plugin-review:delete-failed": "レビューを削除できませんでした。", + "plugin-review:you": "あなた", + "plugin-review:edit-action": "レビューを編集", + "plugin-review:recommended": "このプラグインをおすすめしています", + "plugin-review:error-max-length": "レビューは {max} 文字以内で入力してください。", + "plugin-review:error-downvote-comment": "改善してほしい点を開発者に伝えてください。", + "plugin-review:error-empty": "コメントを追加するか、高評価を選んでください。", + "plugin-review:unrated": "未評価" } diff --git a/src/lang/ko-kr.json b/src/lang/ko-kr.json index 20ae0a3146..d8d1daec75 100644 --- a/src/lang/ko-kr.json +++ b/src/lang/ko-kr.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "플러그인 리뷰", + "plugin-review:account-check-failed": "계정을 확인할 수 없습니다. 다시 시도하세요.", + "plugin-review:sign-in": "로그인하고 리뷰 작성", + "plugin-review:edit": "내 리뷰 수정", + "plugin-review:add": "리뷰 추가...", + "plugin-review:placeholder": "사용 경험을 공유하세요...", + "plugin-review:input-label": "플러그인 리뷰", + "plugin-review:vote-group-label": "평가", + "plugin-review:thumbs-up": "좋아요", + "plugin-review:thumbs-down": "싫어요", + "plugin-review:delete": "리뷰 삭제", + "plugin-review:load-failed": "리뷰를 불러올 수 없습니다.", + "plugin-review:retry": "다시 시도", + "plugin-review:empty-title": "아직 리뷰가 없습니다", + "plugin-review:empty-description": "첫 번째로 사용 경험을 공유해 보세요.", + "plugin-review:yours": "내 리뷰", + "plugin-review:community": "커뮤니티 리뷰", + "plugin-review:no-other-reviews": "아직 다른 리뷰가 없습니다.", + "plugin-review:login-incomplete": "로그인이 완료되지 않았습니다.", + "plugin-review:sign-in-failed": "로그인할 수 없습니다.", + "plugin-review:session-expired-review": "세션이 만료되었습니다. 다시 로그인하고 리뷰를 작성하세요.", + "plugin-review:save-failed": "리뷰를 저장할 수 없습니다.", + "plugin-review:delete-confirmation": "리뷰를 삭제할까요? 이 작업은 되돌릴 수 없습니다.", + "plugin-review:session-expired-continue": "세션이 만료되었습니다. 계속하려면 다시 로그인하세요.", + "plugin-review:delete-failed": "리뷰를 삭제할 수 없습니다.", + "plugin-review:you": "나", + "plugin-review:edit-action": "리뷰 수정", + "plugin-review:recommended": "이 플러그인을 추천함", + "plugin-review:error-max-length": "리뷰는 {max}자 이하여야 합니다.", + "plugin-review:error-downvote-comment": "개발자에게 개선할 점을 알려 주세요.", + "plugin-review:error-empty": "댓글을 추가하거나 좋아요를 선택하세요.", + "plugin-review:unrated": "평가 없음" } diff --git a/src/lang/ml-in.json b/src/lang/ml-in.json index bcc5171dcf..137e1311d2 100644 --- a/src/lang/ml-in.json +++ b/src/lang/ml-in.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "പ്ലഗിൻ അവലോകനങ്ങൾ", + "plugin-review:account-check-failed": "നിങ്ങളുടെ അക്കൗണ്ട് പരിശോധിക്കാനായില്ല. വീണ്ടും ശ്രമിക്കുക.", + "plugin-review:sign-in": "അവലോകനം നൽകാൻ സൈൻ ഇൻ ചെയ്യുക", + "plugin-review:edit": "നിങ്ങളുടെ അവലോകനം തിരുത്തുക", + "plugin-review:add": "അവലോകനം ചേർക്കുക...", + "plugin-review:placeholder": "നിങ്ങളുടെ അനുഭവം പങ്കിടുക...", + "plugin-review:input-label": "പ്ലഗിൻ അവലോകനം", + "plugin-review:vote-group-label": "വോട്ട്", + "plugin-review:thumbs-up": "ഇഷ്ടപ്പെട്ടു", + "plugin-review:thumbs-down": "ഇഷ്ടപ്പെട്ടില്ല", + "plugin-review:delete": "അവലോകനം ഇല്ലാതാക്കുക", + "plugin-review:load-failed": "അവലോകനങ്ങൾ ലോഡ് ചെയ്യാനായില്ല.", + "plugin-review:retry": "വീണ്ടും ശ്രമിക്കുക", + "plugin-review:empty-title": "ഇതുവരെ അവലോകനങ്ങളൊന്നുമില്ല", + "plugin-review:empty-description": "നിങ്ങളുടെ അനുഭവം ആദ്യം പങ്കിടൂ.", + "plugin-review:yours": "നിങ്ങളുടെ അവലോകനം", + "plugin-review:community": "കമ്മ്യൂണിറ്റി അവലോകനങ്ങൾ", + "plugin-review:no-other-reviews": "മറ്റ് അവലോകനങ്ങളൊന്നും ഇതുവരെ ഇല്ല.", + "plugin-review:login-incomplete": "സൈൻ ഇൻ പൂർത്തിയായില്ല.", + "plugin-review:sign-in-failed": "സൈൻ ഇൻ ചെയ്യാനായില്ല.", + "plugin-review:session-expired-review": "നിങ്ങളുടെ സെഷൻ കാലഹരണപ്പെട്ടു. അവലോകനം നൽകാൻ വീണ്ടും സൈൻ ഇൻ ചെയ്യുക.", + "plugin-review:save-failed": "അവലോകനം സേവ് ചെയ്യാനായില്ല.", + "plugin-review:delete-confirmation": "നിങ്ങളുടെ അവലോകനം ഇല്ലാതാക്കണോ? ഇത് പഴയപടിയാക്കാനാകില്ല.", + "plugin-review:session-expired-continue": "നിങ്ങളുടെ സെഷൻ കാലഹരണപ്പെട്ടു. തുടരാൻ വീണ്ടും സൈൻ ഇൻ ചെയ്യുക.", + "plugin-review:delete-failed": "അവലോകനം ഇല്ലാതാക്കാനായില്ല.", + "plugin-review:you": "നിങ്ങൾ", + "plugin-review:edit-action": "അവലോകനം തിരുത്തുക", + "plugin-review:recommended": "ഈ പ്ലഗിൻ ശുപാർശ ചെയ്തു", + "plugin-review:error-max-length": "അവലോകനം {max} അക്ഷരങ്ങളോ അതിൽ കുറവോ ആയിരിക്കണം.", + "plugin-review:error-downvote-comment": "എന്താണ് മെച്ചപ്പെടുത്താനാകുന്നതെന്ന് ഡെവലപ്പറോട് പറയുക.", + "plugin-review:error-empty": "ഒരു അഭിപ്രായം ചേർക്കുക അല്ലെങ്കിൽ ഇഷ്ടപ്പെട്ടു തിരഞ്ഞെടുക്കുക.", + "plugin-review:unrated": "വിലയിരുത്തിയിട്ടില്ല" } diff --git a/src/lang/mm-unicode.json b/src/lang/mm-unicode.json index 00262a2a54..2a504340ee 100644 --- a/src/lang/mm-unicode.json +++ b/src/lang/mm-unicode.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "ပလပ်အင် သုံးသပ်ချက်များ", + "plugin-review:account-check-failed": "သင့်အကောင့်ကို စစ်ဆေး၍မရပါ။ ထပ်မံကြိုးစားပါ။", + "plugin-review:sign-in": "သုံးသပ်ချက်ရေးရန် အကောင့်ဝင်ပါ", + "plugin-review:edit": "သင့်သုံးသပ်ချက်ကို ပြင်ဆင်ပါ", + "plugin-review:add": "သုံးသပ်ချက် ထည့်ရန်...", + "plugin-review:placeholder": "သင့်အတွေ့အကြုံကို မျှဝေပါ...", + "plugin-review:input-label": "ပလပ်အင် သုံးသပ်ချက်", + "plugin-review:vote-group-label": "မဲ", + "plugin-review:thumbs-up": "ကြိုက်သည်", + "plugin-review:thumbs-down": "မကြိုက်ပါ", + "plugin-review:delete": "သုံးသပ်ချက် ဖျက်ရန်", + "plugin-review:load-failed": "သုံးသပ်ချက်များကို ဖွင့်၍မရပါ။", + "plugin-review:retry": "ထပ်မံကြိုးစားပါ", + "plugin-review:empty-title": "သုံးသပ်ချက် မရှိသေးပါ", + "plugin-review:empty-description": "သင့်အတွေ့အကြုံကို ပထမဆုံး မျှဝေပါ။", + "plugin-review:yours": "သင့်သုံးသပ်ချက်", + "plugin-review:community": "အသိုင်းအဝိုင်း သုံးသပ်ချက်များ", + "plugin-review:no-other-reviews": "အခြားသုံးသပ်ချက် မရှိသေးပါ။", + "plugin-review:login-incomplete": "အကောင့်ဝင်ခြင်း မပြီးဆုံးပါ။", + "plugin-review:sign-in-failed": "အကောင့်ဝင်၍မရပါ။", + "plugin-review:session-expired-review": "သင့်အသုံးပြုချိန် ကုန်ဆုံးသွားပါပြီ။ သုံးသပ်ချက်ရေးရန် ပြန်ဝင်ပါ။", + "plugin-review:save-failed": "သုံးသပ်ချက်ကို သိမ်း၍မရပါ။", + "plugin-review:delete-confirmation": "သင့်သုံးသပ်ချက်ကို ဖျက်မလား။ ပြန်ယူ၍မရပါ။", + "plugin-review:session-expired-continue": "သင့်အသုံးပြုချိန် ကုန်ဆုံးသွားပါပြီ။ ဆက်လုပ်ရန် ပြန်ဝင်ပါ။", + "plugin-review:delete-failed": "သုံးသပ်ချက်ကို ဖျက်၍မရပါ။", + "plugin-review:you": "သင်", + "plugin-review:edit-action": "သုံးသပ်ချက် ပြင်ဆင်ရန်", + "plugin-review:recommended": "ဤပလပ်အင်ကို အကြံပြုထားသည်", + "plugin-review:error-max-length": "သုံးသပ်ချက်သည် စာလုံးရေ {max} လုံး သို့မဟုတ် ထိုထက်နည်းရမည်။", + "plugin-review:error-downvote-comment": "မည်သည့်အရာကို ပိုကောင်းအောင်လုပ်နိုင်ကြောင်း developer ကို ပြောပါ။", + "plugin-review:error-empty": "မှတ်ချက်ထည့်ပါ သို့မဟုတ် ကြိုက်သည်ကို ရွေးပါ။", + "plugin-review:unrated": "အဆင့်မသတ်မှတ်ရသေးပါ" } diff --git a/src/lang/mm-zawgyi.json b/src/lang/mm-zawgyi.json index 84cf0cfc9f..2962e24868 100644 --- a/src/lang/mm-zawgyi.json +++ b/src/lang/mm-zawgyi.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "ပလပ္အင္ သုံးသပ္ခ်က္မ်ား", + "plugin-review:account-check-failed": "သင့္အေကာင့္ကို စစ္ေဆး၍မရပါ။ ထပ္မံႀကိဳးစားပါ။", + "plugin-review:sign-in": "သုံးသပ္ခ်က္ေရးရန္ အေကာင့္ဝင္ပါ", + "plugin-review:edit": "သင့္သုံးသပ္ခ်က္ကို ျပင္ဆင္ပါ", + "plugin-review:add": "သုံးသပ္ခ်က္ ထည့္ရန္...", + "plugin-review:placeholder": "သင့္အေတြ႕အႀကဳံကို မွ်ေဝပါ...", + "plugin-review:input-label": "ပလပ္အင္ သုံးသပ္ခ်က္", + "plugin-review:vote-group-label": "မဲ", + "plugin-review:thumbs-up": "ႀကိဳက္သည္", + "plugin-review:thumbs-down": "မႀကိဳက္ပါ", + "plugin-review:delete": "သုံးသပ္ခ်က္ ဖ်က္ရန္", + "plugin-review:load-failed": "သုံးသပ္ခ်က္မ်ားကို ဖြင့္၍မရပါ။", + "plugin-review:retry": "ထပ္မံႀကိဳးစားပါ", + "plugin-review:empty-title": "သုံးသပ္ခ်က္ မရွိေသးပါ", + "plugin-review:empty-description": "သင့္အေတြ႕အႀကဳံကို ပထမဆုံး မွ်ေဝပါ။", + "plugin-review:yours": "သင့္သုံးသပ္ခ်က္", + "plugin-review:community": "အသိုင္းအဝိုင္း သုံးသပ္ခ်က္မ်ား", + "plugin-review:no-other-reviews": "အျခားသုံးသပ္ခ်က္ မရွိေသးပါ။", + "plugin-review:login-incomplete": "အေကာင့္ဝင္ျခင္း မၿပီးဆုံးပါ။", + "plugin-review:sign-in-failed": "အေကာင့္ဝင္၍မရပါ။", + "plugin-review:session-expired-review": "သင့္အသုံးျပဳခ်ိန္ ကုန္ဆုံးသြားပါၿပီ။ သုံးသပ္ခ်က္ေရးရန္ ျပန္ဝင္ပါ။", + "plugin-review:save-failed": "သုံးသပ္ခ်က္ကို သိမ္း၍မရပါ။", + "plugin-review:delete-confirmation": "သင့္သုံးသပ္ခ်က္ကို ဖ်က္မလား။ ျပန္ယူ၍မရပါ။", + "plugin-review:session-expired-continue": "သင့္အသုံးျပဳခ်ိန္ ကုန္ဆုံးသြားပါၿပီ။ ဆက္လုပ္ရန္ ျပန္ဝင္ပါ။", + "plugin-review:delete-failed": "သုံးသပ္ခ်က္ကို ဖ်က္၍မရပါ။", + "plugin-review:you": "သင္", + "plugin-review:edit-action": "သုံးသပ္ခ်က္ ျပင္ဆင္ရန္", + "plugin-review:recommended": "ဤပလပ္အင္ကို အႀကံျပဳထားသည္", + "plugin-review:error-max-length": "သုံးသပ္ခ်က္သည္ စာလုံးေရ {max} လုံး သို႔မဟုတ္ ထိုထက္နည္းရမည္။", + "plugin-review:error-downvote-comment": "မည္သည့္အရာကို ပိုေကာင္းေအာင္လုပ္ႏိုင္ေၾကာင္း developer ကို ေျပာပါ။", + "plugin-review:error-empty": "မွတ္ခ်က္ထည့္ပါ သို႔မဟုတ္ ႀကိဳက္သည္ကို ေ႐ြးပါ။", + "plugin-review:unrated": "အဆင့္မသတ္မွတ္ရေသးပါ" } diff --git a/src/lang/pl-pl.json b/src/lang/pl-pl.json index 1634787b00..9f9aa52498 100644 --- a/src/lang/pl-pl.json +++ b/src/lang/pl-pl.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Opinie o wtyczce", + "plugin-review:account-check-failed": "Nie udało się sprawdzić Twojego konta. Spróbuj ponownie.", + "plugin-review:sign-in": "Zaloguj się, aby dodać opinię", + "plugin-review:edit": "Edytuj swoją opinię", + "plugin-review:add": "Dodaj opinię…", + "plugin-review:placeholder": "Podziel się swoim doświadczeniem…", + "plugin-review:input-label": "Opinia o wtyczce", + "plugin-review:vote-group-label": "Głos", + "plugin-review:thumbs-up": "Lubię", + "plugin-review:thumbs-down": "Nie lubię", + "plugin-review:delete": "Usuń opinię", + "plugin-review:load-failed": "Nie udało się wczytać opinii.", + "plugin-review:retry": "Spróbuj ponownie", + "plugin-review:empty-title": "Brak opinii", + "plugin-review:empty-description": "Podziel się swoim doświadczeniem jako pierwsza osoba.", + "plugin-review:yours": "Twoja opinia", + "plugin-review:community": "Opinie społeczności", + "plugin-review:no-other-reviews": "Nie ma jeszcze innych opinii.", + "plugin-review:login-incomplete": "Logowanie nie zostało ukończone.", + "plugin-review:sign-in-failed": "Nie udało się zalogować.", + "plugin-review:session-expired-review": "Twoja sesja wygasła. Zaloguj się ponownie, aby dodać opinię.", + "plugin-review:save-failed": "Nie udało się zapisać opinii.", + "plugin-review:delete-confirmation": "Usunąć Twoją opinię? Tej operacji nie można cofnąć.", + "plugin-review:session-expired-continue": "Twoja sesja wygasła. Zaloguj się ponownie, aby kontynuować.", + "plugin-review:delete-failed": "Nie udało się usunąć opinii.", + "plugin-review:you": "Ty", + "plugin-review:edit-action": "Edytuj opinię", + "plugin-review:recommended": "Poleca tę wtyczkę", + "plugin-review:error-max-length": "Opinia może mieć maksymalnie {max} znaków.", + "plugin-review:error-downvote-comment": "Powiedz deweloperowi, co można poprawić.", + "plugin-review:error-empty": "Dodaj komentarz lub wybierz „Lubię”.", + "plugin-review:unrated": "Bez oceny" } diff --git a/src/lang/pt-br.json b/src/lang/pt-br.json index 9f6552f768..1affbea199 100644 --- a/src/lang/pt-br.json +++ b/src/lang/pt-br.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Avaliações do plugin", + "plugin-review:account-check-failed": "Não foi possível verificar sua conta. Tente novamente.", + "plugin-review:sign-in": "Entre para avaliar", + "plugin-review:edit": "Editar sua avaliação", + "plugin-review:add": "Adicionar uma avaliação...", + "plugin-review:placeholder": "Compartilhe sua experiência...", + "plugin-review:input-label": "Avaliação do plugin", + "plugin-review:vote-group-label": "Voto", + "plugin-review:thumbs-up": "Gostei", + "plugin-review:thumbs-down": "Não gostei", + "plugin-review:delete": "Excluir avaliação", + "plugin-review:load-failed": "Não foi possível carregar as avaliações.", + "plugin-review:retry": "Tentar novamente", + "plugin-review:empty-title": "Ainda não há avaliações", + "plugin-review:empty-description": "Seja a primeira pessoa a compartilhar sua experiência.", + "plugin-review:yours": "Sua avaliação", + "plugin-review:community": "Avaliações da comunidade", + "plugin-review:no-other-reviews": "Ainda não há outras avaliações.", + "plugin-review:login-incomplete": "O login não foi concluído.", + "plugin-review:sign-in-failed": "Não foi possível entrar.", + "plugin-review:session-expired-review": "Sua sessão expirou. Entre novamente para avaliar.", + "plugin-review:save-failed": "Não foi possível salvar a avaliação.", + "plugin-review:delete-confirmation": "Excluir sua avaliação? Esta ação não pode ser desfeita.", + "plugin-review:session-expired-continue": "Sua sessão expirou. Entre novamente para continuar.", + "plugin-review:delete-failed": "Não foi possível excluir a avaliação.", + "plugin-review:you": "Você", + "plugin-review:edit-action": "Editar avaliação", + "plugin-review:recommended": "Recomendou este plugin", + "plugin-review:error-max-length": "A avaliação deve ter no máximo {max} caracteres.", + "plugin-review:error-downvote-comment": "Diga ao desenvolvedor o que pode ser melhorado.", + "plugin-review:error-empty": "Adicione um comentário ou escolha Gostei.", + "plugin-review:unrated": "Sem avaliação" } diff --git a/src/lang/pu-in.json b/src/lang/pu-in.json index 0cdbc0b314..22734a25c9 100644 --- a/src/lang/pu-in.json +++ b/src/lang/pu-in.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "ਪਲੱਗਇਨ ਸਮੀਖਿਆਵਾਂ", + "plugin-review:account-check-failed": "ਤੁਹਾਡੇ ਖਾਤੇ ਦੀ ਜਾਂਚ ਨਹੀਂ ਹੋ ਸਕੀ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।", + "plugin-review:sign-in": "ਸਮੀਖਿਆ ਦੇਣ ਲਈ ਸਾਈਨ ਇਨ ਕਰੋ", + "plugin-review:edit": "ਆਪਣੀ ਸਮੀਖਿਆ ਸੋਧੋ", + "plugin-review:add": "ਸਮੀਖਿਆ ਸ਼ਾਮਲ ਕਰੋ...", + "plugin-review:placeholder": "ਆਪਣਾ ਅਨੁਭਵ ਸਾਂਝਾ ਕਰੋ...", + "plugin-review:input-label": "ਪਲੱਗਇਨ ਸਮੀਖਿਆ", + "plugin-review:vote-group-label": "ਵੋਟ", + "plugin-review:thumbs-up": "ਪਸੰਦ", + "plugin-review:thumbs-down": "ਨਾਪਸੰਦ", + "plugin-review:delete": "ਸਮੀਖਿਆ ਮਿਟਾਓ", + "plugin-review:load-failed": "ਸਮੀਖਿਆਵਾਂ ਲੋਡ ਨਹੀਂ ਹੋ ਸਕੀਆਂ।", + "plugin-review:retry": "ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ", + "plugin-review:empty-title": "ਹਾਲੇ ਕੋਈ ਸਮੀਖਿਆ ਨਹੀਂ", + "plugin-review:empty-description": "ਆਪਣਾ ਅਨੁਭਵ ਸਾਂਝਾ ਕਰਨ ਵਾਲੇ ਪਹਿਲੇ ਵਿਅਕਤੀ ਬਣੋ।", + "plugin-review:yours": "ਤੁਹਾਡੀ ਸਮੀਖਿਆ", + "plugin-review:community": "ਭਾਈਚਾਰੇ ਦੀਆਂ ਸਮੀਖਿਆਵਾਂ", + "plugin-review:no-other-reviews": "ਹਾਲੇ ਹੋਰ ਕੋਈ ਸਮੀਖਿਆ ਨਹੀਂ।", + "plugin-review:login-incomplete": "ਸਾਈਨ ਇਨ ਪੂਰਾ ਨਹੀਂ ਹੋਇਆ।", + "plugin-review:sign-in-failed": "ਸਾਈਨ ਇਨ ਨਹੀਂ ਹੋ ਸਕਿਆ।", + "plugin-review:session-expired-review": "ਤੁਹਾਡਾ ਸੈਸ਼ਨ ਖਤਮ ਹੋ ਗਿਆ। ਸਮੀਖਿਆ ਦੇਣ ਲਈ ਦੁਬਾਰਾ ਸਾਈਨ ਇਨ ਕਰੋ।", + "plugin-review:save-failed": "ਸਮੀਖਿਆ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ।", + "plugin-review:delete-confirmation": "ਆਪਣੀ ਸਮੀਖਿਆ ਮਿਟਾਉਣੀ ਹੈ? ਇਹ ਵਾਪਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।", + "plugin-review:session-expired-continue": "ਤੁਹਾਡਾ ਸੈਸ਼ਨ ਖਤਮ ਹੋ ਗਿਆ। ਜਾਰੀ ਰੱਖਣ ਲਈ ਦੁਬਾਰਾ ਸਾਈਨ ਇਨ ਕਰੋ।", + "plugin-review:delete-failed": "ਸਮੀਖਿਆ ਮਿਟਾਈ ਨਹੀਂ ਜਾ ਸਕੀ।", + "plugin-review:you": "ਤੁਸੀਂ", + "plugin-review:edit-action": "ਸਮੀਖਿਆ ਸੋਧੋ", + "plugin-review:recommended": "ਇਸ ਪਲੱਗਇਨ ਦੀ ਸਿਫ਼ਾਰਸ਼ ਕੀਤੀ", + "plugin-review:error-max-length": "ਸਮੀਖਿਆ {max} ਅੱਖਰਾਂ ਜਾਂ ਇਸ ਤੋਂ ਘੱਟ ਦੀ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ।", + "plugin-review:error-downvote-comment": "ਡਿਵੈਲਪਰ ਨੂੰ ਦੱਸੋ ਕਿ ਕੀ ਸੁਧਾਰਿਆ ਜਾ ਸਕਦਾ ਹੈ।", + "plugin-review:error-empty": "ਟਿੱਪਣੀ ਸ਼ਾਮਲ ਕਰੋ ਜਾਂ ਪਸੰਦ ਚੁਣੋ।", + "plugin-review:unrated": "ਹਾਲੇ ਮੁਲਾਂਕਣ ਨਹੀਂ" } diff --git a/src/lang/ru-ru.json b/src/lang/ru-ru.json index 4095204dc4..1d28242fce 100644 --- a/src/lang/ru-ru.json +++ b/src/lang/ru-ru.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Отзывы о плагине", + "plugin-review:account-check-failed": "Не удалось проверить вашу учётную запись. Повторите попытку.", + "plugin-review:sign-in": "Войти, чтобы оставить отзыв", + "plugin-review:edit": "Редактировать свой отзыв", + "plugin-review:add": "Добавить отзыв…", + "plugin-review:placeholder": "Поделитесь своим опытом…", + "plugin-review:input-label": "Отзыв о плагине", + "plugin-review:vote-group-label": "Оценка", + "plugin-review:thumbs-up": "Нравится", + "plugin-review:thumbs-down": "Не нравится", + "plugin-review:delete": "Удалить отзыв", + "plugin-review:load-failed": "Не удалось загрузить отзывы.", + "plugin-review:retry": "Повторить", + "plugin-review:empty-title": "Отзывов пока нет", + "plugin-review:empty-description": "Станьте первым, кто поделится своим опытом.", + "plugin-review:yours": "Ваш отзыв", + "plugin-review:community": "Отзывы сообщества", + "plugin-review:no-other-reviews": "Других отзывов пока нет.", + "plugin-review:login-incomplete": "Вход не был завершён.", + "plugin-review:sign-in-failed": "Не удалось войти.", + "plugin-review:session-expired-review": "Сеанс истёк. Войдите снова, чтобы оставить отзыв.", + "plugin-review:save-failed": "Не удалось сохранить отзыв.", + "plugin-review:delete-confirmation": "Удалить ваш отзыв? Это действие нельзя отменить.", + "plugin-review:session-expired-continue": "Сеанс истёк. Войдите снова, чтобы продолжить.", + "plugin-review:delete-failed": "Не удалось удалить отзыв.", + "plugin-review:you": "Вы", + "plugin-review:edit-action": "Редактировать отзыв", + "plugin-review:recommended": "Рекомендует этот плагин", + "plugin-review:error-max-length": "Отзыв должен содержать не более {max} символов.", + "plugin-review:error-downvote-comment": "Расскажите разработчику, что можно улучшить.", + "plugin-review:error-empty": "Добавьте комментарий или выберите «Нравится».", + "plugin-review:unrated": "Нет оценок" } diff --git a/src/lang/tl-ph.json b/src/lang/tl-ph.json index 509640d0c0..811030d742 100644 --- a/src/lang/tl-ph.json +++ b/src/lang/tl-ph.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Mga review ng plugin", + "plugin-review:account-check-failed": "Hindi masuri ang iyong account. Subukan muli.", + "plugin-review:sign-in": "Mag-sign in para mag-review", + "plugin-review:edit": "I-edit ang iyong review", + "plugin-review:add": "Magdagdag ng review...", + "plugin-review:placeholder": "Ibahagi ang iyong karanasan...", + "plugin-review:input-label": "Review ng plugin", + "plugin-review:vote-group-label": "Boto", + "plugin-review:thumbs-up": "Gusto", + "plugin-review:thumbs-down": "Hindi gusto", + "plugin-review:delete": "I-delete ang review", + "plugin-review:load-failed": "Hindi ma-load ang mga review.", + "plugin-review:retry": "Subukan muli", + "plugin-review:empty-title": "Wala pang review", + "plugin-review:empty-description": "Mauna sa pagbabahagi ng iyong karanasan.", + "plugin-review:yours": "Iyong review", + "plugin-review:community": "Mga review ng komunidad", + "plugin-review:no-other-reviews": "Wala pang ibang review.", + "plugin-review:login-incomplete": "Hindi natapos ang pag-sign in.", + "plugin-review:sign-in-failed": "Hindi makapag-sign in.", + "plugin-review:session-expired-review": "Nag-expire ang iyong session. Mag-sign in muli para mag-review.", + "plugin-review:save-failed": "Hindi mai-save ang review.", + "plugin-review:delete-confirmation": "I-delete ang iyong review? Hindi na ito maibabalik.", + "plugin-review:session-expired-continue": "Nag-expire ang iyong session. Mag-sign in muli para magpatuloy.", + "plugin-review:delete-failed": "Hindi ma-delete ang review.", + "plugin-review:you": "Ikaw", + "plugin-review:edit-action": "I-edit ang review", + "plugin-review:recommended": "Inirerekomenda ang plugin na ito", + "plugin-review:error-max-length": "Dapat {max} character o mas kaunti ang review.", + "plugin-review:error-downvote-comment": "Sabihin sa developer kung ano ang maaaring mapabuti.", + "plugin-review:error-empty": "Magdagdag ng komento o piliin ang Gusto.", + "plugin-review:unrated": "Walang rating" } diff --git a/src/lang/tr-tr.json b/src/lang/tr-tr.json index 327b4556db..742f48ad5f 100644 --- a/src/lang/tr-tr.json +++ b/src/lang/tr-tr.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Eklenti değerlendirmeleri", + "plugin-review:account-check-failed": "Hesabınız kontrol edilemedi. Tekrar deneyin.", + "plugin-review:sign-in": "Değerlendirmek için oturum açın", + "plugin-review:edit": "Değerlendirmenizi düzenleyin", + "plugin-review:add": "Değerlendirme ekleyin...", + "plugin-review:placeholder": "Deneyiminizi paylaşın...", + "plugin-review:input-label": "Eklenti değerlendirmesi", + "plugin-review:vote-group-label": "Oy", + "plugin-review:thumbs-up": "Beğendim", + "plugin-review:thumbs-down": "Beğenmedim", + "plugin-review:delete": "Değerlendirmeyi sil", + "plugin-review:load-failed": "Değerlendirmeler yüklenemedi.", + "plugin-review:retry": "Tekrar dene", + "plugin-review:empty-title": "Henüz değerlendirme yok", + "plugin-review:empty-description": "Deneyiminizi ilk paylaşan siz olun.", + "plugin-review:yours": "Değerlendirmeniz", + "plugin-review:community": "Topluluk değerlendirmeleri", + "plugin-review:no-other-reviews": "Henüz başka değerlendirme yok.", + "plugin-review:login-incomplete": "Oturum açma tamamlanmadı.", + "plugin-review:sign-in-failed": "Oturum açılamadı.", + "plugin-review:session-expired-review": "Oturumunuzun süresi doldu. Değerlendirmek için tekrar oturum açın.", + "plugin-review:save-failed": "Değerlendirme kaydedilemedi.", + "plugin-review:delete-confirmation": "Değerlendirmeniz silinsin mi? Bu işlem geri alınamaz.", + "plugin-review:session-expired-continue": "Oturumunuzun süresi doldu. Devam etmek için tekrar oturum açın.", + "plugin-review:delete-failed": "Değerlendirme silinemedi.", + "plugin-review:you": "Siz", + "plugin-review:edit-action": "Değerlendirmeyi düzenle", + "plugin-review:recommended": "Bu eklentiyi önerdi", + "plugin-review:error-max-length": "Değerlendirme en fazla {max} karakter olmalıdır.", + "plugin-review:error-downvote-comment": "Geliştiriciye nelerin iyileştirilebileceğini söyleyin.", + "plugin-review:error-empty": "Yorum ekleyin veya Beğendim’i seçin.", + "plugin-review:unrated": "Değerlendirilmedi" } diff --git a/src/lang/uk-ua.json b/src/lang/uk-ua.json index 1f14b264af..b6522b1d60 100644 --- a/src/lang/uk-ua.json +++ b/src/lang/uk-ua.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Відгуки про плагін", + "plugin-review:account-check-failed": "Не вдалося перевірити ваш обліковий запис. Спробуйте ще раз.", + "plugin-review:sign-in": "Увійти, щоб залишити відгук", + "plugin-review:edit": "Редагувати свій відгук", + "plugin-review:add": "Додати відгук…", + "plugin-review:placeholder": "Поділіться своїм досвідом…", + "plugin-review:input-label": "Відгук про плагін", + "plugin-review:vote-group-label": "Оцінка", + "plugin-review:thumbs-up": "Подобається", + "plugin-review:thumbs-down": "Не подобається", + "plugin-review:delete": "Видалити відгук", + "plugin-review:load-failed": "Не вдалося завантажити відгуки.", + "plugin-review:retry": "Спробувати ще раз", + "plugin-review:empty-title": "Відгуків ще немає", + "plugin-review:empty-description": "Поділіться своїм досвідом першими.", + "plugin-review:yours": "Ваш відгук", + "plugin-review:community": "Відгуки спільноти", + "plugin-review:no-other-reviews": "Інших відгуків ще немає.", + "plugin-review:login-incomplete": "Вхід не було завершено.", + "plugin-review:sign-in-failed": "Не вдалося ввійти.", + "plugin-review:session-expired-review": "Сеанс завершився. Увійдіть знову, щоб залишити відгук.", + "plugin-review:save-failed": "Не вдалося зберегти відгук.", + "plugin-review:delete-confirmation": "Видалити ваш відгук? Цю дію не можна скасувати.", + "plugin-review:session-expired-continue": "Сеанс завершився. Увійдіть знову, щоб продовжити.", + "plugin-review:delete-failed": "Не вдалося видалити відгук.", + "plugin-review:you": "Ви", + "plugin-review:edit-action": "Редагувати відгук", + "plugin-review:recommended": "Рекомендує цей плагін", + "plugin-review:error-max-length": "Відгук має містити не більше {max} символів.", + "plugin-review:error-downvote-comment": "Розкажіть розробнику, що можна покращити.", + "plugin-review:error-empty": "Додайте коментар або виберіть «Подобається».", + "plugin-review:unrated": "Без оцінки" } diff --git a/src/lang/uz-uz.json b/src/lang/uz-uz.json index eec005214b..1f4272b967 100644 --- a/src/lang/uz-uz.json +++ b/src/lang/uz-uz.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Plagin sharhlari", + "plugin-review:account-check-failed": "Hisobingizni tekshirib bo‘lmadi. Qayta urinib ko‘ring.", + "plugin-review:sign-in": "Sharh qoldirish uchun kiring", + "plugin-review:edit": "Sharhingizni tahrirlash", + "plugin-review:add": "Sharh qo‘shish...", + "plugin-review:placeholder": "Tajribangizni ulashing...", + "plugin-review:input-label": "Plagin sharhi", + "plugin-review:vote-group-label": "Ovoz", + "plugin-review:thumbs-up": "Yoqdi", + "plugin-review:thumbs-down": "Yoqmadi", + "plugin-review:delete": "Sharhni o‘chirish", + "plugin-review:load-failed": "Sharhlarni yuklab bo‘lmadi.", + "plugin-review:retry": "Qayta urinish", + "plugin-review:empty-title": "Hozircha sharhlar yo‘q", + "plugin-review:empty-description": "Tajribangizni birinchi bo‘lib ulashing.", + "plugin-review:yours": "Sharhingiz", + "plugin-review:community": "Hamjamiyat sharhlari", + "plugin-review:no-other-reviews": "Hozircha boshqa sharhlar yo‘q.", + "plugin-review:login-incomplete": "Kirish yakunlanmadi.", + "plugin-review:sign-in-failed": "Tizimga kirib bo‘lmadi.", + "plugin-review:session-expired-review": "Seans muddati tugadi. Sharh qoldirish uchun qayta kiring.", + "plugin-review:save-failed": "Sharhni saqlab bo‘lmadi.", + "plugin-review:delete-confirmation": "Sharhingiz o‘chirilsinmi? Buni ortga qaytarib bo‘lmaydi.", + "plugin-review:session-expired-continue": "Seans muddati tugadi. Davom etish uchun qayta kiring.", + "plugin-review:delete-failed": "Sharhni o‘chirib bo‘lmadi.", + "plugin-review:you": "Siz", + "plugin-review:edit-action": "Sharhni tahrirlash", + "plugin-review:recommended": "Bu plaginni tavsiya qildi", + "plugin-review:error-max-length": "Sharh {max} ta yoki undan kam belgidan iborat bo‘lishi kerak.", + "plugin-review:error-downvote-comment": "Dasturchiga nimani yaxshilash mumkinligini ayting.", + "plugin-review:error-empty": "Izoh qo‘shing yoki “Yoqdi”ni tanlang.", + "plugin-review:unrated": "Baholanmagan" } diff --git a/src/lang/vi-vn.json b/src/lang/vi-vn.json index 4c992e2502..fd4eee2626 100644 --- a/src/lang/vi-vn.json +++ b/src/lang/vi-vn.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "Đánh giá plugin", + "plugin-review:account-check-failed": "Không thể kiểm tra tài khoản của bạn. Hãy thử lại.", + "plugin-review:sign-in": "Đăng nhập để đánh giá", + "plugin-review:edit": "Chỉnh sửa đánh giá của bạn", + "plugin-review:add": "Thêm đánh giá...", + "plugin-review:placeholder": "Chia sẻ trải nghiệm của bạn...", + "plugin-review:input-label": "Đánh giá plugin", + "plugin-review:vote-group-label": "Bình chọn", + "plugin-review:thumbs-up": "Thích", + "plugin-review:thumbs-down": "Không thích", + "plugin-review:delete": "Xóa đánh giá", + "plugin-review:load-failed": "Không thể tải các đánh giá.", + "plugin-review:retry": "Thử lại", + "plugin-review:empty-title": "Chưa có đánh giá", + "plugin-review:empty-description": "Hãy là người đầu tiên chia sẻ trải nghiệm.", + "plugin-review:yours": "Đánh giá của bạn", + "plugin-review:community": "Đánh giá từ cộng đồng", + "plugin-review:no-other-reviews": "Chưa có đánh giá nào khác.", + "plugin-review:login-incomplete": "Quá trình đăng nhập chưa hoàn tất.", + "plugin-review:sign-in-failed": "Không thể đăng nhập.", + "plugin-review:session-expired-review": "Phiên của bạn đã hết hạn. Hãy đăng nhập lại để đánh giá.", + "plugin-review:save-failed": "Không thể lưu đánh giá.", + "plugin-review:delete-confirmation": "Xóa đánh giá của bạn? Bạn không thể hoàn tác thao tác này.", + "plugin-review:session-expired-continue": "Phiên của bạn đã hết hạn. Hãy đăng nhập lại để tiếp tục.", + "plugin-review:delete-failed": "Không thể xóa đánh giá.", + "plugin-review:you": "Bạn", + "plugin-review:edit-action": "Chỉnh sửa đánh giá", + "plugin-review:recommended": "Đã đề xuất plugin này", + "plugin-review:error-max-length": "Đánh giá phải có tối đa {max} ký tự.", + "plugin-review:error-downvote-comment": "Hãy cho nhà phát triển biết điều gì có thể được cải thiện.", + "plugin-review:error-empty": "Thêm bình luận hoặc chọn Thích.", + "plugin-review:unrated": "Chưa đánh giá" } diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index 377aa0f004..d8067ddb03 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "复制时应用排除项", "settings-info-app-use-file-operation-exclusions": "在复制和粘贴操作期间,跳过符合排除规则的文件和文件夹。", "horizontal scroll margin": "水平滚动边距", - "settings-info-horizontal-scroll-margin": "在关闭自动换行时,为最长行的末尾添加空白区域。请输入任意非负整数的像素值。" + "settings-info-horizontal-scroll-margin": "在关闭自动换行时,为最长行的末尾添加空白区域。请输入任意非负整数的像素值。", + "plugin-review:dialog-label": "插件评价", + "plugin-review:account-check-failed": "无法检查你的账户,请重试。", + "plugin-review:sign-in": "登录后评价", + "plugin-review:edit": "编辑你的评价", + "plugin-review:add": "添加评价…", + "plugin-review:placeholder": "分享你的使用体验…", + "plugin-review:input-label": "插件评价", + "plugin-review:vote-group-label": "投票", + "plugin-review:thumbs-up": "赞", + "plugin-review:thumbs-down": "踩", + "plugin-review:delete": "删除评价", + "plugin-review:load-failed": "无法加载评价。", + "plugin-review:retry": "重试", + "plugin-review:empty-title": "暂无评价", + "plugin-review:empty-description": "成为第一个分享使用体验的人。", + "plugin-review:yours": "你的评价", + "plugin-review:community": "社区评价", + "plugin-review:no-other-reviews": "暂无其他评价。", + "plugin-review:login-incomplete": "登录未完成。", + "plugin-review:sign-in-failed": "无法登录。", + "plugin-review:session-expired-review": "会话已过期,请重新登录后评价。", + "plugin-review:save-failed": "无法保存评价。", + "plugin-review:delete-confirmation": "要删除你的评价吗?此操作无法撤销。", + "plugin-review:session-expired-continue": "会话已过期,请重新登录后继续。", + "plugin-review:delete-failed": "无法删除评价。", + "plugin-review:you": "你", + "plugin-review:edit-action": "编辑评价", + "plugin-review:recommended": "推荐了此插件", + "plugin-review:error-max-length": "评价不能超过 {max} 个字符。", + "plugin-review:error-downvote-comment": "告诉开发者哪些地方可以改进。", + "plugin-review:error-empty": "添加评论或选择“赞”。", + "plugin-review:unrated": "暂无评分" } diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json index 2e450d79c3..2bbe289d28 100644 --- a/src/lang/zh-hant.json +++ b/src/lang/zh-hant.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "複製時應用排除項", "settings-info-app-use-file-operation-exclusions": "在複製和粘貼操作期間,跳過符合排除規則的文件和文件夾。", "horizontal scroll margin": "水平滾動邊距", - "settings-info-horizontal-scroll-margin": "在關閉自動換行時,爲最長行的末尾添加空白區域。請輸入任意非負整數的像素值。" + "settings-info-horizontal-scroll-margin": "在關閉自動換行時,爲最長行的末尾添加空白區域。請輸入任意非負整數的像素值。", + "plugin-review:dialog-label": "外掛評論", + "plugin-review:account-check-failed": "無法檢查你的帳戶,請再試一次。", + "plugin-review:sign-in": "登入以撰寫評論", + "plugin-review:edit": "編輯你的評論", + "plugin-review:add": "新增評論…", + "plugin-review:placeholder": "分享你的使用體驗…", + "plugin-review:input-label": "外掛評論", + "plugin-review:vote-group-label": "投票", + "plugin-review:thumbs-up": "讚", + "plugin-review:thumbs-down": "倒讚", + "plugin-review:delete": "刪除評論", + "plugin-review:load-failed": "無法載入評論。", + "plugin-review:retry": "重試", + "plugin-review:empty-title": "尚無評論", + "plugin-review:empty-description": "成為第一個分享使用體驗的人。", + "plugin-review:yours": "你的評論", + "plugin-review:community": "社群評論", + "plugin-review:no-other-reviews": "尚無其他評論。", + "plugin-review:login-incomplete": "登入未完成。", + "plugin-review:sign-in-failed": "無法登入。", + "plugin-review:session-expired-review": "工作階段已過期,請重新登入以撰寫評論。", + "plugin-review:save-failed": "無法儲存評論。", + "plugin-review:delete-confirmation": "要刪除你的評論嗎?此操作無法復原。", + "plugin-review:session-expired-continue": "工作階段已過期,請重新登入以繼續。", + "plugin-review:delete-failed": "無法刪除評論。", + "plugin-review:you": "你", + "plugin-review:edit-action": "編輯評論", + "plugin-review:recommended": "推薦了此外掛", + "plugin-review:error-max-length": "評論不得超過 {max} 個字元。", + "plugin-review:error-downvote-comment": "告訴開發者哪些地方可以改進。", + "plugin-review:error-empty": "新增留言或選擇「讚」。", + "plugin-review:unrated": "尚未評分" } diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index 734c10caf0..add0b58a04 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -835,5 +835,37 @@ "apply exclusions when copying": "Apply exclusions when copying", "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value." + "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "plugin-review:dialog-label": "外掛評論", + "plugin-review:account-check-failed": "無法檢查你的帳號,請再試一次。", + "plugin-review:sign-in": "登入以撰寫評論", + "plugin-review:edit": "編輯你的評論", + "plugin-review:add": "新增評論…", + "plugin-review:placeholder": "分享你的使用心得…", + "plugin-review:input-label": "外掛評論", + "plugin-review:vote-group-label": "評分", + "plugin-review:thumbs-up": "讚", + "plugin-review:thumbs-down": "倒讚", + "plugin-review:delete": "刪除評論", + "plugin-review:load-failed": "無法載入評論。", + "plugin-review:retry": "重試", + "plugin-review:empty-title": "目前沒有評論", + "plugin-review:empty-description": "成為第一個分享使用心得的人。", + "plugin-review:yours": "你的評論", + "plugin-review:community": "社群評論", + "plugin-review:no-other-reviews": "目前沒有其他評論。", + "plugin-review:login-incomplete": "登入未完成。", + "plugin-review:sign-in-failed": "無法登入。", + "plugin-review:session-expired-review": "工作階段已過期,請重新登入以撰寫評論。", + "plugin-review:save-failed": "無法儲存評論。", + "plugin-review:delete-confirmation": "要刪除你的評論嗎?此動作無法復原。", + "plugin-review:session-expired-continue": "工作階段已過期,請重新登入以繼續。", + "plugin-review:delete-failed": "無法刪除評論。", + "plugin-review:you": "你", + "plugin-review:edit-action": "編輯評論", + "plugin-review:recommended": "推薦這個外掛", + "plugin-review:error-max-length": "評論不得超過 {max} 個字元。", + "plugin-review:error-downvote-comment": "告訴開發者哪些地方可以改進。", + "plugin-review:error-empty": "新增留言或選擇「讚」。", + "plugin-review:unrated": "尚未評分" } diff --git a/src/lib/lang.js b/src/lib/lang.js index b8a2966ab5..77a21e1c6f 100644 --- a/src/lib/lang.js +++ b/src/lib/lang.js @@ -187,6 +187,34 @@ const langMap = { }, }; +const intlLocaleOverrides = { + "ir-fa": "fa-IR", + "mm-unicode": "my-MM", + "mm-zawgyi": "my-MM", + "pu-in": "pa-IN", +}; +const rtlLanguages = new Set(["ar", "fa", "he"]); + +export function getIntlLocale(code) { + const normalizedCode = code?.toLowerCase(); + const locale = + intlLocaleOverrides[normalizedCode] || + (normalizedCode in langMap + ? normalizedCode + : globalThis.navigator?.language || "en-US"); + + try { + return Intl.getCanonicalLocales(locale)[0]; + } catch { + return "en-US"; + } +} + +export function getLocaleDirection(locale) { + const language = locale?.split("-")[0]?.toLowerCase(); + return rtlLanguages.has(language) ? "rtl" : "ltr"; +} + export default { async set(code) { code = code?.toLowerCase(); diff --git a/src/pages/plugin/plugin.scss b/src/pages/plugin/plugin.scss index cf88e1b229..68c1bc2119 100644 --- a/src/pages/plugin/plugin.scss +++ b/src/pages/plugin/plugin.scss @@ -608,117 +608,515 @@ position: fixed; display: flex; flex-direction: column; - width: 100vw; - height: 70vh; - top: auto; + width: min(100vw, 720px); + height: 76vh; + height: min(76dvh, 680px); + max-height: calc(100vh - 16px - env(safe-area-inset-top)); + max-height: calc(100dvh - 16px - env(safe-area-inset-top)); + inset-inline: 0; bottom: 0; - background-color: rgb(255, 255, 255); + margin: auto; background-color: var(--secondary-color); + color: var(--primary-text-color); z-index: 999; - box-shadow: 0 0 20px rgba(0, 0, 0, 0.2); box-shadow: 0 0 20px var(--box-shadow-color); - border-radius: 40px 40px 0 0; + border-radius: 24px 24px 0 0; overflow: hidden; animation: slide-up 0.3s ease-in-out; + overscroll-behavior: contain; &.hide { - transition: all 0.3s ease-in-out !important; + transition: transform 0.3s ease-in-out !important; transform: translateY(100%) !important; } .reviews-header { - height: 40px; + position: relative; + flex: 0 0 52px; display: flex; align-items: center; justify-content: center; + border-bottom: 1px solid var(--border-color); + background: color-mix(in srgb, var(--secondary-color), var(--popup-background-color) 28%); + user-select: none; + touch-action: pan-y; - &::after { - content: ""; + .reviews-drag-handle { + position: absolute; + top: 7px; + width: 40px; + height: 4px; + border-radius: 999px; + background: color-mix(in srgb, var(--secondary-text-color) 50%, transparent); + } + + strong { + margin-top: 5px; + font-size: 16px; + font-weight: 600; + text-transform: capitalize; + } + + .reviews-close { + position: absolute; + inset-inline-end: 8px; + bottom: 6px; width: 40px; - height: 5px; - border-radius: 2.5px; - background-color: rgba(0, 0, 0, 0.2); + height: 40px; + padding: 0; + border: 0; + border-radius: 50%; + background: transparent; + color: var(--secondary-text-color); + font-size: 18px; + + &:active { + background: color-mix(in srgb, var(--primary-text-color) 7%, transparent); + } + } + } + + button { + font: inherit; + + &:focus-visible { + outline: 2px solid var(--active-icon-color); + outline-offset: 2px; + } + + &:disabled { + cursor: default; + opacity: 0.55; + } + } + + .review-composer { + flex: 0 0 auto; + min-height: 64px; + padding: 12px 16px; + box-sizing: border-box; + border-bottom: 1px solid var(--border-color); + background: var(--secondary-color); + + &.review-composer-hidden { + display: none; + } + + &.loading { + @include mixins.loader(24px); } } - .write-review { - padding: 0 10px; + .review-entry-surface { + width: 100%; + padding: 10px; + box-sizing: border-box; + border: 1px solid var(--popup-border-color); + border-radius: 14px; + background: color-mix(in srgb, var(--secondary-color), var(--popup-background-color) 56%); + } + + .review-add-row, + .review-sign-in, + .review-editor-main { display: flex; - align-content: center; - justify-content: center; - width: fit-content; - margin: auto; + align-items: center; + gap: 12px; + } - span { - height: fit-content; - margin: auto; + .review-editor-main { + align-items: flex-start; + } + + .review-avatar, + .user-profile { + position: relative; + display: grid; + flex: 0 0 auto; + place-items: center; + width: 36px; + height: 36px; + overflow: hidden; + border-radius: 50%; + background: color-mix(in srgb, var(--primary-text-color) 8%, transparent); + color: var(--secondary-text-color); + font-size: 20px; + + > img { + position: absolute; + inset: 0; + display: block; + width: 100%; + height: 100%; + object-fit: cover; } + } + + .review-sign-in > .review-avatar.icon { + display: grid; + place-items: center; + background: color-mix(in srgb, var(--primary-text-color) 8%, transparent); + color: var(--secondary-text-color); + font-size: 20px; + } + + .review-sign-in-content, + .review-editor-fields { + min-width: 0; + flex: 1; + } - .icon { - height: 30px; - margin-right: 10px; + .review-editor-fields { + padding: 8px 10px 4px; + box-sizing: border-box; + border: 1px solid var(--border-color); + border-radius: 12px; + background: var(--secondary-color); + transition: border-color 160ms ease, box-shadow 160ms ease; + + &:focus-within { + border-color: var(--active-icon-color); + box-shadow: 0 0 0 2px color-mix(in srgb, var(--active-icon-color) 12%, transparent); } } + .review-add-button { + width: 100%; + min-height: 40px; + padding: 7px 10px; + border: 0; + border-radius: 10px; + background: transparent; + color: var(--secondary-text-color); + text-align: start; + font-weight: 500; + + &:active { + background: color-mix(in srgb, var(--primary-text-color) 6%, transparent); + color: var(--primary-text-color); + } + } + + .review-editor textarea { + display: block; + width: 100%; + min-height: 32px; + max-height: 144px; + padding: 3px 0; + box-sizing: border-box; + resize: none; + overflow-y: auto; + border: 0; + border-radius: 0; + outline: none; + background: transparent; + color: var(--primary-text-color); + font: inherit; + line-height: 1.4; + + &::placeholder { + color: var(--secondary-text-color); + } + } + + .review-editor-meta { + display: flex; + justify-content: space-between; + gap: 8px; + min-height: 18px; + padding-top: 2px; + } + + .review-error { + color: var(--error-text-color); + line-height: 1.35; + } + + .review-counter { + margin-inline-start: auto; + color: var(--secondary-text-color); + white-space: nowrap; + font-size: 11px; + } + + .review-editor-actions { + display: flex; + align-items: center; + justify-content: flex-end; + gap: 10px; + margin-top: 10px; + padding-inline-start: 48px; + } + + .review-vote-actions, + .review-form-actions { + display: flex; + align-items: center; + gap: 4px; + } + + .review-vote-actions { + margin-inline-end: auto; + padding: 2px; + border: 1px solid var(--border-color); + border-radius: 999px; + background: var(--secondary-color); + } + + .review-vote-button, + .review-delete-button, + .review-edit-button { + display: grid; + place-items: center; + width: 34px; + height: 34px; + padding: 0; + border: 0; + border-radius: 50%; + background: transparent; + color: var(--secondary-text-color); + + &.selected { + background: color-mix(in srgb, var(--button-background-color) 16%, transparent); + color: var(--button-background-color); + } + + &:active { + background: color-mix(in srgb, var(--primary-text-color) 7%, transparent); + } + } + + .review-vote-down .icon, + .review-vote-indicator.down .icon { + transform: rotate(180deg); + } + + .review-delete-button { + margin-inline-end: 6px; + background: color-mix(in srgb, var(--error-text-color) 9%, transparent); + color: var(--error-text-color); + } + + .review-cancel-button, + .review-save-button, + .reviews-state button { + min-height: 36px; + padding: 7px 14px; + border: 0; + border-radius: 18px; + font-weight: 500; + } + + .review-cancel-button { + background: transparent; + color: var(--primary-text-color); + } + + .review-save-button, + .reviews-state button { + min-width: 76px; + background: var(--button-background-color); + color: var(--button-text-color); + } + .reviews-body { + min-height: 0; flex: 1; overflow: auto; + padding: 4px 0 max(16px, env(safe-area-inset-bottom)); + box-sizing: border-box; + overscroll-behavior: contain; &.loading { @include mixins.loader(30px); } + .reviews-state { + min-height: 180px; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 10px; + padding: 24px; + box-sizing: border-box; + color: var(--secondary-text-color); + text-align: center; + + &.reviews-empty .icon { + font-size: 30px; + } + + strong { + color: var(--primary-text-color); + } + } + + .reviews-section { + padding: 10px 12px 0; + } + + .reviews-section-label { + padding: 0 4px 7px; + color: color-mix(in srgb, var(--secondary-text-color), transparent 12%); + font-size: 12px; + font-weight: 600; + line-height: 1.3; + } + + .reviews-card { + overflow: hidden; + border: 1px solid var(--popup-border-color); + border-radius: 14px; + background: color-mix(in srgb, var(--secondary-color), var(--popup-background-color) 48%); + } + + .own-review-card { + border-color: color-mix(in srgb, var(--active-icon-color) 38%, var(--border-color)); + background: color-mix(in srgb, var(--secondary-color), var(--active-icon-color) 6%); + } + + .reviews-community-empty { + display: grid; + min-height: 72px; + place-items: center; + color: var(--secondary-text-color); + } + .review { - padding: 10px; + padding: 14px 16px; display: flex; flex-direction: column; - border-bottom: solid 1px rgba(255, 255, 255, 0.1); + border-bottom: 1px solid var(--border-color); + + &:last-child { + border-bottom: 0; + } .review-author { display: flex; - height: 30px; + min-height: 36px; align-items: center; justify-content: flex-start; - margin-bottom: 5px; - - .vote { - height: 40px; - width: 40px; - background-position: center; - background-repeat: no-repeat; - background-size: 20px; + gap: 10px; + margin-bottom: 6px; + + .review-author-identity { + min-width: 0; + display: flex; + align-items: baseline; + gap: 6px; + overflow: hidden; + + time { + flex: 0 0 auto; + color: color-mix(in srgb, var(--secondary-text-color), transparent 30%); + font-size: 0.85em; + font-weight: 400; + white-space: nowrap; + } + } + + .user-name { + min-width: 0; + display: flex; + align-items: baseline; + gap: 6px; + overflow: hidden; + font-weight: 500; + text-overflow: ellipsis; + white-space: nowrap; + + small { + color: var(--secondary-text-color); + font-weight: 400; + } } .user-profile { - height: 30px; - width: 30px; - border-radius: 50%; - background-position: center; - background-repeat: no-repeat; - background-size: cover; - margin-right: 10px; - font-weight: 400; + width: 32px; + height: 32px; } } + .review-vote-indicator { + display: grid; + place-items: center; + width: 28px; + height: 28px; + margin-inline-start: auto; + color: var(--secondary-text-color); + } + + .review-edit-button { + width: 32px; + height: 32px; + margin-inline-start: 0; + background: color-mix(in srgb, var(--button-background-color) 10%, transparent); + color: var(--button-background-color); + } + .review-body { - display: flex; - align-items: center; - font-weight: 300; - overflow: auto; + margin: 0; + margin-inline-start: 42px; + color: var(--primary-text-color); + font-weight: 400; + line-height: 1.45; + overflow-wrap: anywhere; + white-space: pre-wrap; + + &.review-vote-only { + color: var(--secondary-text-color); + font-size: 0.92em; + font-style: italic; + } } .author-reply { + margin: 10px 0 0; + margin-inline-start: 42px; + padding: 10px 12px; + border-inline-start: 3px solid var(--active-icon-color); + border-radius: 8px; + background: color-mix(in srgb, var(--primary-text-color) 6%, transparent); + line-height: 1.4; + &::before { display: block; content: attr(data-author); - font-weight: 400; - margin-bottom: 10px; + margin-bottom: 4px; + font-weight: 600; } - - padding: 10px; - background-color: rgba(0, 0, 0, 0.1); } } } + + @media (max-width: 480px) { + border-radius: 20px 20px 0 0; + + .review-composer { + padding-inline: 12px; + } + + .review-entry-surface { + padding: 9px; + } + + .reviews-body .reviews-section { + padding-inline: 10px; + } + + .reviews-body .review { + padding-inline: 12px; + } + + .review-editor-actions { + padding-inline-start: 0; + flex-wrap: wrap; + } + + .review-form-actions { + gap: 2px; + } + } } diff --git a/src/pages/plugin/plugin.view.js b/src/pages/plugin/plugin.view.js index f93bc64943..ed0cc0e53c 100644 --- a/src/pages/plugin/plugin.view.js +++ b/src/pages/plugin/plugin.view.js @@ -6,13 +6,27 @@ import dayjsRelativeTime from "dayjs/esm/plugin/relativeTime"; import dayjsUpdateLocale from "dayjs/esm/plugin/updateLocale"; import dayjsUtc from "dayjs/esm/plugin/utc"; import alert from "dialogs/alert"; +import confirm from "dialogs/confirm"; import DOMPurify from "dompurify"; import Ref from "html-tag-js/ref"; import actionStack from "lib/actionStack"; import auth, { loginEvents } from "lib/auth"; import config from "lib/config"; +import { getIntlLocale, getLocaleDirection } from "lib/lang"; +import settings from "lib/settings"; import helpers from "utils/helpers"; import Url from "utils/Url"; +import { + formatReviewDate, + getRatingClass, + getRatingLabel, + hasReviewChanged, + partitionPluginReviews, + REVIEW_MAX_COMMENT_LENGTH, + resolveReviewAvatarUrl, + updateReviewStats, + validateReviewDraft, +} from "./reviewUtils"; dayjs.extend(dayjsRelativeTime); dayjs.extend(dayjsUtc); @@ -68,7 +82,16 @@ export default (props) => { unsupportedEditor, } = props; - let rating = "unrated"; + let reviewStats = { + votesUp: Number(votesUp) || 0, + votesDown: Number(votesDown) || 0, + commentCount: Number(commentCount) || 0, + }; + let rating = getRatingLabel(reviewStats.votesUp, reviewStats.votesDown); + const getRatingText = () => + rating === "unrated" ? strings["plugin-review:unrated"] : rating; + const ratingValueRef = Ref(); + const commentCountRef = Ref(); const keywords = typeof keywordsRaw === "string" ? JSON.parse(keywordsRaw) : keywordsRaw; @@ -77,10 +100,14 @@ export default (props) => { ? JSON.parse(contributorsRaw) : contributorsRaw; - if (votesUp || votesDown) { - rating = `${Math.round((votesUp / (votesUp + votesDown)) * 100)}%`; - } const showPurchaseWarning = !helpers.shouldAllowExternalPurchase(); + const applyReviewStats = (nextStats) => { + reviewStats = nextStats; + rating = getRatingLabel(reviewStats.votesUp, reviewStats.votesDown); + ratingValueRef.textContent = getRatingText(); + ratingValueRef.className = getRatingClass(rating); + commentCountRef.textContent = reviewStats.commentCount; + }; const formatUpdatedDate = (dateString) => { if (!dateString) return null; @@ -158,18 +185,25 @@ export default (props) => {
    - = 80 ? "rating-high" : rating.replace("%", "") >= 50 ? "rating-medium" : "rating-low"}`} - > - {rating} + + {getRatingText()}
    + showReviews({ + pluginId: id, + author, + stats: reviewStats, + onStatsChange: applyReviewStats, + }) + } > - {commentCount} + + {reviewStats.commentCount} + {strings.reviews}
    @@ -449,10 +483,28 @@ function Version({ ); } -async function showReviews(pluginId, author) { +async function showReviews({ pluginId, author, stats, onStatsChange }) { + const locale = getIntlLocale(settings.value?.lang); const mask = Ref(); const body = Ref(); + const composer = Ref(); const container = Ref(); + const state = { + busy: false, + closed: false, + draftComment: "", + draftDirty: false, + draftVote: 0, + editorError: "", + expanded: false, + reviewListError: null, + reviews: [], + resumeDraftAfterSignIn: false, + stats: { ...stats }, + user: null, + userReview: null, + }; + let removeDragListeners = () => {}; actionStack.push({ id: "reviews", @@ -468,50 +520,574 @@ async function showReviews(pluginId, author) { >, ); app.append( -
    -
    -
    - - - Review - +
    +
    + + {strings.reviews} +
    +
    , ); - try { - const reviews = await fsOperation( - config.API_BASE, - `/comments/${pluginId}`, - ).readFile("json"); - if (!reviews.length) { - body.style.textAlign = "center"; - body.textContent = "No reviews yet"; + await initialize(); + + async function initialize() { + composer.el.classList.add("loading"); + body.el.classList.add("loading"); + state.reviewListError = null; + + const [reviewsResult, userResult] = await Promise.allSettled([ + loadReviews(), + auth.getLoggedInUser(), + ]); + if (state.closed) return; + + if (reviewsResult.status === "fulfilled") { + state.reviews = reviewsResult.value; + } else { + state.reviewListError = reviewsResult.reason; + } + + if (userResult.status === "fulfilled") { + state.user = userResult.value; + if (state.user) { + const { ownReview: listedReview } = partitionPluginReviews( + state.reviews, + null, + state.user.id, + ); + try { + state.userReview = (await loadUserReview()) || listedReview || null; + } catch { + state.userReview = listedReview || null; + } + } + } else { + state.editorError = strings["plugin-review:account-check-failed"]; + } + + composer.el.classList.remove("loading"); + body.el.classList.remove("loading"); + renderComposer(); + renderReviews(); + } + + function renderComposer({ focus = false } = {}) { + if (state.closed) return; + composer.el.classList.remove("loading"); + composer.el.classList.remove("review-composer-hidden"); + + if (!state.user) { + const errorMessage = state.editorError; + composer.el.replaceChildren( +
    + +
    + + {errorMessage ? ( + {errorMessage} + ) : null} +
    +
    , + ); + return; + } + + if (!state.expanded && state.userReview) { + composer.el.replaceChildren(); + composer.el.classList.add("review-composer-hidden"); + return; + } + + if (!state.expanded) { + composer.el.replaceChildren( +
    + + +
    , + ); + return; + } + + const textarea = Ref(); + const counter = Ref(); + const error = Ref(); + const saveButton = Ref(); + const upButton = Ref(); + const upIcon = Ref(); + const downButton = Ref(); + const downIcon = Ref(); + + composer.el.replaceChildren( +
    +
    + +
    + +
    + + +
    +
    +
    +
    +
    + + +
    +
    + {state.userReview ? ( + + ) : null} + + +
    +
    +
    , + ); + + textarea.el.value = state.draftComment; + autosizeReviewInput(textarea.el); + updateEditorState(); + if (focus) requestAnimationFrame(() => textarea.el.focus()); + + function toggleVote(vote) { + state.draftVote = state.draftVote === vote ? 0 : vote; + state.draftDirty = true; + state.editorError = ""; + updateEditorState(); + } + + function updateEditorState() { + const validation = validateReviewDraft({ + comment: state.draftComment, + vote: state.draftVote, + }); + const unchanged = !hasReviewChanged(state.userReview, validation); + const validationMessage = + state.draftDirty && validation.errorKey + ? getReviewString(validation.errorKey, { + max: REVIEW_MAX_COMMENT_LENGTH, + }) + : ""; + + counter.textContent = `${state.draftComment.length}/${REVIEW_MAX_COMMENT_LENGTH}`; + error.textContent = state.editorError || validationMessage; + upButton.el.classList.toggle("selected", state.draftVote === 1); + downButton.el.classList.toggle("selected", state.draftVote === -1); + upButton.el.setAttribute("aria-pressed", state.draftVote === 1); + downButton.el.setAttribute("aria-pressed", state.draftVote === -1); + upIcon.className = `icon ${state.draftVote === 1 ? "like-solid" : "like"}`; + downIcon.className = `icon ${state.draftVote === -1 ? "like-solid" : "like"}`; + saveButton.disabled = Boolean( + validation.errorKey || unchanged || state.busy, + ); + saveButton.textContent = state.busy + ? strings["loading..."] + : state.userReview + ? strings.update + : strings.save; + } + } + + function renderReviews() { + if (state.closed) return; + body.el.classList.remove("loading"); + + if (state.reviewListError) { + body.el.replaceChildren( +
    + {strings["plugin-review:load-failed"]} + +
    , + ); return; } - reviews.forEach((review) => { - if (!review.comment) return; - review.author = author; - body.append(); + const { ownReview, communityReviews } = partitionPluginReviews( + state.reviews, + state.userReview, + state.user?.id, + ); + const showOwnReview = Boolean(ownReview && !state.expanded); + + if (!showOwnReview && !communityReviews.length && !state.expanded) { + body.el.replaceChildren( +
    + + {strings["plugin-review:empty-title"]} + {strings["plugin-review:empty-description"]} +
    , + ); + return; + } + + const sections = []; + if (showOwnReview) { + sections.push( +
    +
    + {strings["plugin-review:yours"]} +
    +
    + +
    +
    , + ); + } + + sections.push( +
    +
    + {strings["plugin-review:community"]} +
    + {communityReviews.length ? ( +
    + {communityReviews.map((review) => ( + + ))} +
    + ) : ( +
    + {strings["plugin-review:no-other-reviews"]} +
    + )} +
    , + ); + + body.el.replaceChildren(...sections); + } + + function openEditor() { + state.draftComment = state.userReview?.comment || ""; + state.draftVote = state.userReview?.vote || 0; + state.draftDirty = false; + state.editorError = ""; + state.expanded = true; + state.resumeDraftAfterSignIn = false; + renderComposer({ focus: true }); + renderReviews(); + } + + function cancelEditor() { + if (state.busy) return; + state.expanded = false; + state.editorError = ""; + state.resumeDraftAfterSignIn = false; + renderComposer(); + renderReviews(); + } + + async function signIn() { + if (state.busy) return; + state.busy = true; + state.editorError = ""; + renderComposer(); + + try { + await auth.login(); + const user = await auth.getLoggedInUser(true); + if (!user) { + state.busy = false; + state.editorError = strings["plugin-review:login-incomplete"]; + renderComposer(); + return; + } + state.user = user; + const { ownReview: listedReview } = partitionPluginReviews( + state.reviews, + null, + state.user.id, + ); + state.userReview = await loadUserReview().catch( + () => listedReview || null, + ); + state.busy = false; + if (state.resumeDraftAfterSignIn) { + state.resumeDraftAfterSignIn = false; + state.editorError = ""; + state.expanded = true; + renderComposer({ focus: true }); + renderReviews(); + } else { + openEditor(); + } + } catch { + state.busy = false; + state.editorError = strings["plugin-review:sign-in-failed"]; + renderComposer(); + } + } + + async function saveReview() { + if (state.busy) return; + const review = validateReviewDraft({ + comment: state.draftComment, + vote: state.draftVote, }); - } catch (error) { - body.textContent = error.message; - } finally { - body.classList.remove("loading"); + if (review.errorKey || !hasReviewChanged(state.userReview, review)) return; + + state.busy = true; + state.editorError = ""; + renderComposer(); + + try { + const result = await requestJson(Url.join(config.API_BASE, "comment"), { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + plugin_id: pluginId, + comment: review.comment, + vote: review.vote, + }), + }); + const previousReview = state.userReview; + state.userReview = { + ...previousReview, + id: result.id, + plugin_id: pluginId, + user_id: state.user.id, + name: state.user.name, + github: state.user.github, + comment: result.comment, + vote: result.vote, + updated_at: new Date().toISOString(), + }; + state.reviews = [ + state.userReview, + ...state.reviews.filter( + (item) => + item.id !== state.userReview.id && item.user_id !== state.user.id, + ), + ]; + state.stats = updateReviewStats( + state.stats, + previousReview, + state.userReview, + ); + onStatsChange(state.stats); + state.busy = false; + state.expanded = false; + state.editorError = ""; + state.resumeDraftAfterSignIn = false; + renderComposer(); + renderReviews(); + toast(strings.success); + } catch (error) { + state.busy = false; + if (error.status === 401) { + state.user = null; + state.expanded = false; + state.resumeDraftAfterSignIn = true; + state.editorError = strings["plugin-review:session-expired-review"]; + renderComposer(); + } else { + state.editorError = strings["plugin-review:save-failed"]; + renderComposer({ focus: true }); + } + } + } + + async function deleteReview() { + if (state.busy || !state.userReview?.id) return; + const approved = await confirm( + strings.delete, + strings["plugin-review:delete-confirmation"], + false, + { + direction: getLocaleDirection(locale), + aboveOverlay: true, + }, + ); + if (!approved || state.closed) return; + + state.busy = true; + state.editorError = ""; + renderComposer(); + + try { + const previousReview = state.userReview; + await requestJson( + Url.join(config.API_BASE, "comment", previousReview.id), + { + method: "DELETE", + headers: { "Content-Type": "application/json" }, + }, + ); + state.reviews = state.reviews.filter( + (item) => + item.id !== previousReview.id && item.user_id !== state.user.id, + ); + state.stats = updateReviewStats(state.stats, previousReview, null); + onStatsChange(state.stats); + state.userReview = null; + state.busy = false; + state.expanded = false; + renderComposer(); + renderReviews(); + toast(strings.success); + } catch (error) { + state.busy = false; + if (error.status === 401) { + state.user = null; + state.expanded = false; + state.editorError = strings["plugin-review:session-expired-continue"]; + renderComposer(); + } else { + state.editorError = strings["plugin-review:delete-failed"]; + renderComposer({ focus: true }); + } + } + } + + async function retryReviews() { + body.el.classList.add("loading"); + state.reviewListError = null; + try { + state.reviews = await loadReviews(); + } catch (error) { + state.reviewListError = error; + } finally { + renderReviews(); + } + } + + function loadReviews() { + return fsOperation(config.API_BASE, `/comments/${pluginId}`).readFile( + "json", + ); + } + + async function loadUserReview() { + const review = await requestJson( + Url.join(config.API_BASE, "user", "comment", pluginId), + ); + return review?.id ? review : null; + } + + async function requestJson(url, options) { + const response = await fetch(url, options); + const result = await response.json().catch(() => ({})); + if (!response.ok) { + const error = new Error(); + error.status = response.status; + throw error; + } + return result; } function closeReviews() { + if (state.closed) return; + state.closed = true; + removeDragListeners(); actionStack.remove("reviews"); - container.classList.add("hide"); + container.el.classList.add("hide"); setTimeout(() => { - mask.el.remove(); - container.el.remove(); + mask.el?.remove(); + container.el?.remove(); }, 300); } @@ -519,32 +1095,38 @@ async function showReviews(pluginId, author) { * @param {TouchEvent} e */ function ontouchstart(e) { + if (state.closed || e.touches.length !== 1) return; + removeDragListeners(); const { clientY } = e.touches[0]; const { top } = container.el.getBoundingClientRect(); const y = clientY - top; let dy = 0; - container.style.transition = "none"; + container.el.style.transition = "none"; document.addEventListener("touchmove", ontouchmove); document.addEventListener("touchend", ontouchend); document.addEventListener("touchcancel", ontouchend); + removeDragListeners = () => { + document.removeEventListener("touchmove", ontouchmove); + document.removeEventListener("touchend", ontouchend); + document.removeEventListener("touchcancel", ontouchend); + }; function ontouchmove(e) { + if (e.touches.length !== 1) return; const { clientY } = e.touches[0]; dy = clientY - top - y; if (dy < 0) dy = 0; - container.style.transform = `translateY(${dy}px)`; + container.el.style.transform = `translateY(${dy}px)`; } function ontouchend() { - document.removeEventListener("touchmove", ontouchmove); - document.removeEventListener("touchend", ontouchend); - document.removeEventListener("touchcancel", ontouchcancel); + removeDragListeners(); if (dy < 100) { - container.style.transition = "transform 0.3s ease-in-out"; - container.style.transform = "translateY(0)"; + container.el.style.transition = "transform 0.3s ease-in-out"; + container.el.style.transform = "translateY(0)"; return; } closeReviews(); @@ -552,50 +1134,102 @@ async function showReviews(pluginId, author) { } } +function ReviewAvatar({ user, className = "review-avatar" }) { + const avatarUrl = resolveReviewAvatarUrl(user); + return ( + + ); +} + +function autosizeReviewInput(textarea) { + textarea.style.height = "auto"; + textarea.style.height = `${Math.min(textarea.scrollHeight, 144)}px`; +} + +function getReviewString(key, replacements = {}) { + let value = strings[key] || key; + for (const [name, replacement] of Object.entries(replacements)) { + value = value.replaceAll(`{${name}}`, String(replacement)); + } + return value; +} + function Review({ name, github, + avatar_url: avatarUrl, + updated_at: updatedAt, vote, comment, author, author_reply: authorReply, + isOwn, + onEdit, + locale, }) { - let dp = Url.join(config.API_BASE, `../user.png`); - let voteImage = Ref(); - let review = Ref(); - - if (github) { - dp = `https://avatars.githubusercontent.com/${github}`; - } - - if (vote === 1) { - voteImage.style.backgroundImage = `url(${Url.join(config.API_BASE, `../thumbs-up.gif`)})`; - } else if (vote === -1) { - voteImage.style.backgroundImage = `url(${Url.join(config.API_BASE, `../thumbs-down.gif`)})`; - } - - if (authorReply) { - setTimeout(() => { - review.append( -

    - {authorReply} -

    , - ); - }, 0); - } - + const reviewDate = formatReviewDate(updatedAt, Date.now(), locale); + const hasComment = typeof comment === "string" && Boolean(comment.trim()); return ( -
    +
    - - {name} - + /> + + + {name} + {isOwn ? {strings["plugin-review:you"]} : null} + + {reviewDate ? ( + + ) : null} + + {vote ? ( + + + + ) : null} + {isOwn ? ( + + ) : null}
    -

    {comment}

    -
    + {hasComment ? ( +

    {comment}

    + ) : isOwn && Number(vote) === 1 ? ( +

    + {strings["plugin-review:recommended"]} +

    + ) : null} + {authorReply ? ( +

    + {authorReply} +

    + ) : null} + ); } diff --git a/src/pages/plugin/reviewUtils.js b/src/pages/plugin/reviewUtils.js new file mode 100644 index 0000000000..73722c6d5a --- /dev/null +++ b/src/pages/plugin/reviewUtils.js @@ -0,0 +1,180 @@ +export const REVIEW_MAX_COMMENT_LENGTH = 250; + +const SECOND = 1000; +const MINUTE = 60 * SECOND; +const HOUR = 60 * MINUTE; +const DAY = 24 * HOUR; + +function parseReviewDate(value) { + if (typeof value !== "string" || !value.trim()) return null; + + const trimmed = value.trim(); + const normalized = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(?:\.\d+)?$/.test( + trimmed, + ) + ? `${trimmed.replace(" ", "T")}Z` + : trimmed; + const date = new Date(normalized); + return Number.isNaN(date.getTime()) ? null : date; +} + +export function formatReviewDate(value, now = Date.now(), locale = "en-US") { + const date = parseReviewDate(value); + const currentTime = now instanceof Date ? now.getTime() : Number(now); + if (!date || !Number.isFinite(currentTime)) return null; + + const difference = date.getTime() - currentTime; + const absoluteDifference = Math.abs(difference); + let unit = "second"; + let amount = 0; + + if (absoluteDifference < 45 * SECOND) { + amount = 0; + } else if (absoluteDifference < 90 * SECOND) { + unit = "minute"; + amount = Math.sign(difference); + } else if (absoluteDifference < 45 * MINUTE) { + unit = "minute"; + amount = Math.round(difference / MINUTE); + } else if (absoluteDifference < 90 * MINUTE) { + unit = "hour"; + amount = Math.sign(difference); + } else if (absoluteDifference < 22 * HOUR) { + unit = "hour"; + amount = Math.round(difference / HOUR); + } else if (absoluteDifference < 36 * HOUR) { + unit = "day"; + amount = Math.sign(difference); + } else if (absoluteDifference < 26 * DAY) { + unit = "day"; + amount = Math.round(difference / DAY); + } else if (absoluteDifference < 45 * DAY) { + unit = "month"; + amount = Math.sign(difference); + } else if (absoluteDifference < 320 * DAY) { + unit = "month"; + amount = Math.round(difference / (30 * DAY)); + } else if (absoluteDifference < 548 * DAY) { + unit = "year"; + amount = Math.sign(difference); + } else { + unit = "year"; + amount = Math.round(difference / (365 * DAY)); + } + + const relative = new Intl.RelativeTimeFormat(locale, { + numeric: "auto", + }).format(amount, unit); + + return { + dateTime: date.toISOString(), + relative, + title: date.toLocaleString(locale, { + dateStyle: "medium", + timeStyle: "short", + }), + }; +} + +export function resolveReviewAvatarUrl(user = {}) { + const avatarUrl = + typeof user?.avatar_url === "string" ? user.avatar_url.trim() : ""; + if (avatarUrl) return avatarUrl; + + const github = typeof user?.github === "string" ? user.github.trim() : ""; + return github ? `https://avatars.githubusercontent.com/${github}` : null; +} + +function hasSameId(left, right) { + if (left === null || left === undefined) return false; + if (right === null || right === undefined) return false; + return String(left) === String(right); +} + +export function partitionPluginReviews(reviews = [], currentReview, userId) { + const reviewList = Array.isArray(reviews) ? reviews : []; + const ownReview = + currentReview || + reviewList.find((review) => hasSameId(review?.user_id, userId)) || + null; + const communityReviews = reviewList.filter((review) => { + if (!review?.comment?.trim()) return false; + if (hasSameId(review.user_id, userId)) return false; + if (hasSameId(review.id, ownReview?.id)) return false; + return !hasSameId(review.user_id, ownReview?.user_id); + }); + + return { ownReview, communityReviews }; +} + +export function normalizeReviewDraft(draft = {}) { + const { comment = "", vote = 0 } = draft || {}; + return { + comment: typeof comment === "string" ? comment.trim() : "", + vote: [-1, 0, 1].includes(Number(vote)) ? Number(vote) : 0, + }; +} + +export function validateReviewDraft(draft) { + const normalized = normalizeReviewDraft(draft); + + if (normalized.comment.length > REVIEW_MAX_COMMENT_LENGTH) { + return { + ...normalized, + errorKey: "plugin-review:error-max-length", + }; + } + if (normalized.vote === -1 && !normalized.comment) { + return { + ...normalized, + errorKey: "plugin-review:error-downvote-comment", + }; + } + if (normalized.vote === 0 && !normalized.comment) { + return { ...normalized, errorKey: "plugin-review:error-empty" }; + } + + return normalized; +} + +export function hasReviewChanged(previousReview, nextReview) { + const previous = normalizeReviewDraft(previousReview); + const next = normalizeReviewDraft(nextReview); + return previous.comment !== next.comment || previous.vote !== next.vote; +} + +export function updateReviewStats(stats, previousReview, nextReview) { + const previous = normalizeReviewDraft(previousReview); + const next = normalizeReviewDraft(nextReview); + let votesUp = Number(stats?.votesUp) || 0; + let votesDown = Number(stats?.votesDown) || 0; + let commentCount = Number(stats?.commentCount) || 0; + + if (previous.vote === 1) votesUp -= 1; + if (previous.vote === -1) votesDown -= 1; + if (next.vote === 1) votesUp += 1; + if (next.vote === -1) votesDown += 1; + if (previous.comment) commentCount -= 1; + if (next.comment) commentCount += 1; + + return { + votesUp: Math.max(0, votesUp), + votesDown: Math.max(0, votesDown), + commentCount: Math.max(0, commentCount), + }; +} + +export function getRatingLabel(votesUp, votesDown) { + const up = Number(votesUp) || 0; + const down = Number(votesDown) || 0; + const total = up + down; + return total ? `${Math.round((up / total) * 100)}%` : "unrated"; +} + +export function getRatingClass(rating) { + if (rating === "unrated") return "rating-value"; + const value = Number.parseInt(rating, 10); + if (value >= 80) return "rating-value rating-high"; + if (value >= 50) return "rating-value rating-medium"; + return "rating-value rating-low"; +} diff --git a/tests/unit/confirm.test.js b/tests/unit/confirm.test.js new file mode 100644 index 0000000000..cec4ae2d48 --- /dev/null +++ b/tests/unit/confirm.test.js @@ -0,0 +1,103 @@ +// @vitest-environment happy-dom + +import tag from "html-tag-js"; +import { + afterAll, + afterEach, + beforeEach, + describe, + expect, + it, + vi, +} from "vitest"; + +const mocks = vi.hoisted(() => ({ + push: vi.fn(), + remove: vi.fn(), + restoreTheme: vi.fn(), +})); + +vi.mock("components/checkbox", () => ({ default: () => null })); +vi.mock("dompurify", () => ({ + default: { sanitize: vi.fn((value) => value) }, +})); +vi.mock("lib/actionStack", () => ({ + default: { + push: mocks.push, + remove: mocks.remove, + }, +})); +vi.mock("lib/restoreTheme", () => ({ default: mocks.restoreTheme })); + +import confirm from "dialogs/confirm"; + +const originalApp = globalThis.app; +const originalStrings = globalThis.strings; +const originalTag = globalThis.tag; + +function restoreGlobal(name, value) { + if (value === undefined) { + Reflect.deleteProperty(globalThis, name); + } else { + globalThis[name] = value; + } +} + +function getDialog() { + return document.querySelector(".prompt.confirm"); +} + +function getButtons() { + return document.querySelectorAll(".button-container button"); +} + +describe("confirm dialog layering", () => { + beforeEach(() => { + vi.useFakeTimers(); + vi.clearAllMocks(); + document.body.replaceChildren(); + globalThis.tag = tag; + globalThis.app = document.body; + globalThis.strings = { ok: "OK", cancel: "Cancel" }; + }); + + afterEach(() => { + vi.runOnlyPendingTimers(); + vi.useRealTimers(); + document.body.replaceChildren(); + }); + + afterAll(() => { + restoreGlobal("app", originalApp); + restoreGlobal("strings", originalStrings); + restoreGlobal("tag", originalTag); + }); + + it("keeps the default layer and resolves false when cancelled", async () => { + const result = confirm("Delete", "Delete this review?"); + const dialog = getDialog(); + + expect(dialog).not.toBeNull(); + expect(dialog.className).toBe("prompt confirm"); + + getButtons()[0].click(); + + await expect(result).resolves.toBe(false); + }); + + it("applies the overlay layer without losing RTL and resolves true", async () => { + const result = confirm("Delete", "Delete this review?", false, { + direction: "rtl", + aboveOverlay: true, + }); + const dialog = getDialog(); + + expect(dialog).not.toBeNull(); + expect(dialog.className).toBe("prompt confirm above-overlay"); + expect(dialog.dir).toBe("rtl"); + + getButtons()[1].click(); + + await expect(result).resolves.toBe(true); + }); +}); diff --git a/tests/unit/pluginReview.test.js b/tests/unit/pluginReview.test.js new file mode 100644 index 0000000000..efb70b1bbc --- /dev/null +++ b/tests/unit/pluginReview.test.js @@ -0,0 +1,183 @@ +import { describe, expect, it } from "vitest"; +import { getIntlLocale, getLocaleDirection } from "lib/lang"; +import { + formatReviewDate, + getRatingClass, + getRatingLabel, + hasReviewChanged, + normalizeReviewDraft, + partitionPluginReviews, + resolveReviewAvatarUrl, + updateReviewStats, + validateReviewDraft, +} from "pages/plugin/reviewUtils"; + +describe("plugin review dates", () => { + it("formats database timestamps as website-style relative dates", () => { + const formatted = formatReviewDate( + "2026-08-26 12:00:00", + Date.parse("2026-08-28T12:00:00Z"), + "en-US", + ); + + expect(formatted?.dateTime).toBe("2026-08-26T12:00:00.000Z"); + expect(formatted?.relative).toBe("2 days ago"); + expect(formatted?.title).toBeTruthy(); + }); + + it("uses the selected locale for relative and absolute dates", () => { + const value = "2026-08-26 12:00:00"; + const now = Date.parse("2026-08-28T12:00:00Z"); + const formatted = formatReviewDate(value, now, "fr-FR"); + const date = new Date("2026-08-26T12:00:00Z"); + + expect(formatted?.relative).toBe( + new Intl.RelativeTimeFormat("fr-FR", { numeric: "auto" }).format( + -2, + "day", + ), + ); + expect(formatted?.title).toBe( + date.toLocaleString("fr-FR", { + dateStyle: "medium", + timeStyle: "short", + }), + ); + }); + + it("normalizes Acode-specific locale codes", () => { + expect(getIntlLocale("pu-in")).toBe("pa-IN"); + expect(getIntlLocale("ir-fa")).toBe("fa-IR"); + expect(getIntlLocale("mm-unicode")).toBe("my-MM"); + expect(getIntlLocale("mm-zawgyi")).toBe("my-MM"); + expect(getLocaleDirection("fa-IR")).toBe("rtl"); + expect(getLocaleDirection("ar-YE")).toBe("rtl"); + expect(getLocaleDirection("he-IL")).toBe("rtl"); + expect(getLocaleDirection("de-DE")).toBe("ltr"); + }); + + it("hides missing or invalid review dates", () => { + expect(formatReviewDate()).toBeNull(); + expect(formatReviewDate("not-a-date")).toBeNull(); + }); +}); + +describe("plugin review avatars", () => { + it("prefers an explicit avatar and falls back to GitHub", () => { + expect( + resolveReviewAvatarUrl({ + avatar_url: " https://example.com/avatar.png ", + github: "acode-foundation", + }), + ).toBe("https://example.com/avatar.png"); + expect(resolveReviewAvatarUrl({ github: " acode-foundation " })).toBe( + "https://avatars.githubusercontent.com/acode-foundation", + ); + }); + + it("uses the local placeholder when no avatar is available", () => { + expect(resolveReviewAvatarUrl()).toBeNull(); + expect(resolveReviewAvatarUrl({ avatar_url: " ", github: " " })).toBeNull(); + }); +}); + +describe("plugin review ordering", () => { + it("pins and deduplicates the current user's review across id types", () => { + const reviews = [ + { id: 1, user_id: 10, comment: "First" }, + { id: 2, user_id: "7", comment: "Mine from the list" }, + { id: 3, user_id: 11, comment: "Second" }, + ]; + const currentReview = { + id: "2", + user_id: 7, + comment: "", + vote: 1, + }; + + expect(partitionPluginReviews(reviews, currentReview, "7")).toEqual({ + ownReview: currentReview, + communityReviews: [reviews[0], reviews[2]], + }); + }); +}); + +describe("plugin review draft", () => { + it("normalizes whitespace and preserves valid votes", () => { + expect(normalizeReviewDraft({ comment: " Very useful ", vote: "1" })).toEqual( + { + comment: "Very useful", + vote: 1, + }, + ); + }); + + it("supports an upvote without text and validates negative feedback", () => { + expect(validateReviewDraft({ vote: 1 })).toEqual({ comment: "", vote: 1 }); + expect(validateReviewDraft({ comment: " ", vote: -1 }).errorKey).toBe( + "plugin-review:error-downvote-comment", + ); + expect(validateReviewDraft({ comment: " ", vote: 0 }).errorKey).toBe( + "plugin-review:error-empty", + ); + }); + + it("enforces the 250 character limit", () => { + expect(validateReviewDraft({ comment: "x".repeat(250), vote: 0 })).toEqual({ + comment: "x".repeat(250), + vote: 0, + }); + expect( + validateReviewDraft({ comment: "x".repeat(251), vote: 0 }).errorKey, + ).toBe("plugin-review:error-max-length"); + }); + + it("compares normalized drafts to prevent duplicate submissions", () => { + expect( + hasReviewChanged( + { comment: "Useful", vote: 1 }, + { comment: " Useful ", vote: "1" }, + ), + ).toBe(false); + expect( + hasReviewChanged( + { comment: "Useful", vote: 1 }, + { comment: "Updated", vote: 1 }, + ), + ).toBe(true); + }); +}); + +describe("plugin review metrics", () => { + it("moves votes and comment counts without inflation", () => { + expect( + updateReviewStats( + { votesUp: 8, votesDown: 2, commentCount: 4 }, + { vote: 1, comment: "Old" }, + { vote: -1, comment: "New" }, + ), + ).toEqual({ votesUp: 7, votesDown: 3, commentCount: 4 }); + }); + + it("handles vote-only reviews and deletion", () => { + const added = updateReviewStats( + { votesUp: 0, votesDown: 0, commentCount: 0 }, + null, + { vote: 1, comment: "" }, + ); + expect(added).toEqual({ votesUp: 1, votesDown: 0, commentCount: 0 }); + expect(updateReviewStats(added, { vote: 1 }, null)).toEqual({ + votesUp: 0, + votesDown: 0, + commentCount: 0, + }); + }); + + it("formats rating labels and visual states", () => { + expect(getRatingLabel(0, 0)).toBe("unrated"); + expect(getRatingLabel(8, 2)).toBe("80%"); + expect(getRatingClass("80%")).toContain("rating-high"); + expect(getRatingClass("50%")).toContain("rating-medium"); + expect(getRatingClass("49%")).toContain("rating-low"); + }); +}); From 2a17db0221ae18eaec5183ce8014ce75538b5fdc Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sat, 29 Aug 2026 09:40:11 +0000 Subject: [PATCH 079/195] Improve selection menu UX and plugin action overflow (#2813) * feat(editor): improve mobile selection menu overflow UX * fix(editor): prevent selection actions during overflow scrolling * fix(editor): validate pointer displacement on release --- src/cm/selectionMenuUtils.ts | 91 ++++++ src/cm/touchSelectionMenu.js | 365 ++++++++++++++++++++++--- src/lib/selectionMenu.js | 60 +++- src/main.scss | 154 ++++++++++- tests/unit/selectionMenuButton.test.ts | 89 ++++++ tests/unit/selectionMenuUtils.test.ts | 34 ++- 6 files changed, 737 insertions(+), 56 deletions(-) create mode 100644 tests/unit/selectionMenuButton.test.ts diff --git a/src/cm/selectionMenuUtils.ts b/src/cm/selectionMenuUtils.ts index 414dbfa836..65abc0ceda 100644 --- a/src/cm/selectionMenuUtils.ts +++ b/src/cm/selectionMenuUtils.ts @@ -1,4 +1,5 @@ export interface SelectionMenuItem { + id?: string; mode?: "selected" | "all"; readOnly?: boolean; } @@ -8,6 +9,70 @@ export interface SelectionMenuFilterOptions { hasSelection: boolean; } +const POINTER_MOVE_TOLERANCE = 8; + +/** Preserve editor focus during a pointer press and activate on release. */ +export function bindSelectionMenuButton( + button: HTMLButtonElement, + onActivate: (event: Event) => void, +): void { + let activePointerId: number | null = null; + let pointerStart: { x: number; y: number } | null = null; + + const stopEvent = (event: Event) => { + event.preventDefault(); + event.stopPropagation(); + }; + const clearPointer = () => { + activePointerId = null; + pointerStart = null; + button.classList.remove("is-pressed"); + }; + const pointerMoved = (event: PointerEvent) => { + if (!pointerStart) return false; + const xDistance = event.clientX - pointerStart.x; + const yDistance = event.clientY - pointerStart.y; + return ( + xDistance ** 2 + yDistance ** 2 > + POINTER_MOVE_TOLERANCE ** 2 + ); + }; + + button.addEventListener("pointerdown", (event) => { + if (event.isPrimary === false) return; + if (event.pointerType === "mouse" && event.button !== 0) return; + activePointerId = event.pointerId; + pointerStart = { x: event.clientX, y: event.clientY }; + button.classList.add("is-pressed"); + stopEvent(event); + try { + button.setPointerCapture?.(event.pointerId); + } catch { + // Pointer capture is optional in older Android WebViews. + } + }); + + button.addEventListener("pointermove", (event) => { + if (event.pointerId !== activePointerId || !pointerStart) return; + if (pointerMoved(event)) clearPointer(); + }); + + button.addEventListener("pointerup", (event) => { + if (event.pointerId !== activePointerId || !pointerStart) return; + const moved = pointerMoved(event); + clearPointer(); + stopEvent(event); + if (!moved) onActivate(event); + }); + + button.addEventListener("pointercancel", clearPointer); + button.addEventListener("lostpointercapture", clearPointer); + button.addEventListener("click", (event) => { + stopEvent(event); + if (event.detail === 0) onActivate(event); + }); +} + /** Filter selection actions using Acode's read-only and selection rules. */ export function filterSelectionMenuItems( items: readonly T[], @@ -23,3 +88,29 @@ export function filterSelectionMenuItems( return true; }); } + +const SELECTION_PRIMARY_ACTIONS = new Set([ + "copy", + "cut", + "paste", + "select-all", +]); +const CARET_PRIMARY_ACTIONS = new Set(["paste", "select-all"]); + +/** Keep the touch toolbar compact by moving secondary/plugin actions into More. */ +export function partitionSelectionMenuItems( + items: readonly T[], + options: Pick, +): { primary: T[]; overflow: T[] } { + const primaryIds = options.hasSelection + ? SELECTION_PRIMARY_ACTIONS + : CARET_PRIMARY_ACTIONS; + const primary: T[] = []; + const overflow: T[] = []; + + for (const item of items) { + (primaryIds.has(item.id ?? "") ? primary : overflow).push(item); + } + + return { primary, overflow }; +} diff --git a/src/cm/touchSelectionMenu.js b/src/cm/touchSelectionMenu.js index f99badae35..fc004d5327 100644 --- a/src/cm/touchSelectionMenu.js +++ b/src/cm/touchSelectionMenu.js @@ -1,3 +1,4 @@ +import { LSPPlugin } from "@codemirror/lsp-client"; import { EditorSelection } from "@codemirror/state"; import { focusEditorIfEditable, @@ -5,8 +6,13 @@ import { resolveReadOnlyContextSelection, shouldCommitReadOnlyTap, } from "cm/editorReadOnly"; -import { filterSelectionMenuItems } from "cm/selectionMenuUtils"; +import { + bindSelectionMenuButton, + filterSelectionMenuItems, + partitionSelectionMenuItems, +} from "cm/selectionMenuUtils"; import selectionMenu from "lib/selectionMenu"; +import { animate } from "motion"; export { filterSelectionMenuItems } from "cm/selectionMenuUtils"; @@ -18,6 +24,7 @@ const MENU_SHOW_DELAY = 120; const MENU_CARET_GAP = 10; const MENU_SELECTION_GAP = 12; const MENU_HANDLE_CLEARANCE = 28; +const OVERFLOW_GRID_THRESHOLD = 10; const TAP_MAX_COLUMN_DELTA = 2; const TAP_MAX_POS_DELTA = 2; @@ -127,6 +134,19 @@ function clamp(value, min, max) { return Math.max(min, Math.min(max, value)); } +function hasCodeActionProvider(view) { + return LSPPlugin.getAll(view, "codeAction").some( + (plugin) => !!plugin.client.serverCapabilities?.codeActionProvider, + ); +} + +function animationsDisabled() { + return ( + document.body.classList.contains("no-animation") || + globalThis.matchMedia?.("(prefers-reduced-motion: reduce)").matches + ); +} + export default function createTouchSelectionMenu(view, options = {}) { return new TouchSelectionMenuController(view, options); } @@ -149,6 +169,11 @@ class TouchSelectionMenuController { #handlingMenuAction = false; #menuShowTimer = null; #tooltipObserver = null; + #dismissedSelection = null; + #renderedMenuKey = ""; + #menuAnchor = null; + #menuAnimation = null; + #viewAnimations = []; constructor(view, options = {}) { this.#view = view; @@ -226,6 +251,7 @@ class TouchSelectionMenuController { this.#pointerSelectionSession = null; this.#readOnlyTapSession = null; this.#pendingPointerSelectionClick = null; + this.#dismissedSelection = null; this.#menuRequested = false; this.#isPointerInteracting = false; this.#isScrolling = false; @@ -238,6 +264,7 @@ class TouchSelectionMenuController { setSelection(value) { if (!this.#enabled) return; if (value) { + this.#dismissedSelection = null; this.#menuRequested = true; } this.onStateChanged({ @@ -254,6 +281,7 @@ class TouchSelectionMenuController { this.#hideMenu(); return; } + this.#dismissedSelection = null; this.#scheduleMenuShow(MENU_SHOW_DELAY); } @@ -279,6 +307,12 @@ class TouchSelectionMenuController { onStateChanged(meta = {}) { if (!this.#enabled) return; if (meta.selectionChanged) this.#cancelReadOnlyTap(); + if ( + meta.selectionChanged && + this.#dismissedSelection !== this.#selectionSignature() + ) { + this.#dismissedSelection = null; + } if (this.#handlingMenuAction) return; if (!this.#shouldShowMenu()) { if (!this.#hasSelection()) { @@ -298,6 +332,7 @@ class TouchSelectionMenuController { this.#pointerSelectionSession = null; this.#readOnlyTapSession = null; this.#pendingPointerSelectionClick = null; + this.#dismissedSelection = null; this.#menuRequested = false; this.#isPointerInteracting = false; this.#isScrolling = false; @@ -321,6 +356,7 @@ class TouchSelectionMenuController { } event.preventDefault(); event.stopPropagation(); + this.#dismissedSelection = null; this.#menuRequested = true; this.#scheduleMenuShow(MENU_SHOW_DELAY); }; @@ -337,6 +373,7 @@ class TouchSelectionMenuController { return; } if (target instanceof Node && this.#view.dom.contains(target)) { + this.#dismissedSelection = null; this.#capturePointerSelection(event); this.#captureReadOnlyTap(event); this.#isPointerInteracting = true; @@ -549,6 +586,12 @@ class TouchSelectionMenuController { #shouldShowMenu() { if (this.#isScrolling || this.#isPointerInteracting) return false; if (!this.#view.hasFocus && !this.#isReadOnly()) return false; + if ( + !this.#menuRequested && + this.#dismissedSelection === this.#selectionSignature() + ) { + return false; + } return this.#hasSelection() || this.#menuRequested; } @@ -616,52 +659,248 @@ class TouchSelectionMenuController { } #showMenu(anchor) { + this.#menuAnchor = anchor; const hasSelection = this.#hasSelection(); - const items = filterSelectionMenuItems(selectionMenu(), { - readOnly: this.#isReadOnly(), - hasSelection, - }); + const items = filterSelectionMenuItems( + selectionMenu({ + codeActionsAvailable: hasCodeActionProvider(this.#view), + }), + { + readOnly: this.#isReadOnly(), + hasSelection, + }, + ); - this.$menu.innerHTML = ""; if (!items.length) { this.#menuRequested = false; this.#hideMenu(true); return; } - items.forEach(({ onclick, text }) => { - const $item = document.createElement("div"); - if (typeof text === "string") { - $item.textContent = text; - } else if (text instanceof Node) { - $item.append(text.cloneNode(true)); - } - let handled = false; - const runAction = (event) => { - if (handled) return; - handled = true; - event.preventDefault(); - event.stopPropagation(); - this.#handlingMenuAction = true; - try { - onclick?.(); - } finally { - this.#handlingMenuAction = false; - this.#menuRequested = false; - this.#hideMenu(); - focusEditorIfEditable(this.#view); - } - }; - $item.addEventListener("pointerdown", runAction); - $item.addEventListener("click", runAction); - this.$menu.append($item); - }); + const menuKey = `${hasSelection}:${items + .map((item) => item.id || this.#getItemLabel(item)) + .join("|")}`; + if (menuKey !== this.#renderedMenuKey) { + const groups = partitionSelectionMenuItems(items, { hasSelection }); + this.#renderMenu(groups.primary, groups.overflow); + this.#renderedMenuKey = menuKey; + } if (!this.$menu.isConnected) { this.#container.append(this.$menu); } + const isOpening = !this.#menuActive; + this.#positionMenu(anchor); + this.#menuActive = true; + this.#menuRequested = false; + if (isOpening) this.#animateMenuIn(); + } + + #renderMenu(primaryItems, overflowItems) { + this.$menu.replaceChildren(); + this.$menu.setAttribute("aria-label", "Text selection actions"); + + const $primary = document.createElement("div"); + $primary.className = "cursor-menu__primary"; + $primary.setAttribute("role", "toolbar"); + for (const item of primaryItems) { + $primary.append(this.#createActionButton(item, false)); + } + + if (overflowItems.length) { + const $overflow = document.createElement("div"); + $overflow.className = "cursor-menu__overflow"; + if (overflowItems.length > OVERFLOW_GRID_THRESHOLD) { + $overflow.classList.add("cursor-menu__overflow--grid"); + } + $overflow.setAttribute("role", "toolbar"); + $overflow.setAttribute("aria-label", "More text actions"); + $overflow.hidden = true; + + const backLabel = globalThis.strings?.back || "Back"; + const $back = document.createElement("button"); + $back.type = "button"; + $back.className = "cursor-menu__action cursor-menu__back"; + $back.setAttribute("aria-label", backLabel); + $back.append(this.#createIcon("arrow_back")); + + const $overflowActions = document.createElement("div"); + $overflowActions.className = "cursor-menu__overflow-actions"; + for (const item of overflowItems) { + $overflowActions.append(this.#createActionButton(item, true)); + } + $overflow.append($back, $overflowActions); + + const moreLabel = globalThis.strings?.more || "More"; + const $more = document.createElement("button"); + $more.type = "button"; + $more.className = "cursor-menu__action cursor-menu__more"; + $more.setAttribute("aria-label", moreLabel); + $more.setAttribute("aria-expanded", "false"); + $more.append(this.#createIcon("keyboard_control")); + bindSelectionMenuButton($more, () => { + $more.setAttribute("aria-expanded", "true"); + this.#setOverflowExpanded($primary, $overflow, true); + }); + bindSelectionMenuButton($back, () => { + $more.setAttribute("aria-expanded", "false"); + this.#setOverflowExpanded($primary, $overflow, false); + }); + + $primary.append($more); + this.$menu.append($primary, $overflow); + return; + } + + this.$menu.append($primary); + } + + #createActionButton(item, isOverflow) { + const $item = document.createElement("button"); + const label = this.#getItemLabel(item); + $item.type = "button"; + $item.className = `cursor-menu__action${ + isOverflow ? " cursor-menu__overflow-action" : "" + }`; + $item.setAttribute("aria-label", label); + if (label !== "More action") $item.title = label; + + if (isOverflow) { + if (item.text instanceof Node) { + $item.append(item.text.cloneNode(true)); + } else { + $item.textContent = label; + } + } else if (item.text instanceof Node) { + $item.append(item.text.cloneNode(true)); + } else { + $item.textContent = label; + } + + let handled = false; + const runAction = (event) => { + if (handled) return; + handled = true; + event.preventDefault(); + event.stopPropagation(); + this.#clearMenuShowTimer(); + cancelAnimationFrame(this.#stateSyncRaf); + this.#stateSyncRaf = 0; + this.#handlingMenuAction = true; + try { + item.onclick?.(); + } finally { + this.#handlingMenuAction = false; + this.#menuRequested = false; + this.#dismissedSelection = this.#selectionSignature(); + this.#hideMenu(); + focusEditorIfEditable(this.#view); + } + }; + bindSelectionMenuButton($item, runAction); + return $item; + } + + #animateMenuIn() { + this.#menuAnimation?.cancel?.(); + if (animationsDisabled()) { + this.$menu.style.opacity = "1"; + this.$menu.style.transform = "none"; + return; + } + + const y = this.$menu.dataset.placement === "above" ? 3 : -3; + this.#menuAnimation = animate( + this.$menu, + { + opacity: [0, 1], + scale: [0.96, 1], + y: [y, 0], + }, + { duration: 0.14, ease: "easeOut" }, + ); + } + + #setOverflowExpanded($primary, $overflow, expanded) { + for (const animation of this.#viewAnimations) animation.cancel?.(); + this.#viewAnimations = []; + const initialRect = this.$menu.getBoundingClientRect(); + const outgoing = expanded ? $primary : $overflow; + const incoming = expanded ? $overflow : $primary; + const direction = expanded ? 1 : -1; + this.$menu.style.width = `${this.$menu.getBoundingClientRect().width}px`; + incoming.hidden = false; + incoming.style.visibility = ""; + incoming.style.pointerEvents = "auto"; + outgoing.style.pointerEvents = "none"; + + const usesGrid = $overflow.classList.contains( + "cursor-menu__overflow--grid", + ); + const targetHeight = + expanded && usesGrid ? $overflow.getBoundingClientRect().height : 40; + this.$menu.style.height = `${targetHeight}px`; + if (usesGrid && this.#menuAnchor) this.#positionMenu(this.#menuAnchor); + const finalRect = this.$menu.getBoundingClientRect(); + + const finish = () => { + outgoing.hidden = true; + outgoing.style.opacity = ""; + outgoing.style.transform = ""; + outgoing.style.visibility = ""; + incoming.style.opacity = ""; + incoming.style.transform = ""; + this.$menu.style.height = `${targetHeight}px`; + this.$menu.style.transform = ""; + this.#viewAnimations = []; + }; + if (animationsDisabled()) { + finish(); + return; + } + + const outgoingAnimation = animate( + outgoing, + { opacity: [1, 0], x: [0, -6 * direction] }, + { duration: 0.1, ease: "easeIn" }, + ); + const incomingAnimation = animate( + incoming, + { opacity: [0, 1], x: [6 * direction, 0] }, + { duration: 0.14, ease: "easeOut" }, + ); + const animations = [outgoingAnimation, incomingAnimation]; + if (usesGrid && initialRect.height !== finalRect.height) { + animations.push( + animate( + this.$menu, + { + height: [initialRect.height, finalRect.height], + y: [initialRect.top - finalRect.top, 0], + }, + { duration: 0.16, ease: "easeOut" }, + ), + ); + } + this.#viewAnimations = animations; + Promise.allSettled(animations).then(() => { + if (this.#viewAnimations !== animations) return; + finish(); + }); + } + + #positionMenu(anchor) { + if (!this.$menu.isConnected) return; const containerRect = this.#container.getBoundingClientRect(); + this.$menu.style.setProperty( + "--cursor-menu-max-width", + `${Math.max(0, containerRect.width - MENU_MARGIN * 2)}px`, + ); + this.$menu.style.setProperty( + "--cursor-menu-grid-max-height", + `${Math.max(40, Math.min(240, containerRect.height - MENU_MARGIN * 2))}px`, + ); this.$menu.style.left = "0px"; this.$menu.style.top = "0px"; this.$menu.style.visibility = "hidden"; @@ -679,10 +918,11 @@ class TouchSelectionMenuController { containerRect.top + containerRect.height - menuRect.height - MENU_MARGIN; const fitsAbove = topAbove >= minTop; const fitsBelow = topBelow <= maxTop; + const placedAbove = fitsAbove || !fitsBelow; const clamped = clampMenuPosition( { left: preferredLeft, - top: fitsAbove || !fitsBelow ? topAbove : topBelow, + top: placedAbove ? topAbove : topBelow, width: menuRect.width, height: menuRect.height, }, @@ -698,9 +938,29 @@ class TouchSelectionMenuController { this.$menu.style.left = `${clamped.left - containerRect.left}px`; this.$menu.style.top = `${clamped.top - containerRect.top}px`; + this.$menu.dataset.placement = placedAbove ? "above" : "below"; this.$menu.style.visibility = ""; - this.#menuActive = true; - this.#menuRequested = false; + } + + #getItemLabel(item) { + if (item.label) return item.label; + if (typeof item.text === "string" && item.text.trim()) return item.text; + if (item.text instanceof Element) { + return ( + item.text.getAttribute("aria-label") || + item.text.getAttribute("title") || + item.text.textContent?.trim() || + "More action" + ); + } + return "More action"; + } + + #createIcon(name) { + const $icon = document.createElement("span"); + $icon.className = `icon ${name}`; + $icon.setAttribute("aria-hidden", "true"); + return $icon; } #showMenuDeferred() { @@ -771,9 +1031,36 @@ class TouchSelectionMenuController { #hideMenu(force = false) { if (!force && !this.#menuActive && !this.$menu.isConnected) return; + this.#menuAnimation?.cancel?.(); + for (const animation of this.#viewAnimations) animation.cancel?.(); + this.#menuAnimation = null; + this.#viewAnimations = []; if (this.$menu.isConnected) { this.$menu.remove(); } + const overflow = this.$menu.querySelector(".cursor-menu__overflow"); + if (overflow) overflow.hidden = true; + if (overflow) { + overflow.style.opacity = ""; + overflow.style.transform = ""; + overflow.style.pointerEvents = ""; + } + const primary = this.$menu.querySelector(".cursor-menu__primary"); + if (primary) { + primary.hidden = false; + primary.style.opacity = ""; + primary.style.transform = ""; + primary.style.pointerEvents = ""; + } + this.$menu.style.opacity = ""; + this.$menu.style.transform = ""; + this.$menu.style.width = ""; + this.$menu.style.height = "40px"; + this.$menu + .querySelector(".cursor-menu__more") + ?.setAttribute("aria-expanded", "false"); + this.#renderedMenuKey = ""; + this.#menuAnchor = null; this.#menuActive = false; } @@ -817,4 +1104,10 @@ class TouchSelectionMenuController { const selection = this.#view.state.selection.main; return selection.from !== selection.to; } + + #selectionSignature() { + return this.#view.state.selection.ranges + .map((range) => `${range.anchor}:${range.head}`) + .join("|"); + } } diff --git a/src/lib/selectionMenu.js b/src/lib/selectionMenu.js index e697802e6c..333333fb8e 100644 --- a/src/lib/selectionMenu.js +++ b/src/lib/selectionMenu.js @@ -29,21 +29,42 @@ const showCodeActions = async () => { const items = []; -export default function selectionMenu() { +export default function selectionMenu(options = {}) { + const { codeActionsAvailable = true } = options; return [ item( () => exec("copy"), , "selected", true, + { id: "copy", label: getLabel("copy", "Copy") }, + ), + item( + () => exec("cut"), + , + "selected", + false, + { + id: "cut", + label: getLabel("cut", "Cut"), + }, + ), + item( + () => exec("paste"), + , + "all", + false, + { + id: "paste", + label: getLabel("paste", "Paste"), + }, ), - item(() => exec("cut"), , "selected"), - item(() => exec("paste"), , "all"), item( () => exec("selectall"), , "all", true, + { id: "select-all", label: getLabel("select all", "Select all") }, ), appSettings.get("showShareButton") && item( @@ -51,18 +72,26 @@ export default function selectionMenu() { , "selected", true, + { id: "share", label: getLabel("share", "Share") }, ), item( (color) => acode.exec("insert-color", color), , "all", + false, + { id: "insert-color", label: getLabel("insert color", "Insert color") }, ), - item( - () => showCodeActions(), - , - "all", - true, - ), + codeActionsAvailable && + item( + () => showCodeActions(), + , + "all", + true, + { + id: "code-actions", + label: getLabel("code actions", "Code Actions"), + }, + ), ...items, ].filter(Boolean); } @@ -73,15 +102,20 @@ export default function selectionMenu() { * @param {string | HTMLElement} text content of the item * @param {'selected'|'all'} mode mode supported by the item * @param {boolean} readOnly whether to show the item in readOnly mode + * @param {{id?: string, label?: string}} options display metadata */ -selectionMenu.add = (onclick, text, mode, readOnly) => { - items.push(item(onclick, text, mode, readOnly)); +selectionMenu.add = (onclick, text, mode, readOnly, options) => { + items.push(item(onclick, text, mode, readOnly, options)); }; selectionMenu.exec = (command) => { exec(command); }; -function item(onclick, text, mode = "all", readOnly = false) { - return { onclick, text, mode, readOnly }; +function item(onclick, text, mode = "all", readOnly = false, options = {}) { + return { onclick, text, mode, readOnly, ...options }; +} + +function getLabel(key, fallback) { + return globalThis.strings?.[key] || fallback; } diff --git a/src/main.scss b/src/main.scss index d49def88b5..5b04d56e9a 100644 --- a/src/main.scss +++ b/src/main.scss @@ -475,32 +475,61 @@ textarea { } .cursor-menu { + --cursor-menu-max-width: calc(100vw - 20px); + --cursor-menu-grid-max-height: min(40vh, 240px); position: absolute; top: 0; left: 0; + width: max-content; + max-width: var(--cursor-menu-max-width); height: 40px; + margin: 0; + padding: 0; + box-sizing: border-box; background-color: #ffffff; background-color: var(--secondary-color); display: flex; - border-radius: 4px; + flex-direction: column; + border-radius: var(--popup-border-radius); box-shadow: 0 0 8px rgba(0, 0, 0, 0.2); box-shadow: 0 0 8px var(--box-shadow-color); - border: none; border: solid 1px var(--popup-border-color); color: #252525; color: var(--secondary-text-color); transform-origin: left center; + isolation: isolate; + overflow: hidden; z-index: 4; - >span, - >div { + &__primary { + display: flex; + height: 100%; + align-items: stretch; + + &[hidden] { + visibility: hidden; + } + } + + &__action { + appearance: none; display: inline-flex; align-items: center; justify-content: center; + min-width: 50px; height: 100%; + margin: 0; + padding: 0; + border: 0; + border-radius: 0; + outline: none; + background: transparent; + font: inherit; font-size: 0.9em; - min-width: 50px; color: inherit; + cursor: pointer; + -webkit-tap-highlight-color: transparent; + touch-action: manipulation; user-select: none; white-space: nowrap; @@ -508,6 +537,120 @@ textarea { opacity: 0.6; pointer-events: none; } + + &:active { + background-color: rgba(0, 0, 0, 0.2); + } + + &.is-pressed { + background-color: rgba(0, 0, 0, 0.2); + } + + &:focus-visible { + outline: 1px solid currentColor; + outline-offset: -2px; + } + } + + &__more { + width: 50px; + padding: 0; + } + + &__overflow { + position: absolute; + inset: 0; + z-index: 1; + display: flex; + height: 100%; + min-width: 0; + color: inherit; + background-color: inherit; + border-radius: var(--popup-border-radius); + + &[hidden] { + visibility: hidden; + } + + &--grid { + inset: 0 auto auto 0; + display: grid; + grid-template-columns: repeat(auto-fill, minmax(50px, 1fr)); + grid-auto-rows: 40px; + align-content: start; + width: 100%; + height: max-content; + max-height: var(--cursor-menu-grid-max-height); + overflow-x: hidden; + overflow-y: auto; + overscroll-behavior-y: contain; + scrollbar-width: none; + touch-action: pan-y; + + &::-webkit-scrollbar { + display: none; + } + } + } + + &__back { + flex: 0 0 50px; + border-inline-end: solid 1px var(--border-color); + } + + &__overflow-actions { + display: flex; + min-width: 0; + flex: 1; + overflow-x: auto; + overflow-y: hidden; + overscroll-behavior-x: contain; + scrollbar-width: none; + touch-action: pan-x; + + &::-webkit-scrollbar { + display: none; + } + } + + &__overflow--grid &__overflow-actions { + display: contents; + } + + &__overflow--grid &__back { + position: sticky; + top: 0; + z-index: 1; + width: 50px; + height: 40px; + background-color: inherit; + } + + &__overflow--grid &__overflow-action { + height: 40px; + touch-action: pan-y; + } + + &__overflow-action { + flex: 0 0 50px; + justify-content: center; + width: 50px; + height: 100%; + padding: 0; + overflow: hidden; + text-overflow: ellipsis; + touch-action: pan-x; + + > .icon { + color: inherit; + } + + > :not(.icon) { + max-width: 46px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } } } @@ -759,4 +902,3 @@ input[type="search"]::-webkit-search-results-decoration { } } } - diff --git a/tests/unit/selectionMenuButton.test.ts b/tests/unit/selectionMenuButton.test.ts new file mode 100644 index 0000000000..47e0b26b1b --- /dev/null +++ b/tests/unit/selectionMenuButton.test.ts @@ -0,0 +1,89 @@ +// @vitest-environment happy-dom + +import { bindSelectionMenuButton } from "cm/selectionMenuUtils"; +import { describe, expect, it, vi } from "vitest"; + +function pointerEvent( + type: string, + pointerId = 7, + position: { x: number; y: number } = { x: 0, y: 0 }, +) { + return new PointerEvent(type, { + bubbles: true, + button: 0, + cancelable: true, + clientX: position.x, + clientY: position.y, + isPrimary: true, + pointerId, + pointerType: "touch", + }); +} + +describe("selection menu button interaction", () => { + it("preserves pointer-down and activates exactly once on release", () => { + const button = document.createElement("button"); + const activate = vi.fn(); + bindSelectionMenuButton(button, activate); + + const down = pointerEvent("pointerdown"); + button.dispatchEvent(down); + expect(down.defaultPrevented).toBe(true); + expect(button.classList.contains("is-pressed")).toBe(true); + expect(activate).not.toHaveBeenCalled(); + + button.dispatchEvent(pointerEvent("pointerup")); + button.dispatchEvent( + new MouseEvent("click", { bubbles: true, cancelable: true, detail: 1 }), + ); + + expect(button.classList.contains("is-pressed")).toBe(false); + expect(activate).toHaveBeenCalledTimes(1); + }); + + it("supports keyboard clicks and cancels interrupted presses", () => { + const button = document.createElement("button"); + const activate = vi.fn(); + bindSelectionMenuButton(button, activate); + + button.dispatchEvent(pointerEvent("pointerdown")); + button.dispatchEvent(pointerEvent("pointercancel")); + expect(activate).not.toHaveBeenCalled(); + + button.dispatchEvent( + new MouseEvent("click", { bubbles: true, cancelable: true, detail: 0 }), + ); + expect(activate).toHaveBeenCalledTimes(1); + }); + + it("does not activate an action when the pointer becomes a scroll gesture", () => { + const button = document.createElement("button"); + const activate = vi.fn(); + bindSelectionMenuButton(button, activate); + + button.dispatchEvent(pointerEvent("pointerdown", 7, { x: 10, y: 10 })); + button.dispatchEvent(pointerEvent("pointermove", 7, { x: 10, y: 30 })); + button.dispatchEvent(pointerEvent("pointerup", 7, { x: 10, y: 30 })); + button.dispatchEvent( + new MouseEvent("click", { bubbles: true, cancelable: true, detail: 1 }), + ); + + expect(button.classList.contains("is-pressed")).toBe(false); + expect(activate).not.toHaveBeenCalled(); + }); + + it("checks final pointer displacement when no move event is delivered", () => { + const button = document.createElement("button"); + const activate = vi.fn(); + bindSelectionMenuButton(button, activate); + + button.dispatchEvent(pointerEvent("pointerdown", 7, { x: 10, y: 10 })); + button.dispatchEvent(pointerEvent("pointerup", 7, { x: 30, y: 10 })); + button.dispatchEvent( + new MouseEvent("click", { bubbles: true, cancelable: true, detail: 1 }), + ); + + expect(button.classList.contains("is-pressed")).toBe(false); + expect(activate).not.toHaveBeenCalled(); + }); +}); diff --git a/tests/unit/selectionMenuUtils.test.ts b/tests/unit/selectionMenuUtils.test.ts index 962f912e94..360fafdc57 100644 --- a/tests/unit/selectionMenuUtils.test.ts +++ b/tests/unit/selectionMenuUtils.test.ts @@ -1,4 +1,7 @@ -import { filterSelectionMenuItems } from "cm/selectionMenuUtils"; +import { + filterSelectionMenuItems, + partitionSelectionMenuItems, +} from "cm/selectionMenuUtils"; import { describe, expect, it } from "vitest"; const items = [ @@ -41,3 +44,32 @@ describe("selection menu filtering", () => { ]); }); }); + +describe("selection menu hierarchy", () => { + it("keeps selection essentials in the compact toolbar", () => { + const pluginItem = { id: "plugin-action", mode: "all" } as const; + const { primary, overflow } = partitionSelectionMenuItems( + [...items, pluginItem], + { hasSelection: true }, + ); + + expect(primary.map((item) => item.id)).toEqual([ + "copy", + "cut", + "paste", + "select-all", + ]); + expect(overflow.map((item) => item.id)).toEqual(["plugin-action"]); + }); + + it("keeps caret actions concise and moves plugins into More", () => { + const pluginItem = { mode: "all" } as const; + const { primary, overflow } = partitionSelectionMenuItems( + [...items, pluginItem], + { hasSelection: false }, + ); + + expect(primary.map((item) => item.id)).toEqual(["paste", "select-all"]); + expect(overflow).toEqual([items[0], items[1], pluginItem]); + }); +}); From c7a9e347de11294efe55bf12981e89bbcc23dfd0 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sat, 29 Aug 2026 13:43:14 +0000 Subject: [PATCH 080/195] fix(search): include restored files in global search (#2830) * fix(search): include restored files in global search * fix --- src/sidebarApps/searchInFiles/index.js | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/sidebarApps/searchInFiles/index.js b/src/sidebarApps/searchInFiles/index.js index e0d66e97b2..6cfa938cef 100644 --- a/src/sidebarApps/searchInFiles/index.js +++ b/src/sidebarApps/searchInFiles/index.js @@ -693,9 +693,10 @@ async function readSearchFileContent(uri) { if (helpers.isBinary(uri)) return ""; const editorFile = editorManager.getFile(uri, "uri"); - if (editorFile?.session?.doc) { + const editorDocument = getSearchEditorDocument(editorFile); + if (editorDocument) { try { - return getDocText(editorFile.session.doc); + return getDocText(editorDocument); } catch (_) { return ""; } @@ -704,6 +705,17 @@ async function readSearchFileContent(uri) { return fsOperation(uri).readFile(settings.value.defaultFileEncoding); } +function getSearchEditorDocument(file) { + const document = file?.session?.doc; + if (!document) return null; + if (file.loaded) return document; + + // Remote files can expose non-empty unsaved recovery text while their source + // is still loading. An inactive restored tab instead has an empty placeholder. + if (file.loading && file.isUnsaved && document.length > 0) return document; + return null; +} + function supportsNativeSearch(url = "") { return ( fileIndex.supports(url) && @@ -819,9 +831,10 @@ function getOpenFileOverlays() { const overlays = {}; editorManager.files.forEach((file) => { if (!file.uri || !supportsNativeSearch(file.uri)) return; - if (!file.session?.doc) return; + const editorDocument = getSearchEditorDocument(file); + if (!editorDocument) return; try { - overlays[file.uri] = getDocText(file.session.doc); + overlays[file.uri] = getDocText(editorDocument); } catch (_) { // ignore invalid editor docs } From dbdb9680c97e35cbf745f9b9cf38723675be5878 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sat, 29 Aug 2026 19:29:46 +0530 Subject: [PATCH 081/195] chore: v1.13.2 --- CHANGELOG.md | 24 ++++++++++++++++++++++++ config.xml | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- readme.md | 2 ++ 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60ee76afad..bcaf913468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Change Log +## v1.13.2 + +* feat: stabilize SFTP and add secure SSH terminal integration by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2694 +* fix(lsp): correct workspace and document color capabilities and add tailwind lsp by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2736 +* refactor: Standardize DOM element dataset attributes across file browser component by @AuDevTist1C in https://github.com/Acode-Foundation/Acode/pull/2543 +* fix(lsp): preserve websocket clients across tab switches by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2764 +* feat(plugins): expose static CodeMirror highlighter by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2769 +* refactor(loader): Extract `tailSpin` SVG component and dynamic gradient logic by @AuDevTist1C in https://github.com/Acode-Foundation/Acode/pull/2776 +* fix(quick-tools): prevent scrollbars during editor gestures by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2777 +* fix: fall back to internal storage when external storage is unavailable by @ulite-Amr in https://github.com/Acode-Foundation/Acode/pull/2781 +* fix(theme): prevent freeze when switching to system theme by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2790 +* fix(sftp): cancel stalled connections and prevent delayed errors by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2791 +* fix: admob issues by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/2800 +* fix(android): avoid splash surface crash on realme Android 13 by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2805 +* fix(session): restore picker documents and skip intent files tab by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2809 +* feat(console): isolate execution and improve mobile REPL UX by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2808 +* feat(console): follow active Acode theme by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2814 +* chore: improve Indonesian (id) language translations by @MatrixTM26 in https://github.com/Acode-Foundation/Acode/pull/2798 +* fix: preserve MIME type for plugin icons on plugin details page by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2818 +* fix(console): run JavaScript files in isolated worker by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2819 +* feat: plugin review by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/2826 +* Improve selection menu UX and plugin action overflow by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2813 +* fix(search): include restored files in global search by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/2830 + ## v1.12.9 * fix(admob): remove the policy-prohibited interstitial shown while exiting the app diff --git a/config.xml b/config.xml index 45f6f86385..cb49d5be3d 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - @@ -90,4 +90,4 @@ - \ No newline at end of file + diff --git a/package-lock.json b/package-lock.json index ca419ccda3..85817b8fcd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "com.foxdebug.acode", - "version": "1.13.1", + "version": "1.13.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "com.foxdebug.acode", - "version": "1.13.1", + "version": "1.13.2", "license": "MIT", "dependencies": { "@codemirror/autocomplete": "^6.20.3", diff --git a/package.json b/package.json index c1cf55d0d7..992d2d2186 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.foxdebug.acode", "displayName": "Acode", - "version": "1.13.1", + "version": "1.13.2", "description": "Acode is a code editor for android", "scripts": { "lang": "node ./utils/lang.js", diff --git a/readme.md b/readme.md index f95dad8c33..ca69912401 100644 --- a/readme.md +++ b/readme.md @@ -15,6 +15,8 @@ Welcome to Acode Editor - a powerful and versatile code editing tool designed sp - Edit and create websites, and instantly preview them in a browser. - Seamlessly modify source files for various languages like Python, Java, JavaScript, and more. - Built-in javascript console +- S/FTP and SSH terminal integration +- Built-in terminal(Alpine) - Enjoy multi-language editing support with easy management tools. - Enjoy a large collections of community plugins to enhance your coding experience. From 7357c01f29cf399c5ca300c86c00f6df25e7af35 Mon Sep 17 00:00:00 2001 From: AuDevTist1C <114492072+AuDevTist1C@users.noreply.github.com> Date: Sat, 29 Aug 2026 14:34:04 +0000 Subject: [PATCH 082/195] refactor(file-browser): Convert directory cache to `Map` instance (#2831) Replace the plain object container used for cached directories with an ES6 `Map` to improve key management semantics. Update cached directory data structure (`src/pages/fileBrowser/fileBrowser.js`): - Re-initialize `cachedDir` variable as a `Map` - Replace object property lookups with `Map.prototype.has()` and `Map.prototype.get()` - Update cache writes to use `Map.prototype.set()` - Update directory deletion calls to use `Map.prototype.delete()` (AI generated commit message) --- src/pages/fileBrowser/fileBrowser.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index ef9c59ce28..dcb53c4890 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -171,7 +171,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { $selectionMenuToggler.style.display = "none"; $pasteToggler.style.display = "none"; const progress = {}; - let cachedDir = {}; + let cachedDir = new Map(); let currentDir = { url: null, name: null, @@ -255,8 +255,6 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { } if (action === "reload") { - const { url } = currentDir; - if (url in cachedDir) delete cachedDir[url]; reload(); return; } @@ -731,7 +729,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { } recents.removeFile(url); openFolder.removeItem(url); - delete cachedDir[url]; + cachedDir.delete(url); } function updateSelectionCount($count) { @@ -1471,8 +1469,8 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { let list = []; let error = false; - if (url in cachedDir) { - return cachedDir[url]; + if (cachedDir.has(url)) { + return cachedDir.get(url); } else { if (url === "/") { list = await listAllStorages(); @@ -1807,8 +1805,8 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { const $oldList = $content.get("#list"); if ($oldList) { const { url } = currentDir; - if (url && cachedDir[url]) { - cachedDir[url].scroll = $oldList.scrollTop; + if (url && cachedDir.has(url)) { + cachedDir.get(url).scroll = $oldList.scrollTop; } $oldList.remove(); } @@ -1817,13 +1815,13 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { $list.focus(); currentDir = dir; - cachedDir[dir.url] = dir; + cachedDir.set(dir.url, dir); updatePasteToggler(); } function reload() { const { url, name } = currentDir; - delete cachedDir[url]; + cachedDir.delete(url); navigate(url, name); } From febb4f746c81db96d0ebace651b6186577ee6240 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sat, 29 Aug 2026 17:29:40 +0000 Subject: [PATCH 083/195] fix(editor): stabilize selection menu sizing and transitions (#2833) --- src/cm/touchSelectionMenu.js | 136 ++++++++++++++++++++++++++--------- src/main.scss | 30 ++++---- 2 files changed, 116 insertions(+), 50 deletions(-) diff --git a/src/cm/touchSelectionMenu.js b/src/cm/touchSelectionMenu.js index fc004d5327..c61b7bc060 100644 --- a/src/cm/touchSelectionMenu.js +++ b/src/cm/touchSelectionMenu.js @@ -174,6 +174,7 @@ class TouchSelectionMenuController { #menuAnchor = null; #menuAnimation = null; #viewAnimations = []; + #overflowExpanded = false; constructor(view, options = {}) { this.#view = view; @@ -680,7 +681,8 @@ class TouchSelectionMenuController { const menuKey = `${hasSelection}:${items .map((item) => item.id || this.#getItemLabel(item)) .join("|")}`; - if (menuKey !== this.#renderedMenuKey) { + const menuChanged = menuKey !== this.#renderedMenuKey; + if (menuChanged) { const groups = partitionSelectionMenuItems(items, { hasSelection }); this.#renderMenu(groups.primary, groups.overflow); this.#renderedMenuKey = menuKey; @@ -689,6 +691,8 @@ class TouchSelectionMenuController { if (!this.$menu.isConnected) { this.#container.append(this.$menu); } + this.$menu.style.removeProperty("width"); + this.$menu.style.removeProperty("height"); const isOpening = !this.#menuActive; this.#positionMenu(anchor); this.#menuActive = true; @@ -697,6 +701,11 @@ class TouchSelectionMenuController { } #renderMenu(primaryItems, overflowItems) { + for (const animation of this.#viewAnimations) animation.cancel?.(); + this.#viewAnimations = []; + this.#overflowExpanded = false; + this.$menu.style.removeProperty("width"); + this.$menu.style.removeProperty("height"); this.$menu.replaceChildren(); this.$menu.setAttribute("aria-label", "Text selection actions"); @@ -822,68 +831,121 @@ class TouchSelectionMenuController { } #setOverflowExpanded($primary, $overflow, expanded) { + if (expanded === this.#overflowExpanded) return; + const initialRect = this.$menu.getBoundingClientRect(); + this.#menuAnimation?.cancel?.(); + this.#menuAnimation = null; for (const animation of this.#viewAnimations) animation.cancel?.(); this.#viewAnimations = []; - const initialRect = this.$menu.getBoundingClientRect(); - const outgoing = expanded ? $primary : $overflow; + $primary.hidden = this.#overflowExpanded; + $overflow.hidden = !this.#overflowExpanded; + const outgoing = this.#overflowExpanded ? $overflow : $primary; const incoming = expanded ? $overflow : $primary; const direction = expanded ? 1 : -1; - this.$menu.style.width = `${this.$menu.getBoundingClientRect().width}px`; - incoming.hidden = false; - incoming.style.visibility = ""; - incoming.style.pointerEvents = "auto"; + for (const $view of [$primary, $overflow]) { + $view.style.opacity = ""; + $view.style.transform = ""; + $view.style.visibility = ""; + $view.style.position = ""; + $view.style.inset = ""; + $view.style.pointerEvents = ""; + $view.style.transformOrigin = ""; + } + this.#overflowExpanded = expanded; + outgoing.style.position = "absolute"; + outgoing.style.inset = "0 auto auto 0"; outgoing.style.pointerEvents = "none"; - - const usesGrid = $overflow.classList.contains( - "cursor-menu__overflow--grid", - ); - const targetHeight = - expanded && usesGrid ? $overflow.getBoundingClientRect().height : 40; - this.$menu.style.height = `${targetHeight}px`; - if (usesGrid && this.#menuAnchor) this.#positionMenu(this.#menuAnchor); + incoming.hidden = false; + this.$menu.style.removeProperty("width"); + this.$menu.style.removeProperty("height"); + this.$menu.style.transform = ""; + if (this.#menuAnchor) this.#positionMenu(this.#menuAnchor); const finalRect = this.$menu.getBoundingClientRect(); + const menuScaleX = finalRect.width + ? initialRect.width / finalRect.width + : 1; + const menuScaleY = finalRect.height + ? initialRect.height / finalRect.height + : 1; + const viewScaleX = menuScaleX ? 1 / menuScaleX : 1; + const viewScaleY = menuScaleY ? 1 / menuScaleY : 1; + this.$menu.style.transformOrigin = "left top"; + for (const $view of [outgoing, incoming]) { + $view.style.transformOrigin = "left top"; + } + const clearMenuGeometry = () => { + this.$menu.style.removeProperty("width"); + this.$menu.style.removeProperty("height"); + this.$menu.style.transform = ""; + this.$menu.style.transformOrigin = ""; + }; const finish = () => { outgoing.hidden = true; - outgoing.style.opacity = ""; - outgoing.style.transform = ""; - outgoing.style.visibility = ""; - incoming.style.opacity = ""; - incoming.style.transform = ""; - this.$menu.style.height = `${targetHeight}px`; - this.$menu.style.transform = ""; + for (const $view of [$primary, $overflow]) { + $view.style.opacity = ""; + $view.style.transform = ""; + $view.style.position = ""; + $view.style.inset = ""; + $view.style.pointerEvents = ""; + $view.style.transformOrigin = ""; + } + clearMenuGeometry(); this.#viewAnimations = []; }; + if (animationsDisabled()) { finish(); return; } - const outgoingAnimation = animate( outgoing, - { opacity: [1, 0], x: [0, -6 * direction] }, - { duration: 0.1, ease: "easeIn" }, + { + opacity: [1, 0], + x: [0, -6 * direction], + scaleX: [viewScaleX, 1], + scaleY: [viewScaleY, 1], + }, + { duration: 0.12, ease: "easeIn" }, ); const incomingAnimation = animate( incoming, - { opacity: [0, 1], x: [6 * direction, 0] }, - { duration: 0.14, ease: "easeOut" }, + { + opacity: [0, 1], + x: [6 * direction, 0], + scaleX: [viewScaleX, 1], + scaleY: [viewScaleY, 1], + }, + { duration: 0.18, ease: "easeOut" }, ); const animations = [outgoingAnimation, incomingAnimation]; - if (usesGrid && initialRect.height !== finalRect.height) { + if ( + initialRect.width !== finalRect.width || + initialRect.height !== finalRect.height || + initialRect.left !== finalRect.left || + initialRect.top !== finalRect.top + ) { animations.push( animate( this.$menu, { - height: [initialRect.height, finalRect.height], + x: [initialRect.left - finalRect.left, 0], y: [initialRect.top - finalRect.top, 0], + scaleX: [menuScaleX, 1], + scaleY: [menuScaleY, 1], + }, + { + duration: 0.18, + ease: [0.2, 0, 0, 1], + onComplete: clearMenuGeometry, }, - { duration: 0.16, ease: "easeOut" }, ), ); } this.#viewAnimations = animations; - Promise.allSettled(animations).then(() => { + Promise.allSettled( + animations.map((animation) => animation.finished ?? animation), + ).then(() => { if (this.#viewAnimations !== animations) return; finish(); }); @@ -1044,6 +1106,9 @@ class TouchSelectionMenuController { overflow.style.opacity = ""; overflow.style.transform = ""; overflow.style.pointerEvents = ""; + overflow.style.position = ""; + overflow.style.inset = ""; + overflow.style.transformOrigin = ""; } const primary = this.$menu.querySelector(".cursor-menu__primary"); if (primary) { @@ -1051,15 +1116,20 @@ class TouchSelectionMenuController { primary.style.opacity = ""; primary.style.transform = ""; primary.style.pointerEvents = ""; + primary.style.position = ""; + primary.style.inset = ""; + primary.style.transformOrigin = ""; } this.$menu.style.opacity = ""; this.$menu.style.transform = ""; - this.$menu.style.width = ""; - this.$menu.style.height = "40px"; + this.$menu.style.transformOrigin = ""; + this.$menu.style.removeProperty("width"); + this.$menu.style.removeProperty("height"); this.$menu .querySelector(".cursor-menu__more") ?.setAttribute("aria-expanded", "false"); this.#renderedMenuKey = ""; + this.#overflowExpanded = false; this.#menuAnchor = null; this.#menuActive = false; } diff --git a/src/main.scss b/src/main.scss index 5b04d56e9a..927445937b 100644 --- a/src/main.scss +++ b/src/main.scss @@ -482,7 +482,8 @@ textarea { left: 0; width: max-content; max-width: var(--cursor-menu-max-width); - height: 40px; + height: auto; + min-height: 40px; margin: 0; padding: 0; box-sizing: border-box; @@ -503,12 +504,8 @@ textarea { &__primary { display: flex; - height: 100%; + height: 40px; align-items: stretch; - - &[hidden] { - visibility: hidden; - } } &__action { @@ -558,27 +555,21 @@ textarea { } &__overflow { - position: absolute; - inset: 0; - z-index: 1; display: flex; - height: 100%; + width: max-content; + max-width: var(--cursor-menu-max-width); + height: 40px; min-width: 0; color: inherit; background-color: inherit; border-radius: var(--popup-border-radius); - &[hidden] { - visibility: hidden; - } - &--grid { - inset: 0 auto auto 0; display: grid; grid-template-columns: repeat(auto-fill, minmax(50px, 1fr)); grid-auto-rows: 40px; align-content: start; - width: 100%; + width: min(250px, var(--cursor-menu-max-width)); height: max-content; max-height: var(--cursor-menu-grid-max-height); overflow-x: hidden; @@ -593,6 +584,11 @@ textarea { } } + &__primary[hidden], + &__overflow[hidden] { + display: none; + } + &__back { flex: 0 0 50px; border-inline-end: solid 1px var(--border-color); @@ -601,7 +597,7 @@ textarea { &__overflow-actions { display: flex; min-width: 0; - flex: 1; + flex: 0 1 auto; overflow-x: auto; overflow-y: hidden; overscroll-behavior-x: contain; From eac9b6ea8202d9a614583f06e43b5cdc5a61e863 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sat, 29 Aug 2026 17:45:10 +0000 Subject: [PATCH 084/195] fix(editor): keep fullscreen controls above bottom pane tabs (#2834) --- src/main.js | 14 ++------------ src/styles/page.scss | 45 -------------------------------------------- 2 files changed, 2 insertions(+), 57 deletions(-) diff --git a/src/main.js b/src/main.js index ebc2871227..381a48e1fe 100644 --- a/src/main.js +++ b/src/main.js @@ -629,12 +629,7 @@ async function loadApp() { $mainMenu.removeEventListener("click", handleMenu); $mainMenu.destroy(); } - const { openFileListPos, fullscreen } = settings.value; - if (openFileListPos === settings.OPEN_FILE_LIST_POS_BOTTOM && fullscreen) { - $mainMenu = createMainMenu({ bottom: "6px", toggler: $menuToggler }); - } else { - $mainMenu = createMainMenu({ top: "6px", toggler: $menuToggler }); - } + $mainMenu = createMainMenu({ top: "6px", toggler: $menuToggler }); $mainMenu.addEventListener("click", handleMenu); }; @@ -643,12 +638,7 @@ async function loadApp() { $fileMenu.removeEventListener("click", handleMenu); $fileMenu.destroy(); } - const { openFileListPos, fullscreen } = settings.value; - if (openFileListPos === settings.OPEN_FILE_LIST_POS_BOTTOM && fullscreen) { - $fileMenu = createFileMenu({ bottom: "6px", toggler: $editMenuToggler }); - } else { - $fileMenu = createFileMenu({ top: "6px", toggler: $editMenuToggler }); - } + $fileMenu = createFileMenu({ top: "6px", toggler: $editMenuToggler }); $fileMenu.addEventListener("click", handleMenu); }; diff --git a/src/styles/page.scss b/src/styles/page.scss index 62b2d5c204..e32740eef5 100644 --- a/src/styles/page.scss +++ b/src/styles/page.scss @@ -21,51 +21,6 @@ body { wc-page { &#root { - &[open-file-list-pos="bottom"] { - &[footer-height="1"] { - header { - bottom: 40px; - } - - #sidebar-toggler { - bottom: 40px; - } - } - - &[footer-height="2"] { - header { - bottom: 80px; - } - - #sidebar-toggler { - bottom: 80px; - } - } - - &[footer-height="3"] { - header { - bottom: 120px; - } - - #sidebar-toggler { - bottom: 120px; - } - } - - header { - bottom: 0; - top: auto !important; - z-index: 99; - } - - #sidebar-toggler { - bottom: 0; - top: auto !important; - z-index: 99; - transition: none !important; - } - } - &:not(.top-bar) { &.show-header { #header-toggler { From 31f8eb4e0484994db2de968c12183c0152aca753 Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Sat, 29 Aug 2026 17:48:09 +0000 Subject: [PATCH 085/195] chore(community-release-notifier): Change sed parsing - TG release notes (#2832) * chore(community-release-notifier): Change sed parsing - TG release notes This commit fixes Release notes not being sed escaped properly leading towards Telegram notifier failing for Stable Releases as they were auto-generated by git. * Disable markdown format in community release notifier Commented out the markdown format option in the Telegram notifier. --- .github/workflows/community-release-notifier.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/community-release-notifier.yml b/.github/workflows/community-release-notifier.yml index 1b08d7bee3..5dc9daa458 100644 --- a/.github/workflows/community-release-notifier.yml +++ b/.github/workflows/community-release-notifier.yml @@ -56,7 +56,7 @@ jobs: id: vars env: INPUT_TAG: ${{ github.event.release.tag_name || inputs.tag_name }} - INPUT_URL: ${{ github.event.release.url || inputs.url }} + INPUT_URL: ${{ github.event.release.html_url || inputs.url }} INPUT_BODY: ${{ github.event.release.body || inputs.body }} run: | TAG="$INPUT_TAG" @@ -68,7 +68,12 @@ jobs: # Escape problematic characters for MarkdownV2 (very conservative escaping) # We escape: _ * [ ] ( ) ~ ` > # + - = | { } . ! \ BODY_SAFE=$(printf '%s' "$INPUT_BODY" | \ - sed 's/[_*[\]()~`>#+=|{}.!\\-]/\\&/g') + sed -E \ + -e 's/^[[:space:]]*##[[:space:]]*//' \ + -e 's/^[[:space:]]*\*[[:space:]]+/- /' \ + -e 's/\*\*([^*]*)\*\*/\*\1\*/g' \ + -e 's/\\!/!/g' \ + -e 's/@([A-Za-z0-9-]+)/@\1/g') TAG_SAFE=$(printf '%s' "$TAG" | sed 's/[_*[\]()~`>#+=|{}.!\\-]/\\&/g') if [[ "$TAG" == *"-nightly"* ]]; then @@ -140,7 +145,8 @@ jobs: ${{ steps.vars.outputs.announce }} ${{ steps.vars.outputs.body_safe }} - format: markdown + # disabled for time being see https://github.com/Acode-Foundation/Acode/pull/2832#discussion_r3887130617 + #format: markdown disable_web_page_preview: true # Only needed for topic-enabled supergroups/channels message_thread_id: ${{ secrets.TELEGRAM_MESSAGE_THREAD_ID }} From 0981172ebc3b653ad2c4acc48ffccf8781f6af8f Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sat, 29 Aug 2026 18:17:47 +0000 Subject: [PATCH 086/195] fix(editor): restore cursor state and prevent tab-switch flash (#2835) * fix(editor): restore cursor state and prevent tab-switch flash * fix --- src/lib/editorFile.js | 77 +++++++++++++++++++-------- src/lib/editorManager.js | 10 ++++ src/lib/restoreFiles.js | 47 ++++++++++------ src/lib/saveState.js | 13 +++-- tests/unit/restoreFiles.test.js | 70 ++++++++++++++++++++++++ tests/unit/sessionPersistence.test.js | 33 ++++++++++++ 6 files changed, 209 insertions(+), 41 deletions(-) create mode 100644 tests/unit/restoreFiles.test.js diff --git a/src/lib/editorFile.js b/src/lib/editorFile.js index df7abed821..e638cdb84b 100644 --- a/src/lib/editorFile.js +++ b/src/lib/editorFile.js @@ -1,17 +1,11 @@ import fsOperation from "fileSystem"; // CodeMirror imports for document state management -import { EditorState } from "@codemirror/state"; +import { EditorSelection, EditorState } from "@codemirror/state"; import { focusEditorIfEditable, reconfigureEditorReadOnly, } from "cm/editorReadOnly"; -import { - clearSelection, - getDocText, - restoreFolds, - restoreSelection, - setScrollPosition, -} from "cm/editorUtils"; +import { clearSelection, getDocText } from "cm/editorUtils"; import { getMode, getModeForPath } from "cm/modelist"; import quickTools from "components/quickTools"; import Sidebar from "components/sidebar"; @@ -37,6 +31,25 @@ import appSettings from "./settings"; let mainCSSStyleSheet = null; +function restoreSessionSelection(state, selection) { + if (!selection?.ranges?.length) return state; + + const docLength = state.doc.length; + const ranges = selection.ranges.map((range) => { + const from = Math.max(0, Math.min(docLength, range.from | 0)); + const to = Math.max(0, Math.min(docLength, range.to | 0)); + return EditorSelection.range(from, to); + }); + const mainIndex = + selection.mainIndex >= 0 && selection.mainIndex < ranges.length + ? selection.mainIndex + : 0; + + return state.update({ + selection: EditorSelection.create(ranges, mainIndex), + }).state; +} + function getMainCSSStyleSheet() { if (mainCSSStyleSheet) return mainCSSStyleSheet; for (const sheet of document.styleSheets) { @@ -446,6 +459,7 @@ export default class EditorFile { * contains information about cursor position, scroll left, scroll top, folds. */ #loadOptions; + #loadPromise = null; /** * Weather file is changed and needs to be saved * @type {boolean} @@ -502,6 +516,10 @@ export default class EditorFile { hasDiskConflict = false; isPanePlaceholder = false; persistInSession = true; + lastScrollTop = 0; + lastScrollLeft = 0; + restoredSelection = null; + restoredFolds = null; /** * @@ -702,6 +720,14 @@ export default class EditorFile { folds: options?.folds, editable, }; + this.lastScrollTop = Number.isFinite(options?.scrollTop) + ? options.scrollTop + : 0; + this.lastScrollLeft = Number.isFinite(options?.scrollLeft) + ? options.scrollLeft + : 0; + this.restoredSelection = options?.cursorPos || null; + this.restoredFolds = options?.folds || null; } this.#onFilePosChange = () => { @@ -1557,8 +1583,8 @@ export default class EditorFile { this.#tab.classList.add("active"); this.#tab.scrollIntoView(); - if (this.type === "editor" && !this.loaded && !this.loading) { - this.#loadText(); + if (this.type === "editor" && !this.loaded) { + void this.load(); } syncQuickToolsVisibility(this); @@ -1640,6 +1666,20 @@ export default class EditorFile { } } + /** + * Load this file's document into its stored editor session. + * Reuses an in-flight load so session restoration can safely preload tabs. + */ + load() { + if (this.type !== "editor" || this.loaded) return Promise.resolve(this); + if (this.#loadPromise) return this.#loadPromise; + + this.#loadPromise = this.#loadText().finally(() => { + this.#loadPromise = null; + }); + return this.#loadPromise; + } + /** * Add event listener * @param {string} event @@ -1781,9 +1821,7 @@ export default class EditorFile { const protocol = this.uri ? Url.getProtocol(this.uri) : ""; const isRemoteFile = protocol === "ftp:" || protocol === "sftp:"; - const { cursorPos, scrollLeft, scrollTop, folds, editable } = - this.#loadOptions; - const { editor } = editorManager; + const { cursorPos, editable } = this.#loadOptions; this.#loadOptions = null; @@ -1855,7 +1893,11 @@ export default class EditorFile { const isUnsaved = this.isUnsaved; this.markChanged = false; - this.session = EditorState.create({ doc: value }); + this.session = restoreSessionSelection( + EditorState.create({ doc: value }), + cursorPos, + ); + this.restoredSelection = null; this.__cmSessionReady = false; this.__cmLanguageReady = false; this.__cmLanguageSignature = null; @@ -1874,13 +1916,6 @@ export default class EditorFile { setTimeout(() => { this.#emit("load", createFileEvent(this)); - if (cursorPos) { - restoreSelection(editor, cursorPos); - } - if (scrollTop || scrollLeft) { - setScrollPosition(editor, scrollTop, scrollLeft); - } - restoreFolds(editor, folds); }, 0); } catch (error) { this.#emit("loaderror", createFileEvent(this)); diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js index d719add426..d216b4b933 100644 --- a/src/lib/editorManager.js +++ b/src/lib/editorManager.js @@ -3018,9 +3018,19 @@ async function EditorManager($header, $body) { // Restore folds from previous state if available try { const folds = prevState ? getAllFolds(prevState) : []; + const canConsumeRestoredFolds = file.loaded && !file.loading; + if ( + !folds.length && + canConsumeRestoredFolds && + file.restoredFolds?.length + ) { + folds.push(...file.restoredFolds); + } if (folds && folds.length) { restoreFolds(editor, folds); + file.session = editor.state; } + if (canConsumeRestoredFolds) file.restoredFolds = null; } catch (error) { warnRecoverable( "Failed to restore folded regions from previous session state.", diff --git a/src/lib/restoreFiles.js b/src/lib/restoreFiles.js index 6f58c88285..4f844ac678 100644 --- a/src/lib/restoreFiles.js +++ b/src/lib/restoreFiles.js @@ -3,26 +3,39 @@ import EditorFile from "./editorFile"; /** * * @param {import('./editorFile').FileOptions[]} files - * @param {(count: number)=>void} callback */ export default async function restoreFiles(files) { - let rendered = false; + const hasRenderedFile = files.some((file) => file.render); + const localLoads = []; - await Promise.all( - files.map(async (file, i) => { - rendered ||= !!file.render; + files.forEach((file, index) => { + const render = + file.render || (!hasRenderedFile && index === files.length - 1); + const options = { + ...file, + render, + emitUpdate: false, + }; + const restoredFile = new EditorFile(file.filename, options); + const load = Promise.resolve(restoredFile.load?.()); - if (i === files.length - 1 && !rendered) { - file.render = true; - } + if (isRemoteUri(file.uri)) { + void load.catch((error) => { + console.warn(`Failed to preload restored file: ${file.uri}`, error); + }); + return; + } - const { filename, render = false } = file; - const options = { - ...file, - render, - emitUpdate: false, - }; - new EditorFile(filename, options); - }), - ); + localLoads.push(load); + }); + + // Finish restoring local documents before startup persistence is enabled. + // Otherwise the temporary empty sessions can overwrite saved cursor state, + // and the first visit to an inactive local tab visibly flashes a loading editor. + // Remote tabs keep preloading without blocking the rest of app startup. + await Promise.all(localLoads); +} + +function isRemoteUri(uri) { + return /^(?:https?|s?ftp):/i.test(uri || ""); } diff --git a/src/lib/saveState.js b/src/lib/saveState.js index 7e0ea6790b..5d31b37324 100644 --- a/src/lib/saveState.js +++ b/src/lib/saveState.js @@ -20,7 +20,9 @@ export default () => { // - Active file uses live EditorView selection // - Inactive files use their persisted EditorState selection let cursorPos; - if (activeFile?.id === file.id) { + if (!file.loaded && file.restoredSelection) { + cursorPos = file.restoredSelection; + } else if (activeFile?.id === file.id) { cursorPos = getSelection(editor); } else { const sel = file.session?.selection; @@ -39,7 +41,12 @@ export default () => { // - Active file uses live scroll from EditorView // - Inactive files use lastScrollTop/Left captured on tab switch let scrollTop, scrollLeft; - if (activeFile?.id === file.id) { + if (!file.loaded) { + scrollTop = + typeof file.lastScrollTop === "number" ? file.lastScrollTop : 0; + scrollLeft = + typeof file.lastScrollLeft === "number" ? file.lastScrollLeft : 0; + } else if (activeFile?.id === file.id) { const sp = getScrollPosition(editor); scrollTop = sp.scrollTop; scrollLeft = sp.scrollLeft; @@ -72,7 +79,7 @@ export default () => { editable: file.editable, encoding: file.encoding, render: activeFile?.id === file.id, - folds: getAllFolds(file.session), + folds: file.restoredFolds ?? getAllFolds(file.session), }; if (settings.rememberFiles || fileJson.isUnsaved) diff --git a/tests/unit/restoreFiles.test.js b/tests/unit/restoreFiles.test.js new file mode 100644 index 0000000000..339a347111 --- /dev/null +++ b/tests/unit/restoreFiles.test.js @@ -0,0 +1,70 @@ +import { beforeEach, describe, expect, it, vi } from "vitest"; + +const runtime = vi.hoisted(() => ({ + instances: [], +})); + +vi.mock("lib/editorFile", () => ({ + default: class MockEditorFile { + constructor(filename, options) { + this.filename = filename; + this.options = options; + this.loaded = new Promise((resolve) => { + this.resolveLoad = resolve; + }); + runtime.instances.push(this); + } + + load() { + return this.loaded; + } + }, +})); + +import restoreFiles from "lib/restoreFiles"; + +describe("restored file loading", () => { + beforeEach(() => { + runtime.instances.length = 0; + }); + + it("waits for every local tab and activates the last tab by default", async () => { + let completed = false; + const restoration = restoreFiles([ + { id: "one", filename: "one.js", uri: "file:///one.js" }, + { id: "two", filename: "two.js", uri: "file:///two.js" }, + ]).then(() => { + completed = true; + }); + + expect(runtime.instances).toHaveLength(2); + expect(runtime.instances.map((file) => file.options.render)).toEqual([ + false, + true, + ]); + expect(completed).toBe(false); + + runtime.instances[0].resolveLoad(); + await Promise.resolve(); + expect(completed).toBe(false); + + runtime.instances[1].resolveLoad(); + await restoration; + expect(completed).toBe(true); + }); + + it.each(["ftp", "sftp", "http", "https"])( + "does not block startup on an unresolved %s tab", + async (protocol) => { + await restoreFiles([ + { + id: "remote", + filename: "remote.js", + uri: `${protocol}://example.com/remote.js`, + }, + ]); + + expect(runtime.instances).toHaveLength(1); + }, + ); +}); diff --git a/tests/unit/sessionPersistence.test.js b/tests/unit/sessionPersistence.test.js index 938cc63a60..e096148b65 100644 --- a/tests/unit/sessionPersistence.test.js +++ b/tests/unit/sessionPersistence.test.js @@ -134,6 +134,39 @@ describe("file session persistence", () => { uri, ]); }); + + it("keeps restored folds until an inactive tab is first rendered", () => { + const file = createOpenFile("file:///restored.js", {}); + file.restoredFolds = [ + { fromLine: 2, fromCol: 0, toLine: 5, toCol: 1 }, + ]; + globalThis.editorManager.files.push(file); + + saveState(); + + expect(JSON.parse(localStorage.files)[0].folds).toEqual(file.restoredFolds); + }); + + it("keeps the restored cursor while a remote tab is still loading", () => { + const file = createOpenFile("sftp://example.com/restored.js", {}); + file.loaded = false; + file.loading = true; + file.restoredSelection = { + ranges: [{ from: 25, to: 25 }], + mainIndex: 0, + }; + file.lastScrollTop = 120; + file.lastScrollLeft = 8; + globalThis.editorManager.files.push(file); + globalThis.editorManager.activeFile = file; + + saveState(); + + const savedFile = JSON.parse(localStorage.files)[0]; + expect(savedFile.cursorPos).toEqual(file.restoredSelection); + expect(savedFile.scrollTop).toBe(120); + expect(savedFile.scrollLeft).toBe(8); + }); }); function createOpenFile(uri, options) { From 9d20f50a2d1e5d8e2fd935fbc0921b026a1300a5 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 30 Aug 2026 04:21:31 +0000 Subject: [PATCH 087/195] feat(lsp): improve actions, navigation, and position handling (#2837) - advertise code action resolve support - clamp LSP positions beyond document bounds - support LocationLink and multiple navigation results - add LSP operations to the selection menu - fix navigation scrolling after switching files - use shared position and location normalization helpers --- src/cm/commandRegistry.js | 10 +- src/cm/lsp/clientManager.ts | 17 +- src/cm/lsp/codeActions.ts | 31 ++-- src/cm/lsp/definition.ts | 147 ++++++++++++++++++ src/cm/lsp/diagnostics.ts | 9 +- src/cm/lsp/documentColors.ts | 5 +- src/cm/lsp/index.ts | 10 ++ src/cm/lsp/inlayHints.ts | 3 +- src/cm/lsp/locationUtils.ts | 26 ++++ src/cm/lsp/positionUtils.ts | 16 ++ src/cm/lsp/references.ts | 4 +- src/cm/lsp/rename.ts | 47 ++++-- src/cm/lsp/tooltipExtensions.ts | 19 ++- src/cm/lsp/types.ts | 7 +- src/cm/touchSelectionMenu.js | 26 ++++ src/components/referencesPanel/utils.js | 29 ++-- src/lib/editorManager.js | 57 +++++-- src/lib/selectionMenu.js | 81 +++++++++- .../lspExternalWebSocketLifecycle.test.js | 18 +++ tests/unit/lspLocationUtils.test.ts | 38 +++++ tests/unit/lspPositionUtils.test.ts | 28 ++++ 21 files changed, 534 insertions(+), 94 deletions(-) create mode 100644 src/cm/lsp/definition.ts create mode 100644 src/cm/lsp/locationUtils.ts create mode 100644 src/cm/lsp/positionUtils.ts create mode 100644 tests/unit/lspLocationUtils.test.ts create mode 100644 tests/unit/lspPositionUtils.test.ts diff --git a/src/cm/commandRegistry.js b/src/cm/commandRegistry.js index 1446027cbb..5d53cb1747 100644 --- a/src/cm/commandRegistry.js +++ b/src/cm/commandRegistry.js @@ -63,13 +63,7 @@ import { } from "@codemirror/lint"; import { LSPPlugin, - closeReferencePanel as lspCloseReferencePanel, - findReferences as lspFindReferences, formatDocument as lspFormatDocument, - jumpToDeclaration as lspJumpToDeclaration, - jumpToDefinition as lspJumpToDefinition, - jumpToImplementation as lspJumpToImplementation, - jumpToTypeDefinition as lspJumpToTypeDefinition, } from "@codemirror/lsp-client"; import { Compartment, EditorSelection } from "@codemirror/state"; import { keymap } from "@codemirror/view"; @@ -91,6 +85,10 @@ import { renameSymbol as acodeRenameSymbol, clearDiagnosticsEffect, clientManager, + jumpToDeclaration as lspJumpToDeclaration, + jumpToDefinition as lspJumpToDefinition, + jumpToImplementation as lspJumpToImplementation, + jumpToTypeDefinition as lspJumpToTypeDefinition, nextSignature as lspNextSignature, prevSignature as lspPrevSignature, showSignatureHelp as lspShowSignatureHelp, diff --git a/src/cm/lsp/clientManager.ts b/src/cm/lsp/clientManager.ts index 11bb6f5401..efd9cb284d 100644 --- a/src/cm/lsp/clientManager.ts +++ b/src/cm/lsp/clientManager.ts @@ -24,6 +24,7 @@ import { supportsBuiltinFormatting } from "./formattingSupport"; import { documentColorsExtension } from "./documentColors"; import { inlayHintsExtension } from "./inlayHints"; import { addLspLog } from "./logs"; +import { safeLspPositionToOffset } from "./positionUtils"; import { selectRuntimeProvider } from "./runtimeProviders"; import serverRegistry from "./serverRegistry"; import { @@ -804,6 +805,14 @@ export class LspClientManager { configuration: true, workspaceFolders: true, }, + textDocument: { + codeAction: { + dataSupport: true, + resolveSupport: { + properties: ["edit"], + }, + }, + }, }, }; @@ -1436,12 +1445,8 @@ function applyTextEdits( if (!edit?.range) continue; let fromBase: number; let toBase: number; - try { - fromBase = plugin.fromPosition(edit.range.start, plugin.syncedDoc); - toBase = plugin.fromPosition(edit.range.end, plugin.syncedDoc); - } catch (_) { - continue; - } + fromBase = safeLspPositionToOffset(plugin.syncedDoc, edit.range.start); + toBase = safeLspPositionToOffset(plugin.syncedDoc, edit.range.end); const fromResult = plugin.unsyncedChanges.mapPos( fromBase, 1, diff --git a/src/cm/lsp/codeActions.ts b/src/cm/lsp/codeActions.ts index 89811ac560..7e8996e5ad 100644 --- a/src/cm/lsp/codeActions.ts +++ b/src/cm/lsp/codeActions.ts @@ -12,8 +12,9 @@ import type { Range as LspRange, WorkspaceEdit, } from "vscode-languageserver-types"; -import type { Position, Range } from "./types"; +import type { Range } from "./types"; import { addLspLogFor } from "./logs"; +import { safeLspPositionToOffset } from "./positionUtils"; import type AcodeWorkspace from "./workspace"; type CodeActionResponse = (CodeAction | Command)[] | null; @@ -62,13 +63,6 @@ function isCommand(item: CodeAction | Command): item is Command { ); } -function lspPositionToOffset( - doc: { line: (n: number) => { from: number } }, - pos: Position, -): number { - return doc.line(pos.line + 1).from + pos.character; -} - async function requestCodeActions( plugin: LSPPlugin, range: LspRange, @@ -157,7 +151,7 @@ async function applyChangesToFile( workspace: AcodeWorkspace, uri: string, changes: LspChange[], - mapping: { mapPosition: (uri: string, pos: Position) => number }, + mapping: { mapPos: (uri: string, pos: number, assoc?: number) => number }, ): Promise { const file = workspace.getFile(uri); if (file) { @@ -165,8 +159,16 @@ async function applyChangesToFile( if (view) { view.dispatch({ changes: changes.map((c) => ({ - from: mapping.mapPosition(uri, c.range.start), - to: mapping.mapPosition(uri, c.range.end), + from: mapping.mapPos( + uri, + safeLspPositionToOffset(file.doc, c.range.start), + 1, + ), + to: mapping.mapPos( + uri, + safeLspPositionToOffset(file.doc, c.range.end), + -1, + ), insert: c.newText, })), userEvent: "codeAction", @@ -188,8 +190,11 @@ async function applyChangesToFile( displayedView.dispatch({ changes: changes.map((c) => ({ - from: lspPositionToOffset(displayedView.state.doc, c.range.start), - to: lspPositionToOffset(displayedView.state.doc, c.range.end), + from: safeLspPositionToOffset( + displayedView.state.doc, + c.range.start, + ), + to: safeLspPositionToOffset(displayedView.state.doc, c.range.end), insert: c.newText, })), userEvent: "codeAction", diff --git a/src/cm/lsp/definition.ts b/src/cm/lsp/definition.ts new file mode 100644 index 0000000000..53d3726ed7 --- /dev/null +++ b/src/cm/lsp/definition.ts @@ -0,0 +1,147 @@ +import { LSPPlugin } from "@codemirror/lsp-client"; +import type { Command, EditorView } from "@codemirror/view"; +import { showReferencesPanel } from "components/referencesPanel"; +import { navigateToReference } from "components/referencesPanel/utils"; +import toast from "components/toast"; +import type { ServerCapabilities } from "vscode-languageserver-protocol"; +import { normalizeLocations, type LspLocationResult } from "./locationUtils"; +import { addLspLogFor } from "./logs"; +import { fetchLineText, getWordAtCursor } from "./references"; + +type DefinitionKind = + | "definition" + | "declaration" + | "implementation" + | "typeDefinition"; + +const CAPABILITY: Record = { + definition: "definitionProvider", + declaration: "declarationProvider", + implementation: "implementationProvider", + typeDefinition: "typeDefinitionProvider", +}; + +const LABEL: Record = { + definition: "definition", + declaration: "declaration", + implementation: "implementation", + typeDefinition: "type definition", +}; + +function locationKey(location: ReturnType[number]) { + const { start, end } = location.range; + return `${location.uri}:${start.line}:${start.character}:${end.line}:${end.character}`; +} + +async function fetchLocations( + view: EditorView, + kind: DefinitionKind, +): Promise | null> { + const plugins = LSPPlugin.getAll(view, kind).filter( + (plugin) => !!plugin.client.serverCapabilities?.[CAPABILITY[kind]], + ); + if (!plugins.length) { + toast(`Language server does not support go to ${LABEL[kind]}`); + return null; + } + + const position = view.state.selection.main.head; + const settled = await Promise.allSettled( + plugins.map(async (plugin) => { + plugin.client.sync(); + return plugin.client.request< + { + textDocument: { uri: string }; + position: { line: number; character: number }; + }, + LspLocationResult + >(`textDocument/${kind}`, { + textDocument: { uri: plugin.uri }, + position: plugin.toPosition(position), + }); + }), + ); + + const locations: ReturnType = []; + const seen = new Set(); + for (let index = 0; index < settled.length; index++) { + const result = settled[index]; + if (result.status === "rejected") { + addLspLogFor( + plugins[index], + "warn", + `Go to ${LABEL[kind]} failed`, + result.reason, + ); + continue; + } + for (const location of normalizeLocations(result.value)) { + const key = locationKey(location); + if (seen.has(key)) continue; + seen.add(key); + locations.push(location); + } + } + return locations; +} + +async function goTo(view: EditorView, kind: DefinitionKind): Promise { + try { + const locations = await fetchLocations(view, kind); + if (locations === null) return false; + if (!locations.length) { + toast(`No ${LABEL[kind]} found`); + return true; + } + + if (locations.length === 1) { + await navigateToReference(locations[0]); + return true; + } + + const symbolName = getWordAtCursor(view); + const panel = showReferencesPanel({ symbolName }); + panel.setReferences( + await Promise.all( + locations.map(async (location) => ({ + ...location, + lineText: await fetchLineText( + location.uri, + location.range.start.line, + ), + })), + ), + ); + return true; + } catch (error) { + console.error(`[LSP:Definition] Go to ${LABEL[kind]} failed:`, error); + return false; + } +} + +export const jumpToDefinition: Command = (view) => { + void goTo(view, "definition"); + return true; +}; + +export const jumpToDeclaration: Command = (view) => { + void goTo(view, "declaration"); + return true; +}; + +export const jumpToImplementation: Command = (view) => { + void goTo(view, "implementation"); + return true; +}; + +export const jumpToTypeDefinition: Command = (view) => { + void goTo(view, "typeDefinition"); + return true; +}; + +export const goToDefinition = (view: EditorView) => goTo(view, "definition"); +export const goToDeclaration = (view: EditorView) => goTo(view, "declaration"); +export const goToImplementation = (view: EditorView) => + goTo(view, "implementation"); +export const goToTypeDefinition = (view: EditorView) => + goTo(view, "typeDefinition"); diff --git a/src/cm/lsp/diagnostics.ts b/src/cm/lsp/diagnostics.ts index 906c505167..61e670ac73 100644 --- a/src/cm/lsp/diagnostics.ts +++ b/src/cm/lsp/diagnostics.ts @@ -10,6 +10,7 @@ import { } from "@codemirror/state"; import { type EditorView, ViewPlugin, type ViewUpdate } from "@codemirror/view"; import { addLspLogFor } from "./logs"; +import { safeLspPositionToOffset } from "./positionUtils"; import type { DocumentDiagnosticParams, DocumentDiagnosticReport, @@ -186,13 +187,13 @@ function collectLspDiagnostics( let from: number; let to: number; try { - const mappedFrom = plugin.fromPosition( - diagnostic.range.start, + const mappedFrom = safeLspPositionToOffset( plugin.syncedDoc, + diagnostic.range.start, ); - const mappedTo = plugin.fromPosition( - diagnostic.range.end, + const mappedTo = safeLspPositionToOffset( plugin.syncedDoc, + diagnostic.range.end, ); const fromResult = plugin.unsyncedChanges.mapPos(mappedFrom); const toResult = plugin.unsyncedChanges.mapPos(mappedTo); diff --git a/src/cm/lsp/documentColors.ts b/src/cm/lsp/documentColors.ts index 11496259fd..6c64c7540d 100644 --- a/src/cm/lsp/documentColors.ts +++ b/src/cm/lsp/documentColors.ts @@ -36,6 +36,7 @@ import { type ColorChipPayload, } from "../colorChip"; import type { LSPPluginAPI } from "./types"; +import { safeLspPositionToOffset } from "./positionUtils"; export interface DocumentColorsConfig { enabled?: boolean; @@ -178,8 +179,8 @@ function mapLspRange( let from: number; let to: number; try { - const fromBase = lsp.fromPosition(range.start, lsp.syncedDoc); - const toBase = lsp.fromPosition(range.end, lsp.syncedDoc); + const fromBase = safeLspPositionToOffset(lsp.syncedDoc, range.start); + const toBase = safeLspPositionToOffset(lsp.syncedDoc, range.end); const fromMapped = lsp.unsyncedChanges.mapPos( fromBase, 1, diff --git a/src/cm/lsp/index.ts b/src/cm/lsp/index.ts index f3a8b4d36a..e165f91b17 100644 --- a/src/cm/lsp/index.ts +++ b/src/cm/lsp/index.ts @@ -89,6 +89,16 @@ export { findAllReferences, findAllReferencesInTab, } from "./references"; +export { + goToDeclaration, + goToDefinition, + goToImplementation, + goToTypeDefinition, + jumpToDeclaration, + jumpToDefinition, + jumpToImplementation, + jumpToTypeDefinition, +} from "./definition"; export { acodeRenameExtension, acodeRenameKeymap, diff --git a/src/cm/lsp/inlayHints.ts b/src/cm/lsp/inlayHints.ts index 477c82d1b2..112ec3e5b3 100644 --- a/src/cm/lsp/inlayHints.ts +++ b/src/cm/lsp/inlayHints.ts @@ -22,6 +22,7 @@ import type { Position, } from "vscode-languageserver-types"; import type { LSPPluginAPI } from "./types"; +import { safeLspPositionToOffset } from "./positionUtils"; // ============================================================================ // Types @@ -238,7 +239,7 @@ function createPlugin(config: InlayHintsConfig) { let pos: number; try { - pos = lsp.fromPosition(h.position, lsp.syncedDoc); + pos = safeLspPositionToOffset(lsp.syncedDoc, h.position); const mapped = lsp.unsyncedChanges.mapPos(pos); if (mapped === null) continue; pos = mapped; diff --git a/src/cm/lsp/locationUtils.ts b/src/cm/lsp/locationUtils.ts new file mode 100644 index 0000000000..672c6a2744 --- /dev/null +++ b/src/cm/lsp/locationUtils.ts @@ -0,0 +1,26 @@ +import type { + Location, + LocationLink, +} from "vscode-languageserver-protocol"; + +export type LspLocationResult = + | Location + | Location[] + | LocationLink[] + | null; + +/** Normalize definition-style responses to the Location shape used by Acode. */ +export function normalizeLocations(result: LspLocationResult): Location[] { + if (!result) return []; + const locations = Array.isArray(result) ? result : [result]; + + return locations.map((location) => { + if ("targetUri" in location) { + return { + uri: location.targetUri, + range: location.targetSelectionRange ?? location.targetRange, + }; + } + return location; + }); +} diff --git a/src/cm/lsp/positionUtils.ts b/src/cm/lsp/positionUtils.ts new file mode 100644 index 0000000000..158afe188e --- /dev/null +++ b/src/cm/lsp/positionUtils.ts @@ -0,0 +1,16 @@ +import type { Text } from "@codemirror/state"; + +/** Convert an LSP position to an offset without reading outside the document. */ +export function safeLspPositionToOffset( + doc: Pick, + position: { line: number; character: number }, +): number { + if (position.line < 0) return 0; + if (position.line >= doc.lines) return doc.length; + + const line = doc.line(position.line + 1); + const character = Number.isFinite(position.character) + ? Math.max(0, Math.min(position.character, line.length)) + : 0; + return line.from + character; +} diff --git a/src/cm/lsp/references.ts b/src/cm/lsp/references.ts index def69288c3..cb02fe207d 100644 --- a/src/cm/lsp/references.ts +++ b/src/cm/lsp/references.ts @@ -33,7 +33,7 @@ interface ReferenceParams { context: { includeDeclaration: boolean }; } -async function fetchLineText(uri: string, line: number): Promise { +export async function fetchLineText(uri: string, line: number): Promise { try { interface EditorManagerLike { getFile?: (uri: string, type: string) => EditorFileLike | null; @@ -89,7 +89,7 @@ async function fetchLineText(uri: string, line: number): Promise { return ""; } -function getWordAtCursor(view: EditorView): string { +export function getWordAtCursor(view: EditorView): string { const { state } = view; const pos = state.selection.main.head; const word = state.wordAt(pos); diff --git a/src/cm/lsp/rename.ts b/src/cm/lsp/rename.ts index 75b89693cb..5e4c93b50b 100644 --- a/src/cm/lsp/rename.ts +++ b/src/cm/lsp/rename.ts @@ -8,6 +8,7 @@ import { import prompt from "dialogs/prompt"; import type * as lsp from "vscode-languageserver-protocol"; import { addLspLogFor } from "./logs"; +import { safeLspPositionToOffset } from "./positionUtils"; import type AcodeWorkspace from "./workspace"; interface RenameParams { @@ -99,12 +100,24 @@ async function performRename(view: EditorView): Promise { ) { initialValue = word; } else if ("start" in prepareResult && "end" in prepareResult) { - const from = plugin.fromPosition(prepareResult.start); - const to = plugin.fromPosition(prepareResult.end); + const from = safeLspPositionToOffset( + view.state.doc, + prepareResult.start, + ); + const to = safeLspPositionToOffset( + view.state.doc, + prepareResult.end, + ); initialValue = view.state.sliceDoc(from, to); } else if ("range" in prepareResult && prepareResult.range) { - const from = plugin.fromPosition(prepareResult.range.start); - const to = plugin.fromPosition(prepareResult.range.end); + const from = safeLspPositionToOffset( + view.state.doc, + prepareResult.range.start, + ); + const to = safeLspPositionToOffset( + view.state.doc, + prepareResult.range.end, + ); initialValue = view.state.sliceDoc(from, to); } } @@ -148,19 +161,11 @@ async function performRename(view: EditorView): Promise { return true; } -function lspPositionToOffset( - doc: { line: (n: number) => { from: number } }, - pos: lsp.Position, -): number { - const line = doc.line(pos.line + 1); - return line.from + pos.character; -} - async function applyChangesToFile( workspace: AcodeWorkspace, uri: string, lspChanges: LspChange[], - mapping: { mapPosition: (uri: string, pos: lsp.Position) => number }, + mapping: { mapPos: (uri: string, pos: number, assoc?: number) => number }, ): Promise { const file = workspace.getFile(uri); @@ -169,8 +174,16 @@ async function applyChangesToFile( if (view) { view.dispatch({ changes: lspChanges.map((change) => ({ - from: mapping.mapPosition(uri, change.range.start), - to: mapping.mapPosition(uri, change.range.end), + from: mapping.mapPos( + uri, + safeLspPositionToOffset(file.doc, change.range.start), + 1, + ), + to: mapping.mapPos( + uri, + safeLspPositionToOffset(file.doc, change.range.end), + -1, + ), insert: change.newText, })), userEvent: "rename", @@ -189,8 +202,8 @@ async function applyChangesToFile( const doc = displayedView.state.doc; displayedView.dispatch({ changes: lspChanges.map((change) => ({ - from: lspPositionToOffset(doc, change.range.start), - to: lspPositionToOffset(doc, change.range.end), + from: safeLspPositionToOffset(doc, change.range.start), + to: safeLspPositionToOffset(doc, change.range.end), insert: change.newText, })), userEvent: "rename", diff --git a/src/cm/lsp/tooltipExtensions.ts b/src/cm/lsp/tooltipExtensions.ts index 2a9a157ea0..7332d12a2c 100644 --- a/src/cm/lsp/tooltipExtensions.ts +++ b/src/cm/lsp/tooltipExtensions.ts @@ -40,6 +40,7 @@ import type { MarkupContent, } from "vscode-languageserver-types"; import { getMode, getModeForPath, type Mode } from "../modelist"; +import { safeLspPositionToOffset } from "./positionUtils"; interface LspClientInternals { config?: { @@ -258,14 +259,6 @@ async function loadHoverContentLanguages(contents: Hover["contents"]): Promise"']/g, (match) => { switch (match) { @@ -401,8 +394,14 @@ function lspTooltipSource( let to = pos; for (const { result } of results) { if (!result.range) continue; - from = Math.min(from, fromPosition(view.state.doc, result.range.start)); - to = Math.max(to, fromPosition(view.state.doc, result.range.end)); + from = Math.min( + from, + safeLspPositionToOffset(view.state.doc, result.range.start), + ); + to = Math.max( + to, + safeLspPositionToOffset(view.state.doc, result.range.end), + ); } return { diff --git a/src/cm/lsp/types.ts b/src/cm/lsp/types.ts index ad47e72df0..6f39038a42 100644 --- a/src/cm/lsp/types.ts +++ b/src/cm/lsp/types.ts @@ -631,13 +631,8 @@ export interface LSPPluginAPI { client: LSPClient & { sync: () => void; connected?: boolean }; /** Convert a document offset to an LSP Position */ toPosition: (offset: number) => { line: number; character: number }; - /** Convert an LSP Position to a document offset */ - fromPosition: ( - pos: { line: number; character: number }, - doc?: unknown, - ) => number; /** The currently synced document state */ - syncedDoc: { length: number }; + syncedDoc: Text; /** Pending changes that haven't been synced yet */ unsyncedChanges: { mapPos: (pos: number, assoc?: number, mode?: MapMode) => number | null; diff --git a/src/cm/touchSelectionMenu.js b/src/cm/touchSelectionMenu.js index c61b7bc060..b017acb1fb 100644 --- a/src/cm/touchSelectionMenu.js +++ b/src/cm/touchSelectionMenu.js @@ -140,6 +140,31 @@ function hasCodeActionProvider(view) { ); } +function hasLspActions(view) { + const capabilities = [ + ["definition", "definitionProvider"], + ["declaration", "declarationProvider"], + ["implementation", "implementationProvider"], + ["typeDefinition", "typeDefinitionProvider"], + ["references", "referencesProvider"], + ]; + if ( + capabilities.some(([feature, capability]) => + LSPPlugin.getAll(view, feature).some( + (plugin) => !!plugin.client.serverCapabilities?.[capability], + ), + ) + ) { + return true; + } + return ( + !view.state.readOnly && + LSPPlugin.getAll(view, "rename").some( + (plugin) => !!plugin.client.serverCapabilities?.renameProvider, + ) + ); +} + function animationsDisabled() { return ( document.body.classList.contains("no-animation") || @@ -665,6 +690,7 @@ class TouchSelectionMenuController { const items = filterSelectionMenuItems( selectionMenu({ codeActionsAvailable: hasCodeActionProvider(this.#view), + lspActionsAvailable: hasLspActions(this.#view), }), { readOnly: this.#isReadOnly(), diff --git a/src/components/referencesPanel/utils.js b/src/components/referencesPanel/utils.js index d88a9ca84f..d02de6ca54 100644 --- a/src/components/referencesPanel/utils.js +++ b/src/components/referencesPanel/utils.js @@ -1,5 +1,5 @@ -import { EditorView } from "@codemirror/view"; import { focusEditorIfEditable } from "cm/editorReadOnly"; +import { safeLspPositionToOffset } from "cm/lsp/positionUtils"; import Sidebar from "components/sidebar"; import DOMPurify from "dompurify"; import openFile from "lib/openFile"; @@ -117,19 +117,22 @@ export async function navigateToReference(ref) { if (!editor) return; const doc = editor.state.doc; - const startLine = doc.line(ref.range.start.line + 1); - const endLine = doc.line(ref.range.end.line + 1); - const from = Math.min( - startLine.from + ref.range.start.character, - startLine.to, - ); - const to = Math.min(endLine.from + ref.range.end.character, endLine.to); + const from = safeLspPositionToOffset(doc, ref.range.start); + const to = safeLspPositionToOffset(doc, ref.range.end); - editor.dispatch({ - selection: { anchor: from, head: to }, - effects: EditorView.scrollIntoView(from, { y: "center" }), - }); - focusEditorIfEditable(editor); + if (typeof editorManager.revealRange === "function") { + editorManager.revealRange(from, to, { + y: "center", + userEvent: "select.definition", + }); + } else { + editor.dispatch({ + selection: { anchor: from, head: to }, + scrollIntoView: true, + userEvent: "select.definition", + }); + focusEditorIfEditable(editor); + } } catch (error) { console.error("Failed to navigate to reference:", error); } diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js index d216b4b933..3ce9068465 100644 --- a/src/lib/editorManager.js +++ b/src/lib/editorManager.js @@ -1850,13 +1850,7 @@ async function EditorManager($header, $body) { const col = Math.max(0, Math.min(targetColumn, docLine.length)); const pos = docLine.from + col; - // Move cursor and scroll into view - editor.dispatch({ - selection: { anchor: pos, head: pos }, - effects: EditorView.scrollIntoView(pos, { y: "center" }), - }); - focusEditorIfEditable(editor); - return true; + return revealEditorRange(editor, pos); } catch (error) { console.error("Error in gotoLine:", error); return false; @@ -2181,12 +2175,7 @@ async function EditorManager($header, $body) { const col = Math.max(0, Math.min(targetColumn, docLine.length)); const pos = docLine.from + col; - targetEditor.dispatch({ - selection: { anchor: pos, head: pos }, - effects: EditorView.scrollIntoView(pos, { y: "center" }), - }); - focusEditorIfEditable(targetEditor); - return true; + return revealEditorRange(targetEditor, pos); } catch (error) { console.error("Error in gotoLine:", error); return false; @@ -3192,6 +3181,9 @@ async function EditorManager($header, $body) { hasUnsavedFiles, getEditorHeight, getEditorWidth, + revealRange(from, to = from, options) { + return revealEditorRange(manager.editor, from, to, options); + }, header: $header, openPreviousEditorFromHistory, openNextEditorFromHistory, @@ -3452,6 +3444,45 @@ async function EditorManager($header, $body) { applyFileToEditor(file, { forceRecreate: true }); } + /** + * Reveal an editor range after a file switch. + * + * File activation restores the tab's saved viewport over two animation + * frames and a short timeout. Explicit navigation must cancel that work or + * it can overwrite CodeMirror's scrollIntoView effect while leaving the new + * selection in place. + */ + function revealEditorRange( + targetEditor, + from, + to = from, + { y = "center", userEvent = "select.reveal" } = {}, + ) { + if (!targetEditor) return false; + + try { + const length = targetEditor.state.doc.length; + const anchor = Math.max(0, Math.min(Number(from) || 0, length)); + const head = Math.max(0, Math.min(Number(to) || 0, length)); + + if (targetEditor === editor) { + cancelPendingScrollRestore(); + clearScrollbarScrollLock(); + } + + targetEditor.dispatch({ + selection: { anchor, head }, + effects: EditorView.scrollIntoView(anchor, { y }), + userEvent, + }); + focusEditorIfEditable(targetEditor); + return true; + } catch (error) { + console.error("Error revealing editor range:", error); + return false; + } + } + appSettings.on("update:tabSize", function () { updateEditorIndentationSettings(); }); diff --git a/src/lib/selectionMenu.js b/src/lib/selectionMenu.js index 333333fb8e..f071d62bd8 100644 --- a/src/lib/selectionMenu.js +++ b/src/lib/selectionMenu.js @@ -27,10 +27,78 @@ const showCodeActions = async () => { } }; +const showLspActions = async () => { + const { editor } = editorManager; + if (!editor) return; + + try { + const lsp = await import("cm/lsp"); + const { LSPPlugin } = await import("@codemirror/lsp-client"); + const hasCapability = (feature, capability) => + LSPPlugin.getAll(editor, feature).some( + (plugin) => !!plugin.client.serverCapabilities?.[capability], + ); + const editable = !editor.state.readOnly; + const actions = [ + hasCapability("definition", "definitionProvider") && { + value: "definition", + text: getLabel("go to definition", "Go to Definition"), + icon: "keyboard_arrow_right", + run: lsp.goToDefinition, + }, + hasCapability("declaration", "declarationProvider") && { + value: "declaration", + text: getLabel("go to declaration", "Go to Declaration"), + icon: "keyboard_arrow_right", + run: lsp.goToDeclaration, + }, + hasCapability("implementation", "implementationProvider") && { + value: "implementation", + text: getLabel("go to implementation", "Go to Implementation"), + icon: "keyboard_arrow_right", + run: lsp.goToImplementation, + }, + hasCapability("typeDefinition", "typeDefinitionProvider") && { + value: "type-definition", + text: getLabel("go to type definition", "Go to Type Definition"), + icon: "keyboard_arrow_right", + run: lsp.goToTypeDefinition, + }, + hasCapability("references", "referencesProvider") && { + value: "references", + text: getLabel("find references", "Find References"), + icon: "linkinsert_link", + run: lsp.findAllReferences, + }, + editable && + hasCapability("rename", "renameProvider") && { + value: "rename", + text: getLabel("rename symbol", "Rename Symbol"), + icon: "edit", + run: lsp.renameSymbol, + }, + ].filter(Boolean); + + if (!actions.length) return; + // Let the tap/click that opened this picker finish before its rows exist. + // Otherwise Android WebView can deliver that click to the first row. + await new Promise((resolve) => setTimeout(resolve, 0)); + const { default: select } = await import("dialogs/select"); + const selected = await select( + getLabel("lsp actions", "LSP Actions"), + actions, + ).catch(() => null); + const action = actions.find((item) => item.value === selected); + if (action) await action.run(editor); + } catch (error) { + console.warn("[SelectionMenu] LSP actions not available:", error); + } +}; + const items = []; export default function selectionMenu(options = {}) { - const { codeActionsAvailable = true } = options; + const { codeActionsAvailable = true, lspActionsAvailable = true } = options; return [ item( () => exec("copy"), @@ -92,6 +160,17 @@ export default function selectionMenu(options = {}) { label: getLabel("code actions", "Code Actions"), }, ), + lspActionsAvailable && + item( + () => showLspActions(), + , + "all", + true, + { + id: "lsp-actions", + label: getLabel("lsp actions", "LSP Actions"), + }, + ), ...items, ].filter(Boolean); } diff --git a/tests/unit/lspExternalWebSocketLifecycle.test.js b/tests/unit/lspExternalWebSocketLifecycle.test.js index 65b66dbcbc..227061a14d 100644 --- a/tests/unit/lspExternalWebSocketLifecycle.test.js +++ b/tests/unit/lspExternalWebSocketLifecycle.test.js @@ -197,6 +197,24 @@ afterEach(async () => { }); describe("LSP client idle lifecycle", () => { + it("advertises lazy code-action edit resolution", async () => { + manager = new LspClientManager(); + await manager.getExtensionsForFile({ + uri: "file:///workspace/main.rs", + rootUri: "file:///workspace", + languageId: LANGUAGE_ID, + view, + }); + + const initialize = TestWebSocket.instances[0].sent + .map((data) => JSON.parse(data)) + .find((message) => message.method === "initialize"); + expect(initialize.params.capabilities.textDocument.codeAction).toEqual({ + dataSupport: true, + resolveSupport: {properties: ["edit"]}, + }); + }); + it("reuses an external WebSocket client when a file attaches during the grace period", async () => { const onClientIdle = vi.fn(({dispose}) => void dispose()); manager = new LspClientManager({onClientIdle}); diff --git a/tests/unit/lspLocationUtils.test.ts b/tests/unit/lspLocationUtils.test.ts new file mode 100644 index 0000000000..8a006dd372 --- /dev/null +++ b/tests/unit/lspLocationUtils.test.ts @@ -0,0 +1,38 @@ +import { normalizeLocations } from "cm/lsp/locationUtils"; +import { describe, expect, it } from "vitest"; + +const targetRange = { + start: { line: 4, character: 1 }, + end: { line: 4, character: 8 }, +}; + +describe("normalizeLocations", () => { + it("keeps Location responses unchanged", () => { + const location = { uri: "file:///project/a.ts", range: targetRange }; + expect(normalizeLocations(location)).toEqual([location]); + }); + + it("uses a LocationLink target selection range when present", () => { + const selection = { + start: { line: 4, character: 3 }, + end: { line: 4, character: 6 }, + }; + expect( + normalizeLocations([ + { + targetUri: "file:///project/a.ts", + targetRange, + targetSelectionRange: selection, + }, + ]), + ).toEqual([{ uri: "file:///project/a.ts", range: selection }]); + }); + + it("falls back to the LocationLink target range", () => { + expect( + normalizeLocations([ + { targetUri: "file:///project/a.ts", targetRange }, + ]), + ).toEqual([{ uri: "file:///project/a.ts", range: targetRange }]); + }); +}); diff --git a/tests/unit/lspPositionUtils.test.ts b/tests/unit/lspPositionUtils.test.ts new file mode 100644 index 0000000000..789e4ff250 --- /dev/null +++ b/tests/unit/lspPositionUtils.test.ts @@ -0,0 +1,28 @@ +import { Text } from "@codemirror/state"; +import { safeLspPositionToOffset } from "cm/lsp/positionUtils"; +import { describe, expect, it } from "vitest"; + +describe("safeLspPositionToOffset", () => { + const doc = Text.of(["alpha", "beta"]); + + it("converts valid positions and clamps oversized characters", () => { + expect(safeLspPositionToOffset(doc, { line: 0, character: 2 })).toBe(2); + expect(safeLspPositionToOffset(doc, { line: 1, character: 99 })).toBe( + doc.length, + ); + }); + + it("accepts the exclusive one-past-EOF position used by LSP edits", () => { + expect( + safeLspPositionToOffset(doc, { line: doc.lines, character: 0 }), + ).toBe(doc.length); + expect( + safeLspPositionToOffset(doc, { line: doc.lines + 10, character: 4 }), + ).toBe(doc.length); + }); + + it("clamps negative lines and characters", () => { + expect(safeLspPositionToOffset(doc, { line: -1, character: 20 })).toBe(0); + expect(safeLspPositionToOffset(doc, { line: 1, character: -4 })).toBe(6); + }); +}); From 289de09744d6ce81150917bf4d318ed305585bd7 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 30 Aug 2026 04:42:59 +0000 Subject: [PATCH 088/195] fix(editor): highlight all visible search matches (#2838) --- src/cm/mainEditorExtensions.ts | 5 +- src/cm/searchMatchHighlighter.ts | 140 +++++++++++++++++++ tests/unit/searchMatchHighlighter.test.ts | 161 ++++++++++++++++++++++ 3 files changed, 305 insertions(+), 1 deletion(-) create mode 100644 src/cm/searchMatchHighlighter.ts create mode 100644 tests/unit/searchMatchHighlighter.test.ts diff --git a/src/cm/mainEditorExtensions.ts b/src/cm/mainEditorExtensions.ts index e445bf9b40..f825898d4a 100644 --- a/src/cm/mainEditorExtensions.ts +++ b/src/cm/mainEditorExtensions.ts @@ -1,5 +1,6 @@ import type { Extension } from "@codemirror/state"; import { EditorView } from "@codemirror/view"; +import searchMatchHighlighter from "./searchMatchHighlighter"; interface MainEditorExtensionOptions { emmetExtensions?: Extension[]; @@ -51,7 +52,9 @@ export function createMainEditorExtensions( pushExtension(extensions, options.multiCursorSelectionExtension); pushExtension(extensions, options.touchSelectionUpdateExtension); pushExtension(extensions, options.quickToolsModifierInputExtension); - pushExtension(extensions, options.searchExtension); + if (options.searchExtension != null) { + extensions.push(options.searchExtension, searchMatchHighlighter); + } pushExtension(extensions, options.readOnlyExtension); if (options.optionExtensions?.length) { diff --git a/src/cm/searchMatchHighlighter.ts b/src/cm/searchMatchHighlighter.ts new file mode 100644 index 0000000000..70449c54ab --- /dev/null +++ b/src/cm/searchMatchHighlighter.ts @@ -0,0 +1,140 @@ +import { + getSearchQuery, + searchPanelOpen, + type SearchQuery, +} from "@codemirror/search"; +import { RangeSetBuilder, type EditorState } from "@codemirror/state"; +import type { DecorationSet, ViewUpdate } from "@codemirror/view"; +import { Decoration, EditorView, ViewPlugin } from "@codemirror/view"; + +interface DocRange { + from: number; + to: number; +} + +// Keep the same regular-expression look-around used by CodeMirror's built-in +// search highlighter. Literal searches only need enough context to catch a +// match that crosses a viewport boundary. +const REGEXP_SCAN_MARGIN = 250; + +const matchMark = Decoration.mark({ class: "cm-searchMatch" }); +const selectedMatchMark = Decoration.mark({ + class: "cm-searchMatch cm-searchMatch-selected", +}); + +function scanMargin(query: SearchQuery): number { + return query.regexp ? REGEXP_SCAN_MARGIN : query.search.length; +} + +function sameHighlightQuery(left: SearchQuery, right: SearchQuery): boolean { + return ( + left.search === right.search && + left.caseSensitive === right.caseSensitive && + left.literal === right.literal && + left.regexp === right.regexp && + left.wholeWord === right.wholeWord && + left.test === right.test + ); +} + +function scanRanges( + visibleRanges: readonly DocRange[], + margin: number, + docLength: number, +): DocRange[] { + const ranges: DocRange[] = []; + + for (const visible of visibleRanges) { + const from = Math.max(0, visible.from - margin); + const to = Math.min(docLength, visible.to + margin); + const previous = ranges[ranges.length - 1]; + + if (previous && from <= previous.to) { + previous.to = Math.max(previous.to, to); + } else { + ranges.push({ from, to }); + } + } + + return ranges; +} + +/** + * Builds search marks only around rendered document ranges. Keeping this + * separate from the view plugin makes the viewport-only behavior testable. + */ +export function buildSearchMatchDecorations( + state: EditorState, + visibleRanges: readonly DocRange[], +): DecorationSet { + const query = getSearchQuery(state); + if (!query.search || !query.valid || searchPanelOpen(state)) { + return Decoration.none; + } + + const builder = new RangeSetBuilder(); + const ranges = scanRanges(visibleRanges, scanMargin(query), state.doc.length); + const selectedRanges = new Map>(); + for (const range of state.selection.ranges) { + let ends = selectedRanges.get(range.from); + if (!ends) selectedRanges.set(range.from, (ends = new Set())); + ends.add(range.to); + } + + for (const { from, to } of ranges) { + const cursor = query.getCursor(state, from, to); + for (let result = cursor.next(); !result.done; result = cursor.next()) { + const match = result.value; + const selected = selectedRanges.get(match.from)?.has(match.to) === true; + builder.add( + match.from, + match.to, + selected ? selectedMatchMark : matchMark, + ); + } + } + + return builder.finish(); +} + +class SearchMatchHighlighterPlugin { + decorations: DecorationSet; + + constructor(view: EditorView) { + this.decorations = buildSearchMatchDecorations( + view.state, + view.visibleRanges, + ); + } + + update(update: ViewUpdate): void { + const queryChanged = !sameHighlightQuery( + getSearchQuery(update.state), + getSearchQuery(update.startState), + ); + const panelChanged = + searchPanelOpen(update.state) !== searchPanelOpen(update.startState); + + if ( + queryChanged || + panelChanged || + update.docChanged || + update.selectionSet || + update.viewportChanged + ) { + this.decorations = buildSearchMatchDecorations( + update.state, + update.view.visibleRanges, + ); + } + } +} + +export const searchMatchHighlighter = ViewPlugin.fromClass( + SearchMatchHighlighterPlugin, + { + decorations: (plugin) => plugin.decorations, + }, +); + +export default searchMatchHighlighter; diff --git a/tests/unit/searchMatchHighlighter.test.ts b/tests/unit/searchMatchHighlighter.test.ts new file mode 100644 index 0000000000..7b4fb5ac23 --- /dev/null +++ b/tests/unit/searchMatchHighlighter.test.ts @@ -0,0 +1,161 @@ +// @vitest-environment happy-dom + +import { + openSearchPanel, + search, + SearchQuery, + setSearchQuery, +} from "@codemirror/search"; +import { EditorSelection, EditorState } from "@codemirror/state"; +import { type DecorationSet, EditorView } from "@codemirror/view"; +import searchMatchHighlighter, { + buildSearchMatchDecorations, +} from "cm/searchMatchHighlighter"; +import { afterEach, describe, expect, it } from "vitest"; + +interface HighlightRange { + from: number; + to: number; + className: string; +} + +const views: EditorView[] = []; + +afterEach(() => { + while (views.length) views.pop()?.destroy(); + document.body.replaceChildren(); +}); + +function searchState( + doc: string, + searchText: string, + selection = EditorSelection.cursor(0), + options: Partial[0]> = {}, +): EditorState { + const state = EditorState.create({ + doc, + selection, + extensions: search(), + }); + return state.update({ + effects: setSearchQuery.of( + new SearchQuery({ search: searchText, ...options }), + ), + }).state; +} + +function highlightRanges( + state: EditorState, + visibleRanges: readonly { from: number; to: number }[], +): HighlightRange[] { + return decorationRanges( + buildSearchMatchDecorations(state, visibleRanges), + state.doc.length, + ); +} + +function decorationRanges( + decorations: DecorationSet, + docLength: number, +): HighlightRange[] { + const ranges: HighlightRange[] = []; + decorations.between(0, docLength, (from, to, decoration) => { + ranges.push({ + from, + to, + className: String(decoration.spec.class ?? ""), + }); + }); + return ranges; +} + +describe("custom search match highlighter", () => { + it("reacts to custom query and selection updates without a native panel", () => { + const view = new EditorView({ + state: EditorState.create({ + doc: "foo foo", + extensions: [search(), searchMatchHighlighter], + }), + parent: document.body, + }); + views.push(view); + + view.dispatch({ + effects: setSearchQuery.of(new SearchQuery({ search: "foo" })), + }); + view.dispatch({ selection: EditorSelection.range(4, 7) }); + + const plugin = view.plugin(searchMatchHighlighter); + expect(plugin).not.toBeNull(); + expect( + decorationRanges(plugin!.decorations, view.state.doc.length), + ).toEqual([ + { from: 0, to: 3, className: "cm-searchMatch" }, + { + from: 4, + to: 7, + className: "cm-searchMatch cm-searchMatch-selected", + }, + ]); + }); + + it("highlights every match in the rendered range and marks the selection", () => { + const state = searchState( + "foo foo foo", + "foo", + EditorSelection.range(4, 7), + ); + + expect(highlightRanges(state, [{ from: 0, to: state.doc.length }])).toEqual( + [ + { from: 0, to: 3, className: "cm-searchMatch" }, + { + from: 4, + to: 7, + className: "cm-searchMatch cm-searchMatch-selected", + }, + { from: 8, to: 11, className: "cm-searchMatch" }, + ], + ); + }); + + it("limits work to the viewport instead of scanning a large document", () => { + const padding = "x".repeat(100_000); + const doc = `needle${padding}needle${padding}needle`; + const middleMatch = 6 + padding.length; + const state = searchState(doc, "needle"); + + expect( + highlightRanges(state, [ + { from: middleMatch - 10, to: middleMatch + 16 }, + ]), + ).toEqual([ + { from: middleMatch, to: middleMatch + 6, className: "cm-searchMatch" }, + ]); + }); + + it("merges nearby viewport windows so matches are not decorated twice", () => { + const state = searchState("foo foo foo", "foo"); + + expect( + highlightRanges(state, [ + { from: 0, to: 5 }, + { from: 6, to: 11 }, + ]), + ).toHaveLength(3); + }); + + it("leaves highlighting to CodeMirror when its native panel is open", () => { + const view = new EditorView({ + state: searchState("foo foo", "foo"), + parent: document.body, + }); + views.push(view); + + openSearchPanel(view); + + expect( + highlightRanges(view.state, [{ from: 0, to: view.state.doc.length }]), + ).toEqual([]); + }); +}); From fd3e31a43126cefb1d2de913a7b78dd99c40533b Mon Sep 17 00:00:00 2001 From: summoner Date: Mon, 31 Aug 2026 06:08:32 +0000 Subject: [PATCH 089/195] Translation: Update hu-hu.json (#2828) * Translation: Update hu-hu.json Fixing AI-translated strings * Translation: Update hu-hu.json Fix typos --- src/lang/hu-hu.json | 54 ++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index 061b674d7b..f8e76f3ac0 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -837,35 +837,35 @@ "horizontal scroll margin": "Vízszintes görgetési margó", "settings-info-horizontal-scroll-margin": "A leghosszabb sor után egy üres hely lesz hozzáadva a képernyő széléhez, ha a sorok tördelése ki van kapcsolva. Adjon meg egy nem negatív egész pixelértéket.", "plugin-review:dialog-label": "Bővítményértékelések", - "plugin-review:account-check-failed": "Nem sikerült ellenőrizni a fiókodat. Próbáld újra.", - "plugin-review:sign-in": "Jelentkezz be az értékeléshez", - "plugin-review:edit": "Értékelésed szerkesztése", - "plugin-review:add": "Értékelés hozzáadása…", - "plugin-review:placeholder": "Oszd meg a tapasztalataidat…", - "plugin-review:input-label": "Bővítmény értékelése", - "plugin-review:vote-group-label": "Szavazat", + "plugin-review:account-check-failed": "Nem sikerült ellenőrizni a fiókját. Próbálja újra.", + "plugin-review:sign-in": "Megjegyzés írásához be kell jelentkezni", + "plugin-review:edit": "Megjegyzés szerkesztése", + "plugin-review:add": "Megjegyzés hozzáadása…", + "plugin-review:placeholder": "Ossza meg a tapasztalatait…", + "plugin-review:input-label": "Megjegyzés hozzáadása", + "plugin-review:vote-group-label": "Szavazás", "plugin-review:thumbs-up": "Tetszik", "plugin-review:thumbs-down": "Nem tetszik", - "plugin-review:delete": "Értékelés törlése", - "plugin-review:load-failed": "Nem sikerült betölteni az értékeléseket.", + "plugin-review:delete": "Megjegyzés törlése", + "plugin-review:load-failed": "Nem sikerült betölteni a megjegyzéseket.", "plugin-review:retry": "Újrapróbálkozás", - "plugin-review:empty-title": "Még nincsenek értékelések", - "plugin-review:empty-description": "Oszd meg elsőként a tapasztalataidat.", - "plugin-review:yours": "Saját értékelésed", - "plugin-review:community": "Közösségi értékelések", - "plugin-review:no-other-reviews": "Még nincsenek további értékelések.", - "plugin-review:login-incomplete": "A bejelentkezés nem fejeződött be.", + "plugin-review:empty-title": "Még nincsenek megjegyzések", + "plugin-review:empty-description": "Ossza meg elsőként a tapasztalatait.", + "plugin-review:yours": "Saját megjegyzés", + "plugin-review:community": "Közösségi megjegyzések", + "plugin-review:no-other-reviews": "Még nincsenek további megjegyzések.", + "plugin-review:login-incomplete": "A bejelentkezési folyamat még nem fejeződött be.", "plugin-review:sign-in-failed": "Nem sikerült bejelentkezni.", - "plugin-review:session-expired-review": "A munkameneted lejárt. Jelentkezz be újra az értékeléshez.", - "plugin-review:save-failed": "Nem sikerült menteni az értékelést.", - "plugin-review:delete-confirmation": "Törlöd az értékelésedet? Ez nem vonható vissza.", - "plugin-review:session-expired-continue": "A munkameneted lejárt. Jelentkezz be újra a folytatáshoz.", - "plugin-review:delete-failed": "Nem sikerült törölni az értékelést.", - "plugin-review:you": "Te", - "plugin-review:edit-action": "Értékelés szerkesztése", - "plugin-review:recommended": "Ajánlja ezt a bővítményt", - "plugin-review:error-max-length": "Az értékelés legfeljebb {max} karakter lehet.", - "plugin-review:error-downvote-comment": "Írd meg a fejlesztőnek, min lehetne javítani.", - "plugin-review:error-empty": "Adj hozzá megjegyzést, vagy válaszd a Tetszik lehetőséget.", - "plugin-review:unrated": "Nincs értékelve" + "plugin-review:session-expired-review": "A munkamenet lejárt. Jelentkezzen be újra a megjegyzés írásához.", + "plugin-review:save-failed": "Nem sikerült menteni a megjegyzést.", + "plugin-review:delete-confirmation": "Biztosan törli a megjegyzést? Ez a művelet nem vonható vissza.", + "plugin-review:session-expired-continue": "A munkamenet lejárt. A folytatáshoz jelentkezzen be újra.", + "plugin-review:delete-failed": "Nem sikerült törölni a megjegyzést.", + "plugin-review:you": "Ön", + "plugin-review:edit-action": "Megjegyzés szerkesztése", + "plugin-review:recommended": "Bővítmény ajánlása", + "plugin-review:error-max-length": "A megjegyzés szövege legfeljebb {max} karakter lehet.", + "plugin-review:error-downvote-comment": "Írja meg a fejlesztőknek, hogy min lehetne javítani.", + "plugin-review:error-empty": "Adjon hozzá megjegyzést vagy válassza a „Tetszik” lehetőséget.", + "plugin-review:unrated": "Még nem értékelte senki" } From d3877473f3a1c72e60c8eb207cc3f329ca3eefec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2026 06:13:37 +0000 Subject: [PATCH 090/195] chore(deps): bump actions/setup-java from 5 to 6 (#2821) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 5 to 6. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/setup-java dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/nightly-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index b7812b4341..4323996a06 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -106,7 +106,7 @@ jobs: allow-unsafe-pr-checkout: ${{ !!(inputs.is_PR && inputs.PR_NUMBER && github.event.pull_request.head.sha) }} - name: Setup Java - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: temurin java-version: "21" From 618a6fd7a145e830936d4f456e5a56b8558c3768 Mon Sep 17 00:00:00 2001 From: Rohit Kushvaha Date: Mon, 31 Aug 2026 07:08:49 +0000 Subject: [PATCH 091/195] feat: improved pluginContext (#2806) * feat: improved pluginContext * Update src/lib/pluginContext.js Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> * format * fix: holes * format * . --------- Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --- package-lock.json | 5247 +---------------- src/lib/loadPlugin.js | 10 +- src/lib/pluginContext.js | 162 + src/plugins/pluginContext/plugin.xml | 5 - .../pluginContext/src/android/Tee.java | 160 +- .../pluginContext/www/PluginContext.js | 90 - 6 files changed, 383 insertions(+), 5291 deletions(-) create mode 100644 src/lib/pluginContext.js delete mode 100644 src/plugins/pluginContext/www/PluginContext.js diff --git a/package-lock.json b/package-lock.json index 85817b8fcd..db9891a999 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4151,13 +4151,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true, - "license": "MIT" - }, "node_modules/@iconify/types": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz", @@ -4705,34 +4698,6 @@ "node": ">=10" } }, - "node_modules/@npmcli/move-file": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", - "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "dev": true, - "license": "MIT", - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@npmcli/move-file/node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "license": "MIT", - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@npmcli/name-from-folder": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-4.0.0.tgz", @@ -5751,16 +5716,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/@sindresorhus/is": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", - "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/@sphinxxxx/color-conversion": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/@sphinxxxx/color-conversion/-/color-conversion-2.2.2.tgz", @@ -5774,29 +5729,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@szmarczak/http-timer": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", - "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "defer-to-connect": "^1.0.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 6" - } - }, "node_modules/@tufjs/canonical-json": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz", @@ -6638,53 +6570,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/accepts/node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/accepts/node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/accepts/node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/acorn": { "version": "8.18.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz", @@ -6706,33 +6591,6 @@ "node": ">= 14" } }, - "node_modules/agentkeepalive": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz", - "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "humanize-ms": "^1.2.1" - }, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "license": "MIT", - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/ajv": { "version": "8.20.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", @@ -6810,61 +6668,6 @@ "integrity": "sha512-iFY7JCgHbepc0b82yLaw4IMortylNb6wG4kL+4R0C3iv6i+RHGHux/yUX5BTiRvSX/shMnngjR1YyNMnXEFh5A==", "license": "MIT" }, - "node_modules/ansi-align": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", - "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^4.1.0" - } - }, - "node_modules/ansi-align/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-align/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/ansi-align/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-align/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", @@ -6875,16 +6678,6 @@ "node": ">=6" } }, - "node_modules/ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/ansi-regex": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", @@ -6940,48 +6733,12 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true, - "license": "ISC" - }, - "node_modules/are-we-there-yet": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", - "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "license": "Python-2.0" }, - "node_modules/array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "dev": true, - "license": "MIT" - }, "node_modules/array-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", @@ -6991,16 +6748,6 @@ "node": ">=8" } }, - "node_modules/asn1": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", - "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": "~2.1.0" - } - }, "node_modules/assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", @@ -7020,43 +6767,6 @@ "node": "*" } }, - "node_modules/async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "lodash": "^4.17.14" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/atomically": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz", - "integrity": "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.12.0" - } - }, "node_modules/autoprefixer": { "version": "10.5.4", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.4.tgz", @@ -7100,23 +6810,6 @@ "integrity": "sha512-f86EjiUKE6Xvczc4ioP1JBlWG7FKrE13qe/DxBCpe8GCipCq2nFw73aO8QEBKHfSbYGDN5eB9jXWKen7tspDqQ==", "license": "MIT" }, - "node_modules/aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "*" - } - }, - "node_modules/aws4": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz", - "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==", - "dev": true, - "license": "MIT" - }, "node_modules/babel-loader": { "version": "10.1.1", "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-10.1.1.tgz", @@ -7202,16 +6895,6 @@ "node": ">=6.0.0" } }, - "node_modules/bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "tweetnacl": "^0.14.3" - } - }, "node_modules/big-integer": { "version": "1.6.52", "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz", @@ -7284,227 +6967,69 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/body-parser": { - "version": "1.20.5", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.5.tgz", - "integrity": "sha512-3grm+/2tUOvu2cjJkvsIxrv/wVpfXQW4PsQHYm7yk4vfpu7Ekl6nEsYBoJUL6qDwZUx8wUhQ8tR2qz+ad9c9OA==", - "dev": true, + "node_modules/bplist-parser": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.2.tgz", + "integrity": "sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ==", "license": "MIT", "dependencies": { - "bytes": "~3.1.2", - "content-type": "~1.0.5", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "~1.2.0", - "http-errors": "~2.0.1", - "iconv-lite": "~0.4.24", - "on-finished": "~2.4.1", - "qs": "~6.15.1", - "raw-body": "~2.5.3", - "type-is": "~1.6.18", - "unpipe": "~1.0.0" + "big-integer": "1.6.x" }, "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" + "node": ">= 5.10.0" } }, - "node_modules/body-parser/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, + "node_modules/brace-expansion": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", + "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", "license": "MIT", "dependencies": { - "ms": "2.0.0" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" } }, - "node_modules/body-parser/node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "license": "MIT", "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" + "fill-range": "^7.1.1" }, "engines": { - "node": ">=0.10.0" + "node": ">=8" } }, - "node_modules/body-parser/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true, - "license": "MIT" + "license": "ISC" }, - "node_modules/body-parser/node_modules/qs": { - "version": "6.15.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz", - "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==", + "node_modules/browserslist": { + "version": "4.28.8", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.8.tgz", + "integrity": "sha512-V2NpofLblG64mfOtSgDhOJESZEGogzDMBv/q+W6oc4LXWP/q75eOXoOaaOu1EOadB9U4Bwx/e0yzbvwKH8zalA==", "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "es-define-property": "^1.0.1", - "side-channel": "^1.1.1" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/boxen": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz", - "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-align": "^3.0.0", - "camelcase": "^6.2.0", - "chalk": "^4.1.0", - "cli-boxes": "^2.2.1", - "string-width": "^4.2.2", - "type-fest": "^0.20.2", - "widest-line": "^3.1.0", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/boxen/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/boxen/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/boxen/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/boxen/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/boxen/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/bplist-parser": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.2.tgz", - "integrity": "sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ==", - "license": "MIT", - "dependencies": { - "big-integer": "1.6.x" - }, - "engines": { - "node": ">= 5.10.0" - } - }, - "node_modules/brace-expansion": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", - "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", - "license": "MIT", - "dependencies": { - "balanced-match": "^4.0.2" - }, - "engines": { - "node": "18 || 20 || >=22" - } - }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "license": "MIT", - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true, - "license": "ISC" - }, - "node_modules/browserslist": { - "version": "4.28.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.8.tgz", - "integrity": "sha512-V2NpofLblG64mfOtSgDhOJESZEGogzDMBv/q+W6oc4LXWP/q75eOXoOaaOu1EOadB9U4Bwx/e0yzbvwKH8zalA==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", "dependencies": { "baseline-browser-mapping": "^2.11.12", "caniuse-lite": "^1.0.30001809", @@ -7540,23 +7065,6 @@ "node": ">=4.0" } }, - "node_modules/builtins": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", - "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/cacache": { "version": "20.0.4", "resolved": "https://registry.npmjs.org/cacache/-/cacache-20.0.4.tgz", @@ -7578,82 +7086,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/cacheable-request": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", - "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", - "dev": true, - "license": "MIT", - "dependencies": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^3.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^4.1.0", - "responselike": "^1.0.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cacheable-request/node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "license": "MIT", - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cacheable-request/node_modules/lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/call-bound": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", - "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "get-intrinsic": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -7697,13 +7129,6 @@ ], "license": "CC-BY-4.0" }, - "node_modules/caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==", - "dev": true, - "license": "Apache-2.0" - }, "node_modules/chai": { "version": "4.3.6", "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz", @@ -7740,13 +7165,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true, - "license": "MIT" - }, "node_modules/check-error": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", @@ -7796,23 +7214,6 @@ "node": ">=6.0" } }, - "node_modules/ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/cli": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", @@ -7827,39 +7228,6 @@ "node": ">=0.2.5" } }, - "node_modules/cli-boxes": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", - "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "restore-cursor": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/cli-width": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", - "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", - "dev": true, - "license": "ISC" - }, "node_modules/cli/node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -7927,19 +7295,6 @@ "node": ">=20" } }, - "node_modules/clone-response": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", - "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-response": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/cmd-shim": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-8.0.0.tgz", @@ -7949,16 +7304,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/codemirror": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.2.tgz", @@ -8024,19 +7369,6 @@ "resolved": "src/plugins/pluginContext", "link": true }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/commander": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", @@ -8055,86 +7387,6 @@ "node": ">= 18" } }, - "node_modules/compressible": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", - "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": ">= 1.43.0 < 2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/compression": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz", - "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==", - "dev": true, - "license": "MIT", - "dependencies": { - "bytes": "3.1.2", - "compressible": "~2.0.18", - "debug": "2.6.9", - "negotiator": "~0.6.4", - "on-headers": "~1.1.0", - "safe-buffer": "5.2.1", - "vary": "~1.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/compression/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/compression/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true, - "license": "MIT" - }, - "node_modules/compression/node_modules/negotiator": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", - "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/compression/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -8142,60 +7394,6 @@ "dev": true, "license": "MIT" }, - "node_modules/conf": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/conf/-/conf-10.2.0.tgz", - "integrity": "sha512-8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^8.6.3", - "ajv-formats": "^2.1.1", - "atomically": "^1.7.0", - "debounce-fn": "^4.0.0", - "dot-prop": "^6.0.1", - "env-paths": "^2.2.1", - "json-schema-typed": "^7.0.3", - "onetime": "^5.1.2", - "pkg-up": "^3.1.0", - "semver": "^7.3.5" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/conf/node_modules/dot-prop": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", - "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/conf/node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/configstore": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", @@ -8222,57 +7420,6 @@ "date-now": "^0.1.4" } }, - "node_modules/console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "5.2.1" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/content-disposition/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", @@ -8280,23 +7427,6 @@ "dev": true, "license": "MIT" }, - "node_modules/cookie": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", - "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie-signature": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", - "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", - "dev": true, - "license": "MIT" - }, "node_modules/cordova": { "version": "13.0.0", "resolved": "https://registry.npmjs.org/cordova/-/cordova-13.0.0.tgz", @@ -8607,61 +7737,6 @@ "resolved": "src/plugins/websocket", "link": true }, - "node_modules/cordova-serve": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.1.tgz", - "integrity": "sha512-YbfXaZ60yr5dkqmDFQgrU7TSKnzCqYsxHgIUzDeX8RggZb6mz1F9jMfUBbaYyaU7JjcuJ0aoRPYLvwSGQVhGkw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "chalk": "^3.0.0", - "compression": "^1.7.4", - "express": "^4.17.1", - "open": "^7.0.3", - "which": "^2.0.2" - }, - "engines": { - "node": ">= 10", - "npm": ">= 5.6.0" - } - }, - "node_modules/cordova-serve/node_modules/chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cordova-serve/node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, - "license": "ISC" - }, - "node_modules/cordova-serve/node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/cordova/node_modules/semver": { "version": "7.8.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", @@ -8867,19 +7942,6 @@ "node": ">=4" } }, - "node_modules/currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==", - "dev": true, - "license": "MIT", - "dependencies": { - "array-find-index": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/cytoscape": { "version": "3.34.2", "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.34.2.tgz", @@ -9388,19 +8450,6 @@ "lodash-es": "^4.17.21" } }, - "node_modules/dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", - "dev": true, - "license": "MIT", - "dependencies": { - "assert-plus": "^1.0.0" - }, - "engines": { - "node": ">=0.10" - } - }, "node_modules/date-now": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", @@ -9413,32 +8462,6 @@ "integrity": "sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ==", "license": "MIT" }, - "node_modules/debounce-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz", - "integrity": "sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-fn": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/debounce-fn/node_modules/mimic-fn": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz", - "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/debug": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", @@ -9469,19 +8492,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-response": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/dedent": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.2.tgz", @@ -9510,23 +8520,6 @@ "node": ">=0.12" } }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/defer-to-connect": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", - "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", - "dev": true, - "license": "MIT" - }, "node_modules/delaunator": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.1.0.tgz", @@ -9536,73 +8529,13 @@ "robust-predicates": "^3.0.2" } }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, + "node_modules/detect-indent": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", + "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", "license": "MIT", "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/dep-graph": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz", - "integrity": "sha512-/6yUWlSH0Uevjj6HWvO86rDeFzuYfzbaKDqifTEemwfwEPyBrODTb3ox/jFzqmc2+UmgJ3IDMS88BKEBh1Nm2Q==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dev": true, - "dependencies": { - "underscore": "1.2.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/dep-graph/node_modules/underscore": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz", - "integrity": "sha512-HRhh6FYh5I5/zTt7L9MnHRA/nlSFPiwymMCXEremmzT7tHR+8CNP0FXHPaUpafAPwvAlNrvZiH91kQwoo/CqUA==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/detect-indent": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", - "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", - "license": "MIT", - "engines": { - "node": ">=8" + "node": ">=8" } }, "node_modules/detect-libc": { @@ -9727,52 +8660,12 @@ "node": ">=8" } }, - "node_modules/dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/duplexer3": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz", - "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", - "dev": true, - "license": "MIT", - "dependencies": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, "node_modules/editor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz", "integrity": "sha512-SoRmbGStwNYHgKfjOrX2L0mUvp9bUVv0uPppZSOMAntEbcFtoC3MKF5b3T6HQPXKIV+QGY3xPO3JK5it5lVkuw==", "license": "MIT" }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true, - "license": "MIT" - }, "node_modules/electron-to-chromium": { "version": "1.5.415", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.415.tgz", @@ -9834,37 +8727,6 @@ "node": ">=14" } }, - "node_modules/encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "iconv-lite": "^0.6.2" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", - "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", - "dev": true, - "license": "MIT", - "dependencies": { - "once": "^1.4.0" - } - }, "node_modules/endent": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/endent/-/endent-2.1.0.tgz", @@ -9918,13 +8780,6 @@ "node": ">=6" } }, - "node_modules/err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true, - "license": "MIT" - }, "node_modules/error-ex": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz", @@ -9935,16 +8790,6 @@ "is-arrayish": "^0.2.1" } }, - "node_modules/es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, "node_modules/es-errors": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", @@ -9961,19 +8806,6 @@ "dev": true, "license": "MIT" }, - "node_modules/es-object-atoms": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz", - "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/es-toolkit": { "version": "1.51.0", "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.51.0.tgz", @@ -9995,23 +8827,6 @@ "node": ">=6" } }, - "node_modules/escape-goat": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", - "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true, - "license": "MIT" - }, "node_modules/escape-string-regexp": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", @@ -10108,16 +8923,6 @@ "node": ">=0.10.0" } }, - "node_modules/etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/events": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", @@ -10177,156 +8982,6 @@ "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==", "license": "Apache-2.0" }, - "node_modules/express": { - "version": "4.22.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.22.2.tgz", - "integrity": "sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "~1.20.5", - "content-disposition": "~0.5.4", - "content-type": "~1.0.4", - "cookie": "~0.7.1", - "cookie-signature": "~1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.3.1", - "fresh": "~0.5.2", - "http-errors": "~2.0.0", - "merge-descriptors": "1.0.3", - "methods": "~1.1.2", - "on-finished": "~2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "~0.1.12", - "proxy-addr": "~2.0.7", - "qs": "~6.15.1", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "~0.19.0", - "serve-static": "~1.16.2", - "setprototypeof": "1.2.0", - "statuses": "~2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "engines": { - "node": ">= 0.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/express/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/express/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true, - "license": "MIT" - }, - "node_modules/express/node_modules/qs": { - "version": "6.15.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz", - "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "es-define-property": "^1.0.1", - "side-channel": "^1.1.1" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/express/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true, - "license": "MIT" - }, - "node_modules/external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "license": "MIT", - "dependencies": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/external-editor/node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/external-editor/node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "license": "MIT", - "dependencies": { - "os-tmpdir": "~1.0.2" - }, - "engines": { - "node": ">=0.6.0" - } - }, "node_modules/extsprintf": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", @@ -10415,29 +9070,6 @@ } } }, - "node_modules/figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==", - "dev": true, - "license": "MIT", - "dependencies": { - "escape-string-regexp": "^1.0.5" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/figures/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/filesize": { "version": "11.0.22", "resolved": "https://registry.npmjs.org/filesize/-/filesize-11.0.22.tgz", @@ -10459,42 +9091,6 @@ "node": ">=8" } }, - "node_modules/finalhandler": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", - "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "on-finished": "~2.4.1", - "parseurl": "~1.3.3", - "statuses": "~2.0.2", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/finalhandler/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/finalhandler/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true, - "license": "MIT" - }, "node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -10522,64 +9118,6 @@ "flat": "cli.js" } }, - "node_modules/forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "*" - } - }, - "node_modules/form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 0.12" - } - }, - "node_modules/form-data/node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/form-data/node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/fraction.js": { "version": "5.3.4", "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz", @@ -10621,31 +9159,6 @@ } } }, - "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/fs-minipass": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", @@ -10689,75 +9202,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "node_modules/gauge/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gauge/node_modules/is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "number-is-nan": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gauge/node_modules/string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", - "dev": true, - "license": "MIT", - "dependencies": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gauge/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -10799,45 +9243,6 @@ "node": "*" } }, - "node_modules/get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, - "license": "MIT", - "dependencies": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/get-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", @@ -10850,16 +9255,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", - "dev": true, - "license": "MIT", - "dependencies": { - "assert-plus": "^1.0.0" - } - }, "node_modules/glob": { "version": "13.0.6", "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz", @@ -10889,32 +9284,6 @@ "node": ">= 6" } }, - "node_modules/global-dirs": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", - "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ini": "2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/global-dirs/node_modules/ini": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", - "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, "node_modules/globby": { "version": "11.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", @@ -10935,55 +9304,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/got": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", - "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sindresorhus/is": "^0.14.0", - "@szmarczak/http-timer": "^1.1.2", - "cacheable-request": "^6.0.0", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^4.1.0", - "lowercase-keys": "^1.0.1", - "mimic-response": "^1.0.1", - "p-cancelable": "^1.0.0", - "to-readable-stream": "^1.0.0", - "url-parse-lax": "^3.0.0" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/got/node_modules/get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "license": "MIT", - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -11038,55 +9358,6 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, - "node_modules/har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=4" - } - }, - "node_modules/har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "deprecated": "this library is no longer supported", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/har-validator/node_modules/ajv": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz", - "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/har-validator/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -11097,36 +9368,6 @@ "node": ">=8" } }, - "node_modules/has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/has-yarn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", - "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/hasown": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.3.tgz", @@ -11221,27 +9462,6 @@ "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", "license": "BSD-2-Clause" }, - "node_modules/http-errors": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", - "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "depd": "~2.0.0", - "inherits": "~2.0.4", - "setprototypeof": "~1.2.0", - "statuses": "~2.0.2", - "toidentifier": "~1.0.1" - }, - "engines": { - "node": ">= 0.8" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, "node_modules/http-proxy-agent": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", @@ -11255,22 +9475,6 @@ "node": ">= 14" } }, - "node_modules/http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - }, - "engines": { - "node": ">=0.8", - "npm": ">=1.3.7" - } - }, "node_modules/https-proxy-agent": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", @@ -11293,16 +9497,6 @@ "node": ">=10.17.0" } }, - "node_modules/humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.0.0" - } - }, "node_modules/iconv-lite": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", @@ -11378,16 +9572,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/import-lazy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/import-meta-resolve": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz", @@ -11407,23 +9591,6 @@ "node": ">=0.8.19" } }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true, - "license": "ISC" - }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -11451,346 +9618,22 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/init-package-json": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-2.0.5.tgz", - "integrity": "sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==", - "dev": true, + "node_modules/internmap": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", + "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==", "license": "ISC", - "dependencies": { - "npm-package-arg": "^8.1.5", - "promzard": "^0.3.0", - "read": "~1.0.1", - "read-package-json": "^4.1.1", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4", - "validate-npm-package-name": "^3.0.0" - }, "engines": { - "node": ">=10" + "node": ">=12" } }, - "node_modules/init-package-json/node_modules/hosted-git-info": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", - "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, + "node_modules/ip-address": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", + "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "license": "MIT", "engines": { - "node": ">=10" - } - }, - "node_modules/init-package-json/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/init-package-json/node_modules/npm-package-arg": { - "version": "8.1.5", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz", - "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^4.0.1", - "semver": "^7.3.4", - "validate-npm-package-name": "^3.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/init-package-json/node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/init-package-json/node_modules/validate-npm-package-name": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", - "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==", - "dev": true, - "license": "ISC", - "dependencies": { - "builtins": "^1.0.3" - } - }, - "node_modules/inquirer": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", - "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-escapes": "^3.2.0", - "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^2.1.0", - "strip-ansi": "^5.1.0", - "through": "^2.3.6" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/inquirer/node_modules/ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/inquirer/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/inquirer/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/inquirer/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/inquirer/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true, - "license": "MIT" - }, - "node_modules/inquirer/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/inquirer/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/inquirer/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/inquirer/node_modules/string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/inquirer/node_modules/string-width/node_modules/ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/inquirer/node_modules/string-width/node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/inquirer/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/inquirer/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/insight": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/insight/-/insight-0.11.1.tgz", - "integrity": "sha512-TBcZ0qC9dgdmcxL93OoqkY/RZXJtIi0i07phX/QyYk2ysmJtZex59dgTj4Doq50N9CG9dLRe/RIudc/5CCoFNw==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "async": "^2.6.2", - "chalk": "^4.1.1", - "conf": "^10.0.1", - "inquirer": "^6.3.1", - "lodash.debounce": "^4.0.8", - "os-name": "^4.0.1", - "request": "^2.88.0", - "tough-cookie": "^4.0.0", - "uuid": "^8.3.2" - }, - "engines": { - "node": ">=12.20" - } - }, - "node_modules/insight/node_modules/tough-cookie": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", - "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/insight/node_modules/universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/insight/node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", - "dev": true, - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/internmap": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", - "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", - "license": "MIT", - "engines": { - "node": ">= 12" - } - }, - "node_modules/ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.10" + "node": ">= 12" } }, "node_modules/is-arrayish": { @@ -11813,19 +9656,6 @@ "node": ">=8" } }, - "node_modules/is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", - "dev": true, - "license": "MIT", - "dependencies": { - "ci-info": "^2.0.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, "node_modules/is-core-module": { "version": "2.16.2", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz", @@ -11841,22 +9671,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true, - "license": "MIT", - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -11888,43 +9702,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-installed-globally": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", - "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "global-dirs": "^3.0.0", - "is-path-inside": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-npm": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz", - "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -11994,26 +9771,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-docker": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-yarn-global": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", - "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==", - "dev": true, - "license": "MIT" - }, "node_modules/isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -12038,13 +9795,6 @@ "node": ">=0.10.0" } }, - "node_modules/isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==", - "dev": true, - "license": "MIT" - }, "node_modules/jest-worker": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", @@ -12118,13 +9868,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==", - "dev": true, - "license": "MIT" - }, "node_modules/jsesc": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", @@ -12195,13 +9938,6 @@ "node": "*" } }, - "node_modules/json-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==", - "dev": true, - "license": "MIT" - }, "node_modules/json-parse-even-better-errors": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-5.0.0.tgz", @@ -12211,13 +9947,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/json-schema": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", - "dev": true, - "license": "(AFL-2.1 OR BSD-3-Clause)" - }, "node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", @@ -12225,13 +9954,6 @@ "dev": true, "license": "MIT" }, - "node_modules/json-schema-typed": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz", - "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A==", - "dev": true, - "license": "BSD-2-Clause" - }, "node_modules/json-stringify-nice": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz", @@ -12241,13 +9963,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "dev": true, - "license": "ISC" - }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", @@ -12267,19 +9982,6 @@ "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", "license": "MIT" }, - "node_modules/jsonfile": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz", - "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, "node_modules/jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", @@ -12289,32 +9991,6 @@ ], "license": "MIT" }, - "node_modules/jsprim": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", - "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", - "dev": true, - "license": "MIT", - "dependencies": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.4.0", - "verror": "1.10.0" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/jsprim/node_modules/extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "license": "MIT" - }, "node_modules/jszip": { "version": "3.10.1", "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", @@ -12355,34 +10031,11 @@ "katex": "cli.js" } }, - "node_modules/keyv": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", - "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", - "dev": true, - "license": "MIT", - "dependencies": { - "json-buffer": "3.0.0" - } - }, "node_modules/khroma": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/khroma/-/khroma-2.1.0.tgz", "integrity": "sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==" }, - "node_modules/latest-version": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", - "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", - "dev": true, - "license": "MIT", - "dependencies": { - "package-json": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/layout-base": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-1.0.2.tgz", @@ -12752,20 +10405,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/loud-rejection": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.2.0.tgz", - "integrity": "sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/loupe": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", @@ -12776,16 +10415,6 @@ "get-func-name": "^2.0.1" } }, - "node_modules/lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/lru-cache": { "version": "11.5.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.1.tgz", @@ -12795,19 +10424,6 @@ "node": "20 || >=22" } }, - "node_modules/macos-release": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.1.tgz", - "integrity": "sha512-DXqXhEM7gW59OjZO8NIjBCz9AQ1BEMrfiOAl4AYByHCtVHRF4KoGNO8mqQeM8lRCtQe/UnJ4imO/d2HdkKsd+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/magic-string": { "version": "0.30.21", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", @@ -12941,55 +10557,12 @@ "node": ">= 18" } }, - "node_modules/math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/md5-file": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-5.0.0.tgz", - "integrity": "sha512-xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw==", - "dev": true, - "license": "MIT", - "bin": { - "md5-file": "cli.js" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/mdurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", "license": "MIT" }, - "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/merge-descriptors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", - "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -13046,16 +10619,6 @@ "node": ">= 20" } }, - "node_modules/methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/micromatch": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", @@ -13081,19 +10644,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true, - "license": "MIT", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/mime-db": { "version": "1.54.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", @@ -13128,16 +10678,6 @@ "node": ">=6" } }, - "node_modules/mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/mini-css-extract-plugin": { "version": "2.10.2", "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.10.2.tgz", @@ -13174,16 +10714,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/minimizer-webpack-plugin": { "version": "5.6.1", "resolved": "https://registry.npmjs.org/minimizer-webpack-plugin/-/minimizer-webpack-plugin-5.6.1.tgz", @@ -13325,30 +10855,6 @@ "node": ">=8" } }, - "node_modules/minipass-json-stream": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz", - "integrity": "sha512-myxeeTm57lYs8pH2nxPzmEEg8DGIgW+9mv6D4JZD2pa81I/OBjeU7PtICXV6c9eRGTA5JMDsuIPUZRCyBMYNhg==", - "dev": true, - "license": "MIT", - "dependencies": { - "jsonparse": "^1.3.1", - "minipass": "^3.0.0" - } - }, - "node_modules/minipass-json-stream/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/minipass-pipeline": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", @@ -13837,13 +11343,6 @@ "mustache": "bin/mustache" } }, - "node_modules/mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==", - "dev": true, - "license": "ISC" - }, "node_modules/nanoid": { "version": "3.3.18", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.18.tgz", @@ -13948,61 +11447,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/normalize-package-data": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", - "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "hosted-git-info": "^4.0.1", - "is-core-module": "^2.5.0", - "semver": "^7.3.4", - "validate-npm-package-license": "^3.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/normalize-package-data/node_modules/hosted-git-info": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", - "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/normalize-package-data/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/normalize-package-data/node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -14013,16 +11457,6 @@ "node": ">=0.10.0" } }, - "node_modules/normalize-url": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", - "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/npm-bundled": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-5.0.0.tgz", @@ -14166,63 +11600,6 @@ "node": ">=8" } }, - "node_modules/npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "node_modules/number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "*" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-inspect": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/objectorarray": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.5.tgz", @@ -14243,29 +11620,6 @@ "node": ">=12.20.0" } }, - "node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/on-headers": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz", - "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -14291,78 +11645,14 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/open": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", - "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "license": "MIT", "dependencies": { - "is-docker": "^2.0.0", - "is-wsl": "^2.1.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/os-name": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz", - "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==", - "dev": true, - "license": "MIT", - "dependencies": { - "macos-release": "^2.5.0", - "windows-release": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/p-cancelable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", - "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "yocto-queue": "^0.1.0" + "yocto-queue": "^0.1.0" }, "engines": { "node": ">=10" @@ -14399,32 +11689,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/package-json": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", - "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "got": "^9.6.0", - "registry-auth-token": "^4.0.0", - "registry-url": "^5.0.0", - "semver": "^6.2.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/package-manager-detector": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.6.0.tgz", @@ -14520,16 +11784,6 @@ "dev": true, "license": "MIT" }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/path-browserify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", @@ -14600,13 +11854,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/path-to-regexp": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz", - "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==", - "dev": true, - "license": "MIT" - }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -14633,13 +11880,6 @@ "node": "*" } }, - "node_modules/performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", - "dev": true, - "license": "MIT" - }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -14659,95 +11899,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-up": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", - "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", - "dev": true, - "license": "MIT", - "dependencies": { - "find-up": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-up/node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-up/node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-up/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-up/node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-up/node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/plist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.1.tgz", @@ -14935,16 +12086,6 @@ "dev": true, "license": "MIT" }, - "node_modules/prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/prettier": { "version": "3.8.3", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz", @@ -15016,37 +12157,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true, - "license": "ISC" - }, - "node_modules/promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/promzard": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz", - "integrity": "sha512-JZeYqd7UAcHCwI+sTOeUDYkvEU+1bQ7iE0UT1MgB/tERkAPkesW46MrpIySzODi+owTjZtiF8Ay5j9m60KmMBw==", - "dev": true, - "license": "ISC", - "dependencies": { - "read": "1" - } - }, "node_modules/properties-parser": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.6.0.tgz", @@ -15057,44 +12167,6 @@ "node": ">= 0.3.1" } }, - "node_modules/proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/psl": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz", - "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==", - "dev": true, - "license": "MIT", - "dependencies": { - "punycode": "^2.3.1" - }, - "funding": { - "url": "https://github.com/sponsors/lupomontero" - } - }, - "node_modules/pump": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz", - "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==", - "dev": true, - "license": "MIT", - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -15114,41 +12186,6 @@ "node": ">=6" } }, - "node_modules/pupa": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", - "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", - "dev": true, - "license": "MIT", - "dependencies": { - "escape-goat": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", - "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.6.0", - "teleport": ">=0.2.0" - } - }, - "node_modules/qs": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.5.tgz", - "integrity": "sha512-mzR4sElr1bfCaPJe7m8ilJ6ZXdDaGoObcYR0ZHSsktM/Lt21MVHj5De30GQH2eiZ1qGRTO7LCAzQsUeXTNexWQ==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.6" - } - }, "node_modules/querystringify": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", @@ -15185,45 +12222,6 @@ "safe-buffer": "^5.1.0" } }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/raw-body": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz", - "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==", - "dev": true, - "license": "MIT", - "dependencies": { - "bytes": "~3.1.2", - "http-errors": "~2.0.1", - "iconv-lite": "~0.4.24", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/raw-body/node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/raw-loader": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz", @@ -15298,187 +12296,15 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/rc/node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true, - "license": "ISC" - }, - "node_modules/rc/node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/read": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", - "integrity": "sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==", - "dev": true, + "node_modules/read-cmd-shim": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-6.0.0.tgz", + "integrity": "sha512-1zM5HuOfagXCBWMN83fuFI/x+T/UhZ7k+KIzhrHXcQoeX5+7gmaDYjELQHmmzIodumBHeByBJT4QYS7ufAgs7A==", "license": "ISC", - "dependencies": { - "mute-stream": "~0.0.4" - }, "engines": { - "node": ">=0.8" + "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/read-chunk": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz", - "integrity": "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "pify": "^4.0.1", - "with-open-file": "^0.1.6" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/read-cmd-shim": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-6.0.0.tgz", - "integrity": "sha512-1zM5HuOfagXCBWMN83fuFI/x+T/UhZ7k+KIzhrHXcQoeX5+7gmaDYjELQHmmzIodumBHeByBJT4QYS7ufAgs7A==", - "license": "ISC", - "engines": { - "node": "^20.17.0 || >=22.9.0" - } - }, - "node_modules/read-package-json": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.2.tgz", - "integrity": "sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ==", - "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.1", - "json-parse-even-better-errors": "^2.3.0", - "normalize-package-data": "^3.0.0", - "npm-normalize-package-bin": "^1.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/read-package-json-fast": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz", - "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "json-parse-even-better-errors": "^2.3.0", - "npm-normalize-package-bin": "^1.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/read-package-json-fast/node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "license": "MIT" - }, - "node_modules/read-package-json-fast/node_modules/npm-normalize-package-bin": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", - "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", - "dev": true, - "license": "ISC" - }, - "node_modules/read-package-json/node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/read-package-json/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/read-package-json/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/read-package-json/node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "license": "MIT" - }, - "node_modules/read-package-json/node_modules/minimatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", - "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/read-package-json/node_modules/npm-normalize-package-bin": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", - "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", - "dev": true, - "license": "ISC" - }, "node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -15546,32 +12372,6 @@ "node": ">=4" } }, - "node_modules/registry-auth-token": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz", - "integrity": "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==", - "dev": true, - "license": "MIT", - "dependencies": { - "rc": "1.2.8" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/registry-url": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", - "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", - "dev": true, - "license": "MIT", - "dependencies": { - "rc": "^1.2.8" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/regjsgen": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz", @@ -15592,73 +12392,6 @@ "regjsparser": "bin/parser" } }, - "node_modules/request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", - "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "engines": { - "node": ">= 4" - } - }, - "node_modules/request/node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/request/node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/request/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", - "dev": true, - "license": "MIT", - "bin": { - "uuid": "bin/uuid" - } - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -15715,63 +12448,6 @@ "node": ">=4" } }, - "node_modules/responselike": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", - "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "lowercase-keys": "^1.0.0" - } - }, - "node_modules/restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/restore-cursor/node_modules/mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/restore-cursor/node_modules/onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-fn": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "node_modules/reusify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", @@ -15782,76 +12458,6 @@ "node": ">=0.10.0" } }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/rimraf/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/rimraf/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/minimatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", - "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/robust-predicates": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.3.tgz", @@ -15904,16 +12510,6 @@ "points-on-path": "^0.2.1" } }, - "node_modules/run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -15943,26 +12539,6 @@ "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==", "license": "BSD-3-Clause" }, - "node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/rxjs/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true, - "license": "0BSD" - }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -16102,61 +12678,6 @@ "semver": "bin/semver.js" } }, - "node_modules/semver-diff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz", - "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/send": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", - "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "~0.5.2", - "http-errors": "~2.0.1", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "~2.4.1", - "range-parser": "~1.2.1", - "statuses": "~2.0.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/send/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/send/node_modules/debug/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true, - "license": "MIT" - }, "node_modules/serialize-javascript": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", @@ -16167,42 +12688,12 @@ "randombytes": "^2.1.0" } }, - "node_modules/serve-static": { - "version": "1.16.3", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz", - "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", - "dev": true, - "license": "MIT", - "dependencies": { - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "~0.19.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true, - "license": "ISC" - }, "node_modules/setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", "license": "MIT" }, - "node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true, - "license": "ISC" - }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -16224,82 +12715,6 @@ "node": ">=8" } }, - "node_modules/side-channel": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz", - "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.4", - "side-channel-list": "^1.0.1", - "side-channel-map": "^1.0.1", - "side-channel-weakmap": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-list": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz", - "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", - "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-weakmap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", - "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3", - "side-channel-map": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/siginfo": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", @@ -16420,28 +12835,6 @@ "node": ">=0.10.0" } }, - "node_modules/spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-correct/node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, "node_modules/spdx-exceptions": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", @@ -16475,32 +12868,6 @@ "node": ">=0.2.4" } }, - "node_modules/sshpk": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz", - "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "bin": { - "sshpk-conv": "bin/sshpk-conv", - "sshpk-sign": "bin/sshpk-sign", - "sshpk-verify": "bin/sshpk-verify" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ssri": { "version": "13.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-13.0.1.tgz", @@ -16520,16 +12887,6 @@ "dev": true, "license": "MIT" }, - "node_modules/statuses": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", - "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/std-env": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.2.0.tgz", @@ -16595,16 +12952,6 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -16786,13 +13133,6 @@ "license": "MIT", "peer": true }, - "node_modules/through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true, - "license": "MIT" - }, "node_modules/tinybench": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", @@ -16844,16 +13184,6 @@ "node": ">=14.14" } }, - "node_modules/to-readable-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", - "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -16866,37 +13196,6 @@ "node": ">=8.0" } }, - "node_modules/toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/tough-cookie/node_modules/punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", - "dev": true, - "license": "MIT" - }, "node_modules/treeverse": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz", @@ -16960,26 +13259,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", - "dev": true, - "license": "Unlicense" - }, "node_modules/type-detect": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", @@ -16990,56 +13269,6 @@ "node": ">=4" } }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/type-is/node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/type-is/node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/typedarray-to-buffer": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", @@ -17076,13 +13305,6 @@ "dev": true, "license": "MIT" }, - "node_modules/underscore": { - "version": "1.13.8", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.8.tgz", - "integrity": "sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ==", - "dev": true, - "license": "MIT" - }, "node_modules/undici": { "version": "6.27.0", "resolved": "https://registry.npmjs.org/undici/-/undici-6.27.0.tgz", @@ -17143,26 +13365,6 @@ "node": ">=4" } }, - "node_modules/unique-filename": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", - "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^2.0.0" - } - }, - "node_modules/unique-slug": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", - "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - } - }, "node_modules/unique-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", @@ -17175,26 +13377,6 @@ "node": ">=8" } }, - "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/untildify": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", @@ -17236,52 +13418,10 @@ "browserslist": ">= 4.21.0" } }, - "node_modules/update-notifier": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz", - "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "boxen": "^5.0.0", - "chalk": "^4.1.0", - "configstore": "^5.0.1", - "has-yarn": "^2.1.0", - "import-lazy": "^2.1.0", - "is-ci": "^2.0.0", - "is-installed-globally": "^0.4.0", - "is-npm": "^5.0.0", - "is-yarn-global": "^0.3.0", - "latest-version": "^5.1.0", - "pupa": "^2.1.1", - "semver": "^7.3.4", - "semver-diff": "^3.1.1", - "xdg-basedir": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/yeoman/update-notifier?sponsor=1" - } - }, - "node_modules/update-notifier/node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -17298,35 +13438,12 @@ "requires-port": "^1.0.0" } }, - "node_modules/url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "prepend-http": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "license": "MIT" }, - "node_modules/utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/uuid": { "version": "11.1.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.1.tgz", @@ -17346,28 +13463,6 @@ "integrity": "sha512-zaSmOW6ykXwrkX0YTuFUSoALNEKGaQHpxBJQLb3TXspRNDpBwbfrIQCZqAQ0LKBlKuyn2YOq7NNd6415hvZ33g==", "license": "Apache-2.0" }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "node_modules/validate-npm-package-license/node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, "node_modules/validate-npm-package-name": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-7.0.2.tgz", @@ -17386,38 +13481,6 @@ "@sphinxxxx/color-conversion": "^2.2.2" } }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "license": "MIT", - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "node_modules/verror/node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", - "dev": true, - "license": "MIT" - }, "node_modules/vite": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/vite/-/vite-8.2.2.tgz", @@ -17794,200 +13857,6 @@ "node": ">=8" } }, - "node_modules/wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, - "node_modules/wide-align/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/wide-align/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/wide-align/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wide-align/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/widest-line": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", - "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", - "dev": true, - "license": "MIT", - "dependencies": { - "string-width": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/widest-line/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/widest-line/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/widest-line/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/widest-line/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/windows-release": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz", - "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "execa": "^4.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/windows-release/node_modules/execa": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", - "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", - "dev": true, - "license": "MIT", - "dependencies": { - "cross-spawn": "^7.0.0", - "get-stream": "^5.0.0", - "human-signals": "^1.1.1", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.0", - "onetime": "^5.1.0", - "signal-exit": "^3.0.2", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/windows-release/node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "license": "MIT", - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/windows-release/node_modules/human-signals": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", - "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=8.12.0" - } - }, - "node_modules/with-open-file": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz", - "integrity": "sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-finally": "^1.0.0", - "p-try": "^2.1.0", - "pify": "^4.0.1" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/workerpool": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz", @@ -18224,974 +14093,6 @@ "xml2js": "0.4.23" } }, - "src/plugins/cordova-plugin-advanced-http/node_modules/@npmcli/fs": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", - "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@gar/promisify": "^1.0.1", - "semver": "^7.3.5" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/@npmcli/git": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz", - "integrity": "sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/promise-spawn": "^1.3.2", - "lru-cache": "^6.0.0", - "mkdirp": "^1.0.4", - "npm-pick-manifest": "^6.1.1", - "promise-inflight": "^1.0.1", - "promise-retry": "^2.0.1", - "semver": "^7.3.5", - "which": "^2.0.2" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/@npmcli/installed-package-contents": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz", - "integrity": "sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==", - "dev": true, - "license": "ISC", - "dependencies": { - "npm-bundled": "^1.1.1", - "npm-normalize-package-bin": "^1.0.1" - }, - "bin": { - "installed-package-contents": "index.js" - }, - "engines": { - "node": ">= 10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/@npmcli/node-gyp": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz", - "integrity": "sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==", - "dev": true, - "license": "ISC" - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/@npmcli/promise-spawn": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz", - "integrity": "sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==", - "dev": true, - "license": "ISC", - "dependencies": { - "infer-owner": "^1.0.4" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/@npmcli/run-script": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.6.tgz", - "integrity": "sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/node-gyp": "^1.0.2", - "@npmcli/promise-spawn": "^1.3.2", - "node-gyp": "^7.1.0", - "read-package-json-fast": "^2.0.1" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true, - "license": "ISC" - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/bplist-parser": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", - "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", - "dev": true, - "license": "MIT", - "dependencies": { - "big-integer": "^1.6.44" - }, - "engines": { - "node": ">= 5.10.0" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/cacache": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", - "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/fs": "^1.0.0", - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "infer-owner": "^1.0.4", - "lru-cache": "^6.0.0", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.1", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" - }, - "engines": { - "node": ">= 10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/cordova": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/cordova/-/cordova-11.0.0.tgz", - "integrity": "sha512-Hu2YeT0naeP/1sEm/xfJYUsXN48XV6zagxbi1+4q0Ei9c5TKsIq8v4EWukvSHF4UO2pnh+9ViaDlGMcS1Wrnfg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "configstore": "^5.0.1", - "cordova-common": "^4.0.2", - "cordova-create": "^4.0.0", - "cordova-lib": "^11.0.0", - "editor": "^1.0.0", - "execa": "^5.1.1", - "fs-extra": "^10.0.0", - "insight": "^0.11.1", - "loud-rejection": "^2.2.0", - "nopt": "^5.0.0", - "semver": "^7.3.5", - "systeminformation": "^5.9.17", - "update-notifier": "^5.1.0" - }, - "bin": { - "cordova": "bin/cordova" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/cordova-app-hello-world": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-6.0.0.tgz", - "integrity": "sha512-wPZsm+fzNUwdiTRODT+fQuPV410RNmd3Buiw63vT8BPxjC+cn6Bu8emrgwrDM4pbmU5sa5Unwu3xPcbQGQ3G3g==", - "dev": true, - "license": "Apache-2.0" - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/cordova-common": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-4.1.0.tgz", - "integrity": "sha512-sYfOSfpYGQOmUDlsARUbpT/EvVKT/E+GI3zwTXt+C6DjZ7xs6ZQVHs3umHKSidjf9yVM2LLmvGFpGrGX7aGxug==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@netflix/nerror": "^1.1.3", - "ansi": "^0.3.1", - "bplist-parser": "^0.2.0", - "cross-spawn": "^7.0.1", - "elementtree": "^0.1.7", - "endent": "^1.4.1", - "fast-glob": "^3.2.2", - "fs-extra": "^9.0.0", - "glob": "^7.1.6", - "plist": "^3.0.1", - "q": "^1.5.1", - "read-chunk": "^3.2.0", - "strip-bom": "^4.0.0", - "underscore": "^1.9.2" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/cordova-common/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/cordova-create": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-4.1.0.tgz", - "integrity": "sha512-8VQohB5w5WwuxurQJ+2L+lAFVhBr//kFvlxLOmF0P3SzTdfIU02pNalbOeLalC0DXD7rfBXJZOxJ+KSM5TOq+Q==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "cordova-app-hello-world": "^6.0.0", - "cordova-common": "^4.1.0", - "cordova-fetch": "^3.1.0", - "fs-extra": "^10.1.0", - "globby": "^11.1.0", - "import-fresh": "^3.3.0", - "isobject": "^4.0.0", - "npm-package-arg": "^8.1.5", - "path-is-inside": "^1.0.2", - "tmp": "^0.2.1", - "valid-identifier": "0.0.2" - }, - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/cordova-fetch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.1.0.tgz", - "integrity": "sha512-qOT3HlNzVWbsCZVvbkZ6PdvAG1byiK8vWG+/Z+7s+8ZB76rOYKdzMvrmmMwrTTX6nglDnz5uJ/4XjQHJB770GQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "cordova-common": "^4.1.0", - "fs-extra": "^9.1.0", - "npm-package-arg": "^8.1.5", - "pacote": "^11.3.5", - "pify": "^5.0.0", - "resolve": "^1.22.1", - "semver": "^7.3.8", - "which": "^2.0.2" - }, - "engines": { - "node": ">= 10", - "npm": ">= 5.6.0" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/cordova-fetch/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/cordova-lib": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-11.1.0.tgz", - "integrity": "sha512-/XM+/wFag72bD4SNSxwX8b3OWatHNNlnmJpgb5pepp2Pobb957nWyR0GPwIkKyOyszdZesWM3Vv8uH9e2Z1k2w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "cordova-common": "^4.1.0", - "cordova-fetch": "^3.1.0", - "cordova-serve": "^4.0.0", - "dep-graph": "^1.1.0", - "detect-indent": "^6.1.0", - "detect-newline": "^3.1.0", - "elementtree": "^0.1.7", - "execa": "^5.1.1", - "fs-extra": "^10.1.0", - "globby": "^11.1.0", - "init-package-json": "^2.0.5", - "md5-file": "^5.0.0", - "pify": "^5.0.0", - "semver": "^7.3.8", - "stringify-package": "^1.0.1", - "write-file-atomic": "^3.0.3" - }, - "engines": { - "node": ">=12" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true, - "license": "MIT" - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/endent": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/endent/-/endent-1.4.1.tgz", - "integrity": "sha512-buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "dedent": "^0.7.0", - "fast-json-parse": "^1.0.3", - "objectorarray": "^1.0.4" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/hosted-git-info": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", - "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@tootallnate/once": "1", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/ignore-walk": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz", - "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "minimatch": "^3.0.4" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, - "license": "ISC" - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/make-fetch-happen": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz", - "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.1.3", - "cacache": "^15.2.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^4.0.1", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^6.0.0", - "minipass": "^3.1.3", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^1.3.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.2", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^6.0.0", - "ssri": "^8.0.0" - }, - "engines": { - "node": ">= 10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/minimatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", - "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/minipass-fetch": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz", - "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.1.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.0.0" - }, - "engines": { - "node": ">=8" - }, - "optionalDependencies": { - "encoding": "^0.1.12" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "license": "MIT", - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/negotiator": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", - "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/node-gyp": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz", - "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "env-paths": "^2.2.0", - "glob": "^7.1.4", - "graceful-fs": "^4.2.3", - "nopt": "^5.0.0", - "npmlog": "^4.1.2", - "request": "^2.88.2", - "rimraf": "^3.0.2", - "semver": "^7.3.2", - "tar": "^6.0.2", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": ">= 10.12.0" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/nopt": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", - "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": ">=6" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/npm-bundled": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz", - "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "npm-normalize-package-bin": "^1.0.1" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/npm-install-checks": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz", - "integrity": "sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "semver": "^7.1.1" - }, - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/npm-normalize-package-bin": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", - "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", - "dev": true, - "license": "ISC" - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/npm-package-arg": { - "version": "8.1.5", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz", - "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "hosted-git-info": "^4.0.1", - "semver": "^7.3.4", - "validate-npm-package-name": "^3.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/npm-packlist": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz", - "integrity": "sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.6", - "ignore-walk": "^3.0.3", - "npm-bundled": "^1.1.1", - "npm-normalize-package-bin": "^1.0.1" - }, - "bin": { - "npm-packlist": "bin/index.js" - }, - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/npm-pick-manifest": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz", - "integrity": "sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==", - "dev": true, - "license": "ISC", - "dependencies": { - "npm-install-checks": "^4.0.0", - "npm-normalize-package-bin": "^1.0.1", - "npm-package-arg": "^8.1.2", - "semver": "^7.3.4" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/npm-registry-fetch": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz", - "integrity": "sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==", - "dev": true, - "license": "ISC", - "dependencies": { - "make-fetch-happen": "^9.0.1", - "minipass": "^3.1.3", - "minipass-fetch": "^1.3.0", - "minipass-json-stream": "^1.0.1", - "minizlib": "^2.0.0", - "npm-package-arg": "^8.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/pacote": { - "version": "11.3.5", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz", - "integrity": "sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/git": "^2.1.0", - "@npmcli/installed-package-contents": "^1.0.6", - "@npmcli/promise-spawn": "^1.2.0", - "@npmcli/run-script": "^1.8.2", - "cacache": "^15.0.5", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "infer-owner": "^1.0.4", - "minipass": "^3.1.3", - "mkdirp": "^1.0.3", - "npm-package-arg": "^8.0.1", - "npm-packlist": "^2.1.4", - "npm-pick-manifest": "^6.0.0", - "npm-registry-fetch": "^11.0.0", - "promise-retry": "^2.0.1", - "read-package-json-fast": "^2.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.1", - "tar": "^6.1.0" - }, - "bin": { - "pacote": "lib/bin.js" - }, - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/pify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz", - "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "engines": { - "node": ">= 6" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/socks-proxy-agent": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", - "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - }, - "engines": { - "node": ">= 10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/ssri": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", - "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": ">= 8" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "dev": true, - "license": "ISC", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/tar/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", - "dev": true, - "license": "MIT", - "bin": { - "uuid": "bin/uuid" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/validate-npm-package-name": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", - "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==", - "dev": true, - "license": "ISC", - "dependencies": { - "builtins": "^1.0.3" - } - }, - "src/plugins/cordova-plugin-advanced-http/node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, "src/plugins/cordova-plugin-buildinfo": { "version": "4.0.0", "dev": true, diff --git a/src/lib/loadPlugin.js b/src/lib/loadPlugin.js index 75656082bf..2272163ec8 100644 --- a/src/lib/loadPlugin.js +++ b/src/lib/loadPlugin.js @@ -3,8 +3,16 @@ import Page from "components/page"; import helpers from "utils/helpers"; import Url from "utils/Url"; import actionStack from "./actionStack"; +import generatePluginContext, { connect } from "./pluginContext"; export default async function loadPlugin(pluginId, justInstalled = false) { + // Establish the trusted native session BEFORE any plugin script is appended + // and run. Plugin main.js runs as soon as its ); + const iconApi = fileIcons.bindPlugin($script, pluginId); + $script.onerror = (error) => { + fileIcons.unregisterByPlugin(pluginId); reject( new Error( `Failed to load script for plugin ${pluginId}: ${error.message || error}`, @@ -77,6 +81,7 @@ export default async function loadPlugin(pluginId, justInstalled = false) { } await acode.initPlugin(pluginId, baseUrl, $page, { + fileIcons: iconApi, cacheFileUrl: await helpers.toInternalUri(cacheFile), cacheFile: fsOperation(cacheFile), firstInit: justInstalled, @@ -88,6 +93,7 @@ export default async function loadPlugin(pluginId, justInstalled = false) { resolve(); } catch (error) { + fileIcons.unregisterByPlugin(pluginId); reject(error); } }; diff --git a/src/lib/openFolder.js b/src/lib/openFolder.js index 927606a926..fa300d0ce0 100644 --- a/src/lib/openFolder.js +++ b/src/lib/openFolder.js @@ -10,6 +10,7 @@ import confirm from "dialogs/confirm"; import prompt from "dialogs/prompt"; import select from "dialogs/select"; import escapeStringRegexp from "escape-string-regexp"; +import fileIcons from "lib/fileIcons"; import copyEntry from "utils/copyEntry"; import helpers from "utils/helpers"; import Path from "utils/Path"; @@ -142,8 +143,12 @@ function openFolder(_path, opts = {}) { const $root = collapsableList(title, "folder", { allCaps: true, - ontoggle: () => expandList($root), + ontoggle: () => { + setFolderLeadIcon($root, title, { isRoot: true }); + expandList($root); + }, }); + setFolderLeadIcon($root, title, { isRoot: true }); const $text = $root.$title.get(":scope>span.text"); $root.id = "r" + _path.hashCode(); @@ -1157,16 +1162,38 @@ async function refreshRenamedEntryInOpenFolders( */ function createFolderTile(name, url) { const $list = collapsableList(name, "folder", { - ontoggle: () => expandList($list), + ontoggle: () => { + setFolderLeadIcon($list, name); + expandList($list); + }, }); const { $title } = $list; $title.dataset.url = url; $title.dataset.name = name; $title.dataset.type = "dir"; + setFolderLeadIcon($list, name); return $list; } +function setFolderLeadIcon($list, name, options = {}) { + const $icon = $list.$title?.firstElementChild; + if (!$icon) return; + $icon.className = helpers.getIconForFolder(name, { + expanded: $list.unclasped, + isRoot: options.isRoot, + }); +} + +fileIcons.onChange(() => { + for (const folder of addedFolder) { + const $list = folder.$node; + const name = $list?.$title?.dataset?.name; + if (!$list || !name) continue; + setFolderLeadIcon($list, name, { isRoot: true }); + } +}); + /** * Create a file tile * @param {string} name diff --git a/src/lib/recents.js b/src/lib/recents.js index 1f583a8a07..eda542edcf 100644 --- a/src/lib/recents.js +++ b/src/lib/recents.js @@ -119,7 +119,7 @@ const recents = { text: name, subText: location, title: path, - icon: "folder", + fileIcon: { name, kind: "folder" }, className: "recent-entry", tailElement: tailElement, ontailclick: (e) => { @@ -153,7 +153,7 @@ const recents = { text: name, subText: location, title: path, - icon: helpers.getIconForFile(name), + fileIcon: { name, kind: "file" }, className: "recent-entry", tailElement: tailElement, ontailclick: (e) => { diff --git a/src/lib/settings.js b/src/lib/settings.js index fd6f3cd79d..de8d3b18bf 100644 --- a/src/lib/settings.js +++ b/src/lib/settings.js @@ -219,6 +219,7 @@ class Settings { shiftClickSelection: true, showShareButton: true, appIcon: "default", + iconTheme: "builtin", }; this.value = structuredClone(this.#defaultSettings); } diff --git a/src/main.js b/src/main.js index 87b6f9a445..3f412ba423 100644 --- a/src/main.js +++ b/src/main.js @@ -44,6 +44,7 @@ import { canSaveFile } from "lib/commands"; import config from "lib/config"; import EditorFile from "lib/editorFile"; import EditorManager from "lib/editorManager"; +import fileIcons from "lib/fileIcons"; import { initFileList } from "lib/fileList"; import fonts from "lib/fonts"; import lang from "lib/lang"; @@ -311,6 +312,8 @@ async function onDeviceReady() { acode.setLoadingMessage("Loading settings..."); await settings.init(); + fileIcons.bindSettings(settings); + fileIcons.syncFromSettings(); themes.init(); initHighlighting(); @@ -358,6 +361,7 @@ async function onDeviceReady() { // load plugins try { await loadPlugins(); + fileIcons.refreshRenderedIcons(); // Ensure at least one sidebar app is active after all plugins are loaded // This handles cases where the stored section was from an uninstalled plugin sidebarApps.ensureActiveApp(); diff --git a/src/settings/appSettings.js b/src/settings/appSettings.js index a7f912f74c..f6f46e65d2 100644 --- a/src/settings/appSettings.js +++ b/src/settings/appSettings.js @@ -7,6 +7,7 @@ import select from "dialogs/select"; import actions from "handlers/quickTools"; import actionStack from "lib/actionStack"; import config from "lib/config"; +import fileIcons from "lib/fileIcons"; import fonts from "lib/fonts"; import lang from "lib/lang"; import openFile from "lib/openFile"; @@ -226,6 +227,27 @@ export default function otherSettings() { category: categories.fonts, chevron: true, }, + { + key: "iconTheme", + text: strings["icon pack"], + value: values.iconTheme || "builtin", + get select() { + return fileIcons + .list() + .map((theme) => [ + theme.id, + theme.available === false + ? `${theme.name} (${strings.unavailable || "unavailable"})` + : theme.name, + ]); + }, + valueText: (value) => { + const theme = fileIcons.list().find((entry) => entry.id === value); + return theme?.name || value || "Builtin"; + }, + info: strings["settings-info-icon-pack"], + category: categories.interface, + }, { key: "rememberFiles", text: strings["remember opened files"], diff --git a/src/settings/formatterSettings.js b/src/settings/formatterSettings.js index 512510d6d5..604caec673 100644 --- a/src/settings/formatterSettings.js +++ b/src/settings/formatterSettings.js @@ -1,7 +1,6 @@ import { getModes } from "cm/modelist"; import settingsPage from "components/settingsPage"; import appSettings from "lib/settings"; -import helpers from "utils/helpers"; export default function formatterSettings(languageName) { const title = strings.formatter; @@ -28,7 +27,7 @@ export default function formatterSettings(languageName) { return { key: name, text: caption, - icon: helpers.getIconForFile(`sample.${sampleExt}`), + fileIcon: { name: `sample.${sampleExt}` }, value: formatterID, valueText: (value) => { const formatter = formatters.find(({ id }) => id === value); diff --git a/src/sidebarApps/files/index.js b/src/sidebarApps/files/index.js index 1c9e900ec8..4baca7cec7 100644 --- a/src/sidebarApps/files/index.js +++ b/src/sidebarApps/files/index.js @@ -1,5 +1,6 @@ import "./style.scss"; import Sidebar from "components/sidebar"; +import fileIcons from "lib/fileIcons"; import settings from "lib/settings"; /**@type {HTMLElement} */ @@ -45,6 +46,9 @@ function initApp(el) { * @param {HTMLElement} el */ function onSelected(el) { + // Phone sidebars and inactive sidebar apps are detached, so document-wide + // icon updates cannot reach them until this view is shown again. + fileIcons.refreshRenderedIcons(container); const $scrollableLists = container.getAll(":scope .scroll[data-scroll-top]"); $scrollableLists.forEach(($el) => { $el.scrollTop = $el.dataset.scrollTop; diff --git a/src/sidebarApps/searchInFiles/cmResultView.js b/src/sidebarApps/searchInFiles/cmResultView.js index 0ddc754533..4d755f3586 100644 --- a/src/sidebarApps/searchInFiles/cmResultView.js +++ b/src/sidebarApps/searchInFiles/cmResultView.js @@ -125,16 +125,19 @@ export function createSearchResultView( } class FileIconWidget extends WidgetType { - constructor(className) { + constructor(className, name) { super(); this.className = className; + this.name = name; } eq(other) { - return other.className === this.className; + return other.className === this.className && other.name === this.name; } toDOM() { const span = document.createElement("span"); - span.className = `${this.className} cm-fileIcon`; + span.className = `${helpers.getIconForFile(this.name)} cm-fileIcon`; + span.dataset.fileIconName = this.name; + span.dataset.fileIconExtra = "cm-fileIcon"; return span; } ignoreEvent() { @@ -165,7 +168,7 @@ export function createSearchResultView( const iconClass = helpers.getIconForFile(fname); builder.push( Decoration.widget({ - widget: new FileIconWidget(iconClass), + widget: new FileIconWidget(iconClass, fname), side: -1, }).range(header.from), ); diff --git a/src/utils/helpers.js b/src/utils/helpers.js index d2b97f5328..e48e94bea0 100644 --- a/src/utils/helpers.js +++ b/src/utils/helpers.js @@ -1,9 +1,9 @@ import fsOperation from "fileSystem"; -import { getModeForPath as getCMModeForPath } from "cm/modelist"; import alert from "dialogs/alert"; import escapeStringRegexp from "escape-string-regexp"; import adRewards from "lib/adRewards"; import config from "lib/config"; +import fileIcons from "lib/fileIcons"; import { interstitialAd, requestBannerForPage } from "lib/startAd"; import { isBinaryFile } from "./binaryExtensions"; import { isPlayStoreInstall } from "./installSource"; @@ -11,49 +11,6 @@ import path from "./Path"; import Uri from "./Uri"; import Url from "./Url"; -/** - * Gets programming language name according to filename - * @param {String} filename - * @returns - */ -function getFileType(filename) { - const regex = { - babel: /\.babelrc$/i, - jsmap: /\.js\.map$/i, - yarn: /^yarn\.lock$/i, - testjs: /\.test\.js$/i, - testts: /\.test\.ts$/i, - cssmap: /\.css\.map$/i, - typescriptdef: /\.d\.ts$/i, - clojurescript: /\.cljs$/i, - cppheader: /\.(hh|hpp)$/i, - jsconfig: /^jsconfig.json$/i, - tsconfig: /^tsconfig.json$/i, - android: /\.(apk|aab|slim)$/i, - jsbeautify: /^\.jsbeautifyrc$/i, - webpack: /^webpack\.config\.js$/i, - audio: /\.(mp3|wav|ogg|flac|aac)$/i, - git: /(^\.gitignore$)|(^\.gitmodules$)/i, - video: /\.(mp4|m4a|mov|3gp|wmv|flv|avi)$/i, - image: /\.(png|jpg|jpeg|gif|bmp|ico|webp)$/i, - npm: /(^package\.json$)|(^package\-lock\.json$)/i, - compressed: /\.(zip|rar|7z|tar|gz|gzip|dmg|iso)$/i, - eslint: - /(^\.eslintrc(\.(json5?|ya?ml|toml))?$|eslint\.config\.(c?js|json)$)/i, - postcssconfig: - /(^\.postcssrc(\.(json5?|ya?ml|toml))?$|postcss\.config\.(c?js|json)$)/i, - prettier: - /(^\.prettierrc(\.(json5?|ya?ml|toml))?$|prettier\.config\.(c?js|json)$)/i, - }; - - const fileType = Object.keys(regex).find((type) => - regex[type].test(filename), - ); - if (fileType) return fileType; - - return Url.extname(filename).substring(1); -} - export default { /** * @deprecated This method is deprecated, use 'encodings.decode' instead. @@ -77,20 +34,20 @@ export default { * @param {string} filename */ getIconForFile(filename) { - const type = getFileType(filename); - // Use CodeMirror's modelist to determine mode name - let modeName = "text"; - try { - const mode = getCMModeForPath?.(filename); - modeName = mode?.name || modeName; - } catch (e) { - // fallback to default if CodeMirror modelist isn't available yet - } - - const iconForMode = `file_type_${modeName}`; - const iconForType = `file_type_${type}`; - - return `file file_type_default ${iconForMode} ${iconForType}`; + return fileIcons.icon({ kind: "file", name: filename }); + }, + /** + * Gets icon according to folder name and expansion state + * @param {string} name + * @param {{expanded?: boolean, isRoot?: boolean}} [options] + */ + getIconForFolder(name, options = {}) { + return fileIcons.icon({ + kind: "folder", + name, + expanded: options.expanded, + isRoot: options.isRoot, + }); }, /** * @@ -123,7 +80,9 @@ export default { } } if (item.isDirectory) { - item.icon = "folder"; + item.icon = this.getIconForFolder(item.name, { + isRoot: item.isRoot, + }); } else { if (mode === "folder") { item.disabled = true; diff --git a/tests/unit/fileIconAssets.test.ts b/tests/unit/fileIconAssets.test.ts new file mode 100644 index 0000000000..239e34c77a --- /dev/null +++ b/tests/unit/fileIconAssets.test.ts @@ -0,0 +1,124 @@ +// @vitest-environment happy-dom +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import fileIcons from "lib/fileIcons"; + +const requests: FakeImage[] = []; +class FakeImage { + src = ""; + onload: (() => void) | null = null; + onerror: (() => void) | null = null; + constructor() { + requests.push(this); + } +} +beforeEach(() => { + vi.stubGlobal("Image", FakeImage); + vi.stubGlobal("requestAnimationFrame", (fn: () => void) => { + queueMicrotask(fn); + return 0; + }); +}); +afterEach(() => { + fileIcons.resetForTests(); + requests.length = 0; + document.head.innerHTML = ""; + document.body.innerHTML = ""; + vi.restoreAllMocks(); + vi.unstubAllGlobals(); +}); +const pack = (id = "pack") => ({ + id, + pluginId: "test.plugin", + icons: "file:///icons/", + fileExtensions: { js: "js" }, + folder: "closed", + folderExpanded: "open", +}); + +describe("icon assets", () => { + it("loads only resolved assets of the active theme, sharing requests", () => { + fileIcons.register(pack()); + expect(document.querySelector("style[data-file-icon]")).toBeNull(); + expect(requests).toHaveLength(0); + fileIcons.use("pack", { persist: false }); + expect(requests).toHaveLength(0); + expect(fileIcons.resolve("a.js").themeId).toBe("builtin"); + fileIcons.resolve("b.js"); + expect(requests).toHaveLength(1); + requests[0].onload?.(); + expect(fileIcons.resolve("a.js").themeId).toBe("pack"); + }); + + it("keeps a visible fallback after failure and reports it once", () => { + const warn = vi.spyOn(console, "warn").mockImplementation(() => {}); + fileIcons.register(pack()); + fileIcons.use("pack", { persist: false }); + fileIcons.resolve("a.js"); + requests[0].onerror?.(); + expect(fileIcons.resolve("a.js").themeId).toBe("builtin"); + fileIcons.resolve("a.js"); + expect(requests).toHaveLength(1); + expect(warn).toHaveBeenCalledTimes(1); + }); + + it("uses the closed asset when the expanded asset fails", () => { + vi.spyOn(console, "warn").mockImplementation(() => {}); + fileIcons.register(pack()); + fileIcons.use("pack", { persist: false }); + fileIcons.resolve({ kind: "folder", name: "src", expanded: true }); + requests.find((r) => r.src.endsWith("open.svg"))!.onerror?.(); + requests.find((r) => r.src.endsWith("closed.svg"))!.onload?.(); + expect( + fileIcons.resolve({ kind: "folder", name: "src", expanded: true }).iconId, + ).toBe("closed"); + }); + + it("ignores stale asset completion after theme replacement", () => { + fileIcons.register(pack()); + fileIcons.use("pack", { persist: false }); + fileIcons.resolve("a.js"); + const old = requests[0]; + fileIcons.register({ ...pack(), icons: "file:///replacement/" }); + old.onload?.(); + expect(fileIcons.resolve("a.js").themeId).toBe("builtin"); + expect(requests.at(-1)?.src).toBe("file:///replacement/js.svg"); + }); + + it("updates a recycled row using its current filename", async () => { + fileIcons.register(pack()); + fileIcons.use("pack", { persist: false }); + document.body.innerHTML = + '
    '; + fileIcons.refreshRenderedIcons(); + const tile = document.body.firstElementChild as HTMLElement; + tile.dataset.name = "notes.txt"; + requests[0].onload?.(); + await Promise.resolve(); + expect(tile.firstElementChild?.className).toBe(fileIcons.icon("notes.txt")); + }); + + it("uses distinct CSS classes for IDs that previously collided", () => { + fileIcons.register({ + id: "ids", + pluginId: "test.plugin", + icons: { + "foo.bar": { src: "file:///a.svg" }, + "foo-bar": { src: "file:///b.svg" }, + }, + fileNames: { a: "foo.bar", b: "foo-bar" }, + }); + fileIcons.use("ids", { persist: false }); + fileIcons.resolve("a"); + fileIcons.resolve("b"); + for (const request of requests) request.onload?.(); + expect(fileIcons.icon("a")).not.toBe(fileIcons.icon("b")); + }); + + it("exposes only the supported plugin surface", () => { + expect( + Object.keys( + fileIcons.bindPlugin(document.createElement("script"), "test.plugin"), + ), + ).toEqual(["register", "icon", "onChange"]); + }); +}); diff --git a/tests/unit/fileIconOwnership.test.ts b/tests/unit/fileIconOwnership.test.ts new file mode 100644 index 0000000000..032e9d94db --- /dev/null +++ b/tests/unit/fileIconOwnership.test.ts @@ -0,0 +1,118 @@ +// @vitest-environment happy-dom +import { afterEach, expect, it, vi } from "vitest"; +import fileIcons from "lib/fileIcons"; + +afterEach(() => fileIcons.resetForTests()); + +it("binds registration to the loading plugin and rejects mismatched ownership", () => { + const script = document.createElement("script"); + const api = fileIcons.bindPlugin(script, "owner.plugin"); + expect(fileIcons.getPluginApi(script)).toBe(api); + const pack = { id: "owner.icons", icons: "file:///icons/", file: "default" }; + expect(() => api.register({ ...pack, pluginId: "typo.plugin" })).toThrow( + /loading plugin 'owner.plugin'/, + ); + expect(fileIcons.list().some((pack) => pack.id === "owner.icons")).toBe( + false, + ); + api.register(pack); + expect( + fileIcons.list().find((pack) => pack.id === "owner.icons")?.pluginId, + ).toBe("owner.plugin"); + fileIcons.use("owner.icons", { persist: false }); + expect( + document.querySelector('style[data-file-icon="owner.icons"]'), + ).not.toBeNull(); + fileIcons.unregisterByPlugin("owner.plugin"); + expect(fileIcons.active().id).toBe("builtin"); + expect( + document.querySelector('style[data-file-icon="owner.icons"]'), + ).toBeNull(); + expect(() => api.register(pack)).toThrow(/unloaded/); +}); + +it("keeps interleaved asynchronous plugin registrations scoped across reloads", async () => { + const first = fileIcons.bindPlugin(document.createElement("script"), "first"); + const second = fileIcons.bindPlugin( + document.createElement("script"), + "second", + ); + await Promise.resolve(); + second.register({ id: "second.icons" }); + first.register({ id: "first.icons", pluginId: "first" }); + fileIcons.unregisterByPlugin("first"); + const replacement = fileIcons.bindPlugin( + document.createElement("script"), + "first", + ); + replacement.register({ id: "first.icons" }); + expect(() => first.register({ id: "first.icons" })).toThrow(/unloaded/); + expect( + fileIcons + .list() + .filter((pack) => pack.available) + .map((pack) => pack.id), + ).toEqual(["builtin", "second.icons", "first.icons"]); +}); + +it("does not offer an unscoped registration API outside plugin execution", () => { + expect(() => fileIcons.getPluginApi(null)).toThrow(/options.fileIcons/); + expect(() => + fileIcons.getPluginApi(document.createElement("script")), + ).toThrow(/plugin main script/); +}); + +it("removes plugin listeners before pack teardown emits a change", () => { + const api = fileIcons.bindPlugin(document.createElement("script"), "owner"); + api.register({ id: "owner.icons" }); + fileIcons.use("owner.icons", { persist: false }); + const listener = vi.fn(); + api.onChange(listener); + const internal = vi.fn(); + const offInternal = fileIcons.onChange(internal); + fileIcons.unregisterByPlugin("owner"); + expect(internal).toHaveBeenCalledTimes(1); + expect(listener).not.toHaveBeenCalled(); + fileIcons.use("missing", { persist: false }); + expect(listener).not.toHaveBeenCalled(); + expect(() => api.onChange(listener)).toThrow(/unloaded/); + offInternal(); +}); + +it("cleans listener-only scopes on failed init and isolates reloaded subscriptions", () => { + const listener = vi.fn(); + const old = fileIcons.bindPlugin(document.createElement("script"), "owner"); + const staleUnsubscribe = old.onChange(listener); + // The loader uses this same teardown path when initialization fails. + fileIcons.unregisterByPlugin("owner"); + const current = fileIcons.bindPlugin( + document.createElement("script"), + "owner", + ); + const off = current.onChange(listener); + staleUnsubscribe(); + staleUnsubscribe(); + fileIcons.use("missing", { persist: false }); + expect(listener).toHaveBeenCalledTimes(1); + off(); + off(); + fileIcons.use("builtin", { persist: false }); + expect(listener).toHaveBeenCalledTimes(1); +}); + +it("preserves another plugin's subscription to the same callback", () => { + const listener = vi.fn(); + const first = fileIcons.bindPlugin(document.createElement("script"), "first"); + const second = fileIcons.bindPlugin( + document.createElement("script"), + "second", + ); + first.onChange(listener); + second.onChange(listener); + fileIcons.unregisterByPlugin("first"); + fileIcons.use("missing", { persist: false }); + expect(listener).toHaveBeenCalledTimes(1); + fileIcons.unregisterByPlugin("second"); + fileIcons.use("builtin", { persist: false }); + expect(listener).toHaveBeenCalledTimes(1); +}); diff --git a/tests/unit/fileIconSidebar.test.ts b/tests/unit/fileIconSidebar.test.ts new file mode 100644 index 0000000000..c83bfe0fa9 --- /dev/null +++ b/tests/unit/fileIconSidebar.test.ts @@ -0,0 +1,138 @@ +// @vitest-environment happy-dom +import { afterEach, beforeEach, expect, it, vi } from "vitest"; +import fileIcons from "lib/fileIcons"; + +const sidebar = vi.hoisted(() => ({ on: vi.fn() })); +vi.mock("components/sidebar", () => ({ default: sidebar })); +vi.mock("lib/settings", () => ({ default: {} })); + +beforeEach(() => { + vi.stubGlobal("strings", { files: "Files", "open folder": "Open folder" }); + vi.stubGlobal("editorManager", { on: vi.fn() }); +}); +afterEach(() => { + fileIcons.resetForTests(); + document.body.innerHTML = ""; + vi.clearAllMocks(); + vi.unstubAllGlobals(); +}); + +it("refreshes detached files and expanded folders when the phone sidebar reopens", async () => { + const { default: filesApp } = await import( + "../../src/sidebarApps/files/index.js" + ); + const container = document.createElement("div"); + Object.assign(container, { + getAll: (selector: string) => + Array.from(container.querySelectorAll(selector)), + }); + const init = filesApp[3] as (element: HTMLElement) => void; + init(container); + container.innerHTML = + '
    '; + const register = (id: string) => + fileIcons.register({ + id, + pluginId: "test.plugin", + icons: { + file: { className: `${id}-file` }, + closed: { className: `${id}-closed` }, + open: { className: `${id}-open` }, + root: { className: `${id}-root` }, + }, + file: "file", + folder: "closed", + folderExpanded: "open", + rootFolderExpanded: "root", + }); + register("first"); + register("second"); + document.body.append(container); + fileIcons.use("first", { persist: false }); + container.remove(); // hide() removes the phone sidebar from the document + fileIcons.use("second", { persist: false }); + expect(container.querySelector('[data-type="file"] span')?.className).toBe( + "first-file", + ); + document.body.append(container); + const onShow = sidebar.on.mock.calls.find(([event]) => event === "show")![1]; + onShow(); + expect(container.querySelector('[data-type="file"] span')?.className).toBe( + "second-file", + ); + expect(container.querySelector('[data-type="dir"] span')?.className).toBe( + "second-open", + ); + expect(container.querySelector('[data-type="root"] span')?.className).toBe( + "second-root", + ); + expect(container.querySelector(".hidden")).toBeNull(); + + // Selecting the Files tab also refreshes an inactive, detached sidebar app. + container.remove(); + fileIcons.use("builtin", { persist: false }); + (filesApp[5] as () => void)(); + expect(container.querySelector('[data-type="dir"] span')?.className).toBe( + "icon folder", + ); + expect(container.querySelector('[data-type="file"] span')?.className).toBe( + fileIcons.icon("app.js"), + ); + expect(fileIcons.active().name).toBe("Builtin"); +}); + +it("replaces fallbacks with loaded assets after reopening without toggling folders", async () => { + const { default: filesApp } = await import( + "../../src/sidebarApps/files/index.js" + ); + const requests: Array<{ + src: string; + onload: (() => void) | null; + onerror: (() => void) | null; + }> = []; + class ImageStub { + src = ""; + onload = null; + onerror = null; + constructor() { + requests.push(this); + } + } + vi.stubGlobal("Image", ImageStub); + vi.stubGlobal("requestAnimationFrame", (fn: () => void) => { + queueMicrotask(fn); + return 0; + }); + const container = document.createElement("div"); + Object.assign(container, { + getAll: (selector: string) => + Array.from(container.querySelectorAll(selector)), + }); + (filesApp[3] as (element: HTMLElement) => void)(container); + container.innerHTML = + '
    '; + fileIcons.register({ + id: "images", + pluginId: "test.plugin", + icons: "file:///icons/", + file: "file", + folder: "folder", + folderExpanded: "folder-open", + }); + fileIcons.use("images", { persist: false }); + // Match the phone sidebar: it may refresh immediately before being attached. + const show = sidebar.on.mock.calls.find(([event]) => event === "show")![1]; + show(); + document.body.append(container); + expect(requests.length).toBeGreaterThan(0); + for (const request of requests) request.onload?.(); + await Promise.resolve(); + expect(fileIcons.resolve("app.js").themeId).toBe("images"); + expect(container.querySelector('[data-type="file"] span')?.className).toBe( + fileIcons.icon("app.js"), + ); + expect(container.querySelector('[data-type="dir"] span')?.className).toBe( + fileIcons.icon({ name: "src", kind: "folder", expanded: true }), + ); + expect(container.querySelector(".hidden")).toBeNull(); +}); diff --git a/tests/unit/fileIconTheme.test.ts b/tests/unit/fileIconTheme.test.ts new file mode 100644 index 0000000000..6f81cf0973 --- /dev/null +++ b/tests/unit/fileIconTheme.test.ts @@ -0,0 +1,356 @@ +import { afterEach, describe, expect, it } from "vitest"; +import fileIcons, { BUILTIN_THEME_ID } from "lib/fileIcons"; + +afterEach(() => { + fileIcons.resetForTests(); +}); + +function classOf(resource: Parameters[0]) { + return fileIcons.icon(resource); +} + +describe("built-in file icon matching", () => { + it("prefers exact filenames over extensions", () => { + const handle = fileIcons.resolve("package.json"); + expect(handle.source).toBe("fileName"); + expect(handle.iconId).toBe("npm"); + expect(handle.className).toContain("file_type_npm"); + }); + + it("matches gitignore as a filename, not an extension", () => { + const handle = fileIcons.resolve(".gitignore"); + expect(handle.source).toBe("fileName"); + expect(handle.iconId).toBe("git"); + expect(handle.className).toContain("file_type_git"); + }); + + it("uses the longest compound extension", () => { + expect(fileIcons.resolve("button.test.ts").iconId).toBe("testts"); + expect(fileIcons.resolve("index.d.ts").iconId).toBe("typescriptdef"); + expect(fileIcons.resolve("bundle.js.map").iconId).toBe("jsmap"); + expect(fileIcons.resolve("app.ts").iconId).toBe("ts"); + }); + + it("matches extensions case-insensitively", () => { + expect(fileIcons.resolve("Photo.PNG").iconId).toBe("image"); + expect(fileIcons.resolve("ARCHIVE.TAR.GZ").iconId).toBe("compressed"); + }); + + it("keeps file-type classes compatible with the existing icon font", () => { + expect(classOf("package.json")).toContain("file_type_npm"); + expect(classOf("webpack.config.js")).toContain("file_type_webpack"); + expect(classOf("notes.txt")).toContain("file_type_txt"); + }); +}); + +describe("built-in folder icons", () => { + it("uses the same expandable folder glyph for every folder", () => { + expect(classOf({ kind: "folder", name: "src" })).toBe("icon folder"); + expect(classOf({ kind: "folder", name: "node_modules" })).toBe( + "icon folder", + ); + expect(classOf({ kind: "folder", name: "random-dir" })).toBe("icon folder"); + }); +}); + +describe("plugin icon themes", () => { + it("keeps the built-in theme active until a preferred plugin theme registers", () => { + fileIcons.use("material-icons", { persist: false }); + expect(fileIcons.active()).toMatchObject({ + id: BUILTIN_THEME_ID, + preferredId: "material-icons", + available: false, + }); + expect(fileIcons.resolve("app.js").themeId).toBe(BUILTIN_THEME_ID); + + fileIcons.register({ + id: "material-icons", + name: "Material Icons", + pluginId: "acode.material.icons", + icons: { + js: { className: "icon material-js" }, + }, + fileExtensions: { js: "js" }, + file: "js", + folder: "js", + }); + + expect(fileIcons.active().id).toBe("material-icons"); + expect(fileIcons.resolve("app.js")).toMatchObject({ + className: "icon material-js", + iconId: "js", + source: "fileExtension", + themeId: "material-icons", + }); + }); + + it("does not apply inactive plugin themes", () => { + fileIcons.register({ + pluginId: "test.plugin", + id: "other-icons", + name: "Other", + icons: { + js: { className: "icon other-js" }, + }, + fileExtensions: { js: "js" }, + }); + + expect(fileIcons.active().id).toBe(BUILTIN_THEME_ID); + expect(fileIcons.icon("app.js")).not.toContain("other-js"); + }); + + it("resolves SVG packs from an icons folder like VS Code iconPath", () => { + fileIcons.register({ + pluginId: "test.plugin", + id: "pack", + name: "Pack", + icons: "https://example.com/icons/", + fileExtensions: { js: "javascript" }, + folderNames: { src: "folder-src" }, + folder: "folder", + folderExpanded: "folder-open", + }); + fileIcons.use("pack", { persist: false }); + + expect(fileIcons.resolve("app.js").iconId).toBe("javascript"); + expect(fileIcons.resolve({ kind: "folder", name: "src" }).iconId).toBe( + "folder-src", + ); + expect( + fileIcons.resolve({ kind: "folder", name: "other", expanded: true }) + .iconId, + ).toBe("folder-open"); + }); + + it("falls back to the built-in theme when the active plugin unregisters", () => { + const registration = fileIcons.register({ + id: "temp-icons", + name: "Temp", + pluginId: "plugin.temp", + icons: { + file: { className: "icon temp-file" }, + }, + file: "file", + }); + fileIcons.use("temp-icons", { persist: false }); + expect(fileIcons.icon("unknown.xyz")).toBe("icon temp-file"); + + registration.dispose(); + expect(fileIcons.active().id).toBe(BUILTIN_THEME_ID); + expect(fileIcons.resolve("unknown.xyz").themeId).toBe(BUILTIN_THEME_ID); + }); + + it("unregisters themes owned by a plugin", () => { + fileIcons.register({ + id: "owned-icons", + name: "Owned", + pluginId: "plugin.owned", + icons: { file: { className: "icon owned" } }, + file: "file", + }); + fileIcons.use("owned-icons", { persist: false }); + fileIcons.unregisterByPlugin("plugin.owned"); + expect( + fileIcons.list().find((theme) => theme.id === "owned-icons")?.available, + ).not.toBe(true); + expect(fileIcons.active()).toMatchObject({ + id: BUILTIN_THEME_ID, + preferredId: "owned-icons", + available: false, + }); + }); + + it("resolves batches in input order", () => { + const handles = fileIcons.resolveMany([ + "package.json", + { kind: "folder", name: "src" }, + "main.py", + ]); + expect(handles.map((handle) => handle.iconId)).toEqual([ + "npm", + "folder", + "py", + ]); + }); + + it("rejects invalid themes without replacing a previous valid version", () => { + fileIcons.register({ + pluginId: "test.plugin", + id: "stable-icons", + name: "Stable", + icons: { js: { className: "icon stable-js" } }, + fileExtensions: { js: "js" }, + }); + fileIcons.use("stable-icons", { persist: false }); + + expect(() => + fileIcons.register({ + pluginId: "test.plugin", + id: "stable-icons", + fileExtensions: { js: "js" }, + icons: { js: { src: "javascript:alert(1)" } }, + }), + ).toThrow(/Unsafe/); + + expect(fileIcons.icon("app.js")).toBe("icon stable-js"); + }); + + it("rejects conflicting normalized associations", () => { + expect(() => + fileIcons.register({ + id: "duplicates", + pluginId: "test.plugin", + icons: { a: { className: "a" }, b: { className: "b" } }, + fileExtensions: { js: "a", JS: "b" }, + }), + ).toThrow(/Conflicting fileExtension/); + }); +}); + +describe("theme contract", () => { + const theme = (id = "test") => ({ + id, + pluginId: "test.plugin", + icons: { + closed: { className: "custom-closed" }, + open: { className: "custom-open" }, + }, + folder: "closed", + }); + + it("inherits a custom closed folder for expanded and root folders", () => { + fileIcons.register(theme()); + fileIcons.use("test", { persist: false }); + for (const isRoot of [false, true]) { + expect( + fileIcons.icon({ + kind: "folder", + name: "other", + expanded: true, + isRoot, + }), + ).toBe("custom-closed"); + } + }); + + it("honors explicit expanded and root icons", () => { + fileIcons.register({ + ...theme(), + folderExpanded: "open", + rootFolder: "closed", + }); + fileIcons.use("test", { persist: false }); + expect( + fileIcons.icon({ kind: "folder", name: "other", expanded: true }), + ).toBe("custom-open"); + expect( + fileIcons.icon({ + kind: "folder", + name: "other", + expanded: true, + isRoot: true, + }), + ).toBe("custom-closed"); + }); + + it("does not let an obsolete disposal remove its replacement", () => { + const old = fileIcons.register(theme()); + const current = fileIcons.register({ ...theme(), name: "Replacement" }); + old.dispose(); + expect(fileIcons.list().find((t) => t.id === "test")?.name).toBe( + "Replacement", + ); + current.dispose(); + current.dispose(); + expect(fileIcons.list().some((t) => t.id === "test")).toBe(false); + }); + + it("rejects another plugin replacing the same id", () => { + fileIcons.register(theme()); + expect(() => + fileIcons.register({ ...theme(), pluginId: "other.plugin" }), + ).toThrow(/another plugin/); + }); + + it("reports missing references and unsupported fields", () => { + expect(() => + fileIcons.register({ ...theme(), fileExtensions: { js: "missing" } }), + ).toThrow(/fileExtensions.js.*missing/); + expect(() => + fileIcons.register({ ...theme(), label: "Alias" } as never), + ).toThrow(/theme.label/); + expect(() => + fileIcons.register({ + ...theme(), + icons: { bad: { src: "file:///bad.svg", light: "file:///light.svg" } }, + } as never), + ).toThrow(/icons.bad.light/); + }); + + it("requires ownership for automatic cleanup", () => { + expect(() => fileIcons.register({ id: "missing-owner" } as never)).toThrow( + /pluginId/, + ); + }); + + it("does not treat a dotfile as an extension", () => { + fileIcons.register({ ...theme(), fileExtensions: { env: "open" } }); + fileIcons.use("test", { persist: false }); + expect(fileIcons.resolve(".env").source).toBe("default"); + expect(fileIcons.resolve("project.env").iconId).toBe("open"); + }); + + it("does not infer undeclared open assets", () => { + fileIcons.register({ + id: "directory", + pluginId: "test.plugin", + icons: "file:///icons/", + folderNames: { src: "source" }, + }); + fileIcons.use("directory", { persist: false }); + expect( + fileIcons.resolve({ kind: "folder", name: "src", expanded: true }).iconId, + ).toBe("source"); + }); +}); + +describe("extension scanning edge cases", () => { + it.each([ + ["button.test.ts", "test"], + ["BUTTON.TEST.TS", "test"], + ["button.other.ts", "ts"], + [".config.test.ts", "test"], + [".test.ts", "test"], + ["button..ts", "ts"], + [".ts", "plain"], + ["README", "plain"], + ["button.ts.", "plain"], + [".", "plain"], + ["..", "plain"], + ["", "plain"], + ])("resolves %j to %s", (name, expected) => { + fileIcons.register({ + id: "scan", + pluginId: "test.plugin", + icons: { + test: { className: "test" }, + ts: { className: "ts" }, + plain: { className: "plain" }, + }, + fileExtensions: { "test.ts": "test", ts: "ts" }, + file: "plain", + }); + fileIcons.use("scan", { persist: false }); + expect(fileIcons.icon(name)).toBe(expected); + }); + + it.each([ + ["file.UNLISTED", "unlisted"], + ["file..UNLISTED", "unlisted"], + [".UNLISTED", "default"], + ["file.UNLISTED.", "default"], + ["extensionless", "default"], + ])("keeps the built-in last-extension fallback for %j", (name, expected) => { + expect(fileIcons.resolve(name).iconId).toBe(expected); + }); +}); diff --git a/tests/unit/fileTreeRecycling.test.ts b/tests/unit/fileTreeRecycling.test.ts new file mode 100644 index 0000000000..1c9d57477d --- /dev/null +++ b/tests/unit/fileTreeRecycling.test.ts @@ -0,0 +1,72 @@ +// @vitest-environment happy-dom +import { afterEach, beforeEach, expect, it, vi } from "vitest"; +import tag from "html-tag-js"; +import FileTree from "components/fileTree"; + +vi.mock("utils/helpers", () => ({ + default: { + getIconForFile: (name: string) => name, + getIconForFolder: (name: string, options: { expanded: boolean }) => + `${name}-${options.expanded ? "open" : "closed"}`, + sortDir: (entries: unknown[]) => entries, + }, +})); +beforeEach(() => vi.stubGlobal("tag", tag)); +afterEach(() => vi.unstubAllGlobals()); + +it("uses the recycled folder's name and URL for toggles and context actions", async () => { + const getEntries = vi.fn(async () => []); + const onExpandedChange = vi.fn(); + const onContextMenu = vi.fn(); + const tree = new FileTree(document.createElement("div"), { + getEntries, + onExpandedChange, + onContextMenu, + }); + const row = tree.createFolderElement("src", "file:///src"); + await row.expand(); + const originalChild = row.fileTree; + const destroy = vi.spyOn(originalChild, "destroy"); + expect(tree.createFolderElement("assets", "file:///assets", row)).toBe(row); + expect(destroy).toHaveBeenCalledTimes(1); + expect(row.fileTree).toBeNull(); + expect(row.$title.firstElementChild.className).toBe("assets-closed"); + await row.expand(); + expect(getEntries).toHaveBeenLastCalledWith("file:///assets"); + expect(row.$title.firstElementChild.className).toBe("assets-open"); + expect(onExpandedChange).toHaveBeenLastCalledWith("file:///assets", true); + expect(tree.childTrees.has("file:///src")).toBe(false); + expect(tree.childTrees.has("file:///assets")).toBe(true); + await row.collapse(); + expect(row.$title.firstElementChild.className).toBe("assets-closed"); + expect(onExpandedChange).toHaveBeenLastCalledWith("file:///assets", false); + row.$title.dispatchEvent(new Event("contextmenu")); + expect(onContextMenu).toHaveBeenLastCalledWith( + "dir", + "file:///assets", + "assets", + row.$title, + ); + tree.destroy(); +}); + +it("uses recycled file identity for open and context actions", () => { + const onFileClick = vi.fn(); + const onContextMenu = vi.fn(); + const tree = new FileTree(document.createElement("div"), { + onFileClick, + onContextMenu, + }); + const row = tree.createFileElement("a.js", "file:///a.js"); + tree.createFileElement("b.ts", "file:///b.ts", row); + row.click(); + row.dispatchEvent(new Event("contextmenu")); + expect(onFileClick).toHaveBeenCalledWith("file:///b.ts", "b.ts"); + expect(onContextMenu).toHaveBeenCalledWith( + "file", + "file:///b.ts", + "b.ts", + row, + ); + tree.destroy(); +}); From 428395f66c474c697524839de8baadd0710e81c5 Mon Sep 17 00:00:00 2001 From: Rohit Kushvaha Date: Tue, 15 Sep 2026 02:14:47 +0000 Subject: [PATCH 123/195] feat: enable r8 minification (#2891) --- build-extras.gradle | 9 +++++++++ config.xml | 5 +++++ proguard-rules.pro | 27 +++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 proguard-rules.pro diff --git a/build-extras.gradle b/build-extras.gradle index 6b606e0ed2..4b1e8cf979 100644 --- a/build-extras.gradle +++ b/build-extras.gradle @@ -2,6 +2,15 @@ android { packagingOptions { pickFirst 'META-INF/versions/9/OSGI-INF/MANIFEST.MF' } + buildTypes { + release { + //might cause ClassNotFoundException errors + //to fix those errors you need to either put @Keep on the class/feild or add a entry in progrud rules file + minifyEnabled true + shrinkResources true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } } configurations { diff --git a/config.xml b/config.xml index 4cf527c0fb..946ace476a 100644 --- a/config.xml +++ b/config.xml @@ -314,6 +314,11 @@ + + + + + diff --git a/proguard-rules.pro b/proguard-rules.pro new file mode 100644 index 0000000000..db72d9a955 --- /dev/null +++ b/proguard-rules.pro @@ -0,0 +1,27 @@ +# Keep Cordova classes +-keep class org.apache.cordova.** { *; } + +# Cordova discovers plugins by class name from config.xml and instantiates them +# reflectively, and plugins can dispatch actions by method name through +# reflection too (e.g. Ftp.execute() uses +# getClass().getDeclaredMethod(action, JSONArray, CallbackContext)). +# Without keeping the members, R8 strips methods such as connect()/listDirectory() +# and those plugin calls fail at runtime with NoSuchMethodException. +-keep public class * extends org.apache.cordova.CordovaPlugin { *; } + +# WebView JS bridge methods are invoked by name from JavaScript. +-keepclassmembers class * { + @android.webkit.JavascriptInterface ; +} + +# cordova-plugin-buildinfo resolves the app's BuildConfig reflectively: +# Class.forName(packageName + ".BuildConfig") and c.getField(fieldName). +-keep class **.BuildConfig { *; } + +# maverick-synergy (SSH/SFTP) references java.lang.management from +# Utils.generateThreadDump(), which does not exist on Android. That method is +# never reached on Android, so ignore the missing Java SE classes. +-dontwarn java.lang.management.** + +# Keep Javascript Interface attributes +-keepattributes *Annotation*,EnclosingMethod,InnerClasses,Signature From 903d6514804bf6d03140d5b9db04f80dba2c27a2 Mon Sep 17 00:00:00 2001 From: summoner Date: Tue, 15 Sep 2026 16:10:48 +0000 Subject: [PATCH 124/195] Translation: Update hu-hu.json (#2903) Translate new strings Fix sentences --- src/lang/hu-hu.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index 4e1b5aa789..6db53dfca5 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -843,8 +843,8 @@ "settings-info-horizontal-scroll-margin": "A leghosszabb sor után egy üres hely lesz hozzáadva a képernyő széléhez, ha a sorok tördelése ki van kapcsolva. Adjon meg egy nem negatív egész pixelértéket.", "confirm app icon reward": "Megtekint egy hirdetést az alkalmazásikon beállításának feloldásához?", "rewarded ad unavailable": "A jutalomért megtekinthető hirdetések jelenleg nem érhetők el. Próbálja újra később.", - "rewarded ad failed": "A hirdetést nem sikerült befejezni. Próbáld újra.", - "rewarded ad incomplete": "Nézd végig a hirdetést a jutalom megszerzéséhez.", + "rewarded ad failed": "Nem sikerült befejezni a hirdetés megtekintését. Próbálja újra.", + "rewarded ad incomplete": "Nézze végig a hirdetést a jutalom megszerzéséhez.", "plugin-review:dialog-label": "Bővítményértékelések", "plugin-review:account-check-failed": "Nem sikerült ellenőrizni a fiókját. Próbálja újra.", "plugin-review:sign-in": "Megjegyzés írásához be kell jelentkezni", @@ -882,7 +882,7 @@ "wrap-indent-indent": "Behúzás (+1 szint)", "wrap-indent-deep": "Mély behúzás (+2 szint)", "settings-info-editor-wrapping-indent": "Válassza ki, hogy a tördelt szövegek a képernyő bal szélétől kezdődjenek-e, az eredeti sor behúzását kövessék-e, vagy még jobban legyenek-e behúzva. Minden további behúzási szint a tabulátor méretét veszi alapul.", - "icon pack": "Icon pack", - "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "icon pack": "Ikoncsomag", + "settings-info-icon-pack": "Válassza ki a fájlokhoz és a mappákhoz használandó ikonokat a fájlkezelőben és az alkalmazás egészében megjelenő fájllistákban.", + "unavailable": "nem érhető el" } From 1202bedf461532d9823d12c1c1977b1e6f383279 Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Fri, 18 Sep 2026 09:25:09 +0000 Subject: [PATCH 125/195] feat: plugin quicktool adapter (#2898) * feat: plugin quicktool adapter - allow plugin to adapt quicktool - allow plugin to hook save, save event - fix icon size in file explorer * fix: Capture Swallows Later Input * fix: issues * fix: plugin based file system intialization - improve tooltip bug and visibility - UI issues * fix: restore cached files without waiting for providers Replace the startup wait with generic cache-first restoration and provider registration notifications. Preserve cached documents and keep uncached tabs idle until their filesystem becomes available. * fix: load file from cache or defer loading if file system unavailable --------- Co-authored-by: Ajit Kumar --- src/components/tabView.js | 2 +- src/components/tooltip/index.js | 50 +- src/components/tooltip/longPress.js | 126 +++++ src/components/tooltip/style.scss | 22 +- src/fileSystem/index.js | 17 + src/handlers/quickTools.js | 148 ++++- src/handlers/quickToolsInit.js | 107 +++- src/lib/acode.js | 6 + src/lib/checkFiles.js | 32 +- src/lib/commands.js | 48 +- src/lib/editorFile.js | 247 +++++--- src/lib/editorManager.js | 67 ++- src/lib/quickToolsAdapter.js | 205 +++++++ src/lib/quickToolsOverlays.js | 53 ++ src/lib/restoreFiles.js | 8 +- src/lib/saveFile.js | 85 ++- src/main.js | 7 +- src/pages/fileBrowser/fileBrowser.scss | 13 + src/utils/remoteFilePreview.js | 2 +- tests/helpers/loadSourceModule.js | 24 + tests/unit/fileSaveEvents.test.js | 123 ++++ tests/unit/iconTooltips.test.js | 212 +++++++ tests/unit/pluginFileRestoration.test.js | 680 +++++++++++++++++++++++ tests/unit/quickToolsAdapter.test.js | 148 +++++ tests/unit/quickToolsAdapterUi.test.js | 634 +++++++++++++++++++++ tests/unit/quickToolsOverlays.test.js | 94 ++++ tests/unit/remoteFilePreview.test.js | 4 +- tests/unit/restoreFiles.test.js | 2 +- tests/unit/saveCommands.test.js | 121 ++++ 29 files changed, 3097 insertions(+), 190 deletions(-) create mode 100644 src/components/tooltip/longPress.js create mode 100644 src/lib/quickToolsAdapter.js create mode 100644 src/lib/quickToolsOverlays.js create mode 100644 tests/helpers/loadSourceModule.js create mode 100644 tests/unit/fileSaveEvents.test.js create mode 100644 tests/unit/iconTooltips.test.js create mode 100644 tests/unit/pluginFileRestoration.test.js create mode 100644 tests/unit/quickToolsAdapter.test.js create mode 100644 tests/unit/quickToolsAdapterUi.test.js create mode 100644 tests/unit/quickToolsOverlays.test.js create mode 100644 tests/unit/saveCommands.test.js diff --git a/src/components/tabView.js b/src/components/tabView.js index 86131a2ee7..d8910990b7 100644 --- a/src/components/tabView.js +++ b/src/components/tabView.js @@ -35,7 +35,7 @@ export default function TabView({ id, disableSwipe = false }, children) { if (!activeRect.width) return; const targetLeft = activeRect.left - optionsRect.left; const targetWidth = activeRect.width; - const targetTransform = `translate3d(${targetLeft}px, 0, 0)`; + const targetTransform = `translateX(${targetLeft}px)`; $indicator.style.width = `${targetWidth}px`; if (document.body.classList.contains("no-animation")) { $indicator.style.transform = targetTransform; diff --git a/src/components/tooltip/index.js b/src/components/tooltip/index.js index 9366e6b6ae..a7bd558bfb 100644 --- a/src/components/tooltip/index.js +++ b/src/components/tooltip/index.js @@ -1,25 +1,45 @@ import "./style.scss"; import { animate } from "motion"; +import { installIconTooltips } from "./longPress"; let tooltip; let rafId = null; +let animation; +let icons; + +export function initIconTooltips() { + icons ||= installIconTooltips(document, showTooltip, hideTooltip); + return icons.dismiss; +} function createTooltip() { if (tooltip) return tooltip; tooltip = document.createElement("div"); tooltip.className = "acode-tooltip"; + tooltip.setAttribute("role", "tooltip"); document.body.appendChild(tooltip); return tooltip; } -export function showTooltip(target, text) { +export function showTooltip(target, text, description) { if (!target || !text) return; const $tooltip = createTooltip(); - $tooltip.textContent = text; + animation?.stop(); + $tooltip.replaceChildren(); + const label = document.createElement("div"); + label.textContent = text; + $tooltip.append(label); + if (description) { + const detail = document.createElement("div"); + detail.className = "acode-tooltip-description"; + detail.textContent = description; + $tooltip.append(detail); + } + $tooltip.removeAttribute("aria-hidden"); const rect = target.getBoundingClientRect(); @@ -27,18 +47,32 @@ export function showTooltip(target, text) { cancelAnimationFrame(rafId); } rafId = requestAnimationFrame(() => { + const viewport = window.visualViewport; + const x = viewport?.offsetLeft || 0, + y = viewport?.offsetTop || 0; + const visibleWidth = viewport?.width || window.innerWidth; + const visibleHeight = viewport?.height || window.innerHeight; + $tooltip.style.maxWidth = `${Math.max(0, visibleWidth - 16)}px`; + $tooltip.style.maxHeight = `${Math.max(0, visibleHeight - 16)}px`; const width = $tooltip.offsetWidth; const height = $tooltip.offsetHeight; const left = Math.max( - 8, + x + 8, Math.min( - window.innerWidth - width - 8, + x + visibleWidth - width - 8, rect.left + rect.width / 2 - width / 2, ), ); - const top = Math.max(8, rect.top - height - 10); + const above = rect.top - height - 10; + const top = Math.max( + y + 8, + Math.min( + y + visibleHeight - height - 8, + above >= y + 8 ? above : rect.bottom + 10, + ), + ); $tooltip.style.left = `${left}px`; $tooltip.style.top = `${top}px`; @@ -48,7 +82,7 @@ export function showTooltip(target, text) { rafId = null; return; } - animate( + animation = animate( $tooltip, { opacity: 1, @@ -64,6 +98,8 @@ export function showTooltip(target, text) { export function hideTooltip() { if (!tooltip) return; + animation?.stop(); + tooltip.setAttribute("aria-hidden", "true"); if (rafId !== null) { cancelAnimationFrame(rafId); @@ -74,7 +110,7 @@ export function hideTooltip() { tooltip.style.transform = "translateY(5px)"; return; } - animate( + animation = animate( tooltip, { opacity: 0, diff --git a/src/components/tooltip/longPress.js b/src/components/tooltip/longPress.js new file mode 100644 index 0000000000..805f221326 --- /dev/null +++ b/src/components/tooltip/longPress.js @@ -0,0 +1,126 @@ +/** One delegated listener set, including icon controls inside open ShadowRoots. */ +export function installIconTooltips(root, show, hide) { + let press, timer, suppressed, observer; + let shadowRoots = []; + const pointers = new Set(); + const labelOf = (node) => + ["data-label", "aria-label", "title"] + .map((name) => node.getAttribute(name)?.trim()) + .find(Boolean); + const targetOf = (event) => { + const path = event.composedPath(); + // Quicktools already own their tooltip, repeat and modifier gestures. + if (path.some((node) => node?.id === "quick-tools")) return; + return path.find( + (node) => + node?.matches?.("button, [role='button'], .icon") && labelOf(node), + ); + }; + function dismiss() { + clearTimeout(timer); + press = undefined; + observer?.disconnect(); + observer = undefined; + for (const shadow of shadowRoots) + shadow.removeEventListener("scroll", dismiss, true); + shadowRoots = []; + hide(); + } + function down(event) { + pointers.add(event.pointerId); + dismiss(); + suppressed = undefined; + if (pointers.size !== 1 || event.button !== 0) return; + const target = targetOf(event); + if (!target) return; + // Element scroll events do not cross a shadow boundary. + shadowRoots = event + .composedPath() + .filter((node) => node?.nodeType === 11 && node.host); + for (const shadow of shadowRoots) + shadow.addEventListener("scroll", dismiss, true); + press = { target, x: event.clientX, y: event.clientY, held: false }; + timer = setTimeout(() => { + if (!press || !target.isConnected) return; + press.held = true; + show(target, labelOf(target), target.dataset.description); + observer = new MutationObserver(() => { + if (!target.isConnected) dismiss(); + }); + // Also observe removal of the tab's host, including nested shadow hosts. + for (const boundary of [root, ...shadowRoots]) + observer.observe(boundary, { childList: true, subtree: true }); + }, 500); + } + function move(event) { + if ( + press && + Math.hypot(event.clientX - press.x, event.clientY - press.y) > 10 + ) + dismiss(); + } + function up(event) { + pointers.delete(event.pointerId); + clearTimeout(timer); + if (press?.held) + suppressed = { target: press.target, until: Date.now() + 750 }; + press = undefined; + } + function cancel(event) { + pointers.delete(event.pointerId); + dismiss(); + } + function click(event) { + if ( + event.detail && + suppressed && + suppressed.target === targetOf(event) && + Date.now() < suppressed.until + ) { + event.preventDefault(); + event.stopImmediatePropagation(); + } + suppressed = undefined; + } + function contextmenu(event) { + // A control's own menu wins over the shared tooltip. + if (event.defaultPrevented) { + dismiss(); + return; + } + if (press?.held && press.target === targetOf(event)) event.preventDefault(); + } + function reset() { + pointers.clear(); + suppressed = undefined; + dismiss(); + } + const events = { + pointerdown: down, + pointermove: move, + pointerup: up, + pointercancel: cancel, + click, + scroll: dismiss, + keydown: dismiss, + }; + for (const [name, handler] of Object.entries(events)) + root.addEventListener(name, handler, true); + root.addEventListener("contextmenu", contextmenu); + const viewport = root.defaultView?.visualViewport; + root.defaultView?.addEventListener("blur", reset); + viewport?.addEventListener("resize", dismiss); + viewport?.addEventListener("scroll", dismiss); + return { + dismiss: reset, + dispose() { + reset(); + for (const [name, handler] of Object.entries(events)) + root.removeEventListener(name, handler, true); + root.removeEventListener("contextmenu", contextmenu); + root.defaultView?.removeEventListener("blur", reset); + viewport?.removeEventListener("resize", dismiss); + viewport?.removeEventListener("scroll", dismiss); + }, + }; +} diff --git a/src/components/tooltip/style.scss b/src/components/tooltip/style.scss index 2436406dae..ffea0f7c1e 100644 --- a/src/components/tooltip/style.scss +++ b/src/components/tooltip/style.scss @@ -1,17 +1,23 @@ .acode-tooltip { position: fixed; - padding: 6px 10px; + padding: 8px 12px; background: var(--popup-background-color); color: var(--popup-text-color); - border: 1px solid var(--popup-border-color); - box-shadow: 0 0 4px var(--box-shadow-color); + border: 1px solid + color-mix(in srgb, var(--popup-text-color) 30%, var(--popup-background-color)); + box-shadow: 0 4px 12px var(--box-shadow-color); border-radius: var(--popup-border-radius); - font-size: 12px; + font-size: 13px; + font-weight: 500; - white-space: nowrap; + white-space: normal; + overflow-wrap: anywhere; + overflow: hidden; + box-sizing: border-box; + line-height: 1.4; pointer-events: none; @@ -21,4 +27,8 @@ z-index: 999999; } - +.acode-tooltip-description { + margin-top: 3px; + font-size: 12px; + font-weight: 400; +} diff --git a/src/fileSystem/index.js b/src/fileSystem/index.js index 7169afdec0..3adbadee71 100644 --- a/src/fileSystem/index.js +++ b/src/fileSystem/index.js @@ -7,6 +7,13 @@ import internalFs from "./internalFs"; import Sftp from "./sftp"; const fsList = []; +const registrationListeners = new Set(); + +// Internal notification; plugins keep using fsOperation.extend as before. +export function onProviderRegistered(listener) { + registrationListeners.add(listener); + return () => registrationListeners.delete(listener); +} /** * @typedef {Object} Stat @@ -61,8 +68,18 @@ export default function fsOperation(...url) { return fsList.find((fs) => fs.test(url))?.fs(url); } +// Check registration without constructing a transport or opening a file. +export function hasProvider(url) { + return fsList.some((fs) => fs.test(url)); +} + fsOperation.extend = (test, fs) => { fsList.push({ test, fs }); + for (const listener of registrationListeners) { + Promise.resolve() + .then(() => listener(test)) + .catch(console.error); + } }; fsOperation.remove = (test) => { diff --git a/src/handlers/quickTools.js b/src/handlers/quickTools.js index 00bcad9aa4..724ccbefa8 100644 --- a/src/handlers/quickTools.js +++ b/src/handlers/quickTools.js @@ -24,6 +24,7 @@ import { import { runQuickToolKey } from "cm/quickToolsNavigation"; import quickTools from "components/quickTools"; import actionStack from "lib/actionStack"; +import quickToolsAdapters from "lib/quickToolsAdapter"; import searchHistory from "lib/searchHistory"; import appSettings from "lib/settings"; import searchSettings from "settings/searchSettings"; @@ -50,6 +51,91 @@ let activeSearchState = null; let searchCloseVisibilityObserver = null; /** @type {import("./readOnlyQuickToolsCapture").ReadOnlyQuickToolsCaptureSession | null} */ let readOnlyCaptureSession = null; +let adapterCapture = null; + +function adapterAction(action, value) { + if (action === "insert") return { type: "text", text: String(value ?? "") }; + if (action === "key") { + const event = KeyboardEvent("keydown", getKeys({ keyCode: Number(value) })); + return { type: "key", key: event.key, ...getQuickToolsModifierSnapshot() }; + } + if (action === "command" || action === "search") + return { + type: "command", + command: action === "search" ? "find" : String(value), + }; + if (["shift", "ctrl", "alt", "meta"].includes(action)) + return { type: "modifier", key: action }; + return null; +} + +function finishAdapterCapture({ focus = true } = {}) { + const restoreFocus = + focus && + ((adapterCapture && !adapterCapture.consumed) || + document.activeElement === quickTools.$input); + // Blurring may emit composition events synchronously. Keep an inert guard + // for those events without leaving the hidden input as the typing target. + if (adapterCapture) adapterCapture.consumed = true; + clearQuickToolsModifierState(); + quickToolsAdapters.discardCapture(); + quickTools.$input.value = ""; + quickTools.$input.blur(); + if (restoreFocus) quickToolsAdapters.focus(); +} + +function handleAdapterCapture(event) { + if (!adapterCapture) return false; + if ( + adapterCapture.target !== editorManager.activeFile || + !quickToolsAdapters.has() + ) { + adapterCapture = null; + return true; + } + const result = captureReadOnlyQuickToolsKey(adapterCapture, { + type: event.type, + key: event.key, + data: event.data, + value: quickTools.$input.value, + inputType: event.inputType, + isComposing: event.isComposing, + }); + adapterCapture = result.session; + if (result.outcome.kind === "pass") { + if (event.type !== "keydown") return false; + if (["Shift", "Control", "Alt", "Meta", "Process"].includes(event.key)) + return true; + quickToolsAdapters.dispatch({ + type: "key", + key: event.key, + ...adapterCapture.modifiers, + }); + } else if (result.outcome.kind === "key") { + const modifiers = adapterCapture.modifiers; + const shiftOnly = + modifiers.shiftKey && + !modifiers.ctrlKey && + !modifiers.altKey && + !modifiers.metaKey; + quickToolsAdapters.dispatch({ + type: "key", + key: shiftOnly + ? mapQuickToolShiftText(result.outcome.key) + : result.outcome.key, + ...modifiers, + }); + } else { + if (result.outcome.kind === "duplicate") { + quickTools.$input.value = ""; + event.preventDefault(); + } + return true; + } + event.preventDefault(); + finishAdapterCapture(); + return true; +} const state = { shift: false, @@ -73,14 +159,17 @@ setQuickToolsModifierInputHandler(handleCodeMirrorQuickToolsTextInput); */ quickTools.$input.addEventListener("beforeinput", (event) => { + if (handleAdapterCapture(event)) return; handleReadOnlyQuickToolsCaptureEvent(event); }); quickTools.$input.addEventListener("compositionend", (event) => { + if (handleAdapterCapture(event)) return; handleReadOnlyQuickToolsCaptureEvent(event); }); quickTools.$input.addEventListener("input", (e) => { + if (handleAdapterCapture(e)) return; if (handleReadOnlyQuickToolsCaptureEvent(e)) return; const key = e.target.value.toUpperCase(); quickTools.$input.value = ""; @@ -113,6 +202,7 @@ quickTools.$input.addEventListener("input", (e) => { }); quickTools.$input.addEventListener("keydown", (e) => { + if (handleAdapterCapture(e)) return; if (handleReadOnlyQuickToolsCaptureEvent(e)) return; const { keyCode, key, which } = e; const keyCombination = getKeys({ keyCode, key, which }); @@ -268,7 +358,11 @@ export function clearQuickToolsModifierState({ restoreFocus = false } = {}) { return changed; } -export function cancelQuickToolsModifierInput() { +export function cancelQuickToolsModifierInput({ + preserveCapture = false, +} = {}) { + adapterCapture = null; + if (!preserveCapture) quickToolsAdapters.discardCapture(); clearReadOnlyCaptureSession(); const changed = clearQuickToolsModifierState(); quickTools.$input.value = ""; @@ -290,6 +384,48 @@ export default function actions(action, value) { const { editor } = editorManager; const { $input, $replaceInput } = quickTools; + const routed = quickToolsAdapters.has() && adapterAction(action, value); + if (routed) { + if ( + routed.type === "command" && + [ + "saveFile", + "saveFileAs", + "saveAllChanges", + "openCommandPalette", + ].includes(routed.command) + ) { + finishAdapterCapture({ focus: false }); + return executeCommand(routed.command, editor); + } + if (!quickToolsAdapters.available(routed)) { + if (!Object.values(state).some(Boolean)) + quickToolsAdapters.discardCapture(); + return false; + } + if (routed.type === "modifier") { + quickToolsAdapters.capture(); + state[action] = !state[action]; + events[action].forEach((cb) => cb(state[action])); + if (Object.values(state).some(Boolean)) { + adapterCapture = { + target: editorManager.activeFile, + modifiers: getQuickToolsModifierSnapshot(), + consumed: false, + }; + $input.value = ""; + $input.focus(); + } else { + cancelQuickToolsModifierInput(); + quickToolsAdapters.focus(); + } + return state[action]; + } + const handled = quickToolsAdapters.dispatch(routed); + if (routed.type !== "key" || !routed.key.startsWith("Arrow")) + finishAdapterCapture(); + return handled; + } if (Object.keys(state).includes(action)) { setInput(); @@ -736,7 +872,7 @@ function setHeight(height = 1, save = true) { const { editor, activeFile } = editorManager; // If active file has hideQuickTools, force height to 0 and don't save - if (activeFile?.hideQuickTools) { + if (!quickToolsAdapters.visible(activeFile)) { height = 0; save = false; } @@ -937,6 +1073,10 @@ function getFooterHeight() { } function focusEditor() { + if (quickToolsAdapters.has()) { + quickToolsAdapters.focus(); + return; + } const { editor, activeFile } = editorManager; if (!activeFile?.focused) { return; @@ -1047,6 +1187,10 @@ function dismissReadOnlyQuickToolsInput(view) { } function restoreQuickToolsTargetFocus() { + if (quickToolsAdapters.has()) { + quickToolsAdapters.focus(); + return; + } const codeMirrorView = getCodeMirrorInputView(input); if (codeMirrorView) { if (dismissReadOnlyQuickToolsInput(codeMirrorView)) return; diff --git a/src/handlers/quickToolsInit.js b/src/handlers/quickToolsInit.js index 330cd7d197..1df5f75512 100644 --- a/src/handlers/quickToolsInit.js +++ b/src/handlers/quickToolsInit.js @@ -4,6 +4,9 @@ import quickTools from "components/quickTools"; import { description } from "components/quickTools/items"; import { hideTooltip, showTooltip } from "components/tooltip"; import config from "lib/config"; +import { syncQuickToolsVisibility } from "lib/editorFile"; +import quickToolsAdapters from "lib/quickToolsAdapter"; +import { watchQuickToolsOverlays } from "lib/quickToolsOverlays"; import appSettings from "lib/settings"; import actions, { cancelQuickToolsModifierInput, key } from "./quickTools"; @@ -50,12 +53,64 @@ function clearTouchFeedback() { } } +function discardAdapterCapture() { + // Modifier sequences keep their selection until a key is dispatched. + if (!key.shift && !key.ctrl && !key.alt && !key.meta) + quickToolsAdapters.discardCapture(); +} + /** * Initialize quick tools * @param {HTMLElement} $footer */ export default function init() { const { $footer, $toggler, $input } = quickTools; + let adapterWasActive = false, + visible; + const refreshAdapter = () => { + const hasAdapter = quickToolsAdapters.has(); + if (!hasAdapter && !adapterWasActive) { + visible = undefined; + return; + } + adapterWasActive = hasAdapter; + const nextVisible = quickToolsAdapters.visible(); + if (visible !== nextVisible) { + visible = nextVisible; + syncQuickToolsVisibility(editorManager.activeFile); + } + updateHistoryButtons(); + }; + const clearAdapterInput = ({ preserveCapture = false } = {}) => { + clearTimeout(timeout); + touchcancel(undefined, { preserveCapture }); + reset(); + cancelQuickToolsModifierInput({ preserveCapture }); + }; + quickToolsAdapters.subscribe((change) => { + if (change?.cancelled && change.tab === editorManager.activeFile) + clearAdapterInput(); + refreshAdapter(); + }); + watchQuickToolsOverlays(quickToolsAdapters, clearAdapterInput); + const capture = () => { + discardAdapterCapture(); + quickToolsAdapters.capture(); + }; + $footer.addEventListener("pointerdown", capture, true); + $footer.addEventListener("keydown", capture, true); + $footer.addEventListener("pointercancel", discardAdapterCapture, true); + $footer.addEventListener("scroll", discardAdapterCapture, true); + const leaveQuickTools = (event) => { + if (!quickToolsAdapters.has()) return; + const path = event.composedPath(); + if (path.includes($footer) || path.includes($input)) return; + quickToolsAdapters.discardCapture(); + if (key.shift || key.ctrl || key.alt || key.meta) + cancelQuickToolsModifierInput(); + }; + document.addEventListener("pointerdown", leaveQuickTools, true); + document.addEventListener("focusin", leaveQuickTools, true); $toggler.addEventListener("click", (e) => { e.preventDefault(); @@ -102,7 +157,14 @@ export default function init() { }); editorManager.on("editor-state-changed", updateHistoryButtons); - editorManager.on("switch-file", cancelQuickToolsModifierInput); + editorManager.on("switch-file", () => { + // activeFile already points to the incoming tab. Only sync cancels the + // outgoing adapter; UI cleanup must preserve the incoming selection. + if (adapterWasActive || quickToolsAdapters.has()) + clearAdapterInput({ preserveCapture: true }); + else cancelQuickToolsModifierInput(); + quickToolsAdapters.sync(); + }); appSettings.on("update:quicktoolsItems:after", () => { setTimeout(updateHistoryButtons, 100); @@ -147,6 +209,7 @@ export default function init() { function onwheel(e) { e.preventDefault(); + discardAdapterCapture(); const $el = e.target; const { $row1, $row2 } = quickTools; let $row; @@ -166,6 +229,7 @@ function onclick(e) { reset(); if (e.target.disabled) { + discardAdapterCapture(); e.preventDefault(); e.stopPropagation(); return; @@ -302,11 +366,10 @@ function touchend(e) { } $row.scrollLeft = scroll; - touchcancel(e); - - if ($el === $touchstart && performance.now() - startTime < 100) { - click($el); - } + const shouldClick = + $el === $touchstart && performance.now() - startTime < 100; + touchcancel(e, { preserveCapture: shouldClick }); + if (shouldClick) click($el); return; } @@ -315,7 +378,7 @@ function touchend(e) { return; } - touchcancel(e); + touchcancel(e, { preserveCapture: true }); click($el); } @@ -323,7 +386,7 @@ function touchend(e) { * * @param {TouchEvent} e */ -function touchcancel(e) { +function touchcancel(e, { preserveCapture = false } = {}) { document.removeEventListener("keyup", touchcancel); document.removeEventListener("touchend", touchend); document.removeEventListener("touchcancel", touchcancel); @@ -332,6 +395,7 @@ function touchcancel(e) { clearTimeout(contextmenuTimeout); clearTouchFeedback(); hideTooltip(); + if (!preserveCapture) discardAdapterCapture(); } /** @@ -361,7 +425,7 @@ function oncontextmenu(e) { timeout = setTimeout(dispatchEventWithTimeout, time); }; - if (activeFile.focused) { + if (activeFile.focused && !quickToolsAdapters.has()) { focusEditorIfEditable(editor); } dispatchEventWithTimeout(); @@ -372,7 +436,10 @@ function oncontextmenu(e) { * @param {HTMLElement} $el */ function click($el) { - if ($el.disabled) return; + if ($el.disabled) { + discardAdapterCapture(); + return; + } $el.classList.add("click"); clearTimeout($el.dataset.timeout); @@ -385,7 +452,10 @@ function click($el) { } const { action } = $el.dataset; - if (!action) return; + if (!action) { + discardAdapterCapture(); + return; + } let { value } = $el.dataset; @@ -393,7 +463,11 @@ function click($el) { value = $el.value; } - actions(action, value); + try { + actions(action, value); + } finally { + discardAdapterCapture(); + } } function scheduleUpdateQuickToolsState() { @@ -413,6 +487,15 @@ function updateQuickToolsState() { } function updateHistoryButtons() { + if (quickToolsAdapters.has()) { + for (const command of ["undo", "redo"]) { + updateHistoryButton( + command, + !quickToolsAdapters.available({ type: "command", command }), + ); + } + return; + } const { editor, activeFile } = editorManager; const disabled = !editor || activeFile?.type !== "editor"; diff --git a/src/lib/acode.js b/src/lib/acode.js index e5d57e2bdb..f36c7401ac 100644 --- a/src/lib/acode.js +++ b/src/lib/acode.js @@ -85,6 +85,7 @@ import helpers from "utils/helpers"; import KeyboardEvent from "utils/keyboardEvent"; import Url from "utils/Url"; import config from "./config"; +import quickToolsAdapters from "./quickToolsAdapter"; import webview from "./webview"; class Acode { @@ -1036,6 +1037,11 @@ class Acode { return command; } + /** Register input, selection and availability handlers for one custom tab. */ + registerQuickToolsAdapter(tab, adapter) { + return quickToolsAdapters.register(tab, adapter); + } + removeCommand(name) { if (!name) return; removeExternalCommand(name); diff --git a/src/lib/checkFiles.js b/src/lib/checkFiles.js index 6044498b21..93751f1ee9 100644 --- a/src/lib/checkFiles.js +++ b/src/lib/checkFiles.js @@ -26,19 +26,12 @@ export default async function checkFiles() { /** @type {{ editor: import('@codemirror/view').EditorView }} */ const { editor } = editorManager; - recursiveFileCheck([...files]); - - /** - * Checks if the file has been changed - * @param {EditorFile[]} files List of files to check - */ - async function recursiveFileCheck(files) { - const file = files.pop(); - await checkFile(file); - if (files.length) { - recursiveFileCheck(files); + for (const file of [...files].reverse()) { + try { + await checkFile(file); + } catch (error) { + console.warn("Failed to check file", error); } - return; } /** @@ -51,11 +44,14 @@ export default async function checkFiles() { * @returns {Promise} */ async function checkFile(file) { - if (file === undefined || !file.loaded || file.loading) return; + if (file?.type !== "editor" || !file.tab || !file.loaded || file.loading) + return; if (file.uri) { const fs = fsOperation(file.uri); - const exists = await fs.exists(); + if (!fs) return; + const exists = fs.exists ? await fs.exists() : true; + if (!file.tab) return; if (!exists && !file.readOnly) { file.isUnsaved = true; @@ -74,7 +70,8 @@ export default async function checkFiles() { let mtime = null; if (file.hasVersionMetadata && file.savedMtime != null) { - const stat = await fs.stat().catch(() => null); + const stat = await fs.stat?.().catch(() => null); + if (!file.tab) return; mtime = helpers.getStatMtime(stat); if (mtime != null) { if (mtime === file.savedMtime) return; @@ -104,6 +101,7 @@ export default async function checkFiles() { if (file.isUnsaved) return; const text = await fs.readFile(file.encoding); + if (!file.tab) return; const diskDoc = Text.of(String(text ?? "").split("\n")); const currentDoc = file.session?.doc; @@ -114,7 +112,7 @@ export default async function checkFiles() { file.filename + strings["file changed"], ); - if (!confirmation) return; + if (!confirmation || !file.tab) return; const cursorPos = editor.getCursorPosition(); editorManager.getFile(file.id, "id")?.makeActive(); @@ -126,7 +124,7 @@ export default async function checkFiles() { } finally { file.markChanged = true; } - await file.writeToCache(); + await file.flushCacheWrite(); editor.gotoLine(cursorPos.row, cursorPos.column); } catch (error) { // ignore diff --git a/src/lib/commands.js b/src/lib/commands.js index 7d7082d042..de3a005a8e 100644 --- a/src/lib/commands.js +++ b/src/lib/commands.js @@ -78,7 +78,8 @@ function resolveExactFile(referenceFile) { export function canSaveFile(file = editorManager.activeFile) { return ( - file?.type === "editor" && + (file?.type === "editor" || file?.canSave === true) && + file.canSave !== false && typeof file.save === "function" && typeof file.saveAs === "function" ); @@ -138,15 +139,22 @@ async function closeTabs(files, options = {}) { } } + let complete = true; for (const file of [...closableFiles]) { - if (save) { - await file.save(); + if (save && file.isUnsaved) { + if (!canSaveFile(file)) { + complete = false; + continue; + } + const saved = await file.save(); + if (saved === false || file.hasUnsavedChanges?.() || file.isUnsaved) + return false; } await file.remove(true, { silentPinned: true }); } - return true; + return complete; } export default { @@ -157,7 +165,7 @@ export default { await runAllTests(); }, async "close-all-tabs"() { - await closeTabs(editorManager.files); + return closeTabs(editorManager.files); }, /** * Close every tab shown in the same tab group (pane tab bar) as the @@ -183,19 +191,19 @@ export default { return closeTabs(files); }, async "close-tabs-to-left"(referenceFile) { - await closeTabs( + return closeTabs( getTabsRelativeToFile("left", referenceFile), getTabCloseSelectionOptions(), ); }, async "close-tabs-to-right"(referenceFile) { - await closeTabs( + return closeTabs( getTabsRelativeToFile("right", referenceFile), getTabCloseSelectionOptions(), ); }, async "close-other-tabs"(referenceFile) { - await closeTabs( + return closeTabs( getTabsRelativeToFile("others", referenceFile), getTabCloseSelectionOptions(), ); @@ -206,10 +214,18 @@ export default { strings["save all changes warning"], ); if (!doSave) return; - editorManager.files.forEach((file) => { - file.save(); - file.isUnsaved = false; - }); + let complete = true; + for (const file of [...editorManager.files]) { + if (!file.isUnsaved) continue; + if (!canSaveFile(file)) { + complete = false; + continue; + } + const saved = await file.save(); + if (saved === false || file.hasUnsavedChanges?.() || file.isUnsaved) + return false; + } + return complete; }, "close-current-tab"() { editorManager.activeFile?.remove(); @@ -493,8 +509,8 @@ export default { try { const { activeFile } = editorManager; if (!canSaveFile(activeFile)) return; - await activeFile.save(); - if (showToast) { + const saved = await activeFile.save(); + if (showToast && saved === true) { toast(strings["file saved"]); } } catch (error) { @@ -505,8 +521,8 @@ export default { try { const { activeFile } = editorManager; if (!canSaveFile(activeFile)) return; - await activeFile.saveAs(); - if (showToast) { + const saved = await activeFile.saveAs(); + if (showToast && saved === true) { toast(strings["file saved"]); } } catch (error) { diff --git a/src/lib/editorFile.js b/src/lib/editorFile.js index f5074fa687..03a8c3ba0e 100644 --- a/src/lib/editorFile.js +++ b/src/lib/editorFile.js @@ -1,4 +1,4 @@ -import fsOperation from "fileSystem"; +import fsOperation, { hasProvider } from "fileSystem"; // CodeMirror imports for document state management import { EditorSelection, EditorState } from "@codemirror/state"; import { @@ -17,6 +17,7 @@ import startDrag from "handlers/editorFileTab"; import actions from "handlers/quickTools"; import { openTabContextMenuOnRelease } from "handlers/tabContextMenu"; import tag from "html-tag-js"; +import quickToolsAdapters from "lib/quickToolsAdapter"; import mimeTypes from "mime-types"; import { applyHighlightStyles } from "utils/codeHighlight"; import helpers from "utils/helpers"; @@ -31,6 +32,8 @@ import saveFile from "./saveFile"; import appSettings from "./settings"; let mainCSSStyleSheet = null; +// Internal save origin; plugin save events keep their existing shape. +export const AUTO_SAVE = Symbol("auto-save"); function restoreSessionSelection(state, selection) { if (!selection?.ranges?.length) return state; @@ -61,9 +64,9 @@ function getMainCSSStyleSheet() { return null; } -function syncQuickToolsVisibility(file) { +export function syncQuickToolsVisibility(file) { const { $toggler } = quickTools; - const hideForFile = !!file?.hideQuickTools; + const hideForFile = !quickToolsAdapters.visible(file); clearTimeout($toggler._hideTimeout); if (hideForFile || !appSettings.value.floatingButton) { @@ -461,6 +464,7 @@ export default class EditorFile { */ #loadOptions; #loadPromise = null; + #pendingSave = null; /** * Weather file is changed and needs to be saved * @type {boolean} @@ -469,6 +473,7 @@ export default class EditorFile { #hasVersionMetadata = false; #cacheWriteTimer = null; #cacheWritePromise = null; + #hasCache = false; #savedDoc = null; /** * Whether to show run button or not @@ -772,6 +777,7 @@ export default class EditorFile { } if (options?.render ?? true) this.render(); + if (this.loaded) void this.scheduleCacheWrite(0); } get type() { @@ -1099,7 +1105,7 @@ export default class EditorFile { const normalizedMtime = helpers.normalizeMtime(mtime); this.docVersion = isUnsaved ? 1 : 0; this.savedVersion = isUnsaved ? 0 : this.docVersion; - this.cacheVersion = isUnsaved ? this.docVersion : this.savedVersion; + this.cacheVersion = -1; this.savedMtime = normalizedMtime; this.diskMtime = normalizedMtime; this.hasDiskConflict = false; @@ -1152,43 +1158,40 @@ export default class EditorFile { } scheduleCacheWrite(delay = 1500) { - if (this.type !== "editor") return Promise.resolve(); - if (this.cacheVersion === this.docVersion && this.#hasVersionMetadata) { + if ( + this.type !== "editor" || + this.id === config.DEFAULT_FILE_SESSION || + !this.canSave + ) + return Promise.resolve(); + if (this.#hasCache && this.cacheVersion === this.docVersion) { return this.#cacheWritePromise || Promise.resolve(); } if (this.#cacheWriteTimer) clearTimeout(this.#cacheWriteTimer); - if (delay <= 0) { - this.#cacheWriteTimer = null; - this.#cacheWritePromise = this.writeToCache().finally(() => { - this.#cacheWritePromise = null; - }); - return this.#cacheWritePromise; - } + if (delay <= 0) return this.flushCacheWrite(); this.#cacheWriteTimer = setTimeout(() => { this.#cacheWriteTimer = null; - this.#cacheWritePromise = this.writeToCache().finally(() => { - this.#cacheWritePromise = null; - }); + void this.flushCacheWrite(); }, delay); return Promise.resolve(); } async flushCacheWrite() { + if ( + this.type !== "editor" || + this.id === config.DEFAULT_FILE_SESSION || + !this.canSave + ) + return; if (this.#cacheWriteTimer) { clearTimeout(this.#cacheWriteTimer); this.#cacheWriteTimer = null; - if (!this.#cacheWritePromise) { - this.#cacheWritePromise = this.writeToCache().finally(() => { - this.#cacheWritePromise = null; - }); - } } - if (this.#cacheWritePromise) await this.#cacheWritePromise; - if (this.cacheVersion !== this.docVersion) { - if (this.#cacheWriteTimer) { - clearTimeout(this.#cacheWriteTimer); - this.#cacheWriteTimer = null; - } + if (this.#cacheWritePromise) { + await this.#cacheWritePromise; + return this.flushCacheWrite(); + } + if (!this.#hasCache || this.cacheVersion !== this.docVersion) { this.#cacheWritePromise = this.writeToCache().finally(() => { this.#cacheWritePromise = null; }); @@ -1197,20 +1200,22 @@ export default class EditorFile { } async writeToCache() { + // A tab switch can flush a restored tab before its document is ready. + if (!this.loaded || this.loading || !this.#tab) return; const writeVersion = this.docVersion; const text = getDocText(this.session.doc); - const fs = fsOperation(this.cacheFile); try { - if (!(await fs.exists())) { + const fs = fsOperation(this.cacheFile); + const exists = await fs.exists(); + if (!this.#tab) return; + if (!exists) { await fsOperation(CACHE_STORAGE).createFile(this.id, text); - this.cacheVersion = writeVersion; - this.#hasVersionMetadata = true; - if (this.docVersion !== writeVersion) this.scheduleCacheWrite(); - return; + } else { + await fs.writeFile(text); } - - await fs.writeFile(text); + if (!this.#tab) return; + this.#hasCache = true; this.cacheVersion = writeVersion; this.#hasVersionMetadata = true; if (this.docVersion !== writeVersion) this.scheduleCacheWrite(); @@ -1440,9 +1445,8 @@ export default class EditorFile { * Saves the file. * @returns {Promise} true if file is saved, false if not. */ - save() { - if (this.type !== "editor") return Promise.resolve(false); - return this.#save(false); + save(origin) { + return this.#save(false, origin === AUTO_SAVE); } /** @@ -1450,10 +1454,20 @@ export default class EditorFile { * @returns {Promise} true if file is saved, false if not. */ saveAs() { - if (this.type !== "editor") return Promise.resolve(false); return this.#save(true); } + /** Custom tabs opt into the standard save controls through their save event. */ + get canSave() { + return ( + !!this.#tab && + (this.type !== "editor" || (this.loaded && !this.loading)) && + (this.type === "editor" || + typeof this.onsave === "function" || + this.#events.save.length > 0) + ); + } + setReadOnly(value) { const readOnly = !!value; this.readOnly = readOnly; @@ -1473,7 +1487,7 @@ export default class EditorFile { reconfigureEditorReadOnly( targetEditor, readOnlyCompartment, - readOnly, + readOnly || !this.loaded || this.loading, ); } } @@ -1681,7 +1695,8 @@ export default class EditorFile { * Reuses an in-flight load so session restoration can safely preload tabs. */ load() { - if (this.type !== "editor" || this.loaded) return Promise.resolve(this); + if (this.type !== "editor" || this.loaded || !this.#tab) + return Promise.resolve(this); if (this.#loadPromise) return this.#loadPromise; this.#loadPromise = this.#loadText().finally(() => { @@ -1829,28 +1844,32 @@ export default class EditorFile { if (this.#type !== "editor") return; let value = ""; const protocol = this.uri ? Url.getProtocol(this.uri) : ""; - const isRemoteFile = protocol === "ftp:" || protocol === "sftp:"; - + const isTransportFile = protocol === "ftp:" || protocol === "sftp:"; const { cursorPos, editable } = this.#loadOptions; - - this.#loadOptions = null; - - if (!editable) { - this.setReadOnly(true); - } - this.loading = true; - this.markChanged = false; - if (isRemoteFile) this.#setRemoteLoading(true); - this.#emit("loadstart", createFileEvent(this)); + let started = false; try { const cacheFs = fsOperation(this.cacheFile); + const cacheExists = await cacheFs.exists(); + if (!this.#tab) return; + if (cacheExists) value = await cacheFs.readFile("utf-8"); + if (!this.#tab) return; + this.#hasCache = cacheExists; + + // An uncached tab stays idle until its filesystem registers. + if (!cacheExists && this.uri && !hasProvider(this.uri)) return; + + started = true; + this.loading = true; + this.markChanged = false; + this.#setRemoteLoading(true); + this.#emit("loadstart", createFileEvent(this)); + if (!this.#tab) return; let file = null; - let cacheExists; let loadedMtime = this.savedMtime; let savedDoc = null; - if (isRemoteFile) { + if (!cacheExists && isTransportFile) { file = fsOperation(this.uri); let transportCache = null; try { @@ -1867,40 +1886,32 @@ export default class EditorFile { transportCache, encoding: this.encoding, }); - cacheExists = preview.editorCacheExists; - if (cacheExists) value = preview.text; + if (!this.#tab) return; if (preview.text !== null) { - this.session = EditorState.create({ doc: preview.text }); editorManager.emit("file-loading-preview", this, preview.text); } - } else { - cacheExists = await cacheFs.exists(); - if (cacheExists) { - value = await cacheFs.readFile(this.encoding); - } } - if (this.uri) { + if (!this.#tab) return; + if (!cacheExists && this.uri) { file ||= fsOperation(this.uri); - const fileExists = await file.exists(); - if (!fileExists && cacheExists) { - this.deletedFile = true; - this.isUnsaved = true; - } else if (fileExists) { - const stat = await file.stat().catch(() => null); + const fileExists = file.exists ? await file.exists() : true; + if (!this.#tab) return; + if (fileExists) { + const stat = await file.stat?.().catch(() => null); + if (!this.#tab) return; loadedMtime = helpers.getStatMtime(stat); const diskValue = await file.readFile(this.encoding); savedDoc = EditorState.create({ doc: diskValue }).doc; - if (!cacheExists) { - value = diskValue; - } - } else if (!cacheExists && !fileExists) { + value = diskValue; + } else { window.log("error", "unable to load file"); throw new Error("Unable to load file"); } } + if (!this.#tab) return; const isUnsaved = this.isUnsaved; this.markChanged = false; this.session = restoreSessionSelection( @@ -1911,10 +1922,17 @@ export default class EditorFile { this.__cmSessionReady = false; this.__cmLanguageReady = false; this.__cmLanguageSignature = null; - this.markLoaded({ mtime: loadedMtime, isUnsaved, savedDoc }); + if (cacheExists) { + // Recovery data is the document, not a newly verified disk snapshot. + this.#savedDoc = isUnsaved ? null : this.#rawSession.doc; + } else { + this.markLoaded({ mtime: loadedMtime, isUnsaved, savedDoc }); + } + this.#loadOptions = null; this.markChanged = true; this.loaded = true; this.loading = false; + if (!cacheExists) void this.scheduleCacheWrite(0); const { activeFile, emit } = editorManager; const pane = editorManager.getFilePane?.(this); @@ -1925,17 +1943,21 @@ export default class EditorFile { } setTimeout(() => { - this.#emit("load", createFileEvent(this)); + if (this.#tab) this.#emit("load", createFileEvent(this)); }, 0); } catch (error) { + if (!this.#tab) return; this.#emit("loaderror", createFileEvent(this)); this.remove(false, { ignorePinned: true }); toast(`Unable to load: ${this.filename}`); window.log("error", "Unable to load: " + this.filename); window.log("error", error); } finally { - if (isRemoteFile) this.#setRemoteLoading(false); - this.#emit("loadend", createFileEvent(this)); + this.loading = false; + if (started && this.#tab) { + this.#setRemoteLoading(false); + this.#emit("loadend", createFileEvent(this)); + } } } @@ -1963,12 +1985,43 @@ export default class EditorFile { // editorManager.editor._emit("scrollleft", e); // } - #save(as) { - const event = createFileEvent(this); - this.#emit("save", event); + #save(as, automatic = false) { + if (!this.canSave) return Promise.resolve(false); + if (this.#pendingSave) return this.#pendingSave; + // Set the promise before dispatch so re-entrant requests also share it. + this.#pendingSave = Promise.resolve() + .then(() => (this.canSave ? this.#dispatchSave(as, automatic) : false)) + .finally(() => { + this.#pendingSave = null; + }); + return this.#pendingSave; + } - if (event.defaultPrevented) return Promise.resolve(false); - return Promise.all([this.flushCacheWrite(), saveFile(this, as)]); + #dispatchSave(as, automatic) { + const event = new SaveFileEvent(this, as); + try { + this.#emit("save", event); + } catch (error) { + // A later observer can fail after a handler has supplied a promise. + event.response?.catch(() => {}); + return Promise.reject(error); + } finally { + event.finishDispatch(); + } + if (event.response) + return event.response.then((saved) => { + if (!saved || !this.#tab) return false; + editorManager.onupdate("save-file"); + editorManager.emit("update", "save-file"); + editorManager.emit("save-file", this); + return true; + }); + if (event.defaultPrevented || this.type !== "editor") + return Promise.resolve(false); + return Promise.all([ + this.flushCacheWrite(), + saveFile(this, as, { automatic, savedDoc: this.#savedDoc }), + ]).then(([, saved]) => saved === true); } #run(file) { @@ -2012,10 +2065,11 @@ export default class EditorFile { clearTimeout(this.#cacheWriteTimer); this.#cacheWriteTimer = null; } - this.#cacheWritePromise = null; this.#savedDoc = null; if (this.type === "editor") { - this.#removeCache(); + void Promise.resolve(this.#cacheWritePromise).then(() => + this.#removeCache(), + ); // CodeMirror EditorState doesn't need explicit cleanup this.session = null; } else if (this.content) { @@ -2128,3 +2182,26 @@ class FileEvent { return this.#defaultPrevented; } } + +class SaveFileEvent extends FileEvent { + #dispatching = true; + #response; + saveAs; + constructor(file, saveAs) { + super(file); + this.saveAs = saveAs; + } + /** Claim this save synchronously; resolve true only after a successful write. */ + respondWith(result) { + if (!this.#dispatching || this.#response) + throw new Error("respondWith must be called once during the save event."); + this.preventDefault(); + this.#response = Promise.resolve(result).then((saved) => saved === true); + } + get response() { + return this.#response; + } + finishDispatch() { + this.#dispatching = false; + } +} diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js index 1bf1b1b789..ea2b573299 100644 --- a/src/lib/editorManager.js +++ b/src/lib/editorManager.js @@ -68,6 +68,7 @@ import { } from "cm/modelist"; import createTouchSelectionMenu from "cm/touchSelectionMenu"; import "cm/supportedModes"; +import { onProviderRegistered } from "fileSystem"; import { autocompletion } from "@codemirror/autocomplete"; import { serverCompletionSource } from "@codemirror/lsp-client"; import colorView from "cm/colorView"; @@ -97,7 +98,7 @@ import SideButton, { sideButtonContainer } from "components/sideButton"; import keyboardHandler, { keydownState } from "handlers/keyboard"; import { animate } from "motion"; import config from "./config"; -import EditorFile from "./editorFile"; +import EditorFile, { AUTO_SAVE } from "./editorFile"; import openFile from "./openFile"; import { addedFolder } from "./openFolder"; import appSettings from "./settings"; @@ -141,6 +142,8 @@ async function EditorManager($header, $body) { const PANE_SPLIT_VERTICAL = "vertical"; const docSyncTimers = new WeakMap(); + // Preview text belongs to the loading view, not the file's saved session. + const loadingPreviews = new WeakMap(); let touchSelectionController = null; let touchSelectionSyncRaf = 0; let nativeContextMenuDisabled = null; @@ -1403,6 +1406,7 @@ async function EditorManager($header, $body) { async function configureLspForFile(file) { const pane = getFileLspPane(file); if (!pane?.editor || pane.activeFile?.id !== file?.id) return; + if (!file.loaded || file.loading) return; const targetEditor = pane.editor; const metadata = buildLspMetadata(file, targetEditor); const token = ++pane.lspRequestToken; @@ -2824,16 +2828,18 @@ async function EditorManager($header, $body) { } } - function showLoadingEditor(file, text = "") { + function showLoadingEditor(file, text = loadingPreviews.get(file)) { const loadingState = EditorState.create({ - doc: text, + doc: text ?? "", extensions: [ themeCompartment.of(getConfiguredThemeExtension()), ...getBaseExtensionsFromOptions(), languageCompartment.of([]), lspCompartment.of([]), readOnlyCompartment.of(createEditorReadOnlyExtension(true)), - placeholder(`Loading ${file.filename || "file"}...`), + ...(text === undefined + ? [placeholder(`Loading ${file.filename || "file"}...`)] + : []), ], }); editor.setState(loadingState); @@ -2890,6 +2896,11 @@ async function EditorManager($header, $body) { // Helper: apply a file's content and language to the editor view function applyFileToEditor(file, options = {}) { if (!file || file.type !== "editor") return; + if (!file.loaded || file.loading) { + showLoadingEditor(file); + return; + } + loadingPreviews.delete(file); const { forceRecreate = false, restoreScroll = true, @@ -3289,7 +3300,7 @@ async function EditorManager($header, $body) { diagnosticsButtonSyncRaf = requestAnimationFrame(() => { diagnosticsButtonSyncRaf = 0; const active = manager.activeFile; - if (active?.type === "editor") { + if (active?.type === "editor" && active.loaded && !active.loading) { active.session = editor.state; } toggleProblemButton(); @@ -3441,7 +3452,7 @@ async function EditorManager($header, $body) { function recreateActiveEditorState() { const file = manager.activeFile; - if (file?.type !== "editor") return; + if (file?.type !== "editor" || !file.loaded || file.loading) return; file.session = editor.state; file.lastScrollTop = editor.scrollDOM?.scrollTop ?? 0; @@ -3695,7 +3706,7 @@ async function EditorManager($header, $body) { if (file.uri && file.isUnsaved && autosave) { timers.autosaveTimeout = setTimeout(() => { timers.autosaveTimeout = null; - file.save()?.catch?.((error) => { + file.save(AUTO_SAVE)?.catch?.((error) => { warnRecoverable( `Failed to autosave ${file.filename || file.uri}`, error, @@ -3711,6 +3722,20 @@ async function EditorManager($header, $body) { } // Register critical listeners + onProviderRegistered((test) => { + for (const file of manager.files) { + if ( + file.type === "editor" && + file.tab && + !file.loaded && + file.uri && + test(file.uri) + ) { + void file.load().catch(console.error); + } + } + }); + manager.on(["file-loaded"], (file) => { if (!file || file.type !== "editor") return; const pane = getFilePane(file); @@ -3722,7 +3747,8 @@ async function EditorManager($header, $body) { }); manager.on(["file-loading-preview"], (file, text) => { - if (!file || file.type !== "editor" || !file.loading) return; + if (!file || file.type !== "editor" || !file.loading || !file.tab) return; + loadingPreviews.set(file, text); const pane = getFilePane(file); if (!pane?.editor || pane.activeFile?.id !== file.id) return; @@ -3742,7 +3768,7 @@ async function EditorManager($header, $body) { const file = manager.activeFile; if (file?.type !== "editor") return; try { - const ro = !file.editable || !!file.loading; + const ro = !file.editable || !file.loaded || file.loading; reconfigureEditorReadOnly(editor, readOnlyCompartment, ro); touchSelectionController?.onStateChanged(); } catch (error) { @@ -3757,6 +3783,7 @@ async function EditorManager($header, $body) { }); manager.on(["remove-file"], (file) => { + loadingPreviews.delete(file); removeFileFromHistory(file); clearDocSyncTimers(file); detachLspForFile(file); @@ -4139,7 +4166,12 @@ async function EditorManager($header, $body) { return true; } - if (sourcePane?.activeFile?.id === file.id && file.type === "editor") { + if ( + sourcePane?.activeFile?.id === file.id && + file.type === "editor" && + file.loaded && + !file.loading + ) { const sourceEditor = sourcePane.editor; file.session = getRawEditorState(sourceEditor?.state); file.lastScrollTop = sourceEditor?.scrollDOM?.scrollTop || 0; @@ -4975,11 +5007,7 @@ async function EditorManager($header, $body) { file.tab?.classList.add("active"); updateHeaderForFile(file); if (file.type === "editor") { - if (!file.loaded && !file.loading) { - showLoadingEditor(file); - } else { - applyFileToPaneEditor(file, pane); - } + applyFileToPaneEditor(file, pane); pane.editorContainer.style.display = "block"; $hScrollbar.hideImmediately(); @@ -5008,7 +5036,7 @@ async function EditorManager($header, $body) { // Persist the previous editor's state before switching away const prev = paneActiveFile; - if (prev?.type === "editor") { + if (prev?.type === "editor" && prev.loaded && !prev.loading) { prev.session = getRawEditorState(pane.editor.state); prev.lastScrollTop = pane.editor.scrollDOM?.scrollTop || 0; prev.lastScrollLeft = pane.editor.scrollDOM?.scrollLeft || 0; @@ -5033,12 +5061,7 @@ async function EditorManager($header, $body) { if (file.type === "editor") { pane.touchSelectionController?.setEnabled(true); - if (!file.loaded && !file.loading) { - showLoadingEditor(file); - } else { - // Apply active file content and language to CodeMirror - applyFileToEditor(file); - } + applyFileToEditor(file); pane.editorContainer.style.display = "block"; $hScrollbar.hideImmediately(); diff --git a/src/lib/quickToolsAdapter.js b/src/lib/quickToolsAdapter.js new file mode 100644 index 0000000000..03c6bf7b08 --- /dev/null +++ b/src/lib/quickToolsAdapter.js @@ -0,0 +1,205 @@ +import { hasQuickToolsOverlay } from "./quickToolsOverlays"; + +/** + * Per-tab input routing for custom editors. No editor engine or UI dependencies. + * An adapter owns all editing actions on its tab: unsupported actions never fall + * through to the code editor, including while an asynchronous action is pending. + */ +export function createQuickToolsAdapterRegistry( + getActiveTab, + resolveAction = async (action) => action, + isBlocked = () => false, +) { + const entries = new Map(); + const listeners = new Set(); + let activeTab, + blocked = false; + const notify = (change) => listeners.forEach((listener) => listener(change)); + const current = () => entries.get(getActiveTab()); + function cancel(entry) { + if (!entry || entry.cancelling) return; + entry.cancelling = true; + try { + entry.controller.abort(); + entry.controller = new AbortController(); + entry.queue = Promise.resolve(); + entry.pending = 0; + entry.selection = undefined; + entry.adapter.cancel?.(); + } finally { + entry.cancelling = false; + } + } + const valid = (entry, signal) => + !signal.aborted && + !blocked && + !isBlocked() && + current() === entry && + entry.adapter.getState().enabled && + !entry.adapter.getState().busy; + return { + subscribe(listener) { + listeners.add(listener); + return () => listeners.delete(listener); + }, + register(tab, adapter) { + if ( + !tab || + !adapter?.getState || + !adapter?.canHandle || + !adapter?.execute || + !adapter?.subscribe + ) + throw new TypeError( + "A quicktools adapter needs a tab, state, availability and execution handlers.", + ); + if (entries.has(tab)) + throw new Error("This tab already has a quicktools adapter."); + const entry = { + tab, + adapter, + controller: new AbortController(), + queue: Promise.resolve(), + pending: 0, + selection: undefined, + cancelling: false, + }; + entries.set(tab, entry); + const unsubscribe = adapter.subscribe(() => { + const state = adapter.getState(); + const cancelled = !state.enabled || state.busy; + if (cancelled) cancel(entry); + notify({ tab, cancelled }); + }); + const dispose = () => { + if (entries.get(tab) !== entry) return; + entries.delete(tab); + unsubscribe?.(); + tab.off?.("close", dispose); + cancel(entry); + notify({ tab, cancelled: true }); + }; + tab.on?.("close", dispose); + notify(); + return dispose; + }, + sync() { + const next = getActiveTab(); + if (next !== activeTab) { + cancel(entries.get(activeTab)); + activeTab = next; + } + notify(); + }, + setBlocked(value) { + if (blocked === value) return; + blocked = value; + if (value) cancel(current()); + notify(); + }, + has(tab = getActiveTab()) { + return entries.has(tab); + }, + visible(tab = getActiveTab()) { + const entry = entries.get(tab); + return entry ? !!entry.adapter.getState().enabled : !tab?.hideQuickTools; + }, + available(action) { + const entry = current(); + return ( + !!entry && + !blocked && + !isBlocked() && + entry.adapter.getState().enabled && + !entry.adapter.getState().busy && + entry.adapter.canHandle(action) + ); + }, + capture() { + const entry = current(); + if (!entry || blocked || isBlocked() || entry.selection) return; + // Repeated input must capture the selection produced by the preceding + // action, rather than restoring an older caret when the queue catches up. + entry.selection = entry.pending + ? entry.queue.then(() => entry.adapter.captureSelection?.()) + : Promise.resolve(entry.adapter.captureSelection?.()); + // Capture failures are reported by dispatch, without an unhandled rejection. + entry.selection.catch(() => {}); + }, + discardCapture() { + // Dispatched actions already own their snapshots. Leave their queue intact. + const entry = current(); + if (entry) entry.selection = undefined; + }, + dispatch(action) { + const entry = current(); + if (!entry) return false; + if (!this.available(action)) { + this.discardCapture(); + return true; + } + const signal = entry.controller.signal, + selection = entry.selection; + entry.selection = undefined; + entry.pending++; + entry.queue = entry.queue + .then(async () => { + if (!valid(entry, signal) || !this.available(action)) return; + if (selection) { + const snapshot = await selection; + if (!valid(entry, signal)) return; + await entry.adapter.restoreSelection?.(snapshot); + } + if (!valid(entry, signal) || !this.available(action)) return; + const resolved = await resolveAction(action); + if (valid(entry, signal) && this.available(action)) + await entry.adapter.execute(resolved, { signal }); + }) + .catch((error) => { + if (valid(entry, signal)) entry.adapter.onError?.(error); + }) + .finally(() => { + if (signal === entry.controller.signal) entry.pending--; + }); + return true; + }, + focus() { + const entry = current(); + if (entry && !blocked && entry.adapter.getState().enabled) { + const signal = entry.controller.signal; + Promise.resolve() + .then(() => { + if (valid(entry, signal)) return entry.adapter.focus?.(); + }) + .catch((error) => { + if (valid(entry, signal)) entry.adapter.onError?.(error); + }); + } + }, + cancel() { + cancel(current()); + }, + }; +} + +export default createQuickToolsAdapterRegistry( + () => globalThis.editorManager?.activeFile, + async (action) => { + const paste = + (action.type === "command" && action.command === "paste") || + (action.type === "key" && + (action.ctrlKey || action.metaKey) && + action.key.toLowerCase() === "v"); + if (!paste) return action; + const text = await new Promise((resolve, reject) => { + const clipboard = globalThis.cordova?.plugins?.clipboard; + if (!clipboard) { + reject(new Error("Clipboard is unavailable.")); + return; + } + clipboard.paste(resolve, reject); + }); + return { type: "text", text: String(text || "") }; + }, + hasQuickToolsOverlay, +); diff --git a/src/lib/quickToolsOverlays.js b/src/lib/quickToolsOverlays.js new file mode 100644 index 0000000000..ac812a35c9 --- /dev/null +++ b/src/lib/quickToolsOverlays.js @@ -0,0 +1,53 @@ +// Native dialogs and menus are direct children of body or the app container. +// Never observe editor content (including an adapter's ShadowRoot/iframe). +const containers = () => + [globalThis.document?.body, globalThis.app].filter( + (node, index, nodes) => + node?.nodeType === 1 && nodes.indexOf(node) === index, + ); +export function hasQuickToolsOverlay() { + return containers().some((root) => + [...root.children].some((node) => + node.matches(".prompt, #palette, .context-menu, .mask"), + ), + ); +} + +export function watchQuickToolsOverlays(registry, cancelInput) { + let watching = false, + wasBlocked = false; + const update = () => { + const blocked = hasQuickToolsOverlay(); + if (blocked && !wasBlocked) cancelInput(); + wasBlocked = blocked; + registry.setBlocked(blocked); + }; + const observer = new MutationObserver(update); + const sync = () => { + const active = registry.has(); + if (active === watching) return; + watching = active; + if (active) { + for (const node of containers()) + observer.observe(node, { childList: true }); + document.addEventListener("focusin", update, true); + document.addEventListener("pointerdown", update, true); + update(); + } else { + wasBlocked = false; + observer.disconnect(); + document.removeEventListener("focusin", update, true); + document.removeEventListener("pointerdown", update, true); + registry.setBlocked(false); + } + }; + const unsubscribe = registry.subscribe(sync); + sync(); + return () => { + unsubscribe(); + observer.disconnect(); + document.removeEventListener("focusin", update, true); + document.removeEventListener("pointerdown", update, true); + registry.setBlocked(false); + }; +} diff --git a/src/lib/restoreFiles.js b/src/lib/restoreFiles.js index 4f844ac678..fa50829105 100644 --- a/src/lib/restoreFiles.js +++ b/src/lib/restoreFiles.js @@ -19,7 +19,7 @@ export default async function restoreFiles(files) { const restoredFile = new EditorFile(file.filename, options); const load = Promise.resolve(restoredFile.load?.()); - if (isRemoteUri(file.uri)) { + if (file.uri && !/^(?:file|content):/i.test(file.uri)) { void load.catch((error) => { console.warn(`Failed to preload restored file: ${file.uri}`, error); }); @@ -32,10 +32,6 @@ export default async function restoreFiles(files) { // Finish restoring local documents before startup persistence is enabled. // Otherwise the temporary empty sessions can overwrite saved cursor state, // and the first visit to an inactive local tab visibly flashes a loading editor. - // Remote tabs keep preloading without blocking the rest of app startup. + // Remote and plugin tabs must not block the plugin startup they depend on. await Promise.all(localLoads); } - -function isRemoteUri(uri) { - return /^(?:https?|s?ftp):/i.test(uri || ""); -} diff --git a/src/lib/saveFile.js b/src/lib/saveFile.js index a01286b84e..0f43feaac5 100644 --- a/src/lib/saveFile.js +++ b/src/lib/saveFile.js @@ -1,5 +1,8 @@ -import fsOperation from "fileSystem"; +import fsOperation, { hasProvider } from "fileSystem"; +import { Text } from "@codemirror/state"; import { getDocText } from "cm/editorUtils"; +import toast from "components/toast"; +import confirm from "dialogs/confirm"; import prompt from "dialogs/prompt"; import select from "dialogs/select"; import recents from "lib/recents"; @@ -19,10 +22,26 @@ const SELECT_FOLDER = "select-folder"; * Saves a file to it's location, if file is new, it will ask for location * @param {EditorFile} file * @param {boolean} [isSaveAs] + * @param {{automatic?: boolean, savedDoc?: import('@codemirror/state').Text}} [options] Internal save context. + * @returns {Promise} */ -async function saveFile(file, isSaveAs = false) { +async function saveFile( + file, + isSaveAs = false, + { automatic = false, savedDoc: baseline = null } = {}, +) { // If file is loading, return - if (file.loading) return; + if (!file.loaded || file.loading || !file.tab) return false; + if (!isSaveAs && file.uri && !hasProvider(file.uri)) { + if (!automatic) + toast( + strings["file provider unavailable"] || "File provider unavailable", + ); + return false; + } + const tab = file.tab; + let targetUri = file.uri; + const isCurrent = () => file.tab === tab && file.uri === targetUri; /** * If set, new file needs to be created @@ -68,12 +87,14 @@ async function saveFile(file, isSaveAs = false) { "dir", // type strings["select folder"], // title ); + if (!option || !isCurrent()) return false; if (option === SELECT_FOLDER) { newUrl = await selectFolder(); } else { newUrl = option.val.url; } + if (!newUrl || !isCurrent()) return false; if (isSaveAs) { filename = await getfilename(newUrl, file.filename); @@ -82,8 +103,8 @@ async function saveFile(file, isSaveAs = false) { } // in case if user cancels the dialog - if (!filename) { - return; + if (!filename || !isCurrent()) { + return false; } } @@ -93,6 +114,7 @@ async function saveFile(file, isSaveAs = false) { $text.textContent = strings.saving + "..."; file.isSaving = true; + let saved = false; try { if (isSaveAs || newUrl) { @@ -100,13 +122,17 @@ async function saveFile(file, isSaveAs = false) { const fileUri = Url.join(newUrl, file.filename); fileOnDevice = fsOperation(fileUri); - if (!(await fileOnDevice.exists())) { + const exists = await fileOnDevice.exists(); + if (!isCurrent()) return false; + if (!exists) { await fsOperation(newUrl).createFile(file.filename); } + if (!isCurrent()) return false; const openedFile = editorManager.getFile(fileUri, "uri"); if (openedFile) openedFile.uri = null; file.uri = fileUri; + targetUri = fileUri; recents.addFile(fileUri); const folder = openFolder.find(newUrl); @@ -116,6 +142,34 @@ async function saveFile(file, isSaveAs = false) { if (!fileOnDevice) { fileOnDevice = fsOperation(file.uri); } + if (!fileOnDevice || !isCurrent()) return false; + + if (!isSaveAs && !isNewFile) { + const source = Text.of( + (await fileOnDevice.readFile(encoding)).split(/\r\n?|\n/), + ); + if (!isCurrent()) return false; + let unchanged = source.eq(file.session.doc); + if (!unchanged && baseline) { + unchanged = source.eq(baseline); + } else if (!unchanged && file.savedMtime != null) { + const stat = await fileOnDevice.stat?.().catch(() => null); + if (!isCurrent()) return false; + unchanged = helpers.getStatMtime(stat) === file.savedMtime; + } + if (!unchanged) { + file.hasDiskConflict = true; + file.refreshUnsavedState(); + editorManager.onupdate("file-changed"); + editorManager.emit("update", "file-changed"); + if (automatic) return false; + const overwrite = await confirm( + strings.warning || "Warning", + `${file.filename}: the source has changed or its saved version could not be verified. Overwrite it with this document?`, + ); + if (!overwrite || !isCurrent()) return false; + } + } if (appSettings.value.formatOnSave) { editorManager.activeFile.markChanged = false; @@ -129,14 +183,18 @@ async function saveFile(file, isSaveAs = false) { const savedDoc = file.session?.doc || null; const savedVersion = file.docVersion; const data = getDocText(savedDoc); + if (!isCurrent()) return false; await fileOnDevice.writeFile(data, encoding); - const stat = await fileOnDevice.stat().catch(() => null); + if (!isCurrent()) return false; + const stat = await fileOnDevice.stat?.().catch(() => null); + if (!isCurrent()) return false; file.markSaved({ mtime: helpers.getStatMtime(stat), savedDoc, savedVersion, }); + saved = true; if (file.location) { recents.addFolder(file.location); @@ -144,6 +202,7 @@ async function saveFile(file, isSaveAs = false) { clearTimeout(saveTimeout); saveTimeout = setTimeout(() => { + if (!isCurrent()) return; file.isSaving = false; if (newUrl) recents.addFile(file.uri); editorManager.onupdate("save-file"); @@ -151,14 +210,20 @@ async function saveFile(file, isSaveAs = false) { editorManager.emit("save-file", file); resetText(); }, editorManager.TIMEOUT_VALUE + 100); + return true; } catch (err) { - helpers.error(err); + if (!automatic && isCurrent()) helpers.error(err); + return false; + } finally { + if (isCurrent()) { + if (!saved) file.isSaving = false; + resetText(); + } } - resetText(); function resetText() { setTimeout(() => { - $text.textContent = file.filename; + if (isCurrent()) $text.textContent = file.filename; }, editorManager.TIMEOUT_VALUE); } diff --git a/src/main.js b/src/main.js index 3f412ba423..aef107b04a 100644 --- a/src/main.js +++ b/src/main.js @@ -28,6 +28,7 @@ import Contextmenu from "components/contextmenu"; import Sidebar from "components/sidebar"; import tile from "components/tile"; import toast from "components/toast"; +import { initIconTooltips } from "components/tooltip"; import alert from "dialogs/alert"; import confirm from "dialogs/confirm"; import intentHandler, { processPendingIntents } from "handlers/intent"; @@ -375,8 +376,9 @@ async function onDeviceReady() { } editorManager.reapplyActiveFile(); if (activeFile?.uri) { - // Re-emit file-loaded event - editorManager.emit("file-loaded", activeFile); + if (activeFile.loaded && !activeFile.loading) { + editorManager.emit("file-loaded", activeFile); + } // Re-emit switch-file event editorManager.emit("switch-file", activeFile); } @@ -708,6 +710,7 @@ async function loadApp() { //#region Add event listeners initModes(); quickToolsInit(); + editorManager.on("switch-file", initIconTooltips()); sidebarApps.init($sidebar); await sidebarApps.loadApps(); editorManager.onupdate = onEditorUpdate; diff --git a/src/pages/fileBrowser/fileBrowser.scss b/src/pages/fileBrowser/fileBrowser.scss index 769090e05d..0a262aaefb 100644 --- a/src/pages/fileBrowser/fileBrowser.scss +++ b/src/pages/fileBrowser/fileBrowser.scss @@ -3,6 +3,19 @@ display: none; } + #list .tile > .icon:first-child { + --file-icon-size: 24px; + font-size: var(--file-icon-size); + background-size: var(--file-icon-size); + background-position: center; + + > svg, > img { + width: var(--file-icon-size); + height: var(--file-icon-size); + object-fit: contain; + } + } + .tile { &[data-storage-type="notification"] { background-color: rgb(153, 153, 255); diff --git a/src/utils/remoteFilePreview.js b/src/utils/remoteFilePreview.js index d022383ef9..04c19e8434 100644 --- a/src/utils/remoteFilePreview.js +++ b/src/utils/remoteFilePreview.js @@ -19,7 +19,7 @@ export async function readRemoteFilePreview({ if (editorCacheExists) { return { editorCacheExists, - text: await editorCache.readFile(encoding), + text: await editorCache.readFile("utf-8"), }; } diff --git a/tests/helpers/loadSourceModule.js b/tests/helpers/loadSourceModule.js new file mode 100644 index 0000000000..a64a8e3122 --- /dev/null +++ b/tests/helpers/loadSourceModule.js @@ -0,0 +1,24 @@ +import { readFileSync } from "node:fs"; +import path from "node:path"; +import vm from "node:vm"; +import { transformSync } from "@babel/core"; + +const compiled = new Map(); +// Compile the actual source with Acode's JSX transform; replace only its environment. +export function loadSourceModule(relative, dependencies, globals = {}) { + const filename = path.resolve(relative); + if (!compiled.has(filename)) compiled.set(filename, transformSync(readFileSync(filename, "utf8"), { + filename, babelrc: false, configFile: false, + presets: [["@babel/preset-env", { targets: { node: "current" }, modules: "commonjs" }]], + plugins: ["html-tag-js/jsx/syntax-parser.js", "html-tag-js/jsx/jsx-to-tag.js"], + }).code); + const exports = {}; + vm.runInNewContext(compiled.get(filename), { + exports, Promise, console, setTimeout, clearTimeout, + require(id) { + if (!(id in dependencies)) throw Error(`Unexpected import: ${id}`); + return dependencies[id]; + }, ...globals, + }, { filename }); + return exports; +} diff --git a/tests/unit/fileSaveEvents.test.js b/tests/unit/fileSaveEvents.test.js new file mode 100644 index 0000000000..ad6c5aa73f --- /dev/null +++ b/tests/unit/fileSaveEvents.test.js @@ -0,0 +1,123 @@ +// @vitest-environment happy-dom +import { afterEach, expect, it, vi } from "vitest"; +import { EditorState, EditorSelection } from "@codemirror/state"; +import tag from "html-tag-js"; +import { loadSourceModule } from "../helpers/loadSourceModule"; + +const deferred = () => { let resolve, reject; const promise = new Promise((a, b) => { resolve = a; reject = b; }); return { promise, resolve, reject }; }; +function setup() { + const write = vi.fn(async () => true); + const manager = { files: [], getFile: () => null, addFile: file => manager.files.push(file), emit: vi.fn(), onupdate: vi.fn(), activeFile: null }; + const defaults = Object.fromEntries([ + "fileSystem", "components/quickTools", "components/sidebar", "components/toast", "dialogs/confirm", "handlers/editorFileTab", "handlers/quickTools", "lib/quickToolsAdapter", "handlers/tabContextMenu", "dompurify", "mime-types", "utils/codeHighlight", "utils/Path", "utils/remoteFilePreview", "utils/Url", "./loadPlugins", "./openFolder", "./run", "cm/editorReadOnly", + ].map(id => [id, {}])); + const { default: EditorFile } = loadSourceModule("src/lib/editorFile.js", { + ...defaults, + "components/sidebar": { hide: vi.fn() }, + "@codemirror/state": { EditorState, EditorSelection }, + "cm/editorUtils": { getDocText: doc => doc.toString() }, + "cm/modelist": { getModeForPath: () => "text", getMode: () => ({ name: "text", extensions: [], getExtension: () => [] }) }, + "html-tag-js": tag, + "components/tile": options => { + const element = document.createElement("li"); + element.innerHTML = ''; + element.tail = vi.fn(); + element.text = options.text; + return element; + }, + "utils/helpers": { normalizeMtime: () => null, getIconForFile: () => "file" }, + "./config": { DEFAULT_FILE_SESSION: "default" }, + "./settings": { value: {}, on: vi.fn(), off: vi.fn() }, + "./saveFile": write, + }, { document, window, tag, editorManager: manager }); + EditorFile.prototype.setMode = vi.fn(); // Language setup is unrelated to save routing. + EditorFile.prototype.writeToCache = vi.fn(async () => {}); + const file = (type = "docs") => new EditorFile("test.txt", { + id: String(manager.files.length), type, content: document.createElement("div"), render: false, text: "original", + }); + return { file, write, manager }; +} +afterEach(() => document.body.replaceChildren()); + +it("enables only custom tabs with listeners or onsave, and never uses the text writer", async () => { + const f = setup(), doc = f.file(), terminal = f.file("terminal"); + expect(doc.canSave).toBe(false); + expect(await doc.save()).toBe(false); + expect(await terminal.saveAs()).toBe(false); + const handler = e => e.respondWith(Promise.resolve(true)); + doc.on("save", handler); + expect(doc.canSave).toBe(true); + expect(await doc.save()).toBe(true); + doc.off("save", handler); + expect(doc.canSave).toBe(false); + doc.onsave = handler; + expect(await doc.saveAs()).toBe(true); + doc.onsave = undefined; + expect(doc.canSave).toBe(false); + expect(f.write).not.toHaveBeenCalled(); +}); +it("awaits one response, distinguishes Save As and shares repeated requests per tab", async () => { + const f = setup(), one = f.file(), two = f.file(), hold = deferred(); + const events = [], handler = vi.fn(e => { events.push(e); e.respondWith(hold.promise); }); + one.on("save", handler); + two.on("save", e => e.respondWith(Promise.resolve(false))); + const saving = one.saveAs(); + expect(one.save()).toBe(saving); + await Promise.resolve(); + expect(handler).toHaveBeenCalledOnce(); + expect(events[0].saveAs).toBe(true); + expect(events[0].target).toBe(one); + expect(await two.save()).toBe(false); + hold.resolve(true); + expect(await saving).toBe(true); + await one.save(); + expect(events[1].saveAs).toBe(false); +}); +it("rejects failures, duplicate and late responses, and releases pending requests", async () => { + const f = setup(), file = f.file(); + let event; + const fail = e => { event = e; e.respondWith(Promise.reject(Error("disk full"))); }; + file.on("save", fail); + await expect(file.save()).rejects.toThrow("disk full"); + expect(() => event.respondWith(Promise.resolve(true))).toThrow(/once/); + file.off("save", fail); + const duplicate = e => { e.respondWith(Promise.resolve(true)); e.respondWith(Promise.resolve(true)); }; + file.on("save", duplicate); + await expect(file.save()).rejects.toThrow(/once/); + file.off("save", duplicate); + file.on("save", e => { event = e; }); + expect(await file.save()).toBe(false); + expect(() => event.respondWith(Promise.resolve(true))).toThrow(/during/); +}); +it("preserves text fallback and existing cancellation/listener ordering", async () => { + const f = setup(), file = f.file("editor"); + file.flushCacheWrite = vi.fn(async () => {}); + expect(file.canSave).toBe(true); + await file.saveAs(); + expect(f.write).toHaveBeenCalledWith(file, true, { automatic: false, savedDoc: file.session.doc }); + const cancel = e => e.preventDefault(), observe = vi.fn(); + file.onsave = cancel; + file.on("save", observe); + expect(await file.save()).toBe(false); + expect(observe).toHaveBeenCalledOnce(); + expect(f.write).toHaveBeenCalledOnce(); + file.onsave = e => { e.preventDefault(); e.stopPropagation(); }; + await file.save(); + expect(observe).toHaveBeenCalledOnce(); + file.onsave = e => e.respondWith(Promise.resolve(true)); + expect(await file.save()).toBe(true); + expect(f.write).toHaveBeenCalledOnce(); +}); + + it("drops completion notifications after closing the captured custom tab", async () => { + const f = setup(), file = f.file(), hold = deferred(); + f.file(); + file.on("save", e => e.respondWith(hold.promise)); + const saving = file.save(); + await Promise.resolve(); + await file.remove(true); + expect(file.canSave).toBe(false); + hold.resolve(true); + expect(await saving).toBe(false); + expect(f.manager.emit.mock.calls.some(([name]) => name === "save-file")).toBe(false); +}); diff --git a/tests/unit/iconTooltips.test.js b/tests/unit/iconTooltips.test.js new file mode 100644 index 0000000000..17ed23e910 --- /dev/null +++ b/tests/unit/iconTooltips.test.js @@ -0,0 +1,212 @@ +// @vitest-environment happy-dom +import { afterEach, expect, it, vi } from "vitest"; +import { installIconTooltips } from "../../src/components/tooltip/longPress"; +let controller; +afterEach(() => { + controller?.dispose(); + vi.useRealTimers(); + document.body.replaceChildren(); +}); +function fixture() { + vi.useFakeTimers(); + const owner = document.createElement("div"); + document.body.append(owner); + const root = owner.attachShadow({ mode: "open" }); + root.innerHTML = ''; + const button = root.querySelector("button"), + icon = root.querySelector("svg"); + const show = vi.fn(), + hide = vi.fn(); + controller = installIconTooltips(document, show, hide); + const send = (name, options = {}) => + icon.dispatchEvent( + new PointerEvent(name, { + bubbles: true, + composed: true, + cancelable: true, + pointerId: 1, + pointerType: "touch", + button: 0, + clientX: 20, + clientY: 20, + ...options, + }), + ); + return { root, owner, button, icon, show, hide, send }; +} + +function click(target, detail = 1) { + const event = new MouseEvent("click", { + bubbles: true, + composed: true, + cancelable: true, + detail, + }); + target.dispatchEvent(event); + return event; +} + +it.each([ + ["plain content", false], + ["plain content", true], + ["unlabeled control", false], + ["unlabeled control", true], + ["quicktools", false], + ["quicktools", true], +])("passes ordinary clicks on %s (Shadow DOM: %s) without browser errors", (kind, shadow) => { + const f = fixture(); + const container = document.createElement("div"); + container.innerHTML = + kind === "plain content" + ? "
    Content
    " + : ""; + if (kind === "quicktools") { + container.id = "quick-tools"; + container.firstChild.setAttribute("aria-label", "Quicktool"); + } + (shadow ? f.root : document.body).append(container); + const target = container.querySelector("svg") || container.firstChild; + const activated = vi.fn(); + container.firstChild.addEventListener("click", activated); + const errors = vi.fn((event) => event.preventDefault()); + window.addEventListener("error", errors); + try { + for (const type of ["pointerdown", "pointerup"]) { + target.dispatchEvent( + new PointerEvent(type, { + bubbles: true, + composed: true, + pointerId: 1, + button: 0, + }), + ); + } + expect(click(target).defaultPrevented).toBe(false); + expect(activated).toHaveBeenCalledOnce(); + expect(errors).not.toHaveBeenCalled(); + expect(f.show).not.toHaveBeenCalled(); + } finally { + window.removeEventListener("error", errors); + } +}); + +it.each([ + "expired", + "keyboard", + "programmatic", + "different target", +])("allows %s clicks after a long press and clears suppression", async (kind) => { + const f = fixture(), + activated = vi.fn(); + f.button.addEventListener("click", activated); + f.send("pointerdown"); + await vi.advanceTimersByTimeAsync(500); + f.send("pointerup"); + if (kind === "expired") await vi.advanceTimersByTimeAsync(750); + if (kind === "programmatic") f.button.click(); + else if (kind === "different target") { + const other = document.createElement("button"); + document.body.append(other); + other.addEventListener("click", activated); + expect(click(other).defaultPrevented).toBe(false); + } else { + expect(click(f.icon, kind === "keyboard" ? 0 : 1).defaultPrevented).toBe( + false, + ); + } + expect(activated).toHaveBeenCalledOnce(); + expect(click(f.icon).defaultPrevented).toBe(false); + expect(activated).toHaveBeenCalledTimes(2); +}); + +it("reads metadata through Shadow DOM and consumes the release click without activating the icon", async () => { + const f = fixture(), + clicked = vi.fn(); + f.button.onclick = clicked; + f.button.dataset.description = "Existing description"; + f.send("pointerdown"); + await vi.advanceTimersByTimeAsync(499); + expect(f.show).not.toHaveBeenCalled(); + await vi.advanceTimersByTimeAsync(1); + expect(f.show).toHaveBeenCalledWith( + f.button, + "Format", + "Existing description", + ); + f.send("pointerup"); + expect(click(f.icon).defaultPrevented).toBe(true); + expect(clicked).not.toHaveBeenCalled(); + f.send("pointerdown"); + f.send("pointerup"); + expect(click(f.icon).defaultPrevented).toBe(false); + expect(clicked).toHaveBeenCalledOnce(); +}); +it("cancels scrolling, movement, extra touches and removal; leaves stock quicktools alone", async () => { + const f = fixture(); + for (const cancel of [ + () => f.send("pointermove", { clientX: 40 }), + () => document.dispatchEvent(new Event("scroll")), + () => f.root.dispatchEvent(new Event("scroll")), + () => f.send("pointercancel"), + ]) { + f.send("pointerdown"); + cancel(); + f.send("pointerup"); + await vi.advanceTimersByTimeAsync(600); + } + expect(f.show).not.toHaveBeenCalled(); + f.send("pointerdown"); + f.send("pointerdown", { pointerId: 2 }); + await vi.advanceTimersByTimeAsync(600); + expect(f.show).not.toHaveBeenCalled(); + f.send("pointerup", { pointerId: 2 }); + f.send("pointerup"); + f.send("pointerdown"); + await vi.advanceTimersByTimeAsync(500); + expect(f.show).toHaveBeenCalledWith(f.button, "Format", undefined); + f.hide.mockClear(); + f.owner.remove(); + await vi.advanceTimersByTimeAsync(0); + expect(f.hide).toHaveBeenCalled(); + document.body.append(f.owner); + f.owner.id = "quick-tools"; + f.send("pointerup"); + f.show.mockClear(); + f.send("pointerdown"); + await vi.advanceTimersByTimeAsync(600); + expect(f.show).not.toHaveBeenCalled(); +}); +it("uses existing global labels in precedence order and lets an existing context menu win", async () => { + const f = fixture(); + f.button.setAttribute("aria-label", "Accessible label"); + f.button.title = "Title label"; + for (const [remove, label] of [ + [null, "Format"], + ["data-label", "Accessible label"], + ["aria-label", "Title label"], + ]) { + if (remove) f.button.removeAttribute(remove); + f.send("pointerdown"); + await vi.advanceTimersByTimeAsync(500); + expect(f.show).toHaveBeenLastCalledWith(f.button, label, undefined); + f.send("pointerup"); + } + f.button.addEventListener("contextmenu", (event) => event.preventDefault()); + f.send("pointerdown"); + f.hide.mockClear(); + f.icon.dispatchEvent( + new Event("contextmenu", { + bubbles: true, + composed: true, + cancelable: true, + }), + ); + await vi.advanceTimersByTimeAsync(600); + expect(f.hide).toHaveBeenCalled(); + f.send("pointerup"); + f.button.removeAttribute("title"); + f.show.mockClear(); + f.send("pointerdown"); + await vi.advanceTimersByTimeAsync(600); + expect(f.show).not.toHaveBeenCalled(); +}); diff --git a/tests/unit/pluginFileRestoration.test.js b/tests/unit/pluginFileRestoration.test.js new file mode 100644 index 0000000000..2f33bf5940 --- /dev/null +++ b/tests/unit/pluginFileRestoration.test.js @@ -0,0 +1,680 @@ +// @vitest-environment happy-dom +import { readFileSync } from "node:fs"; +import vm from "node:vm"; +import { parse } from "@babel/parser"; +import { + Compartment, + EditorSelection, + EditorState, + Text, +} from "@codemirror/state"; +import { EditorView, placeholder } from "@codemirror/view"; +import { + blurEditorIfReadOnly, + createEditorReadOnlyExtension, +} from "cm/editorReadOnly"; +import tag from "html-tag-js"; +import { readRemoteFilePreview } from "utils/remoteFilePreview"; +import { afterEach, expect, it, vi } from "vitest"; +import { loadSourceModule } from "../helpers/loadSourceModule"; + +afterEach(() => { + vi.clearAllTimers(); + vi.useRealTimers(); + document.body.replaceChildren(); +}); + +const managerSource = readFileSync("src/lib/editorManager.js", "utf8"); +const managerBody = parse(managerSource, { + sourceType: "module", + plugins: ["jsx"], +}).program.body.find( + (node) => + node.type === "FunctionDeclaration" && node.id.name === "EditorManager", +).body.body; + +function setup() { + vi.useFakeTimers(); + const cache = new Map([["file:///local.js", "local content"]]); + const read = vi.fn(async (uri, encoding) => { + const value = cache.get(uri); + return ArrayBuffer.isView(value) + ? new TextDecoder(encoding).decode(value) + : value; + }); + const write = vi.fn(async (uri, text) => cache.set(uri, text)); + const stat = vi.fn(async () => ({})); + const remote = { + exists: async () => true, + stat, + readFile: vi.fn(async () => "remote content"), + }; + const remoteFactory = vi.fn(() => remote); + const localFs = (uri) => ({ + exists: async () => cache.has(uri), + readFile: (encoding) => read(uri, encoding), + stat, + writeFile: (text) => write(uri, text), + createFile: (name, text) => write(`${uri}/${name}`, text), + delete: async () => cache.delete(uri), + }); + const url = { + join: (...parts) => parts.join("/"), + basename: (value) => value.split("/").at(-1), + getProtocol: (value) => `${value.split(":")[0]}:`, + }; + const filesystem = loadSourceModule("src/fileSystem/index.js", { + "lib/ajax": { get: remote.readFile }, + "utils/encodings": { decode: (value) => value }, + "utils/Url": url, + "./internalFs": { + test: (uri) => uri.startsWith("file:"), + createFs: localFs, + }, + "./externalFs": { + test: (uri) => uri.startsWith("content:"), + createFs: localFs, + }, + "./ftp": { + test: (uri) => uri.startsWith("ftp:"), + fromUrl: remoteFactory, + }, + "./sftp": { + test: (uri) => uri.startsWith("sftp:"), + fromUrl: remoteFactory, + }, + }); + const { default: fs, onProviderRegistered } = filesystem; + const settings = { value: {}, on: vi.fn(), off: vi.fn() }; + const manager = { + TIMEOUT_VALUE: 0, + files: [], + activeFile: null, + header: {}, + emit: vi.fn(), + onupdate: vi.fn(), + getFile: (id, key = "id") => manager.files.find((file) => file[key] === id), + addFile: (file) => manager.files.push(file), + }; + // Use the actual registration handler, with the same registry used by EditorFile. + const registration = managerBody.find( + (node) => + node.type === "ExpressionStatement" && + node.expression.callee?.name === "onProviderRegistered", + ); + vm.runInNewContext( + managerSource.slice(registration.start, registration.end), + { onProviderRegistered, manager, console }, + ); + const toast = vi.fn(), + log = vi.fn(); + const confirm = vi.fn(async () => false); + const error = vi.fn(); + const helpers = { + normalizeMtime: (value) => value ?? null, + getStatMtime: (value) => value?.modifiedDate ?? null, + error, + getIconForFile: () => "file", + getVirtualPath: (value) => value, + fixFilename: (value) => value, + }; + const selectLocation = vi.fn(async () => ({ + val: { url: "file:///export" }, + })); + const { default: saveFile } = loadSourceModule( + "src/lib/saveFile.js", + { + fileSystem: filesystem, + "@codemirror/state": { Text }, + "cm/editorUtils": { getDocText: (doc) => doc.toString() }, + "components/toast": toast, + "dialogs/confirm": confirm, + "dialogs/prompt": async () => "", + "dialogs/select": {}, + "lib/recents": { + select: selectLocation, + addFolder: vi.fn(), + }, + "pages/fileBrowser": {}, + "utils/helpers": helpers, + "utils/Url": url, + "./config": {}, + "./editorFile": {}, + "./openFolder": {}, + "./settings": settings, + }, + { editorManager: manager, strings: {} }, + ); + const unused = Object.fromEntries( + [ + "components/quickTools", + "dialogs/confirm", + "handlers/editorFileTab", + "handlers/quickTools", + "handlers/tabContextMenu", + "dompurify", + "mime-types", + "utils/codeHighlight", + "utils/Path", + "./openFolder", + "./run", + "cm/editorReadOnly", + "lib/quickToolsAdapter", + ].map((id) => [id, {}]), + ); + const { default: EditorFile, AUTO_SAVE } = loadSourceModule( + "src/lib/editorFile.js", + { + ...unused, + fileSystem: filesystem, + "@codemirror/state": { EditorState, EditorSelection }, + "cm/editorUtils": { getDocText: (doc) => doc.toString() }, + "cm/modelist": { + getModeForPath: () => "text", + getMode: () => ({ name: "text" }), + }, + "components/sidebar": { hide: vi.fn() }, + "components/toast": toast, + "components/tile": () => { + const tile = document.createElement("li"); + tile.innerHTML = ''; + tile.tail = vi.fn(); + return tile; + }, + "html-tag-js": tag, + "utils/Url": url, + "utils/remoteFilePreview": { readRemoteFilePreview }, + "utils/helpers": helpers, + "./config": { DEFAULT_FILE_SESSION: "default" }, + "./loadPlugins": { isInitialPluginLoadComplete: () => false }, + "./settings": settings, + "./saveFile": saveFile, + }, + { + document, + window: { log }, + tag, + editorManager: manager, + CACHE_STORAGE: "file:///cache", + strings: {}, + }, + ); + EditorFile.prototype.setMode = vi.fn(); + EditorFile.prototype.render = function () { + manager.activeFile = this; + }; + const { default: restoreFiles } = loadSourceModule( + "src/lib/restoreFiles.js", + { fileSystem: filesystem, "./editorFile": EditorFile }, + ); + return { + AUTO_SAVE, + confirm, + error, + stat, + cache, + read, + write, + remote, + remoteFactory, + fs, + manager, + toast, + log, + selectLocation, + restoreFiles, + }; +} + +it("restores populated and empty recovery caches as usable documents for every filesystem", async () => { + const f = setup(); + const records = [ + "file", + "content", + "ftp", + "sftp", + "https", + "gh", + "plugin", + ].map((protocol, index) => { + const text = index % 2 ? "unsaved content" : ""; + f.cache.set(`file:///cache/${protocol}`, text); + return { + id: protocol, + filename: "file.js", + uri: `${protocol}://example/file.js`, + render: protocol === "gh", + isUnsaved: !!text, + docVersion: 7, + savedVersion: text ? 4 : 7, + cacheVersion: 7, + savedMtime: 100, + diskMtime: 200, + hasDiskConflict: !!text, + pinned: true, + editable: protocol !== "https", + encoding: "utf-16le", + scrollTop: 120, + cursorPos: { ranges: [{ from: text ? 5 : 0, to: text ? 5 : 0 }] }, + }; + }); + await f.restoreFiles(records); + await Promise.all(f.manager.files.map((file) => file.load())); + for (const [index, file] of f.manager.files.entries()) { + const record = records[index]; + expect(file.loaded).toBe(true); + expect(file.loading).toBe(false); + expect(file.session.doc.toString()).toBe(f.cache.get(file.cacheFile)); + expect(file.session.selection.main.head).toBe( + record.cursorPos.ranges[0].to, + ); + for (const key of [ + "isUnsaved", + "docVersion", + "savedVersion", + "cacheVersion", + "savedMtime", + "diskMtime", + "hasDiskConflict", + "pinned", + "editable", + "encoding", + ]) + expect(file[key]).toBe(record[key]); + expect(file.lastScrollTop).toBe(120); + expect(file.canSave).toBe(true); + expect(f.read).toHaveBeenCalledWith(file.cacheFile, "utf-8"); + } + const github = f.manager.activeFile; + await github.save(); + expect(f.toast).toHaveBeenCalledWith("File provider unavailable"); + await github.saveAs(); // Cancelling the filename prompt still proves Save As is available. + expect(f.selectLocation).toHaveBeenCalledOnce(); + github.session = EditorState.create({ doc: "new offline edit" }); + github.markEdited(); + await github.writeToCache(); + expect(f.cache.get(github.cacheFile)).toBe("new offline edit"); + expect(github.isUnsaved).toBe(true); + await vi.advanceTimersByTimeAsync(65000); + expect(github.tab).not.toBeNull(); + expect(f.cache.get(github.cacheFile)).toBe("new offline edit"); + f.fs.extend((uri) => /^(gh|plugin):/.test(uri), f.remoteFactory); + await vi.runAllTimersAsync(); + expect(f.remoteFactory).not.toHaveBeenCalled(); + expect(f.remote.readFile).not.toHaveBeenCalled(); + expect(f.log).not.toHaveBeenCalled(); +}); + +it("keeps uncached tabs idle, then resumes only matching open files without blocking local restoration", async () => { + const f = setup(); + let finish; + const response = new Promise((resolve) => { + finish = resolve; + }); + f.remote.readFile.mockReturnValue(response); + await f.restoreFiles([ + { + id: "pending", + filename: "pending.js", + uri: "custom://pending", + cursorPos: { ranges: [{ from: 5, to: 5 }] }, + }, + { id: "closed", filename: "closed.js", uri: "custom://closed" }, + { id: "missing", filename: "missing.js", uri: "disabled://missing" }, + { + id: "local", + filename: "local.js", + uri: "file:///local.js", + render: true, + }, + { id: "http", filename: "remote.js", uri: "https://example/remote.js" }, + { id: "closing", filename: "closing.js", uri: "custom://closing" }, + ]); + const [pending, closed, missing, local, http, closing] = f.manager.files; + await local.flushCacheWrite(); + f.write.mockClear(); + expect(local.session.doc.toString()).toBe("local content"); + expect(http.loading).toBe(true); + const firstAttempt = pending.load(); + await firstAttempt; + expect(pending.load()).not.toBe(firstAttempt); // No promise is waiting for a plugin. + await pending.load(); + expect(pending.loaded).toBe(false); + expect(pending.loading).toBe(false); + await pending.writeToCache(); + expect(await pending.save()).toBe(false); + expect(await pending.saveAs()).toBe(false); + expect(f.write).not.toHaveBeenCalled(); + expect(f.selectLocation).not.toHaveBeenCalled(); + await closed.remove(true); + await vi.advanceTimersByTimeAsync(65000); + expect(pending.tab).not.toBeNull(); + expect(missing.tab).not.toBeNull(); + f.fs.extend((uri) => uri.startsWith("custom:"), f.remoteFactory); + f.fs.extend((uri) => uri.startsWith("custom:"), f.remoteFactory); + await vi.advanceTimersByTimeAsync(0); + expect(f.remote.readFile).toHaveBeenCalledTimes(3); + expect(pending.loading).toBe(true); + const completion = Promise.all([pending.load(), http.load(), closing.load()]); + await closing.remove(true); + finish("remote content"); + await completion; + expect(pending.session.doc.toString()).toBe("remote content"); + expect(pending.session.selection.main.head).toBe(5); + expect(pending.loading).toBe(false); + expect(pending.loaded).toBe(true); + expect(closed.session).toBeNull(); + expect(closing.session).toBeNull(); + expect(http.session.doc.toString()).toBe("remote content"); + expect(f.manager.activeFile).toBe(local); + expect(missing.loaded).toBe(false); + expect(missing.loading).toBe(false); + await pending.flushCacheWrite(); + expect(f.cache.get(pending.cacheFile)).toBe("remote content"); + expect(f.toast).not.toHaveBeenCalled(); + expect(f.log).not.toHaveBeenCalled(); +}); + +it("caches unchanged and empty documents from both opening paths, then restores without source reads", async () => { + for (const supplied of [false, true]) { + for (const text of ["café", ""]) { + const f = setup(); + f.cache.set("file:///local.js", text); + const record = { + id: "initial", + uri: "file:///local.js", + filename: "local.js", + encoding: "utf-16le", + isUnsaved: false, + }; + await f.restoreFiles([{ ...record, ...(supplied ? { text } : {}) }]); + const file = f.manager.files[0]; + await file.flushCacheWrite(); + expect(f.cache.get(file.cacheFile)).toBe(text); + expect(file.isUnsaved).toBe(false); + await file.flushCacheWrite(); + expect(f.write).toHaveBeenCalledOnce(); + // Recovery bytes are UTF-8 even when the original file uses UTF-16. + const reopened = setup(); + reopened.cache.set(file.cacheFile, new TextEncoder().encode(text)); + await reopened.restoreFiles([record]); + const restored = reopened.manager.files[0]; + expect(restored.session.doc.toString()).toBe(text); + expect(restored.encoding).toBe("utf-16le"); + expect(reopened.read.mock.calls.map(([uri]) => uri)).toEqual([ + file.cacheFile, + ]); + expect(reopened.write).not.toHaveBeenCalled(); + } + } +}); + +it("retries a failed initial cache write and removes an in-flight cache when its tab closes", async () => { + const f = setup(); + f.write.mockRejectedValueOnce(Error("disk full")); + await f.restoreFiles([ + { id: "retry", uri: "file:///local.js", filename: "local.js" }, + ]); + await vi.runAllTimersAsync(); + const file = f.manager.files[0]; + expect(f.cache.has(file.cacheFile)).toBe(false); + expect(file.cacheVersion).not.toBe(file.docVersion); + await file.flushCacheWrite(); + expect(f.cache.get(file.cacheFile)).toBe("local content"); + let finish; + f.write.mockImplementationOnce( + (uri, text) => + new Promise((resolve) => { + finish = () => { + f.cache.set(uri, text); + resolve(); + }; + }), + ); + file.session.setValue("new edit"); + const writing = file.flushCacheWrite(); + await vi.waitFor(() => expect(finish).toBeTypeOf("function")); + await file.remove(true); + finish(); + await writing; + await vi.runAllTimersAsync(); + expect(f.cache.has(file.cacheFile)).toBe(false); + expect(file.session).toBeNull(); +}); + +it("checks a clean cache before saving, cancels safely, and shares overlapping overwrite requests", async () => { + const f = setup(); + f.cache.set("file:///cache/stale", "old text"); + f.cache.set("file:///local.js", "external changes"); + await f.restoreFiles([ + { + id: "stale", + uri: "file:///local.js", + filename: "local.js", + isUnsaved: false, + }, + ]); + const file = f.manager.files[0]; + expect(await file.save()).toBe(false); + expect(f.cache.get(file.uri)).toBe("external changes"); + expect(f.cache.get(file.cacheFile)).toBe("old text"); + expect(file.hasDiskConflict).toBe(true); + expect(file.isSaving).toBe(false); + f.confirm.mockClear(); + expect(await file.save(f.AUTO_SAVE)).toBe(false); + expect(f.confirm).not.toHaveBeenCalled(); + let approve; + f.confirm.mockImplementationOnce( + () => + new Promise((resolve) => { + approve = resolve; + }), + ); + const saving = file.save(); + expect(file.save()).toBe(saving); + await vi.waitFor(() => expect(approve).toBeTypeOf("function")); + approve(true); + expect(await saving).toBe(true); + expect(f.confirm).toHaveBeenCalledOnce(); + expect(f.cache.get(file.uri)).toBe("old text"); + expect(file.isUnsaved).toBe(false); + expect(file.hasDiskConflict).toBe(false); +}); + +it("verifies dirty recovery metadata and preserves unverifiable edits", async () => { + for (const mtime of [10, 20, null]) { + const f = setup(); + f.stat.mockResolvedValue({ modifiedDate: mtime }); + f.cache.set("file:///cache/dirty", "recovered edits"); + await f.restoreFiles([ + { + id: "dirty", + uri: "file:///local.js", + filename: "local.js", + isUnsaved: true, + savedMtime: 10, + }, + ]); + const file = f.manager.files[0]; + expect(await file.save()).toBe(mtime === 10); + expect(f.confirm).toHaveBeenCalledTimes(mtime === 10 ? 0 : 1); + expect(f.cache.get(file.uri)).toBe( + mtime === 10 ? "recovered edits" : "local content", + ); + expect(f.cache.get(file.cacheFile)).toBe("recovered edits"); + } +}); + +it("allows unchanged-source edits and stops failed or obsolete source verification", async () => { + const f = setup(); + f.cache.set("file:///local.js", "local\r\ncontent"); + await f.restoreFiles([ + { id: "safe", uri: "file:///local.js", filename: "local.js" }, + ]); + const file = f.manager.files[0]; + await file.flushCacheWrite(); + file.session.setValue("my edit"); + expect(await file.save(f.AUTO_SAVE)).toBe(true); + expect(f.confirm).not.toHaveBeenCalled(); + expect(f.cache.get(file.uri)).toBe("my edit"); + f.read.mockRejectedValueOnce(Error("offline")); + expect(await file.save()).toBe(false); + expect(f.error).toHaveBeenCalledOnce(); + let finish; + f.read.mockImplementationOnce( + () => + new Promise((resolve) => { + finish = resolve; + }), + ); + const saving = file.save(); + await vi.waitFor(() => expect(finish).toBeTypeOf("function")); + await file.remove(true); + const writes = f.write.mock.calls.length; + finish("my edit"); + expect(await saving).toBe(false); + expect(f.write).toHaveBeenCalledTimes(writes); + await vi.runAllTimersAsync(); + expect(f.cache.has(file.cacheFile)).toBe(false); +}); + +it("continues resume checks past unavailable, failing, and read-only HTTP providers", async () => { + const f = setup(); + f.cache.set("file:///cache/offline", "cached"); + f.cache.set("file:///cache/broken", "cached"); + f.cache.set("file:///cache/http", "remote content"); + await f.restoreFiles([ + { + id: "local", + uri: "file:///local.js", + filename: "local.js", + encoding: "utf-8", + }, + { + id: "http", + uri: "https://example/file", + filename: "file", + readOnly: true, + }, + { id: "broken", uri: "broken://file", filename: "file" }, + { + id: "offline", + uri: "disabled://file", + filename: "file", + isUnsaved: true, + }, + { id: "pending", uri: "disabled://pending", filename: "pending" }, + ]); + await Promise.all(f.manager.files.map((file) => file.load())); + f.fs.extend( + (uri) => uri.startsWith("broken:"), + () => ({ + exists: async () => { + throw Error("offline"); + }, + }), + ); + const warn = vi.fn(); + const { default: checkFiles } = loadSourceModule( + "src/lib/checkFiles.js", + { + fileSystem: f.fs, + "@codemirror/state": { Text }, + "dialogs/alert": vi.fn(), + "dialogs/confirm": f.confirm, + "utils/helpers": { getStatMtime: () => null }, + }, + { editorManager: f.manager, strings: {}, console: { warn } }, + ); + f.read.mockClear(); + await checkFiles(); + expect(warn).toHaveBeenCalledOnce(); + expect(f.read).toHaveBeenCalledWith("file:///local.js", "utf-8"); + expect(f.confirm).not.toHaveBeenCalled(); + expect(f.cache.get("file:///cache/offline")).toBe("cached"); + expect(f.manager.files.every((file) => file.tab)).toBe(true); +}); + +it.each(["cached text", "", undefined])( + "keeps the loading view for cache %j until the session is ready", + (cached) => { + const source = managerSource; + const body = managerBody; + const names = [ + "showLoadingEditor", + "applyFileToEditor", + "recreateActiveEditorState", + "getRawEditorState", + "isReusableEditorState", + ]; + const editor = new EditorView({ parent: document.body }); + const file = { + type: "editor", + filename: "file.js", + loaded: false, + loading: false, + session: EditorState.create(), + __cmSessionReady: true, + __cmExtensionSignature: "test", + }; + const loadingPreviews = new WeakMap(); + if (cached !== undefined) loadingPreviews.set(file, cached); + const context = vm.createContext({ + editor, + EditorState, + placeholder, + createEditorReadOnlyExtension, + blurEditorIfReadOnly, + loadingPreviews, + manager: { activeFile: file }, + touchSelectionController: null, + themeCompartment: new Compartment(), + languageCompartment: new Compartment(), + lspCompartment: new Compartment(), + readOnlyCompartment: new Compartment(), + getConfiguredThemeExtension: () => [], + getBaseExtensionsFromOptions: () => [], + getEditorExtensionSignature: () => "test", + getFileLanguageSignature: () => "text", + applyCurrentEditorOptions: vi.fn(), + shouldApplyLanguage: () => false, + restoreFileScrollPosition: vi.fn(), + scheduleLspForFile: vi.fn(), + }); + // Run the actual render functions with a real EditorView; omit the unrelated app shell. + vm.runInContext( + body + .filter( + (node) => + node.type === "FunctionDeclaration" && names.includes(node.id.name), + ) + .map((node) => source.slice(node.start, node.end)) + .join("\n"), + context, + ); + try { + const savedSession = file.session; + context.applyFileToEditor(file); + const preview = editor.state; + context.recreateActiveEditorState(); + expect(editor.state).toBe(preview); + context.applyFileToEditor(file, { forceRecreate: true }); + expect(editor.state.doc.toString()).toBe(cached ?? ""); + expect(editor.state.readOnly).toBe(true); + expect(editor.contentDOM.getAttribute("contenteditable")).toBe("false"); + expect( + editor.dom.querySelector(".cm-placeholder")?.textContent ?? null, + ).toBe(cached === undefined ? "Loading file.js..." : null); + expect(file.session).toBe(savedSession); + file.session = EditorState.create({ doc: cached ?? "loaded text" }); + file.loaded = true; + file.loading = false; + context.applyFileToEditor(file); + expect(editor.state).toBe(file.session); + expect(editor.state.readOnly).toBe(false); + expect(editor.dom.querySelector(".cm-placeholder")).toBeNull(); + } finally { + editor.destroy(); + } + }, +); diff --git a/tests/unit/quickToolsAdapter.test.js b/tests/unit/quickToolsAdapter.test.js new file mode 100644 index 0000000000..a8822177fc --- /dev/null +++ b/tests/unit/quickToolsAdapter.test.js @@ -0,0 +1,148 @@ +import { describe, it, expect, vi } from "vitest"; +import { createQuickToolsAdapterRegistry } from "../../src/lib/quickToolsAdapter"; + +function setup(resolve) { + let tab = { hideQuickTools: true }; + const original = tab; + const registry = createQuickToolsAdapterRegistry(() => tab, resolve); + let state = { enabled: true, busy: false }, notify; + const adapter = { + getState: () => state, + canHandle: (action) => action.type !== "command" || action.command === "undo", + subscribe: (fn) => { notify = fn; return vi.fn(); }, + execute: vi.fn(async () => {}), + captureSelection: vi.fn(async () => ({ anchor: 3 })), + restoreSelection: vi.fn(async () => {}), + focus: vi.fn(), onError: vi.fn(), cancel: vi.fn(), + }; + const dispose = registry.register(tab, adapter); + registry.sync(); + return { registry, adapter, original, dispose, + change: (value) => { tab = value; registry.sync(); }, + state: (value) => { state = { ...state, ...value }; notify(); }, + }; +} +const insert = { type: "text", text: "x" }; +const settle = () => new Promise((resolve) => setTimeout(resolve, 0)); + +describe("custom-tab quicktools", () => { + it("uses editor availability, preserves configured opt-out for unadapted tabs, and never falls through unsupported actions", async () => { + const f = setup(); + expect(f.registry.visible()).toBe(true); + expect(f.registry.dispatch({ type: "command", command: "movelinesup" })).toBe(true); + f.state({ busy: true }); + expect(f.registry.visible()).toBe(true); + expect(f.registry.available(insert)).toBe(false); + f.registry.dispatch(insert); + await settle(); + expect(f.adapter.execute).not.toHaveBeenCalled(); + f.state({ enabled: false }); + expect(f.registry.visible()).toBe(false); + f.change({ type: "editor", hideQuickTools: false }); + expect(f.registry.visible()).toBe(true); + expect(f.registry.dispatch(insert)).toBe(false); + f.change({ type: "terminal", hideQuickTools: false }); + expect(f.registry.dispatch(insert)).toBe(false); + }); + it("captures once before focus moves and preserves sequential repeated input", async () => { + const f = setup(); + f.registry.capture(); f.registry.capture(); + for (let i = 0; i < 3; i++) f.registry.dispatch({ type: "text", text: String(i) }); + await settle(); + expect(f.adapter.captureSelection).toHaveBeenCalledOnce(); + expect(f.adapter.restoreSelection).toHaveBeenCalledOnce(); + expect(f.adapter.execute.mock.calls.map(([action]) => action.text)).toEqual(["0", "1", "2"]); + expect(f.adapter.focus).not.toHaveBeenCalled(); + }); + it("drops clipboard work and queued repeats after switching away and back", async () => { + let finish; + const f = setup(() => new Promise((resolve) => { finish = resolve; })); + f.registry.dispatch(insert); f.registry.dispatch(insert); + await settle(); + f.change({ type: "editor" }); f.change(f.original); + finish(insert); + await settle(); + expect(f.adapter.execute).not.toHaveBeenCalled(); + }); + it("cancels pending selection restoration when a dialog opens or the adapter closes", async () => { + for (const close of [false, true]) { + const f = setup(); let finish; + f.adapter.captureSelection.mockImplementation(() => new Promise((resolve) => { finish = resolve; })); + f.registry.capture(); f.registry.dispatch(insert); + await settle(); + if (close) f.dispose(); else f.registry.setBlocked(true); + finish({ anchor: 3 }); await settle(); + expect(f.adapter.restoreSelection).not.toHaveBeenCalled(); + expect(f.adapter.execute).not.toHaveBeenCalled(); + } + }); + it("isolates two custom tabs and makes stale cleanup harmless", async () => { + const f = setup(); const second = { hideQuickTools: true }, execute = vi.fn(); + f.registry.register(second, { ...f.adapter, execute }); + f.change(second); f.registry.dispatch(insert); await settle(); + expect(execute).toHaveBeenCalledOnce(); + expect(f.adapter.execute).not.toHaveBeenCalled(); + f.dispose(); f.dispose(); + expect(f.registry.has(second)).toBe(true); + }); + it("starts a fresh queue after cancellation even if the old clipboard never resolves", async () => { + let first = true; + const f = setup(action => { if (first) { first = false; return new Promise(() => {}); } return action; }); + f.registry.dispatch(insert); await settle(); + f.change({ type: "editor" }); f.change(f.original); + f.registry.dispatch(insert); await settle(); + expect(f.adapter.execute).toHaveBeenCalledOnce(); + }); + it("captures the updated caret for rapid taps and cancels deferred focus", async () => { + const f = setup(); let caret = 0; + f.adapter.captureSelection.mockImplementation(async () => caret); + f.adapter.restoreSelection.mockImplementation(async (value) => { caret = value; }); + f.adapter.execute.mockImplementation(async () => { caret++; }); + for (let i = 0; i < 4; i++) { f.registry.capture(); f.registry.dispatch(insert); } + await settle(); expect(caret).toBe(4); + f.registry.focus(); f.registry.cancel(); await settle(); + expect(f.adapter.focus).not.toHaveBeenCalled(); + }); + it("discards unused captures without cancelling an already queued edit", async () => { + const f = setup(); let finish, caret = 3; + f.adapter.captureSelection.mockImplementation(() => caret); + f.adapter.restoreSelection.mockImplementation(value => { caret = value; }); + f.adapter.execute.mockImplementationOnce(() => new Promise(resolve => { finish = resolve; })); + f.registry.capture(); f.registry.dispatch(insert); + await settle(); + const signal = f.adapter.execute.mock.calls[0][1].signal; + f.registry.capture(); f.registry.discardCapture(); + finish(); await settle(); + caret = 20; + f.registry.capture(); f.registry.dispatch(insert); + await settle(); + expect(f.adapter.restoreSelection.mock.calls).toEqual([[3], [20]]); + expect(f.adapter.execute).toHaveBeenCalledTimes(2); + expect(signal.aborted).toBe(false); + expect(f.adapter.cancel).not.toHaveBeenCalled(); + }); + it.each([{ busy: true }, { enabled: false }])("guards cancellation that publishes state %o and permits later cancellation", async (state) => { + const f = setup(); + f.registry.dispatch(insert); + await settle(); + const signal = f.adapter.execute.mock.calls[0][1].signal; + f.adapter.cancel.mockImplementation(() => f.state(state)); + expect(() => f.registry.cancel()).not.toThrow(); + expect(signal.aborted).toBe(true); + expect(f.adapter.cancel).toHaveBeenCalledOnce(); + f.state({ enabled: true, busy: false }); + f.registry.dispatch(insert); + await settle(); + expect(f.adapter.execute).toHaveBeenCalledTimes(2); + f.registry.cancel(); + expect(f.adapter.cancel).toHaveBeenCalledTimes(2); + }); + it("releases the cancellation guard if the plugin throws", () => { + const f = setup(); + f.adapter.cancel.mockImplementationOnce(() => { throw Error("plugin failure"); }); + expect(() => f.registry.cancel()).toThrow("plugin failure"); + expect(() => f.registry.cancel()).not.toThrow(); + expect(f.adapter.cancel).toHaveBeenCalledTimes(2); + }); + +}); diff --git a/tests/unit/quickToolsAdapterUi.test.js b/tests/unit/quickToolsAdapterUi.test.js new file mode 100644 index 0000000000..6a2d1450ca --- /dev/null +++ b/tests/unit/quickToolsAdapterUi.test.js @@ -0,0 +1,634 @@ +// @vitest-environment happy-dom +import { afterEach, expect, it, vi } from "vitest"; +import { loadSourceModule } from "../helpers/loadSourceModule"; + +function mockQuickTools() { + vi.doMock("components/quickTools", async () => { + const $footer = document.createElement("footer"); + $footer.innerHTML = `
    `; + const { default: items } = await vi.importActual( + "components/quickTools/items", + ); + const { id, action, value } = items.find((item) => item.id === "save"); + const save = document.createElement("button"); + Object.assign(save.dataset, { id, action, value }); + $footer.children[0].append(save); + return { + default: { + $footer, + $row1: $footer.children[0], + $row2: $footer.children[1], + $input: document.createElement("input"), + $toggler: document.createElement("button"), + }, + }; + }); +} +vi.mock("cm/commandRegistry", () => ({ + executeCommand: vi.fn(), + getRegisteredCommands: () => [], +})); +vi.mock("settings/searchSettings", () => ({ default: vi.fn() })); +vi.mock("dialogs/confirm", () => ({ default: vi.fn() })); +// Happy DOM lacks the legacy initKeyboardEvent API used by the app's polyfill. +vi.mock("utils/keyboardEvent", () => ({ + default: (type, init) => + new KeyboardEvent(type, { + ...init, + key: init.key || { 37: "ArrowLeft", 39: "ArrowRight" }[init.keyCode], + }), +})); +vi.mock("lib/settings", () => ({ + default: { + value: Object.freeze({ + quickTools: 2, + quicktoolsItems: Object.freeze([5, 20, 3, 4]), + floatingButton: false, + quickToolsTriggerMode: "click", + }), + QUICKTOOLS_TRIGGER_MODE_CLICK: "click", + on: vi.fn(), + }, +})); +vi.mock("lib/editorFile", () => ({ syncQuickToolsVisibility: vi.fn() })); +vi.mock("components/quickTools/items", () => ({ description: {} })); +vi.mock("components/tooltip", () => ({ + hideTooltip: vi.fn(), + showTooltip: vi.fn(), +})); +vi.mock("lib/config", () => ({ default: {} })); +vi.mock("cm/editorReadOnly", () => ({ focusEditorIfEditable: vi.fn() })); +vi.mock("@codemirror/commands", async (importOriginal) => ({ + ...(await importOriginal()), + undoDepth: () => 1, + redoDepth: () => 0, +})); + +const cleanups = []; +afterEach(async () => { + cleanups.splice(0).forEach((dispose) => dispose()); + document.body.replaceChildren(); + await vi.advanceTimersByTimeAsync(0); + vi.clearAllTimers(); + vi.restoreAllMocks(); + vi.useRealTimers(); + vi.unstubAllGlobals(); + vi.resetModules(); + vi.clearAllMocks(); + document.body.replaceChildren(); +}); + +async function setup(triggerMode = "click") { + vi.useFakeTimers(); + mockQuickTools(); + const listeners = new Map(); + const manager = { + activeFile: { type: "editor" }, + editor: { state: {} }, + on(events, listener) { + for (const event of [events].flat()) + listeners.set(event, [...(listeners.get(event) || []), listener]); + }, + }; + vi.stubGlobal("editorManager", manager); + vi.stubGlobal("root", document.body); + const { default: init } = await import("handlers/quickToolsInit"); + const { default: tools } = await import("components/quickTools"); + const { default: registry } = await import("lib/quickToolsAdapter"); + const { default: settings } = await import("lib/settings"); + const { syncQuickToolsVisibility } = await import("lib/editorFile"); + const { default: actions, key } = await import("handlers/quickTools"); + const { default: stack } = await import("lib/actionStack"); + settings.value = { ...settings.value, quickToolsTriggerMode: triggerMode }; + const switchTab = (tab, beforeNotify = () => {}) => { + manager.activeFile = tab; + beforeNotify(); + listeners.get("switch-file").forEach((fn) => fn()); + }; + init(); + vi.runOnlyPendingTimers(); + return { + manager, + tools, + registry, + settings, + syncQuickToolsVisibility, + switchTab, + actions, + key, + stack, + }; +} + +// Run the real host command mapping, replacing unrelated editor integrations. +function hostCommands(manager, exec) { + const dependencies = Object.fromEntries( + [ + "fileSystem", + "@codemirror/commands", + "@codemirror/language", + "@codemirror/lint", + "@codemirror/lsp-client", + "@codemirror/view", + "cm/editorReadOnly", + "cm/foldAwareLineCommands", + "cm/foldingCommands", + "cm/lsp", + "cm/lsp/references", + "components/symbolsPanel", + "components/toast", + "dialogs/prompt", + "handlers/quickTools", + "lib/settings", + "utils/Url", + ].map((id) => [id, {}]), + ); + return loadSourceModule( + "src/cm/commandRegistry.js", + { + ...dependencies, + "@codemirror/state": { Compartment: class {} }, + "cm/keyBindingUtils": { toCodeMirrorKey: () => null }, + "lib/keyBindings": { + __esModule: true, + default: {}, + APP_KEY_BINDING_NAMES: new Set(), + CODEMIRROR_COMMAND_NAMES: new Set(), + }, + }, + { editorManager: manager, acode: { exec } }, + ); +} + +it.each([ + true, + false, +])("routes the stock Save button through the host with canHandle=%s", async (supported) => { + const f = await adaptedSetup(); + f.adapter.canHandle = () => supported; + const save = vi.fn(); + f.manager.activeFile.save = save; + const exec = vi.fn(() => f.manager.activeFile.save()); + const { executeCommand } = await import("cm/commandRegistry"); + executeCommand.mockImplementation( + hostCommands(f.manager, exec).executeCommand, + ); + f.tools.$footer.querySelector('[data-id="save"]').click(); + await vi.advanceTimersByTimeAsync(0); + expect(exec).toHaveBeenCalledExactlyOnceWith("save"); + expect(save).toHaveBeenCalledOnce(); + expect(f.adapter.execute).not.toHaveBeenCalled(); +}); + +it.each([ + ["saveFileAs", "save-as"], + ["saveAllChanges", "save-all-changes"], + ["openCommandPalette", "command-palette"], +])("routes %s outside adapter availability", async (command, host) => { + const f = await adaptedSetup(); + f.setState({ busy: true }); + f.adapter.canHandle = () => false; + const exec = vi.fn(); + const { executeCommand } = await import("cm/commandRegistry"); + executeCommand.mockImplementation( + hostCommands(f.manager, exec).executeCommand, + ); + expect(f.actions("command", command)).toBe(true); + expect(exec).toHaveBeenCalledExactlyOnceWith(host); + expect(f.adapter.execute).not.toHaveBeenCalled(); +}); + +it("finishes capture before host Save without cancelling queued edits or refocusing over a dialog", async () => { + const f = await adaptedSetup(); + f.actions("ctrl"); + f.actions("key", 39); + const { executeCommand } = await import("cm/commandRegistry"); + const dialogInput = document.createElement("input"); + executeCommand.mockImplementation(() => { + expect(f.key.ctrl).toBe(false); + expect(document.activeElement).not.toBe(f.tools.$input); + document.body.append(dialogInput); + dialogInput.focus(); + return true; + }); + f.tools.$footer.querySelector('[data-id="save"]').click(); + f.tools.$input.dispatchEvent( + new InputEvent("beforeinput", { data: "s", cancelable: true }), + ); + await vi.advanceTimersByTimeAsync(0); + expect(f.adapter.execute).toHaveBeenCalledExactlyOnceWith( + expect.objectContaining({ key: "ArrowRight", ctrlKey: true }), + expect.any(Object), + ); + expect(f.adapter.cancel).not.toHaveBeenCalled(); + expect(f.adapter.focus).not.toHaveBeenCalled(); + expect(document.activeElement).toBe(dialogInput); +}); + +it("cancels only outgoing tabs through the switch handler and preserves incoming work and capture", async () => { + const f = await adaptedSetup(); + const first = f.manager.activeFile, + second = { type: "docs" }, + code = { type: "editor" }; + const next = { + ...f.adapter, + cancel: vi.fn(), + execute: vi.fn(), + captureSelection: () => 20, + restoreSelection: vi.fn(), + }; + cleanups.push(f.registry.register(second, next)); + f.switchTab(code); + expect(f.adapter.cancel).toHaveBeenCalledOnce(); + f.switchTab(first); + expect(f.adapter.cancel).toHaveBeenCalledOnce(); + f.actions("ctrl"); + f.switchTab(second, () => { + // Earlier switch listeners can enqueue work and capture before quicktools cleanup. + f.registry.dispatch({ type: "text", text: "a" }); + f.registry.capture(); + }); + f.registry.dispatch({ type: "text", text: "b" }); + await vi.advanceTimersByTimeAsync(0); + expect(f.key.ctrl).toBe(false); + expect(f.adapter.cancel).toHaveBeenCalledTimes(2); + expect(next.cancel).not.toHaveBeenCalled(); + expect(next.execute.mock.calls.map(([action]) => action.text)).toEqual([ + "a", + "b", + ]); + expect(next.restoreSelection).toHaveBeenCalledExactlyOnceWith(20); + expect( + next.execute.mock.calls.every(([, { signal }]) => !signal.aborted), + ).toBe(true); + f.switchTab(code); + expect(next.cancel).toHaveBeenCalledOnce(); +}); + +it.each([ + "busy", + "disabled", + "overlay", + "disposal", +])("does not repeat registry cancellation during %s UI cleanup", async (transition) => { + const f = await adaptedSetup(); + f.actions("ctrl"); + if (transition === "busy") f.setState({ busy: true }); + if (transition === "disabled") f.setState({ enabled: false }); + if (transition === "disposal") f.dispose(); + if (transition === "overlay") { + const overlay = document.createElement("div"); + overlay.className = "prompt"; + document.body.append(overlay); + } + await vi.advanceTimersByTimeAsync(0); + expect(f.adapter.cancel).toHaveBeenCalledOnce(); + expect(f.key.ctrl).toBe(false); +}); + +it("keeps stock items and preferences intact through adapter state and tab changes", async () => { + const { tools, registry, settings, syncQuickToolsVisibility, switchTab } = + await setup(); + const stock = () => + [...tools.$footer.querySelectorAll("[data-action]")].map( + (button) => button.outerHTML, + ); + const before = stock(), + preferences = JSON.stringify(settings.value); + let state = { enabled: true, busy: false }, + notify; + const word = { hideQuickTools: true }; + switchTab(word); + const dispose = registry.register(word, { + getState: () => state, + canHandle: (action) => action.command === "redo", + execute: vi.fn(), + subscribe: (fn) => { + notify = fn; + return () => {}; + }, + }); + expect(syncQuickToolsVisibility).toHaveBeenLastCalledWith(word); + expect(tools.$footer.querySelector('[data-id="undo"]').disabled).toBe(true); + expect(tools.$footer.querySelector('[data-id="redo"]').disabled).toBe(false); + state = { ...state, busy: true }; + notify(); + expect(tools.$footer.querySelector('[data-id="redo"]').disabled).toBe(true); + expect(stock()).toEqual(before); + switchTab({ type: "editor" }); + vi.runOnlyPendingTimers(); + expect(tools.$footer.querySelector('[data-id="undo"]').disabled).toBe(false); + expect(tools.$footer.querySelector('[data-id="redo"]').disabled).toBe(true); + // Loading another tab must not reuse the previous document's visibility cache. + const second = { hideQuickTools: true }; + switchTab(second); + const disposeSecond = registry.register(second, { + getState: () => ({ enabled: true }), + canHandle: () => false, + execute: vi.fn(), + subscribe: () => () => {}, + }); + expect(syncQuickToolsVisibility).toHaveBeenLastCalledWith(second); + dispose(); + expect(stock()).toEqual(before); + expect(JSON.stringify(settings.value)).toBe(preferences); + disposeSecond(); +}); + +async function adaptedSetup(triggerMode) { + const f = await setup(triggerMode); + const tab = { type: "docs" }; + f.switchTab(tab); + const editor = document.createElement("textarea"); + editor.value = "0123456789"; + document.body.append(editor); + editor.focus(); + editor.setSelectionRange(3, 3); + let state = { enabled: true }, + notify; + const adapter = { + getState: () => state, + canHandle: (action) => action.command !== "unsupported", + subscribe: (listener) => { + notify = listener; + return () => {}; + }, + captureSelection: vi.fn(() => editor.selectionStart), + restoreSelection: vi.fn((position) => + editor.setSelectionRange(position, position), + ), + execute: vi.fn((action) => { + if (action.type === "text") editor.setRangeText(action.text); + }), + focus: vi.fn(() => editor.focus()), + cancel: vi.fn(), + }; + const dispose = f.registry.register(tab, adapter); + cleanups.push(dispose); + const button = f.tools.$footer.querySelector('[data-id="move"]'); + button.dataset.action = "insert"; + button.dataset.value = "x"; + const pointer = (type, target = button) => + target.dispatchEvent(new PointerEvent(type, { bubbles: true })); + const click = () => + button.dispatchEvent( + new MouseEvent("click", { bubbles: true, cancelable: true }), + ); + return { + ...f, + editor, + adapter, + button, + pointer, + click, + dispose, + setState(value) { + state = { ...state, ...value }; + notify(); + }, + }; +} + +it.each([ + "keydown", + "beforeinput", + "input", + "compositionend", + "composition", +])("finishes %s shortcut capture, absorbs trailing events, and resumes normal typing", async (type) => { + const f = await adaptedSetup(); + f.actions("ctrl"); + const input = f.tools.$input; + if (type === "composition") { + input.dispatchEvent( + new KeyboardEvent("keydown", { key: "Process", isComposing: true }), + ); + } + input.value = "c"; + const event = + type === "keydown" + ? new KeyboardEvent(type, { key: "c", cancelable: true }) + : new InputEvent(type === "composition" ? "beforeinput" : type, { + data: "c", + inputType: + type === "composition" ? "insertCompositionText" : "insertText", + isComposing: type === "composition", + cancelable: true, + }); + input.dispatchEvent(event); + await vi.advanceTimersByTimeAsync(0); + expect(f.adapter.execute).toHaveBeenCalledExactlyOnceWith( + expect.objectContaining({ type: "key", key: "c", ctrlKey: true }), + expect.any(Object), + ); + expect(f.key.ctrl).toBe(false); + expect(document.activeElement).toBe(f.editor); + for (const type of ["beforeinput", "input", "compositionend"]) { + input.value = "c"; + input.dispatchEvent(new InputEvent(type, { data: "c", cancelable: true })); + } + for (const text of ["x", "y"]) { + const target = document.activeElement; + if ( + target.dispatchEvent( + new InputEvent("beforeinput", { + data: text, + inputType: "insertText", + cancelable: true, + }), + ) + ) { + const caret = target.selectionStart + text.length; + target.setRangeText(text); + target.setSelectionRange(caret, caret); + } + } + await vi.advanceTimersByTimeAsync(0); + expect(f.editor.value).toBe("012xy3456789"); + expect(input.value).toBe(""); + expect(f.adapter.execute).toHaveBeenCalledOnce(); + expect(f.adapter.cancel).not.toHaveBeenCalled(); +}); + +it("completes special keys and toolbar input while preserving modifier arrow repeats", async () => { + const f = await adaptedSetup(); + for (const key of ["ArrowLeft", "Backspace"]) { + f.actions("ctrl"); + f.tools.$input.dispatchEvent( + new KeyboardEvent("keydown", { key, cancelable: true }), + ); + await vi.advanceTimersByTimeAsync(0); + expect(f.key.ctrl).toBe(false); + expect(document.activeElement).toBe(f.editor); + } + f.actions("ctrl"); + f.actions("shift"); + f.actions("key", 39); + f.actions("key", 39); + await vi.advanceTimersByTimeAsync(0); + expect( + f.adapter.execute.mock.calls.slice(-2).map(([action]) => action), + ).toEqual([ + expect.objectContaining({ + key: "ArrowRight", + ctrlKey: true, + shiftKey: true, + }), + expect.objectContaining({ + key: "ArrowRight", + ctrlKey: true, + shiftKey: true, + }), + ]); + expect(f.key.ctrl && f.key.shift).toBe(true); + f.actions("insert", "x"); + await vi.advanceTimersByTimeAsync(0); + expect(f.key.ctrl || f.key.shift).toBe(false); + expect(document.activeElement).toBe(f.editor); + expect(f.adapter.cancel).not.toHaveBeenCalled(); +}); + +it.each([ + "no focus callback", + "tab switch", + "overlay", + "busy", + "disabled", + "disposal", +])("releases shortcut input without stale focus after %s", async (transition) => { + const f = await adaptedSetup(); + f.actions("ctrl"); + f.tools.$input.dispatchEvent( + new InputEvent("beforeinput", { data: "c", cancelable: true }), + ); + if (transition === "no focus callback") delete f.adapter.focus; + if (transition === "tab switch") f.switchTab({ type: "editor" }); + if (transition === "overlay") { + const overlay = document.createElement("div"); + overlay.className = "prompt"; + document.body.append(overlay); + } + if (transition === "busy") f.setState({ busy: true }); + if (transition === "disabled") f.setState({ enabled: false }); + if (transition === "disposal") f.dispose(); + await vi.advanceTimersByTimeAsync(0); + expect(document.activeElement).not.toBe(f.tools.$input); + if (f.adapter.focus) expect(f.adapter.focus).not.toHaveBeenCalled(); +}); + +it.each([ + "pointercancel", + "scroll", + "outside pointer", + "outside focus", + "unsupported", + "unused gesture", +])("drops selection after %s without disturbing queued edits", async (transition) => { + const f = await adaptedSetup(); + f.pointer("pointerdown"); + if (transition === "pointercancel") f.pointer("pointercancel"); + if (transition === "scroll") f.tools.$row1.dispatchEvent(new Event("scroll")); + if (transition === "outside pointer") f.pointer("pointerdown", f.editor); + if (transition === "outside focus") { + f.button.focus(); + f.editor.focus(); + } + if (transition === "unsupported") f.actions("command", "unsupported"); + f.editor.setSelectionRange(8, 8); + f.pointer("pointerdown"); + f.click(); + await vi.advanceTimersByTimeAsync(0); + expect(f.editor.value).toBe("01234567x89"); + expect(f.adapter.cancel).not.toHaveBeenCalled(); +}); + +it("retains touch selection until dispatch and drops a cancelled touch", async () => { + const f = await adaptedSetup("touch"); + vi.spyOn(document, "elementFromPoint").mockReturnValue(f.button); + const touch = (type) => + f.button.dispatchEvent( + new TouchEvent(type, { + bubbles: true, + cancelable: true, + changedTouches: [{ clientX: 0, clientY: 0 }], + }), + ); + f.pointer("pointerdown"); + touch("touchstart"); + touch("touchcancel"); + f.editor.setSelectionRange(8, 8); + f.pointer("pointerdown"); + touch("touchstart"); + // Simulate selection being lost when the toolbar takes focus. + f.editor.setSelectionRange(0, 0); + touch("touchend"); + await vi.advanceTimersByTimeAsync(0); + expect(f.editor.value).toBe("01234567x89"); +}); + +it("routes modifier input and cancels capture on state, overlay, tab and disposal changes without touching the Back stack", async () => { + const { tools, registry, switchTab, actions, key, stack } = await setup(); + const entry = { id: "navigation", action: vi.fn() }; + stack.push(entry); + const mutations = ["push", "remove", "pop"].map((method) => + vi.spyOn(stack, method), + ); + const word = {}; + switchTab(word); + const execute = vi.fn(); + let busy = false, + notify; + const dispose = registry.register(word, { + getState: () => ({ enabled: true, busy }), + canHandle: () => true, + subscribe: (listener) => { + notify = listener; + return () => {}; + }, + execute, + }); + expect(actions("ctrl")).toBe(true); + tools.$input.dispatchEvent( + new InputEvent("beforeinput", { + inputType: "insertText", + data: "c", + cancelable: true, + }), + ); + await vi.advanceTimersByTimeAsync(0); + expect(execute).toHaveBeenCalledWith( + expect.objectContaining({ type: "key", key: "c", ctrlKey: true }), + expect.any(Object), + ); + expect(key.ctrl).toBe(false); + + const checkCancellation = (transition) => { + expect(actions("ctrl")).toBe(true); + tools.$input.value = "pending"; + transition(); + expect(key.ctrl).toBe(false); + expect(tools.$input.value).toBe(""); + }; + checkCancellation(() => { + busy = true; + notify(); + }); + busy = false; + notify(); + const overlay = document.createElement("div"); + overlay.className = "prompt"; + checkCancellation(() => { + document.body.append(overlay); + overlay.dispatchEvent(new PointerEvent("pointerdown", { bubbles: true })); + }); + overlay.remove(); + document.body.dispatchEvent( + new PointerEvent("pointerdown", { bubbles: true }), + ); + checkCancellation(() => switchTab({ type: "editor" })); + switchTab(word); + checkCancellation(dispose); + expect(stack.length).toBe(1); + expect(stack.get(entry.id)).toBe(entry); + mutations.forEach((method) => expect(method).not.toHaveBeenCalled()); +}); diff --git a/tests/unit/quickToolsOverlays.test.js b/tests/unit/quickToolsOverlays.test.js new file mode 100644 index 0000000000..99898b88f9 --- /dev/null +++ b/tests/unit/quickToolsOverlays.test.js @@ -0,0 +1,94 @@ +// @vitest-environment happy-dom +import { afterEach, expect, it, vi } from "vitest"; +import { createQuickToolsAdapterRegistry } from "../../src/lib/quickToolsAdapter"; +import { + hasQuickToolsOverlay, + watchQuickToolsOverlays, +} from "../../src/lib/quickToolsOverlays"; +let dispose; +afterEach(() => { + dispose?.(); + document.body.replaceChildren(); +}); +const settle = () => new Promise((resolve) => setTimeout(resolve, 0)); +it("cancels clipboard and repeats on native overlays without observing editor content or changing the Back stack", async () => { + let tab = {}, + finish; + const registry = createQuickToolsAdapterRegistry( + () => tab, + (action) => + new Promise((resolve) => { + finish = () => resolve(action); + }), + hasQuickToolsOverlay, + ); + const execute = vi.fn(), + cancel = vi.fn(); + const unregister = registry.register(tab, { + getState: () => ({ enabled: true }), + canHandle: () => true, + subscribe: () => () => {}, + execute, + }); + dispose = watchQuickToolsOverlays(registry, cancel); + registry.dispatch({ type: "text", text: "pending" }); + await settle(); + const prompt = document.createElement("div"); + prompt.className = "prompt"; + document.body.append(prompt); + await settle(); + expect(cancel).toHaveBeenCalledOnce(); + expect(registry.available({ type: "text" })).toBe(false); + prompt.remove(); + await settle(); + finish(); + await settle(); + expect(execute).not.toHaveBeenCalled(); + const content = document.createElement("div"); + document.body.append(content); + await settle(); + content.append(document.createElement("div")); + await settle(); + expect(cancel).toHaveBeenCalledOnce(); + for (const type of ["editor", "terminal"]) { + tab = { type }; + registry.sync(); + document.body.append(prompt); + await settle(); + expect(registry.dispatch({ type: "text" })).toBe(false); + prompt.remove(); + } + unregister(); + expect(cancel).toHaveBeenCalledOnce(); +}); +it("checks an overlay synchronously before dispatch and does not refocus into a busy adapter", async () => { + const tab = {}, + execute = vi.fn(), + focus = vi.fn(); + let busy = false; + const registry = createQuickToolsAdapterRegistry( + () => tab, + undefined, + hasQuickToolsOverlay, + ); + registry.register(tab, { + getState: () => ({ enabled: true, busy }), + canHandle: () => true, + subscribe: () => () => {}, + execute, + focus, + }); + const palette = document.createElement("div"); + palette.id = "palette"; + document.body.append(palette); + registry.dispatch({ type: "text", text: "x" }); + registry.focus(); + await settle(); + expect(execute).not.toHaveBeenCalled(); + expect(focus).not.toHaveBeenCalled(); + palette.remove(); + busy = true; + registry.focus(); + await settle(); + expect(focus).not.toHaveBeenCalled(); +}); diff --git a/tests/unit/remoteFilePreview.test.js b/tests/unit/remoteFilePreview.test.js index f82fe47f6c..ed4debcae2 100644 --- a/tests/unit/remoteFilePreview.test.js +++ b/tests/unit/remoteFilePreview.test.js @@ -19,10 +19,10 @@ describe("readRemoteFilePreview", () => { readRemoteFilePreview({ editorCache, transportCache, - encoding: "UTF-8", + encoding: "utf-16le", }), ).resolves.toEqual({ editorCacheExists: true, text: "unsaved" }); - expect(editorCache.readFile).toHaveBeenCalledWith("UTF-8"); + expect(editorCache.readFile).toHaveBeenCalledWith("utf-8"); expect(transportCache.exists).not.toHaveBeenCalled(); }); diff --git a/tests/unit/restoreFiles.test.js b/tests/unit/restoreFiles.test.js index 339a347111..18a8eee3e9 100644 --- a/tests/unit/restoreFiles.test.js +++ b/tests/unit/restoreFiles.test.js @@ -53,7 +53,7 @@ describe("restored file loading", () => { expect(completed).toBe(true); }); - it.each(["ftp", "sftp", "http", "https"])( + it.each(["ftp", "sftp", "http", "https", "gh", "plugin", "custom"])( "does not block startup on an unresolved %s tab", async (protocol) => { await restoreFiles([ diff --git a/tests/unit/saveCommands.test.js b/tests/unit/saveCommands.test.js new file mode 100644 index 0000000000..2576fdf490 --- /dev/null +++ b/tests/unit/saveCommands.test.js @@ -0,0 +1,121 @@ +import { expect, it, vi } from "vitest"; +import { loadSourceModule } from "../helpers/loadSourceModule"; + +function setup(files) { + const manager = { files, activeFile: files[0], getFile: id => files.find(file => file.id === id) }; + const toast = vi.fn(), error = vi.fn(); + const dependencies = Object.fromEntries([ + "fileSystem", "@codemirror/commands", "cm/editorReadOnly", "components/sidebar", "dialogs/prompt", "handlers/quickTools", "lib/recents", "utils/color/regex", "utils/Url", "./checkFiles", "./config", "./editorFile", "./lazyImports", "./openFile", "./openFolder", "./run", "./saveState", "./settings", "./showFileInfo", + ].map(id => [id, {}])); + const module = loadSourceModule("src/lib/commands.js", { + ...dependencies, "dialogs/confirm": async () => true, "dialogs/select": async () => "save", "utils/helpers": { error }, + }, { editorManager: manager, strings: {}, toast }); + return { ...module, manager, toast, error }; +} +function tab(id, type = "docs") { + const file = { id, type, canSave: type === "docs" || type === "editor", isUnsaved: true, remove: vi.fn(async () => true) }; + file.save = vi.fn(async () => { file.isUnsaved = false; return true; }); + file.saveAs = vi.fn(async () => true); + file.hasUnsavedChanges = () => file.isUnsaved; + return file; +} +it("routes standard Save and Save As to the captured tab and leaves terminals ineligible", async () => { + const one = tab("one"), two = tab("two"), code = tab("code", "editor"), terminal = tab("terminal", "terminal"); + const f = setup([one, two, code, terminal]); + for (const file of [one, two, code]) { + f.manager.activeFile = file; + expect(f.canSaveFile(file)).toBe(true); + await f.default.save(); await f.default["save-as"](); + expect(file.save).toHaveBeenCalledOnce(); expect(file.saveAs).toHaveBeenCalledOnce(); + } + f.manager.activeFile = terminal; + await f.default.save(); await f.default["save-as"](); + expect(terminal.save).not.toHaveBeenCalled(); +}); +it("does not report custom-tab success on cancellation or failure", async () => { + const file = tab("one"), f = setup([file]); + file.save.mockResolvedValueOnce(false).mockRejectedValueOnce(Error("full")); + await f.default.save(true); await f.default.save(true); + expect(f.toast).not.toHaveBeenCalled(); expect(f.error).toHaveBeenCalledOnce(); + await f.default.save(true); expect(f.toast).toHaveBeenCalledOnce(); +}); +it("does not save pending editors or report a cancelled editor save as successful", async () => { + const file = tab("pending", "editor"), f = setup([file]); + file.canSave = false; + await f.default.save(true); await f.default["save-as"](true); + expect(file.save).not.toHaveBeenCalled(); expect(file.saveAs).not.toHaveBeenCalled(); + file.canSave = true; + file.save.mockResolvedValue(false); file.saveAs.mockResolvedValue(false); + await f.default.save(true); await f.default["save-as"](true); + expect(f.toast).not.toHaveBeenCalled(); +}); +it("saves sequentially without clearing flags and stops at cancellation or newer edits", async () => { + const one = tab("one"), two = tab("two"), code = tab("code", "editor"); + const f = setup([one, two, code]); + let release; + one.save.mockImplementationOnce(() => new Promise(resolve => { release = () => { one.isUnsaved = false; resolve(true); }; })); + const saving = f.default["save-all-changes"](); + await vi.waitFor(() => expect(one.save).toHaveBeenCalledOnce()); + expect(one.isUnsaved).toBe(true); expect(two.save).not.toHaveBeenCalled(); + two.save.mockResolvedValueOnce(false); + release(); expect(await saving).toBe(false); + expect(two.isUnsaved).toBe(true); expect(code.save).not.toHaveBeenCalled(); + two.save.mockResolvedValueOnce(true); // A newer edit remains dirty after the write. + expect(await f.default["save-all-changes"]()).toBe(false); + expect(code.save).not.toHaveBeenCalled(); + expect(await f.default["save-all-changes"]()).toBe(true); + expect(code.isUnsaved).toBe(false); +}); +it.each([false, true, "failure"])("save-and-close keeps edits after an unsuccessful save (%s)", async outcome => { + const file = tab("one"), f = setup([file]); + if (outcome === "failure") file.save.mockRejectedValueOnce(Error("disk full")); + else file.save.mockResolvedValueOnce(outcome); + const result = f.default["close-all-tabs"](); + if (outcome === "failure") await expect(result).rejects.toThrow("disk full"); + else await result; + expect(file.remove).not.toHaveBeenCalled(); + expect(file.isUnsaved).toBe(true); +}); + +it.each(["terminal", "editor"])("skips an unsavable dirty %s while saving eligible tabs", async type => { + for (const command of ["save-all-changes", "close-all-tabs"]) { + const unsupported = tab("unsupported", type), one = tab("one"), two = tab("two", "editor"); + unsupported.canSave = false; + const files = [unsupported, one, two]; + const f = setup(files); + expect(await f.default[command]()).toBe(false); + expect(unsupported.save).not.toHaveBeenCalled(); + expect(unsupported.remove).not.toHaveBeenCalled(); + expect(unsupported.isUnsaved).toBe(true); + for (const file of [one, two]) { + expect(file.save).toHaveBeenCalledOnce(); + expect(file.isUnsaved).toBe(false); + expect(file.remove).toHaveBeenCalledTimes(command === "close-all-tabs" ? 1 : 0); + } + } +}); + +it.each([false, true, "failure"])("still stops after a savable write fails or remains dirty (%s)", async outcome => { + for (const command of ["save-all-changes", "close-all-tabs"]) { + const unsupported = tab("unsupported", "terminal"), failed = tab("failed"), later = tab("later", "editor"); + const f = setup([unsupported, failed, later]); + if (outcome === "failure") failed.save.mockRejectedValueOnce(Error("disk full")); + else failed.save.mockResolvedValueOnce(outcome); + const saving = f.default[command](); + if (outcome === "failure") await expect(saving).rejects.toThrow("disk full"); + else expect(await saving).toBe(false); + expect(failed.remove).not.toHaveBeenCalled(); + expect(later.save).not.toHaveBeenCalled(); + expect(later.remove).not.toHaveBeenCalled(); + } +}); + +it("keeps pinned tabs untouched by save-and-close and reports complete success for eligible tabs", async () => { + const pinned = tab("pinned"), file = tab("file"); + pinned.pinned = true; + const f = setup([pinned, file]); + expect(await f.default["close-all-tabs"]()).toBe(true); + expect(pinned.save).not.toHaveBeenCalled(); + expect(pinned.remove).not.toHaveBeenCalled(); + expect(file.remove).toHaveBeenCalledOnce(); +}); From 33a4084935b6b08bec23f0311c7988d0ba4e23d2 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Fri, 18 Sep 2026 22:58:05 +0530 Subject: [PATCH 126/195] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27c08194ba..c3c053f23e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Check spelling - uses: crate-ci/typos@master + uses: crate-ci/typos@main with: config: ./_typos.toml From 2803ddab73162c033857ac5fec03c7fe9035d0a8 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Fri, 18 Sep 2026 17:37:49 +0000 Subject: [PATCH 127/195] fix(editor): make fold all reliable for large files (#2912) * fix(editor): make fold all reliable for large files * fix --- src/cm/foldingCommands.js | 188 +++++++++++++++++++++++------ tests/unit/foldingCommands.test.js | 150 +++++++++++++++++++++++ 2 files changed, 299 insertions(+), 39 deletions(-) create mode 100644 tests/unit/foldingCommands.test.js diff --git a/src/cm/foldingCommands.js b/src/cm/foldingCommands.js index c3eef13349..17f6bab321 100644 --- a/src/cm/foldingCommands.js +++ b/src/cm/foldingCommands.js @@ -6,13 +6,20 @@ import { foldNodeProp, foldService, foldState, + forceParsing, + language, + StreamLanguage, syntaxTree, + syntaxTreeAvailable, unfoldEffect, } from "@codemirror/language"; import { StateEffect } from "@codemirror/state"; -const FULL_PARSE_BUDGET_MS = 100; -const INCOMPLETE_PARSE_MARGIN = 50; +const INITIAL_PARSE_BUDGET_MS = 12; +const IDLE_PARSE_BUDGET_MS = 10; +const MIN_IDLE_PARSE_BUDGET_MS = 2; +const IDLE_CALLBACK_TIMEOUT_MS = 50; +const pendingFoldAllJobs = new WeakMap(); function findServiceFold(state, line) { for (const service of state.facet(foldService)) { @@ -22,68 +29,104 @@ function findServiceFold(state, line) { return null; } -function addSyntaxFolds(state, tree, line, addRange) { - if (!tree || tree.length < line.to) return; +function scheduleIdleWork(callback) { + if ( + typeof window !== "undefined" && + typeof window.requestIdleCallback === "function" + ) { + return { + kind: "idle", + id: window.requestIdleCallback(callback, { + timeout: IDLE_CALLBACK_TIMEOUT_MS, + }), + }; + } - for (let iter = tree.resolveStack(line.to, 1); iter; iter = iter.next) { - const node = iter.node; - if (node.to <= line.to || node.from > line.to) continue; - const lastChild = node.lastChild; - if ( - tree.length !== state.doc.length && - node.to >= tree.length - INCOMPLETE_PARSE_MARGIN && - lastChild?.to === node.to && - lastChild.type.isError - ) { - continue; - } + return { + kind: "timeout", + id: setTimeout(() => callback(null), 0), + }; +} - const fold = node.type.prop(foldNodeProp); - if (!fold) continue; +function cancelIdleWork(handle) { + if (!handle) return; + if ( + handle.kind === "idle" && + typeof window !== "undefined" && + typeof window.cancelIdleCallback === "function" + ) { + window.cancelIdleCallback(handle.id); + } else { + clearTimeout(handle.id); + } +} - const range = fold(node, state); - if ( - range && - range.from >= line.from && - range.from <= line.to && - range.to > line.to - ) { - addRange(range); - } +function cancelPendingFoldAll(view) { + const job = pendingFoldAllJobs.get(view); + if (!job) return; + job.cancelled = true; + cancelIdleWork(job.handle); + pendingFoldAllJobs.delete(view); +} + +function getIdleParseBudget(deadline) { + if (!deadline || typeof deadline.timeRemaining !== "function") { + return IDLE_PARSE_BUDGET_MS; } + return Math.max( + MIN_IDLE_PARSE_BUDGET_MS, + Math.min(IDLE_PARSE_BUDGET_MS, Math.floor(deadline.timeRemaining())), + ); } -/** - * Fold every foldable block, including nested blocks. CodeMirror's built-in - * foldAll intentionally skips nested ranges after finding a top-level fold. - */ -export function foldAllCodeBlocks(view) { - const { state } = view; - const tree = - ensureSyntaxTree(state, state.doc.length, FULL_PARSE_BUDGET_MS) ?? - syntaxTree(state); +function addSyntaxFolds(state, tree, addRange) { + if (!tree || tree.length < state.doc.length) return; + + tree.iterate({ + enter(ref) { + const node = ref.node; + const fold = node.type.prop(foldNodeProp); + if (!fold) return; + + const range = fold(node, state); + if (!range) return; + const line = state.doc.lineAt(range.from); + if (range.from <= line.to && range.to > line.to) addRange(range); + }, + }); +} + +function collectFoldEffects(state, tree) { const existing = new Set(); foldedRanges(state).between(0, state.doc.length, (from, to) => { existing.add(`${from}:${to}`); }); - const effects = []; + const ranges = []; const discovered = new Set(); const addRange = (range) => { const id = `${range.from}:${range.to}`; if (existing.has(id) || discovered.has(id)) return; discovered.add(id); - effects.push(foldEffect.of(range)); + ranges.push(range); }; for (let lineNumber = 1; lineNumber <= state.doc.lines; lineNumber += 1) { const line = state.doc.line(lineNumber); const serviceRange = findServiceFold(state, line); if (serviceRange) addRange(serviceRange); - else addSyntaxFolds(state, tree, line, addRange); } + addSyntaxFolds(state, tree, addRange); + + return ranges + .sort((a, b) => a.from - b.from || a.to - b.to) + .map((range) => foldEffect.of(range)); +} +function applyAllFolds(view, tree) { + const { state } = view; + const effects = collectFoldEffects(state, tree); if (!effects.length) return false; if (!state.field(foldState, false)) { // Install the state field first so it can consume the fold effects in @@ -94,8 +137,75 @@ export function foldAllCodeBlocks(view) { return true; } +function scheduleProgressiveFoldAll(view, document) { + const job = { + cancelled: false, + document, + handle: null, + }; + pendingFoldAllJobs.set(view, job); + + const continueParsing = (deadline) => { + job.handle = null; + if ( + job.cancelled || + pendingFoldAllJobs.get(view) !== job || + view.state.doc !== document + ) { + pendingFoldAllJobs.delete(view); + return; + } + + try { + const complete = + syntaxTreeAvailable(view.state, document.length) || + forceParsing(view, document.length, getIdleParseBudget(deadline)); + + if (complete) { + pendingFoldAllJobs.delete(view); + applyAllFolds(view, syntaxTree(view.state)); + return; + } + } catch (error) { + console.error("Failed to finish parsing for Fold all.", error); + pendingFoldAllJobs.delete(view); + return; + } + + job.handle = scheduleIdleWork(continueParsing); + }; + + job.handle = scheduleIdleWork(continueParsing); +} + +/** + * Fold every foldable block, including nested blocks. Small and already-parsed + * documents fold synchronously. Large documents finish parsing in short idle + * slices before all ranges are collected in one pass and one transaction. + */ +export function foldAllCodeBlocks(view) { + cancelPendingFoldAll(view); + const { state } = view; + const activeLanguage = state.facet(language); + + if (!activeLanguage || activeLanguage instanceof StreamLanguage) { + return applyAllFolds(view, syntaxTree(state)); + } + + const tree = ensureSyntaxTree( + state, + state.doc.length, + INITIAL_PARSE_BUDGET_MS, + ); + if (tree) return applyAllFolds(view, tree); + + scheduleProgressiveFoldAll(view, state.doc); + return true; +} + /** Unfold every stored fold, including nested folds created above. */ export function unfoldAllCodeBlocks(view) { + cancelPendingFoldAll(view); const effects = []; foldedRanges(view.state).between(0, view.state.doc.length, (from, to) => { effects.push(unfoldEffect.of({ from, to })); diff --git a/tests/unit/foldingCommands.test.js b/tests/unit/foldingCommands.test.js new file mode 100644 index 0000000000..5e94fb0e4e --- /dev/null +++ b/tests/unit/foldingCommands.test.js @@ -0,0 +1,150 @@ +// @vitest-environment happy-dom + +import { javascript } from "@codemirror/lang-javascript"; +import { codeFolding, foldedRanges } from "@codemirror/language"; +import { EditorState } from "@codemirror/state"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; + +const parsing = vi.hoisted(() => ({ + ensureSyntaxTree: vi.fn(), + forceParsing: vi.fn(), + syntaxTreeAvailable: vi.fn(), +})); + +vi.mock("@codemirror/language", async (importOriginal) => ({ + ...(await importOriginal()), + ensureSyntaxTree: parsing.ensureSyntaxTree, + forceParsing: parsing.forceParsing, + syntaxTreeAvailable: parsing.syntaxTreeAvailable, +})); + +const { foldAllCodeBlocks, unfoldAllCodeBlocks } = await import( + "cm/foldingCommands" +); + +function createView() { + let state = EditorState.create({ + doc: [ + "function outer() {", + "\tif (ready) {", + '\t\tconsole.log("ready");', + "\t}", + "}", + ].join("\n"), + extensions: [javascript(), codeFolding()], + }); + + return { + get state() { + return state; + }, + dispatch(spec) { + state = state.update(spec).state; + }, + }; +} + +function countFoldedRanges(state) { + let count = 0; + foldedRanges(state).between(0, state.doc.length, () => { + count += 1; + }); + return count; +} + +describe("progressive Fold all", () => { + let idleCallbacks; + let nextIdleId; + + beforeEach(() => { + idleCallbacks = new Map(); + nextIdleId = 1; + window.requestIdleCallback = vi.fn((callback) => { + const id = nextIdleId; + nextIdleId += 1; + idleCallbacks.set(id, callback); + return id; + }); + window.cancelIdleCallback = vi.fn((id) => { + idleCallbacks.delete(id); + }); + + parsing.ensureSyntaxTree.mockReset().mockReturnValue(null); + parsing.forceParsing.mockReset(); + parsing.syntaxTreeAvailable.mockReset().mockReturnValue(false); + }); + + afterEach(() => { + vi.restoreAllMocks(); + }); + + function takeNextIdleCallback() { + const next = idleCallbacks.entries().next().value; + expect(next).toBeDefined(); + const [id, callback] = next; + idleCallbacks.delete(id); + return callback; + } + + function runNextIdleCallback() { + takeNextIdleCallback()({ + didTimeout: false, + timeRemaining: () => 8, + }); + } + + it("folds after parsing completes across multiple idle slices", () => { + const view = createView(); + parsing.forceParsing + .mockReturnValueOnce(false) + .mockReturnValueOnce(false) + .mockReturnValueOnce(true); + + expect(foldAllCodeBlocks(view)).toBe(true); + expect(countFoldedRanges(view.state)).toBe(0); + + runNextIdleCallback(); + runNextIdleCallback(); + expect(countFoldedRanges(view.state)).toBe(0); + + runNextIdleCallback(); + expect(parsing.forceParsing).toHaveBeenCalledTimes(3); + expect(countFoldedRanges(view.state)).toBeGreaterThan(0); + expect(idleCallbacks.size).toBe(0); + }); + + it("cancels pending parsing when the document changes", () => { + const view = createView(); + parsing.forceParsing.mockReturnValue(false); + + foldAllCodeBlocks(view); + runNextIdleCallback(); + expect(parsing.forceParsing).toHaveBeenCalledTimes(1); + + view.dispatch({ changes: { from: 0, insert: "// changed\n" } }); + runNextIdleCallback(); + + expect(parsing.forceParsing).toHaveBeenCalledTimes(1); + expect(countFoldedRanges(view.state)).toBe(0); + expect(idleCallbacks.size).toBe(0); + }); + + it("cancels pending parsing when Unfold all runs", () => { + const view = createView(); + parsing.forceParsing.mockReturnValue(false); + + foldAllCodeBlocks(view); + const pendingCallback = takeNextIdleCallback(); + expect(unfoldAllCodeBlocks(view)).toBe(false); + + pendingCallback({ + didTimeout: false, + timeRemaining: () => 8, + }); + + expect(window.cancelIdleCallback).toHaveBeenCalledTimes(1); + expect(parsing.forceParsing).not.toHaveBeenCalled(); + expect(countFoldedRanges(view.state)).toBe(0); + expect(idleCallbacks.size).toBe(0); + }); +}); From 6d4f5eda7d942feedeb9054ff7a96b8562a25717 Mon Sep 17 00:00:00 2001 From: Jamal Kamaladdinoglu Date: Sat, 19 Sep 2026 21:56:41 +0000 Subject: [PATCH 128/195] chore: add Azerbaijani (az) translation (#2918) --- _typos.toml | 1 + src/lang/az-az.json | 888 ++++++++++++++++++++++++++++++++++++++++++++ src/lib/lang.js | 6 + 3 files changed, 895 insertions(+) create mode 100644 src/lang/az-az.json diff --git a/_typos.toml b/_typos.toml index a5d72f6083..2a74f47eb8 100644 --- a/_typos.toml +++ b/_typos.toml @@ -13,6 +13,7 @@ extend-exclude = [ "plugins", "platforms", "src/lang/ar-ye.json", + "src/lang/az-az.json", "src/lang/be-by.json", "src/lang/bn-bd.json", "src/lang/cs-cz.json", diff --git a/src/lang/az-az.json b/src/lang/az-az.json new file mode 100644 index 0000000000..743e28f05d --- /dev/null +++ b/src/lang/az-az.json @@ -0,0 +1,888 @@ +{ + "lang": "Azərbaycanca", + "about": "Haqqında", + "active files": "Aktiv fayllar", + "alert": "Xəbərdarlıq", + "app theme": "Tətbiqin teması", + "autocorrect": "Avtomatik düzəliş aktivləşdirilsin?", + "autosave": "Avtomatik yadda saxlama", + "cancel": "Ləğv et", + "change language": "Dili dəyiş", + "choose color": "Rəng seç", + "clear": "Təmizlə", + "close app": "Tətbiq bağlansın?", + "commit message": "Dəyişiklik qeydinin mesajı", + "console": "Konsol", + "conflict error": "Ziddiyyət! Növbəti dəyişiklik qeydindən əvvəl gözlə.", + "copy": "Kopyala", + "create folder error": "Təəssüf ki, yeni qovluq yaratmaq mümkün olmadı", + "cut": "Kəs", + "delete": "Sil", + "dependencies": "Asılılıqlar", + "delay": "Millisaniyə ilə vaxt", + "editor settings": "Redaktorun parametrləri", + "editor theme": "Redaktorun teması", + "enter file name": "Faylın adını daxil et", + "enter folder name": "Qovluğun adını daxil et", + "empty folder message": "Boş qovluq", + "enter line number": "Sətir nömrəsini daxil et", + "error": "Xəta", + "failed": "Uğursuz oldu", + "file already exists": "Fayl artıq mövcuddur", + "file already exists force": "Fayl artıq mövcuddur. Üzərinə yazılsın?", + "file already exists force named": "'{name}' artıq mövcuddur. Üzərinə yazılsın?", + "file changed": " dəyişdirilib, fayl yenidən yüklənsin?", + "file deleted": "Fayl silindi", + "file is not supported": "Fayl dəstəklənmir", + "file not supported": "Bu fayl növü dəstəklənmir.", + "file too large": "Fayl emal üçün çox böyükdür. İcazə verilən ən böyük fayl ölçüsü: {size}", + "file renamed": "Faylın adı dəyişdirildi", + "file saved": "Fayl yadda saxlanıldı", + "folder added": "Qovluq əlavə edildi", + "folder already added": "Qovluq artıq əlavə edilib", + "font size": "Şriftin ölçüsü", + "goto": "Sətrə keç", + "icons definition": "Nişanların tərifi", + "info": "Məlumat", + "invalid value": "Yanlış dəyər", + "language changed": "Dil uğurla dəyişdirildi", + "linting": "Sintaksis xətasını yoxla", + "logout": "Çıxış", + "loading": "Yüklənir", + "my profile": "Profilim", + "new file": "Yeni fayl", + "new folder": "Yeni qovluq", + "no": "Xeyr", + "no editor message": "Menyudan fayl və qovluq aç və ya yenisini yarat", + "not set": "Təyin edilməyib", + "unsaved files close app": "Yadda saxlanılmamış fayllar var. Tətbiq bağlansın?", + "notice": "Bildiriş", + "open file": "Faylı aç", + "open files and folders": "Fayl və qovluqları aç", + "open folder": "Qovluğu aç", + "open recent": "Son istifadə olunanları aç", + "ok": "Oldu", + "overwrite": "Üzərinə yaz", + "paste": "Yapışdır", + "preview mode": "Önbaxış rejimi", + "read only file": "Yalnız oxunan faylı yadda saxlamaq mümkün deyil. Başqa adla yadda saxlamağa cəhd et", + "reload": "Yenidən yüklə", + "rename": "Adını dəyiş", + "new name": "Yeni ad", + "enter new name": "Yeni adı daxil et", + "code actions": "Kod əməliyyatları", + "replace": "Əvəz et", + "required": "Bu sahə mütləq doldurulmalıdır", + "run your web app": "Veb tətbiqini işə sal", + "save": "Yadda saxla", + "saving": "Yadda saxlanılır", + "save as": "Başqa adla yadda saxla", + "save file to run": "Brauzerdə işə salmaq üçün bu faylı yadda saxla", + "search": "Axtarış", + "see logs and errors": "Jurnal qeydlərinə və xətalara bax", + "select folder": "Qovluq seç", + "settings": "Parametrlər", + "settings saved": "Parametrlər yadda saxlanıldı", + "show line numbers": "Sətir nömrələrini göstər", + "show hidden files": "Gizli faylları göstər", + "show share button": "Paylaş düyməsini göstər", + "show spaces": "Boşluqları göstər", + "soft tab": "Boşluqlarla tabulyasiya", + "sort by name": "Ada görə sırala", + "success": "Uğurlu oldu", + "tab size": "Tabulyasiya ölçüsü", + "text wrap": "Mətnin bükülməsi / sözə görə bükülmə", + "wrapped line indent": "Bükülən sətrin girintisi", + "wrap-indent-same": "Eyni", + "wrap-indent-indent": "Girinti (+1 səviyyə)", + "wrap-indent-deep": "Dərin girinti (+2 səviyyə)", + "settings-info-editor-wrapping-indent": "Bükülən mətnin sol kənardan başlamasını, ilkin sətrin girintisinə uyğun olmasını və ya daha çox girintili olmasını seç. Hər əlavə səviyyə təyin etdiyin tabulyasiya ölçüsündən istifadə edir.", + "theme": "Tema", + "title-listfiles": "Faylları siyahıya al", + "ui zoom": "İnterfeysin miqyası", + "unable to delete file": "Faylı silmək mümkün olmadı", + "unable to open file": "Təəssüf ki, faylı açmaq mümkün olmadı", + "unable to open folder": "Təəssüf ki, qovluğu açmaq mümkün olmadı", + "unable to save file": "Təəssüf ki, faylı yadda saxlamaq mümkün olmadı", + "unable to rename": "Təəssüf ki, adı dəyişmək mümkün olmadı", + "unsaved file": "Bu fayl yadda saxlanılmayıb, yenə də bağlansın?", + "warning": "Xəbərdarlıq", + "use emmet": "Emmet-dən istifadə et", + "use quick tools": "Sürətli alətlərdən istifadə et", + "yes": "Bəli", + "encoding": "Mətnin kodlaşdırılması", + "syntax highlighting": "Sintaksisin rənglənməsi", + "read only": "Yalnız oxumaq üçün", + "select all": "Hamısını seç", + "select branch": "Budaq seç", + "create new branch": "Yeni budaq yarat", + "use branch": "Budaqdan istifadə et", + "new branch": "Yeni budaq", + "branch": "Budaq", + "key bindings": "Düymə təyinatları", + "edit": "Redaktə et", + "reset": "Sıfırla", + "color": "Rəng", + "select word": "Söz seç", + "quick tools": "Sürətli alətlər", + "select": "Seç", + "editor font": "Redaktorun şrifti", + "new project": "Yeni layihə", + "format": "Formatla", + "project name": "Layihənin adı", + "unsupported device": "Cihazın temanı dəstəkləmir.", + "vibrate on tap": "Toxunuşda titrə", + "copy command is not supported by ftp.": "Kopyala əmri FTP tərəfindən dəstəklənmir.", + "support title": "Acode-a dəstək ol", + "fullscreen": "Tam ekran", + "animation": "Animasiya", + "backup": "Ehtiyat nüsxə", + "restore": "Bərpa et", + "backup successful": "Ehtiyat nüsxə uğurla yaradıldı", + "invalid backup file": "Yanlış ehtiyat nüsxə faylı", + "add path": "Yol əlavə et", + "live autocompletion": "Yazarkən avtomatik tamamlama", + "local word completion": "Yerli söz tamamlama", + "language package completion": "Dil paketi ilə tamamlama", + "recommend extensions": "Qoşmalar tövsiyə et", + "auto close tags": "Etiketləri avtomatik bağla", + "auto rename tags": "Etiketlərin adını avtomatik dəyiş", + "file properties": "Faylın xüsusiyyətləri", + "path": "Yol", + "type": "Növ", + "word count": "Söz sayı", + "line count": "Sətir sayı", + "last modified": "Son dəyişiklik", + "size": "Ölçü", + "share": "Paylaş", + "show print margin": "Çap sərhədini göstər", + "login": "Giriş", + "scrollbar size": "Sürüşdürmə zolağının ölçüsü", + "scrollbar height": "Sürüşdürmə zolağının hündürlüyü", + "cursor controller size": "Kursor idarəedicisinin ölçüsü", + "full": "Tam", + "scroll past end": "Sondan kənara sürüşdür", + "settings-info-scroll-past-end": "Redaktorun aşağı hissəsinə əlavə boş sahə artıraraq son sətri yuxarıya sürüşdürməyə imkan verir.", + "none": "Yoxdur", + "small": "Kiçik", + "large": "Böyük", + "confirm on exit": "Çıxışda təsdiq istə", + "show console": "Konsolu göstər", + "image": "Şəkil", + "insert file": "Fayl yerləşdir", + "insert color": "Rəng yerləşdir", + "powersave mode warning": "Xarici brauzerdə önbaxış üçün enerjiyə qənaət rejimini söndür.", + "exit": "Çıx", + "custom": "Fərdi", + "reset warning": "Temanı sıfırlamaq istədiyinə əminsən?", + "theme type": "Temanın növü", + "light": "Açıq", + "dark": "Tünd", + "file browser": "Fayl brauzeri", + "icon pack": "Nişan paketi", + "settings-info-icon-pack": "Tətbiqdəki fayl bələdçisində və fayl siyahılarında fayl və qovluqlar üçün istifadə olunan nişanları seç.", + "unavailable": "Əlçatan deyil", + "operation not permitted": "Əməliyyata icazə verilmir", + "no such file or directory": "Belə fayl və ya qovluq yoxdur", + "input/output error": "Giriş/çıxış xətası", + "permission denied": "İcazə verilmədi", + "bad address": "Yanlış ünvan", + "file exists": "Fayl mövcuddur", + "not a directory": "Qovluq deyil", + "is a directory": "Qovluqdur", + "invalid argument": "Yanlış arqument", + "too many open files in system": "Sistemdə həddindən artıq açıq fayl var", + "too many open files": "Həddindən artıq açıq fayl var", + "text file busy": "Mətn faylı məşğuldur", + "no space left on device": "Cihazda yer qalmayıb", + "read-only file system": "Yalnız oxunan fayl sistemi", + "file name too long": "Faylın adı çox uzundur", + "too many users": "Həddindən artıq çox istifadəçi var", + "connection timed out": "Əlaqə üçün gözləmə vaxtı bitdi", + "connection refused": "Əlaqə rədd edildi", + "owner died": "Sahib proses dayandı", + "an error occurred": "Xəta baş verdi", + "add ftp": "FTP əlavə et", + "add sftp": "SFTP əlavə et", + "save file": "Faylı yadda saxla", + "save file as": "Faylı başqa adla yadda saxla", + "files": "Fayllar", + "help": "Kömək", + "file has been deleted": "{file} silinib!", + "feature not available": "Bu funksiya əlçatan deyil.", + "feature available in paid version": "Bu funksiya yalnız tətbiqin ödənişli versiyasında əlçatandır.", + "deleted file": "Silinmiş fayl", + "line height": "Sətrin hündürlüyü", + "preview info": "Aktiv faylı işə salmaq istəyirsənsə, işə salma nişanına toxunub saxla.", + "manage all files": "Cihazındakı faylları asanlıqla redaktə etmək üçün parametrlərdə Acode redaktoruna bütün faylları idarə etməyə icazə ver.", + "close file": "Faylı bağla", + "reset connections": "Əlaqələri sıfırla", + "check file changes": "Fayl dəyişikliklərini yoxla", + "open in browser": "Brauzerdə aç", + "desktop mode": "Masaüstü rejim", + "toggle console": "Konsolu göstər/gizlət", + "new line mode": "Yeni sətir rejimi", + "add a storage": "Yaddaş sahəsi əlavə et", + "rate acode": "Acode-u qiymətləndir", + "support": "Dəstək", + "downloading file": "{file} endirilir", + "downloading...": "Endirilir...", + "folder name": "Qovluğun adı", + "keyboard mode": "Klaviatura rejimi", + "normal": "Adi", + "app settings": "Tətbiqin parametrləri", + "disable in-app-browser caching": "Tətbiqdaxili brauzerdə keşləməni söndür", + "copied to clipboard": "Mübadilə buferinə kopyalandı", + "clipboard not available": "Mübadilə buferi əlçatan deyil.", + "remember opened files": "Açılmış faylları yadda saxla", + "remember opened folders": "Açılmış qovluqları yadda saxla", + "no suggestions": "Təkliflərsiz", + "no suggestions aggressive": "Təkliflərsiz sərt rejim", + "install": "Quraşdır", + "installing": "Quraşdırılır...", + "plugins": "Qoşmalar", + "recently used": "Son istifadə olunanlar", + "update": "Yenilə", + "uninstall": "Quraşdırmanı sil", + "download acode pro": "Acode Pro-nu endir", + "loading plugins": "Qoşmalar yüklənir", + "faqs": "Tez-tez verilən suallar", + "feedback": "Rəy", + "header": "Başlıq", + "sidebar": "Yan panel", + "inapp": "Tətbiqdaxili", + "browser": "Brauzer", + "diagonal scrolling": "Diaqonal sürüşdürmə", + "reverse scrolling": "Əks istiqamətdə sürüşdürmə", + "formatter": "Formatlayıcı", + "format on save": "Yadda saxlayarkən formatla", + "remove ads": "Reklamları çıxar", + "fast": "Sürətli", + "slow": "Yavaş", + "scroll settings": "Sürüşdürmə parametrləri", + "scroll speed": "Sürüşdürmə sürəti", + "loading...": "Yüklənir...", + "no plugins found": "Qoşma tapılmadı", + "name": "Ad", + "username": "İstifadəçi adı", + "optional": "İstəyə bağlı", + "hostname": "Host adı", + "password": "Parol", + "security type": "Təhlükəsizlik növü", + "connection mode": "Əlaqə rejimi", + "port": "Port", + "key file": "Açar faylı", + "select key file": "Açar faylını seç", + "passphrase": "Parol ifadəsi", + "connecting...": "Əlaqə qurulur...", + "type filename": "Faylın adını yaz", + "unable to load files": "Faylları yükləmək mümkün olmadı", + "preview port": "Önbaxış portu", + "find file": "Fayl tap", + "system": "Sistem", + "please select a formatter": "Formatlayıcı seç", + "case sensitive": "Böyük və kiçik hərflərə həssas", + "regular expression": "Müntəzəm ifadə", + "whole word": "Bütöv söz", + "edit with": "Bununla redaktə et", + "open with": "Bununla aç", + "no app found to handle this file": "Bu faylı emal edəcək tətbiq tapılmadı", + "restore default settings": "Standart parametrləri bərpa et", + "server port": "Server portu", + "preview settings": "Önbaxış parametrləri", + "preview settings note": "Önbaxış portu ilə server portu fərqlidirsə, tətbiq serveri işə salmayacaq və əvəzində brauzerdə və ya tətbiqdaxili brauzerdə https://: ünvanını açacaq. Bu, serveri başqa yerdə işə saldıqda faydalıdır.", + "backup/restore note": "Yalnız parametrlərinin, fərdi temanın, quraşdırılmış qoşmaların və düymə təyinatlarının ehtiyat nüsxəsi yaradılacaq. FTP/SFTP və ya tətbiqin vəziyyətinin ehtiyat nüsxəsi yaradılmayacaq.", + "host": "Host", + "retry ftp/sftp when fail": "FTP/SFTP uğursuz olduqda yenidən cəhd et", + "more": "Daha çox", + "thank you :)": "Təşəkkürlər :)", + "purchase pending": "Satınalma gözləmədədir", + "cancelled": "Ləğv edildi", + "local": "Yerli", + "remote": "Uzaq", + "show console toggler": "Konsol keçid düyməsini göstər", + "binary file": "Bu faylda ikili verilənlər var, onu açmaq istəyirsən?", + "relative line numbers": "Nisbi sətir nömrələri", + "elastic tabstops": "Çevik tabulyasiya dayanacaqları", + "line based rtl switching": "Sətir üzrə RTL keçidi", + "hard wrap": "Sətirsonu ilə bükülmə", + "spellcheck": "Orfoqrafiya yoxlaması", + "wrap method": "Bükülmə üsulu", + "use textarea for ime": "IME üçün mətn sahəsindən istifadə et", + "invalid plugin": "Yanlış qoşma", + "type command": "Əmr yaz", + "plugin": "Qoşma", + "quicktools trigger mode": "Sürətli alətlərin işə salınma rejimi", + "print margin": "Çap sərhədi", + "touch move threshold": "Toxunuş hərəkətinin həddi", + "info-retryremotefsafterfail": "FTP/SFTP əlaqəsi uğursuz olduqda yenidən cəhd et.", + "info-fullscreen": "Əsas ekranda başlıq zolağını gizlət.", + "info-checkfiles": "Tətbiq arxa planda olarkən fayl dəyişikliklərini yoxla.", + "info-console": "JavaScript konsolunu seç. Əvvəlki konsol standartdır, eruda isə üçüncü tərəf konsoludur.", + "info-keyboardmode": "Mətn daxil etmək üçün klaviatura rejimi. Təkliflərsiz rejim təklifləri və avtomatik düzəlişi gizlədəcək. Təkliflərsiz rejim işləmirsə, dəyəri təkliflərsiz sərt rejimə dəyişməyə cəhd et.", + "info-rememberfiles": "Tətbiq bağlandıqda açılmış faylları yadda saxla.", + "info-rememberfolders": "Tətbiq bağlandıqda açılmış qovluqları yadda saxla.", + "info-floatingbutton": "Sürətli alətlərin üzən düyməsini göstər və ya gizlət.", + "info-openfilelistpos": "Aktiv fayllar siyahısının göstəriləcəyi yer.", + "info-touchmovethreshold": "Cihazının toxunuş həssaslığı çox yüksəkdirsə, təsadüfi toxunuş hərəkətinin qarşısını almaq üçün bu dəyəri artıra bilərsən.", + "info-scroll-settings": "Bu parametrlərə mətnin bükülməsi də daxil olmaqla sürüşdürmə parametrləri daxildir.", + "info-animation": "Tətbiq ləng işləyirsə, animasiyanı söndür.", + "info-quicktoolstriggermode": "Sürətli alətlərdəki düymə işləmirsə, bu dəyəri dəyişməyə cəhd et.", + "info-checkForAppUpdates": "Tətbiq yeniləmələrini avtomatik yoxla.", + "info-quickTools": "Sürətli alətləri göstər və ya gizlət.", + "info-showHiddenFiles": "Gizli fayl və qovluqları göstər. (Adı . ilə başlayanlar)", + "info-listFiles": "Qovluq açıldıqda bütün faylları avtomatik siyahıya al", + "info-all_file_access": "Terminalda /sdcard və /storage yollarına girişi aktivləşdir.", + "info-fontSize": "Mətni göstərmək üçün istifadə olunan şrift ölçüsü.", + "info-fontFamily": "Mətni göstərmək üçün istifadə olunan şrift ailəsi.", + "info-theme": "Terminalın rəng teması.", + "info-cursorStyle": "Terminal fokusda olduqda kursorun üslubu.", + "info-cursorInactiveStyle": "Terminal fokusda olmadıqda kursorun üslubu.", + "info-fontWeight": "Qalın olmayan mətni göstərmək üçün istifadə olunan şrift qalınlığı.", + "info-cursorBlink": "Kursorun yanıb-sönməsinin aktiv olub-olmaması.", + "info-scrollback": "Terminalda geriyə sürüşdürmə həcmi. Bu, sətirlər ilkin görünüş sahəsindən kənara sürüşdürüldükdə saxlanılan sətirlərin sayıdır.", + "info-terminal-show-scrollbar": "Terminalın yanında xterm sürüşdürmə zolağını göstər.", + "info-tabStopWidth": "Terminalda tabulyasiya dayanacaqlarının ölçüsü.", + "info-letterSpacing": "Simvollar arasındakı tam piksellə ölçülən məsafə.", + "info-imageSupport": "Terminalda şəkillərin dəstəklənib-dəstəklənməməsi.", + "info-fontLigatures": "Terminalda şrift liqaturalarının aktivləşdirilib-aktivləşdirilməməsi.", + "info-confirmTabClose": "Terminal vərəqlərini bağlamazdan əvvəl təsdiq istə.", + "info-backup": "Terminal quraşdırmasının ehtiyat nüsxəsini yaradır.", + "info-restore": "Terminal quraşdırmasının ehtiyat nüsxəsini bərpa edir.", + "info-uninstall": "Terminal quraşdırmasını silir.", + "owned": "Sahib olduqlarım", + "api_error": "API serveri işləmir, bir müddət sonra yenidən cəhd et.", + "installed": "Quraşdırılıb", + "all": "Hamısı", + "medium": "Orta", + "refund": "Ödənişi geri qaytar", + "product not available": "Məhsul əlçatan deyil", + "no-product-info": "Bu məhsul hazırda ölkəndə əlçatan deyil, daha sonra yenidən cəhd et.", + "close": "Bağla", + "explore": "Kəşf et", + "key bindings updated": "Düymə təyinatları yeniləndi", + "search in files": "Fayllarda axtarış", + "exclude files": "Faylları istisna et", + "include files": "Faylları daxil et", + "search result": "{files} faylda {matches} nəticə.", + "invalid regex": "Yanlış müntəzəm ifadə: {message}.", + "bottom": "Aşağı", + "save all": "Hamısını yadda saxla", + "close all": "Hamısını bağla", + "unsaved files warning": "Bəzi fayllar yadda saxlanılmayıb. Nə edəcəyini seçmək üçün 'Oldu', geri qayıtmaq üçün isə 'Ləğv et' düyməsini bas.", + "save all warning": "Bütün faylları yadda saxlayıb bağlamaq istədiyinə əminsən? Bu əməliyyatı geri qaytarmaq mümkün deyil.", + "save all changes warning": "Bütün faylları yadda saxlamaq istədiyinə əminsən?", + "close all warning": "Bütün faylları bağlamaq istədiyinə əminsən? Yadda saxlanılmamış dəyişiklikləri itirəcəksən və bu əməliyyatı geri qaytarmaq mümkün deyil.", + "refresh": "Təzələ", + "shortcut buttons": "Qısayol düymələri", + "no result": "Nəticə yoxdur", + "searching...": "Axtarılır...", + "quicktools:ctrl-key": "İdarəetmə/Əmr düyməsi", + "quicktools:tab-key": "Tabulyasiya düyməsi", + "quicktools:shift-key": "Yuxarı registr düyməsi", + "quicktools:undo": "Geri al", + "quicktools:redo": "Yenidən et", + "quicktools:search": "Faylda axtarış", + "quicktools:save": "Faylı yadda saxla", + "quicktools:esc-key": "Çıxış düyməsi", + "quicktools:curlybracket": "Fiqurlu mötərizə yerləşdir", + "quicktools:squarebracket": "Kvadrat mötərizə yerləşdir", + "quicktools:parentheses": "Dairəvi mötərizə yerləşdir", + "quicktools:anglebracket": "Bucaq mötərizəsi yerləşdir", + "quicktools:left-arrow-key": "Sol ox düyməsi", + "quicktools:right-arrow-key": "Sağ ox düyməsi", + "quicktools:up-arrow-key": "Yuxarı ox düyməsi", + "quicktools:down-arrow-key": "Aşağı ox düyməsi", + "quicktools:moveline-up": "Sətri yuxarı köçür", + "quicktools:moveline-down": "Sətri aşağı köçür", + "quicktools:copyline-up": "Sətri yuxarı kopyala", + "quicktools:copyline-down": "Sətri aşağı kopyala", + "quicktools:semicolon": "Nöqtəli vergül yerləşdir", + "quicktools:quotation": "Dırnaq işarəsi yerləşdir", + "quicktools:and": "Və işarəsi yerləşdir", + "quicktools:bar": "Şaquli xətt işarəsi yerləşdir", + "quicktools:equal": "Bərabərlik işarəsi yerləşdir", + "quicktools:slash": "Çəp xətt işarəsi yerləşdir", + "quicktools:exclamation": "Nida işarəsi yerləşdir", + "quicktools:alt-key": "Alternativ düyməsi", + "quicktools:meta-key": "Windows/Meta düyməsi", + "quicktools:search-prev": "Əvvəlki uyğunluq", + "quicktools:search-next": "Növbəti uyğunluq", + "quicktools:search-settings": "Axtarış parametrləri", + "quicktools:search-replace": "Əvəz et", + "quicktools:search-replace-all": "Hamısını əvəz et", + "info-quicktoolssettings": "Kod yazmağı rahatlaşdırmaq üçün redaktorun altındakı sürətli alətlər sahəsində qısayol və klaviatura düymələrini fərdiləşdir.", + "info-excludefolders": "Bütün node_modules qovluqlarındakı faylları nəzərə almamaq üçün **/node_modules/** nümunəsindən istifadə et. Bu fayllar siyahılarda göstərilməyəcək və fayl axtarışlarına daxil edilməyəcək.", + "missed files": "Axtarış başladıqdan sonra {count} fayl yoxlanıldı və axtarışa daxil edilməyəcək.", + "remove": "Çıxar", + "quicktools:command-palette": "Əmr palitrası", + "default file encoding": "Standart fayl kodlaşdırması", + "remove entry": "'{name}' yolunu yadda saxlanılmış yollardan çıxarmaq istədiyinə əminsən? Nəzərə al ki, onu çıxarmaq yolun özünü silməyəcək.", + "delete entry": "Silinməni təsdiqlə: '{name}'. Bu əməliyyatı geri qaytarmaq mümkün deyil. Davam edilsin?", + "change encoding": "'{file}' faylı '{encoding}' kodlaşdırması ilə yenidən açılsın? Bu əməliyyat faylda yadda saxlanılmamış bütün dəyişikliklərin itirilməsinə səbəb olacaq. Faylı yenidən açmaq istəyirsən?", + "reopen file": "'{file}' faylını yenidən açmaq istədiyinə əminsən? Yadda saxlanılmamış bütün dəyişikliklər itiriləcək.", + "plugin min version": "{name} yalnız Acode - {v-code} və daha yeni versiyalarda əlçatandır. Yeniləmək üçün buraya bas.", + "color preview": "Rəng önbaxışı", + "confirm": "Təsdiqlə", + "problems": "Problemlər", + "show side buttons": "Yan düymələri göstər", + "bug_report": "Xəta hesabatı göndər", + "verified publisher": "Təsdiqlənmiş naşir", + "most_downloaded": "Ən çox endirilənlər", + "newly_added": "Yeni əlavə olunanlar", + "top_rated": "Ən yüksək qiymətləndirilənlər", + "rename not supported": "Termux qovluğunda ad dəyişdirmə dəstəklənmir", + "compress": "Sıxışdır", + "copy uri": "URI-ni kopyala", + "copying items": "{count} element kopyalanır...", + "cannot paste folder into itself": "Qovluğu öz daxilinə yapışdırmaq mümkün deyil", + "folder already exists": "Qovluq artıq mövcuddur", + "delete entries": "{count} elementi silmək istədiyinə əminsən?", + "deleting items": "{count} element silinir...", + "import project zip": "Layihə idxal et (zip)", + "changelog": "Dəyişiklik jurnalı", + "notifications": "Bildirişlər", + "no_unread_notifications": "Oxunmamış bildiriş yoxdur", + "should_use_current_file_for_preview": "Önbaxış üçün standart fayl (index.html) əvəzinə cari fayldan istifadə et", + "fade fold widgets": "Qatlama nişanlarını solğunlaşdır", + "quicktools:home-key": "Sətrin əvvəli düyməsi", + "quicktools:end-key": "Sətrin sonu düyməsi", + "quicktools:pageup-key": "Bir səhifə yuxarı düyməsi", + "quicktools:pagedown-key": "Bir səhifə aşağı düyməsi", + "quicktools:delete-key": "Sil düyməsi", + "quicktools:tilde": "Tilda işarəsi yerləşdir", + "quicktools:backtick": "Tərs dırnaq işarəsi yerləşdir", + "quicktools:hash": "# işarəsi yerləşdir", + "quicktools:dollar": "Dollar işarəsi yerləşdir", + "quicktools:modulo": "Qalıq/faiz işarəsi yerləşdir", + "quicktools:caret": "^ işarəsi yerləşdir", + "plugin_enabled": "Qoşma aktivdir", + "plugin_disabled": "Qoşma deaktivdir", + "enable_plugin": "Bu qoşmanı aktivləşdir", + "disable_plugin": "Bu qoşmanı söndür", + "open_source": "Açıq mənbə", + "terminal settings": "Terminal parametrləri", + "font ligatures": "Şrift liqaturaları", + "letter spacing": "Hərflərarası məsafə", + "terminal:tab stop width": "Tabulyasiya dayanacağının eni", + "terminal:scrollback": "Geriyə sürüşdürmə sətirləri", + "terminal:show scrollbar": "Sürüşdürmə zolağını göstər", + "terminal:cursor blink": "Kursorun yanıb-sönməsi", + "terminal:font weight": "Şriftin qalınlığı", + "terminal:cursor inactive style": "Qeyri-aktiv kursorun üslubu", + "terminal:cursor style": "Kursorun üslubu", + "terminal:font family": "Şrift ailəsi", + "terminal:convert eol": "Sətir sonluqlarını çevir", + "terminal:confirm tab close": "Terminal vərəqinin bağlanmasını təsdiqlə", + "terminal:image support": "Şəkil dəstəyi", + "terminal": "Terminal", + "running processes": "İşləyən proseslər", + "terminal not installed prompt": "Terminal quraşdırılmayıb. Onu indi ilkin sazlamaq istəyirsən?", + "terminal first launch prompt": "Terminal mühiti quraşdırılmayıb. O, əmrləri, SSH və skriptləri işlətməyə imkan verir. İndi quraşdırılsın?", + "don't ask again": "Bir daha soruşma", + "allFileAccess": "Bütün fayllara giriş", + "fonts": "Şriftlər", + "sponsor": "Sponsor", + "downloads": "Endirmələr", + "reviews": "Rəylər", + "overview": "İcmal", + "contributors": "Töhfə verənlər", + "quicktools:hyphen": "Defis işarəsi yerləşdir", + "check for app updates": "Tətbiq yeniləmələrini yoxla", + "prompt update check consent message": "İnternetə qoşulduqda Acode yeni tətbiq yeniləmələrini yoxlaya bilər. Yeniləmə yoxlamaları aktivləşdirilsin?", + "keywords": "Açar sözlər", + "author": "Müəllif", + "filtered by": "Süzgəc meyarı", + "clean install state": "Quraşdırma vəziyyətini təmizlə", + "backup created": "Ehtiyat nüsxə yaradıldı", + "restore completed": "Bərpa tamamlandı", + "restore will include": "Bərpa ediləcəklər", + "restore warning": "Bu əməliyyatı geri qaytarmaq mümkün deyil. Davam edilsin?", + "reload to apply": "Dəyişiklikləri tətbiq etmək üçün yenidən yüklənsin?", + "reload app": "Tətbiqi yenidən yüklə", + "preparing backup": "Ehtiyat nüsxə hazırlanır", + "collecting settings": "Parametrlər toplanır", + "collecting key bindings": "Düymə təyinatları toplanır", + "collecting plugins": "Qoşma məlumatları toplanır", + "creating backup": "Ehtiyat nüsxə faylı yaradılır", + "validating backup": "Ehtiyat nüsxənin etibarlılığı yoxlanılır", + "restoring key bindings": "Düymə təyinatları bərpa edilir", + "restoring plugins": "Qoşmalar bərpa edilir", + "restoring settings": "Parametrlər bərpa edilir", + "legacy backup warning": "Bu, köhnə ehtiyat nüsxə formatıdır. Bəzi funksiyalar məhdud ola bilər.", + "checksum mismatch": "Yoxlama cəmi uyğun gəlmir - ehtiyat nüsxə faylı dəyişdirilmiş və ya zədələnmiş ola bilər.", + "plugin not found": "Qoşma reyestrdə tapılmadı", + "paid plugin skipped": "Ödənişli qoşma - satınalma tapılmadı", + "source not found": "Mənbə faylı artıq mövcud deyil", + "restored": "Bərpa edildi", + "skipped": "Ötürüldü", + "backup not valid object": "Ehtiyat nüsxə faylı düzgün obyekt deyil", + "backup no data": "Ehtiyat nüsxə faylında bərpa ediləcək məlumat yoxdur", + "backup legacy warning": "Bu, köhnə ehtiyat nüsxə formatıdır (v1). Bəzi funksiyalar məhdud ola bilər.", + "backup missing metadata": "Ehtiyat nüsxənin metaməlumatları yoxdur - bəzi məlumatlar əlçatan olmaya bilər", + "backup checksum mismatch": "Yoxlama cəmi uyğun gəlmir - ehtiyat nüsxə faylı dəyişdirilmiş və ya zədələnmiş ola bilər. Ehtiyatla davam et.", + "backup checksum verify failed": "Yoxlama cəmini təsdiqləmək mümkün olmadı", + "backup invalid settings": "Yanlış parametr formatı", + "backup invalid keybindings": "Düymə təyinatlarının formatı yanlışdır", + "backup invalid plugins": "Quraşdırılmış qoşmaların formatı yanlışdır", + "issues found": "Problemlər tapıldı", + "error details": "Xətanın təfərrüatları", + "active tools": "Aktiv alətlər", + "recent": "Son fayllar", + "command palette": "Əmr palitrasını aç", + "change theme": "Temanı dəyiş", + "documentation": "Sənədlər", + "open in terminal": "Terminalda aç", + "developer mode": "Tərtibatçı rejimi", + "info-developermode": "Qoşmalardakı xətaları aradan qaldırmaq və tətbiqin vəziyyətini yoxlamaq üçün tərtibatçı alətlərini (Eruda) aktivləşdir. Müfəttiş tətbiq işə salındıqda başladılacaq.", + "developer mode enabled": "Tərtibatçı rejimi aktivdir. Müfəttişi göstərmək/gizlətmək üçün əmr palitrasından istifadə et (Ctrl+Shift+I).", + "developer mode disabled": "Tərtibatçı rejimi deaktivdir", + "copy relative path": "Nisbi yolu kopyala", + "available tools": "Əlçatan alətlər", + "shortcut request sent": "Qısayol sorğusu açıldı. Tamamlamaq üçün Əlavə et düyməsinə toxun.", + "add to home screen": "Əsas ekrana əlavə et", + "pin shortcuts not supported": "Bu cihazda əsas ekran qısayolları dəstəklənmir.", + "save file before home shortcut": "Faylı əsas ekrana əlavə etməzdən əvvəl yadda saxla.", + "terminal_required_message_for_lsp": "Terminal quraşdırılmayıb. LSP serverlərindən istifadə etmək üçün əvvəlcə terminalı quraşdır.", + "shift click selection": "Yuxarı registr düyməsi + toxunuş/klik ilə seçim", + "earn ad-free time": "Reklamsız istifadə vaxtı qazan", + "indent guides": "Girinti bələdçiləri", + "language servers": "Dil serverləri", + "lint gutter": "Kod yoxlamasının kənar zolağını göstər", + "rainbow brackets": "Rəngarəng mötərizələr", + "lsp-add-custom-server": "Fərdi server əlavə et", + "lsp-binary-args": "İcra faylının arqumentləri (JSON massivi)", + "lsp-binary-command": "İcra faylının əmri", + "lsp-binary-path-optional": "İcra faylının yolu (istəyə bağlı)", + "lsp-check-command-optional": "Yoxlama əmri (istəyə bağlı əvəzləmə)", + "lsp-checking-installation-status": "Quraşdırma vəziyyəti yoxlanılır...", + "lsp-configured": "Sazlanıb", + "lsp-custom-server-added": "Fərdi server əlavə edildi", + "lsp-default": "Standart", + "lsp-details-line": "Təfərrüatlar: {details}", + "lsp-edit-initialization-options": "İlkin sazlama seçimlərini redaktə et", + "lsp-empty": "Boş", + "lsp-enabled": "Aktivdir", + "lsp-error-add-server-failed": "Serveri əlavə etmək mümkün olmadı", + "lsp-error-args-must-be-array": "Arqumentlər JSON massivi olmalıdır", + "lsp-error-binary-command-required": "İcra faylının əmri tələb olunur", + "lsp-error-language-id-required": "Ən azı bir dil ID-si tələb olunur", + "lsp-error-package-required": "Ən azı bir paket tələb olunur", + "lsp-error-server-id-required": "Server ID-si tələb olunur", + "lsp-feature-completion": "Kod tamamlama", + "lsp-feature-completion-info": "Serverin avtomatik tamamlama təkliflərini aktivləşdir.", + "lsp-feature-diagnostics": "Diaqnostika", + "lsp-feature-diagnostics-info": "Dil serverindən gələn xəta və xəbərdarlıqları göstər.", + "lsp-feature-formatting": "Formatlama", + "lsp-feature-formatting-info": "Dil serveri vasitəsilə kod formatlamasını aktivləşdir.", + "lsp-feature-hover": "Üzərinə gəldikdə məlumat", + "lsp-feature-hover-info": "Üzərinə gəldikdə növ məlumatını və sənədləri göstər.", + "lsp-feature-inlay-hints": "Sətirdaxili göstərişlər", + "lsp-feature-inlay-hints-info": "Redaktorda sətirdaxili növ göstərişlərini göstər.", + "lsp-feature-signature": "Funksiya imzası üzrə kömək", + "lsp-feature-signature-info": "Yazarkən funksiya parametrləri üzrə göstərişləri göstər.", + "lsp-feature-state-toast": "{feature} {state}", + "lsp-initialization-options": "İlkin sazlama seçimləri", + "lsp-initialization-options-json": "İlkin sazlama seçimləri (JSON)", + "lsp-initialization-options-updated": "İlkin sazlama seçimləri yeniləndi", + "lsp-install-command": "Quraşdırma əmri", + "lsp-install-command-unavailable": "Quraşdırma əmri əlçatan deyil", + "lsp-install-info-check-failed": "Acode quraşdırma vəziyyətini təsdiqləyə bilmədi.", + "lsp-install-info-missing": "Dil serveri terminal mühitində quraşdırılmayıb.", + "lsp-install-info-ready": "Dil serveri quraşdırılıb və hazırdır.", + "lsp-install-info-unknown": "Quraşdırma vəziyyətini avtomatik yoxlamaq mümkün olmadı.", + "lsp-install-info-version-available": "{version} versiyası əlçatandır.", + "lsp-install-notification": "{server} dil serveri quraşdırılmayıb. Quraşdırmaq üçün toxun.", + "lsp-install-method-apk": "APK paketi", + "lsp-install-method-cargo": "Cargo paketi", + "lsp-install-method-manual": "Əl ilə quraşdırılan icra faylı", + "lsp-install-method-npm": "npm paketi", + "lsp-install-method-pip": "pip paketi", + "lsp-install-method-shell": "Fərdi əmr qabığı", + "lsp-install-method-title": "Quraşdırma üsulu", + "lsp-install-repair": "Quraşdır / təmir et", + "lsp-installation-status": "Quraşdırma vəziyyəti", + "lsp-installed": "Quraşdırılıb", + "lsp-invalid-timeout": "Yanlış gözləmə müddəti", + "lsp-language-ids": "Dil ID-ləri (vergüllə ayrılmış)", + "lsp-packages-prompt": "{method} paketləri (vergüllə ayrılmış)", + "lsp-remove-custom-server": "Fərdi serveri çıxar", + "lsp-remove-custom-server-confirm": "{server} fərdi dil serveri çıxarılsın?", + "lsp-remove-installed-files": "{server} üçün quraşdırılmış fayllar çıxarılsın?", + "lsp-custom-server-removed": "Fərdi server çıxarıldı", + "lsp-server-disabled-toast": "Server deaktivdir", + "lsp-server-enabled-toast": "Server aktivdir", + "lsp-server-id": "Server ID-si", + "lsp-server-label": "Server etiketi", + "lsp-server-not-found": "Server tapılmadı", + "lsp-server-uninstalled": "Serverin quraşdırılması silindi", + "lsp-startup-timeout": "Başlama üçün gözləmə müddəti", + "lsp-startup-timeout-ms": "Başlama üçün gözləmə müddəti (millisaniyə)", + "lsp-startup-timeout-set": "Başlama üçün gözləmə müddəti {timeout} ms olaraq təyin edildi", + "lsp-state-disabled": "Deaktiv", + "lsp-state-enabled": "Aktivdir", + "lsp-status": "Vəziyyət", + "lsp-status-check-failed": "Yoxlama uğursuz oldu", + "lsp-status-installed": "Quraşdırılıb", + "lsp-status-installed-version": "Quraşdırılıb ({version})", + "lsp-status-line": "Vəziyyət: {status}", + "lsp-status-not-installed": "Quraşdırılmayıb", + "lsp-status-unknown": "Naməlum", + "lsp-timeout-ms": "{timeout} ms", + "lsp-transport-method-stdio": "STDIO (icra faylının əmrini işə sal)", + "lsp-transport-method-websocket": "WebSocket (ws/wss URL ünvanına qoşul)", + "lsp-uninstall-command-unavailable": "Quraşdırmanı silmə əmri əlçatan deyil", + "lsp-uninstall-notification": "{server} dil serverinin quraşdırılmasını silmək üçün toxun.", + "lsp-uninstall-server": "Serverin quraşdırılmasını sil", + "lsp-update-command-optional": "Yeniləmə əmri (istəyə bağlı)", + "lsp-update-command-unavailable": "Yeniləmə əmri əlçatan deyil", + "lsp-update-server": "Serveri yenilə", + "lsp-version-line": "Versiya: {version}", + "lsp-websocket-url": "WebSocket URL", + "lsp-websocket-server-managed-externally": "Bu server WebSocket vasitəsilə xaricdən idarə olunur.", + "lsp-error-websocket-url-invalid": "WebSocket URL ünvanı ws:// və ya wss:// ilə başlamalıdır", + "lsp-error-websocket-url-required": "WebSocket URL ünvanı tələb olunur", + "lsp-view-initialization-options": "İlkin sazlama seçimlərinə bax", + "settings-category-about-acode": "Acode haqqında", + "settings-category-discover-apps": "Daha çox tətbiq kəşf et", + "settings-category-advanced": "Əlavə", + "settings-category-assistance": "Yardım", + "settings-category-core": "Əsas parametrlər", + "settings-category-cursor": "Kursor", + "settings-category-cursor-selection": "Kursor və seçim", + "settings-category-custom-servers": "Fərdi serverlər", + "settings-category-customization": "Fərdiləşdirmə", + "settings-category-display": "Görünüş", + "settings-category-editing": "Redaktə", + "settings-category-features": "Funksiyalar", + "settings-category-files-sessions": "Fayllar və seanslar", + "settings-category-fonts": "Şriftlər", + "settings-category-general": "Ümumi", + "settings-category-guides-indicators": "Bələdçilər və göstəricilər", + "settings-category-installation": "Quraşdırma", + "settings-category-interface": "İnterfeys", + "settings-category-maintenance": "Texniki xidmət", + "settings-category-permissions": "İcazələr", + "settings-category-preview": "Önbaxış", + "settings-category-scrolling": "Sürüşdürmə", + "settings-category-server": "Server", + "settings-category-servers": "Serverlər", + "settings-category-session": "Seans", + "settings-category-support-acode": "Acode-a dəstək ol", + "settings-category-text-layout": "Mətn və tərtibat", + "settings-category-tools": "Alətlər", + "settings-info-app-animation": "Tətbiqdəki keçid animasiyalarını idarə et.", + "settings-info-app-check-files": "Fayllar Acode-dan kənarda dəyişdikdə redaktorları təzələ.", + "settings-info-app-clean-install-state": "İlkin tanışlıq və sazlama proseslərində istifadə olunan saxlanılmış quraşdırma vəziyyətini təmizlə.", + "settings-info-app-confirm-on-exit": "Tətbiqi bağlamazdan əvvəl soruş.", + "settings-info-app-console": "Acode-un xətaları aradan qaldırmaq üçün hansı konsoldan istifadə edəcəyini seç.", + "settings-info-app-default-file-encoding": "Faylları açarkən və ya yaradarkən istifadə olunan standart kodlaşdırma.", + "settings-info-app-exclude-folders": "Axtarış və ya yoxlama zamanı qovluqları və nümunələrə uyğun gələnləri ötür.", + "apply exclusions when copying": "Kopyalayarkən istisnaları tətbiq et", + "settings-info-app-use-file-operation-exclusions": "Kopyalama və yapışdırma əməliyyatlarında istisna nümunələrinə uyğun gələn fayl və qovluqları ötür.", + "settings-info-app-floating-button": "Üzən sürətli əməliyyatlar düyməsini göstər.", + "settings-info-app-font-manager": "Tətbiq şriftlərini quraşdır, idarə et və ya çıxar.", + "settings-info-app-fullscreen": "Acode-dan istifadə edərkən sistemin vəziyyət zolağını gizlət.", + "settings-info-app-keybindings": "Düymə təyinatları faylını redaktə et və ya qısayolları sıfırla.", + "settings-info-app-keyboard-mode": "Redaktə zamanı ekran klaviaturasının necə işləyəcəyini seç.", + "settings-info-app-language": "Tətbiqin dilini və tərcümə olunmuş etiketlərini seç.", + "settings-info-app-open-file-list-position": "Aktiv fayllar siyahısının harada görünəcəyini seç.", + "settings-info-app-quick-tools-settings": "Sürətli alət qısayollarının sırasını dəyiş və onları fərdiləşdir.", + "settings-info-app-quick-tools-trigger-mode": "Sürətli alətlərin basdıqda və ya toxunduqda necə açılacağını seç.", + "settings-info-app-remember-files": "Son dəfə açıq olan faylları yenidən aç.", + "settings-info-app-remember-folders": "Əvvəlki seansdakı qovluqları yenidən aç.", + "settings-info-app-retry-remote-fs": "Uğursuz ötürmədən sonra uzaq fayl əməliyyatlarına yenidən cəhd et.", + "settings-info-app-side-buttons": "Redaktorun yanında əlavə əməliyyat düymələrini göstər.", + "settings-info-app-sponsor-sidebar": "Yan paneldə sponsor bəndini göstər.", + "settings-info-app-touch-move-threshold": "Toxunuşla sürükləmənin aşkarlanması üçün tələb olunan ən az hərəkət.", + "settings-info-app-ui-zoom": "Acode interfeysində mətnin miqyasını dəyiş.", + "settings-info-app-vibrate-on-tap": "Toxunuşlar və idarəetmə elementləri üçün titrəyişli cavabı aktivləşdir.", + "settings-info-editor-autosave": "Dəyişiklikləri müəyyən gecikmədən sonra avtomatik yadda saxla.", + "settings-info-editor-color-preview": "Redaktorda rəng dəyərlərinin sətirdaxili önbaxışını göstər.", + "settings-info-editor-fade-fold-widgets": "Qatlama nişanlarını lazım olana qədər solğunlaşdır.", + "settings-info-editor-font-family": "Redaktorda istifadə olunan şrifti seç.", + "settings-info-editor-font-size": "Redaktorun mətn ölçüsünü təyin et.", + "settings-info-editor-format-on-save": "Fayl hər dəfə yadda saxlanıldıqda formatlayıcını işə sal.", + "settings-info-editor-hard-wrap": "Yalnız vizual bükülmə əvəzinə həqiqi sətirsonu simvolları yerləşdir.", + "settings-info-editor-indent-guides": "Girinti bələdçi xətlərini göstər.", + "settings-info-editor-line-height": "Sətirlər arasındakı şaquli məsafəni tənzimlə.", + "settings-info-editor-line-numbers": "Kənar zolaqda sətir nömrələrini göstər.", + "settings-info-editor-lint-gutter": "Kənar zolaqda diaqnostika və kod yoxlaması nişanlarını göstər.", + "settings-info-editor-live-autocomplete": "Yazarkən təkliflər göstər.", + "settings-info-editor-local-word-completion": "Cari fayldakı sözləri təklif et.", + "settings-info-editor-language-completion": "CodeMirror dil paketlərindən açar sözlər, kod parçaları və digər tamamlamalar təklif et.", + "settings-info-editor-recommend-extensions": "Dil rejimi olmadığına görə fayl adi mətn kimi açıldıqda qoşmalar təklif et.", + "extension recommendation title": "{extension} üçün qoşmalar mövcuddur", + "extension recommendation message": "{extension} üçün sintaksis rejimi quraşdırılmayıb. Qoşmalar arasında \"{keyword}\" üzrə axtarış et.", + "extension request title": "{extension} üçün qoşma tapılmadı", + "extension request message": "Acode-un bu fayl növünün sintaksisini rəngləyə bilməsi üçün qoşma istə.", + "search plugins": "Qoşmalarda axtarış", + "request plugin": "Qoşma istə", + "settings-info-editor-auto-close-tags": "HTML, XML, Vue, Angular və PHP şablon fayllarında bağlayıcı etiketləri avtomatik yerləşdir.", + "settings-info-editor-auto-rename-tags": "HTML-ə bənzər etiketləri redaktə edərkən uyğun açıcı və ya bağlayıcı etiketin adını dəyiş.", + "settings-info-editor-rainbow-brackets": "Uyğun mötərizələri iç-içəlik dərinliyinə görə rənglə.", + "settings-info-editor-relative-line-numbers": "Cari sətirdən məsafəni göstər.", + "settings-info-editor-rtl-text": "Sağdan sola yazı istiqamətini hər sətir üçün dəyiş.", + "settings-info-editor-scroll-settings": "Sürüşdürmə zolağının ölçüsünü, sürətini və jestlərin davranışını tənzimlə.", + "settings-info-editor-shift-click-selection": "Yuxarı registr düyməsini basılı saxlayıb toxunmaqla və ya klikləməklə seçimi genişləndir.", + "settings-info-editor-show-share-button": "Seçim menyusunda paylaş düyməsini göstər.", + "settings-info-editor-show-spaces": "Boşluq və sətirsonu simvollarının görünən nişanlarını göstər.", + "settings-info-editor-soft-tab": "Tabulyasiya simvolları əvəzinə boşluqlar yerləşdir.", + "settings-info-editor-tab-size": "Hər tabulyasiya addımının neçə boşluqdan ibarət olduğunu təyin et.", + "settings-info-editor-teardrop-size": "Toxunuşla redaktə üçün kursor tutacağının ölçüsünü təyin et.", + "settings-info-editor-text-wrap": "Redaktorda uzun sətirləri bük.", + "settings-info-lsp-add-custom-server": "Quraşdırma, yeniləmə və işə salma əmrləri ilə fərdi dil serverini qeydiyyata al.", + "settings-info-lsp-allow-non-terminal-workspace": "SAF, xarici və uzaq məkanlar üçün dil serverlərinə icazə ver. LSP Acode-un daxili terminalında işləyir və həmin məkanlara giriş əldə edə bilmir. Buna görə virtual yola və ya keş məkanına qoşulduqda funksiyalar düzgün işləməyə bilər.", + "settings-info-lsp-edit-init-options": "İlkin sazlama seçimlərini JSON kimi redaktə et.", + "settings-info-lsp-install-server": "Bu dil serverini quraşdır və ya təmir et.", + "settings-info-lsp-remove-custom-server": "Bu fərdi dil serverini Acode-dan çıxar.", + "settings-info-lsp-server-enabled": "Bu dil serverini aktivləşdir və ya söndür.", + "settings-info-lsp-startup-timeout": "Acode-un serverin başlamasını nə qədər gözləyəcəyini təyin et.", + "settings-info-lsp-uninstall-server": "Bu server üçün quraşdırılmış paketləri və ya icra fayllarını çıxar.", + "settings-info-lsp-update-server": "Yeniləmə imkanı varsa, bu dil serverini yenilə.", + "settings-info-lsp-view-init-options": "Qüvvədə olan ilkin sazlama seçimlərinə JSON kimi bax.", + "settings-info-main-ad-rewards": "Müvəqqəti reklamsız istifadə imkanı əldə etmək üçün reklamlara bax.", + "settings-info-main-app-settings": "Dil, tətbiqin davranışı və sürətli giriş alətləri.", + "settings-info-main-backup-restore": "Parametrləri ehtiyat nüsxəyə ixrac et və ya sonradan bərpa et.", + "settings-info-main-changelog": "Son yeniləmələrə və buraxılış qeydlərinə bax.", + "settings-info-main-edit-settings": "settings.json faylını birbaşa redaktə et.", + "settings-info-main-editor-settings": "Şriftlər, tabulyasiyalar, təkliflər və redaktorun görünüşü.", + "settings-info-main-formatter": "Dəstəklənən hər dil üçün formatlayıcı seç.", + "settings-info-main-lsp-settings": "Dil serverlərini və redaktorun ağıllı funksiyalarını sazla.", + "settings-info-main-plugins": "Quraşdırılmış qoşmaları və onların əlçatan əməliyyatlarını idarə et.", + "settings-info-main-preview-settings": "Önbaxış rejimi, server portları və brauzerin davranışı.", + "settings-info-main-rateapp": "Google Play-də Acode-u qiymətləndir.", + "settings-info-main-remove-ads": "Daimi reklamsız istifadə imkanı əldə et.", + "settings-info-main-reset": "Acode-un parametrlərini sıfırlayaraq standart konfiqurasiyasını bərpa et.", + "settings-info-main-sponsors": "Acode-un davamlı inkişafına dəstək ol.", + "settings-info-main-terminal-settings": "Terminalın teması, şrifti, kursoru və seans davranışı.", + "settings-info-main-theme": "Tətbiqin teması, kontrast və fərdi rənglər.", + "settings-info-preview-disable-cache": "Tətbiqdaxili brauzerdə məzmunu həmişə yenidən yüklə.", + "settings-info-preview-host": "Önbaxış URL ünvanını açarkən istifadə olunan host adı.", + "settings-info-preview-mode": "Önbaxışı işə saldıqda harada açılacağını seç.", + "settings-info-preview-preview-port": "Canlı önbaxış serverinin istifadə etdiyi port.", + "settings-info-preview-server-port": "Tətbiqin daxili serverinin istifadə etdiyi port.", + "settings-info-preview-show-console-toggler": "Önbaxışda konsol düyməsini göstər.", + "settings-info-preview-use-current-file": "Önbaxışı başladarkən cari fayla üstünlük ver.", + "settings-info-terminal-convert-eol": "Terminal çıxışını yapışdırarkən və ya göstərərkən sətir sonluqlarını çevir.", + "settings-note-formatter-settings": "Hər dilə formatlayıcı təyin et. Daha çox seçim əldə etmək üçün formatlayıcı qoşmaları quraşdır.", + "settings-note-lsp-settings": "Dil serverləri avtomatik tamamlama, diaqnostika, üzərinə gəldikdə təfərrüatlar və digər imkanlar əlavə edir. Onlar Acode-un daxili terminalının birbaşa giriş əldə edə bildiyi qovluqlarla, məsələn, terminal/public qovluqları ilə daha yaxşı işləyir. SAF, xarici və uzaq məkanlar keşlənmiş və ya virtual yollardan istifadə edə bildiyi üçün standart olaraq ötürülür; uyğunluq seçimini yalnız onları sınamaq istəyirsənsə aktivləşdir.", + "lsp-allow-non-terminal-workspace": "LSP-ni xarici qovluqlarda işə sal", + "search result label singular": "nəticə", + "search result label plural": "nəticələr", + "pin tab": "Vərəqi bərkit", + "unpin tab": "Vərəqin bərkidilməsini ləğv et", + "pinned tab": "Bərkidilmiş vərəq", + "unpin tab before closing": "Vərəqi bağlamazdan əvvəl onun bərkidilməsini ləğv et.", + "app font": "Tətbiqin şrifti", + "app icon": "Tətbiqin nişanı", + "app icon changed": "Tətbiqin nişanı dəyişdirildi", + "app icon change warning": "Tətbiqin nişanı dəyişdirildikdən sonra tətbiq bağlanacaq.", + "settings-info-app-font-family": "Tətbiqin bütün interfeysində istifadə olunan şrifti seç.", + "settings-info-app-icon": "Cihazında göstərilən tətbiq nişanını seç.", + "unsaved selected tabs warning": "Seçilmiş vərəqlərdən bəziləri yadda saxlanılmayıb. Nə edəcəyini seç.", + "save selected tabs": "Seçilmiş vərəqləri yadda saxla", + "close selected tabs": "Seçilmiş vərəqləri bağla", + "save selected tabs warning": "Seçilmiş vərəqləri yadda saxlayıb bağlamaq istədiyinə əminsən?", + "close selected tabs warning": "Seçilmiş vərəqləri bağlamaq istədiyinə əminsən? Yadda saxlanılmamış dəyişiklikləri itirəcəksən və bu əməliyyatı geri qaytarmaq mümkün deyil.", + "close tabs to right": "Sağdakıları bağla", + "close tabs to left": "Soldakıları bağla", + "close other tabs": "Digərlərini bağla", + "plugin-not-supported": "Qoşma dəstəklənmir", + "plugin-not-supported-info": "Qoşma Acode-un köhnə versiyası üçün yaradılıb.", + "login-to-view": "Buna baxmaq üçün daxil ol...", + "iap-plugin-purchase-warning": "Satın alınmış qoşmalar Acode hesabınla sinxronlaşdırılmır. Satınalmanı bərpa etmək üçün Play Store-da eyni Google hesabından istifadə et.", + "iap-pro-purchase-warning": "Bu satınalma Acode hesabınla sinxronlaşdırılmayacaq. Satınalmanı bərpa etmək üçün Play Store-da eyni Google hesabından istifadə et.", + "confirm-login": "Acode-a daxil olmamısan, indi daxil olmaq istəyirsən?", + "terminal:failsafe": "Nasazlıqdan qorunma rejimi", + "terminal:failsafe-info": "Terminalı sistemin əmr qabığı ilə işə sal", + "compact": "Yığcam", + "off": "Sönülü", + "quick tools height": "Sürətli alətlərin hündürlüyü", + "quick tools toggler": "Sürətli alətlərin keçid düyməsi", + "terminal:block": "Blok", + "terminal:underline": "Alt xətt", + "terminal:bar": "Şaquli xətt", + "terminal:inactive block": "Blok", + "terminal:inactive underline": "Alt xətt", + "terminal:inactive bar": "Şaquli xətt", + "terminal:inactive none": "Yoxdur", + "terminal:normal": "Adi", + "terminal:bold": "Qalın", + "quicktools-trigger:click": "Klik", + "quicktools-trigger:touch": "Toxunuş", + "settings-info-terminal-uninstall": "Terminalın quraşdırılmasını silmək istədiyinə əminsən?", + "terminal:inactive outline": "Kontur", + "restored successfully": "Terminal uğurla bərpa edildi", + "uninstalled successfully": "Terminalın quraşdırılması uğurla silindi", + "enter plugin source": "Qoşmanın mənbəyini daxil et", + "enter keywords": "Açar sözləri daxil et", + "enter author name": "Müəllifin adını daxil et", + "update available": "Yeniləmə mövcuddur", + "update available info": "Acode {version} artıq əlçatandır! Baxmaq üçün buraya bas.", + "plugin updates": "Qoşma yeniləmələri", + "plugin updates singular": "1 qoşmanın yeni versiyası mövcuddur.", + "plugin updates plural": "{count} qoşmanın yeni versiyası mövcuddur.", + "just now": "İndicə", + "day singular": "{count} gün əvvəl", + "hour singular": "{count} saat əvvəl", + "min singular": "{count} dəqiqə əvvəl", + "day plural": "{count} gün bundan əvvəl", + "hour plural": "{count} saat bundan əvvəl", + "min plural": "{count} dəqiqə bundan əvvəl", + "settings-category-builtin-servers": "Daxili serverlər", + "settings-category-plugin-servers": "Qoşma serverləri", + "active processes": "Aktiv proseslər", + "total memory": "Ümumi yaddaş", + "uptime": "İşləmə müddəti", + "note": "Qeyd", + "acode main process": "Acode-un əsas prosesi", + "ppid parent": "PPID (üst proses)", + "unknown": "Naməlum", + "just started": "İndicə başladı", + "diff days": "{days} gün {hr} saat əvvəl", + "diff hr": "{hr} saat {min} dəq əvvəl", + "diff min": "{min} dəq {sec} san əvvəl", + "diff sec": "{sec} san əvvəl", + "command": "Əmr", + "managed": "İdarə olunan", + "acode service": "Acode xidməti", + "horizontal scroll margin": "Üfüqi sürüşdürmə boşluğu", + "settings-info-horizontal-scroll-margin": "Sözə görə bükülmə sönülü olduqda ən uzun sətirdən sonra boş sahə artırır. Mənfi olmayan istənilən tam piksel dəyərini daxil et.", + "confirm app icon reward": "Bu tətbiq nişanını tətbiq etmək üçün bir mükafatlı reklama baxmaq istəyirsən?", + "rewarded ad unavailable": "Mükafatlı reklamlar hazırda əlçatan deyil. Yenidən cəhd et.", + "rewarded ad failed": "Reklama baxışı tamamlamaq mümkün olmadı. Yenidən cəhd et.", + "rewarded ad incomplete": "Mükafatı qazanmaq üçün reklama sona qədər bax.", + "plugin-review:dialog-label": "Qoşma rəyləri", + "plugin-review:account-check-failed": "Hesabını yoxlamaq mümkün olmadı. Yenidən cəhd et.", + "plugin-review:sign-in": "Rəy bildirmək üçün daxil ol", + "plugin-review:edit": "Rəyini redaktə et", + "plugin-review:add": "Rəy əlavə et...", + "plugin-review:placeholder": "Təcrübəni paylaş...", + "plugin-review:input-label": "Qoşma rəyi", + "plugin-review:vote-group-label": "Səs", + "plugin-review:thumbs-up": "Bəyən", + "plugin-review:thumbs-down": "Bəyənmə", + "plugin-review:delete": "Rəyi sil", + "plugin-review:load-failed": "Rəyləri yükləmək mümkün olmadı.", + "plugin-review:retry": "Yenidən cəhd et", + "plugin-review:empty-title": "Hələ rəy yoxdur", + "plugin-review:empty-description": "Təcrübəsini paylaşan ilk şəxs ol.", + "plugin-review:yours": "Rəyin", + "plugin-review:community": "İcma rəyləri", + "plugin-review:no-other-reviews": "Hələ başqa rəy yoxdur.", + "plugin-review:login-incomplete": "Giriş tamamlanmadı.", + "plugin-review:sign-in-failed": "Daxil olmaq mümkün olmadı.", + "plugin-review:session-expired-review": "Seansının müddəti bitdi. Rəy bildirmək üçün yenidən daxil ol.", + "plugin-review:save-failed": "Rəyi yadda saxlamaq mümkün olmadı.", + "plugin-review:delete-confirmation": "Rəyin silinsin? Bu əməliyyatı geri qaytarmaq mümkün deyil.", + "plugin-review:session-expired-continue": "Seansının müddəti bitdi. Davam etmək üçün yenidən daxil ol.", + "plugin-review:delete-failed": "Rəyi silmək mümkün olmadı.", + "plugin-review:you": "Sən", + "plugin-review:edit-action": "Rəyi redaktə et", + "plugin-review:recommended": "Bu qoşmanı tövsiyə edib", + "plugin-review:error-max-length": "Rəy ən çox {max} simvoldan ibarət olmalıdır.", + "plugin-review:error-downvote-comment": "Nəyin yaxşılaşdırıla biləcəyini tərtibatçıya bildir.", + "plugin-review:error-empty": "Şərh əlavə et və ya «Bəyən» seçimini et.", + "plugin-review:unrated": "Qiymətləndirilməyib" +} diff --git a/src/lib/lang.js b/src/lib/lang.js index b4477e9629..dc3ed9d376 100644 --- a/src/lib/lang.js +++ b/src/lib/lang.js @@ -191,6 +191,12 @@ const langMap = { return await import("../lang/ln-ln.json"); }, }, + "az-az": { + name: "Azərbaycanca", + async strings() { + return await import("../lang/az-az.json"); + }, + }, }; const intlLocaleOverrides = { From 20e4fa52a125a5f8c0105184b2347ea49273d9dc Mon Sep 17 00:00:00 2001 From: Launch Lee <80872691+LaunchLee@users.noreply.github.com> Date: Sat, 19 Sep 2026 21:57:41 +0000 Subject: [PATCH 129/195] Update zh-cn.json and zh-hant.json (#2914) --- src/lang/zh-cn.json | 16 ++++++++-------- src/lang/zh-hant.json | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index eafd3a0410..d0b7a0604b 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -877,12 +877,12 @@ "plugin-review:error-downvote-comment": "告诉开发者哪些地方可以改进。", "plugin-review:error-empty": "添加评论或选择“赞”。", "plugin-review:unrated": "暂无评分", - "wrapped line indent": "Word wrap indentation", - "wrap-indent-same": "Same", - "wrap-indent-indent": "Indent (+1 level)", - "wrap-indent-deep": "Deep indent (+2 levels)", - "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", - "icon pack": "Icon pack", - "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "wrapped line indent": "折行缩进", + "wrap-indent-same": "与首行对齐", + "wrap-indent-indent": "缩进(+1 级)", + "wrap-indent-deep": "深度缩进(+2 级)", + "settings-info-editor-wrapping-indent": "选择折行后的文本是从行首靠左对齐、保持原行的缩进,还是进一步向内缩进。每增加一级缩进将遵循您设定的制表符宽度。", + "icon pack": "图标包", + "settings-info-icon-pack": "选择资源管理器及整个应用文件列表中文件和文件夹所使用的图标。", + "unavailable": "不可用" } diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json index 4f2d88a12b..b8dc2ae7df 100644 --- a/src/lang/zh-hant.json +++ b/src/lang/zh-hant.json @@ -877,12 +877,12 @@ "plugin-review:error-downvote-comment": "告訴開發者哪些地方可以改進。", "plugin-review:error-empty": "新增留言或選擇「讚」。", "plugin-review:unrated": "尚未評分", - "wrapped line indent": "Word wrap indentation", - "wrap-indent-same": "Same", - "wrap-indent-indent": "Indent (+1 level)", - "wrap-indent-deep": "Deep indent (+2 levels)", - "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", - "icon pack": "Icon pack", - "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "wrapped line indent": "換行縮排", + "wrap-indent-same": "與首行對齊", + "wrap-indent-indent": "縮排(+1 級)", + "wrap-indent-deep": "深度縮排(+2 級)", + "settings-info-editor-wrapping-indent": "選擇換行後的文字是靠左對齊、保持原行的縮排,還是進一步向內縮排。每增加一級縮排將遵循您設定的製表符寬度。", + "icon pack": "圖標包", + "settings-info-icon-pack": "選擇檔案總管及整個應用程式檔案列表中檔案和文件夾所使用的圖標。", + "unavailable": "不可用" } From 30b4e630dfd3ba816b13e08ff58dc1c8485378bc Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 20 Sep 2026 16:07:14 +0530 Subject: [PATCH 130/195] chore: upgrade lezer lib This fixes the ino broken syntax parsing --- bun.lock | 12 +++--- package-lock.json | 16 ++++---- package.json | 6 ++- tests/unit/lezerLrHighlighting.test.js | 52 ++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 16 deletions(-) create mode 100644 tests/unit/lezerLrHighlighting.test.js diff --git a/bun.lock b/bun.lock index 5d53ecb875..e6b1726d93 100644 --- a/bun.lock +++ b/bun.lock @@ -39,9 +39,9 @@ "@codemirror/view": "^6.43.9", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", - "@lezer/common": "^1.5.0", + "@lezer/common": "^1.5.2", "@lezer/highlight": "^1.2.3", - "@lezer/lr": "^1.4.7", + "@lezer/lr": "^1.4.10", "@ungap/custom-elements": "^1.3.0", "@xterm/addon-attach": "^0.12.0", "@xterm/addon-fit": "^0.11.0", @@ -154,6 +154,8 @@ "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.7.1", "@codemirror/view": "^6.43.9", + "@lezer/common": "^1.5.2", + "@lezer/lr": "^1.4.10", "tar": "^7.5.22", }, "packages": { @@ -475,7 +477,7 @@ "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="], - "@lezer/common": ["@lezer/common@1.5.0", "", {}, "sha512-PNGcolp9hr4PJdXR4ix7XtixDrClScvtSCYW3rQG106oVMOOI+jFb+0+J3mbeL/53g1Zd6s0kJzaw6Ri68GmAA=="], + "@lezer/common": ["@lezer/common@1.5.2", "", {}, "sha512-sxQE460fPZyU3sdc8lafxiPwJHBzZRy/udNFynGQky1SePYBdhkBl1kOagA9uT3pxR8K09bOrmTUqA9wb/PjSQ=="], "@lezer/cpp": ["@lezer/cpp@1.1.5", "", { "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "sha512-DIhSXmYtJKLehrjzDFN+2cPt547ySQ41nA8yqcDf/GxMc+YM736xqltFkvADL2M0VebU5I+3+4ks2Vv+Kyq3Aw=="], @@ -495,7 +497,7 @@ "@lezer/json": ["@lezer/json@1.0.3", "", { "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "sha512-BP9KzdF9Y35PDpv04r0VeSTKDeox5vVr3efE7eBbx3r4s3oNLfunchejZhjArmeieBH+nVOpgIiBJpEAv8ilqQ=="], - "@lezer/lr": ["@lezer/lr@1.4.7", "", { "dependencies": { "@lezer/common": "^1.0.0" } }, "sha512-wNIFWdSUfX9Jc6ePMzxSPVgTVB4EOfDIwLQLWASyiUdHKaMsiilj9bYiGkGQCKVodd0x6bgQCV207PILGFCF9Q=="], + "@lezer/lr": ["@lezer/lr@1.4.10", "", { "dependencies": { "@lezer/common": "^1.0.0" } }, "sha512-rnCpTIBafOx4mRp43xOxDJbFipJm/c0cia/V5TiGlhmMa+wsSdoGmUN3w5Bqrks/09Q/D4tNAmWaT8p6NRi77A=="], "@lezer/markdown": ["@lezer/markdown@1.6.3", "", { "dependencies": { "@lezer/common": "^1.5.0", "@lezer/highlight": "^1.0.0" } }, "sha512-jpGm5Ps+XErS+xA4urw7ogEGkeZOahVQF21Z6oECF0sj+2liwZopd2+I8uH5I/vZsRuuze3OxBREIANLf6KKUw=="], @@ -1957,8 +1959,6 @@ "@codemirror/lang-liquid/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], - "@codemirror/lang-markdown/@lezer/common": ["@lezer/common@1.5.2", "", {}, "sha512-sxQE460fPZyU3sdc8lafxiPwJHBzZRy/udNFynGQky1SePYBdhkBl1kOagA9uT3pxR8K09bOrmTUqA9wb/PjSQ=="], - "@codemirror/lang-php/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], "@codemirror/lang-vue/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], diff --git a/package-lock.json b/package-lock.json index eb74acdaab..14176d4b19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,9 +43,9 @@ "@codemirror/view": "^6.43.9", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", - "@lezer/common": "^1.5.0", + "@lezer/common": "^1.5.2", "@lezer/highlight": "^1.2.3", - "@lezer/lr": "^1.4.7", + "@lezer/lr": "^1.4.10", "@ungap/custom-elements": "^1.3.0", "@xterm/addon-attach": "^0.12.0", "@xterm/addon-fit": "^0.11.0", @@ -4239,9 +4239,9 @@ } }, "node_modules/@lezer/common": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.0.tgz", - "integrity": "sha512-PNGcolp9hr4PJdXR4ix7XtixDrClScvtSCYW3rQG106oVMOOI+jFb+0+J3mbeL/53g1Zd6s0kJzaw6Ri68GmAA==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.2.tgz", + "integrity": "sha512-sxQE460fPZyU3sdc8lafxiPwJHBzZRy/udNFynGQky1SePYBdhkBl1kOagA9uT3pxR8K09bOrmTUqA9wb/PjSQ==", "license": "MIT" }, "node_modules/@lezer/cpp": { @@ -4345,9 +4345,9 @@ } }, "node_modules/@lezer/lr": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.7.tgz", - "integrity": "sha512-wNIFWdSUfX9Jc6ePMzxSPVgTVB4EOfDIwLQLWASyiUdHKaMsiilj9bYiGkGQCKVodd0x6bgQCV207PILGFCF9Q==", + "version": "1.4.10", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.10.tgz", + "integrity": "sha512-rnCpTIBafOx4mRp43xOxDJbFipJm/c0cia/V5TiGlhmMa+wsSdoGmUN3w5Bqrks/09Q/D4tNAmWaT8p6NRi77A==", "license": "MIT", "dependencies": { "@lezer/common": "^1.0.0" diff --git a/package.json b/package.json index 1265f6ad22..9be320fe84 100644 --- a/package.json +++ b/package.json @@ -157,9 +157,9 @@ "@codemirror/view": "^6.43.9", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", - "@lezer/common": "^1.5.0", + "@lezer/common": "^1.5.2", "@lezer/highlight": "^1.2.3", - "@lezer/lr": "^1.4.7", + "@lezer/lr": "^1.4.10", "@ungap/custom-elements": "^1.3.0", "@xterm/addon-attach": "^0.12.0", "@xterm/addon-fit": "^0.11.0", @@ -210,6 +210,8 @@ "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.7.1", "@codemirror/view": "^6.43.9", + "@lezer/common": "^1.5.2", + "@lezer/lr": "^1.4.10", "tar": "^7.5.22" }, "browserslist": "cover 100%", diff --git a/tests/unit/lezerLrHighlighting.test.js b/tests/unit/lezerLrHighlighting.test.js new file mode 100644 index 0000000000..a656f94c81 --- /dev/null +++ b/tests/unit/lezerLrHighlighting.test.js @@ -0,0 +1,52 @@ +import { cppLanguage } from "@codemirror/lang-cpp"; +import { classHighlighter, highlightTree } from "@lezer/highlight"; +import { describe, expect, it } from "vitest"; + +function highlightRanges(source) { + const tree = cppLanguage.parser.parse(source); + const inverted = []; + tree.iterate({ + enter(node) { + if (node.from > node.to) { + inverted.push({ from: node.from, to: node.to, type: node.name }); + } + }, + }); + + const ranges = []; + highlightTree(tree, classHighlighter, (from, to, classes) => { + ranges.push({ from, to, classes }); + }); + + const lastOffset = ranges.at(-1)?.to ?? 0; + return { + inverted, + ranges, + lastLine: source.slice(0, lastOffset).split("\n").length, + }; +} + +describe("@lezer/lr C highlighting", () => { + it("keeps highlighting after a comment/#define composite skipped node", () => { + const source = [ + "", + "// ─────────────────────────────────────────────────────────────", + "// COLORS (RGB565)", + "// ─────────────────────────────────────────────────────────────", + "#define C_BG 0x0841", + "#define C_PANEL 0x1082", + "int setup() {", + " return C_BG;", + "}", + ].join("\n"); + + const { inverted, ranges, lastLine } = highlightRanges(source); + + expect(inverted).toEqual([]); + expect(ranges.length).toBeGreaterThan(10); + expect(lastLine).toBe(source.split("\n").length); + expect(ranges.some((range) => range.classes.includes("tok-keyword"))).toBe( + true, + ); + }); +}); From d7a1c9185648a28a9c3d872662bfd271b2547193 Mon Sep 17 00:00:00 2001 From: Rohit Kushvaha Date: Mon, 21 Sep 2026 06:21:47 +0000 Subject: [PATCH 131/195] fix: resolve @codemirror/lsp-client from git submodule (#2901) * fix: resolve @codemirror/lsp-client from git submodule npm refuses to fetch git dependencies (EALLOWGIT), which made `npm run setup` fail before installing any dependency. The dependency now points at the local codemirror-lsp-client submodule, pinned to the same commit the git ref used. - setup initializes the submodule before installing dependencies - CI checkout steps that install or build fetch submodules recursively - rspack treats the submodule's prebuilt dist as a dependency, not as first-party source - docs clone with --recurse-submodules and note the setup fallback * fix * format * fix --- .github/workflows/ci.yml | 4 + .github/workflows/nightly-build.yml | 1 + .gitmodules | 3 + CONTRIBUTING.md | 43 +- _typos.toml | 1 + bun.lock | 4 +- codemirror-lsp-client | 1 + package-lock.json | 1986 +++++++++++++++++++++------ package.json | 6 +- readme.md | 2 + rspack.config.js | 5 +- tests/unit/setup.test.js | 107 ++ utils/setup.js | 167 ++- 13 files changed, 1910 insertions(+), 420 deletions(-) create mode 100644 .gitmodules create mode 160000 codemirror-lsp-client create mode 100644 tests/unit/setup.test.js diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3c053f23e..db104d8948 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,6 +49,8 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + submodules: recursive - name: Use Node.js uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 @@ -73,6 +75,8 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + submodules: recursive - name: Use Node.js uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 4323996a06..beb371e43a 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -102,6 +102,7 @@ jobs: with: fetch-depth: 0 # Required for tags persist-credentials: false + submodules: recursive ref: ${{ (inputs.is_PR && inputs.PR_NUMBER) && github.event.pull_request.head.sha || '' }} allow-unsafe-pr-checkout: ${{ !!(inputs.is_PR && inputs.PR_NUMBER && github.event.pull_request.head.sha) }} diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..4d07829ae2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "codemirror-lsp-client"] + path = codemirror-lsp-client + url = https://github.com/Acode-Foundation/codemirror-lsp-client diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2457415d2e..d91d3dac9d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ Thank you for your interest in contributing to Acode! This guide will help you g 2. Clone and open the repository: ```bash - git clone https://github.com/Acode-Foundation/Acode.git + git clone --recurse-submodules https://github.com/Acode-Foundation/Acode.git code Acode ``` @@ -35,7 +35,7 @@ If your editor doesn't support DevContainers, you can use Docker directly: ```bash # Clone the repository -git clone https://github.com/Acode-Foundation/Acode.git +git clone --recurse-submodules https://github.com/Acode-Foundation/Acode.git cd Acode # Build the Docker image from our Dockerfile @@ -109,7 +109,7 @@ Some more environment variables, check [cordova docs](https://cordova.apache.org ```bash # Clone the repository -git clone https://github.com/Acode-Foundation/Acode.git +git clone --recurse-submodules https://github.com/Acode-Foundation/Acode.git cd Acode # Install dependencies and set up Cordova @@ -121,6 +121,43 @@ pnpm run build paid dev apk # or pnpm run build p d The APK will be at: `platforms/android/app/build/outputs/apk/debug/app-debug.apk` +> [!NOTE] +> `@codemirror/lsp-client` comes from the `codemirror-lsp-client` git submodule and is installed as a local `file:` dependency, so the submodule must be cloned before `setup` runs. If it isn't, `setup` stops with a missing-submodules error — see [Troubleshooting](#-troubleshooting). + +## 🔧 Troubleshooting + +### `setup` fails: submodules are not checked out + +`@codemirror/lsp-client` is not fetched from a registry. It comes from the +[`codemirror-lsp-client`](https://github.com/Acode-Foundation/codemirror-lsp-client) +git submodule and is installed as a local `file:` dependency. + +Before installing dependencies, `pnpm run setup` reads `.gitmodules` and verifies that +every submodule it declares has actually been cloned — a directory only counts as cloned +when it contains at least one non-hidden file. An empty, missing, or partial checkout (for +example one holding only `.git` or `node_modules`) therefore stops setup with: + +``` +The following submodule(s) are not checked out (empty or absent): +``` + +To fix it, initialize the submodules from the repository root and re-run setup: + +```bash +git submodule update --init --recursive +pnpm run setup +``` + +This usually means the repository was cloned without `--recurse-submodules`. Cloning with +submodules avoids the problem entirely: + +```bash +git clone --recurse-submodules https://github.com/Acode-Foundation/Acode.git +``` + +> [!NOTE] +> The check is skipped when `.gitmodules` is absent (for example an unpacked source +> archive) or declares no submodules, so those setups are unaffected. ## 📝 Contribution Guidelines diff --git a/_typos.toml b/_typos.toml index 2a74f47eb8..463c229048 100644 --- a/_typos.toml +++ b/_typos.toml @@ -4,6 +4,7 @@ check-filename = true [files] extend-exclude = [ "node_modules", + "codemirror-lsp-client", "www", "*.yaml", ".vscode", diff --git a/bun.lock b/bun.lock index e6b1726d93..86f0f4f46a 100644 --- a/bun.lock +++ b/bun.lock @@ -32,7 +32,7 @@ "@codemirror/language-data": "^6.5.2", "@codemirror/legacy-modes": "^6.5.3", "@codemirror/lint": "^6.9.7", - "@codemirror/lsp-client": "github:Acode-Foundation/codemirror-lsp-client#db6930c2b6db67e14978f08ae8f5aeb149d29468", + "@codemirror/lsp-client": "file:codemirror-lsp-client", "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.7.1", "@codemirror/theme-one-dark": "^6.1.3", @@ -429,7 +429,7 @@ "@codemirror/lint": ["@codemirror/lint@6.9.7", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.42.0", "crelt": "^1.0.5" } }, "sha512-28/+iWLYxKxsvGYhSYL7zaCZqLz5+FFFDq9tVsvGv9kv8RY4fFAchJ5WX9M3YrrRlTIsECjsXPqeNgnSmNP2dg=="], - "@codemirror/lsp-client": ["@codemirror/lsp-client@github:Acode-Foundation/codemirror-lsp-client#db6930c", { "dependencies": { "@codemirror/autocomplete": "^6.20.0", "@codemirror/language": "^6.11.0", "@codemirror/lint": "^6.8.5", "@codemirror/state": "^6.5.2", "@codemirror/view": "^6.37.0", "@lezer/highlight": "^1.2.1", "marked": "^15.0.12", "vscode-languageserver-protocol": "^3.17.5" } }, "Acode-Foundation-codemirror-lsp-client-db6930c", "sha512-yENf3NqsXGERWcvUL98FziXbUgkB1R4jU2kTQGYxwcZ6HwTP8+uwebs/j+HDRD7VbxRyemYJClvMNU8n0p8UPg=="], + "@codemirror/lsp-client": ["@codemirror/lsp-client@file:codemirror-lsp-client", { "dependencies": { "@codemirror/autocomplete": "^6.20.0", "@codemirror/language": "^6.11.0", "@codemirror/lint": "^6.8.5", "@codemirror/state": "^6.5.2", "@codemirror/view": "^6.37.0", "@lezer/highlight": "^1.2.1", "marked": "^15.0.12", "vscode-languageserver-protocol": "^3.17.5" }, "devDependencies": { "@codemirror/buildhelper": "^1.0.0", "@codemirror/lang-javascript": "^6.0.0", "typescript": "^5.8.3", "typescript-language-server": "^4.3.4" } }], "@codemirror/search": ["@codemirror/search@6.7.1", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.37.0", "crelt": "^1.0.5" } }, "sha512-uMe5UO6PamJtSHrXhhHOzSX3ReWtiJrva6GnPMwSOrZtiExb5X5eExhr2OUZQVvdxPsKpY3Ro2mFbQadpPWmHA=="], diff --git a/codemirror-lsp-client b/codemirror-lsp-client new file mode 160000 index 0000000000..db6930c2b6 --- /dev/null +++ b/codemirror-lsp-client @@ -0,0 +1 @@ +Subproject commit db6930c2b6db67e14978f08ae8f5aeb149d29468 diff --git a/package-lock.json b/package-lock.json index 14176d4b19..b702bafd71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "@codemirror/language-data": "^6.5.2", "@codemirror/legacy-modes": "^6.5.3", "@codemirror/lint": "^6.9.7", - "@codemirror/lsp-client": "github:Acode-Foundation/codemirror-lsp-client#db6930c2b6db67e14978f08ae8f5aeb149d29468", + "@codemirror/lsp-client": "file:codemirror-lsp-client", "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.7.1", "@codemirror/theme-one-dark": "^6.1.3", @@ -149,6 +149,27 @@ "ws": "^8.21.3" } }, + "codemirror-lsp-client": { + "name": "@codemirror/lsp-client", + "version": "6.2.5-acode.1", + "license": "MIT", + "dependencies": { + "@codemirror/autocomplete": "^6.20.0", + "@codemirror/language": "^6.11.0", + "@codemirror/lint": "^6.8.5", + "@codemirror/state": "^6.5.2", + "@codemirror/view": "^6.37.0", + "@lezer/highlight": "^1.2.1", + "marked": "^15.0.12", + "vscode-languageserver-protocol": "^3.17.5" + }, + "devDependencies": { + "@codemirror/buildhelper": "^1.0.0", + "@codemirror/lang-javascript": "^6.0.0", + "typescript": "^5.8.3", + "typescript-language-server": "^4.3.4" + } + }, "node_modules/@antfu/install-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@antfu/install-pkg/-/install-pkg-1.1.0.tgz", @@ -3447,6 +3468,13 @@ "node": ">=6.9.0" } }, + "node_modules/@bazel/runfiles": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@bazel/runfiles/-/runfiles-6.5.0.tgz", + "integrity": "sha512-RzahvqTkfpY2jsDxo8YItPX+/iZ6hbiikw1YhE0bA9EKBR5Og8Pa6FHn9PO9M0zaXRVsr0GFQLKbB/0rzy9SzA==", + "dev": true, + "license": "Apache-2.0" + }, "node_modules/@biomejs/biome": { "version": "2.4.11", "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.4.11.tgz", @@ -3634,6 +3662,22 @@ "@lezer/common": "^1.0.0" } }, + "node_modules/@codemirror/buildhelper": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@codemirror/buildhelper/-/buildhelper-1.0.2.tgz", + "integrity": "sha512-aVewtDPZptq9dTvYqIjpu9HTEmMaKAE4VL22z5E1ycgY5e1LdAiRd5YYjqzQeqLjxpWsHy+emO3n5UUcxpUmSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@lezer/generator": "^1.0.0", + "@marijn/buildtool": "^1.0.0", + "@marijn/testtool": "^0.1.3" + }, + "bin": { + "cm-buildhelper": "bin/cm-buildhelper.js", + "cm-runtests": "bin/cm-runtests.js" + } + }, "node_modules/@codemirror/commands": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.11.0.tgz", @@ -3992,20 +4036,8 @@ } }, "node_modules/@codemirror/lsp-client": { - "version": "6.2.5-acode.1", - "resolved": "git+ssh://git@github.com/Acode-Foundation/codemirror-lsp-client.git#db6930c2b6db67e14978f08ae8f5aeb149d29468", - "integrity": "sha512-rmtrQojm4rSJCmqZhoskG4UeEth+lzrcGsmrlnKqSU0EJCeRYE1kjZKhjI+XsMVD5YFgup31IGN+NsxfOirDMg==", - "license": "MIT", - "dependencies": { - "@codemirror/autocomplete": "^6.20.0", - "@codemirror/language": "^6.11.0", - "@codemirror/lint": "^6.8.5", - "@codemirror/state": "^6.5.2", - "@codemirror/view": "^6.37.0", - "@lezer/highlight": "^1.2.1", - "marked": "^15.0.12", - "vscode-languageserver-protocol": "^3.17.5" - } + "resolved": "codemirror-lsp-client", + "link": true }, "node_modules/@codemirror/search": { "version": "6.7.1", @@ -4198,6 +4230,17 @@ "@jridgewell/trace-mapping": "^0.3.24" } }, + "node_modules/@jridgewell/remapping": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", + "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", @@ -4429,188 +4472,561 @@ "@lezer/lr": "^1.4.0" } }, + "node_modules/@marijn/buildtool": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@marijn/buildtool/-/buildtool-1.2.0.tgz", + "integrity": "sha512-ytEK7n4NVrq6Rhq2J+N/CcvJLl6NX0bZ1qSi3w8lxZVcI4L6Y6vj1pugcTnv+YdyFNwFuACSdDesetZmQqSy1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mocha": "^9.1.1", + "acorn": "^8.10.0", + "acorn-walk": "^8.2.0", + "rollup": "^4.8.0", + "rollup-plugin-dts": "^6.1.0", + "typescript": "^5.3.3" + } + }, "node_modules/@marijn/find-cluster-break": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.4.tgz", "integrity": "sha512-Wy0V7+SGUjnF9/TkiM1hKVDPj7jKXduPNboMVtHTA8dySMURWqfg/JZ9E2Sq8JgSJmkl7k7Qe9FLeMSrSraWmQ==", "license": "MIT" }, - "node_modules/@mermaid-js/parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.2.1.tgz", - "integrity": "sha512-n12NohV3mrUyUL2o93IgG/ifeW9FTyeJn3zDxkhwa8MJ9Fxg3HQMlA3RiGmD/3UnJvheztkjjQAjA2T4LmUcpw==", - "license": "MIT", - "dependencies": { - "@chevrotain/types": "~11.1.2" - } - }, - "node_modules/@napi-rs/wasm-runtime": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz", - "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==", + "node_modules/@marijn/testtool": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@marijn/testtool/-/testtool-0.1.3.tgz", + "integrity": "sha512-Rdi3amfFyTZoUXxMc95k9x9Ult+DtQSuOHsZwN5wtIKQ5JdXQaErgtWgGjW0Fpg4Rj0YrUCpWOj0VqsumAt5JA==", "dev": true, "license": "MIT", - "optional": true, "dependencies": { - "@tybys/wasm-util": "^0.10.3" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/Brooooooklyn" + "esmoduleserve": "^0.2.0", + "ist": "^1.1.7", + "mocha": "^10.0.0", + "selenium-webdriver": "^4.10.0", + "serve-static": "^1.14.1" }, - "peerDependencies": { - "@emnapi/core": "^1.7.1", - "@emnapi/runtime": "^1.7.1" + "bin": { + "testtool": "bin/testtool.js" } }, - "node_modules/@netflix/nerror": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@netflix/nerror/-/nerror-1.1.3.tgz", - "integrity": "sha512-b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==", + "node_modules/@marijn/testtool/node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "dev": true, "license": "MIT", - "dependencies": { - "assert-plus": "^1.0.0", - "extsprintf": "^1.4.0", - "lodash": "^4.17.15" + "engines": { + "node": ">=6" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "node_modules/@marijn/testtool/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, "engines": { - "node": ">= 8" + "node": ">=8" } }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "node_modules/@marijn/testtool/node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@marijn/testtool/node_modules/brace-expansion": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.7.tgz", + "integrity": "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==", + "dev": true, "license": "MIT", - "engines": { - "node": ">= 8" + "dependencies": { + "balanced-match": "^1.0.0" } }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "node_modules/@marijn/testtool/node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, "license": "MIT", "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" }, "engines": { - "node": ">= 8" + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" } }, - "node_modules/@npmcli/agent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.0.tgz", - "integrity": "sha512-kAQTcEN9E8ERLVg5AsGwLNoFb+oEG6engbqAU2P43gD4JEIkNGMHdVQ096FsOAAYpZPB0RSt0zgInKIAS1l5QA==", + "node_modules/@marijn/testtool/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, "license": "ISC", "dependencies": { - "agent-base": "^7.1.0", - "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.1", - "lru-cache": "^11.2.1", - "socks-proxy-agent": "^8.0.3" - }, - "engines": { - "node": "^20.17.0 || >=22.9.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" } }, - "node_modules/@npmcli/arborist": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-9.5.0.tgz", - "integrity": "sha512-qS+TtKWC58sjBjD+szLrhEj2TCLnwzUA9vlMyCnU9ztw01ZjQSu25iQPxeBa0sk9sS9/Hzs/xJMWl7J/vRCjGQ==", - "license": "ISC", - "dependencies": { - "@gar/promise-retry": "^1.0.0", - "@isaacs/string-locale-compare": "^1.1.0", - "@npmcli/fs": "^5.0.0", - "@npmcli/installed-package-contents": "^4.0.0", - "@npmcli/map-workspaces": "^5.0.0", - "@npmcli/metavuln-calculator": "^9.0.2", - "@npmcli/name-from-folder": "^4.0.0", - "@npmcli/node-gyp": "^5.0.0", - "@npmcli/package-json": "^7.0.0", - "@npmcli/query": "^5.0.0", - "@npmcli/redact": "^4.0.0", - "@npmcli/run-script": "^10.0.0", - "bin-links": "^6.0.0", - "cacache": "^20.0.1", - "common-ancestor-path": "^2.0.0", - "hosted-git-info": "^9.0.0", - "json-stringify-nice": "^1.1.4", - "lru-cache": "^11.2.1", - "minimatch": "^10.0.3", - "nopt": "^9.0.0", - "npm-install-checks": "^8.0.0", - "npm-package-arg": "^13.0.0", - "npm-pick-manifest": "^11.0.1", - "npm-registry-fetch": "^19.0.0", - "pacote": "^21.0.2", - "parse-conflict-json": "^5.0.1", - "proc-log": "^6.0.0", - "proggy": "^4.0.0", - "promise-all-reject-late": "^1.0.0", - "promise-call-limit": "^3.0.1", - "semver": "^7.3.7", - "ssri": "^13.0.0", - "treeverse": "^3.0.0", - "walk-up-path": "^4.0.0" - }, - "bin": { - "arborist": "bin/index.js" - }, + "node_modules/@marijn/testtool/node_modules/diff": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.2.tgz", + "integrity": "sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A==", + "dev": true, + "license": "BSD-3-Clause", "engines": { - "node": "^20.17.0 || >=22.9.0" + "node": ">=0.3.1" } }, - "node_modules/@npmcli/arborist/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, + "node_modules/@marijn/testtool/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/@marijn/testtool/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@npmcli/fs": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-5.0.0.tgz", - "integrity": "sha512-7OsC1gNORBEawOa5+j2pXN9vsicaIOH5cPXxoR6fJOmH6/EXpJB2CajXOu1fPRFun2m1lktEFX11+P89hqO/og==", + "node_modules/@marijn/testtool/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", + "dev": true, "license": "ISC", "dependencies": { - "semver": "^7.3.5" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" }, "engines": { - "node": "^20.17.0 || >=22.9.0" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@npmcli/fs/node_modules/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "node_modules/@marijn/testtool/node_modules/minimatch": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", + "dev": true, "license": "ISC", - "bin": { - "semver": "bin/semver.js" + "dependencies": { + "brace-expansion": "^2.0.1" }, "engines": { "node": ">=10" } }, - "node_modules/@npmcli/git": { - "version": "7.0.2", + "node_modules/@marijn/testtool/node_modules/mocha": { + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", + "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.3", + "browser-stdout": "^1.3.1", + "chokidar": "^3.5.3", + "debug": "^4.3.5", + "diff": "^5.2.0", + "escape-string-regexp": "^4.0.0", + "find-up": "^5.0.0", + "glob": "^8.1.0", + "he": "^1.2.0", + "js-yaml": "^4.1.0", + "log-symbols": "^4.1.0", + "minimatch": "^5.1.6", + "ms": "^2.1.3", + "serialize-javascript": "^6.0.2", + "strip-json-comments": "^3.1.1", + "supports-color": "^8.1.1", + "workerpool": "^6.5.1", + "yargs": "^16.2.0", + "yargs-parser": "^20.2.9", + "yargs-unparser": "^2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha.js" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/@marijn/testtool/node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/@marijn/testtool/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/@marijn/testtool/node_modules/serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/@marijn/testtool/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@marijn/testtool/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@marijn/testtool/node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@marijn/testtool/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/@marijn/testtool/node_modules/workerpool": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", + "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/@marijn/testtool/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@marijn/testtool/node_modules/yargs": { + "version": "16.2.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.2.tgz", + "integrity": "sha512-Nt9ZJjXTv5R8MHbqby/wXQ6Gi0Bb3TcYZkR1bzuL4yB2OxWPkXknz513gEF0GoA6tn00UpbPvERW8rzCuWCA6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@marijn/testtool/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/@mermaid-js/parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.2.1.tgz", + "integrity": "sha512-n12NohV3mrUyUL2o93IgG/ifeW9FTyeJn3zDxkhwa8MJ9Fxg3HQMlA3RiGmD/3UnJvheztkjjQAjA2T4LmUcpw==", + "license": "MIT", + "dependencies": { + "@chevrotain/types": "~11.1.2" + } + }, + "node_modules/@napi-rs/lzma-linux-x64-gnu": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@napi-rs/lzma-linux-x64-gnu/-/lzma-linux-x64-gnu-1.5.1.tgz", + "integrity": "sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ==", + "cpu": [ + "x64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^22.20 || ^24.12 || >=25" + } + }, + "node_modules/@napi-rs/wasm-runtime": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz", + "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@tybys/wasm-util": "^0.10.3" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + }, + "peerDependencies": { + "@emnapi/core": "^1.7.1", + "@emnapi/runtime": "^1.7.1" + } + }, + "node_modules/@netflix/nerror": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@netflix/nerror/-/nerror-1.1.3.tgz", + "integrity": "sha512-b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==", + "license": "MIT", + "dependencies": { + "assert-plus": "^1.0.0", + "extsprintf": "^1.4.0", + "lodash": "^4.17.15" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@npmcli/agent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.0.tgz", + "integrity": "sha512-kAQTcEN9E8ERLVg5AsGwLNoFb+oEG6engbqAU2P43gD4JEIkNGMHdVQ096FsOAAYpZPB0RSt0zgInKIAS1l5QA==", + "license": "ISC", + "dependencies": { + "agent-base": "^7.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.1", + "lru-cache": "^11.2.1", + "socks-proxy-agent": "^8.0.3" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/arborist": { + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-9.5.0.tgz", + "integrity": "sha512-qS+TtKWC58sjBjD+szLrhEj2TCLnwzUA9vlMyCnU9ztw01ZjQSu25iQPxeBa0sk9sS9/Hzs/xJMWl7J/vRCjGQ==", + "license": "ISC", + "dependencies": { + "@gar/promise-retry": "^1.0.0", + "@isaacs/string-locale-compare": "^1.1.0", + "@npmcli/fs": "^5.0.0", + "@npmcli/installed-package-contents": "^4.0.0", + "@npmcli/map-workspaces": "^5.0.0", + "@npmcli/metavuln-calculator": "^9.0.2", + "@npmcli/name-from-folder": "^4.0.0", + "@npmcli/node-gyp": "^5.0.0", + "@npmcli/package-json": "^7.0.0", + "@npmcli/query": "^5.0.0", + "@npmcli/redact": "^4.0.0", + "@npmcli/run-script": "^10.0.0", + "bin-links": "^6.0.0", + "cacache": "^20.0.1", + "common-ancestor-path": "^2.0.0", + "hosted-git-info": "^9.0.0", + "json-stringify-nice": "^1.1.4", + "lru-cache": "^11.2.1", + "minimatch": "^10.0.3", + "nopt": "^9.0.0", + "npm-install-checks": "^8.0.0", + "npm-package-arg": "^13.0.0", + "npm-pick-manifest": "^11.0.1", + "npm-registry-fetch": "^19.0.0", + "pacote": "^21.0.2", + "parse-conflict-json": "^5.0.1", + "proc-log": "^6.0.0", + "proggy": "^4.0.0", + "promise-all-reject-late": "^1.0.0", + "promise-call-limit": "^3.0.1", + "semver": "^7.3.7", + "ssri": "^13.0.0", + "treeverse": "^3.0.0", + "walk-up-path": "^4.0.0" + }, + "bin": { + "arborist": "bin/index.js" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/arborist/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@npmcli/fs": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-5.0.0.tgz", + "integrity": "sha512-7OsC1gNORBEawOa5+j2pXN9vsicaIOH5cPXxoR6fJOmH6/EXpJB2CajXOu1fPRFun2m1lktEFX11+P89hqO/og==", + "license": "ISC", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/fs/node_modules/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@npmcli/git": { + "version": "7.0.2", "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-7.0.2.tgz", "integrity": "sha512-oeolHDjExNAJAnlYP2qzNjMX/Xi9bmu78C9dIGr4xjobrSKbuMYCph8lTzn4vnW3NjIqVmw/f8BCfouqyJXlRg==", "license": "ISC", @@ -4826,35 +5242,224 @@ "funding": { "type": "opencollective", "url": "https://opencollective.com/parcel" - }, - "optionalDependencies": { - "@parcel/watcher-android-arm64": "2.5.6", - "@parcel/watcher-darwin-arm64": "2.5.6", - "@parcel/watcher-darwin-x64": "2.5.6", - "@parcel/watcher-freebsd-x64": "2.5.6", - "@parcel/watcher-linux-arm-glibc": "2.5.6", - "@parcel/watcher-linux-arm-musl": "2.5.6", - "@parcel/watcher-linux-arm64-glibc": "2.5.6", - "@parcel/watcher-linux-arm64-musl": "2.5.6", - "@parcel/watcher-linux-x64-glibc": "2.5.6", - "@parcel/watcher-linux-x64-musl": "2.5.6", - "@parcel/watcher-win32-arm64": "2.5.6", - "@parcel/watcher-win32-ia32": "2.5.6", - "@parcel/watcher-win32-x64": "2.5.6" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.5.6", + "@parcel/watcher-darwin-arm64": "2.5.6", + "@parcel/watcher-darwin-x64": "2.5.6", + "@parcel/watcher-freebsd-x64": "2.5.6", + "@parcel/watcher-linux-arm-glibc": "2.5.6", + "@parcel/watcher-linux-arm-musl": "2.5.6", + "@parcel/watcher-linux-arm64-glibc": "2.5.6", + "@parcel/watcher-linux-arm64-musl": "2.5.6", + "@parcel/watcher-linux-x64-glibc": "2.5.6", + "@parcel/watcher-linux-x64-musl": "2.5.6", + "@parcel/watcher-win32-arm64": "2.5.6", + "@parcel/watcher-win32-ia32": "2.5.6", + "@parcel/watcher-win32-x64": "2.5.6" + } + }, + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz", + "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz", + "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz", + "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz", + "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz", + "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-musl": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz", + "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz", + "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz", + "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz", + "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@parcel/watcher-android-arm64": { + "node_modules/@parcel/watcher-linux-x64-musl": { "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz", - "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz", + "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==", "cpu": [ - "arm64" + "x64" ], "dev": true, "license": "MIT", "optional": true, "os": [ - "android" + "linux" ], "engines": { "node": ">= 10.0.0" @@ -4864,10 +5469,10 @@ "url": "https://opencollective.com/parcel" } }, - "node_modules/@parcel/watcher-darwin-arm64": { + "node_modules/@parcel/watcher-win32-arm64": { "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz", - "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz", + "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==", "cpu": [ "arm64" ], @@ -4875,7 +5480,7 @@ "license": "MIT", "optional": true, "os": [ - "darwin" + "win32" ], "engines": { "node": ">= 10.0.0" @@ -4885,18 +5490,18 @@ "url": "https://opencollective.com/parcel" } }, - "node_modules/@parcel/watcher-darwin-x64": { + "node_modules/@parcel/watcher-win32-ia32": { "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz", - "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz", + "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==", "cpu": [ - "x64" + "ia32" ], "dev": true, "license": "MIT", "optional": true, "os": [ - "darwin" + "win32" ], "engines": { "node": ">= 10.0.0" @@ -4906,10 +5511,10 @@ "url": "https://opencollective.com/parcel" } }, - "node_modules/@parcel/watcher-freebsd-x64": { + "node_modules/@parcel/watcher-win32-x64": { "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz", - "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz", + "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==", "cpu": [ "x64" ], @@ -4917,7 +5522,7 @@ "license": "MIT", "optional": true, "os": [ - "freebsd" + "win32" ], "engines": { "node": ">= 10.0.0" @@ -4927,10 +5532,10 @@ "url": "https://opencollective.com/parcel" } }, - "node_modules/@parcel/watcher-linux-arm-glibc": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz", - "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==", + "node_modules/@rolldown/binding-android-arm-eabi": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.6.tgz", + "integrity": "sha512-b+jTcARdTiFLI6jB4a5XjTm0RWd6KcRfQj/I2356fxUZemiho9zQLxo0RtCuMDAyKcLo6cEltkgbQp6d1+sjjQ==", "cpu": [ "arm" ], @@ -4938,20 +5543,84 @@ "license": "MIT", "optional": true, "os": [ - "linux" + "android" ], "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" + "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@parcel/watcher-linux-arm-musl": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz", - "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==", + "node_modules/@rolldown/binding-android-arm64": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.6.tgz", + "integrity": "sha512-lkWU8ZJaRk9q3CIEY1Tc7vIFALp3Xw5NfGJo2hQg5oIqNgxWi1zI+IiDEK3r70BF5Dzol1tcXsnzsRc8NLhG+Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-darwin-arm64": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.6.tgz", + "integrity": "sha512-dgR56NYnvAszm7Ob1B2/Vn0e8bUQYZH2UjVaMMtMVOCKFSfjhfLmuA/9+O+F+ajUdG6B/bSssrKW6JJYASa8jA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-darwin-x64": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.6.tgz", + "integrity": "sha512-vpVxFvUCFioJqug7OTvqptkc4yb8UX0AwfDmJpaR/0sWz+BUmqSVAf7c8JkUgnN8YLspb4a/N6NhTyMAmdyQ7Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-freebsd-x64": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.6.tgz", + "integrity": "sha512-h1wG6Y6K3JlRswxsI64qQJqBAy4vrLuHgRbc8CZMGSWTOFRY6ghMApM1NKzB2I0n5xV1fjkE18SuVl2QpLeNpA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-linux-arm-gnueabihf": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.6.tgz", + "integrity": "sha512-tbCiqub0q2MVWJKgF5PoAlNWCtQydiOYSLIkd8sByqK/6MMYLJRcSXSYodqYtd0O+Fw7QaVmKKlS4oL94YRZ0w==", "cpu": [ "arm" ], @@ -4962,17 +5631,13 @@ "linux" ], "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" + "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@parcel/watcher-linux-arm64-glibc": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz", - "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==", + "node_modules/@rolldown/binding-linux-arm64-gnu": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.6.tgz", + "integrity": "sha512-oxK9+baEBPhZG5HB4URY+uU04zJWeZlH6Tb9rB5DK4DF9XR1uXNLXt5Q5ZsugTKayNCNLhkcwz/ye74hRI98dg==", "cpu": [ "arm64" ], @@ -4983,17 +5648,13 @@ "linux" ], "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" + "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@parcel/watcher-linux-arm64-musl": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz", - "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==", + "node_modules/@rolldown/binding-linux-arm64-musl": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.6.tgz", + "integrity": "sha512-muWCk27FVBEZtv0MsK8gnfSmgczA8KQ0uRVJbTABKhkRfQc38aUrcb7fhi3BNiyseFmgcRsoMfQsSNJ+DbZdSw==", "cpu": [ "arm64" ], @@ -5004,17 +5665,47 @@ "linux" ], "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" + "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@parcel/watcher-linux-x64-glibc": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz", - "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==", + "node_modules/@rolldown/binding-linux-ppc64-gnu": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.6.tgz", + "integrity": "sha512-eWDoSfU7Co2qj3vgB3Dt4lj1mG6CoWbcJQkRMP3XJplyCMtuaq3LHvPFjS9QIPvMGWVadJC04Xiy0IdcVPtnwQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-linux-s390x-gnu": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.6.tgz", + "integrity": "sha512-2bWNjRSIayvupRKxXUY2tWG9fYdoUlTqWywHRvE8Eq3GvuQ+f2HeIkve697fIt+IQs/PV8yFsdWuhp1aJ1PdnA==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-linux-x64-gnu": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.6.tgz", + "integrity": "sha512-KekI0gS0wLxe1UBSQSjenBVwou/JkcQPDzBPICGZjxUv9k3RteHDPBQaiOicZUFKRIH2wKEimGwVpnJsbPzu7w==", "cpu": [ "x64" ], @@ -5025,17 +5716,13 @@ "linux" ], "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" + "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@parcel/watcher-linux-x64-musl": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz", - "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==", + "node_modules/@rolldown/binding-linux-x64-musl": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.6.tgz", + "integrity": "sha512-TvtPnfVr+HtyGiDmPK4VWmlNm7QhNNAcK5Q9A7aOXsI8545yCyaoMaicXrFZ72JzeYjaUVk7yT243zT0jzjFKQ==", "cpu": [ "x64" ], @@ -5046,17 +5733,13 @@ "linux" ], "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" + "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@parcel/watcher-win32-arm64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz", - "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==", + "node_modules/@rolldown/binding-openharmony-arm64": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.6.tgz", + "integrity": "sha512-iOo0VEay2XFhaCcH0sps5XIimkSuOnNaZrf6+ZkoSOQBJPKNU48RkmJv0/lSpipexu5P+ouFgafe5IGr/DiQfg==", "cpu": [ "arm64" ], @@ -5064,22 +5747,18 @@ "license": "MIT", "optional": true, "os": [ - "win32" + "openharmony" ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" + "engines": { + "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@parcel/watcher-win32-ia32": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz", - "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==", + "node_modules/@rolldown/binding-win32-arm64-msvc": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.6.tgz", + "integrity": "sha512-y5NTmmasMS455JlOCO4ZM9krIchv3Mvm1crL1iUPGOPgEzSkves9n0SdC5Sjz6+qWDFhd8/JpfWMH8NSWNHe+A==", "cpu": [ - "ia32" + "arm64" ], "dev": true, "license": "MIT", @@ -5088,17 +5767,13 @@ "win32" ], "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" + "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@parcel/watcher-win32-x64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz", - "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==", + "node_modules/@rolldown/binding-win32-x64-msvc": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.6.tgz", + "integrity": "sha512-np8iZSLfXlAD4kWhiyq/u0Yt8oZDtRQ8lGhQaCXo2rl37KNjeU0GjJuwr4P3oeZ++ROfofsKNBqR5LTO8aXyWQ==", "cpu": [ "x64" ], @@ -5109,17 +5784,20 @@ "win32" ], "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" + "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@rolldown/binding-android-arm-eabi": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.6.tgz", - "integrity": "sha512-b+jTcARdTiFLI6jB4a5XjTm0RWd6KcRfQj/I2356fxUZemiho9zQLxo0RtCuMDAyKcLo6cEltkgbQp6d1+sjjQ==", + "node_modules/@rolldown/pluginutils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz", + "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.63.3.tgz", + "integrity": "sha512-w3Jnvi1ocaVm/c7yVPpfB98XeSRBMyzp6njL5MVVbGyXjpmUkN+s6Hp4t0PqhGCCaI1ZHMKXt/w0lA1RCaLVcw==", "cpu": [ "arm" ], @@ -5128,15 +5806,12 @@ "optional": true, "os": [ "android" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + ] }, - "node_modules/@rolldown/binding-android-arm64": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.6.tgz", - "integrity": "sha512-lkWU8ZJaRk9q3CIEY1Tc7vIFALp3Xw5NfGJo2hQg5oIqNgxWi1zI+IiDEK3r70BF5Dzol1tcXsnzsRc8NLhG+Q==", + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.63.3.tgz", + "integrity": "sha512-uI/ESiaIbbRYAEhzy8PCUWDp1hB0bjAqM06mW9flOoNO4Q8DQpeoREhBR5Hegfl+wpXiguyJv6XSPzEN7OxyHQ==", "cpu": [ "arm64" ], @@ -5145,15 +5820,12 @@ "optional": true, "os": [ "android" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + ] }, - "node_modules/@rolldown/binding-darwin-arm64": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.6.tgz", - "integrity": "sha512-dgR56NYnvAszm7Ob1B2/Vn0e8bUQYZH2UjVaMMtMVOCKFSfjhfLmuA/9+O+F+ajUdG6B/bSssrKW6JJYASa8jA==", + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.63.3.tgz", + "integrity": "sha512-oxhrd1jmXLwWZ83eQYDXxuqRdkqkzrjR3JobKeuUyfdNZo11FuQIvqEOZhyIT7OBHxXoGslDDjN0cQcM6T0TqQ==", "cpu": [ "arm64" ], @@ -5162,15 +5834,12 @@ "optional": true, "os": [ "darwin" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + ] }, - "node_modules/@rolldown/binding-darwin-x64": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.6.tgz", - "integrity": "sha512-vpVxFvUCFioJqug7OTvqptkc4yb8UX0AwfDmJpaR/0sWz+BUmqSVAf7c8JkUgnN8YLspb4a/N6NhTyMAmdyQ7Q==", + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.63.3.tgz", + "integrity": "sha512-7/YiIMghVE8DrxKvNdorAaJVdriOFgOIpdStnPx8ppx5zfTwC3jBCSEAIzB7JD5404m65THl6H93UTTVUvypmg==", "cpu": [ "x64" ], @@ -5179,15 +5848,26 @@ "optional": true, "os": [ "darwin" + ] + }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.63.3.tgz", + "integrity": "sha512-GXFZRRoMAytaI5z6N3Zhfw0WL18Q0M8r95D5hlC4GqE/lGk8pbSJNUBoOWDfbm6dTciqHj2nU87tI5f6XhQiOg==", + "cpu": [ + "arm64" ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] }, - "node_modules/@rolldown/binding-freebsd-x64": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.6.tgz", - "integrity": "sha512-h1wG6Y6K3JlRswxsI64qQJqBAy4vrLuHgRbc8CZMGSWTOFRY6ghMApM1NKzB2I0n5xV1fjkE18SuVl2QpLeNpA==", + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.63.3.tgz", + "integrity": "sha512-77W+8X3ddYgPxUpB8nZFQs2Mq+wc4HVlcSRtApXLjYBcnPMkttrSnU8VwKQjeWYhMsITHFs5cWBQ8vz1Q+5RHQ==", "cpu": [ "x64" ], @@ -5196,134 +5876,247 @@ "optional": true, "os": [ "freebsd" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.63.3.tgz", + "integrity": "sha512-FVkwK+iUC+mq+GipVK46rRVticfAPtvPUNlqlGXUDxdVk/UGjQiiiUVPUrEXdSpU2ufU0XxLGyTqDtBidDOVmg==", + "cpu": [ + "arm" ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@rolldown/binding-linux-arm-gnueabihf": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.6.tgz", - "integrity": "sha512-tbCiqub0q2MVWJKgF5PoAlNWCtQydiOYSLIkd8sByqK/6MMYLJRcSXSYodqYtd0O+Fw7QaVmKKlS4oL94YRZ0w==", + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.63.3.tgz", + "integrity": "sha512-+aGU1t3398yQOVj1Bz8o3e+KtswxAPvO+mtxtNdfXYMkXIHu7XhhkCD7/DEH9q8tF8uhDnMWvfpUKI8y1sZJsg==", "cpu": [ "arm" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.63.3.tgz", + "integrity": "sha512-cR0kjpRXR2KJ2oQK8E2KTPtphs+b9hZ8IhTZubNryt/RsqgdOZBQ2Zq0q5UedtiIi0rs3jVhJh55RE1ZHUVGUA==", + "cpu": [ + "arm64" ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@rolldown/binding-linux-arm64-gnu": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.6.tgz", - "integrity": "sha512-oxK9+baEBPhZG5HB4URY+uU04zJWeZlH6Tb9rB5DK4DF9XR1uXNLXt5Q5ZsugTKayNCNLhkcwz/ye74hRI98dg==", + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.63.3.tgz", + "integrity": "sha512-y1RYi4Q3/9ByVWSSt9kX2ustE0B7kFYbJ6zZdVZVyqopZs3yhCTwRfrjIX4vezUJInma/Gs6BOFDJg7yZmJ0IQ==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.63.3.tgz", + "integrity": "sha512-DNhEA5viIj3Z5bZLE4z4oV8N5ozWqDwyt7T6KG7VdLDJ0nW+rNOYlphBl4/3HQkK75qipPLsVOfStHHOwN9WSg==", + "cpu": [ + "loong64" ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@rolldown/binding-linux-arm64-musl": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.6.tgz", - "integrity": "sha512-muWCk27FVBEZtv0MsK8gnfSmgczA8KQ0uRVJbTABKhkRfQc38aUrcb7fhi3BNiyseFmgcRsoMfQsSNJ+DbZdSw==", + "node_modules/@rollup/rollup-linux-loong64-musl": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.63.3.tgz", + "integrity": "sha512-17gQCqrIpXBX2Cmi9/TygnVOqGbzsba/iaqcYSL8FY7lNugg+7AiYNs5c5nKWD+NRQha36Sa0CqkJqH4XVHwnQ==", "cpu": [ - "arm64" + "loong64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.63.3.tgz", + "integrity": "sha512-6LwVnZRIyINpdku/yOcI8Tm9YqLmhHK5emmlOOnW9tO0SYEm1FmKPcsSAGp0NBlqR2P04xaND4jvN6sTHqhq8A==", + "cpu": [ + "ppc64" ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@rolldown/binding-linux-ppc64-gnu": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.6.tgz", - "integrity": "sha512-eWDoSfU7Co2qj3vgB3Dt4lj1mG6CoWbcJQkRMP3XJplyCMtuaq3LHvPFjS9QIPvMGWVadJC04Xiy0IdcVPtnwQ==", + "node_modules/@rollup/rollup-linux-ppc64-musl": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.63.3.tgz", + "integrity": "sha512-xMUqkTXlEUtI/p5AAukMwBRr1enU3efsTeF+bskeFfk8t1C9rcC8sLREcZXmTfAXEbvRdJVSonVJez3TMlbR3w==", "cpu": [ "ppc64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.63.3.tgz", + "integrity": "sha512-S3E94co9F9WRRqEaUoQZ38K1gCz6KiM+nL7/3ijq7fDGF3OznjS5TasgYITlvl27GQKtu4lOAOsr5MFwkijvOA==", + "cpu": [ + "riscv64" ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@rolldown/binding-linux-s390x-gnu": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.6.tgz", - "integrity": "sha512-2bWNjRSIayvupRKxXUY2tWG9fYdoUlTqWywHRvE8Eq3GvuQ+f2HeIkve697fIt+IQs/PV8yFsdWuhp1aJ1PdnA==", + "node_modules/@rollup/rollup-linux-riscv64-musl": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.63.3.tgz", + "integrity": "sha512-1QtRDwG42x5BJI3s9mxu5rEjDnfbSnk20HQ9/ylTAYnSwYwxMVb+Vgu34wzzTQ7ogqBybebgQNUDAvZVQ38DbA==", "cpu": [ - "s390x" + "riscv64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.63.3.tgz", + "integrity": "sha512-BQhejF6ZXOpxbngiNTP12GCGQeaDVL2QXGeBVViKIYzFHM5RKxTxwUMB1fr1BeNFphFMpnRqC5QSXFSa4z6UQw==", + "cpu": [ + "s390x" ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@rolldown/binding-linux-x64-gnu": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.6.tgz", - "integrity": "sha512-KekI0gS0wLxe1UBSQSjenBVwou/JkcQPDzBPICGZjxUv9k3RteHDPBQaiOicZUFKRIH2wKEimGwVpnJsbPzu7w==", + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.63.3.tgz", + "integrity": "sha512-SXagRwnI2Wlwlitllu59UK/nGVbD1CKPcNqDplHwIC4BqJcpXFjD32d1R/RbuISa95HdQrZM3/7v4bKiowFaLA==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ "linux" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + ] }, - "node_modules/@rolldown/binding-linux-x64-musl": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.6.tgz", - "integrity": "sha512-TvtPnfVr+HtyGiDmPK4VWmlNm7QhNNAcK5Q9A7aOXsI8545yCyaoMaicXrFZ72JzeYjaUVk7yT243zT0jzjFKQ==", + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.63.3.tgz", + "integrity": "sha512-2IPozoEALRCziGqE8O9KMK60PMu5TS1huv4fwoeCexj+WjmcwFtX9CTOVbfXCUqcELAubEwRFPYlzb/WvwY2HQ==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ "linux" + ] + }, + "node_modules/@rollup/rollup-openbsd-x64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.63.3.tgz", + "integrity": "sha512-AoxqosUHT9IX54hFn2TiN6A7d6ZKTtE6pd2bqWtqkkNJ6HJGaU6FRouGX8L1O7R/ZwsnCnpQrHzb4pDEx+UHRQ==", + "cpu": [ + "x64" ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ] }, - "node_modules/@rolldown/binding-openharmony-arm64": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.6.tgz", - "integrity": "sha512-iOo0VEay2XFhaCcH0sps5XIimkSuOnNaZrf6+ZkoSOQBJPKNU48RkmJv0/lSpipexu5P+ouFgafe5IGr/DiQfg==", + "node_modules/@rollup/rollup-openharmony-arm64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.63.3.tgz", + "integrity": "sha512-d+CaftKgmkFBzCwezMqqy1d0QNNYugqLCMcYVQWBy5SS2YfeMP8Q8ripkgx9O8IyBXXLHrJ+aaCV4U96usv6Yg==", "cpu": [ "arm64" ], @@ -5332,32 +6125,54 @@ "optional": true, "os": [ "openharmony" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.63.3.tgz", + "integrity": "sha512-xXlDF6nR1eOuXbdDy5Hl5fmtY7teUDevF/k0O7IPoZe4Tpmdv+lgdE5JRsnhQtt37ql9P0VF2kAN9a0OCZdo+Q==", + "cpu": [ + "arm64" ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] }, - "node_modules/@rolldown/binding-win32-arm64-msvc": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.6.tgz", - "integrity": "sha512-y5NTmmasMS455JlOCO4ZM9krIchv3Mvm1crL1iUPGOPgEzSkves9n0SdC5Sjz6+qWDFhd8/JpfWMH8NSWNHe+A==", + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.63.3.tgz", + "integrity": "sha512-YtXAgLN+JP7Ay6qG3eWhc7IHMQPzLc8r3uvhAvlJIoCz/4Q32+Bl9Fmnywidh8v1GOIMmymjovfqY9ETAtysvA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.63.3.tgz", + "integrity": "sha512-WuWtSJRNo549vzcfZyEgfqb6zeSgn1F+UE5kQ+BCjzz0W4MGCjntUHkZVc1VRuAM7+ULaSyhiPxD1spyewFvkQ==", "cpu": [ - "arm64" + "x64" ], "dev": true, "license": "MIT", "optional": true, "os": [ "win32" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } + ] }, - "node_modules/@rolldown/binding-win32-x64-msvc": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.6.tgz", - "integrity": "sha512-np8iZSLfXlAD4kWhiyq/u0Yt8oZDtRQ8lGhQaCXo2rl37KNjeU0GjJuwr4P3oeZ++ROfofsKNBqR5LTO8aXyWQ==", + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.63.3.tgz", + "integrity": "sha512-+lIKX7O0+IGe7WuhATaAMMeT7B76vfhXH/l9wLQL+nvyhbw2ohYCKIdWL56JfDu75CWt5oKRP4QFH/jkMtBquA==", "cpu": [ "x64" ], @@ -5366,17 +6181,7 @@ "optional": true, "os": [ "win32" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } - }, - "node_modules/@rolldown/pluginutils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz", - "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==", - "dev": true, - "license": "MIT" + ] }, "node_modules/@rspack/binding": { "version": "2.2.0", @@ -6117,6 +6922,13 @@ "license": "MIT", "peer": true }, + "node_modules/@types/mocha": { + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz", + "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/node": { "version": "26.1.2", "resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.2.tgz", @@ -6583,6 +7395,19 @@ "node": ">=0.4.0" } }, + "node_modules/acorn-walk": { + "version": "8.3.5", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz", + "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/agent-base": { "version": "7.1.4", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", @@ -8530,6 +9355,27 @@ "robust-predicates": "^3.0.2" } }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, "node_modules/detect-indent": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", @@ -8667,6 +9513,13 @@ "integrity": "sha512-SoRmbGStwNYHgKfjOrX2L0mUvp9bUVv0uPppZSOMAntEbcFtoC3MKF5b3T6HQPXKIV+QGY3xPO3JK5it5lVkuw==", "license": "MIT" }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "dev": true, + "license": "MIT" + }, "node_modules/electron-to-chromium": { "version": "1.5.415", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.415.tgz", @@ -8728,6 +9581,16 @@ "node": ">=14" } }, + "node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/endent": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/endent/-/endent-2.1.0.tgz", @@ -8828,6 +9691,13 @@ "node": ">=6" } }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "dev": true, + "license": "MIT" + }, "node_modules/escape-string-regexp": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", @@ -8840,6 +9710,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/esmoduleserve": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/esmoduleserve/-/esmoduleserve-0.2.1.tgz", + "integrity": "sha512-LeuOiyyCSc2sG0Clx9A/tzApfP2gz2/YPE7IBSQwP2JPZKm8S0WZ1b1DfH9eCYXo469k81od3lFvFloYJNpTYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.0.4", + "acorn-walk": "^8.0.0", + "resolve": "^1.15.1", + "serve-static": "^1.14.1" + }, + "bin": { + "esmoduleserve": "index.js" + } + }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -8873,6 +9759,16 @@ "node": ">=0.10.0" } }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/events": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", @@ -9109,6 +10005,16 @@ } } }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/fs-minipass": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", @@ -9412,6 +10318,27 @@ "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", "license": "BSD-2-Clause" }, + "node_modules/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/http-proxy-agent": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", @@ -9745,6 +10672,13 @@ "node": ">=0.10.0" } }, + "node_modules/ist": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/ist/-/ist-1.1.7.tgz", + "integrity": "sha512-ex9JyqY+tCjBlxN1pXlqxEgtGGUGp1TG83ll1xpu8SfPgOhfAhEGCuepNHlB+d7Le+hLoBcfCu/G0ZQaFbi9hA==", + "dev": true, + "license": "MIT" + }, "node_modules/jest-worker": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", @@ -10594,6 +11528,19 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/mime-db": { "version": "1.54.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", @@ -11582,6 +12529,19 @@ "node": ">=12.20.0" } }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -11746,6 +12706,16 @@ "dev": true, "license": "MIT" }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/path-browserify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", @@ -12184,6 +13154,16 @@ "safe-buffer": "^5.1.0" } }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/raw-loader": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz", @@ -12460,6 +13440,118 @@ "@rolldown/binding-win32-x64-msvc": "1.2.6" } }, + "node_modules/rollup": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.63.3.tgz", + "integrity": "sha512-1i2XreiAoMMXuPGD6Msj2xWrMMkHojNRKivInxGQcg7/1KuPuYlfUutLyh4drnOxUTHX9cHI4wFoat8D/NKaBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "1.0.9" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@napi-rs/lzma-linux-x64-gnu": "1.5.1", + "@rollup/rollup-android-arm-eabi": "4.63.3", + "@rollup/rollup-android-arm64": "4.63.3", + "@rollup/rollup-darwin-arm64": "4.63.3", + "@rollup/rollup-darwin-x64": "4.63.3", + "@rollup/rollup-freebsd-arm64": "4.63.3", + "@rollup/rollup-freebsd-x64": "4.63.3", + "@rollup/rollup-linux-arm-gnueabihf": "4.63.3", + "@rollup/rollup-linux-arm-musleabihf": "4.63.3", + "@rollup/rollup-linux-arm64-gnu": "4.63.3", + "@rollup/rollup-linux-arm64-musl": "4.63.3", + "@rollup/rollup-linux-loong64-gnu": "4.63.3", + "@rollup/rollup-linux-loong64-musl": "4.63.3", + "@rollup/rollup-linux-ppc64-gnu": "4.63.3", + "@rollup/rollup-linux-ppc64-musl": "4.63.3", + "@rollup/rollup-linux-riscv64-gnu": "4.63.3", + "@rollup/rollup-linux-riscv64-musl": "4.63.3", + "@rollup/rollup-linux-s390x-gnu": "4.63.3", + "@rollup/rollup-linux-x64-gnu": "4.63.3", + "@rollup/rollup-linux-x64-musl": "4.63.3", + "@rollup/rollup-openbsd-x64": "4.63.3", + "@rollup/rollup-openharmony-arm64": "4.63.3", + "@rollup/rollup-win32-arm64-msvc": "4.63.3", + "@rollup/rollup-win32-ia32-msvc": "4.63.3", + "@rollup/rollup-win32-x64-gnu": "4.63.3", + "@rollup/rollup-win32-x64-msvc": "4.63.3", + "fsevents": "~2.3.2" + } + }, + "node_modules/rollup-plugin-dts": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/rollup-plugin-dts/-/rollup-plugin-dts-6.5.1.tgz", + "integrity": "sha512-jODTXp3H7MK/Ur/ErtsrQ0G1GvaCmc3du+y5pNrdBMf6d7HlL2Nd/N6TkEr+f75CkUj01zEoEd7y2elH0eHi1Q==", + "dev": true, + "license": "LGPL-3.0-only", + "dependencies": { + "@jridgewell/remapping": "^2.3.5", + "@jridgewell/sourcemap-codec": "^1.5.5", + "convert-source-map": "^2.0.0", + "magic-string": "^0.30.21" + }, + "engines": { + "node": ">=20" + }, + "funding": { + "url": "https://github.com/sponsors/Swatinem" + }, + "optionalDependencies": { + "@babel/code-frame": "^8.0.0" + }, + "peerDependencies": { + "@typescript/typescript6": "^6", + "rollup": "^3 || ^4", + "typescript": "^4.5 || ^5 || ^6 || ^7" + }, + "peerDependenciesMeta": { + "@typescript/typescript6": { + "optional": true + } + } + }, + "node_modules/rollup-plugin-dts/node_modules/@babel/code-frame": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-8.0.0.tgz", + "integrity": "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@babel/helper-validator-identifier": "^8.0.0", + "js-tokens": "^10.0.0" + }, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/rollup-plugin-dts/node_modules/@babel/helper-validator-identifier": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.4.tgz", + "integrity": "sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": "^22.18.0 || >=24.11.0" + } + }, + "node_modules/rollup-plugin-dts/node_modules/js-tokens": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", + "dev": true, + "license": "MIT", + "optional": true + }, "node_modules/roughjs": { "version": "4.6.6", "resolved": "https://registry.npmjs.org/roughjs/-/roughjs-4.6.6.tgz", @@ -12631,6 +13723,32 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/selenium-webdriver": { + "version": "4.49.0", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.49.0.tgz", + "integrity": "sha512-16XqeOEMj+4+p+pzLLyvNWmF5jCY05EKIl3e1anZBgv4+zq7PUTtiNjKtQhMpwosZ0wIMKDFAQ2xdyogOHD4DA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/SeleniumHQ" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/selenium" + } + ], + "license": "Apache-2.0", + "dependencies": { + "@bazel/runfiles": "^6.5.0", + "jszip": "^3.10.1", + "tmp": "^0.2.7", + "ws": "^8.21.3" + }, + "engines": { + "node": ">= 22.0.0" + } + }, "node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -12640,6 +13758,48 @@ "semver": "bin/semver.js" } }, + "node_modules/send": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", + "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.1", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "~2.4.1", + "range-parser": "~1.2.1", + "statuses": "~2.0.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/send/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "license": "MIT" + }, "node_modules/serialize-javascript": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", @@ -12650,12 +13810,35 @@ "randombytes": "^2.1.0" } }, + "node_modules/serve-static": { + "version": "1.16.3", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz", + "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "~0.19.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", "license": "MIT" }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true, + "license": "ISC" + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -12849,6 +14032,16 @@ "dev": true, "license": "MIT" }, + "node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/std-env": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.2.0.tgz", @@ -13158,6 +14351,16 @@ "node": ">=8.0" } }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, "node_modules/treeverse": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz", @@ -13254,6 +14457,19 @@ "node": ">=14.17" } }, + "node_modules/typescript-language-server": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-4.4.1.tgz", + "integrity": "sha512-vEvDw+cjY75afMN2rhx0z8sQtFDAUHoBniksBmB6NUZlDt0rEIwQq01VMiqyXFm9uZwcED2475cmDeXxoDHleg==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "typescript-language-server": "lib/cli.mjs" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/uc.micro": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", diff --git a/package.json b/package.json index 9be320fe84..73c8310072 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,9 @@ "cordova-plugin-iap": {}, "com.foxdebug.acode.rk.customtabs": {}, "cordova-plugin-crashhandler": {}, - "cordova-plugin-advanced-http": {}, + "cordova-plugin-advanced-http": { + "ANDROIDBLACKLISTSECURESOCKETPROTOCOLS": "SSLv3,TLSv1" + }, "cordova-plugin-acode-webview": {}, "cordova-plugin-system": {} }, @@ -150,7 +152,7 @@ "@codemirror/language-data": "^6.5.2", "@codemirror/legacy-modes": "^6.5.3", "@codemirror/lint": "^6.9.7", - "@codemirror/lsp-client": "github:Acode-Foundation/codemirror-lsp-client#db6930c2b6db67e14978f08ae8f5aeb149d29468", + "@codemirror/lsp-client": "file:codemirror-lsp-client", "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.7.1", "@codemirror/theme-one-dark": "^6.1.3", diff --git a/readme.md b/readme.md index ca69912401..6732b02471 100644 --- a/readme.md +++ b/readme.md @@ -36,6 +36,8 @@ Acode/ |- www/ - Public documents, compiled files, and HTML templates | |- utils/ - CLI tools for building, string manipulation, and more +| +|- codemirror-lsp-client/ - Git submodule providing @codemirror/lsp-client (clone with --recurse-submodules) ## • Multi-language Support diff --git a/rspack.config.js b/rspack.config.js index 9efbf30197..c811c6b778 100644 --- a/rspack.config.js +++ b/rspack.config.js @@ -42,8 +42,11 @@ module.exports = (env, options) => { test: /\.m?js$/, oneOf: [ // Node modules - use builtin:swc-loader only + // The codemirror-lsp-client submodule is installed through a "file:" + // dependency, so it resolves to its real path outside node_modules. It + // still ships pre-built code and must not go through the source loaders. { - include: /node_modules/, + include: /[\\/](?:node_modules|codemirror-lsp-client)[\\/]/, use: [ { loader: 'builtin:swc-loader', diff --git a/tests/unit/setup.test.js b/tests/unit/setup.test.js new file mode 100644 index 0000000000..5e0af53396 --- /dev/null +++ b/tests/unit/setup.test.js @@ -0,0 +1,107 @@ +import assert from "node:assert/strict"; +import fs from "node:fs"; +import { createRequire } from "node:module"; +import os from "node:os"; +import path from "node:path"; +import { test } from "vitest"; + +const requireFromTest = createRequire(import.meta.url); +const { parseGitmodules, hasSubmoduleSources, findMissingSubmodules } = + requireFromTest("../../utils/setup.js"); + +const GITMODULES = `[submodule "codemirror-lsp-client"] +\tpath = codemirror-lsp-client +\turl = https://github.com/Acode-Foundation/codemirror-lsp-client +`; + +function makeRepoRoot() { + return fs.mkdtempSync(path.join(os.tmpdir(), "acode-setup-")); +} + +test("parses submodule path, name and url from .gitmodules", () => { + const submodules = parseGitmodules(`# a comment +[submodule "codemirror-lsp-client"] +\tpath = codemirror-lsp-client +\turl = https://github.com/Acode-Foundation/codemirror-lsp-client + +[submodule "other"] +\tpath = vendor/other +`); + + assert.deepEqual(submodules, [ + { + name: "codemirror-lsp-client", + path: "codemirror-lsp-client", + url: "https://github.com/Acode-Foundation/codemirror-lsp-client", + }, + { name: "other", path: "vendor/other", url: "" }, + ]); +}); + +test("treats a missing, empty or partial directory as not checked out", () => { + const repoRoot = makeRepoRoot(); + const submodule = { path: "codemirror-lsp-client" }; + const submodulePath = path.join(repoRoot, submodule.path); + + try { + assert.equal(hasSubmoduleSources(repoRoot, submodule), false); + + fs.mkdirSync(submodulePath); + assert.equal(hasSubmoduleSources(repoRoot, submodule), false); + + // A partial checkout holding only .git, .DS_Store or node_modules is + // not usable by the local "file:" dependency. + fs.writeFileSync( + path.join(submodulePath, ".git"), + "gitdir: ../.git/modules/codemirror-lsp-client", + ); + assert.equal(hasSubmoduleSources(repoRoot, submodule), false); + + fs.writeFileSync(path.join(submodulePath, ".DS_Store"), ""); + assert.equal(hasSubmoduleSources(repoRoot, submodule), false); + + fs.mkdirSync(path.join(submodulePath, "node_modules")); + assert.equal(hasSubmoduleSources(repoRoot, submodule), false); + + fs.writeFileSync(path.join(submodulePath, "package.json"), "{}"); + assert.equal(hasSubmoduleSources(repoRoot, submodule), true); + } finally { + fs.rmSync(repoRoot, { recursive: true, force: true }); + } +}); + +test("reports the submodules that are not checked out", () => { + const repoRoot = makeRepoRoot(); + + try { + fs.writeFileSync(path.join(repoRoot, ".gitmodules"), GITMODULES); + + assert.deepEqual(findMissingSubmodules(repoRoot), [ + { + name: "codemirror-lsp-client", + path: "codemirror-lsp-client", + url: "https://github.com/Acode-Foundation/codemirror-lsp-client", + }, + ]); + + fs.mkdirSync(path.join(repoRoot, "codemirror-lsp-client")); + fs.writeFileSync( + path.join(repoRoot, "codemirror-lsp-client", "package.json"), + "{}", + ); + + assert.deepEqual(findMissingSubmodules(repoRoot), []); + } finally { + fs.rmSync(repoRoot, { recursive: true, force: true }); + } +}); + +test("does not require submodules when there is no .gitmodules", () => { + const repoRoot = makeRepoRoot(); + + try { + assert.deepEqual(findMissingSubmodules(repoRoot), []); + } finally { + fs.rmSync(repoRoot, { recursive: true, force: true }); + } +}); diff --git a/utils/setup.js b/utils/setup.js index dcb7dc1614..0c4bd37b37 100644 --- a/utils/setup.js +++ b/utils/setup.js @@ -1,7 +1,8 @@ // setup acode for the first time -// 1. install dependencies -// 2. add cordova platform android@10.2 -// 3. install cordova plugins +// 1. verify git submodules are checked out +// 2. install dependencies +// 3. add cordova platform android@10.2 +// 4. install cordova plugins // cordova-plugin-buildinfo // cordova-plugin-device // cordova-plugin-file @@ -14,6 +15,7 @@ const PLATFORM_FILES = [".DS_Store"]; const PACKAGE_MANAGERS = new Set(["bun", "npm", "pnpm", "yarn"]); const ID_PAID = "com.foxdebug.acode"; const ADMOB_PLUGIN_DIR = "admob"; +const REPO_ROOT = path.join(__dirname, ".."); function isPaidVersion() { const configPath = path.join(__dirname, "../config.xml"); @@ -60,32 +62,143 @@ function installDependencies() { } } -installDependencies(); -try { - execSync("cordova platform add android", { stdio: "inherit" }); -} catch (error) { - // ignore +// Parse every submodule declared in .gitmodules. Plain string parsing (instead +// of shelling out to `git submodule status`) so setup also works when git is +// not installed, e.g. inside a CI container or an unpacked source archive. +function parseGitmodules(content) { + const submodules = []; + let current = null; + + for (const rawLine of content.split(/\r?\n/)) { + const line = rawLine.trim(); + + if (!line || line.startsWith("#") || line.startsWith(";")) continue; + + const section = /^\[submodule\s+"(.*)"\]$/.exec(line); + if (section) { + current = { name: section[1], path: "", url: "" }; + submodules.push(current); + continue; + } + + const entry = /^([^=]+?)\s*=\s*(.*)$/.exec(line); + if (!current || !entry) continue; + + const key = entry[1].trim(); + if (key === "path") current.path = entry[2].trim(); + else if (key === "url") current.url = entry[2].trim(); + } + + return submodules.filter((submodule) => submodule.path); +} + +// An uninitialized submodule leaves its directory empty (or absent), and a +// partial checkout may hold only `.git` or `node_modules`. Require at least one +// non-hidden regular file so those are rejected before dependencies are +// installed, without hardcoding a file name for every submodule. +function hasSubmoduleSources(repoRoot, submodule) { + const submodulePath = path.join(repoRoot, submodule.path); + + let entries; + try { + entries = fs.readdirSync(submodulePath, { withFileTypes: true }); + } catch (error) { + if (error.code === "ENOENT") return false; + throw error; + } + + return entries.some((entry) => entry.isFile() && !entry.name.startsWith(".")); } -try { - execSync("mkdir -p www/css/build www/js/build", { stdio: "inherit" }); -} catch (error) { - console.log( - "Failed to create www/css/build & www/js/build directories (You may Try after reading The Error)", - error, +function findMissingSubmodules(repoRoot = REPO_ROOT) { + const gitmodulesPath = path.join(repoRoot, ".gitmodules"); + + if (!fs.existsSync(gitmodulesPath)) return []; + + const submodules = parseGitmodules(fs.readFileSync(gitmodulesPath, "utf8")); + + return submodules.filter( + (submodule) => !hasSubmoduleSources(repoRoot, submodule), ); } -execSync("cordova plugin add cordova-plugin-buildinfo", { stdio: "inherit" }); -execSync("cordova plugin add cordova-plugin-device", { stdio: "inherit" }); -execSync("cordova plugin add cordova-plugin-file", { stdio: "inherit" }); - -const shouldSkipAdmob = isPaidVersion(); -const plugins = fs.readdirSync(path.join(__dirname, "../src/plugins")); -plugins.forEach((plugin) => { - if (PLATFORM_FILES.includes(plugin) || plugin.startsWith(".")) return; - const pluginPath = path.join(__dirname, "../src/plugins", plugin); - if (!fs.lstatSync(pluginPath).isDirectory()) return; - if (shouldSkipAdmob && plugin === ADMOB_PLUGIN_DIR) return; - execSync(`cordova plugin add ./src/plugins/${plugin}`, { stdio: "inherit" }); -}); +function failMissingSubmodules(missing) { + const list = missing + .map((submodule) => + submodule.url + ? ` - ${submodule.path}\n ${submodule.url}` + : ` - ${submodule.path}`, + ) + .join("\n"); + + console.error(` +The following submodule(s) are not checked out (empty or absent): + +${list} + + +How to fix: + From the repository root, run: + + git submodule update --init --recursive + + Then re-run setup: + + npm run setup +`); + + process.exit(1); +} + +function verifySubmodules(repoRoot = REPO_ROOT) { + const missing = findMissingSubmodules(repoRoot); + + if (missing.length > 0) failMissingSubmodules(missing); +} + +function main() { + verifySubmodules(); + installDependencies(); + + try { + execSync("cordova platform add android", { stdio: "inherit" }); + } catch (error) { + // ignore + } + + try { + execSync("mkdir -p www/css/build www/js/build", { stdio: "inherit" }); + } catch (error) { + console.log( + "Failed to create www/css/build & www/js/build directories (You may Try after reading The Error)", + error, + ); + } + + execSync("cordova plugin add cordova-plugin-buildinfo", { stdio: "inherit" }); + execSync("cordova plugin add cordova-plugin-device", { stdio: "inherit" }); + execSync("cordova plugin add cordova-plugin-file", { stdio: "inherit" }); + + const shouldSkipAdmob = isPaidVersion(); + const plugins = fs.readdirSync(path.join(__dirname, "../src/plugins")); + plugins.forEach((plugin) => { + if (PLATFORM_FILES.includes(plugin) || plugin.startsWith(".")) return; + const pluginPath = path.join(__dirname, "../src/plugins", plugin); + if (!fs.lstatSync(pluginPath).isDirectory()) return; + if (shouldSkipAdmob && plugin === ADMOB_PLUGIN_DIR) return; + execSync(`cordova plugin add ./src/plugins/${plugin}`, { + stdio: "inherit", + }); + }); +} + +if (require.main === module) { + main(); +} + +//used in tests +module.exports = { + parseGitmodules, + hasSubmoduleSources, + findMissingSubmodules, +}; From 0f5dead2e3c8b739dd28ac6435057ab23f370902 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Tue, 22 Sep 2026 04:33:00 +0000 Subject: [PATCH 132/195] feat(editor): enable GFM syntax for Markdown mode (#2922) --- src/cm/supportedModes.ts | 8 ++++++++ tests/unit/modelist.test.js | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/cm/supportedModes.ts b/src/cm/supportedModes.ts index 31a34ff1d6..959386be94 100644 --- a/src/cm/supportedModes.ts +++ b/src/cm/supportedModes.ts @@ -72,6 +72,14 @@ function createLanguageLoader(name: string, lang: LanguageDescription) { return javascript({ jsx: true }); }; + case "markdown": + return async () => { + const { markdown, markdownLanguage } = await import( + "@codemirror/lang-markdown" + ); + return markdown({ base: markdownLanguage }); + }; + case "html": return async () => { const { html } = await import("@codemirror/lang-html"); diff --git a/tests/unit/modelist.test.js b/tests/unit/modelist.test.js index beab912787..30fece6351 100644 --- a/tests/unit/modelist.test.js +++ b/tests/unit/modelist.test.js @@ -147,6 +147,30 @@ function registerTestMode(name, extensions, options) { } describe("getModeForPath", () => { + it("loads Markdown with extended GFM syntax", async () => { + const markdownMode = getModeForPath("README.md"); + const loadMarkdown = markdownMode.getExtension(); + expect(loadMarkdown).toEqual(expect.any(Function)); + + const support = await loadMarkdown(); + const tree = support.language.parser.parse( + [ + "~~Strikethrough~~", + "", + "- [x] Completed task", + "", + "| Column 1 | Column 2 |", + "|----------|----------|", + "| A | B |", + ].join("\n"), + ); + const syntax = tree.toString(); + + expect(syntax).toContain("Strikethrough"); + expect(syntax).toContain("TaskMarker"); + expect(syntax).toContain("Table"); + }); + it("matches the previous sort-and-scan result for built-in modes", () => { const paths = collectParityPaths(); expect(paths.length).toBeGreaterThan(100); From b745128d01f36ffe41bc5fc9d163dae49ef57b86 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Tue, 22 Sep 2026 10:04:53 +0530 Subject: [PATCH 133/195] chore: update bun.lock --- bun.lock | 818 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 537 insertions(+), 281 deletions(-) diff --git a/bun.lock b/bun.lock index 86f0f4f46a..a72716e329 100644 --- a/bun.lock +++ b/bun.lock @@ -199,7 +199,7 @@ "@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - "@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.2", "", {}, "sha512-9Fr9QeyCAyi1BR1jKZ6uYQ24EIhQUx5ReHfQU7drOE+TPOb+w11/dsqLkMOT2U29OdCT71XajrOT8xDc1C7orA=="], + "@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], "@babel/helper-validator-option": ["@babel/helper-validator-option@8.0.0", "", {}, "sha512-U4Dybxh4WESWHt5XhBeExi4DrY0/DNK1aHpQbsrQXCUbFHuMweT0TpLEWKvaraV2Y6fS+ZXunsZ8zIuZIgvF2Q=="], @@ -207,7 +207,7 @@ "@babel/helpers": ["@babel/helpers@8.0.0", "", { "dependencies": { "@babel/template": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-wfbi91pM3py96oIiJEz7qIpyXDytgr9zQC1HEWwlGNVRAEmItuU/0a41ZUKu1sJGyhhOIpc4t5vk4PYzt8wpsg=="], - "@babel/parser": ["@babel/parser@7.29.8", "", { "dependencies": { "@babel/types": "^7.29.8" }, "bin": "./bin/babel-parser.js" }, "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA=="], + "@babel/parser": ["@babel/parser@7.29.8", "", { "dependencies": { "@babel/types": "^7.29.8" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA=="], "@babel/plugin-bugfix-firefox-class-in-computed-class-key": ["@babel/plugin-bugfix-firefox-class-in-computed-class-key@8.0.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^8.0.1" }, "peerDependencies": { "@babel/core": "^8.0.0" } }, "sha512-Ytgjjne4RnG3Oig7ik+NfY4ebRY30BPptVkkyu1f72eINJXRM3/bkU++tIc5aPvyLmo4KH20avq0xJ2o+9aEnw=="], @@ -345,6 +345,8 @@ "@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], + "@bazel/runfiles": ["@bazel/runfiles@6.5.0", "", {}, "sha512-RzahvqTkfpY2jsDxo8YItPX+/iZ6hbiikw1YhE0bA9EKBR5Og8Pa6FHn9PO9M0zaXRVsr0GFQLKbB/0rzy9SzA=="], + "@biomejs/biome": ["@biomejs/biome@2.4.11", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "2.4.11", "@biomejs/cli-darwin-x64": "2.4.11", "@biomejs/cli-linux-arm64": "2.4.11", "@biomejs/cli-linux-arm64-musl": "2.4.11", "@biomejs/cli-linux-x64": "2.4.11", "@biomejs/cli-linux-x64-musl": "2.4.11", "@biomejs/cli-win32-arm64": "2.4.11", "@biomejs/cli-win32-x64": "2.4.11" }, "bin": { "biome": "bin/biome" } }, "sha512-nWxHX8tf3Opb/qRgZpBbsTOqOodkbrkJ7S+JxJAruxOReaDPPmPuLBAGQ8vigyUgo0QBB+oQltNEAvalLcjggA=="], "@biomejs/cli-darwin-arm64": ["@biomejs/cli-darwin-arm64@2.4.11", "", { "os": "darwin", "cpu": "arm64" }, "sha512-wOt+ed+L2dgZanWyL6i29qlXMc088N11optzpo10peayObBaAshbTcxKUchzEMp9QSY8rh5h6VfAFE3WTS1rqg=="], @@ -365,18 +367,12 @@ "@braintree/sanitize-url": ["@braintree/sanitize-url@7.1.2", "", {}, "sha512-jigsZK+sMF/cuiB7sERuo9V7N9jx+dhmHHnQyDSVdpZwVutaBu7WvNYqMDLSgFgfB30n452TP3vjDAvFC973mA=="], - "@chevrotain/cst-dts-gen": ["@chevrotain/cst-dts-gen@11.0.3", "", { "dependencies": { "@chevrotain/gast": "11.0.3", "@chevrotain/types": "11.0.3", "lodash-es": "4.17.21" } }, "sha512-BvIKpRLeS/8UbfxXxgC33xOumsacaeCKAjAeLyOn7Pcp95HiRbrpl14S+9vaZLolnbssPIUuiUd8IvgkRyt6NQ=="], - - "@chevrotain/gast": ["@chevrotain/gast@11.0.3", "", { "dependencies": { "@chevrotain/types": "11.0.3", "lodash-es": "4.17.21" } }, "sha512-+qNfcoNk70PyS/uxmj3li5NiECO+2YKZZQMbmjTqRI3Qchu8Hig/Q9vgkHpI3alNjr7M+a2St5pw5w5F6NL5/Q=="], - - "@chevrotain/regexp-to-ast": ["@chevrotain/regexp-to-ast@11.0.3", "", {}, "sha512-1fMHaBZxLFvWI067AVbGJav1eRY7N8DDvYCTwGBiE/ytKBgP8azTdgyrKyWZ9Mfh09eHWb5PgTSO8wi7U824RA=="], - "@chevrotain/types": ["@chevrotain/types@11.1.2", "", {}, "sha512-U+HFai5+zmJCkK86QsaJtoITlboZHBqrVketcO2ROv865xfCMSFpELQoz1GkX5GzME8pTa+3kbKrZHQtI0gdbw=="], - "@chevrotain/utils": ["@chevrotain/utils@11.0.3", "", {}, "sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ=="], - "@codemirror/autocomplete": ["@codemirror/autocomplete@6.20.3", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0" } }, "sha512-tlosUqb+3BbxCxZdu4tKeRghPFC+QM7q4X5YhKV2eCmPG+1r2F3f4AaSz5sCrFqUtX4Jh20VFTKecl16MgiV9g=="], + "@codemirror/buildhelper": ["@codemirror/buildhelper@1.0.2", "", { "dependencies": { "@lezer/generator": "^1.0.0", "@marijn/buildtool": "^1.0.0", "@marijn/testtool": "^0.1.3" }, "bin": { "cm-buildhelper": "bin/cm-buildhelper.js", "cm-runtests": "bin/cm-runtests.js" } }, "sha512-aVewtDPZptq9dTvYqIjpu9HTEmMaKAE4VL22z5E1ycgY5e1LdAiRd5YYjqzQeqLjxpWsHy+emO3n5UUcxpUmSg=="], + "@codemirror/commands": ["@codemirror/commands@6.11.0", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.7.0", "@codemirror/view": "^6.27.0", "@lezer/common": "^1.1.0" } }, "sha512-/K4Rl5BN0OtTiPWmJCdqODu38XnDMsDxKY5rgrPnCkutPTJf2wVbkoixLfealF5Kwse/s8P8M5jAiURiwSwnFA=="], "@codemirror/lang-angular": ["@codemirror/lang-angular@0.1.4", "", { "dependencies": { "@codemirror/lang-html": "^6.0.0", "@codemirror/lang-javascript": "^6.1.2", "@codemirror/language": "^6.0.0", "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.3.3" } }, "sha512-oap+gsltb/fzdlTQWD6BFF4bSLKcDnlxDsLdePiJpCVNKWXSTAbiiQeYI3UmES+BLAdkmIC1WjyztC1pi/bX4g=="], @@ -461,7 +457,7 @@ "@iconify/types": ["@iconify/types@2.0.0", "", {}, "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg=="], - "@iconify/utils": ["@iconify/utils@3.1.0", "", { "dependencies": { "@antfu/install-pkg": "^1.1.0", "@iconify/types": "^2.0.0", "mlly": "^1.8.0" } }, "sha512-Zlzem1ZXhI1iHeeERabLNzBHdOa4VhQbqAcOQaMKuTuyZCpwKbC2R4Dd0Zo3g9EAc+Y4fiarO8HIHRAth7+skw=="], + "@iconify/utils": ["@iconify/utils@3.1.3", "", { "dependencies": { "@antfu/install-pkg": "^1.1.0", "@iconify/types": "^2.0.0", "import-meta-resolve": "^4.2.0" } }, "sha512-LPKOXPn/zV+zis1oOfGWogaXVpqUybF3ZS6SCZIsz8vg0ivVp9+fVqyYB7xq0aiST/VhUQYGO1qo6uoYSiEJqw=="], "@isaacs/fs-minipass": ["@isaacs/fs-minipass@4.0.1", "", { "dependencies": { "minipass": "^7.0.4" } }, "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w=="], @@ -469,6 +465,8 @@ "@jridgewell/gen-mapping": ["@jridgewell/gen-mapping@0.3.13", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA=="], + "@jridgewell/remapping": ["@jridgewell/remapping@2.3.5", "", { "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ=="], + "@jridgewell/resolve-uri": ["@jridgewell/resolve-uri@3.1.2", "", {}, "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="], "@jridgewell/source-map": ["@jridgewell/source-map@0.3.11", "", { "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25" } }, "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA=="], @@ -481,7 +479,7 @@ "@lezer/cpp": ["@lezer/cpp@1.1.5", "", { "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "sha512-DIhSXmYtJKLehrjzDFN+2cPt547ySQ41nA8yqcDf/GxMc+YM736xqltFkvADL2M0VebU5I+3+4ks2Vv+Kyq3Aw=="], - "@lezer/css": ["@lezer/css@1.3.0", "", { "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.3.0" } }, "sha512-pBL7hup88KbI7hXnZV3PQsn43DHy6TWyzuyk2AO9UyoXcDltvIdqWKE1dLL/45JVZ+YZkHe1WVHqO6wugZZWcw=="], + "@lezer/css": ["@lezer/css@1.3.3", "", { "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.3.0" } }, "sha512-RzBo8r+/6QJeow7aPHIpGVIH59xTcJXp399820gZoMo9noQDRVpJLheIBUicYwKcsbOYoBRoLZlf2720dG/4Tg=="], "@lezer/generator": ["@lezer/generator@1.8.0", "", { "dependencies": { "@lezer/common": "^1.1.0", "@lezer/lr": "^1.3.0" }, "bin": { "lezer-generator": "src/lezer-generator.cjs" } }, "sha512-/SF4EDWowPqV1jOgoGSGTIFsE7Ezdr7ZYxyihl5eMKVO5tlnpIhFcDavgm1hHY5GEonoOAEnJ0CU0x+tvuAuUg=="], @@ -511,12 +509,18 @@ "@lezer/xml": ["@lezer/xml@1.0.6", "", { "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "sha512-CdDwirL0OEaStFue/66ZmFSeppuL6Dwjlk8qk153mSQwiSH/Dlri4GNymrNWnUmPl2Um7QfV1FO9KFUyX3Twww=="], - "@lezer/yaml": ["@lezer/yaml@1.0.3", "", { "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.4.0" } }, "sha512-GuBLekbw9jDBDhGur82nuwkxKQ+a3W5H0GfaAthDXcAu+XdpS43VlnxA9E9hllkpSP5ellRDKjLLj7Lu9Wr6xA=="], + "@lezer/yaml": ["@lezer/yaml@1.0.4", "", { "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.4.0" } }, "sha512-2lrrHqxalACEbxIbsjhqGpSW8kWpUKuY6RHgnSAFZa6qK62wvnPxA8hGOwOoDbwHcOFs5M4o27mjGu+P7TvBmw=="], + + "@marijn/buildtool": ["@marijn/buildtool@1.2.0", "", { "dependencies": { "@types/mocha": "^9.1.1", "acorn": "^8.10.0", "acorn-walk": "^8.2.0", "rollup": "^4.8.0", "rollup-plugin-dts": "^6.1.0", "typescript": "^5.3.3" } }, "sha512-ytEK7n4NVrq6Rhq2J+N/CcvJLl6NX0bZ1qSi3w8lxZVcI4L6Y6vj1pugcTnv+YdyFNwFuACSdDesetZmQqSy1w=="], - "@marijn/find-cluster-break": ["@marijn/find-cluster-break@1.0.2", "", {}, "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g=="], + "@marijn/find-cluster-break": ["@marijn/find-cluster-break@1.0.4", "", {}, "sha512-Wy0V7+SGUjnF9/TkiM1hKVDPj7jKXduPNboMVtHTA8dySMURWqfg/JZ9E2Sq8JgSJmkl7k7Qe9FLeMSrSraWmQ=="], + + "@marijn/testtool": ["@marijn/testtool@0.1.3", "", { "dependencies": { "esmoduleserve": "^0.2.0", "ist": "^1.1.7", "mocha": "^10.0.0", "selenium-webdriver": "^4.10.0", "serve-static": "^1.14.1" }, "bin": { "testtool": "bin/testtool.js" } }, "sha512-Rdi3amfFyTZoUXxMc95k9x9Ult+DtQSuOHsZwN5wtIKQ5JdXQaErgtWgGjW0Fpg4Rj0YrUCpWOj0VqsumAt5JA=="], "@mermaid-js/parser": ["@mermaid-js/parser@1.2.1", "", { "dependencies": { "@chevrotain/types": "~11.1.2" } }, "sha512-n12NohV3mrUyUL2o93IgG/ifeW9FTyeJn3zDxkhwa8MJ9Fxg3HQMlA3RiGmD/3UnJvheztkjjQAjA2T4LmUcpw=="], + "@napi-rs/lzma-linux-x64-gnu": ["@napi-rs/lzma-linux-x64-gnu@1.5.1", "", { "os": "linux", "cpu": "x64" }, "sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ=="], + "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.1.6", "", { "dependencies": { "@tybys/wasm-util": "^0.10.3" }, "peerDependencies": { "@emnapi/core": "^1.7.1", "@emnapi/runtime": "^1.7.1" } }, "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg=="], "@netflix/nerror": ["@netflix/nerror@1.1.3", "", { "dependencies": { "assert-plus": "^1.0.0", "extsprintf": "^1.4.0", "lodash": "^4.17.15" } }, "sha512-b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="], @@ -555,68 +559,118 @@ "@npmcli/run-script": ["@npmcli/run-script@10.0.4", "", { "dependencies": { "@npmcli/node-gyp": "^5.0.0", "@npmcli/package-json": "^7.0.0", "@npmcli/promise-spawn": "^9.0.0", "node-gyp": "^12.1.0", "proc-log": "^6.0.0" } }, "sha512-mGUWr1uMnf0le2TwfOZY4SFxZGXGfm4Jtay/nwAa2FLNAKXUoUwaGwBMNH36UHPtinWfTSJ3nqFQr0091CxVGg=="], - "@oxc-project/types": ["@oxc-project/types@0.142.0", "", {}, "sha512-7W+2q5AKQVU36fkaryontrHn3YDt1RyUYXatw9i5H8ocYe2sPKSFB6eS8WNPeRKiN1qAWWZUPm7gwFzJGrccqQ=="], + "@oxc-project/types": ["@oxc-project/types@0.147.0", "", {}, "sha512-IJ3s6ltHLp45S0bh7phkX+gJO7A1Wuz2EaqpAhb8WjqDwbzMiWKHhyyT42tskaWjEYXtHtVCPpnBJVT9+dcRLg=="], - "@parcel/watcher": ["@parcel/watcher@2.5.1", "", { "dependencies": { "detect-libc": "^1.0.3", "is-glob": "^4.0.3", "micromatch": "^4.0.5", "node-addon-api": "^7.0.0" }, "optionalDependencies": { "@parcel/watcher-android-arm64": "2.5.1", "@parcel/watcher-darwin-arm64": "2.5.1", "@parcel/watcher-darwin-x64": "2.5.1", "@parcel/watcher-freebsd-x64": "2.5.1", "@parcel/watcher-linux-arm-glibc": "2.5.1", "@parcel/watcher-linux-arm-musl": "2.5.1", "@parcel/watcher-linux-arm64-glibc": "2.5.1", "@parcel/watcher-linux-arm64-musl": "2.5.1", "@parcel/watcher-linux-x64-glibc": "2.5.1", "@parcel/watcher-linux-x64-musl": "2.5.1", "@parcel/watcher-win32-arm64": "2.5.1", "@parcel/watcher-win32-ia32": "2.5.1", "@parcel/watcher-win32-x64": "2.5.1" } }, "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg=="], + "@parcel/watcher": ["@parcel/watcher@2.5.6", "", { "dependencies": { "detect-libc": "^2.0.3", "is-glob": "^4.0.3", "node-addon-api": "^7.0.0", "picomatch": "^4.0.3" }, "optionalDependencies": { "@parcel/watcher-android-arm64": "2.5.6", "@parcel/watcher-darwin-arm64": "2.5.6", "@parcel/watcher-darwin-x64": "2.5.6", "@parcel/watcher-freebsd-x64": "2.5.6", "@parcel/watcher-linux-arm-glibc": "2.5.6", "@parcel/watcher-linux-arm-musl": "2.5.6", "@parcel/watcher-linux-arm64-glibc": "2.5.6", "@parcel/watcher-linux-arm64-musl": "2.5.6", "@parcel/watcher-linux-x64-glibc": "2.5.6", "@parcel/watcher-linux-x64-musl": "2.5.6", "@parcel/watcher-win32-arm64": "2.5.6", "@parcel/watcher-win32-ia32": "2.5.6", "@parcel/watcher-win32-x64": "2.5.6" } }, "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ=="], - "@parcel/watcher-android-arm64": ["@parcel/watcher-android-arm64@2.5.1", "", { "os": "android", "cpu": "arm64" }, "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA=="], + "@parcel/watcher-android-arm64": ["@parcel/watcher-android-arm64@2.5.6", "", { "os": "android", "cpu": "arm64" }, "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A=="], - "@parcel/watcher-darwin-arm64": ["@parcel/watcher-darwin-arm64@2.5.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw=="], + "@parcel/watcher-darwin-arm64": ["@parcel/watcher-darwin-arm64@2.5.6", "", { "os": "darwin", "cpu": "arm64" }, "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA=="], - "@parcel/watcher-darwin-x64": ["@parcel/watcher-darwin-x64@2.5.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg=="], + "@parcel/watcher-darwin-x64": ["@parcel/watcher-darwin-x64@2.5.6", "", { "os": "darwin", "cpu": "x64" }, "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg=="], - "@parcel/watcher-freebsd-x64": ["@parcel/watcher-freebsd-x64@2.5.1", "", { "os": "freebsd", "cpu": "x64" }, "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ=="], + "@parcel/watcher-freebsd-x64": ["@parcel/watcher-freebsd-x64@2.5.6", "", { "os": "freebsd", "cpu": "x64" }, "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng=="], - "@parcel/watcher-linux-arm-glibc": ["@parcel/watcher-linux-arm-glibc@2.5.1", "", { "os": "linux", "cpu": "arm" }, "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA=="], + "@parcel/watcher-linux-arm-glibc": ["@parcel/watcher-linux-arm-glibc@2.5.6", "", { "os": "linux", "cpu": "arm" }, "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ=="], - "@parcel/watcher-linux-arm-musl": ["@parcel/watcher-linux-arm-musl@2.5.1", "", { "os": "linux", "cpu": "arm" }, "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q=="], + "@parcel/watcher-linux-arm-musl": ["@parcel/watcher-linux-arm-musl@2.5.6", "", { "os": "linux", "cpu": "arm" }, "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg=="], - "@parcel/watcher-linux-arm64-glibc": ["@parcel/watcher-linux-arm64-glibc@2.5.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w=="], + "@parcel/watcher-linux-arm64-glibc": ["@parcel/watcher-linux-arm64-glibc@2.5.6", "", { "os": "linux", "cpu": "arm64" }, "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA=="], - "@parcel/watcher-linux-arm64-musl": ["@parcel/watcher-linux-arm64-musl@2.5.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg=="], + "@parcel/watcher-linux-arm64-musl": ["@parcel/watcher-linux-arm64-musl@2.5.6", "", { "os": "linux", "cpu": "arm64" }, "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA=="], - "@parcel/watcher-linux-x64-glibc": ["@parcel/watcher-linux-x64-glibc@2.5.1", "", { "os": "linux", "cpu": "x64" }, "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A=="], + "@parcel/watcher-linux-x64-glibc": ["@parcel/watcher-linux-x64-glibc@2.5.6", "", { "os": "linux", "cpu": "x64" }, "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ=="], - "@parcel/watcher-linux-x64-musl": ["@parcel/watcher-linux-x64-musl@2.5.1", "", { "os": "linux", "cpu": "x64" }, "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg=="], + "@parcel/watcher-linux-x64-musl": ["@parcel/watcher-linux-x64-musl@2.5.6", "", { "os": "linux", "cpu": "x64" }, "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg=="], - "@parcel/watcher-win32-arm64": ["@parcel/watcher-win32-arm64@2.5.1", "", { "os": "win32", "cpu": "arm64" }, "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw=="], + "@parcel/watcher-win32-arm64": ["@parcel/watcher-win32-arm64@2.5.6", "", { "os": "win32", "cpu": "arm64" }, "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q=="], - "@parcel/watcher-win32-ia32": ["@parcel/watcher-win32-ia32@2.5.1", "", { "os": "win32", "cpu": "ia32" }, "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ=="], + "@parcel/watcher-win32-ia32": ["@parcel/watcher-win32-ia32@2.5.6", "", { "os": "win32", "cpu": "ia32" }, "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g=="], - "@parcel/watcher-win32-x64": ["@parcel/watcher-win32-x64@2.5.1", "", { "os": "win32", "cpu": "x64" }, "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA=="], + "@parcel/watcher-win32-x64": ["@parcel/watcher-win32-x64@2.5.6", "", { "os": "win32", "cpu": "x64" }, "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw=="], - "@rolldown/binding-android-arm64": ["@rolldown/binding-android-arm64@1.2.1", "", { "os": "android", "cpu": "arm64" }, "sha512-02hOeOSryYxVrOIphmLAsqnCJWxwlzFk+pEt/N/i6OgT3lShHO7xGCU5cpgchRDHboAEbSjzgGh+O/u1GswQmA=="], + "@rolldown/binding-android-arm-eabi": ["@rolldown/binding-android-arm-eabi@1.2.6", "", { "os": "android", "cpu": "arm" }, "sha512-b+jTcARdTiFLI6jB4a5XjTm0RWd6KcRfQj/I2356fxUZemiho9zQLxo0RtCuMDAyKcLo6cEltkgbQp6d1+sjjQ=="], - "@rolldown/binding-darwin-arm64": ["@rolldown/binding-darwin-arm64@1.2.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-fMsTOnN0OjFm3CyppWPitKnc8UlliVARUULW6cfU6AIqjdtgmSFWSk9vecHzZduv/yMWIHDlRhM1e8Iff9uAfA=="], + "@rolldown/binding-android-arm64": ["@rolldown/binding-android-arm64@1.2.6", "", { "os": "android", "cpu": "arm64" }, "sha512-lkWU8ZJaRk9q3CIEY1Tc7vIFALp3Xw5NfGJo2hQg5oIqNgxWi1zI+IiDEK3r70BF5Dzol1tcXsnzsRc8NLhG+Q=="], - "@rolldown/binding-darwin-x64": ["@rolldown/binding-darwin-x64@1.2.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-1wjKdz/XLGKHaTNHjQveQ/B23TKx4ItAqm1JbyVuvNPc4Ze0Fb48s49TAd/2zcplPl8okE/UbTgmlVfwT7eFeQ=="], + "@rolldown/binding-darwin-arm64": ["@rolldown/binding-darwin-arm64@1.2.6", "", { "os": "darwin", "cpu": "arm64" }, "sha512-dgR56NYnvAszm7Ob1B2/Vn0e8bUQYZH2UjVaMMtMVOCKFSfjhfLmuA/9+O+F+ajUdG6B/bSssrKW6JJYASa8jA=="], - "@rolldown/binding-freebsd-x64": ["@rolldown/binding-freebsd-x64@1.2.1", "", { "os": "freebsd", "cpu": "x64" }, "sha512-Fa0jHR07E7YBN4vOEsbVf2briYNsuOowfLJaXULZM0ldMlaCaj2LJgLMbMe4iacRyZmvR8efFhgR9wKuGclQUg=="], + "@rolldown/binding-darwin-x64": ["@rolldown/binding-darwin-x64@1.2.6", "", { "os": "darwin", "cpu": "x64" }, "sha512-vpVxFvUCFioJqug7OTvqptkc4yb8UX0AwfDmJpaR/0sWz+BUmqSVAf7c8JkUgnN8YLspb4a/N6NhTyMAmdyQ7Q=="], - "@rolldown/binding-linux-arm-gnueabihf": ["@rolldown/binding-linux-arm-gnueabihf@1.2.1", "", { "os": "linux", "cpu": "arm" }, "sha512-pzkgu1SSHGgRRyRZ4fbmSgmajbVt+epaLP99NDjFft69v/ypfTi6swBMiVdh2EkQ0OSnHE1lZDM7DRGkyAzUpA=="], + "@rolldown/binding-freebsd-x64": ["@rolldown/binding-freebsd-x64@1.2.6", "", { "os": "freebsd", "cpu": "x64" }, "sha512-h1wG6Y6K3JlRswxsI64qQJqBAy4vrLuHgRbc8CZMGSWTOFRY6ghMApM1NKzB2I0n5xV1fjkE18SuVl2QpLeNpA=="], - "@rolldown/binding-linux-arm64-gnu": ["@rolldown/binding-linux-arm64-gnu@1.2.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-QI5SEDY8cbiYWHx0VO4vIc3UlS6a32vXHjU8Qy/17adEmZIPuByJg13UEvo9c/UCiUkdcVWY83C+b+JrwnNyUg=="], + "@rolldown/binding-linux-arm-gnueabihf": ["@rolldown/binding-linux-arm-gnueabihf@1.2.6", "", { "os": "linux", "cpu": "arm" }, "sha512-tbCiqub0q2MVWJKgF5PoAlNWCtQydiOYSLIkd8sByqK/6MMYLJRcSXSYodqYtd0O+Fw7QaVmKKlS4oL94YRZ0w=="], - "@rolldown/binding-linux-arm64-musl": ["@rolldown/binding-linux-arm64-musl@1.2.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-Sm41FyCeXqmYcERoYOCbGIL5hNfd8w9LQ7Y61Bev48HkcjaJqV/iiVOaiDxjVTRMS+QKrZmD8cfPt4uMVnvM+A=="], + "@rolldown/binding-linux-arm64-gnu": ["@rolldown/binding-linux-arm64-gnu@1.2.6", "", { "os": "linux", "cpu": "arm64" }, "sha512-oxK9+baEBPhZG5HB4URY+uU04zJWeZlH6Tb9rB5DK4DF9XR1uXNLXt5Q5ZsugTKayNCNLhkcwz/ye74hRI98dg=="], - "@rolldown/binding-linux-ppc64-gnu": ["@rolldown/binding-linux-ppc64-gnu@1.2.1", "", { "os": "linux", "cpu": "ppc64" }, "sha512-2x+WhXTGl9yJYPbltW/BSEPTVz9OIWQyER4N+gJEDWkkn904eRcBzELqh/Hf7K0w/ubGbKNMv0ZC+94QK/IFEg=="], + "@rolldown/binding-linux-arm64-musl": ["@rolldown/binding-linux-arm64-musl@1.2.6", "", { "os": "linux", "cpu": "arm64" }, "sha512-muWCk27FVBEZtv0MsK8gnfSmgczA8KQ0uRVJbTABKhkRfQc38aUrcb7fhi3BNiyseFmgcRsoMfQsSNJ+DbZdSw=="], - "@rolldown/binding-linux-s390x-gnu": ["@rolldown/binding-linux-s390x-gnu@1.2.1", "", { "os": "linux", "cpu": "s390x" }, "sha512-eEjmQpuRQayHPWWnywaWHkFT3ToPbP3RYy42VVd/B9aBGDA+Ol25EIWHxKQST3IiWJjikCWUF7KtbfqwZrzVwQ=="], + "@rolldown/binding-linux-ppc64-gnu": ["@rolldown/binding-linux-ppc64-gnu@1.2.6", "", { "os": "linux", "cpu": "ppc64" }, "sha512-eWDoSfU7Co2qj3vgB3Dt4lj1mG6CoWbcJQkRMP3XJplyCMtuaq3LHvPFjS9QIPvMGWVadJC04Xiy0IdcVPtnwQ=="], - "@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.2.1", "", { "os": "linux", "cpu": "x64" }, "sha512-/Orga1fZYkLc/56jBICcHrKchl8Z2UKdDSr3LG9ToWO1lQ6a4Livk9Xz+9WN91zsz5QR3XQz2NNoSDEvP6qadw=="], + "@rolldown/binding-linux-s390x-gnu": ["@rolldown/binding-linux-s390x-gnu@1.2.6", "", { "os": "linux", "cpu": "s390x" }, "sha512-2bWNjRSIayvupRKxXUY2tWG9fYdoUlTqWywHRvE8Eq3GvuQ+f2HeIkve697fIt+IQs/PV8yFsdWuhp1aJ1PdnA=="], - "@rolldown/binding-linux-x64-musl": ["@rolldown/binding-linux-x64-musl@1.2.1", "", { "os": "linux", "cpu": "x64" }, "sha512-xxBJRL+0q0Kce7orznGWLuylHDY65vuARXZRpX+hPdv+DqK2c3NlCsVA98tlWzWNEE7yPqA/1NQ5nnCrj49Y5A=="], + "@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.2.6", "", { "os": "linux", "cpu": "x64" }, "sha512-KekI0gS0wLxe1UBSQSjenBVwou/JkcQPDzBPICGZjxUv9k3RteHDPBQaiOicZUFKRIH2wKEimGwVpnJsbPzu7w=="], - "@rolldown/binding-openharmony-arm64": ["@rolldown/binding-openharmony-arm64@1.2.1", "", { "os": "none", "cpu": "arm64" }, "sha512-M6AdXIXw3s+/8XpKMzdGDEXGS1S7kwUsy+rcTIUIOx5Ge4nXKCtAFHFV9YKkXvGcC5WMoTjAteLzlsQROVI0Yw=="], + "@rolldown/binding-linux-x64-musl": ["@rolldown/binding-linux-x64-musl@1.2.6", "", { "os": "linux", "cpu": "x64" }, "sha512-TvtPnfVr+HtyGiDmPK4VWmlNm7QhNNAcK5Q9A7aOXsI8545yCyaoMaicXrFZ72JzeYjaUVk7yT243zT0jzjFKQ=="], - "@rolldown/binding-wasm32-wasi": ["@rolldown/binding-wasm32-wasi@1.2.1", "", { "dependencies": { "@emnapi/core": "2.0.0-alpha.3", "@emnapi/runtime": "2.0.0-alpha.3", "@napi-rs/wasm-runtime": "^1.2.0" } }, "sha512-/TX0SoRGojHzSAHpfVBbavRVSazg5U3h3Y3VXfcc0cdugq6kxdqw8LPGFiPr+/7gE/60zRcsOY2Vi9b9eT0jww=="], + "@rolldown/binding-openharmony-arm64": ["@rolldown/binding-openharmony-arm64@1.2.6", "", { "os": "none", "cpu": "arm64" }, "sha512-iOo0VEay2XFhaCcH0sps5XIimkSuOnNaZrf6+ZkoSOQBJPKNU48RkmJv0/lSpipexu5P+ouFgafe5IGr/DiQfg=="], - "@rolldown/binding-win32-arm64-msvc": ["@rolldown/binding-win32-arm64-msvc@1.2.1", "", { "os": "win32", "cpu": "arm64" }, "sha512-EvRrivJieyHG+AO9lleZWgq+g0+S7oV2C51yuqlcyU/R9net+sI4Pj0F+lUoP2bEr6TWX3SqFaaS0SzfLxSzkw=="], + "@rolldown/binding-win32-arm64-msvc": ["@rolldown/binding-win32-arm64-msvc@1.2.6", "", { "os": "win32", "cpu": "arm64" }, "sha512-y5NTmmasMS455JlOCO4ZM9krIchv3Mvm1crL1iUPGOPgEzSkves9n0SdC5Sjz6+qWDFhd8/JpfWMH8NSWNHe+A=="], - "@rolldown/binding-win32-x64-msvc": ["@rolldown/binding-win32-x64-msvc@1.2.1", "", { "os": "win32", "cpu": "x64" }, "sha512-Z4eCmn5QJ/5+azF9knpLWKfVd9aidn0mAe9TpJgvBLId9Ax3t0+JVxBmT25Bv7NBbVW1TZyKjQjQReouMeH5UQ=="], + "@rolldown/binding-win32-x64-msvc": ["@rolldown/binding-win32-x64-msvc@1.2.6", "", { "os": "win32", "cpu": "x64" }, "sha512-np8iZSLfXlAD4kWhiyq/u0Yt8oZDtRQ8lGhQaCXo2rl37KNjeU0GjJuwr4P3oeZ++ROfofsKNBqR5LTO8aXyWQ=="], "@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.1", "", {}, "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw=="], + "@rollup/rollup-android-arm-eabi": ["@rollup/rollup-android-arm-eabi@4.63.3", "", { "os": "android", "cpu": "arm" }, "sha512-w3Jnvi1ocaVm/c7yVPpfB98XeSRBMyzp6njL5MVVbGyXjpmUkN+s6Hp4t0PqhGCCaI1ZHMKXt/w0lA1RCaLVcw=="], + + "@rollup/rollup-android-arm64": ["@rollup/rollup-android-arm64@4.63.3", "", { "os": "android", "cpu": "arm64" }, "sha512-uI/ESiaIbbRYAEhzy8PCUWDp1hB0bjAqM06mW9flOoNO4Q8DQpeoREhBR5Hegfl+wpXiguyJv6XSPzEN7OxyHQ=="], + + "@rollup/rollup-darwin-arm64": ["@rollup/rollup-darwin-arm64@4.63.3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-oxhrd1jmXLwWZ83eQYDXxuqRdkqkzrjR3JobKeuUyfdNZo11FuQIvqEOZhyIT7OBHxXoGslDDjN0cQcM6T0TqQ=="], + + "@rollup/rollup-darwin-x64": ["@rollup/rollup-darwin-x64@4.63.3", "", { "os": "darwin", "cpu": "x64" }, "sha512-7/YiIMghVE8DrxKvNdorAaJVdriOFgOIpdStnPx8ppx5zfTwC3jBCSEAIzB7JD5404m65THl6H93UTTVUvypmg=="], + + "@rollup/rollup-freebsd-arm64": ["@rollup/rollup-freebsd-arm64@4.63.3", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-GXFZRRoMAytaI5z6N3Zhfw0WL18Q0M8r95D5hlC4GqE/lGk8pbSJNUBoOWDfbm6dTciqHj2nU87tI5f6XhQiOg=="], + + "@rollup/rollup-freebsd-x64": ["@rollup/rollup-freebsd-x64@4.63.3", "", { "os": "freebsd", "cpu": "x64" }, "sha512-77W+8X3ddYgPxUpB8nZFQs2Mq+wc4HVlcSRtApXLjYBcnPMkttrSnU8VwKQjeWYhMsITHFs5cWBQ8vz1Q+5RHQ=="], + + "@rollup/rollup-linux-arm-gnueabihf": ["@rollup/rollup-linux-arm-gnueabihf@4.63.3", "", { "os": "linux", "cpu": "arm" }, "sha512-FVkwK+iUC+mq+GipVK46rRVticfAPtvPUNlqlGXUDxdVk/UGjQiiiUVPUrEXdSpU2ufU0XxLGyTqDtBidDOVmg=="], + + "@rollup/rollup-linux-arm-musleabihf": ["@rollup/rollup-linux-arm-musleabihf@4.63.3", "", { "os": "linux", "cpu": "arm" }, "sha512-+aGU1t3398yQOVj1Bz8o3e+KtswxAPvO+mtxtNdfXYMkXIHu7XhhkCD7/DEH9q8tF8uhDnMWvfpUKI8y1sZJsg=="], + + "@rollup/rollup-linux-arm64-gnu": ["@rollup/rollup-linux-arm64-gnu@4.63.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-cR0kjpRXR2KJ2oQK8E2KTPtphs+b9hZ8IhTZubNryt/RsqgdOZBQ2Zq0q5UedtiIi0rs3jVhJh55RE1ZHUVGUA=="], + + "@rollup/rollup-linux-arm64-musl": ["@rollup/rollup-linux-arm64-musl@4.63.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-y1RYi4Q3/9ByVWSSt9kX2ustE0B7kFYbJ6zZdVZVyqopZs3yhCTwRfrjIX4vezUJInma/Gs6BOFDJg7yZmJ0IQ=="], + + "@rollup/rollup-linux-loong64-gnu": ["@rollup/rollup-linux-loong64-gnu@4.63.3", "", { "os": "linux", "cpu": "none" }, "sha512-DNhEA5viIj3Z5bZLE4z4oV8N5ozWqDwyt7T6KG7VdLDJ0nW+rNOYlphBl4/3HQkK75qipPLsVOfStHHOwN9WSg=="], + + "@rollup/rollup-linux-loong64-musl": ["@rollup/rollup-linux-loong64-musl@4.63.3", "", { "os": "linux", "cpu": "none" }, "sha512-17gQCqrIpXBX2Cmi9/TygnVOqGbzsba/iaqcYSL8FY7lNugg+7AiYNs5c5nKWD+NRQha36Sa0CqkJqH4XVHwnQ=="], + + "@rollup/rollup-linux-ppc64-gnu": ["@rollup/rollup-linux-ppc64-gnu@4.63.3", "", { "os": "linux", "cpu": "ppc64" }, "sha512-6LwVnZRIyINpdku/yOcI8Tm9YqLmhHK5emmlOOnW9tO0SYEm1FmKPcsSAGp0NBlqR2P04xaND4jvN6sTHqhq8A=="], + + "@rollup/rollup-linux-ppc64-musl": ["@rollup/rollup-linux-ppc64-musl@4.63.3", "", { "os": "linux", "cpu": "ppc64" }, "sha512-xMUqkTXlEUtI/p5AAukMwBRr1enU3efsTeF+bskeFfk8t1C9rcC8sLREcZXmTfAXEbvRdJVSonVJez3TMlbR3w=="], + + "@rollup/rollup-linux-riscv64-gnu": ["@rollup/rollup-linux-riscv64-gnu@4.63.3", "", { "os": "linux", "cpu": "none" }, "sha512-S3E94co9F9WRRqEaUoQZ38K1gCz6KiM+nL7/3ijq7fDGF3OznjS5TasgYITlvl27GQKtu4lOAOsr5MFwkijvOA=="], + + "@rollup/rollup-linux-riscv64-musl": ["@rollup/rollup-linux-riscv64-musl@4.63.3", "", { "os": "linux", "cpu": "none" }, "sha512-1QtRDwG42x5BJI3s9mxu5rEjDnfbSnk20HQ9/ylTAYnSwYwxMVb+Vgu34wzzTQ7ogqBybebgQNUDAvZVQ38DbA=="], + + "@rollup/rollup-linux-s390x-gnu": ["@rollup/rollup-linux-s390x-gnu@4.63.3", "", { "os": "linux", "cpu": "s390x" }, "sha512-BQhejF6ZXOpxbngiNTP12GCGQeaDVL2QXGeBVViKIYzFHM5RKxTxwUMB1fr1BeNFphFMpnRqC5QSXFSa4z6UQw=="], + + "@rollup/rollup-linux-x64-gnu": ["@rollup/rollup-linux-x64-gnu@4.63.3", "", { "os": "linux", "cpu": "x64" }, "sha512-SXagRwnI2Wlwlitllu59UK/nGVbD1CKPcNqDplHwIC4BqJcpXFjD32d1R/RbuISa95HdQrZM3/7v4bKiowFaLA=="], + + "@rollup/rollup-linux-x64-musl": ["@rollup/rollup-linux-x64-musl@4.63.3", "", { "os": "linux", "cpu": "x64" }, "sha512-2IPozoEALRCziGqE8O9KMK60PMu5TS1huv4fwoeCexj+WjmcwFtX9CTOVbfXCUqcELAubEwRFPYlzb/WvwY2HQ=="], + + "@rollup/rollup-openbsd-x64": ["@rollup/rollup-openbsd-x64@4.63.3", "", { "os": "openbsd", "cpu": "x64" }, "sha512-AoxqosUHT9IX54hFn2TiN6A7d6ZKTtE6pd2bqWtqkkNJ6HJGaU6FRouGX8L1O7R/ZwsnCnpQrHzb4pDEx+UHRQ=="], + + "@rollup/rollup-openharmony-arm64": ["@rollup/rollup-openharmony-arm64@4.63.3", "", { "os": "none", "cpu": "arm64" }, "sha512-d+CaftKgmkFBzCwezMqqy1d0QNNYugqLCMcYVQWBy5SS2YfeMP8Q8ripkgx9O8IyBXXLHrJ+aaCV4U96usv6Yg=="], + + "@rollup/rollup-win32-arm64-msvc": ["@rollup/rollup-win32-arm64-msvc@4.63.3", "", { "os": "win32", "cpu": "arm64" }, "sha512-xXlDF6nR1eOuXbdDy5Hl5fmtY7teUDevF/k0O7IPoZe4Tpmdv+lgdE5JRsnhQtt37ql9P0VF2kAN9a0OCZdo+Q=="], + + "@rollup/rollup-win32-ia32-msvc": ["@rollup/rollup-win32-ia32-msvc@4.63.3", "", { "os": "win32", "cpu": "ia32" }, "sha512-YtXAgLN+JP7Ay6qG3eWhc7IHMQPzLc8r3uvhAvlJIoCz/4Q32+Bl9Fmnywidh8v1GOIMmymjovfqY9ETAtysvA=="], + + "@rollup/rollup-win32-x64-gnu": ["@rollup/rollup-win32-x64-gnu@4.63.3", "", { "os": "win32", "cpu": "x64" }, "sha512-WuWtSJRNo549vzcfZyEgfqb6zeSgn1F+UE5kQ+BCjzz0W4MGCjntUHkZVc1VRuAM7+ULaSyhiPxD1spyewFvkQ=="], + + "@rollup/rollup-win32-x64-msvc": ["@rollup/rollup-win32-x64-msvc@4.63.3", "", { "os": "win32", "cpu": "x64" }, "sha512-+lIKX7O0+IGe7WuhATaAMMeT7B76vfhXH/l9wLQL+nvyhbw2ohYCKIdWL56JfDu75CWt5oKRP4QFH/jkMtBquA=="], + "@rspack/binding": ["@rspack/binding@2.2.0", "", { "optionalDependencies": { "@rspack/binding-darwin-arm64": "2.2.0", "@rspack/binding-darwin-x64": "2.2.0", "@rspack/binding-linux-arm64-gnu": "2.2.0", "@rspack/binding-linux-arm64-musl": "2.2.0", "@rspack/binding-linux-ppc64-gnu": "2.2.0", "@rspack/binding-linux-riscv64-gnu": "2.2.0", "@rspack/binding-linux-riscv64-musl": "2.2.0", "@rspack/binding-linux-s390x-gnu": "2.2.0", "@rspack/binding-linux-x64-gnu": "2.2.0", "@rspack/binding-linux-x64-musl": "2.2.0", "@rspack/binding-wasm32-wasi": "2.2.0", "@rspack/binding-win32-arm64-msvc": "2.2.0", "@rspack/binding-win32-ia32-msvc": "2.2.0", "@rspack/binding-win32-x64-msvc": "2.2.0" } }, "sha512-nxZzJqqB0EmEKp6qjzFNkBb/SgGt0k0DSENrLvAJgvVvrm3waVsubD0cfxtPlZY/rd5SzadzxWGEHRyFcds5nA=="], "@rspack/binding-darwin-arm64": ["@rspack/binding-darwin-arm64@2.2.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-KAVVT7hp3NBjtc/RY2UtOjzzc8i+s4pIhW1p52UV+Aev6ywQCu3dXwkHTonpPvJO3hqLXc4zIMH5l4HbMqBm4g=="], @@ -647,13 +701,13 @@ "@rspack/binding-win32-x64-msvc": ["@rspack/binding-win32-x64-msvc@2.2.0", "", { "os": "win32", "cpu": "x64" }, "sha512-v6/3bFr9+i7hRpgulL9b5qCvZL0VgR4vQGQNqOWezUzZmPUj9LYpvB0L9xZIVwDQ2ug/xBiA58bfg5IbESgoyw=="], - "@rspack/cli": ["@rspack/cli@2.2.0", "", { "peerDependencies": { "@rspack/core": "^2.0.0-0", "@rspack/dev-server": "^2.0.0-0" }, "optionalPeers": ["@rspack/dev-server"], "bin": { "rspack": "./bin/rspack.js" } }, "sha512-GSiQPG5v5tN8vYJdUMYX44sPiwVVG8H25fq3LWRydVB4WswDAD/N3qNgWZtFVliQdLH3ZWzFdFUoCyZmea0TMA=="], + "@rspack/cli": ["@rspack/cli@2.2.0", "", { "peerDependencies": { "@rspack/core": "^2.0.0-0", "@rspack/dev-server": "^2.0.0-0" }, "optionalPeers": ["@rspack/dev-server"], "bin": { "rspack": "bin/rspack.js" } }, "sha512-GSiQPG5v5tN8vYJdUMYX44sPiwVVG8H25fq3LWRydVB4WswDAD/N3qNgWZtFVliQdLH3ZWzFdFUoCyZmea0TMA=="], "@rspack/core": ["@rspack/core@2.2.0", "", { "dependencies": { "@rspack/binding": "2.2.0" }, "peerDependencies": { "@module-federation/runtime-tools": "^0.24.1 || ^2.0.0", "@swc/helpers": "^0.5.23" }, "optionalPeers": ["@module-federation/runtime-tools", "@swc/helpers"] }, "sha512-3W7oX0BAHbK4VlknH3lfyfRvupzxdZtyEa+DfKmdjzmIAcqYtHnFd0nLqp5dzitDPyDI1TIKkDhpB0AZJn0pVg=="], "@sigstore/bundle": ["@sigstore/bundle@4.0.0", "", { "dependencies": { "@sigstore/protobuf-specs": "^0.5.0" } }, "sha512-NwCl5Y0V6Di0NexvkTqdoVfmjTaQwoLM236r89KEojGmq/jMls8S+zb7yOwAPdXvbwfKDlP+lmXgAL4vKSQT+A=="], - "@sigstore/core": ["@sigstore/core@3.2.0", "", {}, "sha512-kxHrDQ9YgfrWUSXU0cjsQGv8JykOFZQ9ErNKbFPWzk3Hgpwu8x2hHrQ9IdA8yl+j9RTLTC3sAF3Tdq1IQCP4oA=="], + "@sigstore/core": ["@sigstore/core@3.2.1", "", {}, "sha512-qRsxPnCrbC/puegGxKuynfnxgLiHqWStrSjxkoB4YKqq3Z3s4cyZyj42ZdWFAEblNP65C+rBH8EuREHIXoi83g=="], "@sigstore/protobuf-specs": ["@sigstore/protobuf-specs@0.5.1", "", {}, "sha512-/ScWUhhoFasJsSRGTVBwId1loQjjnjAfE4djL6ZhrXRpNCmPTnUKF5Jokd58ILseOMjzET3UrMOtJPS9sYeI0g=="], @@ -661,7 +715,7 @@ "@sigstore/tuf": ["@sigstore/tuf@4.0.2", "", { "dependencies": { "@sigstore/protobuf-specs": "^0.5.0", "tuf-js": "^4.1.0" } }, "sha512-TCAzTy0xzdP79EnxSjq9KQ3eaR7+FmudLC6eRKknVKZbV7ZNlGLClAAQb/HMNJ5n2OBNk2GT1tEmU0xuPr+SLQ=="], - "@sigstore/verify": ["@sigstore/verify@3.1.0", "", { "dependencies": { "@sigstore/bundle": "^4.0.0", "@sigstore/core": "^3.1.0", "@sigstore/protobuf-specs": "^0.5.0" } }, "sha512-mNe0Iigql08YupSOGv197YdHpPPr+EzDZmfCgMc7RPNaZTw5aLN01nBl6CHJOh3BGtnMIj83EeN4butBchc8Ag=="], + "@sigstore/verify": ["@sigstore/verify@3.1.1", "", { "dependencies": { "@sigstore/bundle": "^4.0.0", "@sigstore/core": "^3.2.1", "@sigstore/protobuf-specs": "^0.5.0" } }, "sha512-qv7+G3J2cc6wwFj3yKvXOamzqhMwSk1ogPGmhpS8iXllcPrJaIIBA+4HbttlHVu1pqWTdmaCH/WE7UOC51kdoA=="], "@sphinxxxx/color-conversion": ["@sphinxxxx/color-conversion@2.2.2", "", {}, "sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw=="], @@ -743,11 +797,7 @@ "@types/deep-eql": ["@types/deep-eql@4.0.2", "", {}, "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw=="], - "@types/eslint": ["@types/eslint@9.6.1", "", { "dependencies": { "@types/estree": "*", "@types/json-schema": "*" } }, "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag=="], - - "@types/eslint-scope": ["@types/eslint-scope@3.7.7", "", { "dependencies": { "@types/eslint": "*", "@types/estree": "*" } }, "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg=="], - - "@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="], + "@types/estree": ["@types/estree@1.0.9", "", {}, "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg=="], "@types/gensync": ["@types/gensync@1.0.5", "", {}, "sha512-MbsRCT7mTikHwKZ0X+LVUTLRrZZRLipTuXEO9qOYO+zmjMVk81axyClMROf6uoPD9MRVu46bx8zoR0Ad9q3NAg=="], @@ -759,11 +809,13 @@ "@types/linkify-it": ["@types/linkify-it@5.0.0", "", {}, "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q=="], - "@types/markdown-it": ["@types/markdown-it@14.1.2", "", { "dependencies": { "@types/linkify-it": "^5", "@types/mdurl": "^2" } }, "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog=="], + "@types/markdown-it": ["@types/markdown-it@14.2.0", "", { "dependencies": { "@types/linkify-it": "^5", "@types/mdurl": "^2" } }, "sha512-NoQ2yGlLWj4wpxMs+TYmRKk3thDrQ97agr7sFqfLsAlvoS8SNQuTrlObhFqG9iugdTtgOE9jpJ6FNM4ZGsa5xQ=="], "@types/mdurl": ["@types/mdurl@2.0.0", "", {}, "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg=="], - "@types/node": ["@types/node@25.0.3", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA=="], + "@types/mocha": ["@types/mocha@9.1.1", "", {}, "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw=="], + + "@types/node": ["@types/node@26.1.2", "", { "dependencies": { "undici-types": "~8.3.0" } }, "sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg=="], "@types/trusted-types": ["@types/trusted-types@2.0.7", "", {}, "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="], @@ -781,7 +833,7 @@ "@vitest/expect": ["@vitest/expect@4.1.11", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", "@vitest/spy": "4.1.11", "@vitest/utils": "4.1.11", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" } }, "sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw=="], - "@vitest/mocker": ["@vitest/mocker@4.1.11", "", { "dependencies": { "@vitest/spy": "4.1.11", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, "peerDependencies": { "msw": "^2.4.9", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "optionalPeers": ["msw", "vite"] }, "sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ=="], + "@vitest/mocker": ["@vitest/mocker@4.1.11", "", { "dependencies": { "@vitest/spy": "4.1.11", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, "peerDependencies": { "msw": "^2.4.9", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "optionalPeers": ["msw"] }, "sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ=="], "@vitest/pretty-format": ["@vitest/pretty-format@4.1.11", "", { "dependencies": { "tinyrainbow": "^3.1.0" } }, "sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw=="], @@ -825,7 +877,7 @@ "@webassemblyjs/wast-printer": ["@webassemblyjs/wast-printer@1.14.1", "", { "dependencies": { "@webassemblyjs/ast": "1.14.1", "@xtuc/long": "4.2.2" } }, "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw=="], - "@xmldom/xmldom": ["@xmldom/xmldom@0.8.11", "", {}, "sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw=="], + "@xmldom/xmldom": ["@xmldom/xmldom@0.9.10", "", {}, "sha512-A9gOqLdi6cV4ibazAjcQufGj0B1y/vDqYrcuP6d/6x8P27gRS8643Dj9o1dEKtB6O7fwxb2FgBmJS2mX7gpvdw=="], "@xterm/addon-attach": ["@xterm/addon-attach@0.12.0", "", {}, "sha512-1lxvXM4JYSm60lbFmE8WMOy2oF2ip3Ye8jWorSAmwy7x8FiC53netEJ5RguL8+FSRj79MUQsNCb2hprY2QA2ig=="], @@ -849,15 +901,15 @@ "abbrev": ["abbrev@4.0.0", "", {}, "sha512-a1wflyaL0tHtJSmLSOVybYhy22vRih4eduhhrkcjgrWGnRfrZtovJ2FRjxuTtkkj47O/baf0R86QU5OuYpz8fA=="], - "acorn": ["acorn@8.18.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ=="], + "acorn": ["acorn@8.18.0", "", { "bin": "bin/acorn" }, "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ=="], - "acorn-import-phases": ["acorn-import-phases@1.0.4", "", { "peerDependencies": { "acorn": "^8.14.0" } }, "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ=="], + "acorn-walk": ["acorn-walk@8.3.5", "", { "dependencies": { "acorn": "^8.11.0" } }, "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw=="], "agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="], - "ajv": ["ajv@8.17.1", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="], + "ajv": ["ajv@8.20.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA=="], - "ajv-formats": ["ajv-formats@2.1.1", "", { "dependencies": { "ajv": "^8.0.0" } }, "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="], + "ajv-formats": ["ajv-formats@2.1.1", "", { "dependencies": { "ajv": "^8.0.0" }, "peerDependencies": { "ajv": "^8.0.0" } }, "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="], "ajv-keywords": ["ajv-keywords@5.1.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3" }, "peerDependencies": { "ajv": "^8.8.2" } }, "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="], @@ -881,11 +933,11 @@ "assertion-error": ["assertion-error@1.1.0", "", {}, "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="], - "autoprefixer": ["autoprefixer@10.5.4", "", { "dependencies": { "browserslist": "^4.28.6", "caniuse-lite": "^1.0.30001806", "fraction.js": "^5.3.4", "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" }, "peerDependencies": { "postcss": "^8.1.0" }, "bin": { "autoprefixer": "bin/autoprefixer" } }, "sha512-MaU0U/za7N3r6brxD4YB/l4NSrFzLPlANv6wEuQVaIPlD3L4W9rFcQPbL/EilY9BHhHvhfcz3gInDLrEtWT4EA=="], + "autoprefixer": ["autoprefixer@10.5.4", "", { "dependencies": { "browserslist": "^4.28.6", "caniuse-lite": "^1.0.30001806", "fraction.js": "^5.3.4", "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" }, "peerDependencies": { "postcss": "^8.1.0" }, "bin": "bin/autoprefixer" }, "sha512-MaU0U/za7N3r6brxD4YB/l4NSrFzLPlANv6wEuQVaIPlD3L4W9rFcQPbL/EilY9BHhHvhfcz3gInDLrEtWT4EA=="], "autosize": ["autosize@6.0.1", "", {}, "sha512-f86EjiUKE6Xvczc4ioP1JBlWG7FKrE13qe/DxBCpe8GCipCq2nFw73aO8QEBKHfSbYGDN5eB9jXWKen7tspDqQ=="], - "babel-loader": ["babel-loader@10.1.1", "", { "dependencies": { "find-up": "^5.0.0" }, "peerDependencies": { "@babel/core": "^7.12.0 || ^8.0.0-beta.1", "@rspack/core": "^1.0.0 || ^2.0.0-0", "webpack": ">=5.61.0" }, "optionalPeers": ["@rspack/core", "webpack"] }, "sha512-JwKSzk2kjIe7mgPK+/lyZ2QAaJcpahNAdM+hgR2HI8D0OJVkdj8Rl6J3kaLYki9pwF7P2iWnD8qVv80Lq1ABtg=="], + "babel-loader": ["babel-loader@10.1.1", "", { "dependencies": { "find-up": "^5.0.0" }, "peerDependencies": { "@babel/core": "^7.12.0 || ^8.0.0-beta.1", "@rspack/core": "^1.0.0 || ^2.0.0-0", "webpack": ">=5.61.0" } }, "sha512-JwKSzk2kjIe7mgPK+/lyZ2QAaJcpahNAdM+hgR2HI8D0OJVkdj8Rl6J3kaLYki9pwF7P2iWnD8qVv80Lq1ABtg=="], "babel-plugin-polyfill-corejs3": ["babel-plugin-polyfill-corejs3@1.0.0", "", { "dependencies": { "@babel/helper-define-polyfill-provider": "^1.0.0", "core-js-compat": "^3.48.0" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0" } }, "sha512-yIkslVjbmml2Xjb6XhFW7lISXHsqk6cesxTdDsXoMom4Lnb99DbD3OQbSOoM5Z+ASh8YXYaLAsRQrU2Jeh3Qig=="], @@ -893,7 +945,7 @@ "base64-js": ["base64-js@1.5.1", "", {}, "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="], - "baseline-browser-mapping": ["baseline-browser-mapping@2.11.19", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-Grytf1xOxOEMTGRwx6rLGKkTabd4vMg3VrKdj/7joCmV0qgh4QwMMO6xh34YEXQqirAuUdgQGa5orJQQ+69RBw=="], + "baseline-browser-mapping": ["baseline-browser-mapping@2.11.19", "", { "bin": "dist/cli.cjs" }, "sha512-Grytf1xOxOEMTGRwx6rLGKkTabd4vMg3VrKdj/7joCmV0qgh4QwMMO6xh34YEXQqirAuUdgQGa5orJQQ+69RBw=="], "big-integer": ["big-integer@1.6.52", "", {}, "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg=="], @@ -905,13 +957,13 @@ "bplist-parser": ["bplist-parser@0.3.2", "", { "dependencies": { "big-integer": "1.6.x" } }, "sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ=="], - "brace-expansion": ["brace-expansion@1.1.12", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg=="], + "brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], "braces": ["braces@3.0.3", "", { "dependencies": { "fill-range": "^7.1.1" } }, "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="], "browser-stdout": ["browser-stdout@1.3.1", "", {}, "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="], - "browserslist": ["browserslist@4.28.8", "", { "dependencies": { "baseline-browser-mapping": "^2.11.12", "caniuse-lite": "^1.0.30001809", "electron-to-chromium": "^1.5.402", "node-releases": "^2.0.53", "update-browserslist-db": "^1.3.0" }, "bin": { "browserslist": "cli.js" } }, "sha512-V2NpofLblG64mfOtSgDhOJESZEGogzDMBv/q+W6oc4LXWP/q75eOXoOaaOu1EOadB9U4Bwx/e0yzbvwKH8zalA=="], + "browserslist": ["browserslist@4.28.8", "", { "dependencies": { "baseline-browser-mapping": "^2.11.12", "caniuse-lite": "^1.0.30001809", "electron-to-chromium": "^1.5.402", "node-releases": "^2.0.53", "update-browserslist-db": "^1.3.0" }, "bin": "cli.js" }, "sha512-V2NpofLblG64mfOtSgDhOJESZEGogzDMBv/q+W6oc4LXWP/q75eOXoOaaOu1EOadB9U4Bwx/e0yzbvwKH8zalA=="], "buffer-from": ["buffer-from@1.1.2", "", {}, "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="], @@ -931,10 +983,6 @@ "check-error": ["check-error@1.0.3", "", { "dependencies": { "get-func-name": "^2.0.2" } }, "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg=="], - "chevrotain": ["chevrotain@11.0.3", "", { "dependencies": { "@chevrotain/cst-dts-gen": "11.0.3", "@chevrotain/gast": "11.0.3", "@chevrotain/regexp-to-ast": "11.0.3", "@chevrotain/types": "11.0.3", "@chevrotain/utils": "11.0.3", "lodash-es": "4.17.21" } }, "sha512-ci2iJH6LeIkvP9eJW6gpueU8cnZhv85ELY8w8WiFtNjMHA5ad6pQLaJo9mEly/9qUyCpvqX8/POVUTf18/HFdw=="], - - "chevrotain-allstar": ["chevrotain-allstar@0.3.1", "", { "dependencies": { "lodash-es": "^4.17.21" }, "peerDependencies": { "chevrotain": "^11.0.0" } }, "sha512-b7g+y9A0v4mxCW1qUhf3BSVPg+/NvGErk/dOkrDaHA0nQIQGAtrOjlX//9OQtRlSCy+x9rfB5N8yC71lH1nvMw=="], - "chokidar": ["chokidar@4.0.3", "", { "dependencies": { "readdirp": "^4.0.1" } }, "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA=="], "chownr": ["chownr@3.0.0", "", {}, "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g=="], @@ -971,15 +1019,13 @@ "concat-map": ["concat-map@0.0.1", "", {}, "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="], - "confbox": ["confbox@0.1.8", "", {}, "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w=="], - "configstore": ["configstore@5.0.1", "", { "dependencies": { "dot-prop": "^5.2.0", "graceful-fs": "^4.1.2", "make-dir": "^3.0.0", "unique-string": "^2.0.0", "write-file-atomic": "^3.0.0", "xdg-basedir": "^4.0.0" } }, "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="], "console-browserify": ["console-browserify@1.1.0", "", { "dependencies": { "date-now": "^0.1.4" } }, "sha512-duS7VP5pvfsNLDvL1O4VOEbw37AI3A4ZUQYemvDlnpGrNu9tprR7BYWpDYwC0Xia0Zxz5ZupdiIrUp0GH1aXfg=="], "convert-source-map": ["convert-source-map@2.0.0", "", {}, "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="], - "cordova": ["cordova@13.0.0", "", { "dependencies": { "configstore": "^5.0.1", "cordova-common": "^6.0.0", "cordova-create": "^6.0.0", "cordova-lib": "^13.0.0", "editor": "^1.0.0", "execa": "^5.1.1", "nopt": "^9.0.0", "semver": "^7.7.3", "systeminformation": "^5.27.11" }, "bin": { "cordova": "bin/cordova" } }, "sha512-QAIMwmYLL0jHo4vauWSnRd2fr9l+wajG+F5aUkrC6e4ZQGSTv0wAiRmpqQUkIc1ZdELisKDQws/BjHz5nP/sLw=="], + "cordova": ["cordova@13.0.0", "", { "dependencies": { "configstore": "^5.0.1", "cordova-common": "^6.0.0", "cordova-create": "^6.0.0", "cordova-lib": "^13.0.0", "editor": "^1.0.0", "execa": "^5.1.1", "nopt": "^9.0.0", "semver": "^7.7.3", "systeminformation": "^5.27.11" }, "bin": "bin/cordova" }, "sha512-QAIMwmYLL0jHo4vauWSnRd2fr9l+wajG+F5aUkrC6e4ZQGSTv0wAiRmpqQUkIc1ZdELisKDQws/BjHz5nP/sLw=="], "cordova-android": ["cordova-android@15.1.0", "", { "dependencies": { "android-versions": "^2.1.1", "cordova-common": "^6.0.0", "dedent": "^1.7.1", "execa": "^5.1.1", "fast-glob": "^3.3.3", "is-path-inside": "^3.0.3", "nopt": "^9.0.0", "properties-parser": "^0.6.0", "semver": "^7.7.4", "string-argv": "^0.3.2", "untildify": "^4.0.0", "which": "^6.0.1" } }, "sha512-mnOnOisYUVhyrLCPVlHJBKh4ro+X6nZA7nPqBrpVnyTpiiDiakNCfbBJjSs1MTBUJZ6dcmhhvNKZWPT9w6aGPA=="], @@ -997,13 +1043,13 @@ "cordova-plugin-acode-webview": ["cordova-plugin-acode-webview@file:src/plugins/webview", {}], - "cordova-plugin-advanced-http": ["cordova-plugin-advanced-http@file:src/plugins/cordova-plugin-advanced-http", { "devDependencies": { "chai": "4.3.6", "colors": "1.4.0", "cordova": "13.0.0", "mocha": "9.2.2", "umd-tough-cookie": "3.0.0", "xml2js": "0.4.23" } }], + "cordova-plugin-advanced-http": ["/cordova-plugin-advanced-http@file:src/plugins/cordova-plugin-advanced-http", { "devDependencies": { "chai": "4.3.6", "colors": "1.4.0", "cordova": "13.0.0", "mocha": "9.2.2", "umd-tough-cookie": "3.0.0", "xml2js": "0.4.23" } }], "cordova-plugin-browser": ["cordova-plugin-browser@file:src/plugins/browser", {}], - "cordova-plugin-buildinfo": ["cordova-plugin-buildinfo@file:src/plugins/cordova-plugin-buildinfo", { "devDependencies": { "jshint": "^2.6.0" } }], + "cordova-plugin-buildinfo": ["/cordova-plugin-buildinfo@file:src/plugins/cordova-plugin-buildinfo", { "devDependencies": { "jshint": "^2.6.0" } }], - "cordova-plugin-crashhandler": ["cordova-plugin-crashhandler@file:src/plugins/cordova-plugin-crashhandler", {}], + "cordova-plugin-crashhandler": ["/cordova-plugin-crashhandler@file:src/plugins/cordova-plugin-crashhandler", {}], "cordova-plugin-device": ["cordova-plugin-device@2.1.0", "", {}, "sha512-FU0Lw1jZpuKOgG4v80LrfMAOIMCGfAVPumn7AwaX9S1iU/X3OPZUyoKUgP09q4bxL35IeNPkqNWVKYduAXZ1sg=="], @@ -1033,7 +1079,7 @@ "cose-base": ["cose-base@1.0.3", "", { "dependencies": { "layout-base": "^1.0.0" } }, "sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg=="], - "cosmiconfig": ["cosmiconfig@9.0.0", "", { "dependencies": { "env-paths": "^2.2.1", "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", "parse-json": "^5.2.0" }, "peerDependencies": { "typescript": ">=4.9.5" }, "optionalPeers": ["typescript"] }, "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg=="], + "cosmiconfig": ["cosmiconfig@9.0.1", "", { "dependencies": { "env-paths": "^2.2.1", "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", "parse-json": "^5.2.0" }, "peerDependencies": { "typescript": ">=4.9.5" } }, "sha512-hr4ihw+DBqcvrsEDioRO31Z17x71pUYoNe/4h6Z0wB72p7MU7/9gH8Q3s12NFhHPfYBBOV3qyfUxmr/Yn3shnQ=="], "crelt": ["crelt@1.0.6", "", {}, "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="], @@ -1041,9 +1087,9 @@ "crypto-random-string": ["crypto-random-string@2.0.0", "", {}, "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="], - "css-loader": ["css-loader@7.1.4", "", { "dependencies": { "icss-utils": "^5.1.0", "postcss": "^8.4.40", "postcss-modules-extract-imports": "^3.1.0", "postcss-modules-local-by-default": "^4.0.5", "postcss-modules-scope": "^3.2.0", "postcss-modules-values": "^4.0.0", "postcss-value-parser": "^4.2.0", "semver": "^7.6.3" }, "peerDependencies": { "@rspack/core": "0.x || ^1.0.0 || ^2.0.0-0", "webpack": "^5.27.0" }, "optionalPeers": ["@rspack/core", "webpack"] }, "sha512-vv3J9tlOl04WjiMvHQI/9tmIrCxVrj6PFbHemBB1iihpeRbi/I4h033eoFIhwxBBqLhI0KYFS7yvynBFhIZfTw=="], + "css-loader": ["css-loader@7.1.4", "", { "dependencies": { "icss-utils": "^5.1.0", "postcss": "^8.4.40", "postcss-modules-extract-imports": "^3.1.0", "postcss-modules-local-by-default": "^4.0.5", "postcss-modules-scope": "^3.2.0", "postcss-modules-values": "^4.0.0", "postcss-value-parser": "^4.2.0", "semver": "^7.6.3" }, "peerDependencies": { "@rspack/core": "0.x || ^1.0.0 || ^2.0.0-0", "webpack": "^5.27.0" } }, "sha512-vv3J9tlOl04WjiMvHQI/9tmIrCxVrj6PFbHemBB1iihpeRbi/I4h033eoFIhwxBBqLhI0KYFS7yvynBFhIZfTw=="], - "cssesc": ["cssesc@3.0.0", "", { "bin": { "cssesc": "bin/cssesc" } }, "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="], + "cssesc": ["cssesc@3.0.0", "", { "bin": "bin/cssesc" }, "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="], "cytoscape": ["cytoscape@3.34.2", "", {}, "sha512-Cm2jaj1X/PBNlzV9yH8zcfGOxO7U+CJ/+mxSBVPSchLaugdp4jtlGx5qaHtPRZ6tgiZ5P+o1XoRfJA+ba6KM3g=="], @@ -1129,11 +1175,15 @@ "deep-eql": ["deep-eql@3.0.1", "", { "dependencies": { "type-detect": "^4.0.0" } }, "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="], - "delaunator": ["delaunator@5.0.1", "", { "dependencies": { "robust-predicates": "^3.0.2" } }, "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw=="], + "delaunator": ["delaunator@5.1.0", "", { "dependencies": { "robust-predicates": "^3.0.2" } }, "sha512-AGrQ4QSgssa1NGmWmLPqN5NY2KajF5MqxetNEO+o0n3ZwZZeTmt7bBnvzHWrmkZFxGgr4HdyFgelzgi06otLuQ=="], + + "depd": ["depd@2.0.0", "", {}, "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="], + + "destroy": ["destroy@1.2.0", "", {}, "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="], "detect-indent": ["detect-indent@6.1.0", "", {}, "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA=="], - "detect-libc": ["detect-libc@1.0.3", "", { "bin": { "detect-libc": "./bin/detect-libc.js" } }, "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="], + "detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="], "detect-newline": ["detect-newline@3.1.0", "", {}, "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="], @@ -1155,6 +1205,8 @@ "editor": ["editor@1.0.0", "", {}, "sha512-SoRmbGStwNYHgKfjOrX2L0mUvp9bUVv0uPppZSOMAntEbcFtoC3MKF5b3T6HQPXKIV+QGY3xPO3JK5it5lVkuw=="], + "ee-first": ["ee-first@1.1.1", "", {}, "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="], + "electron-to-chromium": ["electron-to-chromium@1.5.415", "", {}, "sha512-958V+Kbhtgz+SxXeEVKBjrlKRBIDAYvUJfwhjxMZ5S6ut9jAl7l9ZKBkBrvjyjZE36PabLUo2L8kEeV5O4vgJg=="], "elementtree": ["elementtree@0.1.7", "", { "dependencies": { "sax": "1.1.4" } }, "sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg=="], @@ -1167,9 +1219,11 @@ "empathic": ["empathic@2.0.1", "", {}, "sha512-YGRs8knHhKHVShLkFET/rWAU8kmHbOV5LwN938RHI0pljAJ1Gf6SzXsSmRaEzcXTtOOmVqJ5+WtQPL5uigY50Q=="], + "encodeurl": ["encodeurl@2.0.0", "", {}, "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="], + "endent": ["endent@2.1.0", "", { "dependencies": { "dedent": "^0.7.0", "fast-json-parse": "^1.0.3", "objectorarray": "^1.0.5" } }, "sha512-r8VyPX7XL8U01Xgnb1CjZ3XV+z90cXIJ9JPE/R9SEC9vpw2P6CfsRPJmp20DppC5N7ZAMCmjYkJIa744Iyg96w=="], - "enhanced-resolve": ["enhanced-resolve@5.19.0", "", { "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.3.0" } }, "sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg=="], + "enhanced-resolve": ["enhanced-resolve@5.24.5", "", { "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.3.3" } }, "sha512-L1l8TNvomm6UVW5B253AGxQagSQr+vGwhMlrrfRS2qmhx46AMpMVJKQYLvWYbysTMY8VoicOvzHzoHMbyzB+4A=="], "entities": ["entities@7.0.1", "", {}, "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA=="], @@ -1177,26 +1231,28 @@ "error-ex": ["error-ex@1.3.4", "", { "dependencies": { "is-arrayish": "^0.2.1" } }, "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ=="], - "es-module-lexer": ["es-module-lexer@2.0.0", "", {}, "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw=="], + "es-errors": ["es-errors@1.3.0", "", {}, "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="], + + "es-module-lexer": ["es-module-lexer@2.1.0", "", {}, "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ=="], "es-toolkit": ["es-toolkit@1.51.0", "", {}, "sha512-zC2lQGkM7QX+Gm6iM3+WIdZJzthsEd14LvRNJneSO2hzyz/zNBENR8+YXWo1cKxgPBtV6ksPYHELbcwBRzmdCw=="], "escalade": ["escalade@3.2.0", "", {}, "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="], - "escape-string-regexp": ["escape-string-regexp@5.0.0", "", {}, "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="], - - "eslint-scope": ["eslint-scope@5.1.1", "", { "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" } }, "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="], + "escape-html": ["escape-html@1.0.3", "", {}, "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="], - "esprima": ["esprima@4.0.1", "", { "bin": { "esparse": "./bin/esparse.js", "esvalidate": "./bin/esvalidate.js" } }, "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="], + "escape-string-regexp": ["escape-string-regexp@5.0.0", "", {}, "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="], - "esrecurse": ["esrecurse@4.3.0", "", { "dependencies": { "estraverse": "^5.2.0" } }, "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="], + "esmoduleserve": ["esmoduleserve@0.2.1", "", { "dependencies": { "acorn": "^8.0.4", "acorn-walk": "^8.0.0", "resolve": "^1.15.1", "serve-static": "^1.14.1" }, "bin": "index.js" }, "sha512-LeuOiyyCSc2sG0Clx9A/tzApfP2gz2/YPE7IBSQwP2JPZKm8S0WZ1b1DfH9eCYXo469k81od3lFvFloYJNpTYA=="], - "estraverse": ["estraverse@4.3.0", "", {}, "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="], + "esprima": ["esprima@4.0.1", "", { "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" } }, "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="], "estree-walker": ["estree-walker@3.0.3", "", { "dependencies": { "@types/estree": "^1.0.0" } }, "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g=="], "esutils": ["esutils@2.0.3", "", {}, "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="], + "etag": ["etag@1.8.1", "", {}, "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="], + "events": ["events@3.3.0", "", {}, "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="], "execa": ["execa@5.1.1", "", { "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", "human-signals": "^2.1.0", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^4.0.1", "onetime": "^5.1.2", "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" } }, "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="], @@ -1217,11 +1273,11 @@ "fast-json-stable-stringify": ["fast-json-stable-stringify@2.1.0", "", {}, "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="], - "fast-uri": ["fast-uri@3.1.0", "", {}, "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA=="], + "fast-uri": ["fast-uri@3.1.2", "", {}, "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ=="], "fastq": ["fastq@1.20.1", "", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw=="], - "fdir": ["fdir@6.5.0", "", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="], + "fdir": ["fdir@6.5.0", "", { "peerDependencies": { "picomatch": "^3 || ^4" } }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="], "filesize": ["filesize@11.0.22", "", {}, "sha512-RlCVs9CY+oSsRnNZn95J9vDXjNjOwddKyTFjOYtA4yxYVIxBnwiVVGJX+TFhsmu3uUf81JDGyijtYL9xgawlTw=="], @@ -1229,12 +1285,14 @@ "find-up": ["find-up@5.0.0", "", { "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" } }, "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="], - "flat": ["flat@5.0.2", "", { "bin": { "flat": "cli.js" } }, "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="], + "flat": ["flat@5.0.2", "", { "bin": "cli.js" }, "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="], "fraction.js": ["fraction.js@5.3.4", "", {}, "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ=="], "framer-motion": ["framer-motion@12.43.0", "", { "dependencies": { "motion-dom": "^12.43.0", "motion-utils": "^12.39.0", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-1eaL3RvR/kAlbG7UYcpMptEyzPoENO0c6w7ZnB3/hh2vSAz/6uGAFn6fdoqTBguNstf3MsFhJHsD/0DHiclG+g=="], + "fresh": ["fresh@0.5.2", "", {}, "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="], + "fs-minipass": ["fs-minipass@3.0.3", "", { "dependencies": { "minipass": "^7.0.3" } }, "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw=="], "fs.realpath": ["fs.realpath@1.0.0", "", {}, "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="], @@ -1257,8 +1315,6 @@ "glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="], - "glob-to-regexp": ["glob-to-regexp@0.4.1", "", {}, "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="], - "globby": ["globby@11.1.0", "", { "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", "fast-glob": "^3.2.9", "ignore": "^5.2.0", "merge2": "^1.4.1", "slash": "^3.0.0" } }, "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="], "graceful-fs": ["graceful-fs@4.2.11", "", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="], @@ -1271,9 +1327,9 @@ "has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="], - "hasown": ["hasown@2.0.2", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="], + "hasown": ["hasown@2.0.3", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg=="], - "he": ["he@1.2.0", "", { "bin": { "he": "bin/he" } }, "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="], + "he": ["he@1.2.0", "", { "bin": "bin/he" }, "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="], "hosted-git-info": ["hosted-git-info@9.0.3", "", { "dependencies": { "lru-cache": "^11.1.0" } }, "sha512-Hc+ghLoSt6QaYZUv0WBiIvmMDZuZZ7oaDvdH8MbfOO4lOsxdXLEvuC6ePoGs9H1X9oCLyq6+NVN0MKqD+ydxyg=="], @@ -1283,6 +1339,8 @@ "http-cache-semantics": ["http-cache-semantics@4.2.0", "", {}, "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ=="], + "http-errors": ["http-errors@2.0.1", "", { "dependencies": { "depd": "~2.0.0", "inherits": "~2.0.4", "setprototypeof": "~1.2.0", "statuses": "~2.0.2", "toidentifier": "~1.0.1" } }, "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ=="], + "http-proxy-agent": ["http-proxy-agent@7.0.2", "", { "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" } }, "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig=="], "https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="], @@ -1313,7 +1371,7 @@ "ini": ["ini@6.0.0", "", {}, "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ=="], - "internmap": ["internmap@1.0.1", "", {}, "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw=="], + "internmap": ["internmap@2.0.3", "", {}, "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="], "ip-address": ["ip-address@10.2.0", "", {}, "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA=="], @@ -1321,7 +1379,7 @@ "is-binary-path": ["is-binary-path@2.1.0", "", { "dependencies": { "binary-extensions": "^2.0.0" } }, "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="], - "is-core-module": ["is-core-module@2.16.1", "", { "dependencies": { "hasown": "^2.0.2" } }, "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w=="], + "is-core-module": ["is-core-module@2.16.2", "", { "dependencies": { "hasown": "^2.0.3" } }, "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA=="], "is-extglob": ["is-extglob@2.1.1", "", {}, "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="], @@ -1349,19 +1407,19 @@ "isobject": ["isobject@4.0.0", "", {}, "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="], - "java-parser": ["java-parser@3.0.1", "", { "dependencies": { "chevrotain": "11.0.3", "chevrotain-allstar": "0.3.1", "lodash": "4.17.21" } }, "sha512-sDIR7u9b7O2JViNUxiZRhnRz7URII/eE7g2B+BmGxDeS6Ex3OYAcCyz5oh0H4LQ+hL/BS8OJTz8apMy9xtGmrQ=="], + "ist": ["ist@1.1.7", "", {}, "sha512-ex9JyqY+tCjBlxN1pXlqxEgtGGUGp1TG83ll1xpu8SfPgOhfAhEGCuepNHlB+d7Le+hLoBcfCu/G0ZQaFbi9hA=="], "jest-worker": ["jest-worker@27.5.1", "", { "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", "supports-color": "^8.0.0" } }, "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="], - "jiti": ["jiti@2.6.1", "", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ=="], + "jiti": ["jiti@2.7.0", "", { "bin": "lib/jiti-cli.mjs" }, "sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ=="], "js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - "js-yaml": ["js-yaml@4.1.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="], + "js-yaml": ["js-yaml@4.1.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": "bin/js-yaml.js" }, "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="], - "jsesc": ["jsesc@3.1.0", "", { "bin": { "jsesc": "bin/jsesc" } }, "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA=="], + "jsesc": ["jsesc@3.1.0", "", { "bin": "bin/jsesc" }, "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA=="], - "jshint": ["jshint@2.13.6", "", { "dependencies": { "cli": "~1.0.0", "console-browserify": "1.1.x", "exit": "0.1.x", "htmlparser2": "3.8.x", "lodash": "~4.17.21", "minimatch": "~3.0.2", "strip-json-comments": "1.0.x" }, "bin": { "jshint": "bin/jshint" } }, "sha512-IVdB4G0NTTeQZrBoM8C5JFVLjV2KtZ9APgybDA1MK73xb09qFs0jCXyQLnCOp1cSZZZbvhq/6mfXHUTaDkffuQ=="], + "jshint": ["jshint@2.13.6", "", { "dependencies": { "cli": "~1.0.0", "console-browserify": "1.1.x", "exit": "0.1.x", "htmlparser2": "3.8.x", "lodash": "~4.17.21", "minimatch": "~3.0.2", "strip-json-comments": "1.0.x" }, "bin": "bin/jshint" }, "sha512-IVdB4G0NTTeQZrBoM8C5JFVLjV2KtZ9APgybDA1MK73xb09qFs0jCXyQLnCOp1cSZZZbvhq/6mfXHUTaDkffuQ=="], "json-parse-even-better-errors": ["json-parse-even-better-errors@2.3.1", "", {}, "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="], @@ -1369,7 +1427,7 @@ "json-stringify-nice": ["json-stringify-nice@1.1.4", "", {}, "sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw=="], - "json5": ["json5@2.2.3", "", { "bin": { "json5": "lib/cli.js" } }, "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="], + "json5": ["json5@2.2.3", "", { "bin": "lib/cli.js" }, "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="], "jsonc-parser": ["jsonc-parser@3.3.1", "", {}, "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ=="], @@ -1381,7 +1439,7 @@ "just-diff-apply": ["just-diff-apply@5.5.0", "", {}, "sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw=="], - "katex": ["katex@0.16.47", "", { "dependencies": { "commander": "^8.3.0" }, "bin": { "katex": "cli.js" } }, "sha512-Eeo8Ys1doU1z+x8AZsPpQu+p/QcZBI5PeOo7QGQdy2x2m0MU/hYagBbGOmXwr5KVbEfVuWv9LpnQWeehogurjg=="], + "katex": ["katex@0.16.47", "", { "dependencies": { "commander": "^8.3.0" }, "bin": "cli.js" }, "sha512-Eeo8Ys1doU1z+x8AZsPpQu+p/QcZBI5PeOo7QGQdy2x2m0MU/hYagBbGOmXwr5KVbEfVuWv9LpnQWeehogurjg=="], "khroma": ["khroma@2.1.0", "", {}, "sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw=="], @@ -1417,15 +1475,13 @@ "linkify-it": ["linkify-it@5.0.2", "", { "dependencies": { "uc.micro": "^2.0.0" } }, "sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q=="], - "loader-runner": ["loader-runner@4.3.1", "", {}, "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q=="], - "loader-utils": ["loader-utils@2.0.4", "", { "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", "json5": "^2.1.2" } }, "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw=="], "locate-path": ["locate-path@6.0.0", "", { "dependencies": { "p-locate": "^5.0.0" } }, "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="], - "lodash": ["lodash@4.17.21", "", {}, "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="], + "lodash": ["lodash@4.17.23", "", {}, "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w=="], - "lodash-es": ["lodash-es@4.17.23", "", {}, "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg=="], + "lodash-es": ["lodash-es@4.18.1", "", {}, "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A=="], "lodash.debounce": ["lodash.debounce@4.0.8", "", {}, "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="], @@ -1433,7 +1489,7 @@ "loupe": ["loupe@2.3.7", "", { "dependencies": { "get-func-name": "^2.0.1" } }, "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA=="], - "lru-cache": ["lru-cache@11.3.6", "", {}, "sha512-Gf/KoL3C/MlI7Bt0PGI9I+TeTC/I6r/csU58N4BSNc4lppLBeKsOdFYkK+dX0ABDUMJNfCHTyPpzwwO21Awd3A=="], + "lru-cache": ["lru-cache@11.5.1", "", {}, "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A=="], "magic-string": ["magic-string@0.30.21", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="], @@ -1441,7 +1497,7 @@ "make-fetch-happen": ["make-fetch-happen@15.0.5", "", { "dependencies": { "@gar/promise-retry": "^1.0.0", "@npmcli/agent": "^4.0.0", "@npmcli/redact": "^4.0.0", "cacache": "^20.0.1", "http-cache-semantics": "^4.1.1", "minipass": "^7.0.2", "minipass-fetch": "^5.0.0", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "negotiator": "^1.0.0", "proc-log": "^6.0.0", "ssri": "^13.0.0" } }, "sha512-uCbIa8jWWmQZt4dSnEStkVC6gdakiinAm4PiGsywIkguF0eWMdcjDz0ECYhUolFU3pFLOev9VNPCEygydXnddg=="], - "markdown-it": ["markdown-it@14.3.0", "", { "dependencies": { "argparse": "^2.0.1", "entities": "^4.5.0", "linkify-it": "^5.0.2", "mdurl": "^2.0.0", "punycode.js": "^2.3.1", "uc.micro": "^2.1.0" }, "bin": { "markdown-it": "bin/markdown-it.mjs" } }, "sha512-RCEsPjR+sr0x+AuYp601tKTkgFG4YEPLCzHST3cQ/fhlJkqAkz1L2/Qbp1j9qw5SBwQHFBoW8+hoN5xssOF0Tw=="], + "markdown-it": ["markdown-it@14.3.0", "", { "dependencies": { "argparse": "^2.0.1", "entities": "^4.5.0", "linkify-it": "^5.0.2", "mdurl": "^2.0.0", "punycode.js": "^2.3.1", "uc.micro": "^2.1.0" }, "bin": "bin/markdown-it.mjs" }, "sha512-RCEsPjR+sr0x+AuYp601tKTkgFG4YEPLCzHST3cQ/fhlJkqAkz1L2/Qbp1j9qw5SBwQHFBoW8+hoN5xssOF0Tw=="], "markdown-it-anchor": ["markdown-it-anchor@9.2.1", "", { "peerDependencies": { "@types/markdown-it": "*", "markdown-it": "*" } }, "sha512-p6APiLJDFAW2GEvaavDvhIBn7jrX2jLv77NkBGgNacFTurbORYc4pyYySg/mI6mpR6cHQuAtzKtmqgQr4K8dsQ=="], @@ -1455,7 +1511,7 @@ "markdown-it-texmath": ["markdown-it-texmath@1.0.0", "", {}, "sha512-4hhkiX8/gus+6e53PLCUmUrsa6ZWGgJW2XCW6O0ASvZUiezIK900ZicinTDtG3kAO2kon7oUA/ReWmpW2FByxg=="], - "marked": ["marked@15.0.12", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA=="], + "marked": ["marked@15.0.12", "", { "bin": "bin/marked.js" }, "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA=="], "mdurl": ["mdurl@2.0.0", "", {}, "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w=="], @@ -1467,6 +1523,8 @@ "micromatch": ["micromatch@4.0.8", "", { "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" } }, "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="], + "mime": ["mime@1.6.0", "", { "bin": "cli.js" }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="], + "mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="], "mime-types": ["mime-types@3.0.2", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A=="], @@ -1477,6 +1535,8 @@ "minimatch": ["minimatch@4.2.1", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g=="], + "minimizer-webpack-plugin": ["minimizer-webpack-plugin@5.10.0", "", { "dependencies": { "@jridgewell/trace-mapping": "^0.3.31", "jest-worker": "^27.4.5", "schema-utils": "^4.3.3", "terser": "^5.51.0" }, "peerDependencies": { "webpack": "^5.1.0" } }, "sha512-2//60T4S0X1Ug/dqLDOgDaGlZsN1Lv8hf8oB0NOV/KIHSaXlPwXBBIbim79dE2Z7NEs52ES8YHoSv6Lmsk+XNg=="], + "minipass": ["minipass@7.1.3", "", {}, "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A=="], "minipass-collect": ["minipass-collect@2.0.1", "", { "dependencies": { "minipass": "^7.0.3" } }, "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw=="], @@ -1491,9 +1551,7 @@ "minizlib": ["minizlib@3.1.0", "", { "dependencies": { "minipass": "^7.1.2" } }, "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw=="], - "mlly": ["mlly@1.8.1", "", { "dependencies": { "acorn": "^8.16.0", "pathe": "^2.0.3", "pkg-types": "^1.3.1", "ufo": "^1.6.3" } }, "sha512-SnL6sNutTwRWWR/vcmCYHSADjiEesp5TGQQ0pXyLhW5IoeibRlF/CbSLailbB3CNqJUk9cVJ9dUDnbD7GrcHBQ=="], - - "mocha": ["mocha@9.2.2", "", { "dependencies": { "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", "chokidar": "3.5.3", "debug": "4.3.3", "diff": "5.0.0", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", "glob": "7.2.0", "growl": "1.10.5", "he": "1.2.0", "js-yaml": "4.1.0", "log-symbols": "4.1.0", "minimatch": "4.2.1", "ms": "2.1.3", "nanoid": "3.3.1", "serialize-javascript": "6.0.0", "strip-json-comments": "3.1.1", "supports-color": "8.1.1", "which": "2.0.2", "workerpool": "6.2.0", "yargs": "16.2.0", "yargs-parser": "20.2.4", "yargs-unparser": "2.0.0" }, "bin": { "mocha": "bin/mocha", "_mocha": "bin/_mocha" } }, "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g=="], + "mocha": ["mocha@9.2.2", "", { "dependencies": { "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", "chokidar": "3.5.3", "debug": "4.3.3", "diff": "5.0.0", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", "glob": "7.2.0", "growl": "1.10.5", "he": "1.2.0", "js-yaml": "4.1.0", "log-symbols": "4.1.0", "minimatch": "4.2.1", "ms": "2.1.3", "nanoid": "3.3.1", "serialize-javascript": "6.0.0", "strip-json-comments": "3.1.1", "supports-color": "8.1.1", "which": "2.0.2", "workerpool": "6.2.0", "yargs": "16.2.0", "yargs-parser": "20.2.4", "yargs-unparser": "2.0.0" }, "bin": { "_mocha": "bin/_mocha", "mocha": "bin/mocha" } }, "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g=="], "motion": ["motion@12.43.0", "", { "dependencies": { "framer-motion": "^12.43.0", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-BQgQbSa9Hn3/mtbib0MK53y6JSANa+YKUKlaYnWzAVDH424RYQ5LVpV3pNiWH00BA2z4ojsSdMzqT7g2FQwjuQ=="], @@ -1503,9 +1561,9 @@ "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="], - "mustache": ["mustache@4.2.0", "", { "bin": { "mustache": "bin/mustache" } }, "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ=="], + "mustache": ["mustache@4.2.0", "", { "bin": "bin/mustache" }, "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ=="], - "nanoid": ["nanoid@3.3.16", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q=="], + "nanoid": ["nanoid@3.3.18", "", { "bin": "bin/nanoid.cjs" }, "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w=="], "negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="], @@ -1513,11 +1571,11 @@ "node-addon-api": ["node-addon-api@7.1.1", "", {}, "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ=="], - "node-gyp": ["node-gyp@12.3.0", "", { "dependencies": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", "graceful-fs": "^4.2.6", "nopt": "^9.0.0", "proc-log": "^6.0.0", "semver": "^7.3.5", "tar": "^7.5.4", "tinyglobby": "^0.2.12", "undici": "^6.25.0", "which": "^6.0.0" }, "bin": { "node-gyp": "bin/node-gyp.js" } }, "sha512-QNcUWM+HgJplcPzBvFBZ9VXacyGZ4+VTOb80PwWR+TlVzoHbRKULNEzpRsnaoxG3Wzr7Qh7BYxGDU3CbKib2Yg=="], + "node-gyp": ["node-gyp@12.3.0", "", { "dependencies": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", "graceful-fs": "^4.2.6", "nopt": "^9.0.0", "proc-log": "^6.0.0", "semver": "^7.3.5", "tar": "^7.5.4", "tinyglobby": "^0.2.12", "undici": "^6.25.0", "which": "^6.0.0" }, "bin": "bin/node-gyp.js" }, "sha512-QNcUWM+HgJplcPzBvFBZ9VXacyGZ4+VTOb80PwWR+TlVzoHbRKULNEzpRsnaoxG3Wzr7Qh7BYxGDU3CbKib2Yg=="], "node-releases": ["node-releases@2.0.53", "", {}, "sha512-D9UOmYG3UH1V+ENW56t5QXBwJw1YEY18ruVeus89Rw+SyIgjPkCO84bRzO3uNIYosJbNwiabWVn48o3uJLjxFQ=="], - "nopt": ["nopt@9.0.0", "", { "dependencies": { "abbrev": "^4.0.0" }, "bin": { "nopt": "bin/nopt.js" } }, "sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw=="], + "nopt": ["nopt@9.0.0", "", { "dependencies": { "abbrev": "^4.0.0" }, "bin": "bin/nopt.js" }, "sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw=="], "normalize-path": ["normalize-path@3.0.0", "", {}, "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="], @@ -1541,6 +1599,8 @@ "obug": ["obug@2.1.3", "", {}, "sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg=="], + "on-finished": ["on-finished@2.4.1", "", { "dependencies": { "ee-first": "1.1.1" } }, "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="], + "once": ["once@1.4.0", "", { "dependencies": { "wrappy": "1" } }, "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="], "onetime": ["onetime@5.1.2", "", { "dependencies": { "mimic-fn": "^2.1.0" } }, "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="], @@ -1553,7 +1613,7 @@ "package-manager-detector": ["package-manager-detector@1.6.0", "", {}, "sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA=="], - "pacote": ["pacote@21.5.0", "", { "dependencies": { "@gar/promise-retry": "^1.0.0", "@npmcli/git": "^7.0.0", "@npmcli/installed-package-contents": "^4.0.0", "@npmcli/package-json": "^7.0.0", "@npmcli/promise-spawn": "^9.0.0", "@npmcli/run-script": "^10.0.0", "cacache": "^20.0.0", "fs-minipass": "^3.0.0", "minipass": "^7.0.2", "npm-package-arg": "^13.0.0", "npm-packlist": "^10.0.1", "npm-pick-manifest": "^11.0.1", "npm-registry-fetch": "^19.0.0", "proc-log": "^6.0.0", "sigstore": "^4.0.0", "ssri": "^13.0.0", "tar": "^7.4.3" }, "bin": { "pacote": "bin/index.js" } }, "sha512-VtZ0SB8mb5Tzw3dXDfVAIjhyVKUHZkS/ZH9/5mpKenwC9sFOXNI0JI7kEF7IMkwOnsWMFrvAZHzx1T5fmrp9FQ=="], + "pacote": ["pacote@21.5.0", "", { "dependencies": { "@gar/promise-retry": "^1.0.0", "@npmcli/git": "^7.0.0", "@npmcli/installed-package-contents": "^4.0.0", "@npmcli/package-json": "^7.0.0", "@npmcli/promise-spawn": "^9.0.0", "@npmcli/run-script": "^10.0.0", "cacache": "^20.0.0", "fs-minipass": "^3.0.0", "minipass": "^7.0.2", "npm-package-arg": "^13.0.0", "npm-packlist": "^10.0.1", "npm-pick-manifest": "^11.0.1", "npm-registry-fetch": "^19.0.0", "proc-log": "^6.0.0", "sigstore": "^4.0.0", "ssri": "^13.0.0", "tar": "^7.4.3" }, "bin": "bin/index.js" }, "sha512-VtZ0SB8mb5Tzw3dXDfVAIjhyVKUHZkS/ZH9/5mpKenwC9sFOXNI0JI7kEF7IMkwOnsWMFrvAZHzx1T5fmrp9FQ=="], "pako": ["pako@1.0.11", "", {}, "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="], @@ -1563,6 +1623,8 @@ "parse-json": ["parse-json@5.2.0", "", { "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", "json-parse-even-better-errors": "^2.3.0", "lines-and-columns": "^1.1.6" } }, "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="], + "parseurl": ["parseurl@1.3.3", "", {}, "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="], + "path-browserify": ["path-browserify@1.0.1", "", {}, "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="], "path-data-parser": ["path-data-parser@0.1.0", "", {}, "sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w=="], @@ -1589,17 +1651,15 @@ "picomatch": ["picomatch@4.0.7", "", {}, "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA=="], - "pkg-types": ["pkg-types@1.3.1", "", { "dependencies": { "confbox": "^0.1.8", "mlly": "^1.7.4", "pathe": "^2.0.1" } }, "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ=="], - - "plist": ["plist@3.1.0", "", { "dependencies": { "@xmldom/xmldom": "^0.8.8", "base64-js": "^1.5.1", "xmlbuilder": "^15.1.1" } }, "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ=="], + "plist": ["plist@3.1.1", "", { "dependencies": { "@xmldom/xmldom": "^0.9.10", "base64-js": "^1.5.1", "xmlbuilder": "^15.1.1" } }, "sha512-ZIfcLJC+7E7FBFnDxm9MPmt7D+DidyQ26lewieO75AdhA2ayMtsJSES0iWzqJQbcVRSrTufQoy0DR94xHue0oA=="], "points-on-curve": ["points-on-curve@0.2.0", "", {}, "sha512-0mYKnYYe9ZcqMCWhUjItv/oHjvgEsfKvnUTg8sAtnHr3GVy7rGkXCb6d5cSyqrWqL4k81b9CPg3urd+T7aop3A=="], "points-on-path": ["points-on-path@0.2.1", "", { "dependencies": { "path-data-parser": "0.1.0", "points-on-curve": "0.2.0" } }, "sha512-25ClnWWuw7JbWZcgqY/gJ4FQWadKxGWk+3kR/7kD0tCaDtPPMj7oHu2ToLaVhfpnHrZzYby2w6tUA0eOIuUg8g=="], - "postcss": ["postcss@8.5.25", "", { "dependencies": { "nanoid": "^3.3.16", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw=="], + "postcss": ["postcss@8.5.26", "", { "dependencies": { "nanoid": "^3.3.17", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ=="], - "postcss-loader": ["postcss-loader@8.2.1", "", { "dependencies": { "cosmiconfig": "^9.0.0", "jiti": "^2.5.1", "semver": "^7.6.2" }, "peerDependencies": { "@rspack/core": "0.x || ^1.0.0 || ^2.0.0-0", "postcss": "^7.0.0 || ^8.0.1", "webpack": "^5.0.0" }, "optionalPeers": ["@rspack/core", "webpack"] }, "sha512-k98jtRzthjj3f76MYTs9JTpRqV1RaaMhEU0Lpw9OTmQZQdppg4B30VZ74BojuBHt3F4KyubHJoXCMUeM8Bqeow=="], + "postcss-loader": ["postcss-loader@8.2.1", "", { "dependencies": { "cosmiconfig": "^9.0.0", "jiti": "^2.5.1", "semver": "^7.6.2" }, "peerDependencies": { "@rspack/core": "0.x || ^1.0.0 || ^2.0.0-0", "postcss": "^7.0.0 || ^8.0.1", "webpack": "^5.0.0" } }, "sha512-k98jtRzthjj3f76MYTs9JTpRqV1RaaMhEU0Lpw9OTmQZQdppg4B30VZ74BojuBHt3F4KyubHJoXCMUeM8Bqeow=="], "postcss-modules-extract-imports": ["postcss-modules-extract-imports@3.1.0", "", { "peerDependencies": { "postcss": "^8.1.0" } }, "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q=="], @@ -1613,9 +1673,9 @@ "postcss-value-parser": ["postcss-value-parser@4.2.0", "", {}, "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="], - "prettier": ["prettier@3.8.3", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw=="], + "prettier": ["prettier@3.8.3", "", { "bin": "bin/prettier.cjs" }, "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw=="], - "prettier-plugin-java": ["prettier-plugin-java@2.8.1", "", { "dependencies": { "java-parser": "3.0.1" }, "peerDependencies": { "prettier": "^3.0.0" } }, "sha512-tkteH5OSCEb0E7wKnhhUSitr1pGUCUt9M//CwerSNhoalL/qv0jXTeSVBPZ36KC+kZl3nbq4dxh144NuGchACg=="], + "prettier-plugin-java": ["prettier-plugin-java@2.9.1", "", { "dependencies": { "web-tree-sitter": "0.26.8" }, "peerDependencies": { "prettier": "^3.0.0" } }, "sha512-qdvMRgSlx5li5fkbIQlMAUSJQn8rIwP2Ux0U1Xg8ganHMAK4UOUoOG00GeZfoLRllSgNt5V3dZOlwUXPLoamSQ=="], "proc-log": ["proc-log@6.1.0", "", {}, "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ=="], @@ -1639,6 +1699,8 @@ "randombytes": ["randombytes@2.1.0", "", { "dependencies": { "safe-buffer": "^5.1.0" } }, "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="], + "range-parser": ["range-parser@1.2.1", "", {}, "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="], + "raw-loader": ["raw-loader@4.0.2", "", { "dependencies": { "loader-utils": "^2.0.0", "schema-utils": "^3.0.0" }, "peerDependencies": { "webpack": "^4.0.0 || ^5.0.0" } }, "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA=="], "read-cmd-shim": ["read-cmd-shim@6.0.0", "", {}, "sha512-1zM5HuOfagXCBWMN83fuFI/x+T/UhZ7k+KIzhrHXcQoeX5+7gmaDYjELQHmmzIodumBHeByBJT4QYS7ufAgs7A=="], @@ -1655,7 +1717,7 @@ "regjsgen": ["regjsgen@0.8.0", "", {}, "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q=="], - "regjsparser": ["regjsparser@0.13.0", "", { "dependencies": { "jsesc": "~3.1.0" }, "bin": { "regjsparser": "bin/parser" } }, "sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q=="], + "regjsparser": ["regjsparser@0.13.2", "", { "dependencies": { "jsesc": "~3.1.0" }, "bin": "bin/parser" }, "sha512-NgRBy2Nx/bE+9F27nVHnqcN5HjyLmecqsqx2PJHu3/IEtADD4WuxuXIVExD5PoSDFVrl78dOonfcOe5O+5nbzQ=="], "require-directory": ["require-directory@2.1.1", "", {}, "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="], @@ -1663,15 +1725,19 @@ "requires-port": ["requires-port@1.0.0", "", {}, "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="], - "resolve": ["resolve@1.22.11", "", { "dependencies": { "is-core-module": "^2.16.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ=="], + "resolve": ["resolve@1.22.12", "", { "dependencies": { "es-errors": "^1.3.0", "is-core-module": "^2.16.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": "bin/resolve" }, "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA=="], "resolve-from": ["resolve-from@4.0.0", "", {}, "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="], "reusify": ["reusify@1.1.0", "", {}, "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw=="], - "robust-predicates": ["robust-predicates@3.0.2", "", {}, "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="], + "robust-predicates": ["robust-predicates@3.0.3", "", {}, "sha512-NS3levdsRIUOmiJ8FZWCP7LG3QpJyrs/TE0Zpf1yvZu8cAJJ6QMW92H1c7kWpdIHo8RvmLxN/o2JXTKHp74lUA=="], + + "rolldown": ["rolldown@1.2.6", "", { "dependencies": { "@oxc-project/types": "=0.147.0", "@rolldown/pluginutils": "^1.0.0" }, "optionalDependencies": { "@rolldown/binding-android-arm-eabi": "1.2.6", "@rolldown/binding-android-arm64": "1.2.6", "@rolldown/binding-darwin-arm64": "1.2.6", "@rolldown/binding-darwin-x64": "1.2.6", "@rolldown/binding-freebsd-x64": "1.2.6", "@rolldown/binding-linux-arm-gnueabihf": "1.2.6", "@rolldown/binding-linux-arm64-gnu": "1.2.6", "@rolldown/binding-linux-arm64-musl": "1.2.6", "@rolldown/binding-linux-ppc64-gnu": "1.2.6", "@rolldown/binding-linux-s390x-gnu": "1.2.6", "@rolldown/binding-linux-x64-gnu": "1.2.6", "@rolldown/binding-linux-x64-musl": "1.2.6", "@rolldown/binding-openharmony-arm64": "1.2.6", "@rolldown/binding-win32-arm64-msvc": "1.2.6", "@rolldown/binding-win32-x64-msvc": "1.2.6" }, "bin": "bin/cli.mjs" }, "sha512-vMM4q3aixf46GiF1Kok8jDPFsEpXgFWGjUHXNkNHNm+Y2adXAG2dbX91jkti3i0ZRsOlcmbuzAz1poObSHCmUA=="], - "rolldown": ["rolldown@1.2.1", "", { "dependencies": { "@oxc-project/types": "=0.142.0", "@rolldown/pluginutils": "^1.0.0" }, "optionalDependencies": { "@rolldown/binding-android-arm64": "1.2.1", "@rolldown/binding-darwin-arm64": "1.2.1", "@rolldown/binding-darwin-x64": "1.2.1", "@rolldown/binding-freebsd-x64": "1.2.1", "@rolldown/binding-linux-arm-gnueabihf": "1.2.1", "@rolldown/binding-linux-arm64-gnu": "1.2.1", "@rolldown/binding-linux-arm64-musl": "1.2.1", "@rolldown/binding-linux-ppc64-gnu": "1.2.1", "@rolldown/binding-linux-s390x-gnu": "1.2.1", "@rolldown/binding-linux-x64-gnu": "1.2.1", "@rolldown/binding-linux-x64-musl": "1.2.1", "@rolldown/binding-openharmony-arm64": "1.2.1", "@rolldown/binding-wasm32-wasi": "1.2.1", "@rolldown/binding-win32-arm64-msvc": "1.2.1", "@rolldown/binding-win32-x64-msvc": "1.2.1" }, "bin": { "rolldown": "./bin/cli.mjs" } }, "sha512-4FKJhg8d3OiyQOA6Q1Q0hoFFpW9/OoX+VsHzpECsdsIZoOArrAK90gl59YK/Z+gnDel45bgJZK03ozH/9bCqEw=="], + "rollup": ["rollup@4.63.3", "", { "dependencies": { "@types/estree": "1.0.9" }, "optionalDependencies": { "@napi-rs/lzma-linux-x64-gnu": "1.5.1", "@rollup/rollup-android-arm-eabi": "4.63.3", "@rollup/rollup-android-arm64": "4.63.3", "@rollup/rollup-darwin-arm64": "4.63.3", "@rollup/rollup-darwin-x64": "4.63.3", "@rollup/rollup-freebsd-arm64": "4.63.3", "@rollup/rollup-freebsd-x64": "4.63.3", "@rollup/rollup-linux-arm-gnueabihf": "4.63.3", "@rollup/rollup-linux-arm-musleabihf": "4.63.3", "@rollup/rollup-linux-arm64-gnu": "4.63.3", "@rollup/rollup-linux-arm64-musl": "4.63.3", "@rollup/rollup-linux-loong64-gnu": "4.63.3", "@rollup/rollup-linux-loong64-musl": "4.63.3", "@rollup/rollup-linux-ppc64-gnu": "4.63.3", "@rollup/rollup-linux-ppc64-musl": "4.63.3", "@rollup/rollup-linux-riscv64-gnu": "4.63.3", "@rollup/rollup-linux-riscv64-musl": "4.63.3", "@rollup/rollup-linux-s390x-gnu": "4.63.3", "@rollup/rollup-linux-x64-gnu": "4.63.3", "@rollup/rollup-linux-x64-musl": "4.63.3", "@rollup/rollup-openbsd-x64": "4.63.3", "@rollup/rollup-openharmony-arm64": "4.63.3", "@rollup/rollup-win32-arm64-msvc": "4.63.3", "@rollup/rollup-win32-ia32-msvc": "4.63.3", "@rollup/rollup-win32-x64-gnu": "4.63.3", "@rollup/rollup-win32-x64-msvc": "4.63.3", "fsevents": "~2.3.2" }, "bin": "dist/bin/rollup" }, "sha512-1i2XreiAoMMXuPGD6Msj2xWrMMkHojNRKivInxGQcg7/1KuPuYlfUutLyh4drnOxUTHX9cHI4wFoat8D/NKaBw=="], + + "rollup-plugin-dts": ["rollup-plugin-dts@6.5.1", "", { "dependencies": { "@jridgewell/remapping": "^2.3.5", "@jridgewell/sourcemap-codec": "^1.5.5", "convert-source-map": "^2.0.0", "magic-string": "^0.30.21" }, "optionalDependencies": { "@babel/code-frame": "^8.0.0" }, "peerDependencies": { "@typescript/typescript6": "^6", "rollup": "^3 || ^4", "typescript": "^4.5 || ^5 || ^6 || ^7" }, "optionalPeers": ["@typescript/typescript6"] }, "sha512-jODTXp3H7MK/Ur/ErtsrQ0G1GvaCmc3du+y5pNrdBMf6d7HlL2Nd/N6TkEr+f75CkUj01zEoEd7y2elH0eHi1Q=="], "roughjs": ["roughjs@4.6.6", "", { "dependencies": { "hachure-fill": "^0.5.2", "path-data-parser": "^0.1.0", "points-on-curve": "^0.2.0", "points-on-path": "^0.2.1" } }, "sha512-ZUz/69+SYpFN/g/lUlo2FXcIjRkSu3nDarreVdGGndHEBJ6cXPdKguS8JGxwj5HA5xIbVKSmLgr5b3AWxtRfvQ=="], @@ -1683,20 +1749,28 @@ "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="], - "sass": ["sass@1.103.1", "", { "dependencies": { "chokidar": "^5.0.0", "immutable": "^5.1.5", "source-map-js": ">=0.6.2 <2.0.0" }, "optionalDependencies": { "@parcel/watcher": "^2.4.1" }, "bin": { "sass": "sass.js" } }, "sha512-9icZURbP51S6S0QGoyaeqk9uB06GNWxsFYWfH5RgpFgqK5FA8tJcM3AdVxrZEVJ7dz+L87nG95gBKf4VuaMHGw=="], + "sass": ["sass@1.103.1", "", { "dependencies": { "chokidar": "^5.0.0", "immutable": "^5.1.5", "source-map-js": ">=0.6.2 <2.0.0" }, "optionalDependencies": { "@parcel/watcher": "^2.4.1" }, "bin": "sass.js" }, "sha512-9icZURbP51S6S0QGoyaeqk9uB06GNWxsFYWfH5RgpFgqK5FA8tJcM3AdVxrZEVJ7dz+L87nG95gBKf4VuaMHGw=="], - "sass-loader": ["sass-loader@16.0.8", "", { "dependencies": { "neo-async": "^2.6.2" }, "peerDependencies": { "@rspack/core": "0.x || ^1.0.0 || ^2.0.0-0", "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", "sass": "^1.3.0", "sass-embedded": "*", "webpack": "^5.0.0" }, "optionalPeers": ["@rspack/core", "node-sass", "sass", "sass-embedded", "webpack"] }, "sha512-hcov4ZwZJIGbEuyNr9EmiTmZueyrxSToE6GOzoZnq5JM7ecRO7ttyvilPn+VmRsqiP16+VYZzVnGZj/hzZgKBA=="], + "sass-loader": ["sass-loader@16.0.8", "", { "dependencies": { "neo-async": "^2.6.2" }, "peerDependencies": { "@rspack/core": "0.x || ^1.0.0 || ^2.0.0-0", "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", "sass": "^1.3.0", "sass-embedded": "*", "webpack": "^5.0.0" }, "optionalPeers": ["node-sass", "sass-embedded"] }, "sha512-hcov4ZwZJIGbEuyNr9EmiTmZueyrxSToE6GOzoZnq5JM7ecRO7ttyvilPn+VmRsqiP16+VYZzVnGZj/hzZgKBA=="], "sax": ["sax@1.1.4", "", {}, "sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg=="], "schema-utils": ["schema-utils@4.3.3", "", { "dependencies": { "@types/json-schema": "^7.0.9", "ajv": "^8.9.0", "ajv-formats": "^2.1.1", "ajv-keywords": "^5.1.0" } }, "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA=="], - "semver": ["semver@7.7.4", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA=="], + "selenium-webdriver": ["selenium-webdriver@4.49.0", "", { "dependencies": { "@bazel/runfiles": "^6.5.0", "jszip": "^3.10.1", "tmp": "^0.2.7", "ws": "^8.21.3" } }, "sha512-16XqeOEMj+4+p+pzLLyvNWmF5jCY05EKIl3e1anZBgv4+zq7PUTtiNjKtQhMpwosZ0wIMKDFAQ2xdyogOHD4DA=="], + + "semver": ["semver@7.8.4", "", { "bin": "bin/semver.js" }, "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA=="], + + "send": ["send@0.19.2", "", { "dependencies": { "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "~0.5.2", "http-errors": "~2.0.1", "mime": "1.6.0", "ms": "2.1.3", "on-finished": "~2.4.1", "range-parser": "~1.2.1", "statuses": "~2.0.2" } }, "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg=="], "serialize-javascript": ["serialize-javascript@6.0.0", "", { "dependencies": { "randombytes": "^2.1.0" } }, "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="], + "serve-static": ["serve-static@1.16.3", "", { "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", "send": "~0.19.1" } }, "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA=="], + "setimmediate": ["setimmediate@1.0.5", "", {}, "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="], + "setprototypeof": ["setprototypeof@1.2.0", "", {}, "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="], + "shebang-command": ["shebang-command@2.0.0", "", { "dependencies": { "shebang-regex": "^3.0.0" } }, "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="], "shebang-regex": ["shebang-regex@3.0.0", "", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="], @@ -1733,6 +1807,8 @@ "stackback": ["stackback@0.0.2", "", {}, "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw=="], + "statuses": ["statuses@2.0.2", "", {}, "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw=="], + "std-env": ["std-env@4.2.0", "", {}, "sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw=="], "string-argv": ["string-argv@0.3.2", "", {}, "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q=="], @@ -1743,7 +1819,7 @@ "stringify-package": ["stringify-package@1.0.1", "", {}, "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg=="], - "strip-ansi": ["strip-ansi@7.1.2", "", { "dependencies": { "ansi-regex": "^6.0.1" } }, "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA=="], + "strip-ansi": ["strip-ansi@7.2.0", "", { "dependencies": { "ansi-regex": "^6.2.2" } }, "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w=="], "strip-final-newline": ["strip-final-newline@2.0.0", "", {}, "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="], @@ -1753,41 +1829,41 @@ "style-mod": ["style-mod@4.1.3", "", {}, "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ=="], - "stylis": ["stylis@4.3.6", "", {}, "sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ=="], + "stylis": ["stylis@4.4.0", "", {}, "sha512-5Z9ZpRzfuH6l/UAvCPAPUo3665Nk2wLaZU3x+TLHKVzIz33+sbJqbtrYoC3KD4/uVOr2Zp+L0LySezP9OHV9yA=="], "supports-color": ["supports-color@8.1.1", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="], "supports-preserve-symlinks-flag": ["supports-preserve-symlinks-flag@1.0.0", "", {}, "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="], - "systeminformation": ["systeminformation@5.31.6", "", { "os": "!aix", "bin": { "systeminformation": "lib/cli.js" } }, "sha512-Uv2b2uGGM6ns+26czgW2cYRabYdnswM0ddSOOlryHOaelzsmDSet1iM/NT7VOYxW8x/BW+HkY+b1Ve2pLTSGSA=="], + "systeminformation": ["systeminformation@5.31.6", "", { "os": "!aix", "bin": "lib/cli.js" }, "sha512-Uv2b2uGGM6ns+26czgW2cYRabYdnswM0ddSOOlryHOaelzsmDSet1iM/NT7VOYxW8x/BW+HkY+b1Ve2pLTSGSA=="], - "tapable": ["tapable@2.3.0", "", {}, "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg=="], + "tapable": ["tapable@2.3.3", "", {}, "sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A=="], "tar": ["tar@7.5.22", "", { "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", "minizlib": "^3.1.0", "yallist": "^5.0.0" } }, "sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA=="], "terminal": ["terminal@0.1.4", "", { "dependencies": { "sprintf": ">= 0.1.1" } }, "sha512-w6OAFpUO+TimZUdQ46dK3fYYOCCBIsS2QUfIEkzX21oJ8tvJOJvJkcmrbleLH5KG02SNohYFDj81bL3VPaULsQ=="], - "terser": ["terser@5.44.1", "", { "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.15.0", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, "bin": { "terser": "bin/terser" } }, "sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw=="], - - "terser-webpack-plugin": ["terser-webpack-plugin@5.3.16", "", { "dependencies": { "@jridgewell/trace-mapping": "^0.3.25", "jest-worker": "^27.4.5", "schema-utils": "^4.3.0", "serialize-javascript": "^6.0.2", "terser": "^5.31.1" }, "peerDependencies": { "webpack": "^5.1.0" } }, "sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q=="], + "terser": ["terser@5.51.2", "", { "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.15.0", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, "bin": "bin/terser" }, "sha512-bWnjSNscmuI+GJze6ZupnHP8G/cTcsJF+bXCeQknk2SHQsgbNJnLrqiH9jZ2W4STPVXH2mDKKRX3iwPhc9Cn/Q=="], "tinybench": ["tinybench@2.9.0", "", {}, "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg=="], - "tinyexec": ["tinyexec@1.0.4", "", {}, "sha512-u9r3uZC0bdpGOXtlxUIdwf9pkmvhqJdrVCH9fapQtgy/OeTTMZ1nqH7agtvEfmGui6e1XxjcdrlxvxJvc3sMqw=="], + "tinyexec": ["tinyexec@1.1.2", "", {}, "sha512-dAqSqE/RabpBKI8+h26GfLq6Vb3JVXs30XYQjdMjaj/c2tS8IYYMbIzP599KtRj7c57/wYApb3QjgRgXmrCukA=="], "tinyglobby": ["tinyglobby@0.2.17", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g=="], "tinyrainbow": ["tinyrainbow@3.1.1", "", {}, "sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw=="], - "tmp": ["tmp@0.2.5", "", {}, "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow=="], + "tmp": ["tmp@0.2.7", "", {}, "sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw=="], "to-regex-range": ["to-regex-range@5.0.1", "", { "dependencies": { "is-number": "^7.0.0" } }, "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="], + "toidentifier": ["toidentifier@1.0.1", "", {}, "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="], + "treeverse": ["treeverse@3.0.0", "", {}, "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ=="], "ts-dedent": ["ts-dedent@2.2.0", "", {}, "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ=="], - "ts-loader": ["ts-loader@9.6.2", "", { "dependencies": { "chalk": "^4.1.0", "picomatch": "^4.0.0", "source-map": "^0.7.4" }, "peerDependencies": { "loader-utils": "*", "typescript": "*", "webpack": "^4.0.0 || ^5.0.0" }, "optionalPeers": ["loader-utils"] }, "sha512-R4iuczmtgxvtuI556s+hTZ6/7Ee03VCAk/l/M8LY1OAsUgB7YydsCxkgq9D9pKRaD7GJqUi2u8fp9zZP/ufjKA=="], + "ts-loader": ["ts-loader@9.6.2", "", { "dependencies": { "chalk": "^4.1.0", "picomatch": "^4.0.0", "source-map": "^0.7.4" }, "peerDependencies": { "loader-utils": "*", "typescript": "*", "webpack": "^4.0.0 || ^5.0.0" } }, "sha512-R4iuczmtgxvtuI556s+hTZ6/7Ee03VCAk/l/M8LY1OAsUgB7YydsCxkgq9D9pKRaD7GJqUi2u8fp9zZP/ufjKA=="], "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], @@ -1799,15 +1875,15 @@ "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], - "uc.micro": ["uc.micro@2.1.0", "", {}, "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A=="], + "typescript-language-server": ["typescript-language-server@4.4.1", "", { "bin": "lib/cli.mjs" }, "sha512-vEvDw+cjY75afMN2rhx0z8sQtFDAUHoBniksBmB6NUZlDt0rEIwQq01VMiqyXFm9uZwcED2475cmDeXxoDHleg=="], - "ufo": ["ufo@1.6.3", "", {}, "sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q=="], + "uc.micro": ["uc.micro@2.1.0", "", {}, "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A=="], "umd-tough-cookie": ["umd-tough-cookie@3.0.0", "", {}, "sha512-LgVV1jgzEPgC/zOj6T9OIDBTj7YCGEJkgoxV2gHYv1Crlst1X95lRIF48hFleGgv4v01Z86LxyyLyvl++M2Srg=="], - "undici": ["undici@6.25.0", "", {}, "sha512-ZgpWDC5gmNiuY9CnLVXEH8rl50xhRCuLNA97fAUnKi8RRuV4E6KG31pDTsLVUKnohJE0I3XDrTeEydAXRw47xg=="], + "undici": ["undici@6.27.0", "", {}, "sha512-YmfV3YnEDzXRC5lZ2jWtWWHKGUm1zIt8AhesR1tens+HTNv+YZlN/dp6G727LOvMJ8xjP9Be7Y2Sdr96LDm+pg=="], - "undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="], + "undici-types": ["undici-types@8.3.0", "", {}, "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ=="], "unicode-canonical-property-names-ecmascript": ["unicode-canonical-property-names-ecmascript@2.0.1", "", {}, "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg=="], @@ -1821,7 +1897,7 @@ "untildify": ["untildify@4.0.0", "", {}, "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="], - "update-browserslist-db": ["update-browserslist-db@1.3.1", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-ZZ61DsRsOnakl74HAmp3oSN4aXUmEWXf+i/yv0h7tIBfICc3VdrFErQKUUKPgu3AMsTUMbcongALEN4l6GSUrQ=="], + "update-browserslist-db": ["update-browserslist-db@1.3.1", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": "cli.js" }, "sha512-ZZ61DsRsOnakl74HAmp3oSN4aXUmEWXf+i/yv0h7tIBfICc3VdrFErQKUUKPgu3AMsTUMbcongALEN4l6GSUrQ=="], "uri-js": ["uri-js@4.4.1", "", { "dependencies": { "punycode": "^2.1.0" } }, "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="], @@ -1829,7 +1905,7 @@ "util-deprecate": ["util-deprecate@1.0.2", "", {}, "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="], - "uuid": ["uuid@11.1.0", "", { "bin": { "uuid": "dist/esm/bin/uuid" } }, "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A=="], + "uuid": ["uuid@11.1.1", "", { "bin": "dist/esm/bin/uuid" }, "sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ=="], "valid-identifier": ["valid-identifier@0.0.2", "", {}, "sha512-zaSmOW6ykXwrkX0YTuFUSoALNEKGaQHpxBJQLb3TXspRNDpBwbfrIQCZqAQ0LKBlKuyn2YOq7NNd6415hvZ33g=="], @@ -1837,9 +1913,9 @@ "vanilla-picker": ["vanilla-picker@2.12.3", "", { "dependencies": { "@sphinxxxx/color-conversion": "^2.2.2" } }, "sha512-qVkT1E7yMbUsB2mmJNFmaXMWE2hF8ffqzMMwe9zdAikd8u2VfnsVY2HQcOUi2F38bgbxzlJBEdS1UUhOXdF9GQ=="], - "vite": ["vite@8.2.0", "", { "dependencies": { "lightningcss": "^1.33.0", "picomatch": "^4.0.5", "postcss": "^8.5.23", "rolldown": "~1.2.0", "tinyglobby": "^0.2.17" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "@vitejs/devtools": "^0.4.0", "esbuild": "^0.27.0 || ^0.28.0", "jiti": ">=1.21.0", "less": "^4.0.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "@vitejs/devtools", "esbuild", "jiti", "less", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-pn+CFpM0lwDeKwmOq1ZaBK/9sjorZcgqxki6MbY/jPEVd9vichIlmlD4HmQ5wdP5EgqQCFRaACBxMC7uEGc6lQ=="], + "vite": ["vite@8.2.2", "", { "dependencies": { "lightningcss": "^1.33.0", "picomatch": "^4.0.5", "postcss": "^8.5.26", "rolldown": "~1.2.4", "tinyglobby": "^0.2.17" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "@vitejs/devtools": "^0.4.0 || ^0.5.0", "esbuild": "^0.27.0 || ^0.28.0", "jiti": ">=1.21.0", "less": "^4.0.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@vitejs/devtools", "esbuild", "less", "sass-embedded", "stylus", "sugarss", "tsx", "yaml"], "bin": "bin/vite.js" }, "sha512-cFKLV/PRgAUlIRm5WjMjJ86jrftzpqcgH+Us+DS8mI3CDNiH30Whrz8uHL3+MOLPAgqbMBAqWdAHAphOAM+z/Q=="], - "vitest": ["vitest@4.1.11", "", { "dependencies": { "@vitest/expect": "4.1.11", "@vitest/mocker": "4.1.11", "@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.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", "obug": "^2.1.1", "pathe": "^2.0.3", "picomatch": "^4.0.3", "std-env": "^4.0.0-rc.1", "tinybench": "^2.9.0", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", "tinyrainbow": "^3.1.0", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0", "why-is-node-running": "^2.3.0" }, "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.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": "*" }, "optionalPeers": ["@edge-runtime/vm", "@opentelemetry/api", "@types/node", "@vitest/browser-playwright", "@vitest/browser-preview", "@vitest/browser-webdriverio", "@vitest/coverage-istanbul", "@vitest/coverage-v8", "@vitest/ui", "happy-dom", "jsdom"], "bin": { "vitest": "./vitest.mjs" } }, "sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw=="], + "vitest": ["vitest@4.1.11", "", { "dependencies": { "@vitest/expect": "4.1.11", "@vitest/mocker": "4.1.11", "@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.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", "obug": "^2.1.1", "pathe": "^2.0.3", "picomatch": "^4.0.3", "std-env": "^4.0.0-rc.1", "tinybench": "^2.9.0", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", "tinyrainbow": "^3.1.0", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0", "why-is-node-running": "^2.3.0" }, "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.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" }, "optionalPeers": ["@edge-runtime/vm", "@opentelemetry/api", "@vitest/browser-playwright", "@vitest/browser-preview", "@vitest/browser-webdriverio", "@vitest/coverage-istanbul", "@vitest/coverage-v8", "@vitest/ui", "jsdom"], "bin": "vitest.mjs" }, "sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw=="], "vscode-css-languageservice": ["vscode-css-languageservice@6.3.10", "", { "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "3.17.5", "vscode-uri": "^3.1.0" } }, "sha512-eq5N9Er3fC4vA9zd9EFhyBG90wtCCuXgRSpAndaOgXMh1Wgep5lBgRIeDgjZBW9pa+332yC9+49cZMW8jcL3MA=="], @@ -1861,17 +1937,19 @@ "walk-up-path": ["walk-up-path@4.0.0", "", {}, "sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A=="], - "watchpack": ["watchpack@2.5.1", "", { "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" } }, "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg=="], + "watchpack": ["watchpack@2.5.2", "", { "dependencies": { "graceful-fs": "^4.1.2" } }, "sha512-6i/00NBjP4yGPs+caKSyRfpTF/8Torsu0MOW3mMzIbhgISFder8i7xbqgHlLMwJrdiN8ndBV3UA1/AfzPSr+jg=="], - "webpack": ["webpack@5.105.0", "", { "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", "@types/json-schema": "^7.0.15", "@webassemblyjs/ast": "^1.14.1", "@webassemblyjs/wasm-edit": "^1.14.1", "@webassemblyjs/wasm-parser": "^1.14.1", "acorn": "^8.15.0", "acorn-import-phases": "^1.0.3", "browserslist": "^4.28.1", "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^5.19.0", "es-module-lexer": "^2.0.0", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.3.1", "mime-types": "^2.1.27", "neo-async": "^2.6.2", "schema-utils": "^4.3.3", "tapable": "^2.3.0", "terser-webpack-plugin": "^5.3.16", "watchpack": "^2.5.1", "webpack-sources": "^3.3.3" }, "bin": { "webpack": "bin/webpack.js" } }, "sha512-gX/dMkRQc7QOMzgTe6KsYFM7DxeIONQSui1s0n/0xht36HvrgbxtM1xBlgx596NbpHuQU8P7QpKwrZYwUX48nw=="], + "web-tree-sitter": ["web-tree-sitter@0.26.8", "", {}, "sha512-4sUwi7ZyOrIk5KLgYLkc2A/F0LFMQnBhfb+2Cdl7ik4ePJ6JD+fk4ofI2sA5eGawBKBaK4Vntt7Ww5KcEsay4A=="], - "webpack-sources": ["webpack-sources@3.3.3", "", {}, "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg=="], + "webpack": ["webpack@5.110.3", "", { "dependencies": { "@types/estree": "^1.0.8", "@types/json-schema": "^7.0.15", "@webassemblyjs/ast": "^1.14.1", "@webassemblyjs/wasm-edit": "^1.14.1", "@webassemblyjs/wasm-parser": "^1.14.1", "acorn": "^8.16.0", "browserslist": "^4.28.1", "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^5.24.4", "es-module-lexer": "^2.1.0", "events": "^3.2.0", "graceful-fs": "^4.2.11", "mime-db": "^1.54.0", "minimizer-webpack-plugin": "^5.7.0", "neo-async": "^2.6.2", "schema-utils": "^4.3.3", "tapable": "^2.3.0", "watchpack": "^2.5.2", "webpack-sources": "^3.5.1" }, "bin": "bin/webpack.js" }, "sha512-GuizBzRvo9YPpyoNMf3ag7AzxbaW85qrRSqTha345KyJbAFPt3/cMzBM0h+RWg7SK/7DdzRLINP3LvQ0hvr4hg=="], + + "webpack-sources": ["webpack-sources@3.5.1", "", {}, "sha512-jyuiGJdtvY434z5bUZrjz67v76/ePNvFZTp9Mdz29IlH4+GPsgyGjiv0fKI+M7BdkU6ADjulUcKAd3tUK3WlEw=="], "whatwg-mimetype": ["whatwg-mimetype@3.0.0", "", {}, "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q=="], "which": ["which@6.0.1", "", { "dependencies": { "isexe": "^4.0.0" }, "bin": { "node-which": "bin/which.js" } }, "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg=="], - "why-is-node-running": ["why-is-node-running@2.3.0", "", { "dependencies": { "siginfo": "^2.0.0", "stackback": "0.0.2" }, "bin": { "why-is-node-running": "cli.js" } }, "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w=="], + "why-is-node-running": ["why-is-node-running@2.3.0", "", { "dependencies": { "siginfo": "^2.0.0", "stackback": "0.0.2" }, "bin": "cli.js" }, "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w=="], "workerpool": ["workerpool@6.2.0", "", {}, "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A=="], @@ -1903,81 +1981,87 @@ "@babel/core/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], - "@babel/core/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + "@babel/core/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], "@babel/core/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], "@babel/generator/@babel/types": ["@babel/types@7.29.8", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg=="], - "@babel/helper-compilation-targets/browserslist": ["browserslist@4.28.2", "", { "dependencies": { "baseline-browser-mapping": "^2.10.12", "caniuse-lite": "^1.0.30001782", "electron-to-chromium": "^1.5.328", "node-releases": "^2.0.36", "update-browserslist-db": "^1.2.3" }, "bin": { "browserslist": "cli.js" } }, "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg=="], + "@babel/helper-annotate-as-pure/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], + + "@babel/helper-compilation-targets/semver": ["semver@7.8.4", "", { "bin": "bin/semver.js" }, "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA=="], "@babel/helper-create-class-features-plugin/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], + "@babel/helper-create-class-features-plugin/semver": ["semver@7.8.4", "", { "bin": "bin/semver.js" }, "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA=="], + + "@babel/helper-create-regexp-features-plugin/semver": ["semver@7.8.4", "", { "bin": "bin/semver.js" }, "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA=="], + "@babel/helper-member-expression-to-functions/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], + "@babel/helper-member-expression-to-functions/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], + "@babel/helper-module-imports/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], + "@babel/helper-module-imports/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], + + "@babel/helper-module-transforms/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + "@babel/helper-module-transforms/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], + "@babel/helper-optimise-call-expression/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], + "@babel/helper-remap-async-to-generator/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], "@babel/helper-replace-supers/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - "@babel/helper-wrap-function/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], + "@babel/helper-skip-transparent-expression-wrappers/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - "@babel/parser/@babel/types": ["@babel/types@7.29.8", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg=="], + "@babel/helper-wrap-function/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - "@babel/plugin-transform-async-generator-functions/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - - "@babel/plugin-transform-classes/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], - - "@babel/plugin-transform-classes/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - - "@babel/template/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - - "@babel/traverse/@babel/code-frame": ["@babel/code-frame@7.29.7", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw=="], + "@babel/helper-wrap-function/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - "@babel/traverse/@babel/template": ["@babel/template@7.29.7", "", { "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/parser": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg=="], + "@babel/helper-wrap-function/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - "@babel/traverse/@babel/types": ["@babel/types@7.29.8", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg=="], + "@babel/helpers/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - "@chevrotain/cst-dts-gen/@chevrotain/types": ["@chevrotain/types@11.0.3", "", {}, "sha512-gsiM3G8b58kZC2HaWR50gu6Y1440cHiJ+i3JUvcp/35JchYejb2+5MVeJK0iKThYpAa/P2PYFV4hoi44HD+aHQ=="], + "@babel/helpers/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - "@chevrotain/cst-dts-gen/lodash-es": ["lodash-es@4.17.21", "", {}, "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="], + "@babel/parser/@babel/types": ["@babel/types@7.29.8", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg=="], - "@chevrotain/gast/@chevrotain/types": ["@chevrotain/types@11.0.3", "", {}, "sha512-gsiM3G8b58kZC2HaWR50gu6Y1440cHiJ+i3JUvcp/35JchYejb2+5MVeJK0iKThYpAa/P2PYFV4hoi44HD+aHQ=="], + "@babel/plugin-transform-async-generator-functions/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - "@chevrotain/gast/lodash-es": ["lodash-es@4.17.21", "", {}, "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="], + "@babel/plugin-transform-classes/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], - "@codemirror/lang-angular/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + "@babel/plugin-transform-classes/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - "@codemirror/lang-angular/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], + "@babel/plugin-transform-modules-systemjs/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - "@codemirror/lang-jinja/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + "@babel/preset-env/semver": ["semver@7.8.4", "", { "bin": "bin/semver.js" }, "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA=="], - "@codemirror/lang-liquid/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + "@babel/preset-modules/@babel/types": ["@babel/types@8.0.4", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.4" } }, "sha512-eY+Yn3dCqTGmyiq2QRU66lA5FL8lqqqvecHt0fF3uHONIa7ToYsaCiWV8lOKqAs0Rb2SjixiKFROngnulPtt2g=="], - "@codemirror/lang-php/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + "@babel/template/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@codemirror/lang-vue/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + "@babel/traverse/@babel/code-frame": ["@babel/code-frame@7.29.7", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw=="], - "@codemirror/lang-vue/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], + "@babel/traverse/@babel/template": ["@babel/template@7.29.7", "", { "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/parser": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg=="], - "@codemirror/language-data/@codemirror/lang-html": ["@codemirror/lang-html@6.4.11", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/language": "^6.4.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/css": "^1.1.0", "@lezer/html": "^1.3.12" } }, "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw=="], + "@babel/traverse/@babel/types": ["@babel/types@7.29.8", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg=="], - "@codemirror/language-data/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], + "@marijn/testtool/mocha": ["mocha@10.8.2", "", { "dependencies": { "ansi-colors": "^4.1.3", "browser-stdout": "^1.3.1", "chokidar": "^3.5.3", "debug": "^4.3.5", "diff": "^5.2.0", "escape-string-regexp": "^4.0.0", "find-up": "^5.0.0", "glob": "^8.1.0", "he": "^1.2.0", "js-yaml": "^4.1.0", "log-symbols": "^4.1.0", "minimatch": "^5.1.6", "ms": "^2.1.3", "serialize-javascript": "^6.0.2", "strip-json-comments": "^3.1.1", "supports-color": "^8.1.1", "workerpool": "^6.5.1", "yargs": "^16.2.0", "yargs-parser": "^20.2.9", "yargs-unparser": "^2.0.0" }, "bin": { "_mocha": "bin/_mocha", "mocha": "bin/mocha.js" } }, "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg=="], - "@codemirror/language-data/@codemirror/lang-jinja": ["@codemirror/lang-jinja@6.0.0", "", { "dependencies": { "@codemirror/lang-html": "^6.0.0", "@codemirror/language": "^6.0.0", "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.2.0", "@lezer/lr": "^1.4.0" } }, "sha512-47MFmRcR8UAxd8DReVgj7WJN1WSAMT7OJnewwugZM4XiHWkOjgJQqvEM1NpMj9ALMPyxmlziEI1opH9IaEvmaw=="], + "@netflix/nerror/lodash": ["lodash@4.18.1", "", {}, "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q=="], - "@codemirror/language-data/@codemirror/lang-liquid": ["@codemirror/lang-liquid@6.3.1", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/lang-html": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.3.1" } }, "sha512-S/jE/D7iij2Pu70AC65ME6AYWxOOcX20cSJvaPgY5w7m2sfxsArAcUAuUgm/CZCVmqoi9KiOlS7gj/gyLipABw=="], + "@npmcli/arborist/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], - "@codemirror/language-data/@codemirror/lang-markdown": ["@codemirror/lang-markdown@6.5.0", "", { "dependencies": { "@codemirror/autocomplete": "^6.7.1", "@codemirror/lang-html": "^6.0.0", "@codemirror/language": "^6.3.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", "@lezer/common": "^1.2.1", "@lezer/markdown": "^1.0.0" } }, "sha512-0K40bZ35jpHya6FriukbgaleaqzBLZfOh7HuzqbMxBXkbYMJDxfF39c23xOgxFezR+3G+tR2/Mup+Xk865OMvw=="], + "@npmcli/arborist/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], - "@codemirror/language-data/@codemirror/lang-yaml": ["@codemirror/lang-yaml@6.1.2", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.2.0", "@lezer/lr": "^1.0.0", "@lezer/yaml": "^1.0.0" } }, "sha512-dxrfG8w5Ce/QbT7YID7mWZFKhdhsaTNOYjOkSIMt1qmC4VQnXSDSYVHHHn8k6kJUfIhtLo8t1JJgltlxWdsITw=="], + "@npmcli/fs/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], - "@npmcli/arborist/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], + "@npmcli/git/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], "@npmcli/map-workspaces/glob": ["glob@13.0.6", "", { "dependencies": { "minimatch": "^10.2.2", "minipass": "^7.1.3", "path-scurry": "^2.0.2" } }, "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw=="], @@ -1985,15 +2069,13 @@ "@npmcli/metavuln-calculator/json-parse-even-better-errors": ["json-parse-even-better-errors@5.0.0", "", {}, "sha512-ZF1nxZ28VhQouRWhUcVlUIN3qwSgPuswK05s/HIaoetAoE/9tngVmCHjSxmSQPav1nd+lPtTL0YZ/2AFdR/iYQ=="], + "@npmcli/metavuln-calculator/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], + "@npmcli/package-json/glob": ["glob@13.0.6", "", { "dependencies": { "minimatch": "^10.2.2", "minipass": "^7.1.3", "path-scurry": "^2.0.2" } }, "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw=="], "@npmcli/package-json/json-parse-even-better-errors": ["json-parse-even-better-errors@5.0.0", "", {}, "sha512-ZF1nxZ28VhQouRWhUcVlUIN3qwSgPuswK05s/HIaoetAoE/9tngVmCHjSxmSQPav1nd+lPtTL0YZ/2AFdR/iYQ=="], - "@rolldown/binding-wasm32-wasi/@emnapi/core": ["@emnapi/core@2.0.0-alpha.3", "", { "dependencies": { "@emnapi/wasi-threads": "2.0.1", "tslib": "^2.4.0" } }, "sha512-AZypUeJ/yByuxyS7BlSNRDOMLMlROYtjYdIAuBmJssVz1UJDSeYxLrdizhXCFYhedC5bqd/ASy8EuNXbVVXp9g=="], - - "@rolldown/binding-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@2.0.0-alpha.3", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-hFPAhMUjJD9BSyCANEISPOogeXC9Zo9ZQl7L6vKnaVsMkCtzznaW/naYypeyl0Gv5rYfWYsZbpixTMpjDJzQeA=="], - - "@rolldown/binding-wasm32-wasi/@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.2.2", "", { "dependencies": { "@tybys/wasm-util": "^0.10.3" }, "peerDependencies": { "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.3", "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.3" } }, "sha512-JfB4kuJQjaoHuCTseIINHtHWeJnvgEcxjwA5t/Y00ZgaOO1Crz3fjT/p8kT28zA/Caz7oiUMn3d6H2yOVCVwuw=="], + "@npmcli/package-json/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], "@tufjs/models/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], @@ -2001,7 +2083,9 @@ "@vitest/expect/chai": ["chai@6.2.2", "", {}, "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg=="], - "anymatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], + "android-versions/semver": ["semver@7.8.5", "", { "bin": "bin/semver.js" }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="], + + "anymatch/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="], "bin-links/write-file-atomic": ["write-file-atomic@7.0.1", "", { "dependencies": { "signal-exit": "^4.0.1" } }, "sha512-OTIk8iR8/aCRWBqvxrzxR0hgxWpnYBblY1S5hDWBQfk/VFmJwzmJgQFN3WsoUKHISv2eAwe+PpbUzyL1CKTLXg=="], @@ -2009,25 +2093,27 @@ "chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], - "chevrotain/@chevrotain/types": ["@chevrotain/types@11.0.3", "", {}, "sha512-gsiM3G8b58kZC2HaWR50gu6Y1440cHiJ+i3JUvcp/35JchYejb2+5MVeJK0iKThYpAa/P2PYFV4hoi44HD+aHQ=="], - - "chevrotain/lodash-es": ["lodash-es@4.17.21", "", {}, "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="], - "cli/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], "cliui/string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="], + "cordova/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], + + "cordova-android/semver": ["semver@7.8.5", "", { "bin": "bin/semver.js" }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="], + + "cordova-fetch/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], + "cordova-fetch/which": ["which@5.0.0", "", { "dependencies": { "isexe": "^3.1.1" }, "bin": { "node-which": "bin/which.js" } }, "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ=="], - "cordova-lib/write-file-atomic": ["write-file-atomic@7.0.1", "", { "dependencies": { "signal-exit": "^4.0.1" } }, "sha512-OTIk8iR8/aCRWBqvxrzxR0hgxWpnYBblY1S5hDWBQfk/VFmJwzmJgQFN3WsoUKHISv2eAwe+PpbUzyL1CKTLXg=="], + "cordova-lib/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], - "core-js-compat/browserslist": ["browserslist@4.28.2", "", { "dependencies": { "baseline-browser-mapping": "^2.10.12", "caniuse-lite": "^1.0.30001782", "electron-to-chromium": "^1.5.328", "node-releases": "^2.0.36", "update-browserslist-db": "^1.2.3" }, "bin": { "browserslist": "cli.js" } }, "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg=="], + "cordova-lib/write-file-atomic": ["write-file-atomic@7.0.1", "", { "dependencies": { "signal-exit": "^4.0.1" } }, "sha512-OTIk8iR8/aCRWBqvxrzxR0hgxWpnYBblY1S5hDWBQfk/VFmJwzmJgQFN3WsoUKHISv2eAwe+PpbUzyL1CKTLXg=="], - "cosmiconfig/js-yaml": ["js-yaml@4.1.1", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA=="], + "cosmiconfig/js-yaml": ["js-yaml@4.2.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": "bin/js-yaml.js" }, "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw=="], - "cross-spawn/which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="], + "cross-spawn/which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="], - "css-loader/postcss": ["postcss@8.5.6", "", { "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg=="], + "css-loader/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], "cytoscape-fcose/cose-base": ["cose-base@2.2.0", "", { "dependencies": { "layout-base": "^2.0.0" } }, "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g=="], @@ -2043,9 +2129,7 @@ "endent/dedent": ["dedent@0.7.0", "", {}, "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="], - "esrecurse/estraverse": ["estraverse@5.3.0", "", {}, "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="], - - "glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], + "glob/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="], "htmlparser2/entities": ["entities@1.0.0", "", {}, "sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ=="], @@ -2053,19 +2137,19 @@ "ignore-walk/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], - "jshint/minimatch": ["minimatch@3.0.8", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q=="], + "jest-worker/supports-color": ["supports-color@8.1.1", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="], - "jshint/strip-json-comments": ["strip-json-comments@1.0.4", "", { "bin": { "strip-json-comments": "cli.js" } }, "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg=="], + "jshint/minimatch": ["minimatch@3.0.8", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q=="], - "lightningcss/detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="], + "jshint/strip-json-comments": ["strip-json-comments@1.0.4", "", { "bin": "cli.js" }, "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg=="], - "make-dir/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], + "make-dir/semver": ["semver@6.3.1", "", { "bin": "bin/semver.js" }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], "markdown-it/entities": ["entities@4.5.0", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="], - "mermaid/marked": ["marked@16.4.2", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-TI3V8YYWvkVf3KJe1dRkpnjs68JUPyEa5vjKrp1XEEJUAOaQc+Qj+L1qWbPd0SJuAdQkFU0h73sXXqwDYxsiDA=="], + "mermaid/marked": ["marked@16.4.2", "", { "bin": "bin/marked.js" }, "sha512-TI3V8YYWvkVf3KJe1dRkpnjs68JUPyEa5vjKrp1XEEJUAOaQc+Qj+L1qWbPd0SJuAdQkFU0h73sXXqwDYxsiDA=="], - "micromatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], + "micromatch/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="], "minipass-fetch/iconv-lite": ["iconv-lite@0.7.2", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw=="], @@ -2073,51 +2157,47 @@ "minipass-pipeline/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="], - "mlly/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="], - "mocha/chokidar": ["chokidar@3.5.3", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="], "mocha/debug": ["debug@4.3.3", "", { "dependencies": { "ms": "2.1.2" } }, "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="], "mocha/escape-string-regexp": ["escape-string-regexp@4.0.0", "", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="], - "mocha/nanoid": ["nanoid@3.3.1", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="], + "mocha/nanoid": ["nanoid@3.3.1", "", { "bin": "bin/nanoid.cjs" }, "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="], - "mocha/which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="], + "mocha/which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="], "mocha/yargs": ["yargs@16.2.0", "", { "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.0", "y18n": "^5.0.5", "yargs-parser": "^20.2.2" } }, "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="], "mocha/yargs-parser": ["yargs-parser@20.2.4", "", {}, "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA=="], - "node-gyp/tinyglobby": ["tinyglobby@0.2.16", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg=="], + "node-gyp/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], - "parse-conflict-json/json-parse-even-better-errors": ["json-parse-even-better-errors@5.0.0", "", {}, "sha512-ZF1nxZ28VhQouRWhUcVlUIN3qwSgPuswK05s/HIaoetAoE/9tngVmCHjSxmSQPav1nd+lPtTL0YZ/2AFdR/iYQ=="], - - "parse-json/@babel/code-frame": ["@babel/code-frame@7.27.1", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.27.1", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg=="], + "npm-install-checks/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], - "plist/xmlbuilder": ["xmlbuilder@15.1.1", "", {}, "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="], + "npm-package-arg/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], - "raw-loader/schema-utils": ["schema-utils@3.3.0", "", { "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" } }, "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg=="], + "npm-pick-manifest/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], - "sass/chokidar": ["chokidar@5.0.0", "", { "dependencies": { "readdirp": "^5.0.0" } }, "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw=="], + "parse-conflict-json/json-parse-even-better-errors": ["json-parse-even-better-errors@5.0.0", "", {}, "sha512-ZF1nxZ28VhQouRWhUcVlUIN3qwSgPuswK05s/HIaoetAoE/9tngVmCHjSxmSQPav1nd+lPtTL0YZ/2AFdR/iYQ=="], - "source-map-support/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="], + "parse-json/@babel/code-frame": ["@babel/code-frame@7.29.7", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw=="], - "terser/acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="], + "plist/xmlbuilder": ["xmlbuilder@15.1.1", "", {}, "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="], - "terser/commander": ["commander@2.20.3", "", {}, "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="], + "postcss-loader/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], - "terser-webpack-plugin/serialize-javascript": ["serialize-javascript@6.0.2", "", { "dependencies": { "randombytes": "^2.1.0" } }, "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g=="], + "raw-loader/schema-utils": ["schema-utils@3.3.0", "", { "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" } }, "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg=="], - "tinyglobby/picomatch": ["picomatch@4.0.5", "", {}, "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A=="], + "rollup-plugin-dts/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - "vite/picomatch": ["picomatch@4.0.5", "", {}, "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A=="], + "sass/chokidar": ["chokidar@5.0.0", "", { "dependencies": { "readdirp": "^5.0.0" } }, "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw=="], - "webpack/acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="], + "send/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="], - "webpack/browserslist": ["browserslist@4.28.1", "", { "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", "electron-to-chromium": "^1.5.263", "node-releases": "^2.0.27", "update-browserslist-db": "^1.2.0" }, "bin": { "browserslist": "cli.js" } }, "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA=="], + "source-map-support/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="], - "webpack/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], + "terser/commander": ["commander@2.20.3", "", {}, "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="], "wrap-ansi/ansi-styles": ["ansi-styles@6.2.3", "", {}, "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="], @@ -2129,77 +2209,157 @@ "@babel/generator/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], - "@babel/helper-compilation-targets/browserslist/baseline-browser-mapping": ["baseline-browser-mapping@2.10.29", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-Asa2krT+XTPZINCS+2QcyS8WTkObE77RwkydwF7h6DmnKqbvlalz93m/dnphUyCa6SWSP51VgtEUf2FN+gelFQ=="], - - "@babel/helper-compilation-targets/browserslist/caniuse-lite": ["caniuse-lite@1.0.30001792", "", {}, "sha512-hVLMUZFgR4JJ6ACt1uEESvQN1/dBVqPAKY0hgrV70eN3391K6juAfTjKZLKvOMsx8PxA7gsY1/tLMMTcfFLLpw=="], - - "@babel/helper-compilation-targets/browserslist/electron-to-chromium": ["electron-to-chromium@1.5.353", "", {}, "sha512-kOrWphBi8TOZyiJZqsgqIle0lw+tzmnQK83pV9dZUd01Nm2POECSyFQMAuarzZdYqQW7FH9RaYOuaRo3h+bQ3w=="], + "@babel/helper-annotate-as-pure/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - "@babel/helper-compilation-targets/browserslist/node-releases": ["node-releases@2.0.38", "", {}, "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw=="], + "@babel/helper-annotate-as-pure/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - "@babel/helper-compilation-targets/browserslist/update-browserslist-db": ["update-browserslist-db@1.2.3", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w=="], + "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], - "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + + "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], + + "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], + + "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], - "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + + "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], + + "@babel/helper-member-expression-to-functions/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], + + "@babel/helper-member-expression-to-functions/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helper-module-imports/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], "@babel/helper-module-imports/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-module-imports/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], - "@babel/helper-module-imports/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + "@babel/helper-module-imports/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + + "@babel/helper-module-imports/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], + + "@babel/helper-module-imports/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], + + "@babel/helper-module-imports/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helper-module-transforms/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], "@babel/helper-module-transforms/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-module-transforms/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], - "@babel/helper-module-transforms/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + "@babel/helper-module-transforms/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + + "@babel/helper-module-transforms/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], + + "@babel/helper-module-transforms/@babel/traverse/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], + + "@babel/helper-optimise-call-expression/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], + + "@babel/helper-optimise-call-expression/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], - "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + + "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], + + "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], + + "@babel/helper-replace-supers/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], "@babel/helper-replace-supers/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-replace-supers/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], - "@babel/helper-replace-supers/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + "@babel/helper-replace-supers/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + + "@babel/helper-replace-supers/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], + + "@babel/helper-replace-supers/@babel/traverse/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], + + "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], - "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + + "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], + + "@babel/helper-skip-transparent-expression-wrappers/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], + + "@babel/helper-skip-transparent-expression-wrappers/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helper-wrap-function/@babel/template/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], + + "@babel/helper-wrap-function/@babel/template/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + + "@babel/helper-wrap-function/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], "@babel/helper-wrap-function/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-wrap-function/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], - "@babel/helper-wrap-function/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + "@babel/helper-wrap-function/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + + "@babel/helper-wrap-function/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], + + "@babel/helper-wrap-function/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helpers/@babel/template/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], + + "@babel/helpers/@babel/template/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + + "@babel/helpers/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], + + "@babel/helpers/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], "@babel/parser/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@7.29.7", "", {}, "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw=="], "@babel/parser/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], + "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], + "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], - "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + + "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], + + "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], + + "@babel/plugin-transform-classes/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], "@babel/plugin-transform-classes/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], - "@babel/plugin-transform-classes/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": "./bin/babel-parser.js" }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + "@babel/plugin-transform-classes/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], + + "@babel/plugin-transform-classes/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], + + "@babel/plugin-transform-classes/@babel/traverse/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], + + "@babel/preset-modules/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], + + "@babel/preset-modules/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.4", "", {}, "sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg=="], "@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], @@ -2209,11 +2369,31 @@ "@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], - "@codemirror/lang-jinja/@codemirror/lang-html/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], + "@marijn/testtool/mocha/ansi-colors": ["ansi-colors@4.1.3", "", {}, "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw=="], + + "@marijn/testtool/mocha/chokidar": ["chokidar@3.6.0", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="], + + "@marijn/testtool/mocha/diff": ["diff@5.2.2", "", {}, "sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A=="], + + "@marijn/testtool/mocha/escape-string-regexp": ["escape-string-regexp@4.0.0", "", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="], + + "@marijn/testtool/mocha/glob": ["glob@8.1.0", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^5.0.1", "once": "^1.3.0" } }, "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="], + + "@marijn/testtool/mocha/js-yaml": ["js-yaml@4.2.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": "bin/js-yaml.js" }, "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw=="], + + "@marijn/testtool/mocha/minimatch": ["minimatch@5.1.9", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw=="], - "@codemirror/lang-liquid/@codemirror/lang-html/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], + "@marijn/testtool/mocha/serialize-javascript": ["serialize-javascript@6.0.2", "", { "dependencies": { "randombytes": "^2.1.0" } }, "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g=="], - "@codemirror/lang-php/@codemirror/lang-html/@codemirror/lang-javascript": ["@codemirror/lang-javascript@6.2.4", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.6.0", "@codemirror/lint": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0", "@lezer/javascript": "^1.0.0" } }, "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA=="], + "@marijn/testtool/mocha/strip-json-comments": ["strip-json-comments@3.1.1", "", {}, "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="], + + "@marijn/testtool/mocha/supports-color": ["supports-color@8.1.1", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="], + + "@marijn/testtool/mocha/workerpool": ["workerpool@6.5.1", "", {}, "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA=="], + + "@marijn/testtool/mocha/yargs": ["yargs@16.2.2", "", { "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.0", "y18n": "^5.0.5", "yargs-parser": "^20.2.2" } }, "sha512-Nt9ZJjXTv5R8MHbqby/wXQ6Gi0Bb3TcYZkR1bzuL4yB2OxWPkXknz513gEF0GoA6tn00UpbPvERW8rzCuWCA6w=="], + + "@marijn/testtool/mocha/yargs-parser": ["yargs-parser@20.2.9", "", {}, "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="], "@npmcli/arborist/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="], @@ -2221,38 +2401,24 @@ "@npmcli/package-json/glob/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], - "@rolldown/binding-wasm32-wasi/@emnapi/core/@emnapi/wasi-threads": ["@emnapi/wasi-threads@2.0.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9DsSk+o5NBX0CCJT8s0EROGSGxjR/tKu6aBTaVyq+SjAEQH4XcdcRxPBRzsBLizTTJ49MJjF+jgu3qnO9GLQcQ=="], - "@tufjs/models/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="], "bin-links/write-file-atomic/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], "cacache/glob/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], - "cli/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], - - "cliui/string-width/get-east-asian-width": ["get-east-asian-width@1.4.0", "", {}, "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q=="], + "cli/glob/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="], "cordova-fetch/which/isexe": ["isexe@3.1.5", "", {}, "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w=="], "cordova-lib/write-file-atomic/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], - "core-js-compat/browserslist/baseline-browser-mapping": ["baseline-browser-mapping@2.10.29", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-Asa2krT+XTPZINCS+2QcyS8WTkObE77RwkydwF7h6DmnKqbvlalz93m/dnphUyCa6SWSP51VgtEUf2FN+gelFQ=="], - - "core-js-compat/browserslist/caniuse-lite": ["caniuse-lite@1.0.30001792", "", {}, "sha512-hVLMUZFgR4JJ6ACt1uEESvQN1/dBVqPAKY0hgrV70eN3391K6juAfTjKZLKvOMsx8PxA7gsY1/tLMMTcfFLLpw=="], - - "core-js-compat/browserslist/electron-to-chromium": ["electron-to-chromium@1.5.353", "", {}, "sha512-kOrWphBi8TOZyiJZqsgqIle0lw+tzmnQK83pV9dZUd01Nm2POECSyFQMAuarzZdYqQW7FH9RaYOuaRo3h+bQ3w=="], - - "core-js-compat/browserslist/node-releases": ["node-releases@2.0.38", "", {}, "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw=="], - - "core-js-compat/browserslist/update-browserslist-db": ["update-browserslist-db@1.2.3", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w=="], - "cross-spawn/which/isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], - "css-loader/postcss/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], - "cytoscape-fcose/cose-base/layout-base": ["layout-base@2.0.1", "", {}, "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg=="], + "d3-sankey/d3-array/internmap": ["internmap@1.0.1", "", {}, "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw=="], + "d3-sankey/d3-shape/d3-path": ["d3-path@1.0.9", "", {}, "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="], "htmlparser2/readable-stream/isarray": ["isarray@0.0.1", "", {}, "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="], @@ -2261,6 +2427,8 @@ "ignore-walk/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="], + "jshint/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], + "minipass-flush/minipass/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], "minipass-pipeline/minipass/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], @@ -2275,31 +2443,97 @@ "mocha/yargs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], - "node-gyp/tinyglobby/picomatch": ["picomatch@4.0.4", "", {}, "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A=="], - - "parse-json/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.28.5", "", {}, "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q=="], + "parse-json/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], "parse-json/@babel/code-frame/js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], - "raw-loader/schema-utils/ajv": ["ajv@6.12.6", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="], + "raw-loader/schema-utils/ajv": ["ajv@6.15.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw=="], "raw-loader/schema-utils/ajv-keywords": ["ajv-keywords@3.5.2", "", { "peerDependencies": { "ajv": "^6.9.1" } }, "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="], + "rollup-plugin-dts/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.4", "", {}, "sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg=="], + + "rollup-plugin-dts/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], + "sass/chokidar/readdirp": ["readdirp@5.1.1", "", {}, "sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA=="], - "webpack/browserslist/baseline-browser-mapping": ["baseline-browser-mapping@2.9.13", "", { "bin": { "baseline-browser-mapping": "dist/cli.js" } }, "sha512-WhtvB2NG2wjr04+h77sg3klAIwrgOqnjS49GGudnUPGFFgg7G17y7Qecqp+2Dr5kUDxNRBca0SK7cG8JwzkWDQ=="], + "send/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], + + "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], + + "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], + + "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], + + "@babel/helper-module-imports/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helper-module-imports/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], + + "@babel/helper-module-transforms/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], + + "@babel/helper-module-transforms/@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], + + "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], + + "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - "webpack/browserslist/caniuse-lite": ["caniuse-lite@1.0.30001763", "", {}, "sha512-mh/dGtq56uN98LlNX9qdbKnzINhX0QzhiWBFEkFfsFO4QyCvL8YegrJAazCwXIeqkIob8BlZPGM3xdnY+sgmvQ=="], + "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - "webpack/browserslist/electron-to-chromium": ["electron-to-chromium@1.5.267", "", {}, "sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw=="], + "@babel/helper-replace-supers/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - "webpack/browserslist/node-releases": ["node-releases@2.0.27", "", {}, "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA=="], + "@babel/helper-replace-supers/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - "webpack/browserslist/update-browserslist-db": ["update-browserslist-db@1.2.3", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w=="], + "@babel/helper-replace-supers/@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - "webpack/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], + "@babel/helper-replace-supers/@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - "wrap-ansi/string-width/get-east-asian-width": ["get-east-asian-width@1.4.0", "", {}, "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q=="], + "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], + + "@babel/helper-wrap-function/@babel/template/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helper-wrap-function/@babel/template/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], + + "@babel/helper-wrap-function/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helper-wrap-function/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], + + "@babel/helpers/@babel/template/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/helpers/@babel/template/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], + + "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], + + "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], + + "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/plugin-transform-classes/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@babel/plugin-transform-classes/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], + + "@babel/plugin-transform-classes/@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], + + "@babel/plugin-transform-classes/@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], + + "@marijn/testtool/mocha/chokidar/readdirp": ["readdirp@3.6.0", "", { "dependencies": { "picomatch": "^2.2.1" } }, "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="], + + "@marijn/testtool/mocha/minimatch/brace-expansion": ["brace-expansion@2.1.7", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g=="], + + "@marijn/testtool/mocha/yargs/cliui": ["cliui@7.0.4", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", "wrap-ansi": "^7.0.0" } }, "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="], + + "@marijn/testtool/mocha/yargs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], "@npmcli/arborist/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], @@ -2311,9 +2545,13 @@ "cacache/glob/minimatch/brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="], + "cli/glob/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], + "ignore-walk/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], - "mocha/chokidar/readdirp/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], + "jshint/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], + + "mocha/chokidar/readdirp/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="], "mocha/yargs/cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], @@ -2325,12 +2563,30 @@ "raw-loader/schema-utils/ajv/json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="], + "@marijn/testtool/mocha/chokidar/readdirp/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="], + + "@marijn/testtool/mocha/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], + + "@marijn/testtool/mocha/yargs/cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + + "@marijn/testtool/mocha/yargs/cliui/wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="], + + "@marijn/testtool/mocha/yargs/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], + + "@marijn/testtool/mocha/yargs/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + "@npmcli/package-json/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], "cacache/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], + "cli/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], + "mocha/yargs/cliui/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], "mocha/yargs/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + + "@marijn/testtool/mocha/yargs/cliui/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], + + "@marijn/testtool/mocha/yargs/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], } } From b57a418e9dbd5299f662c5449956d65127b68d65 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Tue, 22 Sep 2026 06:11:31 +0000 Subject: [PATCH 134/195] fix(fileIcons api): preserve sizing and folder state on plugin refresh (#2923) * fix(fileIcons api): preserve sizing and folder state on plugin refresh * fix --- src/lib/fileIcons.ts | 23 ++++++++-- src/pages/fileBrowser/fileBrowser.scss | 8 ++-- tests/unit/codeHighlight.test.js | 59 +++++++++++++++----------- tests/unit/fileIconAssets.test.ts | 30 +++++++++++++ tests/unit/sftpProfiles.test.js | 51 ++++++++++++++-------- 5 files changed, 123 insertions(+), 48 deletions(-) diff --git a/src/lib/fileIcons.ts b/src/lib/fileIcons.ts index 32fdeeaa49..3168b6dbcc 100644 --- a/src/lib/fileIcons.ts +++ b/src/lib/fileIcons.ts @@ -687,9 +687,9 @@ class FileIconRegistry { for (const $tile of root.querySelectorAll( '[data-type="dir"][data-name], [data-type="root"][data-name]', )) { - const expanded = !$tile - .closest(".collapsible") - ?.classList.contains("hidden"); + const $collapsible = $tile.closest(".collapsible"); + const expanded = + $collapsible !== null && !$collapsible.classList.contains("hidden"); applyLeadClass( $tile, this.icon({ @@ -1094,7 +1094,22 @@ function applyLeadClass($tile: HTMLElement, className: string): void { ) { return; } - $lead.className = className; + + // Some consumers add structural classes around the resolved icon class. + // Keep those classes when a late-loading plugin refreshes an existing row. + // File Browser uses `icon` for sizing. `user-added-storage` is its colour + // hook, and it must survive after the builtin `folder` glyph class is + // replaced. Keeping `folder` would also paint the icon-font glyph. + const structuralClasses = ["icon", "user-added-storage"].filter((name) => + $lead.classList.contains(name), + ); + const resolvedClasses = new Set(className.split(/\s+/).filter(Boolean)); + const missingStructuralClasses = structuralClasses.filter( + (name) => !resolvedClasses.has(name), + ); + $lead.className = [className, ...missingStructuralClasses] + .filter(Boolean) + .join(" "); } const fileIcons = new FileIconRegistry(); diff --git a/src/pages/fileBrowser/fileBrowser.scss b/src/pages/fileBrowser/fileBrowser.scss index 0a262aaefb..f95a975198 100644 --- a/src/pages/fileBrowser/fileBrowser.scss +++ b/src/pages/fileBrowser/fileBrowser.scss @@ -54,10 +54,12 @@ &.folder { color: rgb(206, 206, 53); + } - &.user-added-storage { - color: rgb(53, 101, 206); - } + // Plugin icon themes replace the builtin `folder` glyph class. + // Storage colour has to match `user-added-storage` on its own. + &.user-added-storage { + color: rgb(53, 101, 206); } &.code { diff --git a/tests/unit/codeHighlight.test.js b/tests/unit/codeHighlight.test.js index b434faa8cd..327a763b09 100644 --- a/tests/unit/codeHighlight.test.js +++ b/tests/unit/codeHighlight.test.js @@ -134,30 +134,41 @@ describe("codeHighlight", () => { }); it("updates fallback styles while the shadow host is still detached", () => { - initHighlighting(); - const host = document.createElement("div"); - const shadow = host.attachShadow({ mode: "open" }); - Object.defineProperty(shadow, "adoptedStyleSheets", { - configurable: true, - get() { - throw new Error("adoptedStyleSheets unavailable"); - }, - set() { - throw new Error("adoptedStyleSheets unavailable"); - }, - }); - - applyHighlightStyles(shadow); - const style = shadow.querySelector("#cm-static-highlight-styles"); - expect(style).toBeTruthy(); - expect(style.isConnected).toBe(false); - expect(style.textContent).toContain("#c678dd"); - - settings.value.editorTheme = "githubLight"; - for (const listener of themeListeners) listener(); - - expect(style.parentNode).toBe(shadow); - expect(style.textContent).toContain("#cf222e"); + const warn = vi.spyOn(console, "warn").mockImplementation(() => {}); + try { + initHighlighting(); + const host = document.createElement("div"); + const shadow = host.attachShadow({ mode: "open" }); + Object.defineProperty(shadow, "adoptedStyleSheets", { + configurable: true, + get() { + throw new Error("adoptedStyleSheets unavailable"); + }, + set() { + throw new Error("adoptedStyleSheets unavailable"); + }, + }); + + applyHighlightStyles(shadow); + const style = shadow.querySelector("#cm-static-highlight-styles"); + expect(style).toBeTruthy(); + expect(style.isConnected).toBe(false); + expect(style.textContent).toContain("#c678dd"); + + settings.value.editorTheme = "githubLight"; + for (const listener of themeListeners) listener(); + + expect(style.parentNode).toBe(shadow); + expect(style.textContent).toContain("#cf222e"); + expect(warn).toHaveBeenCalledWith( + "Failed to adopt highlight stylesheet", + expect.objectContaining({ + message: "adoptedStyleSheets unavailable", + }), + ); + } finally { + warn.mockRestore(); + } }); it("updates adopted shadow styles when the editor theme changes", () => { diff --git a/tests/unit/fileIconAssets.test.ts b/tests/unit/fileIconAssets.test.ts index 239e34c77a..eef03d770a 100644 --- a/tests/unit/fileIconAssets.test.ts +++ b/tests/unit/fileIconAssets.test.ts @@ -97,6 +97,36 @@ describe("icon assets", () => { expect(tile.firstElementChild?.className).toBe(fileIcons.icon("notes.txt")); }); + it("preserves file browser layout and closed-folder state during a late plugin refresh", () => { + document.body.innerHTML = ` +
    + +
    +
    + +
    `; + fileIcons.register({ + id: "classes", + pluginId: "test.plugin", + icons: { + file: { className: "pack-file" }, + folder: { className: "pack-folder" }, + "folder-open": { className: "pack-folder-open" }, + }, + file: "file", + folder: "folder", + folderExpanded: "folder-open", + }); + + fileIcons.use("classes", { persist: false }); + + const [file, folder] = document.body.querySelectorAll("span"); + expect(file.className).toBe("pack-file icon"); + expect(folder.className).toBe( + "pack-folder icon user-added-storage", + ); + }); + it("uses distinct CSS classes for IDs that previously collided", () => { fileIcons.register({ id: "ids", diff --git a/tests/unit/sftpProfiles.test.js b/tests/unit/sftpProfiles.test.js index b66dab3d9d..bae0b1abf9 100644 --- a/tests/unit/sftpProfiles.test.js +++ b/tests/unit/sftpProfiles.test.js @@ -257,23 +257,40 @@ describe("SFTP secure profiles", () => { }); it("scrubs malformed legacy SFTP values instead of marking them migrated", async () => { - globalThis.sftp = { saveProfile: vi.fn() }; - localStorage.setItem( - "recentFiles", - JSON.stringify([ - "sftp:///missing-host", - "sftp://user:%E0%A4%A@example.com/bad-encoding", - ]), - ); - - const result = await migrateLegacySftpProfiles(); - - expect(JSON.parse(localStorage.getItem("recentFiles"))).toEqual([]); - expect(result.failures[0].message).toBe( - "The saved SFTP address is incomplete", - ); - expect(result.failures[1].message).toBe("URI malformed"); - expect(localStorage.getItem("sftpNativeProfileMigration")).toBe("2"); + const warn = vi.spyOn(console, "warn").mockImplementation(() => {}); + try { + globalThis.sftp = { saveProfile: vi.fn() }; + localStorage.setItem( + "recentFiles", + JSON.stringify([ + "sftp:///missing-host", + "sftp://user:%E0%A4%A@example.com/bad-encoding", + ]), + ); + + const result = await migrateLegacySftpProfiles(); + + expect(JSON.parse(localStorage.getItem("recentFiles"))).toEqual([]); + expect(result.failures[0].message).toBe( + "The saved SFTP address is incomplete", + ); + expect(result.failures[1].message).toBe("URI malformed"); + expect(localStorage.getItem("sftpNativeProfileMigration")).toBe("2"); + expect(warn).toHaveBeenNthCalledWith( + 1, + "Could not migrate legacy SFTP URL", + expect.objectContaining({ + message: "The saved SFTP address is incomplete", + }), + ); + expect(warn).toHaveBeenNthCalledWith( + 2, + "Could not migrate legacy SFTP URL", + expect.objectContaining({ message: "URI malformed" }), + ); + } finally { + warn.mockRestore(); + } }); it("deletes an app-owned legacy key copy when its profile cannot migrate", async () => { From 3db0be923439e274030428d723b3e2c25eb527f5 Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Tue, 22 Sep 2026 09:38:02 +0000 Subject: [PATCH 135/195] feat: immersive fullscreen and orientation api (#2919) * feat: immersive fullscreen and orientation api * fix: typings * chore: remove comments from generated files --------- Co-authored-by: Ajit Kumar --- config.xml | 17 ++ hooks/android/ImmersiveFullscreen.java | 221 ++++++++++++++++++ hooks/immersive-fullscreen.js | 162 +++++++++++++ src/handlers/intent.js | 128 +++++++--- src/index.d.ts | 20 ++ src/lang/ar-ye.json | 3 + src/lang/az-az.json | 3 + src/lang/be-by.json | 3 + src/lang/bn-bd.json | 3 + src/lang/cs-cz.json | 3 + src/lang/de-de.json | 3 + src/lang/en-us.json | 3 + src/lang/es-sv.json | 3 + src/lang/fr-fr.json | 3 + src/lang/he-il.json | 3 + src/lang/hi-in.json | 3 + src/lang/hu-hu.json | 3 + src/lang/id-id.json | 3 + src/lang/index.d.ts | 3 + src/lang/ir-fa.json | 3 + src/lang/it-it.json | 3 + src/lang/ja-jp.json | 3 + src/lang/ko-kr.json | 3 + src/lang/ln-ln.json | 3 + src/lang/ml-in.json | 3 + src/lang/mm-unicode.json | 3 + src/lang/mm-zawgyi.json | 3 + src/lang/pl-pl.json | 3 + src/lang/pt-br.json | 3 + src/lang/pu-in.json | 3 + src/lang/ru-ru.json | 3 + src/lang/tl-ph.json | 3 + src/lang/tr-tr.json | 3 + src/lang/uk-ua.json | 3 + src/lang/uz-uz.json | 3 + src/lang/vi-vn.json | 3 + src/lang/zh-cn.json | 3 + src/lang/zh-hant.json | 3 + src/lang/zh-tw.json | 3 + src/lib/acode.js | 4 + src/lib/fullscreen.js | 113 +++++++++ src/lib/openFile.js | 28 +++ src/lib/orientation.js | 30 +++ src/main.js | 2 + .../android/com/foxdebug/system/System.java | 71 +++++- src/plugins/system/system.d.ts | 1 + src/utils/binaryExtensions.js | 4 + tests/unit/fileIntents.test.js | 179 ++++++++++++++ tests/unit/fullscreen.test.js | 215 +++++++++++++++++ tests/unit/immersiveFullscreenPrepare.test.js | 131 +++++++++++ tests/unit/openFileCancellation.test.js | 139 ++++++++++- tests/unit/sessionPersistence.test.js | 2 + 52 files changed, 1530 insertions(+), 39 deletions(-) create mode 100644 hooks/android/ImmersiveFullscreen.java create mode 100644 hooks/immersive-fullscreen.js create mode 100644 src/lib/fullscreen.js create mode 100644 src/lib/orientation.js create mode 100644 tests/unit/fileIntents.test.js create mode 100644 tests/unit/fullscreen.test.js create mode 100644 tests/unit/immersiveFullscreenPrepare.test.js diff --git a/config.xml b/config.xml index 946ace476a..0241142964 100644 --- a/config.xml +++ b/config.xml @@ -69,6 +69,22 @@ + + + + + + + + + + + + + + + + @@ -314,6 +330,7 @@ + diff --git a/hooks/android/ImmersiveFullscreen.java b/hooks/android/ImmersiveFullscreen.java new file mode 100644 index 0000000000..28d9f8a9ab --- /dev/null +++ b/hooks/android/ImmersiveFullscreen.java @@ -0,0 +1,221 @@ +package org.apache.cordova; + +import android.app.Activity; +import android.content.pm.ActivityInfo; +import android.os.Build; +import android.view.View; +import android.view.ViewTreeObserver; +import android.view.Window; +import android.view.WindowManager; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowCompat; +import androidx.core.view.WindowInsetsCompat; +import androidx.core.view.WindowInsetsControllerCompat; + +/** Owns window state only while Cordova is displaying a browser fullscreen view. */ +final class ImmersiveFullscreen + implements + ViewTreeObserver.OnWindowFocusChangeListener, + View.OnAttachStateChangeListener +{ + + @SuppressWarnings("deprecation") + private static final int LEGACY_FULLSCREEN_FLAGS = + View.SYSTEM_UI_FLAG_FULLSCREEN | + View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | + View.SYSTEM_UI_FLAG_IMMERSIVE | + View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; + + private final Activity activity; + private final Window window; + private final View decor; + private final WindowInsetsControllerCompat controller; + private final Runnable onExit; + private View fullscreenView; + private ViewTreeObserver focusObserver; + private boolean statusBarVisible; + private boolean navigationBarVisible; + private int previousBehavior; + private int previousCutoutMode; + private int previousLegacyFlags; + private boolean resumed; + private Integer requestedOrientation; + private int previousOrientation; + private boolean orientationApplied; + + ImmersiveFullscreen(Activity activity, boolean resumed, Runnable onExit) { + this.activity = activity; + this.resumed = resumed; + this.onExit = onExit; + window = activity.getWindow(); + decor = window.getDecorView(); + controller = WindowCompat.getInsetsController(window, decor); + } + + @SuppressWarnings("deprecation") + void enter(View view) { + if (fullscreenView != null) return; + + WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(decor); + int flags = decor.getSystemUiVisibility(); + statusBarVisible = + insets != null + ? insets.isVisible(WindowInsetsCompat.Type.statusBars()) + : (flags & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0 && + (window.getAttributes().flags & + WindowManager.LayoutParams.FLAG_FULLSCREEN) == 0; + navigationBarVisible = + insets != null + ? insets.isVisible(WindowInsetsCompat.Type.navigationBars()) + : (flags & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0; + previousBehavior = controller.getSystemBarsBehavior(); + previousLegacyFlags = flags & LEGACY_FULLSCREEN_FLAGS; + if (Build.VERSION.SDK_INT >= 28) { + WindowManager.LayoutParams attributes = window.getAttributes(); + previousCutoutMode = attributes.layoutInDisplayCutoutMode; + attributes.layoutInDisplayCutoutMode = + Build.VERSION.SDK_INT >= 30 + ? WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS + : WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES; + window.setAttributes(attributes); + } + + fullscreenView = view; + // The wrapper fills Cordova's root, with no status/navigation bar margins. + // Only the keyboard should shrink the usable area. Leave the root's inset + // listener alone so normal editor layout is unchanged on exit. + ViewCompat.setOnApplyWindowInsetsListener(view, (target, appliedInsets) -> { + int bottom = appliedInsets + .getInsets(WindowInsetsCompat.Type.ime()) + .bottom; + target.setPadding(0, 0, 0, bottom); + return appliedInsets; + }); + view.addOnAttachStateChangeListener(this); + focusObserver = decor.getViewTreeObserver(); + focusObserver.addOnWindowFocusChangeListener(this); + reapply(); + ViewCompat.requestApplyInsets(view); + } + + void reapply() { + if ( + !resumed || + fullscreenView == null || + !fullscreenView.isAttachedToWindow() || + !decor.hasWindowFocus() + ) return; + controller.setSystemBarsBehavior( + WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE + ); + controller.hide(WindowInsetsCompat.Type.systemBars()); + } + + void lockOrientation(String orientation) { + final int requested; + if ("landscape".equals(orientation)) { + requested = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE; + } else if ("portrait".equals(orientation)) { + requested = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT; + } else { + throw new IllegalArgumentException( + "Orientation must be landscape or portrait." + ); + } + if ( + !resumed || fullscreenView == null || !fullscreenView.isAttachedToWindow() + ) { + throw new IllegalStateException( + "Orientation requires foreground fullscreen." + ); + } + + int previous = activity.getRequestedOrientation(); + activity.setRequestedOrientation(requested); + // Only a successful first request owns the restoration state. Changing + // modes or resuming this session must not replace it with our own override. + if (requestedOrientation == null) previousOrientation = previous; + requestedOrientation = requested; + orientationApplied = true; + } + + void unlockOrientation() { + restoreOrientation(); + requestedOrientation = null; + } + + void pause() { + resumed = false; + restoreOrientation(); + } + + void resume() { + resumed = true; + if ( + fullscreenView != null && + fullscreenView.isAttachedToWindow() && + requestedOrientation != null + ) { + activity.setRequestedOrientation(requestedOrientation); + orientationApplied = true; + } + reapply(); + } + + private void restoreOrientation() { + if (!orientationApplied) return; + activity.setRequestedOrientation(previousOrientation); + orientationApplied = false; + } + + @SuppressWarnings("deprecation") + void exit() { + if (fullscreenView == null) return; + View view = fullscreenView; + fullscreenView = null; + onExit.run(); + unlockOrientation(); + view.removeOnAttachStateChangeListener(this); + ViewCompat.setOnApplyWindowInsetsListener(view, null); + view.setPadding(0, 0, 0, 0); + if ( + focusObserver.isAlive() + ) focusObserver.removeOnWindowFocusChangeListener(this); + focusObserver = null; + + controller.setSystemBarsBehavior(previousBehavior); + restoreBar(WindowInsetsCompat.Type.statusBars(), statusBarVisible); + restoreBar(WindowInsetsCompat.Type.navigationBars(), navigationBarVisible); + if (Build.VERSION.SDK_INT < 30) { + // Restore only the bits we own; keep any theme changes made meanwhile. + decor.setSystemUiVisibility( + (decor.getSystemUiVisibility() & ~LEGACY_FULLSCREEN_FLAGS) | + previousLegacyFlags + ); + } + if (Build.VERSION.SDK_INT >= 28) { + WindowManager.LayoutParams attributes = window.getAttributes(); + attributes.layoutInDisplayCutoutMode = previousCutoutMode; + window.setAttributes(attributes); + } + ViewCompat.requestApplyInsets(decor); + } + + private void restoreBar(int type, boolean visible) { + if (visible) controller.show(type); + else controller.hide(type); + } + + @Override + public void onWindowFocusChanged(boolean hasFocus) { + if (hasFocus) reapply(); + } + + @Override + public void onViewAttachedToWindow(View view) {} + + @Override + public void onViewDetachedFromWindow(View view) { + exit(); + } +} diff --git a/hooks/immersive-fullscreen.js b/hooks/immersive-fullscreen.js new file mode 100644 index 0000000000..0d776d7d83 --- /dev/null +++ b/hooks/immersive-fullscreen.js @@ -0,0 +1,162 @@ +const fs = require("node:fs"); +const path = require("node:path"); + +// Patch Cordova's existing custom-view lifecycle rather than replacing its +// WebChromeClient (which also owns dialogs, permissions and file selection). +module.exports = function prepareImmersiveFullscreen(context) { + if (!context.opts.platforms.includes("android")) return; + + const root = context.opts.projectRoot; + const destination = path.join( + root, + "platforms/android/CordovaLib/src/org/apache/cordova", + ); + const webViewPath = path.join(destination, "CordovaWebViewImpl.java"); + const controller = fs.readFileSync( + path.join(root, "hooks/android/ImmersiveFullscreen.java"), + "utf8", + ); + const original = fs.readFileSync(webViewPath, "utf8"); + const newline = original.includes("\r\n") ? "\r\n" : "\n"; + + // Markers delimit our generated blocks so each prepare can replace them safely, + // including when only the controller changes. + let source = original + .replace(/\r\n/g, "\n") + .replace( + /^[ \t]*\/\/ ACODE_FULLSCREEN_BEGIN ([a-z]+)\n[\s\S]*?^[ \t]*\/\/ ACODE_FULLSCREEN_END \1\n/gm, + "", + ); + if (/ACODE_FULLSCREEN_(BEGIN|END)/.test(source)) { + throw new Error( + "Acode fullscreen: incomplete generated patch; regenerate the Android platform.", + ); + } + + function insert(name, anchor, code, before = false) { + const matches = [...source.matchAll(new RegExp(anchor.source, "gm"))]; + if (matches.length !== 1) { + throw new Error( + `Acode fullscreen: expected one Cordova ${name} anchor, found ${matches.length}. Update hooks/immersive-fullscreen.js for this Cordova version.`, + ); + } + const indent = matches[0][1]; + const block = [ + `// ACODE_FULLSCREEN_BEGIN ${name}`, + ...code.trim().split("\n"), + `// ACODE_FULLSCREEN_END ${name}`, + ] + .map((line) => indent + line) + .join("\n"); + source = source.replace(anchor, (match) => + before ? `${block}\n${match}` : `${match}\n${block}`, + ); + } + + // System calls these setters on the UI thread; null releases the orientation override. + insert( + "field", + /^([ \t]*)private View mCustomView;[ \t]*$/m, + ` +private ImmersiveFullscreen immersiveFullscreen; +private boolean fullscreenPaused; +private boolean fullscreenBackHandlerEnabled; + +public void setFullscreenBackHandler(boolean enabled) { + if (enabled && (mCustomView == null || !mCustomView.isAttachedToWindow() || fullscreenPaused)) { + throw new IllegalStateException("Back handler requires foreground fullscreen."); + } + fullscreenBackHandlerEnabled = enabled; +} + +public void setFullscreenOrientation(String orientation) { + if (orientation == null) { + if (immersiveFullscreen != null) immersiveFullscreen.unlockOrientation(); + return; + } + if (immersiveFullscreen == null) { + throw new IllegalStateException("Orientation requires foreground fullscreen."); + } + immersiveFullscreen.lockOrientation(orientation); +} +`, + ); + // CoreAndroid's message channel accepts only Cordova's built-in events. + insert( + "back", + /(?<=if \(isBackButton && mCustomView != null\) \{\n)^([ \t]*)hideCustomView\(\);\n[ \t]*return true;[ \t]*$/m, + ` +if (fullscreenBackHandlerEnabled) { + engine.evaluateJavascript("cordova.fireDocumentEvent('fullscreenbackbutton');", null); + return true; +} +`, + true, + ); + insert( + "enter", + /^([ \t]*)parent\.bringToFront\(\);[ \t]*$/m, + ` +fullscreenBackHandlerEnabled = false; +immersiveFullscreen = new ImmersiveFullscreen(cordova.getActivity(), !fullscreenPaused, () -> fullscreenBackHandlerEnabled = false); +immersiveFullscreen.enter(wrapperView); +`, + ); + insert( + "exit", + /^([ \t]*)mCustomView\.setVisibility\(View\.GONE\);[ \t]*$/m, + ` +fullscreenBackHandlerEnabled = false; +if (immersiveFullscreen != null) { + immersiveFullscreen.exit(); + immersiveFullscreen = null; +} +`, + true, + ); + insert( + "pause", + /^([ \t]*)pluginManager\.onPause\(keepRunning\);[ \t]*$/m, + ` +fullscreenPaused = true; +if (immersiveFullscreen != null) immersiveFullscreen.pause(); +`, + true, + ); + insert( + "resume", + /^([ \t]*)this\.pluginManager\.onResume\(keepRunning\);[ \t]*$/m, + ` +fullscreenPaused = false; +if (immersiveFullscreen != null) immersiveFullscreen.resume(); +`, + true, + ); + insert( + "reset", + /^([ \t]*)pluginManager\.onReset\(\);[ \t]*$/m, + ` +fullscreenBackHandlerEnabled = false; +if (immersiveFullscreen != null) immersiveFullscreen.unlockOrientation(); +`, + true, + ); + // Release fullscreen while the WebView and its callback are still alive. + insert( + "destroy", + /^([ \t]*)engine\.destroy\(\);[ \t]*$/m, + ` +fullscreenBackHandlerEnabled = false; +hideCustomView(); +`, + true, + ); + + // Validate all anchors before writing either generated file. + fs.writeFileSync( + path.join(destination, "ImmersiveFullscreen.java"), + controller, + ); + const patched = source.replace(/\n/g, newline); + if (patched !== original) fs.writeFileSync(webViewPath, patched); +}; diff --git a/src/handlers/intent.js b/src/handlers/intent.js index 78c0009ab6..22c30ac568 100644 --- a/src/handlers/intent.js +++ b/src/handlers/intent.js @@ -1,16 +1,19 @@ import fsOperation from "fileSystem"; +import select from "dialogs/select"; import auth from "lib/auth"; import config from "lib/config"; +import { isInitialPluginLoadComplete } from "lib/loadPlugins"; import openFile from "lib/openFile"; import { BANNER_SUPPRESSION_REASON, setBannerSuppressed } from "lib/startAd"; import helpers from "utils/helpers"; const handlers = []; /** - * Queue to store intents that arrive before files are restored - * @type {Array<{url: string, options: object}>} + * Batches wait for restored files and plugin handlers, then open sequentially. + * @type {Array<{uris: string[], invalid: boolean}>} */ const pendingIntents = []; +let opening; /** * @@ -19,15 +22,13 @@ const pendingIntents = []; export default async function HandleIntent(intent = {}) { const type = intent.action?.split(".").slice(-1)[0]; - if (["SEND", "VIEW", "EDIT"].includes(type)) { + if (["SEND", "SEND_MULTIPLE", "VIEW", "EDIT"].includes(type)) { /**@type {string} */ const url = intent.fileUri || intent.data || intent.extras?.["android.intent.extra.STREAM"]; - if (!url) return; - - if (url.startsWith("acode://")) { + if (typeof url === "string" && url.startsWith("acode://")) { const path = url.replace("acode://", ""); const [module, action, value] = path.split("/"); @@ -75,21 +76,26 @@ export default async function HandleIntent(intent = {}) { return; } - const options = { - mode: "single", - render: true, - persistInSession: false, - }; - - if (sessionStorage.getItem("isfilesRestored") === "true") { - await openFile(url, options); - } else { - // Store the intent for later processing when files are restored - pendingIntents.push({ - url, - options, - }); - } + const incoming = intent.uris?.length + ? intent.uris + : Array.isArray(url) + ? url + : url == null + ? [] + : [url]; + if (!Array.isArray(incoming) || !incoming.length) return; + const uris = [ + ...new Set( + incoming.filter( + (uri) => typeof uri === "string" && /^(content|file):\/\//i.test(uri), + ), + ), + ]; + pendingIntents.push({ + uris, + invalid: incoming.some((uri) => !uris.includes(uri)), + }); + await processPendingIntents(); } } @@ -106,23 +112,73 @@ export function removeIntentHandler(handler) { if (index > -1) handlers.splice(index, 1); } -/** - * Process all pending intents that were queued before files were restored. - * This function is called after isfilesRestored is set to true in main.js. - * @returns {Promise} - */ +/** Drain only after both startup phases, including a partially failed plugin load. */ export async function processPendingIntents() { - if (sessionStorage.getItem("isfilesRestored") !== "true") return; - - // Process all pending intents - while (pendingIntents.length > 0) { - const pendingIntent = pendingIntents.shift(); - try { - await openFile(pendingIntent.url, pendingIntent.options); - } catch (error) { - helpers.error(error); + if ( + sessionStorage.getItem("isfilesRestored") !== "true" || + !isInitialPluginLoadComplete() + ) + return; + if (opening) return opening; + opening = (async () => { + while (pendingIntents.length) { + const { uris, invalid } = pendingIntents.shift(); + const failures = invalid + ? [{ filename: strings["invalid shared file"] }] + : []; + for (const uri of uris) { + try { + await openFile(uri, { + mode: "single", + render: true, + persistInSession: false, + external: true, + }); + } catch (error) { + console.error("Unable to open incoming file", error); + failures.push({ + code: error?.code, + filename: error?.filename || uri, + }); + } + } + if (failures.length) + await reportFailures(failures).catch(HandleIntent.onError); } - } + })().finally(() => { + opening = undefined; + }); + return opening; +} + +async function reportFailures(failures) { + const needsPlugin = failures.some( + (error) => error.code === "DOCUMENT_HANDLER_UNAVAILABLE", + ); + const explanation = needsPlugin + ? strings["document plugin required"] + : strings["shared files unavailable"]; + // The select dialog supports rich text. Build its message as text so + // provider filenames cannot introduce markup or links. + const message = document.createElement("p"); + message.style.cssText = + "white-space:pre-wrap;overflow-wrap:anywhere;margin:0"; + message.textContent = `${explanation}\n\n${failures.map((error) => error.filename).join("\n")}`; + const answer = await new Promise((resolve, reject) => { + select( + strings["unable to open file"], + [ + { text: message.outerHTML, disabled: true }, + ...(needsPlugin ? [{ value: "plugins", text: strings.plugins }] : []), + { value: "close", text: needsPlugin ? strings.cancel : strings.ok }, + ], + { + default: needsPlugin ? "plugins" : "close", + onCancel: () => resolve(null), + }, + ).then(resolve, reject); + }); + if (answer === "plugins") acode.exec("open", "plugins"); } class IntentEvent { diff --git a/src/index.d.ts b/src/index.d.ts index 12e76f127f..75aa19d8be 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -10,6 +10,9 @@ declare const ANDROID_SDK_INT: number; declare const DOES_SUPPORT_THEME: boolean; declare const acode: { webview: AcodeWebViewAPI; + require(module: "fullscreen"): AcodeFullscreenAPI; + require(module: "orientation"): AcodeOrientationAPI; + require(module: string): unknown; [key: string]: unknown; }; @@ -172,3 +175,20 @@ interface AcodeWebView { interface AcodeWebViewAPI { create(options?: WebViewOptions): Promise; } + +interface AcodeFullscreenAPI { + /** + * Claim Back for the current browser fullscreen owner, or release with null. + * The callback must explicitly exit fullscreen when desired. + * Resolves when the native request is accepted. + */ + setBackHandler(callback: (() => void | Promise) | null): Promise; +} + +/** Fullscreen-scoped orientation requests resolve on native acceptance. */ +interface AcodeOrientationAPI { + /** Requires a foreground browser fullscreen session. */ + lock(mode: "landscape" | "portrait"): Promise; + /** Restores the previous orientation policy, if overridden. */ + unlock(): Promise; +} diff --git a/src/lang/ar-ye.json b/src/lang/ar-ye.json index 6939fd6b68..67b21b3d7c 100644 --- a/src/lang/ar-ye.json +++ b/src/lang/ar-ye.json @@ -91,6 +91,9 @@ "theme": "السمة", "title-listfiles": "سرد الملفات", "unable to delete file": "عذراً، فشل حذف الملف", + "document plugin required": "ثبّت Docs Workspace أو فعّله من قسم الإضافات، ثم أعد فتح المستند.", + "shared files unavailable": "تعذّر فتح هذه الملفات. قد تكون غير مدعومة أو لم يعد الوصول إليها ممكنًا. حاول مشاركتها مرة أخرى.", + "invalid shared file": "ملف مشارَك غير صالح", "unable to open file": "عذراً، فشل فتح الملف", "unable to open folder": "عذراً، فشل فتح المجلد", "unable to save file": "عذراً، فشل حفظ الملف", diff --git a/src/lang/az-az.json b/src/lang/az-az.json index 743e28f05d..6285bb588a 100644 --- a/src/lang/az-az.json +++ b/src/lang/az-az.json @@ -101,6 +101,9 @@ "title-listfiles": "Faylları siyahıya al", "ui zoom": "İnterfeysin miqyası", "unable to delete file": "Faylı silmək mümkün olmadı", + "document plugin required": "Qoşmalar bölməsində Docs Workspace-i quraşdırın və ya aktivləşdirin, sonra sənədi yenidən açın.", + "shared files unavailable": "Bu faylları açmaq mümkün olmadı. Onlar dəstəklənməyə bilər və ya artıq əlçatan deyil. Onları yenidən paylaşmağa çalışın.", + "invalid shared file": "Paylaşılan fayl etibarsızdır", "unable to open file": "Təəssüf ki, faylı açmaq mümkün olmadı", "unable to open folder": "Təəssüf ki, qovluğu açmaq mümkün olmadı", "unable to save file": "Təəssüf ki, faylı yadda saxlamaq mümkün olmadı", diff --git a/src/lang/be-by.json b/src/lang/be-by.json index 9561a723fc..98601603c2 100644 --- a/src/lang/be-by.json +++ b/src/lang/be-by.json @@ -90,6 +90,9 @@ "theme": "Тэма", "title-listfiles": "Спіс файлаў", "unable to delete file": "немагчыма выдаліць файл", + "document plugin required": "Усталюйце або ўключыце Docs Workspace у раздзеле «Убудовы», затым адкрыйце дакумент зноў.", + "shared files unavailable": "Не ўдалося адкрыць гэтыя файлы. Магчыма, яны не падтрымліваюцца або больш недаступныя. Паспрабуйце падзяліцца імі яшчэ раз.", + "invalid shared file": "Няправільны абагулены файл", "unable to open file": "Выбачайце, файл немагчыма адкрыць", "unable to open folder": "Выбачайце, каталог немагчыма адкрыць", "unable to save file": "Выбачайце, файл немагчыма захаваць", diff --git a/src/lang/bn-bd.json b/src/lang/bn-bd.json index 23221edf83..c439ccecdc 100644 --- a/src/lang/bn-bd.json +++ b/src/lang/bn-bd.json @@ -90,6 +90,9 @@ "theme": "থীম", "title-listfiles": "ফাইল তালিকাভুক্ত করুন", "unable to delete file": "ডিলেট করতে অসমর্থ", + "document plugin required": "প্লাগইন বিভাগ থেকে Docs Workspace ইনস্টল বা সক্রিয় করুন, তারপর নথিটি আবার খুলুন।", + "shared files unavailable": "এই ফাইলগুলো খোলা যায়নি। এগুলো সমর্থিত নাও হতে পারে অথবা আর অ্যাক্সেসযোগ্য নেই। আবার শেয়ার করার চেষ্টা করুন।", + "invalid shared file": "শেয়ার করা ফাইলটি অবৈধ", "unable to open file": "দুঃখিত, ফাইলটি খুলতে ব্যার্থ", "unable to open folder": "দুঃখিত, ফোল্ডার খুলতে ব্যার্থ", "unable to save file": "দুঃখিত, ফাইলটি সংরক্ষণে ব্যার্থ", diff --git a/src/lang/cs-cz.json b/src/lang/cs-cz.json index 52596946d4..f33b46844d 100644 --- a/src/lang/cs-cz.json +++ b/src/lang/cs-cz.json @@ -90,6 +90,9 @@ "theme": "Motiv", "title-listfiles": "Seznam souborů", "unable to delete file": "nelze smazat soubor", + "document plugin required": "V sekci Pluginy nainstalujte nebo povolte Docs Workspace a poté dokument znovu otevřete.", + "shared files unavailable": "Tyto soubory se nepodařilo otevřít. Možná nejsou podporované nebo již nejsou přístupné. Zkuste je sdílet znovu.", + "invalid shared file": "Neplatný sdílený soubor", "unable to open file": "Omlouváme se, soubor se nepodařilo otevřít", "unable to open folder": "Omlouváme se, složku se nepodařilo otevřít", "unable to save file": "Omlouváme se, soubor se nepodařilo uložit", diff --git a/src/lang/de-de.json b/src/lang/de-de.json index 5ef81148c2..c19f4e6f56 100644 --- a/src/lang/de-de.json +++ b/src/lang/de-de.json @@ -90,6 +90,9 @@ "theme": "Design", "title-listfiles": "Dateienliste", "unable to delete file": "Löschen der Datei nicht möglich", + "document plugin required": "Installiere oder aktiviere Docs Workspace unter Plugins und öffne das Dokument anschließend erneut.", + "shared files unavailable": "Diese Dateien konnten nicht geöffnet werden. Sie werden möglicherweise nicht unterstützt oder sind nicht mehr zugänglich. Versuche, sie erneut zu teilen.", + "invalid shared file": "Ungültige geteilte Datei", "unable to open file": "Datei konnte nicht geöffnet werden", "unable to open folder": "Ordner konnte nicht geöffnet werden", "unable to save file": "Datei konnte nicht gespeichert werden", diff --git a/src/lang/en-us.json b/src/lang/en-us.json index b3d9985084..2869c6c2c2 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -101,6 +101,9 @@ "title-listfiles": "List files", "ui zoom": "UI zoom", "unable to delete file": "unable to delete file", + "document plugin required": "Install or enable Docs Workspace in Plugins, then reopen the document.", + "shared files unavailable": "These files could not be opened. They may be unsupported or no longer accessible. Try sharing them again.", + "invalid shared file": "Invalid shared file", "unable to open file": "Sorry, unable to open file", "unable to open folder": "Sorry, unable to open folder", "unable to save file": "Sorry, unable to save file", diff --git a/src/lang/es-sv.json b/src/lang/es-sv.json index 1942bb00a4..ad78d40c95 100644 --- a/src/lang/es-sv.json +++ b/src/lang/es-sv.json @@ -90,6 +90,9 @@ "theme": "Tema", "title-listfiles": "Listar archivos", "unable to delete file": "no se puede eliminar el archivo", + "document plugin required": "Instala o activa Docs Workspace en Extensiones y vuelve a abrir el documento.", + "shared files unavailable": "No se pudieron abrir estos archivos. Puede que no sean compatibles o que ya no estén disponibles. Intenta compartirlos de nuevo.", + "invalid shared file": "Archivo compartido no válido", "unable to open file": "Lo sentimos, no se puede abrir el archivo", "unable to open folder": "Lo sentimos, no se puede abrir la carpeta", "unable to save file": "Lo sentimos, no se puede guardar el archivo", diff --git a/src/lang/fr-fr.json b/src/lang/fr-fr.json index ec0b418df2..5fc53c6f1d 100644 --- a/src/lang/fr-fr.json +++ b/src/lang/fr-fr.json @@ -90,6 +90,9 @@ "theme": "Thème", "title-listfiles": "Lister les fichiers", "unable to delete file": "Impossible de supprimer le fichier", + "document plugin required": "Installez ou activez Docs Workspace dans Extensions, puis ouvrez à nouveau le document.", + "shared files unavailable": "Impossible d’ouvrir ces fichiers. Ils ne sont peut-être pas pris en charge ou ne sont plus accessibles. Essayez de les partager à nouveau.", + "invalid shared file": "Fichier partagé non valide", "unable to open file": "Désolé, impossible d'ouvrir le fichier", "unable to open folder": "Désolé, impossible d'ouvrir le dossier", "unable to save file": "Désolé, impossible d'enregistrer le fichier", diff --git a/src/lang/he-il.json b/src/lang/he-il.json index 35b7a716ce..358b04abc6 100644 --- a/src/lang/he-il.json +++ b/src/lang/he-il.json @@ -90,6 +90,9 @@ "theme": "עיצוב", "title-listfiles": "רשימת קבצים", "unable to delete file": "לא ניתן למחוק קובץ", + "document plugin required": "התקינו או הפעילו את Docs Workspace בתוספים, ולאחר מכן פתחו שוב את המסמך.", + "shared files unavailable": "לא ניתן לפתוח את הקבצים האלה. ייתכן שהם אינם נתמכים או שאינם נגישים עוד. נסו לשתף אותם שוב.", + "invalid shared file": "קובץ משותף לא תקין", "unable to open file": "מצטערים, לא הצלחנו לפתוח את הקובץ", "unable to open folder": "מצטערים, לא הצלחנו לפתוח את התיקיה", "unable to save file": "מצטערים, לא הצלחנו לשמור את הקובץ", diff --git a/src/lang/hi-in.json b/src/lang/hi-in.json index f16dae7b26..6aa97f71a1 100644 --- a/src/lang/hi-in.json +++ b/src/lang/hi-in.json @@ -88,6 +88,9 @@ "theme": "थीम", "title-listfiles": "फ़ाइलें सूचीबद्ध करें", "unable to delete file": "फाइल डिलीट नहीं हो पा रहा है", + "document plugin required": "प्लगिन्स में Docs Workspace इंस्टॉल या चालू करें, फिर दस्तावेज़ दोबारा खोलें।", + "shared files unavailable": "ये फ़ाइलें खोली नहीं जा सकीं। हो सकता है कि ये समर्थित न हों या अब उपलब्ध न हों। इन्हें दोबारा साझा करने का प्रयास करें।", + "invalid shared file": "साझा की गई फ़ाइल अमान्य है", "unable to open file": "क्षमा करें, फ़ाइल खोलने में असमर्थ", "unable to open folder": "क्षमा करें, फ़ोल्डर खोलने में असमर्थ", "unable to save file": "क्षमा करें, फ़ाइल सेव करने में असमर्थ", diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index 6db53dfca5..f2865688a2 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -90,6 +90,9 @@ "theme": "Téma", "title-listfiles": "Fájlok listázása", "unable to delete file": "Nem lehet törölni a fájlt", + "document plugin required": "Telepítse vagy engedélyezze a Docs Workspace bővítményt a Bővítmények között, majd nyissa meg újra a dokumentumot.", + "shared files unavailable": "Ezeket a fájlokat nem sikerült megnyitni. Lehet, hogy nem támogatottak, vagy már nem érhetők el. Próbálja meg újra megosztani őket.", + "invalid shared file": "Érvénytelen megosztott fájl", "unable to open file": "Nem lehet megnyitni a fájlt", "unable to open folder": "Nem lehet megnyitni a mappát", "unable to save file": "Nem lehet menteni a fájlt", diff --git a/src/lang/id-id.json b/src/lang/id-id.json index f7dceb77f1..e21a315901 100644 --- a/src/lang/id-id.json +++ b/src/lang/id-id.json @@ -90,6 +90,9 @@ "theme": "Tema", "title-listfiles": "Daftar berkas", "unable to delete file": "Tidak dapat menghapus berkas", + "document plugin required": "Pasang atau aktifkan Docs Workspace di Plugin, lalu buka kembali dokumen.", + "shared files unavailable": "Berkas-berkas ini tidak dapat dibuka. Formatnya mungkin tidak didukung atau berkas sudah tidak dapat diakses. Coba bagikan kembali.", + "invalid shared file": "Berkas yang dibagikan tidak valid", "unable to open file": "Maaf, tidak dapat membuka berkas", "unable to open folder": "Maaf, tidak dapat membuka folder", "unable to save file": "Maaf, tidak dapat menyimpan berkas", diff --git a/src/lang/index.d.ts b/src/lang/index.d.ts index 7873fb8b6a..59076bc1b8 100644 --- a/src/lang/index.d.ts +++ b/src/lang/index.d.ts @@ -104,6 +104,9 @@ declare type LangStrings = { "title-listfiles": string; "ui zoom": string; "unable to delete file": string; + "document plugin required": string; + "shared files unavailable": string; + "invalid shared file": string; "unable to open file": string; "unable to open folder": string; "unable to save file": string; diff --git a/src/lang/ir-fa.json b/src/lang/ir-fa.json index 8a1db6e17f..07f6c056bc 100644 --- a/src/lang/ir-fa.json +++ b/src/lang/ir-fa.json @@ -90,6 +90,9 @@ "theme": "تم", "title-listfiles": "List files", "unable to delete file": "نمیتوانم فایل را حذف کنم", + "document plugin required": "Docs Workspace را در بخش Plugins نصب یا فعال کنید، سپس سند را دوباره باز کنید.", + "shared files unavailable": "این فایل‌ها باز نشدند. ممکن است پشتیبانی نشوند یا دیگر در دسترس نباشند. دوباره آن‌ها را به اشتراک بگذارید.", + "invalid shared file": "فایل اشتراک‌گذاری‌شده نامعتبر است", "unable to open file": "متأسفم ، نمیتوانم فایل را باز کنم", "unable to open folder": "متأسفم ، نمیتوانم پوشه را باز کنم", "unable to save file": "متأسفم ، نمیتوانم فایل را ذخیره کنم", diff --git a/src/lang/it-it.json b/src/lang/it-it.json index 19ddbba944..efe7c90e32 100644 --- a/src/lang/it-it.json +++ b/src/lang/it-it.json @@ -90,6 +90,9 @@ "theme": "tema", "title-listfiles": "List files", "unable to delete file": "non è stato possibile eliminare il file", + "document plugin required": "Installa o abilita Docs Workspace in Plugins, quindi riapri il documento.", + "shared files unavailable": "Impossibile aprire questi file. Potrebbero non essere supportati o non essere più accessibili. Prova a condividerli di nuovo.", + "invalid shared file": "File condiviso non valido", "unable to open file": "Ci spiace. non è stato possibile aprire il file", "unable to open folder": "Ci spiace. non è stato possibile aprire la cartella", "unable to save file": "Ci spiace. non è stato possibile salvare il file", diff --git a/src/lang/ja-jp.json b/src/lang/ja-jp.json index 03ec6d4954..27fd7b6033 100644 --- a/src/lang/ja-jp.json +++ b/src/lang/ja-jp.json @@ -90,6 +90,9 @@ "theme": "テーマ", "title-listfiles": "ファイル一覧", "unable to delete file": "ファイルを削除できません", + "document plugin required": "「プラグイン」で Docs Workspace をインストールまたは有効にしてから、ドキュメントを開き直してください。", + "shared files unavailable": "これらのファイルを開けませんでした。対応していない形式か、アクセスできなくなっている可能性があります。もう一度共有してみてください。", + "invalid shared file": "共有されたファイルが無効です", "unable to open file": "ファイルを開けません", "unable to open folder": "フォルダを開けません", "unable to save file": "ファイルを保存できません", diff --git a/src/lang/ko-kr.json b/src/lang/ko-kr.json index fd76716b43..74156bbda0 100644 --- a/src/lang/ko-kr.json +++ b/src/lang/ko-kr.json @@ -90,6 +90,9 @@ "theme": "배경", "title-listfiles": "List files", "unable to delete file": "파일을 삭제할 수 없습니다", + "document plugin required": "Plugins에서 Docs Workspace를 설치하거나 활성화한 다음 문서를 다시 여세요.", + "shared files unavailable": "이 파일들을 열 수 없습니다. 지원되지 않는 형식이거나 더 이상 접근할 수 없는 파일일 수 있습니다. 다시 공유해 보세요.", + "invalid shared file": "공유된 파일이 올바르지 않습니다", "unable to open file": "파일을 열수가 없습니다", "unable to open folder": "폴더를 열수가 없습니다", "unable to save file": "파일을 저장할 수 없습니다.", diff --git a/src/lang/ln-ln.json b/src/lang/ln-ln.json index a0de1f1e17..63d4e9ce7e 100644 --- a/src/lang/ln-ln.json +++ b/src/lang/ln-ln.json @@ -88,6 +88,9 @@ "text wrap": "Kokanga milongo ya makomi", "theme": "Motema ya app", "title-listfiles": "Tanga ba fichiers", + "document plugin required": "Tyá to fungolá Docs Workspace na Ba plugins, mpe fungolá lisusu mokanda.", + "shared files unavailable": "Ba fichiers oyo ekoki kofungwama te. Mbala mosusu lolenge na yango esungami te to ekoki lisusu kozwama te. Meká kokabola yango lisusu.", + "invalid shared file": "Fichier oyo ekabolami ezali malamu te", "unable to open file": "Limbisa, ekoki te kofungola fichier", "unable to open folder": "Limbisa, ekoki te kofungola dossier", "unable to save file": "Limbisa, ekoki te kobomba fichier", diff --git a/src/lang/ml-in.json b/src/lang/ml-in.json index 4b1af01ee2..04db791635 100644 --- a/src/lang/ml-in.json +++ b/src/lang/ml-in.json @@ -90,6 +90,9 @@ "theme": "പതിപാദം", "title-listfiles": "ഫയലുകൾ ലിസ്റ്റ് ചെയ്യുക", "unable to delete file": "ഫയൽ ഇല്ലാതാക്കാൻ കഴിയില്ല", + "document plugin required": "പ്ലഗിൻസ് വിഭാഗത്തിൽ Docs Workspace ഇൻസ്റ്റാൾ ചെയ്യുകയോ പ്രവർത്തനക്ഷമമാക്കുകയോ ചെയ്ത ശേഷം പ്രമാണം വീണ്ടും തുറക്കുക.", + "shared files unavailable": "ഈ ഫയലുകൾ തുറക്കാൻ കഴിഞ്ഞില്ല. ഇവ പിന്തുണയ്ക്കാത്തവയോ ഇനി ആക്‌സസ് ചെയ്യാൻ കഴിയാത്തവയോ ആയിരിക്കാം. വീണ്ടും പങ്കിടാൻ ശ്രമിക്കുക.", + "invalid shared file": "പങ്കിട്ട ഫയൽ അസാധുവാണ്", "unable to open file": "ക്ഷമിക്കണം, ഫയൽ തുറക്കാൻ കഴിഞ്ഞില്ല", "unable to open folder": "ക്ഷമിക്കണം, ഫോൾഡർ തുറക്കാൻ കഴിഞ്ഞില്ല", "unable to save file": "ക്ഷമിക്കണം, ഫയൽ സംരക്ഷിക്കാൻ കഴിഞ്ഞില്ല", diff --git a/src/lang/mm-unicode.json b/src/lang/mm-unicode.json index 74364aff07..6411d5b9b1 100644 --- a/src/lang/mm-unicode.json +++ b/src/lang/mm-unicode.json @@ -90,6 +90,9 @@ "theme": "theme", "title-listfiles": "List files", "unable to delete file": "ဖိုင်ဖျက်လို့မရပါ", + "document plugin required": "Plugins တွင် Docs Workspace ကို ထည့်သွင်းပါ သို့မဟုတ် ဖွင့်ထားပါ။ ထို့နောက် စာရွက်စာတမ်းကို ပြန်ဖွင့်ပါ။", + "shared files unavailable": "ဤဖိုင်များကို ဖွင့်၍မရပါ။ ပံ့ပိုးမထားသော ဖိုင်အမျိုးအစားများ ဖြစ်နိုင်သည် သို့မဟုတ် ဝင်ရောက်အသုံးပြု၍ မရတော့ခြင်း ဖြစ်နိုင်သည်။ ထပ်မံမျှဝေကြည့်ပါ။", + "invalid shared file": "မျှဝေထားသော ဖိုင် မမှန်ကန်ပါ", "unable to open file": "ဝမ်းနည်းပါတယ်။ဖိုင်ဖွင့်မရပါ။", "unable to open folder": "ဝမ်းနည်းပါတယ်။Folderဖွင့်မရပါ။", "unable to save file": "ဝမ်းနည်းပါတယ်။ဖိုင်သိမ်းမရပါ။", diff --git a/src/lang/mm-zawgyi.json b/src/lang/mm-zawgyi.json index d1f72c1e89..dd8f456bf2 100644 --- a/src/lang/mm-zawgyi.json +++ b/src/lang/mm-zawgyi.json @@ -90,6 +90,9 @@ "theme": "theme", "title-listfiles": "List files", "unable to delete file": "ဖိုင္ဖ်က္လို႔မရပါ", + "document plugin required": "Plugins တြင္ Docs Workspace ကို ထည့္သြင္းပါ သို႔မဟုတ္ ဖြင့္ထားပါ။ ထို႔ေနာက္ စာ႐ြက္စာတမ္းကို ျပန္ဖြင့္ပါ။", + "shared files unavailable": "ဤဖိုင္မ်ားကို ဖြင့္၍မရပါ။ ပံ့ပိုးမထားေသာ ဖိုင္အမ်ိဳးအစားမ်ား ျဖစ္ႏိုင္သည္ သို႔မဟုတ္ ဝင္ေရာက္အသုံးျပဳ၍ မရေတာ့ျခင္း ျဖစ္ႏိုင္သည္။ ထပ္မံမွ်ေဝၾကည့္ပါ။", + "invalid shared file": "မွ်ေဝထားေသာ ဖိုင္ မမွန္ကန္ပါ", "unable to open file": "ဝမ္းနည္းပါတယ္။ဖိုင္ဖြင့္မရပါ။", "unable to open folder": "ဝမ္းနည္းပါတယ္။Folderဖြင့္မရပါ။", "unable to save file": "ဝမ္းနည္းပါတယ္။ဖိုင္သိမ္းမရပါ။", diff --git a/src/lang/pl-pl.json b/src/lang/pl-pl.json index e1729da06e..d5b418a9e0 100644 --- a/src/lang/pl-pl.json +++ b/src/lang/pl-pl.json @@ -90,6 +90,9 @@ "theme": "Motyw", "title-listfiles": "Lista plików", "unable to delete file": "nie można usunąć pliku", + "document plugin required": "Zainstaluj lub włącz Docs Workspace w sekcji Wtyczki, a następnie ponownie otwórz dokument.", + "shared files unavailable": "Nie udało się otworzyć tych plików. Mogą być nieobsługiwane lub już niedostępne. Spróbuj udostępnić je ponownie.", + "invalid shared file": "Nieprawidłowy udostępniony plik", "unable to open file": "Nie udało się otworzyć pliku", "unable to open folder": "Nie udało się otworzyć folderu", "unable to save file": "Nie udało się zapisać pliku", diff --git a/src/lang/pt-br.json b/src/lang/pt-br.json index 6a7516d6cd..aa6de4b0e2 100644 --- a/src/lang/pt-br.json +++ b/src/lang/pt-br.json @@ -90,6 +90,9 @@ "theme": "Tema", "title-listfiles": "Listar arquivos", "unable to delete file": "não foi possível excluir o arquivo", + "document plugin required": "Instale ou ative o Docs Workspace em Plugins e abra o documento novamente.", + "shared files unavailable": "Não foi possível abrir estes arquivos. Eles podem não ser compatíveis ou não estar mais acessíveis. Tente compartilhá-los novamente.", + "invalid shared file": "Arquivo compartilhado inválido", "unable to open file": "Desculpe, não foi possível abrir o arquivo", "unable to open folder": "Desculpe, não foi possível abrir a pasta", "unable to save file": "Desculpe, não foi possível salvar o arquivo", diff --git a/src/lang/pu-in.json b/src/lang/pu-in.json index 70ac968a62..05b389b8c7 100644 --- a/src/lang/pu-in.json +++ b/src/lang/pu-in.json @@ -90,6 +90,9 @@ "theme": "ਥੀਮ", "title-listfiles": "List files", "unable to delete file": "ਫਾਈਲ ਨੂੰ ਮਿਟਾਉਣ ਵਿੱਚ ਅਸਮਰੱਥ", + "document plugin required": "ਪਲੱਗਇਨ ਵਿੱਚ Docs Workspace ਇੰਸਟਾਲ ਜਾਂ ਚਾਲੂ ਕਰੋ, ਫਿਰ ਦਸਤਾਵੇਜ਼ ਮੁੜ ਖੋਲ੍ਹੋ।", + "shared files unavailable": "ਇਹ ਫ਼ਾਈਲਾਂ ਖੋਲ੍ਹੀਆਂ ਨਹੀਂ ਜਾ ਸਕੀਆਂ। ਹੋ ਸਕਦਾ ਹੈ ਇਹ ਸਮਰਥਿਤ ਨਾ ਹੋਣ ਜਾਂ ਹੁਣ ਪਹੁੰਚਯੋਗ ਨਾ ਹੋਣ। ਇਨ੍ਹਾਂ ਨੂੰ ਮੁੜ ਸਾਂਝਾ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ।", + "invalid shared file": "ਸਾਂਝੀ ਕੀਤੀ ਫ਼ਾਈਲ ਅਵੈਧ ਹੈ", "unable to open file": "ਮਾਫ਼ ਕਰਨਾ, ਫ਼ਾਈਲ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਮਰੱਥ", "unable to open folder": "ਮਾਫ਼ ਕਰਨਾ, ਫੋਲਡਰ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਮਰੱਥ", "unable to save file": "ਮਾਫ਼ ਕਰਨਾ, ਫ਼ਾਈਲ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ", diff --git a/src/lang/ru-ru.json b/src/lang/ru-ru.json index 0d61d611bf..79e83dddba 100644 --- a/src/lang/ru-ru.json +++ b/src/lang/ru-ru.json @@ -90,6 +90,9 @@ "theme": "Тема", "title-listfiles": "Список файлов", "unable to delete file": "Невозможно удалить файл", + "document plugin required": "Установите или включите Docs Workspace в разделе «Плагины», затем откройте документ снова.", + "shared files unavailable": "Не удалось открыть эти файлы. Возможно, они не поддерживаются или больше недоступны. Попробуйте поделиться ими ещё раз.", + "invalid shared file": "Недопустимый переданный файл", "unable to open file": "Невозможно открыть файл", "unable to open folder": "Невозможно открыть папку", "unable to save file": "Невозможно сохранить файл", diff --git a/src/lang/tl-ph.json b/src/lang/tl-ph.json index bb7b2ac749..b5a5424fca 100644 --- a/src/lang/tl-ph.json +++ b/src/lang/tl-ph.json @@ -90,6 +90,9 @@ "theme": "Tema", "title-listfiles": "Ilista ang mga file", "unable to delete file": "hindi ma-delete ang file", + "document plugin required": "I-install o i-enable ang Docs Workspace sa Plugins, pagkatapos ay buksan muli ang dokumento.", + "shared files unavailable": "Hindi mabuksan ang mga file na ito. Maaaring hindi suportado ang mga ito o hindi na ma-access. Subukang ibahagi muli ang mga ito.", + "invalid shared file": "Hindi valid ang ibinahaging file", "unable to open file": "Paumanhin, hindi ma-open ang file", "unable to open folder": "Paumanhin, hindi ma-open ang folder", "unable to save file": "Paumanhin, hindi ma-save ang file", diff --git a/src/lang/tr-tr.json b/src/lang/tr-tr.json index de2f19aaed..0d723b7ffd 100644 --- a/src/lang/tr-tr.json +++ b/src/lang/tr-tr.json @@ -90,6 +90,9 @@ "theme": "Tema", "title-listfiles": "List files", "unable to delete file": "Dosya silinemedi", + "document plugin required": "Plugins bölümünden Docs Workspace'i yükleyin veya etkinleştirin, ardından belgeyi yeniden açın.", + "shared files unavailable": "Bu dosyalar açılamadı. Desteklenmiyor veya artık erişilemiyor olabilirler. Yeniden paylaşmayı deneyin.", + "invalid shared file": "Paylaşılan dosya geçersiz", "unable to open file": "Dosya açılamadı", "unable to open folder": "Klasör açılamadı", "unable to save file": "Dosya kaydedilemedi", diff --git a/src/lang/uk-ua.json b/src/lang/uk-ua.json index 43f8a786ab..ab5da72106 100644 --- a/src/lang/uk-ua.json +++ b/src/lang/uk-ua.json @@ -90,6 +90,9 @@ "theme": "Тема", "title-listfiles": "List files", "unable to delete file": "не можливо видалити файл", + "document plugin required": "Установіть або ввімкніть Docs Workspace у розділі «Плагіни», а потім знову відкрийте документ.", + "shared files unavailable": "Не вдалося відкрити ці файли. Можливо, вони не підтримуються або більше недоступні. Спробуйте поділитися ними ще раз.", + "invalid shared file": "Недійсний надісланий файл", "unable to open file": "Вибачте, не можливо відкрити файл", "unable to open folder": "Вибачте, не можливо відкрити теку", "unable to save file": "Вибачте, не можливо зберегти файл", diff --git a/src/lang/uz-uz.json b/src/lang/uz-uz.json index 8ecb20a89b..986916b7e8 100644 --- a/src/lang/uz-uz.json +++ b/src/lang/uz-uz.json @@ -90,6 +90,9 @@ "theme": "Mavzu", "title-listfiles": "List files", "unable to delete file": "faylni o'chirib bo'lmadi", + "document plugin required": "Plugins bo‘limida Docs Workspace’ni o‘rnating yoki yoqing, so‘ng hujjatni qayta oching.", + "shared files unavailable": "Bu fayllarni ochib bo‘lmadi. Ular qo‘llab-quvvatlanmasligi yoki endi ulardan foydalanib bo‘lmasligi mumkin. Ularni qayta ulashishga urinib ko‘ring.", + "invalid shared file": "Ulashilgan fayl yaroqsiz", "unable to open file": "Kechirasiz,faylni ochib bo'lmadi", "unable to open folder": "Kechirasiz,papkani ochib bo'lmadi", "unable to save file": "Kechirasiz,faylni saqlab bo'lmadi", diff --git a/src/lang/vi-vn.json b/src/lang/vi-vn.json index ce61c46ac2..64441eb461 100644 --- a/src/lang/vi-vn.json +++ b/src/lang/vi-vn.json @@ -90,6 +90,9 @@ "theme": "Chủ đề", "title-listfiles": "Liệt kê tệp", "unable to delete file": "không thể xóa tệp", + "document plugin required": "Cài đặt hoặc bật Docs Workspace trong Plugins, rồi mở lại tài liệu.", + "shared files unavailable": "Không thể mở các tệp này. Chúng có thể không được hỗ trợ hoặc không còn truy cập được. Hãy thử chia sẻ lại.", + "invalid shared file": "Tệp được chia sẻ không hợp lệ", "unable to open file": "Xin lỗi, không thể mở tệp", "unable to open folder": "Xin lỗi, không thể mở thư mục", "unable to save file": "Xin lỗi, không thể lưu tệp", diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index d0b7a0604b..d6c1737b6d 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -90,6 +90,9 @@ "theme": "主题", "title-listfiles": "列出文件", "unable to delete file": "无法删除文件", + "document plugin required": "请在“插件”中安装或启用 Docs Workspace,然后重新打开文档。", + "shared files unavailable": "无法打开这些文件。它们可能不受支持或已无法访问。请尝试重新分享。", + "invalid shared file": "分享的文件无效", "unable to open file": "无法打开文件", "unable to open folder": "无法打开文件夹", "unable to save file": "无法保存文件", diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json index b8dc2ae7df..6ad71367e6 100644 --- a/src/lang/zh-hant.json +++ b/src/lang/zh-hant.json @@ -90,6 +90,9 @@ "theme": "主題", "title-listfiles": "列出文件", "unable to delete file": "無法刪除文件", + "document plugin required": "請在「插件」中安裝或啟用 Docs Workspace,然後重新開啟文件。", + "shared files unavailable": "無法開啟這些文件。它們可能不受支援或已無法存取。請嘗試重新分享。", + "invalid shared file": "分享的文件無效", "unable to open file": "無法打開文件", "unable to open folder": "無法打開文件夾", "unable to save file": "無法保存文件", diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index 679abc6d34..c814718a27 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -90,6 +90,9 @@ "theme": "主題", "title-listfiles": "列出檔案", "unable to delete file": "無法刪除檔案", + "document plugin required": "請在「外掛」中安裝或啟用 Docs Workspace,然後重新開啟文件。", + "shared files unavailable": "無法開啟這些檔案。它們可能不受支援或已無法存取。請嘗試重新分享。", + "invalid shared file": "分享的檔案無效", "unable to open file": "無法開啟檔案", "unable to open folder": "無法開啟資料夾", "unable to save file": "無法儲存檔案", diff --git a/src/lib/acode.js b/src/lib/acode.js index f36c7401ac..2870fc0a98 100644 --- a/src/lib/acode.js +++ b/src/lib/acode.js @@ -56,6 +56,7 @@ import fileIndex from "lib/fileIndex"; import files from "lib/fileList"; import fileTypeHandler from "lib/fileTypeHandler"; import fonts from "lib/fonts"; +import fullscreen from "lib/fullscreen"; import { BROKEN_PLUGINS, LOADED_PLUGINS, @@ -64,6 +65,7 @@ import { } from "lib/loadPlugins"; import notificationManager from "lib/notificationManager"; import openFolder, { addedFolder } from "lib/openFolder"; +import orientation from "lib/orientation"; import projects from "lib/projects"; import selectionMenu from "lib/selectionMenu"; import appSettings from "lib/settings"; @@ -436,6 +438,8 @@ class Acode { this.define("sidebarApps", sidebarAppsModule); this.define("terminal", terminalModule); this.define("webview", webview); + this.define("orientation", orientation); + this.define("fullscreen", fullscreen); this.define("codemirror", codemirrorModule); this.define("codeHighlight", codeHighlightModule); this.define("@codemirror/autocomplete", cmAutocomplete); diff --git a/src/lib/fullscreen.js b/src/lib/fullscreen.js new file mode 100644 index 0000000000..f2985c1ea9 --- /dev/null +++ b/src/lib/fullscreen.js @@ -0,0 +1,113 @@ +/** Opt-in Android Back delivery for the current browser fullscreen owner. */ +let owner = fullscreenElement(); +let generation = 0; +let registration = null; +let requested = false; +let queue = Promise.resolve(); + +function fullscreenElement() { + let element = document.fullscreenElement; + while (element?.shadowRoot?.fullscreenElement) { + element = element.shadowRoot.fullscreenElement; + } + return element; +} + +function enqueue(operation) { + const result = queue.then(operation); + queue = result.catch(() => {}); + return result; +} + +function setNativeHandler(enabled) { + return new Promise((resolve, reject) => { + cordova.exec( + resolve, + (message) => reject(new Error(message)), + "System", + "set-fullscreen-back-handler", + [enabled], + ); + }); +} + +function updateOwner() { + const next = fullscreenElement(); + if (next === owner) return; + owner = next; + generation++; + registration = null; + if (requested) { + requested = false; + // Finish any in-flight enable before releasing it. New registrations queue + // behind this release; an old acknowledgement cannot reinstall a callback. + enqueue(() => setNativeHandler(false)).catch(() => {}); + } +} + +document.addEventListener("fullscreenchange", updateOwner); +document.addEventListener("fullscreenbackbutton", () => { + updateOwner(); + const current = registration; + const currentOwner = owner; + const currentGeneration = generation; + const exit = () => { + updateOwner(); + if ( + currentOwner && + owner === currentOwner && + generation === currentGeneration && + registration === current + ) { + Promise.resolve(document.exitFullscreen()).catch(() => {}); + } + }; + if (!current) return exit(); + try { + Promise.resolve(current.callback()).catch(exit); + } catch { + exit(); + } +}); + +export default { + /** + * Claim Back while fullscreen, or release it with null. The callback must + * explicitly exit fullscreen when desired. Native acceptance is asynchronous. + * @param {(() => void | Promise) | null} callback + * @returns {Promise} + */ + async setBackHandler(callback) { + if (callback !== null && typeof callback !== "function") { + throw new TypeError("Back handler must be a function or null."); + } + updateOwner(); + if (callback && !owner) { + throw new Error("Back handler requires fullscreen."); + } + const requestGeneration = generation; + const next = callback ? { callback } : null; + requested = true; + await enqueue(async () => { + updateOwner(); + if (requestGeneration !== generation) { + if (callback) throw new Error("Fullscreen session changed."); + return; + } + const previous = registration; + // Back can arrive after native acceptance but before its acknowledgement. + registration = next; + try { + await setNativeHandler(!!callback); + } catch (error) { + updateOwner(); + if (requestGeneration === generation) registration = previous; + throw error; + } + updateOwner(); + if (callback && requestGeneration !== generation) { + throw new Error("Fullscreen session changed."); + } + }); + }, +}; diff --git a/src/lib/openFile.js b/src/lib/openFile.js index e4b6dee1e0..c84cee1fec 100644 --- a/src/lib/openFile.js +++ b/src/lib/openFile.js @@ -27,6 +27,7 @@ let loadingFileCount = 0; * @property {string} paneId * @property {boolean} persistInSession * @property {AbortSignal} signal Discard an obsolete open before activating its file. + * @property {boolean} external Receive an Android file intent; report failures to the batch and require document handlers. */ /** @@ -146,6 +147,15 @@ export default async function openFile(file, options = {}) { // Check for registered file handlers const customHandler = fileTypeHandler.getFileHandler(name); + const needsDocumentHandler = + options.external && + /\.(pdf|docx|dotx|xlsx|xls|ods|pptx|ppsx|potx)$/i.test(name); + if (needsDocumentHandler && !customHandler) { + throw Object.assign(new Error("Document handler unavailable"), { + code: "DOCUMENT_HANDLER_UNAVAILABLE", + filename: name, + }); + } if (customHandler) { try { await customHandler.handleFile({ @@ -167,6 +177,14 @@ export default async function openFile(file, options = {}) { } catch (error) { if (signal?.aborted) return; console.error(`File handler '${customHandler.id}' failed:`, error); + if (options.external) { + throw Object.assign( + new Error("Document handler failed", { cause: error }), + { + filename: name, + }, + ); + } // Continue with default handling if custom handler fails } } @@ -436,6 +454,8 @@ export default async function openFile(file, options = {}) { // Else open a new file // Checks for valid file if (fileInfo.length * 0.000001 > settings.maxFileSize) { + if (options.external) + throw Object.assign(new Error("File too large"), { filename: name }); return alert( strings.error.toUpperCase(), strings["file too large"].replace( @@ -445,6 +465,13 @@ export default async function openFile(file, options = {}) { ); } + if ( + options.external && + (helpers.isBinary(name) || + helpers.isBinary({ name, mime: fileInfo.mime || fileInfo.type })) + ) { + throw Object.assign(new Error("Unsupported file"), { filename: name }); + } if (helpers.isBinary(uri)) { const confirmation = await confirm(strings.info, strings["binary file"]); if (!confirmation || signal?.aborted) return; @@ -479,6 +506,7 @@ export default async function openFile(file, options = {}) { if (mode !== "single") recents.addFile(uri); return; } catch (error) { + if (options.external && !signal?.aborted) throw error; if (!signal?.aborted) console.error(error); } finally { releaseTitleLoader?.(); diff --git a/src/lib/orientation.js b/src/lib/orientation.js new file mode 100644 index 0000000000..a83336ed56 --- /dev/null +++ b/src/lib/orientation.js @@ -0,0 +1,30 @@ +/** Temporary orientation requests for the main WebView's fullscreen session. */ +export default { + /** + * @param {"landscape" | "portrait"} mode + * @returns {Promise} Resolves when the native request is accepted. + */ + async lock(mode) { + if (mode !== "landscape" && mode !== "portrait") { + throw new TypeError("Orientation must be landscape or portrait."); + } + await setOrientation(mode); + }, + + /** @returns {Promise} Restores the previous policy, if overridden. */ + async unlock() { + await setOrientation(null); + }, +}; + +function setOrientation(mode) { + return new Promise((resolve, reject) => { + cordova.exec( + resolve, + (message) => reject(new Error(message)), + "System", + "set-fullscreen-orientation", + [mode], + ); + }); +} diff --git a/src/main.js b/src/main.js index aef107b04a..cf91423da2 100644 --- a/src/main.js +++ b/src/main.js @@ -386,6 +386,8 @@ async function onDeviceReady() { window.log("error", "Failed to load plugins!"); window.log("error", error); toast("Failed to load plugins!"); + } finally { + void processPendingIntents().catch(intentHandler.onError); } applySettings.afterRender(); diff --git a/src/plugins/system/android/com/foxdebug/system/System.java b/src/plugins/system/android/com/foxdebug/system/System.java index 8011ce98b5..58e9f53335 100644 --- a/src/plugins/system/android/com/foxdebug/system/System.java +++ b/src/plugins/system/android/com/foxdebug/system/System.java @@ -66,6 +66,7 @@ import org.apache.cordova.CordovaInterface; import org.apache.cordova.CordovaPlugin; import org.apache.cordova.CordovaWebView; +import org.apache.cordova.CordovaWebViewImpl; import org.apache.cordova.PluginResult; import org.json.JSONArray; import org.json.JSONException; @@ -180,6 +181,28 @@ public boolean execute( case "get-configuration": getConfiguration(callbackContext); return true; + case "set-fullscreen-back-handler": + final boolean fullscreenBackHandler = args.getBoolean(0); + activity.runOnUiThread(() -> { + try { + ((CordovaWebViewImpl) webView).setFullscreenBackHandler(fullscreenBackHandler); + callbackContext.success(); + } catch (RuntimeException error) { + callbackContext.error(error.getMessage()); + } + }); + return true; + case "set-fullscreen-orientation": + final String orientation = args.isNull(0) ? null : args.getString(0); + activity.runOnUiThread(() -> { + try { + ((CordovaWebViewImpl) webView).setFullscreenOrientation(orientation); + callbackContext.success(); + } catch (RuntimeException error) { + callbackContext.error(error.getMessage()); + } + }); + return true; case "http-stream-start": httpStreamStart(args, callbackContext); return true; @@ -2015,13 +2038,57 @@ private JSONObject getIntentJson(Intent intent) { json.put("data", intent.getDataString()); json.put("type", intent.getType()); json.put("package", intent.getPackage()); + json.put("uris", getIntentUris(intent)); json.put("extras", getExtrasJson(intent.getExtras())); - } catch (JSONException e) { + } catch (JSONException | RuntimeException e) { e.printStackTrace(); } return json; } + private JSONArray getIntentUris(Intent intent) { + Set uris = new LinkedHashSet<>(); + String action = intent.getAction(); + if (Intent.ACTION_VIEW.equals(action) || Intent.ACTION_EDIT.equals(action)) { + if (intent.getData() != null) uris.add(intent.getData()); + } else if (!Intent.ACTION_SEND.equals(action) && !Intent.ACTION_SEND_MULTIPLE.equals(action)) { + return new JSONArray(); + } + try { + Object stream = intent.getExtras() == null ? null : intent.getExtras().get(Intent.EXTRA_STREAM); + if (stream instanceof Uri) uris.add((Uri) stream); + else if (stream instanceof ArrayList) { + for (Object item : (ArrayList) stream) { + if (item instanceof Uri) uris.add((Uri) item); + } + } + } catch (RuntimeException error) { + Log.w(TAG, "Unable to read shared streams", error); + } + ClipData clip = intent.getClipData(); + if (clip != null) { + for (int i = 0; i < clip.getItemCount(); i++) { + Uri uri = clip.getItemAt(i).getUri(); + if (uri != null) uris.add(uri); + } + } + JSONArray result = new JSONArray(); + for (Uri uri : uris) { + if (!"content".equals(uri.getScheme()) && !"file".equals(uri.getScheme())) continue; + result.put(uri.toString()); + int grants = intent.getFlags() & (Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); + if ("content".equals(uri.getScheme()) && grants != 0 && + (intent.getFlags() & Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION) != 0) { + try { + context.getContentResolver().takePersistableUriPermission(uri, grants); + } catch (SecurityException | IllegalArgumentException ignored) { + // Temporary access remains valid when a provider cannot persist the grant. + } + } + } + return result; + } + private JSONObject getExtrasJson(Bundle extras) { JSONObject json = new JSONObject(); if (extras != null) { @@ -2042,7 +2109,7 @@ private JSONObject getExtrasJson(Bundle extras) { json.put(key, (Boolean) value); } else if (value instanceof Bundle) { json.put(key, getExtrasJson((Bundle) value)); - } else { + } else if (value != null) { json.put(key, value.toString()); } } catch (JSONException e) { diff --git a/src/plugins/system/system.d.ts b/src/plugins/system/system.d.ts index 8100a2b99f..ed15e281e1 100644 --- a/src/plugins/system/system.d.ts +++ b/src/plugins/system/system.d.ts @@ -28,6 +28,7 @@ interface FileShortcut { } interface Intent { + uris?: string[]; action: string; data: string; type: string; diff --git a/src/utils/binaryExtensions.js b/src/utils/binaryExtensions.js index a255ed6dbb..2a3e69c222 100644 --- a/src/utils/binaryExtensions.js +++ b/src/utils/binaryExtensions.js @@ -243,6 +243,7 @@ const textExtensionSet = new Set([ "toml", "ts", "tsx", + "tsv", "txt", "vue", "xml", @@ -294,8 +295,11 @@ const binaryMimeTypes = new Set([ "application/vnd.oasis.opendocument.spreadsheet", "application/vnd.oasis.opendocument.text", "application/vnd.openxmlformats-officedocument.presentationml.presentation", + "application/vnd.openxmlformats-officedocument.presentationml.slideshow", + "application/vnd.openxmlformats-officedocument.presentationml.template", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", + "application/vnd.openxmlformats-officedocument.wordprocessingml.template", "application/wasm", "application/x-7z-compressed", "application/x-ace-compressed", diff --git a/tests/unit/fileIntents.test.js b/tests/unit/fileIntents.test.js new file mode 100644 index 0000000000..1e156f290f --- /dev/null +++ b/tests/unit/fileIntents.test.js @@ -0,0 +1,179 @@ +// @vitest-environment happy-dom +import { afterEach, expect, it, vi } from "vitest"; +import strings from "../../src/lang/en-us.json"; +import { loadSourceModule } from "../helpers/loadSourceModule"; + +afterEach(() => vi.restoreAllMocks()); + +function setup() { + let restored = false, + pluginsReady = false; + const open = vi.fn(async () => {}); + const select = vi.fn(async () => "close"); + const exec = vi.fn(); + const reportError = vi.fn(); + const handler = loadSourceModule( + "src/handlers/intent.js", + { + fileSystem: {}, + "lib/auth": {}, + "lib/config": {}, + "lib/startAd": {}, + "lib/openFile": open, + "lib/loadPlugins": { isInitialPluginLoadComplete: () => pluginsReady }, + "dialogs/select": select, + "utils/helpers": { error: reportError }, + }, + { + document, + strings, + acode: { exec }, + sessionStorage: { getItem: () => String(restored) }, + }, + ); + return { + ...handler, + open, + select, + exec, + reportError, + ready(files = true, plugins = true) { + restored = files; + pluginsReady = plugins; + }, + send(uris, action = "SEND_MULTIPLE") { + return handler.default({ + action: `android.intent.action.${action}`, + uris, + }); + }, + }; +} + +it("queues cold-start and in-startup batches until both files and plugins are ready", async () => { + const f = setup(); + await f.send(["content://docs/1"]); + f.ready(true, false); + await f.send(["content://docs/2"]); + await f.processPendingIntents(); + expect(f.open).not.toHaveBeenCalled(); + f.ready(false, true); + await f.processPendingIntents(); + expect(f.open).not.toHaveBeenCalled(); + f.ready(); + await f.processPendingIntents(); + expect(f.open.mock.calls.map(([uri]) => uri)).toEqual(["content://docs/1", "content://docs/2"]); + expect(f.open).toHaveBeenLastCalledWith("content://docs/2", { + mode: "single", + render: true, + persistInSession: false, + external: true, + }); +}); + +it("serializes warm batches and deduplicates stream/ClipData URIs without losing order", async () => { + const f = setup(); + f.ready(); + let finish; + f.open.mockImplementationOnce( + () => + new Promise((resolve) => { + finish = resolve; + }), + ); + const first = f.send(["content://docs/1", "content://docs/1", "file:///second.pdf"]); + const second = f.send(["content://docs/3"], "SEND"); + expect(f.open).toHaveBeenCalledTimes(1); + finish(); + await Promise.all([first, second]); + expect(f.open.mock.calls.map(([uri]) => uri)).toEqual([ + "content://docs/1", + "file:///second.pdf", + "content://docs/3", + ]); +}); + +it("accepts legacy single streams and VIEW/EDIT data and leaves deep links on their existing route", async () => { + const f = setup(); + f.ready(); + await f.default({ + action: "android.intent.action.SEND", + extras: { "android.intent.extra.STREAM": "content://docs/one" }, + }); + for (const action of ["VIEW", "EDIT"]) + await f.default({ + action: `android.intent.action.${action}`, + data: "content://docs/opaque", + }); + const link = vi.fn((event) => event.preventDefault()); + f.addIntentHandler(link); + await f.default({ + action: "android.intent.action.VIEW", + data: "acode://sample/open/id", + }); + expect(link).toHaveBeenCalledWith( + expect.objectContaining({ module: "sample", action: "open", value: "id" }), + ); + f.removeIntentHandler(link); + await f.default({ + action: "android.intent.action.VIEW", + data: "acode://auth/callback", + }); + await f.default({ action: "android.intent.action.MAIN" }); + expect(f.open).toHaveBeenCalledTimes(3); + expect(f.select).not.toHaveBeenCalled(); +}); + +it("continues after failures and offers Plugins once per batch, escaping provider names", async () => { + const f = setup(); + f.ready(); + vi.spyOn(console, "error").mockImplementation(() => {}); + f.open.mockRejectedValueOnce({ + code: "DOCUMENT_HANDLER_UNAVAILABLE", + filename: ".pdf", + }); + f.open.mockRejectedValueOnce(new Error("Provider denied access")); + f.select.mockResolvedValueOnce("plugins"); + await f.send([ + "content://docs/1", + "content://docs/2", + "content://docs/3", + null, + 5, + "https://not-a-file.test", + ]); + expect(f.open).toHaveBeenCalledTimes(3); + expect(f.select).toHaveBeenCalledOnce(); + const items = f.select.mock.calls[0][1]; + expect(items[0].text).toContain("<img src=x>.pdf"); + expect(items[0].text).toContain("content://docs/2"); + expect(items.map((item) => item.value)).toEqual([undefined, "plugins", "close"]); + expect(f.exec).toHaveBeenCalledWith("open", "plugins"); +}); + +it.each(["cancel", "reject"])( + "continues queued and later intents when the error dialog ends with %s", + async (outcome) => { + const f = setup(); + f.ready(); + vi.spyOn(console, "error").mockImplementation(() => {}); + f.open.mockRejectedValueOnce({ + code: "DOCUMENT_HANDLER_UNAVAILABLE", + filename: "missing.docx", + }); + f.select.mockImplementationOnce((_title, _items, options) => { + if (outcome === "reject") return Promise.reject(Error("Dialog failed")); + options.onCancel(); + return new Promise(() => {}); + }); + await Promise.all([f.send(["content://docs/missing"]), f.send(["content://docs/queued"])]); + await f.send(["content://docs/next"]); + expect(f.open.mock.calls.map(([uri]) => uri)).toEqual([ + "content://docs/missing", + "content://docs/queued", + "content://docs/next", + ]); + expect(f.reportError).toHaveBeenCalledTimes(outcome === "reject" ? 1 : 0); + expect(f.exec).not.toHaveBeenCalled(); + }, +); diff --git a/tests/unit/fullscreen.test.js b/tests/unit/fullscreen.test.js new file mode 100644 index 0000000000..c0f6ce6436 --- /dev/null +++ b/tests/unit/fullscreen.test.js @@ -0,0 +1,215 @@ +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import orientation from "../../src/lib/orientation"; + +let api, doc, exec; +const flush = async () => { + for (let i = 0; i < 12; i++) await Promise.resolve(); +}; +const change = (owner) => { + doc.fullscreenElement = owner; + doc.dispatchEvent(new Event("fullscreenchange")); +}; +const back = () => doc.dispatchEvent(new Event("fullscreenbackbutton")); + +beforeEach(async () => { + vi.resetModules(); + doc = new EventTarget(); + doc.fullscreenElement = null; + doc.exitFullscreen = vi.fn(async () => change(null)); + exec = vi.fn((resolve) => resolve()); + vi.stubGlobal("document", doc); + vi.stubGlobal("cordova", { exec }); + api = (await import("../../src/lib/fullscreen.js")).default; +}); +afterEach(() => vi.unstubAllGlobals()); + +it("validates orientation requests and waits for native lock/unlock acceptance", async () => { + await expect(orientation.lock("any")).rejects.toThrow(TypeError); + expect(exec).not.toHaveBeenCalled(); + exec.mockImplementation(() => {}); + for (const mode of ["landscape", "portrait", null]) { + const settled = vi.fn(); + const request = (mode ? orientation.lock(mode) : orientation.unlock()).then(settled); + const [success, , service, action, args] = exec.mock.lastCall; + expect([service, action, args]).toEqual(["System", "set-fullscreen-orientation", [mode]]); + await Promise.resolve(); + expect(settled).not.toHaveBeenCalled(); + success(); + await request; + } + exec.mockImplementation((_success, error) => error("Native failure")); + await expect(orientation.lock("landscape")).rejects.toThrow("Native failure"); + await expect(orientation.unlock()).rejects.toThrow("Native failure"); +}); + +describe("fullscreen Back ownership", () => { + it("rejects invalid callbacks and registration outside fullscreen without native changes", async () => { + for (const value of [undefined, false, "pause", {}]) { + await expect(api.setBackHandler(value)).rejects.toThrow(TypeError); + } + await expect(api.setBackHandler(() => {})).rejects.toThrow(/requires fullscreen/); + expect(exec).not.toHaveBeenCalled(); + await expect(api.setBackHandler(null)).resolves.toBeUndefined(); + await expect(api.setBackHandler(null)).resolves.toBeUndefined(); + expect(exec.mock.calls.map((call) => call.slice(2))).toEqual([ + ["System", "set-fullscreen-back-handler", [false]], + ["System", "set-fullscreen-back-handler", [false]], + ]); + }); + + it("delivers repeated Back until explicit release without changing browser fullscreen", async () => { + const owner = {}; + const callback = vi.fn(); + change(owner); + await api.setBackHandler(callback); + back(); + back(); + back(); + expect(callback).toHaveBeenCalledTimes(3); + expect(doc.fullscreenElement).toBe(owner); + expect(doc.exitFullscreen).not.toHaveBeenCalled(); + await api.setBackHandler(null); + back(); + expect(callback).toHaveBeenCalledTimes(3); + expect(doc.exitFullscreen).toHaveBeenCalledOnce(); + await flush(); + }); + + it("serializes replacement and release so late failure cannot clear a newer callback", async () => { + change({}); + const old = vi.fn(), + next = vi.fn(); + await api.setBackHandler(old); + let reject; + exec.mockImplementationOnce((_resolve, failure) => { + reject = failure; + }); + const failed = api.setBackHandler(() => {}); + const failure = expect(failed).rejects.toThrow("native failure"); + const replacement = api.setBackHandler(next); + await flush(); + expect(exec).toHaveBeenCalledTimes(2); + reject("native failure"); + await failure; + await replacement; + back(); + expect(next).toHaveBeenCalledOnce(); + expect(old).not.toHaveBeenCalled(); + await api.setBackHandler(null); + back(); + expect(next).toHaveBeenCalledOnce(); + await flush(); + }); + + it("restores the previous registration if a replacement is rejected by native", async () => { + change({}); + const old = vi.fn(); + await api.setBackHandler(old); + exec.mockImplementationOnce((_resolve, reject) => reject("backgrounded")); + await expect(api.setBackHandler(() => {})).rejects.toThrow("backgrounded"); + back(); + expect(old).toHaveBeenCalledOnce(); + }); + + it.each(["throw", "reject"])( + "exits the original session when a callback fails: %s", + async (kind) => { + change({}); + await api.setBackHandler(() => { + if (kind === "throw") throw new Error("pause failed"); + return Promise.reject(new Error("pause failed")); + }); + back(); + await flush(); + expect(doc.exitFullscreen).toHaveBeenCalledOnce(); + }, + ); + + it.each(["replace", "reenter"])("ignores an async callback failure after %s", async (kind) => { + const owner = {}; + change(owner); + let reject; + await api.setBackHandler( + () => + new Promise((_resolve, failure) => { + reject = failure; + }), + ); + back(); + if (kind === "reenter") { + change(null); + change(owner); + } + const next = vi.fn(); + await api.setBackHandler(next); + reject(new Error("obsolete callback")); + await flush(); + expect(doc.exitFullscreen).not.toHaveBeenCalled(); + back(); + expect(next).toHaveBeenCalledOnce(); + }); + + it("clears callbacks on owner changes including nested shadow fullscreen", async () => { + const child = {}; + const shadowRoot = { fullscreenElement: child }; + change({ shadowRoot }); + const callback = vi.fn(); + await api.setBackHandler(callback); + shadowRoot.fullscreenElement = {}; + doc.dispatchEvent(new Event("fullscreenchange")); + await flush(); + expect(exec.mock.calls.at(-1)[4]).toEqual([false]); + back(); + expect(callback).not.toHaveBeenCalled(); + expect(doc.exitFullscreen).toHaveBeenCalledOnce(); + }); + + it.each(["resolve", "reject"])( + "cleans up pending registration after exit and %s, before a new owner registers", + async (result) => { + change({}); + const old = vi.fn(), + queued = vi.fn(), + next = vi.fn(); + let complete; + exec.mockImplementationOnce((resolve, reject) => { + complete = result === "resolve" ? resolve : reject; + }); + const pending = api.setBackHandler(old); + const failure = expect(pending).rejects.toThrow(); + const obsolete = api.setBackHandler(queued); + const obsoleteFailure = expect(obsolete).rejects.toThrow(/session changed/); + await flush(); + change(null); + change({}); + const fresh = api.setBackHandler(next); + complete("old request"); + await failure; + await obsoleteFailure; + await fresh; + expect(exec.mock.calls.map((call) => call[4][0])).toEqual([true, false, true]); + back(); + expect(next).toHaveBeenCalledOnce(); + expect(old).not.toHaveBeenCalled(); + expect(queued).not.toHaveBeenCalled(); + }, + ); + + it("invalidates a queued release on exit so it cannot release the next session", async () => { + change({}); + let complete; + exec.mockImplementationOnce((resolve) => { + complete = resolve; + }); + const pending = api.setBackHandler(() => {}); + const failure = expect(pending).rejects.toThrow(/session changed/); + const release = api.setBackHandler(null); + await flush(); + change(null); + change({}); + const next = api.setBackHandler(() => {}); + complete(); + await Promise.all([failure, release, next]); + expect(exec.mock.calls.map((call) => call[4][0])).toEqual([true, false, true]); + }); +}); diff --git a/tests/unit/immersiveFullscreenPrepare.test.js b/tests/unit/immersiveFullscreenPrepare.test.js new file mode 100644 index 0000000000..66b790da57 --- /dev/null +++ b/tests/unit/immersiveFullscreenPrepare.test.js @@ -0,0 +1,131 @@ +import fs from "node:fs"; +import { createRequire } from "node:module"; +import os from "node:os"; +import path from "node:path"; +import { afterEach, describe, expect, it } from "vitest"; + +const require = createRequire(import.meta.url); +const prepare = require("../../hooks/immersive-fullscreen.js"); +const cordovaSource = fs.readFileSync( + new URL( + "../../node_modules/cordova-android/framework/src/org/apache/cordova/CordovaWebViewImpl.java", + import.meta.url, + ), + "utf8", +); +const controllerSource = fs.readFileSync( + new URL("../../hooks/android/ImmersiveFullscreen.java", import.meta.url), + "utf8", +); +const roots = []; + +afterEach(() => { + for (const root of roots.splice(0)) fs.rmSync(root, { recursive: true, force: true }); +}); + +function fixture(source = cordovaSource) { + const root = fs.mkdtempSync(path.join(os.tmpdir(), "acode-fullscreen-")); + roots.push(root); + const native = path.join(root, "platforms/android/CordovaLib/src/org/apache/cordova"); + const tracked = path.join(root, "hooks/android/ImmersiveFullscreen.java"); + const generated = path.join(native, "ImmersiveFullscreen.java"); + const webview = path.join(native, "CordovaWebViewImpl.java"); + fs.mkdirSync(native, { recursive: true }); + fs.mkdirSync(path.dirname(tracked), { recursive: true }); + fs.writeFileSync(tracked, controllerSource); + fs.writeFileSync(webview, source); + return { + tracked, + generated, + webview, + run: () => prepare({ opts: { projectRoot: root, platforms: ["android"] } }), + read: () => fs.readFileSync(webview, "utf8"), + }; +} + +describe("Android immersive fullscreen preparation", () => { + it("wires fullscreen and orientation into the Cordova lifecycle in order", () => { + const f = fixture(); + f.run(); + const patched = f.read(); + expect(fs.readFileSync(f.generated, "utf8")).toBe(controllerSource); + for (const [method, before, after] of [ + ["showCustomView", "parent.bringToFront()", "immersiveFullscreen.enter(wrapperView)"], + ["hideCustomView", "immersiveFullscreen.exit()", "mCustomViewCallback.onCustomViewHidden()"], + ["handlePause", "immersiveFullscreen.pause()", "pluginManager.onPause"], + ["handleResume", "immersiveFullscreen.resume()", "pluginManager.onResume"], + ["onPageStarted", "immersiveFullscreen.unlockOrientation()", "pluginManager.onReset"], + ["handleDestroy", "hideCustomView()", "engine.destroy()"], + ]) { + const start = patched.indexOf(`public void ${method}(`); + expect(start).toBeGreaterThan(-1); + const body = patched.slice(start).split("\n }", 1)[0]; + expect(body.indexOf(before)).toBeGreaterThan(-1); + expect(body.indexOf(after)).toBeGreaterThan(body.indexOf(before)); + } + const keyUp = patched.indexOf("event.getAction() == KeyEvent.ACTION_UP"); + const backEvent = patched.indexOf("fullscreenbackbutton"); + expect(backEvent).toBeGreaterThan(keyUp); + expect(backEvent).toBeLessThan(patched.indexOf("hideCustomView();", keyUp)); + }); + + it("is repeatable and refreshes the controller without altering upstream code", () => { + const f = fixture(); + f.run(); + const first = f.read(); + fs.appendFileSync(f.tracked, "\n// updated native controller\n"); + f.run(); + expect(f.read()).toBe(first); + expect(fs.readFileSync(f.generated, "utf8")).toBe(fs.readFileSync(f.tracked, "utf8")); + expect( + first.replace( + /^[ \t]*\/\/ ACODE_FULLSCREEN_BEGIN ([a-z]+)\n[\s\S]*?^[ \t]*\/\/ ACODE_FULLSCREEN_END \1\n/gm, + "", + ), + ).toBe(cordovaSource); + }); + + it("accepts the existing Java hook's formatting and retains CRLF", async () => { + const formatted = await require("prettier").format(cordovaSource, { + plugins: [require.resolve("prettier-plugin-java")], + parser: "java", + tabWidth: 2, + printWidth: Number.POSITIVE_INFINITY, + endOfLine: "crlf", + }); + const f = fixture(formatted); + f.run(); + const first = f.read(); + expect(first).toContain("\r\n"); + expect(first.replace(/\r\n/g, "")).not.toContain("\n"); + f.run(); + expect(f.read()).toBe(first); + }); + + it.each([ + ["missing", cordovaSource.replace("parent.bringToFront();", "")], + ["ambiguous", `${cordovaSource}\nparent.bringToFront();\n`], + ...[ + "if (isBackButton && mCustomView != null)", + "pluginManager.onPause(keepRunning);", + "this.pluginManager.onResume(keepRunning);", + "pluginManager.onReset();", + ].map((anchor) => [anchor, cordovaSource.replaceAll(anchor, "// changed upstream")]), + ])("rejects incompatible anchors before writing: %s", (_kind, source) => { + const f = fixture(source); + expect(f.run).toThrow(/Acode fullscreen: expected one Cordova/); + expect(f.read()).toBe(source); + expect(fs.existsSync(f.generated)).toBe(false); + }); + + it("rejects a damaged prior patch without overwriting either generated file", () => { + const f = fixture(); + f.run(); + const damaged = f.read().replace("// ACODE_FULLSCREEN_END enter", "// missing end marker"); + fs.writeFileSync(f.webview, damaged); + fs.writeFileSync(f.generated, "// existing controller"); + expect(f.run).toThrow(/incomplete generated patch/); + expect(f.read()).toBe(damaged); + expect(fs.readFileSync(f.generated, "utf8")).toBe("// existing controller"); + }); +}); diff --git a/tests/unit/openFileCancellation.test.js b/tests/unit/openFileCancellation.test.js index 4f8cd26a3b..231996249f 100644 --- a/tests/unit/openFileCancellation.test.js +++ b/tests/unit/openFileCancellation.test.js @@ -1,6 +1,7 @@ import fs from "node:fs"; import ts from "typescript"; import { beforeEach, describe, expect, it, vi } from "vitest"; +import { isBinaryFile } from "../../src/utils/binaryExtensions"; // openFile contains app-specific JSX. Compile the actual module for this // isolated test, supplying its Cordova/UI dependencies without booting the app. @@ -72,7 +73,7 @@ describe("openFile cancellation", () => { "palettes/changeEncoding": {}, "utils/encodings": { decode, detectEncoding }, "utils/helpers": { - default: { getStatMtime: () => 0, isBinary: () => false }, + default: { getStatMtime: () => 0, isBinary: isBinaryFile }, }, "./editorFile": { default: createEditor }, "./fileSessionPersistence": { promoteSessionPersistence: vi.fn() }, @@ -101,6 +102,142 @@ describe("openFile cancellation", () => { expect(recents.addFile).toHaveBeenCalledWith("target"); }); + it.each([ + "pdf", + "docx", + "dotx", + "xlsx", + "xls", + "ods", + "pptx", + "ppsx", + "potx", + ])( + "requires a handler for external %s documents using the provider filename", + async (extension) => { + stat.mockResolvedValue({ + name: `Document.${extension.toUpperCase()}`, + canWrite: false, + }); + await expect( + openFile("content://provider/42", { external: true }), + ).rejects.toMatchObject({ code: "DOCUMENT_HANDLER_UNAVAILABLE" }); + expect(readFile).not.toHaveBeenCalled(); + expect(createEditor).not.toHaveBeenCalled(); + expect(loaderVisible).toBe(false); + }, + ); + + it("routes granted read-only documents and propagates handler failures instead of decoding bytes", async () => { + const handleFile = vi.fn(async () => {}); + stat.mockResolvedValue({ name: "Shared.docx", canWrite: false }); + handler.getFileHandler.mockReturnValue({ id: "docs", handleFile }); + await openFile("content://provider/42", { external: true }); + expect(handleFile).toHaveBeenCalledWith( + expect.objectContaining({ name: "Shared.docx", readOnly: true }), + ); + handleFile.mockRejectedValueOnce(Error("Engine failed")); + vi.spyOn(console, "error").mockImplementation(() => {}); + await expect( + openFile("content://provider/42", { external: true }), + ).rejects.toMatchObject({ filename: "Shared.docx" }); + expect(readFile).not.toHaveBeenCalled(); + expect(createEditor).not.toHaveBeenCalled(); + expect(loaderVisible).toBe(false); + }); + + it.each([ + ["Quarterly report", "type", " Application/PDF; charset=binary "], + [ + "Budget", + "mime", + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + ], + [ + "Letter", + "type", + "application/vnd.openxmlformats-officedocument.wordprocessingml.template", + ], + [ + "Slides", + "mime", + "application/vnd.openxmlformats-officedocument.presentationml.slideshow", + ], + [ + "Template", + "type", + "application/vnd.openxmlformats-officedocument.presentationml.template", + ], + ["archive.zip", "type", "text/plain"], + ])( + "rejects external binary %s before reading or decoding", + async (name, field, mime) => { + stat.mockResolvedValue({ + name, + [field]: mime, + canWrite: true, + url: "content://provider/42", + }); + await expect( + openFile("content://provider/42", { external: true }), + ).rejects.toMatchObject({ + message: "Unsupported file", + filename: name, + }); + expect(readFile).not.toHaveBeenCalled(); + expect(decode).not.toHaveBeenCalled(); + expect(createEditor).not.toHaveBeenCalled(); + expect(loaderVisible).toBe(false); + }, + ); + + it.each([ + ["README", "text/plain"], + ["Makefile", undefined], + ["plain.txt", "application/octet-stream"], + ["plain.csv", "application/octet-stream"], + ["plain.tsv", "application/octet-stream"], + ])( + "retains the normal %s editor fallback for incoming files", + async (name, type) => { + stat.mockResolvedValue({ name, type, url: "content://provider/plain" }); + await openFile("content://provider/plain", { external: true }); + expect(createEditor).toHaveBeenCalledOnce(); + expect(manager.activeFile.text).toBe("target text"); + }, + ); + + it("preserves handlers and internal opens for extensionless files with binary metadata", async () => { + stat.mockResolvedValue({ + name: "Report", + type: "application/pdf", + canWrite: false, + }); + const handleFile = vi.fn(async () => {}); + handler.getFileHandler.mockReturnValueOnce({ id: "custom", handleFile }); + await openFile("content://provider/report", { external: true }); + expect(handleFile).toHaveBeenCalledWith( + expect.objectContaining({ name: "Report", readOnly: true }), + ); + expect(readFile).not.toHaveBeenCalled(); + expect(createEditor).not.toHaveBeenCalled(); + await openFile("content://provider/report"); + expect(createEditor).toHaveBeenCalledOnce(); + }); + + it("reports expired grants and reuses already-open custom tabs without replacing their content", async () => { + stat.mockRejectedValueOnce(Error("Grant expired")); + await expect( + openFile("content://provider/42", { external: true }), + ).rejects.toThrow("Grant expired"); + const existing = { makeActive: vi.fn() }; + manager.getFile.mockReturnValueOnce(existing); + await openFile("content://provider/42", { external: true }); + expect(existing.makeActive).toHaveBeenCalledOnce(); + expect(stat).toHaveBeenCalledTimes(1); + expect(createEditor).not.toHaveBeenCalled(); + }); + it("does not activate an existing file with an already-aborted signal", async () => { const file = { makeActive: vi.fn() }; manager.getFile.mockReturnValue(file); diff --git a/tests/unit/sessionPersistence.test.js b/tests/unit/sessionPersistence.test.js index e096148b65..823b1a2494 100644 --- a/tests/unit/sessionPersistence.test.js +++ b/tests/unit/sessionPersistence.test.js @@ -25,12 +25,14 @@ vi.mock("cm/editorUtils", () => ({ })), })); vi.mock("dialogs/alert", () => ({ default: vi.fn() })); +vi.mock("dialogs/select", () => ({ default: vi.fn() })); vi.mock("fileSystem", () => ({ default: vi.fn() })); vi.mock("lib/auth", () => ({ default: {} })); vi.mock("lib/config", () => ({ default: { DEFAULT_FILE_SESSION: "default-session" }, })); vi.mock("lib/openFile", () => ({ default: runtime.openFile })); +vi.mock("lib/loadPlugins", () => ({ isInitialPluginLoadComplete: () => true })); vi.mock("lib/openFolder", () => ({ default: vi.fn(), addedFolder: [], From 3e2e0ab47ab8c1e440ba29f549a7411655da2abf Mon Sep 17 00:00:00 2001 From: Ajit Kumar Date: Tue, 22 Sep 2026 22:39:47 +0000 Subject: [PATCH 136/195] feat: review button in plugin page (#2925) Co-authored-by: Ajit Kumar --- src/pages/plugin/plugin.scss | 42 +++++++++++++++++++++++++++++++++ src/pages/plugin/plugin.view.js | 38 +++++++++++++++++++---------- 2 files changed, 67 insertions(+), 13 deletions(-) diff --git a/src/pages/plugin/plugin.scss b/src/pages/plugin/plugin.scss index 68c1bc2119..304cd6afc3 100644 --- a/src/pages/plugin/plugin.scss +++ b/src/pages/plugin/plugin.scss @@ -7,6 +7,48 @@ margin: 0 auto; box-sizing: border-box; + &.has-reviews-button #plugin-tab .tab-content { + padding-bottom: calc(88px + env(safe-area-inset-bottom)); + } + + .plugin-reviews-button { + position: fixed; + inset-inline-end: calc(20px + max(env(safe-area-inset-left), env(safe-area-inset-right))); + bottom: calc(20px + env(safe-area-inset-bottom)); + z-index: 2; + display: inline-flex; + align-items: center; + justify-content: center; + gap: 8px; + min-width: 48px; + min-height: 48px; + max-width: calc(100% - 40px - env(safe-area-inset-left) - env(safe-area-inset-right)); + padding: 12px 20px; + box-sizing: border-box; + border: none; + border-radius: 24px; + background: var(--button-background-color); + color: var(--button-text-color); + box-shadow: 0 4px 12px var(--box-shadow-color); + font: inherit; + font-weight: 500; + line-height: 1.25; + text-transform: capitalize; + cursor: pointer; + + &:focus-visible { + outline: 2px solid var(--button-background-color); + outline-offset: 4px; + } + + .icon { + flex: 0 0 20px; + width: 20px; + height: 20px; + font-size: 20px; + } + } + .plugin-header { display: grid; grid-template-columns: auto 1fr auto; diff --git a/src/pages/plugin/plugin.view.js b/src/pages/plugin/plugin.view.js index ed0cc0e53c..ef957d30f8 100644 --- a/src/pages/plugin/plugin.view.js +++ b/src/pages/plugin/plugin.view.js @@ -92,6 +92,7 @@ export default (props) => { rating === "unrated" ? strings["plugin-review:unrated"] : rating; const ratingValueRef = Ref(); const commentCountRef = Ref(); + const hasReviews = votesUp !== undefined; const keywords = typeof keywordsRaw === "string" ? JSON.parse(keywordsRaw) : keywordsRaw; @@ -108,6 +109,13 @@ export default (props) => { ratingValueRef.className = getRatingClass(rating); commentCountRef.textContent = reviewStats.commentCount; }; + const openReviews = () => + showReviews({ + pluginId: id, + author, + stats: reviewStats, + onStatsChange: applyReviewStats, + }); const formatUpdatedDate = (dateString) => { if (!dateString) return null; @@ -124,7 +132,10 @@ export default (props) => { }; return ( -
    +
    { {license || "Unknown"}
    - {votesUp !== undefined ? ( + {hasReviews ? (
    @@ -189,17 +200,7 @@ export default (props) => { {getRatingText()}
    -
    - showReviews({ - pluginId: id, - author, - stats: reviewStats, - onStatsChange: applyReviewStats, - }) - } - > +
    {reviewStats.commentCount} @@ -305,6 +306,17 @@ export default (props) => { >
    + {hasReviews ? ( + + ) : null}
    ); }; From 5a7cc934cf1ba812df41e601e66b91e338039e46 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Thu, 24 Sep 2026 13:11:00 +0000 Subject: [PATCH 137/195] perf: speed up app startup (#2930) * perf: speed up app startup - Remove the fixed 500ms delay before hiding the splash; reveal after the app has rendered a frame. - Run independent native startup calls (encodings, storage dirs, installer, Android version) in parallel. - Run the Play Billing purchase check alongside startup. Non-Pro users still wait for it before the UI is usable so paid themes are never treated as locked; ads and the login check still wait for it. - Load the terminal manager (xterm and addons) on demand instead of in main.js; keep xterm.css in main.css and have it loaded before plugins so the synchronous plugin terminal APIs behave as before. - Target WebView 67+ instead of ES2015 and let swc reduce the core-js entry import to the polyfills that WebView needs. - Shorten the native splash fade to 150ms. - Fix disabledMap being out of scope in the owned plugins list and an unhandled rejection when the sponsor form is cancelled. - Add temporary startup timing marks (src/lib/startupPerf.js). Co-Authored-By: Claude Opus 5.5 * fix: let plugins load with the settled Pro status On free builds, a cached acode_pro value no longer waited for the Play Billing check, so plugins (including theme plugins) could initialize before a downgrade was applied. Wait for the check before loading any plugin, as before the check ran in parallel. Paid builds are always Pro and do not wait. Also remove the temporary startup timing marks. Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- config.xml | 1 + rspack.config.js | 16 +- src/components/terminal/loader.js | 36 ++++ src/lib/acode.js | 33 +-- src/main.js | 266 +++++++++++++++---------- src/pages/fileBrowser/fileBrowser.js | 1 - src/pages/fontManager/fontManager.js | 2 +- src/pages/plugins/plugins.js | 2 +- src/pages/sponsor/sponsor.js | 3 +- src/pages/themeSetting/themeSetting.js | 2 +- src/settings/terminalSettings.js | 6 +- 11 files changed, 237 insertions(+), 131 deletions(-) create mode 100644 src/components/terminal/loader.js diff --git a/config.xml b/config.xml index 0241142964..cb6a6aed77 100644 --- a/config.xml +++ b/config.xml @@ -26,6 +26,7 @@ + diff --git a/rspack.config.js b/rspack.config.js index c811c6b778..76d5c4713f 100644 --- a/rspack.config.js +++ b/rspack.config.js @@ -12,6 +12,16 @@ module.exports = (env, options) => { ? ''.concat(devProto, '://', devHost, ':', devPort) : ''; + // Match the oldest WebView the app supports (MIN_WEBVIEW_MAJOR in + // www/index.html) instead of plain ES2015, so native async/await, classes + // and spread are kept. `entry` mode rewrites `import "core-js/stable"` to + // only the polyfills that WebView still needs. + const swcEnv = { + targets: 'chrome >= 67', + mode: 'entry', + coreJs: require('core-js/package.json').version, + }; + const rules = [ { test: /typescript[\\/]lib[\\/]lib\..*\.d\.ts$/, @@ -30,8 +40,8 @@ module.exports = (env, options) => { syntax: 'typescript', tsx: false, }, - target: 'es2015', }, + env: swcEnv, }, }, path.resolve(__dirname, 'utils/custom-loaders/html-tag-jsx-loader.js'), @@ -55,8 +65,8 @@ module.exports = (env, options) => { parser: { syntax: 'ecmascript', }, - target: 'es2015', }, + env: swcEnv, }, }, ], @@ -72,8 +82,8 @@ module.exports = (env, options) => { syntax: 'ecmascript', jsx: false, }, - target: 'es2015', }, + env: swcEnv, }, }, path.resolve(__dirname, 'utils/custom-loaders/html-tag-jsx-loader.js'), diff --git a/src/components/terminal/loader.js b/src/components/terminal/loader.js new file mode 100644 index 0000000000..336118e1ec --- /dev/null +++ b/src/components/terminal/loader.js @@ -0,0 +1,36 @@ +/** + * Loads the terminal manager (and xterm) on demand so it stays out of the + * startup bundle. + */ + +/** @type {import("./terminalManager").default | null} */ +let manager = null; +/** @type {Promise | null} */ +let loading = null; + +/** + * The terminal manager if it has already been loaded, otherwise null. + */ +export function getLoadedTerminalManager() { + return manager; +} + +/** + * Loads the terminal manager, reusing the pending load if one is in flight. + * @returns {Promise} + */ +export function loadTerminalManager() { + loading ??= import( + /* webpackChunkName: "terminal" */ "./terminalManager" + ).then( + ({ default: terminalManager }) => { + manager = terminalManager; + return terminalManager; + }, + (error) => { + loading = null; + throw error; + }, + ); + return loading; +} diff --git a/src/lib/acode.js b/src/lib/acode.js index 2870fc0a98..55785a14aa 100644 --- a/src/lib/acode.js +++ b/src/lib/acode.js @@ -34,7 +34,12 @@ import Page from "components/page"; import palette from "components/palette"; import settingsPage from "components/settingsPage"; import SideButton from "components/sideButton"; -import { TerminalManager, TerminalThemeManager } from "components/terminal"; +import { + getLoadedTerminalManager, + loadTerminalManager, +} from "components/terminal/loader"; +import TerminalThemeManager from "components/terminal/terminalThemeManager"; +import TerminalTouchSelection from "components/terminal/terminalTouchSelection"; import toast from "components/toast"; import tutorial from "components/tutorial"; import alert from "dialogs/alert"; @@ -294,20 +299,24 @@ class Acode { }; const terminalTouchSelectionMoreOptions = { - add: (option) => TerminalManager.addTouchSelectionMoreOption(option), - remove: (id) => TerminalManager.removeTouchSelectionMoreOption(id), - list: () => TerminalManager.getTouchSelectionMoreOptions(), + add: (option) => TerminalTouchSelection.addMoreOption(option), + remove: (id) => TerminalTouchSelection.removeMoreOption(id), + list: () => TerminalTouchSelection.getMoreOptions(), }; const terminalModule = { - create: (options) => TerminalManager.createTerminal(options), - createLocal: (options) => TerminalManager.createLocalTerminal(options), - createServer: (options) => TerminalManager.createServerTerminal(options), - get: (id) => TerminalManager.getTerminal(id), - getAll: () => TerminalManager.getAllTerminals(), + create: async (options) => + (await loadTerminalManager()).createTerminal(options), + createLocal: async (options) => + (await loadTerminalManager()).createLocalTerminal(options), + createServer: async (options) => + (await loadTerminalManager()).createServerTerminal(options), + // No terminal can exist before the manager has loaded. + get: (id) => getLoadedTerminalManager()?.getTerminal(id) ?? null, + getAll: () => getLoadedTerminalManager()?.getAllTerminals() ?? new Map(), write: (id, data) => this.#secureTerminalWrite(id, data), - clear: (id) => TerminalManager.clearTerminal(id), - close: (id) => TerminalManager.closeTerminal(id), + clear: (id) => getLoadedTerminalManager()?.clearTerminal(id), + close: async (id) => (await loadTerminalManager()).closeTerminal(id), moreOptions: terminalTouchSelectionMoreOptions, touchSelection: { moreOptions: terminalTouchSelectionMoreOptions, @@ -551,7 +560,7 @@ class Acode { } // If all security checks pass, proceed with writing - return TerminalManager.writeToTerminal(id, data); + return getLoadedTerminalManager()?.writeToTerminal(id, data); } /** diff --git a/src/main.js b/src/main.js index cf91423da2..bd62a94561 100644 --- a/src/main.js +++ b/src/main.js @@ -8,6 +8,8 @@ import "styles/overrideAceStyle.scss"; import "styles/wideScreen.scss"; // Editor tabs use a shadow root that only links build/main.css. import "pages/welcome/welcome.scss"; +// Terminal code loads on demand; keep its styles in main.css as before. +import "@xterm/xterm/css/xterm.css"; import "lib/polyfill"; import "cm/supportedModes"; @@ -26,6 +28,7 @@ import { } from "cm/modelist"; import Contextmenu from "components/contextmenu"; import Sidebar from "components/sidebar"; +import { loadTerminalManager } from "components/terminal/loader"; import tile from "components/tile"; import toast from "components/toast"; import { initIconTooltips } from "components/tooltip"; @@ -73,6 +76,12 @@ import $_fileMenu from "views/file-menu.hbs"; import $_menu from "views/menu.hbs"; import auth, { loginEvents } from "./lib/auth"; +/** + * Settles once the startup purchase check can no longer change Pro status. + * Plugins wait for it so they initialize with the final value. + */ +let proStatusReady = Promise.resolve(); + const oldPreventDefault = TouchEvent.prototype.preventDefault; const previousVersionCode = Number.parseInt(localStorage.versionCode, 10); const logger = new Logger(); @@ -118,8 +127,6 @@ async function ensurePermission(permission) { } async function onDeviceReady() { - await initEncodings(); // important to load encodings before anything else - const isFreePackage = /(free)$/.test(BuildInfo.packageName); const oldResolveURL = window.resolveLocalFileSystemURL; const { @@ -145,27 +152,36 @@ async function onDeviceReady() { } } + // Start the Play Billing check first so it runs alongside the rest of + // startup instead of blocking it. + config.HAS_PRO = !isFreePackage || localStorage.acode_pro === "true"; + const proPurchaseCheck = verifyProPurchase(isFreePackage); + // Paid builds are always Pro, so only a free build's check can change it. + proStatusReady = isFreePackage ? proPurchaseCheck : Promise.resolve(); + + // These native calls are independent, so run them together. + const [dataStorage, cacheStorage, installSource, androidSdkInt] = + await Promise.all([ + resolveStorageDir(externalDataDirectory, dataDirectory), + resolveStorageDir(externalCacheDirectory, cacheDirectory), + getInstallSource(), + getAndroidSdkInt(), + initEncodings(), // important to load encodings before anything else + ]); + window.app = document.body; window.root = tag.get("#root"); window.addedFolder = addedFolder; window.editorManager = null; window.toast = toast; window.ASSETS_DIRECTORY = Url.join(cordova.file.applicationDirectory, "www"); - window.DATA_STORAGE = await resolveStorageDir( - externalDataDirectory, - dataDirectory, - ); - window.CACHE_STORAGE = await resolveStorageDir( - externalCacheDirectory, - cacheDirectory, - ); + window.DATA_STORAGE = dataStorage; + window.CACHE_STORAGE = cacheStorage; window.PLUGIN_DIR = Url.join(DATA_STORAGE, "plugins"); window.KEYBINDING_FILE = Url.join(DATA_STORAGE, ".key-bindings.json"); window.log = logger.log.bind(logger); - config.HAS_PRO = !isFreePackage; - // Capture synchronous errors window.addEventListener("error", (event) => { const errorMsg = `Error: ${event.message}, Source: ${event.filename}, Line: ${event.lineno}, Column: ${event.colno}, Stack: ${event.error?.stack || "N/A"}`; @@ -179,14 +195,6 @@ async function onDeviceReady() { ); }); - let installSource = INSTALL_SOURCE_PLAY; - - try { - installSource = await helpers.promisify(system.getInstaller); - } catch (error) { - console.error(error); - } - Object.defineProperty(window, "appInstallSource", { get() { return installSource; @@ -198,39 +206,7 @@ async function onDeviceReady() { enumerable: false, }); - try { - await helpers.promisify(iap.startConnection).catch((e) => { - window.log("error", "connection error"); - window.log("error", e); - }); - - if (localStorage.acode_pro === "true") { - config.HAS_PRO = true; - } - - if (navigator.onLine) { - const purchases = await helpers.promisify(iap.getPurchases); - const isPro = purchases.find((p) => - p.productIds.includes("acode_pro_new"), - ); - if (isPro) { - config.HAS_PRO = true; - } else { - config.HAS_PRO = !isFreePackage; - } - } - } catch (error) { - window.log("error", "Purchase error"); - window.log("error", error); - } - - try { - window.ANDROID_SDK_INT = await new Promise((resolve, reject) => - system.getAndroidVersion(resolve, reject), - ); - } catch (error) { - window.ANDROID_SDK_INT = Number.parseInt(device.version); - } + window.ANDROID_SDK_INT = androidSdkInt; window.DOES_SUPPORT_THEME = (() => { const $testEl = (
    { - document.body.removeAttribute("data-small-msg"); - app.classList.remove("loading", "splash"); - - // load plugins - try { - await loadPlugins(); - fileIcons.refreshRenderedIcons(); - // Ensure at least one sidebar app is active after all plugins are loaded - // This handles cases where the stored section was from an uninstalled plugin - sidebarApps.ensureActiveApp(); - - // Re-emit events for active file after plugins are loaded - const { activeFile } = editorManager; - for (const file of editorManager.files) { - if (file?.type === "editor") { - file.setMode(); - } - } - editorManager.reapplyActiveFile(); - if (activeFile?.uri) { - if (activeFile.loaded && !activeFile.loading) { - editorManager.emit("file-loaded", activeFile); - } - // Re-emit switch-file event - editorManager.emit("switch-file", activeFile); - } - } catch (error) { - window.log("error", "Failed to load plugins!"); - window.log("error", error); - toast("Failed to load plugins!"); - } finally { - void processPendingIntents().catch(intentHandler.onError); - } - applySettings.afterRender(); - - // Check login status before emitting events - try { - const user = await auth.getLoggedInUser(); - if (user) { - if (Boolean(user.acode_pro)) { - config.HAS_PRO = true; - } - loginEvents.emit(); - } - } catch (error) { - console.error("Error checking login status:", error); - } - - fetchPromotions(); - startAd(); - }, 500); + // Only the purchase check can upgrade a non-Pro user, so settle it before + // the UI is usable; otherwise paid themes could be treated as locked. + if (!config.HAS_PRO) { + await proPurchaseCheck; + } + // Reveal the app once it has rendered a frame, then load the rest. + requestAnimationFrame(() => + requestAnimationFrame(() => void onAppRendered(proPurchaseCheck)), + ); } await promptUpdateCheckConsent(); @@ -501,6 +434,122 @@ async function onDeviceReady() { .catch(console.error); } +async function getInstallSource() { + try { + return await helpers.promisify(system.getInstaller); + } catch (error) { + console.error(error); + return INSTALL_SOURCE_PLAY; + } +} + +async function getAndroidSdkInt() { + try { + return await new Promise((resolve, reject) => + system.getAndroidVersion(resolve, reject), + ); + } catch (error) { + return Number.parseInt(device.version); + } +} + +/** + * Confirms Pro status against Play purchases. + * Only a change made here is applied, so an upgrade from another source + * (e.g. a login that finished first) is never downgraded. + * @param {boolean} isFreePackage + */ +async function verifyProPurchase(isFreePackage) { + const initialHasPro = config.HAS_PRO; + try { + await helpers.promisify(iap.startConnection).catch((e) => { + logger.log("error", "connection error"); + logger.log("error", e); + }); + + if (!navigator.onLine) return; + + const purchases = await helpers.promisify(iap.getPurchases); + const isPro = purchases.find((p) => p.productIds.includes("acode_pro_new")); + if (isPro) { + config.HAS_PRO = true; + // Lets the next launch skip waiting for this check. + localStorage.acode_pro = "true"; + } else if (config.HAS_PRO === initialHasPro) { + config.HAS_PRO = !isFreePackage; + } + } catch (error) { + logger.log("error", "Purchase error"); + logger.log("error", error); + } +} + +/** + * Hides the splash and loads everything that is not needed for the first + * frame: plugins, login state and ads. + * @param {Promise} proPurchaseCheck + */ +async function onAppRendered(proPurchaseCheck) { + document.body.removeAttribute("data-small-msg"); + app.classList.remove("loading", "splash"); + + // load plugins + try { + // Plugins may use the synchronous terminal APIs, so have them ready. + await loadTerminalManager().catch((error) => { + console.error("Failed to load terminal module:", error); + }); + await proStatusReady; + await loadPlugins(); + fileIcons.refreshRenderedIcons(); + // Ensure at least one sidebar app is active after all plugins are loaded + // This handles cases where the stored section was from an uninstalled plugin + sidebarApps.ensureActiveApp(); + + // Re-emit events for active file after plugins are loaded + const { activeFile } = editorManager; + for (const file of editorManager.files) { + if (file?.type === "editor") { + file.setMode(); + } + } + editorManager.reapplyActiveFile(); + if (activeFile?.uri) { + if (activeFile.loaded && !activeFile.loading) { + editorManager.emit("file-loaded", activeFile); + } + // Re-emit switch-file event + editorManager.emit("switch-file", activeFile); + } + } catch (error) { + window.log("error", "Failed to load plugins!"); + window.log("error", error); + toast("Failed to load plugins!"); + } finally { + void processPendingIntents().catch(intentHandler.onError); + } + applySettings.afterRender(); + + // The purchase result must be applied before login can upgrade to Pro. + await proPurchaseCheck; + + // Check login status before emitting events + try { + const user = await auth.getLoggedInUser(); + if (user) { + if (Boolean(user.acode_pro)) { + config.HAS_PRO = true; + } + loginEvents.emit(); + } + } catch (error) { + console.error("Error checking login status:", error); + } + + fetchPromotions(); + startAd(); +} + function showSftpMigrationReport({ failures, removedReferences, @@ -761,6 +810,9 @@ async function loadApp() { openWelcomeTab(); } + // Plugins read Pro status while initializing, so let it settle first. + await proStatusReady; + // load theme plugins try { await loadPlugins(true); @@ -802,8 +854,8 @@ async function loadApp() { acode.exec("save-state"); initFileList(); - import(/* webpackChunkName: "terminal" */ "components/terminal").then( - ({ TerminalManager }) => { + loadTerminalManager().then( + (TerminalManager) => { TerminalManager.restorePersistedSessions().catch((error) => { console.error("Terminal restoration failed:", error); }); diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index dcb53c4890..30b487cdc7 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -6,7 +6,6 @@ import Checkbox from "components/checkbox"; import Contextmenu from "components/contextmenu"; import Page from "components/page"; import searchBar from "components/searchbar"; -import terminalManager from "components/terminal/terminalManager"; import alert from "dialogs/alert"; import confirm from "dialogs/confirm"; import loader from "dialogs/loader"; diff --git a/src/pages/fontManager/fontManager.js b/src/pages/fontManager/fontManager.js index d615aa1217..33c7aab3ca 100644 --- a/src/pages/fontManager/fontManager.js +++ b/src/pages/fontManager/fontManager.js @@ -2,7 +2,7 @@ import "./style.scss"; import fsOperation from "fileSystem"; import Page from "components/page"; import searchBar from "components/searchbar"; -import { DEFAULT_TERMINAL_SETTINGS } from "components/terminal"; +import { DEFAULT_TERMINAL_SETTINGS } from "components/terminal/terminalDefaults"; import toast from "components/toast"; import confirm from "dialogs/confirm"; import dialog from "dialogs/dialog"; diff --git a/src/pages/plugins/plugins.js b/src/pages/plugins/plugins.js index 4062a988f2..52272210f0 100644 --- a/src/pages/plugins/plugins.js +++ b/src/pages/plugins/plugins.js @@ -673,9 +673,9 @@ export default function PluginsInclude(updates) { $list.owned.setAttribute("empty-msg", strings["loading..."]); let iapPurchases = []; + const disabledMap = settings.value.pluginsDisabled || {}; if (helpers.isIapAvailable()) { iapPurchases = await helpers.promisify(iap.getPurchases); - const disabledMap = settings.value.pluginsDisabled || {}; iapPurchases.forEach(async ({ productIds }) => { const [sku] = productIds; diff --git a/src/pages/sponsor/sponsor.js b/src/pages/sponsor/sponsor.js index 02b53475fd..36c32ce08f 100644 --- a/src/pages/sponsor/sponsor.js +++ b/src/pages/sponsor/sponsor.js @@ -242,6 +242,7 @@ async function handlePurchase(productId, title) { }); } + // multiPrompt rejects when the dialog is cancelled. result = await multiPrompt(onlyTitle(title), [ { placeholder: "Name", @@ -264,7 +265,7 @@ async function handlePurchase(productId, title) { type: "checkbox", value: true, }, - ]); + ]).catch(() => null); if (!result) { return; diff --git a/src/pages/themeSetting/themeSetting.js b/src/pages/themeSetting/themeSetting.js index e22081a407..815c44b917 100644 --- a/src/pages/themeSetting/themeSetting.js +++ b/src/pages/themeSetting/themeSetting.js @@ -8,7 +8,7 @@ import { basicSetup, EditorView } from "codemirror"; import Page from "components/page"; import searchBar from "components/searchbar"; import TabView from "components/tabView"; -import { TerminalThemeManager } from "components/terminal"; +import TerminalThemeManager from "components/terminal/terminalThemeManager"; import alert from "dialogs/alert"; import Ref from "html-tag-js/ref"; import actionStack from "lib/actionStack"; diff --git a/src/settings/terminalSettings.js b/src/settings/terminalSettings.js index e8e07112b6..35a82179fd 100644 --- a/src/settings/terminalSettings.js +++ b/src/settings/terminalSettings.js @@ -1,9 +1,7 @@ import fsOperation from "fileSystem"; import settingsPage from "components/settingsPage"; -import { - DEFAULT_TERMINAL_SETTINGS, - TerminalThemeManager, -} from "components/terminal"; +import { DEFAULT_TERMINAL_SETTINGS } from "components/terminal/terminalDefaults"; +import TerminalThemeManager from "components/terminal/terminalThemeManager"; import toast from "components/toast"; import alert from "dialogs/alert"; import confirm from "dialogs/confirm"; From 60acb25a603420ac61609bc5a7b97ec70412e763 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Thu, 24 Sep 2026 13:11:01 +0000 Subject: [PATCH 138/195] perf: smaller startup bundle, cached encodings and faster command registration (#2931) * perf: shrink startup bundle and cache native encodings - Load lib/run (markdown-it, its plugins and the markdown preview) on first run/preview instead of in main.js. - Load mime-types and its MIME database on demand at each lookup site. - Skip load-time validation for bundled editor themes; they are still validated when applied, and plugin themes are still validated when registered. - Cache the Android charset list per app build, OS version and device model instead of rebuilding it natively on every launch. - Fetch the sidebar app chunks in parallel while adding them in their original order. Co-Authored-By: Claude Opus 5.5 * perf: make command registration and keymap rebuilds cheap Each command registration (including every plugin addCommand) rebuilt the whole keymap, re-parsing both key strings for every pairwise conflict check, and immediately reconfigured every editor pane. Profiling on a device showed ~1.8s of main-thread CPU spent here while plugins loaded. - Cache canonicalized key strings; the result depends only on the input. - Find the first conflicting claim without copying the claimed-keys map for every candidate. - Rebuild the keymap lazily: registration marks it dirty and every reader rebuilds first, so reads stay current. The returned command still has its final key and description immediately. - Apply keymap refreshes once per burst in a microtask, which always runs before the next key event. - Drop the module-load rebuild that setKeyBindings immediately repeated. Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- src/cm/commandRegistry.js | 93 ++++++++++++++--- src/cm/keyBindingUtils.js | 12 ++- src/cm/themes/index.js | 67 ++++++++---- src/fileSystem/ftp.js | 4 +- src/fileSystem/sftp.js | 6 +- src/lib/commands.js | 4 +- src/lib/editorFile.js | 11 +- src/lib/runLazily.js | 9 ++ src/pages/fileBrowser/fileBrowser.js | 3 +- src/pages/plugin/plugin.js | 3 +- src/sidebarApps/index.js | 14 ++- src/utils/encodings.js | 57 ++++++++++- src/utils/mimeTypes.js | 11 ++ tests/unit/commandRegistryKeymap.test.js | 124 +++++++++++++++++++++++ tests/unit/fileSaveEvents.test.js | 2 +- tests/unit/pluginFileRestoration.test.js | 4 +- tests/unit/saveCommands.test.js | 2 +- 17 files changed, 365 insertions(+), 61 deletions(-) create mode 100644 src/lib/runLazily.js create mode 100644 src/utils/mimeTypes.js create mode 100644 tests/unit/commandRegistryKeymap.test.js diff --git a/src/cm/commandRegistry.js b/src/cm/commandRegistry.js index 5d53cb1747..c3f295c16d 100644 --- a/src/cm/commandRegistry.js +++ b/src/cm/commandRegistry.js @@ -151,6 +151,16 @@ let cachedKeymap = []; /** @type {Set} */ const commandViews = new Set(); +/** + * Commands are often registered in bursts (a plugin adding several at once), + * so the keymap is rebuilt lazily on the next read instead of per command. + */ +let keymapDirty = true; + +/** @type {Set} views waiting for the updated keymap */ +const pendingKeymapViews = new Set(); +let keymapRefreshScheduled = false; + const CODEMIRROR_COMMAND_ENTRIES = Object.entries(cmCommands).filter( ([name, value]) => typeof value === "function" && CODEMIRROR_COMMAND_NAMES.has(name), @@ -164,7 +174,6 @@ registerCoreCommands(); registerLspCommands(); registerLintCommands(); registerCommandsFromKeyBindings(); -rebuildKeymap(); function registerCoreCommands() { addCommand({ @@ -1514,19 +1523,34 @@ function buildResolvedKeyBindingsSnapshot() { ); } +/** + * Resolve a command's effective description and key from the bindings. + * @returns {string|null} the key source + */ +function syncCommandBinding(command, name) { + const bindingInfo = resolveBindingInfo(name); + command.description = bindingInfo?.description || command.defaultDescription; + command.key = + bindingInfo && Object.prototype.hasOwnProperty.call(bindingInfo, "key") + ? bindingInfo.key + : (command.defaultKey ?? null); + return command.key; +} + +function invalidateKeymap() { + keymapDirty = true; +} + +function ensureKeymap() { + if (keymapDirty) rebuildKeymap(); +} + function rebuildKeymap() { cachedResolvedKeyBindings = buildResolvedKeyBindingsSnapshot(); const candidates = []; let order = 0; commandMap.forEach((command, name) => { - const bindingInfo = resolveBindingInfo(name); - command.description = - bindingInfo?.description || command.defaultDescription; - const keySource = - bindingInfo && Object.prototype.hasOwnProperty.call(bindingInfo, "key") - ? bindingInfo.key - : (command.defaultKey ?? null); - command.key = keySource; + const keySource = syncCommandBinding(command, name); const combos = parseKeyString(keySource); combos.forEach((combo) => { const cmKey = toCodeMirrorKey(combo); @@ -1551,9 +1575,15 @@ function rebuildKeymap() { const conflicts = []; for (const candidate of candidates) { const canonicalKey = canonicalizeKeyBinding(candidate.key); - const claimed = Array.from(claimedKeys.entries()).find(([key]) => - keyBindingsConflict(key, canonicalKey), - ); + // First conflicting claim in insertion order, without copying the map + // for every candidate. + let claimed = null; + for (const entry of claimedKeys) { + if (keyBindingsConflict(entry[0], canonicalKey)) { + claimed = entry; + break; + } + } if (claimed) { const [claimedKey, owner] = claimed; const appCommandShadowsCodeMirrorDefault = @@ -1596,6 +1626,7 @@ function rebuildKeymap() { cachedKeyBindingConflicts = conflicts; cachedKeymap = bindings; resolvedKeyBindingsVersion += 1; + keymapDirty = false; return bindings; } @@ -1643,6 +1674,7 @@ export function executeCommand(name, view, args) { } export function getRegisteredCommands() { + ensureKeymap(); return Array.from(commandMap.values()).map((command) => ({ name: command.name, description: command.description || command.defaultDescription, @@ -1651,22 +1683,27 @@ export function getRegisteredCommands() { } export function getResolvedKeyBindings() { + ensureKeymap(); return cachedResolvedKeyBindings; } export function getEffectiveKeyBindings() { + ensureKeymap(); return cachedEffectiveKeyBindings; } export function getKeyBindingConflicts() { + ensureKeymap(); return cachedKeyBindingConflicts.map((conflict) => ({ ...conflict })); } export function getResolvedKeyBindingsVersion() { + ensureKeymap(); return resolvedKeyBindingsVersion; } export function getCommandKeymapExtension() { + ensureKeymap(); return commandKeymapCompartment.of(keymap.of(cachedKeymap)); } @@ -1754,9 +1791,11 @@ export function registerExternalCommand(descriptor = {}) { const stored = commandMap.get(name); if (stored) { stored.key = normalized.key ?? stored.key; + // The returned command reflects its final binding right away. + syncCommandBinding(stored, name); } - rebuildKeymap(); + invalidateKeymap(); return stored; } @@ -1765,13 +1804,34 @@ export function removeExternalCommand(name) { const exists = commandMap.has(name); if (!exists) return false; commandMap.delete(name); - rebuildKeymap(); + invalidateKeymap(); return true; } +/** + * Apply the current keymap to a view. Calls made in the same task are applied + * together in a microtask, which always runs before the next key event. + */ export function refreshCommandKeymap(view) { const resolvedView = resolveView(view); - applyCommandKeymap(resolvedView); + if (!resolvedView) return; + pendingKeymapViews.add(resolvedView); + if (keymapRefreshScheduled) return; + keymapRefreshScheduled = true; + Promise.resolve().then(flushKeymapRefresh); +} + +function flushKeymapRefresh() { + keymapRefreshScheduled = false; + const views = Array.from(pendingKeymapViews); + pendingKeymapViews.clear(); + for (const view of views) { + try { + applyCommandKeymap(view); + } catch (error) { + console.error("Failed to apply command keymap", error); + } + } } function normalizeExternalCommand(descriptor) { @@ -1827,8 +1887,9 @@ function normalizeExternalKey(bindKey) { return combos.length ? combos.join("|") : null; } -function applyCommandKeymap(view, bindings = cachedKeymap) { +function applyCommandKeymap(view, bindings) { if (!view) return; + ensureKeymap(); commandViews.add(view); view.dispatch({ effects: commandKeymapCompartment.reconfigure( diff --git a/src/cm/keyBindingUtils.js b/src/cm/keyBindingUtils.js index 69e2a3583b..1ebcdeb10f 100644 --- a/src/cm/keyBindingUtils.js +++ b/src/cm/keyBindingUtils.js @@ -45,8 +45,18 @@ export function toCodeMirrorKey(combo) { return strokes.length ? strokes.join(" ") : null; } +// Conflict checks compare every binding with every other one each time the +// keymap is rebuilt (once per registered command), so cache the parsed form. +const canonicalKeyCache = new Map(); + export function canonicalizeKeyBinding(combo) { - return toCodeMirrorKey(combo)?.toLowerCase() || null; + if (typeof combo !== "string") { + return toCodeMirrorKey(combo)?.toLowerCase() || null; + } + if (canonicalKeyCache.has(combo)) return canonicalKeyCache.get(combo); + const canonicalKey = toCodeMirrorKey(combo)?.toLowerCase() || null; + canonicalKeyCache.set(combo, canonicalKey); + return canonicalKey; } /** diff --git a/src/cm/themes/index.js b/src/cm/themes/index.js index dbcd67eba1..1043b60c66 100644 --- a/src/cm/themes/index.js +++ b/src/cm/themes/index.js @@ -116,6 +116,19 @@ function resolveThemeEntryExtensions(theme, fallbackExtensions) { } export function addTheme(id, caption, isDark, getExtension, config = null) { + return registerTheme(id, caption, isDark, getExtension, config, true); +} + +/** + * Registers a bundled theme. These are known to be valid, so the up-front + * validation (which builds every theme's extensions at startup) is skipped; + * they are still validated when applied. + */ +function addBuiltInTheme(id, caption, isDark, getExtension, config = null) { + return registerTheme(id, caption, isDark, getExtension, config, false); +} + +function registerTheme(id, caption, isDark, getExtension, config, validate) { const key = String(id || "") .trim() .toLowerCase(); @@ -129,7 +142,7 @@ export function addTheme(id, caption, isDark, getExtension, config = null) { config: config || null, }; - if (!validateThemeExtensions(key, theme.getExtension())) { + if (validate && !validateThemeExtensions(key, theme.getExtension())) { return false; } @@ -164,115 +177,127 @@ export function removeTheme(id) { themes.delete(String(id).toLowerCase()); } -addTheme("one_dark", "One Dark", true, () => [oneDark], oneDarkConfig); -addTheme(auraConfig.name, "Aura", !!auraConfig.dark, () => aura(), auraConfig); -addTheme( +addBuiltInTheme("one_dark", "One Dark", true, () => [oneDark], oneDarkConfig); +addBuiltInTheme( + auraConfig.name, + "Aura", + !!auraConfig.dark, + () => aura(), + auraConfig, +); +addBuiltInTheme( cobaltConfig.name, "Cobalt", !!cobaltConfig.dark, () => cobalt(), cobaltConfig, ); -addTheme( +addBuiltInTheme( noctisLilacConfig.name, noctisLilacConfig.caption || "Noctis Lilac", !!noctisLilacConfig.dark, () => noctisLilac(), noctisLilacConfig, ); -addTheme( +addBuiltInTheme( draculaConfig.name, "Dracula", !!draculaConfig.dark, () => dracula(), draculaConfig, ); -addTheme(nordConfig.name, "Nord", !!nordConfig.dark, () => nord(), nordConfig); -addTheme( +addBuiltInTheme( + nordConfig.name, + "Nord", + !!nordConfig.dark, + () => nord(), + nordConfig, +); +addBuiltInTheme( gruvboxDarkConfig.name, "Gruvbox Dark", !!gruvboxDarkConfig.dark, () => gruvboxDark(), gruvboxDarkConfig, ); -addTheme( +addBuiltInTheme( ayuDarkConfig.name, "Ayu Dark", !!ayuDarkConfig.dark, () => ayuDark(), ayuDarkConfig, ); -addTheme( +addBuiltInTheme( materialPalenightConfig.name, "Material Palenight", !!materialPalenightConfig.dark, () => materialPalenight(), materialPalenightConfig, ); -addTheme( +addBuiltInTheme( githubDarkConfig.name, "GitHub Dark", !!githubDarkConfig.dark, () => githubDark(), githubDarkConfig, ); -addTheme( +addBuiltInTheme( githubLightConfig.name, "GitHub Light", !!githubLightConfig.dark, () => githubLight(), githubLightConfig, ); -addTheme( +addBuiltInTheme( solarizedDarkConfig.name, "Solarized Dark", !!solarizedDarkConfig.dark, () => solarizedDark(), solarizedDarkConfig, ); -addTheme( +addBuiltInTheme( solarizedLightConfig.name, "Solarized Light", !!solarizedLightConfig.dark, () => solarizedLight(), solarizedLightConfig, ); -addTheme( +addBuiltInTheme( tokyoNightDayConfig.name, "Tokyo Night Day", !!tokyoNightDayConfig.dark, () => tokyoNightDay(), tokyoNightDayConfig, ); -addTheme( +addBuiltInTheme( tokyoNightConfig.name, "Tokyo Night", !!tokyoNightConfig.dark, () => tokyoNight(), tokyoNightConfig, ); -addTheme( +addBuiltInTheme( tomorrowNightConfig.name, "Tomorrow Night", !!tomorrowNightConfig.dark, () => tomorrowNight(), tomorrowNightConfig, ); -addTheme( +addBuiltInTheme( tomorrowNightBrightConfig.name, "Tomorrow Night Bright", !!tomorrowNightBrightConfig.dark, () => tomorrowNightBright(), tomorrowNightBrightConfig, ); -addTheme( +addBuiltInTheme( monokaiConfig.name, "Monokai", !!monokaiConfig.dark, () => monokai(), monokaiConfig, ); -addTheme( +addBuiltInTheme( vscodeDarkConfig.name, "VS Code Dark", !!vscodeDarkConfig.dark, @@ -281,7 +306,7 @@ addTheme( ); for (const config of catppuccinConfigs) { - addTheme( + addBuiltInTheme( config.name, config.caption, config.dark, diff --git a/src/fileSystem/ftp.js b/src/fileSystem/ftp.js index 8ba1ea7206..98f4c9ef7c 100644 --- a/src/fileSystem/ftp.js +++ b/src/fileSystem/ftp.js @@ -1,7 +1,7 @@ import settings from "lib/settings"; -import mimeType from "mime-types"; import { decode, encode } from "utils/encodings"; import helpers from "utils/helpers"; +import loadMimeTypes from "utils/mimeTypes"; import Path from "utils/Path"; import Url from "utils/Url"; import internalFs from "./internalFs"; @@ -91,6 +91,7 @@ class FtpClient { async listDir() { await this.#connectIfNotConnected(); + const mimeType = await loadMimeTypes(); return new Promise((resolve, reject) => { ftp.listDirectory( this.#conId, @@ -282,6 +283,7 @@ class FtpClient { } async #getStat(url = this.#path) { + const mimeType = await loadMimeTypes(); return new Promise((resolve, reject) => { ftp.getStat( this.#conId, diff --git a/src/fileSystem/sftp.js b/src/fileSystem/sftp.js index 803be8af45..d30b50f3c0 100644 --- a/src/fileSystem/sftp.js +++ b/src/fileSystem/sftp.js @@ -1,7 +1,7 @@ import settings from "lib/settings"; -import mimeType from "mime-types"; import { decode, encode } from "utils/encodings"; import helpers from "utils/helpers"; +import loadMimeTypes from "utils/mimeTypes"; import Path from "utils/Path"; import Url from "utils/Url"; import internalFs from "./internalFs"; @@ -44,7 +44,8 @@ class SftpClient { * @param {String} filename * @param {boolean} stat */ - lsDir(filename = this.#path) { + async lsDir(filename = this.#path) { + const mimeType = await loadMimeTypes(); return new Promise((resolve, reject) => { sftp.isConnected(async (connectionID) => { (async () => { @@ -459,6 +460,7 @@ class SftpClient { async stat() { if (this.#stat) return this.#stat; + const mimeType = await loadMimeTypes(); return new Promise((resolve, reject) => { sftp.isConnected(async (connectionID) => { (async () => { diff --git a/src/lib/commands.js b/src/lib/commands.js index de3a005a8e..b0584442ab 100644 --- a/src/lib/commands.js +++ b/src/lib/commands.js @@ -16,7 +16,7 @@ import EditorFile from "./editorFile"; import { loadFileBrowser } from "./lazyImports"; import openFile from "./openFile"; import openFolder from "./openFolder"; -import run from "./run"; +import runLazily from "./runLazily"; import saveState from "./saveState"; import appSettings from "./settings"; import showFileInfo from "./showFileInfo"; @@ -287,7 +287,7 @@ export default { resolveReferenceFile(referenceFile)?.togglePinned?.(); }, console() { - run(true, "inapp"); + void runLazily(true, "inapp"); }, "check-files"() { if (!appSettings.value.checkFiles) return; diff --git a/src/lib/editorFile.js b/src/lib/editorFile.js index 03a8c3ba0e..b9a736f06b 100644 --- a/src/lib/editorFile.js +++ b/src/lib/editorFile.js @@ -18,16 +18,16 @@ import actions from "handlers/quickTools"; import { openTabContextMenuOnRelease } from "handlers/tabContextMenu"; import tag from "html-tag-js"; import quickToolsAdapters from "lib/quickToolsAdapter"; -import mimeTypes from "mime-types"; import { applyHighlightStyles } from "utils/codeHighlight"; import helpers from "utils/helpers"; +import loadMimeTypes from "utils/mimeTypes"; import Path from "utils/Path"; import { readRemoteFilePreview } from "utils/remoteFilePreview"; import Url from "utils/Url"; import config from "./config"; import { isInitialPluginLoadComplete } from "./loadPlugins"; import openFolder from "./openFolder"; -import run from "./run"; +import runLazily from "./runLazily"; import saveFile from "./saveFile"; import appSettings from "./settings"; @@ -1788,7 +1788,10 @@ export default class EditorFile { async #fileAction(action, mimeType) { try { const uri = await this.#getShareableUri(); - if (!mimeType) mimeType = mimeTypes.lookup(this.name) || "text/plain"; + if (!mimeType) { + const mimeTypes = await loadMimeTypes(); + mimeType = mimeTypes.lookup(this.name) || "text/plain"; + } system.fileAction( uri, this.filename, @@ -2028,7 +2031,7 @@ export default class EditorFile { const event = createFileEvent(this); this.#emit("run", event); if (event.defaultPrevented) return; - run(false, appSettings.value.previewMode, file); + void runLazily(false, appSettings.value.previewMode, file); } #updateTab() { diff --git a/src/lib/runLazily.js b/src/lib/runLazily.js new file mode 100644 index 0000000000..cc21326ae3 --- /dev/null +++ b/src/lib/runLazily.js @@ -0,0 +1,9 @@ +/** + * Runs/previews a file, loading the runner on first use. The runner pulls in + * markdown-it and the markdown preview, which are not needed at startup. + * @param {...any} args arguments for lib/run + */ +export default async function runLazily(...args) { + const { default: run } = await import(/* webpackChunkName: "run" */ "./run"); + return run(...args); +} diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index 30b487cdc7..aabbbb19e6 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -21,12 +21,12 @@ import recents from "lib/recents"; import remoteStorage from "lib/remoteStorage"; import appSettings from "lib/settings"; import { deleteSftpProfile, getSftpProfileId } from "lib/sftpProfiles"; -import mimeTypes from "mime-types"; import mustache from "mustache"; import filesSettings from "settings/filesSettings"; import URLParse from "url-parse"; import copyEntry from "utils/copyEntry"; import helpers from "utils/helpers"; +import loadMimeTypes from "utils/mimeTypes"; import Url from "utils/Url"; import _addMenu from "./add-menu.hbs"; import _addMenuHome from "./add-menu-home.hbs"; @@ -1196,6 +1196,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { break; } + const mimeTypes = await loadMimeTypes(); const mimeType = mimeTypes.lookup(name) || mimeTypes.lookup(shareableUri) || diff --git a/src/pages/plugin/plugin.js b/src/pages/plugin/plugin.js index 8afc97a263..d9a74f460a 100644 --- a/src/pages/plugin/plugin.js +++ b/src/pages/plugin/plugin.js @@ -18,9 +18,9 @@ import anchor from "markdown-it-anchor"; import markdownItFootnote from "markdown-it-footnote"; import MarkdownItGitHubAlerts from "markdown-it-github-alerts"; import markdownItTaskLists from "markdown-it-task-lists"; -import mimeTypes from "mime-types"; import { highlightCodeBlock, initHighlighting } from "utils/codeHighlight"; import helpers from "utils/helpers"; +import loadMimeTypes from "utils/mimeTypes"; import Url from "utils/Url"; import { isVersionGreater } from "utils/version"; import view, { cleanups } from "./plugin.view.js"; @@ -121,6 +121,7 @@ export default async function PluginInclude( Url.join(PLUGIN_DIR, id, installedPlugin.icon), ); const iconData = await fsOperation(iconUrl).readFile(); + const mimeTypes = await loadMimeTypes(); const iconMimeType = mimeTypes.lookup(installedPlugin.icon) || "image/png"; const icon = URL.createObjectURL( diff --git a/src/sidebarApps/index.js b/src/sidebarApps/index.js index 4172f79917..e97cc22e2e 100644 --- a/src/sidebarApps/index.js +++ b/src/sidebarApps/index.js @@ -86,10 +86,16 @@ function init($el) { * Loads all sidebar apps. */ async function loadApps() { - add(...(await import("./files")).default); - add(...(await import("./searchInFiles")).default); - add(...(await import("./extensions")).default); - add(...(await import("./notification")).default); + // Fetch the app chunks in parallel but add them in their original order. + const appModules = [ + import("./files"), + import("./searchInFiles"), + import("./extensions"), + import("./notification"), + ]; + for (const appModule of appModules) { + add(...(await appModule).default); + } setSponsorSidebarAppVisibility(appSettings.value.showSponsorSidebarApp); } diff --git a/src/utils/encodings.js b/src/utils/encodings.js index 71a1d892e0..662b808f57 100644 --- a/src/utils/encodings.js +++ b/src/utils/encodings.js @@ -201,14 +201,63 @@ export function encode(text, charset) { return execEncode(text, charset); } +const ENCODINGS_CACHE_KEY = "availableEncodingsCache"; + +/** + * The available charsets only change with the Android runtime, so the list is + * cached per app build and OS version instead of being rebuilt natively (and + * sent over the bridge) on every launch. + */ +function getEncodingsCacheId() { + return [ + globalThis.BuildInfo?.versionCode, + globalThis.device?.version, + globalThis.device?.model, + ].join("|"); +} + +function setEncodings(map) { + Object.keys(map).forEach((key) => { + const encoding = map[key]; + encodings[key] = encoding; + }); +} + +function readCachedEncodings() { + try { + const cached = JSON.parse(localStorage.getItem(ENCODINGS_CACHE_KEY)); + if (cached?.id !== getEncodingsCacheId()) return null; + const { map } = cached; + if (!map || typeof map !== "object" || !map["UTF-8"]) return null; + return map; + } catch { + return null; + } +} + +function writeCachedEncodings(map) { + try { + localStorage.setItem( + ENCODINGS_CACHE_KEY, + JSON.stringify({ id: getEncodingsCacheId(), map }), + ); + } catch (error) { + console.warn("Unable to cache available encodings", error); + } +} + export async function initEncodings() { + const cachedMap = readCachedEncodings(); + if (cachedMap) { + setEncodings(cachedMap); + return; + } + return new Promise((resolve, reject) => { cordova.exec( (map) => { - Object.keys(map).forEach((key) => { - const encoding = map[key]; - encodings[key] = encoding; - }); + setEncodings(map); + writeCachedEncodings(map); resolve(); }, (error) => { diff --git a/src/utils/mimeTypes.js b/src/utils/mimeTypes.js new file mode 100644 index 0000000000..f5bc130432 --- /dev/null +++ b/src/utils/mimeTypes.js @@ -0,0 +1,11 @@ +/** + * Loads the mime-types package on demand. Its MIME database is large and is + * never needed during startup. + * @returns {Promise} + */ +export default async function loadMimeTypes() { + const { default: mimeTypes } = await import( + /* webpackChunkName: "mimeTypes" */ "mime-types" + ); + return mimeTypes; +} diff --git a/tests/unit/commandRegistryKeymap.test.js b/tests/unit/commandRegistryKeymap.test.js new file mode 100644 index 0000000000..429a100aa9 --- /dev/null +++ b/tests/unit/commandRegistryKeymap.test.js @@ -0,0 +1,124 @@ +import { expect, it, vi } from "vitest"; +import { loadSourceModule } from "../helpers/loadSourceModule"; + +async function loadRegistry() { + const keyBindingUtils = await import("cm/keyBindingUtils"); + const stubs = Object.fromEntries( + [ + "fileSystem", + "@codemirror/commands", + "@codemirror/language", + "@codemirror/lint", + "@codemirror/lsp-client", + "cm/editorReadOnly", + "cm/foldAwareLineCommands", + "cm/foldingCommands", + "cm/lsp", + "cm/lsp/references", + "components/symbolsPanel", + "components/toast", + "dialogs/prompt", + "handlers/quickTools", + "lib/settings", + "utils/Url", + ].map((id) => [id, {}]), + ); + return loadSourceModule( + "src/cm/commandRegistry.js", + { + ...stubs, + "@codemirror/state": { + Compartment: class { + of(extension) { + return extension; + } + reconfigure(extension) { + return { reconfigure: extension }; + } + }, + EditorSelection: {}, + }, + "@codemirror/view": { keymap: { of: (bindings) => ({ bindings }) } }, + "cm/keyBindingUtils": keyBindingUtils, + "lib/keyBindings": { + __esModule: true, + default: {}, + APP_KEY_BINDING_NAMES: new Set(), + CODEMIRROR_COMMAND_NAMES: new Set(), + }, + }, + { editorManager: {} }, + ); +} + +const appliedKeys = (view, call) => + view.dispatch.mock.calls[call][0].effects.reconfigure.bindings.map( + (binding) => binding.key, + ); + +it("applies a burst of command registrations to the editor once, keeping reads current", async () => { + const registry = await loadRegistry(); + const view = { dispatch: vi.fn() }; + + const first = registry.registerExternalCommand({ + name: "pluginFirst", + exec() {}, + bindKey: "Ctrl-Alt-A", + }); + registry.refreshCommandKeymap(view); + registry.registerExternalCommand({ + name: "pluginSecond", + exec() {}, + bindKey: { win: "Ctrl-Alt-B" }, + }); + registry.refreshCommandKeymap(view); + + // The returned command and registry reads are up to date immediately. + expect(first.key).toBe("Ctrl-Alt-A"); + expect( + registry + .getRegisteredCommands() + .filter(({ name }) => name.startsWith("plugin")) + .map(({ name, key }) => [name, key]), + ).toEqual([ + ["pluginFirst", "Ctrl-Alt-A"], + ["pluginSecond", "Ctrl-Alt-B"], + ]); + + // The editor is reconfigured once, before any later event can run. + expect(view.dispatch).not.toHaveBeenCalled(); + await Promise.resolve(); + expect(view.dispatch).toHaveBeenCalledOnce(); + expect(appliedKeys(view, 0)).toEqual( + expect.arrayContaining(["Mod-Alt-a", "Mod-Alt-b"]), + ); + + registry.removeExternalCommand("pluginFirst"); + registry.refreshCommandKeymap(view); + await Promise.resolve(); + expect(view.dispatch).toHaveBeenCalledTimes(2); + expect(appliedKeys(view, 1)).not.toContain("Mod-Alt-a"); + expect(appliedKeys(view, 1)).toContain("Mod-Alt-b"); +}); + +it("reports a shortcut conflict with the earlier registered command", async () => { + const registry = await loadRegistry(); + registry.registerExternalCommand({ + name: "pluginOwner", + exec() {}, + bindKey: "Ctrl-K", + }); + registry.registerExternalCommand({ + name: "pluginChord", + exec() {}, + bindKey: "Ctrl-K Ctrl-X", + }); + + expect(registry.getKeyBindingConflicts()).toEqual([ + { + key: "Mod-k Mod-x", + command: "pluginChord", + shadowedBy: "pluginOwner", + }, + ]); +}); diff --git a/tests/unit/fileSaveEvents.test.js b/tests/unit/fileSaveEvents.test.js index ad6c5aa73f..a7c6a47b2d 100644 --- a/tests/unit/fileSaveEvents.test.js +++ b/tests/unit/fileSaveEvents.test.js @@ -9,7 +9,7 @@ function setup() { const write = vi.fn(async () => true); const manager = { files: [], getFile: () => null, addFile: file => manager.files.push(file), emit: vi.fn(), onupdate: vi.fn(), activeFile: null }; const defaults = Object.fromEntries([ - "fileSystem", "components/quickTools", "components/sidebar", "components/toast", "dialogs/confirm", "handlers/editorFileTab", "handlers/quickTools", "lib/quickToolsAdapter", "handlers/tabContextMenu", "dompurify", "mime-types", "utils/codeHighlight", "utils/Path", "utils/remoteFilePreview", "utils/Url", "./loadPlugins", "./openFolder", "./run", "cm/editorReadOnly", + "fileSystem", "components/quickTools", "components/sidebar", "components/toast", "dialogs/confirm", "handlers/editorFileTab", "handlers/quickTools", "lib/quickToolsAdapter", "handlers/tabContextMenu", "dompurify", "utils/mimeTypes", "utils/codeHighlight", "utils/Path", "utils/remoteFilePreview", "utils/Url", "./loadPlugins", "./openFolder", "./runLazily", "cm/editorReadOnly", ].map(id => [id, {}])); const { default: EditorFile } = loadSourceModule("src/lib/editorFile.js", { ...defaults, diff --git a/tests/unit/pluginFileRestoration.test.js b/tests/unit/pluginFileRestoration.test.js index 2f33bf5940..27a70a4432 100644 --- a/tests/unit/pluginFileRestoration.test.js +++ b/tests/unit/pluginFileRestoration.test.js @@ -153,11 +153,11 @@ function setup() { "handlers/quickTools", "handlers/tabContextMenu", "dompurify", - "mime-types", + "utils/mimeTypes", "utils/codeHighlight", "utils/Path", "./openFolder", - "./run", + "./runLazily", "cm/editorReadOnly", "lib/quickToolsAdapter", ].map((id) => [id, {}]), diff --git a/tests/unit/saveCommands.test.js b/tests/unit/saveCommands.test.js index 2576fdf490..3414ca9b48 100644 --- a/tests/unit/saveCommands.test.js +++ b/tests/unit/saveCommands.test.js @@ -5,7 +5,7 @@ function setup(files) { const manager = { files, activeFile: files[0], getFile: id => files.find(file => file.id === id) }; const toast = vi.fn(), error = vi.fn(); const dependencies = Object.fromEntries([ - "fileSystem", "@codemirror/commands", "cm/editorReadOnly", "components/sidebar", "dialogs/prompt", "handlers/quickTools", "lib/recents", "utils/color/regex", "utils/Url", "./checkFiles", "./config", "./editorFile", "./lazyImports", "./openFile", "./openFolder", "./run", "./saveState", "./settings", "./showFileInfo", + "fileSystem", "@codemirror/commands", "cm/editorReadOnly", "components/sidebar", "dialogs/prompt", "handlers/quickTools", "lib/recents", "utils/color/regex", "utils/Url", "./checkFiles", "./config", "./editorFile", "./lazyImports", "./openFile", "./openFolder", "./runLazily", "./saveState", "./settings", "./showFileInfo", ].map(id => [id, {}])); const module = loadSourceModule("src/lib/commands.js", { ...dependencies, "dialogs/confirm": async () => true, "dialogs/select": async () => "save", "utils/helpers": { error }, From b7dbe3d69dcf5165e19581fe3927f0838dce09f4 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Thu, 24 Sep 2026 13:17:59 +0000 Subject: [PATCH 139/195] Revert startup performance PRs #2930 and #2931 (#2933) * Revert "perf: smaller startup bundle, cached encodings and faster command registration (#2931)" This reverts commit 60acb25a603420ac61609bc5a7b97ec70412e763. The startup work is being consolidated into a single PR for review. Co-Authored-By: Claude Opus 5.5 * Revert "perf: speed up app startup (#2930)" This reverts commit 5a7cc934cf1ba812df41e601e66b91e338039e46. The startup work is being consolidated into a single PR for review. Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- config.xml | 1 - rspack.config.js | 16 +- src/cm/commandRegistry.js | 93 ++------ src/cm/keyBindingUtils.js | 12 +- src/cm/themes/index.js | 67 ++---- src/components/terminal/loader.js | 36 --- src/fileSystem/ftp.js | 4 +- src/fileSystem/sftp.js | 6 +- src/lib/acode.js | 33 +-- src/lib/commands.js | 4 +- src/lib/editorFile.js | 11 +- src/lib/runLazily.js | 9 - src/main.js | 266 +++++++++-------------- src/pages/fileBrowser/fileBrowser.js | 4 +- src/pages/fontManager/fontManager.js | 2 +- src/pages/plugin/plugin.js | 3 +- src/pages/plugins/plugins.js | 2 +- src/pages/sponsor/sponsor.js | 3 +- src/pages/themeSetting/themeSetting.js | 2 +- src/settings/terminalSettings.js | 6 +- src/sidebarApps/index.js | 14 +- src/utils/encodings.js | 57 +---- src/utils/mimeTypes.js | 11 - tests/unit/commandRegistryKeymap.test.js | 124 ----------- tests/unit/fileSaveEvents.test.js | 2 +- tests/unit/pluginFileRestoration.test.js | 4 +- tests/unit/saveCommands.test.js | 2 +- 27 files changed, 192 insertions(+), 602 deletions(-) delete mode 100644 src/components/terminal/loader.js delete mode 100644 src/lib/runLazily.js delete mode 100644 src/utils/mimeTypes.js delete mode 100644 tests/unit/commandRegistryKeymap.test.js diff --git a/config.xml b/config.xml index cb6a6aed77..0241142964 100644 --- a/config.xml +++ b/config.xml @@ -26,7 +26,6 @@ - diff --git a/rspack.config.js b/rspack.config.js index 76d5c4713f..c811c6b778 100644 --- a/rspack.config.js +++ b/rspack.config.js @@ -12,16 +12,6 @@ module.exports = (env, options) => { ? ''.concat(devProto, '://', devHost, ':', devPort) : ''; - // Match the oldest WebView the app supports (MIN_WEBVIEW_MAJOR in - // www/index.html) instead of plain ES2015, so native async/await, classes - // and spread are kept. `entry` mode rewrites `import "core-js/stable"` to - // only the polyfills that WebView still needs. - const swcEnv = { - targets: 'chrome >= 67', - mode: 'entry', - coreJs: require('core-js/package.json').version, - }; - const rules = [ { test: /typescript[\\/]lib[\\/]lib\..*\.d\.ts$/, @@ -40,8 +30,8 @@ module.exports = (env, options) => { syntax: 'typescript', tsx: false, }, + target: 'es2015', }, - env: swcEnv, }, }, path.resolve(__dirname, 'utils/custom-loaders/html-tag-jsx-loader.js'), @@ -65,8 +55,8 @@ module.exports = (env, options) => { parser: { syntax: 'ecmascript', }, + target: 'es2015', }, - env: swcEnv, }, }, ], @@ -82,8 +72,8 @@ module.exports = (env, options) => { syntax: 'ecmascript', jsx: false, }, + target: 'es2015', }, - env: swcEnv, }, }, path.resolve(__dirname, 'utils/custom-loaders/html-tag-jsx-loader.js'), diff --git a/src/cm/commandRegistry.js b/src/cm/commandRegistry.js index c3f295c16d..5d53cb1747 100644 --- a/src/cm/commandRegistry.js +++ b/src/cm/commandRegistry.js @@ -151,16 +151,6 @@ let cachedKeymap = []; /** @type {Set} */ const commandViews = new Set(); -/** - * Commands are often registered in bursts (a plugin adding several at once), - * so the keymap is rebuilt lazily on the next read instead of per command. - */ -let keymapDirty = true; - -/** @type {Set} views waiting for the updated keymap */ -const pendingKeymapViews = new Set(); -let keymapRefreshScheduled = false; - const CODEMIRROR_COMMAND_ENTRIES = Object.entries(cmCommands).filter( ([name, value]) => typeof value === "function" && CODEMIRROR_COMMAND_NAMES.has(name), @@ -174,6 +164,7 @@ registerCoreCommands(); registerLspCommands(); registerLintCommands(); registerCommandsFromKeyBindings(); +rebuildKeymap(); function registerCoreCommands() { addCommand({ @@ -1523,34 +1514,19 @@ function buildResolvedKeyBindingsSnapshot() { ); } -/** - * Resolve a command's effective description and key from the bindings. - * @returns {string|null} the key source - */ -function syncCommandBinding(command, name) { - const bindingInfo = resolveBindingInfo(name); - command.description = bindingInfo?.description || command.defaultDescription; - command.key = - bindingInfo && Object.prototype.hasOwnProperty.call(bindingInfo, "key") - ? bindingInfo.key - : (command.defaultKey ?? null); - return command.key; -} - -function invalidateKeymap() { - keymapDirty = true; -} - -function ensureKeymap() { - if (keymapDirty) rebuildKeymap(); -} - function rebuildKeymap() { cachedResolvedKeyBindings = buildResolvedKeyBindingsSnapshot(); const candidates = []; let order = 0; commandMap.forEach((command, name) => { - const keySource = syncCommandBinding(command, name); + const bindingInfo = resolveBindingInfo(name); + command.description = + bindingInfo?.description || command.defaultDescription; + const keySource = + bindingInfo && Object.prototype.hasOwnProperty.call(bindingInfo, "key") + ? bindingInfo.key + : (command.defaultKey ?? null); + command.key = keySource; const combos = parseKeyString(keySource); combos.forEach((combo) => { const cmKey = toCodeMirrorKey(combo); @@ -1575,15 +1551,9 @@ function rebuildKeymap() { const conflicts = []; for (const candidate of candidates) { const canonicalKey = canonicalizeKeyBinding(candidate.key); - // First conflicting claim in insertion order, without copying the map - // for every candidate. - let claimed = null; - for (const entry of claimedKeys) { - if (keyBindingsConflict(entry[0], canonicalKey)) { - claimed = entry; - break; - } - } + const claimed = Array.from(claimedKeys.entries()).find(([key]) => + keyBindingsConflict(key, canonicalKey), + ); if (claimed) { const [claimedKey, owner] = claimed; const appCommandShadowsCodeMirrorDefault = @@ -1626,7 +1596,6 @@ function rebuildKeymap() { cachedKeyBindingConflicts = conflicts; cachedKeymap = bindings; resolvedKeyBindingsVersion += 1; - keymapDirty = false; return bindings; } @@ -1674,7 +1643,6 @@ export function executeCommand(name, view, args) { } export function getRegisteredCommands() { - ensureKeymap(); return Array.from(commandMap.values()).map((command) => ({ name: command.name, description: command.description || command.defaultDescription, @@ -1683,27 +1651,22 @@ export function getRegisteredCommands() { } export function getResolvedKeyBindings() { - ensureKeymap(); return cachedResolvedKeyBindings; } export function getEffectiveKeyBindings() { - ensureKeymap(); return cachedEffectiveKeyBindings; } export function getKeyBindingConflicts() { - ensureKeymap(); return cachedKeyBindingConflicts.map((conflict) => ({ ...conflict })); } export function getResolvedKeyBindingsVersion() { - ensureKeymap(); return resolvedKeyBindingsVersion; } export function getCommandKeymapExtension() { - ensureKeymap(); return commandKeymapCompartment.of(keymap.of(cachedKeymap)); } @@ -1791,11 +1754,9 @@ export function registerExternalCommand(descriptor = {}) { const stored = commandMap.get(name); if (stored) { stored.key = normalized.key ?? stored.key; - // The returned command reflects its final binding right away. - syncCommandBinding(stored, name); } - invalidateKeymap(); + rebuildKeymap(); return stored; } @@ -1804,34 +1765,13 @@ export function removeExternalCommand(name) { const exists = commandMap.has(name); if (!exists) return false; commandMap.delete(name); - invalidateKeymap(); + rebuildKeymap(); return true; } -/** - * Apply the current keymap to a view. Calls made in the same task are applied - * together in a microtask, which always runs before the next key event. - */ export function refreshCommandKeymap(view) { const resolvedView = resolveView(view); - if (!resolvedView) return; - pendingKeymapViews.add(resolvedView); - if (keymapRefreshScheduled) return; - keymapRefreshScheduled = true; - Promise.resolve().then(flushKeymapRefresh); -} - -function flushKeymapRefresh() { - keymapRefreshScheduled = false; - const views = Array.from(pendingKeymapViews); - pendingKeymapViews.clear(); - for (const view of views) { - try { - applyCommandKeymap(view); - } catch (error) { - console.error("Failed to apply command keymap", error); - } - } + applyCommandKeymap(resolvedView); } function normalizeExternalCommand(descriptor) { @@ -1887,9 +1827,8 @@ function normalizeExternalKey(bindKey) { return combos.length ? combos.join("|") : null; } -function applyCommandKeymap(view, bindings) { +function applyCommandKeymap(view, bindings = cachedKeymap) { if (!view) return; - ensureKeymap(); commandViews.add(view); view.dispatch({ effects: commandKeymapCompartment.reconfigure( diff --git a/src/cm/keyBindingUtils.js b/src/cm/keyBindingUtils.js index 1ebcdeb10f..69e2a3583b 100644 --- a/src/cm/keyBindingUtils.js +++ b/src/cm/keyBindingUtils.js @@ -45,18 +45,8 @@ export function toCodeMirrorKey(combo) { return strokes.length ? strokes.join(" ") : null; } -// Conflict checks compare every binding with every other one each time the -// keymap is rebuilt (once per registered command), so cache the parsed form. -const canonicalKeyCache = new Map(); - export function canonicalizeKeyBinding(combo) { - if (typeof combo !== "string") { - return toCodeMirrorKey(combo)?.toLowerCase() || null; - } - if (canonicalKeyCache.has(combo)) return canonicalKeyCache.get(combo); - const canonicalKey = toCodeMirrorKey(combo)?.toLowerCase() || null; - canonicalKeyCache.set(combo, canonicalKey); - return canonicalKey; + return toCodeMirrorKey(combo)?.toLowerCase() || null; } /** diff --git a/src/cm/themes/index.js b/src/cm/themes/index.js index 1043b60c66..dbcd67eba1 100644 --- a/src/cm/themes/index.js +++ b/src/cm/themes/index.js @@ -116,19 +116,6 @@ function resolveThemeEntryExtensions(theme, fallbackExtensions) { } export function addTheme(id, caption, isDark, getExtension, config = null) { - return registerTheme(id, caption, isDark, getExtension, config, true); -} - -/** - * Registers a bundled theme. These are known to be valid, so the up-front - * validation (which builds every theme's extensions at startup) is skipped; - * they are still validated when applied. - */ -function addBuiltInTheme(id, caption, isDark, getExtension, config = null) { - return registerTheme(id, caption, isDark, getExtension, config, false); -} - -function registerTheme(id, caption, isDark, getExtension, config, validate) { const key = String(id || "") .trim() .toLowerCase(); @@ -142,7 +129,7 @@ function registerTheme(id, caption, isDark, getExtension, config, validate) { config: config || null, }; - if (validate && !validateThemeExtensions(key, theme.getExtension())) { + if (!validateThemeExtensions(key, theme.getExtension())) { return false; } @@ -177,127 +164,115 @@ export function removeTheme(id) { themes.delete(String(id).toLowerCase()); } -addBuiltInTheme("one_dark", "One Dark", true, () => [oneDark], oneDarkConfig); -addBuiltInTheme( - auraConfig.name, - "Aura", - !!auraConfig.dark, - () => aura(), - auraConfig, -); -addBuiltInTheme( +addTheme("one_dark", "One Dark", true, () => [oneDark], oneDarkConfig); +addTheme(auraConfig.name, "Aura", !!auraConfig.dark, () => aura(), auraConfig); +addTheme( cobaltConfig.name, "Cobalt", !!cobaltConfig.dark, () => cobalt(), cobaltConfig, ); -addBuiltInTheme( +addTheme( noctisLilacConfig.name, noctisLilacConfig.caption || "Noctis Lilac", !!noctisLilacConfig.dark, () => noctisLilac(), noctisLilacConfig, ); -addBuiltInTheme( +addTheme( draculaConfig.name, "Dracula", !!draculaConfig.dark, () => dracula(), draculaConfig, ); -addBuiltInTheme( - nordConfig.name, - "Nord", - !!nordConfig.dark, - () => nord(), - nordConfig, -); -addBuiltInTheme( +addTheme(nordConfig.name, "Nord", !!nordConfig.dark, () => nord(), nordConfig); +addTheme( gruvboxDarkConfig.name, "Gruvbox Dark", !!gruvboxDarkConfig.dark, () => gruvboxDark(), gruvboxDarkConfig, ); -addBuiltInTheme( +addTheme( ayuDarkConfig.name, "Ayu Dark", !!ayuDarkConfig.dark, () => ayuDark(), ayuDarkConfig, ); -addBuiltInTheme( +addTheme( materialPalenightConfig.name, "Material Palenight", !!materialPalenightConfig.dark, () => materialPalenight(), materialPalenightConfig, ); -addBuiltInTheme( +addTheme( githubDarkConfig.name, "GitHub Dark", !!githubDarkConfig.dark, () => githubDark(), githubDarkConfig, ); -addBuiltInTheme( +addTheme( githubLightConfig.name, "GitHub Light", !!githubLightConfig.dark, () => githubLight(), githubLightConfig, ); -addBuiltInTheme( +addTheme( solarizedDarkConfig.name, "Solarized Dark", !!solarizedDarkConfig.dark, () => solarizedDark(), solarizedDarkConfig, ); -addBuiltInTheme( +addTheme( solarizedLightConfig.name, "Solarized Light", !!solarizedLightConfig.dark, () => solarizedLight(), solarizedLightConfig, ); -addBuiltInTheme( +addTheme( tokyoNightDayConfig.name, "Tokyo Night Day", !!tokyoNightDayConfig.dark, () => tokyoNightDay(), tokyoNightDayConfig, ); -addBuiltInTheme( +addTheme( tokyoNightConfig.name, "Tokyo Night", !!tokyoNightConfig.dark, () => tokyoNight(), tokyoNightConfig, ); -addBuiltInTheme( +addTheme( tomorrowNightConfig.name, "Tomorrow Night", !!tomorrowNightConfig.dark, () => tomorrowNight(), tomorrowNightConfig, ); -addBuiltInTheme( +addTheme( tomorrowNightBrightConfig.name, "Tomorrow Night Bright", !!tomorrowNightBrightConfig.dark, () => tomorrowNightBright(), tomorrowNightBrightConfig, ); -addBuiltInTheme( +addTheme( monokaiConfig.name, "Monokai", !!monokaiConfig.dark, () => monokai(), monokaiConfig, ); -addBuiltInTheme( +addTheme( vscodeDarkConfig.name, "VS Code Dark", !!vscodeDarkConfig.dark, @@ -306,7 +281,7 @@ addBuiltInTheme( ); for (const config of catppuccinConfigs) { - addBuiltInTheme( + addTheme( config.name, config.caption, config.dark, diff --git a/src/components/terminal/loader.js b/src/components/terminal/loader.js deleted file mode 100644 index 336118e1ec..0000000000 --- a/src/components/terminal/loader.js +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Loads the terminal manager (and xterm) on demand so it stays out of the - * startup bundle. - */ - -/** @type {import("./terminalManager").default | null} */ -let manager = null; -/** @type {Promise | null} */ -let loading = null; - -/** - * The terminal manager if it has already been loaded, otherwise null. - */ -export function getLoadedTerminalManager() { - return manager; -} - -/** - * Loads the terminal manager, reusing the pending load if one is in flight. - * @returns {Promise} - */ -export function loadTerminalManager() { - loading ??= import( - /* webpackChunkName: "terminal" */ "./terminalManager" - ).then( - ({ default: terminalManager }) => { - manager = terminalManager; - return terminalManager; - }, - (error) => { - loading = null; - throw error; - }, - ); - return loading; -} diff --git a/src/fileSystem/ftp.js b/src/fileSystem/ftp.js index 98f4c9ef7c..8ba1ea7206 100644 --- a/src/fileSystem/ftp.js +++ b/src/fileSystem/ftp.js @@ -1,7 +1,7 @@ import settings from "lib/settings"; +import mimeType from "mime-types"; import { decode, encode } from "utils/encodings"; import helpers from "utils/helpers"; -import loadMimeTypes from "utils/mimeTypes"; import Path from "utils/Path"; import Url from "utils/Url"; import internalFs from "./internalFs"; @@ -91,7 +91,6 @@ class FtpClient { async listDir() { await this.#connectIfNotConnected(); - const mimeType = await loadMimeTypes(); return new Promise((resolve, reject) => { ftp.listDirectory( this.#conId, @@ -283,7 +282,6 @@ class FtpClient { } async #getStat(url = this.#path) { - const mimeType = await loadMimeTypes(); return new Promise((resolve, reject) => { ftp.getStat( this.#conId, diff --git a/src/fileSystem/sftp.js b/src/fileSystem/sftp.js index d30b50f3c0..803be8af45 100644 --- a/src/fileSystem/sftp.js +++ b/src/fileSystem/sftp.js @@ -1,7 +1,7 @@ import settings from "lib/settings"; +import mimeType from "mime-types"; import { decode, encode } from "utils/encodings"; import helpers from "utils/helpers"; -import loadMimeTypes from "utils/mimeTypes"; import Path from "utils/Path"; import Url from "utils/Url"; import internalFs from "./internalFs"; @@ -44,8 +44,7 @@ class SftpClient { * @param {String} filename * @param {boolean} stat */ - async lsDir(filename = this.#path) { - const mimeType = await loadMimeTypes(); + lsDir(filename = this.#path) { return new Promise((resolve, reject) => { sftp.isConnected(async (connectionID) => { (async () => { @@ -460,7 +459,6 @@ class SftpClient { async stat() { if (this.#stat) return this.#stat; - const mimeType = await loadMimeTypes(); return new Promise((resolve, reject) => { sftp.isConnected(async (connectionID) => { (async () => { diff --git a/src/lib/acode.js b/src/lib/acode.js index 55785a14aa..2870fc0a98 100644 --- a/src/lib/acode.js +++ b/src/lib/acode.js @@ -34,12 +34,7 @@ import Page from "components/page"; import palette from "components/palette"; import settingsPage from "components/settingsPage"; import SideButton from "components/sideButton"; -import { - getLoadedTerminalManager, - loadTerminalManager, -} from "components/terminal/loader"; -import TerminalThemeManager from "components/terminal/terminalThemeManager"; -import TerminalTouchSelection from "components/terminal/terminalTouchSelection"; +import { TerminalManager, TerminalThemeManager } from "components/terminal"; import toast from "components/toast"; import tutorial from "components/tutorial"; import alert from "dialogs/alert"; @@ -299,24 +294,20 @@ class Acode { }; const terminalTouchSelectionMoreOptions = { - add: (option) => TerminalTouchSelection.addMoreOption(option), - remove: (id) => TerminalTouchSelection.removeMoreOption(id), - list: () => TerminalTouchSelection.getMoreOptions(), + add: (option) => TerminalManager.addTouchSelectionMoreOption(option), + remove: (id) => TerminalManager.removeTouchSelectionMoreOption(id), + list: () => TerminalManager.getTouchSelectionMoreOptions(), }; const terminalModule = { - create: async (options) => - (await loadTerminalManager()).createTerminal(options), - createLocal: async (options) => - (await loadTerminalManager()).createLocalTerminal(options), - createServer: async (options) => - (await loadTerminalManager()).createServerTerminal(options), - // No terminal can exist before the manager has loaded. - get: (id) => getLoadedTerminalManager()?.getTerminal(id) ?? null, - getAll: () => getLoadedTerminalManager()?.getAllTerminals() ?? new Map(), + create: (options) => TerminalManager.createTerminal(options), + createLocal: (options) => TerminalManager.createLocalTerminal(options), + createServer: (options) => TerminalManager.createServerTerminal(options), + get: (id) => TerminalManager.getTerminal(id), + getAll: () => TerminalManager.getAllTerminals(), write: (id, data) => this.#secureTerminalWrite(id, data), - clear: (id) => getLoadedTerminalManager()?.clearTerminal(id), - close: async (id) => (await loadTerminalManager()).closeTerminal(id), + clear: (id) => TerminalManager.clearTerminal(id), + close: (id) => TerminalManager.closeTerminal(id), moreOptions: terminalTouchSelectionMoreOptions, touchSelection: { moreOptions: terminalTouchSelectionMoreOptions, @@ -560,7 +551,7 @@ class Acode { } // If all security checks pass, proceed with writing - return getLoadedTerminalManager()?.writeToTerminal(id, data); + return TerminalManager.writeToTerminal(id, data); } /** diff --git a/src/lib/commands.js b/src/lib/commands.js index b0584442ab..de3a005a8e 100644 --- a/src/lib/commands.js +++ b/src/lib/commands.js @@ -16,7 +16,7 @@ import EditorFile from "./editorFile"; import { loadFileBrowser } from "./lazyImports"; import openFile from "./openFile"; import openFolder from "./openFolder"; -import runLazily from "./runLazily"; +import run from "./run"; import saveState from "./saveState"; import appSettings from "./settings"; import showFileInfo from "./showFileInfo"; @@ -287,7 +287,7 @@ export default { resolveReferenceFile(referenceFile)?.togglePinned?.(); }, console() { - void runLazily(true, "inapp"); + run(true, "inapp"); }, "check-files"() { if (!appSettings.value.checkFiles) return; diff --git a/src/lib/editorFile.js b/src/lib/editorFile.js index b9a736f06b..03a8c3ba0e 100644 --- a/src/lib/editorFile.js +++ b/src/lib/editorFile.js @@ -18,16 +18,16 @@ import actions from "handlers/quickTools"; import { openTabContextMenuOnRelease } from "handlers/tabContextMenu"; import tag from "html-tag-js"; import quickToolsAdapters from "lib/quickToolsAdapter"; +import mimeTypes from "mime-types"; import { applyHighlightStyles } from "utils/codeHighlight"; import helpers from "utils/helpers"; -import loadMimeTypes from "utils/mimeTypes"; import Path from "utils/Path"; import { readRemoteFilePreview } from "utils/remoteFilePreview"; import Url from "utils/Url"; import config from "./config"; import { isInitialPluginLoadComplete } from "./loadPlugins"; import openFolder from "./openFolder"; -import runLazily from "./runLazily"; +import run from "./run"; import saveFile from "./saveFile"; import appSettings from "./settings"; @@ -1788,10 +1788,7 @@ export default class EditorFile { async #fileAction(action, mimeType) { try { const uri = await this.#getShareableUri(); - if (!mimeType) { - const mimeTypes = await loadMimeTypes(); - mimeType = mimeTypes.lookup(this.name) || "text/plain"; - } + if (!mimeType) mimeType = mimeTypes.lookup(this.name) || "text/plain"; system.fileAction( uri, this.filename, @@ -2031,7 +2028,7 @@ export default class EditorFile { const event = createFileEvent(this); this.#emit("run", event); if (event.defaultPrevented) return; - void runLazily(false, appSettings.value.previewMode, file); + run(false, appSettings.value.previewMode, file); } #updateTab() { diff --git a/src/lib/runLazily.js b/src/lib/runLazily.js deleted file mode 100644 index cc21326ae3..0000000000 --- a/src/lib/runLazily.js +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Runs/previews a file, loading the runner on first use. The runner pulls in - * markdown-it and the markdown preview, which are not needed at startup. - * @param {...any} args arguments for lib/run - */ -export default async function runLazily(...args) { - const { default: run } = await import(/* webpackChunkName: "run" */ "./run"); - return run(...args); -} diff --git a/src/main.js b/src/main.js index bd62a94561..cf91423da2 100644 --- a/src/main.js +++ b/src/main.js @@ -8,8 +8,6 @@ import "styles/overrideAceStyle.scss"; import "styles/wideScreen.scss"; // Editor tabs use a shadow root that only links build/main.css. import "pages/welcome/welcome.scss"; -// Terminal code loads on demand; keep its styles in main.css as before. -import "@xterm/xterm/css/xterm.css"; import "lib/polyfill"; import "cm/supportedModes"; @@ -28,7 +26,6 @@ import { } from "cm/modelist"; import Contextmenu from "components/contextmenu"; import Sidebar from "components/sidebar"; -import { loadTerminalManager } from "components/terminal/loader"; import tile from "components/tile"; import toast from "components/toast"; import { initIconTooltips } from "components/tooltip"; @@ -76,12 +73,6 @@ import $_fileMenu from "views/file-menu.hbs"; import $_menu from "views/menu.hbs"; import auth, { loginEvents } from "./lib/auth"; -/** - * Settles once the startup purchase check can no longer change Pro status. - * Plugins wait for it so they initialize with the final value. - */ -let proStatusReady = Promise.resolve(); - const oldPreventDefault = TouchEvent.prototype.preventDefault; const previousVersionCode = Number.parseInt(localStorage.versionCode, 10); const logger = new Logger(); @@ -127,6 +118,8 @@ async function ensurePermission(permission) { } async function onDeviceReady() { + await initEncodings(); // important to load encodings before anything else + const isFreePackage = /(free)$/.test(BuildInfo.packageName); const oldResolveURL = window.resolveLocalFileSystemURL; const { @@ -152,36 +145,27 @@ async function onDeviceReady() { } } - // Start the Play Billing check first so it runs alongside the rest of - // startup instead of blocking it. - config.HAS_PRO = !isFreePackage || localStorage.acode_pro === "true"; - const proPurchaseCheck = verifyProPurchase(isFreePackage); - // Paid builds are always Pro, so only a free build's check can change it. - proStatusReady = isFreePackage ? proPurchaseCheck : Promise.resolve(); - - // These native calls are independent, so run them together. - const [dataStorage, cacheStorage, installSource, androidSdkInt] = - await Promise.all([ - resolveStorageDir(externalDataDirectory, dataDirectory), - resolveStorageDir(externalCacheDirectory, cacheDirectory), - getInstallSource(), - getAndroidSdkInt(), - initEncodings(), // important to load encodings before anything else - ]); - window.app = document.body; window.root = tag.get("#root"); window.addedFolder = addedFolder; window.editorManager = null; window.toast = toast; window.ASSETS_DIRECTORY = Url.join(cordova.file.applicationDirectory, "www"); - window.DATA_STORAGE = dataStorage; - window.CACHE_STORAGE = cacheStorage; + window.DATA_STORAGE = await resolveStorageDir( + externalDataDirectory, + dataDirectory, + ); + window.CACHE_STORAGE = await resolveStorageDir( + externalCacheDirectory, + cacheDirectory, + ); window.PLUGIN_DIR = Url.join(DATA_STORAGE, "plugins"); window.KEYBINDING_FILE = Url.join(DATA_STORAGE, ".key-bindings.json"); window.log = logger.log.bind(logger); + config.HAS_PRO = !isFreePackage; + // Capture synchronous errors window.addEventListener("error", (event) => { const errorMsg = `Error: ${event.message}, Source: ${event.filename}, Line: ${event.lineno}, Column: ${event.colno}, Stack: ${event.error?.stack || "N/A"}`; @@ -195,6 +179,14 @@ async function onDeviceReady() { ); }); + let installSource = INSTALL_SOURCE_PLAY; + + try { + installSource = await helpers.promisify(system.getInstaller); + } catch (error) { + console.error(error); + } + Object.defineProperty(window, "appInstallSource", { get() { return installSource; @@ -206,7 +198,39 @@ async function onDeviceReady() { enumerable: false, }); - window.ANDROID_SDK_INT = androidSdkInt; + try { + await helpers.promisify(iap.startConnection).catch((e) => { + window.log("error", "connection error"); + window.log("error", e); + }); + + if (localStorage.acode_pro === "true") { + config.HAS_PRO = true; + } + + if (navigator.onLine) { + const purchases = await helpers.promisify(iap.getPurchases); + const isPro = purchases.find((p) => + p.productIds.includes("acode_pro_new"), + ); + if (isPro) { + config.HAS_PRO = true; + } else { + config.HAS_PRO = !isFreePackage; + } + } + } catch (error) { + window.log("error", "Purchase error"); + window.log("error", error); + } + + try { + window.ANDROID_SDK_INT = await new Promise((resolve, reject) => + system.getAndroidVersion(resolve, reject), + ); + } catch (error) { + window.ANDROID_SDK_INT = Number.parseInt(device.version); + } window.DOES_SUPPORT_THEME = (() => { const $testEl = (
    - requestAnimationFrame(() => void onAppRendered(proPurchaseCheck)), - ); + setTimeout(async () => { + document.body.removeAttribute("data-small-msg"); + app.classList.remove("loading", "splash"); + + // load plugins + try { + await loadPlugins(); + fileIcons.refreshRenderedIcons(); + // Ensure at least one sidebar app is active after all plugins are loaded + // This handles cases where the stored section was from an uninstalled plugin + sidebarApps.ensureActiveApp(); + + // Re-emit events for active file after plugins are loaded + const { activeFile } = editorManager; + for (const file of editorManager.files) { + if (file?.type === "editor") { + file.setMode(); + } + } + editorManager.reapplyActiveFile(); + if (activeFile?.uri) { + if (activeFile.loaded && !activeFile.loading) { + editorManager.emit("file-loaded", activeFile); + } + // Re-emit switch-file event + editorManager.emit("switch-file", activeFile); + } + } catch (error) { + window.log("error", "Failed to load plugins!"); + window.log("error", error); + toast("Failed to load plugins!"); + } finally { + void processPendingIntents().catch(intentHandler.onError); + } + applySettings.afterRender(); + + // Check login status before emitting events + try { + const user = await auth.getLoggedInUser(); + if (user) { + if (Boolean(user.acode_pro)) { + config.HAS_PRO = true; + } + loginEvents.emit(); + } + } catch (error) { + console.error("Error checking login status:", error); + } + + fetchPromotions(); + startAd(); + }, 500); } await promptUpdateCheckConsent(); @@ -434,122 +501,6 @@ async function onDeviceReady() { .catch(console.error); } -async function getInstallSource() { - try { - return await helpers.promisify(system.getInstaller); - } catch (error) { - console.error(error); - return INSTALL_SOURCE_PLAY; - } -} - -async function getAndroidSdkInt() { - try { - return await new Promise((resolve, reject) => - system.getAndroidVersion(resolve, reject), - ); - } catch (error) { - return Number.parseInt(device.version); - } -} - -/** - * Confirms Pro status against Play purchases. - * Only a change made here is applied, so an upgrade from another source - * (e.g. a login that finished first) is never downgraded. - * @param {boolean} isFreePackage - */ -async function verifyProPurchase(isFreePackage) { - const initialHasPro = config.HAS_PRO; - try { - await helpers.promisify(iap.startConnection).catch((e) => { - logger.log("error", "connection error"); - logger.log("error", e); - }); - - if (!navigator.onLine) return; - - const purchases = await helpers.promisify(iap.getPurchases); - const isPro = purchases.find((p) => p.productIds.includes("acode_pro_new")); - if (isPro) { - config.HAS_PRO = true; - // Lets the next launch skip waiting for this check. - localStorage.acode_pro = "true"; - } else if (config.HAS_PRO === initialHasPro) { - config.HAS_PRO = !isFreePackage; - } - } catch (error) { - logger.log("error", "Purchase error"); - logger.log("error", error); - } -} - -/** - * Hides the splash and loads everything that is not needed for the first - * frame: plugins, login state and ads. - * @param {Promise} proPurchaseCheck - */ -async function onAppRendered(proPurchaseCheck) { - document.body.removeAttribute("data-small-msg"); - app.classList.remove("loading", "splash"); - - // load plugins - try { - // Plugins may use the synchronous terminal APIs, so have them ready. - await loadTerminalManager().catch((error) => { - console.error("Failed to load terminal module:", error); - }); - await proStatusReady; - await loadPlugins(); - fileIcons.refreshRenderedIcons(); - // Ensure at least one sidebar app is active after all plugins are loaded - // This handles cases where the stored section was from an uninstalled plugin - sidebarApps.ensureActiveApp(); - - // Re-emit events for active file after plugins are loaded - const { activeFile } = editorManager; - for (const file of editorManager.files) { - if (file?.type === "editor") { - file.setMode(); - } - } - editorManager.reapplyActiveFile(); - if (activeFile?.uri) { - if (activeFile.loaded && !activeFile.loading) { - editorManager.emit("file-loaded", activeFile); - } - // Re-emit switch-file event - editorManager.emit("switch-file", activeFile); - } - } catch (error) { - window.log("error", "Failed to load plugins!"); - window.log("error", error); - toast("Failed to load plugins!"); - } finally { - void processPendingIntents().catch(intentHandler.onError); - } - applySettings.afterRender(); - - // The purchase result must be applied before login can upgrade to Pro. - await proPurchaseCheck; - - // Check login status before emitting events - try { - const user = await auth.getLoggedInUser(); - if (user) { - if (Boolean(user.acode_pro)) { - config.HAS_PRO = true; - } - loginEvents.emit(); - } - } catch (error) { - console.error("Error checking login status:", error); - } - - fetchPromotions(); - startAd(); -} - function showSftpMigrationReport({ failures, removedReferences, @@ -810,9 +761,6 @@ async function loadApp() { openWelcomeTab(); } - // Plugins read Pro status while initializing, so let it settle first. - await proStatusReady; - // load theme plugins try { await loadPlugins(true); @@ -854,8 +802,8 @@ async function loadApp() { acode.exec("save-state"); initFileList(); - loadTerminalManager().then( - (TerminalManager) => { + import(/* webpackChunkName: "terminal" */ "components/terminal").then( + ({ TerminalManager }) => { TerminalManager.restorePersistedSessions().catch((error) => { console.error("Terminal restoration failed:", error); }); diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index aabbbb19e6..dcb53c4890 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -6,6 +6,7 @@ import Checkbox from "components/checkbox"; import Contextmenu from "components/contextmenu"; import Page from "components/page"; import searchBar from "components/searchbar"; +import terminalManager from "components/terminal/terminalManager"; import alert from "dialogs/alert"; import confirm from "dialogs/confirm"; import loader from "dialogs/loader"; @@ -21,12 +22,12 @@ import recents from "lib/recents"; import remoteStorage from "lib/remoteStorage"; import appSettings from "lib/settings"; import { deleteSftpProfile, getSftpProfileId } from "lib/sftpProfiles"; +import mimeTypes from "mime-types"; import mustache from "mustache"; import filesSettings from "settings/filesSettings"; import URLParse from "url-parse"; import copyEntry from "utils/copyEntry"; import helpers from "utils/helpers"; -import loadMimeTypes from "utils/mimeTypes"; import Url from "utils/Url"; import _addMenu from "./add-menu.hbs"; import _addMenuHome from "./add-menu-home.hbs"; @@ -1196,7 +1197,6 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { break; } - const mimeTypes = await loadMimeTypes(); const mimeType = mimeTypes.lookup(name) || mimeTypes.lookup(shareableUri) || diff --git a/src/pages/fontManager/fontManager.js b/src/pages/fontManager/fontManager.js index 33c7aab3ca..d615aa1217 100644 --- a/src/pages/fontManager/fontManager.js +++ b/src/pages/fontManager/fontManager.js @@ -2,7 +2,7 @@ import "./style.scss"; import fsOperation from "fileSystem"; import Page from "components/page"; import searchBar from "components/searchbar"; -import { DEFAULT_TERMINAL_SETTINGS } from "components/terminal/terminalDefaults"; +import { DEFAULT_TERMINAL_SETTINGS } from "components/terminal"; import toast from "components/toast"; import confirm from "dialogs/confirm"; import dialog from "dialogs/dialog"; diff --git a/src/pages/plugin/plugin.js b/src/pages/plugin/plugin.js index d9a74f460a..8afc97a263 100644 --- a/src/pages/plugin/plugin.js +++ b/src/pages/plugin/plugin.js @@ -18,9 +18,9 @@ import anchor from "markdown-it-anchor"; import markdownItFootnote from "markdown-it-footnote"; import MarkdownItGitHubAlerts from "markdown-it-github-alerts"; import markdownItTaskLists from "markdown-it-task-lists"; +import mimeTypes from "mime-types"; import { highlightCodeBlock, initHighlighting } from "utils/codeHighlight"; import helpers from "utils/helpers"; -import loadMimeTypes from "utils/mimeTypes"; import Url from "utils/Url"; import { isVersionGreater } from "utils/version"; import view, { cleanups } from "./plugin.view.js"; @@ -121,7 +121,6 @@ export default async function PluginInclude( Url.join(PLUGIN_DIR, id, installedPlugin.icon), ); const iconData = await fsOperation(iconUrl).readFile(); - const mimeTypes = await loadMimeTypes(); const iconMimeType = mimeTypes.lookup(installedPlugin.icon) || "image/png"; const icon = URL.createObjectURL( diff --git a/src/pages/plugins/plugins.js b/src/pages/plugins/plugins.js index 52272210f0..4062a988f2 100644 --- a/src/pages/plugins/plugins.js +++ b/src/pages/plugins/plugins.js @@ -673,9 +673,9 @@ export default function PluginsInclude(updates) { $list.owned.setAttribute("empty-msg", strings["loading..."]); let iapPurchases = []; - const disabledMap = settings.value.pluginsDisabled || {}; if (helpers.isIapAvailable()) { iapPurchases = await helpers.promisify(iap.getPurchases); + const disabledMap = settings.value.pluginsDisabled || {}; iapPurchases.forEach(async ({ productIds }) => { const [sku] = productIds; diff --git a/src/pages/sponsor/sponsor.js b/src/pages/sponsor/sponsor.js index 36c32ce08f..02b53475fd 100644 --- a/src/pages/sponsor/sponsor.js +++ b/src/pages/sponsor/sponsor.js @@ -242,7 +242,6 @@ async function handlePurchase(productId, title) { }); } - // multiPrompt rejects when the dialog is cancelled. result = await multiPrompt(onlyTitle(title), [ { placeholder: "Name", @@ -265,7 +264,7 @@ async function handlePurchase(productId, title) { type: "checkbox", value: true, }, - ]).catch(() => null); + ]); if (!result) { return; diff --git a/src/pages/themeSetting/themeSetting.js b/src/pages/themeSetting/themeSetting.js index 815c44b917..e22081a407 100644 --- a/src/pages/themeSetting/themeSetting.js +++ b/src/pages/themeSetting/themeSetting.js @@ -8,7 +8,7 @@ import { basicSetup, EditorView } from "codemirror"; import Page from "components/page"; import searchBar from "components/searchbar"; import TabView from "components/tabView"; -import TerminalThemeManager from "components/terminal/terminalThemeManager"; +import { TerminalThemeManager } from "components/terminal"; import alert from "dialogs/alert"; import Ref from "html-tag-js/ref"; import actionStack from "lib/actionStack"; diff --git a/src/settings/terminalSettings.js b/src/settings/terminalSettings.js index 35a82179fd..e8e07112b6 100644 --- a/src/settings/terminalSettings.js +++ b/src/settings/terminalSettings.js @@ -1,7 +1,9 @@ import fsOperation from "fileSystem"; import settingsPage from "components/settingsPage"; -import { DEFAULT_TERMINAL_SETTINGS } from "components/terminal/terminalDefaults"; -import TerminalThemeManager from "components/terminal/terminalThemeManager"; +import { + DEFAULT_TERMINAL_SETTINGS, + TerminalThemeManager, +} from "components/terminal"; import toast from "components/toast"; import alert from "dialogs/alert"; import confirm from "dialogs/confirm"; diff --git a/src/sidebarApps/index.js b/src/sidebarApps/index.js index e97cc22e2e..4172f79917 100644 --- a/src/sidebarApps/index.js +++ b/src/sidebarApps/index.js @@ -86,16 +86,10 @@ function init($el) { * Loads all sidebar apps. */ async function loadApps() { - // Fetch the app chunks in parallel but add them in their original order. - const appModules = [ - import("./files"), - import("./searchInFiles"), - import("./extensions"), - import("./notification"), - ]; - for (const appModule of appModules) { - add(...(await appModule).default); - } + add(...(await import("./files")).default); + add(...(await import("./searchInFiles")).default); + add(...(await import("./extensions")).default); + add(...(await import("./notification")).default); setSponsorSidebarAppVisibility(appSettings.value.showSponsorSidebarApp); } diff --git a/src/utils/encodings.js b/src/utils/encodings.js index 662b808f57..71a1d892e0 100644 --- a/src/utils/encodings.js +++ b/src/utils/encodings.js @@ -201,63 +201,14 @@ export function encode(text, charset) { return execEncode(text, charset); } -const ENCODINGS_CACHE_KEY = "availableEncodingsCache"; - -/** - * The available charsets only change with the Android runtime, so the list is - * cached per app build and OS version instead of being rebuilt natively (and - * sent over the bridge) on every launch. - */ -function getEncodingsCacheId() { - return [ - globalThis.BuildInfo?.versionCode, - globalThis.device?.version, - globalThis.device?.model, - ].join("|"); -} - -function setEncodings(map) { - Object.keys(map).forEach((key) => { - const encoding = map[key]; - encodings[key] = encoding; - }); -} - -function readCachedEncodings() { - try { - const cached = JSON.parse(localStorage.getItem(ENCODINGS_CACHE_KEY)); - if (cached?.id !== getEncodingsCacheId()) return null; - const { map } = cached; - if (!map || typeof map !== "object" || !map["UTF-8"]) return null; - return map; - } catch { - return null; - } -} - -function writeCachedEncodings(map) { - try { - localStorage.setItem( - ENCODINGS_CACHE_KEY, - JSON.stringify({ id: getEncodingsCacheId(), map }), - ); - } catch (error) { - console.warn("Unable to cache available encodings", error); - } -} - export async function initEncodings() { - const cachedMap = readCachedEncodings(); - if (cachedMap) { - setEncodings(cachedMap); - return; - } - return new Promise((resolve, reject) => { cordova.exec( (map) => { - setEncodings(map); - writeCachedEncodings(map); + Object.keys(map).forEach((key) => { + const encoding = map[key]; + encodings[key] = encoding; + }); resolve(); }, (error) => { diff --git a/src/utils/mimeTypes.js b/src/utils/mimeTypes.js deleted file mode 100644 index f5bc130432..0000000000 --- a/src/utils/mimeTypes.js +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Loads the mime-types package on demand. Its MIME database is large and is - * never needed during startup. - * @returns {Promise} - */ -export default async function loadMimeTypes() { - const { default: mimeTypes } = await import( - /* webpackChunkName: "mimeTypes" */ "mime-types" - ); - return mimeTypes; -} diff --git a/tests/unit/commandRegistryKeymap.test.js b/tests/unit/commandRegistryKeymap.test.js deleted file mode 100644 index 429a100aa9..0000000000 --- a/tests/unit/commandRegistryKeymap.test.js +++ /dev/null @@ -1,124 +0,0 @@ -import { expect, it, vi } from "vitest"; -import { loadSourceModule } from "../helpers/loadSourceModule"; - -async function loadRegistry() { - const keyBindingUtils = await import("cm/keyBindingUtils"); - const stubs = Object.fromEntries( - [ - "fileSystem", - "@codemirror/commands", - "@codemirror/language", - "@codemirror/lint", - "@codemirror/lsp-client", - "cm/editorReadOnly", - "cm/foldAwareLineCommands", - "cm/foldingCommands", - "cm/lsp", - "cm/lsp/references", - "components/symbolsPanel", - "components/toast", - "dialogs/prompt", - "handlers/quickTools", - "lib/settings", - "utils/Url", - ].map((id) => [id, {}]), - ); - return loadSourceModule( - "src/cm/commandRegistry.js", - { - ...stubs, - "@codemirror/state": { - Compartment: class { - of(extension) { - return extension; - } - reconfigure(extension) { - return { reconfigure: extension }; - } - }, - EditorSelection: {}, - }, - "@codemirror/view": { keymap: { of: (bindings) => ({ bindings }) } }, - "cm/keyBindingUtils": keyBindingUtils, - "lib/keyBindings": { - __esModule: true, - default: {}, - APP_KEY_BINDING_NAMES: new Set(), - CODEMIRROR_COMMAND_NAMES: new Set(), - }, - }, - { editorManager: {} }, - ); -} - -const appliedKeys = (view, call) => - view.dispatch.mock.calls[call][0].effects.reconfigure.bindings.map( - (binding) => binding.key, - ); - -it("applies a burst of command registrations to the editor once, keeping reads current", async () => { - const registry = await loadRegistry(); - const view = { dispatch: vi.fn() }; - - const first = registry.registerExternalCommand({ - name: "pluginFirst", - exec() {}, - bindKey: "Ctrl-Alt-A", - }); - registry.refreshCommandKeymap(view); - registry.registerExternalCommand({ - name: "pluginSecond", - exec() {}, - bindKey: { win: "Ctrl-Alt-B" }, - }); - registry.refreshCommandKeymap(view); - - // The returned command and registry reads are up to date immediately. - expect(first.key).toBe("Ctrl-Alt-A"); - expect( - registry - .getRegisteredCommands() - .filter(({ name }) => name.startsWith("plugin")) - .map(({ name, key }) => [name, key]), - ).toEqual([ - ["pluginFirst", "Ctrl-Alt-A"], - ["pluginSecond", "Ctrl-Alt-B"], - ]); - - // The editor is reconfigured once, before any later event can run. - expect(view.dispatch).not.toHaveBeenCalled(); - await Promise.resolve(); - expect(view.dispatch).toHaveBeenCalledOnce(); - expect(appliedKeys(view, 0)).toEqual( - expect.arrayContaining(["Mod-Alt-a", "Mod-Alt-b"]), - ); - - registry.removeExternalCommand("pluginFirst"); - registry.refreshCommandKeymap(view); - await Promise.resolve(); - expect(view.dispatch).toHaveBeenCalledTimes(2); - expect(appliedKeys(view, 1)).not.toContain("Mod-Alt-a"); - expect(appliedKeys(view, 1)).toContain("Mod-Alt-b"); -}); - -it("reports a shortcut conflict with the earlier registered command", async () => { - const registry = await loadRegistry(); - registry.registerExternalCommand({ - name: "pluginOwner", - exec() {}, - bindKey: "Ctrl-K", - }); - registry.registerExternalCommand({ - name: "pluginChord", - exec() {}, - bindKey: "Ctrl-K Ctrl-X", - }); - - expect(registry.getKeyBindingConflicts()).toEqual([ - { - key: "Mod-k Mod-x", - command: "pluginChord", - shadowedBy: "pluginOwner", - }, - ]); -}); diff --git a/tests/unit/fileSaveEvents.test.js b/tests/unit/fileSaveEvents.test.js index a7c6a47b2d..ad6c5aa73f 100644 --- a/tests/unit/fileSaveEvents.test.js +++ b/tests/unit/fileSaveEvents.test.js @@ -9,7 +9,7 @@ function setup() { const write = vi.fn(async () => true); const manager = { files: [], getFile: () => null, addFile: file => manager.files.push(file), emit: vi.fn(), onupdate: vi.fn(), activeFile: null }; const defaults = Object.fromEntries([ - "fileSystem", "components/quickTools", "components/sidebar", "components/toast", "dialogs/confirm", "handlers/editorFileTab", "handlers/quickTools", "lib/quickToolsAdapter", "handlers/tabContextMenu", "dompurify", "utils/mimeTypes", "utils/codeHighlight", "utils/Path", "utils/remoteFilePreview", "utils/Url", "./loadPlugins", "./openFolder", "./runLazily", "cm/editorReadOnly", + "fileSystem", "components/quickTools", "components/sidebar", "components/toast", "dialogs/confirm", "handlers/editorFileTab", "handlers/quickTools", "lib/quickToolsAdapter", "handlers/tabContextMenu", "dompurify", "mime-types", "utils/codeHighlight", "utils/Path", "utils/remoteFilePreview", "utils/Url", "./loadPlugins", "./openFolder", "./run", "cm/editorReadOnly", ].map(id => [id, {}])); const { default: EditorFile } = loadSourceModule("src/lib/editorFile.js", { ...defaults, diff --git a/tests/unit/pluginFileRestoration.test.js b/tests/unit/pluginFileRestoration.test.js index 27a70a4432..2f33bf5940 100644 --- a/tests/unit/pluginFileRestoration.test.js +++ b/tests/unit/pluginFileRestoration.test.js @@ -153,11 +153,11 @@ function setup() { "handlers/quickTools", "handlers/tabContextMenu", "dompurify", - "utils/mimeTypes", + "mime-types", "utils/codeHighlight", "utils/Path", "./openFolder", - "./runLazily", + "./run", "cm/editorReadOnly", "lib/quickToolsAdapter", ].map((id) => [id, {}]), diff --git a/tests/unit/saveCommands.test.js b/tests/unit/saveCommands.test.js index 3414ca9b48..2576fdf490 100644 --- a/tests/unit/saveCommands.test.js +++ b/tests/unit/saveCommands.test.js @@ -5,7 +5,7 @@ function setup(files) { const manager = { files, activeFile: files[0], getFile: id => files.find(file => file.id === id) }; const toast = vi.fn(), error = vi.fn(); const dependencies = Object.fromEntries([ - "fileSystem", "@codemirror/commands", "cm/editorReadOnly", "components/sidebar", "dialogs/prompt", "handlers/quickTools", "lib/recents", "utils/color/regex", "utils/Url", "./checkFiles", "./config", "./editorFile", "./lazyImports", "./openFile", "./openFolder", "./runLazily", "./saveState", "./settings", "./showFileInfo", + "fileSystem", "@codemirror/commands", "cm/editorReadOnly", "components/sidebar", "dialogs/prompt", "handlers/quickTools", "lib/recents", "utils/color/regex", "utils/Url", "./checkFiles", "./config", "./editorFile", "./lazyImports", "./openFile", "./openFolder", "./run", "./saveState", "./settings", "./showFileInfo", ].map(id => [id, {}])); const module = loadSourceModule("src/lib/commands.js", { ...dependencies, "dialogs/confirm": async () => true, "dialogs/select": async () => "save", "utils/helpers": { error }, From a63983fd2f76d5ae44c73d062acb18c12bdc0e7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Sep 2026 15:33:28 +0000 Subject: [PATCH 140/195] chore(deps): bump actions/github-script from 7.1.0 to 9.0.0 (#2877) Bumps [actions/github-script](https://github.com/actions/github-script) from 7.1.0 to 9.0.0. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/f28e40c7f34bde8b3046d885e986cb6290c5673b...3a2844b7e9c422d3c10d287c895573f7108da1b3) --- updated-dependencies: - dependency-name: actions/github-script dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/congrats.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/congrats.yml b/.github/workflows/congrats.yml index 0ba154b32c..34fb958a8f 100644 --- a/.github/workflows/congrats.yml +++ b/.github/workflows/congrats.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Check PR author id: check - uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7 + uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 with: github-token: ${{ secrets.CONGRATSBOT_GITHUB_TOKEN }} script: | From a8594ff7d382b80e61982402393b1c32f411a076 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Oct 2026 08:28:28 +0000 Subject: [PATCH 141/195] chore(deps): bump ghcr.io/nordcominc/devcontainer-features/android-sdk (#2954) Bumps ghcr.io/nordcominc/devcontainer-features/android-sdk from 1.2.0 to 2.0.0. --- updated-dependencies: - dependency-name: ghcr.io/nordcominc/devcontainer-features/android-sdk dependency-version: 2.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .devcontainer/devcontainer-lock.json | 8 ++++---- .devcontainer/devcontainer.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/devcontainer-lock.json b/.devcontainer/devcontainer-lock.json index 3e6b014a8d..78f3facc47 100644 --- a/.devcontainer/devcontainer-lock.json +++ b/.devcontainer/devcontainer-lock.json @@ -5,10 +5,10 @@ "resolved": "ghcr.io/devcontainers/features/node@sha256:586c9a6f7dd40bd3ba2cd41e7f2f88dcc31fbe5d1442afcbf07ffbc66b686857", "integrity": "sha256:586c9a6f7dd40bd3ba2cd41e7f2f88dcc31fbe5d1442afcbf07ffbc66b686857" }, - "ghcr.io/nordcominc/devcontainer-features/android-sdk:1": { - "version": "1.2.0", - "resolved": "ghcr.io/nordcominc/devcontainer-features/android-sdk@sha256:c3e0c7e1b12fce18a257e163ade8515e534e58a7edad10dfb6d1fb1a250a307e", - "integrity": "sha256:c3e0c7e1b12fce18a257e163ade8515e534e58a7edad10dfb6d1fb1a250a307e" + "ghcr.io/nordcominc/devcontainer-features/android-sdk:2": { + "version": "2.0.0", + "resolved": "ghcr.io/nordcominc/devcontainer-features/android-sdk@sha256:17c25d5721b31e45564e864d5bdfead9eefab7a1624e69ac5cf51079e9f62f0b", + "integrity": "sha256:17c25d5721b31e45564e864d5bdfead9eefab7a1624e69ac5cf51079e9f62f0b" } } } diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2a7ab9a789..9b60c448ae 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -15,7 +15,7 @@ }, "features": { - "ghcr.io/nordcominc/devcontainer-features/android-sdk:1": { + "ghcr.io/nordcominc/devcontainer-features/android-sdk:2": { "platform": "36", "build_tools": "36.0.0" }, From 19ac7151b82291351253d7f3489fb91fc10b5897 Mon Sep 17 00:00:00 2001 From: curly72alpha <105135880+curly72alpha@users.noreply.github.com> Date: Sun, 4 Oct 2026 03:00:59 +0000 Subject: [PATCH 142/195] fix(lang): correct typos in Korean translation (#2957) Claude-Session: https://claude.ai/code/session_01TsMv3yunCauGQxTULBRfFU Co-authored-by: curly72alpha Co-authored-by: Claude Opus 5.5 --- src/lang/ko-kr.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lang/ko-kr.json b/src/lang/ko-kr.json index 74156bbda0..f331beb331 100644 --- a/src/lang/ko-kr.json +++ b/src/lang/ko-kr.json @@ -8,7 +8,7 @@ "autosave": "자동 저장", "cancel": "취소", "change language": "언어 변경", - "choose color": "생상 선택", + "choose color": "색상 선택", "clear": "지우기", "close app": "앱을 종료 하시겠습니까?", "commit message": "커밋 메세지", @@ -56,13 +56,13 @@ "not set": "설정 안함", "unsaved files close app": "저장안한 파일이 있습니다. 정말로 앱을 종료 하시겠습니까?", "notice": "공지", - "open file": "파일 욜기", + "open file": "파일 열기", "open files and folders": "폴더 또는 파일을 선택해 주세요", "open folder": "폴더를 선택해 주세요", "open recent": "최근 파일", "ok": "확인", "overwrite": "덮어쓰기", - "paste": "붙혀넣기", + "paste": "붙여넣기", "preview mode": "미리보기", "read only file": "읽기 전용 파일은 보존되지 않습니다. 저장하세요", "reload": "다시 불러오기", @@ -79,11 +79,11 @@ "select folder": "폴더 선택", "settings": "설정", "settings saved": "설정이 저장되었습니다", - "show line numbers": "라인 번호 ㅂ기", + "show line numbers": "라인 번호 보기", "show hidden files": "숨긴 파일 보기", "show spaces": "띄어쓰기 공간 보기", "soft tab": "Soft tab", - "sort by name": "이름 정령", + "sort by name": "이름 정렬", "success": "완료", "tab size": "Tab 크기", "text wrap": "텍스트 반환", @@ -97,7 +97,7 @@ "unable to open folder": "폴더를 열수가 없습니다", "unable to save file": "파일을 저장할 수 없습니다.", "unable to rename": "파일 이름변경을 할 수 없습니다", - "unsaved file": "이 파일은 저장되있지 않습니다 닫으시겠습니까?", + "unsaved file": "이 파일은 저장되어 있지 않습니다. 닫으시겠습니까?", "warning": "위험", "use emmet": "Use emmet", "use quick tools": "퀵 도구툴 사용", @@ -145,11 +145,11 @@ "show print margin": "여백표시", "login": "로그인", "scrollbar size": "스크롤바 크기", - "cursor controller size": "커서 컨트로러 크기", + "cursor controller size": "커서 컨트롤러 크기", "none": "없음", "small": "작은", "large": "큰", - "confirm on exit": "엡 종료시 확인", + "confirm on exit": "앱 종료 시 확인", "show console": "콘솔 보기", "image": "사진", "insert file": "파일 삽입", From 644df30a1094b178a582b3eeec609d446bd2c2d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Oct 2026 06:52:52 +0000 Subject: [PATCH 143/195] chore(deps): bump ghcr.io/devcontainers/features/node (#2961) Bumps ghcr.io/devcontainers/features/node from 2.1.0 to 2.1.1. --- updated-dependencies: - dependency-name: ghcr.io/devcontainers/features/node dependency-version: 2.1.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .devcontainer/devcontainer-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer-lock.json b/.devcontainer/devcontainer-lock.json index 78f3facc47..08e381109d 100644 --- a/.devcontainer/devcontainer-lock.json +++ b/.devcontainer/devcontainer-lock.json @@ -1,9 +1,9 @@ { "features": { "ghcr.io/devcontainers/features/node:2.1": { - "version": "2.1.0", - "resolved": "ghcr.io/devcontainers/features/node@sha256:586c9a6f7dd40bd3ba2cd41e7f2f88dcc31fbe5d1442afcbf07ffbc66b686857", - "integrity": "sha256:586c9a6f7dd40bd3ba2cd41e7f2f88dcc31fbe5d1442afcbf07ffbc66b686857" + "version": "2.1.1", + "resolved": "ghcr.io/devcontainers/features/node@sha256:2a19d3b0b3879437637cfd292eb29fee0afcfbe6364e33db9afc4f80c5c1f956", + "integrity": "sha256:2a19d3b0b3879437637cfd292eb29fee0afcfbe6364e33db9afc4f80c5c1f956" }, "ghcr.io/nordcominc/devcontainer-features/android-sdk:2": { "version": "2.0.0", From 326cf0df826d4a4a22145df52ff318bca0548c74 Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Sat, 10 Oct 2026 17:01:43 +0000 Subject: [PATCH 144/195] chore: fix Discord badge URL in README (#2965) Updated Discord badge URL to a new endpoint. --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 6732b02471..4ac444fff3 100644 --- a/readme.md +++ b/readme.md @@ -4,7 +4,7 @@

    -[![](https://img.shields.io/endpoint?logo=telegram&label=Acode&style=flat&url=https%3A%2F%2Facode.app%2Fapi%2Ftelegram-members-count)](https://t.me/foxdebug_acode) [![](https://dcbadge.vercel.app/api/server/vVxVWYUAWD?style=flat)](https://discord.gg/vVxVWYUAWD) +[![](https://img.shields.io/endpoint?logo=telegram&label=Acode&style=flat&url=https%3A%2F%2Facode.app%2Fapi%2Ftelegram-members-count)](https://t.me/foxdebug_acode) [![](https://dcbadge.limes.pink/api/server/https://discord.gg/vVxVWYUAWD?style=flat)](https://discord.gg/vVxVWYUAWD) ## • Overview From f432f33981a0ee5518ecc7dab1772b4603a82d56 Mon Sep 17 00:00:00 2001 From: Aadin Date: Tue, 13 Oct 2026 10:28:17 +0000 Subject: [PATCH 145/195] feat(browser): set a default device size for the in-app preview (#2966) * refactor(browser): keep a list of devices in the emulator device list * refactor(browser): register each device when added to the list * feat(browser): apply the saved default preview size once layout is ready * feat(browser): save and restore a default device preview size * feat(browser): add "Set as Default" and "Clear Default" menu items * feat(browser): handle "Set as Default" and "Clear Default" actions * feat(browser): show default menu items only while Devices mode is on * feat(browser): open the preview in Devices mode when a default is set * feat(browser): restore the default preview mode on startup * refactor(browser): allow applying desktop mode without reloading * refactor(browser): make the reload in setDesktopMode optional * fix(browser): apply saved desktop mode before the first load to avoid a reload * fix(browser): only apply dimensions after layout, not desktop mode * fix(browser): re-fit saved presets to the current screen on restore * fix(browser): reload once after the saved size is applied * fix(browser): don't resize the webview before the emulator is set up * fix(browser): add reloadAfterLayout helper, only when a page was requested * fix(browser): show "Clear Default" only when a default is saved * fix(browser): refresh default menu items after Set as Default * fix(browser): refresh default menu items after Clear Default --- .../android/com/foxdebug/browser/Browser.java | 103 ++++++++++++++++- .../com/foxdebug/browser/Emulator.java | 106 ++++++++++++++++++ 2 files changed, 208 insertions(+), 1 deletion(-) diff --git a/src/plugins/browser/android/com/foxdebug/browser/Browser.java b/src/plugins/browser/android/com/foxdebug/browser/Browser.java index f12597159b..bd0d4ab93d 100644 --- a/src/plugins/browser/android/com/foxdebug/browser/Browser.java +++ b/src/plugins/browser/android/com/foxdebug/browser/Browser.java @@ -227,6 +227,7 @@ public void onDownloadStart(String url, String userAgent, createMenu(); addView(titleLayout); addView(webViewContainer); + restoreEmulator(); } private void createMenu() { @@ -236,6 +237,10 @@ private void createMenu() { menu.addItem(Ui.Icons.DEVICES, "Devices", false); menu.addItem(Ui.Icons.NO_CACHE, "Disable Cache", false); menu.addItem(Ui.Icons.TERMINAL, "Console", false); + menu.addItem(Ui.Icons.TUNE, "Set as Default"); + menu.addItem(Ui.Icons.REFRESH, "Clear Default"); + menu.setVisible("Set as Default", false); + menu.setVisible("Clear Default", false); menu.addItem(Ui.Icons.OPEN_IN_BROWSER, "Open in Browser"); menu.addItem(Ui.Icons.EXIT, "Exit"); @@ -250,6 +255,7 @@ public void onSelect(String action, Boolean checked) { } emulator = checked; + updateDefaultItems(checked); if (checked) { setDesktopMode(true); setConsoleVisible(false); @@ -284,6 +290,26 @@ public void onGlobalLayout() { case "Console": setConsoleVisible(checked); break; + case "Set as Default": + if (deviceEmulator != null) { + deviceEmulator.saveAsDefault(); + updateDefaultItems(emulator); + Toast + .makeText( + context, + "Saved as default preview", + Toast.LENGTH_SHORT + ) + .show(); + } + break; + case "Clear Default": + Emulator.clearDefault(context); + updateDefaultItems(emulator); + Toast + .makeText(context, "Default cleared", Toast.LENGTH_SHORT) + .show(); + break; case "Disable Cache": webView .getSettings() @@ -308,6 +334,75 @@ public void onGlobalLayout() { ); } + private void updateDefaultItems(boolean emulatorOn) { + menu.setVisible("Set as Default", emulatorOn); + menu.setVisible( + "Clear Default", + emulatorOn && Emulator.hasDefault(context) + ); + } + + private void reloadAfterLayout() { + // If no page was requested yet, the first load will already happen at + // the saved size, so there is nothing to reload. + if (url.isEmpty()) return; + + webView + .getViewTreeObserver() + .addOnGlobalLayoutListener( + new ViewTreeObserver.OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() { + webView.getViewTreeObserver().removeOnGlobalLayoutListener(this); + webView.reload(); + } + } + ); + } + + private void restoreEmulator() { + if (onlyConsole) return; + if (!Emulator.hasDefault(context)) return; + + // Apply the saved mode before the first navigation so the page is not + // loaded with the wrong user agent and then reloaded. + setDesktopMode(true, false); + + webView + .getViewTreeObserver() + .addOnGlobalLayoutListener( + new ViewTreeObserver.OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() { + if (webView.getMeasuredWidth() == 0) return; + webView.getViewTreeObserver().removeOnGlobalLayoutListener(this); + + if (deviceEmulator == null) { + createDeviceEmulatorLayout(); + deviceEmulator.setRestoredListener( + new Runnable() { + @Override + public void run() { + reloadAfterLayout(); + } + } + ); + } + + emulator = true; + menu.setChecked("Devices", true); + updateDefaultItems(true); + setConsoleVisible(false); + menu.setChecked("Console", false); + menu.setVisible("Console", false); + addView(deviceEmulator); + // The emulator sets up its sliders on a later layout pass and then + // applies the saved size itself, so the webview is not resized here. + } + } + ); + } + private void createDeviceEmulatorLayout() { Browser browser = this; deviceEmulator = new Emulator(context, theme); @@ -339,6 +434,10 @@ private void setTextViewProperties(TextView textView, int height) { } private void setDesktopMode(boolean enabled) { + setDesktopMode(enabled, true); + } + + private void setDesktopMode(boolean enabled, boolean reload) { int width = 0; int height = 0; WebSettings webSettings = webView.getSettings(); @@ -360,7 +459,9 @@ private void setDesktopMode(boolean enabled) { webSettings.setLoadWithOverviewMode(enabled); webSettings.setSupportZoom(enabled); webSettings.setBuiltInZoomControls(enabled); - webView.reload(); + if (reload) { + webView.reload(); + } } public void setDesktopMode() { diff --git a/src/plugins/browser/android/com/foxdebug/browser/Emulator.java b/src/plugins/browser/android/com/foxdebug/browser/Emulator.java index adb65f2b1f..25f0d70eae 100644 --- a/src/plugins/browser/android/com/foxdebug/browser/Emulator.java +++ b/src/plugins/browser/android/com/foxdebug/browser/Emulator.java @@ -163,6 +163,8 @@ public void onGlobalLayout() { if (listener != null) { listener.onChange(iWidth, correctedHeight, 1); } + + restoreDefaultDevice(); } } ); @@ -302,6 +304,108 @@ private void selectDevice(Device device) { listener.onChange(width, height, maxScale / 100f); } + public static boolean hasDefault(Context context) { + return context + .getSharedPreferences("acode_browser", Context.MODE_PRIVATE) + .getBoolean("default_set", false); + } + + public static void clearDefault(Context context) { + context + .getSharedPreferences("acode_browser", Context.MODE_PRIVATE) + .edit() + .putBoolean("default_set", false) + .apply(); + } + + public void saveAsDefault() { + context + .getSharedPreferences("acode_browser", Context.MODE_PRIVATE) + .edit() + .putBoolean("default_set", true) + .putInt("default_width", getWidthProgress()) + .putInt("default_height", getHeightProgress()) + .putInt("default_scale", seekBars.get("scale").getProgress()) + .putString( + "default_device", + selectedDevice != null ? selectedDevice.name : "Custom" + ) + .apply(); + } + + private Runnable restoredListener; + + public void setRestoredListener(Runnable listener) { + restoredListener = listener; + } + + private void restoreDefaultDevice() { + if (!hasDefault(context)) return; + + android.content.SharedPreferences prefs = context.getSharedPreferences( + "acode_browser", + Context.MODE_PRIVATE + ); + SeekBar widthSeekBar = seekBars.get("width"); + SeekBar heightSeekBar = seekBars.get("height"); + SeekBar scaleSeekBar = seekBars.get("scale"); + String name = prefs.getString("default_device", "Custom"); + + Device preset = null; + for (Device device : deviceListView.devices) { + if (device.id != customDevice.id && device.name.equals(name)) { + preset = device; + break; + } + } + + if (preset != null && listener != null) { + // A preset is re-fitted to the current screen, so it keeps its shape if + // the screen size changed since it was saved (rotation, split-screen, + // foldables). Only the scale is restored from the saved value. + if (deviceListView.selectedDeviceView != null) { + deviceListView.selectedDeviceView.deselect(); + } + deviceListView.select(preset); + selectDevice(preset); + + int scale = Math.min( + prefs.getInt("default_scale", scaleSeekBar.getMax()), + scaleSeekBar.getMax() + ); + scaleSeekBar.setProgress(scale); + listener.onChange(getWidthProgress(), getHeightProgress(), scale / 100f); + } else { + // Custom sizes are restored from the saved width/height. + int width = Math.min( + prefs.getInt("default_width", widthSeekBar.getMax()), + widthSeekBar.getMax() + ); + int height = Math.min( + prefs.getInt("default_height", heightSeekBar.getMax()), + heightSeekBar.getMax() + ); + + widthSeekBar.setProgress(width); + heightSeekBar.setProgress(height); + setMaxScale(width, height); + int scale = Math.min( + prefs.getInt("default_scale", 100), + scaleSeekBar.getMax() + ); + scaleSeekBar.setProgress(scale); + selectedDevice = customDevice; + + if (listener != null) { + listener.onChange(width, height, scale / 100f); + } + } + + if (restoredListener != null) { + restoredListener.run(); + } + } + private void setMaxScale(int width, int height) { SeekBar scaleSeekBar = seekBars.get("scale"); SeekBar widthSeekBar = seekBars.get("width"); @@ -367,6 +471,7 @@ public void deselect() { class DeviceListView extends ScrollView { DeviceView selectedDeviceView; + ArrayList devices = new ArrayList(); LinearLayout deviceListLayout; Callback callback; Context context; @@ -407,6 +512,7 @@ public void select(Device device) { } public void add(Device device) { + devices.add(device); DeviceView deviceView = new DeviceView(context, device, theme); deviceListLayout.addView(deviceView); From 3148accde57f18a7d6e81f012b8c049488a881e2 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Thu, 15 Oct 2026 21:28:58 +0530 Subject: [PATCH 146/195] chore: Update biome.json --- biome.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/biome.json b/biome.json index 272f33dfb0..7f2cae5e99 100644 --- a/biome.json +++ b/biome.json @@ -40,9 +40,12 @@ "files": { "includes": [ "src/**/*.js", + "src/**/*.ts", "utils/**/*.js", "src/lang/**/*.json", + "tests/**", "!src/plugins/**/*.js", + "!src/plugins/**/*.ts", "!www/**/*", "!plugins/**/*", "!hooks/**/*", From ad8b40fddd023337b8253c8e7f05704a0485252e Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Thu, 15 Oct 2026 21:30:26 +0530 Subject: [PATCH 147/195] fix: fmt --- src/cm/baseExtensions.ts | 7 +- src/cm/colorChip.ts | 3 +- src/cm/colorView.ts | 7 +- src/cm/editorReadOnly.ts | 2 +- src/cm/foldAwareLineCommands.ts | 676 ++-- src/cm/indentationFolding.ts | 14 +- src/cm/lineBreakMarker.ts | 20 +- src/cm/localWordCompletions.ts | 2 +- src/cm/lsp/api.ts | 19 +- src/cm/lsp/clientManager.ts | 3002 ++++++++--------- src/cm/lsp/codeActions.ts | 28 +- src/cm/lsp/definition.ts | 2 +- src/cm/lsp/diagnostics.ts | 26 +- src/cm/lsp/documentColors.ts | 37 +- src/cm/lsp/index.ts | 91 +- src/cm/lsp/inlayHints.ts | 8 +- src/cm/lsp/locationUtils.ts | 11 +- src/cm/lsp/logs.ts | 13 +- src/cm/lsp/references.ts | 7 +- src/cm/lsp/rename.ts | 17 +- src/cm/lsp/runtimeActions.ts | 21 +- src/cm/lsp/runtimeProviders.ts | 6 +- src/cm/lsp/runtimeSettings.ts | 9 +- src/cm/lsp/runtimes/axsBridge.ts | 6 +- src/cm/lsp/runtimes/builtinAlpine.ts | 11 +- src/cm/lsp/runtimes/externalWebSocket.ts | 5 +- src/cm/lsp/serverLauncher.ts | 2116 ++++++------ src/cm/lsp/serverRegistry.ts | 15 +- src/cm/lsp/tooltipExtensions.ts | 18 +- src/cm/lsp/transport.ts | 14 +- src/cm/lsp/types.ts | 2 +- src/cm/lsp/workerTransport.ts | 29 +- src/cm/lsp/workers/css.worker.ts | 11 +- src/cm/lsp/workers/html.worker.ts | 73 +- src/cm/lsp/workers/htmlEmbeddedSupport.ts | 7 +- src/cm/lsp/workers/json.worker.ts | 11 +- src/cm/lsp/workers/nestedLspClient.ts | 8 +- src/cm/lsp/workers/protocol.ts | 5 +- src/cm/lsp/workers/typescript.worker.ts | 357 +- src/cm/lsp/workers/typescriptLibs.ts | 3 +- src/cm/lsp/workspace.ts | 5 +- src/cm/modes/astro/index.ts | 13 +- src/cm/modes/astro/parser/parser.terms.ts | 21 +- src/cm/modes/astro/parser/parser.ts | 32 +- src/cm/modes/astro/parser/tokens.ts | 34 +- src/cm/punctuationWrapping.ts | 3 +- src/cm/quickToolsModifierInput.ts | 2 +- src/cm/quickToolsNavigation.ts | 2 +- src/cm/searchMatchHighlighter.ts | 4 +- src/cm/selectionMenuUtils.ts | 5 +- src/cm/supportedModes.ts | 15 +- src/cm/tagAutoRename.ts | 20 +- src/cordova-custom.d.ts | 6 +- src/index.d.ts | 260 +- src/lang/index.d.ts | 1778 +++++----- src/lib/customTab.ts | 24 +- tests/admob/adConsentCoordinator.test.js | 4 +- tests/admob/adRewardBannerPolicy.test.js | 10 +- tests/admob/bannerWrapper.test.js | 5 +- tests/admob/privacyChoicesController.test.js | 2 +- tests/admob/rewardedAd.test.js | 67 +- tests/helpers/loadSourceModule.js | 47 +- tests/unit/appIconSelection.test.js | 1 + tests/unit/appIconSetting.test.js | 15 +- tests/unit/binaryExtensions.test.js | 2 +- tests/unit/codeHighlight.test.js | 2 +- tests/unit/color.test.js | 2 +- tests/unit/confirm.test.js | 57 +- tests/unit/consoleExecutionContext.test.js | 2 +- tests/unit/consoleExecutor.test.js | 2 +- tests/unit/consoleViewport.test.js | 2 +- tests/unit/editorThemes.test.js | 13 +- tests/unit/fileIconAssets.test.ts | 7 +- tests/unit/fileIconOwnership.test.ts | 3 +- tests/unit/fileIconSidebar.test.ts | 3 +- tests/unit/fileIconTheme.test.ts | 2 +- tests/unit/fileIntents.test.js | 72 +- tests/unit/fileOperationExclusions.test.js | 7 +- tests/unit/fileSaveEvents.test.js | 176 +- tests/unit/fileTreeRecycling.test.ts | 5 +- tests/unit/fullscreen.test.js | 115 +- tests/unit/iconTooltips.test.js | 1 + tests/unit/immersiveFullscreenPrepare.test.js | 45 +- tests/unit/installSource.test.js | 6 +- .../unit/languageModeRecommendations.test.js | 2 +- .../lspExternalWebSocketLifecycle.test.js | 47 +- tests/unit/lspLocationUtils.test.ts | 4 +- tests/unit/lspMultiClient.test.js | 114 +- tests/unit/lspTailwindServer.test.js | 2 +- tests/unit/lspWorkspaceFolders.test.js | 2 +- tests/unit/modelist.test.js | 11 +- tests/unit/nativeSearchProcessing.test.js | 4 +- tests/unit/openFileCancellation.test.js | 173 +- tests/unit/path.test.js | 10 +- tests/unit/pluginContext.test.js | 4 +- tests/unit/pluginFileRestoration.test.js | 167 +- tests/unit/pluginReview.test.js | 14 +- tests/unit/punctuationWrapping.test.ts | 10 +- tests/unit/quickToolsAdapter.test.js | 167 +- tests/unit/quickToolsModifierInput.test.ts | 50 +- tests/unit/quickToolsOverlays.test.js | 1 + tests/unit/quickToolsState.test.js | 42 +- tests/unit/readOnlyQuickToolsCapture.test.ts | 2 +- tests/unit/remoteFilePreview.test.js | 2 +- tests/unit/removeAds.test.js | 3 + tests/unit/restoreFiles.test.js | 31 +- tests/unit/saveCommands.test.js | 169 +- tests/unit/scrollPastEnd.test.js | 10 +- tests/unit/searchMatchHighlighter.test.ts | 2 +- tests/unit/searchResultNavigation.test.js | 113 +- tests/unit/searchStreamingResults.test.js | 4 +- tests/unit/sessionPersistence.test.js | 8 +- tests/unit/sftpProfiles.test.js | 7 +- tests/unit/shell.test.js | 2 +- tests/unit/systemHttpStream.test.js | 33 +- tests/unit/taskManager.test.js | 2 +- tests/unit/uri.test.js | 22 +- tests/unit/url.test.js | 26 +- tests/unit/variableVirtualList.test.js | 2 +- tests/unit/version.test.js | 2 +- 120 files changed, 5575 insertions(+), 5307 deletions(-) diff --git a/src/cm/baseExtensions.ts b/src/cm/baseExtensions.ts index 336027f51a..d55a6c7bfd 100644 --- a/src/cm/baseExtensions.ts +++ b/src/cm/baseExtensions.ts @@ -15,7 +15,6 @@ import { import { highlightSelectionMatches } from "@codemirror/search"; import type { Extension } from "@codemirror/state"; import { EditorState, Prec } from "@codemirror/state"; -import indentationFolding from "./indentationFolding"; import { crosshairCursor, drawSelection, @@ -27,6 +26,7 @@ import { rectangularSelection, tooltips, } from "@codemirror/view"; +import indentationFolding from "./indentationFolding"; export interface BaseExtensionOptions { autoIndent?: boolean; @@ -51,10 +51,7 @@ export default function createBaseExtensions( highlightActiveLine: enableHighlightActiveLine = true, highlightSelectionMatches: enableHighlightSelectionMatches = true, } = options; - const extensions: Extension[] = [ - highlightSpecialChars(), - history(), - ]; + const extensions: Extension[] = [highlightSpecialChars(), history()]; if (enableHighlightActiveLine) extensions.push(highlightActiveLineGutter()); if (codeFolding) extensions.push(foldGutter(), indentationFolding); diff --git a/src/cm/colorChip.ts b/src/cm/colorChip.ts index 3f055cfa58..5d51889185 100644 --- a/src/cm/colorChip.ts +++ b/src/cm/colorChip.ts @@ -96,8 +96,7 @@ export function isViewEditable(view: EditorView): boolean { export function hasLspColorProvider(view: EditorView): boolean { return LSPPlugin.getAll(view, "documentColor").some( (lsp) => - lsp.client.connected && - !!lsp.client.serverCapabilities?.colorProvider, + lsp.client.connected && !!lsp.client.serverCapabilities?.colorProvider, ); } diff --git a/src/cm/colorView.ts b/src/cm/colorView.ts index 33b58bc364..4a9ae7c7d5 100644 --- a/src/cm/colorView.ts +++ b/src/cm/colorView.ts @@ -5,13 +5,13 @@ import color from "utils/color"; import { colorRegex, isValidColor } from "utils/color/regex"; import { COLOR_CHIP_CLASS, + type ColorChipPayload, colorChipDecoration, colorChipTheme, findColorChip, getColorChipPayload, isViewEditable, openColorPicker, - type ColorChipPayload, } from "./colorChip"; import { didReplaceLspDocumentColors, @@ -45,10 +45,7 @@ function isWhitespace(char: string): boolean { function isAlpha(char: string): boolean { if (!char) return false; const code = char.charCodeAt(0); - return ( - (code >= 65 && code <= 90) || - (code >= 97 && code <= 122) - ); + return (code >= 65 && code <= 90) || (code >= 97 && code <= 122); } function charAt(doc: Text, index: number): string { diff --git a/src/cm/editorReadOnly.ts b/src/cm/editorReadOnly.ts index 927b7a8e73..767b740c18 100644 --- a/src/cm/editorReadOnly.ts +++ b/src/cm/editorReadOnly.ts @@ -2,9 +2,9 @@ import { Compartment, EditorSelection, EditorState, - Transaction, type Extension, type SelectionRange, + Transaction, } from "@codemirror/state"; import { EditorView } from "@codemirror/view"; diff --git a/src/cm/foldAwareLineCommands.ts b/src/cm/foldAwareLineCommands.ts index eea19207b9..4591f9ace6 100644 --- a/src/cm/foldAwareLineCommands.ts +++ b/src/cm/foldAwareLineCommands.ts @@ -1,53 +1,53 @@ import { - copyLineDown, - copyLineUp, - deleteLine, - moveLineDown, - moveLineUp, + copyLineDown, + copyLineUp, + deleteLine, + moveLineDown, + moveLineUp, } from "@codemirror/commands"; import { foldEffect, foldedRanges } from "@codemirror/language"; import { - EditorSelection, - type EditorState, - type SelectionRange, - Text, + EditorSelection, + type EditorState, + type SelectionRange, + Text, } from "@codemirror/state"; import type { EditorView } from "@codemirror/view"; interface FoldRange { - from: number; - to: number; + from: number; + to: number; } interface IndexedFold extends FoldRange { - blockFrom: number; - blockTo: number; + blockFrom: number; + blockTo: number; } interface FoldGroup { - blockFrom: number; - blockTo: number; - folds: IndexedFold[]; + blockFrom: number; + blockTo: number; + folds: IndexedFold[]; } interface FoldIndex { - groups: FoldGroup[]; + groups: FoldGroup[]; } interface LineBlock { - from: number; - to: number; - rangeIndexes: number[]; + from: number; + to: number; + rangeIndexes: number[]; } interface MoveOperation { - block: LineBlock; - neighbor: LineBlock; - replaceFrom: number; - replaceTo: number; - insert: Text; - blockOffset: number; - neighborOffset: number; + block: LineBlock; + neighbor: LineBlock; + replaceFrom: number; + replaceTo: number; + insert: Text; + blockOffset: number; + neighborOffset: number; } type Direction = -1 | 1; @@ -55,378 +55,378 @@ type Direction = -1 | 1; const lineBreak = Text.of(["", ""]); function getFoldIndex(state: EditorState): FoldIndex { - const groups: FoldGroup[] = []; - foldedRanges(state).between(0, state.doc.length, (from, to) => { - const fold: IndexedFold = { - from, - to, - blockFrom: state.doc.lineAt(from).from, - blockTo: state.doc.lineAt(to).to, - }; - const previous = groups[groups.length - 1]; - if (previous && fold.blockFrom <= previous.blockTo) { - previous.blockTo = Math.max(previous.blockTo, fold.blockTo); - previous.folds.push(fold); - } else { - groups.push({ - blockFrom: fold.blockFrom, - blockTo: fold.blockTo, - folds: [fold], - }); - } - }); - - return { groups }; + const groups: FoldGroup[] = []; + foldedRanges(state).between(0, state.doc.length, (from, to) => { + const fold: IndexedFold = { + from, + to, + blockFrom: state.doc.lineAt(from).from, + blockTo: state.doc.lineAt(to).to, + }; + const previous = groups[groups.length - 1]; + if (previous && fold.blockFrom <= previous.blockTo) { + previous.blockTo = Math.max(previous.blockTo, fold.blockTo); + previous.folds.push(fold); + } else { + groups.push({ + blockFrom: fold.blockFrom, + blockTo: fold.blockTo, + folds: [fold], + }); + } + }); + + return { groups }; } function firstGroupEndingAtOrAfter(groups: FoldGroup[], position: number) { - let low = 0; - let high = groups.length; - while (low < high) { - const middle = (low + high) >> 1; - if (groups[middle].blockTo < position) low = middle + 1; - else high = middle; - } - return low; + let low = 0; + let high = groups.length; + while (low < high) { + const middle = (low + high) >> 1; + if (groups[middle].blockTo < position) low = middle + 1; + else high = middle; + } + return low; } function expandBlockToFolds( - block: Pick, - index: FoldIndex, + block: Pick, + index: FoldIndex, ): Pick { - let from = block.from; - let to = block.to; - const start = firstGroupEndingAtOrAfter(index.groups, from); - - for (let i = start; i < index.groups.length; i++) { - const group = index.groups[i]; - if (group.blockFrom > to) break; - from = Math.min(from, group.blockFrom); - to = Math.max(to, group.blockTo); - } - - return { from, to }; + let from = block.from; + let to = block.to; + const start = firstGroupEndingAtOrAfter(index.groups, from); + + for (let i = start; i < index.groups.length; i++) { + const group = index.groups[i]; + if (group.blockFrom > to) break; + from = Math.min(from, group.blockFrom); + to = Math.max(to, group.blockTo); + } + + return { from, to }; } function selectionLineBlock( - state: EditorState, - range: SelectionRange, - rangeIndex: number, - index: FoldIndex, + state: EditorState, + range: SelectionRange, + rangeIndex: number, + index: FoldIndex, ): LineBlock { - const startLine = state.doc.lineAt(range.from); - let endLine = state.doc.lineAt(range.to); - if (!range.empty && range.to === endLine.from) { - endLine = state.doc.lineAt(range.to - 1); - } - const expanded = expandBlockToFolds( - { from: startLine.from, to: endLine.to }, - index, - ); - return { ...expanded, rangeIndexes: [rangeIndex] }; + const startLine = state.doc.lineAt(range.from); + let endLine = state.doc.lineAt(range.to); + if (!range.empty && range.to === endLine.from) { + endLine = state.doc.lineAt(range.to - 1); + } + const expanded = expandBlockToFolds( + { from: startLine.from, to: endLine.to }, + index, + ); + return { ...expanded, rangeIndexes: [rangeIndex] }; } function selectedLineBlocks(state: EditorState, index: FoldIndex): LineBlock[] { - const blocks = state.selection.ranges - .map((range, rangeIndex) => - selectionLineBlock(state, range, rangeIndex, index), - ) - .sort((a, b) => a.from - b.from); - const merged: LineBlock[] = []; - - for (const block of blocks) { - const previous = merged[merged.length - 1]; - if (previous && block.from <= previous.to + 1) { - previous.to = Math.max(previous.to, block.to); - previous.rangeIndexes.push(...block.rangeIndexes); - } else { - merged.push({ ...block, rangeIndexes: [...block.rangeIndexes] }); - } - } - - return merged; + const blocks = state.selection.ranges + .map((range, rangeIndex) => + selectionLineBlock(state, range, rangeIndex, index), + ) + .sort((a, b) => a.from - b.from); + const merged: LineBlock[] = []; + + for (const block of blocks) { + const previous = merged[merged.length - 1]; + if (previous && block.from <= previous.to + 1) { + previous.to = Math.max(previous.to, block.to); + previous.rangeIndexes.push(...block.rangeIndexes); + } else { + merged.push({ ...block, rangeIndexes: [...block.rangeIndexes] }); + } + } + + return merged; } function foldsInBlock(index: FoldIndex, block: Pick) { - const folds: IndexedFold[] = []; - const start = firstGroupEndingAtOrAfter(index.groups, block.from); - for (let i = start; i < index.groups.length; i++) { - const group = index.groups[i]; - if (group.blockFrom > block.to) break; - for (const fold of group.folds) { - if (fold.from >= block.from && fold.to <= block.to) folds.push(fold); - } - } - return folds; + const folds: IndexedFold[] = []; + const start = firstGroupEndingAtOrAfter(index.groups, block.from); + for (let i = start; i < index.groups.length; i++) { + const group = index.groups[i]; + if (group.blockFrom > block.to) break; + for (const fold of group.folds) { + if (fold.from >= block.from && fold.to <= block.to) folds.push(fold); + } + } + return folds; } function blockHasFolds( - index: FoldIndex, - block: Pick, + index: FoldIndex, + block: Pick, ) { - const start = firstGroupEndingAtOrAfter(index.groups, block.from); - return ( - start < index.groups.length && index.groups[start].blockFrom <= block.to - ); + const start = firstGroupEndingAtOrAfter(index.groups, block.from); + return ( + start < index.groups.length && index.groups[start].blockFrom <= block.to + ); } function uniqueFolds(folds: FoldRange[]) { - const seen = new Set(); - return folds.filter((fold) => { - const key = `${fold.from}:${fold.to}`; - if (seen.has(key)) return false; - seen.add(key); - return true; - }); + const seen = new Set(); + return folds.filter((fold) => { + const key = `${fold.from}:${fold.to}`; + if (seen.has(key)) return false; + seen.add(key); + return true; + }); } function createFoldEffects(folds: FoldRange[], docLength: number) { - const validFolds = uniqueFolds(folds).filter( - (fold) => fold.from >= 0 && fold.to <= docLength && fold.to > fold.from, - ); - return validFolds.map((fold) => foldEffect.of(fold)); + const validFolds = uniqueFolds(folds).filter( + (fold) => fold.from >= 0 && fold.to <= docLength && fold.to > fold.from, + ); + return validFolds.map((fold) => foldEffect.of(fold)); } function translatedFold(fold: FoldRange, oldFrom: number, newFrom: number) { - return { - from: newFrom + fold.from - oldFrom, - to: newFrom + fold.to - oldFrom, - }; + return { + from: newFrom + fold.from - oldFrom, + to: newFrom + fold.to - oldFrom, + }; } function mapRangeIntoBlock( - range: SelectionRange, - block: LineBlock, - newBlockFrom: number, + range: SelectionRange, + block: LineBlock, + newBlockFrom: number, ) { - return EditorSelection.range( - newBlockFrom + range.anchor - block.from, - newBlockFrom + range.head - block.from, - ); + return EditorSelection.range( + newBlockFrom + range.anchor - block.from, + newBlockFrom + range.head - block.from, + ); } function copyFoldedLines(view: EditorView, direction: Direction): boolean { - const initialState = view.state; - if (initialState.readOnly) return false; - const copyDown = direction > 0; - const foldIndex = getFoldIndex(initialState); - const blocks = selectedLineBlocks(initialState, foldIndex); - if (!blocks.some((block) => blockHasFolds(foldIndex, block))) { - return copyDown ? copyLineDown(view) : copyLineUp(view); - } - - const state = initialState; - const changes = blocks.map((block) => { - const text = state.doc.slice(block.from, block.to); - return copyDown - ? { from: block.from, insert: text.append(lineBreak) } - : { from: block.to, insert: lineBreak.append(text) }; - }); - const changeSet = state.changes(changes); - const mappedRanges: SelectionRange[] = new Array( - state.selection.ranges.length, - ); - const newFolds: FoldRange[] = []; - - for (const block of blocks) { - const blockLength = block.to - block.from; - const topBlockFrom = changeSet.mapPos(block.from, -1); - const bottomBlockFrom = topBlockFrom + blockLength + 1; - // Match CodeMirror's native semantics: copy down keeps the selection in - // the bottom block, while copy up keeps it in the top block. - const selectedBlockFrom = copyDown ? bottomBlockFrom : topBlockFrom; - - for (const rangeIndex of block.rangeIndexes) { - mappedRanges[rangeIndex] = mapRangeIntoBlock( - state.selection.ranges[rangeIndex], - block, - selectedBlockFrom, - ); - } - for (const fold of foldsInBlock(foldIndex, block)) { - newFolds.push( - translatedFold(fold, block.from, topBlockFrom), - translatedFold(fold, block.from, bottomBlockFrom), - ); - } - } - - view.dispatch({ - changes: changeSet, - selection: EditorSelection.create(mappedRanges, state.selection.mainIndex), - effects: createFoldEffects(newFolds, changeSet.newLength), - scrollIntoView: true, - userEvent: "input.copyline", - }); - return true; + const initialState = view.state; + if (initialState.readOnly) return false; + const copyDown = direction > 0; + const foldIndex = getFoldIndex(initialState); + const blocks = selectedLineBlocks(initialState, foldIndex); + if (!blocks.some((block) => blockHasFolds(foldIndex, block))) { + return copyDown ? copyLineDown(view) : copyLineUp(view); + } + + const state = initialState; + const changes = blocks.map((block) => { + const text = state.doc.slice(block.from, block.to); + return copyDown + ? { from: block.from, insert: text.append(lineBreak) } + : { from: block.to, insert: lineBreak.append(text) }; + }); + const changeSet = state.changes(changes); + const mappedRanges: SelectionRange[] = new Array( + state.selection.ranges.length, + ); + const newFolds: FoldRange[] = []; + + for (const block of blocks) { + const blockLength = block.to - block.from; + const topBlockFrom = changeSet.mapPos(block.from, -1); + const bottomBlockFrom = topBlockFrom + blockLength + 1; + // Match CodeMirror's native semantics: copy down keeps the selection in + // the bottom block, while copy up keeps it in the top block. + const selectedBlockFrom = copyDown ? bottomBlockFrom : topBlockFrom; + + for (const rangeIndex of block.rangeIndexes) { + mappedRanges[rangeIndex] = mapRangeIntoBlock( + state.selection.ranges[rangeIndex], + block, + selectedBlockFrom, + ); + } + for (const fold of foldsInBlock(foldIndex, block)) { + newFolds.push( + translatedFold(fold, block.from, topBlockFrom), + translatedFold(fold, block.from, bottomBlockFrom), + ); + } + } + + view.dispatch({ + changes: changeSet, + selection: EditorSelection.create(mappedRanges, state.selection.mainIndex), + effects: createFoldEffects(newFolds, changeSet.newLength), + scrollIntoView: true, + userEvent: "input.copyline", + }); + return true; } function neighboringBlock( - state: EditorState, - block: LineBlock, - direction: Direction, - index: FoldIndex, + state: EditorState, + block: LineBlock, + direction: Direction, + index: FoldIndex, ): LineBlock | null { - const line = state.doc.lineAt(direction < 0 ? block.from : block.to); - const lineNumber = line.number + direction; - if (lineNumber < 1 || lineNumber > state.doc.lines) return null; - const neighborLine = state.doc.line(lineNumber); - const expanded = expandBlockToFolds( - { from: neighborLine.from, to: neighborLine.to }, - index, - ); - return { ...expanded, rangeIndexes: [] }; + const line = state.doc.lineAt(direction < 0 ? block.from : block.to); + const lineNumber = line.number + direction; + if (lineNumber < 1 || lineNumber > state.doc.lines) return null; + const neighborLine = state.doc.line(lineNumber); + const expanded = expandBlockToFolds( + { from: neighborLine.from, to: neighborLine.to }, + index, + ); + return { ...expanded, rangeIndexes: [] }; } function createMoveOperation( - state: EditorState, - block: LineBlock, - neighbor: LineBlock, - direction: Direction, + state: EditorState, + block: LineBlock, + neighbor: LineBlock, + direction: Direction, ): MoveOperation { - const blockText = state.doc.slice(block.from, block.to); - const neighborText = state.doc.slice(neighbor.from, neighbor.to); - if (direction < 0) { - return { - block, - neighbor, - replaceFrom: neighbor.from, - replaceTo: block.to, - insert: blockText.append(lineBreak).append(neighborText), - blockOffset: 0, - neighborOffset: block.to - block.from + 1, - }; - } - return { - block, - neighbor, - replaceFrom: block.from, - replaceTo: neighbor.to, - insert: neighborText.append(lineBreak).append(blockText), - blockOffset: neighbor.to - neighbor.from + 1, - neighborOffset: 0, - }; + const blockText = state.doc.slice(block.from, block.to); + const neighborText = state.doc.slice(neighbor.from, neighbor.to); + if (direction < 0) { + return { + block, + neighbor, + replaceFrom: neighbor.from, + replaceTo: block.to, + insert: blockText.append(lineBreak).append(neighborText), + blockOffset: 0, + neighborOffset: block.to - block.from + 1, + }; + } + return { + block, + neighbor, + replaceFrom: block.from, + replaceTo: neighbor.to, + insert: neighborText.append(lineBreak).append(blockText), + blockOffset: neighbor.to - neighbor.from + 1, + neighborOffset: 0, + }; } function moveFoldedLines(view: EditorView, direction: Direction): boolean { - const initialState = view.state; - if (initialState.readOnly) return false; - const foldIndex = getFoldIndex(initialState); - const blocks = selectedLineBlocks(initialState, foldIndex); - const operations = blocks.flatMap((block) => { - const neighbor = neighboringBlock( - initialState, - block, - direction, - foldIndex, - ); - return neighbor - ? [createMoveOperation(initialState, block, neighbor, direction)] - : []; - }); - if (!operations.length) return false; - - if ( - !operations.some( - (operation) => - blockHasFolds(foldIndex, operation.block) || - blockHasFolds(foldIndex, operation.neighbor), - ) - ) { - return direction < 0 ? moveLineUp(view) : moveLineDown(view); - } - - const state = initialState; - const changeSet = state.changes( - operations.map((operation) => ({ - from: operation.replaceFrom, - to: operation.replaceTo, - insert: operation.insert, - })), - ); - const mappedRanges = state.selection.ranges.map((range) => - EditorSelection.range( - changeSet.mapPos(range.anchor), - changeSet.mapPos(range.head), - ), - ); - const newFolds: FoldRange[] = []; - - for (const operation of operations) { - const replacementFrom = changeSet.mapPos(operation.replaceFrom, -1); - const newBlockFrom = replacementFrom + operation.blockOffset; - const newNeighborFrom = replacementFrom + operation.neighborOffset; - for (const rangeIndex of operation.block.rangeIndexes) { - mappedRanges[rangeIndex] = mapRangeIntoBlock( - state.selection.ranges[rangeIndex], - operation.block, - newBlockFrom, - ); - } - for (const fold of foldsInBlock(foldIndex, operation.block)) { - newFolds.push(translatedFold(fold, operation.block.from, newBlockFrom)); - } - for (const fold of foldsInBlock(foldIndex, operation.neighbor)) { - newFolds.push( - translatedFold(fold, operation.neighbor.from, newNeighborFrom), - ); - } - } - - view.dispatch({ - changes: changeSet, - selection: EditorSelection.create(mappedRanges, state.selection.mainIndex), - effects: createFoldEffects(newFolds, changeSet.newLength), - scrollIntoView: true, - userEvent: "move.line", - }); - return true; + const initialState = view.state; + if (initialState.readOnly) return false; + const foldIndex = getFoldIndex(initialState); + const blocks = selectedLineBlocks(initialState, foldIndex); + const operations = blocks.flatMap((block) => { + const neighbor = neighboringBlock( + initialState, + block, + direction, + foldIndex, + ); + return neighbor + ? [createMoveOperation(initialState, block, neighbor, direction)] + : []; + }); + if (!operations.length) return false; + + if ( + !operations.some( + (operation) => + blockHasFolds(foldIndex, operation.block) || + blockHasFolds(foldIndex, operation.neighbor), + ) + ) { + return direction < 0 ? moveLineUp(view) : moveLineDown(view); + } + + const state = initialState; + const changeSet = state.changes( + operations.map((operation) => ({ + from: operation.replaceFrom, + to: operation.replaceTo, + insert: operation.insert, + })), + ); + const mappedRanges = state.selection.ranges.map((range) => + EditorSelection.range( + changeSet.mapPos(range.anchor), + changeSet.mapPos(range.head), + ), + ); + const newFolds: FoldRange[] = []; + + for (const operation of operations) { + const replacementFrom = changeSet.mapPos(operation.replaceFrom, -1); + const newBlockFrom = replacementFrom + operation.blockOffset; + const newNeighborFrom = replacementFrom + operation.neighborOffset; + for (const rangeIndex of operation.block.rangeIndexes) { + mappedRanges[rangeIndex] = mapRangeIntoBlock( + state.selection.ranges[rangeIndex], + operation.block, + newBlockFrom, + ); + } + for (const fold of foldsInBlock(foldIndex, operation.block)) { + newFolds.push(translatedFold(fold, operation.block.from, newBlockFrom)); + } + for (const fold of foldsInBlock(foldIndex, operation.neighbor)) { + newFolds.push( + translatedFold(fold, operation.neighbor.from, newNeighborFrom), + ); + } + } + + view.dispatch({ + changes: changeSet, + selection: EditorSelection.create(mappedRanges, state.selection.mainIndex), + effects: createFoldEffects(newFolds, changeSet.newLength), + scrollIntoView: true, + userEvent: "move.line", + }); + return true; } export function copyLineUpFoldAware(view: EditorView): boolean { - return copyFoldedLines(view, -1); + return copyFoldedLines(view, -1); } export function copyLineDownFoldAware(view: EditorView): boolean { - return copyFoldedLines(view, 1); + return copyFoldedLines(view, 1); } export function moveLineUpFoldAware(view: EditorView): boolean { - return moveFoldedLines(view, -1); + return moveFoldedLines(view, -1); } export function moveLineDownFoldAware(view: EditorView): boolean { - return moveFoldedLines(view, 1); + return moveFoldedLines(view, 1); } export function deleteLineFoldAware(view: EditorView): boolean { - const initialState = view.state; - if (initialState.readOnly) return false; - const foldIndex = getFoldIndex(initialState); - const blocks = selectedLineBlocks(initialState, foldIndex); - if (!blocks.some((block) => blockHasFolds(foldIndex, block))) { - return deleteLine(view); - } - - const state = initialState; - const changes = blocks.map((block) => { - let { from, to } = block; - if (from > 0) from--; - else if (to < state.doc.length) to++; - return { from, to }; - }); - const changeSet = state.changes(changes); - const cursors = blocks.map((block) => - EditorSelection.cursor( - Math.min(changeSet.newLength, changeSet.mapPos(block.from, -1)), - ), - ); - - view.dispatch({ - changes: changeSet, - selection: EditorSelection.create(cursors, 0), - scrollIntoView: true, - userEvent: "delete.line", - }); - return true; + const initialState = view.state; + if (initialState.readOnly) return false; + const foldIndex = getFoldIndex(initialState); + const blocks = selectedLineBlocks(initialState, foldIndex); + if (!blocks.some((block) => blockHasFolds(foldIndex, block))) { + return deleteLine(view); + } + + const state = initialState; + const changes = blocks.map((block) => { + let { from, to } = block; + if (from > 0) from--; + else if (to < state.doc.length) to++; + return { from, to }; + }); + const changeSet = state.changes(changes); + const cursors = blocks.map((block) => + EditorSelection.cursor( + Math.min(changeSet.newLength, changeSet.mapPos(block.from, -1)), + ), + ); + + view.dispatch({ + changes: changeSet, + selection: EditorSelection.create(cursors, 0), + scrollIntoView: true, + userEvent: "delete.line", + }); + return true; } diff --git a/src/cm/indentationFolding.ts b/src/cm/indentationFolding.ts index 7be802cbfa..ed876a9c83 100644 --- a/src/cm/indentationFolding.ts +++ b/src/cm/indentationFolding.ts @@ -1,8 +1,4 @@ -import { - foldService, - language, - StreamLanguage, -} from "@codemirror/language"; +import { foldService, language, StreamLanguage } from "@codemirror/language"; import { countColumn, type EditorState } from "@codemirror/state"; interface FoldRange { @@ -10,10 +6,7 @@ interface FoldRange { to: number; } -const foldCache = new WeakMap< - EditorState, - Map ->(); +const foldCache = new WeakMap>(); function findIndentationFold( state: EditorState, @@ -60,8 +53,7 @@ function findIndentationFold( foldEnd = nextLine.to; } - const range = - foldEnd === null ? null : { from: line.to, to: foldEnd }; + const range = foldEnd === null ? null : { from: line.to, to: foldEnd }; stateCache.set(line.from, range); return range; } diff --git a/src/cm/lineBreakMarker.ts b/src/cm/lineBreakMarker.ts index ea8eda65e0..74779ceb93 100644 --- a/src/cm/lineBreakMarker.ts +++ b/src/cm/lineBreakMarker.ts @@ -1,5 +1,12 @@ -import { Decoration, DecorationSet, ViewPlugin, WidgetType, EditorView, ViewUpdate } from "@codemirror/view"; import { RangeSetBuilder } from "@codemirror/state"; +import { + Decoration, + DecorationSet, + EditorView, + ViewPlugin, + ViewUpdate, + WidgetType, +} from "@codemirror/view"; class NewlineWidget extends WidgetType { toDOM(): HTMLElement { @@ -30,12 +37,15 @@ export const lineBreakMarkerPlugin = ViewPlugin.fromClass( getDecorations(view: EditorView): DecorationSet { let builder = new RangeSetBuilder(); let lastLineNumber = -1; - + for (let { from, to } of view.visibleRanges) { for (let pos = from; pos <= to; ) { let line = view.state.doc.lineAt(pos); - - if (line.number > lastLineNumber && line.number < view.state.doc.lines) { + + if ( + line.number > lastLineNumber && + line.number < view.state.doc.lines + ) { let deco = Decoration.widget({ widget: new NewlineWidget(), side: 1, @@ -43,7 +53,7 @@ export const lineBreakMarkerPlugin = ViewPlugin.fromClass( builder.add(line.to, line.to, deco); lastLineNumber = line.number; } - + pos = line.to + 1; } } diff --git a/src/cm/localWordCompletions.ts b/src/cm/localWordCompletions.ts index f9b6353f18..4be1cc63e4 100644 --- a/src/cm/localWordCompletions.ts +++ b/src/cm/localWordCompletions.ts @@ -1,6 +1,6 @@ import { - completeAnyWord, type CompletionSource, + completeAnyWord, } from "@codemirror/autocomplete"; import { EditorState, type Extension } from "@codemirror/state"; diff --git a/src/cm/lsp/api.ts b/src/cm/lsp/api.ts index 44103e342f..91aa8734c3 100644 --- a/src/cm/lsp/api.ts +++ b/src/cm/lsp/api.ts @@ -1,4 +1,11 @@ import { defineBundle, defineServer, installers } from "./providerUtils"; +import { + getRuntimeProvider, + listRuntimeProviders, + registerRuntimeProvider, + selectRuntimeProvider, + unregisterRuntimeProvider, +} from "./runtimeProviders"; import { getServerBundle, listServerBundles, @@ -16,13 +23,6 @@ import { unregisterServer, updateServer, } from "./serverRegistry"; -import { - getRuntimeProvider, - listRuntimeProviders, - registerRuntimeProvider, - selectRuntimeProvider, - unregisterRuntimeProvider, -} from "./runtimeProviders"; import "./runtimes/registerBuiltins"; import type { LspRuntimeContext, @@ -36,8 +36,11 @@ import { type LspWorkerTransportOptions, } from "./workerTransport"; +export type { + LspWorkerHostHandler, + LspWorkerTransportOptions, +} from "./workerTransport"; export { defineBundle, defineServer, installers }; -export type { LspWorkerHostHandler, LspWorkerTransportOptions } from "./workerTransport"; export type LspRegistrationEntry = LspServerManifest | LspServerBundle; diff --git a/src/cm/lsp/clientManager.ts b/src/cm/lsp/clientManager.ts index efd9cb284d..6d08882604 100644 --- a/src/cm/lsp/clientManager.ts +++ b/src/cm/lsp/clientManager.ts @@ -1,13 +1,13 @@ import { getIndentUnit, indentUnit } from "@codemirror/language"; import type { - LSPClientExtension, - LSPPluginOptions, + LSPClientExtension, + LSPPluginOptions, } from "@codemirror/lsp-client"; import { - LSPClient, - LSPPlugin, - serverCompletion, - serverDiagnostics, + LSPClient, + LSPPlugin, + serverCompletion, + serverDiagnostics, } from "@codemirror/lsp-client"; import { EditorState, Extension, Facet, MapMode } from "@codemirror/state"; import { EditorView } from "@codemirror/view"; @@ -16,1497 +16,1495 @@ import notificationManager from "lib/notificationManager"; import Uri from "utils/Uri"; import Url from "utils/Url"; import { - clearDiagnosticsEffect, - disposePullDiagnostics, - lspDiagnosticsAutoSyncExtension, + clearDiagnosticsEffect, + disposePullDiagnostics, + lspDiagnosticsAutoSyncExtension, } from "./diagnostics"; -import { supportsBuiltinFormatting } from "./formattingSupport"; import { documentColorsExtension } from "./documentColors"; +import { supportsBuiltinFormatting } from "./formattingSupport"; import { inlayHintsExtension } from "./inlayHints"; import { addLspLog } from "./logs"; import { safeLspPositionToOffset } from "./positionUtils"; import { selectRuntimeProvider } from "./runtimeProviders"; import serverRegistry from "./serverRegistry"; import { - hoverTooltips, - resolveLspHoverHighlightLanguage, - signatureHelp, + hoverTooltips, + resolveLspHoverHighlightLanguage, + signatureHelp, } from "./tooltipExtensions"; import { createTransport } from "./transport"; import type { - BuiltinExtensionsConfig, - ClientManagerOptions, - ClientState, - DocumentUriContext, - FileMetadata, - FormattingOptions, - LspServerDefinition, - LspRuntimeConnection, - LspRuntimeProvider, - LspClientScope, - NormalizedRootUri, - ParsedUri, - RootUriContext, - TextEdit, - TransportContext, - TransportHandle, - Transport, + BuiltinExtensionsConfig, + ClientManagerOptions, + ClientState, + DocumentUriContext, + FileMetadata, + FormattingOptions, + LspClientScope, + LspRuntimeConnection, + LspRuntimeProvider, + LspServerDefinition, + NormalizedRootUri, + ParsedUri, + RootUriContext, + TextEdit, + Transport, + TransportContext, + TransportHandle, } from "./types"; import AcodeWorkspace from "./workspace"; export const DEFAULT_CLIENT_IDLE_GRACE_PERIOD_MS = 15_000; export const lspCompletionEnabled = Facet.define({ - // File-level marker used by the autocomplete override path. If any attached - // server exposes completion, keep the shared LSP completion source available. - // Per-server completion opt-outs do not make this a per-server gate. - combine: (values) => values.some(Boolean), + // File-level marker used by the autocomplete override path. If any attached + // server exposes completion, keep the shared LSP completion source available. + // Per-server completion opt-outs do not make this a per-server gate. + combine: (values) => values.some(Boolean), }); function asArray(value: T | T[] | null | undefined): T[] { - if (!value) return []; - return Array.isArray(value) ? value : [value]; + if (!value) return []; + return Array.isArray(value) ? value : [value]; } function pluginKey( - serverId: string, - rootUri: string | null | undefined, - useWorkspaceFolders?: boolean, + serverId: string, + rootUri: string | null | undefined, + useWorkspaceFolders?: boolean, ): string { - // For workspace folders mode, use just the server ID (one client per server type) - if (useWorkspaceFolders) { - return serverId; - } - return `${serverId}::${rootUri ?? "__global__"}`; + // For workspace folders mode, use just the server ID (one client per server type) + if (useWorkspaceFolders) { + return serverId; + } + return `${serverId}::${rootUri ?? "__global__"}`; } function safeString(value: unknown): string { - return value != null ? String(value) : ""; + return value != null ? String(value) : ""; } function formatInitializationError(error: unknown): string { - if (isPlainObject(error)) { - const message = safeString(error.message).trim(); - const code = - typeof error.code === "number" || typeof error.code === "string" - ? ` (${error.code})` - : ""; - if (message) return `Initialization failed${code}: ${message}`; - } - const message = - error instanceof Error ? error.message : safeString(error).trim(); - return message - ? `Initialization failed: ${message}` - : "Initialization failed"; + if (isPlainObject(error)) { + const message = safeString(error.message).trim(); + const code = + typeof error.code === "number" || typeof error.code === "string" + ? ` (${error.code})` + : ""; + if (message) return `Initialization failed${code}: ${message}`; + } + const message = + error instanceof Error ? error.message : safeString(error).trim(); + return message + ? `Initialization failed: ${message}` + : "Initialization failed"; } function isSettingsOrKeybindingsFile( - uri: string | null | undefined, - file?: { uri?: string } | null, + uri: string | null | undefined, + file?: { uri?: string } | null, ): boolean { - const fileUri = String(uri || file?.uri || "").toLowerCase(); - if (!fileUri) return false; - - try { - const dataStorage = (globalThis as any).DATA_STORAGE; - if (dataStorage) { - const settingsPath = Url.join(dataStorage, "settings.json").toLowerCase(); - const keybindingsPath = ( - (globalThis as any).KEYBINDING_FILE || - Url.join(dataStorage, ".key-bindings.json") - ).toLowerCase(); - - if (fileUri === settingsPath || fileUri === keybindingsPath) { - return true; - } - } - } catch {} - - return ( - fileUri.endsWith("/settings.json") || - fileUri.endsWith("/.key-bindings.json") || - fileUri.endsWith("/keybindings.json") || - fileUri.endsWith("/.keybindings.json") || - fileUri === "settings.json" || - fileUri === ".key-bindings.json" || - fileUri === "keybindings.json" || - fileUri === ".keybindings.json" - ); + const fileUri = String(uri || file?.uri || "").toLowerCase(); + if (!fileUri) return false; + + try { + const dataStorage = (globalThis as any).DATA_STORAGE; + if (dataStorage) { + const settingsPath = Url.join(dataStorage, "settings.json").toLowerCase(); + const keybindingsPath = ( + (globalThis as any).KEYBINDING_FILE || + Url.join(dataStorage, ".key-bindings.json") + ).toLowerCase(); + + if (fileUri === settingsPath || fileUri === keybindingsPath) { + return true; + } + } + } catch {} + + return ( + fileUri.endsWith("/settings.json") || + fileUri.endsWith("/.key-bindings.json") || + fileUri.endsWith("/keybindings.json") || + fileUri.endsWith("/.keybindings.json") || + fileUri === "settings.json" || + fileUri === ".key-bindings.json" || + fileUri === "keybindings.json" || + fileUri === ".keybindings.json" + ); } function isVerboseLspLoggingEnabled(): boolean { - const buildInfo = (globalThis as { BuildInfo?: { debug?: boolean } }) - .BuildInfo; - return !!buildInfo?.debug; + const buildInfo = (globalThis as { BuildInfo?: { debug?: boolean } }) + .BuildInfo; + return !!buildInfo?.debug; } function logLspInfo(...args: unknown[]): void { - if (!isVerboseLspLoggingEnabled()) return; - console.info(...args); + if (!isVerboseLspLoggingEnabled()) return; + console.info(...args); } function isPlainObject(value: unknown): value is Record { - return !!value && typeof value === "object" && !Array.isArray(value); + return !!value && typeof value === "object" && !Array.isArray(value); } function resolveInitializationOptions( - server: LspServerDefinition, - clientConfig: Record, + server: LspServerDefinition, + clientConfig: Record, ): Record | undefined { - const serverOptions = isPlainObject(server.initializationOptions) - ? server.initializationOptions - : null; - const clientOptions = isPlainObject(clientConfig.initializationOptions) - ? clientConfig.initializationOptions - : null; - - if (serverOptions && clientOptions) { - return { - ...serverOptions, - ...clientOptions, - }; - } - - return serverOptions || clientOptions || undefined; + const serverOptions = isPlainObject(server.initializationOptions) + ? server.initializationOptions + : null; + const clientOptions = isPlainObject(clientConfig.initializationOptions) + ? clientConfig.initializationOptions + : null; + + if (serverOptions && clientOptions) { + return { + ...serverOptions, + ...clientOptions, + }; + } + + return serverOptions || clientOptions || undefined; } interface InternalLSPRequest { - promise: Promise; + promise: Promise; } type RequestInnerFn = ( - method: string, - params: Params, - mapped?: boolean, + method: string, + params: Params, + mapped?: boolean, ) => InternalLSPRequest; function connectClient( - client: ExtendedLSPClient, - transport: Transport, - initializationOptions?: Record, - rootUri?: string | null, + client: ExtendedLSPClient, + transport: Transport, + initializationOptions?: Record, + rootUri?: string | null, ): void { - const hasInitializationOptions = - !!initializationOptions && Object.keys(initializationOptions).length > 0; - if (!hasInitializationOptions && !rootUri) { - client.connect(transport); - return; - } - - const patchedClient = client as unknown as { - requestInner: RequestInnerFn; - }; - const originalRequestInner = patchedClient.requestInner.bind( - patchedClient, - ) as RequestInnerFn; - - patchedClient.requestInner = function patchedRequestInner( - method: string, - params: Params, - mapped?: boolean, - ): InternalLSPRequest { - if (method === "initialize" && isPlainObject(params)) { - params = { - ...params, - ...(hasInitializationOptions ? { initializationOptions } : {}), - ...(rootUri - ? { - workspaceFolders: [ - { uri: rootUri, name: workspaceName(rootUri) }, - ], - } - : {}), - } as Params; - } - return originalRequestInner(method, params, mapped); - }; - - try { - client.connect(transport); - } finally { - patchedClient.requestInner = originalRequestInner; - } + const hasInitializationOptions = + !!initializationOptions && Object.keys(initializationOptions).length > 0; + if (!hasInitializationOptions && !rootUri) { + client.connect(transport); + return; + } + + const patchedClient = client as unknown as { + requestInner: RequestInnerFn; + }; + const originalRequestInner = patchedClient.requestInner.bind( + patchedClient, + ) as RequestInnerFn; + + patchedClient.requestInner = function patchedRequestInner( + method: string, + params: Params, + mapped?: boolean, + ): InternalLSPRequest { + if (method === "initialize" && isPlainObject(params)) { + params = { + ...params, + ...(hasInitializationOptions ? { initializationOptions } : {}), + ...(rootUri + ? { + workspaceFolders: [ + { uri: rootUri, name: workspaceName(rootUri) }, + ], + } + : {}), + } as Params; + } + return originalRequestInner(method, params, mapped); + }; + + try { + client.connect(transport); + } finally { + patchedClient.requestInner = originalRequestInner; + } } function workspaceName(rootUri: string): string { - const trimmed = rootUri.replace(/\/+$/, ""); - const encodedName = trimmed.slice(trimmed.lastIndexOf("/") + 1); - try { - return decodeURIComponent(encodedName) || "workspace"; - } catch { - return encodedName || "workspace"; - } + const trimmed = rootUri.replace(/\/+$/, ""); + const encodedName = trimmed.slice(trimmed.lastIndexOf("/") + 1); + try { + return decodeURIComponent(encodedName) || "workspace"; + } catch { + return encodedName || "workspace"; + } } interface BuiltinExtensionsResult { - extensions: Extension[]; - diagnosticsExtension: Extension | LSPClientExtension | null; + extensions: Extension[]; + diagnosticsExtension: Extension | LSPClientExtension | null; } function buildBuiltinExtensions( - config: BuiltinExtensionsConfig = {}, + config: BuiltinExtensionsConfig = {}, ): BuiltinExtensionsResult { - const { - hover: includeHover = true, - completion: includeCompletion = true, - signature: includeSignature = true, - diagnostics: includeDiagnostics = true, - inlayHints: includeInlayHints = false, - documentColors: includeDocumentColors = true, - } = config; - - const extensions: Extension[] = []; - let diagnosticsExtension: Extension | LSPClientExtension | null = null; - - if (includeCompletion) extensions.push(serverCompletion()); - if (includeHover) extensions.push(hoverTooltips()); - if (includeSignature) extensions.push(signatureHelp({ keymap: false })); - if (includeDiagnostics) { - const diagExt = serverDiagnostics(); - diagnosticsExtension = diagExt; - extensions.push(diagExt as Extension); - } - if (includeInlayHints) { - const hintsExt = inlayHintsExtension(); - extensions.push(hintsExt as LSPClientExtension as Extension); - } - if (includeDocumentColors) { - const colorsExt = documentColorsExtension(); - extensions.push(colorsExt as LSPClientExtension as Extension); - } - - return { extensions, diagnosticsExtension }; + const { + hover: includeHover = true, + completion: includeCompletion = true, + signature: includeSignature = true, + diagnostics: includeDiagnostics = true, + inlayHints: includeInlayHints = false, + documentColors: includeDocumentColors = true, + } = config; + + const extensions: Extension[] = []; + let diagnosticsExtension: Extension | LSPClientExtension | null = null; + + if (includeCompletion) extensions.push(serverCompletion()); + if (includeHover) extensions.push(hoverTooltips()); + if (includeSignature) extensions.push(signatureHelp({ keymap: false })); + if (includeDiagnostics) { + const diagExt = serverDiagnostics(); + diagnosticsExtension = diagExt; + extensions.push(diagExt as Extension); + } + if (includeInlayHints) { + const hintsExt = inlayHintsExtension(); + extensions.push(hintsExt as LSPClientExtension as Extension); + } + if (includeDocumentColors) { + const colorsExt = documentColorsExtension(); + extensions.push(colorsExt as LSPClientExtension as Extension); + } + + return { extensions, diagnosticsExtension }; } function buildPluginOptions(server: LspServerDefinition): LSPPluginOptions { - const builtin = server.clientConfig?.builtinExtensions ?? {}; - return { - priority: server.priority, - features: { - completion: builtin.completion !== false, - hover: builtin.hover !== false, - signatureHelp: builtin.signature !== false, - diagnostics: builtin.diagnostics !== false, - formatting: builtin.formatting !== false, - inlayHint: builtin.inlayHints === true, - documentColor: builtin.documentColors !== false, - }, - }; + const builtin = server.clientConfig?.builtinExtensions ?? {}; + return { + priority: server.priority, + features: { + completion: builtin.completion !== false, + hover: builtin.hover !== false, + signatureHelp: builtin.signature !== false, + diagnostics: builtin.diagnostics !== false, + formatting: builtin.formatting !== false, + inlayHint: builtin.inlayHints === true, + documentColor: builtin.documentColors !== false, + }, + }; } interface InitContext { - key: string; - normalizedRootUri: string | null; - originalRootUri: string | null; - runtimeRootUri: string | null; - runtimeOriginalRootUri: string | null; - originalDocumentUri: string; - documentUri: string; - runtimeProvider: LspRuntimeProvider; - scope: LspClientScope; - signal: AbortSignal; + key: string; + normalizedRootUri: string | null; + originalRootUri: string | null; + runtimeRootUri: string | null; + runtimeOriginalRootUri: string | null; + originalDocumentUri: string; + documentUri: string; + runtimeProvider: LspRuntimeProvider; + scope: LspClientScope; + signal: AbortSignal; } interface ResolvedRuntimeTarget { - originalDocumentUri: string; - documentUri: string; - normalizedRootUri: string | null; - originalRootUri: string | null; - runtimeProvider: LspRuntimeProvider; - scope: LspClientScope; + originalDocumentUri: string; + documentUri: string; + normalizedRootUri: string | null; + originalRootUri: string | null; + runtimeProvider: LspRuntimeProvider; + scope: LspClientScope; } interface ExtendedLSPClient extends LSPClient { - __acodeServerId?: string; - __acodeLoggedInfo?: boolean; + __acodeServerId?: string; + __acodeLoggedInfo?: boolean; } interface PendingClientInitialization { - serverId: string; - controller: AbortController; - promise: Promise; + serverId: string; + controller: AbortController; + promise: Promise; } function initializationCancelledError(serverId: string): Error { - const error = new Error(`LSP client initialization cancelled for ${serverId}`); - error.name = "AbortError"; - return error; + const error = new Error( + `LSP client initialization cancelled for ${serverId}`, + ); + error.name = "AbortError"; + return error; } function throwIfInitializationCancelled( - signal: AbortSignal, - serverId: string, + signal: AbortSignal, + serverId: string, ): void { - if (!signal.aborted) return; - throw initializationCancelledError(serverId); + if (!signal.aborted) return; + throw initializationCancelledError(serverId); } function waitForInitialization( - promise: PromiseLike, - signal: AbortSignal, - serverId: string, + promise: PromiseLike, + signal: AbortSignal, + serverId: string, ): Promise { - throwIfInitializationCancelled(signal, serverId); - return new Promise((resolve, reject) => { - const onAbort = () => { - signal.removeEventListener("abort", onAbort); - reject(initializationCancelledError(serverId)); - }; - signal.addEventListener("abort", onAbort, { once: true }); - Promise.resolve(promise).then( - (value) => { - signal.removeEventListener("abort", onAbort); - resolve(value); - }, - (error) => { - signal.removeEventListener("abort", onAbort); - reject(error); - }, - ); - }); + throwIfInitializationCancelled(signal, serverId); + return new Promise((resolve, reject) => { + const onAbort = () => { + signal.removeEventListener("abort", onAbort); + reject(initializationCancelledError(serverId)); + }; + signal.addEventListener("abort", onAbort, { once: true }); + Promise.resolve(promise).then( + (value) => { + signal.removeEventListener("abort", onAbort); + resolve(value); + }, + (error) => { + signal.removeEventListener("abort", onAbort); + reject(error); + }, + ); + }); } export class LspClientManager { - options: ClientManagerOptions; - - #clients: Map; - #pendingClients: Map; - - constructor(options: ClientManagerOptions = {}) { - this.options = { ...options }; - this.#clients = new Map(); - this.#pendingClients = new Map(); - } - - setOptions(next: Partial): void { - this.options = { ...this.options, ...next }; - } - - getActiveClients(): ClientState[] { - return Array.from(this.#clients.values()); - } - - async getExtensionsForFile(metadata: FileMetadata): Promise { - const { - uri: originalUri, - languageId, - languageName, - view, - file, - rootUri, - } = metadata; - - const effectiveLang = safeString(languageId ?? languageName).toLowerCase(); - if (!effectiveLang) return []; - - const servers = serverRegistry.getServersForLanguage(effectiveLang); - if (!servers.length) return []; - - const lspExtensions: Extension[] = []; - const diagnosticsUiExtension = this.options.diagnosticsUiExtension; - - for (const server of servers) { - if (isSettingsOrKeybindingsFile(originalUri, file)) { - continue; - } - const target = await this.#resolveRuntimeTarget(server, { - uri: originalUri, - file, - view, - languageId: effectiveLang, - rootUri, - }); - if (!target) { - console.warn( - `Cannot resolve runtime or document URI for LSP server ${server.id}: ${originalUri}`, - ); - continue; - } - const normalizedUri = target.documentUri; - let targetLanguageId = effectiveLang; - if (server.resolveLanguageId) { - try { - const resolved = server.resolveLanguageId({ - languageId: effectiveLang, - languageName, - uri: normalizedUri, - file, - }); - if (resolved) targetLanguageId = safeString(resolved); - } catch (error) { - console.warn( - `LSP server ${server.id} failed to resolve language id for ${normalizedUri}`, - error, - ); - } - } - - try { - const clientState = await this.#ensureClient( - server, - { - uri: normalizedUri, - file, - view, - languageId: targetLanguageId, - rootUri: target.normalizedRootUri ?? undefined, - }, - target, - ); - const plugin = clientState.client.plugin( - normalizedUri, - targetLanguageId, - buildPluginOptions(server), - ); - if (server.clientConfig?.builtinExtensions?.completion !== false) { - lspExtensions.push(lspCompletionEnabled.of(true)); - } - const aliases = - originalUri && originalUri !== normalizedUri ? [originalUri] : []; - clientState.attach(normalizedUri, view as EditorView, aliases); - lspExtensions.push(plugin); - } catch (error) { - console.error( - `Failed to initialize LSP client for ${server.id}`, - error, - ); - } - } - - if (diagnosticsUiExtension && lspExtensions.length) { - lspExtensions.push(lspDiagnosticsAutoSyncExtension()); - lspExtensions.push(...asArray(diagnosticsUiExtension)); - } - - return lspExtensions; - } - - async formatDocument( - metadata: FileMetadata, - options: FormattingOptions = {}, - ): Promise { - const { uri: originalUri, languageId, languageName, view, file } = metadata; - - const effectiveLang = safeString(languageId ?? languageName).toLowerCase(); - if (!effectiveLang || !view) return false; - - const servers = serverRegistry.getServersForLanguage(effectiveLang); - if (!servers.length) return false; - - for (const server of servers) { - if (isSettingsOrKeybindingsFile(originalUri, file)) { - continue; - } - if (!supportsBuiltinFormatting(server)) continue; - try { - const target = await this.#resolveRuntimeTarget(server, { - uri: originalUri, - file, - view, - languageId: effectiveLang, - rootUri: metadata.rootUri, - }); - if (!target) { - console.warn( - `Cannot resolve document URI for formatting with ${server.id}: ${originalUri}`, - ); - continue; - } - const normalizedUri = target.documentUri; - const context: RootUriContext = { - uri: normalizedUri, - languageId: effectiveLang, - view, - file, - rootUri: target.normalizedRootUri ?? undefined, - }; - const state = await this.#ensureClient(server, context, target); - const capabilities = state.client.serverCapabilities; - if (!capabilities?.documentFormattingProvider) continue; - state.attach(normalizedUri, view); - const plugin = LSPPlugin.get(view, state.client); - if (!plugin) continue; - plugin.client.sync(); - const edits = await state.client.request< - { textDocument: { uri: string }; options: FormattingOptions }, - TextEdit[] | null - >("textDocument/formatting", { - textDocument: { uri: normalizedUri }, - options: buildFormattingOptions(view, options), - }); - if (!edits || !edits.length) { - plugin.client.sync(); - return true; - } - const applied = applyTextEdits(plugin, view, edits); - if (applied) { - plugin.client.sync(); - return true; - } - } catch (error) { - console.error(`LSP formatting failed for ${server.id}`, error); - } - } - return false; - } - - detach(uri: string, view: EditorView): void { - for (const state of this.#clients.values()) { - state.detach(uri, view); - } - } - - async disposeServer(serverId: string): Promise { - const normalizedId = safeString(serverId).toLowerCase(); - if (!normalizedId) return; - const pendingDisposals: Promise[] = []; - for (const [key, pending] of this.#pendingClients.entries()) { - if (pending.serverId !== normalizedId) continue; - pending.controller.abort(); - this.#pendingClients.delete(key); - pendingDisposals.push( - pending.promise.then((state) => state.dispose()), - ); - } - const states = Array.from(this.#clients.values()).filter( - (state) => state.server.id.toLowerCase() === normalizedId, - ); - await Promise.allSettled([ - ...states.map((state) => state.dispose()), - ...pendingDisposals, - ]); - } - - async dispose(): Promise { - try { - interface FileWithSession { - id?: string; - type?: string; - session?: EditorState; - } - - interface EditorManagerLike { - files?: FileWithSession[]; - editor?: EditorView; - activeFile?: FileWithSession; - } - - const em = (globalThis as Record).editorManager as - | EditorManagerLike - | undefined; - - if (em?.editor) { - try { - em.editor.dispatch({ effects: clearDiagnosticsEffect() }); - if (em.activeFile?.type === "editor") { - em.activeFile.session = em.editor.state; - } - } catch { - /* View may be disposed */ - } - } - - if (em?.files) { - for (const file of em.files) { - if (file?.type !== "editor" || file.id === em.activeFile?.id) - continue; - const session = file.session; - if (session && typeof session.update === "function") { - try { - file.session = session.update({ - effects: clearDiagnosticsEffect(), - }).state; - } catch { - /* State update failed */ - } - } - } - } - } catch { - /* Ignore errors */ - } - - const disposeOps: Promise[] = []; - for (const [key, pending] of this.#pendingClients.entries()) { - pending.controller.abort(); - this.#pendingClients.delete(key); - disposeOps.push(pending.promise.then((state) => state.dispose())); - } - for (const [key, state] of this.#clients.entries()) { - disposeOps.push(state.dispose()); - this.#clients.delete(key); - } - await Promise.allSettled(disposeOps); - } - - async #ensureClient( - server: LspServerDefinition, - context: RootUriContext, - target: ResolvedRuntimeTarget, - ): Promise { - const { - documentUri, - normalizedRootUri, - originalRootUri, - runtimeProvider, - scope, - } = target; - const useWsFolders = - scope === "workspace" && server.useWorkspaceFolders === true; - const runtimeServerKey = `${server.id}@${runtimeProvider.id}`; - - // Workspace-folder clients are shared only within the selected runtime. - const key = - scope === "document" - ? `${runtimeServerKey}::__document__::${documentUri}` - : pluginKey(runtimeServerKey, normalizedRootUri, useWsFolders); - - // Return existing client if already initialized - if (this.#clients.has(key)) { - const existing = this.#clients.get(key)!; - // For workspace folders mode, add the new folder to the existing server - if (useWsFolders && normalizedRootUri) { - const workspace = existing.client.workspace as AcodeWorkspace | null; - if (workspace && !workspace.hasWorkspaceFolder(normalizedRootUri)) { - workspace.addWorkspaceFolder(normalizedRootUri); - } - } - return existing; - } - - // If initialization is already in progress, wait for it - if (this.#pendingClients.has(key)) { - const pending = await this.#pendingClients.get(key)!.promise; - if (useWsFolders && normalizedRootUri) { - const workspace = pending.client.workspace as AcodeWorkspace | null; - if (workspace && !workspace.hasWorkspaceFolder(normalizedRootUri)) { - workspace.addWorkspaceFolder(normalizedRootUri); - } - } - return pending; - } - - // Create and track the pending initialization - const controller = new AbortController(); - const initPromise = this.#initializeClient(server, context, { - key, - normalizedRootUri: useWsFolders ? null : normalizedRootUri, - originalRootUri: useWsFolders ? null : originalRootUri, - runtimeRootUri: normalizedRootUri, - runtimeOriginalRootUri: originalRootUri, - originalDocumentUri: target.originalDocumentUri, - documentUri, - runtimeProvider, - scope, - signal: controller.signal, - }); - const pending: PendingClientInitialization = { - serverId: server.id.toLowerCase(), - controller, - promise: initPromise, - }; - this.#pendingClients.set(key, pending); - - try { - const state = await initPromise; - if (useWsFolders && normalizedRootUri) { - const workspace = state.client.workspace as AcodeWorkspace | null; - if (workspace && !workspace.hasWorkspaceFolder(normalizedRootUri)) { - workspace.addWorkspaceFolder(normalizedRootUri); - } - } - return state; - } finally { - if (this.#pendingClients.get(key) === pending) { - this.#pendingClients.delete(key); - } - } - } - - async #initializeClient( - server: LspServerDefinition, - context: RootUriContext, - initContext: InitContext, - ): Promise { - const { - key, - normalizedRootUri, - originalRootUri, - runtimeRootUri, - runtimeOriginalRootUri, - originalDocumentUri, - documentUri, - runtimeProvider, - scope, - signal, - } = initContext; - - const workspaceOptions = { - displayFile: this.options.displayFile, - openFile: this.options.openFile, - resolveLanguageId: this.options.resolveLanguageId, - // Track the first folder advertised during `initialize` so it is not - // sent again as a workspace-folder change after the client connects. - initialFolders: runtimeRootUri ? [runtimeRootUri] : undefined, - }; - - const clientConfig = { ...(server.clientConfig ?? {}) }; - const initializationOptions = resolveInitializationOptions( - server, - clientConfig as Record, - ); - const builtinConfig = clientConfig.builtinExtensions ?? {}; - const useDefaultExtensions = clientConfig.useDefaultExtensions !== false; - const { extensions: defaultExtensions, diagnosticsExtension } = - useDefaultExtensions - ? buildBuiltinExtensions({ - hover: builtinConfig.hover !== false, - completion: builtinConfig.completion !== false, - signature: builtinConfig.signature !== false, - keymaps: builtinConfig.keymaps !== false, - diagnostics: builtinConfig.diagnostics !== false, - inlayHints: builtinConfig.inlayHints === true, - formatting: builtinConfig.formatting !== false, - documentColors: builtinConfig.documentColors !== false, - }) - : { extensions: [], diagnosticsExtension: null }; - - const extraExtensions = asArray(this.options.clientExtensions); - const serverExtensions = asArray(clientConfig.extensions); - - interface ExtensionWithCapabilities { - clientCapabilities?: { - textDocument?: { - publishDiagnostics?: unknown; - }; - }; - } - - const wantsCustomDiagnostics = [ - ...extraExtensions, - ...serverExtensions, - ].some((ext) => { - const extWithCaps = ext as ExtensionWithCapabilities; - return !!extWithCaps?.clientCapabilities?.textDocument - ?.publishDiagnostics; - }); - - const filteredBuiltins = - wantsCustomDiagnostics && diagnosticsExtension - ? defaultExtensions.filter((ext) => ext !== diagnosticsExtension) - : defaultExtensions; - - const clientCapabilities: LSPClientExtension = { - clientCapabilities: { - window: { - workDoneProgress: true, - }, - workspace: { - configuration: true, - workspaceFolders: true, - }, - textDocument: { - codeAction: { - dataSupport: true, - resolveSupport: { - properties: ["edit"], - }, - }, - }, - }, - }; - - const mergedExtensions = [ - ...filteredBuiltins, - ...extraExtensions, - ...serverExtensions, - clientCapabilities, - ]; - clientConfig.extensions = mergedExtensions; - - const existingHandlers = clientConfig.notificationHandlers ?? {}; - - type LogLevel = "error" | "warn" | "log" | "info"; - interface LogMessageParams { - type?: number; - message?: string; - } - interface ShowMessageParams { - type?: number; - message?: string; - } - - clientConfig.notificationHandlers = { - ...existingHandlers, - "window/logMessage": (_client: LSPClient, params: unknown): boolean => { - const logParams = params as LogMessageParams; - if (!logParams?.message) return false; - const { type, message } = logParams; - let level: LogLevel = "info"; - switch (type) { - case 1: - level = "error"; - break; - case 2: - level = "warn"; - break; - case 4: - level = "log"; - break; - default: - level = "info"; - } - const logFn = console[level] ?? console.info; - addLspLog(server.id, level === "log" ? "info" : level, message); - logFn(`[LSP:${server.id}] ${message}`); - return true; - }, - "window/showMessage": (_client: LSPClient, params: unknown): boolean => { - const showParams = params as ShowMessageParams; - if (!showParams?.message) return false; - const { type, message } = showParams; - const serverLabel = server.label || server.id; - - // Helper to clean and truncate message for notifications - const cleanMessage = (msg: string, maxLen = 150): string => { - // Take only first line - let cleaned = msg.split("\n")[0].trim(); - if (cleaned.length > maxLen) { - cleaned = cleaned.slice(0, maxLen - 3) + "..."; - } - return cleaned; - }; - - // Use notifications for errors and warnings - if (type === 1 || type === 2) { - notificationManager.pushNotification({ - title: serverLabel, - message: cleanMessage(message), - icon: type === 1 ? "error" : "warningreport_problem", - type: type === 1 ? "error" : "warning", - }); - addLspLog(server.id, type === 1 ? "error" : "warn", message); - logLspInfo(`[LSP:${server.id}] ${message}`); - return true; - } - - // For info/log messages, use status bar briefly - lspStatusBar.show({ - message: cleanMessage(message, 80), - title: serverLabel, - type: "info", - icon: type === 4 ? "autorenew" : "info", - duration: 5000, - }); - addLspLog(server.id, "info", message); - logLspInfo(`[LSP:${server.id}] ${message}`); - return true; - }, - "$/progress": (_client: LSPClient, params: unknown): boolean => { - interface ProgressParams { - token?: string | number; - value?: { - kind?: "begin" | "report" | "end"; - title?: string; - message?: string; - percentage?: number; - cancellable?: boolean; - }; - } - const progressParams = params as ProgressParams; - if (!progressParams?.value) return false; - - const { kind, title, message, percentage } = progressParams.value; - const displayTitle = title || server.label || server.id; - // Use server ID + token as unique status ID for concurrent progress tracking - const progressToken = progressParams.token; - const statusId = `${server.id}-progress-${progressToken ?? "default"}`; - - if (kind === "begin") { - lspStatusBar.show({ - id: statusId, - message: message || title || "Starting...", - title: displayTitle, - type: "info", - icon: "autorenew", - duration: false, - showProgress: typeof percentage === "number", - progress: percentage, - }); - } else if (kind === "report") { - lspStatusBar.update({ - id: statusId, - message: message, - progress: percentage, - }); - } else if (kind === "end") { - // Just hide the progress item silently, no "Complete" message - lspStatusBar.hideById(statusId); - } - - logLspInfo( - `[LSP:${server.id}] Progress: ${kind} - ${message || title || ""} ${typeof percentage === "number" ? `(${percentage}%)` : ""}`, - ); - return true; - }, - "$/typescriptVersion": (_client: LSPClient, params: unknown): boolean => { - interface TypeScriptVersionParams { - version?: string; - source?: string; - } - const versionParams = params as TypeScriptVersionParams; - if (!versionParams?.version) return false; - - const serverLabel = server.label || server.id; - const source = versionParams.source || "bundled"; - logLspInfo( - `[LSP:${server.id}] TypeScript ${versionParams.version} (${source})`, - ); - - // Show briefly in status bar - lspStatusBar.show({ - message: `TypeScript ${versionParams.version}`, - title: serverLabel, - type: "info", - icon: "code", - duration: 3000, - }); - return true; - }, - }; - - // Log unhandled notifications to help debug what servers are sending - const unhandledNotificationKey = - "unhandledNotification" as keyof typeof clientConfig; - if (!(unhandledNotificationKey in clientConfig)) { - ( - clientConfig as Record< - string, - (client: LSPClient, method: string, params: unknown) => void - > - ).unhandledNotification = ( - _client: LSPClient, - method: string, - params: unknown, - ) => { - logLspInfo( - `[LSP:${server.id}] Unhandled notification: ${method}`, - params, - ); - }; - } - - if (!clientConfig.workspace) { - clientConfig.workspace = (client: LSPClient) => - new AcodeWorkspace(client, workspaceOptions); - } - - if (normalizedRootUri && !clientConfig.rootUri) { - clientConfig.rootUri = normalizedRootUri; - } - - if (!normalizedRootUri && clientConfig.rootUri) { - delete clientConfig.rootUri; - } - - if (server.startupTimeout && !clientConfig.timeout) { - clientConfig.timeout = server.startupTimeout; - } - - if (!clientConfig.highlightLanguage) { - clientConfig.highlightLanguage = resolveLspHoverHighlightLanguage; - } - - let transportHandle: TransportHandle | undefined; - let client: ExtendedLSPClient | undefined; - let runtimeConnection: LspRuntimeConnection | undefined; - - try { - throwIfInitializationCancelled(signal, server.id); - const runtimeContext = { - ...context, - uri: documentUri, - documentUri, - originalDocumentUri, - rootUri: runtimeRootUri, - originalRootUri: runtimeOriginalRootUri ?? undefined, - serverId: server.id, - allowNonTerminalWorkspace: - this.options.allowNonTerminalWorkspace === true, - }; - const connection = await runtimeProvider.start(server, runtimeContext); - const connectionDispose = connection.dispose; - connection.dispose = async () => { - try { - if (connectionDispose) { - await connectionDispose(); - } - } finally { - if (runtimeProvider.stop) { - await runtimeProvider.stop(connection); - } - } - }; - runtimeConnection = connection; - throwIfInitializationCancelled(signal, server.id); - - transportHandle = createTransportFromRuntimeConnection( - server, - runtimeContext, - connection, - ); - await waitForInitialization(transportHandle.ready, signal, server.id); - client = new LSPClient(clientConfig) as ExtendedLSPClient; - client.__acodeServerId = server.id; - connectClient( - client, - transportHandle.transport, - initializationOptions, - runtimeRootUri, - ); - await waitForInitialization(client.initializing, signal, server.id); - if (!client.__acodeLoggedInfo) { - // Log root URI info to console - if (normalizedRootUri) { - if (originalRootUri && originalRootUri !== normalizedRootUri) { - logLspInfo( - `[LSP:${server.id}] root ${normalizedRootUri} (from ${originalRootUri})`, - ); - } else { - logLspInfo(`[LSP:${server.id}] root`, normalizedRootUri); - } - } else if (originalRootUri) { - logLspInfo(`[LSP:${server.id}] root ignored`, originalRootUri); - } - if (initializationOptions) { - logLspInfo( - `[LSP:${server.id}] initializationOptions keys`, - Object.keys(initializationOptions), - ); - } - logLspInfo(`[LSP:${server.id}] initialized`); - addLspLog( - server.id, - "info", - runtimeRootUri - ? `Initialized workspace ${runtimeRootUri}` - : "Initialized without a workspace root", - ); - client.__acodeLoggedInfo = true; - } - } catch (error) { - addLspLog( - server.id, - "error", - formatInitializationError(error), - error, - ); - try { - client?.disconnect(); - } catch { - /* Client may not have finished connecting */ - } - if (transportHandle) { - await transportHandle.dispose?.(); - } else { - await runtimeConnection?.dispose?.(); - } - throw error; - } - - const state = this.#createClientState({ - key, - server, - client, - transportHandle, - normalizedRootUri, - originalRootUri: scope === "document" ? null : originalRootUri, - }); - - this.#clients.set(key, state); - return state; - } - - #createClientState(params: { - key: string; - server: LspServerDefinition; - client: LSPClient; - transportHandle: TransportHandle; - normalizedRootUri: string | null; - originalRootUri: string | null; - }): ClientState { - const { - key, - server, - client, - transportHandle, - normalizedRootUri, - originalRootUri, - } = params; - const fileRefs = new Map>(); - const uriAliases = new Map(); - const effectiveRoot = normalizedRootUri ?? originalRootUri ?? null; - let disposed = false; - let idleTimer: ReturnType | null = null; - - const cancelIdleTimer = (): void => { - if (idleTimer === null) return; - clearTimeout(idleTimer); - idleTimer = null; - }; - - const attach = ( - uri: string, - view: EditorView, - aliases: string[] = [], - ): void => { - cancelIdleTimer(); - const existing = fileRefs.get(uri) ?? new Set(); - existing.add(view); - fileRefs.set(uri, existing); - uriAliases.set(uri, uri); - for (const alias of aliases) { - if (!alias || alias === uri) continue; - uriAliases.set(alias, uri); - } - const suffix = effectiveRoot ? ` (root ${effectiveRoot})` : ""; - logLspInfo(`[LSP:${server.id}] attached to ${uri}${suffix}`); - }; - - const clearClientDiagnostics = (view: EditorView): void => { - try { - view.dispatch({ effects: clearDiagnosticsEffect(client) }); - } catch { - /* View may already be destroyed or may not have diagnostics state. */ - } - }; - - const dispose = async (): Promise => { - if (disposed) return; - disposed = true; - cancelIdleTimer(); - disposePullDiagnostics(client); - this.#clients.delete(key); - for (const views of fileRefs.values()) { - for (const view of views) clearClientDiagnostics(view); - } - try { - client.disconnect(); - } catch (error) { - console.warn(`Error disconnecting LSP client ${server.id}`, error); - } - try { - await transportHandle.dispose?.(); - } catch (error) { - console.warn(`Error disposing LSP transport ${server.id}`, error); - } - }; - - const detach = (uri: string, view?: EditorView): void => { - const actualUri = uriAliases.get(uri) ?? uri; - const existing = fileRefs.get(actualUri); - if (!existing) return; - if (view) { - existing.delete(view); - clearClientDiagnostics(view); - } - if (!view || !existing.size) { - fileRefs.delete(actualUri); - for (const [alias, target] of uriAliases.entries()) { - if (target === actualUri) { - uriAliases.delete(alias); - } - } - try { - // Only pass uri to closeFile - view is not needed for closing - // and passing it may cause issues if the view is already disposed - (client.workspace as AcodeWorkspace)?.closeFile?.(actualUri); - } catch (error) { - console.warn(`Failed to close LSP file ${actualUri}`, error); - } - } - - if (fileRefs.size || idleTimer !== null) return; - - const configuredGracePeriod = this.options.clientIdleGracePeriodMs; - const gracePeriod = - typeof configuredGracePeriod === "number" && - Number.isFinite(configuredGracePeriod) - ? Math.max(0, configuredGracePeriod) - : DEFAULT_CLIENT_IDLE_GRACE_PERIOD_MS; - idleTimer = setTimeout(() => { - idleTimer = null; - if (disposed || fileRefs.size) return; - this.options.onClientIdle?.({ - server, - client, - rootUri: effectiveRoot, - dispose, - }); - }, gracePeriod); - }; - - return { - server, - client, - transport: transportHandle, - rootUri: effectiveRoot, - attach, - detach, - dispose, - }; - } - - async #resolveRootUri( - server: LspServerDefinition, - context: RootUriContext, - ): Promise { - if (typeof server.rootUri === "function") { - try { - const value = await server.rootUri(context?.uri ?? "", context); - if (value) return safeString(value); - } catch (error) { - console.warn(`Server root resolver failed for ${server.id}`, error); - } - } - - if (context?.rootUri) return safeString(context.rootUri); - - if (typeof this.options.resolveRoot === "function") { - try { - const value = await this.options.resolveRoot(context); - if (value) return safeString(value); - } catch (error) { - console.warn("Global LSP root resolver failed", error); - } - } - - return null; - } - - async #resolveRuntimeTarget( - server: LspServerDefinition, - context: RootUriContext, - ): Promise { - const originalDocumentUri = context.uri; - if (!originalDocumentUri) return null; - - const originalRootUri = await this.#resolveRootUri(server, context); - const { normalizedRootUri } = normalizeRootUriForServer( - server, - originalRootUri, - ); - const normalizedDocumentUri = await this.#resolveDocumentUri( - server, - context, - ); - const providerContext = { - ...context, - uri: originalDocumentUri, - documentUri: normalizedDocumentUri, - originalDocumentUri, - rootUri: originalRootUri, - originalRootUri: originalRootUri ?? undefined, - serverId: server.id, - allowNonTerminalWorkspace: - this.options.allowNonTerminalWorkspace === true, - }; - const runtimeProvider = await selectRuntimeProvider(server, providerContext); - if (!runtimeProvider) { - console.warn( - `No LSP runtime provider selected for ${server.id}: uri=${originalDocumentUri}, root=${originalRootUri ?? "none"}, normalizedUri=${normalizedDocumentUri ?? "none"}`, - ); - return null; - } - - let documentUri = normalizedDocumentUri; - let rootUri = normalizedRootUri; - let scope: LspClientScope = "workspace"; - - if (runtimeProvider.resolveUris) { - try { - const resolution = await runtimeProvider.resolveUris(server, { - ...providerContext, - originalRootUri, - normalizedDocumentUri, - normalizedRootUri, - }); - if (resolution) { - if (Object.prototype.hasOwnProperty.call(resolution, "documentUri")) { - documentUri = resolution.documentUri || null; - } - if (Object.prototype.hasOwnProperty.call(resolution, "rootUri")) { - rootUri = resolution.rootUri || null; - } - if (resolution.scope) scope = resolution.scope; - } - } catch (error) { - console.warn( - `LSP runtime provider ${runtimeProvider.id} failed to resolve URIs for ${server.id}`, - error, - ); - return null; - } - } - - if (!documentUri) { - console.warn( - `LSP runtime provider ${runtimeProvider.id} produced no document URI for ${server.id}: uri=${originalDocumentUri}, normalizedUri=${normalizedDocumentUri ?? "none"}`, - ); - return null; - } - return { - originalDocumentUri, - documentUri, - normalizedRootUri: rootUri, - originalRootUri, - runtimeProvider, - scope, - }; - } - - async #resolveDocumentUri( - server: LspServerDefinition, - context: RootUriContext, - ): Promise { - const originalUri = context?.uri; - if (!originalUri) return null; - - const normalizedUri = normalizeDocumentUri(originalUri); - - if (typeof server.documentUri === "function") { - try { - const value = await server.documentUri(originalUri, { - ...context, - normalizedUri, - } as DocumentUriContext); - if (value) return safeString(value); - } catch (error) { - console.warn( - `Server document URI resolver failed for ${server.id}`, - error, - ); - } - } - - return normalizedUri; - } + options: ClientManagerOptions; + + #clients: Map; + #pendingClients: Map; + + constructor(options: ClientManagerOptions = {}) { + this.options = { ...options }; + this.#clients = new Map(); + this.#pendingClients = new Map(); + } + + setOptions(next: Partial): void { + this.options = { ...this.options, ...next }; + } + + getActiveClients(): ClientState[] { + return Array.from(this.#clients.values()); + } + + async getExtensionsForFile(metadata: FileMetadata): Promise { + const { + uri: originalUri, + languageId, + languageName, + view, + file, + rootUri, + } = metadata; + + const effectiveLang = safeString(languageId ?? languageName).toLowerCase(); + if (!effectiveLang) return []; + + const servers = serverRegistry.getServersForLanguage(effectiveLang); + if (!servers.length) return []; + + const lspExtensions: Extension[] = []; + const diagnosticsUiExtension = this.options.diagnosticsUiExtension; + + for (const server of servers) { + if (isSettingsOrKeybindingsFile(originalUri, file)) { + continue; + } + const target = await this.#resolveRuntimeTarget(server, { + uri: originalUri, + file, + view, + languageId: effectiveLang, + rootUri, + }); + if (!target) { + console.warn( + `Cannot resolve runtime or document URI for LSP server ${server.id}: ${originalUri}`, + ); + continue; + } + const normalizedUri = target.documentUri; + let targetLanguageId = effectiveLang; + if (server.resolveLanguageId) { + try { + const resolved = server.resolveLanguageId({ + languageId: effectiveLang, + languageName, + uri: normalizedUri, + file, + }); + if (resolved) targetLanguageId = safeString(resolved); + } catch (error) { + console.warn( + `LSP server ${server.id} failed to resolve language id for ${normalizedUri}`, + error, + ); + } + } + + try { + const clientState = await this.#ensureClient( + server, + { + uri: normalizedUri, + file, + view, + languageId: targetLanguageId, + rootUri: target.normalizedRootUri ?? undefined, + }, + target, + ); + const plugin = clientState.client.plugin( + normalizedUri, + targetLanguageId, + buildPluginOptions(server), + ); + if (server.clientConfig?.builtinExtensions?.completion !== false) { + lspExtensions.push(lspCompletionEnabled.of(true)); + } + const aliases = + originalUri && originalUri !== normalizedUri ? [originalUri] : []; + clientState.attach(normalizedUri, view as EditorView, aliases); + lspExtensions.push(plugin); + } catch (error) { + console.error( + `Failed to initialize LSP client for ${server.id}`, + error, + ); + } + } + + if (diagnosticsUiExtension && lspExtensions.length) { + lspExtensions.push(lspDiagnosticsAutoSyncExtension()); + lspExtensions.push(...asArray(diagnosticsUiExtension)); + } + + return lspExtensions; + } + + async formatDocument( + metadata: FileMetadata, + options: FormattingOptions = {}, + ): Promise { + const { uri: originalUri, languageId, languageName, view, file } = metadata; + + const effectiveLang = safeString(languageId ?? languageName).toLowerCase(); + if (!effectiveLang || !view) return false; + + const servers = serverRegistry.getServersForLanguage(effectiveLang); + if (!servers.length) return false; + + for (const server of servers) { + if (isSettingsOrKeybindingsFile(originalUri, file)) { + continue; + } + if (!supportsBuiltinFormatting(server)) continue; + try { + const target = await this.#resolveRuntimeTarget(server, { + uri: originalUri, + file, + view, + languageId: effectiveLang, + rootUri: metadata.rootUri, + }); + if (!target) { + console.warn( + `Cannot resolve document URI for formatting with ${server.id}: ${originalUri}`, + ); + continue; + } + const normalizedUri = target.documentUri; + const context: RootUriContext = { + uri: normalizedUri, + languageId: effectiveLang, + view, + file, + rootUri: target.normalizedRootUri ?? undefined, + }; + const state = await this.#ensureClient(server, context, target); + const capabilities = state.client.serverCapabilities; + if (!capabilities?.documentFormattingProvider) continue; + state.attach(normalizedUri, view); + const plugin = LSPPlugin.get(view, state.client); + if (!plugin) continue; + plugin.client.sync(); + const edits = await state.client.request< + { textDocument: { uri: string }; options: FormattingOptions }, + TextEdit[] | null + >("textDocument/formatting", { + textDocument: { uri: normalizedUri }, + options: buildFormattingOptions(view, options), + }); + if (!edits || !edits.length) { + plugin.client.sync(); + return true; + } + const applied = applyTextEdits(plugin, view, edits); + if (applied) { + plugin.client.sync(); + return true; + } + } catch (error) { + console.error(`LSP formatting failed for ${server.id}`, error); + } + } + return false; + } + + detach(uri: string, view: EditorView): void { + for (const state of this.#clients.values()) { + state.detach(uri, view); + } + } + + async disposeServer(serverId: string): Promise { + const normalizedId = safeString(serverId).toLowerCase(); + if (!normalizedId) return; + const pendingDisposals: Promise[] = []; + for (const [key, pending] of this.#pendingClients.entries()) { + if (pending.serverId !== normalizedId) continue; + pending.controller.abort(); + this.#pendingClients.delete(key); + pendingDisposals.push(pending.promise.then((state) => state.dispose())); + } + const states = Array.from(this.#clients.values()).filter( + (state) => state.server.id.toLowerCase() === normalizedId, + ); + await Promise.allSettled([ + ...states.map((state) => state.dispose()), + ...pendingDisposals, + ]); + } + + async dispose(): Promise { + try { + interface FileWithSession { + id?: string; + type?: string; + session?: EditorState; + } + + interface EditorManagerLike { + files?: FileWithSession[]; + editor?: EditorView; + activeFile?: FileWithSession; + } + + const em = (globalThis as Record).editorManager as + | EditorManagerLike + | undefined; + + if (em?.editor) { + try { + em.editor.dispatch({ effects: clearDiagnosticsEffect() }); + if (em.activeFile?.type === "editor") { + em.activeFile.session = em.editor.state; + } + } catch { + /* View may be disposed */ + } + } + + if (em?.files) { + for (const file of em.files) { + if (file?.type !== "editor" || file.id === em.activeFile?.id) + continue; + const session = file.session; + if (session && typeof session.update === "function") { + try { + file.session = session.update({ + effects: clearDiagnosticsEffect(), + }).state; + } catch { + /* State update failed */ + } + } + } + } + } catch { + /* Ignore errors */ + } + + const disposeOps: Promise[] = []; + for (const [key, pending] of this.#pendingClients.entries()) { + pending.controller.abort(); + this.#pendingClients.delete(key); + disposeOps.push(pending.promise.then((state) => state.dispose())); + } + for (const [key, state] of this.#clients.entries()) { + disposeOps.push(state.dispose()); + this.#clients.delete(key); + } + await Promise.allSettled(disposeOps); + } + + async #ensureClient( + server: LspServerDefinition, + context: RootUriContext, + target: ResolvedRuntimeTarget, + ): Promise { + const { + documentUri, + normalizedRootUri, + originalRootUri, + runtimeProvider, + scope, + } = target; + const useWsFolders = + scope === "workspace" && server.useWorkspaceFolders === true; + const runtimeServerKey = `${server.id}@${runtimeProvider.id}`; + + // Workspace-folder clients are shared only within the selected runtime. + const key = + scope === "document" + ? `${runtimeServerKey}::__document__::${documentUri}` + : pluginKey(runtimeServerKey, normalizedRootUri, useWsFolders); + + // Return existing client if already initialized + if (this.#clients.has(key)) { + const existing = this.#clients.get(key)!; + // For workspace folders mode, add the new folder to the existing server + if (useWsFolders && normalizedRootUri) { + const workspace = existing.client.workspace as AcodeWorkspace | null; + if (workspace && !workspace.hasWorkspaceFolder(normalizedRootUri)) { + workspace.addWorkspaceFolder(normalizedRootUri); + } + } + return existing; + } + + // If initialization is already in progress, wait for it + if (this.#pendingClients.has(key)) { + const pending = await this.#pendingClients.get(key)!.promise; + if (useWsFolders && normalizedRootUri) { + const workspace = pending.client.workspace as AcodeWorkspace | null; + if (workspace && !workspace.hasWorkspaceFolder(normalizedRootUri)) { + workspace.addWorkspaceFolder(normalizedRootUri); + } + } + return pending; + } + + // Create and track the pending initialization + const controller = new AbortController(); + const initPromise = this.#initializeClient(server, context, { + key, + normalizedRootUri: useWsFolders ? null : normalizedRootUri, + originalRootUri: useWsFolders ? null : originalRootUri, + runtimeRootUri: normalizedRootUri, + runtimeOriginalRootUri: originalRootUri, + originalDocumentUri: target.originalDocumentUri, + documentUri, + runtimeProvider, + scope, + signal: controller.signal, + }); + const pending: PendingClientInitialization = { + serverId: server.id.toLowerCase(), + controller, + promise: initPromise, + }; + this.#pendingClients.set(key, pending); + + try { + const state = await initPromise; + if (useWsFolders && normalizedRootUri) { + const workspace = state.client.workspace as AcodeWorkspace | null; + if (workspace && !workspace.hasWorkspaceFolder(normalizedRootUri)) { + workspace.addWorkspaceFolder(normalizedRootUri); + } + } + return state; + } finally { + if (this.#pendingClients.get(key) === pending) { + this.#pendingClients.delete(key); + } + } + } + + async #initializeClient( + server: LspServerDefinition, + context: RootUriContext, + initContext: InitContext, + ): Promise { + const { + key, + normalizedRootUri, + originalRootUri, + runtimeRootUri, + runtimeOriginalRootUri, + originalDocumentUri, + documentUri, + runtimeProvider, + scope, + signal, + } = initContext; + + const workspaceOptions = { + displayFile: this.options.displayFile, + openFile: this.options.openFile, + resolveLanguageId: this.options.resolveLanguageId, + // Track the first folder advertised during `initialize` so it is not + // sent again as a workspace-folder change after the client connects. + initialFolders: runtimeRootUri ? [runtimeRootUri] : undefined, + }; + + const clientConfig = { ...(server.clientConfig ?? {}) }; + const initializationOptions = resolveInitializationOptions( + server, + clientConfig as Record, + ); + const builtinConfig = clientConfig.builtinExtensions ?? {}; + const useDefaultExtensions = clientConfig.useDefaultExtensions !== false; + const { extensions: defaultExtensions, diagnosticsExtension } = + useDefaultExtensions + ? buildBuiltinExtensions({ + hover: builtinConfig.hover !== false, + completion: builtinConfig.completion !== false, + signature: builtinConfig.signature !== false, + keymaps: builtinConfig.keymaps !== false, + diagnostics: builtinConfig.diagnostics !== false, + inlayHints: builtinConfig.inlayHints === true, + formatting: builtinConfig.formatting !== false, + documentColors: builtinConfig.documentColors !== false, + }) + : { extensions: [], diagnosticsExtension: null }; + + const extraExtensions = asArray(this.options.clientExtensions); + const serverExtensions = asArray(clientConfig.extensions); + + interface ExtensionWithCapabilities { + clientCapabilities?: { + textDocument?: { + publishDiagnostics?: unknown; + }; + }; + } + + const wantsCustomDiagnostics = [ + ...extraExtensions, + ...serverExtensions, + ].some((ext) => { + const extWithCaps = ext as ExtensionWithCapabilities; + return !!extWithCaps?.clientCapabilities?.textDocument + ?.publishDiagnostics; + }); + + const filteredBuiltins = + wantsCustomDiagnostics && diagnosticsExtension + ? defaultExtensions.filter((ext) => ext !== diagnosticsExtension) + : defaultExtensions; + + const clientCapabilities: LSPClientExtension = { + clientCapabilities: { + window: { + workDoneProgress: true, + }, + workspace: { + configuration: true, + workspaceFolders: true, + }, + textDocument: { + codeAction: { + dataSupport: true, + resolveSupport: { + properties: ["edit"], + }, + }, + }, + }, + }; + + const mergedExtensions = [ + ...filteredBuiltins, + ...extraExtensions, + ...serverExtensions, + clientCapabilities, + ]; + clientConfig.extensions = mergedExtensions; + + const existingHandlers = clientConfig.notificationHandlers ?? {}; + + type LogLevel = "error" | "warn" | "log" | "info"; + interface LogMessageParams { + type?: number; + message?: string; + } + interface ShowMessageParams { + type?: number; + message?: string; + } + + clientConfig.notificationHandlers = { + ...existingHandlers, + "window/logMessage": (_client: LSPClient, params: unknown): boolean => { + const logParams = params as LogMessageParams; + if (!logParams?.message) return false; + const { type, message } = logParams; + let level: LogLevel = "info"; + switch (type) { + case 1: + level = "error"; + break; + case 2: + level = "warn"; + break; + case 4: + level = "log"; + break; + default: + level = "info"; + } + const logFn = console[level] ?? console.info; + addLspLog(server.id, level === "log" ? "info" : level, message); + logFn(`[LSP:${server.id}] ${message}`); + return true; + }, + "window/showMessage": (_client: LSPClient, params: unknown): boolean => { + const showParams = params as ShowMessageParams; + if (!showParams?.message) return false; + const { type, message } = showParams; + const serverLabel = server.label || server.id; + + // Helper to clean and truncate message for notifications + const cleanMessage = (msg: string, maxLen = 150): string => { + // Take only first line + let cleaned = msg.split("\n")[0].trim(); + if (cleaned.length > maxLen) { + cleaned = cleaned.slice(0, maxLen - 3) + "..."; + } + return cleaned; + }; + + // Use notifications for errors and warnings + if (type === 1 || type === 2) { + notificationManager.pushNotification({ + title: serverLabel, + message: cleanMessage(message), + icon: type === 1 ? "error" : "warningreport_problem", + type: type === 1 ? "error" : "warning", + }); + addLspLog(server.id, type === 1 ? "error" : "warn", message); + logLspInfo(`[LSP:${server.id}] ${message}`); + return true; + } + + // For info/log messages, use status bar briefly + lspStatusBar.show({ + message: cleanMessage(message, 80), + title: serverLabel, + type: "info", + icon: type === 4 ? "autorenew" : "info", + duration: 5000, + }); + addLspLog(server.id, "info", message); + logLspInfo(`[LSP:${server.id}] ${message}`); + return true; + }, + "$/progress": (_client: LSPClient, params: unknown): boolean => { + interface ProgressParams { + token?: string | number; + value?: { + kind?: "begin" | "report" | "end"; + title?: string; + message?: string; + percentage?: number; + cancellable?: boolean; + }; + } + const progressParams = params as ProgressParams; + if (!progressParams?.value) return false; + + const { kind, title, message, percentage } = progressParams.value; + const displayTitle = title || server.label || server.id; + // Use server ID + token as unique status ID for concurrent progress tracking + const progressToken = progressParams.token; + const statusId = `${server.id}-progress-${progressToken ?? "default"}`; + + if (kind === "begin") { + lspStatusBar.show({ + id: statusId, + message: message || title || "Starting...", + title: displayTitle, + type: "info", + icon: "autorenew", + duration: false, + showProgress: typeof percentage === "number", + progress: percentage, + }); + } else if (kind === "report") { + lspStatusBar.update({ + id: statusId, + message: message, + progress: percentage, + }); + } else if (kind === "end") { + // Just hide the progress item silently, no "Complete" message + lspStatusBar.hideById(statusId); + } + + logLspInfo( + `[LSP:${server.id}] Progress: ${kind} - ${message || title || ""} ${typeof percentage === "number" ? `(${percentage}%)` : ""}`, + ); + return true; + }, + "$/typescriptVersion": (_client: LSPClient, params: unknown): boolean => { + interface TypeScriptVersionParams { + version?: string; + source?: string; + } + const versionParams = params as TypeScriptVersionParams; + if (!versionParams?.version) return false; + + const serverLabel = server.label || server.id; + const source = versionParams.source || "bundled"; + logLspInfo( + `[LSP:${server.id}] TypeScript ${versionParams.version} (${source})`, + ); + + // Show briefly in status bar + lspStatusBar.show({ + message: `TypeScript ${versionParams.version}`, + title: serverLabel, + type: "info", + icon: "code", + duration: 3000, + }); + return true; + }, + }; + + // Log unhandled notifications to help debug what servers are sending + const unhandledNotificationKey = + "unhandledNotification" as keyof typeof clientConfig; + if (!(unhandledNotificationKey in clientConfig)) { + ( + clientConfig as Record< + string, + (client: LSPClient, method: string, params: unknown) => void + > + ).unhandledNotification = ( + _client: LSPClient, + method: string, + params: unknown, + ) => { + logLspInfo( + `[LSP:${server.id}] Unhandled notification: ${method}`, + params, + ); + }; + } + + if (!clientConfig.workspace) { + clientConfig.workspace = (client: LSPClient) => + new AcodeWorkspace(client, workspaceOptions); + } + + if (normalizedRootUri && !clientConfig.rootUri) { + clientConfig.rootUri = normalizedRootUri; + } + + if (!normalizedRootUri && clientConfig.rootUri) { + delete clientConfig.rootUri; + } + + if (server.startupTimeout && !clientConfig.timeout) { + clientConfig.timeout = server.startupTimeout; + } + + if (!clientConfig.highlightLanguage) { + clientConfig.highlightLanguage = resolveLspHoverHighlightLanguage; + } + + let transportHandle: TransportHandle | undefined; + let client: ExtendedLSPClient | undefined; + let runtimeConnection: LspRuntimeConnection | undefined; + + try { + throwIfInitializationCancelled(signal, server.id); + const runtimeContext = { + ...context, + uri: documentUri, + documentUri, + originalDocumentUri, + rootUri: runtimeRootUri, + originalRootUri: runtimeOriginalRootUri ?? undefined, + serverId: server.id, + allowNonTerminalWorkspace: + this.options.allowNonTerminalWorkspace === true, + }; + const connection = await runtimeProvider.start(server, runtimeContext); + const connectionDispose = connection.dispose; + connection.dispose = async () => { + try { + if (connectionDispose) { + await connectionDispose(); + } + } finally { + if (runtimeProvider.stop) { + await runtimeProvider.stop(connection); + } + } + }; + runtimeConnection = connection; + throwIfInitializationCancelled(signal, server.id); + + transportHandle = createTransportFromRuntimeConnection( + server, + runtimeContext, + connection, + ); + await waitForInitialization(transportHandle.ready, signal, server.id); + client = new LSPClient(clientConfig) as ExtendedLSPClient; + client.__acodeServerId = server.id; + connectClient( + client, + transportHandle.transport, + initializationOptions, + runtimeRootUri, + ); + await waitForInitialization(client.initializing, signal, server.id); + if (!client.__acodeLoggedInfo) { + // Log root URI info to console + if (normalizedRootUri) { + if (originalRootUri && originalRootUri !== normalizedRootUri) { + logLspInfo( + `[LSP:${server.id}] root ${normalizedRootUri} (from ${originalRootUri})`, + ); + } else { + logLspInfo(`[LSP:${server.id}] root`, normalizedRootUri); + } + } else if (originalRootUri) { + logLspInfo(`[LSP:${server.id}] root ignored`, originalRootUri); + } + if (initializationOptions) { + logLspInfo( + `[LSP:${server.id}] initializationOptions keys`, + Object.keys(initializationOptions), + ); + } + logLspInfo(`[LSP:${server.id}] initialized`); + addLspLog( + server.id, + "info", + runtimeRootUri + ? `Initialized workspace ${runtimeRootUri}` + : "Initialized without a workspace root", + ); + client.__acodeLoggedInfo = true; + } + } catch (error) { + addLspLog(server.id, "error", formatInitializationError(error), error); + try { + client?.disconnect(); + } catch { + /* Client may not have finished connecting */ + } + if (transportHandle) { + await transportHandle.dispose?.(); + } else { + await runtimeConnection?.dispose?.(); + } + throw error; + } + + const state = this.#createClientState({ + key, + server, + client, + transportHandle, + normalizedRootUri, + originalRootUri: scope === "document" ? null : originalRootUri, + }); + + this.#clients.set(key, state); + return state; + } + + #createClientState(params: { + key: string; + server: LspServerDefinition; + client: LSPClient; + transportHandle: TransportHandle; + normalizedRootUri: string | null; + originalRootUri: string | null; + }): ClientState { + const { + key, + server, + client, + transportHandle, + normalizedRootUri, + originalRootUri, + } = params; + const fileRefs = new Map>(); + const uriAliases = new Map(); + const effectiveRoot = normalizedRootUri ?? originalRootUri ?? null; + let disposed = false; + let idleTimer: ReturnType | null = null; + + const cancelIdleTimer = (): void => { + if (idleTimer === null) return; + clearTimeout(idleTimer); + idleTimer = null; + }; + + const attach = ( + uri: string, + view: EditorView, + aliases: string[] = [], + ): void => { + cancelIdleTimer(); + const existing = fileRefs.get(uri) ?? new Set(); + existing.add(view); + fileRefs.set(uri, existing); + uriAliases.set(uri, uri); + for (const alias of aliases) { + if (!alias || alias === uri) continue; + uriAliases.set(alias, uri); + } + const suffix = effectiveRoot ? ` (root ${effectiveRoot})` : ""; + logLspInfo(`[LSP:${server.id}] attached to ${uri}${suffix}`); + }; + + const clearClientDiagnostics = (view: EditorView): void => { + try { + view.dispatch({ effects: clearDiagnosticsEffect(client) }); + } catch { + /* View may already be destroyed or may not have diagnostics state. */ + } + }; + + const dispose = async (): Promise => { + if (disposed) return; + disposed = true; + cancelIdleTimer(); + disposePullDiagnostics(client); + this.#clients.delete(key); + for (const views of fileRefs.values()) { + for (const view of views) clearClientDiagnostics(view); + } + try { + client.disconnect(); + } catch (error) { + console.warn(`Error disconnecting LSP client ${server.id}`, error); + } + try { + await transportHandle.dispose?.(); + } catch (error) { + console.warn(`Error disposing LSP transport ${server.id}`, error); + } + }; + + const detach = (uri: string, view?: EditorView): void => { + const actualUri = uriAliases.get(uri) ?? uri; + const existing = fileRefs.get(actualUri); + if (!existing) return; + if (view) { + existing.delete(view); + clearClientDiagnostics(view); + } + if (!view || !existing.size) { + fileRefs.delete(actualUri); + for (const [alias, target] of uriAliases.entries()) { + if (target === actualUri) { + uriAliases.delete(alias); + } + } + try { + // Only pass uri to closeFile - view is not needed for closing + // and passing it may cause issues if the view is already disposed + (client.workspace as AcodeWorkspace)?.closeFile?.(actualUri); + } catch (error) { + console.warn(`Failed to close LSP file ${actualUri}`, error); + } + } + + if (fileRefs.size || idleTimer !== null) return; + + const configuredGracePeriod = this.options.clientIdleGracePeriodMs; + const gracePeriod = + typeof configuredGracePeriod === "number" && + Number.isFinite(configuredGracePeriod) + ? Math.max(0, configuredGracePeriod) + : DEFAULT_CLIENT_IDLE_GRACE_PERIOD_MS; + idleTimer = setTimeout(() => { + idleTimer = null; + if (disposed || fileRefs.size) return; + this.options.onClientIdle?.({ + server, + client, + rootUri: effectiveRoot, + dispose, + }); + }, gracePeriod); + }; + + return { + server, + client, + transport: transportHandle, + rootUri: effectiveRoot, + attach, + detach, + dispose, + }; + } + + async #resolveRootUri( + server: LspServerDefinition, + context: RootUriContext, + ): Promise { + if (typeof server.rootUri === "function") { + try { + const value = await server.rootUri(context?.uri ?? "", context); + if (value) return safeString(value); + } catch (error) { + console.warn(`Server root resolver failed for ${server.id}`, error); + } + } + + if (context?.rootUri) return safeString(context.rootUri); + + if (typeof this.options.resolveRoot === "function") { + try { + const value = await this.options.resolveRoot(context); + if (value) return safeString(value); + } catch (error) { + console.warn("Global LSP root resolver failed", error); + } + } + + return null; + } + + async #resolveRuntimeTarget( + server: LspServerDefinition, + context: RootUriContext, + ): Promise { + const originalDocumentUri = context.uri; + if (!originalDocumentUri) return null; + + const originalRootUri = await this.#resolveRootUri(server, context); + const { normalizedRootUri } = normalizeRootUriForServer( + server, + originalRootUri, + ); + const normalizedDocumentUri = await this.#resolveDocumentUri( + server, + context, + ); + const providerContext = { + ...context, + uri: originalDocumentUri, + documentUri: normalizedDocumentUri, + originalDocumentUri, + rootUri: originalRootUri, + originalRootUri: originalRootUri ?? undefined, + serverId: server.id, + allowNonTerminalWorkspace: + this.options.allowNonTerminalWorkspace === true, + }; + const runtimeProvider = await selectRuntimeProvider( + server, + providerContext, + ); + if (!runtimeProvider) { + console.warn( + `No LSP runtime provider selected for ${server.id}: uri=${originalDocumentUri}, root=${originalRootUri ?? "none"}, normalizedUri=${normalizedDocumentUri ?? "none"}`, + ); + return null; + } + + let documentUri = normalizedDocumentUri; + let rootUri = normalizedRootUri; + let scope: LspClientScope = "workspace"; + + if (runtimeProvider.resolveUris) { + try { + const resolution = await runtimeProvider.resolveUris(server, { + ...providerContext, + originalRootUri, + normalizedDocumentUri, + normalizedRootUri, + }); + if (resolution) { + if (Object.prototype.hasOwnProperty.call(resolution, "documentUri")) { + documentUri = resolution.documentUri || null; + } + if (Object.prototype.hasOwnProperty.call(resolution, "rootUri")) { + rootUri = resolution.rootUri || null; + } + if (resolution.scope) scope = resolution.scope; + } + } catch (error) { + console.warn( + `LSP runtime provider ${runtimeProvider.id} failed to resolve URIs for ${server.id}`, + error, + ); + return null; + } + } + + if (!documentUri) { + console.warn( + `LSP runtime provider ${runtimeProvider.id} produced no document URI for ${server.id}: uri=${originalDocumentUri}, normalizedUri=${normalizedDocumentUri ?? "none"}`, + ); + return null; + } + return { + originalDocumentUri, + documentUri, + normalizedRootUri: rootUri, + originalRootUri, + runtimeProvider, + scope, + }; + } + + async #resolveDocumentUri( + server: LspServerDefinition, + context: RootUriContext, + ): Promise { + const originalUri = context?.uri; + if (!originalUri) return null; + + const normalizedUri = normalizeDocumentUri(originalUri); + + if (typeof server.documentUri === "function") { + try { + const value = await server.documentUri(originalUri, { + ...context, + normalizedUri, + } as DocumentUriContext); + if (value) return safeString(value); + } catch (error) { + console.warn( + `Server document URI resolver failed for ${server.id}`, + error, + ); + } + } + + return normalizedUri; + } } function createTransportFromRuntimeConnection( - server: LspServerDefinition, - context: TransportContext, - connection: LspRuntimeConnection, + server: LspServerDefinition, + context: TransportContext, + connection: LspRuntimeConnection, ): TransportHandle { - if (connection.kind === "transport") { - if (!connection.dispose) return connection.transport; - return { - ...connection.transport, - dispose: async () => { - await connection.transport.dispose?.(); - await connection.dispose?.(); - }, - }; - } - - const transportServer: LspServerDefinition = { - ...server, - transport: { - ...server.transport, - kind: "websocket", - url: connection.url, - protocols: connection.protocols, - }, - }; - const handle = createTransport(transportServer, context); - if (!connection.dispose) return handle; - return { - ...handle, - dispose: async () => { - await handle.dispose?.(); - await connection.dispose?.(); - }, - }; + if (connection.kind === "transport") { + if (!connection.dispose) return connection.transport; + return { + ...connection.transport, + dispose: async () => { + await connection.transport.dispose?.(); + await connection.dispose?.(); + }, + }; + } + + const transportServer: LspServerDefinition = { + ...server, + transport: { + ...server.transport, + kind: "websocket", + url: connection.url, + protocols: connection.protocols, + }, + }; + const handle = createTransport(transportServer, context); + if (!connection.dispose) return handle; + return { + ...handle, + dispose: async () => { + await handle.dispose?.(); + await connection.dispose?.(); + }, + }; } interface Change { - from: number; - to: number; - insert: string; + from: number; + to: number; + insert: string; } function applyTextEdits( - plugin: LSPPlugin, - view: EditorView, - edits: TextEdit[], + plugin: LSPPlugin, + view: EditorView, + edits: TextEdit[], ): boolean { - const changes: Change[] = []; - for (const edit of edits) { - if (!edit?.range) continue; - let fromBase: number; - let toBase: number; - fromBase = safeLspPositionToOffset(plugin.syncedDoc, edit.range.start); - toBase = safeLspPositionToOffset(plugin.syncedDoc, edit.range.end); - const fromResult = plugin.unsyncedChanges.mapPos( - fromBase, - 1, - MapMode.TrackDel, - ); - const toResult = plugin.unsyncedChanges.mapPos( - toBase, - -1, - MapMode.TrackDel, - ); - if (fromResult == null || toResult == null) continue; - const insert = - typeof edit.newText === "string" - ? edit.newText.replace(/\r\n/g, "\n") - : ""; - changes.push({ from: fromResult, to: toResult, insert }); - } - if (!changes.length) return false; - changes.sort((a, b) => a.from - b.from || a.to - b.to); - view.dispatch({ changes }); - return true; + const changes: Change[] = []; + for (const edit of edits) { + if (!edit?.range) continue; + let fromBase: number; + let toBase: number; + fromBase = safeLspPositionToOffset(plugin.syncedDoc, edit.range.start); + toBase = safeLspPositionToOffset(plugin.syncedDoc, edit.range.end); + const fromResult = plugin.unsyncedChanges.mapPos( + fromBase, + 1, + MapMode.TrackDel, + ); + const toResult = plugin.unsyncedChanges.mapPos( + toBase, + -1, + MapMode.TrackDel, + ); + if (fromResult == null || toResult == null) continue; + const insert = + typeof edit.newText === "string" + ? edit.newText.replace(/\r\n/g, "\n") + : ""; + changes.push({ from: fromResult, to: toResult, insert }); + } + if (!changes.length) return false; + changes.sort((a, b) => a.from - b.from || a.to - b.to); + view.dispatch({ changes }); + return true; } function buildFormattingOptions( - view: EditorView, - overrides: FormattingOptions = {}, + view: EditorView, + overrides: FormattingOptions = {}, ): FormattingOptions { - const state = view?.state; - if (!state) return { ...overrides }; - - const unitValue = state.facet(indentUnit); - const unit = - typeof unitValue === "string" && unitValue.length - ? unitValue - : String(unitValue ?? "\t"); - let tabSize = getIndentUnit(state); - if ( - typeof tabSize !== "number" || - !Number.isFinite(tabSize) || - tabSize <= 0 - ) { - tabSize = resolveIndentWidth(unit); - } - const insertSpaces = !unit.includes("\t"); - - return { - tabSize, - insertSpaces, - ...overrides, - }; + const state = view?.state; + if (!state) return { ...overrides }; + + const unitValue = state.facet(indentUnit); + const unit = + typeof unitValue === "string" && unitValue.length + ? unitValue + : String(unitValue ?? "\t"); + let tabSize = getIndentUnit(state); + if ( + typeof tabSize !== "number" || + !Number.isFinite(tabSize) || + tabSize <= 0 + ) { + tabSize = resolveIndentWidth(unit); + } + const insertSpaces = !unit.includes("\t"); + + return { + tabSize, + insertSpaces, + ...overrides, + }; } function resolveIndentWidth(unit: string): number { - if (typeof unit !== "string" || !unit.length) return 4; - let width = 0; - for (const ch of unit) { - if (ch === "\t") return 4; - width += 1; - } - return width || 4; + if (typeof unit !== "string" || !unit.length) return 4; + let width = 0; + for (const ch of unit) { + if (ch === "\t") return 4; + width += 1; + } + return width || 4; } const defaultManager = new LspClientManager(); @@ -1514,133 +1512,133 @@ const defaultManager = new LspClientManager(); export default defaultManager; function normalizeRootUriForServer( - _server: LspServerDefinition, - rootUri: string | null, + _server: LspServerDefinition, + rootUri: string | null, ): NormalizedRootUri { - if (!rootUri || typeof rootUri !== "string") { - return { normalizedRootUri: null, originalRootUri: null }; - } - const schemeMatch = /^([a-zA-Z][\w+\-.]*?):/.exec(rootUri); - const scheme = schemeMatch ? schemeMatch[1].toLowerCase() : null; - - // Already a file:// URI - use as-is - if (scheme === "file") { - return { normalizedRootUri: rootUri, originalRootUri: rootUri }; - } - - // Try to convert content:// URIs to file:// URIs - if (scheme === "content") { - const fileUri = contentUriToFileUri(rootUri); - if (fileUri) { - return { normalizedRootUri: fileUri, originalRootUri: rootUri }; - } - // Can't convert to file:// - server won't work properly - return { normalizedRootUri: null, originalRootUri: rootUri }; - } - - // Unknown scheme - try to use as-is - return { normalizedRootUri: rootUri, originalRootUri: rootUri }; + if (!rootUri || typeof rootUri !== "string") { + return { normalizedRootUri: null, originalRootUri: null }; + } + const schemeMatch = /^([a-zA-Z][\w+\-.]*?):/.exec(rootUri); + const scheme = schemeMatch ? schemeMatch[1].toLowerCase() : null; + + // Already a file:// URI - use as-is + if (scheme === "file") { + return { normalizedRootUri: rootUri, originalRootUri: rootUri }; + } + + // Try to convert content:// URIs to file:// URIs + if (scheme === "content") { + const fileUri = contentUriToFileUri(rootUri); + if (fileUri) { + return { normalizedRootUri: fileUri, originalRootUri: rootUri }; + } + // Can't convert to file:// - server won't work properly + return { normalizedRootUri: null, originalRootUri: rootUri }; + } + + // Unknown scheme - try to use as-is + return { normalizedRootUri: rootUri, originalRootUri: rootUri }; } function normalizeDocumentUri(uri: string | null | undefined): string | null { - if (!uri || typeof uri !== "string") return null; - - const schemeMatch = /^([a-zA-Z][\w+\-.]*?):/.exec(uri); - const scheme = schemeMatch ? schemeMatch[1].toLowerCase() : null; - - // Already a file:// URI or untitled use as-is - if (scheme === "file" || scheme === "untitled") { - return uri; - } - - // Convert content:// URIs to file:// URIs - if (scheme === "content") { - const fileUri = contentUriToFileUri(uri); - if (fileUri) { - return fileUri; - } - return null; - } - - // Unknown scheme - return uri; + if (!uri || typeof uri !== "string") return null; + + const schemeMatch = /^([a-zA-Z][\w+\-.]*?):/.exec(uri); + const scheme = schemeMatch ? schemeMatch[1].toLowerCase() : null; + + // Already a file:// URI or untitled use as-is + if (scheme === "file" || scheme === "untitled") { + return uri; + } + + // Convert content:// URIs to file:// URIs + if (scheme === "content") { + const fileUri = contentUriToFileUri(uri); + if (fileUri) { + return fileUri; + } + return null; + } + + // Unknown scheme + return uri; } function contentUriToFileUri(uri: string): string | null { - try { - const parsed = Uri.parse(uri) as ParsedUri | null; - if (!parsed || typeof parsed !== "object") return null; - const { docId, rootUri, isFileUri } = parsed; - if (!docId) return null; - - if (isFileUri && rootUri) { - return rootUri; - } - - const providerMatch = - /^content:\/\/com\.((?![:<>"/\\|?*]).*?)\.documents\//.exec( - rootUri ?? "", - ); - const providerId = providerMatch ? providerMatch[1] : null; - - let normalized = docId.trim(); - if (!normalized) return null; - - switch (providerId) { - case "foxdebug.acode": - case "foxdebug.acodefree": - normalized = normalized.replace(/:+$/, ""); - if (!normalized) return null; - if (normalized.startsWith("raw:/")) { - normalized = normalized.slice(4); - } else if (normalized.startsWith("raw:")) { - normalized = normalized.slice(4); - } - if (!normalized.startsWith("/")) return null; - return buildFileUri(normalized); - case "android.externalstorage": - normalized = normalized.replace(/:+$/, ""); - if (!normalized) return null; - - if (normalized.startsWith("/")) { - return buildFileUri(normalized); - } - - if (normalized.startsWith("raw:/")) { - return buildFileUri(normalized.slice(4)); - } - - if (normalized.startsWith("raw:")) { - return buildFileUri(normalized.slice(4)); - } - - const separator = normalized.indexOf(":"); - if (separator === -1) return null; - - const root = normalized.slice(0, separator); - const remainder = normalized.slice(separator + 1); - if (!remainder) return null; - - switch (root) { - case "primary": - return buildFileUri(`/storage/emulated/0/${remainder}`); - default: - if (/^[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}$/.test(root)) { - return buildFileUri(`/storage/${root}/${remainder}`); - } - } - return null; - default: - return null; - } - } catch (_) { - return null; - } + try { + const parsed = Uri.parse(uri) as ParsedUri | null; + if (!parsed || typeof parsed !== "object") return null; + const { docId, rootUri, isFileUri } = parsed; + if (!docId) return null; + + if (isFileUri && rootUri) { + return rootUri; + } + + const providerMatch = + /^content:\/\/com\.((?![:<>"/\\|?*]).*?)\.documents\//.exec( + rootUri ?? "", + ); + const providerId = providerMatch ? providerMatch[1] : null; + + let normalized = docId.trim(); + if (!normalized) return null; + + switch (providerId) { + case "foxdebug.acode": + case "foxdebug.acodefree": + normalized = normalized.replace(/:+$/, ""); + if (!normalized) return null; + if (normalized.startsWith("raw:/")) { + normalized = normalized.slice(4); + } else if (normalized.startsWith("raw:")) { + normalized = normalized.slice(4); + } + if (!normalized.startsWith("/")) return null; + return buildFileUri(normalized); + case "android.externalstorage": + normalized = normalized.replace(/:+$/, ""); + if (!normalized) return null; + + if (normalized.startsWith("/")) { + return buildFileUri(normalized); + } + + if (normalized.startsWith("raw:/")) { + return buildFileUri(normalized.slice(4)); + } + + if (normalized.startsWith("raw:")) { + return buildFileUri(normalized.slice(4)); + } + + const separator = normalized.indexOf(":"); + if (separator === -1) return null; + + const root = normalized.slice(0, separator); + const remainder = normalized.slice(separator + 1); + if (!remainder) return null; + + switch (root) { + case "primary": + return buildFileUri(`/storage/emulated/0/${remainder}`); + default: + if (/^[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}$/.test(root)) { + return buildFileUri(`/storage/${root}/${remainder}`); + } + } + return null; + default: + return null; + } + } catch (_) { + return null; + } } function buildFileUri(pathname: string): string | null { - if (!pathname) return null; - const normalized = pathname.startsWith("/") ? pathname : `/${pathname}`; - const encoded = encodeURI(normalized).replace(/#/g, "%23"); - return `file://${encoded}`; + if (!pathname) return null; + const normalized = pathname.startsWith("/") ? pathname : `/${pathname}`; + const encoded = encodeURI(normalized).replace(/#/g, "%23"); + return `file://${encoded}`; } diff --git a/src/cm/lsp/codeActions.ts b/src/cm/lsp/codeActions.ts index 7e8996e5ad..aa08478e40 100644 --- a/src/cm/lsp/codeActions.ts +++ b/src/cm/lsp/codeActions.ts @@ -12,9 +12,9 @@ import type { Range as LspRange, WorkspaceEdit, } from "vscode-languageserver-types"; -import type { Range } from "./types"; import { addLspLogFor } from "./logs"; import { safeLspPositionToOffset } from "./positionUtils"; +import type { Range } from "./types"; import type AcodeWorkspace from "./workspace"; type CodeActionResponse = (CodeAction | Command)[] | null; @@ -135,7 +135,12 @@ async function executeCommand( // -32601 = Method not implemented (expected for some LSP servers) const lspError = error as { code?: number }; if (lspError?.code !== -32601) { - addLspLogFor(plugin, "warn", "Code action command execution failed", error); + addLspLogFor( + plugin, + "warn", + "Code action command execution failed", + error, + ); console.warn("[LSP:CodeAction] Command execution failed:", error); } return false; @@ -190,10 +195,7 @@ async function applyChangesToFile( displayedView.dispatch({ changes: changes.map((c) => ({ - from: safeLspPositionToOffset( - displayedView.state.doc, - c.range.start, - ), + from: safeLspPositionToOffset(displayedView.state.doc, c.range.start), to: safeLspPositionToOffset(displayedView.state.doc, c.range.end), insert: c.newText, })), @@ -347,13 +349,13 @@ export async function fetchCodeActions( // Sort: preferred first, then quickfixes, then alphabetically. Stable // sorting preserves server priority for otherwise identical actions. items.sort((a, b) => { - if (a.isPreferred && !b.isPreferred) return -1; - if (!a.isPreferred && b.isPreferred) return 1; - if (a.kind?.startsWith("quickfix") && !b.kind?.startsWith("quickfix")) - return -1; - if (!a.kind?.startsWith("quickfix") && b.kind?.startsWith("quickfix")) - return 1; - return a.title.localeCompare(b.title); + if (a.isPreferred && !b.isPreferred) return -1; + if (!a.isPreferred && b.isPreferred) return 1; + if (a.kind?.startsWith("quickfix") && !b.kind?.startsWith("quickfix")) + return -1; + if (!a.kind?.startsWith("quickfix") && b.kind?.startsWith("quickfix")) + return 1; + return a.title.localeCompare(b.title); }); return items; } diff --git a/src/cm/lsp/definition.ts b/src/cm/lsp/definition.ts index 53d3726ed7..ad85b08a32 100644 --- a/src/cm/lsp/definition.ts +++ b/src/cm/lsp/definition.ts @@ -4,7 +4,7 @@ import { showReferencesPanel } from "components/referencesPanel"; import { navigateToReference } from "components/referencesPanel/utils"; import toast from "components/toast"; import type { ServerCapabilities } from "vscode-languageserver-protocol"; -import { normalizeLocations, type LspLocationResult } from "./locationUtils"; +import { type LspLocationResult, normalizeLocations } from "./locationUtils"; import { addLspLogFor } from "./logs"; import { fetchLineText, getWordAtCursor } from "./references"; diff --git a/src/cm/lsp/diagnostics.ts b/src/cm/lsp/diagnostics.ts index 61e670ac73..36b4e243d2 100644 --- a/src/cm/lsp/diagnostics.ts +++ b/src/cm/lsp/diagnostics.ts @@ -133,16 +133,8 @@ const lspPublishedDiagnostics = StateField.define< for (const [client, diagnostics] of value) { const mapped: LspDiagnostic[] = []; for (const diagnostic of diagnostics) { - const from = tr.changes.mapPos( - diagnostic.from, - 1, - MapMode.TrackDel, - ); - const to = tr.changes.mapPos( - diagnostic.to, - -1, - MapMode.TrackDel, - ); + const from = tr.changes.mapPos(diagnostic.from, 1, MapMode.TrackDel); + const to = tr.changes.mapPos(diagnostic.to, -1, MapMode.TrackDel); if (from != null && to != null) { mapped.push({ ...diagnostic, from, to }); } @@ -346,8 +338,7 @@ async function pullDiagnostics( applyDiagnostics(client, uri, version, report.items); } catch (error) { if (state.generations.get(uri) === generation) { - const message = - error instanceof Error ? error.message : String(error); + const message = error instanceof Error ? error.message : String(error); const failures = (state.failures.get(uri) ?? 0) + 1; state.failures.set(uri, failures); if (/timed out/i.test(message) && failures <= 2) { @@ -390,10 +381,13 @@ export function schedulePullDiagnostics( state.generations.set(uri, generation); state.timers.set( uri, - setTimeout(() => { - state.timers.delete(uri); - void pullDiagnostics(client, uri, generation); - }, Math.max(0, delay)), + setTimeout( + () => { + state.timers.delete(uri); + void pullDiagnostics(client, uri, generation); + }, + Math.max(0, delay), + ), ); } diff --git a/src/cm/lsp/documentColors.ts b/src/cm/lsp/documentColors.ts index 6c64c7540d..efacbb851e 100644 --- a/src/cm/lsp/documentColors.ts +++ b/src/cm/lsp/documentColors.ts @@ -1,7 +1,4 @@ -import type { - LSPClient, - LSPClientExtension, -} from "@codemirror/lsp-client"; +import type { LSPClient, LSPClientExtension } from "@codemirror/lsp-client"; import { LSPPlugin } from "@codemirror/lsp-client"; import type { Extension, Range } from "@codemirror/state"; import { MapMode, StateEffect, StateField } from "@codemirror/state"; @@ -21,6 +18,7 @@ import type { TextEdit, } from "vscode-languageserver-types"; import { + type ColorChipPayload, clamp01, colorChipDecoration, colorChipTheme, @@ -33,10 +31,9 @@ import { lspColorToCss, lspColorToHex, openColorPicker, - type ColorChipPayload, } from "../colorChip"; -import type { LSPPluginAPI } from "./types"; import { safeLspPositionToOffset } from "./positionUtils"; +import type { LSPPluginAPI } from "./types"; export interface DocumentColorsConfig { enabled?: boolean; @@ -295,8 +292,10 @@ function createPlugin(config: DocumentColorsConfig) { return; } - const bindings = LSPPlugin.getAll(this.view, "documentColor") as - readonly LSPPluginAPI[]; + const bindings = LSPPlugin.getAll( + this.view, + "documentColor", + ) as readonly LSPPluginAPI[]; const connected = bindings.filter((lsp) => lsp.client.connected); if (!connected.length) { if (this.hasProvider || this.providerKnown) { @@ -345,11 +344,7 @@ function createPlugin(config: DocumentColorsConfig) { >("textDocument/documentColor", { textDocument: { uri: lsp.uri }, }); - return this.process( - lsp, - result ?? [], - this.view.state.doc.length, - ); + return this.process(lsp, result ?? [], this.view.state.doc.length); }), ); if (id !== this.reqId) return; @@ -439,9 +434,11 @@ async function handleColorPick( view: EditorView, payload: ColorChipPayload, ): Promise { - const lsp = (payload.lspClient - ? LSPPlugin.get(view, payload.lspClient) - : LSPPlugin.getForFeature(view, "documentColor")) as LSPPluginAPI | null; + const lsp = ( + payload.lspClient + ? LSPPlugin.get(view, payload.lspClient) + : LSPPlugin.getForFeature(view, "documentColor") + ) as LSPPluginAPI | null; if (!lsp?.client.connected) return; const doc = view.state.doc; @@ -455,9 +452,11 @@ async function handleColorPick( const picked = await openColorPicker(seed); if (!picked) return; - const lsp2 = (payload.lspClient - ? LSPPlugin.get(view, payload.lspClient) - : LSPPlugin.getForFeature(view, "documentColor")) as LSPPluginAPI | null; + const lsp2 = ( + payload.lspClient + ? LSPPlugin.get(view, payload.lspClient) + : LSPPlugin.getForFeature(view, "documentColor") + ) as LSPPluginAPI | null; if (!lsp2?.client.connected) return; const live = findLiveColor(view, payload, currentText); diff --git a/src/cm/lsp/index.ts b/src/cm/lsp/index.ts index e165f91b17..18c2fb589e 100644 --- a/src/cm/lsp/index.ts +++ b/src/cm/lsp/index.ts @@ -1,5 +1,9 @@ import "./runtimes/registerBuiltins"; +export type { + LspWorkerHostHandler, + LspWorkerTransportOptions, +} from "./api"; export { bundles, default as lspApi, @@ -14,11 +18,6 @@ export { upsert, workers, } from "./api"; -export type { - LspWorkerHostHandler, - LspWorkerTransportOptions, -} from "./api"; -export { createWorkerTransport } from "./workerTransport"; export { default as clientManager, LspClientManager } from "./clientManager"; export type { CodeActionItem } from "./codeActions"; export { @@ -31,6 +30,16 @@ export { showCodeActionsMenu, supportsCodeActions, } from "./codeActions"; +export { + goToDeclaration, + goToDefinition, + goToImplementation, + goToTypeDefinition, + jumpToDeclaration, + jumpToDefinition, + jumpToImplementation, + jumpToTypeDefinition, +} from "./definition"; export { clearDiagnosticsEffect, getLspDiagnostics, @@ -39,6 +48,21 @@ export { lspDiagnosticsExtension, lspDiagnosticsUiExtension, } from "./diagnostics"; +export type { + DocumentColorsConfig, + LspDocumentColor, +} from "./documentColors"; +export { + cssToLspColor, + didReplaceLspDocumentColors, + documentColorsClientExtension, + documentColorsEditorExtension, + documentColorsExtension, + hasColorProvider, + lspColorToCss, + lspColorToHex, + lspDocumentColorsField, +} from "./documentColors"; export type { DocumentSymbolsResult, FlatSymbol, @@ -55,21 +79,6 @@ export { supportsDocumentSymbols, } from "./documentSymbols"; export { registerLspFormatter } from "./formatter"; -export type { - DocumentColorsConfig, - LspDocumentColor, -} from "./documentColors"; -export { - cssToLspColor, - didReplaceLspDocumentColors, - documentColorsClientExtension, - documentColorsEditorExtension, - documentColorsExtension, - hasColorProvider, - lspColorToCss, - lspColorToHex, - lspDocumentColorsField, -} from "./documentColors"; export type { InlayHintsConfig } from "./inlayHints"; export { inlayHintsClientExtension, @@ -80,35 +89,28 @@ export { addLspLog, clearLspLogs, getLspLogs, - onLspLog, type LspLogEntry, type LspLogLevel, + onLspLog, } from "./logs"; export { closeReferencesPanel, findAllReferences, findAllReferencesInTab, } from "./references"; -export { - goToDeclaration, - goToDefinition, - goToImplementation, - goToTypeDefinition, - jumpToDeclaration, - jumpToDefinition, - jumpToImplementation, - jumpToTypeDefinition, -} from "./definition"; export { acodeRenameExtension, acodeRenameKeymap, renameSymbol, } from "./rename"; export { - ensureServerRunning, - resetManagedServers, - stopManagedServer, -} from "./serverLauncher"; + checkRuntimeServerInstallation, + getRuntimeInstallCommand, + getRuntimeLabelForServer, + getRuntimeUninstallCommand, + installRuntimeServer, + uninstallRuntimeServer, +} from "./runtimeActions"; export { BUILTIN_ALPINE_RUNTIME_ID, EXTERNAL_WEBSOCKET_RUNTIME_ID, @@ -121,14 +123,6 @@ export { unregisterRuntimeProvider, WEB_WORKER_RUNTIME_ID, } from "./runtimeProviders"; -export { - checkRuntimeServerInstallation, - getRuntimeInstallCommand, - getRuntimeLabelForServer, - getRuntimeUninstallCommand, - installRuntimeServer, - uninstallRuntimeServer, -} from "./runtimeActions"; export { AUTO_RUNTIME_ID, getDefaultRuntimeSetting, @@ -136,6 +130,11 @@ export { setDefaultRuntime, setServerRuntime, } from "./runtimeSettings"; +export { + ensureServerRunning, + resetManagedServers, + stopManagedServer, +} from "./serverLauncher"; export { default as serverRegistry } from "./serverRegistry"; export { nextSignature, @@ -143,7 +142,6 @@ export { showSignatureHelp, } from "./tooltipExtensions"; export { createTransport } from "./transport"; - export type { BuiltinExtensionsConfig, ClientManagerOptions, @@ -156,8 +154,8 @@ export type { LSPDiagnostic, LSPFormattingOptions, LSPPluginAPI, - LspDiagnostic, LspClientScope, + LspDiagnostic, LspRuntimeConnection, LspRuntimeContext, LspRuntimeProvider, @@ -169,7 +167,8 @@ export type { TextEdit, TransportDescriptor, TransportHandle, - WorkspaceOptions, WorkspaceKind, + WorkspaceOptions, } from "./types"; +export { createWorkerTransport } from "./workerTransport"; export { default as AcodeWorkspace } from "./workspace"; diff --git a/src/cm/lsp/inlayHints.ts b/src/cm/lsp/inlayHints.ts index 112ec3e5b3..133381bb54 100644 --- a/src/cm/lsp/inlayHints.ts +++ b/src/cm/lsp/inlayHints.ts @@ -21,8 +21,8 @@ import type { InlayHintLabelPart, Position, } from "vscode-languageserver-types"; -import type { LSPPluginAPI } from "./types"; import { safeLspPositionToOffset } from "./positionUtils"; +import type { LSPPluginAPI } from "./types"; // ============================================================================ // Types @@ -348,11 +348,7 @@ export function inlayHintsEditorExtension( ): Extension { if (config.enabled === false) return []; if (!Object.keys(config).length) { - defaultInlayHintsEditorExtension ??= [ - hintsField, - createPlugin({}), - styles, - ]; + defaultInlayHintsEditorExtension ??= [hintsField, createPlugin({}), styles]; return defaultInlayHintsEditorExtension; } return [hintsField, createPlugin(config), styles]; diff --git a/src/cm/lsp/locationUtils.ts b/src/cm/lsp/locationUtils.ts index 672c6a2744..78f7ae9c78 100644 --- a/src/cm/lsp/locationUtils.ts +++ b/src/cm/lsp/locationUtils.ts @@ -1,13 +1,6 @@ -import type { - Location, - LocationLink, -} from "vscode-languageserver-protocol"; +import type { Location, LocationLink } from "vscode-languageserver-protocol"; -export type LspLocationResult = - | Location - | Location[] - | LocationLink[] - | null; +export type LspLocationResult = Location | Location[] | LocationLink[] | null; /** Normalize definition-style responses to the Location shape used by Acode. */ export function normalizeLocations(result: LspLocationResult): Location[] { diff --git a/src/cm/lsp/logs.ts b/src/cm/lsp/logs.ts index dca83a9d12..b3083cbc6c 100644 --- a/src/cm/lsp/logs.ts +++ b/src/cm/lsp/logs.ts @@ -1,4 +1,10 @@ -export type LspLogLevel = "debug" | "info" | "log" | "warn" | "error" | "stderr"; +export type LspLogLevel = + | "debug" + | "info" + | "log" + | "warn" + | "error" + | "stderr"; export interface LspLogEntry { timestamp: Date; @@ -79,10 +85,7 @@ export function getLspLogServerId(source: unknown): string | null { Object.prototype.hasOwnProperty.call(source, "client") ? (source as { client?: unknown }).client : source; - const metadata = client as - | { __acodeServerId?: unknown } - | null - | undefined; + const metadata = client as { __acodeServerId?: unknown } | null | undefined; const serverId = metadata?.__acodeServerId; return typeof serverId === "string" && serverId.trim() ? serverId.trim() diff --git a/src/cm/lsp/references.ts b/src/cm/lsp/references.ts index cb02fe207d..498bdceec9 100644 --- a/src/cm/lsp/references.ts +++ b/src/cm/lsp/references.ts @@ -1,11 +1,11 @@ import fsOperation from "fileSystem"; import { LSPPlugin } from "@codemirror/lsp-client"; import type { EditorView } from "@codemirror/view"; +import { getDocText } from "cm/editorUtils"; import { openReferencesTab, showReferencesPanel, } from "components/referencesPanel"; -import { getDocText } from "cm/editorUtils"; import settings from "lib/settings"; interface Position { @@ -33,7 +33,10 @@ interface ReferenceParams { context: { includeDeclaration: boolean }; } -export async function fetchLineText(uri: string, line: number): Promise { +export async function fetchLineText( + uri: string, + line: number, +): Promise { try { interface EditorManagerLike { getFile?: (uri: string, type: string) => EditorFileLike | null; diff --git a/src/cm/lsp/rename.ts b/src/cm/lsp/rename.ts index 5e4c93b50b..63c30ac208 100644 --- a/src/cm/lsp/rename.ts +++ b/src/cm/lsp/rename.ts @@ -104,10 +104,7 @@ async function performRename(view: EditorView): Promise { view.state.doc, prepareResult.start, ); - const to = safeLspPositionToOffset( - view.state.doc, - prepareResult.end, - ); + const to = safeLspPositionToOffset(view.state.doc, prepareResult.end); initialValue = view.state.sliceDoc(from, to); } else if ("range" in prepareResult && prepareResult.range) { const from = safeLspPositionToOffset( @@ -194,7 +191,11 @@ async function applyChangesToFile( const displayedView = await workspace.displayFile(uri); if (!displayedView?.state?.doc) { - addLspLogFor(workspace.client, "warn", `Rename could not open file: ${uri}`); + addLspLogFor( + workspace.client, + "warn", + `Rename could not open file: ${uri}`, + ); console.warn(`[LSP:Rename] Could not open file: ${uri}`); return false; } @@ -272,7 +273,11 @@ async function doRename( console.info( `[LSP:Rename] Renamed to "${newName}" in ${filesChanged} file(s)`, ); - addLspLogFor(plugin, "info", `Renamed to "${newName}" in ${filesChanged} file(s)`); + addLspLogFor( + plugin, + "info", + `Renamed to "${newName}" in ${filesChanged} file(s)`, + ); } export const renameSymbol: Command = (view) => { diff --git a/src/cm/lsp/runtimeActions.ts b/src/cm/lsp/runtimeActions.ts index 2fe36af8aa..9ff4a571aa 100644 --- a/src/cm/lsp/runtimeActions.ts +++ b/src/cm/lsp/runtimeActions.ts @@ -34,7 +34,11 @@ export async function checkRuntimeServerInstallation( server: LspServerDefinition, context?: LspRuntimeContext, ): Promise { - const settingsContext = getSettingsContext(server, context, "checkInstallation"); + const settingsContext = getSettingsContext( + server, + context, + "checkInstallation", + ); const provider = await getProvider(server, context, "checkInstallation"); if (!provider?.checkInstallation) { return { @@ -82,13 +86,7 @@ export async function getRuntimeInstallCommand( ): Promise { const settingsContext = getSettingsContext(server, context, "command"); const provider = await getProvider(server, context, "command"); - return ( - provider?.getInstallCommand?.( - server, - settingsContext, - mode, - ) ?? null - ); + return provider?.getInstallCommand?.(server, settingsContext, mode) ?? null; } export async function getRuntimeUninstallCommand( @@ -97,12 +95,7 @@ export async function getRuntimeUninstallCommand( ): Promise { const settingsContext = getSettingsContext(server, context, "command"); const provider = await getProvider(server, context, "command"); - return ( - provider?.getUninstallCommand?.( - server, - settingsContext, - ) ?? null - ); + return provider?.getUninstallCommand?.(server, settingsContext) ?? null; } export async function getRuntimeLabelForServer( diff --git a/src/cm/lsp/runtimeProviders.ts b/src/cm/lsp/runtimeProviders.ts index 61e9323533..5c9ceb4314 100644 --- a/src/cm/lsp/runtimeProviders.ts +++ b/src/cm/lsp/runtimeProviders.ts @@ -1,10 +1,10 @@ +import { getConfiguredRuntimeId } from "./runtimeSettings"; import type { LspRuntimeContext, LspRuntimeProvider, LspServerDefinition, WorkspaceKind, } from "./types"; -import { getConfiguredRuntimeId } from "./runtimeSettings"; export const BUILTIN_ALPINE_RUNTIME_ID = "builtin-alpine"; export const EXTERNAL_WEBSOCKET_RUNTIME_ID = "external-websocket"; @@ -22,9 +22,7 @@ function toKey(id: string | null | undefined): string { .toLowerCase(); } -function normalizeProvider( - provider: LspRuntimeProvider, -): LspRuntimeProvider { +function normalizeProvider(provider: LspRuntimeProvider): LspRuntimeProvider { const id = toKey(provider?.id); if (!id) throw new Error("LSP runtime provider requires a non-empty id"); if (!provider.label || typeof provider.label !== "string") { diff --git a/src/cm/lsp/runtimeSettings.ts b/src/cm/lsp/runtimeSettings.ts index 2c68408592..c67d691cd7 100644 --- a/src/cm/lsp/runtimeSettings.ts +++ b/src/cm/lsp/runtimeSettings.ts @@ -124,7 +124,9 @@ export async function setServerRuntime( } export function getDefaultRuntimeSetting(): string { - return toRuntimeId(appSettings.value?.lsp?.runtime?.default) || AUTO_RUNTIME_ID; + return ( + toRuntimeId(appSettings.value?.lsp?.runtime?.default) || AUTO_RUNTIME_ID + ); } export function getServerRuntimeSetting(serverId: string): string { @@ -135,8 +137,5 @@ export function getServerRuntimeSetting(serverId: string): string { string, unknown >; - return ( - toRuntimeId(servers[normalizedServerId]) || - AUTO_RUNTIME_ID - ); + return toRuntimeId(servers[normalizedServerId]) || AUTO_RUNTIME_ID; } diff --git a/src/cm/lsp/runtimes/axsBridge.ts b/src/cm/lsp/runtimes/axsBridge.ts index 8e1176c71f..3285c50b16 100644 --- a/src/cm/lsp/runtimes/axsBridge.ts +++ b/src/cm/lsp/runtimes/axsBridge.ts @@ -81,9 +81,9 @@ export async function checkAxsBridgeStatus( return "unsupported"; } - const data = (await response.json().catch(() => null)) as - | AxsBridgeStatusResponse - | null; + const data = (await response + .json() + .catch(() => null)) as AxsBridgeStatusResponse | null; return isAxsBridgeStatusResponse(data) ? "alive" : "dead"; } catch { return "dead"; diff --git a/src/cm/lsp/runtimes/builtinAlpine.ts b/src/cm/lsp/runtimes/builtinAlpine.ts index 499ba15454..eb0b2475ba 100644 --- a/src/cm/lsp/runtimes/builtinAlpine.ts +++ b/src/cm/lsp/runtimes/builtinAlpine.ts @@ -1,6 +1,6 @@ import toast from "components/toast"; import confirm from "dialogs/confirm"; -import { createTransport } from "../transport"; +import { isBuiltinAlpineAccessible } from "../runtimeProviders"; import { checkServerInstallation, ensureServerRunning, @@ -9,12 +9,12 @@ import { installServer, uninstallServer, } from "../serverLauncher"; -import { isBuiltinAlpineAccessible } from "../runtimeProviders"; +import { createTransport } from "../transport"; import type { LspRuntimeContext, LspRuntimeProvider, - LspServerDefinition, LspRuntimeUriResolutionContext, + LspServerDefinition, } from "../types"; export const BUILTIN_ALPINE_RUNTIME_ID = "builtin-alpine"; @@ -52,10 +52,7 @@ export const builtinAlpineRuntimeProvider: LspRuntimeProvider = { label: "Built-in Alpine", priority: -100, - canHandle( - server: LspServerDefinition, - context: LspRuntimeContext, - ): boolean { + canHandle(server: LspServerDefinition, context: LspRuntimeContext): boolean { if (context.runtimeAction && server.launcher) { return true; } diff --git a/src/cm/lsp/runtimes/externalWebSocket.ts b/src/cm/lsp/runtimes/externalWebSocket.ts index 0d0d7e6ad4..b8e0af4661 100644 --- a/src/cm/lsp/runtimes/externalWebSocket.ts +++ b/src/cm/lsp/runtimes/externalWebSocket.ts @@ -1,8 +1,5 @@ -import type { - InstallCheckResult, - LspRuntimeProvider, -} from "../types"; import { EXTERNAL_WEBSOCKET_RUNTIME_ID } from "../runtimeProviders"; +import type { InstallCheckResult, LspRuntimeProvider } from "../types"; const externallyManagedStatus: InstallCheckResult = { status: "unknown", diff --git a/src/cm/lsp/serverLauncher.ts b/src/cm/lsp/serverLauncher.ts index bc83251a63..da1e313d56 100644 --- a/src/cm/lsp/serverLauncher.ts +++ b/src/cm/lsp/serverLauncher.ts @@ -2,31 +2,31 @@ import lspStatusBar from "components/lspStatusBar"; import toast from "components/toast"; import confirm from "dialogs/confirm"; import loader from "dialogs/loader"; +import notificationManager from "lib/notificationManager"; import { buildShellArchCase } from "./installerUtils"; import { - formatCommand, - quoteArg, - runForegroundCommand, - runQuickCommand, + formatCommand, + quoteArg, + runForegroundCommand, + runQuickCommand, } from "./installRuntime"; +import { addLspLog } from "./logs"; import { - buildAxsBridgeCommand, - checkAxsBridgeStatus, - checkServerAliveViaWebSocket, + buildAxsBridgeCommand, + checkAxsBridgeStatus, + checkServerAliveViaWebSocket, } from "./runtimes/axsBridge"; import { getServerBundle } from "./serverCatalog"; -import notificationManager from "lib/notificationManager"; -import { addLspLog } from "./logs"; import type { - InstallCheckResult, - InstallStatus, - LauncherConfig, - LspServerDefinition, - LspServerStats, - LspServerStatsFormatted, - ManagedServerEntry, - PortInfo, - WaitOptions, + InstallCheckResult, + InstallStatus, + LauncherConfig, + LspServerDefinition, + LspServerStats, + LspServerStatsFormatted, + ManagedServerEntry, + PortInfo, + WaitOptions, } from "./types"; const managedServers = new Map(); @@ -45,40 +45,40 @@ const DONT_ASK_TERMINAL_REQUIRED_FOR_LSP = "dontAskTerminalRequiredForLsp"; // canonicalized (see init-sandbox.sh). Drop only that known, harmless message // so genuine proot warnings are still surfaced in the LSP log. const PROOT_FD_BINDING_WARNING = - /can'?t sanitize binding "\/proc\/self\/fd(?:\/[012])?"/i; + /can'?t sanitize binding "\/proc\/self\/fd(?:\/[012])?"/i; let alreadyInformed = false; function getTerminalRequiredMessage(): string { - return ( - strings?.terminal_required_message_for_lsp ?? - "Terminal not installed. Please install Terminal first to use LSP servers." - ); + return ( + strings?.terminal_required_message_for_lsp ?? + "Terminal not installed. Please install Terminal first to use LSP servers." + ); } interface LspError extends Error { - code?: string; + code?: string; } function getExecutor(): Executor { - const executor = (globalThis as unknown as { Executor?: Executor }).Executor; - if (!executor) { - throw new Error("Executor plugin is not available"); - } - return executor; + const executor = (globalThis as unknown as { Executor?: Executor }).Executor; + if (!executor) { + throw new Error("Executor plugin is not available"); + } + return executor; } /** * Get the background executor */ function getBackgroundExecutor(): Executor { - const executor = getExecutor(); - return executor.BackgroundExecutor ?? executor; + const executor = getExecutor(); + return executor.BackgroundExecutor ?? executor; } function joinCommand(command: string, args: string[] = []): string { - if (!Array.isArray(args) || !args.length) return quoteArg(command); - return [quoteArg(command), ...args.map((arg) => quoteArg(arg))].join(" "); + if (!Array.isArray(args) || !args.length) return quoteArg(command); + return [quoteArg(command), ...args.map((arg) => quoteArg(arg))].join(" "); } export { formatCommand } from "./installRuntime"; @@ -96,34 +96,34 @@ let cachedFilesDir: string | null = null; * alpine/home, and some installs keep it as a symlink for shell compatibility. */ async function getTerminalDataDirs(): Promise { - if (cachedFilesDir) { - return [`${cachedFilesDir}/public`, `${cachedFilesDir}/alpine/home`]; - } - - const system = ( - globalThis as unknown as { - system?: { - getFilesDir: ( - success: (filesDir: string) => void, - error: (error: string) => void, - ) => void; - }; - } - ).system; - - if (!system?.getFilesDir) { - throw new Error("System plugin is not available"); - } - - return new Promise((resolve, reject) => { - system.getFilesDir( - (filesDir: string) => { - cachedFilesDir = filesDir; - resolve([`${filesDir}/public`, `${filesDir}/alpine/home`]); - }, - (error: string) => reject(new Error(error)), - ); - }); + if (cachedFilesDir) { + return [`${cachedFilesDir}/public`, `${cachedFilesDir}/alpine/home`]; + } + + const system = ( + globalThis as unknown as { + system?: { + getFilesDir: ( + success: (filesDir: string) => void, + error: (error: string) => void, + ) => void; + }; + } + ).system; + + if (!system?.getFilesDir) { + throw new Error("System plugin is not available"); + } + + return new Promise((resolve, reject) => { + system.getFilesDir( + (filesDir: string) => { + cachedFilesDir = filesDir; + resolve([`${filesDir}/public`, `${filesDir}/alpine/home`]); + }, + (error: string) => reject(new Error(error)), + ); + }); } /** @@ -131,15 +131,15 @@ async function getTerminalDataDirs(): Promise { * Port file format: ~/.axs/lsp_ports/{serverName}_{session} */ async function getPortFilePaths( - serverName: string, - session: string, + serverName: string, + session: string, ): Promise { - const dataDirs = await getTerminalDataDirs(); - // Use just the binary name (not full path), mirroring axs behavior - const baseName = serverName.split("/").pop() || serverName; - return dataDirs.map( - (dataDir) => `file://${dataDir}/.axs/lsp_ports/${baseName}_${session}`, - ); + const dataDirs = await getTerminalDataDirs(); + // Use just the binary name (not full path), mirroring axs behavior + const baseName = serverName.split("/").pop() || serverName; + return dataDirs.map( + (dataDir) => `file://${dataDir}/.axs/lsp_ports/${baseName}_${session}`, + ); } /** @@ -147,30 +147,30 @@ async function getPortFilePaths( * Returns null if the file doesn't exist or contains invalid data. */ async function readPortFromFile(filePath: string): Promise { - try { - // Dynamic import to get fsOperation - const { default: fsOperation } = await import("fileSystem"); - const fs = fsOperation(filePath); - - // Check if file exists first - const exists = await fs.exists(); - if (!exists) { - return null; - } - - // Read the file content as text - const content = (await fs.readFile("utf-8")) as string; - const port = Number.parseInt(content.trim(), 10); - - if (!Number.isFinite(port) || port <= 0 || port > 65535) { - return null; - } - - return port; - } catch { - // File doesn't exist or couldn't be read - return null; - } + try { + // Dynamic import to get fsOperation + const { default: fsOperation } = await import("fileSystem"); + const fs = fsOperation(filePath); + + // Check if file exists first + const exists = await fs.exists(); + if (!exists) { + return null; + } + + // Read the file content as text + const content = (await fs.readFile("utf-8")) as string; + const port = Number.parseInt(content.trim(), 10); + + if (!Number.isFinite(port) || port <= 0 || port > 65535) { + return null; + } + + return port; + } catch { + // File doesn't exist or couldn't be read + return null; + } } /** @@ -179,23 +179,23 @@ async function readPortFromFile(filePath: string): Promise { * @param session - Session ID for port file naming */ export async function getLspPort( - serverName: string, - session: string, + serverName: string, + session: string, ): Promise { - try { - const filePaths = await getPortFilePaths(serverName, session); - - for (const filePath of filePaths) { - const port = await readPortFromFile(filePath); - if (port !== null) { - return { port, filePath, session }; - } - } - - return null; - } catch { - return null; - } + try { + const filePaths = await getPortFilePaths(serverName, session); + + for (const filePath of filePaths) { + const port = await readPortFromFile(filePath); + if (port !== null) { + return { port, filePath, session }; + } + } + + return null; + } catch { + return null; + } } /** @@ -204,21 +204,21 @@ export async function getLspPort( * So once the signal is received, the port file should be available. */ async function waitForServerReady( - serverId: string, - timeout = 10000, + serverId: string, + timeout = 10000, ): Promise { - const deadline = Date.now() + timeout; - const pollInterval = 50; - - while (Date.now() < deadline) { - if (serverReadySignals.has(serverId)) { - serverReadySignals.delete(serverId); - return true; - } - await sleep(pollInterval); - } - - return false; + const deadline = Date.now() + timeout; + const pollInterval = 50; + + while (Date.now() < deadline) { + if (serverReadySignals.has(serverId)) { + serverReadySignals.delete(serverId); + return true; + } + await sleep(pollInterval); + } + + return false; } /** @@ -226,36 +226,36 @@ async function waitForServerReady( * This is the most efficient approach: wait for ready signal, then read port. */ async function waitForPort( - serverId: string, - serverName: string, - session: string, - timeout = 10000, + serverId: string, + serverName: string, + session: string, + timeout = 10000, ): Promise { - // First, wait for the server to signal it's ready - const ready = await waitForServerReady(serverId, timeout); - - if (!ready) { - console.warn( - `[LSP:${serverId}] Server did not signal ready within timeout`, - ); - } - - // The port file should be available now (axs writes it before printing "listening on") - // Read it directly - const portInfo = await getLspPort(serverName, session); - - if (!portInfo && ready) { - // Server signaled ready but port file not found - retry a few times - for (let i = 0; i < 5; i++) { - await sleep(100); - const retryPortInfo = await getLspPort(serverName, session); - if (retryPortInfo) { - return retryPortInfo; - } - } - } - - return portInfo; + // First, wait for the server to signal it's ready + const ready = await waitForServerReady(serverId, timeout); + + if (!ready) { + console.warn( + `[LSP:${serverId}] Server did not signal ready within timeout`, + ); + } + + // The port file should be available now (axs writes it before printing "listening on") + // Read it directly + const portInfo = await getLspPort(serverName, session); + + if (!portInfo && ready) { + // Server signaled ready but port file not found - retry a few times + for (let i = 0; i < 5; i++) { + await sleep(100); + const retryPortInfo = await getLspPort(serverName, session); + if (retryPortInfo) { + return retryPortInfo; + } + } + } + + return portInfo; } /** @@ -263,700 +263,704 @@ async function waitForPort( * Returns the port number if the server is alive, null otherwise. */ export async function canReuseExistingServer( - server: LspServerDefinition, - session: string, + server: LspServerDefinition, + session: string, ): Promise { - const bridge = server.launcher?.bridge; - const serverName = - resolveServerExecutable(server) || - bridge?.command || - server.launcher?.command || - server.id; - - const portInfo = await getLspPort(serverName, session); - if (!portInfo) { - return null; - } - - const url = `ws://127.0.0.1:${portInfo.port}/`; - const status = await checkAxsBridgeStatus(url, 1000); - const alive = - status === "alive" || - (status === "unsupported" && - (await checkServerAliveViaWebSocket(url, 1000))); - - if (alive) { - addLspLog(server.id, "info", `Reusing existing server on port ${portInfo.port}`); - console.info( - `[LSP:${server.id}] Reusing existing server on port ${portInfo.port}`, - ); - return portInfo.port; - } - - console.info( - `[LSP:${server.id}] Found stale port file, will start new server`, - ); - addLspLog(server.id, "warn", "Found stale port file, starting a new server"); - return null; + const bridge = server.launcher?.bridge; + const serverName = + resolveServerExecutable(server) || + bridge?.command || + server.launcher?.command || + server.id; + + const portInfo = await getLspPort(serverName, session); + if (!portInfo) { + return null; + } + + const url = `ws://127.0.0.1:${portInfo.port}/`; + const status = await checkAxsBridgeStatus(url, 1000); + const alive = + status === "alive" || + (status === "unsupported" && + (await checkServerAliveViaWebSocket(url, 1000))); + + if (alive) { + addLspLog( + server.id, + "info", + `Reusing existing server on port ${portInfo.port}`, + ); + console.info( + `[LSP:${server.id}] Reusing existing server on port ${portInfo.port}`, + ); + return portInfo.port; + } + + console.info( + `[LSP:${server.id}] Found stale port file, will start new server`, + ); + addLspLog(server.id, "warn", "Found stale port file, starting a new server"); + return null; } function resolveStartCommand( - server: LspServerDefinition, - session?: string, + server: LspServerDefinition, + session?: string, ): string | null { - const launcher = server.launcher; - if (!launcher) return null; - const executable = resolveServerExecutable(server); - - if (launcher.startCommand) { - return formatCommand(launcher.startCommand); - } - if (launcher.command) { - return joinCommand(executable || launcher.command, launcher.args); - } - if (launcher.bridge) { - return buildAxsBridgeCommand(launcher.bridge, executable, session); - } - return null; + const launcher = server.launcher; + if (!launcher) return null; + const executable = resolveServerExecutable(server); + + if (launcher.startCommand) { + return formatCommand(launcher.startCommand); + } + if (launcher.command) { + return joinCommand(executable || launcher.command, launcher.args); + } + if (launcher.bridge) { + return buildAxsBridgeCommand(launcher.bridge, executable, session); + } + return null; } export function getStartCommand(server: LspServerDefinition): string | null { - return resolveStartCommand(server); + return resolveStartCommand(server); } function getInstallCacheKey(server: LspServerDefinition): string | null { - const checkCommand = - server.launcher?.checkCommand || buildDerivedCheckCommand(server); - if (!checkCommand) return null; - return `${server.id}:${checkCommand}`; + const checkCommand = + server.launcher?.checkCommand || buildDerivedCheckCommand(server); + if (!checkCommand) return null; + return `${server.id}:${checkCommand}`; } function normalizeInstallSpec(server: LspServerDefinition) { - const install = server.launcher?.install; - if (!install) return null; - - const packages = Array.isArray(install.packages) - ? install.packages - .map((entry) => String(entry || "").trim()) - .filter(Boolean) - : []; - const kind = - install.kind || - (install.binaryPath ? "manual" : null) || - (install.source === "apk" ? "apk" : null) || - (install.source === "npm" ? "npm" : null) || - (install.source === "pip" ? "pip" : null) || - (install.source === "cargo" ? "cargo" : null) || - (install.command ? "shell" : null) || - "shell"; - - return { - ...install, - kind, - packages, - command: - typeof install.command === "string" && install.command.trim() - ? install.command.trim() - : undefined, - updateCommand: - typeof install.updateCommand === "string" && install.updateCommand.trim() - ? install.updateCommand.trim() - : undefined, - source: - install.source || - (kind === "shell" ? "custom" : kind === "manual" ? "manual" : kind), - executable: - typeof install.executable === "string" && install.executable.trim() - ? install.executable.trim() - : undefined, - binaryPath: - typeof install.binaryPath === "string" && install.binaryPath.trim() - ? install.binaryPath.trim() - : undefined, - repo: - typeof install.repo === "string" && install.repo.trim() - ? install.repo.trim() - : undefined, - assetNames: - install.assetNames && typeof install.assetNames === "object" - ? Object.fromEntries( - Object.entries(install.assetNames) - .map(([key, value]) => [String(key), String(value || "").trim()]) - .filter(([, value]) => Boolean(value)), - ) - : {}, - archiveType: install.archiveType === "binary" ? "binary" : "zip", - extractFile: - typeof install.extractFile === "string" && install.extractFile.trim() - ? install.extractFile.trim() - : undefined, - npmCommand: - typeof install.npmCommand === "string" && install.npmCommand.trim() - ? install.npmCommand.trim() - : "npm", - pipCommand: - typeof install.pipCommand === "string" && install.pipCommand.trim() - ? install.pipCommand.trim() - : "pip", - pythonCommand: - typeof install.pythonCommand === "string" && install.pythonCommand.trim() - ? install.pythonCommand.trim() - : "python3", - global: install.global !== false, - breakSystemPackages: install.breakSystemPackages !== false, - }; + const install = server.launcher?.install; + if (!install) return null; + + const packages = Array.isArray(install.packages) + ? install.packages + .map((entry) => String(entry || "").trim()) + .filter(Boolean) + : []; + const kind = + install.kind || + (install.binaryPath ? "manual" : null) || + (install.source === "apk" ? "apk" : null) || + (install.source === "npm" ? "npm" : null) || + (install.source === "pip" ? "pip" : null) || + (install.source === "cargo" ? "cargo" : null) || + (install.command ? "shell" : null) || + "shell"; + + return { + ...install, + kind, + packages, + command: + typeof install.command === "string" && install.command.trim() + ? install.command.trim() + : undefined, + updateCommand: + typeof install.updateCommand === "string" && install.updateCommand.trim() + ? install.updateCommand.trim() + : undefined, + source: + install.source || + (kind === "shell" ? "custom" : kind === "manual" ? "manual" : kind), + executable: + typeof install.executable === "string" && install.executable.trim() + ? install.executable.trim() + : undefined, + binaryPath: + typeof install.binaryPath === "string" && install.binaryPath.trim() + ? install.binaryPath.trim() + : undefined, + repo: + typeof install.repo === "string" && install.repo.trim() + ? install.repo.trim() + : undefined, + assetNames: + install.assetNames && typeof install.assetNames === "object" + ? Object.fromEntries( + Object.entries(install.assetNames) + .map(([key, value]) => [String(key), String(value || "").trim()]) + .filter(([, value]) => Boolean(value)), + ) + : {}, + archiveType: install.archiveType === "binary" ? "binary" : "zip", + extractFile: + typeof install.extractFile === "string" && install.extractFile.trim() + ? install.extractFile.trim() + : undefined, + npmCommand: + typeof install.npmCommand === "string" && install.npmCommand.trim() + ? install.npmCommand.trim() + : "npm", + pipCommand: + typeof install.pipCommand === "string" && install.pipCommand.trim() + ? install.pipCommand.trim() + : "pip", + pythonCommand: + typeof install.pythonCommand === "string" && install.pythonCommand.trim() + ? install.pythonCommand.trim() + : "python3", + global: install.global !== false, + breakSystemPackages: install.breakSystemPackages !== false, + }; } function getInstallerExecutable(server: LspServerDefinition): string | null { - const install = normalizeInstallSpec(server); - if (!install) return null; - return install.binaryPath || install.executable || null; + const install = normalizeInstallSpec(server); + if (!install) return null; + return install.binaryPath || install.executable || null; } function getProviderExecutable(server: LspServerDefinition): string | null { - const bundle = getServerBundle(server.id); - if (!bundle?.getExecutable) return null; - try { - return bundle.getExecutable(server.id, server) || null; - } catch (error) { - console.warn(`Failed to resolve bundle executable for ${server.id}`, error); - return null; - } + const bundle = getServerBundle(server.id); + if (!bundle?.getExecutable) return null; + try { + return bundle.getExecutable(server.id, server) || null; + } catch (error) { + console.warn(`Failed to resolve bundle executable for ${server.id}`, error); + return null; + } } function resolveServerExecutable(server: LspServerDefinition): string | null { - return ( - getProviderExecutable(server) || - getInstallerExecutable(server) || - server.launcher?.bridge?.command || - server.launcher?.command || - null - ); + return ( + getProviderExecutable(server) || + getInstallerExecutable(server) || + server.launcher?.bridge?.command || + server.launcher?.command || + null + ); } function getInstallLabel(server: LspServerDefinition): string { - return ( - normalizeInstallSpec(server)?.label || - server.launcher?.install?.label || - server.label || - server.id - ).trim(); + return ( + normalizeInstallSpec(server)?.label || + server.launcher?.install?.label || + server.label || + server.id + ).trim(); } function buildUninstallCommand(server: LspServerDefinition): string | null { - const spec = normalizeInstallSpec(server); - if (!spec) return null; - - if (spec.uninstallCommand) { - return spec.uninstallCommand; - } - if (server.launcher?.uninstallCommand) { - return server.launcher.uninstallCommand; - } - - switch (spec.kind) { - case "apk": - return spec.packages.length - ? `apk del ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}` - : null; - case "npm": { - if (!spec.packages.length) return null; - const npmCommand = spec.npmCommand || "npm"; - const uninstallFlags = - spec.global !== false ? "uninstall -g" : "uninstall"; - return `${npmCommand} ${uninstallFlags} ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}`; - } - case "pip": - return spec.packages.length - ? `${spec.pipCommand || "pip"} uninstall -y ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}` - : null; - case "cargo": - return spec.packages.length - ? spec.packages - .map((entry) => `cargo uninstall ${quoteArg(entry)}`) - .join(" && ") - : null; - case "github-release": - case "manual": - return spec.binaryPath ? `rm -f ${quoteArg(spec.binaryPath)}` : null; - default: - return null; - } + const spec = normalizeInstallSpec(server); + if (!spec) return null; + + if (spec.uninstallCommand) { + return spec.uninstallCommand; + } + if (server.launcher?.uninstallCommand) { + return server.launcher.uninstallCommand; + } + + switch (spec.kind) { + case "apk": + return spec.packages.length + ? `apk del ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}` + : null; + case "npm": { + if (!spec.packages.length) return null; + const npmCommand = spec.npmCommand || "npm"; + const uninstallFlags = + spec.global !== false ? "uninstall -g" : "uninstall"; + return `${npmCommand} ${uninstallFlags} ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}`; + } + case "pip": + return spec.packages.length + ? `${spec.pipCommand || "pip"} uninstall -y ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}` + : null; + case "cargo": + return spec.packages.length + ? spec.packages + .map((entry) => `cargo uninstall ${quoteArg(entry)}`) + .join(" && ") + : null; + case "github-release": + case "manual": + return spec.binaryPath ? `rm -f ${quoteArg(spec.binaryPath)}` : null; + default: + return null; + } } function buildInstallCommand( - server: LspServerDefinition, - mode: "install" | "update" = "install", + server: LspServerDefinition, + mode: "install" | "update" = "install", ): string | null { - const spec = normalizeInstallSpec(server); - if (!spec) return null; - - if (mode === "update" && spec.updateCommand) { - return spec.updateCommand; - } - - switch (spec.kind) { - case "apk": - return spec.packages.length - ? `apk add --no-cache ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}` - : null; - case "npm": { - if (!spec.packages.length) return null; - const npmCommand = spec.npmCommand || "npm"; - const installFlags = spec.global !== false ? "install -g" : "install"; - return `apk add --no-cache nodejs npm && ${npmCommand} ${installFlags} ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}`; - } - case "pip": { - if (!spec.packages.length) return null; - const pipCommand = spec.pipCommand || "pip"; - const breakPackages = - spec.breakSystemPackages !== false - ? "PIP_BREAK_SYSTEM_PACKAGES=1 " - : ""; - return `apk add --no-cache python3 py3-pip && ${breakPackages}${pipCommand} install ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}`; - } - case "cargo": - return spec.packages.length - ? `apk add --no-cache rust cargo && cargo install ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}` - : null; - case "github-release": { - if (!spec.repo || !spec.binaryPath) return null; - const caseLines = buildShellArchCase(spec.assetNames, quoteArg); - if (!caseLines) return null; - const archivePath = '"$TMP_DIR/$ASSET"'; - const extractedFile = quoteArg(spec.extractFile || "luau-lsp"); - const installTarget = quoteArg(spec.binaryPath); - const downloadUrl = `https://github.com/${spec.repo}/releases/latest/download/$ASSET`; - - if (spec.archiveType === "binary") { - return `apk add --no-cache curl && ARCH="$(uname -m)" && case "$ARCH" in\n${caseLines}\n\t*) echo "Unsupported architecture: $ARCH" >&2; exit 1 ;;\nesac && TMP_DIR="$(mktemp -d)" && cleanup() { rm -rf "$TMP_DIR"; } && trap cleanup EXIT && curl -fsSL "${downloadUrl}" -o ${archivePath} && install -Dm755 ${archivePath} ${installTarget}`; - } - - return `apk add --no-cache curl unzip && ARCH="$(uname -m)" && case "$ARCH" in\n${caseLines}\n\t*) echo "Unsupported architecture: $ARCH" >&2; exit 1 ;;\nesac && TMP_DIR="$(mktemp -d)" && cleanup() { rm -rf "$TMP_DIR"; } && trap cleanup EXIT && curl -fsSL "${downloadUrl}" -o ${archivePath} && unzip -oq ${archivePath} -d "$TMP_DIR" && install -Dm755 "$TMP_DIR"/${extractedFile} ${installTarget}`; - } - case "manual": - return null; - default: - return spec.command || null; - } + const spec = normalizeInstallSpec(server); + if (!spec) return null; + + if (mode === "update" && spec.updateCommand) { + return spec.updateCommand; + } + + switch (spec.kind) { + case "apk": + return spec.packages.length + ? `apk add --no-cache ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}` + : null; + case "npm": { + if (!spec.packages.length) return null; + const npmCommand = spec.npmCommand || "npm"; + const installFlags = spec.global !== false ? "install -g" : "install"; + return `apk add --no-cache nodejs npm && ${npmCommand} ${installFlags} ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}`; + } + case "pip": { + if (!spec.packages.length) return null; + const pipCommand = spec.pipCommand || "pip"; + const breakPackages = + spec.breakSystemPackages !== false + ? "PIP_BREAK_SYSTEM_PACKAGES=1 " + : ""; + return `apk add --no-cache python3 py3-pip && ${breakPackages}${pipCommand} install ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}`; + } + case "cargo": + return spec.packages.length + ? `apk add --no-cache rust cargo && cargo install ${spec.packages.map((entry) => quoteArg(entry)).join(" ")}` + : null; + case "github-release": { + if (!spec.repo || !spec.binaryPath) return null; + const caseLines = buildShellArchCase(spec.assetNames, quoteArg); + if (!caseLines) return null; + const archivePath = '"$TMP_DIR/$ASSET"'; + const extractedFile = quoteArg(spec.extractFile || "luau-lsp"); + const installTarget = quoteArg(spec.binaryPath); + const downloadUrl = `https://github.com/${spec.repo}/releases/latest/download/$ASSET`; + + if (spec.archiveType === "binary") { + return `apk add --no-cache curl && ARCH="$(uname -m)" && case "$ARCH" in\n${caseLines}\n\t*) echo "Unsupported architecture: $ARCH" >&2; exit 1 ;;\nesac && TMP_DIR="$(mktemp -d)" && cleanup() { rm -rf "$TMP_DIR"; } && trap cleanup EXIT && curl -fsSL "${downloadUrl}" -o ${archivePath} && install -Dm755 ${archivePath} ${installTarget}`; + } + + return `apk add --no-cache curl unzip && ARCH="$(uname -m)" && case "$ARCH" in\n${caseLines}\n\t*) echo "Unsupported architecture: $ARCH" >&2; exit 1 ;;\nesac && TMP_DIR="$(mktemp -d)" && cleanup() { rm -rf "$TMP_DIR"; } && trap cleanup EXIT && curl -fsSL "${downloadUrl}" -o ${archivePath} && unzip -oq ${archivePath} -d "$TMP_DIR" && install -Dm755 "$TMP_DIR"/${extractedFile} ${installTarget}`; + } + case "manual": + return null; + default: + return spec.command || null; + } } function buildDerivedCheckCommand(server: LspServerDefinition): string | null { - const binary = resolveServerExecutable(server)?.trim() || ""; - const install = normalizeInstallSpec(server); + const binary = resolveServerExecutable(server)?.trim() || ""; + const install = normalizeInstallSpec(server); - if (install?.kind === "manual" && install.binaryPath) { - return `test -x ${quoteArg(install.binaryPath)}`; - } + if (install?.kind === "manual" && install.binaryPath) { + return `test -x ${quoteArg(install.binaryPath)}`; + } - if (binary.includes("/")) { - return `test -x ${quoteArg(binary)}`; - } + if (binary.includes("/")) { + return `test -x ${quoteArg(binary)}`; + } - if (binary) { - return `which ${quoteArg(binary)}`; - } + if (binary) { + return `which ${quoteArg(binary)}`; + } - return null; + return null; } function getUpdateCommand(server: LspServerDefinition): string | null { - const launcher = server.launcher; - if (!launcher) return null; - if ( - typeof launcher.updateCommand === "string" && - launcher.updateCommand.trim() - ) { - return launcher.updateCommand.trim(); - } - return buildInstallCommand(server, "update"); + const launcher = server.launcher; + if (!launcher) return null; + if ( + typeof launcher.updateCommand === "string" && + launcher.updateCommand.trim() + ) { + return launcher.updateCommand.trim(); + } + return buildInstallCommand(server, "update"); } async function readServerVersion( - server: LspServerDefinition, + server: LspServerDefinition, ): Promise { - const command = server.launcher?.versionCommand; - if (!command) return null; - - try { - const output = await runQuickCommand(command); - const version = String(output || "") - .split("\n") - .map((line) => line.trim()) - .find(Boolean); - return version || null; - } catch { - return null; - } + const command = server.launcher?.versionCommand; + if (!command) return null; + + try { + const output = await runQuickCommand(command); + const version = String(output || "") + .split("\n") + .map((line) => line.trim()) + .find(Boolean); + return version || null; + } catch { + return null; + } } export function getInstallCommand( - server: LspServerDefinition, - mode: "install" | "update" = "install", + server: LspServerDefinition, + mode: "install" | "update" = "install", ): string | null { - if (mode === "update") { - return getUpdateCommand(server); - } - return buildInstallCommand(server, "install"); + if (mode === "update") { + return getUpdateCommand(server); + } + return buildInstallCommand(server, "install"); } export function getInstallSource(server: LspServerDefinition): string | null { - return normalizeInstallSpec(server)?.source || null; + return normalizeInstallSpec(server)?.source || null; } export function getUninstallCommand( - server: LspServerDefinition, + server: LspServerDefinition, ): string | null { - return buildUninstallCommand(server); + return buildUninstallCommand(server); } export async function checkServerInstallation( - server: LspServerDefinition, + server: LspServerDefinition, ): Promise { - const bundle = getServerBundle(server.id); - if (bundle?.checkInstallation) { - try { - const result = await bundle.checkInstallation(server.id, server); - if (result) return result; - } catch (error) { - return { - status: "failed", - version: null, - canInstall: Boolean(getInstallCommand(server, "install")), - canUpdate: Boolean(getInstallCommand(server, "update")), - message: error instanceof Error ? error.message : String(error), - }; - } - } - - const launcher = server.launcher; - const installCommand = getInstallCommand(server, "install"); - const updateCommand = getInstallCommand(server, "update"); - const checkCommand = - launcher?.checkCommand || buildDerivedCheckCommand(server); - - if (!checkCommand) { - return { - status: "unknown", - version: await readServerVersion(server), - canInstall: Boolean(installCommand), - canUpdate: Boolean(updateCommand), - message: "No install check configured for this server.", - }; - } - - try { - await runQuickCommand(checkCommand); - return { - status: "present", - version: await readServerVersion(server), - canInstall: Boolean(installCommand), - canUpdate: Boolean(updateCommand), - }; - } catch (error) { - return { - status: installCommand ? "missing" : "failed", - version: null, - canInstall: Boolean(installCommand), - canUpdate: Boolean(updateCommand), - message: error instanceof Error ? error.message : String(error), - }; - } + const bundle = getServerBundle(server.id); + if (bundle?.checkInstallation) { + try { + const result = await bundle.checkInstallation(server.id, server); + if (result) return result; + } catch (error) { + return { + status: "failed", + version: null, + canInstall: Boolean(getInstallCommand(server, "install")), + canUpdate: Boolean(getInstallCommand(server, "update")), + message: error instanceof Error ? error.message : String(error), + }; + } + } + + const launcher = server.launcher; + const installCommand = getInstallCommand(server, "install"); + const updateCommand = getInstallCommand(server, "update"); + const checkCommand = + launcher?.checkCommand || buildDerivedCheckCommand(server); + + if (!checkCommand) { + return { + status: "unknown", + version: await readServerVersion(server), + canInstall: Boolean(installCommand), + canUpdate: Boolean(updateCommand), + message: "No install check configured for this server.", + }; + } + + try { + await runQuickCommand(checkCommand); + return { + status: "present", + version: await readServerVersion(server), + canInstall: Boolean(installCommand), + canUpdate: Boolean(updateCommand), + }; + } catch (error) { + return { + status: installCommand ? "missing" : "failed", + version: null, + canInstall: Boolean(installCommand), + canUpdate: Boolean(updateCommand), + message: error instanceof Error ? error.message : String(error), + }; + } } export function resetInstallState(serverId?: string): void { - if (!serverId) { - checkedCommands.clear(); - return; - } - - const prefix = `${serverId}:`; - for (const key of Array.from(checkedCommands.keys())) { - if (key.startsWith(prefix)) { - checkedCommands.delete(key); - } - } + if (!serverId) { + checkedCommands.clear(); + return; + } + + const prefix = `${serverId}:`; + for (const key of Array.from(checkedCommands.keys())) { + if (key.startsWith(prefix)) { + checkedCommands.delete(key); + } + } } async function ensureInstalled(server: LspServerDefinition): Promise { - const launcher = server.launcher; - const checkCommand = - launcher?.checkCommand || buildDerivedCheckCommand(server); - if (!checkCommand) return true; - - const cacheKey = getInstallCacheKey(server); - if (!cacheKey) return true; - - // Return cached result if already checked - if (checkedCommands.has(cacheKey)) { - const status = checkedCommands.get(cacheKey); - if (status === STATUS_PRESENT) { - return true; - } - if (status === STATUS_DECLINED) { - return false; - } - checkedCommands.delete(cacheKey); - } - - // If there's already a pending check for this server, wait for it - if (pendingInstallChecks.has(cacheKey)) { - const pending = pendingInstallChecks.get(cacheKey); - if (pending) return pending; - } - - // Create and track the pending promise - const checkPromise = performInstallCheck(server, launcher, cacheKey); - pendingInstallChecks.set(cacheKey, checkPromise); - - try { - return await checkPromise; - } finally { - pendingInstallChecks.delete(cacheKey); - } + const launcher = server.launcher; + const checkCommand = + launcher?.checkCommand || buildDerivedCheckCommand(server); + if (!checkCommand) return true; + + const cacheKey = getInstallCacheKey(server); + if (!cacheKey) return true; + + // Return cached result if already checked + if (checkedCommands.has(cacheKey)) { + const status = checkedCommands.get(cacheKey); + if (status === STATUS_PRESENT) { + return true; + } + if (status === STATUS_DECLINED) { + return false; + } + checkedCommands.delete(cacheKey); + } + + // If there's already a pending check for this server, wait for it + if (pendingInstallChecks.has(cacheKey)) { + const pending = pendingInstallChecks.get(cacheKey); + if (pending) return pending; + } + + // Create and track the pending promise + const checkPromise = performInstallCheck(server, launcher, cacheKey); + pendingInstallChecks.set(cacheKey, checkPromise); + + try { + return await checkPromise; + } finally { + pendingInstallChecks.delete(cacheKey); + } } interface LoaderDialog { - show: () => void; - destroy: () => void; + show: () => void; + destroy: () => void; } type InstallActionMode = "install" | "update" | "reinstall"; export async function installServer( - server: LspServerDefinition, - mode: InstallActionMode = "install", - options: { promptConfirm?: boolean } = {}, + server: LspServerDefinition, + mode: InstallActionMode = "install", + options: { promptConfirm?: boolean } = {}, ): Promise { - const bundle = getServerBundle(server.id); - if (bundle?.installServer) { - return bundle.installServer(server.id, server, mode, options); - } - - const { promptConfirm = false } = options; - const cacheKey = getInstallCacheKey(server); - const displayLabel = getInstallLabel(server); - const isUpdate = mode === "update"; - const actionLabel = isUpdate ? "Update" : "Install"; - const command = - mode === "install" - ? getInstallCommand(server, "install") - : getUpdateCommand(server); - - if (!command) { - throw new Error( - `${displayLabel} has no ${actionLabel.toLowerCase()} command.`, - ); - } - - if (promptConfirm) { - let resolveThis: (val: boolean) => void; - let rejectThis: (err: Error) => void; - notificationManager.pushNotification({ - icon: "zap", - title: displayLabel, - message: strings["lsp-install-notification"].replace( - "{server}", - displayLabel, - ), - type: "warning", - action: async (notification) => { - notificationManager.closeNotification(notification); - try { - resolveThis(await installServer(server, mode)); - } catch (error) { - rejectThis(error as Error); - } - }, - onDismiss: () => { - resolveThis(false); - if (cacheKey) { - checkedCommands.set(cacheKey, STATUS_DECLINED); - } - }, - }); - - return new Promise((resolve, reject) => { - resolveThis = resolve; - rejectThis = reject; - }); - } - - let loading = true; - try { - notificationManager.pushNotification({ - icon: "zap", - loading: () => loading, - title: displayLabel, - message: `${isUpdate ? "Updating" : "Installing"} ${displayLabel}...`, - }); - await runForegroundCommand(command); - resetInstallState(server.id); - - const result = await checkServerInstallation(server); - if (cacheKey && result.status === "present") { - checkedCommands.set(cacheKey, STATUS_PRESENT); - } - - toast( - result.status === "present" - ? `${displayLabel} ${isUpdate ? "updated" : "installed"}` - : `${displayLabel} ${actionLabel.toLowerCase()} finished`, - ); - return true; - } catch (error) { - console.error(`Failed to ${actionLabel.toLowerCase()} ${server.id}`, error); - if (cacheKey) { - checkedCommands.set(cacheKey, STATUS_FAILED); - } - toast(strings?.error ?? "Error"); - throw error; - } finally { - loading = false; - } + const bundle = getServerBundle(server.id); + if (bundle?.installServer) { + return bundle.installServer(server.id, server, mode, options); + } + + const { promptConfirm = false } = options; + const cacheKey = getInstallCacheKey(server); + const displayLabel = getInstallLabel(server); + const isUpdate = mode === "update"; + const actionLabel = isUpdate ? "Update" : "Install"; + const command = + mode === "install" + ? getInstallCommand(server, "install") + : getUpdateCommand(server); + + if (!command) { + throw new Error( + `${displayLabel} has no ${actionLabel.toLowerCase()} command.`, + ); + } + + if (promptConfirm) { + let resolveThis: (val: boolean) => void; + let rejectThis: (err: Error) => void; + notificationManager.pushNotification({ + icon: "zap", + title: displayLabel, + message: strings["lsp-install-notification"].replace( + "{server}", + displayLabel, + ), + type: "warning", + action: async (notification) => { + notificationManager.closeNotification(notification); + try { + resolveThis(await installServer(server, mode)); + } catch (error) { + rejectThis(error as Error); + } + }, + onDismiss: () => { + resolveThis(false); + if (cacheKey) { + checkedCommands.set(cacheKey, STATUS_DECLINED); + } + }, + }); + + return new Promise((resolve, reject) => { + resolveThis = resolve; + rejectThis = reject; + }); + } + + let loading = true; + try { + notificationManager.pushNotification({ + icon: "zap", + loading: () => loading, + title: displayLabel, + message: `${isUpdate ? "Updating" : "Installing"} ${displayLabel}...`, + }); + await runForegroundCommand(command); + resetInstallState(server.id); + + const result = await checkServerInstallation(server); + if (cacheKey && result.status === "present") { + checkedCommands.set(cacheKey, STATUS_PRESENT); + } + + toast( + result.status === "present" + ? `${displayLabel} ${isUpdate ? "updated" : "installed"}` + : `${displayLabel} ${actionLabel.toLowerCase()} finished`, + ); + return true; + } catch (error) { + console.error(`Failed to ${actionLabel.toLowerCase()} ${server.id}`, error); + if (cacheKey) { + checkedCommands.set(cacheKey, STATUS_FAILED); + } + toast(strings?.error ?? "Error"); + throw error; + } finally { + loading = false; + } } export async function uninstallServer( - server: LspServerDefinition, - options: { promptConfirm?: boolean } = {}, + server: LspServerDefinition, + options: { promptConfirm?: boolean } = {}, ): Promise { - const bundle = getServerBundle(server.id); - if (bundle?.uninstallServer) { - return bundle.uninstallServer(server.id, server, options); - } - - const { promptConfirm = false } = options; - const cacheKey = getInstallCacheKey(server); - const displayLabel = getInstallLabel(server); - const command = getUninstallCommand(server); - - if (!command) { - throw new Error(`${displayLabel} has no uninstall command.`); - } - - if (promptConfirm) { - notificationManager.pushNotification({ - icon: "zap", - title: displayLabel, - message: strings["lsp-uninstall-notification"].replace( - "{server}", - displayLabel, - ), - type: "warning", - action: (notification) => { - uninstallServer(server, { promptConfirm: false }); - notificationManager.closeNotification(notification); - }, - }); - return false; - } - - let loading = true; - try { - notificationManager.pushNotification({ - icon: "zap", - title: displayLabel, - message: `Uninstalling ${displayLabel}...`, - loading: () => loading, - }); - //await runForegroundCommand(command); - await runQuickCommand(command); - if (cacheKey) { - checkedCommands.delete(cacheKey); - } - resetInstallState(server.id); - stopManagedServer(server.id); - return true; - } catch (error) { - console.error(`Failed to uninstall ${server.id}`, error); - toast(strings?.error ?? "Error"); - throw error; - } finally { - loading = false; - } + const bundle = getServerBundle(server.id); + if (bundle?.uninstallServer) { + return bundle.uninstallServer(server.id, server, options); + } + + const { promptConfirm = false } = options; + const cacheKey = getInstallCacheKey(server); + const displayLabel = getInstallLabel(server); + const command = getUninstallCommand(server); + + if (!command) { + throw new Error(`${displayLabel} has no uninstall command.`); + } + + if (promptConfirm) { + notificationManager.pushNotification({ + icon: "zap", + title: displayLabel, + message: strings["lsp-uninstall-notification"].replace( + "{server}", + displayLabel, + ), + type: "warning", + action: (notification) => { + uninstallServer(server, { promptConfirm: false }); + notificationManager.closeNotification(notification); + }, + }); + return false; + } + + let loading = true; + try { + notificationManager.pushNotification({ + icon: "zap", + title: displayLabel, + message: `Uninstalling ${displayLabel}...`, + loading: () => loading, + }); + //await runForegroundCommand(command); + await runQuickCommand(command); + if (cacheKey) { + checkedCommands.delete(cacheKey); + } + resetInstallState(server.id); + stopManagedServer(server.id); + return true; + } catch (error) { + console.error(`Failed to uninstall ${server.id}`, error); + toast(strings?.error ?? "Error"); + throw error; + } finally { + loading = false; + } } async function performInstallCheck( - server: LspServerDefinition, - launcher: LauncherConfig | undefined, - cacheKey: string, + server: LspServerDefinition, + launcher: LauncherConfig | undefined, + cacheKey: string, ): Promise { - try { - const checkCommand = - launcher?.checkCommand || buildDerivedCheckCommand(server); - if (checkCommand) { - await runQuickCommand(checkCommand); - } - checkedCommands.set(cacheKey, STATUS_PRESENT); - return true; - } catch (error) { - if (!getInstallCommand(server, "install")) { - checkedCommands.set(cacheKey, STATUS_FAILED); - console.warn( - `LSP server ${server.id} is missing check command result and has no installer.`, - error, - ); - throw error; - } - - const installed = await installServer(server, "install", { - promptConfirm: true, - }); - if (!installed) { - checkedCommands.set(cacheKey, STATUS_DECLINED); - return false; - } - checkedCommands.set(cacheKey, STATUS_PRESENT); - return true; - } + try { + const checkCommand = + launcher?.checkCommand || buildDerivedCheckCommand(server); + if (checkCommand) { + await runQuickCommand(checkCommand); + } + checkedCommands.set(cacheKey, STATUS_PRESENT); + return true; + } catch (error) { + if (!getInstallCommand(server, "install")) { + checkedCommands.set(cacheKey, STATUS_FAILED); + console.warn( + `LSP server ${server.id} is missing check command result and has no installer.`, + error, + ); + throw error; + } + + const installed = await installServer(server, "install", { + promptConfirm: true, + }); + if (!installed) { + checkedCommands.set(cacheKey, STATUS_DECLINED); + return false; + } + checkedCommands.set(cacheKey, STATUS_PRESENT); + return true; + } } async function startInteractiveServer( - command: string, - serverId: string, - logOutput: LauncherConfig["logOutput"] = "all", + command: string, + serverId: string, + logOutput: LauncherConfig["logOutput"] = "all", ): Promise { - const executor = getExecutor(); - const callback: ExecutorCallback = (type, data) => { - if (type === "stderr" && PROOT_FD_BINDING_WARNING.test(data)) return; - if (type === "stdout" && /listening on/i.test(data)) { - signalServerReady(serverId); - } - - if (logOutput === "warnings-and-errors") { - const level = /\b(error|failed|failure|fatal|panic)\b/i.test(data) - ? "error" - : /\b(warn(?:ing)?|unknown method|disabled|not supported|lacks)\b/i.test( - data, - ) - ? "warn" - : null; - if (!level) return; - addLspLog(serverId, level, data); - console[level](`[LSP:${serverId}] ${data}`); - return; - } - - if (type === "stderr") { - addLspLog(serverId, "stderr", data); - console.warn(`[LSP:${serverId}] ${data}`); - } else if (type === "stdout" && data && data.trim()) { - addLspLog(serverId, "info", data); - console.info(`[LSP:${serverId}] ${data}`); - } - }; - const uuid = await executor.start(command, callback, true); - addLspLog(serverId, "info", `Started shell process ${uuid}`); - managedServers.set(serverId, { - uuid, - command, - startedAt: Date.now(), - }); - return uuid; + const executor = getExecutor(); + const callback: ExecutorCallback = (type, data) => { + if (type === "stderr" && PROOT_FD_BINDING_WARNING.test(data)) return; + if (type === "stdout" && /listening on/i.test(data)) { + signalServerReady(serverId); + } + + if (logOutput === "warnings-and-errors") { + const level = /\b(error|failed|failure|fatal|panic)\b/i.test(data) + ? "error" + : /\b(warn(?:ing)?|unknown method|disabled|not supported|lacks)\b/i.test( + data, + ) + ? "warn" + : null; + if (!level) return; + addLspLog(serverId, level, data); + console[level](`[LSP:${serverId}] ${data}`); + return; + } + + if (type === "stderr") { + addLspLog(serverId, "stderr", data); + console.warn(`[LSP:${serverId}] ${data}`); + } else if (type === "stdout" && data && data.trim()) { + addLspLog(serverId, "info", data); + console.info(`[LSP:${serverId}] ${data}`); + } + }; + const uuid = await executor.start(command, callback, true); + addLspLog(serverId, "info", `Started shell process ${uuid}`); + managedServers.set(serverId, { + uuid, + command, + startedAt: Date.now(), + }); + return uuid; } function sleep(ms: number): Promise { - return new Promise((resolve) => setTimeout(resolve, ms)); + return new Promise((resolve) => setTimeout(resolve, ms)); } /** @@ -970,7 +974,7 @@ const serverReadySignals = new Map(); * This signals that the server is ready to accept connections. */ export function signalServerReady(serverId: string): void { - serverReadySignals.set(serverId, Date.now()); + serverReadySignals.set(serverId, Date.now()); } /** @@ -979,293 +983,289 @@ export function signalServerReady(serverId: string): void { * This function polls for a ready signal (set when stdout contains "listening") */ async function waitForWebSocket( - url: string, - options: WaitOptions = {}, + url: string, + options: WaitOptions = {}, ): Promise { - const { - delay = 100, // Poll interval - probeTimeout = 5000, // Max wait time - } = options; - - // Extract server ID from URL (e.g., "ws://127.0.0.1:2090" -> check by port) - const portMatch = url.match(/:(\d+)/); - const port = portMatch ? portMatch[1] : null; - - // Find the server ID that's starting on this port - let targetServerId: string | null = null; - const entries = Array.from(managedServers.entries()); - for (const [serverId, entry] of entries) { - if ( - entry.command.includes(`--port ${port}`) || - entry.command.includes(`:${port}`) - ) { - targetServerId = serverId; - break; - } - } - - const deadline = Date.now() + probeTimeout; - - while (Date.now() < deadline) { - // Check if we got a ready signal - if (targetServerId && serverReadySignals.has(targetServerId)) { - // Server is ready, clear the signal and return - serverReadySignals.delete(targetServerId); - return; - } - - await sleep(delay); - } - - // Timeout reached, proceed anyway (transport will retry if needed) - console.debug( - `[LSP] waitForWebSocket timed out for ${url}, proceeding anyway`, - ); + const { + delay = 100, // Poll interval + probeTimeout = 5000, // Max wait time + } = options; + + // Extract server ID from URL (e.g., "ws://127.0.0.1:2090" -> check by port) + const portMatch = url.match(/:(\d+)/); + const port = portMatch ? portMatch[1] : null; + + // Find the server ID that's starting on this port + let targetServerId: string | null = null; + const entries = Array.from(managedServers.entries()); + for (const [serverId, entry] of entries) { + if ( + entry.command.includes(`--port ${port}`) || + entry.command.includes(`:${port}`) + ) { + targetServerId = serverId; + break; + } + } + + const deadline = Date.now() + probeTimeout; + + while (Date.now() < deadline) { + // Check if we got a ready signal + if (targetServerId && serverReadySignals.has(targetServerId)) { + // Server is ready, clear the signal and return + serverReadySignals.delete(targetServerId); + return; + } + + await sleep(delay); + } + + // Timeout reached, proceed anyway (transport will retry if needed) + console.debug( + `[LSP] waitForWebSocket timed out for ${url}, proceeding anyway`, + ); } export interface EnsureServerResult { - uuid: string | null; - /** Port discovered from port file (for auto-port discovery) */ - discoveredPort?: number; + uuid: string | null; + /** Port discovered from port file (for auto-port discovery) */ + discoveredPort?: number; } export async function ensureServerRunning( - server: LspServerDefinition, - session?: string, + server: LspServerDefinition, + session?: string, ): Promise { - const launcher = server.launcher; - if (!launcher) return { uuid: null }; - - // Derive session from server ID if not provided - const effectiveSession = session || server.id; - - // Check if server is already running via port file (dead client detection) - const bridge = launcher.bridge; - const serverName = - resolveServerExecutable(server) || - bridge?.command || - launcher.command || - server.id; - - try { - const existingPort = await canReuseExistingServer(server, effectiveSession); - if (existingPort !== null) { - // Server is already running and responsive, no need to start - return { uuid: null, discoveredPort: existingPort }; - } - } catch { - // Failed to check, proceed with normal startup - } - - const terminal = ( - globalThis as unknown as { - Terminal?: { isInstalled?: () => Promise | boolean }; - } - ).Terminal; - let isTerminalInstalled = false; - try { - isTerminalInstalled = Boolean(await terminal?.isInstalled?.()); - } catch {} - if (!isTerminalInstalled) { - const message = getTerminalRequiredMessage(); - - if (!localStorage.getItem(DONT_ASK_TERMINAL_REQUIRED_FOR_LSP)) { - if (!alreadyInformed) { - const response = await confirm(strings?.error, message, false, { - checkboxText: strings["don't ask again"], - returnState: true, - }); - if ( - typeof response === "object" && - response.confirmed && - response.checked - ) { - localStorage.setItem(DONT_ASK_TERMINAL_REQUIRED_FOR_LSP, "true"); - } - alreadyInformed = true; - } else { - toast(message); - } - } - - const unavailable: LspError = new Error(message); - unavailable.code = "LSP_SERVER_UNAVAILABLE"; - throw unavailable; - } - - const installed = await ensureInstalled(server); - if (!installed) { - const unavailable: LspError = new Error( - `Language server ${server.id} is not available.`, - ); - unavailable.code = "LSP_SERVER_UNAVAILABLE"; - throw unavailable; - } - - const key = server.id; - if (managedServers.has(key)) { - const existing = managedServers.get(key); - if (bridge && !bridge.port) { - if (existing?.port) { - return { uuid: existing.uuid, discoveredPort: existing.port }; - } - const portInfo = await getLspPort(serverName, effectiveSession); - if (portInfo) { - if (existing) { - existing.port = portInfo.port; - } - return { uuid: existing?.uuid ?? null, discoveredPort: portInfo.port }; - } - } - return { uuid: existing?.uuid ?? null }; - } - - const command = resolveStartCommand(server, effectiveSession); - if (!command) { - return { uuid: null }; - } - - try { - const uuid = await startInteractiveServer( - command, - key, - launcher.logOutput, - ); - - // For auto-port discovery, wait for server ready signal then read port - let discoveredPort: number | undefined; - if (bridge && !bridge.port) { - // Auto-port mode - wait for server ready signal and then read port file - const portInfo = await waitForPort( - key, - serverName, - effectiveSession, - 10000, - ); - if (portInfo) { - discoveredPort = portInfo.port; - console.info( - `[LSP:${server.id}] Auto-discovered port ${discoveredPort}`, - ); - addLspLog(server.id, "info", `Auto-discovered port ${discoveredPort}`); - // Update managed server entry with the port - const entry = managedServers.get(key); - if (entry) { - entry.port = discoveredPort; - } - } - if (!discoveredPort) { - throw new Error( - `Could not discover websocket bridge port for ${server.id}`, - ); - } - } else if ( - server.transport?.url && - (server.transport.kind === "websocket" || - server.transport.kind === "stdio") - ) { - // Fixed port mode - wait for the server to signal ready - await waitForWebSocket(server.transport.url); - } - - if (!announcedServers.has(key)) { - console.info(`[LSP:${server.id}] ${server.label} connected`); - addLspLog(server.id, "info", `${server.label} connected`); - announcedServers.add(key); - } - return { uuid, discoveredPort }; - } catch (error) { - console.error(`Failed to start language server ${server.id}`, error); - const errorMessage = error instanceof Error ? error.message : String(error); - addLspLog(server.id, "error", errorMessage || "Connection failed"); - lspStatusBar.show({ - message: errorMessage || "Connection failed", - title: `${server.label} failed`, - type: "error", - icon: "error", - duration: false, - }); - const entry = managedServers.get(key); - if (entry) { - getExecutor() - .stop(entry.uuid) - .catch((err: Error) => { - console.warn( - `Failed to stop language server shell ${server.id}`, - err, - ); - }); - managedServers.delete(key); - } - const unavailable: LspError = new Error( - `Language server ${server.id} failed to start (${errorMessage})`, - ); - unavailable.code = "LSP_SERVER_UNAVAILABLE"; - throw unavailable; - } + const launcher = server.launcher; + if (!launcher) return { uuid: null }; + + // Derive session from server ID if not provided + const effectiveSession = session || server.id; + + // Check if server is already running via port file (dead client detection) + const bridge = launcher.bridge; + const serverName = + resolveServerExecutable(server) || + bridge?.command || + launcher.command || + server.id; + + try { + const existingPort = await canReuseExistingServer(server, effectiveSession); + if (existingPort !== null) { + // Server is already running and responsive, no need to start + return { uuid: null, discoveredPort: existingPort }; + } + } catch { + // Failed to check, proceed with normal startup + } + + const terminal = ( + globalThis as unknown as { + Terminal?: { isInstalled?: () => Promise | boolean }; + } + ).Terminal; + let isTerminalInstalled = false; + try { + isTerminalInstalled = Boolean(await terminal?.isInstalled?.()); + } catch {} + if (!isTerminalInstalled) { + const message = getTerminalRequiredMessage(); + + if (!localStorage.getItem(DONT_ASK_TERMINAL_REQUIRED_FOR_LSP)) { + if (!alreadyInformed) { + const response = await confirm(strings?.error, message, false, { + checkboxText: strings["don't ask again"], + returnState: true, + }); + if ( + typeof response === "object" && + response.confirmed && + response.checked + ) { + localStorage.setItem(DONT_ASK_TERMINAL_REQUIRED_FOR_LSP, "true"); + } + alreadyInformed = true; + } else { + toast(message); + } + } + + const unavailable: LspError = new Error(message); + unavailable.code = "LSP_SERVER_UNAVAILABLE"; + throw unavailable; + } + + const installed = await ensureInstalled(server); + if (!installed) { + const unavailable: LspError = new Error( + `Language server ${server.id} is not available.`, + ); + unavailable.code = "LSP_SERVER_UNAVAILABLE"; + throw unavailable; + } + + const key = server.id; + if (managedServers.has(key)) { + const existing = managedServers.get(key); + if (bridge && !bridge.port) { + if (existing?.port) { + return { uuid: existing.uuid, discoveredPort: existing.port }; + } + const portInfo = await getLspPort(serverName, effectiveSession); + if (portInfo) { + if (existing) { + existing.port = portInfo.port; + } + return { uuid: existing?.uuid ?? null, discoveredPort: portInfo.port }; + } + } + return { uuid: existing?.uuid ?? null }; + } + + const command = resolveStartCommand(server, effectiveSession); + if (!command) { + return { uuid: null }; + } + + try { + const uuid = await startInteractiveServer(command, key, launcher.logOutput); + + // For auto-port discovery, wait for server ready signal then read port + let discoveredPort: number | undefined; + if (bridge && !bridge.port) { + // Auto-port mode - wait for server ready signal and then read port file + const portInfo = await waitForPort( + key, + serverName, + effectiveSession, + 10000, + ); + if (portInfo) { + discoveredPort = portInfo.port; + console.info( + `[LSP:${server.id}] Auto-discovered port ${discoveredPort}`, + ); + addLspLog(server.id, "info", `Auto-discovered port ${discoveredPort}`); + // Update managed server entry with the port + const entry = managedServers.get(key); + if (entry) { + entry.port = discoveredPort; + } + } + if (!discoveredPort) { + throw new Error( + `Could not discover websocket bridge port for ${server.id}`, + ); + } + } else if ( + server.transport?.url && + (server.transport.kind === "websocket" || + server.transport.kind === "stdio") + ) { + // Fixed port mode - wait for the server to signal ready + await waitForWebSocket(server.transport.url); + } + + if (!announcedServers.has(key)) { + console.info(`[LSP:${server.id}] ${server.label} connected`); + addLspLog(server.id, "info", `${server.label} connected`); + announcedServers.add(key); + } + return { uuid, discoveredPort }; + } catch (error) { + console.error(`Failed to start language server ${server.id}`, error); + const errorMessage = error instanceof Error ? error.message : String(error); + addLspLog(server.id, "error", errorMessage || "Connection failed"); + lspStatusBar.show({ + message: errorMessage || "Connection failed", + title: `${server.label} failed`, + type: "error", + icon: "error", + duration: false, + }); + const entry = managedServers.get(key); + if (entry) { + getExecutor() + .stop(entry.uuid) + .catch((err: Error) => { + console.warn( + `Failed to stop language server shell ${server.id}`, + err, + ); + }); + managedServers.delete(key); + } + const unavailable: LspError = new Error( + `Language server ${server.id} failed to start (${errorMessage})`, + ); + unavailable.code = "LSP_SERVER_UNAVAILABLE"; + throw unavailable; + } } export function stopManagedServer(serverId: string): void { - const entry = managedServers.get(serverId); - if (!entry) return; - addLspLog(serverId, "info", "Stopping managed server"); - const executor = getExecutor(); - executor.stop(entry.uuid).catch((error: Error) => { - console.warn(`Failed to stop language server ${serverId}`, error); - }); - managedServers.delete(serverId); - announcedServers.delete(serverId); - - // Stop foreground service when all servers are stopped - if (managedServers.size === 0) { - executor.stopService().catch(() => {}); - } + const entry = managedServers.get(serverId); + if (!entry) return; + addLspLog(serverId, "info", "Stopping managed server"); + const executor = getExecutor(); + executor.stop(entry.uuid).catch((error: Error) => { + console.warn(`Failed to stop language server ${serverId}`, error); + }); + managedServers.delete(serverId); + announcedServers.delete(serverId); + + // Stop foreground service when all servers are stopped + if (managedServers.size === 0) { + executor.stopService().catch(() => {}); + } } export function resetManagedServers(): void { - for (const id of Array.from(managedServers.keys())) { - stopManagedServer(id); - } - managedServers.clear(); - // Ensure foreground service is stopped - getExecutor() - .stopService() - .catch(() => {}); + for (const id of Array.from(managedServers.keys())) { + stopManagedServer(id); + } + managedServers.clear(); + // Ensure foreground service is stopped + getExecutor() + .stopService() + .catch(() => {}); } /** * Get managed server info by server ID */ export function getManagedServerInfo( - serverId: string, + serverId: string, ): ManagedServerEntry | null { - return managedServers.get(serverId) ?? null; + return managedServers.get(serverId) ?? null; } /** * Get all managed servers */ export function getAllManagedServers(): Map { - return new Map(managedServers); + return new Map(managedServers); } function formatMemory(bytes: number): string { - if (!bytes || bytes <= 0) return "—"; - const mb = bytes / (1024 * 1024); - if (mb >= 1) return `${mb.toFixed(1)} MB`; - const kb = bytes / 1024; - return `${kb.toFixed(0)} KB`; + if (!bytes || bytes <= 0) return "—"; + const mb = bytes / (1024 * 1024); + if (mb >= 1) return `${mb.toFixed(1)} MB`; + const kb = bytes / 1024; + return `${kb.toFixed(0)} KB`; } function formatUptime(seconds: number): string { - if (!seconds || seconds <= 0) return "—"; - if (seconds < 60) return `${seconds}s`; - const mins = Math.floor(seconds / 60); - const secs = seconds % 60; - if (mins < 60) return `${mins}m ${secs}s`; - const hours = Math.floor(mins / 60); - const remainingMins = mins % 60; - return `${hours}h ${remainingMins}m`; + if (!seconds || seconds <= 0) return "—"; + if (seconds < 60) return `${seconds}s`; + const mins = Math.floor(seconds / 60); + const secs = seconds % 60; + if (mins < 60) return `${mins}m ${secs}s`; + const hours = Math.floor(mins / 60); + const remainingMins = mins % 60; + return `${hours}h ${remainingMins}m`; } /** @@ -1274,54 +1274,54 @@ function formatUptime(seconds: number): string { * @param timeout - Timeout in milliseconds (default: 2000) */ export async function getServerStats( - serverId: string, - timeout = 2000, + serverId: string, + timeout = 2000, ): Promise { - const entry = managedServers.get(serverId); - if (!entry?.port) { - return null; - } - - try { - const controller = new AbortController(); - const timeoutId = setTimeout(() => controller.abort(), timeout); - - const response = await fetch(`http://127.0.0.1:${entry.port}/status`, { - signal: controller.signal, - }); - - clearTimeout(timeoutId); - - if (!response.ok) { - return null; - } - - const data = (await response.json()) as LspServerStats; - - // Aggregate stats from all processes - let totalMemory = 0; - let maxUptime = 0; - let firstPid: number | null = null; - - for (const proc of data.processes || []) { - totalMemory += proc.memory_bytes || 0; - if (proc.uptime_secs > maxUptime) { - maxUptime = proc.uptime_secs; - } - if (firstPid === null && proc.pid) { - firstPid = proc.pid; - } - } - - return { - memoryBytes: totalMemory, - memoryFormatted: formatMemory(totalMemory), - uptimeSeconds: maxUptime, - uptimeFormatted: formatUptime(maxUptime), - pid: firstPid, - processCount: data.processes?.length ?? 0, - }; - } catch { - return null; - } + const entry = managedServers.get(serverId); + if (!entry?.port) { + return null; + } + + try { + const controller = new AbortController(); + const timeoutId = setTimeout(() => controller.abort(), timeout); + + const response = await fetch(`http://127.0.0.1:${entry.port}/status`, { + signal: controller.signal, + }); + + clearTimeout(timeoutId); + + if (!response.ok) { + return null; + } + + const data = (await response.json()) as LspServerStats; + + // Aggregate stats from all processes + let totalMemory = 0; + let maxUptime = 0; + let firstPid: number | null = null; + + for (const proc of data.processes || []) { + totalMemory += proc.memory_bytes || 0; + if (proc.uptime_secs > maxUptime) { + maxUptime = proc.uptime_secs; + } + if (firstPid === null && proc.pid) { + firstPid = proc.pid; + } + } + + return { + memoryBytes: totalMemory, + memoryFormatted: formatMemory(totalMemory), + uptimeSeconds: maxUptime, + uptimeFormatted: formatUptime(maxUptime), + pid: firstPid, + processCount: data.processes?.length ?? 0, + }; + } catch { + return null; + } } diff --git a/src/cm/lsp/serverRegistry.ts b/src/cm/lsp/serverRegistry.ts index faaeaa9494..f8157af8d4 100644 --- a/src/cm/lsp/serverRegistry.ts +++ b/src/cm/lsp/serverRegistry.ts @@ -2,6 +2,11 @@ import { bindServerRegistry, ensureBuiltinBundlesRegistered, } from "./serverCatalog"; +import { + addJsTsLanguageAliases, + isTailwindCssServer, + resolveJsTsLanguageId, +} from "./servers/shared"; import type { AcodeClientConfig, BridgeConfig, @@ -15,11 +20,6 @@ import type { TransportDescriptor, WebSocketTransportOptions, } from "./types"; -import { - addJsTsLanguageAliases, - isTailwindCssServer, - resolveJsTsLanguageId, -} from "./servers/shared"; const registry = new Map(); const listeners = new Set(); @@ -197,10 +197,7 @@ function sanitizeDefinition( throw new Error(`LSP server ${id} is missing a transport descriptor`); } - if ( - !("languages" in definition) || - !languages.length - ) { + if (!("languages" in definition) || !languages.length) { throw new Error(`LSP server ${id} must declare supported languages`); } diff --git a/src/cm/lsp/tooltipExtensions.ts b/src/cm/lsp/tooltipExtensions.ts index 7332d12a2c..7cab0e1c34 100644 --- a/src/cm/lsp/tooltipExtensions.ts +++ b/src/cm/lsp/tooltipExtensions.ts @@ -52,10 +52,7 @@ const SIGNATURE_TRIGGER_DELAY = 120; const SIGNATURE_RETRIGGER_DELAY = 250; const hoverLanguageLoads = new Map>(); const pluginHoverLanguages = new WeakMap(); -const pluginHoverLanguageLoads = new WeakMap< - Mode, - Promise ->(); +const pluginHoverLanguageLoads = new WeakMap>(); function clientHasCapability( client: LSPClient, @@ -250,7 +247,9 @@ function collectHoverLanguages( return result; } -async function loadHoverContentLanguages(contents: Hover["contents"]): Promise { +async function loadHoverContentLanguages( + contents: Hover["contents"], +): Promise { const languageTags = collectHoverLanguages(contents); await Promise.all( Array.from(languageTags, (language) => @@ -368,8 +367,8 @@ function lspTooltipSource( view: EditorView, pos: number, ): Promise { - const plugins = LSPPlugin.getAll(view, "hover").filter( - (plugin) => clientHasCapability(plugin.client, "hoverProvider"), + const plugins = LSPPlugin.getAll(view, "hover").filter((plugin) => + clientHasCapability(plugin.client, "hoverProvider"), ); if (!plugins.length) return Promise.resolve(null); @@ -808,9 +807,8 @@ export const showSignatureHelp: Command = (view) => { const field = view.state.field(signatureState); if (!plugin || field === undefined) return false; - const lspPlugin = LSPPlugin.getAll(view, "signatureHelp").find( - (candidate) => - clientHasCapability(candidate.client, "signatureHelpProvider"), + const lspPlugin = LSPPlugin.getAll(view, "signatureHelp").find((candidate) => + clientHasCapability(candidate.client, "signatureHelpProvider"), ); if (!lspPlugin) return false; diff --git a/src/cm/lsp/transport.ts b/src/cm/lsp/transport.ts index 1095687e67..46468be1a4 100644 --- a/src/cm/lsp/transport.ts +++ b/src/cm/lsp/transport.ts @@ -45,7 +45,11 @@ function createWebSocketTransport( console.info( `[LSP:${server.id}] Using auto-discovered port ${context.dynamicPort}`, ); - addLspLog(server.id, "info", `Using auto-discovered port ${context.dynamicPort}`); + addLspLog( + server.id, + "info", + `Using auto-discovered port ${context.dynamicPort}`, + ); } // URL is only required when not using dynamic port @@ -176,9 +180,8 @@ function createWebSocketTransport( break; case "workspace/configuration": result = Array.isArray(msg.params?.items) - ? msg.params.items.map( - (item: { section?: unknown }) => - resolveWorkspaceConfiguration(item?.section), + ? msg.params.items.map((item: { section?: unknown }) => + resolveWorkspaceConfiguration(item?.section), ) : []; break; @@ -189,8 +192,7 @@ function createWebSocketTransport( { uri: rootUri, name: - rootUri.replace(/\/$/, "").split("/").pop() || - rootUri, + rootUri.replace(/\/$/, "").split("/").pop() || rootUri, }, ] : null; diff --git a/src/cm/lsp/types.ts b/src/cm/lsp/types.ts index 6f39038a42..6374803801 100644 --- a/src/cm/lsp/types.ts +++ b/src/cm/lsp/types.ts @@ -1,3 +1,4 @@ +import type { Language } from "@codemirror/language"; import type { LSPClient, LSPClientConfig, @@ -6,7 +7,6 @@ import type { Workspace, WorkspaceFile, } from "@codemirror/lsp-client"; -import type { Language } from "@codemirror/language"; import type { ChangeSet, Extension, MapMode, Text } from "@codemirror/state"; import type { EditorView } from "@codemirror/view"; diff --git a/src/cm/lsp/workerTransport.ts b/src/cm/lsp/workerTransport.ts index cf45a2c864..d5263ec0f1 100644 --- a/src/cm/lsp/workerTransport.ts +++ b/src/cm/lsp/workerTransport.ts @@ -76,7 +76,11 @@ function extractHostRequest( return null; } - if (data.params && typeof data.params === "object" && !Array.isArray(data.params)) { + if ( + data.params && + typeof data.params === "object" && + !Array.isArray(data.params) + ) { return { id: data.id, method: data.method, @@ -86,7 +90,12 @@ function extractHostRequest( const params: Record = {}; for (const [key, value] of Object.entries(data)) { - if (key === "kind" || key === "id" || key === "method" || key === "params") { + if ( + key === "kind" || + key === "id" || + key === "method" || + key === "params" + ) { continue; } params[key] = value; @@ -177,12 +186,17 @@ export function createWorkerTransport( try { listener(data); } catch (error) { - console.error(`[LSP:${serverId}] Worker transport listener failed`, error); + console.error( + `[LSP:${serverId}] Worker transport listener failed`, + error, + ); } } } - async function handleHostRequest(message: WorkerControlMessage): Promise { + async function handleHostRequest( + message: WorkerControlMessage, + ): Promise { const request = extractHostRequest(message); if (!request) return; @@ -198,8 +212,7 @@ export function createWorkerTransport( try { response.result = await handler(request.params); } catch (error) { - response.error = - error instanceof Error ? error.message : String(error); + response.error = error instanceof Error ? error.message : String(error); } } @@ -257,9 +270,7 @@ export function createWorkerTransport( }; worker.onerror = (event: ErrorEvent) => { - failTransport( - new Error(event.message || `The ${serverId} worker failed`), - ); + failTransport(new Error(event.message || `The ${serverId} worker failed`)); }; if (options.configure && typeof options.configure === "object") { diff --git a/src/cm/lsp/workers/css.worker.ts b/src/cm/lsp/workers/css.worker.ts index c5c3b5cff1..89186dc3ad 100644 --- a/src/cm/lsp/workers/css.worker.ts +++ b/src/cm/lsp/workers/css.worker.ts @@ -81,10 +81,7 @@ startWorkerServer(({ documents }) => { validate(document) { const service = getService(document); - return service.doValidation( - document, - getStylesheet(document, service), - ); + return service.doValidation(document, getStylesheet(document, service)); }, async request(method, params) { @@ -127,11 +124,7 @@ startWorkerServer(({ documents }) => { return definition ? [definition] : null; } case "textDocument/references": - return service.findReferences( - document, - request.position, - stylesheet, - ); + return service.findReferences(document, request.position, stylesheet); case "textDocument/prepareRename": return ( service.prepareRename(document, request.position, stylesheet) ?? diff --git a/src/cm/lsp/workers/html.worker.ts b/src/cm/lsp/workers/html.worker.ts index b6e8e2de3b..e2046d0f3b 100644 --- a/src/cm/lsp/workers/html.worker.ts +++ b/src/cm/lsp/workers/html.worker.ts @@ -1,6 +1,6 @@ import { - getCSSLanguageService, type LanguageService as CssLanguageService, + getCSSLanguageService, type Stylesheet, } from "vscode-css-languageservice"; import { @@ -67,8 +67,14 @@ startWorkerServer(({ documents, requestFile, rootUri }) => { const jsonService = createImportMapService(); const parsedHtml = new Map(); const embeddedDocuments = new Map(); - const parsedCss = new Map(); - const parsedJson = new Map(); + const parsedCss = new Map< + string, + { version: number; document: Stylesheet } + >(); + const parsedJson = new Map< + string, + { version: number; document: JSONDocument } + >(); const documentContext = { resolveReference }; let typescriptClient: NestedLspClient | null | undefined; @@ -121,12 +127,7 @@ startWorkerServer(({ documents, requestFile, rootUri }) => { version: document.version, regions, css: cssText - ? TextDocument.create( - document.uri, - "css", - document.version, - cssText, - ) + ? TextDocument.create(document.uri, "css", document.version, cssText) : null, importmap: importMapText ? TextDocument.create( @@ -215,10 +216,7 @@ startWorkerServer(({ documents, requestFile, rootUri }) => { if (embedded.css) { diagnostics.push( - ...cssService.doValidation( - embedded.css, - getCss(embedded.css), - ), + ...cssService.doValidation(embedded.css, getCss(embedded.css)), ); } if (embedded.importmap) { @@ -327,30 +325,22 @@ startWorkerServer(({ documents, requestFile, rootUri }) => { return cssService.format(css, request.range, request.options); } if (languageId === "importmap" && importmap) { - return jsonService.format( - importmap, - request.range, - { - tabSize: request.options.tabSize ?? 4, - insertSpaces: request.options.insertSpaces ?? true, - }, - ); + return jsonService.format(importmap, request.range, { + tabSize: request.options.tabSize ?? 4, + insertSpaces: request.options.insertSpaces ?? true, + }); } if (languageId === "javascript") { return requestTypeScript(method, params, javascript); } - return htmlService.format( + return htmlService.format(document, request.range, request.options); + case "textDocument/documentSymbol": { + const symbols: DocumentSymbol[] = htmlService.findDocumentSymbols2( document, - request.range, - request.options, + html, ); - case "textDocument/documentSymbol": { - const symbols: DocumentSymbol[] = - htmlService.findDocumentSymbols2(document, html); if (css) { - symbols.push( - ...cssService.findDocumentSymbols2(css, getCss(css)), - ); + symbols.push(...cssService.findDocumentSymbols2(css, getCss(css))); } if (importmap) { symbols.push( @@ -397,11 +387,7 @@ startWorkerServer(({ documents, requestFile, rootUri }) => { return requestTypeScript(method, params, javascript); } return languageId === "css" && css - ? cssService.findReferences( - css, - request.position, - getCss(css), - ) + ? cssService.findReferences(css, request.position, getCss(css)) : null; case "textDocument/rename": if (languageId === "css" && css) { @@ -455,10 +441,7 @@ startWorkerServer(({ documents, requestFile, rootUri }) => { } if (importmap) { links.push( - ...(await jsonService.findLinks( - importmap, - getJson(importmap), - )), + ...(await jsonService.findLinks(importmap, getJson(importmap))), ); } return links; @@ -476,9 +459,7 @@ startWorkerServer(({ documents, requestFile, rootUri }) => { ) : []; case "textDocument/documentColor": - return css - ? cssService.findDocumentColors(css, getCss(css)) - : []; + return css ? cssService.findDocumentColors(css, getCss(css)) : []; case "textDocument/colorPresentation": return languageId === "css" && css ? cssService.getColorPresentations( @@ -489,8 +470,7 @@ startWorkerServer(({ documents, requestFile, rootUri }) => { ) : []; case "textDocument/foldingRange": { - const ranges: FoldingRange[] = - htmlService.getFoldingRanges(document); + const ranges: FoldingRange[] = htmlService.getFoldingRanges(document); if (css) ranges.push(...cssService.getFoldingRanges(css)); if (importmap) { ranges.push(...jsonService.getFoldingRanges(importmap)); @@ -536,10 +516,7 @@ startWorkerServer(({ documents, requestFile, rootUri }) => { ) { return requestTypeScript(method, params, javascript); } - return htmlService.getSelectionRanges( - document, - request.positions, - ); + return htmlService.getSelectionRanges(document, request.positions); case "textDocument/linkedEditingRange": { if (languageId) return null; const ranges = htmlService.findLinkedEditingRanges( diff --git a/src/cm/lsp/workers/htmlEmbeddedSupport.ts b/src/cm/lsp/workers/htmlEmbeddedSupport.ts index 9a56ac39f3..b396262a33 100644 --- a/src/cm/lsp/workers/htmlEmbeddedSupport.ts +++ b/src/cm/lsp/workers/htmlEmbeddedSupport.ts @@ -134,12 +134,7 @@ export function getDocumentRegions( return { regions, getEmbeddedDocument: (languageId, ignoreAttributeValues) => - getEmbeddedDocument( - document, - regions, - languageId, - ignoreAttributeValues, - ), + getEmbeddedDocument(document, regions, languageId, ignoreAttributeValues), getEmbeddedLanguages: (ignoreAttributeValues) => getEmbeddedLanguages(regions, ignoreAttributeValues), getEmbeddedLanguageAtPosition: (position) => diff --git a/src/cm/lsp/workers/json.worker.ts b/src/cm/lsp/workers/json.worker.ts index 5357d6e1a0..9c898b1088 100644 --- a/src/cm/lsp/workers/json.worker.ts +++ b/src/cm/lsp/workers/json.worker.ts @@ -5,12 +5,12 @@ import { type LanguageService, } from "vscode-json-languageservice"; import type { TextDocument } from "vscode-languageserver-textdocument"; +import { schemas } from "./jsonSchemas"; import { getTextDocument, METHOD_NOT_HANDLED, startWorkerServer, } from "./protocol"; -import { schemas } from "./jsonSchemas"; interface CachedJsonDocument { version: number; @@ -105,8 +105,7 @@ startWorkerServer(({ documents, requestFile }) => { const service = getService(document); return service.doValidation(document, getParsed(document, service), { comments: document.languageId === "jsonc" ? "ignore" : "error", - trailingCommas: - document.languageId === "jsonc" ? "warning" : "error", + trailingCommas: document.languageId === "jsonc" ? "warning" : "error", }); }, @@ -156,11 +155,7 @@ startWorkerServer(({ documents, requestFile }) => { case "textDocument/foldingRange": return service.getFoldingRanges(document); case "textDocument/selectionRange": - return service.getSelectionRanges( - document, - request.positions, - json, - ); + return service.getSelectionRanges(document, request.positions, json); default: return METHOD_NOT_HANDLED; } diff --git a/src/cm/lsp/workers/nestedLspClient.ts b/src/cm/lsp/workers/nestedLspClient.ts index a4dc90c0ec..43e16a2c78 100644 --- a/src/cm/lsp/workers/nestedLspClient.ts +++ b/src/cm/lsp/workers/nestedLspClient.ts @@ -35,9 +35,7 @@ export class NestedLspClient { }); this.ready = new Promise((resolve, reject) => { const timeout = setTimeout(() => { - const error = new Error( - `Timed out starting ${config.serverId} worker`, - ); + const error = new Error(`Timed out starting ${config.serverId} worker`); this.fail(error); reject(error); }, 10000); @@ -182,7 +180,9 @@ export class NestedLspClient { if (!request) return; this.pending.delete(message.id); if (message.error) { - request.reject(new Error(message.error.message || "Nested request failed")); + request.reject( + new Error(message.error.message || "Nested request failed"), + ); } else { request.resolve(message.result); } diff --git a/src/cm/lsp/workers/protocol.ts b/src/cm/lsp/workers/protocol.ts index 65c7494281..5daf735c5b 100644 --- a/src/cm/lsp/workers/protocol.ts +++ b/src/cm/lsp/workers/protocol.ts @@ -394,9 +394,8 @@ export function getTextDocument( documentsMap: Map, params: unknown, ): TextDocument | null { - const uri = ( - params as { textDocument?: { uri?: unknown } } | null - )?.textDocument?.uri; + const uri = (params as { textDocument?: { uri?: unknown } } | null) + ?.textDocument?.uri; return typeof uri === "string" ? (documentsMap.get(uri) ?? null) : null; } diff --git a/src/cm/lsp/workers/typescript.worker.ts b/src/cm/lsp/workers/typescript.worker.ts index 6595e6c057..4a791e5746 100644 --- a/src/cm/lsp/workers/typescript.worker.ts +++ b/src/cm/lsp/workers/typescript.worker.ts @@ -1,30 +1,30 @@ import ts from "typescript"; import { TextDocument } from "vscode-languageserver-textdocument"; import { - CompletionItemKind, - DiagnosticSeverity, - DiagnosticTag, - DocumentHighlightKind, - FoldingRangeKind, - InlayHintKind, - Range, - SelectionRange, - SymbolKind, type CodeAction, type CodeActionContext, type CompletionItem, + CompletionItemKind, type Diagnostic, + DiagnosticSeverity, + DiagnosticTag, type DocumentHighlight, + DocumentHighlightKind, type DocumentSymbol, type FoldingRange, + FoldingRangeKind, type FormattingOptions, type InlayHint, + InlayHintKind, type Location, type LocationLink, + type SelectionRange as LspSelectionRange, type MarkupContent, type Position, - type SelectionRange as LspSelectionRange, + Range, + SelectionRange, type SignatureHelp, + SymbolKind, type TextEdit, type WorkspaceEdit, } from "vscode-languageserver-types"; @@ -157,10 +157,7 @@ class TypeScriptHost implements ts.LanguageServiceHost { containingFile: string, ): (ts.ResolvedModule | undefined)[] { return moduleNames.map((moduleName) => { - const openDocument = this.resolveOpenDocument( - moduleName, - containingFile, - ); + const openDocument = this.resolveOpenDocument(moduleName, containingFile); if (openDocument) return openDocument; return ts.resolveModuleName( moduleName, @@ -206,175 +203,160 @@ class TypeScriptHost implements ts.LanguageServiceHost { } } -startWorkerServer(async ({ - documents, - requestFile, - rootUri, - getProjectVersion, -}) => { - const compilerOptions = await loadCompilerOptions(rootUri, requestFile); - const host = new TypeScriptHost( - documents, - compilerOptions, - getProjectVersion, - ); - const service = ts.createLanguageService( - host, - ts.createDocumentRegistry(true, "/"), - ); +startWorkerServer( + async ({ documents, requestFile, rootUri, getProjectVersion }) => { + const compilerOptions = await loadCompilerOptions(rootUri, requestFile); + const host = new TypeScriptHost( + documents, + compilerOptions, + getProjectVersion, + ); + const service = ts.createLanguageService( + host, + ts.createDocumentRegistry(true, "/"), + ); - return { - capabilities: { - completionProvider: { - resolveProvider: true, - triggerCharacters: [".", "/", '"', "'", "<"], - }, - hoverProvider: true, - signatureHelpProvider: { - triggerCharacters: ["(", ",", "<"], - retriggerCharacters: [")"], - }, - documentFormattingProvider: true, - documentRangeFormattingProvider: true, - documentSymbolProvider: true, - definitionProvider: true, - referencesProvider: true, - renameProvider: { - prepareProvider: true, + return { + capabilities: { + completionProvider: { + resolveProvider: true, + triggerCharacters: [".", "/", '"', "'", "<"], + }, + hoverProvider: true, + signatureHelpProvider: { + triggerCharacters: ["(", ",", "<"], + retriggerCharacters: [")"], + }, + documentFormattingProvider: true, + documentRangeFormattingProvider: true, + documentSymbolProvider: true, + definitionProvider: true, + referencesProvider: true, + renameProvider: { + prepareProvider: true, + }, + documentHighlightProvider: true, + codeActionProvider: true, + foldingRangeProvider: true, + selectionRangeProvider: true, + inlayHintProvider: true, }, - documentHighlightProvider: true, - codeActionProvider: true, - foldingRangeProvider: true, - selectionRangeProvider: true, - inlayHintProvider: true, - }, - validate(document) { - const diagnostics: ts.Diagnostic[] = [ - ...service.getSyntacticDiagnostics(document.uri), - ...service.getSuggestionDiagnostics(document.uri), - ]; - if (isTypeScriptDocument(document)) { - diagnostics.push(...service.getSemanticDiagnostics(document.uri)); - } - return diagnostics.map((diagnostic) => - toDiagnostic(document, diagnostic), - ); - }, - - request(method, params) { - if (method === "completionItem/resolve") { - return resolveCompletion( - service, - documents, - params as CompletionItem, + validate(document) { + const diagnostics: ts.Diagnostic[] = [ + ...service.getSyntacticDiagnostics(document.uri), + ...service.getSuggestionDiagnostics(document.uri), + ]; + if (isTypeScriptDocument(document)) { + diagnostics.push(...service.getSemanticDiagnostics(document.uri)); + } + return diagnostics.map((diagnostic) => + toDiagnostic(document, diagnostic), ); - } + }, - const document = getTextDocument(documents, params); - if (!document) return null; - const request = params as RequestParams; - const offset = request.position - ? document.offsetAt(request.position) - : 0; - - switch (method) { - case "acode/validate": { - const diagnostics: ts.Diagnostic[] = [ - ...service.getSyntacticDiagnostics(document.uri), - ...service.getSuggestionDiagnostics(document.uri), - ]; - if (isTypeScriptDocument(document)) { - diagnostics.push( - ...service.getSemanticDiagnostics(document.uri), - ); - } - return diagnostics.map((diagnostic) => - toDiagnostic(document, diagnostic), - ); - } - case "textDocument/completion": - return completions(service, document, offset); - case "textDocument/hover": - return hover(service, document, offset); - case "textDocument/signatureHelp": - return signatureHelp( - service, - document, - offset, - request.context, - ); - case "textDocument/formatting": - return format(service, document, undefined, request.options); - case "textDocument/rangeFormatting": - return format( - service, - document, - request.range, - request.options, - ); - case "textDocument/documentSymbol": - return documentSymbols(service, document); - case "textDocument/definition": - return definitions(service, documents, document, offset); - case "textDocument/references": - return references(service, documents, document, offset); - case "textDocument/prepareRename": { - const info = service.getRenameInfo(document.uri, offset, { - allowRenameOfImportPath: true, - }); - return info.canRename - ? rangeFromSpan(document, info.triggerSpan) - : null; - } - case "textDocument/rename": - return rename( - service, - documents, - document, - offset, - request.newName, - ); - case "textDocument/documentHighlight": - return documentHighlights(service, document, offset); - case "textDocument/codeAction": - return codeActions( + request(method, params) { + if (method === "completionItem/resolve") { + return resolveCompletion( service, documents, - document, - request.range!, - request.context, - request.options, + params as CompletionItem, ); - case "textDocument/foldingRange": - return foldingRanges(service, document); - case "textDocument/selectionRange": - return selectionRanges( - service, - document, - (params as { positions: Position[] }).positions, - ); - case "textDocument/inlayHint": - return inlayHints(service, document, request.range!); - default: - return METHOD_NOT_HANDLED; - } - }, + } - // Only wipe the shared semantic program when nothing is open. - // cleanupSemanticCache() releases every source file and forces a full - // re-analysis of remaining tabs — costly on multi-file mobile sessions. - closeDocument() { - if (documents.size === 0) { - service.cleanupSemanticCache(); - } - }, + const document = getTextDocument(documents, params); + if (!document) return null; + const request = params as RequestParams; + const offset = request.position + ? document.offsetAt(request.position) + : 0; + + switch (method) { + case "acode/validate": { + const diagnostics: ts.Diagnostic[] = [ + ...service.getSyntacticDiagnostics(document.uri), + ...service.getSuggestionDiagnostics(document.uri), + ]; + if (isTypeScriptDocument(document)) { + diagnostics.push(...service.getSemanticDiagnostics(document.uri)); + } + return diagnostics.map((diagnostic) => + toDiagnostic(document, diagnostic), + ); + } + case "textDocument/completion": + return completions(service, document, offset); + case "textDocument/hover": + return hover(service, document, offset); + case "textDocument/signatureHelp": + return signatureHelp(service, document, offset, request.context); + case "textDocument/formatting": + return format(service, document, undefined, request.options); + case "textDocument/rangeFormatting": + return format(service, document, request.range, request.options); + case "textDocument/documentSymbol": + return documentSymbols(service, document); + case "textDocument/definition": + return definitions(service, documents, document, offset); + case "textDocument/references": + return references(service, documents, document, offset); + case "textDocument/prepareRename": { + const info = service.getRenameInfo(document.uri, offset, { + allowRenameOfImportPath: true, + }); + return info.canRename + ? rangeFromSpan(document, info.triggerSpan) + : null; + } + case "textDocument/rename": + return rename( + service, + documents, + document, + offset, + request.newName, + ); + case "textDocument/documentHighlight": + return documentHighlights(service, document, offset); + case "textDocument/codeAction": + return codeActions( + service, + documents, + document, + request.range!, + request.context, + request.options, + ); + case "textDocument/foldingRange": + return foldingRanges(service, document); + case "textDocument/selectionRange": + return selectionRanges( + service, + document, + (params as { positions: Position[] }).positions, + ); + case "textDocument/inlayHint": + return inlayHints(service, document, request.range!); + default: + return METHOD_NOT_HANDLED; + } + }, - dispose() { - service.dispose(); - }, - }; -}); + // Only wipe the shared semantic program when nothing is open. + // cleanupSemanticCache() releases every source file and forces a full + // re-analysis of remaining tabs — costly on multi-file mobile sessions. + closeDocument() { + if (documents.size === 0) { + service.cleanupSemanticCache(); + } + }, + + dispose() { + service.dispose(); + }, + }; + }, +); async function loadCompilerOptions( rootUri: string | null | undefined, @@ -526,9 +508,7 @@ function hover( range: rangeFromSpan(document, info.textSpan), contents: [ { - language: isTypeScriptDocument(document) - ? "typescript" - : "javascript", + language: isTypeScriptDocument(document) ? "typescript" : "javascript", value: signature, }, [documentation, tags].filter(Boolean).join("\n\n"), @@ -553,9 +533,7 @@ function signatureHelp( label: ts.displayPartsToString(item.prefixDisplayParts) + item.parameters - .map((parameter) => - ts.displayPartsToString(parameter.displayParts), - ) + .map((parameter) => ts.displayPartsToString(parameter.displayParts)) .join(ts.displayPartsToString(item.separatorDisplayParts)) + ts.displayPartsToString(item.suffixDisplayParts), documentation: markdownContent( @@ -642,8 +620,10 @@ function references( offset: number, ): Location[] { const result: Location[] = []; - for (const reference of - service.getReferencesAtPosition(document.uri, offset) ?? []) { + for (const reference of service.getReferencesAtPosition( + document.uri, + offset, + ) ?? []) { const target = documents.get(reference.fileName); if (!target) continue; result.push({ @@ -687,9 +667,9 @@ function documentHighlights( offset: number, ): DocumentHighlight[] { const result: DocumentHighlight[] = []; - for (const item of - service.getDocumentHighlights(document.uri, offset, [document.uri]) ?? - []) { + for (const item of service.getDocumentHighlights(document.uri, offset, [ + document.uri, + ]) ?? []) { for (const highlight of item.highlightSpans) { result.push({ range: rangeFromSpan(document, highlight.textSpan), @@ -773,10 +753,7 @@ function selectionRanges( ); return positions.map((position) => convert( - service.getSmartSelectionRange( - document.uri, - document.offsetAt(position), - ), + service.getSmartSelectionRange(document.uri, document.offsetAt(position)), ), ); } @@ -805,9 +782,7 @@ function inlayHints( .map((hint) => ({ position: document.positionAt(hint.position), label: - hint.text || - hint.displayParts?.map((part) => part.text).join("") || - "", + hint.text || hint.displayParts?.map((part) => part.text).join("") || "", kind: hint.kind === ts.InlayHintKind.Parameter ? InlayHintKind.Parameter diff --git a/src/cm/lsp/workers/typescriptLibs.ts b/src/cm/lsp/workers/typescriptLibs.ts index 616e5dbab6..29d50238cf 100644 --- a/src/cm/lsp/workers/typescriptLibs.ts +++ b/src/cm/lsp/workers/typescriptLibs.ts @@ -22,8 +22,7 @@ const context = require.context( const libraries: Record = {}; for (const key of context.keys()) { const value = context(key); - libraries[key.slice(2)] = - typeof value === "string" ? value : value.default; + libraries[key.slice(2)] = typeof value === "string" ? value : value.default; } export default libraries; diff --git a/src/cm/lsp/workspace.ts b/src/cm/lsp/workspace.ts index b3d02e36f3..890df71f43 100644 --- a/src/cm/lsp/workspace.ts +++ b/src/cm/lsp/workspace.ts @@ -3,10 +3,7 @@ import { LSPPlugin, Workspace } from "@codemirror/lsp-client"; import type { Text, TransactionSpec } from "@codemirror/state"; import type { EditorView } from "@codemirror/view"; import { getModeForPath } from "cm/modelist"; -import { - forgetPullDiagnostics, - schedulePullDiagnostics, -} from "./diagnostics"; +import { forgetPullDiagnostics, schedulePullDiagnostics } from "./diagnostics"; import { addLspLogFor, type LspLogLevel } from "./logs"; import type { WorkspaceFileUpdate, WorkspaceOptions } from "./types"; diff --git a/src/cm/modes/astro/index.ts b/src/cm/modes/astro/index.ts index 691db69a3a..1bfdec8435 100644 --- a/src/cm/modes/astro/index.ts +++ b/src/cm/modes/astro/index.ts @@ -5,17 +5,19 @@ import { typescriptLanguage, } from "@codemirror/lang-javascript"; import { - LRLanguage, - LanguageSupport, foldInside, foldNodeProp, indentNodeProp, + LanguageSupport, + LRLanguage, } from "@codemirror/language"; import { parseMixed } from "@lezer/common"; import { styleTags, tags as t } from "@lezer/highlight"; import { parser } from "./parser/parser"; -export function astro(config: { autoCloseTags?: boolean } = {}): LanguageSupport { +export function astro( + config: { autoCloseTags?: boolean } = {}, +): LanguageSupport { const htmlSupport = html({ autoCloseTags: config.autoCloseTags, matchClosingTags: false, @@ -68,5 +70,8 @@ export function astro(config: { autoCloseTags?: boolean } = {}): LanguageSupport }, }); - return new LanguageSupport(astroLanguage, [htmlSupport.support, jsSupport.support]); + return new LanguageSupport(astroLanguage, [ + htmlSupport.support, + jsSupport.support, + ]); } diff --git a/src/cm/modes/astro/parser/parser.terms.ts b/src/cm/modes/astro/parser/parser.terms.ts index 3e171fc210..920968de05 100644 --- a/src/cm/modes/astro/parser/parser.terms.ts +++ b/src/cm/modes/astro/parser/parser.terms.ts @@ -1,12 +1,11 @@ // This file was generated by lezer-generator. You probably shouldn't edit it. -export const - FrontmatterOpen = 1, - FrontmatterContent = 2, - FrontmatterClose = 3, - ExpressionOpen = 4, - ExpressionContent = 5, - ExpressionClose = 6, - HtmlContent = 7, - Document = 8, - Frontmatter = 9, - AstroExpression = 10 +export const FrontmatterOpen = 1, + FrontmatterContent = 2, + FrontmatterClose = 3, + ExpressionOpen = 4, + ExpressionContent = 5, + ExpressionClose = 6, + HtmlContent = 7, + Document = 8, + Frontmatter = 9, + AstroExpression = 10; diff --git a/src/cm/modes/astro/parser/parser.ts b/src/cm/modes/astro/parser/parser.ts index fc43616063..58786307b4 100644 --- a/src/cm/modes/astro/parser/parser.ts +++ b/src/cm/modes/astro/parser/parser.ts @@ -1,17 +1,19 @@ // This file was generated by lezer-generator. You probably shouldn't edit it. -import {LRParser} from "@lezer/lr" -import {astroTokens} from "./tokens" +import { LRParser } from "@lezer/lr"; +import { astroTokens } from "./tokens"; export const parser = LRParser.deserialize({ - version: 14, - states: "!pQQOPOOO]OPO'#CeOeOPO'#CfOOOP'#Cg'#CgQTOPOOQTOPOOOOOP,59P,59POmOPO,59POOOP,59Q,59QOrOPO,59QOOOP-E6e-E6eOOOP1G.k1G.kOOOP1G.l1G.l", - stateData: "w~OPPOSQOVRO~OQVORUO~OTXOUWO~ORZO~OU[O~O", - goto: "l[PPPPPPPPP]`eRTOVROSTSSOTRYS", - nodeNames: "⚠ FrontmatterOpen FrontmatterContent FrontmatterClose ExpressionOpen ExpressionContent ExpressionClose HtmlContent Document Frontmatter AstroExpression", - maxTerm: 12, - skippedNodes: [0], - repeatNodeCount: 1, - tokenData: "RORO", - tokenizers: [astroTokens], - topRules: {"Document":[0,8]}, - tokenPrec: 0 -}) + version: 14, + states: + "!pQQOPOOO]OPO'#CeOeOPO'#CfOOOP'#Cg'#CgQTOPOOQTOPOOOOOP,59P,59POmOPO,59POOOP,59Q,59QOrOPO,59QOOOP-E6e-E6eOOOP1G.k1G.kOOOP1G.l1G.l", + stateData: "w~OPPOSQOVRO~OQVORUO~OTXOUWO~ORZO~OU[O~O", + goto: "l[PPPPPPPPP]`eRTOVROSTSSOTRYS", + nodeNames: + "⚠ FrontmatterOpen FrontmatterContent FrontmatterClose ExpressionOpen ExpressionContent ExpressionClose HtmlContent Document Frontmatter AstroExpression", + maxTerm: 12, + skippedNodes: [0], + repeatNodeCount: 1, + tokenData: "RORO", + tokenizers: [astroTokens], + topRules: { Document: [0, 8] }, + tokenPrec: 0, +}); diff --git a/src/cm/modes/astro/parser/tokens.ts b/src/cm/modes/astro/parser/tokens.ts index 17e751e112..ea7ed6d078 100644 --- a/src/cm/modes/astro/parser/tokens.ts +++ b/src/cm/modes/astro/parser/tokens.ts @@ -67,10 +67,7 @@ function atLineStart(input: Input): boolean { return input.peek(-1) === newline; } -function lineHasOnlyFrontmatterFence( - input: Input, - offset = 0, -): boolean { +function lineHasOnlyFrontmatterFence(input: Input, offset = 0): boolean { if ( input.peek(offset) !== dash || input.peek(offset + 1) !== dash || @@ -112,10 +109,7 @@ function startsWithTagName( return isNameBoundary(input.peek(offset + 1 + name.length)); } -function tagEnd( - input: Input, - offset: number, -): TagEnd { +function tagEnd(input: Input, offset: number): TagEnd { let quote = 0; let lastNonWhitespace = 0; @@ -145,11 +139,7 @@ function tagEndOffset(input: Input, offset: number): number { return tagEnd(input, offset).end; } -function closeTagEndOffset( - input: Input, - offset: number, - name: string, -): number { +function closeTagEndOffset(input: Input, offset: number, name: string): number { const nameLength = name.length; for (let i = offset; ; i++) { @@ -171,10 +161,7 @@ function closeTagEndOffset( } } -function rawTextElementEndOffset( - input: Input, - offset: number, -): number | null { +function rawTextElementEndOffset(input: Input, offset: number): number | null { if (startsWithTagName(input, offset, "script")) { const openTag = tagEnd(input, offset); if (openTag.selfClosing) return openTag.end; @@ -213,10 +200,7 @@ function htmlCommentEndOffset(input: Input, offset: number): number | null { } } -function expressionEndOffset( - input: Input, - offset: number, -): number { +function expressionEndOffset(input: Input, offset: number): number { let depth = 0; let quote = 0; let escaped = false; @@ -311,9 +295,7 @@ function startsInsideTagFragment(input: Input): boolean { } } -function htmlContentEndOffset( - input: Input, -): number { +function htmlContentEndOffset(input: Input): number { let inTag = startsInsideTagFragment(input); let quote = 0; @@ -368,9 +350,7 @@ function htmlContentEndOffset( } } -function frontmatterContentEndOffset( - input: Input, -): number { +function frontmatterContentEndOffset(input: Input): number { for (let offset = 0; ; offset++) { const next = input.peek(offset); if (next === eof) return offset; diff --git a/src/cm/punctuationWrapping.ts b/src/cm/punctuationWrapping.ts index 917c3c1c4e..dc5ba6f533 100644 --- a/src/cm/punctuationWrapping.ts +++ b/src/cm/punctuationWrapping.ts @@ -10,7 +10,8 @@ import { // VS Code's default wordWrapBreak{After,Before}Characters: // https://github.com/microsoft/vscode/blob/main/src/vs/editor/common/config/editorOptions.ts -const after = " \t})]?|/&.,;¢°′″‰℃、。。、¢,.:;?!%・・ゝゞヽヾーァィゥェォッャュョヮヵヶぁぃぅぇぉっゃゅょゎゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ々〻ァィゥェォャュョッー”〉》」』】〕)]}」"; +const after = + " \t})]?|/&.,;¢°′″‰℃、。。、¢,.:;?!%・・ゝゞヽヾーァィゥェォッャュョヮヵヶぁぃぅぇぉっゃゅょゎゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ々〻ァィゥェォャュョッー”〉》」』】〕)]}」"; const before = "([{‘“〈《「『【〔([{「£¥$£¥++"; const escapeClass = (text: string) => text.replace(/[\\\]\[\-^]/g, "\\$&"); diff --git a/src/cm/quickToolsModifierInput.ts b/src/cm/quickToolsModifierInput.ts index d71969a87a..27c56c3891 100644 --- a/src/cm/quickToolsModifierInput.ts +++ b/src/cm/quickToolsModifierInput.ts @@ -1,7 +1,7 @@ import type { Extension } from "@codemirror/state"; import { - EditorView, type EditorView as CodeMirrorEditorView, + EditorView, } from "@codemirror/view"; import { blurEditorIfReadOnly, focusEditorIfEditable } from "cm/editorReadOnly"; diff --git a/src/cm/quickToolsNavigation.ts b/src/cm/quickToolsNavigation.ts index bc3d8e6c23..85c8ff2e2c 100644 --- a/src/cm/quickToolsNavigation.ts +++ b/src/cm/quickToolsNavigation.ts @@ -31,8 +31,8 @@ import { selectPageUp, } from "@codemirror/commands"; import { - type Command, type EditorView as CodeMirrorEditorView, + type Command, runScopeHandlers, } from "@codemirror/view"; import { focusEditorIfEditable } from "cm/editorReadOnly"; diff --git a/src/cm/searchMatchHighlighter.ts b/src/cm/searchMatchHighlighter.ts index 70449c54ab..651b727936 100644 --- a/src/cm/searchMatchHighlighter.ts +++ b/src/cm/searchMatchHighlighter.ts @@ -1,9 +1,9 @@ import { getSearchQuery, - searchPanelOpen, type SearchQuery, + searchPanelOpen, } from "@codemirror/search"; -import { RangeSetBuilder, type EditorState } from "@codemirror/state"; +import { type EditorState, RangeSetBuilder } from "@codemirror/state"; import type { DecorationSet, ViewUpdate } from "@codemirror/view"; import { Decoration, EditorView, ViewPlugin } from "@codemirror/view"; diff --git a/src/cm/selectionMenuUtils.ts b/src/cm/selectionMenuUtils.ts index 65abc0ceda..1cbc55d704 100644 --- a/src/cm/selectionMenuUtils.ts +++ b/src/cm/selectionMenuUtils.ts @@ -32,10 +32,7 @@ export function bindSelectionMenuButton( if (!pointerStart) return false; const xDistance = event.clientX - pointerStart.x; const yDistance = event.clientY - pointerStart.y; - return ( - xDistance ** 2 + yDistance ** 2 > - POINTER_MOVE_TOLERANCE ** 2 - ); + return xDistance ** 2 + yDistance ** 2 > POINTER_MOVE_TOLERANCE ** 2; }; button.addEventListener("pointerdown", (event) => { diff --git a/src/cm/supportedModes.ts b/src/cm/supportedModes.ts index 959386be94..44334dbc4d 100644 --- a/src/cm/supportedModes.ts +++ b/src/cm/supportedModes.ts @@ -138,7 +138,12 @@ function createLanguageLoader(name: string, lang: LanguageDescription) { } // 1) Always register a plain text fallback -addMode("Text", "txt|text|log|plain|lock|pub|gitkeep|keep|mk|^makefile", "Plain Text", () => []); +addMode( + "Text", + "txt|text|log|plain|lock|pub|gitkeep|keep|mk|^makefile", + "Plain Text", + () => [], +); // 2) Register all languages provided by @codemirror/language-data // We convert extensions like [".js", ".mjs"] into a modelist pattern: "js|mjs" @@ -217,7 +222,13 @@ for (const lang of languages as readonly LanguageDescription[]) { ); } else if (normalizedName === "json" || modeId === "json") { langExtensions.push("prettierrc", "hintrc", "eslintrc", "babelrc"); - filenames.push(".prettierrc", ".hintrc", ".eslintrc", ".babelrc", "bun.lock"); + filenames.push( + ".prettierrc", + ".hintrc", + ".eslintrc", + ".babelrc", + "bun.lock", + ); } else if (normalizedName === "yaml" || modeId === "yaml") { filenames.push("yarn.lock"); } else if (normalizedName === "toml" || modeId === "toml") { diff --git a/src/cm/tagAutoRename.ts b/src/cm/tagAutoRename.ts index f7db333c94..1f3f932faa 100644 --- a/src/cm/tagAutoRename.ts +++ b/src/cm/tagAutoRename.ts @@ -1,7 +1,6 @@ import { syntaxTree } from "@codemirror/language"; -import type { Extension, Text } from "@codemirror/state"; +import type { ChangeSpec, Extension, Text } from "@codemirror/state"; import { Annotation, EditorState, Transaction } from "@codemirror/state"; -import type { ChangeSpec } from "@codemirror/state"; import type { SyntaxNode } from "@lezer/common"; const skipTagAutoRename = Annotation.define(); @@ -17,7 +16,11 @@ interface ChangedRange { toA: number; } -function getTagNameNode(state: EditorState, from: number, to: number): SyntaxNode | null { +function getTagNameNode( + state: EditorState, + from: number, + to: number, +): SyntaxNode | null { const tree = syntaxTree(state); const positions = from === to ? [from, from - 1] : [from, to, to - 1]; @@ -127,15 +130,14 @@ function createPairedRename(transaction: Transaction): ChangeSpec | null { change.fromA, change.toA, ); - if (!target || !touchesRange(change, target.tagName.from, target.tagName.to)) { + if ( + !target || + !touchesRange(change, target.tagName.from, target.tagName.to) + ) { return null; } if ( - touchesRange( - change, - target.pairedTagName.from, - target.pairedTagName.to, - ) + touchesRange(change, target.pairedTagName.from, target.pairedTagName.to) ) { return null; } diff --git a/src/cordova-custom.d.ts b/src/cordova-custom.d.ts index e78a479136..bc256f19bd 100644 --- a/src/cordova-custom.d.ts +++ b/src/cordova-custom.d.ts @@ -1,5 +1,5 @@ -declare module 'cordova/channel'; -declare module 'cordova/exec'; +declare module "cordova/channel"; +declare module "cordova/exec"; interface Cordova { - fireDocumentEvent(eventName: string, data?: any): void; + fireDocumentEvent(eventName: string, data?: any): void; } diff --git a/src/index.d.ts b/src/index.d.ts index 75aa19d8be..97a8a0a559 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -9,186 +9,186 @@ declare const KEYBINDING_FILE: string; declare const ANDROID_SDK_INT: number; declare const DOES_SUPPORT_THEME: boolean; declare const acode: { - webview: AcodeWebViewAPI; - require(module: "fullscreen"): AcodeFullscreenAPI; - require(module: "orientation"): AcodeOrientationAPI; - require(module: string): unknown; - [key: string]: unknown; + webview: AcodeWebViewAPI; + require(module: "fullscreen"): AcodeFullscreenAPI; + require(module: "orientation"): AcodeOrientationAPI; + require(module: string): unknown; + [key: string]: unknown; }; interface Window { - ASSETS_DIRECTORY: string; - DATA_STORAGE: string; - CACHE_STORAGE: string; - PLUGIN_DIR: string; - KEYBINDING_FILE: string; - ANDROID_SDK_INT: number; - DOES_SUPPORT_THEME: boolean; - acode: object; + ASSETS_DIRECTORY: string; + DATA_STORAGE: string; + CACHE_STORAGE: string; + PLUGIN_DIR: string; + KEYBINDING_FILE: string; + ANDROID_SDK_INT: number; + DOES_SUPPORT_THEME: boolean; + acode: object; } interface String { - /** - * Capitalize the first letter of a string - */ - capitalize(): string; - /** - * Generate a hash from a string - */ - hashCode(): string; + /** + * Capitalize the first letter of a string + */ + capitalize(): string; + /** + * Generate a hash from a string + */ + hashCode(): string; } type ExecutorCallback = ( - type: "stdout" | "stderr" | "exit", - data: string, + type: "stdout" | "stderr" | "exit", + data: string, ) => void; interface Executor { - execute: (command: string, alpine: boolean) => Promise; - start: ( - command: string, - callback: ExecutorCallback, - alpine: boolean, - ) => Promise; - write: (uuid: string, input: string) => Promise; - stop: (uuid: string) => Promise; - isRunning: (uuid: string) => Promise; - listProcesses: () => Promise; - /** Move the executor service to the foreground (shows notification) */ - moveToForeground: () => Promise; - /** Move the executor service to the background (hides notification) */ - moveToBackground: () => Promise; - /** Stop the executor service completely */ - stopService: () => Promise; - /** - * Background executor - */ - BackgroundExecutor: Executor; + execute: (command: string, alpine: boolean) => Promise; + start: ( + command: string, + callback: ExecutorCallback, + alpine: boolean, + ) => Promise; + write: (uuid: string, input: string) => Promise; + stop: (uuid: string) => Promise; + isRunning: (uuid: string) => Promise; + listProcesses: () => Promise; + /** Move the executor service to the foreground (shows notification) */ + moveToForeground: () => Promise; + /** Move the executor service to the background (hides notification) */ + moveToBackground: () => Promise; + /** Stop the executor service completely */ + stopService: () => Promise; + /** + * Background executor + */ + BackgroundExecutor: Executor; } interface ExecutorProcess { - id: string; - pid: number; - command: string; - alpine: boolean; - startedAt: number; - background: boolean; + id: string; + pid: number; + command: string; + alpine: boolean; + startedAt: number; + background: boolean; } declare const Executor: Executor | undefined; interface Window { - Executor?: Executor; - editorManager?: EditorManager; + Executor?: Executor; + editorManager?: EditorManager; } interface EditorManager { - editor?: import("@codemirror/view").EditorView; - isCodeMirror?: boolean; - activeFile?: AcodeFile; - getLspMetadata?: (file: AcodeFile) => LspFileMetadata | null; + editor?: import("@codemirror/view").EditorView; + isCodeMirror?: boolean; + activeFile?: AcodeFile; + getLspMetadata?: (file: AcodeFile) => LspFileMetadata | null; } interface LspFileMetadata { - uri: string; - languageId?: string; - languageName?: string; - view?: import("@codemirror/view").EditorView; - file?: AcodeFile; - rootUri?: string; + uri: string; + languageId?: string; + languageName?: string; + view?: import("@codemirror/view").EditorView; + file?: AcodeFile; + rootUri?: string; } /** * Acode file object */ interface AcodeFile { - uri?: string; - name?: string; - session?: unknown; - cacheFile?: string; - [key: string]: unknown; + uri?: string; + name?: string; + session?: unknown; + cacheFile?: string; + [key: string]: unknown; } // Extend globalThis with Executor declare global { - var Executor: Executor | undefined; + var Executor: Executor | undefined; } interface WebViewOptions { - /** Title applied to the hosting activity in fullscreen mode. */ - title?: string; - /** - * "fullscreen" displays the WebView in its own activity, "hidden" runs it - * headless (never displayed). Defaults to "hidden". - */ - mode?: "fullscreen" | "hidden"; - /** - * Allow in-WebView navigation. Defaults to true. Only http(s) targets - * ever load; other schemes are always blocked for isolation. - */ - allowNavigation?: boolean; - /** - * Ask the user with a confirmation dialog before downloading files via - * the system DownloadManager. Defaults to false. - */ - allowDownloads?: boolean; - /** - * Show immediately after creation. Defaults to true. Only meaningful for - * fullscreen mode: when false, the activity launch is deferred until - * show() is called. - */ - visible?: boolean; + /** Title applied to the hosting activity in fullscreen mode. */ + title?: string; + /** + * "fullscreen" displays the WebView in its own activity, "hidden" runs it + * headless (never displayed). Defaults to "hidden". + */ + mode?: "fullscreen" | "hidden"; + /** + * Allow in-WebView navigation. Defaults to true. Only http(s) targets + * ever load; other schemes are always blocked for isolation. + */ + allowNavigation?: boolean; + /** + * Ask the user with a confirmation dialog before downloading files via + * the system DownloadManager. Defaults to false. + */ + allowDownloads?: boolean; + /** + * Show immediately after creation. Defaults to true. Only meaningful for + * fullscreen mode: when false, the activity launch is deferred until + * show() is called. + */ + visible?: boolean; } interface AcodeWebView { - readonly id: string; - readonly options: WebViewOptions; - /** Load an http(s) URL. Other schemes are rejected. */ - loadURL(url: string): Promise; - loadHTML(html: string): Promise; - evaluate(js: string): Promise; - onMessage(callback: (message: unknown) => void): void; - offMessage(callback: (message: unknown) => void): void; - /** - * Subscribe to lifecycle events: "pageFinished", "titleChanged" and - * "closed" (fullscreen closed by the user or the system). After "closed" - * the instance is destroyed and cannot be reused. - */ - on(event: string, callback: (event: string, data?: unknown) => void): void; - off(event: string, callback: (event: string, data?: unknown) => void): void; - postMessage(message: unknown): Promise; - /** - * Show the WebView. Only fullscreen instances can be shown; rejects for - * "hidden" mode. - */ - show(): Promise; - /** - * Hide the WebView. Fullscreen instances are moved to the background; - * show() brings the same WebView back with its page state intact. - * No-op for "hidden" mode. - */ - hide(): Promise; - reload(): Promise; - destroy(): Promise; + readonly id: string; + readonly options: WebViewOptions; + /** Load an http(s) URL. Other schemes are rejected. */ + loadURL(url: string): Promise; + loadHTML(html: string): Promise; + evaluate(js: string): Promise; + onMessage(callback: (message: unknown) => void): void; + offMessage(callback: (message: unknown) => void): void; + /** + * Subscribe to lifecycle events: "pageFinished", "titleChanged" and + * "closed" (fullscreen closed by the user or the system). After "closed" + * the instance is destroyed and cannot be reused. + */ + on(event: string, callback: (event: string, data?: unknown) => void): void; + off(event: string, callback: (event: string, data?: unknown) => void): void; + postMessage(message: unknown): Promise; + /** + * Show the WebView. Only fullscreen instances can be shown; rejects for + * "hidden" mode. + */ + show(): Promise; + /** + * Hide the WebView. Fullscreen instances are moved to the background; + * show() brings the same WebView back with its page state intact. + * No-op for "hidden" mode. + */ + hide(): Promise; + reload(): Promise; + destroy(): Promise; } interface AcodeWebViewAPI { - create(options?: WebViewOptions): Promise; + create(options?: WebViewOptions): Promise; } interface AcodeFullscreenAPI { - /** - * Claim Back for the current browser fullscreen owner, or release with null. - * The callback must explicitly exit fullscreen when desired. - * Resolves when the native request is accepted. - */ - setBackHandler(callback: (() => void | Promise) | null): Promise; + /** + * Claim Back for the current browser fullscreen owner, or release with null. + * The callback must explicitly exit fullscreen when desired. + * Resolves when the native request is accepted. + */ + setBackHandler(callback: (() => void | Promise) | null): Promise; } /** Fullscreen-scoped orientation requests resolve on native acceptance. */ interface AcodeOrientationAPI { - /** Requires a foreground browser fullscreen session. */ - lock(mode: "landscape" | "portrait"): Promise; - /** Restores the previous orientation policy, if overridden. */ - unlock(): Promise; + /** Requires a foreground browser fullscreen session. */ + lock(mode: "landscape" | "portrait"): Promise; + /** Restores the previous orientation policy, if overridden. */ + unlock(): Promise; } diff --git a/src/lang/index.d.ts b/src/lang/index.d.ts index 59076bc1b8..8434189934 100644 --- a/src/lang/index.d.ts +++ b/src/lang/index.d.ts @@ -2,895 +2,895 @@ // Do not edit manually declare type LangStrings = { - "lang": string; - "about": string; - "active files": string; - "alert": string; - "app theme": string; - "autocorrect": string; - "autosave": string; - "cancel": string; - "change language": string; - "choose color": string; - "clear": string; - "close app": string; - "commit message": string; - "console": string; - "conflict error": string; - "copy": string; - "create folder error": string; - "cut": string; - "delete": string; - "dependencies": string; - "delay": string; - "editor settings": string; - "editor theme": string; - "enter file name": string; - "enter folder name": string; - "empty folder message": string; - "enter line number": string; - "error": string; - "failed": string; - "file already exists": string; - "file already exists force": string; - "file already exists force named": string; - "file changed": string; - "file deleted": string; - "file is not supported": string; - "file not supported": string; - "file too large": string; - "file renamed": string; - "file saved": string; - "folder added": string; - "folder already added": string; - "font size": string; - "goto": string; - "icons definition": string; - "info": string; - "invalid value": string; - "language changed": string; - "linting": string; - "logout": string; - "loading": string; - "my profile": string; - "new file": string; - "new folder": string; - "no": string; - "no editor message": string; - "not set": string; - "unsaved files close app": string; - "notice": string; - "open file": string; - "open files and folders": string; - "open folder": string; - "open recent": string; - "ok": string; - "overwrite": string; - "paste": string; - "preview mode": string; - "read only file": string; - "reload": string; - "rename": string; - "new name": string; - "enter new name": string; - "code actions": string; - "replace": string; - "required": string; - "run your web app": string; - "save": string; - "saving": string; - "save as": string; - "save file to run": string; - "search": string; - "see logs and errors": string; - "select folder": string; - "settings": string; - "settings saved": string; - "show line numbers": string; - "show hidden files": string; - "show share button": string; - "show spaces": string; - "soft tab": string; - "sort by name": string; - "success": string; - "tab size": string; - "text wrap": string; - "wrapped line indent": string; - "wrap-indent-same": string; - "wrap-indent-indent": string; - "wrap-indent-deep": string; - "settings-info-editor-wrapping-indent": string; - "theme": string; - "title-listfiles": string; - "ui zoom": string; - "unable to delete file": string; - "document plugin required": string; - "shared files unavailable": string; - "invalid shared file": string; - "unable to open file": string; - "unable to open folder": string; - "unable to save file": string; - "unable to rename": string; - "unsaved file": string; - "warning": string; - "use emmet": string; - "use quick tools": string; - "yes": string; - "encoding": string; - "syntax highlighting": string; - "read only": string; - "select all": string; - "select branch": string; - "create new branch": string; - "use branch": string; - "new branch": string; - "branch": string; - "key bindings": string; - "edit": string; - "reset": string; - "color": string; - "select word": string; - "quick tools": string; - "select": string; - "editor font": string; - "new project": string; - "format": string; - "project name": string; - "unsupported device": string; - "vibrate on tap": string; - "copy command is not supported by ftp.": string; - "support title": string; - "fullscreen": string; - "animation": string; - "backup": string; - "restore": string; - "backup successful": string; - "invalid backup file": string; - "add path": string; - "live autocompletion": string; - "local word completion": string; - "language package completion": string; - "recommend extensions": string; - "auto close tags": string; - "auto rename tags": string; - "file properties": string; - "path": string; - "type": string; - "word count": string; - "line count": string; - "last modified": string; - "size": string; - "share": string; - "show print margin": string; - "login": string; - "scrollbar size": string; - "scrollbar height": string; - "cursor controller size": string; - "full": string; - "scroll past end": string; - "settings-info-scroll-past-end": string; - "none": string; - "small": string; - "large": string; - "confirm on exit": string; - "show console": string; - "image": string; - "insert file": string; - "insert color": string; - "powersave mode warning": string; - "exit": string; - "custom": string; - "reset warning": string; - "theme type": string; - "light": string; - "dark": string; - "file browser": string; - "icon pack": string; - "settings-info-icon-pack": string; - "unavailable": string; - "operation not permitted": string; - "no such file or directory": string; - "input/output error": string; - "permission denied": string; - "bad address": string; - "file exists": string; - "not a directory": string; - "is a directory": string; - "invalid argument": string; - "too many open files in system": string; - "too many open files": string; - "text file busy": string; - "no space left on device": string; - "read-only file system": string; - "file name too long": string; - "too many users": string; - "connection timed out": string; - "connection refused": string; - "owner died": string; - "an error occurred": string; - "add ftp": string; - "add sftp": string; - "save file": string; - "save file as": string; - "files": string; - "help": string; - "file has been deleted": string; - "feature not available": string; - "feature available in paid version": string; - "deleted file": string; - "line height": string; - "preview info": string; - "manage all files": string; - "close file": string; - "reset connections": string; - "check file changes": string; - "open in browser": string; - "desktop mode": string; - "toggle console": string; - "new line mode": string; - "add a storage": string; - "rate acode": string; - "support": string; - "downloading file": string; - "downloading...": string; - "folder name": string; - "keyboard mode": string; - "normal": string; - "app settings": string; - "disable in-app-browser caching": string; - "copied to clipboard": string; - "clipboard not available": string; - "remember opened files": string; - "remember opened folders": string; - "no suggestions": string; - "no suggestions aggressive": string; - "install": string; - "installing": string; - "plugins": string; - "recently used": string; - "update": string; - "uninstall": string; - "download acode pro": string; - "loading plugins": string; - "faqs": string; - "feedback": string; - "header": string; - "sidebar": string; - "inapp": string; - "browser": string; - "diagonal scrolling": string; - "reverse scrolling": string; - "formatter": string; - "format on save": string; - "remove ads": string; - "fast": string; - "slow": string; - "scroll settings": string; - "scroll speed": string; - "loading...": string; - "no plugins found": string; - "name": string; - "username": string; - "optional": string; - "hostname": string; - "password": string; - "security type": string; - "connection mode": string; - "port": string; - "key file": string; - "select key file": string; - "passphrase": string; - "connecting...": string; - "type filename": string; - "unable to load files": string; - "preview port": string; - "find file": string; - "system": string; - "please select a formatter": string; - "case sensitive": string; - "regular expression": string; - "whole word": string; - "edit with": string; - "open with": string; - "no app found to handle this file": string; - "restore default settings": string; - "server port": string; - "preview settings": string; - "preview settings note": string; - "backup/restore note": string; - "host": string; - "retry ftp/sftp when fail": string; - "more": string; - "thank you :)": string; - "purchase pending": string; - "cancelled": string; - "local": string; - "remote": string; - "show console toggler": string; - "binary file": string; - "relative line numbers": string; - "elastic tabstops": string; - "line based rtl switching": string; - "hard wrap": string; - "spellcheck": string; - "wrap method": string; - "use textarea for ime": string; - "invalid plugin": string; - "type command": string; - "plugin": string; - "quicktools trigger mode": string; - "print margin": string; - "touch move threshold": string; - "info-retryremotefsafterfail": string; - "info-fullscreen": string; - "info-checkfiles": string; - "info-console": string; - "info-keyboardmode": string; - "info-rememberfiles": string; - "info-rememberfolders": string; - "info-floatingbutton": string; - "info-openfilelistpos": string; - "info-touchmovethreshold": string; - "info-scroll-settings": string; - "info-animation": string; - "info-quicktoolstriggermode": string; - "info-checkForAppUpdates": string; - "info-quickTools": string; - "info-showHiddenFiles": string; - "info-listFiles": string; - "info-all_file_access": string; - "info-fontSize": string; - "info-fontFamily": string; - "info-theme": string; - "info-cursorStyle": string; - "info-cursorInactiveStyle": string; - "info-fontWeight": string; - "info-cursorBlink": string; - "info-scrollback": string; - "info-terminal-show-scrollbar": string; - "info-tabStopWidth": string; - "info-letterSpacing": string; - "info-imageSupport": string; - "info-fontLigatures": string; - "info-confirmTabClose": string; - "info-backup": string; - "info-restore": string; - "info-uninstall": string; - "owned": string; - "api_error": string; - "installed": string; - "all": string; - "medium": string; - "refund": string; - "product not available": string; - "no-product-info": string; - "close": string; - "explore": string; - "key bindings updated": string; - "search in files": string; - "exclude files": string; - "include files": string; - "search result": string; - "invalid regex": string; - "bottom": string; - "save all": string; - "close all": string; - "unsaved files warning": string; - "save all warning": string; - "save all changes warning": string; - "close all warning": string; - "refresh": string; - "shortcut buttons": string; - "no result": string; - "searching...": string; - "quicktools:ctrl-key": string; - "quicktools:tab-key": string; - "quicktools:shift-key": string; - "quicktools:undo": string; - "quicktools:redo": string; - "quicktools:search": string; - "quicktools:save": string; - "quicktools:esc-key": string; - "quicktools:curlybracket": string; - "quicktools:squarebracket": string; - "quicktools:parentheses": string; - "quicktools:anglebracket": string; - "quicktools:left-arrow-key": string; - "quicktools:right-arrow-key": string; - "quicktools:up-arrow-key": string; - "quicktools:down-arrow-key": string; - "quicktools:moveline-up": string; - "quicktools:moveline-down": string; - "quicktools:copyline-up": string; - "quicktools:copyline-down": string; - "quicktools:semicolon": string; - "quicktools:quotation": string; - "quicktools:and": string; - "quicktools:bar": string; - "quicktools:equal": string; - "quicktools:slash": string; - "quicktools:exclamation": string; - "quicktools:alt-key": string; - "quicktools:meta-key": string; - "quicktools:search-prev": string; - "quicktools:search-next": string; - "quicktools:search-settings": string; - "quicktools:search-replace": string; - "quicktools:search-replace-all": string; - "info-quicktoolssettings": string; - "info-excludefolders": string; - "missed files": string; - "remove": string; - "quicktools:command-palette": string; - "default file encoding": string; - "remove entry": string; - "delete entry": string; - "change encoding": string; - "reopen file": string; - "plugin min version": string; - "color preview": string; - "confirm": string; - "problems": string; - "show side buttons": string; - "bug_report": string; - "verified publisher": string; - "most_downloaded": string; - "newly_added": string; - "top_rated": string; - "rename not supported": string; - "compress": string; - "copy uri": string; - "copying items": string; - "cannot paste folder into itself": string; - "folder already exists": string; - "delete entries": string; - "deleting items": string; - "import project zip": string; - "changelog": string; - "notifications": string; - "no_unread_notifications": string; - "should_use_current_file_for_preview": string; - "fade fold widgets": string; - "quicktools:home-key": string; - "quicktools:end-key": string; - "quicktools:pageup-key": string; - "quicktools:pagedown-key": string; - "quicktools:delete-key": string; - "quicktools:tilde": string; - "quicktools:backtick": string; - "quicktools:hash": string; - "quicktools:dollar": string; - "quicktools:modulo": string; - "quicktools:caret": string; - "plugin_enabled": string; - "plugin_disabled": string; - "enable_plugin": string; - "disable_plugin": string; - "open_source": string; - "terminal settings": string; - "font ligatures": string; - "letter spacing": string; - "terminal:tab stop width": string; - "terminal:scrollback": string; - "terminal:show scrollbar": string; - "terminal:cursor blink": string; - "terminal:font weight": string; - "terminal:cursor inactive style": string; - "terminal:cursor style": string; - "terminal:font family": string; - "terminal:convert eol": string; - "terminal:confirm tab close": string; - "terminal:image support": string; - "terminal": string; - "running processes": string; - "terminal not installed prompt": string; - "terminal first launch prompt": string; - "don't ask again": string; - "allFileAccess": string; - "fonts": string; - "sponsor": string; - "downloads": string; - "reviews": string; - "overview": string; - "contributors": string; - "quicktools:hyphen": string; - "check for app updates": string; - "prompt update check consent message": string; - "keywords": string; - "author": string; - "filtered by": string; - "clean install state": string; - "backup created": string; - "restore completed": string; - "restore will include": string; - "restore warning": string; - "reload to apply": string; - "reload app": string; - "preparing backup": string; - "collecting settings": string; - "collecting key bindings": string; - "collecting plugins": string; - "creating backup": string; - "validating backup": string; - "restoring key bindings": string; - "restoring plugins": string; - "restoring settings": string; - "legacy backup warning": string; - "checksum mismatch": string; - "plugin not found": string; - "paid plugin skipped": string; - "source not found": string; - "restored": string; - "skipped": string; - "backup not valid object": string; - "backup no data": string; - "backup legacy warning": string; - "backup missing metadata": string; - "backup checksum mismatch": string; - "backup checksum verify failed": string; - "backup invalid settings": string; - "backup invalid keybindings": string; - "backup invalid plugins": string; - "issues found": string; - "error details": string; - "active tools": string; - "recent": string; - "command palette": string; - "change theme": string; - "documentation": string; - "open in terminal": string; - "developer mode": string; - "info-developermode": string; - "developer mode enabled": string; - "developer mode disabled": string; - "copy relative path": string; - "available tools": string; - "shortcut request sent": string; - "add to home screen": string; - "pin shortcuts not supported": string; - "save file before home shortcut": string; - "terminal_required_message_for_lsp": string; - "shift click selection": string; - "earn ad-free time": string; - "indent guides": string; - "language servers": string; - "lint gutter": string; - "rainbow brackets": string; - "lsp-add-custom-server": string; - "lsp-binary-args": string; - "lsp-binary-command": string; - "lsp-binary-path-optional": string; - "lsp-check-command-optional": string; - "lsp-checking-installation-status": string; - "lsp-configured": string; - "lsp-custom-server-added": string; - "lsp-default": string; - "lsp-details-line": string; - "lsp-edit-initialization-options": string; - "lsp-empty": string; - "lsp-enabled": string; - "lsp-error-add-server-failed": string; - "lsp-error-args-must-be-array": string; - "lsp-error-binary-command-required": string; - "lsp-error-language-id-required": string; - "lsp-error-package-required": string; - "lsp-error-server-id-required": string; - "lsp-feature-completion": string; - "lsp-feature-completion-info": string; - "lsp-feature-diagnostics": string; - "lsp-feature-diagnostics-info": string; - "lsp-feature-formatting": string; - "lsp-feature-formatting-info": string; - "lsp-feature-hover": string; - "lsp-feature-hover-info": string; - "lsp-feature-inlay-hints": string; - "lsp-feature-inlay-hints-info": string; - "lsp-feature-signature": string; - "lsp-feature-signature-info": string; - "lsp-feature-state-toast": string; - "lsp-initialization-options": string; - "lsp-initialization-options-json": string; - "lsp-initialization-options-updated": string; - "lsp-install-command": string; - "lsp-install-command-unavailable": string; - "lsp-install-info-check-failed": string; - "lsp-install-info-missing": string; - "lsp-install-info-ready": string; - "lsp-install-info-unknown": string; - "lsp-install-info-version-available": string; - "lsp-install-notification": string; - "lsp-install-method-apk": string; - "lsp-install-method-cargo": string; - "lsp-install-method-manual": string; - "lsp-install-method-npm": string; - "lsp-install-method-pip": string; - "lsp-install-method-shell": string; - "lsp-install-method-title": string; - "lsp-install-repair": string; - "lsp-installation-status": string; - "lsp-installed": string; - "lsp-invalid-timeout": string; - "lsp-language-ids": string; - "lsp-packages-prompt": string; - "lsp-remove-custom-server": string; - "lsp-remove-custom-server-confirm": string; - "lsp-remove-installed-files": string; - "lsp-custom-server-removed": string; - "lsp-server-disabled-toast": string; - "lsp-server-enabled-toast": string; - "lsp-server-id": string; - "lsp-server-label": string; - "lsp-server-not-found": string; - "lsp-server-uninstalled": string; - "lsp-startup-timeout": string; - "lsp-startup-timeout-ms": string; - "lsp-startup-timeout-set": string; - "lsp-state-disabled": string; - "lsp-state-enabled": string; - "lsp-status": string; - "lsp-status-check-failed": string; - "lsp-status-installed": string; - "lsp-status-installed-version": string; - "lsp-status-line": string; - "lsp-status-not-installed": string; - "lsp-status-unknown": string; - "lsp-timeout-ms": string; - "lsp-transport-method-stdio": string; - "lsp-transport-method-websocket": string; - "lsp-uninstall-command-unavailable": string; - "lsp-uninstall-notification": string; - "lsp-uninstall-server": string; - "lsp-update-command-optional": string; - "lsp-update-command-unavailable": string; - "lsp-update-server": string; - "lsp-version-line": string; - "lsp-websocket-url": string; - "lsp-websocket-server-managed-externally": string; - "lsp-error-websocket-url-invalid": string; - "lsp-error-websocket-url-required": string; - "lsp-view-initialization-options": string; - "settings-category-about-acode": string; - "settings-category-discover-apps": string; - "settings-category-advanced": string; - "settings-category-assistance": string; - "settings-category-core": string; - "settings-category-cursor": string; - "settings-category-cursor-selection": string; - "settings-category-custom-servers": string; - "settings-category-customization": string; - "settings-category-display": string; - "settings-category-editing": string; - "settings-category-features": string; - "settings-category-files-sessions": string; - "settings-category-fonts": string; - "settings-category-general": string; - "settings-category-guides-indicators": string; - "settings-category-installation": string; - "settings-category-interface": string; - "settings-category-maintenance": string; - "settings-category-permissions": string; - "settings-category-preview": string; - "settings-category-scrolling": string; - "settings-category-server": string; - "settings-category-servers": string; - "settings-category-session": string; - "settings-category-support-acode": string; - "settings-category-text-layout": string; - "settings-category-tools": string; - "settings-info-app-animation": string; - "settings-info-app-check-files": string; - "settings-info-app-clean-install-state": string; - "settings-info-app-confirm-on-exit": string; - "settings-info-app-console": string; - "settings-info-app-default-file-encoding": string; - "settings-info-app-exclude-folders": string; - "apply exclusions when copying": string; - "settings-info-app-use-file-operation-exclusions": string; - "settings-info-app-floating-button": string; - "settings-info-app-font-manager": string; - "settings-info-app-fullscreen": string; - "settings-info-app-keybindings": string; - "settings-info-app-keyboard-mode": string; - "settings-info-app-language": string; - "settings-info-app-open-file-list-position": string; - "settings-info-app-quick-tools-settings": string; - "settings-info-app-quick-tools-trigger-mode": string; - "settings-info-app-remember-files": string; - "settings-info-app-remember-folders": string; - "settings-info-app-retry-remote-fs": string; - "settings-info-app-side-buttons": string; - "settings-info-app-sponsor-sidebar": string; - "settings-info-app-touch-move-threshold": string; - "settings-info-app-ui-zoom": string; - "settings-info-app-vibrate-on-tap": string; - "settings-info-editor-autosave": string; - "settings-info-editor-color-preview": string; - "settings-info-editor-fade-fold-widgets": string; - "settings-info-editor-font-family": string; - "settings-info-editor-font-size": string; - "settings-info-editor-format-on-save": string; - "settings-info-editor-hard-wrap": string; - "settings-info-editor-indent-guides": string; - "settings-info-editor-line-height": string; - "settings-info-editor-line-numbers": string; - "settings-info-editor-lint-gutter": string; - "settings-info-editor-live-autocomplete": string; - "settings-info-editor-local-word-completion": string; - "settings-info-editor-language-completion": string; - "settings-info-editor-recommend-extensions": string; - "extension recommendation title": string; - "extension recommendation message": string; - "extension request title": string; - "extension request message": string; - "search plugins": string; - "request plugin": string; - "settings-info-editor-auto-close-tags": string; - "settings-info-editor-auto-rename-tags": string; - "settings-info-editor-rainbow-brackets": string; - "settings-info-editor-relative-line-numbers": string; - "settings-info-editor-rtl-text": string; - "settings-info-editor-scroll-settings": string; - "settings-info-editor-shift-click-selection": string; - "settings-info-editor-show-share-button": string; - "settings-info-editor-show-spaces": string; - "settings-info-editor-soft-tab": string; - "settings-info-editor-tab-size": string; - "settings-info-editor-teardrop-size": string; - "settings-info-editor-text-wrap": string; - "settings-info-lsp-add-custom-server": string; - "settings-info-lsp-allow-non-terminal-workspace": string; - "settings-info-lsp-edit-init-options": string; - "settings-info-lsp-install-server": string; - "settings-info-lsp-remove-custom-server": string; - "settings-info-lsp-server-enabled": string; - "settings-info-lsp-startup-timeout": string; - "settings-info-lsp-uninstall-server": string; - "settings-info-lsp-update-server": string; - "settings-info-lsp-view-init-options": string; - "settings-info-main-ad-rewards": string; - "settings-info-main-app-settings": string; - "settings-info-main-backup-restore": string; - "settings-info-main-changelog": string; - "settings-info-main-edit-settings": string; - "settings-info-main-editor-settings": string; - "settings-info-main-formatter": string; - "settings-info-main-lsp-settings": string; - "settings-info-main-plugins": string; - "settings-info-main-preview-settings": string; - "settings-info-main-rateapp": string; - "settings-info-main-remove-ads": string; - "settings-info-main-reset": string; - "settings-info-main-sponsors": string; - "settings-info-main-terminal-settings": string; - "settings-info-main-theme": string; - "settings-info-preview-disable-cache": string; - "settings-info-preview-host": string; - "settings-info-preview-mode": string; - "settings-info-preview-preview-port": string; - "settings-info-preview-server-port": string; - "settings-info-preview-show-console-toggler": string; - "settings-info-preview-use-current-file": string; - "settings-info-terminal-convert-eol": string; - "settings-note-formatter-settings": string; - "settings-note-lsp-settings": string; - "lsp-allow-non-terminal-workspace": string; - "search result label singular": string; - "search result label plural": string; - "pin tab": string; - "unpin tab": string; - "pinned tab": string; - "unpin tab before closing": string; - "app font": string; - "app icon": string; - "app icon changed": string; - "app icon change warning": string; - "settings-info-app-font-family": string; - "settings-info-app-icon": string; - "unsaved selected tabs warning": string; - "save selected tabs": string; - "close selected tabs": string; - "save selected tabs warning": string; - "close selected tabs warning": string; - "close tabs to right": string; - "close tabs to left": string; - "close other tabs": string; - "plugin-not-supported": string; - "plugin-not-supported-info": string; - "login-to-view": string; - "iap-plugin-purchase-warning": string; - "iap-pro-purchase-warning": string; - "confirm-login": string; - "terminal:failsafe": string; - "terminal:failsafe-info": string; - "compact": string; - "off": string; - "quick tools height": string; - "quick tools toggler": string; - "terminal:block": string; - "terminal:underline": string; - "terminal:bar": string; - "terminal:inactive block": string; - "terminal:inactive underline": string; - "terminal:inactive bar": string; - "terminal:inactive none": string; - "terminal:normal": string; - "terminal:bold": string; - "quicktools-trigger:click": string; - "quicktools-trigger:touch": string; - "settings-info-terminal-uninstall": string; - "terminal:inactive outline": string; - "restored successfully": string; - "uninstalled successfully": string; - "enter plugin source": string; - "enter keywords": string; - "enter author name": string; - "update available": string; - "update available info": string; - "plugin updates": string; - "plugin updates singular": string; - "plugin updates plural": string; - "just now": string; - "day singular": string; - "hour singular": string; - "min singular": string; - "day plural": string; - "hour plural": string; - "min plural": string; - "settings-category-builtin-servers": string; - "settings-category-plugin-servers": string; - "active processes": string; - "total memory": string; - "uptime": string; - "note": string; - "acode main process": string; - "ppid parent": string; - "unknown": string; - "just started": string; - "diff days": string; - "diff hr": string; - "diff min": string; - "diff sec": string; - "command": string; - "managed": string; - "acode service": string; - "horizontal scroll margin": string; - "settings-info-horizontal-scroll-margin": string; - "confirm app icon reward": string; - "rewarded ad unavailable": string; - "rewarded ad failed": string; - "rewarded ad incomplete": string; - "plugin-review:dialog-label": string; - "plugin-review:account-check-failed": string; - "plugin-review:sign-in": string; - "plugin-review:edit": string; - "plugin-review:add": string; - "plugin-review:placeholder": string; - "plugin-review:input-label": string; - "plugin-review:vote-group-label": string; - "plugin-review:thumbs-up": string; - "plugin-review:thumbs-down": string; - "plugin-review:delete": string; - "plugin-review:load-failed": string; - "plugin-review:retry": string; - "plugin-review:empty-title": string; - "plugin-review:empty-description": string; - "plugin-review:yours": string; - "plugin-review:community": string; - "plugin-review:no-other-reviews": string; - "plugin-review:login-incomplete": string; - "plugin-review:sign-in-failed": string; - "plugin-review:session-expired-review": string; - "plugin-review:save-failed": string; - "plugin-review:delete-confirmation": string; - "plugin-review:session-expired-continue": string; - "plugin-review:delete-failed": string; - "plugin-review:you": string; - "plugin-review:edit-action": string; - "plugin-review:recommended": string; - "plugin-review:error-max-length": string; - "plugin-review:error-downvote-comment": string; - "plugin-review:error-empty": string; - "plugin-review:unrated": string; + lang: string; + about: string; + "active files": string; + alert: string; + "app theme": string; + autocorrect: string; + autosave: string; + cancel: string; + "change language": string; + "choose color": string; + clear: string; + "close app": string; + "commit message": string; + console: string; + "conflict error": string; + copy: string; + "create folder error": string; + cut: string; + delete: string; + dependencies: string; + delay: string; + "editor settings": string; + "editor theme": string; + "enter file name": string; + "enter folder name": string; + "empty folder message": string; + "enter line number": string; + error: string; + failed: string; + "file already exists": string; + "file already exists force": string; + "file already exists force named": string; + "file changed": string; + "file deleted": string; + "file is not supported": string; + "file not supported": string; + "file too large": string; + "file renamed": string; + "file saved": string; + "folder added": string; + "folder already added": string; + "font size": string; + goto: string; + "icons definition": string; + info: string; + "invalid value": string; + "language changed": string; + linting: string; + logout: string; + loading: string; + "my profile": string; + "new file": string; + "new folder": string; + no: string; + "no editor message": string; + "not set": string; + "unsaved files close app": string; + notice: string; + "open file": string; + "open files and folders": string; + "open folder": string; + "open recent": string; + ok: string; + overwrite: string; + paste: string; + "preview mode": string; + "read only file": string; + reload: string; + rename: string; + "new name": string; + "enter new name": string; + "code actions": string; + replace: string; + required: string; + "run your web app": string; + save: string; + saving: string; + "save as": string; + "save file to run": string; + search: string; + "see logs and errors": string; + "select folder": string; + settings: string; + "settings saved": string; + "show line numbers": string; + "show hidden files": string; + "show share button": string; + "show spaces": string; + "soft tab": string; + "sort by name": string; + success: string; + "tab size": string; + "text wrap": string; + "wrapped line indent": string; + "wrap-indent-same": string; + "wrap-indent-indent": string; + "wrap-indent-deep": string; + "settings-info-editor-wrapping-indent": string; + theme: string; + "title-listfiles": string; + "ui zoom": string; + "unable to delete file": string; + "document plugin required": string; + "shared files unavailable": string; + "invalid shared file": string; + "unable to open file": string; + "unable to open folder": string; + "unable to save file": string; + "unable to rename": string; + "unsaved file": string; + warning: string; + "use emmet": string; + "use quick tools": string; + yes: string; + encoding: string; + "syntax highlighting": string; + "read only": string; + "select all": string; + "select branch": string; + "create new branch": string; + "use branch": string; + "new branch": string; + branch: string; + "key bindings": string; + edit: string; + reset: string; + color: string; + "select word": string; + "quick tools": string; + select: string; + "editor font": string; + "new project": string; + format: string; + "project name": string; + "unsupported device": string; + "vibrate on tap": string; + "copy command is not supported by ftp.": string; + "support title": string; + fullscreen: string; + animation: string; + backup: string; + restore: string; + "backup successful": string; + "invalid backup file": string; + "add path": string; + "live autocompletion": string; + "local word completion": string; + "language package completion": string; + "recommend extensions": string; + "auto close tags": string; + "auto rename tags": string; + "file properties": string; + path: string; + type: string; + "word count": string; + "line count": string; + "last modified": string; + size: string; + share: string; + "show print margin": string; + login: string; + "scrollbar size": string; + "scrollbar height": string; + "cursor controller size": string; + full: string; + "scroll past end": string; + "settings-info-scroll-past-end": string; + none: string; + small: string; + large: string; + "confirm on exit": string; + "show console": string; + image: string; + "insert file": string; + "insert color": string; + "powersave mode warning": string; + exit: string; + custom: string; + "reset warning": string; + "theme type": string; + light: string; + dark: string; + "file browser": string; + "icon pack": string; + "settings-info-icon-pack": string; + unavailable: string; + "operation not permitted": string; + "no such file or directory": string; + "input/output error": string; + "permission denied": string; + "bad address": string; + "file exists": string; + "not a directory": string; + "is a directory": string; + "invalid argument": string; + "too many open files in system": string; + "too many open files": string; + "text file busy": string; + "no space left on device": string; + "read-only file system": string; + "file name too long": string; + "too many users": string; + "connection timed out": string; + "connection refused": string; + "owner died": string; + "an error occurred": string; + "add ftp": string; + "add sftp": string; + "save file": string; + "save file as": string; + files: string; + help: string; + "file has been deleted": string; + "feature not available": string; + "feature available in paid version": string; + "deleted file": string; + "line height": string; + "preview info": string; + "manage all files": string; + "close file": string; + "reset connections": string; + "check file changes": string; + "open in browser": string; + "desktop mode": string; + "toggle console": string; + "new line mode": string; + "add a storage": string; + "rate acode": string; + support: string; + "downloading file": string; + "downloading...": string; + "folder name": string; + "keyboard mode": string; + normal: string; + "app settings": string; + "disable in-app-browser caching": string; + "copied to clipboard": string; + "clipboard not available": string; + "remember opened files": string; + "remember opened folders": string; + "no suggestions": string; + "no suggestions aggressive": string; + install: string; + installing: string; + plugins: string; + "recently used": string; + update: string; + uninstall: string; + "download acode pro": string; + "loading plugins": string; + faqs: string; + feedback: string; + header: string; + sidebar: string; + inapp: string; + browser: string; + "diagonal scrolling": string; + "reverse scrolling": string; + formatter: string; + "format on save": string; + "remove ads": string; + fast: string; + slow: string; + "scroll settings": string; + "scroll speed": string; + "loading...": string; + "no plugins found": string; + name: string; + username: string; + optional: string; + hostname: string; + password: string; + "security type": string; + "connection mode": string; + port: string; + "key file": string; + "select key file": string; + passphrase: string; + "connecting...": string; + "type filename": string; + "unable to load files": string; + "preview port": string; + "find file": string; + system: string; + "please select a formatter": string; + "case sensitive": string; + "regular expression": string; + "whole word": string; + "edit with": string; + "open with": string; + "no app found to handle this file": string; + "restore default settings": string; + "server port": string; + "preview settings": string; + "preview settings note": string; + "backup/restore note": string; + host: string; + "retry ftp/sftp when fail": string; + more: string; + "thank you :)": string; + "purchase pending": string; + cancelled: string; + local: string; + remote: string; + "show console toggler": string; + "binary file": string; + "relative line numbers": string; + "elastic tabstops": string; + "line based rtl switching": string; + "hard wrap": string; + spellcheck: string; + "wrap method": string; + "use textarea for ime": string; + "invalid plugin": string; + "type command": string; + plugin: string; + "quicktools trigger mode": string; + "print margin": string; + "touch move threshold": string; + "info-retryremotefsafterfail": string; + "info-fullscreen": string; + "info-checkfiles": string; + "info-console": string; + "info-keyboardmode": string; + "info-rememberfiles": string; + "info-rememberfolders": string; + "info-floatingbutton": string; + "info-openfilelistpos": string; + "info-touchmovethreshold": string; + "info-scroll-settings": string; + "info-animation": string; + "info-quicktoolstriggermode": string; + "info-checkForAppUpdates": string; + "info-quickTools": string; + "info-showHiddenFiles": string; + "info-listFiles": string; + "info-all_file_access": string; + "info-fontSize": string; + "info-fontFamily": string; + "info-theme": string; + "info-cursorStyle": string; + "info-cursorInactiveStyle": string; + "info-fontWeight": string; + "info-cursorBlink": string; + "info-scrollback": string; + "info-terminal-show-scrollbar": string; + "info-tabStopWidth": string; + "info-letterSpacing": string; + "info-imageSupport": string; + "info-fontLigatures": string; + "info-confirmTabClose": string; + "info-backup": string; + "info-restore": string; + "info-uninstall": string; + owned: string; + api_error: string; + installed: string; + all: string; + medium: string; + refund: string; + "product not available": string; + "no-product-info": string; + close: string; + explore: string; + "key bindings updated": string; + "search in files": string; + "exclude files": string; + "include files": string; + "search result": string; + "invalid regex": string; + bottom: string; + "save all": string; + "close all": string; + "unsaved files warning": string; + "save all warning": string; + "save all changes warning": string; + "close all warning": string; + refresh: string; + "shortcut buttons": string; + "no result": string; + "searching...": string; + "quicktools:ctrl-key": string; + "quicktools:tab-key": string; + "quicktools:shift-key": string; + "quicktools:undo": string; + "quicktools:redo": string; + "quicktools:search": string; + "quicktools:save": string; + "quicktools:esc-key": string; + "quicktools:curlybracket": string; + "quicktools:squarebracket": string; + "quicktools:parentheses": string; + "quicktools:anglebracket": string; + "quicktools:left-arrow-key": string; + "quicktools:right-arrow-key": string; + "quicktools:up-arrow-key": string; + "quicktools:down-arrow-key": string; + "quicktools:moveline-up": string; + "quicktools:moveline-down": string; + "quicktools:copyline-up": string; + "quicktools:copyline-down": string; + "quicktools:semicolon": string; + "quicktools:quotation": string; + "quicktools:and": string; + "quicktools:bar": string; + "quicktools:equal": string; + "quicktools:slash": string; + "quicktools:exclamation": string; + "quicktools:alt-key": string; + "quicktools:meta-key": string; + "quicktools:search-prev": string; + "quicktools:search-next": string; + "quicktools:search-settings": string; + "quicktools:search-replace": string; + "quicktools:search-replace-all": string; + "info-quicktoolssettings": string; + "info-excludefolders": string; + "missed files": string; + remove: string; + "quicktools:command-palette": string; + "default file encoding": string; + "remove entry": string; + "delete entry": string; + "change encoding": string; + "reopen file": string; + "plugin min version": string; + "color preview": string; + confirm: string; + problems: string; + "show side buttons": string; + bug_report: string; + "verified publisher": string; + most_downloaded: string; + newly_added: string; + top_rated: string; + "rename not supported": string; + compress: string; + "copy uri": string; + "copying items": string; + "cannot paste folder into itself": string; + "folder already exists": string; + "delete entries": string; + "deleting items": string; + "import project zip": string; + changelog: string; + notifications: string; + no_unread_notifications: string; + should_use_current_file_for_preview: string; + "fade fold widgets": string; + "quicktools:home-key": string; + "quicktools:end-key": string; + "quicktools:pageup-key": string; + "quicktools:pagedown-key": string; + "quicktools:delete-key": string; + "quicktools:tilde": string; + "quicktools:backtick": string; + "quicktools:hash": string; + "quicktools:dollar": string; + "quicktools:modulo": string; + "quicktools:caret": string; + plugin_enabled: string; + plugin_disabled: string; + enable_plugin: string; + disable_plugin: string; + open_source: string; + "terminal settings": string; + "font ligatures": string; + "letter spacing": string; + "terminal:tab stop width": string; + "terminal:scrollback": string; + "terminal:show scrollbar": string; + "terminal:cursor blink": string; + "terminal:font weight": string; + "terminal:cursor inactive style": string; + "terminal:cursor style": string; + "terminal:font family": string; + "terminal:convert eol": string; + "terminal:confirm tab close": string; + "terminal:image support": string; + terminal: string; + "running processes": string; + "terminal not installed prompt": string; + "terminal first launch prompt": string; + "don't ask again": string; + allFileAccess: string; + fonts: string; + sponsor: string; + downloads: string; + reviews: string; + overview: string; + contributors: string; + "quicktools:hyphen": string; + "check for app updates": string; + "prompt update check consent message": string; + keywords: string; + author: string; + "filtered by": string; + "clean install state": string; + "backup created": string; + "restore completed": string; + "restore will include": string; + "restore warning": string; + "reload to apply": string; + "reload app": string; + "preparing backup": string; + "collecting settings": string; + "collecting key bindings": string; + "collecting plugins": string; + "creating backup": string; + "validating backup": string; + "restoring key bindings": string; + "restoring plugins": string; + "restoring settings": string; + "legacy backup warning": string; + "checksum mismatch": string; + "plugin not found": string; + "paid plugin skipped": string; + "source not found": string; + restored: string; + skipped: string; + "backup not valid object": string; + "backup no data": string; + "backup legacy warning": string; + "backup missing metadata": string; + "backup checksum mismatch": string; + "backup checksum verify failed": string; + "backup invalid settings": string; + "backup invalid keybindings": string; + "backup invalid plugins": string; + "issues found": string; + "error details": string; + "active tools": string; + recent: string; + "command palette": string; + "change theme": string; + documentation: string; + "open in terminal": string; + "developer mode": string; + "info-developermode": string; + "developer mode enabled": string; + "developer mode disabled": string; + "copy relative path": string; + "available tools": string; + "shortcut request sent": string; + "add to home screen": string; + "pin shortcuts not supported": string; + "save file before home shortcut": string; + terminal_required_message_for_lsp: string; + "shift click selection": string; + "earn ad-free time": string; + "indent guides": string; + "language servers": string; + "lint gutter": string; + "rainbow brackets": string; + "lsp-add-custom-server": string; + "lsp-binary-args": string; + "lsp-binary-command": string; + "lsp-binary-path-optional": string; + "lsp-check-command-optional": string; + "lsp-checking-installation-status": string; + "lsp-configured": string; + "lsp-custom-server-added": string; + "lsp-default": string; + "lsp-details-line": string; + "lsp-edit-initialization-options": string; + "lsp-empty": string; + "lsp-enabled": string; + "lsp-error-add-server-failed": string; + "lsp-error-args-must-be-array": string; + "lsp-error-binary-command-required": string; + "lsp-error-language-id-required": string; + "lsp-error-package-required": string; + "lsp-error-server-id-required": string; + "lsp-feature-completion": string; + "lsp-feature-completion-info": string; + "lsp-feature-diagnostics": string; + "lsp-feature-diagnostics-info": string; + "lsp-feature-formatting": string; + "lsp-feature-formatting-info": string; + "lsp-feature-hover": string; + "lsp-feature-hover-info": string; + "lsp-feature-inlay-hints": string; + "lsp-feature-inlay-hints-info": string; + "lsp-feature-signature": string; + "lsp-feature-signature-info": string; + "lsp-feature-state-toast": string; + "lsp-initialization-options": string; + "lsp-initialization-options-json": string; + "lsp-initialization-options-updated": string; + "lsp-install-command": string; + "lsp-install-command-unavailable": string; + "lsp-install-info-check-failed": string; + "lsp-install-info-missing": string; + "lsp-install-info-ready": string; + "lsp-install-info-unknown": string; + "lsp-install-info-version-available": string; + "lsp-install-notification": string; + "lsp-install-method-apk": string; + "lsp-install-method-cargo": string; + "lsp-install-method-manual": string; + "lsp-install-method-npm": string; + "lsp-install-method-pip": string; + "lsp-install-method-shell": string; + "lsp-install-method-title": string; + "lsp-install-repair": string; + "lsp-installation-status": string; + "lsp-installed": string; + "lsp-invalid-timeout": string; + "lsp-language-ids": string; + "lsp-packages-prompt": string; + "lsp-remove-custom-server": string; + "lsp-remove-custom-server-confirm": string; + "lsp-remove-installed-files": string; + "lsp-custom-server-removed": string; + "lsp-server-disabled-toast": string; + "lsp-server-enabled-toast": string; + "lsp-server-id": string; + "lsp-server-label": string; + "lsp-server-not-found": string; + "lsp-server-uninstalled": string; + "lsp-startup-timeout": string; + "lsp-startup-timeout-ms": string; + "lsp-startup-timeout-set": string; + "lsp-state-disabled": string; + "lsp-state-enabled": string; + "lsp-status": string; + "lsp-status-check-failed": string; + "lsp-status-installed": string; + "lsp-status-installed-version": string; + "lsp-status-line": string; + "lsp-status-not-installed": string; + "lsp-status-unknown": string; + "lsp-timeout-ms": string; + "lsp-transport-method-stdio": string; + "lsp-transport-method-websocket": string; + "lsp-uninstall-command-unavailable": string; + "lsp-uninstall-notification": string; + "lsp-uninstall-server": string; + "lsp-update-command-optional": string; + "lsp-update-command-unavailable": string; + "lsp-update-server": string; + "lsp-version-line": string; + "lsp-websocket-url": string; + "lsp-websocket-server-managed-externally": string; + "lsp-error-websocket-url-invalid": string; + "lsp-error-websocket-url-required": string; + "lsp-view-initialization-options": string; + "settings-category-about-acode": string; + "settings-category-discover-apps": string; + "settings-category-advanced": string; + "settings-category-assistance": string; + "settings-category-core": string; + "settings-category-cursor": string; + "settings-category-cursor-selection": string; + "settings-category-custom-servers": string; + "settings-category-customization": string; + "settings-category-display": string; + "settings-category-editing": string; + "settings-category-features": string; + "settings-category-files-sessions": string; + "settings-category-fonts": string; + "settings-category-general": string; + "settings-category-guides-indicators": string; + "settings-category-installation": string; + "settings-category-interface": string; + "settings-category-maintenance": string; + "settings-category-permissions": string; + "settings-category-preview": string; + "settings-category-scrolling": string; + "settings-category-server": string; + "settings-category-servers": string; + "settings-category-session": string; + "settings-category-support-acode": string; + "settings-category-text-layout": string; + "settings-category-tools": string; + "settings-info-app-animation": string; + "settings-info-app-check-files": string; + "settings-info-app-clean-install-state": string; + "settings-info-app-confirm-on-exit": string; + "settings-info-app-console": string; + "settings-info-app-default-file-encoding": string; + "settings-info-app-exclude-folders": string; + "apply exclusions when copying": string; + "settings-info-app-use-file-operation-exclusions": string; + "settings-info-app-floating-button": string; + "settings-info-app-font-manager": string; + "settings-info-app-fullscreen": string; + "settings-info-app-keybindings": string; + "settings-info-app-keyboard-mode": string; + "settings-info-app-language": string; + "settings-info-app-open-file-list-position": string; + "settings-info-app-quick-tools-settings": string; + "settings-info-app-quick-tools-trigger-mode": string; + "settings-info-app-remember-files": string; + "settings-info-app-remember-folders": string; + "settings-info-app-retry-remote-fs": string; + "settings-info-app-side-buttons": string; + "settings-info-app-sponsor-sidebar": string; + "settings-info-app-touch-move-threshold": string; + "settings-info-app-ui-zoom": string; + "settings-info-app-vibrate-on-tap": string; + "settings-info-editor-autosave": string; + "settings-info-editor-color-preview": string; + "settings-info-editor-fade-fold-widgets": string; + "settings-info-editor-font-family": string; + "settings-info-editor-font-size": string; + "settings-info-editor-format-on-save": string; + "settings-info-editor-hard-wrap": string; + "settings-info-editor-indent-guides": string; + "settings-info-editor-line-height": string; + "settings-info-editor-line-numbers": string; + "settings-info-editor-lint-gutter": string; + "settings-info-editor-live-autocomplete": string; + "settings-info-editor-local-word-completion": string; + "settings-info-editor-language-completion": string; + "settings-info-editor-recommend-extensions": string; + "extension recommendation title": string; + "extension recommendation message": string; + "extension request title": string; + "extension request message": string; + "search plugins": string; + "request plugin": string; + "settings-info-editor-auto-close-tags": string; + "settings-info-editor-auto-rename-tags": string; + "settings-info-editor-rainbow-brackets": string; + "settings-info-editor-relative-line-numbers": string; + "settings-info-editor-rtl-text": string; + "settings-info-editor-scroll-settings": string; + "settings-info-editor-shift-click-selection": string; + "settings-info-editor-show-share-button": string; + "settings-info-editor-show-spaces": string; + "settings-info-editor-soft-tab": string; + "settings-info-editor-tab-size": string; + "settings-info-editor-teardrop-size": string; + "settings-info-editor-text-wrap": string; + "settings-info-lsp-add-custom-server": string; + "settings-info-lsp-allow-non-terminal-workspace": string; + "settings-info-lsp-edit-init-options": string; + "settings-info-lsp-install-server": string; + "settings-info-lsp-remove-custom-server": string; + "settings-info-lsp-server-enabled": string; + "settings-info-lsp-startup-timeout": string; + "settings-info-lsp-uninstall-server": string; + "settings-info-lsp-update-server": string; + "settings-info-lsp-view-init-options": string; + "settings-info-main-ad-rewards": string; + "settings-info-main-app-settings": string; + "settings-info-main-backup-restore": string; + "settings-info-main-changelog": string; + "settings-info-main-edit-settings": string; + "settings-info-main-editor-settings": string; + "settings-info-main-formatter": string; + "settings-info-main-lsp-settings": string; + "settings-info-main-plugins": string; + "settings-info-main-preview-settings": string; + "settings-info-main-rateapp": string; + "settings-info-main-remove-ads": string; + "settings-info-main-reset": string; + "settings-info-main-sponsors": string; + "settings-info-main-terminal-settings": string; + "settings-info-main-theme": string; + "settings-info-preview-disable-cache": string; + "settings-info-preview-host": string; + "settings-info-preview-mode": string; + "settings-info-preview-preview-port": string; + "settings-info-preview-server-port": string; + "settings-info-preview-show-console-toggler": string; + "settings-info-preview-use-current-file": string; + "settings-info-terminal-convert-eol": string; + "settings-note-formatter-settings": string; + "settings-note-lsp-settings": string; + "lsp-allow-non-terminal-workspace": string; + "search result label singular": string; + "search result label plural": string; + "pin tab": string; + "unpin tab": string; + "pinned tab": string; + "unpin tab before closing": string; + "app font": string; + "app icon": string; + "app icon changed": string; + "app icon change warning": string; + "settings-info-app-font-family": string; + "settings-info-app-icon": string; + "unsaved selected tabs warning": string; + "save selected tabs": string; + "close selected tabs": string; + "save selected tabs warning": string; + "close selected tabs warning": string; + "close tabs to right": string; + "close tabs to left": string; + "close other tabs": string; + "plugin-not-supported": string; + "plugin-not-supported-info": string; + "login-to-view": string; + "iap-plugin-purchase-warning": string; + "iap-pro-purchase-warning": string; + "confirm-login": string; + "terminal:failsafe": string; + "terminal:failsafe-info": string; + compact: string; + off: string; + "quick tools height": string; + "quick tools toggler": string; + "terminal:block": string; + "terminal:underline": string; + "terminal:bar": string; + "terminal:inactive block": string; + "terminal:inactive underline": string; + "terminal:inactive bar": string; + "terminal:inactive none": string; + "terminal:normal": string; + "terminal:bold": string; + "quicktools-trigger:click": string; + "quicktools-trigger:touch": string; + "settings-info-terminal-uninstall": string; + "terminal:inactive outline": string; + "restored successfully": string; + "uninstalled successfully": string; + "enter plugin source": string; + "enter keywords": string; + "enter author name": string; + "update available": string; + "update available info": string; + "plugin updates": string; + "plugin updates singular": string; + "plugin updates plural": string; + "just now": string; + "day singular": string; + "hour singular": string; + "min singular": string; + "day plural": string; + "hour plural": string; + "min plural": string; + "settings-category-builtin-servers": string; + "settings-category-plugin-servers": string; + "active processes": string; + "total memory": string; + uptime: string; + note: string; + "acode main process": string; + "ppid parent": string; + unknown: string; + "just started": string; + "diff days": string; + "diff hr": string; + "diff min": string; + "diff sec": string; + command: string; + managed: string; + "acode service": string; + "horizontal scroll margin": string; + "settings-info-horizontal-scroll-margin": string; + "confirm app icon reward": string; + "rewarded ad unavailable": string; + "rewarded ad failed": string; + "rewarded ad incomplete": string; + "plugin-review:dialog-label": string; + "plugin-review:account-check-failed": string; + "plugin-review:sign-in": string; + "plugin-review:edit": string; + "plugin-review:add": string; + "plugin-review:placeholder": string; + "plugin-review:input-label": string; + "plugin-review:vote-group-label": string; + "plugin-review:thumbs-up": string; + "plugin-review:thumbs-down": string; + "plugin-review:delete": string; + "plugin-review:load-failed": string; + "plugin-review:retry": string; + "plugin-review:empty-title": string; + "plugin-review:empty-description": string; + "plugin-review:yours": string; + "plugin-review:community": string; + "plugin-review:no-other-reviews": string; + "plugin-review:login-incomplete": string; + "plugin-review:sign-in-failed": string; + "plugin-review:session-expired-review": string; + "plugin-review:save-failed": string; + "plugin-review:delete-confirmation": string; + "plugin-review:session-expired-continue": string; + "plugin-review:delete-failed": string; + "plugin-review:you": string; + "plugin-review:edit-action": string; + "plugin-review:recommended": string; + "plugin-review:error-max-length": string; + "plugin-review:error-downvote-comment": string; + "plugin-review:error-empty": string; + "plugin-review:unrated": string; }; declare var strings: LangStrings; diff --git a/src/lib/customTab.ts b/src/lib/customTab.ts index 854c9523f4..cdfb9b89a4 100644 --- a/src/lib/customTab.ts +++ b/src/lib/customTab.ts @@ -4,19 +4,19 @@ import helpers from "utils/helpers"; * Open custom tab */ export default function customTab( - url: string, - options?: { - showTitle?: boolean; - toolbarColor?: string; - }, + url: string, + options?: { + showTitle?: boolean; + toolbarColor?: string; + }, ) { - if (!options) { - options = {}; - } + if (!options) { + options = {}; + } - options.showTitle ??= true; + options.showTitle ??= true; - return new Promise((resolve, reject) => { - cordova.exec(resolve, reject, "CustomTabs", "open", [url, options]); - }); + return new Promise((resolve, reject) => { + cordova.exec(resolve, reject, "CustomTabs", "open", [url, options]); + }); } diff --git a/tests/admob/adConsentCoordinator.test.js b/tests/admob/adConsentCoordinator.test.js index ecd5a2f7fc..7b1471b091 100644 --- a/tests/admob/adConsentCoordinator.test.js +++ b/tests/admob/adConsentCoordinator.test.js @@ -152,7 +152,9 @@ test("hides a stale privacy-option entry and keeps ads single-started", async () }, }); const states = []; - const unsubscribe = harness.coordinator.subscribe((state) => states.push(state)); + const unsubscribe = harness.coordinator.subscribe((state) => + states.push(state), + ); await harness.coordinator.start(); harness.privacy.showOptions = async () => ({ diff --git a/tests/admob/adRewardBannerPolicy.test.js b/tests/admob/adRewardBannerPolicy.test.js index 4de8d29d45..329201fd8c 100644 --- a/tests/admob/adRewardBannerPolicy.test.js +++ b/tests/admob/adRewardBannerPolicy.test.js @@ -172,10 +172,7 @@ test("resume after expiry clears rewarded suppression", async () => { test("refresh failure preserves state, suppression, and existing timer", async () => { const failure = new Error("offline"); const harness = createHarness({ - statuses: [ - { isActive: true, adFreeUntil: 61_000 }, - failure, - ], + statuses: [{ isActive: true, adFreeUntil: 61_000 }, failure], }); await harness.lifecycle.initialize(); const activeState = harness.state; @@ -226,7 +223,10 @@ test("clearing reward suppression leaves Pro suppression active", () => { adFreeUntil: 0, }); - assert.deepEqual(harness.suppressions, new Set([BANNER_SUPPRESSION_REASON.PRO])); + assert.deepEqual( + harness.suppressions, + new Set([BANNER_SUPPRESSION_REASON.PRO]), + ); }); test("uses the same expiry predicate exposed to ad eligibility checks", () => { diff --git a/tests/admob/bannerWrapper.test.js b/tests/admob/bannerWrapper.test.js index 08f75bd86e..1d129e79f8 100644 --- a/tests/admob/bannerWrapper.test.js +++ b/tests/admob/bannerWrapper.test.js @@ -13,7 +13,10 @@ function loadBannerModule() { const { code } = transformSync(source, { filename: sourcePath, presets: [ - ["@babel/preset-env", { modules: "commonjs", targets: { node: "current" } }], + [ + "@babel/preset-env", + { modules: "commonjs", targets: { node: "current" } }, + ], "@babel/preset-typescript", ], }); diff --git a/tests/admob/privacyChoicesController.test.js b/tests/admob/privacyChoicesController.test.js index 74ce715d77..c2de1c8e3e 100644 --- a/tests/admob/privacyChoicesController.test.js +++ b/tests/admob/privacyChoicesController.test.js @@ -1,8 +1,8 @@ import assert from "node:assert/strict"; import { test } from "vitest"; import { - PRIVACY_CHOICES_KEY, bindPrivacyChoices, + PRIVACY_CHOICES_KEY, } from "../../src/lib/privacyChoicesController.mjs"; function createHarness() { diff --git a/tests/admob/rewardedAd.test.js b/tests/admob/rewardedAd.test.js index 06a726e271..86b2634de0 100644 --- a/tests/admob/rewardedAd.test.js +++ b/tests/admob/rewardedAd.test.js @@ -1,5 +1,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import { RewardedAd } from "../../src/plugins/admob/src/www/ads/rewarded"; + const mocks = vi.hoisted(() => ({ start: vi.fn(), config: { HAS_PRO: false }, @@ -279,40 +280,38 @@ describe("rewarded wrapper disposal", () => { expect(calls).toEqual([]); await expect(ad.load()).rejects.toThrow("Ad is destroyed"); }); - it.each(["SDK startup", "native creation"])( - "cancels during %s without issuing a late load or show", - async (phase) => { - let started; - if (phase === "SDK startup") { - admob.start.mockImplementation( - () => - new Promise((resolve) => { - started = resolve; - }), - ); - } - const ad = new RewardedAd({ id: "old", adUnitId: "test" }); - const loading = ad.load(); - const rejected = expect(loading).rejects.toThrow("Ad is destroyed"); - await flush(); - const disposed = ad.destroy(); - expect(ad.destroy()).toBe(disposed); - const next = new RewardedAd({ id: "next", adUnitId: "test" }); - if (started) started(); - else calls.find(({ action }) => action === "adCreate").resolve(); - await Promise.all([disposed, rejected]); - expect(calls.filter(({ action }) => action === "adLoad")).toEqual([]); - expect( - calls - .filter(({ action }) => action === "adDestroy") - .map(({ id }) => id), - ).toEqual(["old"]); - expect(window.admobAds.old).toBeUndefined(); - expect(window.admobAds.next).toBe(next); - await expect(ad.show()).rejects.toThrow("Ad is destroyed"); - await next.destroy(); - }, - ); + it.each([ + "SDK startup", + "native creation", + ])("cancels during %s without issuing a late load or show", async (phase) => { + let started; + if (phase === "SDK startup") { + admob.start.mockImplementation( + () => + new Promise((resolve) => { + started = resolve; + }), + ); + } + const ad = new RewardedAd({ id: "old", adUnitId: "test" }); + const loading = ad.load(); + const rejected = expect(loading).rejects.toThrow("Ad is destroyed"); + await flush(); + const disposed = ad.destroy(); + expect(ad.destroy()).toBe(disposed); + const next = new RewardedAd({ id: "next", adUnitId: "test" }); + if (started) started(); + else calls.find(({ action }) => action === "adCreate").resolve(); + await Promise.all([disposed, rejected]); + expect(calls.filter(({ action }) => action === "adLoad")).toEqual([]); + expect( + calls.filter(({ action }) => action === "adDestroy").map(({ id }) => id), + ).toEqual(["old"]); + expect(window.admobAds.old).toBeUndefined(); + expect(window.admobAds.next).toBe(next); + await expect(ad.show()).rejects.toThrow("Ad is destroyed"); + await next.destroy(); + }); it("destroys a pending native load and ignores its late completion", async () => { const ad = new RewardedAd({ id: "loading", adUnitId: "test" }); const loading = ad.load(); diff --git a/tests/helpers/loadSourceModule.js b/tests/helpers/loadSourceModule.js index a64a8e3122..7ad2aa620d 100644 --- a/tests/helpers/loadSourceModule.js +++ b/tests/helpers/loadSourceModule.js @@ -7,18 +7,41 @@ const compiled = new Map(); // Compile the actual source with Acode's JSX transform; replace only its environment. export function loadSourceModule(relative, dependencies, globals = {}) { const filename = path.resolve(relative); - if (!compiled.has(filename)) compiled.set(filename, transformSync(readFileSync(filename, "utf8"), { - filename, babelrc: false, configFile: false, - presets: [["@babel/preset-env", { targets: { node: "current" }, modules: "commonjs" }]], - plugins: ["html-tag-js/jsx/syntax-parser.js", "html-tag-js/jsx/jsx-to-tag.js"], - }).code); + if (!compiled.has(filename)) + compiled.set( + filename, + transformSync(readFileSync(filename, "utf8"), { + filename, + babelrc: false, + configFile: false, + presets: [ + [ + "@babel/preset-env", + { targets: { node: "current" }, modules: "commonjs" }, + ], + ], + plugins: [ + "html-tag-js/jsx/syntax-parser.js", + "html-tag-js/jsx/jsx-to-tag.js", + ], + }).code, + ); const exports = {}; - vm.runInNewContext(compiled.get(filename), { - exports, Promise, console, setTimeout, clearTimeout, - require(id) { - if (!(id in dependencies)) throw Error(`Unexpected import: ${id}`); - return dependencies[id]; - }, ...globals, - }, { filename }); + vm.runInNewContext( + compiled.get(filename), + { + exports, + Promise, + console, + setTimeout, + clearTimeout, + require(id) { + if (!(id in dependencies)) throw Error(`Unexpected import: ${id}`); + return dependencies[id]; + }, + ...globals, + }, + { filename }, + ); return exports; } diff --git a/tests/unit/appIconSelection.test.js b/tests/unit/appIconSelection.test.js index 2987cc8d4a..f2e41ae871 100644 --- a/tests/unit/appIconSelection.test.js +++ b/tests/unit/appIconSelection.test.js @@ -28,6 +28,7 @@ vi.mock("utils/helpers", () => ({ new Promise((resolve, reject) => fn(...args, resolve, reject)), }, })); + import selectAppIcon from "lib/appIconSelection"; function harness() { diff --git a/tests/unit/appIconSetting.test.js b/tests/unit/appIconSetting.test.js index 74050176a5..20231d060d 100644 --- a/tests/unit/appIconSetting.test.js +++ b/tests/unit/appIconSetting.test.js @@ -40,6 +40,7 @@ vi.mock("utils/helpers", () => ({ new Promise((resolve, reject) => fn(...args, resolve, reject)), }, })); + import actionStack from "lib/actionStack"; import selectAppIcon from "lib/appIconSelection"; import restoreTheme from "lib/restoreTheme"; @@ -300,7 +301,10 @@ it("opens one complete grid and closes only after native success, preserving the expect(h.loader.create).not.toHaveBeenCalled(); confirmSelection(); await vi.waitFor(() => expect(applied).toBeTypeOf("function")); - expect(h.loader.create).toHaveBeenCalledExactlyOnceWith("App icon", "Loading..."); + expect(h.loader.create).toHaveBeenCalledExactlyOnceWith( + "App icon", + "Loading...", + ); expect(h.dialog.inert).toBe(true); expect(document.querySelector("#__loader button")).toBeNull(); await actionStack.pop(); @@ -577,10 +581,15 @@ it("leaves the external Pro flow's loader under its own control", async () => { const pending = h.click("pro"); confirmSelection(); await pending; - expect(h.loader.create).toHaveBeenCalledExactlyOnceWith("Login", "Loading..."); + expect(h.loader.create).toHaveBeenCalledExactlyOnceWith( + "Login", + "Loading...", + ); expect(h.loader.destroy).not.toHaveBeenCalled(); expect(h.dialog.inert).toBe(false); - expect(document.querySelector("#__loader .title").textContent.trim()).toBe("Login"); + expect(document.querySelector("#__loader .title").textContent.trim()).toBe( + "Login", + ); h.loader.destroy(); vi.runAllTimers(); await actionStack.pop(); diff --git a/tests/unit/binaryExtensions.test.js b/tests/unit/binaryExtensions.test.js index 1999c1d55b..f05f336990 100644 --- a/tests/unit/binaryExtensions.test.js +++ b/tests/unit/binaryExtensions.test.js @@ -1,10 +1,10 @@ -import { describe, expect, it } from "vitest"; import { isBinaryFile, isBinaryMime, isBinaryPath, isTextPath, } from "utils/binaryExtensions"; +import { describe, expect, it } from "vitest"; describe("isBinaryPath", () => { it("detects binary extensions", () => { diff --git a/tests/unit/codeHighlight.test.js b/tests/unit/codeHighlight.test.js index 327a763b09..e46e303eb8 100644 --- a/tests/unit/codeHighlight.test.js +++ b/tests/unit/codeHighlight.test.js @@ -18,11 +18,11 @@ vi.mock("lib/settings", () => ({ import "cm/supportedModes"; import settings from "lib/settings"; import { - HIGHLIGHT_CLASS, applyHighlightStyles, clearHighlightCache, getHighlightStyleSheet, getHighlightStyles, + HIGHLIGHT_CLASS, highlightCodeBlock, highlightLine, initHighlighting, diff --git a/tests/unit/color.test.js b/tests/unit/color.test.js index d7e00acbbb..703c6f1e14 100644 --- a/tests/unit/color.test.js +++ b/tests/unit/color.test.js @@ -1,8 +1,8 @@ -import { describe, expect, it } from "vitest"; import Hex from "utils/color/hex"; import Hsl from "utils/color/hsl"; import { isValidColor } from "utils/color/regex"; import Rgb from "utils/color/rgb"; +import { describe, expect, it } from "vitest"; describe("Rgb", () => { it("stringifies opaque colors as rgb()", () => { diff --git a/tests/unit/confirm.test.js b/tests/unit/confirm.test.js index bbcadbda15..238b6fda9b 100644 --- a/tests/unit/confirm.test.js +++ b/tests/unit/confirm.test.js @@ -2,6 +2,7 @@ import tag from "html-tag-js"; import { afterEach, beforeEach, expect, it, vi } from "vitest"; + vi.mock("lib/settings", () => ({ default: { value: { confirmOnExit: false } }, })); @@ -9,8 +10,10 @@ vi.mock("lib/restoreTheme", () => ({ default: vi.fn() })); vi.mock("components/checkbox", () => ({ default: () => document.createElement("input"), })); + import confirm from "dialogs/confirm"; import actionStack from "lib/actionStack"; + beforeEach(() => { vi.useFakeTimers(); vi.clearAllMocks(); @@ -78,33 +81,35 @@ it("preserves checkbox response and ignores subsequent dismissals", async () => expect(actionStack.length).toBe(0); }); -it.each(["back", "cancel", "ok", "abort"])( - "preserves the lower confirmation's Back handler after %s dismisses the top", - async (method) => { - const firstClosed = vi.fn(); - confirm("First", "First confirmation").then(firstClosed); - const controller = new AbortController(); - const second = confirm("Second", "Second confirmation", false, { - signal: controller.signal, - }); - const top = document.querySelectorAll(".confirm")[1]; - if (method === "back") await actionStack.pop(); - if (method === "cancel") top.querySelector("button").click(); - if (method === "ok") top.querySelectorAll("button")[1].click(); - if (method === "abort") controller.abort(); - await expect(second).resolves.toBe(method === "ok"); - vi.runAllTimers(); - expect(document.querySelectorAll(".confirm")).toHaveLength(1); - expect(actionStack.length).toBe(1); - expect(firstClosed).not.toHaveBeenCalled(); +it.each([ + "back", + "cancel", + "ok", + "abort", +])("preserves the lower confirmation's Back handler after %s dismisses the top", async (method) => { + const firstClosed = vi.fn(); + confirm("First", "First confirmation").then(firstClosed); + const controller = new AbortController(); + const second = confirm("Second", "Second confirmation", false, { + signal: controller.signal, + }); + const top = document.querySelectorAll(".confirm")[1]; + if (method === "back") await actionStack.pop(); + if (method === "cancel") top.querySelector("button").click(); + if (method === "ok") top.querySelectorAll("button")[1].click(); + if (method === "abort") controller.abort(); + await expect(second).resolves.toBe(method === "ok"); + vi.runAllTimers(); + expect(document.querySelectorAll(".confirm")).toHaveLength(1); + expect(actionStack.length).toBe(1); + expect(firstClosed).not.toHaveBeenCalled(); - await actionStack.pop(); - expect(firstClosed).toHaveBeenCalledExactlyOnceWith(false); - vi.runAllTimers(); - expect(app.children.length).toBe(0); - expect(actionStack.length).toBe(0); - }, -); + await actionStack.pop(); + expect(firstClosed).toHaveBeenCalledExactlyOnceWith(false); + vi.runAllTimers(); + expect(app.children.length).toBe(0); + expect(actionStack.length).toBe(0); +}); it("preserves the top confirmation when the lower one is aborted", async () => { const controller = new AbortController(); diff --git a/tests/unit/consoleExecutionContext.test.js b/tests/unit/consoleExecutionContext.test.js index 3d6a6519e9..153fee43ad 100644 --- a/tests/unit/consoleExecutionContext.test.js +++ b/tests/unit/consoleExecutionContext.test.js @@ -1,9 +1,9 @@ -import { describe, expect, it } from "vitest"; import { executeConsoleCommand, executeConsoleScript, resolveConsoleExecutionContext, } from "lib/consoleRuntime"; +import { describe, expect, it } from "vitest"; describe("console execution context", () => { it("forces standalone menu consoles to use the worker", () => { diff --git a/tests/unit/consoleExecutor.test.js b/tests/unit/consoleExecutor.test.js index 7dcd45e645..b1e88814fa 100644 --- a/tests/unit/consoleExecutor.test.js +++ b/tests/unit/consoleExecutor.test.js @@ -1,5 +1,5 @@ -import { beforeEach, describe, expect, it, vi } from "vitest"; import ConsoleExecutor from "lib/consoleRuntime"; +import { beforeEach, describe, expect, it, vi } from "vitest"; class FakeWorker { static instances = []; diff --git a/tests/unit/consoleViewport.test.js b/tests/unit/consoleViewport.test.js index 218a5bad69..f8e52fbb8a 100644 --- a/tests/unit/consoleViewport.test.js +++ b/tests/unit/consoleViewport.test.js @@ -1,10 +1,10 @@ // @vitest-environment happy-dom -import { describe, expect, it } from "vitest"; import { applyConsoleViewport, getConsoleViewportRect, } from "lib/consoleRuntime"; +import { describe, expect, it } from "vitest"; describe("console visual viewport", () => { it("uses the visual viewport when the mobile keyboard shrinks the screen", () => { diff --git a/tests/unit/editorThemes.test.js b/tests/unit/editorThemes.test.js index 30ccb06aa7..8f8914eea1 100644 --- a/tests/unit/editorThemes.test.js +++ b/tests/unit/editorThemes.test.js @@ -1,10 +1,6 @@ import { EditorState } from "@codemirror/state"; +import { getThemeConfig, getThemeExtensions, getThemes } from "cm/themes"; import { describe, expect, it } from "vitest"; -import { - getThemeConfig, - getThemeExtensions, - getThemes, -} from "cm/themes"; describe("built-in editor themes", () => { it("uses the base editor foreground for plain VS Code text", () => { @@ -68,9 +64,10 @@ describe("built-in editor themes", () => { if (!activeLine) continue; expect(activeLine, `${id} active line`).toMatch(/^#[\da-f]{8}$/i); - expect(Number.parseInt(activeLine.slice(-2), 16), `${id} active line`).toBeLessThan( - 255, - ); + expect( + Number.parseInt(activeLine.slice(-2), 16), + `${id} active line`, + ).toBeLessThan(255); } }); }); diff --git a/tests/unit/fileIconAssets.test.ts b/tests/unit/fileIconAssets.test.ts index eef03d770a..c32b5dd8e8 100644 --- a/tests/unit/fileIconAssets.test.ts +++ b/tests/unit/fileIconAssets.test.ts @@ -1,6 +1,7 @@ // @vitest-environment happy-dom -import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; + import fileIcons from "lib/fileIcons"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; const requests: FakeImage[] = []; class FakeImage { @@ -122,9 +123,7 @@ describe("icon assets", () => { const [file, folder] = document.body.querySelectorAll("span"); expect(file.className).toBe("pack-file icon"); - expect(folder.className).toBe( - "pack-folder icon user-added-storage", - ); + expect(folder.className).toBe("pack-folder icon user-added-storage"); }); it("uses distinct CSS classes for IDs that previously collided", () => { diff --git a/tests/unit/fileIconOwnership.test.ts b/tests/unit/fileIconOwnership.test.ts index 032e9d94db..83b62f475a 100644 --- a/tests/unit/fileIconOwnership.test.ts +++ b/tests/unit/fileIconOwnership.test.ts @@ -1,6 +1,7 @@ // @vitest-environment happy-dom -import { afterEach, expect, it, vi } from "vitest"; + import fileIcons from "lib/fileIcons"; +import { afterEach, expect, it, vi } from "vitest"; afterEach(() => fileIcons.resetForTests()); diff --git a/tests/unit/fileIconSidebar.test.ts b/tests/unit/fileIconSidebar.test.ts index c83bfe0fa9..2a6eef2769 100644 --- a/tests/unit/fileIconSidebar.test.ts +++ b/tests/unit/fileIconSidebar.test.ts @@ -1,6 +1,7 @@ // @vitest-environment happy-dom -import { afterEach, beforeEach, expect, it, vi } from "vitest"; + import fileIcons from "lib/fileIcons"; +import { afterEach, beforeEach, expect, it, vi } from "vitest"; const sidebar = vi.hoisted(() => ({ on: vi.fn() })); vi.mock("components/sidebar", () => ({ default: sidebar })); diff --git a/tests/unit/fileIconTheme.test.ts b/tests/unit/fileIconTheme.test.ts index 6f81cf0973..ecd0058a3d 100644 --- a/tests/unit/fileIconTheme.test.ts +++ b/tests/unit/fileIconTheme.test.ts @@ -1,5 +1,5 @@ -import { afterEach, describe, expect, it } from "vitest"; import fileIcons, { BUILTIN_THEME_ID } from "lib/fileIcons"; +import { afterEach, describe, expect, it } from "vitest"; afterEach(() => { fileIcons.resetForTests(); diff --git a/tests/unit/fileIntents.test.js b/tests/unit/fileIntents.test.js index 1e156f290f..970439e265 100644 --- a/tests/unit/fileIntents.test.js +++ b/tests/unit/fileIntents.test.js @@ -62,7 +62,10 @@ it("queues cold-start and in-startup batches until both files and plugins are re expect(f.open).not.toHaveBeenCalled(); f.ready(); await f.processPendingIntents(); - expect(f.open.mock.calls.map(([uri]) => uri)).toEqual(["content://docs/1", "content://docs/2"]); + expect(f.open.mock.calls.map(([uri]) => uri)).toEqual([ + "content://docs/1", + "content://docs/2", + ]); expect(f.open).toHaveBeenLastCalledWith("content://docs/2", { mode: "single", render: true, @@ -81,7 +84,11 @@ it("serializes warm batches and deduplicates stream/ClipData URIs without losing finish = resolve; }), ); - const first = f.send(["content://docs/1", "content://docs/1", "file:///second.pdf"]); + const first = f.send([ + "content://docs/1", + "content://docs/1", + "file:///second.pdf", + ]); const second = f.send(["content://docs/3"], "SEND"); expect(f.open).toHaveBeenCalledTimes(1); finish(); @@ -147,33 +154,40 @@ it("continues after failures and offers Plugins once per batch, escaping provide const items = f.select.mock.calls[0][1]; expect(items[0].text).toContain("<img src=x>.pdf"); expect(items[0].text).toContain("content://docs/2"); - expect(items.map((item) => item.value)).toEqual([undefined, "plugins", "close"]); + expect(items.map((item) => item.value)).toEqual([ + undefined, + "plugins", + "close", + ]); expect(f.exec).toHaveBeenCalledWith("open", "plugins"); }); -it.each(["cancel", "reject"])( - "continues queued and later intents when the error dialog ends with %s", - async (outcome) => { - const f = setup(); - f.ready(); - vi.spyOn(console, "error").mockImplementation(() => {}); - f.open.mockRejectedValueOnce({ - code: "DOCUMENT_HANDLER_UNAVAILABLE", - filename: "missing.docx", - }); - f.select.mockImplementationOnce((_title, _items, options) => { - if (outcome === "reject") return Promise.reject(Error("Dialog failed")); - options.onCancel(); - return new Promise(() => {}); - }); - await Promise.all([f.send(["content://docs/missing"]), f.send(["content://docs/queued"])]); - await f.send(["content://docs/next"]); - expect(f.open.mock.calls.map(([uri]) => uri)).toEqual([ - "content://docs/missing", - "content://docs/queued", - "content://docs/next", - ]); - expect(f.reportError).toHaveBeenCalledTimes(outcome === "reject" ? 1 : 0); - expect(f.exec).not.toHaveBeenCalled(); - }, -); +it.each([ + "cancel", + "reject", +])("continues queued and later intents when the error dialog ends with %s", async (outcome) => { + const f = setup(); + f.ready(); + vi.spyOn(console, "error").mockImplementation(() => {}); + f.open.mockRejectedValueOnce({ + code: "DOCUMENT_HANDLER_UNAVAILABLE", + filename: "missing.docx", + }); + f.select.mockImplementationOnce((_title, _items, options) => { + if (outcome === "reject") return Promise.reject(Error("Dialog failed")); + options.onCancel(); + return new Promise(() => {}); + }); + await Promise.all([ + f.send(["content://docs/missing"]), + f.send(["content://docs/queued"]), + ]); + await f.send(["content://docs/next"]); + expect(f.open.mock.calls.map(([uri]) => uri)).toEqual([ + "content://docs/missing", + "content://docs/queued", + "content://docs/next", + ]); + expect(f.reportError).toHaveBeenCalledTimes(outcome === "reject" ? 1 : 0); + expect(f.exec).not.toHaveBeenCalled(); +}); diff --git a/tests/unit/fileOperationExclusions.test.js b/tests/unit/fileOperationExclusions.test.js index 65ec3bc40b..ccc173b9c0 100644 --- a/tests/unit/fileOperationExclusions.test.js +++ b/tests/unit/fileOperationExclusions.test.js @@ -1,5 +1,5 @@ -import { describe, expect, it } from "vitest"; import { isExcludedFileOperationPath } from "utils/fileOperationExclusions"; +import { describe, expect, it } from "vitest"; const patterns = [ "**/node_modules/**", @@ -35,10 +35,7 @@ describe("isExcludedFileOperationPath", () => { it("normalizes Windows separators", () => { expect( - isExcludedFileOperationPath( - "C:\\project\\package.egg-info", - patterns, - ), + isExcludedFileOperationPath("C:\\project\\package.egg-info", patterns), ).toBe(true); }); diff --git a/tests/unit/fileSaveEvents.test.js b/tests/unit/fileSaveEvents.test.js index ad6c5aa73f..0629578367 100644 --- a/tests/unit/fileSaveEvents.test.js +++ b/tests/unit/fileSaveEvents.test.js @@ -1,50 +1,106 @@ // @vitest-environment happy-dom -import { afterEach, expect, it, vi } from "vitest"; -import { EditorState, EditorSelection } from "@codemirror/state"; + +import { EditorSelection, EditorState } from "@codemirror/state"; import tag from "html-tag-js"; +import { afterEach, expect, it, vi } from "vitest"; import { loadSourceModule } from "../helpers/loadSourceModule"; -const deferred = () => { let resolve, reject; const promise = new Promise((a, b) => { resolve = a; reject = b; }); return { promise, resolve, reject }; }; +const deferred = () => { + let resolve, reject; + const promise = new Promise((a, b) => { + resolve = a; + reject = b; + }); + return { promise, resolve, reject }; +}; function setup() { const write = vi.fn(async () => true); - const manager = { files: [], getFile: () => null, addFile: file => manager.files.push(file), emit: vi.fn(), onupdate: vi.fn(), activeFile: null }; - const defaults = Object.fromEntries([ - "fileSystem", "components/quickTools", "components/sidebar", "components/toast", "dialogs/confirm", "handlers/editorFileTab", "handlers/quickTools", "lib/quickToolsAdapter", "handlers/tabContextMenu", "dompurify", "mime-types", "utils/codeHighlight", "utils/Path", "utils/remoteFilePreview", "utils/Url", "./loadPlugins", "./openFolder", "./run", "cm/editorReadOnly", - ].map(id => [id, {}])); - const { default: EditorFile } = loadSourceModule("src/lib/editorFile.js", { - ...defaults, - "components/sidebar": { hide: vi.fn() }, - "@codemirror/state": { EditorState, EditorSelection }, - "cm/editorUtils": { getDocText: doc => doc.toString() }, - "cm/modelist": { getModeForPath: () => "text", getMode: () => ({ name: "text", extensions: [], getExtension: () => [] }) }, - "html-tag-js": tag, - "components/tile": options => { - const element = document.createElement("li"); - element.innerHTML = ''; - element.tail = vi.fn(); - element.text = options.text; - return element; + const manager = { + files: [], + getFile: () => null, + addFile: (file) => manager.files.push(file), + emit: vi.fn(), + onupdate: vi.fn(), + activeFile: null, + }; + const defaults = Object.fromEntries( + [ + "fileSystem", + "components/quickTools", + "components/sidebar", + "components/toast", + "dialogs/confirm", + "handlers/editorFileTab", + "handlers/quickTools", + "lib/quickToolsAdapter", + "handlers/tabContextMenu", + "dompurify", + "mime-types", + "utils/codeHighlight", + "utils/Path", + "utils/remoteFilePreview", + "utils/Url", + "./loadPlugins", + "./openFolder", + "./run", + "cm/editorReadOnly", + ].map((id) => [id, {}]), + ); + const { default: EditorFile } = loadSourceModule( + "src/lib/editorFile.js", + { + ...defaults, + "components/sidebar": { hide: vi.fn() }, + "@codemirror/state": { EditorState, EditorSelection }, + "cm/editorUtils": { getDocText: (doc) => doc.toString() }, + "cm/modelist": { + getModeForPath: () => "text", + getMode: () => ({ + name: "text", + extensions: [], + getExtension: () => [], + }), + }, + "html-tag-js": tag, + "components/tile": (options) => { + const element = document.createElement("li"); + element.innerHTML = ''; + element.tail = vi.fn(); + element.text = options.text; + return element; + }, + "utils/helpers": { + normalizeMtime: () => null, + getIconForFile: () => "file", + }, + "./config": { DEFAULT_FILE_SESSION: "default" }, + "./settings": { value: {}, on: vi.fn(), off: vi.fn() }, + "./saveFile": write, }, - "utils/helpers": { normalizeMtime: () => null, getIconForFile: () => "file" }, - "./config": { DEFAULT_FILE_SESSION: "default" }, - "./settings": { value: {}, on: vi.fn(), off: vi.fn() }, - "./saveFile": write, - }, { document, window, tag, editorManager: manager }); + { document, window, tag, editorManager: manager }, + ); EditorFile.prototype.setMode = vi.fn(); // Language setup is unrelated to save routing. EditorFile.prototype.writeToCache = vi.fn(async () => {}); - const file = (type = "docs") => new EditorFile("test.txt", { - id: String(manager.files.length), type, content: document.createElement("div"), render: false, text: "original", - }); + const file = (type = "docs") => + new EditorFile("test.txt", { + id: String(manager.files.length), + type, + content: document.createElement("div"), + render: false, + text: "original", + }); return { file, write, manager }; } afterEach(() => document.body.replaceChildren()); it("enables only custom tabs with listeners or onsave, and never uses the text writer", async () => { - const f = setup(), doc = f.file(), terminal = f.file("terminal"); + const f = setup(), + doc = f.file(), + terminal = f.file("terminal"); expect(doc.canSave).toBe(false); expect(await doc.save()).toBe(false); expect(await terminal.saveAs()).toBe(false); - const handler = e => e.respondWith(Promise.resolve(true)); + const handler = (e) => e.respondWith(Promise.resolve(true)); doc.on("save", handler); expect(doc.canSave).toBe(true); expect(await doc.save()).toBe(true); @@ -57,10 +113,17 @@ it("enables only custom tabs with listeners or onsave, and never uses the text w expect(f.write).not.toHaveBeenCalled(); }); it("awaits one response, distinguishes Save As and shares repeated requests per tab", async () => { - const f = setup(), one = f.file(), two = f.file(), hold = deferred(); - const events = [], handler = vi.fn(e => { events.push(e); e.respondWith(hold.promise); }); + const f = setup(), + one = f.file(), + two = f.file(), + hold = deferred(); + const events = [], + handler = vi.fn((e) => { + events.push(e); + e.respondWith(hold.promise); + }); one.on("save", handler); - two.on("save", e => e.respondWith(Promise.resolve(false))); + two.on("save", (e) => e.respondWith(Promise.resolve(false))); const saving = one.saveAs(); expect(one.save()).toBe(saving); await Promise.resolve(); @@ -74,50 +137,71 @@ it("awaits one response, distinguishes Save As and shares repeated requests per expect(events[1].saveAs).toBe(false); }); it("rejects failures, duplicate and late responses, and releases pending requests", async () => { - const f = setup(), file = f.file(); + const f = setup(), + file = f.file(); let event; - const fail = e => { event = e; e.respondWith(Promise.reject(Error("disk full"))); }; + const fail = (e) => { + event = e; + e.respondWith(Promise.reject(Error("disk full"))); + }; file.on("save", fail); await expect(file.save()).rejects.toThrow("disk full"); expect(() => event.respondWith(Promise.resolve(true))).toThrow(/once/); file.off("save", fail); - const duplicate = e => { e.respondWith(Promise.resolve(true)); e.respondWith(Promise.resolve(true)); }; + const duplicate = (e) => { + e.respondWith(Promise.resolve(true)); + e.respondWith(Promise.resolve(true)); + }; file.on("save", duplicate); await expect(file.save()).rejects.toThrow(/once/); file.off("save", duplicate); - file.on("save", e => { event = e; }); + file.on("save", (e) => { + event = e; + }); expect(await file.save()).toBe(false); expect(() => event.respondWith(Promise.resolve(true))).toThrow(/during/); }); it("preserves text fallback and existing cancellation/listener ordering", async () => { - const f = setup(), file = f.file("editor"); + const f = setup(), + file = f.file("editor"); file.flushCacheWrite = vi.fn(async () => {}); expect(file.canSave).toBe(true); await file.saveAs(); - expect(f.write).toHaveBeenCalledWith(file, true, { automatic: false, savedDoc: file.session.doc }); - const cancel = e => e.preventDefault(), observe = vi.fn(); + expect(f.write).toHaveBeenCalledWith(file, true, { + automatic: false, + savedDoc: file.session.doc, + }); + const cancel = (e) => e.preventDefault(), + observe = vi.fn(); file.onsave = cancel; file.on("save", observe); expect(await file.save()).toBe(false); expect(observe).toHaveBeenCalledOnce(); expect(f.write).toHaveBeenCalledOnce(); - file.onsave = e => { e.preventDefault(); e.stopPropagation(); }; + file.onsave = (e) => { + e.preventDefault(); + e.stopPropagation(); + }; await file.save(); expect(observe).toHaveBeenCalledOnce(); - file.onsave = e => e.respondWith(Promise.resolve(true)); + file.onsave = (e) => e.respondWith(Promise.resolve(true)); expect(await file.save()).toBe(true); expect(f.write).toHaveBeenCalledOnce(); }); - it("drops completion notifications after closing the captured custom tab", async () => { - const f = setup(), file = f.file(), hold = deferred(); +it("drops completion notifications after closing the captured custom tab", async () => { + const f = setup(), + file = f.file(), + hold = deferred(); f.file(); - file.on("save", e => e.respondWith(hold.promise)); + file.on("save", (e) => e.respondWith(hold.promise)); const saving = file.save(); await Promise.resolve(); await file.remove(true); expect(file.canSave).toBe(false); hold.resolve(true); expect(await saving).toBe(false); - expect(f.manager.emit.mock.calls.some(([name]) => name === "save-file")).toBe(false); + expect(f.manager.emit.mock.calls.some(([name]) => name === "save-file")).toBe( + false, + ); }); diff --git a/tests/unit/fileTreeRecycling.test.ts b/tests/unit/fileTreeRecycling.test.ts index 1c9d57477d..74a3e48e2b 100644 --- a/tests/unit/fileTreeRecycling.test.ts +++ b/tests/unit/fileTreeRecycling.test.ts @@ -1,7 +1,8 @@ // @vitest-environment happy-dom -import { afterEach, beforeEach, expect, it, vi } from "vitest"; -import tag from "html-tag-js"; + import FileTree from "components/fileTree"; +import tag from "html-tag-js"; +import { afterEach, beforeEach, expect, it, vi } from "vitest"; vi.mock("utils/helpers", () => ({ default: { diff --git a/tests/unit/fullscreen.test.js b/tests/unit/fullscreen.test.js index c0f6ce6436..7c1371c985 100644 --- a/tests/unit/fullscreen.test.js +++ b/tests/unit/fullscreen.test.js @@ -29,9 +29,15 @@ it("validates orientation requests and waits for native lock/unlock acceptance", exec.mockImplementation(() => {}); for (const mode of ["landscape", "portrait", null]) { const settled = vi.fn(); - const request = (mode ? orientation.lock(mode) : orientation.unlock()).then(settled); + const request = (mode ? orientation.lock(mode) : orientation.unlock()).then( + settled, + ); const [success, , service, action, args] = exec.mock.lastCall; - expect([service, action, args]).toEqual(["System", "set-fullscreen-orientation", [mode]]); + expect([service, action, args]).toEqual([ + "System", + "set-fullscreen-orientation", + [mode], + ]); await Promise.resolve(); expect(settled).not.toHaveBeenCalled(); success(); @@ -47,7 +53,9 @@ describe("fullscreen Back ownership", () => { for (const value of [undefined, false, "pause", {}]) { await expect(api.setBackHandler(value)).rejects.toThrow(TypeError); } - await expect(api.setBackHandler(() => {})).rejects.toThrow(/requires fullscreen/); + await expect(api.setBackHandler(() => {})).rejects.toThrow( + /requires fullscreen/, + ); expect(exec).not.toHaveBeenCalled(); await expect(api.setBackHandler(null)).resolves.toBeUndefined(); await expect(api.setBackHandler(null)).resolves.toBeUndefined(); @@ -111,21 +119,24 @@ describe("fullscreen Back ownership", () => { expect(old).toHaveBeenCalledOnce(); }); - it.each(["throw", "reject"])( - "exits the original session when a callback fails: %s", - async (kind) => { - change({}); - await api.setBackHandler(() => { - if (kind === "throw") throw new Error("pause failed"); - return Promise.reject(new Error("pause failed")); - }); - back(); - await flush(); - expect(doc.exitFullscreen).toHaveBeenCalledOnce(); - }, - ); + it.each([ + "throw", + "reject", + ])("exits the original session when a callback fails: %s", async (kind) => { + change({}); + await api.setBackHandler(() => { + if (kind === "throw") throw new Error("pause failed"); + return Promise.reject(new Error("pause failed")); + }); + back(); + await flush(); + expect(doc.exitFullscreen).toHaveBeenCalledOnce(); + }); - it.each(["replace", "reenter"])("ignores an async callback failure after %s", async (kind) => { + it.each([ + "replace", + "reenter", + ])("ignores an async callback failure after %s", async (kind) => { const owner = {}; change(owner); let reject; @@ -164,36 +175,40 @@ describe("fullscreen Back ownership", () => { expect(doc.exitFullscreen).toHaveBeenCalledOnce(); }); - it.each(["resolve", "reject"])( - "cleans up pending registration after exit and %s, before a new owner registers", - async (result) => { - change({}); - const old = vi.fn(), - queued = vi.fn(), - next = vi.fn(); - let complete; - exec.mockImplementationOnce((resolve, reject) => { - complete = result === "resolve" ? resolve : reject; - }); - const pending = api.setBackHandler(old); - const failure = expect(pending).rejects.toThrow(); - const obsolete = api.setBackHandler(queued); - const obsoleteFailure = expect(obsolete).rejects.toThrow(/session changed/); - await flush(); - change(null); - change({}); - const fresh = api.setBackHandler(next); - complete("old request"); - await failure; - await obsoleteFailure; - await fresh; - expect(exec.mock.calls.map((call) => call[4][0])).toEqual([true, false, true]); - back(); - expect(next).toHaveBeenCalledOnce(); - expect(old).not.toHaveBeenCalled(); - expect(queued).not.toHaveBeenCalled(); - }, - ); + it.each([ + "resolve", + "reject", + ])("cleans up pending registration after exit and %s, before a new owner registers", async (result) => { + change({}); + const old = vi.fn(), + queued = vi.fn(), + next = vi.fn(); + let complete; + exec.mockImplementationOnce((resolve, reject) => { + complete = result === "resolve" ? resolve : reject; + }); + const pending = api.setBackHandler(old); + const failure = expect(pending).rejects.toThrow(); + const obsolete = api.setBackHandler(queued); + const obsoleteFailure = expect(obsolete).rejects.toThrow(/session changed/); + await flush(); + change(null); + change({}); + const fresh = api.setBackHandler(next); + complete("old request"); + await failure; + await obsoleteFailure; + await fresh; + expect(exec.mock.calls.map((call) => call[4][0])).toEqual([ + true, + false, + true, + ]); + back(); + expect(next).toHaveBeenCalledOnce(); + expect(old).not.toHaveBeenCalled(); + expect(queued).not.toHaveBeenCalled(); + }); it("invalidates a queued release on exit so it cannot release the next session", async () => { change({}); @@ -210,6 +225,10 @@ describe("fullscreen Back ownership", () => { const next = api.setBackHandler(() => {}); complete(); await Promise.all([failure, release, next]); - expect(exec.mock.calls.map((call) => call[4][0])).toEqual([true, false, true]); + expect(exec.mock.calls.map((call) => call[4][0])).toEqual([ + true, + false, + true, + ]); }); }); diff --git a/tests/unit/iconTooltips.test.js b/tests/unit/iconTooltips.test.js index 17ed23e910..b870c7ff06 100644 --- a/tests/unit/iconTooltips.test.js +++ b/tests/unit/iconTooltips.test.js @@ -1,6 +1,7 @@ // @vitest-environment happy-dom import { afterEach, expect, it, vi } from "vitest"; import { installIconTooltips } from "../../src/components/tooltip/longPress"; + let controller; afterEach(() => { controller?.dispose(); diff --git a/tests/unit/immersiveFullscreenPrepare.test.js b/tests/unit/immersiveFullscreenPrepare.test.js index 66b790da57..5f2ea9d76f 100644 --- a/tests/unit/immersiveFullscreenPrepare.test.js +++ b/tests/unit/immersiveFullscreenPrepare.test.js @@ -20,13 +20,17 @@ const controllerSource = fs.readFileSync( const roots = []; afterEach(() => { - for (const root of roots.splice(0)) fs.rmSync(root, { recursive: true, force: true }); + for (const root of roots.splice(0)) + fs.rmSync(root, { recursive: true, force: true }); }); function fixture(source = cordovaSource) { const root = fs.mkdtempSync(path.join(os.tmpdir(), "acode-fullscreen-")); roots.push(root); - const native = path.join(root, "platforms/android/CordovaLib/src/org/apache/cordova"); + const native = path.join( + root, + "platforms/android/CordovaLib/src/org/apache/cordova", + ); const tracked = path.join(root, "hooks/android/ImmersiveFullscreen.java"); const generated = path.join(native, "ImmersiveFullscreen.java"); const webview = path.join(native, "CordovaWebViewImpl.java"); @@ -50,11 +54,27 @@ describe("Android immersive fullscreen preparation", () => { const patched = f.read(); expect(fs.readFileSync(f.generated, "utf8")).toBe(controllerSource); for (const [method, before, after] of [ - ["showCustomView", "parent.bringToFront()", "immersiveFullscreen.enter(wrapperView)"], - ["hideCustomView", "immersiveFullscreen.exit()", "mCustomViewCallback.onCustomViewHidden()"], + [ + "showCustomView", + "parent.bringToFront()", + "immersiveFullscreen.enter(wrapperView)", + ], + [ + "hideCustomView", + "immersiveFullscreen.exit()", + "mCustomViewCallback.onCustomViewHidden()", + ], ["handlePause", "immersiveFullscreen.pause()", "pluginManager.onPause"], - ["handleResume", "immersiveFullscreen.resume()", "pluginManager.onResume"], - ["onPageStarted", "immersiveFullscreen.unlockOrientation()", "pluginManager.onReset"], + [ + "handleResume", + "immersiveFullscreen.resume()", + "pluginManager.onResume", + ], + [ + "onPageStarted", + "immersiveFullscreen.unlockOrientation()", + "pluginManager.onReset", + ], ["handleDestroy", "hideCustomView()", "engine.destroy()"], ]) { const start = patched.indexOf(`public void ${method}(`); @@ -76,7 +96,9 @@ describe("Android immersive fullscreen preparation", () => { fs.appendFileSync(f.tracked, "\n// updated native controller\n"); f.run(); expect(f.read()).toBe(first); - expect(fs.readFileSync(f.generated, "utf8")).toBe(fs.readFileSync(f.tracked, "utf8")); + expect(fs.readFileSync(f.generated, "utf8")).toBe( + fs.readFileSync(f.tracked, "utf8"), + ); expect( first.replace( /^[ \t]*\/\/ ACODE_FULLSCREEN_BEGIN ([a-z]+)\n[\s\S]*?^[ \t]*\/\/ ACODE_FULLSCREEN_END \1\n/gm, @@ -110,7 +132,10 @@ describe("Android immersive fullscreen preparation", () => { "pluginManager.onPause(keepRunning);", "this.pluginManager.onResume(keepRunning);", "pluginManager.onReset();", - ].map((anchor) => [anchor, cordovaSource.replaceAll(anchor, "// changed upstream")]), + ].map((anchor) => [ + anchor, + cordovaSource.replaceAll(anchor, "// changed upstream"), + ]), ])("rejects incompatible anchors before writing: %s", (_kind, source) => { const f = fixture(source); expect(f.run).toThrow(/Acode fullscreen: expected one Cordova/); @@ -121,7 +146,9 @@ describe("Android immersive fullscreen preparation", () => { it("rejects a damaged prior patch without overwriting either generated file", () => { const f = fixture(); f.run(); - const damaged = f.read().replace("// ACODE_FULLSCREEN_END enter", "// missing end marker"); + const damaged = f + .read() + .replace("// ACODE_FULLSCREEN_END enter", "// missing end marker"); fs.writeFileSync(f.webview, damaged); fs.writeFileSync(f.generated, "// existing controller"); expect(f.run).toThrow(/incomplete generated patch/); diff --git a/tests/unit/installSource.test.js b/tests/unit/installSource.test.js index e5ec612610..5039eff6b3 100644 --- a/tests/unit/installSource.test.js +++ b/tests/unit/installSource.test.js @@ -1,5 +1,5 @@ -import { afterEach, describe, expect, it, vi } from "vitest"; import { INSTALL_SOURCE_PLAY, isPlayStoreInstall } from "utils/installSource"; +import { afterEach, describe, expect, it, vi } from "vitest"; afterEach(() => { vi.unstubAllGlobals(); @@ -12,7 +12,9 @@ describe("isPlayStoreInstall", () => { }); it("returns false for any other install source", () => { - vi.stubGlobal("window", { appInstallSource: "com.android.packageinstaller" }); + vi.stubGlobal("window", { + appInstallSource: "com.android.packageinstaller", + }); expect(isPlayStoreInstall()).toBe(false); }); diff --git a/tests/unit/languageModeRecommendations.test.js b/tests/unit/languageModeRecommendations.test.js index c737c68e42..2a96162312 100644 --- a/tests/unit/languageModeRecommendations.test.js +++ b/tests/unit/languageModeRecommendations.test.js @@ -1,8 +1,8 @@ import { afterAll, beforeEach, describe, expect, it, vi } from "vitest"; import "cm/supportedModes"; import { getModeForPath } from "cm/modelist"; -import notificationManager from "lib/notificationManager"; import recommendLanguageModeExtension from "lib/languageModeRecommendations"; +import notificationManager from "lib/notificationManager"; vi.mock("lib/notificationManager", () => ({ default: { diff --git a/tests/unit/lspExternalWebSocketLifecycle.test.js b/tests/unit/lspExternalWebSocketLifecycle.test.js index 227061a14d..674c4633b0 100644 --- a/tests/unit/lspExternalWebSocketLifecycle.test.js +++ b/tests/unit/lspExternalWebSocketLifecycle.test.js @@ -1,10 +1,10 @@ // @vitest-environment happy-dom -import {StateEffect} from "@codemirror/state"; -import {EditorView} from "@codemirror/view"; -import {afterEach, beforeEach, describe, expect, it, vi} from "vitest"; +import { StateEffect } from "@codemirror/state"; +import { EditorView } from "@codemirror/view"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; -const registry = vi.hoisted(() => ({servers: []})); +const registry = vi.hoisted(() => ({ servers: [] })); // Keep the lifecycle test independent of app UI modules that use JSX in .js // files, which Vitest's native import analysis does not transform. @@ -12,7 +12,8 @@ vi.mock("cm/lsp/serverRegistry", () => ({ default: { getServersForLanguage: (languageId) => registry.servers.filter( - (server) => server.enabled !== false && server.languages.includes(languageId), + (server) => + server.enabled !== false && server.languages.includes(languageId), ), }, })); @@ -25,18 +26,18 @@ vi.mock("components/lspStatusBar", () => ({ }, })); -vi.mock("components/settingsPage", () => ({default: vi.fn()})); +vi.mock("components/settingsPage", () => ({ default: vi.fn() })); vi.mock("components/checkbox", () => ({ default: vi.fn(), updateSwitchHandle: vi.fn(), })); vi.mock("lib/notificationManager", () => ({ - default: {add: vi.fn()}, + default: { add: vi.fn() }, })); vi.mock("lib/settings", () => ({ - default: {value: {lsp: {}}}, + default: { value: { lsp: {} } }, })); vi.mock("cm/lsp/diagnostics", () => ({ @@ -57,7 +58,7 @@ vi.mock("cm/lsp/inlayHints", () => ({ inlayHintsExtension: () => [], })); -vi.mock("cm/lsp/logs", () => ({addLspLog: vi.fn()})); +vi.mock("cm/lsp/logs", () => ({ addLspLog: vi.fn() })); vi.mock("cm/lsp/tooltipExtensions", () => ({ hoverTooltips: () => [], @@ -99,7 +100,7 @@ class TestWebSocket { TestWebSocket.instances.push(this); queueMicrotask(() => { this.readyState = TestWebSocket.OPEN; - this.onopen?.({type: "open"}); + this.onopen?.({ type: "open" }); }); } @@ -115,7 +116,7 @@ class TestWebSocket { data: JSON.stringify({ jsonrpc: "2.0", id: message.id, - result: {capabilities: {}}, + result: { capabilities: {} }, }), }); }); @@ -124,7 +125,7 @@ class TestWebSocket { close(code = 1000) { this.closeCalls++; this.readyState = TestWebSocket.CLOSED; - this.onclose?.({code, wasClean: code === 1000}); + this.onclose?.({ code, wasClean: code === 1000 }); } } @@ -140,7 +141,7 @@ class TestTransport { JSON.stringify({ jsonrpc: "2.0", id: message.id, - result: {capabilities: {}}, + result: { capabilities: {} }, }), ); }); @@ -168,7 +169,7 @@ beforeEach(() => { originalWebSocket = globalThis.WebSocket; globalThis.WebSocket = TestWebSocket; TestWebSocket.instances = []; - registerRuntimeProvider(externalWebSocketRuntimeProvider, {replace: true}); + registerRuntimeProvider(externalWebSocketRuntimeProvider, { replace: true }); registry.servers = [ { id: SERVER_ID, @@ -182,7 +183,7 @@ beforeEach(() => { }, }, ]; - view = new EditorView({doc: "fn main() {}", parent: document.body}); + view = new EditorView({ doc: "fn main() {}", parent: document.body }); }); afterEach(async () => { @@ -211,13 +212,13 @@ describe("LSP client idle lifecycle", () => { .find((message) => message.method === "initialize"); expect(initialize.params.capabilities.textDocument.codeAction).toEqual({ dataSupport: true, - resolveSupport: {properties: ["edit"]}, + resolveSupport: { properties: ["edit"] }, }); }); it("reuses an external WebSocket client when a file attaches during the grace period", async () => { - const onClientIdle = vi.fn(({dispose}) => void dispose()); - manager = new LspClientManager({onClientIdle}); + const onClientIdle = vi.fn(({ dispose }) => void dispose()); + manager = new LspClientManager({ onClientIdle }); const rootUri = "file:///workspace"; await manager.getExtensionsForFile({ @@ -245,8 +246,8 @@ describe("LSP client idle lifecycle", () => { }); it("disposes an unused external WebSocket client after the grace period", async () => { - const onClientIdle = vi.fn(({dispose}) => void dispose()); - manager = new LspClientManager({onClientIdle}); + const onClientIdle = vi.fn(({ dispose }) => void dispose()); + manager = new LspClientManager({ onClientIdle }); const rootUri = "file:///workspace-one"; const uri = `${rootUri}/only.rs`; @@ -291,11 +292,11 @@ describe("LSP client idle lifecycle", () => { }; }, }, - {replace: true}, + { replace: true }, ); registry.servers[0].runtimes = [TRANSPORT_RUNTIME_ID]; - const onClientIdle = vi.fn(({dispose}) => void dispose()); - manager = new LspClientManager({onClientIdle}); + const onClientIdle = vi.fn(({ dispose }) => void dispose()); + manager = new LspClientManager({ onClientIdle }); const rootUri = "file:///workspace"; const uri = `${rootUri}/only.rs`; diff --git a/tests/unit/lspLocationUtils.test.ts b/tests/unit/lspLocationUtils.test.ts index 8a006dd372..743b15fcf3 100644 --- a/tests/unit/lspLocationUtils.test.ts +++ b/tests/unit/lspLocationUtils.test.ts @@ -30,9 +30,7 @@ describe("normalizeLocations", () => { it("falls back to the LocationLink target range", () => { expect( - normalizeLocations([ - { targetUri: "file:///project/a.ts", targetRange }, - ]), + normalizeLocations([{ targetUri: "file:///project/a.ts", targetRange }]), ).toEqual([{ uri: "file:///project/a.ts", range: targetRange }]); }); }); diff --git a/tests/unit/lspMultiClient.test.js b/tests/unit/lspMultiClient.test.js index d118a31340..d56e791c2e 100644 --- a/tests/unit/lspMultiClient.test.js +++ b/tests/unit/lspMultiClient.test.js @@ -1,16 +1,16 @@ // @vitest-environment happy-dom -import {CompletionContext} from "@codemirror/autocomplete"; -import {forEachDiagnostic} from "@codemirror/lint"; -import {Compartment} from "@codemirror/state"; -import {EditorView} from "@codemirror/view"; +import { CompletionContext } from "@codemirror/autocomplete"; +import { forEachDiagnostic } from "@codemirror/lint"; import { LSPClient, LSPPlugin, - Workspace, serverCompletionSource, serverDiagnostics, + Workspace, } from "@codemirror/lsp-client"; +import { Compartment } from "@codemirror/state"; +import { EditorView } from "@codemirror/view"; import { getLspDiagnostics, lspDiagnosticsAutoSyncExtension, @@ -18,7 +18,7 @@ import { lspDiagnosticsUiExtension, schedulePullDiagnostics, } from "cm/lsp/diagnostics"; -import {afterEach, describe, expect, it, vi} from "vitest"; +import { afterEach, describe, expect, it, vi } from "vitest"; const views = []; @@ -67,14 +67,16 @@ class TestWorkspace extends Workspace { file.doc = changes.apply(prevDoc); file.version++; plugin.clear(); - updates.push({file, prevDoc, changes}); + updates.push({ file, prevDoc, changes }); } return updates; } } function client() { - return new LSPClient({workspace: (lspClient) => new TestWorkspace(lspClient)}); + return new LSPClient({ + workspace: (lspClient) => new TestWorkspace(lspClient), + }); } function editor(doc, extensions) { @@ -93,10 +95,10 @@ describe("multiple LSP clients on one editor", () => { const supplemental = client(); const bindings = new Compartment(); const uri = "file:///workspace/example.ts"; - const primaryBinding = primary.plugin(uri, "typescript", {priority: 100}); + const primaryBinding = primary.plugin(uri, "typescript", { priority: 100 }); const supplementalBinding = supplemental.plugin(uri, "typescript", { priority: 20, - features: {formatting: false, rename: false}, + features: { formatting: false, rename: false }, }); const view = editor( "const value = 1", @@ -110,23 +112,29 @@ describe("multiple LSP clients on one editor", () => { expect(LSPPlugin.getForFeature(view, "formatting")?.client).toBe(primary); expect(LSPPlugin.get(view, supplemental)?.client).toBe(supplemental); - view.dispatch({changes: {from: view.state.doc.length, insert: ";"}}); + view.dispatch({ changes: { from: view.state.doc.length, insert: ";" } }); const firstText = view.state.doc.toString(); - expect(LSPPlugin.get(view, primary).unsyncedChanges.apply( - primary.workspace.files[0].doc, - ).toString()).toBe(firstText); - expect(LSPPlugin.get(view, supplemental).unsyncedChanges.apply( - supplemental.workspace.files[0].doc, - ).toString()).toBe(firstText); + expect( + LSPPlugin.get(view, primary) + .unsyncedChanges.apply(primary.workspace.files[0].doc) + .toString(), + ).toBe(firstText); + expect( + LSPPlugin.get(view, supplemental) + .unsyncedChanges.apply(supplemental.workspace.files[0].doc) + .toString(), + ).toBe(firstText); expect(primary.workspace.syncFiles()).toHaveLength(1); expect(LSPPlugin.get(view, primary).unsyncedChanges.empty).toBe(true); expect(LSPPlugin.get(view, supplemental).unsyncedChanges.empty).toBe(false); - view.dispatch({changes: {from: 0, insert: "export "}}); - expect(LSPPlugin.get(view, supplemental).unsyncedChanges.apply( - supplemental.workspace.files[0].doc, - ).toString()).toBe(view.state.doc.toString()); + view.dispatch({ changes: { from: 0, insert: "export " } }); + expect( + LSPPlugin.get(view, supplemental) + .unsyncedChanges.apply(supplemental.workspace.files[0].doc) + .toString(), + ).toBe(view.state.doc.toString()); expect(supplemental.workspace.syncFiles()).toHaveLength(1); expect(LSPPlugin.get(view, supplemental).unsyncedChanges.empty).toBe(true); @@ -147,21 +155,27 @@ describe("multiple LSP clients on one editor", () => { const primary = client(); const supplemental = client(); const failing = client(); - primary.serverCapabilities = {completionProvider: {}}; - supplemental.serverCapabilities = {completionProvider: {}}; - failing.serverCapabilities = {completionProvider: {}}; + primary.serverCapabilities = { completionProvider: {} }; + supplemental.serverCapabilities = { completionProvider: {} }; + failing.serverCapabilities = { completionProvider: {} }; primary.sync = vi.fn(); supplemental.sync = vi.fn(); failing.sync = vi.fn(); - primary.request = vi.fn().mockResolvedValue([ - {label: "typescriptItem", detail: "TypeScript"}, - {label: "sharedItem"}, - ]); - supplemental.request = vi.fn().mockResolvedValue([ - {label: "tailwindItem", detail: "Tailwind CSS"}, - {label: "sharedItem"}, - ]); - failing.request = vi.fn().mockRejectedValue(new Error("server unavailable")); + primary.request = vi + .fn() + .mockResolvedValue([ + { label: "typescriptItem", detail: "TypeScript" }, + { label: "sharedItem" }, + ]); + supplemental.request = vi + .fn() + .mockResolvedValue([ + { label: "tailwindItem", detail: "Tailwind CSS" }, + { label: "sharedItem" }, + ]); + failing.request = vi + .fn() + .mockRejectedValue(new Error("server unavailable")); const view = editor("di", [ primary.plugin("file:///workspace/example.tsx", "typescriptreact", { @@ -192,30 +206,34 @@ describe("multiple LSP clients on one editor", () => { expect(failing.request).toHaveBeenCalledOnce(); expect(warn).toHaveBeenCalledWith( "[lsp] Completion provider failed", - expect.objectContaining({message: "server unavailable"}), + expect.objectContaining({ message: "server unavailable" }), ); }); it("does not query a client when completion is disabled for its binding", async () => { const primary = client(); const diagnosticsOnly = client(); - primary.serverCapabilities = {completionProvider: {}}; - diagnosticsOnly.serverCapabilities = {completionProvider: {}}; + primary.serverCapabilities = { completionProvider: {} }; + diagnosticsOnly.serverCapabilities = { completionProvider: {} }; primary.sync = vi.fn(); diagnosticsOnly.sync = vi.fn(); - primary.request = vi.fn().mockResolvedValue([{label: "primaryItem"}]); - diagnosticsOnly.request = vi.fn().mockResolvedValue([{label: "wrongItem"}]); + primary.request = vi.fn().mockResolvedValue([{ label: "primaryItem" }]); + diagnosticsOnly.request = vi + .fn() + .mockResolvedValue([{ label: "wrongItem" }]); const view = editor("x", [ primary.plugin("file:///workspace/example.ts", "typescript"), diagnosticsOnly.plugin("file:///workspace/example.ts", "typescript", { - features: {completion: false}, + features: { completion: false }, }), ]); const result = await serverCompletionSource( new CompletionContext(view.state, 1, true, view), ); - expect(result.options.map((option) => option.label)).toEqual(["primaryItem"]); + expect(result.options.map((option) => option.label)).toEqual([ + "primaryItem", + ]); expect(diagnosticsOnly.request).not.toHaveBeenCalled(); }); @@ -236,8 +254,8 @@ describe("multiple LSP clients on one editor", () => { message, severity: 2, range: { - start: {line: 0, character}, - end: {line: 0, character: character + 1}, + start: { line: 0, character }, + end: { line: 0, character: character + 1 }, }, }); @@ -275,7 +293,7 @@ describe("multiple LSP clients on one editor", () => { const view = editor("const x = 1", [ enabled.plugin(uri, "typescript"), disabled.plugin(uri, "typescript", { - features: {diagnostics: false}, + features: { diagnostics: false }, }), lspDiagnosticsAutoSyncExtension(), ]); @@ -284,7 +302,7 @@ describe("multiple LSP clients on one editor", () => { expect(enabled.sync).toHaveBeenCalledOnce(); expect(disabled.sync).not.toHaveBeenCalled(); - view.dispatch({changes: {from: view.state.doc.length, insert: ";"}}); + view.dispatch({ changes: { from: view.state.doc.length, insert: ";" } }); await vi.advanceTimersByTimeAsync(500); expect(enabled.sync).toHaveBeenCalledTimes(2); expect(disabled.sync).not.toHaveBeenCalled(); @@ -292,12 +310,12 @@ describe("multiple LSP clients on one editor", () => { it("rejects pull and push diagnostics from a disabled provider", () => { const disabled = client(); - disabled.serverCapabilities = {diagnosticProvider: {}}; + disabled.serverCapabilities = { diagnosticProvider: {} }; disabled.request = vi.fn(); const uri = "file:///workspace/example.ts"; const view = editor("const x = 1", [ disabled.plugin(uri, "typescript", { - features: {diagnostics: false}, + features: { diagnostics: false }, }), lspDiagnosticsUiExtension(false), ]); @@ -317,8 +335,8 @@ describe("multiple LSP clients on one editor", () => { message: "must stay hidden", severity: 2, range: { - start: {line: 0, character: 6}, - end: {line: 0, character: 7}, + start: { line: 0, character: 6 }, + end: { line: 0, character: 7 }, }, }, ], diff --git a/tests/unit/lspTailwindServer.test.js b/tests/unit/lspTailwindServer.test.js index 3ba677e859..1e72fb4ba9 100644 --- a/tests/unit/lspTailwindServer.test.js +++ b/tests/unit/lspTailwindServer.test.js @@ -1,5 +1,5 @@ -import { describe, expect, it } from "vitest"; import { tailwindServers } from "cm/lsp/servers/tailwind"; +import { describe, expect, it } from "vitest"; describe("built-in Tailwind CSS language server", () => { it("is available but disabled by default", () => { diff --git a/tests/unit/lspWorkspaceFolders.test.js b/tests/unit/lspWorkspaceFolders.test.js index e5e8db62d1..29e9da15cd 100644 --- a/tests/unit/lspWorkspaceFolders.test.js +++ b/tests/unit/lspWorkspaceFolders.test.js @@ -1,11 +1,11 @@ // @vitest-environment happy-dom -import { describe, expect, it } from "vitest"; import { addJsTsLanguageAliases, isTailwindCssServer, resolveJsTsLanguageId, } from "cm/lsp/servers/shared"; +import { describe, expect, it } from "vitest"; describe("Tailwind document language IDs", () => { it("recognizes a custom server and supplies its standard aliases", () => { diff --git a/tests/unit/modelist.test.js b/tests/unit/modelist.test.js index 30fece6351..ada2cb3821 100644 --- a/tests/unit/modelist.test.js +++ b/tests/unit/modelist.test.js @@ -1,11 +1,6 @@ import { afterEach, describe, expect, it } from "vitest"; import "cm/supportedModes"; -import { - addMode, - getModeForPath, - getModes, - removeMode, -} from "cm/modelist"; +import { addMode, getModeForPath, getModes, removeMode } from "cm/modelist"; function getModeSpecificityScore(modeInstance) { if (modeInstance.name.toLowerCase() === "text") { @@ -122,9 +117,7 @@ function collectParityPaths() { source.endsWith("$") && !/[|()[*+?]/.test(source.slice(1, -1).replace(/\\./g, "")) ) { - const name = source - .slice(1, -1) - .replace(/\\(.)/g, "$1"); + const name = source.slice(1, -1).replace(/\\(.)/g, "$1"); if (name) paths.add(name); } } diff --git a/tests/unit/nativeSearchProcessing.test.js b/tests/unit/nativeSearchProcessing.test.js index 752bc04bf5..5a12c20570 100644 --- a/tests/unit/nativeSearchProcessing.test.js +++ b/tests/unit/nativeSearchProcessing.test.js @@ -1,7 +1,7 @@ -import { readFileSync, mkdtempSync, writeFileSync, rmSync } from "node:fs"; +import { spawnSync } from "node:child_process"; +import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; -import { spawnSync } from "node:child_process"; import { expect, it } from "vitest"; const hasJava = spawnSync("javac", ["-version"]).status === 0; diff --git a/tests/unit/openFileCancellation.test.js b/tests/unit/openFileCancellation.test.js index 231996249f..80f4d4b0d9 100644 --- a/tests/unit/openFileCancellation.test.js +++ b/tests/unit/openFileCancellation.test.js @@ -86,7 +86,8 @@ describe("openFile cancellation", () => { const exports = {}; new Function("require", "exports", "editorManager", outputText)( (name) => { - if (!(name in dependencies)) throw new Error(`Unexpected import: ${name}`); + if (!(name in dependencies)) + throw new Error(`Unexpected import: ${name}`); return dependencies[name]; }, exports, @@ -112,21 +113,18 @@ describe("openFile cancellation", () => { "pptx", "ppsx", "potx", - ])( - "requires a handler for external %s documents using the provider filename", - async (extension) => { - stat.mockResolvedValue({ - name: `Document.${extension.toUpperCase()}`, - canWrite: false, - }); - await expect( - openFile("content://provider/42", { external: true }), - ).rejects.toMatchObject({ code: "DOCUMENT_HANDLER_UNAVAILABLE" }); - expect(readFile).not.toHaveBeenCalled(); - expect(createEditor).not.toHaveBeenCalled(); - expect(loaderVisible).toBe(false); - }, - ); + ])("requires a handler for external %s documents using the provider filename", async (extension) => { + stat.mockResolvedValue({ + name: `Document.${extension.toUpperCase()}`, + canWrite: false, + }); + await expect( + openFile("content://provider/42", { external: true }), + ).rejects.toMatchObject({ code: "DOCUMENT_HANDLER_UNAVAILABLE" }); + expect(readFile).not.toHaveBeenCalled(); + expect(createEditor).not.toHaveBeenCalled(); + expect(loaderVisible).toBe(false); + }); it("routes granted read-only documents and propagates handler failures instead of decoding bytes", async () => { const handleFile = vi.fn(async () => {}); @@ -169,27 +167,24 @@ describe("openFile cancellation", () => { "application/vnd.openxmlformats-officedocument.presentationml.template", ], ["archive.zip", "type", "text/plain"], - ])( - "rejects external binary %s before reading or decoding", - async (name, field, mime) => { - stat.mockResolvedValue({ - name, - [field]: mime, - canWrite: true, - url: "content://provider/42", - }); - await expect( - openFile("content://provider/42", { external: true }), - ).rejects.toMatchObject({ - message: "Unsupported file", - filename: name, - }); - expect(readFile).not.toHaveBeenCalled(); - expect(decode).not.toHaveBeenCalled(); - expect(createEditor).not.toHaveBeenCalled(); - expect(loaderVisible).toBe(false); - }, - ); + ])("rejects external binary %s before reading or decoding", async (name, field, mime) => { + stat.mockResolvedValue({ + name, + [field]: mime, + canWrite: true, + url: "content://provider/42", + }); + await expect( + openFile("content://provider/42", { external: true }), + ).rejects.toMatchObject({ + message: "Unsupported file", + filename: name, + }); + expect(readFile).not.toHaveBeenCalled(); + expect(decode).not.toHaveBeenCalled(); + expect(createEditor).not.toHaveBeenCalled(); + expect(loaderVisible).toBe(false); + }); it.each([ ["README", "text/plain"], @@ -197,15 +192,12 @@ describe("openFile cancellation", () => { ["plain.txt", "application/octet-stream"], ["plain.csv", "application/octet-stream"], ["plain.tsv", "application/octet-stream"], - ])( - "retains the normal %s editor fallback for incoming files", - async (name, type) => { - stat.mockResolvedValue({ name, type, url: "content://provider/plain" }); - await openFile("content://provider/plain", { external: true }); - expect(createEditor).toHaveBeenCalledOnce(); - expect(manager.activeFile.text).toBe("target text"); - }, - ); + ])("retains the normal %s editor fallback for incoming files", async (name, type) => { + stat.mockResolvedValue({ name, type, url: "content://provider/plain" }); + await openFile("content://provider/plain", { external: true }); + expect(createEditor).toHaveBeenCalledOnce(); + expect(manager.activeFile.text).toBe("target text"); + }); it("preserves handlers and internal opens for extensionless files with binary metadata", async () => { stat.mockResolvedValue({ @@ -246,33 +238,35 @@ describe("openFile cancellation", () => { expect(file.makeActive).not.toHaveBeenCalled(); }); - it.each(["stat", "read", "detect", "decode"])( - "does not steal focus when cancelled during %s", - async (stage) => { - const waiting = deferred(); - const operation = { stat, read: readFile, detect: detectEncoding, decode }[ - stage - ]; - operation.mockReturnValueOnce(waiting.promise); - const opening = openFile("obsolete", { - render: true, - signal: controller.signal, - }); - await vi.waitFor(() => expect(operation).toHaveBeenCalledOnce()); - controller.abort(); + it.each([ + "stat", + "read", + "detect", + "decode", + ])("does not steal focus when cancelled during %s", async (stage) => { + const waiting = deferred(); + const operation = { stat, read: readFile, detect: detectEncoding, decode }[ + stage + ]; + operation.mockReturnValueOnce(waiting.promise); + const opening = openFile("obsolete", { + render: true, + signal: controller.signal, + }); + await vi.waitFor(() => expect(operation).toHaveBeenCalledOnce()); + controller.abort(); - // A newer open completes before the obsolete filesystem work does. - await openFile("latest", { render: true }); - const latest = manager.activeFile; - waiting.resolve( - stage === "stat" ? { name: "obsolete.txt", length: 10 } : "text", - ); - await opening; - expect(manager.activeFile).toBe(latest); - expect(createEditor).toHaveBeenCalledOnce(); - expect(recents.addFile).toHaveBeenCalledExactlyOnceWith("latest"); - }, - ); + // A newer open completes before the obsolete filesystem work does. + await openFile("latest", { render: true }); + const latest = manager.activeFile; + waiting.resolve( + stage === "stat" ? { name: "obsolete.txt", length: 10 } : "text", + ); + await opening; + expect(manager.activeFile).toBe(latest); + expect(createEditor).toHaveBeenCalledOnce(); + expect(recents.addFile).toHaveBeenCalledExactlyOnceWith("latest"); + }); it("guards a custom handler's delayed createEditor callback", async () => { const waiting = deferred(); @@ -311,24 +305,23 @@ describe("openFile cancellation", () => { expect(loaderVisible).toBe(false); }); - it.each([0, 1])( - "keeps the indicator until both concurrent opens finish (first to finish: %s)", - async (first) => { - const reads = [deferred(), deferred()]; - readFile.mockReturnValueOnce(reads[0].promise); - readFile.mockReturnValueOnce(reads[1].promise); - const opens = [openFile("one"), openFile("two")]; - await vi.waitFor(() => expect(readFile).toHaveBeenCalledTimes(2)); - reads[first].resolve("bytes"); - await opens[first]; - expect(loaderVisible).toBe(true); - expect(titleLoader.removeTitleLoader).not.toHaveBeenCalled(); - reads[1 - first].resolve("bytes"); - await opens[1 - first]; - expect(loaderVisible).toBe(false); - expect(titleLoader.removeTitleLoader).toHaveBeenCalledOnce(); - }, - ); + it.each([ + 0, 1, + ])("keeps the indicator until both concurrent opens finish (first to finish: %s)", async (first) => { + const reads = [deferred(), deferred()]; + readFile.mockReturnValueOnce(reads[0].promise); + readFile.mockReturnValueOnce(reads[1].promise); + const opens = [openFile("one"), openFile("two")]; + await vi.waitFor(() => expect(readFile).toHaveBeenCalledTimes(2)); + reads[first].resolve("bytes"); + await opens[first]; + expect(loaderVisible).toBe(true); + expect(titleLoader.removeTitleLoader).not.toHaveBeenCalled(); + reads[1 - first].resolve("bytes"); + await opens[1 - first]; + expect(loaderVisible).toBe(false); + expect(titleLoader.removeTitleLoader).toHaveBeenCalledOnce(); + }); it("releases a cancelled open's loader without waiting for its read", async () => { const reading = deferred(); diff --git a/tests/unit/path.test.js b/tests/unit/path.test.js index d465d0d7cc..ba142f15d5 100644 --- a/tests/unit/path.test.js +++ b/tests/unit/path.test.js @@ -1,5 +1,5 @@ -import { describe, expect, it } from "vitest"; import Path from "utils/Path"; +import { describe, expect, it } from "vitest"; describe("Path.dirname", () => { it("returns the parent directory", () => { @@ -72,9 +72,7 @@ describe("Path.join / normalize", () => { describe("Path.resolve", () => { it("resolves relative segments against a base", () => { - expect(Path.resolve("path/to/some/dir/", "../../dir")).toBe( - "/path/to/dir", - ); + expect(Path.resolve("path/to/some/dir/", "../../dir")).toBe("/path/to/dir"); }); it("resets on absolute segments", () => { @@ -115,8 +113,6 @@ describe("Path.isAbsolute / convertToRelative", () => { }); it("computes a path relative to a base", () => { - expect(Path.convertToRelative("/foo/bar", "/foo/baz/qux")).toBe( - "baz/qux", - ); + expect(Path.convertToRelative("/foo/bar", "/foo/baz/qux")).toBe("baz/qux"); }); }); diff --git a/tests/unit/pluginContext.test.js b/tests/unit/pluginContext.test.js index 2523220c99..ddd2e3eca9 100644 --- a/tests/unit/pluginContext.test.js +++ b/tests/unit/pluginContext.test.js @@ -22,6 +22,8 @@ describe("plugin context Cordova bridge", () => { expect(requireModule).toHaveBeenCalledWith("cordova/exec"); expect(cordova.exec).toBeUndefined(); await expect(pluginContext.connect()).resolves.toBe(true); - await expect(pluginContext.default("example.plugin", "{}")).resolves.toBeTruthy(); + await expect( + pluginContext.default("example.plugin", "{}"), + ).resolves.toBeTruthy(); }); }); diff --git a/tests/unit/pluginFileRestoration.test.js b/tests/unit/pluginFileRestoration.test.js index 2f33bf5940..4589c1812a 100644 --- a/tests/unit/pluginFileRestoration.test.js +++ b/tests/unit/pluginFileRestoration.test.js @@ -595,86 +595,87 @@ it("continues resume checks past unavailable, failing, and read-only HTTP provid expect(f.manager.files.every((file) => file.tab)).toBe(true); }); -it.each(["cached text", "", undefined])( - "keeps the loading view for cache %j until the session is ready", - (cached) => { - const source = managerSource; - const body = managerBody; - const names = [ - "showLoadingEditor", - "applyFileToEditor", - "recreateActiveEditorState", - "getRawEditorState", - "isReusableEditorState", - ]; - const editor = new EditorView({ parent: document.body }); - const file = { - type: "editor", - filename: "file.js", - loaded: false, - loading: false, - session: EditorState.create(), - __cmSessionReady: true, - __cmExtensionSignature: "test", - }; - const loadingPreviews = new WeakMap(); - if (cached !== undefined) loadingPreviews.set(file, cached); - const context = vm.createContext({ - editor, - EditorState, - placeholder, - createEditorReadOnlyExtension, - blurEditorIfReadOnly, - loadingPreviews, - manager: { activeFile: file }, - touchSelectionController: null, - themeCompartment: new Compartment(), - languageCompartment: new Compartment(), - lspCompartment: new Compartment(), - readOnlyCompartment: new Compartment(), - getConfiguredThemeExtension: () => [], - getBaseExtensionsFromOptions: () => [], - getEditorExtensionSignature: () => "test", - getFileLanguageSignature: () => "text", - applyCurrentEditorOptions: vi.fn(), - shouldApplyLanguage: () => false, - restoreFileScrollPosition: vi.fn(), - scheduleLspForFile: vi.fn(), - }); - // Run the actual render functions with a real EditorView; omit the unrelated app shell. - vm.runInContext( - body - .filter( - (node) => - node.type === "FunctionDeclaration" && names.includes(node.id.name), - ) - .map((node) => source.slice(node.start, node.end)) - .join("\n"), - context, - ); - try { - const savedSession = file.session; - context.applyFileToEditor(file); - const preview = editor.state; - context.recreateActiveEditorState(); - expect(editor.state).toBe(preview); - context.applyFileToEditor(file, { forceRecreate: true }); - expect(editor.state.doc.toString()).toBe(cached ?? ""); - expect(editor.state.readOnly).toBe(true); - expect(editor.contentDOM.getAttribute("contenteditable")).toBe("false"); - expect( - editor.dom.querySelector(".cm-placeholder")?.textContent ?? null, - ).toBe(cached === undefined ? "Loading file.js..." : null); - expect(file.session).toBe(savedSession); - file.session = EditorState.create({ doc: cached ?? "loaded text" }); - file.loaded = true; - file.loading = false; - context.applyFileToEditor(file); - expect(editor.state).toBe(file.session); - expect(editor.state.readOnly).toBe(false); - expect(editor.dom.querySelector(".cm-placeholder")).toBeNull(); - } finally { - editor.destroy(); - } - }, -); +it.each([ + "cached text", + "", + undefined, +])("keeps the loading view for cache %j until the session is ready", (cached) => { + const source = managerSource; + const body = managerBody; + const names = [ + "showLoadingEditor", + "applyFileToEditor", + "recreateActiveEditorState", + "getRawEditorState", + "isReusableEditorState", + ]; + const editor = new EditorView({ parent: document.body }); + const file = { + type: "editor", + filename: "file.js", + loaded: false, + loading: false, + session: EditorState.create(), + __cmSessionReady: true, + __cmExtensionSignature: "test", + }; + const loadingPreviews = new WeakMap(); + if (cached !== undefined) loadingPreviews.set(file, cached); + const context = vm.createContext({ + editor, + EditorState, + placeholder, + createEditorReadOnlyExtension, + blurEditorIfReadOnly, + loadingPreviews, + manager: { activeFile: file }, + touchSelectionController: null, + themeCompartment: new Compartment(), + languageCompartment: new Compartment(), + lspCompartment: new Compartment(), + readOnlyCompartment: new Compartment(), + getConfiguredThemeExtension: () => [], + getBaseExtensionsFromOptions: () => [], + getEditorExtensionSignature: () => "test", + getFileLanguageSignature: () => "text", + applyCurrentEditorOptions: vi.fn(), + shouldApplyLanguage: () => false, + restoreFileScrollPosition: vi.fn(), + scheduleLspForFile: vi.fn(), + }); + // Run the actual render functions with a real EditorView; omit the unrelated app shell. + vm.runInContext( + body + .filter( + (node) => + node.type === "FunctionDeclaration" && names.includes(node.id.name), + ) + .map((node) => source.slice(node.start, node.end)) + .join("\n"), + context, + ); + try { + const savedSession = file.session; + context.applyFileToEditor(file); + const preview = editor.state; + context.recreateActiveEditorState(); + expect(editor.state).toBe(preview); + context.applyFileToEditor(file, { forceRecreate: true }); + expect(editor.state.doc.toString()).toBe(cached ?? ""); + expect(editor.state.readOnly).toBe(true); + expect(editor.contentDOM.getAttribute("contenteditable")).toBe("false"); + expect( + editor.dom.querySelector(".cm-placeholder")?.textContent ?? null, + ).toBe(cached === undefined ? "Loading file.js..." : null); + expect(file.session).toBe(savedSession); + file.session = EditorState.create({ doc: cached ?? "loaded text" }); + file.loaded = true; + file.loading = false; + context.applyFileToEditor(file); + expect(editor.state).toBe(file.session); + expect(editor.state.readOnly).toBe(false); + expect(editor.dom.querySelector(".cm-placeholder")).toBeNull(); + } finally { + editor.destroy(); + } +}); diff --git a/tests/unit/pluginReview.test.js b/tests/unit/pluginReview.test.js index efb70b1bbc..3e526dcca3 100644 --- a/tests/unit/pluginReview.test.js +++ b/tests/unit/pluginReview.test.js @@ -1,4 +1,3 @@ -import { describe, expect, it } from "vitest"; import { getIntlLocale, getLocaleDirection } from "lib/lang"; import { formatReviewDate, @@ -11,6 +10,7 @@ import { updateReviewStats, validateReviewDraft, } from "pages/plugin/reviewUtils"; +import { describe, expect, it } from "vitest"; describe("plugin review dates", () => { it("formats database timestamps as website-style relative dates", () => { @@ -104,12 +104,12 @@ describe("plugin review ordering", () => { describe("plugin review draft", () => { it("normalizes whitespace and preserves valid votes", () => { - expect(normalizeReviewDraft({ comment: " Very useful ", vote: "1" })).toEqual( - { - comment: "Very useful", - vote: 1, - }, - ); + expect( + normalizeReviewDraft({ comment: " Very useful ", vote: "1" }), + ).toEqual({ + comment: "Very useful", + vote: 1, + }); }); it("supports an upvote without text and validates negative feedback", () => { diff --git a/tests/unit/punctuationWrapping.test.ts b/tests/unit/punctuationWrapping.test.ts index 4bcd3039b4..97c5b24e05 100644 --- a/tests/unit/punctuationWrapping.test.ts +++ b/tests/unit/punctuationWrapping.test.ts @@ -27,13 +27,11 @@ function editor(doc: string) { function breaks(view: EditorView) { const positions: number[] = []; - view.plugin(punctuationWrapping)?.decorations.between( - 0, - view.state.doc.length, - (from) => { + view + .plugin(punctuationWrapping) + ?.decorations.between(0, view.state.doc.length, (from) => { positions.push(from); - }, - ); + }); return positions; } diff --git a/tests/unit/quickToolsAdapter.test.js b/tests/unit/quickToolsAdapter.test.js index a8822177fc..881458d034 100644 --- a/tests/unit/quickToolsAdapter.test.js +++ b/tests/unit/quickToolsAdapter.test.js @@ -1,25 +1,42 @@ -import { describe, it, expect, vi } from "vitest"; +import { describe, expect, it, vi } from "vitest"; import { createQuickToolsAdapterRegistry } from "../../src/lib/quickToolsAdapter"; function setup(resolve) { let tab = { hideQuickTools: true }; const original = tab; const registry = createQuickToolsAdapterRegistry(() => tab, resolve); - let state = { enabled: true, busy: false }, notify; + let state = { enabled: true, busy: false }, + notify; const adapter = { getState: () => state, - canHandle: (action) => action.type !== "command" || action.command === "undo", - subscribe: (fn) => { notify = fn; return vi.fn(); }, + canHandle: (action) => + action.type !== "command" || action.command === "undo", + subscribe: (fn) => { + notify = fn; + return vi.fn(); + }, execute: vi.fn(async () => {}), captureSelection: vi.fn(async () => ({ anchor: 3 })), restoreSelection: vi.fn(async () => {}), - focus: vi.fn(), onError: vi.fn(), cancel: vi.fn(), + focus: vi.fn(), + onError: vi.fn(), + cancel: vi.fn(), }; const dispose = registry.register(tab, adapter); registry.sync(); - return { registry, adapter, original, dispose, - change: (value) => { tab = value; registry.sync(); }, - state: (value) => { state = { ...state, ...value }; notify(); }, + return { + registry, + adapter, + original, + dispose, + change: (value) => { + tab = value; + registry.sync(); + }, + state: (value) => { + state = { ...state, ...value }; + notify(); + }, }; } const insert = { type: "text", text: "x" }; @@ -29,7 +46,9 @@ describe("custom-tab quicktools", () => { it("uses editor availability, preserves configured opt-out for unadapted tabs, and never falls through unsupported actions", async () => { const f = setup(); expect(f.registry.visible()).toBe(true); - expect(f.registry.dispatch({ type: "command", command: "movelinesup" })).toBe(true); + expect( + f.registry.dispatch({ type: "command", command: "movelinesup" }), + ).toBe(true); f.state({ busy: true }); expect(f.registry.visible()).toBe(true); expect(f.registry.available(insert)).toBe(false); @@ -46,82 +65,143 @@ describe("custom-tab quicktools", () => { }); it("captures once before focus moves and preserves sequential repeated input", async () => { const f = setup(); - f.registry.capture(); f.registry.capture(); - for (let i = 0; i < 3; i++) f.registry.dispatch({ type: "text", text: String(i) }); + f.registry.capture(); + f.registry.capture(); + for (let i = 0; i < 3; i++) + f.registry.dispatch({ type: "text", text: String(i) }); await settle(); expect(f.adapter.captureSelection).toHaveBeenCalledOnce(); expect(f.adapter.restoreSelection).toHaveBeenCalledOnce(); - expect(f.adapter.execute.mock.calls.map(([action]) => action.text)).toEqual(["0", "1", "2"]); + expect(f.adapter.execute.mock.calls.map(([action]) => action.text)).toEqual( + ["0", "1", "2"], + ); expect(f.adapter.focus).not.toHaveBeenCalled(); }); it("drops clipboard work and queued repeats after switching away and back", async () => { let finish; - const f = setup(() => new Promise((resolve) => { finish = resolve; })); - f.registry.dispatch(insert); f.registry.dispatch(insert); + const f = setup( + () => + new Promise((resolve) => { + finish = resolve; + }), + ); + f.registry.dispatch(insert); + f.registry.dispatch(insert); await settle(); - f.change({ type: "editor" }); f.change(f.original); + f.change({ type: "editor" }); + f.change(f.original); finish(insert); await settle(); expect(f.adapter.execute).not.toHaveBeenCalled(); }); it("cancels pending selection restoration when a dialog opens or the adapter closes", async () => { for (const close of [false, true]) { - const f = setup(); let finish; - f.adapter.captureSelection.mockImplementation(() => new Promise((resolve) => { finish = resolve; })); - f.registry.capture(); f.registry.dispatch(insert); + const f = setup(); + let finish; + f.adapter.captureSelection.mockImplementation( + () => + new Promise((resolve) => { + finish = resolve; + }), + ); + f.registry.capture(); + f.registry.dispatch(insert); + await settle(); + if (close) f.dispose(); + else f.registry.setBlocked(true); + finish({ anchor: 3 }); await settle(); - if (close) f.dispose(); else f.registry.setBlocked(true); - finish({ anchor: 3 }); await settle(); expect(f.adapter.restoreSelection).not.toHaveBeenCalled(); expect(f.adapter.execute).not.toHaveBeenCalled(); } }); it("isolates two custom tabs and makes stale cleanup harmless", async () => { - const f = setup(); const second = { hideQuickTools: true }, execute = vi.fn(); + const f = setup(); + const second = { hideQuickTools: true }, + execute = vi.fn(); f.registry.register(second, { ...f.adapter, execute }); - f.change(second); f.registry.dispatch(insert); await settle(); + f.change(second); + f.registry.dispatch(insert); + await settle(); expect(execute).toHaveBeenCalledOnce(); expect(f.adapter.execute).not.toHaveBeenCalled(); - f.dispose(); f.dispose(); + f.dispose(); + f.dispose(); expect(f.registry.has(second)).toBe(true); }); it("starts a fresh queue after cancellation even if the old clipboard never resolves", async () => { let first = true; - const f = setup(action => { if (first) { first = false; return new Promise(() => {}); } return action; }); - f.registry.dispatch(insert); await settle(); - f.change({ type: "editor" }); f.change(f.original); - f.registry.dispatch(insert); await settle(); + const f = setup((action) => { + if (first) { + first = false; + return new Promise(() => {}); + } + return action; + }); + f.registry.dispatch(insert); + await settle(); + f.change({ type: "editor" }); + f.change(f.original); + f.registry.dispatch(insert); + await settle(); expect(f.adapter.execute).toHaveBeenCalledOnce(); }); it("captures the updated caret for rapid taps and cancels deferred focus", async () => { - const f = setup(); let caret = 0; + const f = setup(); + let caret = 0; f.adapter.captureSelection.mockImplementation(async () => caret); - f.adapter.restoreSelection.mockImplementation(async (value) => { caret = value; }); - f.adapter.execute.mockImplementation(async () => { caret++; }); - for (let i = 0; i < 4; i++) { f.registry.capture(); f.registry.dispatch(insert); } - await settle(); expect(caret).toBe(4); - f.registry.focus(); f.registry.cancel(); await settle(); + f.adapter.restoreSelection.mockImplementation(async (value) => { + caret = value; + }); + f.adapter.execute.mockImplementation(async () => { + caret++; + }); + for (let i = 0; i < 4; i++) { + f.registry.capture(); + f.registry.dispatch(insert); + } + await settle(); + expect(caret).toBe(4); + f.registry.focus(); + f.registry.cancel(); + await settle(); expect(f.adapter.focus).not.toHaveBeenCalled(); }); it("discards unused captures without cancelling an already queued edit", async () => { - const f = setup(); let finish, caret = 3; + const f = setup(); + let finish, + caret = 3; f.adapter.captureSelection.mockImplementation(() => caret); - f.adapter.restoreSelection.mockImplementation(value => { caret = value; }); - f.adapter.execute.mockImplementationOnce(() => new Promise(resolve => { finish = resolve; })); - f.registry.capture(); f.registry.dispatch(insert); + f.adapter.restoreSelection.mockImplementation((value) => { + caret = value; + }); + f.adapter.execute.mockImplementationOnce( + () => + new Promise((resolve) => { + finish = resolve; + }), + ); + f.registry.capture(); + f.registry.dispatch(insert); await settle(); const signal = f.adapter.execute.mock.calls[0][1].signal; - f.registry.capture(); f.registry.discardCapture(); - finish(); await settle(); + f.registry.capture(); + f.registry.discardCapture(); + finish(); + await settle(); caret = 20; - f.registry.capture(); f.registry.dispatch(insert); + f.registry.capture(); + f.registry.dispatch(insert); await settle(); expect(f.adapter.restoreSelection.mock.calls).toEqual([[3], [20]]); expect(f.adapter.execute).toHaveBeenCalledTimes(2); expect(signal.aborted).toBe(false); expect(f.adapter.cancel).not.toHaveBeenCalled(); }); - it.each([{ busy: true }, { enabled: false }])("guards cancellation that publishes state %o and permits later cancellation", async (state) => { + it.each([ + { busy: true }, + { enabled: false }, + ])("guards cancellation that publishes state %o and permits later cancellation", async (state) => { const f = setup(); f.registry.dispatch(insert); await settle(); @@ -139,10 +219,11 @@ describe("custom-tab quicktools", () => { }); it("releases the cancellation guard if the plugin throws", () => { const f = setup(); - f.adapter.cancel.mockImplementationOnce(() => { throw Error("plugin failure"); }); + f.adapter.cancel.mockImplementationOnce(() => { + throw Error("plugin failure"); + }); expect(() => f.registry.cancel()).toThrow("plugin failure"); expect(() => f.registry.cancel()).not.toThrow(); expect(f.adapter.cancel).toHaveBeenCalledTimes(2); }); - }); diff --git a/tests/unit/quickToolsModifierInput.test.ts b/tests/unit/quickToolsModifierInput.test.ts index 48742f7752..790e5854cb 100644 --- a/tests/unit/quickToolsModifierInput.test.ts +++ b/tests/unit/quickToolsModifierInput.test.ts @@ -7,12 +7,12 @@ import { } from "@codemirror/language"; import { EditorState } from "@codemirror/state"; import { EditorView } from "@codemirror/view"; -import { afterEach, describe, expect, it } from "vitest"; import quickToolsModifierInput, { isSelectedRangeDeletion, - setQuickToolsModifierInputHandler, type QuickToolsModifierInputContext, + setQuickToolsModifierInputHandler, } from "cm/quickToolsModifierInput"; +import { afterEach, describe, expect, it } from "vitest"; function createView( doc = "abcdef", @@ -46,13 +46,7 @@ function applyInput( const handled = view.state .facet(EditorView.inputHandler) .some((handler) => - handler( - view, - input.from, - input.to, - input.text, - defaultInsert, - ), + handler(view, input.from, input.to, input.text, defaultInsert), ); if (!handled) view.dispatch(defaultInsert()); return handled; @@ -67,20 +61,20 @@ describe("quick-tools modifier input", () => { it("recognizes only empty changes that cover the active selection", () => { const { view } = createView(); - expect( - isSelectedRangeDeletion(view, { from: 1, to: 4, text: "" }), - ).toBe(true); - expect( - isSelectedRangeDeletion(view, { from: 2, to: 4, text: "" }), - ).toBe(false); - expect( - isSelectedRangeDeletion(view, { from: 1, to: 4, text: "c" }), - ).toBe(false); + expect(isSelectedRangeDeletion(view, { from: 1, to: 4, text: "" })).toBe( + true, + ); + expect(isSelectedRangeDeletion(view, { from: 2, to: 4, text: "" })).toBe( + false, + ); + expect(isSelectedRangeDeletion(view, { from: 1, to: 4, text: "c" })).toBe( + false, + ); view.dispatch({ selection: { anchor: 2 } }); - expect( - isSelectedRangeDeletion(view, { from: 1, to: 4, text: "" }), - ).toBe(false); + expect(isSelectedRangeDeletion(view, { from: 1, to: 4, text: "" })).toBe( + false, + ); view.destroy(); }); @@ -102,17 +96,13 @@ describe("quick-tools modifier input", () => { return true; }); - expect(applyInput(view, { from: 0, to: doc.length, text: "" })).toBe( - true, - ); + expect(applyInput(view, { from: 0, to: doc.length, text: "" })).toBe(true); expect(view.state.doc.toString()).toBe(doc); expect(view.state.selection.main.from).toBe(0); expect(view.state.selection.main.to).toBe(doc.length); expect(ctrlArmed).toBe(true); - expect(applyInput(view, { from: 0, to: doc.length, text: "c" })).toBe( - true, - ); + expect(applyInput(view, { from: 0, to: doc.length, text: "c" })).toBe(true); expect(copied).toBe(doc); expect(view.state.doc.toString()).toBe(doc); expect(view.state.selection.main.from).toBe(0); @@ -137,9 +127,9 @@ describe("quick-tools modifier input", () => { view.focus(); await new Promise((resolve) => setTimeout(resolve, 10)); const startState = view.state; - const stringSpan = Array.from(view.contentDOM.querySelectorAll("span")).find( - (element) => element.textContent?.includes("codemirror"), - ); + const stringSpan = Array.from( + view.contentDOM.querySelectorAll("span"), + ).find((element) => element.textContent?.includes("codemirror")); const textNode = stringSpan?.firstChild; expect(textNode).not.toBeNull(); diff --git a/tests/unit/quickToolsOverlays.test.js b/tests/unit/quickToolsOverlays.test.js index 99898b88f9..882fa7bd15 100644 --- a/tests/unit/quickToolsOverlays.test.js +++ b/tests/unit/quickToolsOverlays.test.js @@ -5,6 +5,7 @@ import { hasQuickToolsOverlay, watchQuickToolsOverlays, } from "../../src/lib/quickToolsOverlays"; + let dispose; afterEach(() => { dispose?.(); diff --git a/tests/unit/quickToolsState.test.js b/tests/unit/quickToolsState.test.js index 8b0981d3e4..b52536172c 100644 --- a/tests/unit/quickToolsState.test.js +++ b/tests/unit/quickToolsState.test.js @@ -1,4 +1,3 @@ -import { describe, expect, it } from "vitest"; import { clearModifierState, clearQuickToolsButtonFeedback, @@ -6,6 +5,7 @@ import { removeActionStackEntries, shouldCaptureModifierInput, } from "handlers/quickToolsState"; +import { describe, expect, it } from "vitest"; describe("shouldCaptureModifierInput", () => { const modifiers = (overrides = {}) => ({ @@ -17,35 +17,33 @@ describe("shouldCaptureModifierInput", () => { }); it("captures command modifiers outside CodeMirror", () => { - expect( - shouldCaptureModifierInput(modifiers({ shift: true }), false), - ).toBe(true); - expect( - shouldCaptureModifierInput(modifiers({ ctrl: true }), false), - ).toBe(true); + expect(shouldCaptureModifierInput(modifiers({ shift: true }), false)).toBe( + true, + ); + expect(shouldCaptureModifierInput(modifiers({ ctrl: true }), false)).toBe( + true, + ); }); it("keeps Shift-only text in CodeMirror", () => { - expect( - shouldCaptureModifierInput(modifiers({ shift: true }), true), - ).toBe(false); + expect(shouldCaptureModifierInput(modifiers({ shift: true }), true)).toBe( + false, + ); }); - it.each(["ctrl", "alt", "meta"])( - "captures CodeMirror input when %s is active", - (key) => { - expect( - shouldCaptureModifierInput(modifiers({ [key]: true }), true), - ).toBe(true); - }, - ); + it.each([ + "ctrl", + "alt", + "meta", + ])("captures CodeMirror input when %s is active", (key) => { + expect(shouldCaptureModifierInput(modifiers({ [key]: true }), true)).toBe( + true, + ); + }); it("captures Shift combined with a command modifier", () => { expect( - shouldCaptureModifierInput( - modifiers({ shift: true, ctrl: true }), - true, - ), + shouldCaptureModifierInput(modifiers({ shift: true, ctrl: true }), true), ).toBe(true); }); diff --git a/tests/unit/readOnlyQuickToolsCapture.test.ts b/tests/unit/readOnlyQuickToolsCapture.test.ts index c11395c90e..366e1dfa79 100644 --- a/tests/unit/readOnlyQuickToolsCapture.test.ts +++ b/tests/unit/readOnlyQuickToolsCapture.test.ts @@ -1,8 +1,8 @@ -import { describe, expect, it } from "vitest"; import { captureReadOnlyQuickToolsKey, createReadOnlyQuickToolsCaptureSession, } from "handlers/readOnlyQuickToolsCapture"; +import { describe, expect, it } from "vitest"; const modifiers = { shiftKey: false, diff --git a/tests/unit/remoteFilePreview.test.js b/tests/unit/remoteFilePreview.test.js index ed4debcae2..d4faf9b259 100644 --- a/tests/unit/remoteFilePreview.test.js +++ b/tests/unit/remoteFilePreview.test.js @@ -1,5 +1,5 @@ -import { describe, expect, it, vi } from "vitest"; import { readRemoteFilePreview } from "utils/remoteFilePreview"; +import { describe, expect, it, vi } from "vitest"; function createCache({ exists = false, text = "", error = null } = {}) { return { diff --git a/tests/unit/removeAds.test.js b/tests/unit/removeAds.test.js index cb6fecc7a9..7e16bc83ba 100644 --- a/tests/unit/removeAds.test.js +++ b/tests/unit/removeAds.test.js @@ -1,4 +1,5 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; + const mocks = vi.hoisted(() => ({ config: { HAS_PRO: false, BASE_URL: "https://acode.app" }, toast: vi.fn(), @@ -25,7 +26,9 @@ vi.mock("lib/startAd", () => ({ BANNER_SUPPRESSION_REASON: { PRO: "pro" }, setBannerSuppressed: mocks.suppress, })); + import removeAds, { requestProPurchase } from "lib/removeAds"; + let purchaseUpdated; let purchaseError; beforeEach(() => { diff --git a/tests/unit/restoreFiles.test.js b/tests/unit/restoreFiles.test.js index 18a8eee3e9..d312bea7d3 100644 --- a/tests/unit/restoreFiles.test.js +++ b/tests/unit/restoreFiles.test.js @@ -53,18 +53,23 @@ describe("restored file loading", () => { expect(completed).toBe(true); }); - it.each(["ftp", "sftp", "http", "https", "gh", "plugin", "custom"])( - "does not block startup on an unresolved %s tab", - async (protocol) => { - await restoreFiles([ - { - id: "remote", - filename: "remote.js", - uri: `${protocol}://example.com/remote.js`, - }, - ]); + it.each([ + "ftp", + "sftp", + "http", + "https", + "gh", + "plugin", + "custom", + ])("does not block startup on an unresolved %s tab", async (protocol) => { + await restoreFiles([ + { + id: "remote", + filename: "remote.js", + uri: `${protocol}://example.com/remote.js`, + }, + ]); - expect(runtime.instances).toHaveLength(1); - }, - ); + expect(runtime.instances).toHaveLength(1); + }); }); diff --git a/tests/unit/saveCommands.test.js b/tests/unit/saveCommands.test.js index 2576fdf490..a6817bbd8b 100644 --- a/tests/unit/saveCommands.test.js +++ b/tests/unit/saveCommands.test.js @@ -2,73 +2,148 @@ import { expect, it, vi } from "vitest"; import { loadSourceModule } from "../helpers/loadSourceModule"; function setup(files) { - const manager = { files, activeFile: files[0], getFile: id => files.find(file => file.id === id) }; - const toast = vi.fn(), error = vi.fn(); - const dependencies = Object.fromEntries([ - "fileSystem", "@codemirror/commands", "cm/editorReadOnly", "components/sidebar", "dialogs/prompt", "handlers/quickTools", "lib/recents", "utils/color/regex", "utils/Url", "./checkFiles", "./config", "./editorFile", "./lazyImports", "./openFile", "./openFolder", "./run", "./saveState", "./settings", "./showFileInfo", - ].map(id => [id, {}])); - const module = loadSourceModule("src/lib/commands.js", { - ...dependencies, "dialogs/confirm": async () => true, "dialogs/select": async () => "save", "utils/helpers": { error }, - }, { editorManager: manager, strings: {}, toast }); + const manager = { + files, + activeFile: files[0], + getFile: (id) => files.find((file) => file.id === id), + }; + const toast = vi.fn(), + error = vi.fn(); + const dependencies = Object.fromEntries( + [ + "fileSystem", + "@codemirror/commands", + "cm/editorReadOnly", + "components/sidebar", + "dialogs/prompt", + "handlers/quickTools", + "lib/recents", + "utils/color/regex", + "utils/Url", + "./checkFiles", + "./config", + "./editorFile", + "./lazyImports", + "./openFile", + "./openFolder", + "./run", + "./saveState", + "./settings", + "./showFileInfo", + ].map((id) => [id, {}]), + ); + const module = loadSourceModule( + "src/lib/commands.js", + { + ...dependencies, + "dialogs/confirm": async () => true, + "dialogs/select": async () => "save", + "utils/helpers": { error }, + }, + { editorManager: manager, strings: {}, toast }, + ); return { ...module, manager, toast, error }; } function tab(id, type = "docs") { - const file = { id, type, canSave: type === "docs" || type === "editor", isUnsaved: true, remove: vi.fn(async () => true) }; - file.save = vi.fn(async () => { file.isUnsaved = false; return true; }); + const file = { + id, + type, + canSave: type === "docs" || type === "editor", + isUnsaved: true, + remove: vi.fn(async () => true), + }; + file.save = vi.fn(async () => { + file.isUnsaved = false; + return true; + }); file.saveAs = vi.fn(async () => true); file.hasUnsavedChanges = () => file.isUnsaved; return file; } it("routes standard Save and Save As to the captured tab and leaves terminals ineligible", async () => { - const one = tab("one"), two = tab("two"), code = tab("code", "editor"), terminal = tab("terminal", "terminal"); + const one = tab("one"), + two = tab("two"), + code = tab("code", "editor"), + terminal = tab("terminal", "terminal"); const f = setup([one, two, code, terminal]); for (const file of [one, two, code]) { f.manager.activeFile = file; expect(f.canSaveFile(file)).toBe(true); - await f.default.save(); await f.default["save-as"](); - expect(file.save).toHaveBeenCalledOnce(); expect(file.saveAs).toHaveBeenCalledOnce(); + await f.default.save(); + await f.default["save-as"](); + expect(file.save).toHaveBeenCalledOnce(); + expect(file.saveAs).toHaveBeenCalledOnce(); } f.manager.activeFile = terminal; - await f.default.save(); await f.default["save-as"](); + await f.default.save(); + await f.default["save-as"](); expect(terminal.save).not.toHaveBeenCalled(); }); it("does not report custom-tab success on cancellation or failure", async () => { - const file = tab("one"), f = setup([file]); + const file = tab("one"), + f = setup([file]); file.save.mockResolvedValueOnce(false).mockRejectedValueOnce(Error("full")); - await f.default.save(true); await f.default.save(true); - expect(f.toast).not.toHaveBeenCalled(); expect(f.error).toHaveBeenCalledOnce(); - await f.default.save(true); expect(f.toast).toHaveBeenCalledOnce(); + await f.default.save(true); + await f.default.save(true); + expect(f.toast).not.toHaveBeenCalled(); + expect(f.error).toHaveBeenCalledOnce(); + await f.default.save(true); + expect(f.toast).toHaveBeenCalledOnce(); }); it("does not save pending editors or report a cancelled editor save as successful", async () => { - const file = tab("pending", "editor"), f = setup([file]); + const file = tab("pending", "editor"), + f = setup([file]); file.canSave = false; - await f.default.save(true); await f.default["save-as"](true); - expect(file.save).not.toHaveBeenCalled(); expect(file.saveAs).not.toHaveBeenCalled(); + await f.default.save(true); + await f.default["save-as"](true); + expect(file.save).not.toHaveBeenCalled(); + expect(file.saveAs).not.toHaveBeenCalled(); file.canSave = true; - file.save.mockResolvedValue(false); file.saveAs.mockResolvedValue(false); - await f.default.save(true); await f.default["save-as"](true); + file.save.mockResolvedValue(false); + file.saveAs.mockResolvedValue(false); + await f.default.save(true); + await f.default["save-as"](true); expect(f.toast).not.toHaveBeenCalled(); }); it("saves sequentially without clearing flags and stops at cancellation or newer edits", async () => { - const one = tab("one"), two = tab("two"), code = tab("code", "editor"); + const one = tab("one"), + two = tab("two"), + code = tab("code", "editor"); const f = setup([one, two, code]); let release; - one.save.mockImplementationOnce(() => new Promise(resolve => { release = () => { one.isUnsaved = false; resolve(true); }; })); + one.save.mockImplementationOnce( + () => + new Promise((resolve) => { + release = () => { + one.isUnsaved = false; + resolve(true); + }; + }), + ); const saving = f.default["save-all-changes"](); await vi.waitFor(() => expect(one.save).toHaveBeenCalledOnce()); - expect(one.isUnsaved).toBe(true); expect(two.save).not.toHaveBeenCalled(); + expect(one.isUnsaved).toBe(true); + expect(two.save).not.toHaveBeenCalled(); two.save.mockResolvedValueOnce(false); - release(); expect(await saving).toBe(false); - expect(two.isUnsaved).toBe(true); expect(code.save).not.toHaveBeenCalled(); + release(); + expect(await saving).toBe(false); + expect(two.isUnsaved).toBe(true); + expect(code.save).not.toHaveBeenCalled(); two.save.mockResolvedValueOnce(true); // A newer edit remains dirty after the write. expect(await f.default["save-all-changes"]()).toBe(false); expect(code.save).not.toHaveBeenCalled(); expect(await f.default["save-all-changes"]()).toBe(true); expect(code.isUnsaved).toBe(false); }); -it.each([false, true, "failure"])("save-and-close keeps edits after an unsuccessful save (%s)", async outcome => { - const file = tab("one"), f = setup([file]); - if (outcome === "failure") file.save.mockRejectedValueOnce(Error("disk full")); +it.each([ + false, + true, + "failure", +])("save-and-close keeps edits after an unsuccessful save (%s)", async (outcome) => { + const file = tab("one"), + f = setup([file]); + if (outcome === "failure") + file.save.mockRejectedValueOnce(Error("disk full")); else file.save.mockResolvedValueOnce(outcome); const result = f.default["close-all-tabs"](); if (outcome === "failure") await expect(result).rejects.toThrow("disk full"); @@ -77,9 +152,14 @@ it.each([false, true, "failure"])("save-and-close keeps edits after an unsuccess expect(file.isUnsaved).toBe(true); }); -it.each(["terminal", "editor"])("skips an unsavable dirty %s while saving eligible tabs", async type => { +it.each([ + "terminal", + "editor", +])("skips an unsavable dirty %s while saving eligible tabs", async (type) => { for (const command of ["save-all-changes", "close-all-tabs"]) { - const unsupported = tab("unsupported", type), one = tab("one"), two = tab("two", "editor"); + const unsupported = tab("unsupported", type), + one = tab("one"), + two = tab("two", "editor"); unsupported.canSave = false; const files = [unsupported, one, two]; const f = setup(files); @@ -90,19 +170,29 @@ it.each(["terminal", "editor"])("skips an unsavable dirty %s while saving eligib for (const file of [one, two]) { expect(file.save).toHaveBeenCalledOnce(); expect(file.isUnsaved).toBe(false); - expect(file.remove).toHaveBeenCalledTimes(command === "close-all-tabs" ? 1 : 0); + expect(file.remove).toHaveBeenCalledTimes( + command === "close-all-tabs" ? 1 : 0, + ); } } }); -it.each([false, true, "failure"])("still stops after a savable write fails or remains dirty (%s)", async outcome => { +it.each([ + false, + true, + "failure", +])("still stops after a savable write fails or remains dirty (%s)", async (outcome) => { for (const command of ["save-all-changes", "close-all-tabs"]) { - const unsupported = tab("unsupported", "terminal"), failed = tab("failed"), later = tab("later", "editor"); + const unsupported = tab("unsupported", "terminal"), + failed = tab("failed"), + later = tab("later", "editor"); const f = setup([unsupported, failed, later]); - if (outcome === "failure") failed.save.mockRejectedValueOnce(Error("disk full")); + if (outcome === "failure") + failed.save.mockRejectedValueOnce(Error("disk full")); else failed.save.mockResolvedValueOnce(outcome); const saving = f.default[command](); - if (outcome === "failure") await expect(saving).rejects.toThrow("disk full"); + if (outcome === "failure") + await expect(saving).rejects.toThrow("disk full"); else expect(await saving).toBe(false); expect(failed.remove).not.toHaveBeenCalled(); expect(later.save).not.toHaveBeenCalled(); @@ -111,7 +201,8 @@ it.each([false, true, "failure"])("still stops after a savable write fails or re }); it("keeps pinned tabs untouched by save-and-close and reports complete success for eligible tabs", async () => { - const pinned = tab("pinned"), file = tab("file"); + const pinned = tab("pinned"), + file = tab("file"); pinned.pinned = true; const f = setup([pinned, file]); expect(await f.default["close-all-tabs"]()).toBe(true); diff --git a/tests/unit/scrollPastEnd.test.js b/tests/unit/scrollPastEnd.test.js index 11edc5fdb3..d0c78dd82e 100644 --- a/tests/unit/scrollPastEnd.test.js +++ b/tests/unit/scrollPastEnd.test.js @@ -1,19 +1,15 @@ -import { describe, expect, it } from "vitest"; import { horizontalScrollPastEnd } from "cm/scrollPastEnd"; +import { describe, expect, it } from "vitest"; function themeRules(extension) { - return extension - .flatMap((part) => part?.value?.rules ?? []) - .join("\n"); + return extension.flatMap((part) => part?.value?.rules ?? []).join("\n"); } describe("horizontal scroll past end", () => { it("adds right-side space only to unwrapped editor content", () => { const rules = themeRules(horizontalScrollPastEnd(50)); - expect(rules).toContain( - ".cm-content:not(.cm-lineWrapping) .cm-line", - ); + expect(rules).toContain(".cm-content:not(.cm-lineWrapping) .cm-line"); expect(rules).toContain("box-sizing: border-box"); expect(rules).toContain("min-width: 100%"); expect(rules).toContain("padding-right: 52px"); diff --git a/tests/unit/searchMatchHighlighter.test.ts b/tests/unit/searchMatchHighlighter.test.ts index 7b4fb5ac23..40fe1be84d 100644 --- a/tests/unit/searchMatchHighlighter.test.ts +++ b/tests/unit/searchMatchHighlighter.test.ts @@ -2,8 +2,8 @@ import { openSearchPanel, - search, SearchQuery, + search, setSearchQuery, } from "@codemirror/search"; import { EditorSelection, EditorState } from "@codemirror/state"; diff --git a/tests/unit/searchResultNavigation.test.js b/tests/unit/searchResultNavigation.test.js index ace8ed8972..bf85c3efc1 100644 --- a/tests/unit/searchResultNavigation.test.js +++ b/tests/unit/searchResultNavigation.test.js @@ -1,6 +1,6 @@ +import navigateToResult from "sidebarApps/searchInFiles/navigateToResult"; import { EditorState } from "@codemirror/state"; import openFile from "lib/openFile"; -import navigateToResult from "sidebarApps/searchInFiles/navigateToResult"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; vi.mock("lib/openFile", () => ({ default: vi.fn() })); @@ -61,21 +61,21 @@ describe("project search result navigation", () => { afterEach(() => vi.unstubAllGlobals()); - it.each([false, true])( - "reveals the exact match through the scroll-restore-safe API (existing tab: %s)", - async (existing) => { - if (existing) addFile("target"); - expect(await navigateToResult("target", match)).toBe(true); - expect(openFile).toHaveBeenCalledWith("target", { - render: true, - signal: expect.any(AbortSignal), - }); - expect(manager.revealRange).toHaveBeenCalledWith(8, 11, { - y: "center", - userEvent: "select.search", - }); - }, - ); + it.each([ + false, + true, + ])("reveals the exact match through the scroll-restore-safe API (existing tab: %s)", async (existing) => { + if (existing) addFile("target"); + expect(await navigateToResult("target", match)).toBe(true); + expect(openFile).toHaveBeenCalledWith("target", { + render: true, + signal: expect.any(AbortSignal), + }); + expect(manager.revealRange).toHaveBeenCalledWith(8, 11, { + y: "center", + userEvent: "select.search", + }); + }); it("waits for a restored tab's final document instead of its preview", async () => { const file = addFile("target", "preview"); @@ -173,38 +173,39 @@ describe("project search result navigation", () => { ); }); - it.each(["switched", "closed", "failed"])( - "does not reveal into another document after the target is %s during loading", - async (action) => { - const file = addFile("target"); - const loading = deferred(); - file.load.mockImplementation(() => loading.promise); - const navigation = navigateToResult("target", match); - await vi.waitFor(() => expect(file.load).toHaveBeenCalled()); - if (action === "switched") activate(addFile("other")); - if (action === "closed") files.delete("target"); - if (action === "failed") file.loaded = false; - loading.resolve(); - expect(await navigation).toBe(false); - expect(manager.revealRange).not.toHaveBeenCalled(); - }, - ); - - it.each(["missing", "image"])( - "does not navigate the previous editor when opening a %s target", - async (type) => { - activate(addFile("previous")); - openFile.mockImplementationOnce(async () => { - if (type === "image") { - const file = addFile("target"); - file.type = "image"; - activate(file); - } - }); - expect(await navigateToResult("target", match)).toBe(false); - expect(manager.revealRange).not.toHaveBeenCalled(); - }, - ); + it.each([ + "switched", + "closed", + "failed", + ])("does not reveal into another document after the target is %s during loading", async (action) => { + const file = addFile("target"); + const loading = deferred(); + file.load.mockImplementation(() => loading.promise); + const navigation = navigateToResult("target", match); + await vi.waitFor(() => expect(file.load).toHaveBeenCalled()); + if (action === "switched") activate(addFile("other")); + if (action === "closed") files.delete("target"); + if (action === "failed") file.loaded = false; + loading.resolve(); + expect(await navigation).toBe(false); + expect(manager.revealRange).not.toHaveBeenCalled(); + }); + + it.each([ + "missing", + "image", + ])("does not navigate the previous editor when opening a %s target", async (type) => { + activate(addFile("previous")); + openFile.mockImplementationOnce(async () => { + if (type === "image") { + const file = addFile("target"); + file.type = "image"; + activate(file); + } + }); + expect(await navigateToResult("target", match)).toBe(false); + expect(manager.revealRange).not.toHaveBeenCalled(); + }); it("handles multiline ranges and clamps stale coordinates", async () => { addFile("target", "abc\ndef"); @@ -212,17 +213,27 @@ describe("project search result navigation", () => { start: { row: 0, column: 1 }, end: { row: 1, column: 2 }, }); - expect(manager.revealRange).toHaveBeenLastCalledWith(1, 6, expect.anything()); + expect(manager.revealRange).toHaveBeenLastCalledWith( + 1, + 6, + expect.anything(), + ); await navigateToResult("target", { start: { row: -1, column: -2 }, end: { row: 100, column: 100 }, }); - expect(manager.revealRange).toHaveBeenLastCalledWith(0, 7, expect.anything()); + expect(manager.revealRange).toHaveBeenLastCalledWith( + 0, + 7, + expect.anything(), + ); }); it("continues navigating after an open rejects", async () => { openFile.mockRejectedValueOnce(new Error("Read failed")); - await expect(navigateToResult("broken", match)).rejects.toThrow("Read failed"); + await expect(navigateToResult("broken", match)).rejects.toThrow( + "Read failed", + ); expect(await navigateToResult("target", match)).toBe(true); expect(manager.activeFile.uri).toBe("target"); }); diff --git a/tests/unit/searchStreamingResults.test.js b/tests/unit/searchStreamingResults.test.js index 2ad8e630b6..6aea8bd2ff 100644 --- a/tests/unit/searchStreamingResults.test.js +++ b/tests/unit/searchStreamingResults.test.js @@ -1,8 +1,10 @@ // @vitest-environment happy-dom + +import { createSearchResultView } from "sidebarApps/searchInFiles/cmResultView"; import { readFileSync } from "node:fs"; import vm from "node:vm"; import { expect, it, vi } from "vitest"; -import { createSearchResultView } from "sidebarApps/searchInFiles/cmResultView"; + vi.mock("lib/settings", () => ({ default: { value: {} } })); vi.mock("utils/helpers", () => ({ default: { getIconForFile: (name) => `icon-${name}` }, diff --git a/tests/unit/sessionPersistence.test.js b/tests/unit/sessionPersistence.test.js index 823b1a2494..0082d1914a 100644 --- a/tests/unit/sessionPersistence.test.js +++ b/tests/unit/sessionPersistence.test.js @@ -109,9 +109,7 @@ describe("file session persistence", () => { saveState(); - const restoredUris = JSON.parse(localStorage.files).map( - (file) => file.uri, - ); + const restoredUris = JSON.parse(localStorage.files).map((file) => file.uri); expect(restoredUris).toEqual([selectedUri]); }); @@ -139,9 +137,7 @@ describe("file session persistence", () => { it("keeps restored folds until an inactive tab is first rendered", () => { const file = createOpenFile("file:///restored.js", {}); - file.restoredFolds = [ - { fromLine: 2, fromCol: 0, toLine: 5, toCol: 1 }, - ]; + file.restoredFolds = [{ fromLine: 2, fromCol: 0, toLine: 5, toCol: 1 }]; globalThis.editorManager.files.push(file); saveState(); diff --git a/tests/unit/sftpProfiles.test.js b/tests/unit/sftpProfiles.test.js index bae0b1abf9..fa7a2697fd 100644 --- a/tests/unit/sftpProfiles.test.js +++ b/tests/unit/sftpProfiles.test.js @@ -30,7 +30,9 @@ describe("SFTP secure profiles", () => { const url = createSftpProfileUrl("profile-123", "/project/file.js"); expect(url).toBe("sftp://profile-123/project/file.js"); expect(getSftpProfileId(url)).toBe("profile-123"); - expect(getSftpProfileId("sftp://user:secret@example.com/project")).toBeNull(); + expect( + getSftpProfileId("sftp://user:secret@example.com/project"), + ).toBeNull(); expect( getSftpProfileId("sftp://user:secret@profile-server/project"), ).toBeNull(); @@ -149,8 +151,7 @@ describe("SFTP secure profiles", () => { const saveProfile = vi.fn((...args) => args.at(-2)("profile-folder")); globalThis.sftp = { saveProfile }; const root = "sftp://user:secret@example.com/project"; - const expandedFolder = - "sftp://user:stale-secret@example.com/project/src"; + const expandedFolder = "sftp://user:stale-secret@example.com/project/src"; localStorage.setItem( "folders", JSON.stringify([ diff --git a/tests/unit/shell.test.js b/tests/unit/shell.test.js index 6a7f5ef6d1..000e40f28d 100644 --- a/tests/unit/shell.test.js +++ b/tests/unit/shell.test.js @@ -1,5 +1,5 @@ -import { describe, expect, it } from "vitest"; import { quotePosixShellArg } from "utils/shell"; +import { describe, expect, it } from "vitest"; describe("quotePosixShellArg", () => { it("quotes spaces and shell metacharacters as literal text", () => { diff --git a/tests/unit/systemHttpStream.test.js b/tests/unit/systemHttpStream.test.js index fe20d2b5ae..4319a37985 100644 --- a/tests/unit/systemHttpStream.test.js +++ b/tests/unit/systemHttpStream.test.js @@ -1,5 +1,5 @@ -import { afterAll, beforeAll, describe, expect, it } from "vitest"; import http from "node:http"; +import { afterAll, beforeAll, describe, expect, it } from "vitest"; import system from "../../src/plugins/system/www/plugin.js"; @@ -430,7 +430,10 @@ describe("system.httpStream", () => { bridge = createNativeBridge(); globalThis.cordova = { exec: (...args) => bridge.exec(...args) }; const url = server.url("/network-error"); - const err = await system.httpStream(url).then(() => null, (e) => e); + const err = await system.httpStream(url).then( + () => null, + (e) => e, + ); expect(err).toBeInstanceOf(Error); }); @@ -448,8 +451,7 @@ describe("system.httpStream", () => { expect( bridge.calls.some( (c) => - c.action === "http-stream-cancel" && - typeof c.args[0] === "string", + c.action === "http-stream-cancel" && typeof c.args[0] === "string", ), ).toBe(true); @@ -487,12 +489,15 @@ describe("system.httpStream", () => { const err = await system .httpStream(server.url("/simple"), { signal: controller.signal }) - .then(() => null, (e) => e); + .then( + () => null, + (e) => e, + ); expect(err).toBeInstanceOf(Error); expect(err.name).toBe("AbortError"); - expect( - bridge.calls.some((c) => c.action === "http-stream-start"), - ).toBe(false); + expect(bridge.calls.some((c) => c.action === "http-stream-start")).toBe( + false, + ); }); it("10. aborting the signal cancels an in-flight stream and errors the body", async () => { @@ -509,15 +514,17 @@ describe("system.httpStream", () => { controller.abort(); - const err = await reader.read().then(() => null, (e) => e); + const err = await reader.read().then( + () => null, + (e) => e, + ); expect(err).toBeInstanceOf(Error); expect(err.name).toBe("AbortError"); expect( bridge.calls.some( (c) => - c.action === "http-stream-cancel" && - typeof c.args[0] === "string", + c.action === "http-stream-cancel" && typeof c.args[0] === "string", ), ).toBe(true); const entry = bridge.streams.values().next().value; @@ -542,9 +549,7 @@ describe("system.httpStream", () => { bridge = createNativeBridge(); globalThis.cordova = { exec: (...args) => bridge.exec(...args) }; - const expected = Buffer.from([ - 0x00, 0x08, 0x1f, 0x7f, 0xff, 0x22, 0x00, - ]); + const expected = Buffer.from([0x00, 0x08, 0x1f, 0x7f, 0xff, 0x22, 0x00]); const response = await system.httpStream(server.url("/binary-ctrl")); const bytes = Buffer.from(concat(await collect(response))); expect(bytes.equals(expected)).toBe(true); diff --git a/tests/unit/taskManager.test.js b/tests/unit/taskManager.test.js index 987689c2c9..c364f5f176 100644 --- a/tests/unit/taskManager.test.js +++ b/tests/unit/taskManager.test.js @@ -1,5 +1,5 @@ -import { describe, expect, it } from "vitest"; import TaskManager from "utils/taskManager"; +import { describe, expect, it } from "vitest"; const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)); diff --git a/tests/unit/uri.test.js b/tests/unit/uri.test.js index c13c7d317f..86d7da5122 100644 --- a/tests/unit/uri.test.js +++ b/tests/unit/uri.test.js @@ -1,5 +1,5 @@ -import { describe, expect, it } from "vitest"; import Uri from "utils/Uri"; +import { describe, expect, it } from "vitest"; const TREE_URI = "content://com.android.externalstorage.documents/tree/primary%3ADCIM"; @@ -67,9 +67,9 @@ describe("Uri.getPrimaryAddress", () => { describe("Uri.getDisplayPath", () => { it("uses the storage name and a path relative to its SAF root", () => { const url = `${TREE_URI}::primary:DCIM/Camera/photo.jpg`; - expect( - Uri.getDisplayPath(url, [{ name: "Pictures", url: TREE_URI }]), - ).toBe("Pictures/Camera/photo.jpg"); + expect(Uri.getDisplayPath(url, [{ name: "Pictures", url: TREE_URI }])).toBe( + "Pictures/Camera/photo.jpg", + ); }); it("does not match aliases from a prefix-sharing SAF root", () => { @@ -79,9 +79,7 @@ describe("Uri.getDisplayPath", () => { "content://com.android.externalstorage.documents/tree/primary%3ACodesBackup"; expect( - Uri.getDisplayPath(codesBackupRoot, [ - { name: "Codes", url: codesRoot }, - ]), + Uri.getDisplayPath(codesBackupRoot, [{ name: "Codes", url: codesRoot }]), ).toBe("primary/CodesBackup"); }); @@ -89,15 +87,13 @@ describe("Uri.getDisplayPath", () => { const rootUri = "content://com.android.externalstorage.documents/tree/primary%3A"; const url = `${rootUri}::primary/file.txt`; - expect( - Uri.getDisplayPath(url, [{ name: "Internal", url: rootUri }]), - ).toBe("Internal/file.txt"); + expect(Uri.getDisplayPath(url, [{ name: "Internal", url: rootUri }])).toBe( + "Internal/file.txt", + ); }); it("falls back to a readable volume and document path", () => { - expect(Uri.getDisplayPath(SINGLE_URI, [])).toBe( - "primary/DCIM/file.txt", - ); + expect(Uri.getDisplayPath(SINGLE_URI, [])).toBe("primary/DCIM/file.txt"); }); it("includes the selected folder in a bare primary tree path", () => { diff --git a/tests/unit/url.test.js b/tests/unit/url.test.js index 0334ab0a0c..083b5d51a1 100644 --- a/tests/unit/url.test.js +++ b/tests/unit/url.test.js @@ -1,5 +1,5 @@ -import { describe, expect, it } from "vitest"; import Url from "utils/Url"; +import { describe, expect, it } from "vitest"; describe("Url.getProtocol", () => { it("extracts the protocol", () => { @@ -71,9 +71,7 @@ describe("Url.parse / pathname / dirname", () => { }); it("returns the parent url", () => { - expect(Url.dirname("ftp://localhost/foo/bar")).toBe( - "ftp://localhost/foo/", - ); + expect(Url.dirname("ftp://localhost/foo/bar")).toBe("ftp://localhost/foo/"); }); }); @@ -153,16 +151,16 @@ describe("Url.hidePassword / decodeUrl", () => { // NOTE: url-parse only splits the port for special protocols // (http/https/ws/...), so an http url is used to exercise the // port decoding branch of decodeUrl. - expect( - Url.decodeUrl("http://user:p%40ss@host.com:8080/a%20b?x=1"), - ).toEqual({ - username: "user", - password: "p@ss", - hostname: "host.com", - pathname: "/a b", - port: 8080, - query: { x: "1" }, - }); + expect(Url.decodeUrl("http://user:p%40ss@host.com:8080/a%20b?x=1")).toEqual( + { + username: "user", + password: "p@ss", + hostname: "host.com", + pathname: "/a b", + port: 8080, + query: { x: "1" }, + }, + ); }); it("decodes credentials for ftp urls", () => { diff --git a/tests/unit/variableVirtualList.test.js b/tests/unit/variableVirtualList.test.js index ff2a873103..f659e8bc00 100644 --- a/tests/unit/variableVirtualList.test.js +++ b/tests/unit/variableVirtualList.test.js @@ -1,7 +1,7 @@ // @vitest-environment happy-dom -import { describe, expect, it, vi } from "vitest"; import VariableVirtualList from "components/virtualList/variable"; +import { describe, expect, it, vi } from "vitest"; function createList() { const container = document.createElement("div"); diff --git a/tests/unit/version.test.js b/tests/unit/version.test.js index 246522c952..f5e719ecef 100644 --- a/tests/unit/version.test.js +++ b/tests/unit/version.test.js @@ -1,5 +1,5 @@ -import { describe, expect, it } from "vitest"; import { compareVersions, isVersionGreater, parseVersion } from "utils/version"; +import { describe, expect, it } from "vitest"; describe("utils/version", () => { it("parses strict x.y.z versions", () => { From a8dae47c4238974abd7140239bf69ecdddd89066 Mon Sep 17 00:00:00 2001 From: AuDevTist1C <114492072+AuDevTist1C@users.noreply.github.com> Date: Fri, 16 Oct 2026 07:05:55 +0000 Subject: [PATCH 148/195] refactor(file-browser): Deduplicate `renameFile` flow and unify error handling (#2958) - Unify post-rename side effects (recents update, editor tab URI sync, tree state, success toast, reload) across standard and Termux filesystem paths. - Wrap standard filesystem rename execution inside the master try-catch block to gracefully capture errors. (AI generated commit message) --- src/pages/fileBrowser/fileBrowser.js | 45 ++++++++++------------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index dcb53c4890..a093703f59 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -1214,40 +1214,25 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { } async function renameFile(newname) { - if (isTermuxUrl(url)) { - if (helpers.isDir(type)) { - alert(strings.warning, strings["rename not supported"]); - return; - } else { - // Special handling for Termux content files - const fs = fsOperation(url); - try { + let newUrl; + try { + if (isTermuxUrl(url)) { + if (helpers.isDir(type)) { + alert(strings.warning, strings["rename not supported"]); + return; + } else { + // Special handling for Termux content files + const fs = fsOperation(url); const content = await fs.readFile(); - const newUrl = Url.join(Url.dirname(url), newname); - await fsOperation(Url.dirname(url)).createFile(newname, content); + const dirname = Url.dirname(url); + newUrl = Url.join(dirname, newname); + await fsOperation(dirname).createFile(newname, content); await fs.delete(); - - recents.removeFile(url); - recents.addFile(newUrl); - const file = editorManager.getFile(url, "uri"); - if (file) { - file.uri = newUrl; - file.filename = newname; - } - openFolder.renameItem(url, newUrl, newname); - toast(strings.success); - reload(); - return; - } catch (err) { - window.log("error", err); - helpers.error(err); - return; } + } else { + const fs = fsOperation(url); + newUrl = await fs.renameTo(newname); } - } - const fs = fsOperation(url); - try { - const newUrl = await fs.renameTo(newname); recents.removeFile(url); recents.addFile(newUrl); const file = editorManager.getFile(url, "uri"); From eb7cf40c4bddbc4f291103f849414f137eff0771 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Fri, 16 Oct 2026 07:38:07 +0000 Subject: [PATCH 149/195] feat(editor): richer JS/TS highlighting for JSDoc and methods (#2971) * feat(editor): highlight JSDoc inside JS/TS block comments * feat(editor): colour JS/TS methods as functions and refine JSDoc highlighting - Tag class and interface method names as function definitions and give method calls, method definitions and function declaration names the function colour in all built-in themes. - Bump @lezer/highlight to 1.2.5, which fixes the precedence of context-specific highlight rules added through parser props. - Leave JSDoc braces and punctuation as comment text, handle escaped quotes in types and quoted brackets in optional defaults, and skip /*** comments like TypeScript does. - Add unit tests for JSDoc and method highlighting. * fix(themes): colour properties differently from methods Themes that reused the function colour for properties made this.foo look like a method call. Give properties the palette's property colour where it has one (Tokyo Night, Catppuccin) and the foreground otherwise, and stop colouring Noctis Lilac property definitions as functions. * fix(themes): colour JS properties apart from methods without affecting other languages propertyName is shared by CSS properties, JSON/YAML keys, Go/C++ fields and (through attributeName) HTML attributes, so giving it its own colour moved those away from how VS Code colours them. Restore the themes' propertyName colour and tag JS/TS property names with memberProperty, a sub-tag of propertyName that falls back to it in themes that don't style it. Built-in themes colour it like their VS Code counterparts. --- bun.lock | 4 +- package-lock.json | 8 +- package.json | 2 +- src/cm/highlightTags.ts | 10 + src/cm/modes/javascript/index.ts | 32 ++ src/cm/modes/jsdoc/index.ts | 345 ++++++++++++++++++++++ src/cm/supportedModes.ts | 11 +- src/cm/themes/aura.js | 17 +- src/cm/themes/ayuDark.js | 17 +- src/cm/themes/catppuccin.js | 8 + src/cm/themes/cobalt.js | 15 +- src/cm/themes/dracula.js | 17 +- src/cm/themes/githubDark.js | 17 +- src/cm/themes/githubLight.js | 17 +- src/cm/themes/gruvboxDark.js | 11 +- src/cm/themes/index.js | 29 +- src/cm/themes/materialPalenight.js | 17 +- src/cm/themes/monokai.js | 17 +- src/cm/themes/noctisLilac.js | 14 +- src/cm/themes/nord.js | 17 +- src/cm/themes/solarizedDark.js | 11 +- src/cm/themes/solarizedLight.js | 11 +- src/cm/themes/tokyoNight.js | 17 +- src/cm/themes/tokyoNightDay.js | 17 +- src/cm/themes/tomorrowNight.js | 17 +- src/cm/themes/tomorrowNightBright.js | 17 +- src/cm/themes/vscodeDark.js | 7 +- tests/unit/javascriptHighlighting.test.ts | 261 ++++++++++++++++ 28 files changed, 954 insertions(+), 29 deletions(-) create mode 100644 src/cm/highlightTags.ts create mode 100644 src/cm/modes/javascript/index.ts create mode 100644 src/cm/modes/jsdoc/index.ts create mode 100644 tests/unit/javascriptHighlighting.test.ts diff --git a/bun.lock b/bun.lock index a72716e329..5f2c0d5655 100644 --- a/bun.lock +++ b/bun.lock @@ -40,7 +40,7 @@ "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", "@lezer/common": "^1.5.2", - "@lezer/highlight": "^1.2.3", + "@lezer/highlight": "^1.2.5", "@lezer/lr": "^1.4.10", "@ungap/custom-elements": "^1.3.0", "@xterm/addon-attach": "^0.12.0", @@ -485,7 +485,7 @@ "@lezer/go": ["@lezer/go@1.0.1", "", { "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.3.0" } }, "sha512-xToRsYxwsgJNHTgNdStpcvmbVuKxTapV0dM0wey1geMMRc9aggoVyKgzYp41D2/vVOx+Ii4hmE206kvxIXBVXQ=="], - "@lezer/highlight": ["@lezer/highlight@1.2.3", "", { "dependencies": { "@lezer/common": "^1.3.0" } }, "sha512-qXdH7UqTvGfdVBINrgKhDsVTJTxactNNxLk7+UMwZhU13lMHaOBlJe9Vqp907ya56Y3+ed2tlqzys7jDkTmW0g=="], + "@lezer/highlight": ["@lezer/highlight@1.2.5", "", { "dependencies": { "@lezer/common": "^1.3.0" } }, "sha512-O1GMVKgtf5YspFaRzpmqkVgMtIk2HG9uMAbH6wdAIdNh3TVzCsch/+cRi+6l2//UGDKe6NB9BW3cvuR5ezMQ0w=="], "@lezer/html": ["@lezer/html@1.3.13", "", { "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "sha512-oI7n6NJml729m7pjm9lvLvmXbdoMoi2f+1pwSDJkl9d68zGr7a9Btz8NdHTGQZtW2DA25ybeuv/SyDb9D5tseg=="], diff --git a/package-lock.json b/package-lock.json index b702bafd71..41fccea233 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", "@lezer/common": "^1.5.2", - "@lezer/highlight": "^1.2.3", + "@lezer/highlight": "^1.2.5", "@lezer/lr": "^1.4.10", "@ungap/custom-elements": "^1.3.0", "@xterm/addon-attach": "^0.12.0", @@ -4335,9 +4335,9 @@ } }, "node_modules/@lezer/highlight": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.3.tgz", - "integrity": "sha512-qXdH7UqTvGfdVBINrgKhDsVTJTxactNNxLk7+UMwZhU13lMHaOBlJe9Vqp907ya56Y3+ed2tlqzys7jDkTmW0g==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.5.tgz", + "integrity": "sha512-O1GMVKgtf5YspFaRzpmqkVgMtIk2HG9uMAbH6wdAIdNh3TVzCsch/+cRi+6l2//UGDKe6NB9BW3cvuR5ezMQ0w==", "license": "MIT", "dependencies": { "@lezer/common": "^1.3.0" diff --git a/package.json b/package.json index 73c8310072..aebe3e1725 100644 --- a/package.json +++ b/package.json @@ -160,7 +160,7 @@ "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", "@lezer/common": "^1.5.2", - "@lezer/highlight": "^1.2.3", + "@lezer/highlight": "^1.2.5", "@lezer/lr": "^1.4.10", "@ungap/custom-elements": "^1.3.0", "@xterm/addon-attach": "^0.12.0", diff --git a/src/cm/highlightTags.ts b/src/cm/highlightTags.ts new file mode 100644 index 0000000000..49b746d33f --- /dev/null +++ b/src/cm/highlightTags.ts @@ -0,0 +1,10 @@ +import { Tag, tags as t } from "@lezer/highlight"; + +/** + * Property names in JavaScript/TypeScript: `obj.foo`, object keys and class + * fields. It is a sub-tag of `propertyName`, so themes that don't style it + * keep their `propertyName` colour, and themes that do can colour JS + * properties apart from methods without changing CSS properties, JSON/YAML + * keys or other languages that share `propertyName`. + */ +export const memberProperty = Tag.define("memberProperty", t.propertyName); diff --git a/src/cm/modes/javascript/index.ts b/src/cm/modes/javascript/index.ts new file mode 100644 index 0000000000..2098d61d63 --- /dev/null +++ b/src/cm/modes/javascript/index.ts @@ -0,0 +1,32 @@ +import { javascript } from "@codemirror/lang-javascript"; +import { LanguageSupport, LRLanguage } from "@codemirror/language"; +import { styleTags, tags as t } from "@lezer/highlight"; +import { memberProperty } from "../../highlightTags"; +import { jsdocWrap } from "../jsdoc"; + +const highlightTags = styleTags({ + // Lezer tags class and interface method names like property definitions; + // tag them as functions so themes can colour methods like other editors. + "MethodDeclaration/PropertyDefinition MethodDeclaration/PrivatePropertyDefinition MethodType/PropertyDefinition": + t.function(t.definition(t.propertyName)), + // Method calls keep their more specific `function(propertyName)` rule. + PropertyName: memberProperty, + PropertyDefinition: t.definition(memberProperty), +}); + +/** + * JavaScript/TypeScript support with JSDoc highlighting inside `/** *\/` + * comments, method names tagged as functions and property names tagged as + * {@link memberProperty}. + */ +export function javascriptSupport( + config: { jsx?: boolean; typescript?: boolean } = {}, +): LanguageSupport { + const support = javascript(config); + const language = support.language; + if (!(language instanceof LRLanguage)) return support; + return new LanguageSupport( + language.configure({ props: [highlightTags], wrap: jsdocWrap }), + support.support, + ); +} diff --git a/src/cm/modes/jsdoc/index.ts b/src/cm/modes/jsdoc/index.ts new file mode 100644 index 0000000000..f6935bd83e --- /dev/null +++ b/src/cm/modes/jsdoc/index.ts @@ -0,0 +1,345 @@ +import { foldNodeProp, indentNodeProp } from "@codemirror/language"; +import { + type Input, + NodeSet, + NodeType, + Parser, + type ParseWrapper, + type PartialParse, + parseMixed, + Tree, + type TreeFragment, +} from "@lezer/common"; +import { styleTags, tags as t } from "@lezer/highlight"; + +/** + * A tiny JSDoc tokenizer mounted inside JS/TS `/** ... *\/` comments so + * themes can style block tags, types, parameter names and inline links + * separately from the comment text. Braces and other punctuation are left + * as comment text, like VS Code does. + * + * The mounted tree replaces the host `BlockComment` node, so its root keeps + * that name (comment checks in completion and rainbow brackets still match) + * and the fold/indent behaviour JS gives block comments. It is not a top + * node, so language data (comment tokens, completions) still resolves to the + * surrounding JS/TS. + */ + +enum Type { + BlockComment, + JSDocTag, + JSDocType, + JSDocParam, + JSDocLink, +} + +const nodeSet = new NodeSet( + ["BlockComment", "JSDocTag", "JSDocType", "JSDocParam", "JSDocLink"].map( + (name, id) => NodeType.define({ id, name }), + ), +).extend( + styleTags({ + BlockComment: t.docComment, + JSDocTag: t.keyword, + JSDocType: t.typeName, + JSDocParam: t.variableName, + JSDocLink: t.link, + }), + foldNodeProp.add({ + BlockComment: (tree) => ({ from: tree.from + 2, to: tree.to - 2 }), + }), + indentNodeProp.add({ BlockComment: () => null }), +); + +// Tags followed by a parameter/property name, e.g. `@param {T} name`. +const PARAM_TAGS = new Set(["param", "arg", "argument", "property", "prop"]); +// Tags followed by a type name, e.g. `@typedef {Object} Name`. +const TYPE_NAME_TAGS = new Set(["typedef", "callback", "template"]); + +const IDENTIFIER = /[A-Za-z_$][\w$]*(?:(?:\[\])?\.[\w$]+)*/y; +const TAG_NAME = /@[A-Za-z][\w-]*/y; +const LINK_TARGET = /[^\s|}]+/y; + +function matchAt(re: RegExp, text: string, pos: number): string | null { + re.lastIndex = pos; + const match = re.exec(text); + return match ? match[0] : null; +} + +function isSpace(ch: string | undefined): boolean { + return ch === " " || ch === "\t" || ch === "\r" || ch === "\n"; +} + +/** + * Index just past the string literal opening at `pos`, honouring backslash + * escapes, or -1 when it isn't closed on the same line before `limit`. + */ +function skipQuoted(text: string, pos: number, limit: number): number { + const quote = text[pos]; + for (let i = pos + 1; i < limit; i++) { + const ch = text[i]; + if (ch === "\\") i++; + else if (ch === quote) return i + 1; + else if (ch === "\n") return -1; + } + return -1; +} + +function tokenize(text: string): number[] { + // Flat [type, from, to, size] groups, as expected by Tree.build. + const buffer: number[] = []; + const push = (type: Type, from: number, to: number) => { + if (to > from) buffer.push(type, from, to, 4); + }; + + const end = text.endsWith("*/") ? text.length - 2 : text.length; + let pos = 3; // skip "/**" + let lineStart = false; + let typeAllowed = false; + let pending: "param" | "typeName" | null = null; + // First `}`, newline or end at or after the last `{@` scan. Every `{@` + // before it stops at the same place, so it is reused to keep scanning + // linear when there are many unclosed inline tags. + let inlineStop = -1; + + while (pos < end) { + const ch = text[pos]; + + if (ch === "\n") { + lineStart = true; + typeAllowed = false; + pending = null; + pos++; + continue; + } + if (isSpace(ch)) { + pos++; + continue; + } + if (lineStart && ch === "*") { + pos++; + continue; + } + lineStart = false; + + const prev = text[pos - 1]; + if (ch === "@" && (isSpace(prev) || prev === "*")) { + const tag = matchAt(TAG_NAME, text, pos); + if (tag) { + const name = tag.slice(1); + push(Type.JSDocTag, pos, pos + tag.length); + pos += tag.length; + typeAllowed = true; + pending = PARAM_TAGS.has(name) + ? "param" + : TYPE_NAME_TAGS.has(name) + ? "typeName" + : null; + continue; + } + } + + if (ch === "{" && text[pos + 1] === "@") { + if (inlineStop <= pos) { + inlineStop = pos + 1; + while ( + inlineStop < end && + text[inlineStop] !== "}" && + text[inlineStop] !== "\n" + ) { + inlineStop++; + } + } + pos = + text[inlineStop] === "}" && inlineStop < end + ? inlineTag(text, pos, inlineStop, push) + : pos + 1; + typeAllowed = false; + pending = null; + continue; + } + + if (ch === "{" && typeAllowed) { + pos = typeExpression(text, pos, end, push); + typeAllowed = false; + continue; + } + typeAllowed = false; + + if (pending === "param" && ch === "[") { + pos = optionalParam(text, pos, end, push); + pending = null; + continue; + } + + if (pending) { + const name = matchAt(IDENTIFIER, text, pos); + if (name) { + push( + pending === "param" ? Type.JSDocParam : Type.JSDocType, + pos, + pos + name.length, + ); + pos += name.length; + pending = null; + continue; + } + } + pending = null; + + // Plain description text: covered by the JSDoc root node. + pos++; + while (pos < end && !isSpace(text[pos]) && text[pos] !== "{") pos++; + } + + return buffer; +} + +type Push = (type: Type, from: number, to: number) => void; + +/** `{@link Target|label}` and friends; `close` is the matching `}`. */ +function inlineTag(text: string, pos: number, close: number, push: Push) { + let i = pos + 1; + const tag = matchAt(TAG_NAME, text, i); + if (tag) { + push(Type.JSDocTag, i, i + tag.length); + i += tag.length; + while (i < close && isSpace(text[i])) i++; + const target = matchAt(LINK_TARGET, text, i); + if (target && i + target.length <= close) { + push(Type.JSDocLink, i, i + target.length); + } + } + return close + 1; +} + +// Longest type expression scanned before giving up on a missing `}`. +const MAX_TYPE_LENGTH = 500; + +/** + * `{Array | null}`, possibly spanning lines. Tokens are only kept + * when the closing brace is found, so a stray `{` doesn't colour the rest + * of the comment as a type. + */ +function typeExpression(text: string, pos: number, end: number, push: Push) { + const tokens: [Type, number, number][] = []; + const limit = Math.min(end, pos + MAX_TYPE_LENGTH); + let depth = 1; + let i = pos + 1; + + while (i < limit) { + const ch = text[i]; + if (isSpace(ch) || ch === "*") { + i++; + continue; + } + // Types never contain `@`; it starts the next tag, so `{` was unclosed. + if (ch === "@") break; + if (ch === "{") depth++; + if (ch === "}" && --depth === 0) { + for (const [type, from, to] of tokens) push(type, from, to); + return i + 1; + } + const name = matchAt(IDENTIFIER, text, i); + if (name) { + tokens.push([Type.JSDocType, i, i + name.length]); + i += name.length; + continue; + } + if (ch === '"' || ch === "'") { + const close = skipQuoted(text, i, limit); + if (close === -1) break; + tokens.push([Type.JSDocType, i, close]); + i = close; + continue; + } + i++; + } + return pos + 1; +} + +/** `[name=default]` after `@param`. */ +function optionalParam(text: string, pos: number, end: number, push: Push) { + let i = pos + 1; + const name = matchAt(IDENTIFIER, text, i); + if (name) { + push(Type.JSDocParam, i, i + name.length); + i += name.length; + } + + // Find the closing `]`, ignoring brackets inside quoted defaults. + let depth = 1; + while (i < end && text[i] !== "\n") { + const ch = text[i]; + if (ch === '"' || ch === "'") { + const close = skipQuoted(text, i, end); + if (close === -1) return i; + i = close; + continue; + } + if (ch === "[") depth++; + if (ch === "]" && --depth === 0) return i + 1; + i++; + } + return i; +} + +// Comments are short, so the whole range is tokenized in one step. +class JSDocParse implements PartialParse { + parsedPos: number; + stoppedAt: number | null = null; + + constructor( + private input: Input, + private from: number, + private to: number, + ) { + this.parsedPos = from; + } + + advance(): Tree { + const { from, to } = this; + const buffer = tokenize(this.input.read(from, to)).map((value, index) => + index % 4 === 1 || index % 4 === 2 ? value + from : value, + ); + this.parsedPos = to; + return Tree.build({ + buffer, + nodeSet, + topID: Type.BlockComment, + start: from, + length: to - from, + }); + } + + stopAt(pos: number) { + this.stoppedAt = pos; + } +} + +class JSDocParser extends Parser { + createParse( + input: Input, + _fragments: readonly TreeFragment[], + ranges: readonly { from: number; to: number }[], + ): PartialParse { + return new JSDocParse(input, ranges[0].from, ranges[ranges.length - 1].to); + } +} + +export const jsdocParser = new JSDocParser(); + +const MAX_COMMENT_LENGTH = 100_000; + +/** Mounts the JSDoc parser on `/** ... *\/` block comments. */ +export const jsdocWrap: ParseWrapper = parseMixed((node, input) => { + if (node.name !== "BlockComment") return null; + // Every edit re-tokenizes the whole comment; leave huge ones plain. + if (node.to - node.from > MAX_COMMENT_LENGTH) return null; + // Like TypeScript, only `/**` not followed by `*` or `/` is JSDoc. + const head = input.read(node.from, Math.min(node.from + 4, node.to)); + if (!head.startsWith("/**") || head[3] === "*" || head[3] === "/") { + return null; + } + return { parser: jsdocParser }; +}); diff --git a/src/cm/supportedModes.ts b/src/cm/supportedModes.ts index 44334dbc4d..12febc9f99 100644 --- a/src/cm/supportedModes.ts +++ b/src/cm/supportedModes.ts @@ -67,9 +67,16 @@ function createLanguageLoader(name: string, lang: LanguageDescription) { switch (normalizedName) { case "javascript": + case "jsx": + case "typescript": + case "tsx": return async () => { - const { javascript } = await import("@codemirror/lang-javascript"); - return javascript({ jsx: true }); + const { javascriptSupport } = await import("./modes/javascript"); + return javascriptSupport({ + jsx: normalizedName !== "typescript", + typescript: + normalizedName === "typescript" || normalizedName === "tsx", + }); }; case "markdown": diff --git a/src/cm/themes/aura.js b/src/cm/themes/aura.js index fdbe82456a..b3e94bc12b 100644 --- a/src/cm/themes/aura.js +++ b/src/cm/themes/aura.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; // Aura theme configuration and extensions export const config = { @@ -21,6 +22,7 @@ export const config = { variable: "#edecee", parameter: "#edecee", function: "#ffca85", + memberProperty: "#edecee", string: "#61ffca", constant: "#61ffca", type: "#82e2ff", @@ -109,6 +111,10 @@ export const auraTheme = EditorView.theme( ); export const auraHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.name, t.deleted, t.character, t.macroName], @@ -119,7 +125,16 @@ export const auraHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/ayuDark.js b/src/cm/themes/ayuDark.js index b7629eaaea..cd62ab5fc4 100644 --- a/src/cm/themes/ayuDark.js +++ b/src/cm/themes/ayuDark.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; export const config = { name: "ayuDark", @@ -19,6 +20,7 @@ export const config = { variable: "#b3b1ad", parameter: "#f07178", function: "#ffee99", + memberProperty: "#b3b1ad", string: "#c2d94c", constant: "#e6b450", type: "#ff8f40", @@ -91,6 +93,10 @@ export const ayuDarkTheme = EditorView.theme( ); export const ayuDarkHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.name, t.deleted, t.character, t.macroName], @@ -101,7 +107,16 @@ export const ayuDarkHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/catppuccin.js b/src/cm/themes/catppuccin.js index 6b1e9a5330..7f9d0fb5fc 100644 --- a/src/cm/themes/catppuccin.js +++ b/src/cm/themes/catppuccin.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; const palettes = { latte: { @@ -122,6 +123,7 @@ function createConfig(name, caption, palette) { variable: palette.text, parameter: palette.text, function: palette.blue, + memberProperty: palette.text, string: palette.green, constant: palette.peach, type: palette.yellow, @@ -217,6 +219,10 @@ function createCatppuccinTheme(config) { ); const highlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.name, t.definition(t.name), t.deleted, t.character, t.macroName], @@ -225,6 +231,8 @@ function createCatppuccinTheme(config) { { tag: [ t.function(t.variableName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), t.function(t.propertyName), t.propertyName, t.labelName, diff --git a/src/cm/themes/cobalt.js b/src/cm/themes/cobalt.js index 6d23c56ea8..84ade32c10 100644 --- a/src/cm/themes/cobalt.js +++ b/src/cm/themes/cobalt.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; export const config = { name: "cobalt", @@ -20,6 +21,7 @@ export const config = { variable: "#ffffff", parameter: "#ffffff", function: "#ffc600", + memberProperty: "#ffffff", string: "#3ad900", constant: "#ff628c", type: "#80ffbb", @@ -85,6 +87,10 @@ export const cobaltTheme = EditorView.theme( ); export const cobaltHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.modifier, t.definitionKeyword], color: config.storage }, { @@ -92,7 +98,14 @@ export const cobaltHighlightStyle = HighlightStyle.define([ color: config.variable, }, { - tag: [t.propertyName, t.function(t.variableName), t.labelName], + tag: [ + t.propertyName, + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], color: config.function, }, { diff --git a/src/cm/themes/dracula.js b/src/cm/themes/dracula.js index 8a02c06cbc..f6e3cc6e6b 100644 --- a/src/cm/themes/dracula.js +++ b/src/cm/themes/dracula.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView, lineNumbers } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; export const config = { name: "dracula", @@ -20,6 +21,7 @@ export const config = { variable: "#F8F8F2", parameter: "#F8F8F2", function: "#50FA7B", + memberProperty: "#F8F8F2", string: "#F1FA8C", constant: "#BD93F9", type: "#8BE9FD", @@ -106,6 +108,10 @@ export const draculaTheme = EditorView.theme( ); export const draculaHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.name, t.deleted, t.character, t.macroName], @@ -116,7 +122,16 @@ export const draculaHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/githubDark.js b/src/cm/themes/githubDark.js index e1dcf76533..8ad2c8a4c3 100644 --- a/src/cm/themes/githubDark.js +++ b/src/cm/themes/githubDark.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; export const config = { name: "githubDark", @@ -20,6 +21,7 @@ export const config = { variable: "#e6edf3", parameter: "#e6edf3", function: "#d2a8ff", + memberProperty: "#e6edf3", string: "#a5d6ff", constant: "#79c0ff", type: "#79c0ff", @@ -109,6 +111,10 @@ export const githubDarkTheme = EditorView.theme( ); export const githubDarkHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.name, t.deleted, t.character, t.macroName], @@ -119,7 +125,16 @@ export const githubDarkHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/githubLight.js b/src/cm/themes/githubLight.js index e05b03bb27..8ea5e35b8b 100644 --- a/src/cm/themes/githubLight.js +++ b/src/cm/themes/githubLight.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView, lineNumbers } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; export const config = { name: "githubLight", @@ -20,6 +21,7 @@ export const config = { variable: "#1f2328", parameter: "#1f2328", function: "#8250df", + memberProperty: "#1f2328", string: "#0a3069", constant: "#0550ae", type: "#0550ae", @@ -109,6 +111,10 @@ export const githubLightTheme = EditorView.theme( ); export const githubLightHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.name, t.deleted, t.character, t.macroName], @@ -119,7 +125,16 @@ export const githubLightHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/gruvboxDark.js b/src/cm/themes/gruvboxDark.js index e86960d8c8..06ae5a1c59 100644 --- a/src/cm/themes/gruvboxDark.js +++ b/src/cm/themes/gruvboxDark.js @@ -102,7 +102,16 @@ export const gruvboxDarkHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/index.js b/src/cm/themes/index.js index dbcd67eba1..71c95dc1eb 100644 --- a/src/cm/themes/index.js +++ b/src/cm/themes/index.js @@ -1,5 +1,11 @@ +import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorState } from "@codemirror/state"; -import { oneDark } from "@codemirror/theme-one-dark"; +import { + oneDark, + oneDarkHighlightStyle, + oneDarkTheme, +} from "@codemirror/theme-one-dark"; +import { tags as t } from "@lezer/highlight"; import aura, { config as auraConfig } from "./aura"; import ayuDark, { config as ayuDarkConfig } from "./ayuDark"; import { @@ -47,6 +53,25 @@ const oneDarkConfig = { invalid: "#ff6b6b", }; +// One Dark with method calls, method definitions and function declaration +// names in the function colour, matching the other built-in themes. +const oneDarkExtensions = [ + oneDarkTheme, + syntaxHighlighting( + HighlightStyle.define([ + ...oneDarkHighlightStyle.specs, + { + tag: [ + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + ], + color: oneDarkConfig.function, + }, + ]), + ), +]; + const themes = new Map(); const warnedInvalidThemes = new Set(); @@ -164,7 +189,7 @@ export function removeTheme(id) { themes.delete(String(id).toLowerCase()); } -addTheme("one_dark", "One Dark", true, () => [oneDark], oneDarkConfig); +addTheme("one_dark", "One Dark", true, () => oneDarkExtensions, oneDarkConfig); addTheme(auraConfig.name, "Aura", !!auraConfig.dark, () => aura(), auraConfig); addTheme( cobaltConfig.name, diff --git a/src/cm/themes/materialPalenight.js b/src/cm/themes/materialPalenight.js index 2063e88d7a..8247e4f28f 100644 --- a/src/cm/themes/materialPalenight.js +++ b/src/cm/themes/materialPalenight.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; export const config = { name: "materialPalenight", @@ -19,6 +20,7 @@ export const config = { variable: "#f07178", parameter: "#eeffff", function: "#82aaff", + memberProperty: "#a6accd", string: "#c3e88d", constant: "#f78c6c", type: "#decb6b", @@ -91,6 +93,10 @@ export const materialPalenightTheme = EditorView.theme( ); export const materialPalenightHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.name, t.deleted, t.character, t.macroName], @@ -101,7 +107,16 @@ export const materialPalenightHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/monokai.js b/src/cm/themes/monokai.js index e43e2969d9..82365a6b3a 100644 --- a/src/cm/themes/monokai.js +++ b/src/cm/themes/monokai.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; export const config = { name: "monokai", @@ -20,6 +21,7 @@ export const config = { variable: "#FD971F", parameter: "#FD971F", function: "#66D9EF", + memberProperty: "#f8f8f2", string: "#E6DB74", constant: "#AE81FF", type: "#66D9EF", @@ -113,6 +115,10 @@ export const monokaiTheme = EditorView.theme( ); export const monokaiHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.name, t.deleted, t.character, t.macroName], @@ -123,7 +129,16 @@ export const monokaiHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/noctisLilac.js b/src/cm/themes/noctisLilac.js index c32479274b..c681f69f15 100644 --- a/src/cm/themes/noctisLilac.js +++ b/src/cm/themes/noctisLilac.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; export const config = { name: "noctisLilac", @@ -20,6 +21,7 @@ export const config = { variable: "#0c006b", parameter: "#0c006b", function: "#0095a8", + memberProperty: "#fa8900", string: "#00b368", constant: "#5842ff", type: "#b3694d", @@ -108,6 +110,10 @@ export const noctisLilacTheme = EditorView.theme( ); export const noctisLilacHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.comment, color: config.comment }, { tag: t.keyword, color: config.keyword, fontWeight: "bold" }, { tag: [t.definitionKeyword, t.modifier], color: config.keyword }, @@ -117,7 +123,13 @@ export const noctisLilacHighlightStyle = HighlightStyle.define([ }, { tag: [t.number, t.bool, t.null, t.special(t.brace)], color: config.number }, { - tag: [t.definition(t.propertyName), t.function(t.variableName)], + tag: [ + t.definition(t.propertyName), + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + ], color: config.function, }, { tag: t.typeName, color: config.type }, diff --git a/src/cm/themes/nord.js b/src/cm/themes/nord.js index 60e85cb13b..97cf7c7bc0 100644 --- a/src/cm/themes/nord.js +++ b/src/cm/themes/nord.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; export const config = { name: "nord", @@ -19,6 +20,7 @@ export const config = { variable: "#d8dee9", parameter: "#d8dee9", function: "#8fbcbb", + memberProperty: "#d8dee9", string: "#a3be8c", constant: "#b48ead", type: "#88c0d0", @@ -91,6 +93,10 @@ export const nordTheme = EditorView.theme( ); export const nordHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.name, t.deleted, t.character, t.macroName], @@ -101,7 +107,16 @@ export const nordHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/solarizedDark.js b/src/cm/themes/solarizedDark.js index 088a200a64..168c8b1872 100644 --- a/src/cm/themes/solarizedDark.js +++ b/src/cm/themes/solarizedDark.js @@ -118,7 +118,16 @@ export const solarizedDarkHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/solarizedLight.js b/src/cm/themes/solarizedLight.js index 01dd678f5a..742918aa90 100644 --- a/src/cm/themes/solarizedLight.js +++ b/src/cm/themes/solarizedLight.js @@ -118,7 +118,16 @@ export const solarizedLightHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/tokyoNight.js b/src/cm/themes/tokyoNight.js index 3ec2548e70..cee0c90dde 100644 --- a/src/cm/themes/tokyoNight.js +++ b/src/cm/themes/tokyoNight.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView, lineNumbers } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; export const config = { name: "tokyoNight", @@ -21,6 +22,7 @@ export const config = { variable: "#c0caf5", parameter: "#cfc9c2", function: "#7aa2f7", + memberProperty: "#7dcfff", string: "#9ece6a", constant: "#ff9e64", type: "#2ac3de", @@ -109,6 +111,10 @@ export const tokyoNightTheme = EditorView.theme( ); export const tokyoNightHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.name, t.deleted, t.character, t.macroName], @@ -119,7 +125,16 @@ export const tokyoNightHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/tokyoNightDay.js b/src/cm/themes/tokyoNightDay.js index 75a9fcf820..dd50d9ce8a 100644 --- a/src/cm/themes/tokyoNightDay.js +++ b/src/cm/themes/tokyoNightDay.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView, lineNumbers } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; export const config = { name: "tokyoNightDay", @@ -20,6 +21,7 @@ export const config = { variable: "#3760bf", parameter: "#3760bf", function: "#2e7de9", + memberProperty: "#007197", string: "#587539", constant: "#9854f1", type: "#07879d", @@ -106,6 +108,10 @@ export const tokyoNightDayTheme = EditorView.theme( ); export const tokyoNightDayHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.name, t.deleted, t.character, t.macroName], @@ -116,7 +122,16 @@ export const tokyoNightDayHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/tomorrowNight.js b/src/cm/themes/tomorrowNight.js index 0ff0d39c0b..e4102b871c 100644 --- a/src/cm/themes/tomorrowNight.js +++ b/src/cm/themes/tomorrowNight.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; // Palette adapted from Tomorrow Night (Chris Kempson) export const config = { @@ -22,6 +23,7 @@ export const config = { variable: "#CC6666", parameter: "#DE935F", function: "#81A2BE", + memberProperty: "#C5C8C6", string: "#B5BD68", constant: "#DE935F", type: "#F0C674", @@ -114,6 +116,10 @@ export const tomorrowNightTheme = EditorView.theme( ); export const tomorrowNightHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.name, t.deleted, t.character, t.macroName], @@ -124,7 +130,16 @@ export const tomorrowNightHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/tomorrowNightBright.js b/src/cm/themes/tomorrowNightBright.js index 26bfacf9de..68055c5ad5 100644 --- a/src/cm/themes/tomorrowNightBright.js +++ b/src/cm/themes/tomorrowNightBright.js @@ -1,6 +1,7 @@ import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { EditorView } from "@codemirror/view"; import { tags as t } from "@lezer/highlight"; +import { memberProperty } from "../highlightTags"; // Palette adapted from Tomorrow Night Bright (Chris Kempson) export const config = { @@ -22,6 +23,7 @@ export const config = { variable: "#D54E53", parameter: "#E78C45", function: "#7AA6DA", + memberProperty: "#DEDEDE", string: "#B9CA4A", constant: "#E78C45", type: "#E7C547", @@ -114,6 +116,10 @@ export const tomorrowNightBrightTheme = EditorView.theme( ); export const tomorrowNightBrightHighlightStyle = HighlightStyle.define([ + { + tag: [memberProperty, t.definition(memberProperty)], + color: config.memberProperty, + }, { tag: t.keyword, color: config.keyword }, { tag: [t.name, t.deleted, t.character, t.macroName], @@ -124,7 +130,16 @@ export const tomorrowNightBrightHighlightStyle = HighlightStyle.define([ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string, }, - { tag: [t.function(t.variableName), t.labelName], color: config.function }, + { + tag: [ + t.function(t.variableName), + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.labelName, + ], + color: config.function, + }, { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant, diff --git a/src/cm/themes/vscodeDark.js b/src/cm/themes/vscodeDark.js index 8790b32b19..a6107d9448 100644 --- a/src/cm/themes/vscodeDark.js +++ b/src/cm/themes/vscodeDark.js @@ -161,7 +161,12 @@ export const vscodeDarkHighlightStyle = HighlightStyle.define([ { tag: [t.typeName, t.className], color: config.type }, { tag: [t.tagName, t.standard(t.tagName)], color: config.keyword }, { - tag: [t.function(t.variableName), t.function(t.propertyName)], + tag: [ + t.function(t.variableName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + t.function(t.propertyName), + ], color: config.function, }, { diff --git a/tests/unit/javascriptHighlighting.test.ts b/tests/unit/javascriptHighlighting.test.ts new file mode 100644 index 0000000000..829983722d --- /dev/null +++ b/tests/unit/javascriptHighlighting.test.ts @@ -0,0 +1,261 @@ +import { + ensureSyntaxTree, + foldable, + getIndentation, + highlightingFor, +} from "@codemirror/language"; +import { EditorState } from "@codemirror/state"; +import { EditorView } from "@codemirror/view"; +import { highlightTree, type Tag, tags as t } from "@lezer/highlight"; +import { memberProperty } from "cm/highlightTags"; +import { javascriptSupport } from "cm/modes/javascript"; +import { getThemeExtensions, getThemes } from "cm/themes"; +import { describe, expect, it } from "vitest"; + +type Config = { jsx?: boolean; typescript?: boolean }; + +function createState(doc: string, config: Config = {}) { + return EditorState.create({ doc, extensions: javascriptSupport(config) }); +} + +/** Highlighted ranges as `[tags, text, from]`, skipping whitespace. */ +function highlights(state: EditorState) { + const doc = state.doc.toString(); + const tree = ensureSyntaxTree(state, doc.length, 5000); + if (!tree) throw new Error("parse did not finish"); + const out: [string, string, number][] = []; + highlightTree( + tree, + { style: (tags) => tags.map(String).join(" ") }, + (from, to, tags) => { + const text = doc.slice(from, to); + if (text.trim()) out.push([tags, text, from]); + }, + ); + return out; +} + +/** Texts highlighted with exactly `tags`. */ +function textsWith(state: EditorState, tags: string) { + return highlights(state) + .filter(([style]) => style === tags) + .map(([, text]) => text); +} + +const jsdoc = `const before = 1; +/** + * Adds numbers, mail me@example.com. + * @param {number} a - first + * @param {Array<{ + * id: string + * }> | null} list - multiline type + * @param {string} [text="["] quoted bracket, see {@link Foo.bar|bar} + * @param {'don\\'t' | "a\\"b"} quoted escaped quotes + * @returns {Promise} + * @typedef {Object} Shape + * @template T + */ +function add(a, list, text, quoted) {}`; + +describe.each([ + ["JavaScript", { jsx: true }], + ["TypeScript", { typescript: true }], +])("JSDoc highlighting in %s", (_name, config) => { + const state = createState(jsdoc, config); + + it("highlights block tags, types, parameter names and links", () => { + expect(textsWith(state, "keyword")).toEqual([ + "@param", + "@param", + "@param", + "@link", + "@param", + "@returns", + "@typedef", + "@template", + ]); + expect(textsWith(state, "typeName")).toEqual([ + "number", + "Array", + "id", + "string", + "null", + "string", + "'don\\'t'", + '"a\\"b"', + "Promise", + "void", + "Object", + "Shape", + "T", + ]); + expect(textsWith(state, "variableName")).toEqual([ + "a", + "list", + "text", + "quoted", + ]); + expect(textsWith(state, "link")).toEqual(["Foo.bar"]); + }); + + it("places ranges at the right document positions", () => { + const doc = state.doc.toString(); + for (const [, text, from] of highlights(state)) { + expect(doc.slice(from, from + text.length)).toBe(text); + } + const param = highlights(state).find(([, text]) => text === "@param"); + expect(param?.[2]).toBe(doc.indexOf("@param")); + }); + + it("leaves braces, punctuation and prose as doc comment text", () => { + const docText = textsWith(state, "docComment").join(" "); + expect(docText).toContain("me@example.com"); + expect(docText).toContain("{"); + expect(docText).toContain("["); + + const doc = state.doc.toString(); + const commentEnd = doc.indexOf("*/") + 2; + const inComment = highlights(state).filter( + ([, , from]) => from >= doc.indexOf("/**") && from < commentEnd, + ); + const commentTags = new Set(inComment.map(([tags]) => tags)); + expect([...commentTags].sort()).toEqual([ + "docComment", + "keyword", + "link", + "typeName", + "variableName", + ]); + }); + + it("keeps comment behaviour from the host language", () => { + const inside = state.doc.toString().indexOf("@returns"); + expect(state.languageDataAt("commentTokens", inside)).toEqual([ + { line: "//", block: { open: "/*", close: "*/" } }, + ]); + expect(getIndentation(state, state.doc.line(4).from)).toBeNull(); + const line = state.doc.line(2); + expect(foldable(state, line.from, line.to)).toEqual({ + from: line.from + 2, + to: state.doc.toString().indexOf("*/", line.from), + }); + }); +}); + +describe("JSDoc highlighting edge cases", () => { + it("leaves plain block comments alone", () => { + const state = createState( + "/* @param {T} a */ /**/ /*** @param {T} b */ let x;", + ); + expect(textsWith(state, "keyword")).toEqual([]); + expect(textsWith(state, "blockComment")).toEqual([ + "/* @param {T} a */", + "/**/", + "/*** @param {T} b */", + ]); + }); + + it("does not colour the rest of the comment after an unclosed type", () => { + const state = createState("/** @returns { unclosed\n * prose words */"); + expect(textsWith(state, "keyword")).toEqual(["@returns"]); + expect(textsWith(state, "typeName")).toEqual([]); + }); + + it("updates highlighting after an edit", () => { + let state = createState("/**\n * @param {string} a\n */\nlet x;"); + expect(textsWith(state, "typeName")).toEqual(["string"]); + + const at = state.doc.toString().indexOf("string"); + state = state.update({ + changes: { from: at, to: at + "string".length, insert: "number" }, + }).state; + expect(textsWith(state, "typeName")).toEqual(["number"]); + + state = state.update({ + changes: { from: 0, insert: "/** @see {@link Q} */\n" }, + }).state; + expect(textsWith(state, "link")).toEqual(["Q"]); + expect(textsWith(state, "typeName")).toEqual(["number"]); + }); +}); + +describe("method names", () => { + const fnDefProp = "function(definition(propertyName))"; + + it("tags class and interface methods as function definitions", () => { + const state = createState( + `class A { + constructor(a) {} + get size() { return 1 } + static create() {} + #secret() {} + field = 1; +} +interface I { draw(): void; area: number }`, + { typescript: true }, + ); + expect(textsWith(state, fnDefProp)).toEqual([ + "constructor", + "size", + "create", + "#secret", + "draw", + ]); + expect(textsWith(state, "definition(memberProperty)")).toEqual([ + "field", + "area", + ]); + }); + + it("keeps method calls tagged as function properties", () => { + const state = createState("options.uri.hashCode(); const { a: b } = o;"); + expect(textsWith(state, "function(propertyName)")).toEqual(["hashCode"]); + expect(textsWith(state, "memberProperty")).toEqual(["uri", "a"]); + }); +}); + +describe("built-in theme function colours", () => { + const functionTags = [ + t.function(t.propertyName), + t.function(t.definition(t.propertyName)), + t.function(t.definition(t.variableName)), + ]; + + /** The CSS colour a theme gives `tag`. */ + function colorOf(state: EditorState, tag: Tag) { + const classes = highlightingFor(state, [tag]); + if (!classes) return null; + const rules = state + .facet(EditorView.styleModule) + .map((module) => module.getRules()) + .join("\n"); + for (const cls of classes.split(" ")) { + const rule = rules.match(new RegExp(`\\.${cls}\\s*\\{([^}]*)\\}`)); + const color = rule?.[1].match(/(?:^|;)\s*color:\s*([^;]+)/); + if (color) return color[1].trim(); + } + return null; + } + + it.each( + getThemes().map((theme) => [theme.id]), + )("%s colours methods like functions", (id) => { + const state = EditorState.create({ extensions: getThemeExtensions(id) }); + const expected = colorOf(state, t.function(t.variableName)); + expect(expected).toBeTruthy(); + for (const tag of functionTags) { + expect(colorOf(state, tag)).toBe(expected); + } + }); + + it.each( + getThemes().map((theme) => [theme.id]), + )("%s colours JS properties differently from methods", (id) => { + // VS Code's Solarized colours them alike too. + if (id.startsWith("solarized")) return; + const state = EditorState.create({ extensions: getThemeExtensions(id) }); + const method = colorOf(state, t.function(t.propertyName)); + expect(colorOf(state, memberProperty)).not.toBe(method); + expect(colorOf(state, t.definition(memberProperty))).not.toBe(method); + }); +}); From 09b035d41b650d16c93658e2d83793e48ccc1800 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Fri, 16 Oct 2026 13:32:31 +0530 Subject: [PATCH 150/195] Update _typos.toml --- _typos.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/_typos.toml b/_typos.toml index 463c229048..ca02d14706 100644 --- a/_typos.toml +++ b/_typos.toml @@ -59,3 +59,4 @@ multline = "multline" sav = "sav" ist = "ist" Hel = "Hel" +edn = "edn" From ef7f32656a5c4216209ac7e8d24e81bb1564ff8b Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Fri, 16 Oct 2026 08:04:59 +0000 Subject: [PATCH 151/195] chore(modes): drop legacy modes provided by the Additional Language Modes plugin (#2973) Stop registering the legacy stream-mode Clojure, ClojureScript, edn, Gas, Kotlin, LaTeX, sTeX, Lua and Swift modes, and stop HTML claiming .hbs and .handlebars, so the acode.additional.langmodes plugin's Lezer modes take their canonical names and file extensions. --- src/cm/supportedModes.ts | 26 ++++++- tests/unit/pluginProvidedModes.test.js | 104 +++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 tests/unit/pluginProvidedModes.test.js diff --git a/src/cm/supportedModes.ts b/src/cm/supportedModes.ts index 12febc9f99..f16746a746 100644 --- a/src/cm/supportedModes.ts +++ b/src/cm/supportedModes.ts @@ -152,6 +152,27 @@ addMode( () => [], ); +// Languages that @codemirror/language-data only covers with legacy stream +// tokenizers and that the official Additional Language Modes plugin +// (acode.additional.langmodes) provides as Lezer grammars. They are left out +// so the plugin registers them under their canonical names; without it, these +// files fall back to plain text and Acode recommends the plugin. +const PLUGIN_PROVIDED_LANGUAGES = new Set([ + "clojure", + "clojurescript", + "edn", + "gas", + "kotlin", + "latex", + "stex", + "lua", + "swift", +]); + +// Extensions other modes claim in @codemirror/language-data but that the +// plugin has dedicated modes for: HTML lists Handlebars templates. +const PLUGIN_PROVIDED_EXTENSIONS = new Set(["hbs", "handlebars"]); + // 2) Register all languages provided by @codemirror/language-data // We convert extensions like [".js", ".mjs"] into a modelist pattern: "js|mjs" // and preserve aliases and filename regexes for languages like C++ and Dockerfile. @@ -159,6 +180,7 @@ for (const lang of languages as readonly LanguageDescription[]) { try { const name = String(lang?.name || "").trim(); if (!name) continue; + if (PLUGIN_PROVIDED_LANGUAGES.has(normalizeModeKey(name))) continue; const aliases = collectAliases(name, lang.alias); const modeId = getModeId(name, aliases); @@ -248,7 +270,9 @@ for (const lang of languages as readonly LanguageDescription[]) { for (const e of langExtensions) { if (typeof e !== "string") continue; const cleaned = e.replace(/^\./, "").trim(); - if (cleaned) parts.push(cleaned); + if (cleaned && !PLUGIN_PROVIDED_EXTENSIONS.has(cleaned.toLowerCase())) { + parts.push(cleaned); + } } const filenameMatchers: RegExp[] = []; diff --git a/tests/unit/pluginProvidedModes.test.js b/tests/unit/pluginProvidedModes.test.js new file mode 100644 index 0000000000..959bf48978 --- /dev/null +++ b/tests/unit/pluginProvidedModes.test.js @@ -0,0 +1,104 @@ +import { afterEach, describe, expect, it } from "vitest"; +import "cm/supportedModes"; +import { addMode, getMode, getModeForPath, removeMode } from "cm/modelist"; + +// Modes the Additional Language Modes plugin (acode.additional.langmodes) +// replaces with Lezer grammars, with the extensions it registers. +const pluginModes = [ + { name: "assembly", extensions: ["asm", "s", "S", "nasm"] }, + { name: "c", extensions: ["c", "h", "ino"] }, + { name: "clojure", extensions: ["clj", "cljs", "cljc", "cljx", "edn"] }, + { name: "kotlin", extensions: ["kt", "kts"] }, + { name: "latex", extensions: ["tex", "ltx", "sty", "cls", "latex"] }, + { name: "lua", extensions: ["lua"] }, + { name: "swift", extensions: ["swift"] }, + { name: "handlebars", extensions: ["hbs", "handlebars"] }, + { name: "mustache", extensions: ["mustache"] }, +]; + +/** The plugin's registration rule: keep Acode's mode, add "-enhanced". */ +function registerLikePlugin({ name, extensions }) { + const registered = getMode(name) ? `${name}-enhanced` : name; + addMode(registered, extensions, registered, () => []); + return registered; +} + +describe("legacy modes replaced by the Additional Language Modes plugin", () => { + const registered = []; + + afterEach(() => { + for (const name of registered.splice(0)) removeMode(name); + }); + + it.each([ + "clojure", + "clojurescript", + "edn", + "gas", + "kotlin", + "latex", + "tex", + "stex", + "lua", + "swift", + ])("does not ship a built-in %s mode", (name) => { + expect(getMode(name)).toBeNull(); + }); + + it.each([ + "a.kt", + "a.kts", + "a.lua", + "a.swift", + "a.clj", + "a.cljs", + "a.edn", + "a.s", + "a.tex", + "a.hbs", + "a.handlebars", + ])("falls back to plain text for %s without the plugin", (path) => { + expect(getModeForPath(path).name).toBe("text"); + }); + + it("keeps C, C++, HTML and Luau built in", () => { + expect(getModeForPath("a.html").name).toBe("html"); + expect(getModeForPath("a.c").name).toBe("c"); + expect(getModeForPath("a.cpp").name).toBe("cpp"); + expect(getModeForPath("a.luau").name).toBe("luau"); + }); + + it("opens .text files as plain text instead of LaTeX", () => { + expect(getModeForPath("notes.text").name).toBe("text"); + }); + + it("lets the plugin register the replaced modes under canonical names", () => { + for (const mode of pluginModes) registered.push(registerLikePlugin(mode)); + + expect(registered).toEqual([ + "assembly", + "c-enhanced", + "clojure", + "kotlin", + "latex", + "lua", + "swift", + "handlebars", + "mustache", + ]); + expect(getModeForPath("a.kt").name).toBe("kotlin"); + expect(getModeForPath("a.lua").name).toBe("lua"); + expect(getModeForPath("a.swift").name).toBe("swift"); + expect(getModeForPath("a.cljs").name).toBe("clojure"); + expect(getModeForPath("a.edn").name).toBe("clojure"); + expect(getModeForPath("a.s").name).toBe("assembly"); + expect(getModeForPath("a.tex").name).toBe("latex"); + expect(getModeForPath("a.c").name).toBe("c-enhanced"); + expect(getModeForPath("a.hbs").name).toBe("handlebars"); + expect(getModeForPath("a.handlebars").name).toBe("handlebars"); + expect(getModeForPath("a.mustache").name).toBe("mustache"); + expect(getModeForPath("a.html").name).toBe("html"); + // Luau keeps its own mode even though "lua" now comes from the plugin. + expect(getModeForPath("a.luau").name).toBe("luau"); + }); +}); From d755c315cb760a964a89b136f4ae244ef89db0f8 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 18 Oct 2026 07:46:32 +0000 Subject: [PATCH 152/195] fix: prevent crash when opening file:// links from LSP tooltips (#2977) Open file:// links in LSP hover/signature docs in the editor, and guard the native openInBrowser against file URIs and launch failures. --- src/cm/lsp/tooltipExtensions.ts | 38 +++++++++++++++++++ .../android/com/foxdebug/system/System.java | 22 ++++++++++- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/src/cm/lsp/tooltipExtensions.ts b/src/cm/lsp/tooltipExtensions.ts index 7cab0e1c34..2e73a787d6 100644 --- a/src/cm/lsp/tooltipExtensions.ts +++ b/src/cm/lsp/tooltipExtensions.ts @@ -27,6 +27,7 @@ import { type ViewUpdate, } from "@codemirror/view"; import { highlightCode } from "@lezer/highlight"; +import { navigateToReference } from "components/referencesPanel/utils"; import type { HoverParams, ServerCapabilities, @@ -348,6 +349,41 @@ function closeHoverIfNeeded(view: EditorView): void { } } +// Matches `#12`, `#L12`, `#L12,5`, `#12:5` style line/column fragments. +const FILE_LINK_FRAGMENT = /^#L?(\d+)(?:[,:Cc](\d+))?/; + +/** + * Open `file://` links from LSP documentation in the editor instead of + * letting them bubble to the global handler, which would hand them to + * the system browser. + */ +function handleDocumentationLinks(dom: HTMLElement, view: EditorView): void { + dom.addEventListener("click", (event) => { + const link = (event.target as Element | null)?.closest?.("a[href]"); + if (!link) return; + const href = link.getAttribute("href") || ""; + if (!/^file:/i.test(href)) return; + + event.preventDefault(); + event.stopPropagation(); + + const hashIndex = href.indexOf("#"); + const uri = hashIndex === -1 ? href : href.slice(0, hashIndex); + const match = + hashIndex === -1 ? null : FILE_LINK_FRAGMENT.exec(href.slice(hashIndex)); + const position = { + line: match ? Math.max(0, Number(match[1]) - 1) : 0, + character: match?.[2] ? Math.max(0, Number(match[2]) - 1) : 0, + }; + + closeHoverIfNeeded(view); + void navigateToReference({ + uri, + range: { start: position, end: position }, + }); + }); +} + function hoverRequest(plugin: LSPPlugin, pos: number) { if (!clientHasCapability(plugin.client, "hoverProvider")) { return Promise.resolve(null); @@ -417,6 +453,7 @@ function lspTooltipSource( results[index].result.contents, ); } + handleDocumentationLinks(dom, view); return { dom }; }, above: true, @@ -618,6 +655,7 @@ function drawSignatureTooltip( const docs = dom.appendChild(document.createElement("div")); docs.className = "cm-lsp-signature-documentation cm-lsp-documentation"; docs.innerHTML = plugin.docToHTML(signature.documentation); + handleDocumentationLinks(docs, view); } } diff --git a/src/plugins/system/android/com/foxdebug/system/System.java b/src/plugins/system/android/com/foxdebug/system/System.java index 58e9f53335..146755da62 100644 --- a/src/plugins/system/android/com/foxdebug/system/System.java +++ b/src/plugins/system/android/com/foxdebug/system/System.java @@ -1682,8 +1682,26 @@ private void getAppInfo(CallbackContext callback) { } private void openInBrowser(String src, CallbackContext callback) { - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(src)); - activity.startActivity(browserIntent); + if (src == null || src.isEmpty()) { + callback.error("No URL provided."); + return; + } + + Uri uri = Uri.parse(src); + if ("file".equalsIgnoreCase(uri.getScheme())) { + // file:// URIs can't leave the app (FileUriExposedException). + callback.error("Cannot open file URI in browser: " + src); + return; + } + + try { + Intent browserIntent = new Intent(Intent.ACTION_VIEW, uri); + activity.startActivity(browserIntent); + callback.success(); + } catch (Exception e) { + Log.e("System", "Failed to open URL: " + src, e); + callback.error(e.getMessage()); + } } private void launchApp( From 579af33f9ee584c5f4ad9e60c0f4a90346aa3b5b Mon Sep 17 00:00:00 2001 From: ajr_uribe Date: Sun, 18 Oct 2026 07:47:23 +0000 Subject: [PATCH 153/195] update: es-sv (#2974) * update: es-sv * Fix errors detected by greptile * fix: fmt --------- Co-authored-by: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> --- src/lang/es-sv.json | 952 ++++++++++++++++++++++---------------------- 1 file changed, 476 insertions(+), 476 deletions(-) diff --git a/src/lang/es-sv.json b/src/lang/es-sv.json index ad78d40c95..a65e2b8622 100644 --- a/src/lang/es-sv.json +++ b/src/lang/es-sv.json @@ -1,17 +1,17 @@ { - "lang": "Español (by DouZerr)", + "lang": "Español", "about": "Información", "active files": "Archivos Activos", "alert": "Alerta", - "app theme": "Tema de App", + "app theme": "Tema de la Aplicación", "autocorrect": "¿Habilitar Autocorrección?", - "autosave": "Guardar Automáticamente", + "autosave": "Auto guardado", "cancel": "Cancelar", "change language": "Cambiar Idioma", "choose color": "Elegir color", "clear": "Limpiar", "close app": "¿Cerrar la Aplicación?", - "commit message": "Commitear mensaje", + "commit message": "Mensaje de Commit", "console": "Consola", "conflict error": "¡Conflicto! Por favor espera antes de otro commit.", "copy": "Copiar", @@ -82,10 +82,10 @@ "show line numbers": "Mostrar números de línea", "show hidden files": "Mostrar archivos ocultos", "show spaces": "Mostrar espacios", - "soft tab": "Pestaña suave", + "soft tab": "Tabulador suave", "sort by name": "Ordenar por nombre", "success": "Éxito", - "tab size": "Tamaño de pestaña", + "tab size": "Tamaño de tabulador", "text wrap": "Ajuste de línea", "theme": "Tema", "title-listfiles": "Listar archivos", @@ -100,7 +100,7 @@ "unsaved file": "Este archivo no se guardado, ¿cerrar de todos modos?", "warning": "Advertencia", "use emmet": "Usar emmet", - "use quick tools": "Usa herramientas rápidas", + "use quick tools": "Usar herramientas rápidas", "yes": "Si", "encoding": "Codificación de Texto", "syntax highlighting": "Resaltado de sintaxis", @@ -125,11 +125,11 @@ "unsupported device": "Su dispositivo no es compatible con el tema.", "vibrate on tap": "Vibrar al tocar", "copy command is not supported by ftp.": "Comando de copia no es compatible con FTP.", - "support title": "Apoye Acode", + "support title": "Apoya a Acode", "fullscreen": "pantalla completa", - "animation": "animación", - "backup": "respaldo", - "restore": "restaurar", + "animation": "Animación", + "backup": "Respaldar", + "restore": "Restaurar", "backup successful": "Respaldo exitoso", "invalid backup file": "Archivo de respaldo inválido", "add path": "Añadir dirección", @@ -146,9 +146,9 @@ "login": "Iniciar Sesión", "scrollbar size": "Tamaño de barra de scroll", "cursor controller size": "Tamaño del controlador de cursor", - "none": "ninguno", - "small": "pequeño", - "large": "grande", + "none": "Ninguno", + "small": "Pequeño", + "large": "Grande", "confirm on exit": "Confirmar al salir", "show console": "Mostrar consola", "image": "Imagen", @@ -156,11 +156,11 @@ "insert color": "Insertar color", "powersave mode warning": "Desactive el modo de ahorro de energía para obtener una vista previa en un navegador externo", "exit": "Salir", - "custom": "personalizado", + "custom": "Personalizado", "reset warning": "¿Seguro que quieres restablecer el tema?", "theme type": "Tipo de tema", - "light": "claro", - "dark": "oscuro", + "light": "Claro", + "dark": "Oscuro", "file browser": "Explorador de archivos", "operation not permitted": "Operación no permitida", "no such file or directory": "El fichero o directorio no existe", @@ -213,10 +213,10 @@ "app settings": "Ajustes de aplicacion", "disable in-app-browser caching": "Desactivar el almacenamiento en caché de la aplicación en el navegador", "copied to clipboard": "Copiado al portapapeles", - "clipboard not available": "Clipboard is not available.", + "clipboard not available": "El portapapeles no está disponible.", "remember opened files": "Recordar archivos abiertos", "remember opened folders": "Recordar carpetas abiertas", - "no suggestions": "No hay sugerencias", + "no suggestions": "Sin sugerencias", "no suggestions aggressive": "Ninguna sugerencia, agresivo", "install": "Instalar", "installing": "Instalando...", @@ -251,8 +251,8 @@ "security type": "Tipo de seguridad", "connection mode": "Modo de conexión", "port": "Puerto", - "key file": "Archivo de claves", - "select key file": "Seleccionar archivo clave", + "key file": "Archivo de llaves", + "select key file": "Seleccionar archivo de llave", "passphrase": "Frase de acceso", "connecting...": "Conectando...", "type filename": "Escriba el nombre del archivo", @@ -270,8 +270,8 @@ "restore default settings": "Restablecer la configuración predeterminada", "server port": "Puerto del servidor", "preview settings": "Ajustes de previsualización", - "preview settings note": "Si el puerto de previsualización y el puerto del servidor son diferentes, la aplicación no arrancará el servidor y en su lugar abrirá https://: en el navegador o en el navegador de la aplicación. Esto es útil cuando se está ejecutando un servidor en otro lugar.", - "backup/restore note": "Sólo hará una copia de seguridad de tu configuración, tema personalizado y atajos de teclado. No hará copia de seguridad de su FPT/SFTP.", + "preview settings note": "Si el puerto de previsualización y el puerto del servidor son diferentes, la aplicación no arrancará el servidor y en su lugar abrirá https://: en el navegador o en el navegador de la aplicación. Esto es útil cuando se está ejecutando un servidor en otro lugar.", + "backup/restore note": "Sólo hará una copia de seguridad de tu configuración, tema personalizado y atajos de teclado. No hará copia de seguridad de su FTP/SFTP.", "host": "Host", "retry ftp/sftp when fail": "Reintentar ftp/sftp cuando falla", "more": "Más", @@ -285,13 +285,13 @@ "relative line numbers": "Números de línea relativos", "elastic tabstops": "Tabuladores elásticos", "line based rtl switching": "Conmutación RTL basada en líneas", - "hard wrap": "ajuste de línea rígido", + "hard wrap": "Ajuste de línea rígido", "spellcheck": "Corrector ortográfico", "wrap method": "Método de ajuste de línea", "use textarea for ime": "Utilizar área de texto para IME", - "invalid plugin": "Extensión inválida", + "invalid plugin": "Complemento inválido", "type command": "Escriba el comando", - "plugin": "Extensión", + "plugin": "Complemento", "quicktools trigger mode": "Modo de activación de herramientas rápidas", "print margin": "Margen de impresión", "touch move threshold": "Umbral de movimiento táctil", @@ -308,29 +308,29 @@ "info-scroll-settings": "Esta configuración contiene los ajustes de desplazamiento, incluido el ajuste de línea de texto.", "info-animation": "Si la aplicación va lenta, desactiva la animación.", "info-quicktoolstriggermode": "Si el botón de las herramientas rápidas no funciona, intente cambiar este valor.", - "info-checkForAppUpdates": "Check for app updates automatically.", - "info-quickTools": "Show or hide quick tools.", - "info-showHiddenFiles": "Show hidden files and folders. (Start with .)", + "info-checkForAppUpdates": "Buscar actualizaciones de la aplicación automáticamente.", + "info-quickTools": "Mostrar u ocultar las herramientas rápidas.", + "info-showHiddenFiles": "Mostrar archivos y carpetas ocultos. (Comienzan con .)", "info-listFiles": "Listar automáticamente todos los archivos al abrir una carpeta", - "info-all_file_access": "Enable access of /sdcard and /storage in terminal.", - "info-fontSize": "The font size used to render text.", - "info-fontFamily": "The font family used to render text.", - "info-theme": "The color theme of the terminal.", - "info-cursorStyle": "The style of the cursor when the terminal is focused.", - "info-cursorInactiveStyle": "The style of the cursor when the terminal is not focused.", - "info-fontWeight": "The font weight used to render non-bold text.", - "info-cursorBlink": "Whether the cursor blinks.", - "info-scrollback": "The amount of scrollback in the terminal. Scrollback is the amount of rows that are retained when lines are scrolled beyond the initial viewport.", - "info-tabStopWidth": "The size of tab stops in the terminal.", - "info-letterSpacing": "The spacing in whole pixels between characters.", - "info-imageSupport": "Whether images are supported in the terminal.", - "info-fontLigatures": "Whether font ligatures are enabled in the terminal.", - "info-confirmTabClose": "Ask for confirmation before closing terminal tabs.", - "info-backup": "Creates a backup of the terminal installation.", - "info-restore": "Restores a backup of the terminal installation.", - "info-uninstall": "Uninstalls the terminal installation.", - "owned": "En propiedad", - "api_error": "El servidor API no funciona, inténtelo después de un rato.", + "info-all_file_access": "Otorgar el acceso a /sdcard y /storage en la terminal.", + "info-fontSize": "El tamaño de fuente utilizado para mostrar el texto.", + "info-fontFamily": "La familia tipográfica utilizada para mostrar el texto.", + "info-theme": "La paleta de colores de la terminal.", + "info-cursorStyle": "El estilo del cursor cuando la terminal está enfocada.", + "info-cursorInactiveStyle": "El estilo del cursor cuando la terminal no está enfocada.", + "info-fontWeight": "El grosor de la fuente utilizado para mostrar texto que no esté en negrita.", + "info-cursorBlink": "Parpadeo del cursor.", + "info-scrollback": "Cantidad de desplazamiento hacia atrás en la terminal. El desplazamiento hacia atrás es la cantidad de filas que se conservan cuando las líneas se desplazan más allá del área visible inicial.", + "info-tabStopWidth": "El tamaño de las tabulaciones en la terminal.", + "info-letterSpacing": "El espaciado (en píxeles) entre carácteres.", + "info-imageSupport": "Admitir imagenes en la terminal.", + "info-fontLigatures": "Indica si las ligaduras de texto están habilitadas en la terminal.", + "info-confirmTabClose": "Solicita confirmación antes de cerrar las pestañas de la terminal.", + "info-backup": "Crea una copia de seguridad de la instalación de la terminal.", + "info-restore": "Restaura una copia de seguridad de la instalación de la terminal.", + "info-uninstall": "Desinstala la instalación de la terminal.", + "owned": "Comprados", + "api_error": "El servidor API no funciona, inténtalo más tarde.", "installed": "Instalado", "all": "Todo", "medium": "Medio", @@ -385,11 +385,11 @@ "quicktools:exclamation": "Insertar exclamación", "quicktools:alt-key": "Tecla Alt", "quicktools:meta-key": "Tecla Windows", - "quicktools:search-prev": "Previous Match", - "quicktools:search-next": "Next Match", - "quicktools:search-settings": "Search Settings", - "quicktools:search-replace": "Replace", - "quicktools:search-replace-all": "Replace All", + "quicktools:search-prev": "Coincidencia anterior", + "quicktools:search-next": "Siguiente coincidencia", + "quicktools:search-settings": "Configuración de búsqueda", + "quicktools:search-replace": "Reemplazar", + "quicktools:search-replace-all": "Reemplazar todo", "info-quicktoolssettings": "Personalice los botones de acceso rápido y las teclas del teclado en el contenedor de herramientas rápidas situado debajo del editor para mejorar su experiencia de codificación.", "info-excludefolders": "Utilice el patrón **/node_modules/** para ignorar todos los archivos de la carpeta node_modules. Esto excluirá los archivos de la lista y también evitará que se incluyan en las búsquedas de archivos.", "missed files": "Se han escaneado {count} archivos después de iniciarse la búsqueda y no se incluirán en ella.", @@ -405,445 +405,445 @@ "confirm": "Confirmar", "problems": "Problemas", "show side buttons": "Mostrar botones laterales", - "bug_report": "Submit a Bug Report", + "bug_report": "Reportar un Error", "verified publisher": "Publicador verificado", - "most_downloaded": "Most Downloaded", - "newly_added": "Newly Added", - "top_rated": "Top Rated", - "rename not supported": "Rename on termux dir isn't supported", - "compress": "Compress", - "copy uri": "Copy Uri", - "delete entries": "Are you sure you want to delete {count} items?", - "deleting items": "Deleting {count} items...", - "import project zip": "Import Project(zip)", - "changelog": "Change Log", - "notifications": "Notifications", - "no_unread_notifications": "No unread notifications", - "should_use_current_file_for_preview": "Should use Current File For preview instead of default (index.html)", - "fade fold widgets": "Fade Fold Widgets", - "quicktools:home-key": "Home Key", - "quicktools:end-key": "End Key", - "quicktools:pageup-key": "PageUp Key", - "quicktools:pagedown-key": "PageDown Key", - "quicktools:delete-key": "Delete Key", - "quicktools:tilde": "Insert tilde symbol", - "quicktools:backtick": "Insert backtick", - "quicktools:hash": "Insert Hash symbol", - "quicktools:dollar": "Insert dollar symbol", - "quicktools:modulo": "Insert modulo/percent symbol", - "quicktools:caret": "Insert caret symbol", - "plugin_enabled": "Plugin enabled", - "plugin_disabled": "Plugin disabled", - "enable_plugin": "Enable this Plugin", - "disable_plugin": "Disable this Plugin", - "open_source": "Open Source", - "terminal settings": "Terminal Settings", - "font ligatures": "Font Ligatures", - "letter spacing": "Letter Spacing", - "terminal:tab stop width": "Tab Stop Width", - "terminal:scrollback": "Scrollback Lines", - "terminal:cursor blink": "Cursor Blink", - "terminal:font weight": "Font Weight", - "terminal:cursor inactive style": "Cursor Inactive Style", - "terminal:cursor style": "Cursor Style", - "terminal:font family": "Font Family", - "terminal:convert eol": "Convert EOL", - "terminal:confirm tab close": "Confirm terminal tab close", - "terminal:image support": "Image support", + "most_downloaded": "Más Descargados", + "newly_added": "Recientemente Añadidos", + "top_rated": "Mejor Calificados", + "rename not supported": "No hay soporte de rename en el directorio de Termux", + "compress": "Comprimir", + "copy uri": "Copiar Uri", + "delete entries": "¿Estás seguro de que deseas eliminar {count} elementos?", + "deleting items": "Eliminando {count} elementos...", + "import project zip": "Importar proyecto (zip)", + "changelog": "Historial de cambios", + "notifications": "Notificaciones", + "no_unread_notifications": "No hay notificaciones sin leer", + "should_use_current_file_for_preview": "Usar el archivo actual para la vista previa en lugar del predeterminado (index.html).", + "fade fold widgets": "Desvanecer Iconos de Plegado", + "quicktools:home-key": "Tecla Home", + "quicktools:end-key": "Tecla End", + "quicktools:pageup-key": "Tecla de Pagina Arriba", + "quicktools:pagedown-key": "Tecla de Pagina Abajo", + "quicktools:delete-key": "Tecla de borrado", + "quicktools:tilde": "Insertar tilde", + "quicktools:backtick": "Insertar comilla invertida", + "quicktools:hash": "Insertar símbolo de hash", + "quicktools:dollar": "Insertar símbolo de dólar", + "quicktools:modulo": "Insertar símbolo de módulo/porcentaje", + "quicktools:caret": "Insertar símbolo de intercalación", + "plugin_enabled": "Plugin activado", + "plugin_disabled": "Plugin desactivado", + "enable_plugin": "Activar este Plugin", + "disable_plugin": "Desactivar este Plugin", + "open_source": "Codigo Abierto", + "terminal settings": "Ajustes de la Terminal", + "font ligatures": "Ligaduras de Texto", + "letter spacing": "Espaciado de Letras", + "terminal:tab stop width": "Ancho del Tabulador", + "terminal:scrollback": "Líneas de desplazamiento hacia atrás", + "terminal:cursor blink": "Parpadeo del Cursor", + "terminal:font weight": "Grosor de Fuente", + "terminal:cursor inactive style": "Estilo del Cursor Inactivo", + "terminal:cursor style": "Estilo del Cursor", + "terminal:font family": "Familia de Fuentes", + "terminal:convert eol": "Convertir EOL", + "terminal:confirm tab close": "Confirmar el cierre de la pestaña del terminal", + "terminal:image support": "Soporte de imágenes", "terminal": "Terminal", - "terminal not installed prompt": "Terminal no está instalado. ¿Desea inicializarlo ahora?", - "terminal first launch prompt": "El entorno del terminal no está instalado. Permite ejecutar comandos, SSH y scripting. ¿Instalar ahora?", - "allFileAccess": "All file access", - "fonts": "Fonts", - "sponsor": "Patrocinador", - "downloads": "downloads", - "reviews": "reviews", - "overview": "Overview", - "contributors": "Contributors", - "quicktools:hyphen": "Insert hyphen symbol", - "check for app updates": "Check for app updates", - "prompt update check consent message": "Acode can check for new app updates when you're online. Enable update checks?", - "keywords": "Keywords", - "author": "Author", - "filtered by": "Filtered by", - "clean install state": "Clean Install State", - "backup created": "Backup created", - "restore completed": "Restore completed", - "restore will include": "This will restore", - "restore warning": "This action cannot be undone. Continue?", - "reload to apply": "Reload to apply changes?", - "reload app": "Reload app", - "preparing backup": "Preparing backup", - "collecting settings": "Collecting settings", - "collecting key bindings": "Collecting key bindings", - "collecting plugins": "Collecting plugin information", - "creating backup": "Creating backup file", - "validating backup": "Validating backup", - "restoring key bindings": "Restoring key bindings", - "restoring plugins": "Restoring plugins", - "restoring settings": "Restoring settings", - "legacy backup warning": "This is an older backup format. Some features may be limited.", - "checksum mismatch": "Checksum mismatch - backup file may have been modified or corrupted.", - "plugin not found": "Plugin not found in registry", - "paid plugin skipped": "Paid plugin - purchase not found", - "source not found": "Source file no longer exists", - "restored": "Restored", - "skipped": "Skipped", - "backup not valid object": "Backup file is not a valid object", - "backup no data": "Backup file contains no data to restore", - "backup legacy warning": "This is an older backup format (v1). Some features may be limited.", - "backup missing metadata": "Missing backup metadata - some info may be unavailable", - "backup checksum mismatch": "Checksum mismatch - backup file may have been modified or corrupted. Proceed with caution.", - "backup checksum verify failed": "Could not verify checksum", - "backup invalid settings": "Invalid settings format", - "backup invalid keybindings": "Invalid keyBindings format", - "backup invalid plugins": "Invalid installedPlugins format", - "issues found": "Issues found", - "error details": "Error details", - "active tools": "Active tools", - "available tools": "Available tools", - "recent": "Recent Files", - "command palette": "Open Command Palette", - "change theme": "Change Theme", - "documentation": "Documentation", - "open in terminal": "Open in Terminal", - "developer mode": "Developer Mode", - "info-developermode": "Enable developer tools (Eruda) for debugging plugins and inspecting app state. Inspector will be initialized on app start.", - "developer mode enabled": "Developer mode enabled. Use command palette to toggle inspector (Ctrl+Shift+I).", - "developer mode disabled": "Developer mode disabled", - "copy relative path": "Copy Relative Path", - "shortcut request sent": "Shortcut request opened. Tap Add to finish.", - "add to home screen": "Add to home screen", - "pin shortcuts not supported": "Home screen shortcuts are not supported on this device.", - "save file before home shortcut": "Save the file before adding it to the home screen.", - "terminal_required_message_for_lsp": "Terminal not installed. Please install Terminal first to use LSP servers.", - "shift click selection": "Shift + tap/click selection", - "earn ad-free time": "Earn ad-free time", - "indent guides": "Indent guides", - "language servers": "Language servers", - "lint gutter": "Show lint gutter", - "rainbow brackets": "Rainbow brackets", - "lsp-add-custom-server": "Add custom server", - "lsp-binary-args": "Binary args (JSON array)", - "lsp-binary-command": "Binary command", - "lsp-binary-path-optional": "Binary path (optional)", - "lsp-check-command-optional": "Check command (optional override)", - "lsp-checking-installation-status": "Checking installation status...", - "lsp-configured": "Configured", - "lsp-custom-server-added": "Custom server added", - "lsp-default": "Default", - "lsp-details-line": "Details: {details}", - "lsp-edit-initialization-options": "Edit initialization options", - "lsp-empty": "Empty", - "lsp-enabled": "Enabled", - "lsp-error-add-server-failed": "Failed to add server", - "lsp-error-args-must-be-array": "Arguments must be a JSON array", - "lsp-error-binary-command-required": "Binary command is required", - "lsp-error-language-id-required": "At least one language ID is required", - "lsp-error-package-required": "At least one package is required", - "lsp-error-server-id-required": "Server ID is required", - "lsp-feature-completion": "Code completion", - "lsp-feature-completion-info": "Enable autocomplete suggestions from the server.", - "lsp-feature-diagnostics": "Diagnostics", - "lsp-feature-diagnostics-info": "Show errors and warnings from the language server.", - "lsp-feature-formatting": "Formatting", - "lsp-feature-formatting-info": "Enable code formatting from the language server.", - "lsp-feature-hover": "Hover information", - "lsp-feature-hover-info": "Show type information and documentation on hover.", - "lsp-feature-inlay-hints": "Inlay hints", - "lsp-feature-inlay-hints-info": "Show inline type hints in the editor.", - "lsp-feature-signature": "Signature help", + "terminal not installed prompt": "La terminal no está instalada. ¿Desea inicializarla ahora?", + "terminal first launch prompt": "El entorno de la terminal no está instalado. Permite ejecutar comandos, SSH y scripting. ¿Instalar ahora?", + "allFileAccess": "Acceso a todos los archivos", + "fonts": "Fuentes", + "sponsor": "Patrocinar", + "downloads": "Descargas", + "reviews": "Reseñas", + "overview": "Descripción general", + "contributors": "Contribuidores", + "quicktools:hyphen": "Insertar símbolo de guion", + "check for app updates": "Buscar Actualizaciones de la Aplicación", + "prompt update check consent message": "Acode puede buscar nuevas actualizaciones cuando estés conectado a internet. ¿Activar la busqueda de actualizaciones?", + "keywords": "Palabras Clave", + "author": "Autor", + "filtered by": "Filtrado por", + "clean install state": "Limpiar Install State", + "backup created": "Copia de seguridad creada", + "restore completed": "Restauración completada", + "restore will include": "Esto restaurará", + "restore warning": "Esta acción no se puede deshacer. ¿Continuar?", + "reload to apply": "¿Recargar para aplicar los cambios?", + "reload app": "Recargar Aplicación", + "preparing backup": "Preparando la copia de seguridad", + "collecting settings": "Recopilando Configuraciones", + "collecting key bindings": "Recopilando de combinaciones de teclas", + "collecting plugins": "Recopilando de información del plugin", + "creating backup": "Creando copia de seguridad", + "validating backup": "Validando la copia de seguridad", + "restoring key bindings": "Restaurar las combinaciones de teclas", + "restoring plugins": "Restaurando plugins", + "restoring settings": "Restaurando la configuración", + "legacy backup warning": "Este es un formato de copia de seguridad antiguo. Algunas funciones pueden estar limitadas.", + "checksum mismatch": "Error de suma de comprobación: es posible que el archivo de copia de seguridad haya sido modificado o esté dañado.", + "plugin not found": "El plugin no se encontró en el registro", + "paid plugin skipped": "Complemento de pago: no se encontró la compra.", + "source not found": "El archivo fuente ya no existe", + "restored": "Restaurado", + "skipped": "Ignorado", + "backup not valid object": "El archivo de copia de seguridad no es un objeto válido.", + "backup no data": "El archivo de copia de seguridad no contiene datos para restaurar.", + "backup legacy warning": "Este es un formato de copia de seguridad antiguo (v1). Algunas funciones pueden estar limitadas.", + "backup missing metadata": "Faltan metadatos de copia de seguridad: es posible que parte de la información no esté disponible.", + "backup checksum mismatch": "Error de suma de comprobación: el archivo de copia de seguridad podría haber sido modificado o estar dañado. Proceda con precaución.", + "backup checksum verify failed": "No se pudo verificar la suma de comprobación.", + "backup invalid settings": "Formato de configuración no válido", + "backup invalid keybindings": "Formato de asignación de teclas no válido", + "backup invalid plugins": "Formato de installedPlugins no válido", + "issues found": "Problemas encontrados", + "error details": "Detalles del error", + "active tools": "Herramientas activas", + "available tools": "Herramientas disponibles", + "recent": "Archivos recientes", + "command palette": "Abrir la paleta de comandos", + "change theme": "Cambiar tema", + "documentation": "Documentación", + "open in terminal": "Abrir en la terminal", + "developer mode": "Modo desarrollador", + "info-developermode": "Habilita las herramientas para desarrolladores (Eruda) para depurar complementos e inspeccionar el estado de la aplicación. El inspector se inicializará al iniciar la aplicación.", + "developer mode enabled": "Modo desarrollador activado. Usa la paleta de comandos para activar o desactivar el inspector. (Ctrl+Shift+I).", + "developer mode disabled": "Modo desarrollador desactivado", + "copy relative path": "Copiar ruta relativa", + "shortcut request sent": "Se ha abierto la solicitud de acceso directo. Pulsa Añadir para finalizar.", + "add to home screen": "Agregar a la pantalla de inicio", + "pin shortcuts not supported": "Los accesos directos a la pantalla de inicio no son compatibles con este dispositivo.", + "save file before home shortcut": "Guarda el archivo antes de agregarlo a la pantalla de inicio.", + "terminal_required_message_for_lsp": "La terminal no está instalada. Instale la terminal primero para poder usar los servidores LSP.", + "shift click selection": "Shift + pulsar/clic para seleccionar", + "earn ad-free time": "Gana tiempo sin anuncios", + "indent guides": "Guías de Indentación", + "language servers": "Servidores de Lenguaje", + "lint gutter": "Mostrar lint gutter", + "rainbow brackets": "Corchetes arcoíris", + "lsp-add-custom-server": "Agregar servidor personalizado", + "lsp-binary-args": "Parámetros binarios (array JSON)", + "lsp-binary-command": "Comando binario", + "lsp-binary-path-optional": "Ruta al binario (opcional)", + "lsp-check-command-optional": "Comando de verificación (reemplazo opcional)", + "lsp-checking-installation-status": "Comprobando el estado de la instalación...", + "lsp-configured": "Configurado", + "lsp-custom-server-added": "Servidor personalizado añadido", + "lsp-default": "Por defecto", + "lsp-details-line": "Detalles: {details}", + "lsp-edit-initialization-options": "Editar opciones de inicialización", + "lsp-empty": "Vacío", + "lsp-enabled": "Activado", + "lsp-error-add-server-failed": "No se pudo agregar el servidor.", + "lsp-error-args-must-be-array": "Los argumentos deben ser un array JSON.", + "lsp-error-binary-command-required": "Se requiere un comando binario.", + "lsp-error-language-id-required": "Se requiere al menos un id de lenguaje.", + "lsp-error-package-required": "Se requiere al menos un paquete.", + "lsp-error-server-id-required": "Se requiere el ID del servidor.", + "lsp-feature-completion": "Autocompletado de código", + "lsp-feature-completion-info": "Habilitar las sugerencias de autocompletado del servidor.", + "lsp-feature-diagnostics": "Diagnósticos", + "lsp-feature-diagnostics-info": "Muestra los errores y advertencias del servidor.", + "lsp-feature-formatting": "Formato", + "lsp-feature-formatting-info": "Habilitar el formato de código desde el servidor.", + "lsp-feature-hover": "Información al pasar el cursor", + "lsp-feature-hover-info": "Muestra información sobre el tipo y la documentación al pasar el cursor por encima.", + "lsp-feature-inlay-hints": "Incrustaciones", + "lsp-feature-inlay-hints-info": "Mostrar sugerencias de tipo en línea en el editor.", + "lsp-feature-signature": "Ayuda de parámetros", "lsp-feature-signature-info": "Show function parameter hints while typing.", "lsp-feature-state-toast": "{feature} {state}", - "lsp-initialization-options": "Initialization options", - "lsp-initialization-options-json": "Initialization options (JSON)", - "lsp-initialization-options-updated": "Initialization options updated", - "lsp-install-command": "Install command", - "lsp-install-command-unavailable": "Install command not available", - "lsp-install-info-check-failed": "Acode could not verify the installation status.", - "lsp-install-info-missing": "Language server is not installed in the terminal environment.", - "lsp-install-info-ready": "Language server is installed and ready.", - "lsp-install-info-unknown": "Installation status could not be checked automatically.", - "lsp-install-info-version-available": "Version {version} is available.", + "lsp-initialization-options": "Opciones de inicialización", + "lsp-initialization-options-json": "Opciones de inicialización (JSON)", + "lsp-initialization-options-updated": "Opciones de inicialización actualizadas", + "lsp-install-command": "Comando de instalación", + "lsp-install-command-unavailable": "El comando de instalación no está disponible.", + "lsp-install-info-check-failed": "Acode no pudo verificar el estado de la instalación.", + "lsp-install-info-missing": "El servidor no está instalado en el entorno de la terminal.", + "lsp-install-info-ready": "El servidor está instalado y listo.", + "lsp-install-info-unknown": "No se pudo comprobar automáticamente el estado de la instalación.", + "lsp-install-info-version-available": "Version {version} disponible.", "lsp-install-notification": "{server} no está instalado. Toque para instalar.", - "lsp-install-method-apk": "APK package", + "lsp-install-method-apk": "paquete APK", "lsp-install-method-cargo": "Cargo crate", - "lsp-install-method-manual": "Manual binary", - "lsp-install-method-npm": "npm package", - "lsp-install-method-pip": "pip package", - "lsp-install-method-shell": "Custom shell", - "lsp-install-method-title": "Install method", - "lsp-install-repair": "Install / repair", - "lsp-installation-status": "Installation status", - "lsp-installed": "Installed", - "lsp-invalid-timeout": "Invalid timeout value", - "lsp-language-ids": "Language IDs (comma separated)", - "lsp-packages-prompt": "{method} packages (comma separated)", - "lsp-remove-installed-files": "Remove installed files for {server}?", - "lsp-server-disabled-toast": "Server disabled", - "lsp-server-enabled-toast": "Server enabled", - "lsp-server-id": "Server ID", - "lsp-server-label": "Server label", - "lsp-server-not-found": "Server not found", - "lsp-server-uninstalled": "Server uninstalled", - "lsp-startup-timeout": "Startup timeout", - "lsp-startup-timeout-ms": "Startup timeout (milliseconds)", - "lsp-startup-timeout-set": "Startup timeout set to {timeout} ms", - "lsp-state-disabled": "disabled", - "lsp-state-enabled": "enabled", - "lsp-status": "Status", - "lsp-status-check-failed": "Check failed", - "lsp-status-installed": "Installed", - "lsp-status-installed-version": "Installed ({version})", - "lsp-status-line": "Status: {status}", - "lsp-status-not-installed": "Not installed", - "lsp-status-unknown": "Unknown", + "lsp-install-method-manual": "Binario manual", + "lsp-install-method-npm": "paquete npm", + "lsp-install-method-pip": "paquete pip", + "lsp-install-method-shell": "Shell personalizado", + "lsp-install-method-title": "Método de instalación", + "lsp-install-repair": "Instalar/ Reparar", + "lsp-installation-status": "Estado de la instalación", + "lsp-installed": "Instalado", + "lsp-invalid-timeout": "Valor de tiempo de espera no válido", + "lsp-language-ids": "IDs de lenguajes (separados por comas)", + "lsp-packages-prompt": "paquetes de {method} (separados por comas)", + "lsp-remove-installed-files": "¿Eliminar archivos instalados para {server}?", + "lsp-server-disabled-toast": "Servidor desactivado", + "lsp-server-enabled-toast": "Servidor activado", + "lsp-server-id": "ID del servidor", + "lsp-server-label": "Etiqueta del servidor", + "lsp-server-not-found": "Servidor no encontrado", + "lsp-server-uninstalled": "Servidor desinstalado", + "lsp-startup-timeout": "Tiempo de espera de inicio", + "lsp-startup-timeout-ms": "Tiempo de espera de inicio (milisegundos)", + "lsp-startup-timeout-set": "Tiempo de espera de inicio establecido en: {timeout} ms", + "lsp-state-disabled": "desactivado", + "lsp-state-enabled": "activado", + "lsp-status": "Estado", + "lsp-status-check-failed": "Revisión fallida", + "lsp-status-installed": "Instalado", + "lsp-status-installed-version": "Instalado ({version})", + "lsp-status-line": "Estado: {status}", + "lsp-status-not-installed": "No instalado", + "lsp-status-unknown": "Desconocido", "lsp-timeout-ms": "{timeout} ms", - "lsp-uninstall-command-unavailable": "Uninstall command not available", + "lsp-uninstall-command-unavailable": "Comando para desinstalar no disponible", "lsp-uninstall-notification": "Toque para desinstalar {server}.", - "lsp-uninstall-server": "Uninstall server", - "lsp-update-command-optional": "Update command (optional)", - "lsp-update-command-unavailable": "Update command not available", - "lsp-update-server": "Update server", + "lsp-uninstall-server": "Desinstalar Servidor", + "lsp-update-command-optional": "Comando de actualización (opcional)", + "lsp-update-command-unavailable": "Comando de actualización no disponible", + "lsp-update-server": "Actualizar Servidor", "lsp-version-line": "Version: {version}", - "lsp-view-initialization-options": "View initialization options", - "settings-category-about-acode": "About Acode", + "lsp-view-initialization-options": "Ver opciones de inicialización", + "settings-category-about-acode": "Acerca de Acode", "settings-category-discover-apps": "Descubre más aplicaciones", - "settings-category-advanced": "Advanced", - "settings-category-assistance": "Assistance", - "settings-category-core": "Core settings", + "settings-category-advanced": "Avanzado", + "settings-category-assistance": "Asistencia", + "settings-category-core": "Configuración Principal", "settings-category-cursor": "Cursor", - "settings-category-cursor-selection": "Cursor & selection", - "settings-category-custom-servers": "Custom servers", + "settings-category-cursor-selection": "Cursor y Selección", + "settings-category-custom-servers": "Servidores Personalizados", "settings-category-customization": "Personalización", "settings-category-tools": "Herramientas", - "settings-category-display": "Display", - "settings-category-editing": "Editing", - "settings-category-features": "Features", - "settings-category-files-sessions": "Files & sessions", - "settings-category-fonts": "Fonts", + "settings-category-display": "Visualización", + "settings-category-editing": "Edición", + "settings-category-features": "Funciones", + "settings-category-files-sessions": "Archivos y Sesiones", + "settings-category-fonts": "Fuentes", "settings-category-general": "General", - "settings-category-guides-indicators": "Guides & indicators", - "settings-category-installation": "Installation", - "settings-category-interface": "Interface", - "settings-category-maintenance": "Maintenance", - "settings-category-permissions": "Permissions", - "settings-category-preview": "Preview", - "settings-category-scrolling": "Scrolling", - "settings-category-server": "Server", - "settings-category-servers": "Servers", - "settings-category-session": "Session", - "settings-category-support-acode": "Support Acode", - "settings-category-text-layout": "Text & layout", - "settings-info-app-animation": "Control transition animations across the app.", - "settings-info-app-check-files": "Refresh editors when files change outside Acode.", - "settings-info-app-clean-install-state": "Clear stored install state used by onboarding and setup flows.", - "settings-info-app-confirm-on-exit": "Ask before closing the app.", - "settings-info-app-console": "Choose which debug console integration Acode uses.", - "settings-info-app-default-file-encoding": "Default encoding when opening or creating files.", - "settings-info-app-exclude-folders": "Skip folders and patterns while searching or scanning.", - "settings-info-app-floating-button": "Show the floating quick actions button.", - "settings-info-app-font-manager": "Install, manage, or remove app fonts.", - "settings-info-app-fullscreen": "Hide the system status bar while using Acode.", - "settings-info-app-keybindings": "Edit the key bindings file or reset shortcuts.", - "settings-info-app-keyboard-mode": "Choose how the software keyboard behaves while editing.", - "settings-info-app-language": "Choose the app language and translated labels.", - "settings-info-app-open-file-list-position": "Choose where the active files list appears.", - "settings-info-app-quick-tools-settings": "Reorder and customize quick tool shortcuts.", - "settings-info-app-quick-tools-trigger-mode": "Choose how quick tools open on tap or touch.", - "settings-info-app-remember-files": "Reopen the files that were open last time.", - "settings-info-app-remember-folders": "Reopen folders from the previous session.", - "settings-info-app-retry-remote-fs": "Retry remote file operations after a failed transfer.", - "settings-info-app-side-buttons": "Show extra action buttons beside the editor.", - "settings-info-app-sponsor-sidebar": "Show the sponsor entry in the sidebar.", - "settings-info-app-touch-move-threshold": "Minimum movement before a touch drag is detected.", - "settings-info-app-vibrate-on-tap": "Enable haptic feedback for taps and controls.", - "settings-info-editor-autosave": "Save changes automatically after a delay.", - "settings-info-editor-color-preview": "Preview color values inline in the editor.", - "settings-info-editor-fade-fold-widgets": "Dim fold markers until they are needed.", - "settings-info-editor-font-family": "Choose the typeface used in the editor.", - "settings-info-editor-font-size": "Set the editor text size.", - "settings-info-editor-format-on-save": "Run the formatter whenever a file is saved.", - "settings-info-editor-hard-wrap": "Insert real line breaks instead of only wrapping visually.", - "settings-info-editor-indent-guides": "Show indentation guide lines.", - "settings-info-editor-line-height": "Adjust vertical spacing between lines.", - "settings-info-editor-line-numbers": "Show line numbers in the gutter.", - "settings-info-editor-lint-gutter": "Show diagnostics and lint markers in the gutter.", - "settings-info-editor-live-autocomplete": "Show suggestions while you type.", - "settings-info-editor-rainbow-brackets": "Color matching brackets by nesting depth.", - "settings-info-editor-relative-line-numbers": "Show distance from the current line.", - "settings-info-editor-rtl-text": "Switch right-to-left behavior per line.", - "settings-info-editor-scroll-settings": "Adjust scrollbar size, speed, and gesture behavior.", - "settings-info-editor-shift-click-selection": "Extend selection with Shift + tap or click.", + "settings-category-guides-indicators": "Guías e indicadores", + "settings-category-installation": "Instalación", + "settings-category-interface": "Interfaz", + "settings-category-maintenance": "Mantenimiento", + "settings-category-permissions": "Permisos", + "settings-category-preview": "Vista Previa", + "settings-category-scrolling": "Desplazamiento", + "settings-category-server": "Servidor", + "settings-category-servers": "Servidores", + "settings-category-session": "Sesión", + "settings-category-support-acode": "Apoya a Acode", + "settings-category-text-layout": "Texto y Distribución", + "settings-info-app-animation": "Controla las animaciones en la aplicación.", + "settings-info-app-check-files": "Recarga el editor cuando los archivos cambian fuera de Acode.", + "settings-info-app-clean-install-state": "Limpiar el estado de instalación usado por los flujos de incorporación y configuración.", + "settings-info-app-confirm-on-exit": "Preguntar antes de cerrar la aplicación.", + "settings-info-app-console": "Elige qué integración de consola de debug usa Acode.", + "settings-info-app-default-file-encoding": "Codificación por defecto al abrir o crear archivos.", + "settings-info-app-exclude-folders": "Ignorar carpetas o patrones al buscar o escanear.", + "settings-info-app-floating-button": "Mostrar el botón flotante que abre las herramientas rápidas..", + "settings-info-app-font-manager": "Instala, administra o quita fuentes de la aplicación.", + "settings-info-app-fullscreen": "Esconde la barra de estado al usa Acode.", + "settings-info-app-keybindings": "Edita las combinaciones de teclas o reinicia los atajos del editor.", + "settings-info-app-keyboard-mode": "Elige cómo se comporta el teclado al escribir.", + "settings-info-app-language": "Elige el lenguaje de la aplicación y las etiquetas traducidas.", + "settings-info-app-open-file-list-position": "Elige dónde aparece la lista de archivos activos.", + "settings-info-app-quick-tools-settings": "Reorganiza y personaliza los botones de herramientas rápidas.", + "settings-info-app-quick-tools-trigger-mode": "Elige si las herramientas rápidas se activan mediante clic o toque.", + "settings-info-app-remember-files": "Reabrir archivos que estaban abiertos la última vez.", + "settings-info-app-remember-folders": "Reabrir carpetas de la sesión anterior.", + "settings-info-app-retry-remote-fs": "Reintentar operaciones de archivos remotos después de una transferencia fallida.", + "settings-info-app-side-buttons": "Mostrar botones extra en el margen del editor.", + "settings-info-app-sponsor-sidebar": "Mostrar la opción de sponsor en la barra lateral.", + "settings-info-app-touch-move-threshold": "Movimiento mínimo para que un toque de arrastre sea detectado.", + "settings-info-app-vibrate-on-tap": "Activar la retroalimentación háptica al tocar y para los controles.", + "settings-info-editor-autosave": "Guardar los cambios en un archivo después de cierto tiempo.", + "settings-info-editor-color-preview": "Mostrar vista previa de colores en el editor.", + "settings-info-editor-fade-fold-widgets": "Desvanece los marcadores de plegado hasta que sean necesarios.", + "settings-info-editor-font-family": "Elige el tipo de cara para la fuente del editor", + "settings-info-editor-font-size": "Establece el tamaño de fuente del editor.", + "settings-info-editor-format-on-save": "Ejecutar el formateador cada vez que guardas un archivo.", + "settings-info-editor-hard-wrap": "Insertar saltos de línea reales en lugar de solo ajustar el texto visualmente.", + "settings-info-editor-indent-guides": "Mostrar guías de indentación.", + "settings-info-editor-line-height": "Ajustar espaciado vertical entre líneas.", + "settings-info-editor-line-numbers": "Muestra los números de línea en el editor.", + "settings-info-editor-lint-gutter": "Mostrar diagnósticos y marcadores de error en el lateral del editor.", + "settings-info-editor-live-autocomplete": "Mostrar sugerencias mientras escribes.", + "settings-info-editor-rainbow-brackets": "Llaves del mismo color basado en la profundidad de anidación.", + "settings-info-editor-relative-line-numbers": "Mostrar distancia a la linea actual.", + "settings-info-editor-rtl-text": "Intercambia el comportamiento de las líneas a derecha-a-izquierda", + "settings-info-editor-scroll-settings": "Ajusta el tamaño, velocidad y comportamiento de gestos de la barra de desplazamiento.", + "settings-info-editor-shift-click-selection": "Extender la selección manteniendo shift y tocando o dando click en el editor.", "settings-info-editor-show-spaces": "Mostrar marcadores visibles de espacios en blanco y saltos de línea.", - "settings-info-editor-soft-tab": "Insert spaces instead of tab characters.", - "settings-info-editor-tab-size": "Set how many spaces each tab step uses.", - "settings-info-editor-teardrop-size": "Set the cursor handle size for touch editing.", - "settings-info-editor-text-wrap": "Wrap long lines inside the editor.", - "settings-info-lsp-add-custom-server": "Register a custom language server with install, update, and launch commands.", - "settings-info-lsp-edit-init-options": "Edit initialization options as JSON.", - "settings-info-lsp-install-server": "Install or repair this language server.", - "settings-info-lsp-server-enabled": "Enable or disable this language server.", - "settings-info-lsp-startup-timeout": "Set how long Acode waits for the server to start.", - "settings-info-lsp-uninstall-server": "Remove installed packages or binaries for this server.", - "settings-info-lsp-update-server": "Update this language server if an update flow is available.", - "settings-info-lsp-view-init-options": "View the effective initialization options as JSON.", - "settings-info-main-ad-rewards": "Watch ads to unlock temporary ad-free access.", - "settings-info-main-app-settings": "Language, app behavior, and quick access tools.", - "settings-info-main-backup-restore": "Export settings to a backup or restore them later.", - "settings-info-main-changelog": "See recent updates and release notes.", - "settings-info-main-edit-settings": "Edit the raw settings.json file directly.", - "settings-info-main-editor-settings": "Fonts, tabs, suggestions, and editor display.", - "settings-info-main-formatter": "Choose a formatter for each supported language.", - "settings-info-main-lsp-settings": "Configure language servers and editor intelligence.", - "settings-info-main-plugins": "Manage installed plugins and their available actions.", - "settings-info-main-preview-settings": "Preview mode, server ports, and browser behavior.", - "settings-info-main-rateapp": "Rate Acode on Google Play.", - "settings-info-main-remove-ads": "Unlock permanent ad-free access.", - "settings-info-main-reset": "Reset Acode to its default configuration.", - "settings-info-main-sponsors": "Support ongoing Acode development.", - "settings-info-main-terminal-settings": "Terminal theme, font, cursor, and session behavior.", - "settings-info-main-theme": "App theme, contrast, and custom colors.", - "settings-info-preview-disable-cache": "Always reload content in the in-app browser.", - "settings-info-preview-host": "Hostname used when opening the preview URL.", - "settings-info-preview-mode": "Choose where preview opens when you launch it.", - "settings-info-preview-preview-port": "Port used by the live preview server.", - "settings-info-preview-server-port": "Port used by the internal app server.", - "settings-info-preview-show-console-toggler": "Show the console button in preview.", - "settings-info-preview-use-current-file": "Prefer the current file when starting preview.", - "settings-info-terminal-convert-eol": "Convert line endings when pasting or rendering terminal output.", - "settings-note-formatter-settings": "Assign a formatter to each language. Install formatter plugins to unlock more options.", - "settings-note-lsp-settings": "Language servers add autocomplete, diagnostics, hover details, and more. They work best with folders that Acode's built-in terminal can access directly, such as terminal/public folders. SAF, external, and remote locations are skipped by default because they may use cached or virtual paths; enable the compatibility option only if you want to try them.", - "search result label singular": "result", - "search result label plural": "results", - "pin tab": "Pin tab", - "unpin tab": "Unpin tab", - "pinned tab": "Pinned tab", - "unpin tab before closing": "Unpin the tab before closing it.", - "app font": "App font", + "settings-info-editor-soft-tab": "Inserta espacios en lugar de tabuladores.", + "settings-info-editor-tab-size": "Establece cuántos espacios ocupa un tabulador.", + "settings-info-editor-teardrop-size": "Establece el tamaño del cursor touch al editar.", + "settings-info-editor-text-wrap": "Ajusta las líneas largas dentro del editor.", + "settings-info-lsp-add-custom-server": "Registra un nuevo servidor de lenguaje con comandos de instalación, actualización e inicialización.", + "settings-info-lsp-edit-init-options": "Editar las opciones de inicialización como JSON.", + "settings-info-lsp-install-server": "Instalar o reparar este servidor.", + "settings-info-lsp-server-enabled": "Activa o desactiva este servidor.", + "settings-info-lsp-startup-timeout": "Establece por cuánto tiempo Acode espera a que inicie este servidor.", + "settings-info-lsp-uninstall-server": "Remover los paquetes o binarios instalados para este servidor.", + "settings-info-lsp-update-server": "Actualiza este servidor si algún flujo de actualización está disponible.", + "settings-info-lsp-view-init-options": "Mira las opciones de inicialización aplicadas en formato JSON.", + "settings-info-main-ad-rewards": "Mira anuncios para desactivar los anuncios en la aplicación de forma temporal.", + "settings-info-main-app-settings": "Lenguaje, comportamiento de la aplicación y acceso a herramientas rápidas.", + "settings-info-main-backup-restore": "Exporta tu configuración a un respaldo o restaurala más tarde.", + "settings-info-main-changelog": "Mira las actualizaciones recientes y las notas release de la aplicación", + "settings-info-main-edit-settings": "Edita el archivo de settings.json directamente.", + "settings-info-main-editor-settings": "Fuentes, tabuladores, sugerencias y muestreo del editor", + "settings-info-main-formatter": "Elige un formateador para cada lenguaje soportado.", + "settings-info-main-lsp-settings": "Configurar servidores de lenguaje e inteligencia del editor.", + "settings-info-main-plugins": "Administra los plugins instalados y sus funciones disponibles.", + "settings-info-main-preview-settings": "Modo de vista previa, puertos del servidor y comportamiento del navegador.", + "settings-info-main-rateapp": "Califica Acode en Google Play.", + "settings-info-main-remove-ads": "Desbloquea la experiencia sin anuncios de forma permanente.", + "settings-info-main-reset": "Reiniciar Acode a su configuración por defecto.", + "settings-info-main-sponsors": "Apoyar al desarrollo continuo de Acode.", + "settings-info-main-terminal-settings": "Tema de la terminal, fuente, cursor y comportamiento de la sesión.", + "settings-info-main-theme": "Tema de la aplicación, contraste y colores personalizados.", + "settings-info-preview-disable-cache": "Siempre recargar el contenido en el navegador de la aplicación.", + "settings-info-preview-host": "Nombre de host usado al abrir la URL de la vista previa.", + "settings-info-preview-mode": "Elige dónde se abre la vista previa cuando la inicias.", + "settings-info-preview-preview-port": "Puerto usado por el servidor de vista previa en tiempo real.", + "settings-info-preview-server-port": "Puerto usado por el servidor interno de la aplicación.", + "settings-info-preview-show-console-toggler": "Mostrar el botón de la consola en la vista previa.", + "settings-info-preview-use-current-file": "Usar el archivo actual para iniciar la vista previa.", + "settings-info-terminal-convert-eol": "Convertir los finales de linea al pegar o renderizar la salida de la terminal.", + "settings-note-formatter-settings": "Asigna un formateador a cada lenguaje. Instala plugins de formateado para desbloquear más opciones.", + "settings-note-lsp-settings": "Los servidores de lenguaje agregan funciones de auto completado, diagnósticos, detalles de hover y más. Funcionan mejor con carpetas a las que la terminal de Acode puede acceder directamente, como la carpeta terminal/public. Las ubicaciones SAF, externas y remotas son ignoradas automáticamente ya que podrían usar rutas cacheadas o virtuales; activa la opción de compatibilidad solo si quieres probarlas.", + "search result label singular": "resultado", + "search result label plural": "resultados", + "pin tab": "Fijar ventana", + "unpin tab": "Dejar de fijar ventana", + "pinned tab": "Ventana fijada", + "unpin tab before closing": "Deja de fijar la ventana antes de cerrarla.", + "app font": "Fuente de la Aplicación", "app icon": "Icono de la aplicación", - "app icon changed": "App icon changed", - "app icon change warning": "The app will exit after the app icon is changed.", - "settings-info-app-font-family": "Choose the font used across the app interface.", + "app icon changed": "El icono de la aplicación ha sido cambiado", + "app icon change warning": "La aplicación se cerrará después de cambiar el icono de aplicación.", + "settings-info-app-font-family": "Elige la fuente que se usará en la interfaz de la aplicación.", "settings-info-app-icon": "Elige el icono de la aplicación que se muestra en tu dispositivo.", - "lsp-transport-method-stdio": "STDIO (launch a binary command)", - "lsp-transport-method-websocket": "WebSocket (connect to a ws/wss URL)", - "lsp-websocket-url": "WebSocket URL", - "lsp-websocket-server-managed-externally": "This server is managed externally over WebSocket.", - "lsp-error-websocket-url-invalid": "WebSocket URL must start with ws:// or wss://", - "lsp-error-websocket-url-required": "WebSocket URL is required", - "lsp-remove-custom-server": "Remove custom server", - "lsp-remove-custom-server-confirm": "Remove custom language server {server}?", - "lsp-custom-server-removed": "Custom server removed", - "settings-info-lsp-remove-custom-server": "Remove this custom language server from Acode.", - "unsaved selected tabs warning": "Some selected tabs are not saved. Choose what to do.", - "save selected tabs": "Save selected tabs", - "close selected tabs": "Close selected tabs", - "save selected tabs warning": "Are you sure you want to save and close the selected tabs?", - "close selected tabs warning": "Are you sure you want to close the selected tabs? You will lose the unsaved changes and this action cannot be reversed.", - "close tabs to right": "Close Right", - "close tabs to left": "Close Left", - "close other tabs": "Close Others", - "auto close tags": "Auto close tags", - "settings-info-editor-auto-close-tags": "Automatically insert closing tags in HTML, XML, Vue, Angular, and PHP template files.", - "ui zoom": "UI zoom", - "settings-info-app-ui-zoom": "Scale text across the Acode interface.", - "plugin-not-supported": "Plugin not supported", - "plugin-not-supported-info": "The plugin was created for older version of Acode.", - "login-to-view": "Please login to view this...", - "show share button": "Show share button", - "settings-info-editor-show-share-button": "Show share button in selection menu.", + "lsp-transport-method-stdio": "STDIO (ejecutar un binario)", + "lsp-transport-method-websocket": "WebSocket (conectar a una URL ws/wss)", + "lsp-websocket-url": "URL del WebSocket", + "lsp-websocket-server-managed-externally": "Este servidor es manejado de forma externa por medio de WebSocket.", + "lsp-error-websocket-url-invalid": "La URL del WebSocket debe iniciar con: ws:// o wss://", + "lsp-error-websocket-url-required": "La URL del WebSocket es requerida", + "lsp-remove-custom-server": "Remover servidor personalizado", + "lsp-remove-custom-server-confirm": "¿Remover el servidor personalizado \"{server}\"?", + "lsp-custom-server-removed": "Servidor personalizado removido", + "settings-info-lsp-remove-custom-server": "Remover este servidor de lenguaje personalizado de Acode.", + "unsaved selected tabs warning": "Algunas de las pestañas seleccionadas no se han guardado. Elige que hacer", + "save selected tabs": "Guardar Pestañas Seleccionadas", + "close selected tabs": "Cerrar Pestañas Seleccionadas", + "save selected tabs warning": "¿Estás seguro de guardar y cerrar las pestañas seleccionadas?", + "close selected tabs warning": "¿Estás seguro de que quieres cerrar las pestañas seleccionadas? Perderás los cambios no guardados, esto no es reversible.", + "close tabs to right": "Cerrar Ventanas a la Derecha", + "close tabs to left": "Cerrar Ventanas a la Izquierda", + "close other tabs": "Cerrar Otras Pestañas", + "auto close tags": "Etiquetas de cierre automáticas", + "settings-info-editor-auto-close-tags": "Insertar automáticamente las etiquetas de cierre en: HTML, XML, Vue, Angular y PHP.", + "ui zoom": "Zoom de la IU", + "settings-info-app-ui-zoom": "Escalar el texto en la interfaz de Acode.", + "plugin-not-supported": "Plugin no soportado", + "plugin-not-supported-info": "Este plugin fue creado para una versión antigua de Acode.", + "login-to-view": "Por favor inicia sesión para ver esto...", + "show share button": "Mostrar boton \"compartir\"", + "settings-info-editor-show-share-button": "Mostrar el botón de compartir en el menú de selección.", "iap-plugin-purchase-warning": "Los plugins comprados no se sincronizan con tu cuenta de Acode. Usa la misma cuenta de Google en Play Store para restaurar tu compra.", "iap-pro-purchase-warning": "Esta compra no se sincronizará con tu cuenta de Acode. Usa la misma cuenta de Google en Play Store para restaurar tu compra.", "confirm-login": "No has iniciado sesión en Acode, ¿iniciar sesión ahora?", - "local word completion": "Local word completion", - "language package completion": "Language package completion", - "settings-info-editor-local-word-completion": "Suggest words from the current file.", - "settings-info-editor-language-completion": "Suggest keywords, snippets, and other completions from CodeMirror language packages.", - "terminal:failsafe": "FailSafe mode", - "terminal:failsafe-info": "Start terminal with system shell", - "auto rename tags": "Auto rename tags", - "settings-info-editor-auto-rename-tags": "Rename the matching opening or closing tag while editing HTML-like tags.", - "copying items": "Copying {count} items...", - "cannot paste folder into itself": "Cannot paste a folder into itself", - "folder already exists": "Folder already exists", - "file already exists force named": "'{name}' already exists. Overwrite?", - "lsp-allow-non-terminal-workspace": "Run LSP on external folders", - "settings-info-lsp-allow-non-terminal-workspace": "Allow language servers for SAF, external, and remote locations. LSP runs in Acode's built-in terminal, which cannot access those locations, so features may not work correctly. As it will connect to a virtual path or cache location.", - "don't ask again": "Don't ask again", - "scrollbar height": "Scrollbar height", - "full": "Full", - "scroll past end": "Scroll past end", - "settings-info-scroll-past-end": "Adds extra empty space at the bottom of the editor, allowing you to scroll the last line to the top.", + "local word completion": "Completado con palabras locales", + "language package completion": "Completado de paquetes de lenguaje", + "settings-info-editor-local-word-completion": "Sugerir palabras presentes en el documento actual.", + "settings-info-editor-language-completion": "Sugerir palabras clave, snippets y otras opciones de los paquetes de lenguaje de CodeMirror.", + "terminal:failsafe": "Modo Seguro", + "terminal:failsafe-info": "Iniciar la terminal con el shell del sistema", + "auto rename tags": "Auto renombrar etiquetas", + "settings-info-editor-auto-rename-tags": "Renombrar la etiqueta de apertura o cierre correspondiente al renombrar etiquetas de estilo HTML.", + "copying items": "Copiando {count} objetos...", + "cannot paste folder into itself": "No puedes pegar una carpeta dentro de ella misma.", + "folder already exists": "Esta carpeta ya existe", + "file already exists force named": "'{name}' ya existe, ¿deseas reemplazarlo?", + "lsp-allow-non-terminal-workspace": "Correr LSPs en carpetas externas", + "settings-info-lsp-allow-non-terminal-workspace": "Permitir servidores de lenguaje para ubicaciones SAF, externas y remotas. El LSP se ejecuta en la terminal integrada de Acode, la cual no puede acceder a esas ubicaciones, por lo que algunas funciones podrían no funcionar correctamente, ya que se conectará a una ruta virtual o a una ubicación en caché.", + "don't ask again": "No volver a preguntar", + "scrollbar height": "Altura de la barra de desplazamiento", + "full": "Completo", + "scroll past end": "Desplazar más allá de la última línea.", + "settings-info-scroll-past-end": "Agrega espacio vacío extra al fondo del editor, permitiendo desplazar la última línea hasta arriba.", "compact": "Compacto", "off": "Apagado", "quick tools height": "Altura de herramientas rápidas", "quick tools toggler": "Alternador de herramientas rápidas", - "running processes": "Running processes", - "recommend extensions": "Recommend extensions", - "settings-info-editor-recommend-extensions": "Suggest plugins when a file opens as plain text because no language mode is available.", - "extension recommendation title": "Extensions available for {extension}", - "extension recommendation message": "No syntax mode is installed for {extension}. Search plugins for \"{keyword}\".", - "extension request title": "No extension found for {extension}", - "extension request message": "Ask for a plugin so Acode can highlight this file type.", - "search plugins": "Search plugins", - "request plugin": "Request plugin", - "terminal:block": "Block", - "terminal:underline": "Underline", - "terminal:bar": "Bar", - "terminal:inactive block": "Block", - "terminal:inactive underline": "Underline", - "terminal:inactive bar": "Bar", - "terminal:inactive none": "None", + "running processes": "Procesos en Ejecución", + "recommend extensions": "Recomendar Extensiones.", + "settings-info-editor-recommend-extensions": "Sugerir extensiones cuando un archivo se abre como texto plano porque no hay un resaltador de texto disponible.", + "extension recommendation title": "Hay extensiones disponibles para {extension}.", + "extension recommendation message": "No hay un resaltador de sintaxis instalado para {extension}. Buscar plugins para \"{keyword}\".", + "extension request title": "No se encontró una extensión para: {extension}", + "extension request message": "Solicita un plugin para que acode pueda colorear este tipo de archivo.", + "search plugins": "Buscar Plugins", + "request plugin": "Solicitar Plugin", + "terminal:block": "Bloque", + "terminal:underline": "Subrayado", + "terminal:bar": "Barra", + "terminal:inactive block": "Bloque", + "terminal:inactive underline": "Subrayado", + "terminal:inactive bar": "Barra", + "terminal:inactive none": "Ninguno", "terminal:normal": "Normal", - "terminal:bold": "Bold", + "terminal:bold": "Negrita", "quicktools-trigger:click": "Click", - "quicktools-trigger:touch": "Touch", - "settings-info-terminal-uninstall": "Are you sure you want to uninstall the terminal?", - "terminal:inactive outline": "Outline", - "restored successfully": "Terminal restored successfully", - "uninstalled successfully": "Terminal uninstalled successfully", - "enter plugin source": "Enter plugin source", - "enter keywords": "Enter keywords", - "enter author name": "Enter author name", - "update available": "Update Available", - "update available info": "Acode {version} is now available! Click here to check out.", - "plugin updates": "Plugin Updates", - "plugin updates singular": "1 plugin has a new version available.", - "plugin updates plural": "{count} plugins have new versions available.", - "just now": "Just now", - "day singular": "{count} day ago", - "hour singular": "{count} hour ago", - "min singular": "{count} minute ago", - "day plural": "{count} days ago", - "hour plural": "{count} hours ago", - "min plural": "{count} minutes ago", - "settings-category-builtin-servers": "Built-in servers", - "settings-category-plugin-servers": "Plugin servers", - "new name": "New name", - "enter new name": "Enter new name", - "code actions": "Code Actions", - "active processes": "Active Processes", - "total memory": "Total Memory", - "uptime": "Uptime", - "note": "Note", - "acode main process": "Acode main process", - "ppid parent": "PPID (Parent)", - "unknown": "Unknown", - "just started": "Just Started", - "diff days": "{days}d {hr}h ago", - "diff hr": "{hr}h {min}m ago", - "diff min": "{min}m {sec}s ago", - "diff sec": "{sec}s ago", - "command": "Command", - "managed": "Managed", - "acode service": "Acode Service", - "info-terminal-show-scrollbar": "Show the xterm scrollbar beside the terminal.", - "terminal:show scrollbar": "Show Scrollbar", - "apply exclusions when copying": "Apply exclusions when copying", - "settings-info-app-use-file-operation-exclusions": "Skip files and folders matching the exclusion patterns during copy and paste operations.", - "horizontal scroll margin": "Horizontal scroll margin", - "settings-info-horizontal-scroll-margin": "Adds empty space after the longest line when word wrap is off. Enter any non-negative whole-pixel value.", + "quicktools-trigger:touch": "Toque", + "settings-info-terminal-uninstall": "¿Estás seguro de desinstalar la terminal?", + "terminal:inactive outline": "Contorno", + "restored successfully": "La terminal se restauró correctamente.", + "uninstalled successfully": "La terminal se desinstaló correctamente.", + "enter plugin source": "Ingresa el origen del plugin", + "enter keywords": "Ingresa palabras clave", + "enter author name": "Ingresa nombre del autor", + "update available": "Actualización Disponible", + "update available info": "¡Acode {version} ya está disponible! Haz click aquí para echar un vistazo.", + "plugin updates": "Actualizaciones de Plugins", + "plugin updates singular": "1 plugin tiene una nueva version disponible.", + "plugin updates plural": "{count} plugins tienen nuevas versiones disponibles.", + "just now": "Justo ahora", + "day singular": "hace {count} día", + "hour singular": "hace {count} hora", + "min singular": "hace {count} minuto", + "day plural": "hace {count} días", + "hour plural": "hace {count} horas", + "min plural": "hace {count} minutos", + "settings-category-builtin-servers": "Servidores nativos", + "settings-category-plugin-servers": "Servidores de plugins", + "new name": "Nuevo nombre", + "enter new name": "Ingresa el nuevo nombre", + "code actions": "Acciones de Código", + "active processes": "Procesos Activos", + "total memory": "Memoria Total", + "uptime": "Tiempo ejecutándose", + "note": "Nota", + "acode main process": "Proceso principal de Acode", + "ppid parent": "PPID (Padre)", + "unknown": "Desconocido", + "just started": "Recien Iniciado", + "diff days": "hace {days}d {hr}h", + "diff hr": "hace {hr}h {min}m", + "diff min": "hace {min}m {sec}s", + "diff sec": "hace {sec}s", + "command": "Comando", + "managed": "Administrado por Acode", + "acode service": "Servicio de Acode", + "info-terminal-show-scrollbar": "Mostrar la barra de desplazamiento xterm al lado de la terminal.", + "terminal:show scrollbar": "Mostrar Barra de Desplazamiento", + "apply exclusions when copying": "Aplicar exclusiones al copiar.", + "settings-info-app-use-file-operation-exclusions": "Ignora los archivos y carpetas que coincidan con los patrones de exclusión al realizar operaciones de copiar y pegar.", + "horizontal scroll margin": "Margen de desplazamiento horizontal", + "settings-info-horizontal-scroll-margin": "Agrega espacio vacío después de la linea más larga cuando el ajuste de texto está desactivado. Inserta cualquier valor no negativo (pixeles).", "confirm app icon reward": "¿Ver un anuncio con recompensa para aplicar este icono de la aplicación?", "rewarded ad unavailable": "Los anuncios con recompensa no están disponibles en este momento. Inténtalo de nuevo.", "rewarded ad failed": "No se pudo completar el anuncio. Inténtalo de nuevo.", @@ -878,14 +878,14 @@ "plugin-review:recommended": "Recomendó este complemento", "plugin-review:error-max-length": "La reseña debe tener {max} caracteres o menos.", "plugin-review:error-downvote-comment": "Dile al desarrollador qué podría mejorar.", - "plugin-review:error-empty": "Agrega un comentario o elige Me gusta.", - "plugin-review:unrated": "Sin calificar", - "wrapped line indent": "Word wrap indentation", - "wrap-indent-same": "Same", - "wrap-indent-indent": "Indent (+1 level)", - "wrap-indent-deep": "Deep indent (+2 levels)", - "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", - "icon pack": "Icon pack", - "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "plugin-review:error-empty": "Agrega un comentario o elige \"Me gusta\".", + "plugin-review:unrated": "Sin calificación.", + "wrapped line indent": "Indentación del Ajuste de Texto", + "wrap-indent-same": "Igualar", + "wrap-indent-indent": "Indentar (+1 nivel)", + "wrap-indent-deep": "Indentar profundo (+2 niveles)", + "settings-info-editor-wrapping-indent": "Elige si las líneas ajustadas comienzan desde el borde izquierdo, mantienen la indentación de la línea original o se indentan más. Cada nivel extra usa el tamaño del tabulador.", + "icon pack": "Paquete de Íconos", + "settings-info-icon-pack": "Elige el paquete de iconos usado para archivos y carpetas en el explorador y listas de archivos en la aplicación.", + "unavailable": "no disponible" } From 5323b5879f60605195b259fe38f35e2b7c273c6e Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 18 Oct 2026 07:56:29 +0000 Subject: [PATCH 154/195] feat(modes): let plugin modes reuse another mode's formatter (#2976) * feat(modes): let plugin modes reuse another mode's formatter Add a formatAs option to editorLanguages.register so a plugin mode (e.g. json-bedrock) formats with the formatter and Prettier parser of an existing mode (e.g. json) when the user hasn't picked one for it. editorLanguages.register now forwards its options to addMode, and Mode ignores malformed options instead of throwing. * fix(modes): resolve formatAs aliases and label the inherited choice Resolve formatAs through the mode list so an alias (e.g. json5) finds the base mode's saved formatter and Prettier parser. For modes with formatAs, the picker's unset option now names the inherited formatter (e.g. "Prettier (JSON)") instead of "None". * fix(settings): refresh inherited formatter label when the picker opens --- src/cm/modelist.ts | 27 ++++++++++++++++--- src/lib/acode.js | 12 ++++++--- src/lib/prettierFormatter.js | 5 +++- src/settings/formatterSettings.js | 24 ++++++++++++++--- tests/unit/modelist.test.js | 45 ++++++++++++++++++++++++++++++- 5 files changed, 100 insertions(+), 13 deletions(-) diff --git a/src/cm/modelist.ts b/src/cm/modelist.ts index 64038b7101..bebd133793 100644 --- a/src/cm/modelist.ts +++ b/src/cm/modelist.ts @@ -5,6 +5,8 @@ export type LanguageExtensionProvider = () => Extension | Promise; export interface AddModeOptions { aliases?: string[]; filenameMatchers?: RegExp[]; + /** Mode whose formatter (and Prettier parser) this mode reuses. */ + formatAs?: string; } export interface ModesByName { @@ -352,6 +354,15 @@ export function getMode(name: string): Mode | null { return modesByName[normalizeModeKey(name)] || null; } +/** + * Name of the mode that `name` formats as, with aliases resolved, or `null`. + */ +export function getFormatAsMode(name: string): string | null { + const formatAs = getMode(name)?.formatAs; + if (!formatAs) return null; + return getMode(formatAs)?.name ?? formatAs; +} + export class Mode { extensions: string; caption: string; @@ -360,6 +371,7 @@ export class Mode { aliases: string[]; extRe: RegExp | null; filenameMatchers: RegExp[]; + formatAs: string | null; languageExtension: LanguageExtensionProvider | null; constructor( @@ -377,10 +389,19 @@ export class Mode { this.mode = name; // CodeMirror uses different mode naming this.extensions = extensions; this.caption = caption || this.name.replace(/_/g, " "); - this.aliases = normalizeAliases(options.aliases, this.name); - this.filenameMatchers = Array.isArray(options.filenameMatchers) - ? options.filenameMatchers.filter((matcher) => matcher instanceof RegExp) + // Plugins may pass anything here; ignore what isn't the expected shape + const { aliases, filenameMatchers, formatAs } = + options && typeof options === "object" ? options : {}; + this.aliases = Array.isArray(aliases) + ? normalizeAliases(aliases, this.name) + : []; + this.filenameMatchers = Array.isArray(filenameMatchers) + ? filenameMatchers.filter((matcher) => matcher instanceof RegExp) : []; + this.formatAs = + typeof formatAs === "string" && normalizeModeKey(formatAs) + ? normalizeModeKey(formatAs) + : null; this.languageExtension = languageExtension; let re = ""; diff --git a/src/lib/acode.js b/src/lib/acode.js index 2870fc0a98..e727b447b6 100644 --- a/src/lib/acode.js +++ b/src/lib/acode.js @@ -22,6 +22,7 @@ import lspClientManager from "cm/lsp/clientManager"; import { registerLspFormatter } from "cm/lsp/formatter"; import { addMode, + getFormatAsMode, getModeForPath, getModes, getModesByName, @@ -275,9 +276,10 @@ class Acode { // Preferred CodeMirror language registration API for plugins const editorLanguages = { // name: string, extensions: string|Array, caption?: string, - // loader?: () => Extension | Promise - register: (name, extensions, caption, loader) => - addMode(name, extensions, caption, loader), + // loader?: () => Extension | Promise, + // options?: { aliases?, filenameMatchers?, formatAs? } + register: (name, extensions, caption, loader, options) => + addMode(name, extensions, caption, loader, options), unregister: (name) => removeMode(name), add: (name, extensions, caption, loader) => addMode(name, extensions, caption, loader), @@ -844,7 +846,9 @@ class Acode { } const modeName = resolvedMode || "text"; const formatterMap = appSettings.value.formatter || {}; - const formatterId = formatterMap[modeName]; + const formatAs = getFormatAsMode(modeName); + const formatterId = + formatterMap[modeName] ?? (formatAs && formatterMap[formatAs]); const formatter = this.#formatter.find(({ id }) => id === formatterId); if (!formatter) { diff --git a/src/lib/prettierFormatter.js b/src/lib/prettierFormatter.js index 7200e5646b..e95014c0cf 100644 --- a/src/lib/prettierFormatter.js +++ b/src/lib/prettierFormatter.js @@ -1,6 +1,7 @@ import fsOperation from "fileSystem"; import { parse } from "acorn"; import { getDocText } from "cm/editorUtils"; +import { getFormatAsMode } from "cm/modelist"; import toast from "components/toast"; import appSettings from "lib/settings"; import prettierPluginBabel from "prettier/plugins/babel"; @@ -77,7 +78,9 @@ export async function formatActiveFileWithPrettier() { if (!file || file.type !== "editor" || !editor) return false; const modeName = (file.currentMode || "text").toLowerCase(); - const parser = getParserForMode(modeName); + const formatAs = getFormatAsMode(modeName); + const parser = + getParserForMode(modeName) || (formatAs && getParserForMode(formatAs)); if (!parser) { toast("Prettier does not support this file type yet"); return false; diff --git a/src/settings/formatterSettings.js b/src/settings/formatterSettings.js index 604caec673..b7d97aed44 100644 --- a/src/settings/formatterSettings.js +++ b/src/settings/formatterSettings.js @@ -1,4 +1,4 @@ -import { getModes } from "cm/modelist"; +import { getFormatAsMode, getMode, getModes } from "cm/modelist"; import settingsPage from "components/settingsPage"; import appSettings from "lib/settings"; @@ -21,8 +21,20 @@ export default function formatterSettings(languageName) { const extList = String(extensions) .split("|") .filter((e) => e && !e.startsWith("^")); - const options = acode.getFormatterFor(extList); + // Also offer formatters of the mode this one formats as + const baseMode = getMode(getFormatAsMode(name) || ""); + const baseExts = String(baseMode?.extensions || "") + .split("|") + .filter((e) => e && !e.startsWith("^")); + const options = acode.getFormatterFor([...extList, ...baseExts]); const sampleExt = extList[0] || name; + // Unset falls back to the base mode's formatter, so say which one + const inheritedText = () => { + const inherited = formatters.find( + ({ id }) => id === values.formatter[baseMode.name], + ); + return inherited ? `${inherited.name} (${baseMode.caption})` : null; + }; return { key: name, @@ -34,9 +46,13 @@ export default function formatterSettings(languageName) { if (formatter) { return formatter.name; } - return strings.none; + return (baseMode && inheritedText()) || strings.none; + }, + // Read when the picker opens, so the inherited label stays current + get select() { + if (baseMode) options[0] = [null, inheritedText() || strings.none]; + return options; }, - select: options, chevron: true, category: languagesLabel, }; diff --git a/tests/unit/modelist.test.js b/tests/unit/modelist.test.js index ada2cb3821..612dacfcbb 100644 --- a/tests/unit/modelist.test.js +++ b/tests/unit/modelist.test.js @@ -1,6 +1,12 @@ import { afterEach, describe, expect, it } from "vitest"; import "cm/supportedModes"; -import { addMode, getModeForPath, getModes, removeMode } from "cm/modelist"; +import { + addMode, + getFormatAsMode, + getModeForPath, + getModes, + removeMode, +} from "cm/modelist"; function getModeSpecificityScore(modeInstance) { if (modeInstance.name.toLowerCase() === "text") { @@ -235,6 +241,43 @@ describe("getModeForPath", () => { expect(getModeForPath("acodepluginfile").name).toBe("acode-regex-foo"); }); + it("stores the normalized formatAs mode", () => { + registerTestMode("acode-json-like", "acodejsonlike", { + formatAs: " JSON ", + }); + registerTestMode("acode-plain", "acodeplain"); + + expect(getModeForPath("a.acodejsonlike").formatAs).toBe("json"); + expect(getModeForPath("a.acodeplain").formatAs).toBeNull(); + }); + + it("resolves formatAs aliases to the base mode name", () => { + registerTestMode("acode-json5-like", "acodejson5like", { + formatAs: "json5", + }); + registerTestMode("acode-unknown-base", "acodeunknownbase", { + formatAs: "acode-missing", + }); + + expect(getFormatAsMode("acode-json5-like")).toBe("json"); + expect(getFormatAsMode("acode-unknown-base")).toBe("acode-missing"); + expect(getFormatAsMode("json")).toBeNull(); + }); + + it("ignores malformed mode options from plugins", () => { + expect(() => + registerTestMode("acode-null-options", "acodenullopts", null), + ).not.toThrow(); + registerTestMode("acode-bad-options", "acodebadopts", { + aliases: "abc", + formatAs: 42, + }); + + const mode = getModeForPath("a.acodebadopts"); + expect(mode.aliases).toEqual([]); + expect(mode.formatAs).toBeNull(); + }); + it("invalidates plugin registrations immediately", () => { registerTestMode("acodepluginmode", "acodepluginmode"); From 88ddc2740ac307acb2410ef26094d7ff163b5caa Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Thu, 22 Oct 2026 15:16:34 +0530 Subject: [PATCH 155/195] chore(deps): bump @lezer/common to 1.5.4 @lezer/common 1.5.4 fixes the look-ahead of the anonymous nodes that balance long repeats (lezer/common!11). Before it, incremental parses never reused them and re-tokenized everything before an edit, so a keystroke's reparse grew with its position in the file: CodeMirror's language field hit its 20ms budget on every key deep in large files (369ms vs 0.5ms for an edit at line 100k of a 4MB file in plain Lezer). Bumped in dependencies and overrides, so every package uses this copy. --- bun.lock | 6 +++--- package-lock.json | 8 ++++---- package.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bun.lock b/bun.lock index 5f2c0d5655..9e85dc401c 100644 --- a/bun.lock +++ b/bun.lock @@ -39,7 +39,7 @@ "@codemirror/view": "^6.43.9", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", - "@lezer/common": "^1.5.2", + "@lezer/common": "^1.5.4", "@lezer/highlight": "^1.2.5", "@lezer/lr": "^1.4.10", "@ungap/custom-elements": "^1.3.0", @@ -154,7 +154,7 @@ "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.7.1", "@codemirror/view": "^6.43.9", - "@lezer/common": "^1.5.2", + "@lezer/common": "^1.5.4", "@lezer/lr": "^1.4.10", "tar": "^7.5.22", }, @@ -475,7 +475,7 @@ "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="], - "@lezer/common": ["@lezer/common@1.5.2", "", {}, "sha512-sxQE460fPZyU3sdc8lafxiPwJHBzZRy/udNFynGQky1SePYBdhkBl1kOagA9uT3pxR8K09bOrmTUqA9wb/PjSQ=="], + "@lezer/common": ["@lezer/common@1.5.4", "", {}, "sha512-xt3Q4z64xM+xhg4M7NXqw1N//1O74bUFo5kz6fwMeC4qwxSuRdwkYSmjcqCEEKYkNw5e67f2hcNqBoNERAEU0w=="], "@lezer/cpp": ["@lezer/cpp@1.1.5", "", { "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "sha512-DIhSXmYtJKLehrjzDFN+2cPt547ySQ41nA8yqcDf/GxMc+YM736xqltFkvADL2M0VebU5I+3+4ks2Vv+Kyq3Aw=="], diff --git a/package-lock.json b/package-lock.json index 41fccea233..31cbe89503 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "@codemirror/view": "^6.43.9", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", - "@lezer/common": "^1.5.2", + "@lezer/common": "^1.5.4", "@lezer/highlight": "^1.2.5", "@lezer/lr": "^1.4.10", "@ungap/custom-elements": "^1.3.0", @@ -4282,9 +4282,9 @@ } }, "node_modules/@lezer/common": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.2.tgz", - "integrity": "sha512-sxQE460fPZyU3sdc8lafxiPwJHBzZRy/udNFynGQky1SePYBdhkBl1kOagA9uT3pxR8K09bOrmTUqA9wb/PjSQ==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.4.tgz", + "integrity": "sha512-xt3Q4z64xM+xhg4M7NXqw1N//1O74bUFo5kz6fwMeC4qwxSuRdwkYSmjcqCEEKYkNw5e67f2hcNqBoNERAEU0w==", "license": "MIT" }, "node_modules/@lezer/cpp": { diff --git a/package.json b/package.json index aebe3e1725..a24c5336ac 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "@codemirror/view": "^6.43.9", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", - "@lezer/common": "^1.5.2", + "@lezer/common": "^1.5.4", "@lezer/highlight": "^1.2.5", "@lezer/lr": "^1.4.10", "@ungap/custom-elements": "^1.3.0", @@ -212,7 +212,7 @@ "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.7.1", "@codemirror/view": "^6.43.9", - "@lezer/common": "^1.5.2", + "@lezer/common": "^1.5.4", "@lezer/lr": "^1.4.10", "tar": "^7.5.22" }, From 665ce1c0fc2e71c887013cd9ff0f44dbf847254f Mon Sep 17 00:00:00 2001 From: Priyanshu Jain Date: Thu, 22 Oct 2026 13:27:27 +0000 Subject: [PATCH 156/195] test: add ftp, sftp and file operation tests (#2778) (#2928) * test: add ftp, sftp and file operation tests (#2778) * chore(lint): sort imports * test: fix ftp/sftp/fs runtime test assertions --------- Co-authored-by: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> --- src/test/fs.tests.js | 87 +++++++++++++++++ src/test/ftp.tests.js | 171 ++++++++++++++++++++++++++++++++++ src/test/sftp.tests.js | 176 +++++++++++++++++++++++++++++++++++ src/test/test-definitions.js | 4 + 4 files changed, 438 insertions(+) create mode 100644 src/test/ftp.tests.js create mode 100644 src/test/sftp.tests.js diff --git a/src/test/fs.tests.js b/src/test/fs.tests.js index fa853a2586..ccab9b4f73 100644 --- a/src/test/fs.tests.js +++ b/src/test/fs.tests.js @@ -201,5 +201,92 @@ export async function runFsTests(writeOutput) { } }); + runner.test("copyTo, moveTo, renameTo", async (test) => { + const fs = fsOperation(testDir); + const sourceName = `__fs_source_${Date.now()}__.txt`; + const destDirName = `__fs_destdir_${Date.now()}__`; + const moveDirName = `__fs_movedir_${Date.now()}__`; + + const sourceUrl = Url.join(testDir, sourceName); + const destDirUrl = Url.join(testDir, destDirName); + const moveDirUrl = Url.join(testDir, moveDirName); + + try { + // 1. Create source file and destination directories + await fs.createFile(sourceName, "file operation content"); + await fs.createDirectory(destDirName); + await fs.createDirectory(moveDirName); + + const sourceFs = fsOperation(sourceUrl); + + // 2. copyTo + const copiedUrl = await sourceFs.copyTo(destDirUrl); + const copiedFs = fsOperation(copiedUrl); + test.assertEqual( + await copiedFs.exists(), + true, + "Copied file should exist", + ); + test.assertEqual( + await copiedFs.readFile("utf-8"), + "file operation content", + "Copied file content should match", + ); + + // 3. moveTo + // Empty dir: testDir still holds the source file with the same name + const movedUrl = await copiedFs.moveTo(moveDirUrl); + const movedFs = fsOperation(movedUrl); + test.assertEqual(await movedFs.exists(), true, "Moved file should exist"); + test.assertEqual( + await copiedFs.exists(), + false, + "Original copied file should no longer exist after move", + ); + test.assertEqual( + await movedFs.readFile("utf-8"), + "file operation content", + "Moved file content should match", + ); + + // 4. renameTo + const newName = `__fs_renamed_${Date.now()}__.txt`; + const renamedUrl = await movedFs.renameTo(newName); + const renamedFs = fsOperation(renamedUrl); + test.assertEqual( + await renamedFs.exists(), + true, + "Renamed file should exist", + ); + test.assertEqual( + await movedFs.exists(), + false, + "Original moved file should no longer exist after rename", + ); + test.assertEqual( + await renamedFs.readFile("utf-8"), + "file operation content", + "Renamed file content should match", + ); + + // Cleanup + await sourceFs.delete(); + await renamedFs.delete(); + await fsOperation(destDirUrl).delete(); + await fsOperation(moveDirUrl).delete(); + } catch (error) { + try { + await fsOperation(sourceUrl).delete(); + } catch (_) {} + try { + await fsOperation(destDirUrl).delete(); + } catch (_) {} + try { + await fsOperation(moveDirUrl).delete(); + } catch (_) {} + throw error; + } + }); + return await runner.run(writeOutput); } diff --git a/src/test/ftp.tests.js b/src/test/ftp.tests.js new file mode 100644 index 0000000000..0f86bd5256 --- /dev/null +++ b/src/test/ftp.tests.js @@ -0,0 +1,171 @@ +import fsOperation from "fileSystem"; +import Url from "utils/Url"; +import { SkipTest, TestRunner } from "./tester"; + +export async function runFtpTests(writeOutput) { + const runner = new TestRunner("FTP API Tests"); + + const testDir = window.FTP_TEST_URL; + + runner.test("FTP_TEST_URL is defined", (test) => { + if (!testDir) { + throw new SkipTest( + "window.FTP_TEST_URL is not defined. Set it to run FTP tests.", + ); + } + test.assert(typeof testDir === "string", "FTP_TEST_URL should be a string"); + test.assert( + testDir.startsWith("ftp://"), + "FTP_TEST_URL should start with ftp://", + ); + }); + + runner.test("fsOperation returns a FileSystem object for FTP", (test) => { + if (!testDir) throw new SkipTest("No FTP_TEST_URL"); + const fs = fsOperation(testDir); + test.assert(fs !== null, "fsOperation should return filesystem handler"); + test.assert( + typeof fs.createFile === "function", + "createFile should be a function", + ); + test.assert(typeof fs.exists === "function", "exists should be a function"); + }); + + runner.test( + "FTP: createFile, exists, writeFile, readFile, delete", + async (test) => { + if (!testDir) throw new SkipTest("No FTP_TEST_URL"); + + const fs = fsOperation(testDir); + const filename = `__ftp_test_${Date.now()}__.txt`; + const fileUrl = Url.join(testDir, filename); + + try { + // 1. Create the file + const createdUrl = await fs.createFile(filename, "ftp test content"); + test.assertEqual( + // Provider adds default port/query to the URL; compare paths only + Url.pathname(createdUrl), + Url.pathname(fileUrl), + "Created file URL should match expected path", + ); + + // 2. Check existence + const fileFs = fsOperation(createdUrl); + // Native FTP exists() resolves 1/0, not a boolean + const exists = Boolean(await fileFs.exists()); + test.assertEqual(exists, true, "Created file should exist on FTP"); + + // 3. Read content + const content = await fileFs.readFile("utf-8"); + test.assertEqual( + content, + "ftp test content", + "Read content should match", + ); + + // 4. Write new content + await fileFs.writeFile("updated ftp content"); + const updatedContent = await fileFs.readFile("utf-8"); + test.assertEqual( + updatedContent, + "updated ftp content", + "Read content should match updated content", + ); + + // 5. Stat check + const stat = await fileFs.stat(); + test.assert(stat !== null, "Stat should not be null"); + test.assertEqual(stat.isFile, true, "Stat should show isFile true"); + test.assertEqual( + stat.isDirectory, + false, + "Stat should show isDirectory false", + ); + + // 6. Delete file + await fileFs.delete(); + const existsAfterDelete = Boolean(await fileFs.exists()); + test.assertEqual( + existsAfterDelete, + false, + "File should not exist after deletion", + ); + } catch (error) { + try { + const fileFs = fsOperation(fileUrl); + if (await fileFs.exists()) { + await fileFs.delete(); + } + } catch (_) {} + throw error; + } + }, + ); + + runner.test("FTP: createDirectory, lsDir, delete directory", async (test) => { + if (!testDir) throw new SkipTest("No FTP_TEST_URL"); + + const fs = fsOperation(testDir); + const dirname = `__ftp_dir_test_${Date.now()}__`; + const dirUrl = Url.join(testDir, dirname); + + try { + // 1. Create directory + const createdDirUrl = await fs.createDirectory(dirname); + test.assertEqual( + Url.pathname(createdDirUrl), + Url.pathname(dirUrl), + "Created directory URL should match", + ); + + const dirFs = fsOperation(createdDirUrl); + // Native FTP exists() resolves 1/0, not a boolean + const exists = Boolean(await dirFs.exists()); + test.assertEqual(exists, true, "Created directory should exist"); + + // 2. Stat check + const stat = await dirFs.stat(); + test.assertEqual( + stat.isDirectory, + true, + "Stat should show isDirectory true", + ); + test.assertEqual(stat.isFile, false, "Stat should show isFile false"); + + // 3. Create a file inside directory + const fileUrl = await dirFs.createFile("child.txt", "child content"); + + // 4. List directory contents + const list = await dirFs.lsDir(); + const child = list.find((item) => item.name === "child.txt"); + test.assert( + child !== undefined, + "lsDir should list the created child file", + ); + test.assertEqual(child.isFile, true, "child item should be a file"); + + // 5. Delete child file and directory + const childFs = fsOperation(fileUrl); + await childFs.delete(); + await dirFs.delete(); + + const dirExistsAfterDelete = Boolean(await dirFs.exists()); + test.assertEqual( + dirExistsAfterDelete, + false, + "Directory should not exist after deletion", + ); + } catch (error) { + try { + const dirFs = fsOperation(dirUrl); + if (await dirFs.exists()) { + await dirFs.delete(); + } + } catch (_) {} + throw error; + } + }); + + return await runner.run(writeOutput); +} diff --git a/src/test/sftp.tests.js b/src/test/sftp.tests.js new file mode 100644 index 0000000000..638e5fbd84 --- /dev/null +++ b/src/test/sftp.tests.js @@ -0,0 +1,176 @@ +import fsOperation from "fileSystem"; +import Url from "utils/Url"; +import { SkipTest, TestRunner } from "./tester"; + +export async function runSftpTests(writeOutput) { + const runner = new TestRunner("SFTP API Tests"); + + const testDir = window.SFTP_TEST_URL; + + runner.test("SFTP_TEST_URL is defined", (test) => { + if (!testDir) { + throw new SkipTest( + "window.SFTP_TEST_URL is not defined. Set it to run SFTP tests.", + ); + } + test.assert( + typeof testDir === "string", + "SFTP_TEST_URL should be a string", + ); + test.assert( + testDir.startsWith("sftp://"), + "SFTP_TEST_URL should start with sftp://", + ); + }); + + runner.test("fsOperation returns a FileSystem object for SFTP", (test) => { + if (!testDir) throw new SkipTest("No SFTP_TEST_URL"); + const fs = fsOperation(testDir); + test.assert(fs !== null, "fsOperation should return filesystem handler"); + test.assert( + typeof fs.createFile === "function", + "createFile should be a function", + ); + test.assert(typeof fs.exists === "function", "exists should be a function"); + }); + + runner.test( + "SFTP: createFile, exists, writeFile, readFile, delete", + async (test) => { + if (!testDir) throw new SkipTest("No SFTP_TEST_URL"); + + const fs = fsOperation(testDir); + const filename = `__sftp_test_${Date.now()}__.txt`; + const fileUrl = Url.join(testDir, filename); + + try { + // 1. Create the file + const createdUrl = await fs.createFile(filename, "sftp test content"); + test.assertEqual( + createdUrl, + fileUrl, + "Created file URL should match expected path", + ); + + // 2. Check existence + const fileFs = fsOperation(createdUrl); + const exists = await fileFs.exists(); + test.assertEqual(exists, true, "Created file should exist on SFTP"); + + // 3. Read content + const content = await fileFs.readFile("utf-8"); + test.assertEqual( + content, + "sftp test content", + "Read content should match", + ); + + // 4. Write new content + await fileFs.writeFile("updated sftp content"); + const updatedContent = await fileFs.readFile("utf-8"); + test.assertEqual( + updatedContent, + "updated sftp content", + "Read content should match updated content", + ); + + // 5. Stat check + const stat = await fileFs.stat(); + test.assert(stat !== null, "Stat should not be null"); + test.assertEqual(stat.isFile, true, "Stat should show isFile true"); + test.assertEqual( + stat.isDirectory, + false, + "Stat should show isDirectory false", + ); + + // 6. Delete file + await fileFs.delete(); + // Fresh handle: delete() leaves a cached stat on fileFs + const existsAfterDelete = await fsOperation(createdUrl).exists(); + test.assertEqual( + existsAfterDelete, + false, + "File should not exist after deletion", + ); + } catch (error) { + try { + const fileFs = fsOperation(fileUrl); + if (await fileFs.exists()) { + await fileFs.delete(); + } + } catch (_) {} + throw error; + } + }, + ); + + runner.test( + "SFTP: createDirectory, lsDir, delete directory", + async (test) => { + if (!testDir) throw new SkipTest("No SFTP_TEST_URL"); + + const fs = fsOperation(testDir); + const dirname = `__sftp_dir_test_${Date.now()}__`; + const dirUrl = Url.join(testDir, dirname); + + try { + // 1. Create directory + const createdDirUrl = await fs.createDirectory(dirname); + test.assertEqual( + createdDirUrl, + dirUrl, + "Created directory URL should match", + ); + + const dirFs = fsOperation(createdDirUrl); + const exists = await dirFs.exists(); + test.assertEqual(exists, true, "Created directory should exist"); + + // 2. Stat check + const stat = await dirFs.stat(); + test.assertEqual( + stat.isDirectory, + true, + "Stat should show isDirectory true", + ); + test.assertEqual(stat.isFile, false, "Stat should show isFile false"); + + // 3. Create a file inside directory + const fileUrl = await dirFs.createFile("child.txt", "child content"); + + // 4. List directory contents + const list = await dirFs.lsDir(); + const child = list.find((item) => item.name === "child.txt"); + test.assert( + child !== undefined, + "lsDir should list the created child file", + ); + test.assertEqual(child.isFile, true, "child item should be a file"); + + // 5. Delete child file and directory + const childFs = fsOperation(fileUrl); + await childFs.delete(); + await dirFs.delete(); + + // Fresh handle: delete() leaves a cached stat on dirFs + const dirExistsAfterDelete = await fsOperation(createdDirUrl).exists(); + test.assertEqual( + dirExistsAfterDelete, + false, + "Directory should not exist after deletion", + ); + } catch (error) { + try { + const dirFs = fsOperation(dirUrl); + if (await dirFs.exists()) { + await dirFs.delete(); + } + } catch (_) {} + throw error; + } + }, + ); + + return await runner.run(writeOutput); +} diff --git a/src/test/test-definitions.js b/src/test/test-definitions.js index 9570cf0264..9c34637151 100644 --- a/src/test/test-definitions.js +++ b/src/test/test-definitions.js @@ -2,8 +2,10 @@ import { runAceCompatibilityTests } from "./ace.test"; import { runCodeMirrorTests } from "./editor.tests"; import { runExecutorTests } from "./exec.tests"; import { runFsTests } from "./fs.tests"; +import { runFtpTests } from "./ftp.tests"; import { runLspTests } from "./lsp.tests"; import { runSanityTests } from "./sanity.tests"; +import { runSftpTests } from "./sftp.tests"; import { runUrlTests } from "./url.tests"; /** @@ -15,6 +17,8 @@ export const testDefinitions = [ runExecutorTests, runUrlTests, runFsTests, + runFtpTests, + runSftpTests, runLspTests, runCodeMirrorTests, runAceCompatibilityTests, From b08fd0bfc27abd6c58c576d959c607a7b6b69c31 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 25 Oct 2026 04:34:19 +0000 Subject: [PATCH 157/195] feat(markdown): render mermaid diagrams with pele (#2987) * feat(markdown): render mermaid diagrams with pele Replace the mermaid package with pele, a small synchronous renderer that loads each diagram type on demand and themes via CSS variables. * fix(markdown): map pele colors to defined theme variables --- bun.lock | 416 +-------- package-lock.json | 1227 ++------------------------ package.json | 2 +- src/pages/markdownPreview/index.js | 128 +-- src/pages/markdownPreview/style.scss | 25 +- 5 files changed, 118 insertions(+), 1680 deletions(-) diff --git a/bun.lock b/bun.lock index 9e85dc401c..723e01f48b 100644 --- a/bun.lock +++ b/bun.lock @@ -71,10 +71,10 @@ "markdown-it-github-alerts": "^1.0.1", "markdown-it-task-lists": "^2.1.1", "markdown-it-texmath": "^1.0.0", - "mermaid": "^11.14.0", "mime-types": "^3.0.2", "motion": "^12.43.0", "mustache": "^4.2.0", + "pele": "^1.10.0", "picomatch": "^4.0.7", "url-parse": "^1.5.10", "vanilla-picker": "^2.12.3", @@ -159,8 +159,6 @@ "tar": "^7.5.22", }, "packages": { - "@antfu/install-pkg": ["@antfu/install-pkg@1.1.0", "", { "dependencies": { "package-manager-detector": "^1.3.0", "tinyexec": "^1.0.1" } }, "sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ=="], - "@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], "@babel/compat-data": ["@babel/compat-data@8.0.0", "", {}, "sha512-DOjnob/cXOUgDOozCDeq/aK2p5y8dUIVdf6tNhEV1HQRd6I8aQ4f4fbtHRVEvb6lP3BGomrKHiS8ICAASSVQSw=="], @@ -365,10 +363,6 @@ "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@2.4.11", "", { "os": "win32", "cpu": "x64" }, "sha512-A8D3JM/00C2KQgUV3oj8Ba15EHEYwebAGCy5Sf9GAjr5Y3+kJIYOiESoqRDeuRZueuMdCsbLZIUqmPhpYXJE9A=="], - "@braintree/sanitize-url": ["@braintree/sanitize-url@7.1.2", "", {}, "sha512-jigsZK+sMF/cuiB7sERuo9V7N9jx+dhmHHnQyDSVdpZwVutaBu7WvNYqMDLSgFgfB30n452TP3vjDAvFC973mA=="], - - "@chevrotain/types": ["@chevrotain/types@11.1.2", "", {}, "sha512-U+HFai5+zmJCkK86QsaJtoITlboZHBqrVketcO2ROv865xfCMSFpELQoz1GkX5GzME8pTa+3kbKrZHQtI0gdbw=="], - "@codemirror/autocomplete": ["@codemirror/autocomplete@6.20.3", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0" } }, "sha512-tlosUqb+3BbxCxZdu4tKeRghPFC+QM7q4X5YhKV2eCmPG+1r2F3f4AaSz5sCrFqUtX4Jh20VFTKecl16MgiV9g=="], "@codemirror/buildhelper": ["@codemirror/buildhelper@1.0.2", "", { "dependencies": { "@lezer/generator": "^1.0.0", "@marijn/buildtool": "^1.0.0", "@marijn/testtool": "^0.1.3" }, "bin": { "cm-buildhelper": "bin/cm-buildhelper.js", "cm-runtests": "bin/cm-runtests.js" } }, "sha512-aVewtDPZptq9dTvYqIjpu9HTEmMaKAE4VL22z5E1ycgY5e1LdAiRd5YYjqzQeqLjxpWsHy+emO3n5UUcxpUmSg=="], @@ -455,10 +449,6 @@ "@gar/promise-retry": ["@gar/promise-retry@1.0.3", "", {}, "sha512-GmzA9ckNokPypTg10pgpeHNQe7ph+iIKKmhKu3Ob9ANkswreCx7R3cKmY781K8QK3AqVL3xVh9A42JvIAbkkSA=="], - "@iconify/types": ["@iconify/types@2.0.0", "", {}, "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg=="], - - "@iconify/utils": ["@iconify/utils@3.1.3", "", { "dependencies": { "@antfu/install-pkg": "^1.1.0", "@iconify/types": "^2.0.0", "import-meta-resolve": "^4.2.0" } }, "sha512-LPKOXPn/zV+zis1oOfGWogaXVpqUybF3ZS6SCZIsz8vg0ivVp9+fVqyYB7xq0aiST/VhUQYGO1qo6uoYSiEJqw=="], - "@isaacs/fs-minipass": ["@isaacs/fs-minipass@4.0.1", "", { "dependencies": { "minipass": "^7.0.4" } }, "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w=="], "@isaacs/string-locale-compare": ["@isaacs/string-locale-compare@1.1.0", "", {}, "sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ=="], @@ -517,8 +507,6 @@ "@marijn/testtool": ["@marijn/testtool@0.1.3", "", { "dependencies": { "esmoduleserve": "^0.2.0", "ist": "^1.1.7", "mocha": "^10.0.0", "selenium-webdriver": "^4.10.0", "serve-static": "^1.14.1" }, "bin": { "testtool": "bin/testtool.js" } }, "sha512-Rdi3amfFyTZoUXxMc95k9x9Ult+DtQSuOHsZwN5wtIKQ5JdXQaErgtWgGjW0Fpg4Rj0YrUCpWOj0VqsumAt5JA=="], - "@mermaid-js/parser": ["@mermaid-js/parser@1.2.1", "", { "dependencies": { "@chevrotain/types": "~11.1.2" } }, "sha512-n12NohV3mrUyUL2o93IgG/ifeW9FTyeJn3zDxkhwa8MJ9Fxg3HQMlA3RiGmD/3UnJvheztkjjQAjA2T4LmUcpw=="], - "@napi-rs/lzma-linux-x64-gnu": ["@napi-rs/lzma-linux-x64-gnu@1.5.1", "", { "os": "linux", "cpu": "x64" }, "sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ=="], "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.1.6", "", { "dependencies": { "@tybys/wasm-util": "^0.10.3" }, "peerDependencies": { "@emnapi/core": "^1.7.1", "@emnapi/runtime": "^1.7.1" } }, "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg=="], @@ -733,76 +721,12 @@ "@types/cordova": ["@types/cordova@11.0.3", "", {}, "sha512-kyuRQ40/NWQVhqGIHq78Ehu2Bf9Mlg0LhmSmis6ZFJK7z933FRfYi8tHe/k/0fB+PGfCf95rJC6TO7dopaFvAg=="], - "@types/d3": ["@types/d3@7.4.3", "", { "dependencies": { "@types/d3-array": "*", "@types/d3-axis": "*", "@types/d3-brush": "*", "@types/d3-chord": "*", "@types/d3-color": "*", "@types/d3-contour": "*", "@types/d3-delaunay": "*", "@types/d3-dispatch": "*", "@types/d3-drag": "*", "@types/d3-dsv": "*", "@types/d3-ease": "*", "@types/d3-fetch": "*", "@types/d3-force": "*", "@types/d3-format": "*", "@types/d3-geo": "*", "@types/d3-hierarchy": "*", "@types/d3-interpolate": "*", "@types/d3-path": "*", "@types/d3-polygon": "*", "@types/d3-quadtree": "*", "@types/d3-random": "*", "@types/d3-scale": "*", "@types/d3-scale-chromatic": "*", "@types/d3-selection": "*", "@types/d3-shape": "*", "@types/d3-time": "*", "@types/d3-time-format": "*", "@types/d3-timer": "*", "@types/d3-transition": "*", "@types/d3-zoom": "*" } }, "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww=="], - - "@types/d3-array": ["@types/d3-array@3.2.2", "", {}, "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw=="], - - "@types/d3-axis": ["@types/d3-axis@3.0.6", "", { "dependencies": { "@types/d3-selection": "*" } }, "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw=="], - - "@types/d3-brush": ["@types/d3-brush@3.0.6", "", { "dependencies": { "@types/d3-selection": "*" } }, "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A=="], - - "@types/d3-chord": ["@types/d3-chord@3.0.6", "", {}, "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg=="], - - "@types/d3-color": ["@types/d3-color@3.1.3", "", {}, "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A=="], - - "@types/d3-contour": ["@types/d3-contour@3.0.6", "", { "dependencies": { "@types/d3-array": "*", "@types/geojson": "*" } }, "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg=="], - - "@types/d3-delaunay": ["@types/d3-delaunay@6.0.4", "", {}, "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw=="], - - "@types/d3-dispatch": ["@types/d3-dispatch@3.0.7", "", {}, "sha512-5o9OIAdKkhN1QItV2oqaE5KMIiXAvDWBDPrD85e58Qlz1c1kI/J0NcqbEG88CoTwJrYe7ntUCVfeUl2UJKbWgA=="], - - "@types/d3-drag": ["@types/d3-drag@3.0.7", "", { "dependencies": { "@types/d3-selection": "*" } }, "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ=="], - - "@types/d3-dsv": ["@types/d3-dsv@3.0.7", "", {}, "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g=="], - - "@types/d3-ease": ["@types/d3-ease@3.0.2", "", {}, "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA=="], - - "@types/d3-fetch": ["@types/d3-fetch@3.0.7", "", { "dependencies": { "@types/d3-dsv": "*" } }, "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA=="], - - "@types/d3-force": ["@types/d3-force@3.0.10", "", {}, "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw=="], - - "@types/d3-format": ["@types/d3-format@3.0.4", "", {}, "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g=="], - - "@types/d3-geo": ["@types/d3-geo@3.1.0", "", { "dependencies": { "@types/geojson": "*" } }, "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ=="], - - "@types/d3-hierarchy": ["@types/d3-hierarchy@3.1.7", "", {}, "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg=="], - - "@types/d3-interpolate": ["@types/d3-interpolate@3.0.4", "", { "dependencies": { "@types/d3-color": "*" } }, "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA=="], - - "@types/d3-path": ["@types/d3-path@3.1.1", "", {}, "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg=="], - - "@types/d3-polygon": ["@types/d3-polygon@3.0.2", "", {}, "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA=="], - - "@types/d3-quadtree": ["@types/d3-quadtree@3.0.6", "", {}, "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg=="], - - "@types/d3-random": ["@types/d3-random@3.0.3", "", {}, "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ=="], - - "@types/d3-scale": ["@types/d3-scale@4.0.9", "", { "dependencies": { "@types/d3-time": "*" } }, "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw=="], - - "@types/d3-scale-chromatic": ["@types/d3-scale-chromatic@3.1.0", "", {}, "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ=="], - - "@types/d3-selection": ["@types/d3-selection@3.0.11", "", {}, "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w=="], - - "@types/d3-shape": ["@types/d3-shape@3.1.8", "", { "dependencies": { "@types/d3-path": "*" } }, "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w=="], - - "@types/d3-time": ["@types/d3-time@3.0.4", "", {}, "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g=="], - - "@types/d3-time-format": ["@types/d3-time-format@4.0.3", "", {}, "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg=="], - - "@types/d3-timer": ["@types/d3-timer@3.0.2", "", {}, "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw=="], - - "@types/d3-transition": ["@types/d3-transition@3.0.9", "", { "dependencies": { "@types/d3-selection": "*" } }, "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg=="], - - "@types/d3-zoom": ["@types/d3-zoom@3.0.8", "", { "dependencies": { "@types/d3-interpolate": "*", "@types/d3-selection": "*" } }, "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw=="], - "@types/deep-eql": ["@types/deep-eql@4.0.2", "", {}, "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw=="], "@types/estree": ["@types/estree@1.0.9", "", {}, "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg=="], "@types/gensync": ["@types/gensync@1.0.5", "", {}, "sha512-MbsRCT7mTikHwKZ0X+LVUTLRrZZRLipTuXEO9qOYO+zmjMVk81axyClMROf6uoPD9MRVu46bx8zoR0Ad9q3NAg=="], - "@types/geojson": ["@types/geojson@7946.0.16", "", {}, "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg=="], - "@types/jsesc": ["@types/jsesc@2.5.1", "", {}, "sha512-9VN+6yxLOPLOav+7PwjZbxiID2bVaeq0ED4qSQmdQTdjnXJSaCVKTR58t15oqH1H5t8Ng2ZX1SabJVoN9Q34bw=="], "@types/json-schema": ["@types/json-schema@7.0.15", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="], @@ -829,8 +753,6 @@ "@ungap/promise-all-settled": ["@ungap/promise-all-settled@1.1.2", "", {}, "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="], - "@upsetjs/venn.js": ["@upsetjs/venn.js@2.0.0", "", { "optionalDependencies": { "d3-selection": "^3.0.0", "d3-transition": "^3.0.1" } }, "sha512-WbBhLrooyePuQ1VZxrJjtLvTc4NVfpOyKx0sKqioq9bX1C1m7Jgykkn8gLrtwumBioXIqam8DLxp88Adbue6Hw=="], - "@vitest/expect": ["@vitest/expect@4.1.11", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", "@vitest/spy": "4.1.11", "@vitest/utils": "4.1.11", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" } }, "sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw=="], "@vitest/mocker": ["@vitest/mocker@4.1.11", "", { "dependencies": { "@vitest/spy": "4.1.11", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, "peerDependencies": { "msw": "^2.4.9", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "optionalPeers": ["msw"] }, "sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ=="], @@ -1077,8 +999,6 @@ "core-util-is": ["core-util-is@1.0.3", "", {}, "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="], - "cose-base": ["cose-base@1.0.3", "", { "dependencies": { "layout-base": "^1.0.0" } }, "sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg=="], - "cosmiconfig": ["cosmiconfig@9.0.1", "", { "dependencies": { "env-paths": "^2.2.1", "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", "parse-json": "^5.2.0" }, "peerDependencies": { "typescript": ">=4.9.5" } }, "sha512-hr4ihw+DBqcvrsEDioRO31Z17x71pUYoNe/4h6Z0wB72p7MU7/9gH8Q3s12NFhHPfYBBOV3qyfUxmr/Yn3shnQ=="], "crelt": ["crelt@1.0.6", "", {}, "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="], @@ -1091,78 +1011,6 @@ "cssesc": ["cssesc@3.0.0", "", { "bin": "bin/cssesc" }, "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="], - "cytoscape": ["cytoscape@3.34.2", "", {}, "sha512-Cm2jaj1X/PBNlzV9yH8zcfGOxO7U+CJ/+mxSBVPSchLaugdp4jtlGx5qaHtPRZ6tgiZ5P+o1XoRfJA+ba6KM3g=="], - - "cytoscape-cose-bilkent": ["cytoscape-cose-bilkent@4.1.0", "", { "dependencies": { "cose-base": "^1.0.0" }, "peerDependencies": { "cytoscape": "^3.2.0" } }, "sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ=="], - - "cytoscape-fcose": ["cytoscape-fcose@2.2.0", "", { "dependencies": { "cose-base": "^2.2.0" }, "peerDependencies": { "cytoscape": "^3.2.0" } }, "sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ=="], - - "d3": ["d3@7.9.0", "", { "dependencies": { "d3-array": "3", "d3-axis": "3", "d3-brush": "3", "d3-chord": "3", "d3-color": "3", "d3-contour": "4", "d3-delaunay": "6", "d3-dispatch": "3", "d3-drag": "3", "d3-dsv": "3", "d3-ease": "3", "d3-fetch": "3", "d3-force": "3", "d3-format": "3", "d3-geo": "3", "d3-hierarchy": "3", "d3-interpolate": "3", "d3-path": "3", "d3-polygon": "3", "d3-quadtree": "3", "d3-random": "3", "d3-scale": "4", "d3-scale-chromatic": "3", "d3-selection": "3", "d3-shape": "3", "d3-time": "3", "d3-time-format": "4", "d3-timer": "3", "d3-transition": "3", "d3-zoom": "3" } }, "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA=="], - - "d3-array": ["d3-array@3.2.4", "", { "dependencies": { "internmap": "1 - 2" } }, "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg=="], - - "d3-axis": ["d3-axis@3.0.0", "", {}, "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw=="], - - "d3-brush": ["d3-brush@3.0.0", "", { "dependencies": { "d3-dispatch": "1 - 3", "d3-drag": "2 - 3", "d3-interpolate": "1 - 3", "d3-selection": "3", "d3-transition": "3" } }, "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ=="], - - "d3-chord": ["d3-chord@3.0.1", "", { "dependencies": { "d3-path": "1 - 3" } }, "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g=="], - - "d3-color": ["d3-color@3.1.0", "", {}, "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA=="], - - "d3-contour": ["d3-contour@4.0.2", "", { "dependencies": { "d3-array": "^3.2.0" } }, "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA=="], - - "d3-delaunay": ["d3-delaunay@6.0.4", "", { "dependencies": { "delaunator": "5" } }, "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A=="], - - "d3-dispatch": ["d3-dispatch@3.0.1", "", {}, "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg=="], - - "d3-drag": ["d3-drag@3.0.0", "", { "dependencies": { "d3-dispatch": "1 - 3", "d3-selection": "3" } }, "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg=="], - - "d3-dsv": ["d3-dsv@3.0.1", "", { "dependencies": { "commander": "7", "iconv-lite": "0.6", "rw": "1" }, "bin": { "csv2json": "bin/dsv2json.js", "csv2tsv": "bin/dsv2dsv.js", "dsv2dsv": "bin/dsv2dsv.js", "dsv2json": "bin/dsv2json.js", "json2csv": "bin/json2dsv.js", "json2dsv": "bin/json2dsv.js", "json2tsv": "bin/json2dsv.js", "tsv2csv": "bin/dsv2dsv.js", "tsv2json": "bin/dsv2json.js" } }, "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q=="], - - "d3-ease": ["d3-ease@3.0.1", "", {}, "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w=="], - - "d3-fetch": ["d3-fetch@3.0.1", "", { "dependencies": { "d3-dsv": "1 - 3" } }, "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw=="], - - "d3-force": ["d3-force@3.0.0", "", { "dependencies": { "d3-dispatch": "1 - 3", "d3-quadtree": "1 - 3", "d3-timer": "1 - 3" } }, "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg=="], - - "d3-format": ["d3-format@3.1.2", "", {}, "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg=="], - - "d3-geo": ["d3-geo@3.1.1", "", { "dependencies": { "d3-array": "2.5.0 - 3" } }, "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q=="], - - "d3-hierarchy": ["d3-hierarchy@3.1.2", "", {}, "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA=="], - - "d3-interpolate": ["d3-interpolate@3.0.1", "", { "dependencies": { "d3-color": "1 - 3" } }, "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g=="], - - "d3-path": ["d3-path@3.1.0", "", {}, "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ=="], - - "d3-polygon": ["d3-polygon@3.0.1", "", {}, "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg=="], - - "d3-quadtree": ["d3-quadtree@3.0.1", "", {}, "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw=="], - - "d3-random": ["d3-random@3.0.1", "", {}, "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ=="], - - "d3-sankey": ["d3-sankey@0.12.3", "", { "dependencies": { "d3-array": "1 - 2", "d3-shape": "^1.2.0" } }, "sha512-nQhsBRmM19Ax5xEIPLMY9ZmJ/cDvd1BG3UVvt5h3WRxKg5zGRbvnteTyWAbzeSvlh3tW7ZEmq4VwR5mB3tutmQ=="], - - "d3-scale": ["d3-scale@4.0.2", "", { "dependencies": { "d3-array": "2.10.0 - 3", "d3-format": "1 - 3", "d3-interpolate": "1.2.0 - 3", "d3-time": "2.1.1 - 3", "d3-time-format": "2 - 4" } }, "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ=="], - - "d3-scale-chromatic": ["d3-scale-chromatic@3.1.0", "", { "dependencies": { "d3-color": "1 - 3", "d3-interpolate": "1 - 3" } }, "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ=="], - - "d3-selection": ["d3-selection@3.0.0", "", {}, "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ=="], - - "d3-shape": ["d3-shape@3.2.0", "", { "dependencies": { "d3-path": "^3.1.0" } }, "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA=="], - - "d3-time": ["d3-time@3.1.0", "", { "dependencies": { "d3-array": "2 - 3" } }, "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q=="], - - "d3-time-format": ["d3-time-format@4.1.0", "", { "dependencies": { "d3-time": "1 - 3" } }, "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg=="], - - "d3-timer": ["d3-timer@3.0.1", "", {}, "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="], - - "d3-transition": ["d3-transition@3.0.1", "", { "dependencies": { "d3-color": "1 - 3", "d3-dispatch": "1 - 3", "d3-ease": "1 - 3", "d3-interpolate": "1 - 3", "d3-timer": "1 - 3" }, "peerDependencies": { "d3-selection": "2 - 3" } }, "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w=="], - - "d3-zoom": ["d3-zoom@3.0.0", "", { "dependencies": { "d3-dispatch": "1 - 3", "d3-drag": "2 - 3", "d3-interpolate": "1 - 3", "d3-selection": "2 - 3", "d3-transition": "2 - 3" } }, "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw=="], - - "dagre-d3-es": ["dagre-d3-es@7.0.14", "", { "dependencies": { "d3": "^7.9.0", "lodash-es": "^4.17.21" } }, "sha512-P4rFMVq9ESWqmOgK+dlXvOtLwYg0i7u0HBGJER0LZDJT2VHIPAMZ/riPxqJceWMStH5+E61QxFra9kIS3AqdMg=="], - "date-now": ["date-now@0.1.4", "", {}, "sha512-AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw=="], "dayjs": ["dayjs@1.11.23", "", {}, "sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ=="], @@ -1175,8 +1023,6 @@ "deep-eql": ["deep-eql@3.0.1", "", { "dependencies": { "type-detect": "^4.0.0" } }, "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="], - "delaunator": ["delaunator@5.1.0", "", { "dependencies": { "robust-predicates": "^3.0.2" } }, "sha512-AGrQ4QSgssa1NGmWmLPqN5NY2KajF5MqxetNEO+o0n3ZwZZeTmt7bBnvzHWrmkZFxGgr4HdyFgelzgi06otLuQ=="], - "depd": ["depd@2.0.0", "", {}, "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="], "destroy": ["destroy@1.2.0", "", {}, "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="], @@ -1235,8 +1081,6 @@ "es-module-lexer": ["es-module-lexer@2.1.0", "", {}, "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ=="], - "es-toolkit": ["es-toolkit@1.51.0", "", {}, "sha512-zC2lQGkM7QX+Gm6iM3+WIdZJzthsEd14LvRNJneSO2hzyz/zNBENR8+YXWo1cKxgPBtV6ksPYHELbcwBRzmdCw=="], - "escalade": ["escalade@3.2.0", "", {}, "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="], "escape-html": ["escape-html@1.0.3", "", {}, "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="], @@ -1321,8 +1165,6 @@ "growl": ["growl@1.10.5", "", {}, "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="], - "hachure-fill": ["hachure-fill@0.5.2", "", {}, "sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg=="], - "happy-dom": ["happy-dom@20.11.6", "", { "dependencies": { "@types/node": ">=20.0.0", "@types/whatwg-mimetype": "^3.0.2", "@types/ws": "^8.18.1", "buffer-image-size": "^0.6.4", "entities": "^7.0.1", "whatwg-mimetype": "^3.0.0", "ws": "^8.21.0" } }, "sha512-Hldbg8AdAa5a5oDcZpjqnGitp7JB0hqWmfv/8qr+kft4vzSD8BHsbdRfzYvL/0QcbKcURC/yyoygbeDQarPvYg=="], "has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="], @@ -1347,7 +1189,7 @@ "human-signals": ["human-signals@2.1.0", "", {}, "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="], - "iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="], + "iconv-lite": ["iconv-lite@0.7.2", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw=="], "icss-utils": ["icss-utils@5.1.0", "", { "peerDependencies": { "postcss": "^8.1.0" } }, "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="], @@ -1371,8 +1213,6 @@ "ini": ["ini@6.0.0", "", {}, "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ=="], - "internmap": ["internmap@2.0.3", "", {}, "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="], - "ip-address": ["ip-address@10.2.0", "", {}, "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA=="], "is-arrayish": ["is-arrayish@0.2.1", "", {}, "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="], @@ -1441,10 +1281,6 @@ "katex": ["katex@0.16.47", "", { "dependencies": { "commander": "^8.3.0" }, "bin": "cli.js" }, "sha512-Eeo8Ys1doU1z+x8AZsPpQu+p/QcZBI5PeOo7QGQdy2x2m0MU/hYagBbGOmXwr5KVbEfVuWv9LpnQWeehogurjg=="], - "khroma": ["khroma@2.1.0", "", {}, "sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw=="], - - "layout-base": ["layout-base@1.0.2", "", {}, "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg=="], - "lie": ["lie@3.3.0", "", { "dependencies": { "immediate": "~3.0.5" } }, "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ=="], "lightningcss": ["lightningcss@1.33.0", "", { "dependencies": { "detect-libc": "^2.0.3" }, "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" } }, "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA=="], @@ -1481,8 +1317,6 @@ "lodash": ["lodash@4.17.23", "", {}, "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w=="], - "lodash-es": ["lodash-es@4.18.1", "", {}, "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A=="], - "lodash.debounce": ["lodash.debounce@4.0.8", "", {}, "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="], "log-symbols": ["log-symbols@4.1.0", "", { "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" } }, "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="], @@ -1519,8 +1353,6 @@ "merge2": ["merge2@1.4.1", "", {}, "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="], - "mermaid": ["mermaid@11.15.0", "", { "dependencies": { "@braintree/sanitize-url": "^7.1.1", "@iconify/utils": "^3.0.2", "@mermaid-js/parser": "^1.1.1", "@types/d3": "^7.4.3", "@upsetjs/venn.js": "^2.0.0", "cytoscape": "^3.33.1", "cytoscape-cose-bilkent": "^4.1.0", "cytoscape-fcose": "^2.2.0", "d3": "^7.9.0", "d3-sankey": "^0.12.3", "dagre-d3-es": "7.0.14", "dayjs": "^1.11.19", "dompurify": "^3.3.1", "es-toolkit": "^1.45.1", "katex": "^0.16.25", "khroma": "^2.1.0", "marked": "^16.3.0", "roughjs": "^4.6.6", "stylis": "^4.3.6", "ts-dedent": "^2.2.0", "uuid": "^11.1.0 || ^12 || ^13 || ^14.0.0" } }, "sha512-pTMbcf3rWdtLiYGpmoTjHEpeY8seiy6sR+9nD7LOs8KfUbHE4lOUAprTRqRAcWSQ6MQpdX+YEsxShtGsINtPtw=="], - "micromatch": ["micromatch@4.0.8", "", { "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" } }, "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="], "mime": ["mime@1.6.0", "", { "bin": "cli.js" }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="], @@ -1611,8 +1443,6 @@ "p-map": ["p-map@7.0.4", "", {}, "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ=="], - "package-manager-detector": ["package-manager-detector@1.6.0", "", {}, "sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA=="], - "pacote": ["pacote@21.5.0", "", { "dependencies": { "@gar/promise-retry": "^1.0.0", "@npmcli/git": "^7.0.0", "@npmcli/installed-package-contents": "^4.0.0", "@npmcli/package-json": "^7.0.0", "@npmcli/promise-spawn": "^9.0.0", "@npmcli/run-script": "^10.0.0", "cacache": "^20.0.0", "fs-minipass": "^3.0.0", "minipass": "^7.0.2", "npm-package-arg": "^13.0.0", "npm-packlist": "^10.0.1", "npm-pick-manifest": "^11.0.1", "npm-registry-fetch": "^19.0.0", "proc-log": "^6.0.0", "sigstore": "^4.0.0", "ssri": "^13.0.0", "tar": "^7.4.3" }, "bin": "bin/index.js" }, "sha512-VtZ0SB8mb5Tzw3dXDfVAIjhyVKUHZkS/ZH9/5mpKenwC9sFOXNI0JI7kEF7IMkwOnsWMFrvAZHzx1T5fmrp9FQ=="], "pako": ["pako@1.0.11", "", {}, "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="], @@ -1627,8 +1457,6 @@ "path-browserify": ["path-browserify@1.0.1", "", {}, "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="], - "path-data-parser": ["path-data-parser@0.1.0", "", {}, "sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w=="], - "path-exists": ["path-exists@4.0.0", "", {}, "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="], "path-is-absolute": ["path-is-absolute@1.0.1", "", {}, "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="], @@ -1647,16 +1475,14 @@ "pathval": ["pathval@1.1.1", "", {}, "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="], + "pele": ["pele@1.10.0", "", {}, "sha512-hDMEM+GQ01pZin8tst3PRXGeB/xFATvXBreHHtjx2glSNAQ7nHFq7EbMuNJGTbqkYgueWPboLjyUBsAudsb1qQ=="], + "picocolors": ["picocolors@1.1.1", "", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="], "picomatch": ["picomatch@4.0.7", "", {}, "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA=="], "plist": ["plist@3.1.1", "", { "dependencies": { "@xmldom/xmldom": "^0.9.10", "base64-js": "^1.5.1", "xmlbuilder": "^15.1.1" } }, "sha512-ZIfcLJC+7E7FBFnDxm9MPmt7D+DidyQ26lewieO75AdhA2ayMtsJSES0iWzqJQbcVRSrTufQoy0DR94xHue0oA=="], - "points-on-curve": ["points-on-curve@0.2.0", "", {}, "sha512-0mYKnYYe9ZcqMCWhUjItv/oHjvgEsfKvnUTg8sAtnHr3GVy7rGkXCb6d5cSyqrWqL4k81b9CPg3urd+T7aop3A=="], - - "points-on-path": ["points-on-path@0.2.1", "", { "dependencies": { "path-data-parser": "0.1.0", "points-on-curve": "0.2.0" } }, "sha512-25ClnWWuw7JbWZcgqY/gJ4FQWadKxGWk+3kR/7kD0tCaDtPPMj7oHu2ToLaVhfpnHrZzYby2w6tUA0eOIuUg8g=="], - "postcss": ["postcss@8.5.26", "", { "dependencies": { "nanoid": "^3.3.17", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ=="], "postcss-loader": ["postcss-loader@8.2.1", "", { "dependencies": { "cosmiconfig": "^9.0.0", "jiti": "^2.5.1", "semver": "^7.6.2" }, "peerDependencies": { "@rspack/core": "0.x || ^1.0.0 || ^2.0.0-0", "postcss": "^7.0.0 || ^8.0.1", "webpack": "^5.0.0" } }, "sha512-k98jtRzthjj3f76MYTs9JTpRqV1RaaMhEU0Lpw9OTmQZQdppg4B30VZ74BojuBHt3F4KyubHJoXCMUeM8Bqeow=="], @@ -1731,20 +1557,14 @@ "reusify": ["reusify@1.1.0", "", {}, "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw=="], - "robust-predicates": ["robust-predicates@3.0.3", "", {}, "sha512-NS3levdsRIUOmiJ8FZWCP7LG3QpJyrs/TE0Zpf1yvZu8cAJJ6QMW92H1c7kWpdIHo8RvmLxN/o2JXTKHp74lUA=="], - "rolldown": ["rolldown@1.2.6", "", { "dependencies": { "@oxc-project/types": "=0.147.0", "@rolldown/pluginutils": "^1.0.0" }, "optionalDependencies": { "@rolldown/binding-android-arm-eabi": "1.2.6", "@rolldown/binding-android-arm64": "1.2.6", "@rolldown/binding-darwin-arm64": "1.2.6", "@rolldown/binding-darwin-x64": "1.2.6", "@rolldown/binding-freebsd-x64": "1.2.6", "@rolldown/binding-linux-arm-gnueabihf": "1.2.6", "@rolldown/binding-linux-arm64-gnu": "1.2.6", "@rolldown/binding-linux-arm64-musl": "1.2.6", "@rolldown/binding-linux-ppc64-gnu": "1.2.6", "@rolldown/binding-linux-s390x-gnu": "1.2.6", "@rolldown/binding-linux-x64-gnu": "1.2.6", "@rolldown/binding-linux-x64-musl": "1.2.6", "@rolldown/binding-openharmony-arm64": "1.2.6", "@rolldown/binding-win32-arm64-msvc": "1.2.6", "@rolldown/binding-win32-x64-msvc": "1.2.6" }, "bin": "bin/cli.mjs" }, "sha512-vMM4q3aixf46GiF1Kok8jDPFsEpXgFWGjUHXNkNHNm+Y2adXAG2dbX91jkti3i0ZRsOlcmbuzAz1poObSHCmUA=="], "rollup": ["rollup@4.63.3", "", { "dependencies": { "@types/estree": "1.0.9" }, "optionalDependencies": { "@napi-rs/lzma-linux-x64-gnu": "1.5.1", "@rollup/rollup-android-arm-eabi": "4.63.3", "@rollup/rollup-android-arm64": "4.63.3", "@rollup/rollup-darwin-arm64": "4.63.3", "@rollup/rollup-darwin-x64": "4.63.3", "@rollup/rollup-freebsd-arm64": "4.63.3", "@rollup/rollup-freebsd-x64": "4.63.3", "@rollup/rollup-linux-arm-gnueabihf": "4.63.3", "@rollup/rollup-linux-arm-musleabihf": "4.63.3", "@rollup/rollup-linux-arm64-gnu": "4.63.3", "@rollup/rollup-linux-arm64-musl": "4.63.3", "@rollup/rollup-linux-loong64-gnu": "4.63.3", "@rollup/rollup-linux-loong64-musl": "4.63.3", "@rollup/rollup-linux-ppc64-gnu": "4.63.3", "@rollup/rollup-linux-ppc64-musl": "4.63.3", "@rollup/rollup-linux-riscv64-gnu": "4.63.3", "@rollup/rollup-linux-riscv64-musl": "4.63.3", "@rollup/rollup-linux-s390x-gnu": "4.63.3", "@rollup/rollup-linux-x64-gnu": "4.63.3", "@rollup/rollup-linux-x64-musl": "4.63.3", "@rollup/rollup-openbsd-x64": "4.63.3", "@rollup/rollup-openharmony-arm64": "4.63.3", "@rollup/rollup-win32-arm64-msvc": "4.63.3", "@rollup/rollup-win32-ia32-msvc": "4.63.3", "@rollup/rollup-win32-x64-gnu": "4.63.3", "@rollup/rollup-win32-x64-msvc": "4.63.3", "fsevents": "~2.3.2" }, "bin": "dist/bin/rollup" }, "sha512-1i2XreiAoMMXuPGD6Msj2xWrMMkHojNRKivInxGQcg7/1KuPuYlfUutLyh4drnOxUTHX9cHI4wFoat8D/NKaBw=="], "rollup-plugin-dts": ["rollup-plugin-dts@6.5.1", "", { "dependencies": { "@jridgewell/remapping": "^2.3.5", "@jridgewell/sourcemap-codec": "^1.5.5", "convert-source-map": "^2.0.0", "magic-string": "^0.30.21" }, "optionalDependencies": { "@babel/code-frame": "^8.0.0" }, "peerDependencies": { "@typescript/typescript6": "^6", "rollup": "^3 || ^4", "typescript": "^4.5 || ^5 || ^6 || ^7" }, "optionalPeers": ["@typescript/typescript6"] }, "sha512-jODTXp3H7MK/Ur/ErtsrQ0G1GvaCmc3du+y5pNrdBMf6d7HlL2Nd/N6TkEr+f75CkUj01zEoEd7y2elH0eHi1Q=="], - "roughjs": ["roughjs@4.6.6", "", { "dependencies": { "hachure-fill": "^0.5.2", "path-data-parser": "^0.1.0", "points-on-curve": "^0.2.0", "points-on-path": "^0.2.1" } }, "sha512-ZUz/69+SYpFN/g/lUlo2FXcIjRkSu3nDarreVdGGndHEBJ6cXPdKguS8JGxwj5HA5xIbVKSmLgr5b3AWxtRfvQ=="], - "run-parallel": ["run-parallel@1.2.0", "", { "dependencies": { "queue-microtask": "^1.2.2" } }, "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="], - "rw": ["rw@1.3.3", "", {}, "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="], - "safe-buffer": ["safe-buffer@5.1.2", "", {}, "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="], "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="], @@ -1829,8 +1649,6 @@ "style-mod": ["style-mod@4.1.3", "", {}, "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ=="], - "stylis": ["stylis@4.4.0", "", {}, "sha512-5Z9ZpRzfuH6l/UAvCPAPUo3665Nk2wLaZU3x+TLHKVzIz33+sbJqbtrYoC3KD4/uVOr2Zp+L0LySezP9OHV9yA=="], - "supports-color": ["supports-color@8.1.1", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="], "supports-preserve-symlinks-flag": ["supports-preserve-symlinks-flag@1.0.0", "", {}, "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="], @@ -1861,8 +1679,6 @@ "treeverse": ["treeverse@3.0.0", "", {}, "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ=="], - "ts-dedent": ["ts-dedent@2.2.0", "", {}, "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ=="], - "ts-loader": ["ts-loader@9.6.2", "", { "dependencies": { "chalk": "^4.1.0", "picomatch": "^4.0.0", "source-map": "^0.7.4" }, "peerDependencies": { "loader-utils": "*", "typescript": "*", "webpack": "^4.0.0 || ^5.0.0" } }, "sha512-R4iuczmtgxvtuI556s+hTZ6/7Ee03VCAk/l/M8LY1OAsUgB7YydsCxkgq9D9pKRaD7GJqUi2u8fp9zZP/ufjKA=="], "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], @@ -1905,8 +1721,6 @@ "util-deprecate": ["util-deprecate@1.0.2", "", {}, "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="], - "uuid": ["uuid@11.1.1", "", { "bin": "dist/esm/bin/uuid" }, "sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ=="], - "valid-identifier": ["valid-identifier@0.0.2", "", {}, "sha512-zaSmOW6ykXwrkX0YTuFUSoALNEKGaQHpxBJQLb3TXspRNDpBwbfrIQCZqAQ0LKBlKuyn2YOq7NNd6415hvZ33g=="], "validate-npm-package-name": ["validate-npm-package-name@7.0.2", "", {}, "sha512-hVDIBwsRruT73PbK7uP5ebUt+ezEtCmzZz3F59BSr2F6OVFnJ/6h8liuvdLrQ88Xmnk6/+xGGuq+pG9WwTuy3A=="], @@ -1987,48 +1801,22 @@ "@babel/generator/@babel/types": ["@babel/types@7.29.8", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg=="], - "@babel/helper-annotate-as-pure/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - - "@babel/helper-compilation-targets/semver": ["semver@7.8.4", "", { "bin": "bin/semver.js" }, "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA=="], - "@babel/helper-create-class-features-plugin/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - "@babel/helper-create-class-features-plugin/semver": ["semver@7.8.4", "", { "bin": "bin/semver.js" }, "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA=="], - - "@babel/helper-create-regexp-features-plugin/semver": ["semver@7.8.4", "", { "bin": "bin/semver.js" }, "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA=="], - "@babel/helper-member-expression-to-functions/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - "@babel/helper-member-expression-to-functions/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - "@babel/helper-module-imports/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - "@babel/helper-module-imports/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - - "@babel/helper-module-transforms/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - "@babel/helper-module-transforms/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - "@babel/helper-optimise-call-expression/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - "@babel/helper-remap-async-to-generator/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], "@babel/helper-replace-supers/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - "@babel/helper-skip-transparent-expression-wrappers/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - - "@babel/helper-wrap-function/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - "@babel/helper-wrap-function/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - "@babel/helper-wrap-function/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - - "@babel/helpers/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - - "@babel/helpers/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - "@babel/parser/@babel/types": ["@babel/types@7.29.8", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg=="], "@babel/plugin-transform-async-generator-functions/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], @@ -2037,10 +1825,6 @@ "@babel/plugin-transform-classes/@babel/traverse": ["@babel/traverse@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/generator": "^8.0.0", "@babel/helper-globals": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/template": "^8.0.0", "@babel/types": "^8.0.0", "obug": "^2.1.1" } }, "sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw=="], - "@babel/plugin-transform-modules-systemjs/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/preset-env/semver": ["semver@7.8.4", "", { "bin": "bin/semver.js" }, "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA=="], - "@babel/preset-modules/@babel/types": ["@babel/types@8.0.4", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.4" } }, "sha512-eY+Yn3dCqTGmyiq2QRU66lA5FL8lqqqvecHt0fF3uHONIa7ToYsaCiWV8lOKqAs0Rb2SjixiKFROngnulPtt2g=="], "@babel/template/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], @@ -2115,14 +1899,6 @@ "css-loader/semver": ["semver@7.8.0", "", { "bin": "bin/semver.js" }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], - "cytoscape-fcose/cose-base": ["cose-base@2.2.0", "", { "dependencies": { "layout-base": "^2.0.0" } }, "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g=="], - - "d3-dsv/commander": ["commander@7.2.0", "", {}, "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="], - - "d3-sankey/d3-array": ["d3-array@2.12.1", "", { "dependencies": { "internmap": "^1.0.0" } }, "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ=="], - - "d3-sankey/d3-shape": ["d3-shape@1.3.7", "", { "dependencies": { "d3-path": "1" } }, "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw=="], - "dom-serializer/domelementtype": ["domelementtype@2.3.0", "", {}, "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="], "dom-serializer/entities": ["entities@2.2.0", "", {}, "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="], @@ -2137,8 +1913,6 @@ "ignore-walk/minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="], - "jest-worker/supports-color": ["supports-color@8.1.1", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="], - "jshint/minimatch": ["minimatch@3.0.8", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q=="], "jshint/strip-json-comments": ["strip-json-comments@1.0.4", "", { "bin": "cli.js" }, "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg=="], @@ -2147,12 +1921,8 @@ "markdown-it/entities": ["entities@4.5.0", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="], - "mermaid/marked": ["marked@16.4.2", "", { "bin": "bin/marked.js" }, "sha512-TI3V8YYWvkVf3KJe1dRkpnjs68JUPyEa5vjKrp1XEEJUAOaQc+Qj+L1qWbPd0SJuAdQkFU0h73sXXqwDYxsiDA=="], - "micromatch/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="], - "minipass-fetch/iconv-lite": ["iconv-lite@0.7.2", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw=="], - "minipass-flush/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="], "minipass-pipeline/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="], @@ -2189,8 +1959,6 @@ "raw-loader/schema-utils": ["schema-utils@3.3.0", "", { "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" } }, "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg=="], - "rollup-plugin-dts/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - "sass/chokidar": ["chokidar@5.0.0", "", { "dependencies": { "readdirp": "^5.0.0" } }, "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw=="], "send/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="], @@ -2209,156 +1977,68 @@ "@babel/generator/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], - "@babel/helper-annotate-as-pure/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - - "@babel/helper-annotate-as-pure/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - - "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - - "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - - "@babel/helper-member-expression-to-functions/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - - "@babel/helper-member-expression-to-functions/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-module-imports/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - "@babel/helper-module-imports/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-module-imports/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], "@babel/helper-module-imports/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@babel/helper-module-imports/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - - "@babel/helper-module-imports/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - - "@babel/helper-module-imports/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-module-transforms/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - "@babel/helper-module-transforms/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-module-transforms/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], "@babel/helper-module-transforms/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@babel/helper-module-transforms/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - - "@babel/helper-module-transforms/@babel/traverse/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - - "@babel/helper-optimise-call-expression/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - - "@babel/helper-optimise-call-expression/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - - "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - - "@babel/helper-replace-supers/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - "@babel/helper-replace-supers/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-replace-supers/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], "@babel/helper-replace-supers/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@babel/helper-replace-supers/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - - "@babel/helper-replace-supers/@babel/traverse/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - - "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - - "@babel/helper-skip-transparent-expression-wrappers/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - - "@babel/helper-skip-transparent-expression-wrappers/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-wrap-function/@babel/template/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - - "@babel/helper-wrap-function/@babel/template/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - - "@babel/helper-wrap-function/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - "@babel/helper-wrap-function/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/helper-wrap-function/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], "@babel/helper-wrap-function/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@babel/helper-wrap-function/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - - "@babel/helper-wrap-function/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helpers/@babel/template/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - - "@babel/helpers/@babel/template/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - - "@babel/helpers/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - - "@babel/helpers/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - "@babel/parser/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@7.29.7", "", {}, "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw=="], "@babel/parser/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], - "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/helper-globals": ["@babel/helper-globals@8.0.0", "", {}, "sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw=="], "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - - "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - - "@babel/plugin-transform-classes/@babel/traverse/@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], - "@babel/plugin-transform-classes/@babel/traverse/@babel/generator": ["@babel/generator@8.0.0", "", { "dependencies": { "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "@types/jsesc": "^2.5.0", "jsesc": "^3.0.2" } }, "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g=="], "@babel/plugin-transform-classes/@babel/traverse/@babel/parser": ["@babel/parser@8.0.0", "", { "dependencies": { "@babel/types": "^8.0.0" }, "bin": { "parser": "bin/babel-parser.js" } }, "sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ=="], - "@babel/plugin-transform-classes/@babel/traverse/@babel/template": ["@babel/template@8.0.0", "", { "dependencies": { "@babel/code-frame": "^8.0.0", "@babel/parser": "^8.0.0", "@babel/types": "^8.0.0" } }, "sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ=="], - - "@babel/plugin-transform-classes/@babel/traverse/@babel/types": ["@babel/types@8.0.0", "", { "dependencies": { "@babel/helper-string-parser": "^8.0.0", "@babel/helper-validator-identifier": "^8.0.0" } }, "sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw=="], - - "@babel/preset-modules/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - "@babel/preset-modules/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.4", "", {}, "sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg=="], "@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], @@ -2385,10 +2065,6 @@ "@marijn/testtool/mocha/serialize-javascript": ["serialize-javascript@6.0.2", "", { "dependencies": { "randombytes": "^2.1.0" } }, "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g=="], - "@marijn/testtool/mocha/strip-json-comments": ["strip-json-comments@3.1.1", "", {}, "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="], - - "@marijn/testtool/mocha/supports-color": ["supports-color@8.1.1", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="], - "@marijn/testtool/mocha/workerpool": ["workerpool@6.5.1", "", {}, "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA=="], "@marijn/testtool/mocha/yargs": ["yargs@16.2.2", "", { "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.0", "y18n": "^5.0.5", "yargs-parser": "^20.2.2" } }, "sha512-Nt9ZJjXTv5R8MHbqby/wXQ6Gi0Bb3TcYZkR1bzuL4yB2OxWPkXknz513gEF0GoA6tn00UpbPvERW8rzCuWCA6w=="], @@ -2415,11 +2091,7 @@ "cross-spawn/which/isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], - "cytoscape-fcose/cose-base/layout-base": ["layout-base@2.0.1", "", {}, "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg=="], - - "d3-sankey/d3-array/internmap": ["internmap@1.0.1", "", {}, "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw=="], - - "d3-sankey/d3-shape/d3-path": ["d3-path@1.0.9", "", {}, "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="], + "glob/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], "htmlparser2/readable-stream/isarray": ["isarray@0.0.1", "", {}, "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="], @@ -2451,82 +2123,10 @@ "raw-loader/schema-utils/ajv-keywords": ["ajv-keywords@3.5.2", "", { "peerDependencies": { "ajv": "^6.9.1" } }, "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="], - "rollup-plugin-dts/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.4", "", {}, "sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg=="], - - "rollup-plugin-dts/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - "sass/chokidar/readdirp": ["readdirp@5.1.1", "", {}, "sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA=="], "send/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], - "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - - "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - - "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-member-expression-to-functions/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - - "@babel/helper-module-imports/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-module-imports/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - - "@babel/helper-module-transforms/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - - "@babel/helper-module-transforms/@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - - "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - - "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - - "@babel/helper-remap-async-to-generator/@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-replace-supers/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-replace-supers/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - - "@babel/helper-replace-supers/@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - - "@babel/helper-replace-supers/@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-skip-transparent-expression-wrappers/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - - "@babel/helper-wrap-function/@babel/template/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-wrap-function/@babel/template/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - - "@babel/helper-wrap-function/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helper-wrap-function/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - - "@babel/helpers/@babel/template/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/helpers/@babel/template/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - - "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - - "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - - "@babel/plugin-transform-async-generator-functions/@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/plugin-transform-classes/@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - - "@babel/plugin-transform-classes/@babel/traverse/@babel/code-frame/js-tokens": ["js-tokens@10.0.0", "", {}, "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q=="], - - "@babel/plugin-transform-classes/@babel/traverse/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@8.0.0", "", {}, "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg=="], - - "@babel/plugin-transform-classes/@babel/traverse/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@8.0.0", "", {}, "sha512-kXxQVZHNOctSJJsqzmcbPSCEkM6oHNnDIkua7g9RCO9xRHj2eCiKvRx2KPdfWR9QxcGWnK/oArrtunmie3rL9g=="], - "@marijn/testtool/mocha/chokidar/readdirp": ["readdirp@3.6.0", "", { "dependencies": { "picomatch": "^2.2.1" } }, "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="], "@marijn/testtool/mocha/minimatch/brace-expansion": ["brace-expansion@2.1.7", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g=="], @@ -2549,8 +2149,6 @@ "ignore-walk/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], - "jshint/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], - "mocha/chokidar/readdirp/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="], "mocha/yargs/cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], @@ -2565,8 +2163,6 @@ "@marijn/testtool/mocha/chokidar/readdirp/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="], - "@marijn/testtool/mocha/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], - "@marijn/testtool/mocha/yargs/cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], "@marijn/testtool/mocha/yargs/cliui/wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="], @@ -2579,8 +2175,6 @@ "cacache/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], - "cli/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], - "mocha/yargs/cliui/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], "mocha/yargs/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], diff --git a/package-lock.json b/package-lock.json index 31cbe89503..e555bd51b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -75,10 +75,10 @@ "markdown-it-github-alerts": "^1.0.1", "markdown-it-task-lists": "^2.1.1", "markdown-it-texmath": "^1.0.0", - "mermaid": "^11.14.0", "mime-types": "^3.0.2", "motion": "^12.43.0", "mustache": "^4.2.0", + "pele": "^1.10.0", "picomatch": "^4.0.7", "url-parse": "^1.5.10", "vanilla-picker": "^2.12.3", @@ -170,19 +170,6 @@ "typescript-language-server": "^4.3.4" } }, - "node_modules/@antfu/install-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@antfu/install-pkg/-/install-pkg-1.1.0.tgz", - "integrity": "sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ==", - "license": "MIT", - "dependencies": { - "package-manager-detector": "^1.3.0", - "tinyexec": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - } - }, "node_modules/@babel/code-frame": { "version": "7.29.7", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", @@ -3638,18 +3625,6 @@ "node": ">=14.21.3" } }, - "node_modules/@braintree/sanitize-url": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-7.1.2.tgz", - "integrity": "sha512-jigsZK+sMF/cuiB7sERuo9V7N9jx+dhmHHnQyDSVdpZwVutaBu7WvNYqMDLSgFgfB30n452TP3vjDAvFC973mA==", - "license": "MIT" - }, - "node_modules/@chevrotain/types": { - "version": "11.1.2", - "resolved": "https://registry.npmjs.org/@chevrotain/types/-/types-11.1.2.tgz", - "integrity": "sha512-U+HFai5+zmJCkK86QsaJtoITlboZHBqrVketcO2ROv865xfCMSFpELQoz1GkX5GzME8pTa+3kbKrZHQtI0gdbw==", - "license": "Apache-2.0" - }, "node_modules/@codemirror/autocomplete": { "version": "6.20.3", "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.20.3.tgz", @@ -4184,23 +4159,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/@iconify/types": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz", - "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==", - "license": "MIT" - }, - "node_modules/@iconify/utils": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-3.1.3.tgz", - "integrity": "sha512-LPKOXPn/zV+zis1oOfGWogaXVpqUybF3ZS6SCZIsz8vg0ivVp9+fVqyYB7xq0aiST/VhUQYGO1qo6uoYSiEJqw==", - "license": "MIT", - "dependencies": { - "@antfu/install-pkg": "^1.1.0", - "@iconify/types": "^2.0.0", - "import-meta-resolve": "^4.2.0" - } - }, "node_modules/@isaacs/fs-minipass": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", @@ -4831,15 +4789,6 @@ "node": ">=10" } }, - "node_modules/@mermaid-js/parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.2.1.tgz", - "integrity": "sha512-n12NohV3mrUyUL2o93IgG/ifeW9FTyeJn3zDxkhwa8MJ9Fxg3HQMlA3RiGmD/3UnJvheztkjjQAjA2T4LmUcpw==", - "license": "MIT", - "dependencies": { - "@chevrotain/types": "~11.1.2" - } - }, "node_modules/@napi-rs/lzma-linux-x64-gnu": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/@napi-rs/lzma-linux-x64-gnu/-/lzma-linux-x64-gnu-1.5.1.tgz", @@ -4848,9 +4797,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -5886,9 +5832,6 @@ "arm" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -5903,9 +5846,6 @@ "arm" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -5920,9 +5860,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -5937,9 +5874,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -5954,9 +5888,6 @@ "loong64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -5971,9 +5902,6 @@ "loong64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -5988,9 +5916,6 @@ "ppc64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -6005,9 +5930,6 @@ "ppc64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -6022,9 +5944,6 @@ "riscv64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -6039,9 +5958,6 @@ "riscv64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -6056,9 +5972,6 @@ "s390x" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -6073,9 +5986,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -6090,9 +6000,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -6603,259 +6510,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/d3": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz", - "integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==", - "license": "MIT", - "dependencies": { - "@types/d3-array": "*", - "@types/d3-axis": "*", - "@types/d3-brush": "*", - "@types/d3-chord": "*", - "@types/d3-color": "*", - "@types/d3-contour": "*", - "@types/d3-delaunay": "*", - "@types/d3-dispatch": "*", - "@types/d3-drag": "*", - "@types/d3-dsv": "*", - "@types/d3-ease": "*", - "@types/d3-fetch": "*", - "@types/d3-force": "*", - "@types/d3-format": "*", - "@types/d3-geo": "*", - "@types/d3-hierarchy": "*", - "@types/d3-interpolate": "*", - "@types/d3-path": "*", - "@types/d3-polygon": "*", - "@types/d3-quadtree": "*", - "@types/d3-random": "*", - "@types/d3-scale": "*", - "@types/d3-scale-chromatic": "*", - "@types/d3-selection": "*", - "@types/d3-shape": "*", - "@types/d3-time": "*", - "@types/d3-time-format": "*", - "@types/d3-timer": "*", - "@types/d3-transition": "*", - "@types/d3-zoom": "*" - } - }, - "node_modules/@types/d3-array": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz", - "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==", - "license": "MIT" - }, - "node_modules/@types/d3-axis": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz", - "integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==", - "license": "MIT", - "dependencies": { - "@types/d3-selection": "*" - } - }, - "node_modules/@types/d3-brush": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz", - "integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==", - "license": "MIT", - "dependencies": { - "@types/d3-selection": "*" - } - }, - "node_modules/@types/d3-chord": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz", - "integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==", - "license": "MIT" - }, - "node_modules/@types/d3-color": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz", - "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==", - "license": "MIT" - }, - "node_modules/@types/d3-contour": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz", - "integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==", - "license": "MIT", - "dependencies": { - "@types/d3-array": "*", - "@types/geojson": "*" - } - }, - "node_modules/@types/d3-delaunay": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz", - "integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==", - "license": "MIT" - }, - "node_modules/@types/d3-dispatch": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.7.tgz", - "integrity": "sha512-5o9OIAdKkhN1QItV2oqaE5KMIiXAvDWBDPrD85e58Qlz1c1kI/J0NcqbEG88CoTwJrYe7ntUCVfeUl2UJKbWgA==", - "license": "MIT" - }, - "node_modules/@types/d3-drag": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz", - "integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==", - "license": "MIT", - "dependencies": { - "@types/d3-selection": "*" - } - }, - "node_modules/@types/d3-dsv": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz", - "integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==", - "license": "MIT" - }, - "node_modules/@types/d3-ease": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz", - "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==", - "license": "MIT" - }, - "node_modules/@types/d3-fetch": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz", - "integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==", - "license": "MIT", - "dependencies": { - "@types/d3-dsv": "*" - } - }, - "node_modules/@types/d3-force": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz", - "integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==", - "license": "MIT" - }, - "node_modules/@types/d3-format": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz", - "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==", - "license": "MIT" - }, - "node_modules/@types/d3-geo": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz", - "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==", - "license": "MIT", - "dependencies": { - "@types/geojson": "*" - } - }, - "node_modules/@types/d3-hierarchy": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz", - "integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==", - "license": "MIT" - }, - "node_modules/@types/d3-interpolate": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz", - "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==", - "license": "MIT", - "dependencies": { - "@types/d3-color": "*" - } - }, - "node_modules/@types/d3-path": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz", - "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==", - "license": "MIT" - }, - "node_modules/@types/d3-polygon": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz", - "integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==", - "license": "MIT" - }, - "node_modules/@types/d3-quadtree": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz", - "integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==", - "license": "MIT" - }, - "node_modules/@types/d3-random": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz", - "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==", - "license": "MIT" - }, - "node_modules/@types/d3-scale": { - "version": "4.0.9", - "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz", - "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==", - "license": "MIT", - "dependencies": { - "@types/d3-time": "*" - } - }, - "node_modules/@types/d3-scale-chromatic": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz", - "integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==", - "license": "MIT" - }, - "node_modules/@types/d3-selection": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz", - "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==", - "license": "MIT" - }, - "node_modules/@types/d3-shape": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.8.tgz", - "integrity": "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==", - "license": "MIT", - "dependencies": { - "@types/d3-path": "*" - } - }, - "node_modules/@types/d3-time": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz", - "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==", - "license": "MIT" - }, - "node_modules/@types/d3-time-format": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz", - "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==", - "license": "MIT" - }, - "node_modules/@types/d3-timer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz", - "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==", - "license": "MIT" - }, - "node_modules/@types/d3-transition": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz", - "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==", - "license": "MIT", - "dependencies": { - "@types/d3-selection": "*" - } - }, - "node_modules/@types/d3-zoom": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz", - "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==", - "license": "MIT", - "dependencies": { - "@types/d3-interpolate": "*", - "@types/d3-selection": "*" - } - }, "node_modules/@types/deep-eql": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz", @@ -6877,12 +6531,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/geojson": { - "version": "7946.0.16", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz", - "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==", - "license": "MIT" - }, "node_modules/@types/jsesc": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/@types/jsesc/-/jsesc-2.5.1.tgz", @@ -6983,16 +6631,6 @@ "dev": true, "license": "ISC" }, - "node_modules/@upsetjs/venn.js": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@upsetjs/venn.js/-/venn.js-2.0.0.tgz", - "integrity": "sha512-WbBhLrooyePuQ1VZxrJjtLvTc4NVfpOyKx0sKqioq9bX1C1m7Jgykkn8gLrtwumBioXIqam8DLxp88Adbue6Hw==", - "license": "MIT", - "optionalDependencies": { - "d3-selection": "^3.0.0", - "d3-transition": "^3.0.1" - } - }, "node_modules/@vitest/expect": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.11.tgz", @@ -8621,15 +8259,6 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "license": "MIT" }, - "node_modules/cose-base": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-1.0.3.tgz", - "integrity": "sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==", - "license": "MIT", - "dependencies": { - "layout-base": "^1.0.0" - } - }, "node_modules/cosmiconfig": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.1.tgz", @@ -8768,621 +8397,104 @@ "node": ">=4" } }, - "node_modules/cytoscape": { - "version": "3.34.2", - "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.34.2.tgz", - "integrity": "sha512-Cm2jaj1X/PBNlzV9yH8zcfGOxO7U+CJ/+mxSBVPSchLaugdp4jtlGx5qaHtPRZ6tgiZ5P+o1XoRfJA+ba6KM3g==", - "license": "MIT", - "engines": { - "node": ">=0.10" - } + "node_modules/date-now": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", + "integrity": "sha512-AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw==", + "dev": true }, - "node_modules/cytoscape-cose-bilkent": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz", - "integrity": "sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==", + "node_modules/dayjs": { + "version": "1.11.23", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.23.tgz", + "integrity": "sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ==", + "license": "MIT" + }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { - "cose-base": "^1.0.0" + "ms": "^2.1.3" }, - "peerDependencies": { - "cytoscape": "^3.2.0" + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, - "node_modules/cytoscape-fcose": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz", - "integrity": "sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==", + "node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, "license": "MIT", - "dependencies": { - "cose-base": "^2.2.0" + "engines": { + "node": ">=10" }, - "peerDependencies": { - "cytoscape": "^3.2.0" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/cytoscape-fcose/node_modules/cose-base": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-2.2.0.tgz", - "integrity": "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==", + "node_modules/dedent": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.2.tgz", + "integrity": "sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==", + "dev": true, "license": "MIT", - "dependencies": { - "layout-base": "^2.0.0" + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } } }, - "node_modules/cytoscape-fcose/node_modules/layout-base": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-2.0.1.tgz", - "integrity": "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==", - "license": "MIT" - }, - "node_modules/d3": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz", - "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==", - "license": "ISC", + "node_modules/deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, + "license": "MIT", "dependencies": { - "d3-array": "3", - "d3-axis": "3", - "d3-brush": "3", - "d3-chord": "3", - "d3-color": "3", - "d3-contour": "4", - "d3-delaunay": "6", - "d3-dispatch": "3", - "d3-drag": "3", - "d3-dsv": "3", - "d3-ease": "3", - "d3-fetch": "3", - "d3-force": "3", - "d3-format": "3", - "d3-geo": "3", - "d3-hierarchy": "3", - "d3-interpolate": "3", - "d3-path": "3", - "d3-polygon": "3", - "d3-quadtree": "3", - "d3-random": "3", - "d3-scale": "4", - "d3-scale-chromatic": "3", - "d3-selection": "3", - "d3-shape": "3", - "d3-time": "3", - "d3-time-format": "4", - "d3-timer": "3", - "d3-transition": "3", - "d3-zoom": "3" + "type-detect": "^4.0.0" }, "engines": { - "node": ">=12" + "node": ">=0.12" } }, - "node_modules/d3-array": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", - "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", - "license": "ISC", - "dependencies": { - "internmap": "1 - 2" - }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "dev": true, + "license": "MIT", "engines": { - "node": ">=12" + "node": ">= 0.8" } }, - "node_modules/d3-axis": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz", - "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==", - "license": "ISC", + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "dev": true, + "license": "MIT", "engines": { - "node": ">=12" + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" } }, - "node_modules/d3-brush": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz", - "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==", - "license": "ISC", - "dependencies": { - "d3-dispatch": "1 - 3", - "d3-drag": "2 - 3", - "d3-interpolate": "1 - 3", - "d3-selection": "3", - "d3-transition": "3" - }, + "node_modules/detect-indent": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", + "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", + "license": "MIT", "engines": { - "node": ">=12" - } - }, - "node_modules/d3-chord": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz", - "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==", - "license": "ISC", - "dependencies": { - "d3-path": "1 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-color": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", - "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-contour": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz", - "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==", - "license": "ISC", - "dependencies": { - "d3-array": "^3.2.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-delaunay": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz", - "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==", - "license": "ISC", - "dependencies": { - "delaunator": "5" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-dispatch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz", - "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-drag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz", - "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==", - "license": "ISC", - "dependencies": { - "d3-dispatch": "1 - 3", - "d3-selection": "3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-dsv": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz", - "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==", - "license": "ISC", - "dependencies": { - "commander": "7", - "iconv-lite": "0.6", - "rw": "1" - }, - "bin": { - "csv2json": "bin/dsv2json.js", - "csv2tsv": "bin/dsv2dsv.js", - "dsv2dsv": "bin/dsv2dsv.js", - "dsv2json": "bin/dsv2json.js", - "json2csv": "bin/json2dsv.js", - "json2dsv": "bin/json2dsv.js", - "json2tsv": "bin/json2dsv.js", - "tsv2csv": "bin/dsv2dsv.js", - "tsv2json": "bin/dsv2json.js" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-dsv/node_modules/commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, - "node_modules/d3-ease": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", - "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==", - "license": "BSD-3-Clause", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz", - "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==", - "license": "ISC", - "dependencies": { - "d3-dsv": "1 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-force": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz", - "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==", - "license": "ISC", - "dependencies": { - "d3-dispatch": "1 - 3", - "d3-quadtree": "1 - 3", - "d3-timer": "1 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-format": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.2.tgz", - "integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-geo": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz", - "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==", - "license": "ISC", - "dependencies": { - "d3-array": "2.5.0 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-hierarchy": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz", - "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-interpolate": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", - "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", - "license": "ISC", - "dependencies": { - "d3-color": "1 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz", - "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-polygon": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz", - "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-quadtree": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz", - "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-random": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz", - "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-sankey": { - "version": "0.12.3", - "resolved": "https://registry.npmjs.org/d3-sankey/-/d3-sankey-0.12.3.tgz", - "integrity": "sha512-nQhsBRmM19Ax5xEIPLMY9ZmJ/cDvd1BG3UVvt5h3WRxKg5zGRbvnteTyWAbzeSvlh3tW7ZEmq4VwR5mB3tutmQ==", - "license": "BSD-3-Clause", - "dependencies": { - "d3-array": "1 - 2", - "d3-shape": "^1.2.0" - } - }, - "node_modules/d3-sankey/node_modules/d3-array": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", - "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==", - "license": "BSD-3-Clause", - "dependencies": { - "internmap": "^1.0.0" - } - }, - "node_modules/d3-sankey/node_modules/d3-path": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz", - "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==", - "license": "BSD-3-Clause" - }, - "node_modules/d3-sankey/node_modules/d3-shape": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz", - "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==", - "license": "BSD-3-Clause", - "dependencies": { - "d3-path": "1" - } - }, - "node_modules/d3-sankey/node_modules/internmap": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz", - "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==", - "license": "ISC" - }, - "node_modules/d3-scale": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz", - "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==", - "license": "ISC", - "dependencies": { - "d3-array": "2.10.0 - 3", - "d3-format": "1 - 3", - "d3-interpolate": "1.2.0 - 3", - "d3-time": "2.1.1 - 3", - "d3-time-format": "2 - 4" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-scale-chromatic": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz", - "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==", - "license": "ISC", - "dependencies": { - "d3-color": "1 - 3", - "d3-interpolate": "1 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-selection": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", - "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-shape": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz", - "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==", - "license": "ISC", - "dependencies": { - "d3-path": "^3.1.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-time": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz", - "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==", - "license": "ISC", - "dependencies": { - "d3-array": "2 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-time-format": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz", - "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", - "license": "ISC", - "dependencies": { - "d3-time": "1 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-timer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", - "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-transition": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz", - "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==", - "license": "ISC", - "dependencies": { - "d3-color": "1 - 3", - "d3-dispatch": "1 - 3", - "d3-ease": "1 - 3", - "d3-interpolate": "1 - 3", - "d3-timer": "1 - 3" - }, - "engines": { - "node": ">=12" - }, - "peerDependencies": { - "d3-selection": "2 - 3" - } - }, - "node_modules/d3-zoom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz", - "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==", - "license": "ISC", - "dependencies": { - "d3-dispatch": "1 - 3", - "d3-drag": "2 - 3", - "d3-interpolate": "1 - 3", - "d3-selection": "2 - 3", - "d3-transition": "2 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/dagre-d3-es": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/dagre-d3-es/-/dagre-d3-es-7.0.14.tgz", - "integrity": "sha512-P4rFMVq9ESWqmOgK+dlXvOtLwYg0i7u0HBGJER0LZDJT2VHIPAMZ/riPxqJceWMStH5+E61QxFra9kIS3AqdMg==", - "license": "MIT", - "dependencies": { - "d3": "^7.9.0", - "lodash-es": "^4.17.21" - } - }, - "node_modules/date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha512-AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw==", - "dev": true - }, - "node_modules/dayjs": { - "version": "1.11.23", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.23.tgz", - "integrity": "sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ==", - "license": "MIT" - }, - "node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decamelize": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", - "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/dedent": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.2.tgz", - "integrity": "sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "babel-plugin-macros": "^3.1.0" - }, - "peerDependenciesMeta": { - "babel-plugin-macros": { - "optional": true - } - } - }, - "node_modules/deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-detect": "^4.0.0" - }, - "engines": { - "node": ">=0.12" - } - }, - "node_modules/delaunator": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.1.0.tgz", - "integrity": "sha512-AGrQ4QSgssa1NGmWmLPqN5NY2KajF5MqxetNEO+o0n3ZwZZeTmt7bBnvzHWrmkZFxGgr4HdyFgelzgi06otLuQ==", - "license": "ISC", - "dependencies": { - "robust-predicates": "^3.0.2" - } - }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/detect-indent": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", - "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", - "license": "MIT", - "engines": { - "node": ">=8" + "node": ">=8" } }, "node_modules/detect-libc": { @@ -9670,18 +8782,6 @@ "dev": true, "license": "MIT" }, - "node_modules/es-toolkit": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.51.0.tgz", - "integrity": "sha512-zC2lQGkM7QX+Gm6iM3+WIdZJzthsEd14LvRNJneSO2hzyz/zNBENR8+YXWo1cKxgPBtV6ksPYHELbcwBRzmdCw==", - "license": "MIT", - "workspaces": [ - "docs", - "benchmarks", - "tests/types", - "tests/browser-compat" - ] - }, "node_modules/escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", @@ -10176,12 +9276,6 @@ "node": ">=4.x" } }, - "node_modules/hachure-fill": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/hachure-fill/-/hachure-fill-0.5.2.tgz", - "integrity": "sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==", - "license": "MIT" - }, "node_modules/happy-dom": { "version": "20.11.6", "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-20.11.6.tgz", @@ -10374,18 +9468,6 @@ "node": ">=10.17.0" } }, - "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/icss-utils": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", @@ -10453,6 +9535,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz", "integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==", + "dev": true, "license": "MIT", "funding": { "type": "github", @@ -10495,15 +9578,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/internmap": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", - "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, "node_modules/ip-address": { "version": "10.2.0", "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", @@ -10915,17 +9989,6 @@ "katex": "cli.js" } }, - "node_modules/khroma": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/khroma/-/khroma-2.1.0.tgz", - "integrity": "sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==" - }, - "node_modules/layout-base": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-1.0.2.tgz", - "integrity": "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==", - "license": "MIT" - }, "node_modules/lie": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", @@ -11259,12 +10322,6 @@ "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", "license": "MIT" }, - "node_modules/lodash-es": { - "version": "4.18.1", - "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz", - "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==", - "license": "MIT" - }, "node_modules/lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -11462,47 +10519,6 @@ "node": ">= 8" } }, - "node_modules/mermaid": { - "version": "11.15.0", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.15.0.tgz", - "integrity": "sha512-pTMbcf3rWdtLiYGpmoTjHEpeY8seiy6sR+9nD7LOs8KfUbHE4lOUAprTRqRAcWSQ6MQpdX+YEsxShtGsINtPtw==", - "license": "MIT", - "dependencies": { - "@braintree/sanitize-url": "^7.1.1", - "@iconify/utils": "^3.0.2", - "@mermaid-js/parser": "^1.1.1", - "@types/d3": "^7.4.3", - "@upsetjs/venn.js": "^2.0.0", - "cytoscape": "^3.33.1", - "cytoscape-cose-bilkent": "^4.1.0", - "cytoscape-fcose": "^2.2.0", - "d3": "^7.9.0", - "d3-sankey": "^0.12.3", - "dagre-d3-es": "7.0.14", - "dayjs": "^1.11.19", - "dompurify": "^3.3.1", - "es-toolkit": "^1.45.1", - "katex": "^0.16.25", - "khroma": "^2.1.0", - "marked": "^16.3.0", - "roughjs": "^4.6.6", - "stylis": "^4.3.6", - "ts-dedent": "^2.2.0", - "uuid": "^11.1.0 || ^12 || ^13 || ^14.0.0" - } - }, - "node_modules/mermaid/node_modules/marked": { - "version": "16.4.2", - "resolved": "https://registry.npmjs.org/marked/-/marked-16.4.2.tgz", - "integrity": "sha512-TI3V8YYWvkVf3KJe1dRkpnjs68JUPyEa5vjKrp1XEEJUAOaQc+Qj+L1qWbPd0SJuAdQkFU0h73sXXqwDYxsiDA==", - "license": "MIT", - "bin": { - "marked": "bin/marked.js" - }, - "engines": { - "node": ">= 20" - } - }, "node_modules/micromatch": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", @@ -12611,12 +11627,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/package-manager-detector": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.6.0.tgz", - "integrity": "sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA==", - "license": "MIT" - }, "node_modules/pacote": { "version": "21.5.0", "resolved": "https://registry.npmjs.org/pacote/-/pacote-21.5.0.tgz", @@ -12723,12 +11733,6 @@ "dev": true, "license": "MIT" }, - "node_modules/path-data-parser": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/path-data-parser/-/path-data-parser-0.1.0.tgz", - "integrity": "sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w==", - "license": "MIT" - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -12812,6 +11816,15 @@ "node": "*" } }, + "node_modules/pele": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/pele/-/pele-1.10.0.tgz", + "integrity": "sha512-hDMEM+GQ01pZin8tst3PRXGeB/xFATvXBreHHtjx2glSNAQ7nHFq7EbMuNJGTbqkYgueWPboLjyUBsAudsb1qQ==", + "license": "MIT", + "engines": { + "node": ">=20" + } + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -12845,22 +11858,6 @@ "node": ">=10.4.0" } }, - "node_modules/points-on-curve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/points-on-curve/-/points-on-curve-0.2.0.tgz", - "integrity": "sha512-0mYKnYYe9ZcqMCWhUjItv/oHjvgEsfKvnUTg8sAtnHr3GVy7rGkXCb6d5cSyqrWqL4k81b9CPg3urd+T7aop3A==", - "license": "MIT" - }, - "node_modules/points-on-path": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/points-on-path/-/points-on-path-0.2.1.tgz", - "integrity": "sha512-25ClnWWuw7JbWZcgqY/gJ4FQWadKxGWk+3kR/7kD0tCaDtPPMj7oHu2ToLaVhfpnHrZzYby2w6tUA0eOIuUg8g==", - "license": "MIT", - "dependencies": { - "path-data-parser": "0.1.0", - "points-on-curve": "0.2.0" - } - }, "node_modules/postcss": { "version": "8.5.26", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.26.tgz", @@ -13400,12 +12397,6 @@ "node": ">=0.10.0" } }, - "node_modules/robust-predicates": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.3.tgz", - "integrity": "sha512-NS3levdsRIUOmiJ8FZWCP7LG3QpJyrs/TE0Zpf1yvZu8cAJJ6QMW92H1c7kWpdIHo8RvmLxN/o2JXTKHp74lUA==", - "license": "Unlicense" - }, "node_modules/rolldown": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.6.tgz", @@ -13552,18 +12543,6 @@ "license": "MIT", "optional": true }, - "node_modules/roughjs": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/roughjs/-/roughjs-4.6.6.tgz", - "integrity": "sha512-ZUz/69+SYpFN/g/lUlo2FXcIjRkSu3nDarreVdGGndHEBJ6cXPdKguS8JGxwj5HA5xIbVKSmLgr5b3AWxtRfvQ==", - "license": "MIT", - "dependencies": { - "hachure-fill": "^0.5.2", - "path-data-parser": "^0.1.0", - "points-on-curve": "^0.2.0", - "points-on-path": "^0.2.1" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -13587,12 +12566,6 @@ "queue-microtask": "^1.2.2" } }, - "node_modules/rw": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", - "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==", - "license": "BSD-3-Clause" - }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -13603,7 +12576,8 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/sass": { "version": "1.103.1", @@ -14152,12 +13126,6 @@ "integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==", "license": "MIT" }, - "node_modules/stylis": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.4.0.tgz", - "integrity": "sha512-5Z9ZpRzfuH6l/UAvCPAPUo3665Nk2wLaZU3x+TLHKVzIz33+sbJqbtrYoC3KD4/uVOr2Zp+L0LySezP9OHV9yA==", - "license": "MIT" - }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -14299,6 +13267,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.1.2.tgz", "integrity": "sha512-dAqSqE/RabpBKI8+h26GfLq6Vb3JVXs30XYQjdMjaj/c2tS8IYYMbIzP599KtRj7c57/wYApb3QjgRgXmrCukA==", + "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -14370,15 +13339,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/ts-dedent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz", - "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==", - "license": "MIT", - "engines": { - "node": ">=6.10" - } - }, "node_modules/ts-loader": { "version": "9.6.2", "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.6.2.tgz", @@ -14622,19 +13582,6 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "license": "MIT" }, - "node_modules/uuid": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.1.tgz", - "integrity": "sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ==", - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "license": "MIT", - "bin": { - "uuid": "dist/esm/bin/uuid" - } - }, "node_modules/valid-identifier": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.2.tgz", diff --git a/package.json b/package.json index a24c5336ac..ba2e7d80eb 100644 --- a/package.json +++ b/package.json @@ -191,10 +191,10 @@ "markdown-it-github-alerts": "^1.0.1", "markdown-it-task-lists": "^2.1.1", "markdown-it-texmath": "^1.0.0", - "mermaid": "^11.14.0", "mime-types": "^3.0.2", "motion": "^12.43.0", "mustache": "^4.2.0", + "pele": "^1.10.0", "picomatch": "^4.0.7", "url-parse": "^1.5.10", "vanilla-picker": "^2.12.3", diff --git a/src/pages/markdownPreview/index.js b/src/pages/markdownPreview/index.js index b89ce84a1f..49f84ca5b0 100644 --- a/src/pages/markdownPreview/index.js +++ b/src/pages/markdownPreview/index.js @@ -17,30 +17,9 @@ import { } from "./renderer"; let previewController = null; -let mermaidModulePromise = null; -let mermaidThemeSignature = ""; +let peleModulePromise = null; let mathStylesPromise = null; -function getThemeColor(name, fallback) { - const value = getComputedStyle(document.documentElement) - .getPropertyValue(name) - .trim(); - return value || fallback; -} - -function isDarkColor(color) { - const normalized = color.replace(/\s+/g, ""); - const match = normalized.match(/^#([0-9a-f]{6})$/i); - if (!match) return true; - - const value = match[1]; - const r = Number.parseInt(value.slice(0, 2), 16); - const g = Number.parseInt(value.slice(2, 4), 16); - const b = Number.parseInt(value.slice(4, 6), 16); - const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255; - return luminance < 0.5; -} - function escapeHtml(text) { return String(text ?? "") .replace(/&/g, "&") @@ -75,17 +54,15 @@ function getOffsetTopWithinContainer(target, container) { return top; } -async function getMermaid() { - if (!mermaidModulePromise) { - mermaidModulePromise = import("mermaid") - .then(({ default: mermaid }) => mermaid) - .catch((error) => { - mermaidModulePromise = null; - throw error; - }); +async function getPele() { + if (!peleModulePromise) { + peleModulePromise = import("pele/lazy").catch((error) => { + peleModulePromise = null; + throw error; + }); } - return mermaidModulePromise; + return peleModulePromise; } async function ensureMathStyles() { @@ -102,76 +79,6 @@ async function ensureMathStyles() { return mathStylesPromise; } -function getMermaidThemeConfig() { - const backgroundColor = getThemeColor("--background-color", "#1e1e1e"); - const panelColor = getThemeColor("--popup-background-color", "#2a2f3a"); - const borderColor = getThemeColor("--border-color", "#4a4f5a"); - const primaryTextColor = getThemeColor("--primary-text-color", "#f5f5f5"); - const accentColor = getThemeColor("--link-text-color", "#4ba3ff"); - const activeColor = getThemeColor("--active-color", accentColor); - - return { - startOnLoad: false, - securityLevel: "strict", - htmlLabels: false, - theme: "base", - flowchart: { - htmlLabels: false, - }, - themeVariables: { - darkMode: isDarkColor(backgroundColor), - background: backgroundColor, - mainBkg: panelColor, - primaryColor: panelColor, - mainContrastColor: primaryTextColor, - textColor: primaryTextColor, - primaryTextColor, - primaryBorderColor: borderColor, - lineColor: primaryTextColor, - secondaryColor: accentColor, - secondaryBorderColor: borderColor, - secondaryTextColor: primaryTextColor, - tertiaryColor: backgroundColor, - tertiaryBorderColor: borderColor, - tertiaryTextColor: primaryTextColor, - clusterBkg: panelColor, - clusterBorder: borderColor, - nodeBorder: borderColor, - nodeTextColor: primaryTextColor, - titleColor: primaryTextColor, - defaultLinkColor: activeColor, - actorTextColor: primaryTextColor, - labelTextColor: primaryTextColor, - loopTextColor: primaryTextColor, - noteTextColor: primaryTextColor, - sectionBkgColor: panelColor, - sectionBkgColor2: backgroundColor, - sectionTitleColor: primaryTextColor, - sequenceNumberColor: primaryTextColor, - signalTextColor: primaryTextColor, - taskTextColor: primaryTextColor, - taskTextDarkColor: primaryTextColor, - taskTextOutsideColor: primaryTextColor, - edgeLabelBackground: backgroundColor, - pieTitleTextColor: primaryTextColor, - pieLegendTextColor: primaryTextColor, - pieSectionTextColor: primaryTextColor, - git0: panelColor, - git1: backgroundColor, - git2: accentColor, - git3: activeColor, - }, - }; -} - -function initializeMermaid(mermaid) { - const config = getMermaidThemeConfig(); - const signature = JSON.stringify(config); - if (signature === mermaidThemeSignature) return; - mermaid.initialize(config); - mermaidThemeSignature = signature; -} - async function copyText(text) { if (cordova?.plugins?.clipboard) { cordova.plugins.clipboard.copy(text); @@ -437,17 +344,17 @@ function createMarkdownPreview(file) { ); if (!mermaidBlocks.length) return; - const mermaid = await getMermaid(); + const { renderAsync } = await getPele(); if (previewState.disposed || version !== previewState.renderVersion) return; - initializeMermaid(mermaid); - let index = 0; await Promise.all( - mermaidBlocks.map(async (block) => { + mermaidBlocks.map(async (block, index) => { const source = block.textContent || ""; - const id = `acode-markdown-mermaid-${Date.now()}-${version}-${index++}`; try { - const { svg, bindFunctions } = await mermaid.render(id, source); + const { svg } = await renderAsync(source, { + idPrefix: `acode-markdown-mermaid-${version}-${index}`, + maxWidth: block.clientWidth || undefined, + }); if ( previewState.disposed || version !== previewState.renderVersion || @@ -456,13 +363,10 @@ function createMarkdownPreview(file) { return; } - const sanitizedSvg = DOMPurify.sanitize(svg, { + block.innerHTML = DOMPurify.sanitize(svg, { USE_PROFILES: { svg: true, svgFilters: true }, - ADD_TAGS: ["style"], - ADD_ATTR: ["data-et", "data-id", "data-node", "data-zoom", "class"], + ADD_ATTR: ["data-id", "class"], }); - block.innerHTML = sanitizedSvg; - bindFunctions?.(block); } catch (error) { if (!block.isConnected) return; block.classList.add("mermaid-error"); diff --git a/src/pages/markdownPreview/style.scss b/src/pages/markdownPreview/style.scss index 4e666c17fb..0c1caaa14f 100644 --- a/src/pages/markdownPreview/style.scss +++ b/src/pages/markdownPreview/style.scss @@ -85,6 +85,15 @@ justify-content: center; overflow-x: auto; padding: 12px 0; + --pele-bg: var(--primary-color); + --pele-fg: var(--primary-text-color); + --pele-muted: var(--secondary-text-color); + --pele-line: var(--primary-text-color); + --pele-surface: var(--popup-background-color); + --pele-surface-alt: var(--secondary-color); + --pele-border: var(--border-color); + --pele-accent: var(--link-text-color); + --pele-error: var(--error-text-color); } .mermaid svg { @@ -92,22 +101,6 @@ height: auto; } - .mermaid svg text, - .mermaid svg tspan, - .mermaid .label, - .mermaid .nodeLabel, - .mermaid .edgeLabel, - .mermaid .cluster-label, - .mermaid .flowchart-label { - fill: var(--primary-text-color) !important; - color: var(--primary-text-color) !important; - } - - .mermaid svg foreignObject, - .mermaid svg foreignObject * { - color: var(--primary-text-color) !important; - } - @supports not (gap: 1px) { section.eqno > * + * { margin-left: 12px; } } From 98446ef10ea8f2866416d18e753ccc8bfccd8b44 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 25 Oct 2026 05:21:44 +0000 Subject: [PATCH 158/195] feat(editor): add experimental canvas renderer (#2988) * build: link @acode/canvas-view from a local checkout Resolve canvas-view's imports (and their types) from Acode's own node_modules, so CodeMirror's state and view stay single instances. * feat(settings): add editor renderer setting Renderer: DOM (default) or Canvas (experimental), applied on reload. * feat(editor): add experimental canvas renderer With editorRenderer set to canvas, editors are @acode/canvas-view CanvasViews. Settings that the DOM editor applies through extensions (line numbers, folding, guides, rainbow brackets, whitespace, wrapping, scroll past end, RTL) become canvas options, kept in sync on changes. Themes map to a CanvasThemeSpec (config colors + the theme's HighlightStyle). The selection menu is driven by the view's touch selection hooks, reusing the existing menu UI. * perf(editor): leave out CodeMirror's fold gutter with the canvas renderer The canvas renderer draws its own fold markers, but foldGutter() was still in the state, and its markers plugin rebuilt (unused) markers for the viewport on every update and tab switch. Canvas views now get only the folding state (codeFolding) with indentation folding. * fix(editor): open the color picker on canvas views isViewEditable read contentDOM's contenteditable and aria-readonly attributes. A canvas view's contentDOM is its hidden input element, which has neither, so taps on color chips (regex and LSP document colors) were swallowed as if the editor were read-only. Read the state's editable and readOnly facets instead, which is what the DOM editor's attributes reflect. Co-Authored-By: Claude Opus 5.5 * feat(editor): leave read-only handling to canvas views Acode's read-only setup works around the DOM editor on mobile: it makes the content non-editable, blurs on every focus so no keyboard opens, and shows CodeMirror's cursor layer with CSS. A canvas view handles read-only documents itself: it ignores typing, cut, paste and drops, takes focus with inputmode="none" (so its cursor blinks and hardware shortcuts work, without a keyboard), and drops focus when it becomes read-only. For canvas views the extension is now only EditorState.readOnly plus the filter for Acode's own editing commands, and blurEditorIfReadOnly / focusEditorIfEditable leave them focused. Co-Authored-By: Claude Opus 5.5 * feat(editor): selection matches and active indent guide on canvas With the canvas renderer: - highlightSelectionMatches is on (it's off by default for the DOM editor), drawn with the theme's selectionMatch color, or its selection color, as the themes' CSS does; - indent guides highlight the block around the cursor (one rect per frame on the canvas); - the base extensions leave out drawSelection, dropCursor, highlightActiveLine (and its gutter) and highlightSpecialChars, which the canvas draws itself. The canvas view only skipped their plugins; the active line gutter still rebuilt its markers on every selection change. Co-Authored-By: Claude Opus 5.5 * feat(editor): show lint underlines on canvas views on touch devices On touch devices the LSP linter drops every in-text mark (markerFilter), so only the lint gutter showed an error. Canvas views draw the wavy underlines and lint points natively, without the DOM editor's layout cost, so they keep them; hover tooltips stay filtered on touch. Co-Authored-By: Claude Opus 5.5 * perf(editor): draw color chips on canvas views without DOM ColorChipWidget gets toCanvas(): the same box toDOM styles (0.9em, 2px margins, rounded, a faint border), in cells of the view's font. Canvas views then make no element per chip; they call toDOM only when a chip is tapped, so the color picker still opens. Co-Authored-By: Claude Opus 5.5 * fix(editor): apply the line height setting to the editor's lines The font theme set `lineHeight` on the editor element, but CodeMirror's base theme sets `line-height: 1.4` on `.cm-scroller`, so the setting never reached the lines or gutters: the DOM editor was always 1.4 while canvas views used the setting, and the two renderers didn't match. Set it on `.cm-scroller`, so both renderers use it (canvas-view measures it like CodeMirror, to the DOM's exact value). The default becomes 1.4, what the editor always showed, and stored values of the old default (2), which nobody ever saw, are migrated once so editors don't change size. * feat(editor): canvas backend and sticky scroll settings Two settings for the canvas renderer, next to "Renderer": - "Canvas backend": Auto (WebGL2), WebGL2 or WebGPU (falls back to WebGL2 where unavailable). Views are created with it, so a change asks to reload when the canvas renderer is on. - "Sticky scroll": keeps the header lines of the scopes around the top line pinned while scrolling. Applies live to canvas views. * build: use @acode.app/canvas-view from npm canvas-view is now published as @acode.app/canvas-view, so depend on it instead of a local `bun link` checkout and drop the rspack and tsconfig workarounds that kept the linked copy on Acode's CodeMirror packages. Raise @codemirror/view, state, language and @lezer/common to the versions canvas-view requires, in dependencies and overrides, so a single copy of each is installed. The newer view flushes on every selectionchange, and happy-dom fires that event synchronously from Selection methods, which re-entered EditorView.update in the read-only cursor test. Queue it there like a browser does. Co-Authored-By: Claude Opus 5.5 * fix(editor): keep edits and DOM extensions across renderer changes - Flush pending cache writes and save the session before the reload that applies a renderer or canvas backend change, as the pause handler does, so recent edits aren't lost. - Include the renderer in the editor state signature, and give the DOM fallback pane a fresh empty state, so states built for canvas views (without fold controls and the active line) aren't reused by DOM ones. - Declare the canvas backend and sticky scroll strings in LangStrings. Co-Authored-By: Claude Opus 5.5 * feat(settings): more canvas renderer settings, shown only with canvas - Cursor blink rate, sticky scroll max lines and gutter marker layout (shared column, column per gutter, over line numbers), mapped to the matching canvas-view options and applied live. - Bring back the scroll speed setting, which canvas views use. - Canvas-only settings (backend, sticky scroll, its max lines, gutter markers, cursor blink rate, scroll speed) are listed only while the canvas renderer is selected, and follow renderer changes. Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- bun.lock | 23 +- package-lock.json | 46 ++- package.json | 13 +- src/cm/baseExtensions.ts | 35 ++- src/cm/canvasOptions.ts | 351 +++++++++++++++++++++++ src/cm/colorChip.ts | 28 +- src/cm/createEditorView.ts | 63 ++++ src/cm/editorReadOnly.ts | 34 ++- src/cm/lsp/diagnostics.ts | 13 +- src/cm/touchSelectionMenu.js | 98 ++++++- src/lang/ar-ye.json | 21 +- src/lang/az-az.json | 21 +- src/lang/be-by.json | 21 +- src/lang/bn-bd.json | 21 +- src/lang/cs-cz.json | 21 +- src/lang/de-de.json | 21 +- src/lang/en-us.json | 21 +- src/lang/es-sv.json | 21 +- src/lang/fr-fr.json | 21 +- src/lang/he-il.json | 21 +- src/lang/hi-in.json | 21 +- src/lang/hu-hu.json | 21 +- src/lang/id-id.json | 21 +- src/lang/index.d.ts | 19 ++ src/lang/ir-fa.json | 21 +- src/lang/it-it.json | 21 +- src/lang/ja-jp.json | 21 +- src/lang/ko-kr.json | 21 +- src/lang/ln-ln.json | 21 +- src/lang/ml-in.json | 21 +- src/lang/mm-unicode.json | 21 +- src/lang/mm-zawgyi.json | 21 +- src/lang/pl-pl.json | 21 +- src/lang/pt-br.json | 21 +- src/lang/pu-in.json | 21 +- src/lang/ru-ru.json | 21 +- src/lang/tl-ph.json | 21 +- src/lang/tr-tr.json | 21 +- src/lang/uk-ua.json | 21 +- src/lang/uz-uz.json | 21 +- src/lang/vi-vn.json | 21 +- src/lang/zh-cn.json | 21 +- src/lang/zh-hant.json | 21 +- src/lang/zh-tw.json | 21 +- src/lib/editorManager.js | 226 ++++++++++++--- src/lib/settings.js | 18 +- src/settings/editorSettings.js | 149 +++++++++- src/settings/scrollSettings.js | 24 +- tests/unit/canvasOptions.test.ts | 165 +++++++++++ tests/unit/colorChip.test.ts | 46 +++ tests/unit/editorReadOnly.test.ts | 39 ++- tests/unit/pluginFileRestoration.test.js | 1 + 52 files changed, 1955 insertions(+), 129 deletions(-) create mode 100644 src/cm/canvasOptions.ts create mode 100644 src/cm/createEditorView.ts create mode 100644 tests/unit/canvasOptions.test.ts create mode 100644 tests/unit/colorChip.test.ts diff --git a/bun.lock b/bun.lock index 723e01f48b..9eca137c8a 100644 --- a/bun.lock +++ b/bun.lock @@ -5,6 +5,7 @@ "": { "name": "com.foxdebug.acode", "dependencies": { + "@acode.app/canvas-view": "^0.0.1", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", @@ -28,15 +29,15 @@ "@codemirror/lang-wast": "^6.0.2", "@codemirror/lang-xml": "^6.1.0", "@codemirror/lang-yaml": "^6.1.3", - "@codemirror/language": "^6.12.4", + "@codemirror/language": "^6.13.1", "@codemirror/language-data": "^6.5.2", "@codemirror/legacy-modes": "^6.5.3", "@codemirror/lint": "^6.9.7", "@codemirror/lsp-client": "file:codemirror-lsp-client", "@codemirror/search": "^6.7.1", - "@codemirror/state": "^6.7.1", + "@codemirror/state": "^6.7.6", "@codemirror/theme-one-dark": "^6.1.3", - "@codemirror/view": "^6.43.9", + "@codemirror/view": "^6.43.14", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", "@lezer/common": "^1.5.4", @@ -149,16 +150,18 @@ "overrides": { "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", - "@codemirror/language": "^6.12.4", + "@codemirror/language": "^6.13.1", "@codemirror/lint": "^6.9.7", "@codemirror/search": "^6.7.1", - "@codemirror/state": "^6.7.1", - "@codemirror/view": "^6.43.9", + "@codemirror/state": "^6.7.6", + "@codemirror/view": "^6.43.14", "@lezer/common": "^1.5.4", "@lezer/lr": "^1.4.10", "tar": "^7.5.22", }, "packages": { + "@acode.app/canvas-view": ["@acode.app/canvas-view@0.0.1", "", { "dependencies": { "@codemirror/language": "^6.13.1", "@codemirror/state": "^6.7.6", "@codemirror/view": "^6.43.14", "@lezer/common": "^1.5.4", "@lezer/highlight": "^1.2.5", "style-mod": "^4.1.2" } }, "sha512-brS4L24KCMJUOGXgzwSl2AVv2kpStleD85fLtEXaxPpn0jroRrXmyid2aSqZv4bitralRVu8huzhosDSl9HSww=="], + "@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], "@babel/compat-data": ["@babel/compat-data@8.0.0", "", {}, "sha512-DOjnob/cXOUgDOozCDeq/aK2p5y8dUIVdf6tNhEV1HQRd6I8aQ4f4fbtHRVEvb6lP3BGomrKHiS8ICAASSVQSw=="], @@ -411,7 +414,7 @@ "@codemirror/lang-yaml": ["@codemirror/lang-yaml@6.1.3", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.2.0", "@lezer/lr": "^1.0.0", "@lezer/yaml": "^1.0.0" } }, "sha512-AZ8DJBuXGVHybpBQhmZtgew5//4hv3tdkXnr3vDmOUMJRuB6vn/uuwtmTOTlqEaQFg3hQSVeA90NmvIQyUV6FQ=="], - "@codemirror/language": ["@codemirror/language@6.12.4", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.23.0", "@lezer/common": "^1.5.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", "style-mod": "^4.0.0" } }, "sha512-1q4PaT+o6PbgpkJt4Q8Fv5XJxTy4FUZ4MWETtyiDw3J0Pyr9E2vqcKL+k9wcvjNTIsauxvE7OfmWj3FRPHQ76A=="], + "@codemirror/language": ["@codemirror/language@6.13.1", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/streamparser": "^6.0.0", "@codemirror/view": "^6.23.0", "@lezer/common": "^1.5.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", "style-mod": "^4.0.0" } }, "sha512-zfvU2r3TyylQLMj/te+5CnQ0rSqZi8B1oTCBbQkagcLW4Xc6imab6qN+pEJhsuNOLaJqiRyBXp9UhWA1DhVvDw=="], "@codemirror/language-data": ["@codemirror/language-data@6.5.2", "", { "dependencies": { "@codemirror/lang-angular": "^0.1.0", "@codemirror/lang-cpp": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-go": "^6.0.0", "@codemirror/lang-html": "^6.0.0", "@codemirror/lang-java": "^6.0.0", "@codemirror/lang-javascript": "^6.0.0", "@codemirror/lang-jinja": "^6.0.0", "@codemirror/lang-json": "^6.0.0", "@codemirror/lang-less": "^6.0.0", "@codemirror/lang-liquid": "^6.0.0", "@codemirror/lang-markdown": "^6.0.0", "@codemirror/lang-php": "^6.0.0", "@codemirror/lang-python": "^6.0.0", "@codemirror/lang-rust": "^6.0.0", "@codemirror/lang-sass": "^6.0.0", "@codemirror/lang-sql": "^6.0.0", "@codemirror/lang-vue": "^0.1.1", "@codemirror/lang-wast": "^6.0.0", "@codemirror/lang-xml": "^6.0.0", "@codemirror/lang-yaml": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/legacy-modes": "^6.4.0" } }, "sha512-CPkWBKrNS8stYbEU5kwBwTf3JB1kghlbh4FSAwzGW2TEscdeHHH4FGysREW86Mqnj3Qn09s0/6Ea/TutmoTobg=="], @@ -423,11 +426,13 @@ "@codemirror/search": ["@codemirror/search@6.7.1", "", { "dependencies": { "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.37.0", "crelt": "^1.0.5" } }, "sha512-uMe5UO6PamJtSHrXhhHOzSX3ReWtiJrva6GnPMwSOrZtiExb5X5eExhr2OUZQVvdxPsKpY3Ro2mFbQadpPWmHA=="], - "@codemirror/state": ["@codemirror/state@6.7.1", "", { "dependencies": { "@marijn/find-cluster-break": "^1.0.0" } }, "sha512-9QzNDgE4EYDnAHfrTlR2lwiPciiOymLtwKK+8yHQzCc7GXhAP9xdEbEJFy2IWB1j9UGUl9BsgMmTo/ImA02T7A=="], + "@codemirror/state": ["@codemirror/state@6.7.6", "", { "dependencies": { "@marijn/find-cluster-break": "^1.0.0" } }, "sha512-kAz+AncRtKuIknedxT1bq4XwXv4UowhbkHU1myPrtVb/jZtImWuV5BXzv5vK6i3kYACsdiZiQKFQQ5Mq7elW8w=="], + + "@codemirror/streamparser": ["@codemirror/streamparser@6.0.0", "", {}, "sha512-JTFPF6xrfjt0mnfGPgzcLiMwYmvIyNaoizp8BYzv8FE8KrT6GBGDZ190rtt+O7Wke3gG/MFHyiY9YGNeimof4w=="], "@codemirror/theme-one-dark": ["@codemirror/theme-one-dark@6.1.3", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0", "@lezer/highlight": "^1.0.0" } }, "sha512-NzBdIvEJmx6fjeremiGp3t/okrLPYT0d9orIc7AFun8oZcRk58aejkqhv6spnz4MLAevrKNPMQYXEWMg4s+sKA=="], - "@codemirror/view": ["@codemirror/view@6.43.9", "", { "dependencies": { "@codemirror/state": "^6.7.0", "crelt": "^1.0.6", "style-mod": "^4.1.0", "w3c-keyname": "^2.2.4" } }, "sha512-sTuUzTpPMFebRhg6dawChoKKgndIwfjmJgKVxBefPElcU2NwQ6AFroupk0SFqEerQyZOGRfDNnSN8Dw/lMAsXw=="], + "@codemirror/view": ["@codemirror/view@6.43.15", "", { "dependencies": { "@codemirror/state": "^6.7.0", "crelt": "^1.0.6", "style-mod": "^4.1.0", "w3c-keyname": "^2.2.4" } }, "sha512-HHsfpqFeHyXLs983pSRe38Xajs0vFWZQ2BuX0m7Ki8w3jZ5iD8cuR3lBz2/5/X53Dhf32SBHKh6rtSTB6tKeGw=="], "@deadlyjack/ajax": ["@deadlyjack/ajax@1.2.6", "", {}, "sha512-VwZU8YUflO2/V/dl3dluu+3jg8Ghz/W5fwxD5Z21OZXKeV73d+vStKVBe4wi+Av2KbTR35K7Z+5Q3iIpjB41MA=="], diff --git a/package-lock.json b/package-lock.json index e555bd51b5..b2c1a39e3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "1.13.5", "license": "MIT", "dependencies": { + "@acode.app/canvas-view": "^0.0.1", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", @@ -32,15 +33,15 @@ "@codemirror/lang-wast": "^6.0.2", "@codemirror/lang-xml": "^6.1.0", "@codemirror/lang-yaml": "^6.1.3", - "@codemirror/language": "^6.12.4", + "@codemirror/language": "^6.13.1", "@codemirror/language-data": "^6.5.2", "@codemirror/legacy-modes": "^6.5.3", "@codemirror/lint": "^6.9.7", "@codemirror/lsp-client": "file:codemirror-lsp-client", "@codemirror/search": "^6.7.1", - "@codemirror/state": "^6.7.1", + "@codemirror/state": "^6.7.6", "@codemirror/theme-one-dark": "^6.1.3", - "@codemirror/view": "^6.43.9", + "@codemirror/view": "^6.43.14", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", "@lezer/common": "^1.5.4", @@ -170,6 +171,20 @@ "typescript-language-server": "^4.3.4" } }, + "node_modules/@acode.app/canvas-view": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@acode.app/canvas-view/-/canvas-view-0.0.1.tgz", + "integrity": "sha512-brS4L24KCMJUOGXgzwSl2AVv2kpStleD85fLtEXaxPpn0jroRrXmyid2aSqZv4bitralRVu8huzhosDSl9HSww==", + "license": "MIT", + "dependencies": { + "@codemirror/language": "^6.13.1", + "@codemirror/state": "^6.7.6", + "@codemirror/view": "^6.43.14", + "@lezer/common": "^1.5.4", + "@lezer/highlight": "^1.2.5", + "style-mod": "^4.1.2" + } + }, "node_modules/@babel/code-frame": { "version": "7.29.7", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", @@ -3946,12 +3961,13 @@ } }, "node_modules/@codemirror/language": { - "version": "6.12.4", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.12.4.tgz", - "integrity": "sha512-1q4PaT+o6PbgpkJt4Q8Fv5XJxTy4FUZ4MWETtyiDw3J0Pyr9E2vqcKL+k9wcvjNTIsauxvE7OfmWj3FRPHQ76A==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.13.1.tgz", + "integrity": "sha512-zfvU2r3TyylQLMj/te+5CnQ0rSqZi8B1oTCBbQkagcLW4Xc6imab6qN+pEJhsuNOLaJqiRyBXp9UhWA1DhVvDw==", "license": "MIT", "dependencies": { "@codemirror/state": "^6.0.0", + "@codemirror/streamparser": "^6.0.0", "@codemirror/view": "^6.23.0", "@lezer/common": "^1.5.0", "@lezer/highlight": "^1.0.0", @@ -4026,14 +4042,20 @@ } }, "node_modules/@codemirror/state": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.7.1.tgz", - "integrity": "sha512-9QzNDgE4EYDnAHfrTlR2lwiPciiOymLtwKK+8yHQzCc7GXhAP9xdEbEJFy2IWB1j9UGUl9BsgMmTo/ImA02T7A==", + "version": "6.7.6", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.7.6.tgz", + "integrity": "sha512-kAz+AncRtKuIknedxT1bq4XwXv4UowhbkHU1myPrtVb/jZtImWuV5BXzv5vK6i3kYACsdiZiQKFQQ5Mq7elW8w==", "license": "MIT", "dependencies": { "@marijn/find-cluster-break": "^1.0.0" } }, + "node_modules/@codemirror/streamparser": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@codemirror/streamparser/-/streamparser-6.0.0.tgz", + "integrity": "sha512-JTFPF6xrfjt0mnfGPgzcLiMwYmvIyNaoizp8BYzv8FE8KrT6GBGDZ190rtt+O7Wke3gG/MFHyiY9YGNeimof4w==", + "license": "MIT" + }, "node_modules/@codemirror/theme-one-dark": { "version": "6.1.3", "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.3.tgz", @@ -4047,9 +4069,9 @@ } }, "node_modules/@codemirror/view": { - "version": "6.43.9", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.43.9.tgz", - "integrity": "sha512-sTuUzTpPMFebRhg6dawChoKKgndIwfjmJgKVxBefPElcU2NwQ6AFroupk0SFqEerQyZOGRfDNnSN8Dw/lMAsXw==", + "version": "6.43.15", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.43.15.tgz", + "integrity": "sha512-HHsfpqFeHyXLs983pSRe38Xajs0vFWZQ2BuX0m7Ki8w3jZ5iD8cuR3lBz2/5/X53Dhf32SBHKh6rtSTB6tKeGw==", "license": "MIT", "dependencies": { "@codemirror/state": "^6.7.0", diff --git a/package.json b/package.json index ba2e7d80eb..1105b1ea2c 100644 --- a/package.json +++ b/package.json @@ -125,6 +125,7 @@ "ws": "^8.21.3" }, "dependencies": { + "@acode.app/canvas-view": "^0.0.1", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", @@ -148,15 +149,15 @@ "@codemirror/lang-wast": "^6.0.2", "@codemirror/lang-xml": "^6.1.0", "@codemirror/lang-yaml": "^6.1.3", - "@codemirror/language": "^6.12.4", + "@codemirror/language": "^6.13.1", "@codemirror/language-data": "^6.5.2", "@codemirror/legacy-modes": "^6.5.3", "@codemirror/lint": "^6.9.7", "@codemirror/lsp-client": "file:codemirror-lsp-client", "@codemirror/search": "^6.7.1", - "@codemirror/state": "^6.7.1", + "@codemirror/state": "^6.7.6", "@codemirror/theme-one-dark": "^6.1.3", - "@codemirror/view": "^6.43.9", + "@codemirror/view": "^6.43.14", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", "@lezer/common": "^1.5.4", @@ -207,11 +208,11 @@ "overrides": { "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", - "@codemirror/language": "^6.12.4", + "@codemirror/language": "^6.13.1", "@codemirror/lint": "^6.9.7", "@codemirror/search": "^6.7.1", - "@codemirror/state": "^6.7.1", - "@codemirror/view": "^6.43.9", + "@codemirror/state": "^6.7.6", + "@codemirror/view": "^6.43.14", "@lezer/common": "^1.5.4", "@lezer/lr": "^1.4.10", "tar": "^7.5.22" diff --git a/src/cm/baseExtensions.ts b/src/cm/baseExtensions.ts index d55a6c7bfd..c429b2063c 100644 --- a/src/cm/baseExtensions.ts +++ b/src/cm/baseExtensions.ts @@ -7,6 +7,7 @@ import { import { history } from "@codemirror/commands"; import { bracketMatching, + codeFolding as codeFoldingState, defaultHighlightStyle, foldGutter, indentOnInput, @@ -31,6 +32,17 @@ import indentationFolding from "./indentationFolding"; export interface BaseExtensionOptions { autoIndent?: boolean; codeFolding?: boolean; + /** + * Show CodeMirror's fold gutter with code folding. The canvas renderer + * draws its own fold markers, so it only needs the folding state. + */ + foldGutter?: boolean; + /** + * The canvas renderer draws the selection, cursors, drop cursor, active + * line (and its gutter) and special characters itself, so those + * extensions are left out. + */ + canvas?: boolean; autoCloseBrackets?: boolean; bracketMatching?: boolean; highlightActiveLine?: boolean; @@ -46,17 +58,26 @@ export default function createBaseExtensions( const { autoIndent = true, codeFolding = true, + foldGutter: showFoldGutter = true, + canvas = false, autoCloseBrackets = true, bracketMatching: enableBracketMatching = true, highlightActiveLine: enableHighlightActiveLine = true, highlightSelectionMatches: enableHighlightSelectionMatches = true, } = options; - const extensions: Extension[] = [highlightSpecialChars(), history()]; + const extensions: Extension[] = [history()]; + if (!canvas) extensions.push(highlightSpecialChars()); - if (enableHighlightActiveLine) extensions.push(highlightActiveLineGutter()); - if (codeFolding) extensions.push(foldGutter(), indentationFolding); - extensions.push(drawSelection()); - extensions.push(dropCursor()); + if (enableHighlightActiveLine && !canvas) { + extensions.push(highlightActiveLineGutter()); + } + if (codeFolding) { + extensions.push( + showFoldGutter ? foldGutter() : codeFoldingState(), + indentationFolding, + ); + } + if (!canvas) extensions.push(drawSelection(), dropCursor()); extensions.push(EditorState.allowMultipleSelections.of(true)); if (autoIndent) extensions.push(indentOnInput()); extensions.push( @@ -66,7 +87,9 @@ export default function createBaseExtensions( if (autoCloseBrackets) extensions.push(closeBrackets()); extensions.push(rectangularSelection()); extensions.push(crosshairCursor()); - if (enableHighlightActiveLine) extensions.push(highlightActiveLine()); + if (enableHighlightActiveLine && !canvas) { + extensions.push(highlightActiveLine()); + } if (enableHighlightSelectionMatches) { extensions.push(highlightSelectionMatches()); } diff --git a/src/cm/canvasOptions.ts b/src/cm/canvasOptions.ts new file mode 100644 index 0000000000..fdaaac54d2 --- /dev/null +++ b/src/cm/canvasOptions.ts @@ -0,0 +1,351 @@ +import { + type CanvasThemeSpec, + CanvasView, + type CanvasViewConfig, + type FontSpec, + type TokenStyleSpec, +} from "@acode.app/canvas-view"; +import { HighlightStyle } from "@codemirror/language"; +import { oneDark } from "@codemirror/theme-one-dark"; +import { tags as t } from "@lezer/highlight"; +import { getRainbowBracketColors } from "cm/rainbowBrackets"; +import { getThemeById, getThemeConfig, getThemeExtensions } from "cm/themes"; + +/** + * Maps Acode's editor settings and themes to @acode.app/canvas-view options. + * + * The canvas renderer draws line numbers, fold markers, the active line, + * indent guides, rainbow brackets, whitespace, wrapping and scroll room + * itself, so editorManager leaves those CodeMirror extensions out of the + * state and passes the options built here instead. + */ + +export type CanvasDisplayOptions = Parameters[0]; + +type Settings = Record; + +interface ThemeConfig { + dark?: boolean; + background?: string; + foreground?: string; + selection?: string; + cursor?: string; + activeLine?: string; + lineNumber?: string; + lineNumberActive?: string; + matchingBracket?: string; + selectionMatch?: string; + [color: string]: unknown; +} + +const SCROLL_PAST_END: Record = { + none: 0, + small: 0.25, + medium: 0.5, + full: 1, +}; + +const SCROLL_SPEED: Record = { + SLOW: "slow", + NORMAL: "normal", + FAST: "fast", + FAST_X2: "fastX2", +}; + +const GUTTER_MARKERS = ["shared", "columns", "overlay"] as const; + +/** A finite number within [min, max], else the fallback. */ +function clampSetting( + value: unknown, + min: number, + max: number, + fallback: number, +): number { + const number = Number(value); + if (value == null || value === "" || !Number.isFinite(number)) { + return fallback; + } + return Math.min(Math.max(Math.round(number), min), max); +} + +/** + * Find the HighlightStyle a theme passes to `syntaxHighlighting()`, by + * walking its extension tree (arrays, precedence wrappers, compartments, + * `facet.of(value)` providers). Returns null for themes that compute their + * highlighter (`themeType`) or don't have one. + */ +export function findHighlightStyle( + extension: unknown, + seen = new Set(), +): HighlightStyle | null { + if (!extension || typeof extension !== "object" || seen.has(extension)) { + return null; + } + seen.add(extension); + if (extension instanceof HighlightStyle) return extension; + if (Array.isArray(extension)) { + for (const item of extension) { + const found = findHighlightStyle(item, seen); + if (found) return found; + } + return null; + } + const node = extension as { + value?: unknown; + inner?: unknown; + extension?: unknown; + }; + return ( + findHighlightStyle(node.value, seen) || + findHighlightStyle(node.inner, seen) || + findHighlightStyle(node.extension, seen) + ); +} + +/** Token colors from a theme config, for themes without a HighlightStyle. */ +function highlightFromConfig(config: ThemeConfig): TokenStyleSpec[] { + const color = (key: string) => + typeof config[key] === "string" ? (config[key] as string) : undefined; + const specs: TokenStyleSpec[] = [ + { tag: t.variableName, color: color("variable") }, + { tag: [t.keyword, t.modifier], color: color("keyword") }, + { tag: [t.string, t.special(t.string)], color: color("string") }, + { tag: [t.number, t.bool, t.null], color: color("number") }, + { tag: t.comment, color: color("comment"), fontStyle: "italic" }, + { + tag: [t.function(t.variableName), t.function(t.propertyName)], + color: color("function"), + }, + { tag: t.typeName, color: color("type") }, + { tag: t.className, color: color("class") ?? color("type") }, + { + tag: [t.constant(t.variableName), t.standard(t.variableName)], + color: color("constant"), + }, + { tag: t.operator, color: color("operator") }, + { tag: t.invalid, color: color("invalid") }, + ]; + return specs.filter((spec) => spec.color); +} + +/** + * Decoration colors the canvas draws natively, as the themes' CSS has them: + * selection matches use the theme's `selectionMatch`, else its selection. + */ +function themeClasses(config: ThemeConfig): CanvasThemeSpec["classes"] { + const classes: NonNullable = {}; + if (config.matchingBracket) { + classes["cm-matchingBracket"] = { background: config.matchingBracket }; + } + const selectionMatch = config.selectionMatch || config.selection; + if (selectionMatch) { + classes["cm-selectionMatch"] = { background: selectionMatch }; + } + return Object.keys(classes).length ? classes : undefined; +} + +/** + * The canvas theme for an Acode editor theme: colors from its config, syntax + * colors from the HighlightStyle in its extensions. The theme's + * EditorView.theme stays in the state, where it styles the DOM UI (tooltips, + * panels, autocomplete). + */ +export function getCanvasTheme(themeId: string): CanvasThemeSpec { + // Resolve ids like getThemeExtensions does ("one-dark" -> "one_dark"). + const theme = + getThemeById(themeId) || getThemeById(String(themeId).replace(/-/g, "_")); + const config = (theme?.config || + getThemeConfig(themeId) || + {}) as ThemeConfig; + const highlight = + findHighlightStyle(getThemeExtensions(themeId, [oneDark])) || + highlightFromConfig(config); + return { + dark: config.dark !== false, + background: config.background || "#282c34", + foreground: config.foreground || "#abb2bf", + selection: config.selection, + cursor: config.cursor, + activeLine: config.activeLine, + // Like the DOM themes, which give the active gutter line no background. + activeLineGutter: config.background, + gutterForeground: config.lineNumber, + gutterActiveForeground: config.lineNumberActive, + // Acode draws its own (draggable) scrollbars over the editor. + scrollbar: "transparent", + highlight, + classes: themeClasses(config), + }; +} + +/** A CSS font size ("12px", "1rem", "10pt"...) in CSS pixels. */ +export function fontSizeToPx(value: unknown): number { + const match = /^([\d.]+)\s*([a-z]*)$/i.exec(String(value ?? "").trim()); + if (!match) return 12; + const size = Number.parseFloat(match[1]); + if (!Number.isFinite(size) || size <= 0) return 12; + const unit = match[2].toLowerCase(); + const rootSize = () => + Number.parseFloat(getComputedStyle(document.documentElement).fontSize) || + 16; + switch (unit) { + case "pt": + return (size * 4) / 3; + case "pc": + return size * 16; + case "in": + return size * 96; + case "mm": + return (size * 96) / 25.4; + case "em": + case "rem": + return size * rootSize(); + default: + return size; + } +} + +/** Same font size and line height as `makeFontTheme` gives the DOM editor. */ +export function getCanvasFont(settings: Settings, family: string): FontSpec { + const lineHeight = Number(settings.lineHeight); + return { + family, + size: fontSizeToPx(settings.fontSize || "12px"), + lineHeight: + Number.isFinite(lineHeight) && lineHeight > 0 ? lineHeight : 1.4, + }; +} + +/** Display options from Acode's editor settings (the live ones). */ +export function getCanvasDisplayOptions( + settings: Settings, + { + themeId, + onLineNumberClick, + }: { + themeId: string; + onLineNumberClick?: CanvasViewConfig["onLineNumberClick"]; + }, +): CanvasDisplayOptions { + const { linenumbers = true, relativeLineNumbers = false } = settings; + const cursorWidth = Number(settings.cursorWidth); + const showSpaces = !!settings.showSpaces; + const rainbow = settings.rainbowBrackets ?? true; + return { + lineNumbers: linenumbers + ? relativeLineNumbers + ? "relative" + : true + : false, + onLineNumberClick, + foldMarkers: settings.fadeFoldWidgets ? "fade" : "always", + highlightActiveLine: settings.highlightActiveLine !== false, + cursorWidth: + Number.isFinite(cursorWidth) && cursorWidth > 0 + ? Math.min(cursorWidth, 10) + : 2, + // 0 keeps the cursor steady. + cursorBlinkRate: clampSetting(settings.cursorBlinkRate, 0, 10000, 1200), + gutterMarkers: GUTTER_MARKERS.includes(settings.canvasGutterMarkers) + ? settings.canvasGutterMarkers + : "shared", + lineWrapping: !!settings.textWrap, + wrapIndent: settings.wrappingIndent ?? "same", + textDirection: settings.rtlText ? "auto" : "ltr", + horizontalScrollPastEnd: Number(settings.leftMargin ?? 50) || 0, + scrollPastEnd: SCROLL_PAST_END[settings.scrollPastEnd || "medium"] ?? 1, + scrollSpeed: SCROLL_SPEED[settings.scrollSpeed] ?? "normal", + // Unlike the DOM editor's guides, the block around the cursor is + // highlighted: it's one rect per frame on the canvas. + indentGuides: settings.indentGuides ? { active: true } : false, + rainbowBrackets: rainbow + ? { colors: getRainbowBracketColors(getThemeConfig(themeId)) } + : false, + showWhitespace: showSpaces + ? { spaces: true, trailing: true, lineBreaks: true } + : false, + stickyScroll: settings.stickyScroll + ? { maxLines: clampSetting(settings.stickyScrollMaxLines, 1, 10, 5) } + : false, + }; +} + +const CANVAS_BACKENDS = ["auto", "webgl2", "webgpu"] as const; + +/** The GPU API for new canvas views ("webgpu" falls back to WebGL2). */ +export function getCanvasBackend( + settings: Settings, +): CanvasViewConfig["backend"] { + const value = settings.canvasBackend; + return CANVAS_BACKENDS.includes(value) ? value : "auto"; +} + +interface CanvasSyncState { + display?: string; + font?: string; + theme?: string; +} + +const synced = new WeakMap(); +// Acode replaces `setTheme` on editor instances with its own (taking a theme +// id), so the view's method is called through the prototype. +const setViewTheme = CanvasView.prototype.setTheme; + +/** + * Bring a canvas view in line with the settings. Each part is applied only + * when it changed: reconfiguring resets the drawn scene, and a new font or a + * dark/light switch rebuilds the glyph atlas. + */ +export function syncCanvasView( + view: CanvasView, + { + display, + font, + themeId, + }: { display?: CanvasDisplayOptions; font?: FontSpec; themeId?: string }, +): void { + let state = synced.get(view); + if (!state) { + state = {}; + synced.set(view, state); + } + if (display) { + // Functions (onLineNumberClick) are left out of the key: they read + // settings when called. + const key = JSON.stringify(display); + if (key !== state.display) { + state.display = key; + view.reconfigure(display); + } + } + if (font) { + const key = JSON.stringify(font); + if (key !== state.font) { + state.font = key; + view.setFont(font); + } + } + if (themeId != null) { + const key = String(themeId); + if (key !== state.theme) { + state.theme = key; + setViewTheme.call(view, getCanvasTheme(key)); + } + } +} + +/** Remember what a new view was created with, so syncing skips it. */ +export function markCanvasViewSynced( + view: CanvasView, + { + display, + font, + themeId, + }: { display: CanvasDisplayOptions; font: FontSpec; themeId: string }, +): void { + synced.set(view, { + display: JSON.stringify(display), + font: JSON.stringify(font), + theme: String(themeId), + }); +} diff --git a/src/cm/colorChip.ts b/src/cm/colorChip.ts index 5d51889185..c319709472 100644 --- a/src/cm/colorChip.ts +++ b/src/cm/colorChip.ts @@ -1,3 +1,4 @@ +import type { CanvasWidgetSpec } from "@acode.app/canvas-view"; import type { LSPClient } from "@codemirror/lsp-client"; import { LSPPlugin } from "@codemirror/lsp-client"; import type { Range } from "@codemirror/state"; @@ -73,6 +74,27 @@ export class ColorChipWidget extends WidgetType { return el; } + /** + * How a canvas view (@acode.app/canvas-view) draws the chip: the box + * `toDOM` styles, without making its element. The view only calls + * `toDOM` when the chip is tapped, so the color picker still opens. + */ + toCanvas(view: EditorView): CanvasWidgetSpec { + const cell = view.defaultCharacterWidth || 8; + const em = (view as unknown as { fontSizePx?: number }).fontSizePx || 14; + return { + text: "", + cells: Math.max(0.5, Math.round(((0.9 * em) / cell) * 4) / 4), + padLeft: 2 / cell, + padRight: 2 / cell, + style: { + background: this.payload.css, + border: "rgba(0,0,0,0.2)", + rounded: true, + }, + }; + } + ignoreEvent(): boolean { return false; } @@ -88,9 +110,9 @@ export function colorChipDecoration( } export function isViewEditable(view: EditorView): boolean { - const readOnly = view.contentDOM.ariaReadOnly === "true"; - const editable = view.contentDOM.contentEditable === "true"; - return !readOnly && editable; + // From the state, not contentDOM's attributes: a canvas view's + // contentDOM is its hidden input element, which has neither. + return view.state.facet(EditorView.editable) && !view.state.readOnly; } export function hasLspColorProvider(view: EditorView): boolean { diff --git a/src/cm/createEditorView.ts b/src/cm/createEditorView.ts new file mode 100644 index 0000000000..bf3a2b1e2d --- /dev/null +++ b/src/cm/createEditorView.ts @@ -0,0 +1,63 @@ +import { CanvasView, type CanvasViewConfig } from "@acode.app/canvas-view"; +import type { EditorState } from "@codemirror/state"; +import { EditorView } from "@codemirror/view"; + +/** + * The editor renderers Acode can create. "dom" is CodeMirror's own + * EditorView; "canvas" is @acode.app/canvas-view, which draws the text with + * the GPU on CodeMirror's state (opt-in, experimental). + */ +export type EditorRenderer = "dom" | "canvas"; + +export type CanvasEditorOptions = Omit; + +interface CreateEditorViewOptions { + state: EditorState; + parent: HTMLElement; + /** Options for a canvas view; without them a DOM EditorView is created. */ + canvas?: CanvasEditorOptions | null; +} + +let canvasSupport: boolean | null = null; + +/** + * Whether this WebView can run the canvas renderer (it needs WebGL2). The + * probe context is released right away: pages only get ~16 of them. + */ +export function isCanvasRendererSupported(): boolean { + if (canvasSupport != null) return canvasSupport; + try { + const gl = document.createElement("canvas").getContext("webgl2"); + canvasSupport = !!gl; + gl?.getExtension("WEBGL_lose_context")?.loseContext(); + } catch { + canvasSupport = false; + } + return canvasSupport; +} + +export function isCanvasView(view: unknown): view is CanvasView { + return view instanceof CanvasView; +} + +/** + * Create the editor view for a pane. Code after construction treats both + * kinds the same: CanvasView implements the EditorView members Acode and + * CodeMirror's commands use (`state`, `dispatch`, `setState`, `scrollDOM`, + * `contentDOM`, `coordsAtPos`, `requestMeasure`...). + */ +export default function createEditorView({ + state, + parent, + canvas = null, +}: CreateEditorViewOptions): EditorView { + if (canvas) { + // `view instanceof EditorView` holds for canvas views too. + return new CanvasView({ + ...canvas, + state, + parent, + }) as unknown as EditorView; + } + return new EditorView({ state, parent }); +} diff --git a/src/cm/editorReadOnly.ts b/src/cm/editorReadOnly.ts index 767b740c18..07f5e15700 100644 --- a/src/cm/editorReadOnly.ts +++ b/src/cm/editorReadOnly.ts @@ -7,6 +7,7 @@ import { Transaction, } from "@codemirror/state"; import { EditorView } from "@codemirror/view"; +import { isCanvasView } from "./createEditorView"; interface PointerTapSnapshot { pointerId: number; @@ -75,10 +76,29 @@ const readOnlyCursor = [ }), ]; +export interface EditorReadOnlyOptions { + /** The extension is for a canvas view (@acode.app/canvas-view). */ + canvas?: boolean; +} + /** * Keep CodeMirror's document and DOM editability in sync. */ -export function createEditorReadOnlyExtension(readOnly: boolean): Extension { +export function createEditorReadOnlyExtension( + readOnly: boolean, + { canvas = false }: EditorReadOnlyOptions = {}, +): Extension { + // A canvas view handles read-only files itself: it ignores typing, + // cut, paste and drops, takes focus without opening the keyboard (so + // its cursor shows and hardware-keyboard shortcuts work), and drops + // focus when the editor becomes read-only. It stays editable; only the + // filter for Acode's own editing commands applies. + if (canvas) { + return [ + EditorState.readOnly.of(readOnly), + ...(readOnly ? [readOnlyUserChangeFilter] : []), + ]; + } return [ EditorState.readOnly.of(readOnly), EditorView.editable.of(!readOnly), @@ -103,7 +123,8 @@ export function blurEditorIfReadOnly( view: EditorView, readOnly: boolean, ): void { - if (!readOnly) return; + // A read-only canvas view keeps focus without a keyboard. + if (!readOnly || isCanvasView(view)) return; const activeElement = document.activeElement; if ( activeElement instanceof HTMLElement && @@ -121,7 +142,9 @@ export function reconfigureEditorReadOnly( readOnly: boolean, ): void { view.dispatch({ - effects: compartment.reconfigure(createEditorReadOnlyExtension(readOnly)), + effects: compartment.reconfigure( + createEditorReadOnlyExtension(readOnly, { canvas: isCanvasView(view) }), + ), }); blurEditorIfReadOnly(view, readOnly); } @@ -129,7 +152,10 @@ export function reconfigureEditorReadOnly( /** Focus editable editors and actively settle read-only editors unfocused. */ export function focusEditorIfEditable(view: EditorView): boolean { if (view.state.readOnly) { - blurEditorIfReadOnly(view, true); + // A canvas view focuses without opening the keyboard. (Checked on + // `unknown`: the type guard would narrow an EditorView to never.) + if (isCanvasView(view as unknown)) view.focus(); + else blurEditorIfReadOnly(view, true); return false; } view.focus(); diff --git a/src/cm/lsp/diagnostics.ts b/src/cm/lsp/diagnostics.ts index 36b4e243d2..6768b27b2a 100644 --- a/src/cm/lsp/diagnostics.ts +++ b/src/cm/lsp/diagnostics.ts @@ -543,10 +543,15 @@ export function lspDiagnosticsClientExtension(): { }; } -export function lspDiagnosticsUiExtension(includeGutter = true): Extension[] { - const diagnosticsMarkerFilter = isCoarsePointerDevice() - ? () => [] - : undefined; +export function lspDiagnosticsUiExtension( + includeGutter = true, + { canvas = false }: { canvas?: boolean } = {}, +): Extension[] { + // Touch devices get no in-text marks in the DOM editor. Canvas views + // (@acode.app/canvas-view) draw them natively (wavy underlines, lint + // points) at no layout cost, so they keep them; tooltips stay off. + const diagnosticsMarkerFilter = + isCoarsePointerDevice() && !canvas ? () => [] : undefined; const diagnosticsTooltipFilter = isCoarsePointerDevice() ? () => [] : undefined; diff --git a/src/cm/touchSelectionMenu.js b/src/cm/touchSelectionMenu.js index b017acb1fb..7f45f0afa2 100644 --- a/src/cm/touchSelectionMenu.js +++ b/src/cm/touchSelectionMenu.js @@ -176,6 +176,17 @@ export default function createTouchSelectionMenu(view, options = {}) { return new TouchSelectionMenuController(view, options); } +/** + * The selection menu for a canvas editor (@acode.app/canvas-view). The view owns + * the touch selection gestures and handles, and asks for the menu through its + * `touchSelection.onMenu` hook, which goes to `handleCanvasMenu()`. Only the + * menu UI (items, layout, actions) is shared with the DOM editor's controller, + * so it listens to no pointer or selection events of its own. + */ +export function createCanvasSelectionMenu(view, options = {}) { + return new TouchSelectionMenuController(view, { ...options, canvas: true }); +} + class TouchSelectionMenuController { #view; #container; @@ -200,9 +211,11 @@ class TouchSelectionMenuController { #menuAnimation = null; #viewAnimations = []; #overflowExpanded = false; + #canvas = false; constructor(view, options = {}) { this.#view = view; + this.#canvas = !!options.canvas; this.#container = options.container || view.dom.closest(".editor-container") || view.dom; this.#getActiveFile = options.getActiveFile || (() => null); @@ -217,11 +230,19 @@ class TouchSelectionMenuController { #bindEvents() { const root = this.#view.dom; - root.addEventListener("contextmenu", this.#onContextMenu, true); - document.addEventListener("pointerdown", this.#onGlobalPointerDown, true); - document.addEventListener("pointermove", this.#onGlobalPointerMove, true); - document.addEventListener("pointerup", this.#onGlobalPointerUp, true); - document.addEventListener("pointercancel", this.#onGlobalPointerUp, true); + if (this.#canvas) { + document.addEventListener( + "pointerdown", + this.#onCanvasOutsidePointerDown, + true, + ); + } else { + root.addEventListener("contextmenu", this.#onContextMenu, true); + document.addEventListener("pointerdown", this.#onGlobalPointerDown, true); + document.addEventListener("pointermove", this.#onGlobalPointerMove, true); + document.addEventListener("pointerup", this.#onGlobalPointerUp, true); + document.addEventListener("pointercancel", this.#onGlobalPointerUp, true); + } this.#tooltipObserver = new MutationObserver((mutations) => { const relevant = mutations.some((m) => @@ -231,9 +252,13 @@ class TouchSelectionMenuController { (n.matches?.(".cm-tooltip") || n.querySelector?.(".cm-tooltip")), ), ); - if (!relevant || !this.#menuActive || !this.#shouldShowMenu()) { + if (!relevant || !this.#menuActive) return; + if (this.#canvas) { + // Keep the menu where the view asked for it, clear of the tooltip. + if (this.#menuAnchor) this.#positionMenu(this.#menuAnchor); return; } + if (!this.#shouldShowMenu()) return; this.#showMenuDeferred(); }); this.#tooltipObserver.observe(this.#view.dom, { @@ -244,6 +269,11 @@ class TouchSelectionMenuController { destroy() { const root = this.#view.dom; + document.removeEventListener( + "pointerdown", + this.#onCanvasOutsidePointerDown, + true, + ); root.removeEventListener("contextmenu", this.#onContextMenu, true); document.removeEventListener( "pointerdown", @@ -285,10 +315,15 @@ class TouchSelectionMenuController { cancelAnimationFrame(this.#stateSyncRaf); this.#stateSyncRaf = 0; this.#hideMenu(true); + if (this.#canvas) this.#view.touchSelection?.hideMenu(); } setSelection(value) { if (!this.#enabled) return; + if (this.#canvas) { + if (value) this.#view.touchSelection?.openMenu(); + return; + } if (value) { this.#dismissedSelection = null; this.#menuRequested = true; @@ -302,6 +337,11 @@ class TouchSelectionMenuController { setMenu(value) { this.#menuRequested = !!value; if (!this.#enabled) return; + if (this.#canvas) { + if (value) this.#view.touchSelection?.openMenu(); + else this.#view.touchSelection?.hideMenu(); + return; + } if (!value) { this.#clearMenuShowTimer(); this.#hideMenu(); @@ -316,7 +356,8 @@ class TouchSelectionMenuController { } onScrollStart() { - if (!this.#enabled) return; + // A canvas view hides and re-shows the menu around its own scrolls. + if (!this.#enabled || this.#canvas) return; if (this.#isScrolling) return; this.#clearMenuShowTimer(); this.#isScrolling = true; @@ -325,13 +366,15 @@ class TouchSelectionMenuController { } onScrollEnd() { - if (!this.#enabled || !this.#isScrolling) return; + if (!this.#enabled || this.#canvas || !this.#isScrolling) return; this.#isScrolling = false; if (this.#shouldShowMenu()) this.#scheduleMenuShow(MENU_SHOW_DELAY); } onStateChanged(meta = {}) { - if (!this.#enabled) return; + // A canvas view drops its menu itself on keyboard input and outside + // selection changes. + if (!this.#enabled || this.#canvas) return; if (meta.selectionChanged) this.#cancelReadOnlyTap(); if ( meta.selectionChanged && @@ -364,8 +407,44 @@ class TouchSelectionMenuController { this.#isScrolling = false; this.#clearMenuShowTimer(); this.#hideMenu(true); + if (this.#canvas) this.#view.touchSelection?.hideMenu(); + } + + /** + * A canvas view's `touchSelection.onMenu` event: show the menu over the + * selection (or caret) it reports, or hide it. Hides during scrolls and + * handle drags are transient; the view sends "show" again when they end. + */ + handleCanvasMenu(event) { + if (!this.#canvas) return; + if (event?.type !== "show") { + this.#hideMenu(); + return; + } + if (!this.#enabled) return; + const rect = event.selectionRect; + if (!rect) return; + this.#showMenu({ + x: rect.left + rect.width / 2, + top: rect.top, + bottom: rect.bottom, + hasSelection: event.trigger === "selection", + }); } + #onCanvasOutsidePointerDown = (event) => { + if (!this.#menuActive) return; + const target = event.target; + if ( + target instanceof Node && + (this.$menu.contains(target) || this.#view.dom.contains(target)) + ) { + return; + } + this.#hideMenu(); + this.#view.touchSelection?.hideMenu(); + }; + #onContextMenu = (event) => { if (!this.#enabled) return; if (this.#isIgnoredPointerTarget(event.target)) return; @@ -829,6 +908,7 @@ class TouchSelectionMenuController { this.#menuRequested = false; this.#dismissedSelection = this.#selectionSignature(); this.#hideMenu(); + if (this.#canvas) this.#view.touchSelection?.hideMenu(); focusEditorIfEditable(this.#view); } }; diff --git a/src/lang/ar-ye.json b/src/lang/ar-ye.json index 67b21b3d7c..4e79917b50 100644 --- a/src/lang/ar-ye.json +++ b/src/lang/ar-ye.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/az-az.json b/src/lang/az-az.json index 6285bb588a..b7ee2ee9b5 100644 --- a/src/lang/az-az.json +++ b/src/lang/az-az.json @@ -887,5 +887,24 @@ "plugin-review:error-max-length": "Rəy ən çox {max} simvoldan ibarət olmalıdır.", "plugin-review:error-downvote-comment": "Nəyin yaxşılaşdırıla biləcəyini tərtibatçıya bildir.", "plugin-review:error-empty": "Şərh əlavə et və ya «Bəyən» seçimini et.", - "plugin-review:unrated": "Qiymətləndirilməyib" + "plugin-review:unrated": "Qiymətləndirilməyib", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/be-by.json b/src/lang/be-by.json index 98601603c2..4740aac8e7 100644 --- a/src/lang/be-by.json +++ b/src/lang/be-by.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/bn-bd.json b/src/lang/bn-bd.json index c439ccecdc..081131579a 100644 --- a/src/lang/bn-bd.json +++ b/src/lang/bn-bd.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/cs-cz.json b/src/lang/cs-cz.json index f33b46844d..002613c29a 100644 --- a/src/lang/cs-cz.json +++ b/src/lang/cs-cz.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/de-de.json b/src/lang/de-de.json index c19f4e6f56..4b0ec32516 100644 --- a/src/lang/de-de.json +++ b/src/lang/de-de.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/en-us.json b/src/lang/en-us.json index 2869c6c2c2..569c59521f 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -887,5 +887,24 @@ "plugin-review:error-max-length": "Review must be {max} characters or less.", "plugin-review:error-downvote-comment": "Tell the developer what could be improved.", "plugin-review:error-empty": "Add a comment or choose thumbs up.", - "plugin-review:unrated": "Unrated" + "plugin-review:unrated": "Unrated", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/es-sv.json b/src/lang/es-sv.json index a65e2b8622..3ad4fd47ec 100644 --- a/src/lang/es-sv.json +++ b/src/lang/es-sv.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Elige si las líneas ajustadas comienzan desde el borde izquierdo, mantienen la indentación de la línea original o se indentan más. Cada nivel extra usa el tamaño del tabulador.", "icon pack": "Paquete de Íconos", "settings-info-icon-pack": "Elige el paquete de iconos usado para archivos y carpetas en el explorador y listas de archivos en la aplicación.", - "unavailable": "no disponible" + "unavailable": "no disponible", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/fr-fr.json b/src/lang/fr-fr.json index 5fc53c6f1d..5542fc28d4 100644 --- a/src/lang/fr-fr.json +++ b/src/lang/fr-fr.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/he-il.json b/src/lang/he-il.json index 358b04abc6..8743df929e 100644 --- a/src/lang/he-il.json +++ b/src/lang/he-il.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/hi-in.json b/src/lang/hi-in.json index 6aa97f71a1..8cf91745bf 100644 --- a/src/lang/hi-in.json +++ b/src/lang/hi-in.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index f2865688a2..d6cab64f8a 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Válassza ki, hogy a tördelt szövegek a képernyő bal szélétől kezdődjenek-e, az eredeti sor behúzását kövessék-e, vagy még jobban legyenek-e behúzva. Minden további behúzási szint a tabulátor méretét veszi alapul.", "icon pack": "Ikoncsomag", "settings-info-icon-pack": "Válassza ki a fájlokhoz és a mappákhoz használandó ikonokat a fájlkezelőben és az alkalmazás egészében megjelenő fájllistákban.", - "unavailable": "nem érhető el" + "unavailable": "nem érhető el", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/id-id.json b/src/lang/id-id.json index e21a315901..5e48e7d93e 100644 --- a/src/lang/id-id.json +++ b/src/lang/id-id.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Pilih apakah teks terbungkus dimulai dari tepi kiri, mengikuti indentasi baris asli, atau di-indentasi lebih jauh. Setiap level tambahan menggunakan ukuran tab Anda.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/index.d.ts b/src/lang/index.d.ts index 8434189934..64eed6cb1e 100644 --- a/src/lang/index.d.ts +++ b/src/lang/index.d.ts @@ -891,6 +891,25 @@ declare type LangStrings = { "plugin-review:error-downvote-comment": string; "plugin-review:error-empty": string; "plugin-review:unrated": string; + "editor renderer": string; + "editor renderer dom": string; + "editor renderer canvas": string; + "settings-info-editor-renderer": string; + "canvas backend": string; + "canvas backend auto": string; + "settings-info-canvas-backend": string; + "sticky scroll": string; + "settings-info-sticky-scroll": string; + "sticky scroll max lines": string; + "settings-info-sticky-scroll-max-lines": string; + "gutter markers": string; + "gutter markers shared": string; + "gutter markers columns": string; + "gutter markers overlay": string; + "settings-info-gutter-markers": string; + "cursor blink rate": string; + "settings-info-cursor-blink-rate": string; + "settings-info-scroll-speed": string; }; declare var strings: LangStrings; diff --git a/src/lang/ir-fa.json b/src/lang/ir-fa.json index 07f6c056bc..77126e16bb 100644 --- a/src/lang/ir-fa.json +++ b/src/lang/ir-fa.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/it-it.json b/src/lang/it-it.json index efe7c90e32..1a4912f01c 100644 --- a/src/lang/it-it.json +++ b/src/lang/it-it.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/ja-jp.json b/src/lang/ja-jp.json index 27fd7b6033..b35bd225a0 100644 --- a/src/lang/ja-jp.json +++ b/src/lang/ja-jp.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/ko-kr.json b/src/lang/ko-kr.json index f331beb331..5413bbd4b9 100644 --- a/src/lang/ko-kr.json +++ b/src/lang/ko-kr.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/ln-ln.json b/src/lang/ln-ln.json index 63d4e9ce7e..002ad75981 100644 --- a/src/lang/ln-ln.json +++ b/src/lang/ln-ln.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/ml-in.json b/src/lang/ml-in.json index 04db791635..7982934ab1 100644 --- a/src/lang/ml-in.json +++ b/src/lang/ml-in.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/mm-unicode.json b/src/lang/mm-unicode.json index 6411d5b9b1..5cf1d2e41f 100644 --- a/src/lang/mm-unicode.json +++ b/src/lang/mm-unicode.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/mm-zawgyi.json b/src/lang/mm-zawgyi.json index dd8f456bf2..b6ae8a405c 100644 --- a/src/lang/mm-zawgyi.json +++ b/src/lang/mm-zawgyi.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/pl-pl.json b/src/lang/pl-pl.json index d5b418a9e0..7bd6623217 100644 --- a/src/lang/pl-pl.json +++ b/src/lang/pl-pl.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/pt-br.json b/src/lang/pt-br.json index aa6de4b0e2..f8b6eba9d8 100644 --- a/src/lang/pt-br.json +++ b/src/lang/pt-br.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/pu-in.json b/src/lang/pu-in.json index 05b389b8c7..fa5d2b46bb 100644 --- a/src/lang/pu-in.json +++ b/src/lang/pu-in.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/ru-ru.json b/src/lang/ru-ru.json index 79e83dddba..79b0196c57 100644 --- a/src/lang/ru-ru.json +++ b/src/lang/ru-ru.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/tl-ph.json b/src/lang/tl-ph.json index b5a5424fca..0e95b2f41c 100644 --- a/src/lang/tl-ph.json +++ b/src/lang/tl-ph.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/tr-tr.json b/src/lang/tr-tr.json index 0d723b7ffd..2dd36d4069 100644 --- a/src/lang/tr-tr.json +++ b/src/lang/tr-tr.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/uk-ua.json b/src/lang/uk-ua.json index ab5da72106..fa2161245d 100644 --- a/src/lang/uk-ua.json +++ b/src/lang/uk-ua.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/uz-uz.json b/src/lang/uz-uz.json index 986916b7e8..c03876491f 100644 --- a/src/lang/uz-uz.json +++ b/src/lang/uz-uz.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/vi-vn.json b/src/lang/vi-vn.json index 64441eb461..fdc61e41af 100644 --- a/src/lang/vi-vn.json +++ b/src/lang/vi-vn.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index d6c1737b6d..39e9c7907f 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "选择折行后的文本是从行首靠左对齐、保持原行的缩进,还是进一步向内缩进。每增加一级缩进将遵循您设定的制表符宽度。", "icon pack": "图标包", "settings-info-icon-pack": "选择资源管理器及整个应用文件列表中文件和文件夹所使用的图标。", - "unavailable": "不可用" + "unavailable": "不可用", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json index 6ad71367e6..9bba937281 100644 --- a/src/lang/zh-hant.json +++ b/src/lang/zh-hant.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "選擇換行後的文字是靠左對齊、保持原行的縮排,還是進一步向內縮排。每增加一級縮排將遵循您設定的製表符寬度。", "icon pack": "圖標包", "settings-info-icon-pack": "選擇檔案總管及整個應用程式檔案列表中檔案和文件夾所使用的圖標。", - "unavailable": "不可用" + "unavailable": "不可用", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index c814718a27..54d8e9c222 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -887,5 +887,24 @@ "settings-info-editor-wrapping-indent": "Choose whether wrapped text starts at the left edge, matches the original line's indentation, or is indented further. Each extra level uses your tab size.", "icon pack": "Icon pack", "settings-info-icon-pack": "Choose the icons used for files and folders in the explorer and file lists across the app.", - "unavailable": "unavailable" + "unavailable": "unavailable", + "editor renderer": "Renderer", + "editor renderer dom": "DOM (default)", + "editor renderer canvas": "Canvas (experimental)", + "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", + "canvas backend": "Canvas backend", + "canvas backend auto": "Auto (WebGL2)", + "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", + "sticky scroll": "Sticky scroll", + "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", + "sticky scroll max lines": "Sticky scroll lines", + "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", + "gutter markers": "Gutter markers", + "gutter markers shared": "One column", + "gutter markers columns": "Column per gutter", + "gutter markers overlay": "Over line numbers", + "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", + "cursor blink rate": "Cursor blink rate", + "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." } diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js index ea2b573299..d56f521b66 100644 --- a/src/lib/editorManager.js +++ b/src/lib/editorManager.js @@ -29,6 +29,14 @@ import { wrapWithAbbreviation, } from "@emmetio/codemirror6-plugin"; import createBaseExtensions from "cm/baseExtensions"; +import { + getCanvasBackend, + getCanvasDisplayOptions, + getCanvasFont, + getCanvasTheme, + markCanvasViewSynced, + syncCanvasView, +} from "cm/canvasOptions"; import { setKeyBindings as applyKeyBindings, executeCommand, @@ -38,6 +46,10 @@ import { registerExternalCommand, removeExternalCommand, } from "cm/commandRegistry"; +import createEditorView, { + isCanvasRendererSupported, + isCanvasView, +} from "cm/createEditorView"; import { blurEditorIfReadOnly, createEditorReadOnlyExtension, @@ -66,7 +78,9 @@ import { getModesByName, initModes, } from "cm/modelist"; -import createTouchSelectionMenu from "cm/touchSelectionMenu"; +import createTouchSelectionMenu, { + createCanvasSelectionMenu, +} from "cm/touchSelectionMenu"; import "cm/supportedModes"; import { onProviderRegistered } from "fileSystem"; import { autocompletion } from "@codemirror/autocomplete"; @@ -960,9 +974,20 @@ async function EditorManager($header, $body) { const languageCompartment = new Compartment(); // Compartment for LSP extensions so we can swap per file const lspCompartment = new Compartment(); + // The renderer is chosen at startup ("Renderer" in editor settings applies + // on reload). The canvas renderer draws line numbers, folding, guides, + // whitespace, wrapping and scroll room itself, so the option specs below + // leave those extensions out and canvas views get options instead. + let canvasRenderer = appSettings.value.editorRenderer === "canvas"; + if (canvasRenderer && !isCanvasRendererSupported()) { + canvasRenderer = false; + console.warn("Canvas renderer needs WebGL2; using the DOM editor."); + } const diagnosticsClientExt = lspDiagnosticsClientExtension(); const buildDiagnosticsUiExt = () => - lspDiagnosticsUiExtension(appSettings?.value?.lintGutter !== false); + lspDiagnosticsUiExtension(appSettings?.value?.lintGutter !== false, { + canvas: canvasRenderer, + }); const UNTITLED_URI_PREFIX = "untitled://acode/"; function getEditorFontFamily() { @@ -1010,10 +1035,13 @@ async function EditorManager($header, $body) { function makeFontTheme() { const fontSize = appSettings?.value?.fontSize || "12px"; - const lineHeight = appSettings?.value?.lineHeight || 1.6; + const lineHeight = appSettings?.value?.lineHeight || 1.4; const fontFamily = getEditorFontFamily(); return EditorView.theme({ - "&": { fontSize, lineHeight: String(lineHeight) }, + "&": { fontSize }, + // On the scroller, where CodeMirror's base theme sets 1.4: a line + // height on the editor itself never reached the lines or gutters. + ".cm-scroller": { lineHeight: String(lineHeight) }, ".cm-content": { fontFamily }, ".cm-gutter": { fontFamily }, ".cm-tooltip, .cm-tooltip *": { fontFamily }, @@ -1100,12 +1128,21 @@ async function EditorManager($header, $body) { function getBaseExtensionOptions() { const values = appSettings?.value || {}; - return Object.fromEntries( - Object.entries(baseExtensionDefaults).map(([key, defaultValue]) => [ - key, - values[key] ?? defaultValue, - ]), - ); + return { + ...Object.fromEntries( + Object.entries(baseExtensionDefaults).map(([key, defaultValue]) => [ + key, + values[key] ?? defaultValue, + ]), + ), + // Canvas views draw fold markers themselves; CodeMirror's fold + // gutter would only rebuild its (unused) markers on every update. + foldGutter: !canvasRenderer, + canvas: canvasRenderer, + // Off by default for the DOM editor (its cost per selection + // change); canvas views draw the matches cheaply. + ...(canvasRenderer ? { highlightSelectionMatches: true } : {}), + }; } function createConfiguredBaseExtensions() { @@ -1114,9 +1151,12 @@ async function EditorManager($header, $body) { function getBaseExtensionSignature() { const options = getBaseExtensionOptions(); - return JSON.stringify( - baseExtensionSettings.map((key) => [key, options[key]]), - ); + // The renderer is part of it: states built for canvas views leave out + // what the canvas draws, so a DOM fallback must not reuse them. + return JSON.stringify([ + ...baseExtensionSettings.map((key) => [key, options[key]]), + ["canvas", options.canvas], + ]); } function makeRainbowBracketExtension() { @@ -1161,6 +1201,7 @@ async function EditorManager($header, $body) { keys: ["linenumbers", "relativeLineNumbers"], compartments: [lineNumberCompartment], build() { + if (canvasRenderer) return []; return makeLineNumberExtension(); }, }, @@ -1168,6 +1209,7 @@ async function EditorManager($header, $body) { keys: ["rainbowBrackets"], compartments: [rainbowCompartment], build() { + if (canvasRenderer) return []; return makeRainbowBracketExtension(); }, }, @@ -1176,7 +1218,7 @@ async function EditorManager($header, $body) { compartments: [indentGuidesCompartment], build() { const enabled = appSettings?.value?.indentGuides ?? false; - if (!enabled) return []; + if (!enabled || canvasRenderer) return []; return indentGuides({ highlightActiveGuide: false, hideOnBlankLines: false, @@ -1201,6 +1243,7 @@ async function EditorManager($header, $body) { keys: ["textWrap", "wrappingIndent"], compartments: [wrapCompartment], build() { + if (canvasRenderer) return []; return makeWrapExtension(); }, }, @@ -1216,6 +1259,7 @@ async function EditorManager($header, $body) { keys: ["rtlText"], compartments: [rtlCompartment], build() { + if (canvasRenderer) return []; const rtl = !!appSettings?.value?.rtlText; return EditorView.theme({ "&": { direction: rtl ? "rtl" : "ltr" }, @@ -1227,7 +1271,7 @@ async function EditorManager($header, $body) { compartments: [whitespaceCompartment], build() { const show = !!appSettings?.value?.showSpaces; - return show + return show && !canvasRenderer ? [ highlightWhitespace(), highlightTrailingWhitespace(), @@ -1241,7 +1285,7 @@ async function EditorManager($header, $body) { compartments: [lineBreakMarkerCompartment], build() { const showSpaces = !!appSettings?.value?.showSpaces; - return showSpaces ? lineBreakMarker : []; + return showSpaces && !canvasRenderer ? lineBreakMarker : []; }, }, { @@ -1249,7 +1293,7 @@ async function EditorManager($header, $body) { compartments: [foldThemeCompartment], build() { const fade = !!appSettings?.value?.fadeFoldWidgets; - if (!fade) return []; + if (!fade || canvasRenderer) return []; return EditorView.theme({ ".cm-gutter.cm-foldGutter .cm-gutterElement": { opacity: 0, @@ -1293,7 +1337,7 @@ async function EditorManager($header, $body) { compartments: [scrollPastEndCompartment], build() { const value = appSettings?.value?.scrollPastEnd || "medium"; - if (value === "none") { + if (value === "none" || canvasRenderer) { return []; } const factorMap = { @@ -1377,9 +1421,109 @@ async function EditorManager($header, $body) { } target.dispatch({ effects }); } + if (isCanvasView(target)) syncCanvasOptions(target); + } + } + + function getCanvasDisplayOptionsFromSettings() { + return getCanvasDisplayOptions(appSettings.value, { + themeId: appSettings.value.editorTheme || "one_dark", + onLineNumberClick: handleCanvasLineNumberClick, + }); + } + + /** Apply the current settings to a canvas view (only what changed). */ + function syncCanvasOptions(target) { + syncCanvasView(target, { + display: getCanvasDisplayOptionsFromSettings(), + font: getCanvasFont(appSettings.value, getEditorFontFamily()), + }); + } + + function syncAllCanvasViews() { + for (const pane of panes) { + if (isCanvasView(pane.editor)) syncCanvasOptions(pane.editor); + } + } + + /** + * Taps on a canvas view's line numbers select the line, like the DOM + * editor's line number gutter. Its fold markers sit in a narrow column + * right of the numbers: taps there fall through to the fold toggle. + */ + function handleCanvasLineNumberClick(line, event, view) { + const rect = view.scrollDOM.getBoundingClientRect(); + const foldColumn = view.gutterWidth - view.cellWidth * 1.5; + if (event.clientX - rect.left >= foldColumn) return false; + const docLine = view.state.doc.line(line); + return handleLineNumberClick(view, view.lineBlockAt(docLine.from), event, { + shiftClickSelection: appSettings.value.shiftClickSelection !== false, + }); + } + + /** + * Create a pane's editor view with the configured renderer. Canvas views + * get the settings as options, and drive the selection menu through their + * touch selection hooks. + */ + function createPaneEditorView(pane, state, parent) { + if (!canvasRenderer) return createEditorView({ state, parent }); + const themeId = appSettings.value.editorTheme || "one_dark"; + const display = getCanvasDisplayOptionsFromSettings(); + const font = getCanvasFont(appSettings.value, getEditorFontFamily()); + try { + const view = createEditorView({ + state, + parent, + canvas: { + ...display, + font, + theme: getCanvasTheme(themeId), + backend: getCanvasBackend(appSettings.value), + input: appSettings.value.useTextareaForIME ? "textarea" : "auto", + touchSelection: { + onMenu: (event) => + pane.touchSelectionController?.handleCanvasMenu?.(event), + onHaptic() { + if (appSettings.value.vibrateOnTap) { + navigator.vibrate?.(config.VIBRATION_TIME); + } + }, + }, + }, + }); + markCanvasViewSynced(view, { display, font, themeId }); + return view; + } catch (error) { + // Use the DOM editor for the rest of the session, with the + // extensions the canvas would have drawn. + canvasRenderer = false; + for (const leftover of parent.querySelectorAll(":scope > .cv-editor")) { + leftover.remove(); + } + warnRecoverable( + "Canvas renderer failed to start; using the DOM editor.", + error, + "canvas-renderer", + ); + // Panes start with an empty state; rebuild it with the DOM + // editor's extensions. Files' states follow on their next show, + // since the renderer is in their extension signature. + const view = createEditorView({ + state: createEmptyEditorState(), + parent, + }); + applyOptions(null, view); + return view; } } + function createPaneTouchSelectionMenu(view, options) { + return isCanvasView(view) + ? createCanvasSelectionMenu(view, options) + : createTouchSelectionMenu(view, options); + } + function setThemeForEditors(themeId) { panes.forEach((pane) => { if (pane.editor) { @@ -1675,7 +1819,7 @@ async function EditorManager($header, $body) { searchExtension: search(), // Ensure read-only can be toggled later via compartment readOnlyExtension: readOnlyCompartment.of( - createEditorReadOnlyExtension(false), + createEditorReadOnlyExtension(false, { canvas: canvasRenderer }), ), // Editor options driven by settings via compartments optionExtensions: getBaseExtensionsFromOptions(), @@ -1685,10 +1829,7 @@ async function EditorManager($header, $body) { const editorState = createEmptyEditorState(); - editor = new EditorView({ - state: editorState, - parent: $container, - }); + editor = createPaneEditorView(primaryPane, editorState, $container); editor.__editorPane = primaryPane; primaryPane.editor = editor; activePane = primaryPane; @@ -1734,7 +1875,7 @@ async function EditorManager($header, $body) { }, }); - touchSelectionController = createTouchSelectionMenu(editor, { + touchSelectionController = createPaneTouchSelectionMenu(editor, { container: $container, getActiveFile: () => manager?.activeFile || null, isShiftSelectionActive, @@ -1772,6 +1913,9 @@ async function EditorManager($header, $body) { const id = String(themeId || ""); const ext = getThemeExtensions(id, [oneDark]); targetEditor.dispatch({ effects: themeCompartment.reconfigure(ext) }); + if (isCanvasView(targetEditor)) { + syncCanvasView(targetEditor, { themeId: id }); + } return true; } catch (_) { return false; @@ -2407,15 +2551,16 @@ async function EditorManager($header, $body) { } async function createPaneEditor(pane) { - const paneEditor = new EditorView({ - state: createEmptyEditorState(), - parent: pane.editorContainer, - }); + const paneEditor = createPaneEditorView( + pane, + createEmptyEditorState(), + pane.editorContainer, + ); pane.editor = paneEditor; paneEditor.__editorPane = pane; applyEditorCompatibility(paneEditor); await applyKeyBindings(paneEditor); - pane.touchSelectionController = createTouchSelectionMenu(paneEditor, { + pane.touchSelectionController = createPaneTouchSelectionMenu(paneEditor, { container: pane.editorContainer, getActiveFile: () => pane.activeFile || null, isShiftSelectionActive, @@ -2836,7 +2981,9 @@ async function EditorManager($header, $body) { ...getBaseExtensionsFromOptions(), languageCompartment.of([]), lspCompartment.of([]), - readOnlyCompartment.of(createEditorReadOnlyExtension(true)), + readOnlyCompartment.of( + createEditorReadOnlyExtension(true, { canvas: canvasRenderer }), + ), ...(text === undefined ? [placeholder(`Loading ${file.filename || "file"}...`)] : []), @@ -2978,7 +3125,11 @@ async function EditorManager($header, $body) { // Apply read-only state based on file.editable/loading using Compartment try { const ro = !file.editable || !!file.loading; - exts.push(readOnlyCompartment.of(createEditorReadOnlyExtension(ro))); + exts.push( + readOnlyCompartment.of( + createEditorReadOnlyExtension(ro, { canvas: canvasRenderer }), + ), + ); } catch (e) { // safe to ignore; editor will remain editable by default } @@ -3608,7 +3759,9 @@ async function EditorManager($header, $body) { appSettings.on("update:lintGutter", function (value) { lspClientManager.setOptions({ - diagnosticsUiExtension: lspDiagnosticsUiExtension(value !== false), + diagnosticsUiExtension: lspDiagnosticsUiExtension(value !== false, { + canvas: canvasRenderer, + }), }); const active = manager.activeFile; if (active?.type === "editor") { @@ -3656,6 +3809,15 @@ async function EditorManager($header, $body) { applyOptions(["indentGuides"]); }); + // Options only the canvas renderer applies live; the DOM editor picks up + // highlightActiveLine when the state is recreated. + appSettings.on("update:highlightActiveLine", syncAllCanvasViews); + appSettings.on("update:scrollSpeed", syncAllCanvasViews); + appSettings.on("update:stickyScroll", syncAllCanvasViews); + appSettings.on("update:stickyScrollMaxLines", syncAllCanvasViews); + appSettings.on("update:cursorBlinkRate", syncAllCanvasViews); + appSettings.on("update:canvasGutterMarkers", syncAllCanvasViews); + // Keep file.session and cache in sync on every edit function getDocSyncListener() { return EditorView.updateListener.of((update) => { diff --git a/src/lib/settings.js b/src/lib/settings.js index de8d3b18bf..1fbf774c0d 100644 --- a/src/lib/settings.js +++ b/src/lib/settings.js @@ -133,6 +133,12 @@ class Settings { fontSize: "12px", cursorWidth: 2, editorTheme: "one_dark", + editorRenderer: "dom", + canvasBackend: "auto", + canvasGutterMarkers: "shared", + stickyScroll: false, + stickyScrollMaxLines: 5, + cursorBlinkRate: 1200, textWrap: false, wrappingIndent: "same", softTab: true, @@ -169,7 +175,8 @@ class Settings { scrollbarHeight: 50, showSpaces: false, confirmOnExit: true, - lineHeight: 2, + lineHeight: 1.4, + lineHeightMigrated: true, leftMargin: 50, checkFiles: true, checkForAppUpdates: false, @@ -247,6 +254,15 @@ class Settings { const settings = helpers.parseJSON(await fs.readFile("utf8")); if (settings) { + // The old default line height (2) never reached the editor's lines + // (CodeMirror's 1.4 won), so nobody saw it. Now that it applies, + // keep what the editor showed instead of doubling line spacing. + if ( + settings.lineHeightMigrated === undefined && + settings.lineHeight === 2 + ) + settings.lineHeight = 1.4; + // make sure that all the settings are present Object.keys(this.#defaultSettings).forEach((setting) => { const value = settings[setting]; diff --git a/src/settings/editorSettings.js b/src/settings/editorSettings.js index ec4c34b00a..0ba895e3ec 100644 --- a/src/settings/editorSettings.js +++ b/src/settings/editorSettings.js @@ -1,12 +1,36 @@ import settingsPage from "components/settingsPage"; +import confirm from "dialogs/confirm"; import config from "lib/config"; import fonts from "lib/fonts"; import appSettings from "lib/settings"; import scrollSettings from "./scrollSettings"; +/** Settings only canvas editors use; shown with the canvas renderer. */ +const CANVAS_ONLY_SETTINGS = [ + "canvasBackend", + "stickyScroll", + "stickyScrollMaxLines", + "canvasGutterMarkers", + "cursorBlinkRate", +]; + export default function editorSettings() { const title = strings["editor settings"]; const values = appSettings.value; + const rendererOptions = [ + ["dom", strings["editor renderer dom"]], + ["canvas", strings["editor renderer canvas"]], + ]; + const canvasBackendOptions = [ + ["auto", strings["canvas backend auto"]], + ["webgl2", "WebGL2"], + ["webgpu", "WebGPU"], + ]; + const gutterMarkerOptions = [ + ["shared", strings["gutter markers shared"]], + ["columns", strings["gutter markers columns"]], + ["overlay", strings["gutter markers overlay"]], + ]; const wrappingIndentOptions = [ ["none", strings.none], ["same", strings["wrap-indent-same"]], @@ -29,6 +53,50 @@ export default function editorSettings() { category: categories.scrolling, chevron: true, }, + { + key: "editorRenderer", + text: strings["editor renderer"], + value: values.editorRenderer ?? "dom", + valueText: (value) => + rendererOptions.find(([key]) => key === value)?.[1] ?? + rendererOptions[0][1], + select: rendererOptions, + info: strings["settings-info-editor-renderer"], + category: categories.textLayout, + }, + { + key: "canvasBackend", + text: strings["canvas backend"], + value: values.canvasBackend ?? "auto", + valueText: (value) => + canvasBackendOptions.find(([key]) => key === value)?.[1] ?? + canvasBackendOptions[0][1], + select: canvasBackendOptions, + info: strings["settings-info-canvas-backend"], + category: categories.textLayout, + }, + { + key: "stickyScroll", + text: strings["sticky scroll"], + checkbox: values.stickyScroll ?? false, + info: strings["settings-info-sticky-scroll"], + category: categories.textLayout, + }, + { + key: "stickyScrollMaxLines", + text: strings["sticky scroll max lines"], + value: values.stickyScrollMaxLines ?? 5, + prompt: strings["sticky scroll max lines"], + promptType: "number", + promptOptions: { + test(value) { + value = Number.parseInt(value); + return value >= 1 && value <= 10; + }, + }, + info: strings["settings-info-sticky-scroll-max-lines"], + category: categories.textLayout, + }, { key: "editorFont", text: strings["editor font"], @@ -205,6 +273,17 @@ export default function editorSettings() { info: strings["settings-info-editor-lint-gutter"], category: categories.guidesIndicators, }, + { + key: "canvasGutterMarkers", + text: strings["gutter markers"], + value: values.canvasGutterMarkers ?? "shared", + valueText: (value) => + gutterMarkerOptions.find(([key]) => key === value)?.[1] ?? + gutterMarkerOptions[0][1], + select: gutterMarkerOptions, + info: strings["settings-info-gutter-markers"], + category: categories.guidesIndicators, + }, { key: "showSpaces", text: strings["show spaces"], @@ -247,6 +326,21 @@ export default function editorSettings() { info: strings["settings-info-editor-shift-click-selection"], category: categories.cursorSelection, }, + { + key: "cursorBlinkRate", + text: strings["cursor blink rate"], + value: values.cursorBlinkRate ?? 1200, + prompt: strings["cursor blink rate"] + " (ms)", + promptType: "number", + promptOptions: { + test(value) { + value = Number.parseInt(value); + return value >= 0 && value <= 10000; + }, + }, + info: strings["settings-info-cursor-blink-rate"], + category: categories.cursorSelection, + }, { key: "rtlText", text: strings["line based rtl switching"], @@ -256,7 +350,13 @@ export default function editorSettings() { }, ]; - return settingsPage(title, items, callback, undefined, { + for (const item of items) { + if (CANVAS_ONLY_SETTINGS.includes(item.key)) { + item.hidden = !isCanvasSettingVisible(item.key); + } + } + + const page = settingsPage(title, items, callback, undefined, { preserveOrder: true, pageClassName: "detail-settings-page", listClassName: "detail-settings-list", @@ -264,17 +364,55 @@ export default function editorSettings() { valueInTail: true, }); + // The page is created once and kept, so follow the renderer from here. + appSettings.on("update:editorRenderer", updateCanvasSettings); + appSettings.on("update:stickyScroll", updateCanvasSettings); + + return page; + + function isCanvasSettingVisible(key) { + const { editorRenderer, stickyScroll } = appSettings.value; + if (editorRenderer !== "canvas") return false; + return key !== "stickyScrollMaxLines" || !!stickyScroll; + } + + function updateCanvasSettings() { + for (const key of CANVAS_ONLY_SETTINGS) { + page.setItemVisibility(key, isCanvasSettingVisible(key)); + } + } + /** * Callback for settings page when an item is clicked * @param {string} key * @param {string} value */ - function callback(key, value) { + async function callback(key, value) { switch (key) { case "scroll-settings": appSettings.uiSettings[key].show(); return; + case "editorRenderer": + case "canvasBackend": + // Editors are created with their renderer and backend: reload + // to switch (a backend change only matters to canvas editors). + if (value === appSettings.value[key]) return; + await appSettings.update({ [key]: value }); + if ( + (key === "editorRenderer" || + appSettings.value.editorRenderer === "canvas") && + (await confirm(strings.info, strings["reload to apply"])) + ) { + await reloadApp(); + } + return; + + case "stickyScrollMaxLines": + case "cursorBlinkRate": + appSettings.update({ [key]: Number.parseInt(value) }); + break; + case "editorFont": fonts.setFont(value); @@ -285,4 +423,11 @@ export default function editorSettings() { break; } } + + /** Reload once open files' edits are cached and the session is saved. */ + async function reloadApp() { + await window.editorManager?.flushCacheWrites?.(); + window.acode?.exec("save-state"); + location.reload(); + } } diff --git a/src/settings/scrollSettings.js b/src/settings/scrollSettings.js index dbb72f4d30..cb5eb49f7f 100644 --- a/src/settings/scrollSettings.js +++ b/src/settings/scrollSettings.js @@ -7,18 +7,21 @@ export default function scrollSettings() { const title = strings["scroll settings"]; const items = [ - /*{ + { key: "scrollSpeed", text: strings["scroll speed"], value: values.scrollSpeed, valueText: getScrollSpeedString, select: [ - [constants.SCROLL_SPEED_FAST_X2, `${strings.fast} x2`], - [constants.SCROLL_SPEED_FAST, strings.fast], - [constants.SCROLL_SPEED_NORMAL, strings.normal], - [constants.SCROLL_SPEED_SLOW, strings.slow], + [config.SCROLL_SPEED_FAST_X2, `${strings.fast} x2`], + [config.SCROLL_SPEED_FAST, strings.fast], + [config.SCROLL_SPEED_NORMAL, strings.normal], + [config.SCROLL_SPEED_SLOW, strings.slow], ], - },*/ + info: strings["settings-info-scroll-speed"], + // Only canvas editors use it. + hidden: values.editorRenderer !== "canvas", + }, /*{ key: "reverseScrolling", text: strings["reverse scrolling"], @@ -86,7 +89,7 @@ export default function scrollSettings() { }, ]; - return settingsPage(title, items, callback, undefined, { + const page = settingsPage(title, items, callback, undefined, { preserveOrder: true, pageClassName: "detail-settings-page", listClassName: "detail-settings-list", @@ -95,6 +98,13 @@ export default function scrollSettings() { groupByDefault: true, }); + // The page is created once and kept, so follow the renderer from here. + appSettings.on("update:editorRenderer", (renderer) => { + page.setItemVisibility("scrollSpeed", renderer === "canvas"); + }); + + return page; + function callback(key, value) { appSettings.update({ [key]: key === "leftMargin" ? Number(value) : value, diff --git a/tests/unit/canvasOptions.test.ts b/tests/unit/canvasOptions.test.ts new file mode 100644 index 0000000000..0b949f7aa0 --- /dev/null +++ b/tests/unit/canvasOptions.test.ts @@ -0,0 +1,165 @@ +import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"; +import { Compartment, Prec } from "@codemirror/state"; +import { tags as t } from "@lezer/highlight"; +import { + findHighlightStyle, + fontSizeToPx, + getCanvasDisplayOptions, + getCanvasFont, + getCanvasTheme, +} from "cm/canvasOptions"; +import { getThemeConfig, getThemes } from "cm/themes"; +import { describe, expect, it } from "vitest"; + +describe("canvas renderer theme bridge", () => { + it("finds the HighlightStyle inside wrapped theme extensions", () => { + const style = HighlightStyle.define([{ tag: t.keyword, color: "#f00" }]); + const compartment = new Compartment(); + const extension = [ + [], + compartment.of(Prec.high([syntaxHighlighting(style)])), + ]; + expect(findHighlightStyle(extension)).toBe(style); + expect(findHighlightStyle([])).toBeNull(); + }); + + it("gives every built-in theme syntax colors and its config colors", () => { + for (const theme of getThemes()) { + const spec = getCanvasTheme(theme.id); + const config = getThemeConfig(theme.id); + expect(spec.background, theme.id).toBe(config.background); + expect(spec.foreground, theme.id).toBe(config.foreground); + expect(spec.dark, theme.id).toBe(config.dark !== false); + expect(spec.highlight, theme.id).toBeInstanceOf(HighlightStyle); + // Acode's own scrollbars are used instead of the canvas thumbs. + expect(spec.scrollbar).toBe("transparent"); + } + }); + + it("maps the theme's line number and bracket colors", () => { + const config = getThemeConfig("dracula"); + expect(getCanvasTheme("dracula")).toMatchObject({ + selection: config.selection, + cursor: config.cursor, + gutterForeground: config.lineNumber, + gutterActiveForeground: config.lineNumberActive, + classes: { + "cm-matchingBracket": { background: config.matchingBracket }, + "cm-selectionMatch": { background: config.selection }, + }, + }); + }); +}); + +describe("canvas renderer settings", () => { + const defaults = { + linenumbers: true, + relativeLineNumbers: false, + fadeFoldWidgets: false, + textWrap: false, + wrappingIndent: "same", + leftMargin: 50, + scrollPastEnd: "medium", + scrollSpeed: "NORMAL", + indentGuides: false, + rainbowBrackets: true, + showSpaces: false, + highlightActiveLine: true, + cursorWidth: 2, + rtlText: false, + }; + + it("maps Acode's editor settings to canvas options", () => { + const options = getCanvasDisplayOptions(defaults, { themeId: "one_dark" }); + expect(options).toMatchObject({ + lineNumbers: true, + foldMarkers: "always", + lineWrapping: false, + wrapIndent: "same", + horizontalScrollPastEnd: 50, + scrollPastEnd: 0.5, + scrollSpeed: "normal", + indentGuides: false, + showWhitespace: false, + highlightActiveLine: true, + cursorWidth: 2, + cursorBlinkRate: 1200, + gutterMarkers: "shared", + stickyScroll: false, + textDirection: "ltr", + }); + expect(options.rainbowBrackets).toMatchObject({ + colors: expect.any(Array), + }); + }); + + it("follows changed settings", () => { + const options = getCanvasDisplayOptions( + { + ...defaults, + relativeLineNumbers: true, + fadeFoldWidgets: true, + textWrap: true, + wrappingIndent: "deepIndent", + scrollPastEnd: "none", + scrollSpeed: "FAST_X2", + indentGuides: true, + rainbowBrackets: false, + showSpaces: true, + cursorWidth: 40, + cursorBlinkRate: "0", + canvasGutterMarkers: "overlay", + stickyScroll: true, + stickyScrollMaxLines: 30, + rtlText: true, + }, + { themeId: "one_dark" }, + ); + expect(options).toMatchObject({ + lineNumbers: "relative", + foldMarkers: "fade", + lineWrapping: true, + wrapIndent: "deepIndent", + scrollPastEnd: 0, + scrollSpeed: "fastX2", + indentGuides: { active: true }, + rainbowBrackets: false, + showWhitespace: { spaces: true, trailing: true, lineBreaks: true }, + cursorWidth: 10, + cursorBlinkRate: 0, + gutterMarkers: "overlay", + stickyScroll: { maxLines: 10 }, + textDirection: "auto", + }); + expect( + getCanvasDisplayOptions( + { ...defaults, linenumbers: false }, + { themeId: "one_dark" }, + ).lineNumbers, + ).toBe(false); + expect( + getCanvasDisplayOptions( + { + ...defaults, + stickyScroll: true, + canvasGutterMarkers: "bad", + cursorBlinkRate: "bad", + }, + { themeId: "one_dark" }, + ), + ).toMatchObject({ + stickyScroll: { maxLines: 5 }, + gutterMarkers: "shared", + cursorBlinkRate: 1200, + }); + }); + + it("converts the editor font settings", () => { + expect(fontSizeToPx("14px")).toBe(14); + expect(fontSizeToPx("12pt")).toBe(16); + expect(fontSizeToPx("bad")).toBe(12); + expect( + getCanvasFont({ fontSize: "13px", lineHeight: 2 }, "Roboto Mono"), + ).toEqual({ family: "Roboto Mono", size: 13, lineHeight: 2 }); + }); +}); diff --git a/tests/unit/colorChip.test.ts b/tests/unit/colorChip.test.ts new file mode 100644 index 0000000000..836b71a3c4 --- /dev/null +++ b/tests/unit/colorChip.test.ts @@ -0,0 +1,46 @@ +// @vitest-environment happy-dom + +import type { EditorView } from "@codemirror/view"; +import { ColorChipWidget, getColorChipPayload } from "cm/colorChip"; +import { describe, expect, it, vi } from "vitest"; + +// The picker dialog and color utilities (JSX) and the LSP client loader +// aren't needed here. +vi.mock("../../src/dialogs/color.js", () => ({ default: vi.fn() })); +vi.mock("../../src/utils/color/index.js", () => ({ default: vi.fn() })); +vi.mock("cm/lsp/clientLoader", () => ({ getAllLspPlugins: () => [] })); + +const payload = { + from: 4, + to: 11, + css: "#ff8800", + source: "regex" as const, +}; + +describe("color chip widget", () => { + it("tells a canvas view the box toDOM styles, in cells of its font", () => { + const view = { + defaultCharacterWidth: 8, + fontSizePx: 16, + } as unknown as EditorView; + const spec = new ColorChipWidget(payload).toCanvas(view); + // 0.9em of a 16px font is 14.4px: 1.8 cells, rounded to quarters. + expect(spec).toEqual({ + text: "", + cells: 1.75, + padLeft: 0.25, + padRight: 0.25, + style: { + background: "#ff8800", + border: "rgba(0,0,0,0.2)", + rounded: true, + }, + }); + }); + + it("still makes a DOM element carrying its payload (taps on canvas views)", () => { + const el = new ColorChipWidget(payload).toDOM(); + expect(el.style.backgroundColor).toBeTruthy(); + expect(getColorChipPayload(el)).toBe(payload); + }); +}); diff --git a/tests/unit/editorReadOnly.test.ts b/tests/unit/editorReadOnly.test.ts index 0ae77e8409..8893b2042f 100644 --- a/tests/unit/editorReadOnly.test.ts +++ b/tests/unit/editorReadOnly.test.ts @@ -11,10 +11,30 @@ import { resolveReadOnlyContextSelection, shouldCommitReadOnlyTap, } from "cm/editorReadOnly"; -import { afterEach, describe, expect, it } from "vitest"; +import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest"; const views: EditorView[] = []; +// happy-dom dispatches selectionchange synchronously from Selection methods, +// while browsers queue it as a task. CodeMirror's view flushes on every +// selectionchange, so a synchronous one fired while the view syncs its own +// DOM selection re-enters EditorView.update. Queue it like a browser does. +const dispatchDocumentEvent = document.dispatchEvent; + +beforeAll(() => { + document.dispatchEvent = function (event) { + if (event.type !== "selectionchange") { + return dispatchDocumentEvent.call(this, event); + } + setTimeout(() => dispatchDocumentEvent.call(this, event)); + return true; + }; +}); + +afterAll(() => { + document.dispatchEvent = dispatchDocumentEvent; +}); + afterEach(() => { while (views.length) views.pop()?.destroy(); document.body.replaceChildren(); @@ -53,6 +73,23 @@ function expectReadOnly(view: EditorView) { } describe("editor read-only configuration", () => { + it("leaves focus and input to a canvas view, keeping the edit filter", () => { + const state = EditorState.create({ + doc: "abc", + extensions: createEditorReadOnlyExtension(true, { canvas: true }), + }); + expect(state.readOnly).toBe(true); + // Canvas views take focus without a keyboard while read-only. + expect(state.facet(EditorView.editable)).toBe(true); + const typed = state.update({ + changes: { from: 0, insert: "x" }, + userEvent: "input.type", + }); + expect(typed.state.doc.toString()).toBe("abc"); + const synced = state.update({ changes: { from: 0, insert: "x" } }); + expect(synced.state.doc.toString()).toBe("xabc"); + }); + it("keeps an editable editor focusable for text input", () => { const { view } = createEditor(); diff --git a/tests/unit/pluginFileRestoration.test.js b/tests/unit/pluginFileRestoration.test.js index 4589c1812a..ed12bdd3c0 100644 --- a/tests/unit/pluginFileRestoration.test.js +++ b/tests/unit/pluginFileRestoration.test.js @@ -627,6 +627,7 @@ it.each([ placeholder, createEditorReadOnlyExtension, blurEditorIfReadOnly, + canvasRenderer: false, loadingPreviews, manager: { activeFile: file }, touchSelectionController: null, From a16e2d3b2c95f5f670121075584617c2c838df54 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sun, 25 Oct 2026 12:58:43 +0530 Subject: [PATCH 159/195] chore(deps): bump @acode.app/canvas-view to 0.0.2 The canvas renderer now draws font ligatures (Fira Code's =>, !==...) like the DOM editor, and its fold markers no longer flash when the mouse quickly enters and leaves the gutter. --- bun.lock | 4 ++-- package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bun.lock b/bun.lock index 9eca137c8a..5bd4372c78 100644 --- a/bun.lock +++ b/bun.lock @@ -5,7 +5,7 @@ "": { "name": "com.foxdebug.acode", "dependencies": { - "@acode.app/canvas-view": "^0.0.1", + "@acode.app/canvas-view": "^0.0.2", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", @@ -160,7 +160,7 @@ "tar": "^7.5.22", }, "packages": { - "@acode.app/canvas-view": ["@acode.app/canvas-view@0.0.1", "", { "dependencies": { "@codemirror/language": "^6.13.1", "@codemirror/state": "^6.7.6", "@codemirror/view": "^6.43.14", "@lezer/common": "^1.5.4", "@lezer/highlight": "^1.2.5", "style-mod": "^4.1.2" } }, "sha512-brS4L24KCMJUOGXgzwSl2AVv2kpStleD85fLtEXaxPpn0jroRrXmyid2aSqZv4bitralRVu8huzhosDSl9HSww=="], + "@acode.app/canvas-view": ["@acode.app/canvas-view@0.0.2", "", { "dependencies": { "@codemirror/language": "^6.13.1", "@codemirror/state": "^6.7.6", "@codemirror/view": "^6.43.14", "@lezer/common": "^1.5.4", "@lezer/highlight": "^1.2.5", "style-mod": "^4.1.2" } }, "sha512-Kt6/YSNtdDl6UavLGi3yK4qOK4qqrPDjr+GQoE6V/0oKRcijnz4pvhPy2a+TDCPljSfYOH/KzT0wxKPEXOatFA=="], "@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], diff --git a/package-lock.json b/package-lock.json index b2c1a39e3c..8991702dc2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.13.5", "license": "MIT", "dependencies": { - "@acode.app/canvas-view": "^0.0.1", + "@acode.app/canvas-view": "^0.0.2", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", @@ -172,9 +172,9 @@ } }, "node_modules/@acode.app/canvas-view": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/@acode.app/canvas-view/-/canvas-view-0.0.1.tgz", - "integrity": "sha512-brS4L24KCMJUOGXgzwSl2AVv2kpStleD85fLtEXaxPpn0jroRrXmyid2aSqZv4bitralRVu8huzhosDSl9HSww==", + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@acode.app/canvas-view/-/canvas-view-0.0.2.tgz", + "integrity": "sha512-Kt6/YSNtdDl6UavLGi3yK4qOK4qqrPDjr+GQoE6V/0oKRcijnz4pvhPy2a+TDCPljSfYOH/KzT0wxKPEXOatFA==", "license": "MIT", "dependencies": { "@codemirror/language": "^6.13.1", diff --git a/package.json b/package.json index 1105b1ea2c..1e56bbfe1c 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "ws": "^8.21.3" }, "dependencies": { - "@acode.app/canvas-view": "^0.0.1", + "@acode.app/canvas-view": "^0.0.2", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", From 2f6e4c55e82333545ba987054aafc62929225e21 Mon Sep 17 00:00:00 2001 From: summoner Date: Mon, 26 Oct 2026 08:51:55 +0000 Subject: [PATCH 160/195] Translation: Update hu-hu.json (#2989) * Translation: Update hu-hu.json Translate new strings * Translation: Update hu-hu.json Fix translation --- src/lang/hu-hu.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index d6cab64f8a..3a740c4b62 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -90,7 +90,7 @@ "theme": "Téma", "title-listfiles": "Fájlok listázása", "unable to delete file": "Nem lehet törölni a fájlt", - "document plugin required": "Telepítse vagy engedélyezze a Docs Workspace bővítményt a Bővítmények között, majd nyissa meg újra a dokumentumot.", + "document plugin required": "Telepítse vagy engedélyezze a Docs Workspace bővítményt a bővítmények közül, majd nyissa meg újra a dokumentumot.", "shared files unavailable": "Ezeket a fájlokat nem sikerült megnyitni. Lehet, hogy nem támogatottak, vagy már nem érhetők el. Próbálja meg újra megosztani őket.", "invalid shared file": "Érvénytelen megosztott fájl", "unable to open file": "Nem lehet megnyitni a fájlt", @@ -888,23 +888,23 @@ "icon pack": "Ikoncsomag", "settings-info-icon-pack": "Válassza ki a fájlokhoz és a mappákhoz használandó ikonokat a fájlkezelőben és az alkalmazás egészében megjelenő fájllistákban.", "unavailable": "nem érhető el", - "editor renderer": "Renderer", - "editor renderer dom": "DOM (default)", - "editor renderer canvas": "Canvas (experimental)", - "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", - "canvas backend": "Canvas backend", - "canvas backend auto": "Auto (WebGL2)", - "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", - "sticky scroll": "Sticky scroll", - "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", - "sticky scroll max lines": "Sticky scroll lines", - "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", - "gutter markers": "Gutter markers", - "gutter markers shared": "One column", - "gutter markers columns": "Column per gutter", - "gutter markers overlay": "Over line numbers", - "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", - "cursor blink rate": "Cursor blink rate", - "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "editor renderer": "Megjelenítő", + "editor renderer dom": "DOM (alapértelmezett)", + "editor renderer canvas": "Canvas (kísérleti)", + "settings-info-editor-renderer": "A Canvas a GPU segítségével rajzolja ki a kódot a nagy fájlok gördülékenyebb görgetéséhez. Kísérleti funkció: előfordulhat, hogy egyes bővítmények nem működnek vele. Újratöltés után lép érvénybe.", + "canvas backend": "Canvas háttérprogram", + "canvas backend auto": "Automatikus (WebGL2)", + "settings-info-canvas-backend": "A GPU API, amellyel a Canvas megjelenítő rajzol. A WebGPU ott, ahol nem érhető el, WebGL2-re vált vissza. Újratöltés után lép érvénybe.", + "sticky scroll": "Rögzített görgetés", + "settings-info-sticky-scroll": "Görgetés közben a felső sor körüli függvények, osztályok és blokkok első sorait a képernyő tetejére rögzíti.", + "sticky scroll max lines": "Rögzített görgetés sorai", + "settings-info-sticky-scroll-max-lines": "A rögzített görgetés által a tetején tartott fejlécsorok maximális száma (1–10).", + "gutter markers": "Margójelölők", + "gutter markers shared": "Egy közös oszlop", + "gutter markers columns": "Külön oszlop margónként", + "gutter markers overlay": "Sorszámok felett", + "settings-info-gutter-markers": "Hova kerüljenek a szintaxisellenőrző és egyéb margójelölők: egy közös oszlopba, külön oszlopba mindegyiknek, vagy a sorszámok fölé a helytakarékosság érdekében.", + "cursor blink rate": "Kurzor villogási sebessége", + "settings-info-cursor-blink-rate": "Egy kurzorvillanás időtartama ezredmásodpercben. A 0 értéknél a kurzor nem villog.", + "settings-info-scroll-speed": "A görgetés mértéke egy lendítés vagy az egérkerék elfordításakor." } From 143fa8d684f5c8d83dc47ed2427739a7003a1c2f Mon Sep 17 00:00:00 2001 From: Rohit Kushvaha Date: Mon, 26 Oct 2026 09:28:23 +0000 Subject: [PATCH 161/195] feat: improved webview (#2924) * feat(webview): incognito profiles, configurable settings and richer events Rework the Acode WebView API end to end. - Incognito mode backed by AndroidX WebKit multi-profile isolation, with reference-counted profiles, automatic cleanup and a documented best-effort fallback when the provider lacks multi-profile support. - Configurable user agent (explicit string or desktop/mobile presets) and a broad set of WebSettings, applied at creation and at runtime on the UI thread. - Expanded event stream (page lifecycle, progress, navigation, errors, console, dialogs, permissions, fullscreen, downloads, scroll) plus navigation/settings helpers, capability probes and registry utilities. - Split the native plugin into WebViewPlugin/WebViewInstance/WebViewOptions/ ProfileManager and the JS into a thin bridge plus a public AcodeWebView API. - Harden profile names (reject non-canonical or reserved names instead of rewriting them) and use the originating profile's cookie jar for downloads. * format * fix(webview): keep isolation metadata in sync and restore TLS blacklist * fix --- package-lock.json | 2 +- src/index.d.ts | 295 +++- src/lib/webview.js | 937 ++++++++++-- src/plugins/webview/package.json | 4 +- src/plugins/webview/plugin.xml | 9 +- .../com/foxdebug/webview/ProfileManager.java | 252 ++++ .../com/foxdebug/webview/WebViewActivity.java | 56 +- .../com/foxdebug/webview/WebViewInstance.java | 1308 +++++++++++++---- .../com/foxdebug/webview/WebViewOptions.java | 537 +++++++ .../com/foxdebug/webview/WebViewPlugin.java | 411 ++++-- src/plugins/webview/www/webview.js | 196 ++- tests/unit/webview.test.js | 769 +++++++++- 12 files changed, 4219 insertions(+), 557 deletions(-) create mode 100644 src/plugins/webview/src/android/com/foxdebug/webview/ProfileManager.java create mode 100644 src/plugins/webview/src/android/com/foxdebug/webview/WebViewOptions.java diff --git a/package-lock.json b/package-lock.json index 8991702dc2..a85009c92f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14342,7 +14342,7 @@ }, "src/plugins/webview": { "name": "cordova-plugin-acode-webview", - "version": "1.0.0", + "version": "2.0.0", "dev": true, "license": "Apache-2.0" } diff --git a/src/index.d.ts b/src/index.d.ts index 97a8a0a559..d2dc75df44 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -114,49 +114,204 @@ declare global { var Executor: Executor | undefined; } -interface WebViewOptions { +type WebViewMode = "fullscreen" | "hidden"; +type WebViewCacheMode = + | "default" + | "no-cache" + | "cache-only" + | "cache-else-network"; +type WebViewMixedContentMode = "never-allow" | "compatibility" | "always-allow"; +type WebViewUserAgentMode = "default" | "mobile" | "desktop"; +type WebViewAlgorithmicDarkening = "auto" | "on" | "off"; + +/** Web settings that can be set at creation and changed at runtime. */ +interface WebViewSettings { + /** Exact user-agent string. Takes precedence over userAgentMode. */ + userAgent?: string | null; + /** Preset user agent: platform default, mobile, or desktop. */ + userAgentMode?: WebViewUserAgentMode; + javaScript?: boolean; + domStorage?: boolean; + databaseStorage?: boolean; + cacheMode?: WebViewCacheMode; + mediaPlaybackRequiresUserGesture?: boolean; + loadImages?: boolean; + mixedContentMode?: WebViewMixedContentMode; + /** Page text zoom in percent (25-500). */ + textZoom?: number; + /** Initial viewport scale in percent (0 = WebView default). */ + initialScale?: number; + useWideViewPort?: boolean; + loadWithOverviewMode?: boolean; + supportZoom?: boolean; + builtInZoomControls?: boolean; + displayZoomControls?: boolean; + geolocation?: boolean; + safeBrowsing?: boolean; + algorithmicDarkening?: WebViewAlgorithmicDarkening; + acceptThirdPartyCookies?: boolean; + /** CSS color (e.g. "#101418") painted behind the page. */ + backgroundColor?: string; +} + +interface WebViewOptions extends WebViewSettings { /** Title applied to the hosting activity in fullscreen mode. */ title?: string; /** * "fullscreen" displays the WebView in its own activity, "hidden" runs it * headless (never displayed). Defaults to "hidden". */ - mode?: "fullscreen" | "hidden"; - /** - * Allow in-WebView navigation. Defaults to true. Only http(s) targets - * ever load; other schemes are always blocked for isolation. - */ - allowNavigation?: boolean; - /** - * Ask the user with a confirmation dialog before downloading files via - * the system DownloadManager. Defaults to false. - */ - allowDownloads?: boolean; + mode?: WebViewMode; /** * Show immediately after creation. Defaults to true. Only meaningful for * fullscreen mode: when false, the activity launch is deferred until * show() is called. */ visible?: boolean; + /** + * Run in a private, ephemeral profile: separate cookies/localStorage (when + * the WebView provider supports multi-profile), no cache, and all data is + * cleared when the instance is destroyed. Defaults to false. + */ + incognito?: boolean; + /** + * Named WebView profile used for isolation. Incognito instances get an + * auto-generated ephemeral name when this is omitted; a named incognito + * profile is shared by every instance that uses the same name. + * + * Must be 1-64 characters from `A-Z a-z 0-9 _ -`. Names are used verbatim + * and invalid or reserved (`acode_incognito_*`) names are rejected so two + * different requests can never select the same profile. + */ + profileName?: string; + /** + * Allow in-WebView navigation. Defaults to true. Only http(s) targets ever + * load; other schemes are always blocked for isolation. + */ + allowNavigation?: boolean; + /** + * Ask the user with a confirmation dialog before downloading files via the + * system DownloadManager. Defaults to false. + */ + allowDownloads?: boolean; + /** Resolved by the native layer: whether profile isolation is active. */ + readonly isolated?: boolean; +} + +interface WebViewHTMLLoadOptions { + baseUrl?: string; + mimeType?: string; + encoding?: string; + historyUrl?: string; +} + +interface WebViewCapabilities { + version: string; + /** Multi-profile support: required for true incognito isolation. */ + multiProfile: boolean; + deleteBrowsingData: boolean; + documentStartScript: boolean; + safeBrowsing: boolean; + algorithmicDarkening: boolean; } +interface WebViewInfo { + id: string; + mode: WebViewMode; + incognito: boolean; + isolated: boolean; + destroyed: boolean; + ready: boolean; + profileName?: string; + url: string; + title: string; + progress: number; + loading: boolean; + canGoBack: boolean; + canGoForward: boolean; + userAgent?: string | null; +} + +type WebViewEventName = + | "pageStarted" + | "pageCommitVisible" + | "pageFinished" + | "progressChanged" + | "titleChanged" + | "faviconChanged" + | "historyChanged" + | "scrollChanged" + | "renderProcessGone" + | "ready" + | "closed" + | "navigationRequested" + | "navigationBlocked" + | "resourceError" + | "httpError" + | "sslError" + | "consoleMessage" + | "jsAlert" + | "jsConfirm" + | "jsPrompt" + | "jsBeforeUnload" + | "permissionRequest" + | "geolocationPermissionRequest" + | "fullscreenChanged" + | "windowRequested" + | "downloadRequested" + | "downloadStarted" + | "downloadFailed" + | "shown" + | "hidden" + | "destroyed"; + +type WebViewEventHandler = (data: T, event: string) => void; +type WebViewAnyEventHandler = (event: string, data: unknown) => void; +type WebViewMessageHandler = (message: unknown) => void; + interface AcodeWebView { readonly id: string; readonly options: WebViewOptions; + readonly capabilities: WebViewCapabilities; + readonly isDestroyed: boolean; + /** True once the native WebView exists (see waitForReady). */ + readonly ready: boolean; + readonly isIncognito: boolean; + /** True when the instance runs in its own isolated WebView profile. */ + readonly isIsolated: boolean; + readonly profileName: string | null; + readonly url: string; + readonly title: string; + readonly progress: number; + readonly loading: boolean; + readonly canGoBack: boolean; + readonly canGoForward: boolean; /** Load an http(s) URL. Other schemes are rejected. */ - loadURL(url: string): Promise; - loadHTML(html: string): Promise; - evaluate(js: string): Promise; - onMessage(callback: (message: unknown) => void): void; - offMessage(callback: (message: unknown) => void): void; + loadURL(url: string, headers?: Record): Promise; + loadHTML(html: string, options?: WebViewHTMLLoadOptions): Promise; + evaluate(js: string): Promise; + postMessage(message: unknown): Promise; + reload(): Promise; + stopLoading(): Promise; + /** Navigates back; resolves true when a navigation happened. */ + goBack(): Promise; + goForward(): Promise; + /** Re-reads the back/forward flags from the native WebView. */ + refreshHistory(): Promise<{ canGoBack: boolean; canGoForward: boolean }>; /** - * Subscribe to lifecycle events: "pageFinished", "titleChanged" and - * "closed" (fullscreen closed by the user or the system). After "closed" - * the instance is destroyed and cannot be reused. + * Resolves once the native WebView exists. Hidden instances are ready by the + * time create() resolves; fullscreen instances become ready when their + * activity builds the WebView, so await this before evaluate() on a + * fullscreen instance. Rejects on close/destroy or timeout (ms; 0 disables). */ - on(event: string, callback: (event: string, data?: unknown) => void): void; - off(event: string, callback: (event: string, data?: unknown) => void): void; - postMessage(message: unknown): Promise; + waitForReady(timeout?: number): Promise; + /** + * Resolves when the main frame finishes loading, or rejects on a main-frame + * load error, close/destroy, or timeout (ms; 0 disables the timeout). + * Attach it before starting the navigation, since loadURL()/loadHTML() + * resolve as soon as the load is initiated. + */ + waitForLoad(timeout?: number): Promise<{ url: string; title: string }>; /** * Show the WebView. Only fullscreen instances can be shown; rejects for * "hidden" mode. @@ -168,12 +323,104 @@ interface AcodeWebView { * No-op for "hidden" mode. */ hide(): Promise; - reload(): Promise; + clearCache(includeDiskFiles?: boolean): Promise; + clearHistory(): Promise; + clearFormData(): Promise; + setUserAgent( + userAgent: string | null, + mode?: WebViewUserAgentMode, + ): Promise; + getUserAgent(): Promise; + /** Applies a partial batch of web settings. */ + configure(settings: WebViewSettings): Promise; + getSettings(): Promise; + getInfo(): Promise; + on(event: WebViewEventName | "*", callback: WebViewEventHandler): this; + off(event: WebViewEventName | "*", callback: WebViewEventHandler): this; + once(event: WebViewEventName | "*", callback: WebViewEventHandler): this; + onAny(callback: WebViewAnyEventHandler): this; + offAny(callback: WebViewAnyEventHandler): this; + removeAllListeners(event?: WebViewEventName | "*"): this; + onMessage(callback: WebViewMessageHandler): this; + offMessage(callback: WebViewMessageHandler): this; destroy(): Promise; } +interface AcodeWebViewEvents { + readonly PAGE_STARTED: "pageStarted"; + readonly PAGE_COMMIT_VISIBLE: "pageCommitVisible"; + readonly PAGE_FINISHED: "pageFinished"; + readonly PROGRESS: "progressChanged"; + readonly TITLE_CHANGED: "titleChanged"; + readonly FAVICON_CHANGED: "faviconChanged"; + readonly HISTORY_CHANGED: "historyChanged"; + readonly SCROLL_CHANGED: "scrollChanged"; + readonly RENDER_PROCESS_GONE: "renderProcessGone"; + readonly READY: "ready"; + readonly CLOSED: "closed"; + readonly NAVIGATION_REQUESTED: "navigationRequested"; + readonly NAVIGATION_BLOCKED: "navigationBlocked"; + readonly RESOURCE_ERROR: "resourceError"; + readonly HTTP_ERROR: "httpError"; + readonly SSL_ERROR: "sslError"; + readonly CONSOLE_MESSAGE: "consoleMessage"; + readonly JS_ALERT: "jsAlert"; + readonly JS_CONFIRM: "jsConfirm"; + readonly JS_PROMPT: "jsPrompt"; + readonly JS_BEFORE_UNLOAD: "jsBeforeUnload"; + readonly PERMISSION_REQUEST: "permissionRequest"; + readonly GEOLOCATION_PERMISSION: "geolocationPermissionRequest"; + readonly FULLSCREEN_CHANGED: "fullscreenChanged"; + readonly WINDOW_REQUESTED: "windowRequested"; + readonly DOWNLOAD_REQUESTED: "downloadRequested"; + readonly DOWNLOAD_STARTED: "downloadStarted"; + readonly DOWNLOAD_FAILED: "downloadFailed"; + readonly SHOWN: "shown"; + readonly HIDDEN: "hidden"; + readonly DESTROYED: "destroyed"; +} + interface AcodeWebViewAPI { create(options?: WebViewOptions): Promise; + /** Feature support of the installed WebView provider. */ + getCapabilities(): Promise; + /** Live instance for an id, or null when it no longer exists. */ + get(id: string): AcodeWebView | null; + /** Ids of all live instances. */ + list(): string[]; + /** Destroys every live instance. */ + destroyAll(): Promise; + readonly AcodeWebView: new ( + id: string, + options?: WebViewOptions, + capabilities?: WebViewCapabilities, + ) => AcodeWebView; + readonly events: AcodeWebViewEvents; + readonly modes: { + readonly FULLSCREEN: "fullscreen"; + readonly HIDDEN: "hidden"; + }; + readonly cacheModes: { + readonly DEFAULT: "default"; + readonly NO_CACHE: "no-cache"; + readonly CACHE_ONLY: "cache-only"; + readonly CACHE_ELSE_NETWORK: "cache-else-network"; + }; + readonly mixedContentModes: { + readonly NEVER_ALLOW: "never-allow"; + readonly COMPATIBILITY: "compatibility"; + readonly ALWAYS_ALLOW: "always-allow"; + }; + readonly userAgentModes: { + readonly DEFAULT: "default"; + readonly MOBILE: "mobile"; + readonly DESKTOP: "desktop"; + }; + readonly algorithmicDarkeningModes: { + readonly AUTO: "auto"; + readonly ON: "on"; + readonly OFF: "off"; + }; } interface AcodeFullscreenAPI { diff --git a/src/lib/webview.js b/src/lib/webview.js index 3df669e683..dae223d662 100644 --- a/src/lib/webview.js +++ b/src/lib/webview.js @@ -1,77 +1,376 @@ import nativeBridge from "../plugins/webview/www/webview"; -let initialized = false; +/** + * Event names emitted by a WebView instance. + * + * Native events are asynchronous and carry a plain data object. The two + * JS-local events ("shown", "hidden") are emitted after show()/hide() resolve. + */ +export const WebViewEvents = Object.freeze({ + // Page lifecycle + PAGE_STARTED: "pageStarted", + PAGE_COMMIT_VISIBLE: "pageCommitVisible", + PAGE_FINISHED: "pageFinished", + PROGRESS: "progressChanged", + TITLE_CHANGED: "titleChanged", + FAVICON_CHANGED: "faviconChanged", + HISTORY_CHANGED: "historyChanged", + SCROLL_CHANGED: "scrollChanged", + RENDER_PROCESS_GONE: "renderProcessGone", + READY: "ready", + CLOSED: "closed", + // Navigation + NAVIGATION_REQUESTED: "navigationRequested", + NAVIGATION_BLOCKED: "navigationBlocked", + // Errors + RESOURCE_ERROR: "resourceError", + HTTP_ERROR: "httpError", + SSL_ERROR: "sslError", + // Page interaction + CONSOLE_MESSAGE: "consoleMessage", + JS_ALERT: "jsAlert", + JS_CONFIRM: "jsConfirm", + JS_PROMPT: "jsPrompt", + JS_BEFORE_UNLOAD: "jsBeforeUnload", + PERMISSION_REQUEST: "permissionRequest", + GEOLOCATION_PERMISSION: "geolocationPermissionRequest", + FULLSCREEN_CHANGED: "fullscreenChanged", + WINDOW_REQUESTED: "windowRequested", + // Downloads + DOWNLOAD_REQUESTED: "downloadRequested", + DOWNLOAD_STARTED: "downloadStarted", + DOWNLOAD_FAILED: "downloadFailed", + // JS-local + SHOWN: "shown", + HIDDEN: "hidden", + DESTROYED: "destroyed", +}); + +export const WebViewModes = Object.freeze({ + FULLSCREEN: "fullscreen", + HIDDEN: "hidden", +}); + +export const CacheModes = Object.freeze({ + DEFAULT: "default", + NO_CACHE: "no-cache", + CACHE_ONLY: "cache-only", + CACHE_ELSE_NETWORK: "cache-else-network", +}); + +export const MixedContentModes = Object.freeze({ + NEVER_ALLOW: "never-allow", + COMPATIBILITY: "compatibility", + ALWAYS_ALLOW: "always-allow", +}); + +export const UserAgentModes = Object.freeze({ + DEFAULT: "default", + MOBILE: "mobile", + DESKTOP: "desktop", +}); + +export const AlgorithmicDarkeningModes = Object.freeze({ + AUTO: "auto", + ON: "on", + OFF: "off", +}); + +/** Events after which the native instance is gone and cannot be reused. */ +const TERMINAL_EVENTS = new Set([ + WebViewEvents.CLOSED, + WebViewEvents.RENDER_PROCESS_GONE, +]); + +/** Settings accepted by create()/configure(). */ +const SETTING_KEYS = [ + "userAgent", + "userAgentMode", + "javaScript", + "domStorage", + "databaseStorage", + "cacheMode", + "mediaPlaybackRequiresUserGesture", + "loadImages", + "mixedContentMode", + "textZoom", + "initialScale", + "useWideViewPort", + "loadWithOverviewMode", + "supportZoom", + "builtInZoomControls", + "displayZoomControls", + "geolocation", + "safeBrowsing", + "algorithmicDarkening", + "acceptThirdPartyCookies", + "backgroundColor", +]; + +/** Behavioural options accepted by create(). */ +const BEHAVIOUR_KEYS = [ + "mode", + "title", + "visible", + "incognito", + "profileName", + "allowNavigation", + "allowDownloads", +]; + +const CREATE_KEYS = [...BEHAVIOUR_KEYS, ...SETTING_KEYS]; + +const MODES = Object.values(WebViewModes); +const CACHE_MODES = Object.values(CacheModes); +const MIXED_CONTENT_MODES = Object.values(MixedContentModes); +const USER_AGENT_MODES = Object.values(UserAgentModes); +const DARKENING_MODES = Object.values(AlgorithmicDarkeningModes); + const instances = new Map(); +let messageCallbackRegistered = false; +let cachedCapabilities = null; function ensureInit() { - if (!initialized) { - nativeBridge.setMessageCallback((payload) => { - const { id, message, event, data } = payload; - const instance = instances.get(id); - if (!instance) return; - - if (event) { - // Iterate a copy so callbacks can unsubscribe during dispatch. - for (const entry of instance._eventCallbacks.slice()) { - if (entry.event === event) { - try { - entry.callback(event, data); - } catch (e) { - console.error("WebView event callback error:", e); - } - } - } + if (messageCallbackRegistered) return; + messageCallbackRegistered = true; + nativeBridge.setMessageCallback(dispatchNativePayload); +} - // A fullscreen WebView closed by the user (or by hide()) is - // gone natively; mark it destroyed so later calls fail fast - // and its listeners can be garbage collected. - if (event === "closed") { - instance._destroyed = true; - instances.delete(id); - instance._messageCallbacks = []; - instance._eventCallbacks = []; - } - return; - } +function dispatchNativePayload(payload) { + if (!payload || typeof payload !== "object") return; - if (message !== undefined) { - let parsed = message; - try { - parsed = JSON.parse(message); - } catch (_) {} - for (const cb of instance._messageCallbacks.slice()) { - try { - cb(parsed); - } catch (e) { - console.error("WebView message callback error:", e); - } - } - } - }); - initialized = true; + const instance = instances.get(payload.id); + if (!instance) return; + + if (payload.event) { + instance._handleEvent(payload.event, payload.data); + return; + } + + if (payload.message !== undefined) { + instance._handleMessage(payload.message); + } +} + +function assertOneOf(value, allowed, label) { + if (allowed.includes(value)) return; + throw new Error( + `Unsupported WebView ${label}: "${value}". Use one of: ${allowed + .map((entry) => `"${entry}"`) + .join(", ")}.`, + ); +} + +function clamp(value, min, max) { + const number = Number(value); + if (!Number.isFinite(number)) return min; + return Math.min(max, Math.max(min, Math.round(number))); +} + +/** Validates user input and keeps only options the native layer understands. */ +function normalizeOptions(options) { + if (options == null) return {}; + if (typeof options !== "object") { + throw new TypeError("WebView options must be an object"); + } + + const normalized = {}; + for (const key of CREATE_KEYS) { + if (options[key] !== undefined) normalized[key] = options[key]; + } + + if (normalized.mode !== undefined) { + assertOneOf(normalized.mode, MODES, "mode"); + } + if (normalized.userAgentMode !== undefined) { + assertOneOf(normalized.userAgentMode, USER_AGENT_MODES, "userAgentMode"); + } + if (normalized.cacheMode !== undefined) { + assertOneOf(normalized.cacheMode, CACHE_MODES, "cacheMode"); + } + if (normalized.mixedContentMode !== undefined) { + assertOneOf( + normalized.mixedContentMode, + MIXED_CONTENT_MODES, + "mixedContentMode", + ); + } + if (normalized.algorithmicDarkening !== undefined) { + assertOneOf( + normalized.algorithmicDarkening, + DARKENING_MODES, + "algorithmicDarkening", + ); + } + if (normalized.textZoom !== undefined) { + normalized.textZoom = clamp(normalized.textZoom, 25, 500); + } + if (normalized.initialScale !== undefined) { + normalized.initialScale = clamp(normalized.initialScale, 0, 1000); + } + if (normalized.profileName !== undefined && normalized.profileName !== null) { + normalized.profileName = normalizeProfileName(normalized.profileName); + } + + return normalized; +} + +/** + * Profile names are passed to the WebView provider verbatim. Rewriting them + * would let distinct requests collide onto one shared profile, so invalid + * names are rejected instead. + */ +function normalizeProfileName(profileName) { + const name = String(profileName); + if (!/^[A-Za-z0-9_-]{1,64}$/.test(name)) { + throw new Error( + `Unsupported WebView profileName: "${name}". Use 1-64 characters from A-Z, a-z, 0-9, "_" or "-".`, + ); + } + if (name.startsWith("acode_incognito_")) { + throw new Error( + `Unsupported WebView profileName: "${name}" uses the reserved "acode_incognito_" prefix.`, + ); + } + return name; +} + +/** Normalizes a partial settings update passed to configure(). */ +function normalizeSettings(settings) { + if (settings == null) return {}; + if (typeof settings !== "object") { + throw new TypeError("WebView settings must be an object"); + } + + const normalized = {}; + for (const key of SETTING_KEYS) { + if (settings[key] !== undefined) normalized[key] = settings[key]; + } + + if (normalized.userAgentMode !== undefined) { + assertOneOf(normalized.userAgentMode, USER_AGENT_MODES, "userAgentMode"); + } + if (normalized.cacheMode !== undefined) { + assertOneOf(normalized.cacheMode, CACHE_MODES, "cacheMode"); + } + if (normalized.mixedContentMode !== undefined) { + assertOneOf( + normalized.mixedContentMode, + MIXED_CONTENT_MODES, + "mixedContentMode", + ); + } + if (normalized.algorithmicDarkening !== undefined) { + assertOneOf( + normalized.algorithmicDarkening, + DARKENING_MODES, + "algorithmicDarkening", + ); + } + if (normalized.textZoom !== undefined) { + normalized.textZoom = clamp(normalized.textZoom, 25, 500); + } + if (normalized.initialScale !== undefined) { + normalized.initialScale = clamp(normalized.initialScale, 0, 1000); + } + + return normalized; +} + +function parseMessage(message) { + if (typeof message !== "string") return message; + try { + return JSON.parse(message); + } catch (_) { + return message; } } -class WebView { - constructor(id, options = {}) { +export class AcodeWebView { + constructor(id, options = {}, capabilities = {}) { this.id = id; - this.options = options; + this.options = Object.freeze({ ...options }); + this.capabilities = Object.freeze({ ...capabilities }); + this._messageCallbacks = []; this._eventCallbacks = []; + this._anyCallbacks = []; this._destroyed = false; this._destroyPromise = null; + this._ready = false; + this._settings = { ...options }; + this._state = { + url: "", + title: "", + progress: 0, + loading: false, + canGoBack: false, + canGoForward: false, + isolated: options.isolated === true, + profileName: options.profileName ?? null, + }; instances.set(id, this); } - async loadURL(url) { + get isDestroyed() { + return this._destroyed; + } + + /** True once the native WebView exists (see waitForReady). */ + get ready() { + return this._ready; + } + + get isIncognito() { + return this.options.incognito === true; + } + + /** True when the instance runs in its own isolated WebView profile. */ + get isIsolated() { + return this._state.isolated; + } + + get profileName() { + return this._state.profileName; + } + + get url() { + return this._state.url; + } + + get title() { + return this._state.title; + } + + get progress() { + return this._state.progress; + } + + get loading() { + return this._state.loading; + } + + get canGoBack() { + return this._state.canGoBack; + } + + get canGoForward() { + return this._state.canGoForward; + } + + // ------------------------------------------------------------------ + // Navigation / content + // ------------------------------------------------------------------ + + async loadURL(url, headers) { this._checkDestroyed(); - await nativeBridge.loadURL(this.id, url); + await nativeBridge.loadURL(this.id, url, headers); } - async loadHTML(html) { + async loadHTML(html, options) { this._checkDestroyed(); - await nativeBridge.loadHTML(this.id, html); + await nativeBridge.loadHTML(this.id, html, options); } async evaluate(js) { @@ -79,52 +378,350 @@ class WebView { return await nativeBridge.evaluate(this.id, js); } - onMessage(callback) { + async postMessage(message) { this._checkDestroyed(); - if (typeof callback === "function") { - this._messageCallbacks.push(callback); - } + await nativeBridge.postMessage(this.id, message); } - offMessage(callback) { - this._messageCallbacks = this._messageCallbacks.filter( - (cb) => cb !== callback, - ); + async reload() { + this._checkDestroyed(); + await nativeBridge.reload(this.id); } - on(event, callback) { + async stopLoading() { this._checkDestroyed(); - if (typeof callback === "function") { - this._eventCallbacks.push({ event, callback }); - } + await nativeBridge.stopLoading(this.id); } - off(event, callback) { - this._eventCallbacks = this._eventCallbacks.filter( - (entry) => !(entry.event === event && entry.callback === callback), - ); + async goBack() { + this._checkDestroyed(); + return await nativeBridge.goBack(this.id); } - async postMessage(message) { + async goForward() { this._checkDestroyed(); - await nativeBridge.postMessage(this.id, message); + return await nativeBridge.goForward(this.id); + } + + /** Re-reads history flags from the native WebView and updates state. */ + async refreshHistory() { + this._checkDestroyed(); + const [back, forward] = await Promise.all([ + nativeBridge.canGoBack(this.id), + nativeBridge.canGoForward(this.id), + ]); + this._state.canGoBack = !!back; + this._state.canGoForward = !!forward; + return { + canGoBack: this._state.canGoBack, + canGoForward: this._state.canGoForward, + }; } + /** + * Resolves once the native WebView exists. Hidden instances are ready by + * the time create() resolves; fullscreen instances become ready when their + * activity builds the WebView (which may be after show()). Rejects on + * close/destroy or timeout. + */ + async waitForReady(timeout = 15000) { + this._checkDestroyed(); + if (this._ready) return; + + return new Promise((resolve, reject) => { + let timer = null; + + const cleanup = () => { + this.off(WebViewEvents.READY, onReady); + this.off(WebViewEvents.CLOSED, onClosed); + this.off(WebViewEvents.DESTROYED, onClosed); + if (timer) clearTimeout(timer); + }; + + const settle = (error) => { + cleanup(); + if (error) reject(error); + else resolve(); + }; + + const onReady = () => { + this._ready = true; + settle(null); + }; + const onClosed = () => + settle(new Error("WebView closed before it became ready")); + + // Subscribe before the native probe: a "ready" event may already be + // in flight, and it must not be lost between the check and the wait. + this.on(WebViewEvents.READY, onReady); + this.on(WebViewEvents.CLOSED, onClosed); + this.on(WebViewEvents.DESTROYED, onClosed); + + if (timeout > 0) { + timer = setTimeout( + () => + settle( + new Error("Timed out waiting for the WebView to become ready"), + ), + timeout, + ); + } + + // Hidden instances emit "ready" before the JS instance exists, so + // the event above is not enough on its own. + this.getInfo() + .then((info) => { + if (info && info.ready) { + this._ready = true; + settle(null); + } + }) + .catch(() => { + // Destroyed while probing; the CLOSED/DESTROYED listener or + // the timeout will settle the promise. + }); + }); + } + + /** + * Resolves when the main frame finishes loading (the "pageFinished" event), + * or rejects on a main-frame load error, close/destroy, or timeout. + * + * Attach it *before* starting the navigation, because loadURL()/loadHTML() + * resolve as soon as the load is initiated: + * + * const loaded = wv.waitForLoad(); + * await wv.loadURL("https://example.com"); + * await loaded; // now evaluate() sees the real document + */ + waitForLoad(timeout = 15000) { + this._checkDestroyed(); + + return new Promise((resolve, reject) => { + let timer = null; + + const cleanup = () => { + this.off(WebViewEvents.PAGE_FINISHED, onFinished); + this.off(WebViewEvents.RESOURCE_ERROR, onError); + this.off(WebViewEvents.CLOSED, onClosed); + this.off(WebViewEvents.DESTROYED, onClosed); + this.off(WebViewEvents.RENDER_PROCESS_GONE, onRendererGone); + if (timer) clearTimeout(timer); + }; + + const settle = (error, value) => { + cleanup(); + if (error) reject(error); + else resolve(value); + }; + + const onFinished = (data) => settle(null, data); + const onError = (data) => { + // Ignore subresource failures (images, scripts, …). + if (data && data.isForMainFrame === false) return; + const detail = data?.description ? `: ${data.description}` : ""; + settle(new Error(`WebView failed to load${detail}`)); + }; + const onClosed = () => + settle(new Error("WebView closed before it finished loading")); + const onRendererGone = () => + settle( + new Error( + "WebView renderer process exited before it finished loading", + ), + ); + + this.on(WebViewEvents.PAGE_FINISHED, onFinished); + this.on(WebViewEvents.RESOURCE_ERROR, onError); + this.on(WebViewEvents.CLOSED, onClosed); + this.on(WebViewEvents.DESTROYED, onClosed); + this.on(WebViewEvents.RENDER_PROCESS_GONE, onRendererGone); + + if (timeout > 0) { + timer = setTimeout( + () => + settle( + new Error("Timed out waiting for the WebView to finish loading"), + ), + timeout, + ); + } + }); + } + + // ------------------------------------------------------------------ + // Visibility + // ------------------------------------------------------------------ + async show() { this._checkDestroyed(); await nativeBridge.show(this.id); + this._dispatch(WebViewEvents.SHOWN); } async hide() { this._checkDestroyed(); await nativeBridge.hide(this.id); + this._dispatch(WebViewEvents.HIDDEN); } - async reload() { + // ------------------------------------------------------------------ + // Data / settings + // ------------------------------------------------------------------ + + async clearCache(includeDiskFiles = true) { this._checkDestroyed(); - await nativeBridge.reload(this.id); + await nativeBridge.clearCache(this.id, includeDiskFiles); + } + + async clearHistory() { + this._checkDestroyed(); + await nativeBridge.clearHistory(this.id); + this._state.canGoBack = false; + this._state.canGoForward = false; + } + + async clearFormData() { + this._checkDestroyed(); + await nativeBridge.clearFormData(this.id); + } + + /** Sets a custom user agent, or a preset via userAgentMode. */ + async setUserAgent(userAgent, mode) { + this._checkDestroyed(); + this._settings = await nativeBridge.setUserAgent(this.id, userAgent, mode); + return this._settings; + } + + async getUserAgent() { + this._checkDestroyed(); + return await nativeBridge.getUserAgent(this.id); + } + + /** Applies a partial batch of WebSettings and resolves to the result. */ + async configure(settings) { + this._checkDestroyed(); + this._settings = await nativeBridge.updateSettings( + this.id, + normalizeSettings(settings), + ); + return this._settings; + } + + async getSettings() { + this._checkDestroyed(); + this._settings = await nativeBridge.getSettings(this.id); + return this._settings; + } + + /** Live snapshot: url, title, progress, history, isolation, UA, … */ + async getInfo() { + this._checkDestroyed(); + const info = await nativeBridge.getInfo(this.id); + if (info && typeof info === "object") { + this._state.url = info.url ?? this._state.url; + this._state.title = info.title ?? this._state.title; + this._state.progress = info.progress ?? this._state.progress; + this._state.loading = info.loading ?? this._state.loading; + this._state.canGoBack = info.canGoBack ?? this._state.canGoBack; + this._state.canGoForward = info.canGoForward ?? this._state.canGoForward; + if (info.isolated !== undefined) { + this._state.isolated = info.isolated === true; + } + if (info.profileName !== undefined) { + this._state.profileName = info.profileName ?? null; + } + } + return info; + } + + // ------------------------------------------------------------------ + // Events + // ------------------------------------------------------------------ + + /** + * Subscribes to an event. The callback receives (data, eventName), and + * passing "*" subscribes to every event. Returns the instance for chaining. + */ + on(event, callback) { + this._checkDestroyed(); + if (typeof callback !== "function") { + throw new TypeError("WebView event callback must be a function"); + } + this._eventCallbacks.push({ event, callback }); + return this; } + off(event, callback) { + this._eventCallbacks = this._eventCallbacks.filter( + (entry) => + !( + entry.event === event && + (entry.callback === callback || entry.callback._original === callback) + ), + ); + return this; + } + + /** Subscribes to a single dispatch of an event. */ + once(event, callback) { + const wrapper = (data, name) => { + this.off(event, wrapper); + callback(data, name); + }; + // Allow off(event, originalCallback) to remove a pending once listener. + wrapper._original = callback; + return this.on(event, wrapper); + } + + /** Subscribes to every event; the callback receives (eventName, data). */ + onAny(callback) { + this._checkDestroyed(); + if (typeof callback !== "function") { + throw new TypeError("WebView event callback must be a function"); + } + this._anyCallbacks.push(callback); + return this; + } + + offAny(callback) { + this._anyCallbacks = this._anyCallbacks.filter((cb) => cb !== callback); + return this; + } + + /** Removes listeners for one event, or every listener when omitted. */ + removeAllListeners(event) { + if (event === undefined) { + this._eventCallbacks = []; + this._anyCallbacks = []; + } else { + this._eventCallbacks = this._eventCallbacks.filter( + (entry) => entry.event !== event, + ); + } + return this; + } + + /** Receives messages posted by the hosted page via window.webview.postMessage. */ + onMessage(callback) { + this._checkDestroyed(); + if (typeof callback === "function") { + this._messageCallbacks.push(callback); + } + return this; + } + + offMessage(callback) { + this._messageCallbacks = this._messageCallbacks.filter( + (cb) => cb !== callback, + ); + return this; + } + + // ------------------------------------------------------------------ + // Teardown + // ------------------------------------------------------------------ + async destroy() { this._checkDestroyed(); if (!this._destroyPromise) { @@ -132,8 +729,8 @@ class WebView { await nativeBridge.destroy(this.id); this._destroyed = true; instances.delete(this.id); - this._messageCallbacks = []; - this._eventCallbacks = []; + this._dispatch(WebViewEvents.DESTROYED); + this._clearListeners(); })(); } @@ -144,6 +741,115 @@ class WebView { } } + // ------------------------------------------------------------------ + // Internals + // ------------------------------------------------------------------ + + _handleEvent(event, data) { + if (event === WebViewEvents.READY) { + this._ready = true; + } + this._applyState(event, data); + this._dispatch(event, data); + + if (TERMINAL_EVENTS.has(event)) { + this._destroyed = true; + instances.delete(this.id); + this._clearListeners(); + } + } + + _handleMessage(message) { + const parsed = parseMessage(message); + for (const callback of this._messageCallbacks.slice()) { + try { + callback(parsed); + } catch (error) { + console.error("WebView message callback error:", error); + } + } + } + + _applyState(event, data) { + const payload = data && typeof data === "object" ? data : {}; + switch (event) { + case WebViewEvents.READY: + // Isolation metadata is only final once the native WebView exists + // and the profile has been bound (deferred fullscreen instances). + if (payload.isolated !== undefined) { + this._state.isolated = payload.isolated === true; + } + if (payload.profileName !== undefined) { + this._state.profileName = payload.profileName ?? null; + } + break; + case WebViewEvents.PAGE_STARTED: + if (payload.url !== undefined) this._state.url = payload.url; + this._state.loading = true; + break; + case WebViewEvents.PAGE_COMMIT_VISIBLE: + if (payload.url !== undefined) this._state.url = payload.url; + break; + case WebViewEvents.PAGE_FINISHED: + if (payload.url !== undefined) this._state.url = payload.url; + if (payload.title !== undefined) this._state.title = payload.title; + this._state.loading = false; + this._state.progress = 100; + break; + case WebViewEvents.PROGRESS: { + const progress = Number(payload.progress); + if (Number.isFinite(progress)) { + this._state.progress = progress; + this._state.loading = progress < 100; + } + break; + } + case WebViewEvents.TITLE_CHANGED: + if (payload.title !== undefined) this._state.title = payload.title; + break; + case WebViewEvents.HISTORY_CHANGED: + if (payload.canGoBack !== undefined) { + this._state.canGoBack = !!payload.canGoBack; + } + if (payload.canGoForward !== undefined) { + this._state.canGoForward = !!payload.canGoForward; + } + break; + case WebViewEvents.NAVIGATION_REQUESTED: + if (payload.allowed && payload.url !== undefined) { + this._state.url = payload.url; + } + break; + default: + break; + } + } + + _dispatch(event, data) { + for (const entry of this._eventCallbacks.slice()) { + if (entry.event !== event && entry.event !== "*") continue; + try { + entry.callback(data, event); + } catch (error) { + console.error("WebView event callback error:", error); + } + } + + for (const callback of this._anyCallbacks.slice()) { + try { + callback(event, data); + } catch (error) { + console.error("WebView event callback error:", error); + } + } + } + + _clearListeners() { + this._messageCallbacks = []; + this._eventCallbacks = []; + this._anyCallbacks = []; + } + _checkDestroyed() { if (this._destroyed) { throw new Error("WebView has been destroyed"); @@ -151,27 +857,78 @@ class WebView { } } -const webviewAPI = { - async create(options = {}) { - ensureInit(); +/** + * Creates a WebView. Options are validated up front; the resolved set of + * options (including native defaults) is available as instance.options. + */ +async function create(options = {}) { + ensureInit(); - const mode = options.mode || "hidden"; - if (mode !== "fullscreen" && mode !== "hidden") { - throw new Error( - `Unsupported WebView mode: "${mode}". Use "fullscreen" or "hidden".`, - ); - } + const normalized = normalizeOptions(options); + const result = await nativeBridge.create(normalized); + const resolved = typeof result === "string" ? { id: result } : result || {}; + const id = resolved.id; + if (!id) { + throw new Error("Native WebView creation did not return an id"); + } - const id = await nativeBridge.create({ - title: options.title || "", - mode, - allowNavigation: options.allowNavigation !== false, - allowDownloads: options.allowDownloads === true, - visible: options.visible !== false, - }); + const nativeOptions = { ...normalized, ...(resolved.options || {}) }; + if (resolved.isolated !== undefined) { + nativeOptions.isolated = resolved.isolated; + } + if (resolved.profileName) { + nativeOptions.profileName = resolved.profileName; + } + + const instance = new AcodeWebView( + id, + nativeOptions, + resolved.capabilities || {}, + ); + if (resolved.isolated !== undefined) { + // Trust the native isolation result over any requested profile name. + instance._state.isolated = resolved.isolated === true; + instance._state.profileName = resolved.profileName ?? null; + } else if (resolved.profileName !== undefined) { + instance._state.profileName = resolved.profileName ?? null; + } + instance._ready = resolved.ready === true; + return instance; +} - return new WebView(id, options); +/** Resolves the plugin's feature support (multi-profile, document-start, …). */ +async function getCapabilities() { + ensureInit(); + if (!cachedCapabilities) { + cachedCapabilities = await nativeBridge.capabilities(); + } + return cachedCapabilities; +} + +const webviewAPI = { + create, + getCapabilities, + /** Live instance for an id, or null when it no longer exists. */ + get(id) { + return instances.get(id) || null; + }, + /** Ids of all live instances. */ + list() { + return Array.from(instances.keys()); + }, + /** Destroys every live instance, ignoring individual failures. */ + async destroyAll() { + await Promise.allSettled( + Array.from(instances.values()).map((instance) => instance.destroy()), + ); }, + AcodeWebView, + events: WebViewEvents, + modes: WebViewModes, + cacheModes: CacheModes, + mixedContentModes: MixedContentModes, + userAgentModes: UserAgentModes, + algorithmicDarkeningModes: AlgorithmicDarkeningModes, }; export default webviewAPI; diff --git a/src/plugins/webview/package.json b/src/plugins/webview/package.json index 673be361cb..67641909fa 100644 --- a/src/plugins/webview/package.json +++ b/src/plugins/webview/package.json @@ -1,7 +1,7 @@ { "name": "cordova-plugin-acode-webview", - "version": "1.0.0", - "description": "Acode WebView Plugin API", + "version": "2.0.0", + "description": "Acode WebView Plugin API - Create and manage isolated WebView instances", "main": "", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" diff --git a/src/plugins/webview/plugin.xml b/src/plugins/webview/plugin.xml index c7a6ff773d..e12862da9c 100644 --- a/src/plugins/webview/plugin.xml +++ b/src/plugins/webview/plugin.xml @@ -1,6 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-acode-webview" version="2.0.0"> cordova-plugin-acode-webview Acode WebView Plugin API - Create and manage isolated WebView instances Apache 2.0 @@ -18,9 +18,16 @@ + + + + + diff --git a/src/plugins/webview/src/android/com/foxdebug/webview/ProfileManager.java b/src/plugins/webview/src/android/com/foxdebug/webview/ProfileManager.java new file mode 100644 index 0000000000..1968d6aebd --- /dev/null +++ b/src/plugins/webview/src/android/com/foxdebug/webview/ProfileManager.java @@ -0,0 +1,252 @@ +package com.foxdebug.webview; + +import android.util.Log; +import android.webkit.CookieManager; +import android.webkit.WebStorage; +import android.webkit.WebView; +import androidx.webkit.Profile; +import androidx.webkit.ProfileStore; +import androidx.webkit.WebStorageCompat; +import androidx.webkit.WebViewCompat; +import androidx.webkit.WebViewFeature; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + +/** + * Incognito / profile isolation built on AndroidX WebKit's multi-profile API. + * + *

    WebView profiles provide a genuinely separate cookie jar and web-storage + * area, which is what "incognito" needs. Support depends on the installed + * WebView provider ({@link WebViewFeature#MULTI_PROFILE}); when it is missing + * {@link #acquire} returns {@code null} and the instance falls back to the + * best-effort behaviour documented on {@code WebViewInstance}. + * + *

    A profile is acquired when the instance is created (so its isolation state + * is known before the lazily created fullscreen WebView exists) and bound to + * the WebView once it is constructed. Profiles are reference counted so several + * instances can share one. Data is cleared when the last instance goes away, + * and auto-generated incognito profiles are also deleted. + */ +final class ProfileManager { + + private static final String TAG = "AcodeWebView"; + private static final String EPHEMERAL_PREFIX = "acode_incognito_"; + private static final int MAX_NAME_LENGTH = 64; + + /** + * Profile names are passed to the WebView provider verbatim, so they must be + * canonical. Anything else is rejected instead of being rewritten, which + * would let two different requested names collide onto one shared profile. + */ + private static final Pattern VALID_NAME = Pattern.compile("[A-Za-z0-9_-]{1," + MAX_NAME_LENGTH + "}"); + + private static final Map refCounts = new HashMap<>(); + + private ProfileManager() {} + + static boolean isSupported() { + try { + return WebViewFeature.isFeatureSupported(WebViewFeature.MULTI_PROFILE); + } catch (Throwable t) { + return false; + } + } + + static boolean canDeleteBrowsingData() { + try { + return WebViewFeature.isFeatureSupported(WebViewFeature.DELETE_BROWSING_DATA); + } catch (Throwable t) { + return false; + } + } + + /** True when {@code name} can be used verbatim as a WebView profile name. */ + static boolean isValidName(String name) { + return name != null && VALID_NAME.matcher(name).matches(); + } + + /** True for the reserved namespace used by auto-generated incognito profiles. */ + static boolean isReservedName(String name) { + return name != null && name.startsWith(EPHEMERAL_PREFIX); + } + + /** + * Validates a caller-supplied profile name. Rejecting (rather than rewriting) + * guarantees distinct requested names never select the same profile. + */ + static void requireValidUserName(String name) { + if (!isValidName(name)) { + throw new IllegalArgumentException( + "Unsupported profileName: \"" + name + + "\". Use 1-" + MAX_NAME_LENGTH + " characters from A-Z, a-z, 0-9, \"_\" or \"-\"." + ); + } + if (isReservedName(name)) { + throw new IllegalArgumentException( + "Unsupported profileName: \"" + name + "\" uses the reserved \"" + + EPHEMERAL_PREFIX + "\" prefix." + ); + } + } + + /** Name for an auto-generated, ephemeral incognito profile. */ + static String ephemeralName(String id) { + StringBuilder builder = new StringBuilder(EPHEMERAL_PREFIX); + String source = id != null ? id : ""; + for (int i = 0; i < source.length() && builder.length() < MAX_NAME_LENGTH; i++) { + char c = source.charAt(i); + if (Character.isLetterOrDigit(c) || c == '_' || c == '-') { + builder.append(c); + } + } + return builder.toString(); + } + + /** + * Creates (or joins) the named profile and takes a reference. Runs on the UI + * thread, before the WebView exists. Returns null when isolation is not + * available; callers then use the documented fallback. + */ + static Profile acquire(String profileName) { + if (profileName == null || !isSupported()) return null; + try { + ProfileStore store = ProfileStore.getInstance(); + Profile profile = store.getOrCreateProfile(profileName); + if (profile == null) return null; + + CookieManager cookies = profile.getCookieManager(); + if (cookies != null) { + cookies.setAcceptCookie(true); + } + + refCounts.merge(profileName, 1, Integer::sum); + return profile; + } catch (Throwable t) { + // Any provider-side failure degrades to the non-isolated fallback rather + // than failing instance creation. + Log.w(TAG, "Profile isolation unavailable for \"" + profileName + "\"", t); + return null; + } + } + + /** + * Binds an acquired profile to a freshly constructed WebView. Must run on the + * UI thread and before the WebView loads any content. + */ + static boolean bind(WebView view, Profile profile) { + if (view == null || profile == null) return false; + try { + WebViewCompat.setProfile(view, profile.getName()); + return true; + } catch (Throwable t) { + Log.w(TAG, "Could not bind profile \"" + profile.getName() + "\"", t); + return false; + } + } + + /** + * Releases one reference to a profile. When the last reference is gone the + * profile's browsing data is cleared and, if it was auto-generated for + * incognito, the profile itself is deleted. + */ + static void release(String profileName, boolean ephemeral, boolean clearData) { + if (profileName == null) return; + + Integer count = refCounts.get(profileName); + if (count == null) return; + if (count > 1) { + refCounts.put(profileName, count - 1); + return; + } + refCounts.remove(profileName); + + if (!clearData && !ephemeral) return; + + try { + ProfileStore store = ProfileStore.getInstance(); + Profile profile = store.getProfile(profileName); + if (profile == null) { + if (ephemeral) deleteQuietly(profileName); + return; + } + clearProfile(profile, () -> { + if (ephemeral) deleteQuietly(profileName); + }); + } catch (Throwable t) { + Log.w(TAG, "Could not release profile \"" + profileName + "\"", t); + } + } + + /** + * Deletes auto-generated incognito profiles left behind by a previous + * process (for example when the app was killed before cleanup ran). + */ + static void cleanupEphemeralProfiles() { + if (!isSupported()) return; + try { + ProfileStore store = ProfileStore.getInstance(); + List names = new ArrayList<>(store.getAllProfileNames()); + for (String name : names) { + if (name == null || !name.startsWith(EPHEMERAL_PREFIX)) continue; + Profile profile = store.getProfile(name); + if (profile == null) { + deleteQuietly(name); + } else { + clearProfile(profile, () -> deleteQuietly(name)); + } + } + } catch (Throwable t) { + Log.w(TAG, "Could not clean up ephemeral profiles", t); + } + } + + private static void clearProfile(Profile profile, Runnable onDone) { + try { + CookieManager cookies = profile.getCookieManager(); + if (cookies != null) { + cookies.removeAllCookies(null); + } + } catch (Throwable t) { + Log.w(TAG, "Could not clear profile cookies", t); + } + + WebStorage storage = null; + try { + storage = profile.getWebStorage(); + } catch (Throwable t) { + Log.w(TAG, "Could not access profile web storage", t); + } + + if (storage == null) { + if (onDone != null) onDone.run(); + return; + } + + if (canDeleteBrowsingData()) { + try { + WebStorageCompat.deleteBrowsingData(storage, onDone); + return; + } catch (Throwable t) { + Log.w(TAG, "deleteBrowsingData failed; falling back to deleteAllData", t); + } + } + + try { + storage.deleteAllData(); + } catch (Throwable t) { + Log.w(TAG, "Could not clear profile web storage", t); + } + if (onDone != null) onDone.run(); + } + + private static void deleteQuietly(String profileName) { + try { + ProfileStore.getInstance().deleteProfile(profileName); + } catch (Throwable t) { + Log.w(TAG, "Could not delete profile \"" + profileName + "\"", t); + } + } +} diff --git a/src/plugins/webview/src/android/com/foxdebug/webview/WebViewActivity.java b/src/plugins/webview/src/android/com/foxdebug/webview/WebViewActivity.java index 6090979a7d..849eaea57f 100644 --- a/src/plugins/webview/src/android/com/foxdebug/webview/WebViewActivity.java +++ b/src/plugins/webview/src/android/com/foxdebug/webview/WebViewActivity.java @@ -3,14 +3,21 @@ import android.app.Activity; import android.os.Build; import android.os.Bundle; +import android.view.View; import android.view.ViewGroup; import android.webkit.WebView; import android.widget.FrameLayout; +/** + * Hosts a "fullscreen" {@link WebViewInstance}: it shows the instance's WebView + * and renders fullscreen custom views (video, canvas, …) on top of it. + */ public class WebViewActivity extends Activity { private WebView webView; private String webviewId; + private FrameLayout container; + private View customView; @Override public void onCreate(Bundle savedInstanceState) { @@ -19,9 +26,7 @@ public void onCreate(Bundle savedInstanceState) { webviewId = getIntent().getStringExtra("webviewId"); // The plugin registers itself in pluginInitialize(), so the singleton is - // always available while the app is alive. Previously this read a static - // field that was never set, which made every fullscreen WebView close - // instantly because the instance lookup returned null. + // always available while the app is alive. WebViewPlugin plugin = WebViewPlugin.getInstance(); WebViewInstance instance = plugin != null ? plugin.getInstance(webviewId) : null; if (instance == null) { @@ -45,7 +50,7 @@ public void onCreate(Bundle savedInstanceState) { if (webView.getParent() != null) { ((ViewGroup) webView.getParent()).removeView(webView); } - FrameLayout container = new FrameLayout(this); + container = new FrameLayout(this); // Edge-to-edge is enforced on newer Android versions, so pad the content // out from under the status and navigation bars. WebViewInstance.applySystemBarInsets(container); @@ -60,8 +65,48 @@ public void onCreate(Bundle savedInstanceState) { } } + /** Renders a fullscreen custom view (e.g. a

    Instances are created by {@link WebViewPlugin} and can either be + * "fullscreen" (hosted by a {@link WebViewActivity}) or "hidden" (headless). + * Isolation is always on: file/content access is disabled and navigation is + * restricted to http(s). Incognito additionally routes the WebView through a + * private WebView profile when the provider supports it. + */ public class WebViewInstance { private static final String TAG = "WebViewInstance"; + private static final String BRIDGE_NAME = "AcodeWebViewNative"; + + private static final String EVENT_PAGE_STARTED = "pageStarted"; + private static final String EVENT_PAGE_FINISHED = "pageFinished"; + private static final String EVENT_PAGE_COMMIT_VISIBLE = "pageCommitVisible"; + private static final String EVENT_PROGRESS = "progressChanged"; + private static final String EVENT_TITLE_CHANGED = "titleChanged"; + private static final String EVENT_FAVICON_CHANGED = "faviconChanged"; + private static final String EVENT_HISTORY_CHANGED = "historyChanged"; + private static final String EVENT_SCROLL_CHANGED = "scrollChanged"; + private static final String EVENT_NAVIGATION_REQUESTED = "navigationRequested"; + private static final String EVENT_NAVIGATION_BLOCKED = "navigationBlocked"; + private static final String EVENT_RESOURCE_ERROR = "resourceError"; + private static final String EVENT_HTTP_ERROR = "httpError"; + private static final String EVENT_SSL_ERROR = "sslError"; + private static final String EVENT_CONSOLE_MESSAGE = "consoleMessage"; + private static final String EVENT_JS_ALERT = "jsAlert"; + private static final String EVENT_JS_CONFIRM = "jsConfirm"; + private static final String EVENT_JS_PROMPT = "jsPrompt"; + private static final String EVENT_JS_BEFORE_UNLOAD = "jsBeforeUnload"; + private static final String EVENT_PERMISSION_REQUEST = "permissionRequest"; + private static final String EVENT_GEOLOCATION_PERMISSION = "geolocationPermissionRequest"; + private static final String EVENT_FULLSCREEN_CHANGED = "fullscreenChanged"; + private static final String EVENT_WINDOW_REQUESTED = "windowRequested"; + private static final String EVENT_DOWNLOAD_REQUESTED = "downloadRequested"; + private static final String EVENT_DOWNLOAD_STARTED = "downloadStarted"; + private static final String EVENT_DOWNLOAD_FAILED = "downloadFailed"; + private static final String EVENT_RENDER_PROCESS_GONE = "renderProcessGone"; + private static final String EVENT_READY = "ready"; + + private static final long SCROLL_EVENT_INTERVAL_MS = 80; /** - * Page-side messaging bridge. Injected on page started (best effort, runs - * before page scripts in most cases) and again on page finished (guaranteed). - * It is idempotent and non-destructive: the guard keeps callbacks registered - * by the page between the two injections intact. + * Page-side messaging bridge. Installed at document start when the provider + * supports it, and re-injected on page started/finished as a fallback. It is + * idempotent, so the guard keeps callbacks registered by the page intact + * across injections. */ private static final String BRIDGE_JS = "(function(){" + @@ -48,6 +107,7 @@ public class WebViewInstance { "var callbacks=[];" + "window.webview={" + "__acodeBridge:true," + + "platform:'android'," + "onMessage:function(cb){if(typeof cb==='function'){callbacks.push(cb);}}," + "offMessage:function(cb){callbacks=callbacks.filter(function(c){return c!==cb;});}," + "postMessage:function(msg){" + @@ -61,31 +121,41 @@ public class WebViewInstance { "})();"; final String id; - final String mode; - final String title; - final boolean allowNavigation; - final boolean allowDownloads; + final WebViewOptions options; final WebViewPlugin plugin; private WebView webView; - /** The activity hosting this instance in fullscreen mode, while alive. */ private WebViewActivity hostingActivity = null; - private boolean isDestroyed = false; - /** Content requested before the fullscreen WebView exists yet. */ + private boolean destroyed = false; + + /** Resolved WebView profile name, or null when isolation is unavailable. */ + private String profileName = null; + private Profile profile = null; + private boolean profileIsolated = false; + private boolean ephemeralProfile = false; + private String pendingUrl = null; + private Map pendingHeaders = null; private String pendingHtml = null; + private JSONObject pendingHtmlOptions = null; - WebViewInstance( - String id, String mode, String title, - boolean allowNavigation, boolean allowDownloads, - WebViewPlugin plugin - ) { + private String currentUrl = ""; + private String currentTitle = ""; + private int progress = 0; + private boolean loading = false; + + private View customView = null; + private WebChromeClient.CustomViewCallback customViewCallback = null; + private ScriptHandler documentStartScript = null; + private long lastScrollEventAt = 0L; + + WebViewInstance(String id, WebViewOptions options, WebViewPlugin plugin) { this.id = id; - this.mode = mode; - this.title = title; - this.allowNavigation = allowNavigation; - this.allowDownloads = allowDownloads; + this.options = options; this.plugin = plugin; + // Acquire the profile up front so isolation metadata is final before the + // (lazily created) fullscreen WebView exists. + acquireProfile(); } public WebView getWebView() { @@ -93,11 +163,24 @@ public WebView getWebView() { } String getTitle() { - return title; + return options.title; } boolean isFullscreen() { - return "fullscreen".equals(mode); + return "fullscreen".equals(options.mode); + } + + boolean isIncognito() { + return options.incognito; + } + + boolean isIsolated() { + return profileIsolated; + } + + /** Resolved WebView profile name, or null when no profile is in use. */ + String getProfileName() { + return profileName; } WebViewActivity getHostingActivity() { @@ -114,120 +197,170 @@ void clearHostingActivity(WebViewActivity activity) { } } + /** + * Creates the native WebView. Idempotent: a recreated hosting activity reuses + * the existing WebView (and its page state) instead of leaking a new one. + */ void createWebView(Activity activity) { - // Idempotent: a recreated hosting activity reuses the existing WebView - // (and its page state) instead of leaking one instance per recreation. if (webView != null) return; - webView = new WebView(activity); - - WebSettings settings = webView.getSettings(); - settings.setJavaScriptEnabled(true); - settings.setDomStorageEnabled(true); - // Isolation: hosted content must not reach app/device data. File and - // content scheme access stay disabled, and loadURL()/navigation below - // only allow http(s), so these cannot be bypassed with a crafted URL. - settings.setAllowFileAccess(false); - settings.setAllowContentAccess(false); - setFileUrlAccessFlags(settings); - settings.setDisplayZoomControls(false); - settings.setLoadWithOverviewMode(true); - settings.setUseWideViewPort(true); - webView.setWebViewClient(new InstanceWebViewClient()); - webView.setWebChromeClient(new InstanceWebChromeClient()); - webView.setFocusable(true); - webView.setFocusableInTouchMode(true); + webView = new ScrollAwareWebView(activity); + bindProfile(); + options.applyTo(webView, activity); + configureClients(activity); + installBridge(); + applyPendingContent(); + Payload ready = data() + .put("mode", options.mode) + .put("isolated", profileIsolated) + .put("profileName", profileName != null ? profileName : JSONObject.NULL); + emit(EVENT_READY, ready); + } - webView.addJavascriptInterface(new JsBridge(), "AcodeWebViewNative"); + /** True once the native WebView exists and can accept evaluate(). */ + boolean isReady() { + return webView != null && !destroyed; + } - if (allowDownloads) { - webView.setDownloadListener(new InstanceDownloadListener(activity)); + /** + * Resolves and acquires the WebView profile before any WebView exists. This + * makes {@link #isIsolated()} and {@link #getProfileName()} final at creation + * time, including for fullscreen instances whose WebView is created later. + */ + private void acquireProfile() { + String requested = options.profileName; + boolean explicit = requested != null && !requested.trim().isEmpty(); + + if (options.incognito) { + profileName = explicit ? requested.trim() : ProfileManager.ephemeralName(id); + ephemeralProfile = !explicit; + } else if (explicit) { + profileName = requested.trim(); + ephemeralProfile = false; } - injectBridge(webView); + if (profileName == null) return; - // Apply content requested while the WebView did not exist yet - // (fullscreen instances are created lazily by WebViewActivity). - if (pendingUrl != null) { - webView.loadUrl(pendingUrl); - pendingUrl = null; - pendingHtml = null; - } else if (pendingHtml != null) { - webView.loadDataWithBaseURL(null, pendingHtml, "text/html", "UTF-8", null); - pendingHtml = null; + profile = ProfileManager.acquire(profileName); + profileIsolated = profile != null; + if (!profileIsolated) { + // Multi-profile is unavailable on this provider. Fall back to + // best-effort incognito (no cache) without pretending to be isolated. + profileName = null; + ephemeralProfile = false; } } - @SuppressWarnings("deprecation") - private static void setFileUrlAccessFlags(WebSettings settings) { - settings.setAllowFileAccessFromFileURLs(false); - settings.setAllowUniversalAccessFromFileURLs(false); - } + /** Binds the acquired profile to the freshly constructed WebView. */ + private void bindProfile() { + if (profile == null) return; + if (ProfileManager.bind(webView, profile)) return; - private static void injectBridge(WebView view) { - view.evaluateJavascript(BRIDGE_JS, null); + // Binding failed: drop the reference and fall back to the non-isolated + // behaviour rather than leaking the profile. + ProfileManager.release(profileName, ephemeralProfile, false); + profile = null; + profileName = null; + ephemeralProfile = false; + profileIsolated = false; } /** - * Pads the view so content stays clear of the status and navigation bars. - * Required on API 35+ where edge-to-edge is enforced for the app; on older - * versions the window usually consumes the insets first, making the padding - * zero and this a no-op. + * Cookie manager backing this instance. Isolated profiles use their own jar + * so downloads and other native requests never cross the profile boundary. */ - @SuppressWarnings("deprecation") - static void applySystemBarInsets(final View view) { - view.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() { - @Override - public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) { - int left, top, right, bottom; - if (Build.VERSION.SDK_INT >= 30) { - Insets bars = insets.getInsets(WindowInsets.Type.systemBars()); - left = bars.left; - top = bars.top; - right = bars.right; - bottom = bars.bottom; - } else { - left = insets.getSystemWindowInsetLeft(); - top = insets.getSystemWindowInsetTop(); - right = insets.getSystemWindowInsetRight(); - bottom = insets.getSystemWindowInsetBottom(); - } - v.setPadding(left, top, right, bottom); - return insets; + CookieManager getCookieManager() { + try { + if (profile != null) { + CookieManager scoped = profile.getCookieManager(); + if (scoped != null) return scoped; } - }); + } catch (Throwable t) { + Log.w(TAG, "Could not access profile cookie manager", t); + } + return CookieManager.getInstance(); } - private static final Pattern SCHEME_PATTERN = - Pattern.compile("^([a-zA-Z][a-zA-Z0-9+\\-.]*)://"); + private void configureClients(Activity activity) { + webView.setWebViewClient(new InstanceWebViewClient()); + webView.setWebChromeClient(new InstanceWebChromeClient()); + webView.setFocusable(true); + webView.setFocusableInTouchMode(true); + webView.addJavascriptInterface(new JsBridge(), BRIDGE_NAME); - /** - * Allows only http and https URLs, so hosted pages can never reach local - * files, app content providers or execute javascript: URLs. Input without - * a "scheme://" prefix ("example.com", "localhost:8080/page") is treated - * as a host and loaded over https; anything that is not clearly a URL - * degrades into a harmless failed https load. - */ - private static String sanitizeUrl(String url) { - if (url == null) return null; - String trimmed = url.trim(); - if (trimmed.isEmpty()) return null; - Matcher matcher = SCHEME_PATTERN.matcher(trimmed); - if (matcher.find()) { - String scheme = matcher.group(1); - if (scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https")) { - return trimmed; + if (options.allowDownloads) { + webView.setDownloadListener(new InstanceDownloadListener(activity)); + } + } + + private void installBridge() { + try { + if (WebViewFeature.isFeatureSupported(WebViewFeature.DOCUMENT_START_SCRIPT)) { + documentStartScript = WebViewCompat.addDocumentStartJavaScript( + webView, + BRIDGE_JS, + Collections.singleton("*") + ); + if (documentStartScript != null) return; } - return null; // file://, content://, intent://, etc. + } catch (Throwable t) { + Log.w(TAG, "Document-start script unavailable; falling back to injection", t); } - return "https://" + trimmed; + injectBridge(webView); } - void loadURL(String url, final CallbackContext callbackContext) { - if (isDestroyed) { - callbackContext.error("WebView has been destroyed"); - return; + private static void injectBridge(WebView view) { + view.evaluateJavascript(BRIDGE_JS, null); + } + + private void applyPendingContent() { + if (webView == null) return; + if (pendingUrl != null) { + String url = pendingUrl; + Map headers = pendingHeaders; + clearPending(); + if (headers != null && !headers.isEmpty()) { + webView.loadUrl(url, headers); + } else { + webView.loadUrl(url); + } + } else if (pendingHtml != null) { + String html = pendingHtml; + JSONObject htmlOptions = pendingHtmlOptions; + clearPending(); + loadHtmlNow(html, htmlOptions); } + } + + private void clearPending() { + pendingUrl = null; + pendingHeaders = null; + pendingHtml = null; + pendingHtmlOptions = null; + } + + private void loadHtmlNow(String html, JSONObject htmlOptions) { + String baseUrl = null; + String mimeType = "text/html"; + String encoding = "UTF-8"; + String historyUrl = null; + + if (htmlOptions != null) { + baseUrl = sanitizeUrl(optString(htmlOptions, "baseUrl")); + mimeType = htmlOptions.optString("mimeType", mimeType); + encoding = htmlOptions.optString("encoding", encoding); + historyUrl = sanitizeUrl(optString(htmlOptions, "historyUrl")); + } + + webView.loadDataWithBaseURL(baseUrl, html, mimeType, encoding, historyUrl); + } + + // --------------------------------------------------------------------------- + // Page actions + // --------------------------------------------------------------------------- + + void loadURL(String url, JSONObject headers, final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; final String safeUrl = sanitizeUrl(url); if (safeUrl == null) { @@ -235,71 +368,58 @@ void loadURL(String url, final CallbackContext callbackContext) { return; } - // Fullscreen instances create their WebView lazily in WebViewActivity. + final Map headerMap = toStringMap(headers); + if (webView == null) { pendingUrl = safeUrl; + pendingHeaders = headerMap; pendingHtml = null; + pendingHtmlOptions = null; callbackContext.success(); return; } - runOnUiThread(new Runnable() { - @Override - public void run() { + runOnUiThread(() -> { + if (headerMap != null && !headerMap.isEmpty()) { + webView.loadUrl(safeUrl, headerMap); + } else { webView.loadUrl(safeUrl); - callbackContext.success(); } + callbackContext.success(); }); } - void loadHTML(final String html, final CallbackContext callbackContext) { - if (isDestroyed) { - callbackContext.error("WebView has been destroyed"); - return; - } + void loadHTML(String html, JSONObject htmlOptions, final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; if (webView == null) { pendingHtml = html; + pendingHtmlOptions = htmlOptions; pendingUrl = null; + pendingHeaders = null; callbackContext.success(); return; } - runOnUiThread(new Runnable() { - @Override - public void run() { - webView.loadDataWithBaseURL(null, html, "text/html", "UTF-8", null); - callbackContext.success(); - } + runOnUiThread(() -> { + loadHtmlNow(html, htmlOptions); + callbackContext.success(); }); } void evaluate(String js, final CallbackContext callbackContext) { - if (isDestroyed) { - callbackContext.error("WebView has been destroyed"); - return; - } - if (webView == null) { - callbackContext.error("WebView is not ready"); - return; - } - runOnUiThread(new Runnable() { - @Override - public void run() { - webView.evaluateJavascript(js, new ValueCallback() { - @Override - public void onReceiveValue(String value) { - callbackContext.success(decodeJsResult(value)); - } - }); - } - }); + if (rejectIfDestroyed(callbackContext)) return; + if (rejectIfNotReady(callbackContext)) return; + + runOnUiThread(() -> webView.evaluateJavascript(js, value -> + callbackContext.success(decodeJsResult(value)) + )); } /** - * evaluateJavascript() delivers the result as a JSON-encoded string. - * Decode it properly instead of stripping quotes by hand so escapes - * (newlines, unicode, quotes) survive the round trip. + * evaluateJavascript() delivers the result as a JSON-encoded string. Decode + * it properly instead of stripping quotes by hand so escapes (newlines, + * unicode, quotes) survive the round trip. */ private static String decodeJsResult(String value) { if (value == null) return null; @@ -313,19 +433,13 @@ private static String decodeJsResult(String value) { } void postMessage(String message, final CallbackContext callbackContext) { - if (isDestroyed) { - callbackContext.error("WebView has been destroyed"); - return; - } - if (webView == null) { - callbackContext.error("WebView is not ready"); - return; - } + if (rejectIfDestroyed(callbackContext)) return; + if (rejectIfNotReady(callbackContext)) return; - // JSONObject.quote() produces a safe JS string literal for any input, - // so a malicious or sloppy payload cannot break out of the string and - // inject code into the page context. The page receives a parsed value - // for JSON payloads and the raw string otherwise. + // JSONObject.quote() produces a safe JS string literal for any input, so a + // malicious or sloppy payload cannot break out of the string and inject + // code into the page context. The page receives a parsed value for JSON + // payloads and the raw string otherwise. final String js = "(function(){" + "var raw=" + JSONObject.quote(message) + ";" + @@ -333,40 +447,26 @@ void postMessage(String message, final CallbackContext callbackContext) { "if(window.webview&&window.webview._dispatch){window.webview._dispatch(msg);}" + "})();"; - runOnUiThread(new Runnable() { - @Override - public void run() { - webView.evaluateJavascript(js, null); - callbackContext.success(); - } + runOnUiThread(() -> { + webView.evaluateJavascript(js, null); + callbackContext.success(); }); } void show(final CallbackContext callbackContext) { - if (isDestroyed) { - callbackContext.error("WebView has been destroyed"); - return; - } + if (rejectIfDestroyed(callbackContext)) return; if (!isFullscreen()) { - callbackContext.error("Hidden WebViews cannot be shown; use mode \"fullscreen\" to display content"); + callbackContext.error( + "Hidden WebViews cannot be shown; use mode \"fullscreen\" to display content" + ); return; } - // Launches the hosting activity, or brings it back to the front if it - // is still alive (e.g. after hide() backgrounded it). - runOnUiThread(new Runnable() { - @Override - public void run() { - plugin.showFullscreenActivity(id); - } - }); + runOnUiThread(() -> plugin.showFullscreenActivity(id)); callbackContext.success(); } void hide(final CallbackContext callbackContext) { - if (isDestroyed) { - callbackContext.error("WebView has been destroyed"); - return; - } + if (rejectIfDestroyed(callbackContext)) return; if (!isFullscreen()) { // A hidden (headless) WebView is already hidden. callbackContext.success(); @@ -376,92 +476,429 @@ void hide(final CallbackContext callbackContext) { } /** - * Hiding a fullscreen WebView moves its hosting activity (and its task) - * to the background. Nothing is destroyed, so show() brings the same - * WebView back with its page state intact. The instance is only destroyed - * when the user actually closes it (back button/task removal) or when - * destroy() is called. + * Hiding a fullscreen WebView moves its hosting activity (and its task) to + * the background. Nothing is destroyed, so show() brings the same WebView + * back with its page state intact. The instance is only destroyed when the + * user actually closes it (back button/task removal) or destroy() is called. */ private void hideFullscreen(CallbackContext callbackContext) { - if (isDestroyed) { - callbackContext.error("WebView has been destroyed"); - return; - } - runOnUiThread(new Runnable() { - @Override - public void run() { - if (hostingActivity != null - && !hostingActivity.isFinishing() - && !hostingActivity.isDestroyed()) { - hostingActivity.moveTaskToBack(true); - } + runOnUiThread(() -> { + if (hostingActivity != null + && !hostingActivity.isFinishing() + && !hostingActivity.isDestroyed()) { + hostingActivity.moveTaskToBack(true); } }); callbackContext.success(); } void reload(final CallbackContext callbackContext) { - if (isDestroyed) { - callbackContext.error("WebView has been destroyed"); - return; - } - if (webView == null) { - callbackContext.error("WebView is not ready"); + if (rejectIfDestroyed(callbackContext)) return; + if (rejectIfNotReady(callbackContext)) return; + runOnUiThread(() -> { + webView.reload(); + callbackContext.success(); + }); + } + + void stopLoading(final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; + if (rejectIfNotReady(callbackContext)) return; + runOnUiThread(() -> { + webView.stopLoading(); + callbackContext.success(); + }); + } + + void goBack(final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; + if (rejectIfNotReady(callbackContext)) return; + runOnUiThread(() -> { + boolean moved = webView.canGoBack(); + if (moved) webView.goBack(); + sendBooleanResult(callbackContext, moved); + }); + } + + void goForward(final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; + if (rejectIfNotReady(callbackContext)) return; + runOnUiThread(() -> { + boolean moved = webView.canGoForward(); + if (moved) webView.goForward(); + sendBooleanResult(callbackContext, moved); + }); + } + + void canGoBack(final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; + if (rejectIfNotReady(callbackContext)) return; + runOnUiThread(() -> sendBooleanResult(callbackContext, webView.canGoBack())); + } + + void canGoForward(final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; + if (rejectIfNotReady(callbackContext)) return; + runOnUiThread(() -> sendBooleanResult(callbackContext, webView.canGoForward())); + } + + void clearCache(final boolean includeDiskFiles, final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; + if (rejectIfNotReady(callbackContext)) return; + runOnUiThread(() -> { + webView.clearCache(includeDiskFiles); + callbackContext.success(); + }); + } + + void clearHistory(final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; + if (rejectIfNotReady(callbackContext)) return; + runOnUiThread(() -> { + webView.clearHistory(); + callbackContext.success(); + }); + } + + void clearFormData(final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; + if (rejectIfNotReady(callbackContext)) return; + runOnUiThread(() -> { + webView.clearFormData(); + callbackContext.success(); + }); + } + + void setUserAgent(final String userAgent, final String mode, final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; + + final JSONObject partial = new JSONObject(); + try { + partial.put("userAgent", userAgent != null ? userAgent : JSONObject.NULL); + if (mode != null && !mode.isEmpty()) { + partial.put("userAgentMode", mode); + } + } catch (JSONException e) { + callbackContext.error(e.getMessage()); return; } - runOnUiThread(new Runnable() { - @Override - public void run() { - webView.reload(); - callbackContext.success(); + + applySettings(partial, callbackContext); + } + + void getUserAgent(final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; + runOnUiThread(() -> { + if (destroyed) { + callbackContext.error("WebView has been destroyed"); + return; + } + if (webView == null) { + // The WebView has not been created yet (fullscreen not shown); report + // the configured value instead of failing. + callbackContext.success(optString(options.settings(), "userAgent")); + return; + } + callbackContext.success(webView.getSettings().getUserAgentString()); + }); + } + + void updateSettings(final JSONObject partial, final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; + applySettings(partial, callbackContext); + } + + /** + * Applies a settings batch on the UI thread — WebSettings and WebView methods + * must be touched there — and completes the callback once it is applied. + */ + private void applySettings(final JSONObject partial, final CallbackContext callbackContext) { + runOnUiThread(() -> { + if (destroyed) { + callbackContext.error("WebView has been destroyed"); + return; + } + try { + JSONObject settings = options.update(webView, appContext(), partial); + callbackContext.success(settings); + } catch (Exception e) { + callbackContext.error(e.getMessage()); } }); } + void getSettings(final CallbackContext callbackContext) { + if (rejectIfDestroyed(callbackContext)) return; + runOnUiThread(() -> { + if (destroyed) { + callbackContext.error("WebView has been destroyed"); + return; + } + callbackContext.success(options.settings()); + }); + } + + void getInfo(final CallbackContext callbackContext) { + try { + final JSONObject info = new JSONObject(); + info.put("id", id); + info.put("mode", options.mode); + info.put("incognito", options.incognito); + info.put("isolated", profileIsolated); + info.put("destroyed", destroyed); + info.put("ready", isReady()); + if (profileName != null) { + info.put("profileName", profileName); + } + info.put("url", currentUrl); + info.put("title", currentTitle); + info.put("progress", progress); + info.put("loading", loading); + info.put("canGoBack", false); + info.put("canGoForward", false); + info.put("userAgent", optString(options.settings(), "userAgent")); + + if (destroyed || webView == null) { + callbackContext.success(info); + return; + } + + runOnUiThread(() -> { + try { + String url = webView.getUrl(); + if (url != null) currentUrl = url; + String pageTitle = webView.getTitle(); + if (pageTitle != null) currentTitle = pageTitle; + info.put("url", currentUrl); + info.put("title", currentTitle); + info.put("canGoBack", webView.canGoBack()); + info.put("canGoForward", webView.canGoForward()); + info.put("userAgent", webView.getSettings().getUserAgentString()); + } catch (JSONException e) { + Log.w(TAG, "Could not build full WebView info", e); + } + callbackContext.success(info); + }); + } catch (JSONException e) { + callbackContext.error(e.getMessage()); + } + } + + // --------------------------------------------------------------------------- + // Lifecycle + // --------------------------------------------------------------------------- + void destroy() { - if (isDestroyed) return; - isDestroyed = true; + if (destroyed) return; + destroyed = true; // Finish the hosting fullscreen activity, if any. Its onDestroy() calls - // destroy() again, which is a no-op now that isDestroyed is set. + // destroy() again, which is a no-op now that destroyed is set. WebViewActivity hosting = hostingActivity; hostingActivity = null; if (hosting != null && !hosting.isFinishing()) { hosting.finish(); } - runOnUiThread(new Runnable() { - @Override - public void run() { - if (webView != null) { + runOnUiThread(() -> { + exitCustomView(); + + if (documentStartScript != null) { + try { + documentStartScript.remove(); + } catch (Throwable t) { + Log.w(TAG, "Could not remove document-start script", t); + } + documentStartScript = null; + } + + if (webView != null) { + // On providers without multi-profile support, incognito can at least + // drop the shared HTTP cache and saved form data. + if (options.incognito && !profileIsolated) { + try { + webView.clearCache(true); + webView.clearFormData(); + } catch (Throwable t) { + Log.w(TAG, "Fallback incognito cleanup failed", t); + } + } + try { if (webView.getParent() != null) { ((ViewGroup) webView.getParent()).removeView(webView); } - webView.removeJavascriptInterface("AcodeWebViewNative"); + } catch (Throwable ignored) {} + try { + webView.removeJavascriptInterface(BRIDGE_NAME); webView.setDownloadListener(null); webView.setWebChromeClient(null); webView.setWebViewClient(null); + webView.stopLoading(); webView.loadUrl("about:blank"); webView.destroy(); + } catch (Throwable t) { + Log.w(TAG, "Error destroying WebView", t); } - webView = null; } + webView = null; + + if (profileName != null) { + ProfileManager.release(profileName, ephemeralProfile, options.incognito); + profileName = null; + } + profile = null; + profileIsolated = false; }); } - void onPageFinished(WebView view) { - // Navigation replaced the page's JS context, so the bridge injected into - // the previous document is gone. Re-inject (no-op if already present). + private void onPageFinished(WebView view) { + // Navigation replaced the page's JS context, so re-inject (no-op when the + // document-start script is already installed). injectBridge(view); - try { - JSONObject data = new JSONObject(); - String url = view.getUrl(); - String pageTitle = view.getTitle(); - data.put("url", url != null ? url : ""); - data.put("title", pageTitle != null ? pageTitle : ""); - plugin.sendEventToCordova(id, "pageFinished", data); - } catch (JSONException e) { - Log.e(TAG, "onPageFinished error", e); + String url = view.getUrl(); + currentUrl = url != null ? url : ""; + String pageTitle = view.getTitle(); + currentTitle = pageTitle != null ? pageTitle : ""; + loading = false; + emit(EVENT_PAGE_FINISHED, data() + .put("url", currentUrl) + .put("title", currentTitle)); + } + + private void onPageStarted(String url) { + currentUrl = url != null ? url : ""; + loading = true; + emit(EVENT_PAGE_STARTED, data().put("url", currentUrl)); + } + + private void onScrollChanged(int x, int y, int oldX, int oldY) { + long now = SystemClock.uptimeMillis(); + if (now - lastScrollEventAt < SCROLL_EVENT_INTERVAL_MS) return; + lastScrollEventAt = now; + emit(EVENT_SCROLL_CHANGED, data() + .put("scrollX", x) + .put("scrollY", y) + .put("oldScrollX", oldX) + .put("oldScrollY", oldY)); + } + + // --------------------------------------------------------------------------- + // Fullscreen custom views (video, canvas, …) + // --------------------------------------------------------------------------- + + void onShowCustomView(View view, WebChromeClient.CustomViewCallback callback) { + if (customView != null) { + callback.onCustomViewHidden(); + return; + } + customView = view; + customViewCallback = callback; + + WebViewActivity hosting = hostingActivity; + if (hosting == null || hosting.isFinishing()) { + // Headless instance: there is nowhere to render the view. Release it so + // the page is not left waiting. + exitCustomView(); + emit(EVENT_FULLSCREEN_CHANGED, data().put("fullscreen", true).put("supported", false)); + return; + } + + hosting.showCustomView(view); + emit(EVENT_FULLSCREEN_CHANGED, data().put("fullscreen", true).put("supported", true)); + } + + void onHideCustomView() { + if (customView == null) return; + exitCustomView(); + emit(EVENT_FULLSCREEN_CHANGED, data().put("fullscreen", false)); + } + + boolean isInCustomView() { + return customView != null; + } + + void exitCustomView() { + WebViewActivity hosting = hostingActivity; + if (hosting != null && !hosting.isFinishing()) { + hosting.hideCustomView(); + } + WebChromeClient.CustomViewCallback callback = customViewCallback; + customView = null; + customViewCallback = null; + if (callback != null) { + try { + callback.onCustomViewHidden(); + } catch (Throwable ignored) {} + } + } + + // --------------------------------------------------------------------------- + // Helpers + // --------------------------------------------------------------------------- + + /** + * Cordova's boolean callback overload is not available on every supported + * Android platform version, so send the boolean explicitly. + */ + private static void sendBooleanResult(CallbackContext callbackContext, boolean value) { + callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, value)); + } + + private boolean rejectIfDestroyed(CallbackContext callbackContext) { + if (!destroyed) return false; + callbackContext.error("WebView has been destroyed"); + return true; + } + + private boolean rejectIfNotReady(CallbackContext callbackContext) { + if (webView != null) return false; + callbackContext.error("WebView is not ready"); + return true; + } + + private Context appContext() { + WebViewActivity hosting = hostingActivity; + if (hosting != null) return hosting; + WebView view = webView; + if (view != null) return view.getContext(); + return plugin.getContext(); + } + + private void emit(String event, Payload data) { + plugin.sendEventToCordova(id, event, data.json); + } + + private static Payload data() { + return new Payload(); + } + + /** + * Tiny fluent builder for event payloads. org.json's put() throws a checked + * exception; swallowing it here keeps the many event call sites readable. + */ + private static final class Payload { + final JSONObject json = new JSONObject(); + + Payload put(String key, Object value) { + try { + json.put(key, value); + } catch (JSONException e) { + Log.w(TAG, "Could not add \"" + key + "\" to event payload", e); + } + return this; + } + } + + void download(String url, String userAgent, String mimeType, String fileName) { + // Pass this instance so the download uses its profile-scoped cookie jar. + boolean started = plugin.download(this, url, userAgent, mimeType, fileName); + if (started) { + emit(EVENT_DOWNLOAD_STARTED, data() + .put("url", url) + .put("fileName", fileName) + .put("mimeType", mimeType)); + } else { + emit(EVENT_DOWNLOAD_FAILED, data().put("url", url).put("fileName", fileName)); } } @@ -469,36 +906,110 @@ private static void runOnUiThread(Runnable runnable) { new Handler(Looper.getMainLooper()).post(runnable); } + private static Map toStringMap(JSONObject object) { + if (object == null || object.length() == 0) return null; + Map map = new HashMap<>(); + java.util.Iterator keys = object.keys(); + while (keys.hasNext()) { + String key = keys.next(); + Object value = object.opt(key); + if (value != null && value != JSONObject.NULL) { + map.put(key, String.valueOf(value)); + } + } + return map.isEmpty() ? null : map; + } + + private static String optString(JSONObject object, String key) { + if (object == null || !object.has(key) || object.isNull(key)) return null; + return object.optString(key, null); + } + + private static final Pattern SCHEME_PATTERN = + Pattern.compile("^([a-zA-Z][a-zA-Z0-9+\\-.]*)://"); + + /** + * Allows only http and https URLs, so hosted pages can never reach local + * files, app content providers or execute javascript: URLs. Input without a + * "scheme://" prefix ("example.com", "localhost:8080/page") is treated as a + * host and loaded over https; anything that is not clearly a URL degrades + * into a harmless failed https load. + */ + private static String sanitizeUrl(String url) { + if (url == null) return null; + String trimmed = url.trim(); + if (trimmed.isEmpty()) return null; + Matcher matcher = SCHEME_PATTERN.matcher(trimmed); + if (matcher.find()) { + String scheme = matcher.group(1); + if (scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https")) { + return trimmed; + } + return null; // file://, content://, intent://, etc. + } + return "https://" + trimmed; + } + + // --------------------------------------------------------------------------- + // Native WebView / client implementations + // --------------------------------------------------------------------------- + + /** Emits throttled scroll events; WebView does not expose a scroll listener. */ + private class ScrollAwareWebView extends WebView { + ScrollAwareWebView(Context context) { + super(context); + } + + @Override + protected void onScrollChanged(int l, int t, int oldl, int oldt) { + super.onScrollChanged(l, t, oldl, oldt); + WebViewInstance.this.onScrollChanged(l, t, oldl, oldt); + } + } + private class InstanceWebViewClient extends WebViewClient { + @Override public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) { - return shouldBlockNavigation(request.getUrl()); + return handleNavigation(request.getUrl()); } @SuppressWarnings("deprecation") @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { - return shouldBlockNavigation(Uri.parse(url)); + return handleNavigation(Uri.parse(url)); } /** * Blocks all navigation when allowNavigation is false. Even when it is * true, only http(s) targets may load inside the WebView; other schemes - * (file:, content:, intent:, javascript:, tel:, ...) are blocked so - * hostile pages cannot escape the sandbox or launch other apps. + * (file:, content:, intent:, javascript:, tel:, ...) are blocked so hostile + * pages cannot escape the sandbox or launch other apps. Every decision is + * announced through navigationRequested/navigationBlocked. */ - private boolean shouldBlockNavigation(Uri uri) { - if (!allowNavigation) return true; - String scheme = uri.getScheme(); - return scheme == null - || !(scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https")); + private boolean handleNavigation(Uri uri) { + String url = uri != null ? uri.toString() : ""; + String scheme = uri != null ? uri.getScheme() : null; + boolean httpScheme = scheme != null + && (scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https")); + boolean allowed = options.allowNavigation && httpScheme; + + emit(EVENT_NAVIGATION_REQUESTED, data().put("url", url).put("allowed", allowed)); + + if (!allowed) { + String reason = !options.allowNavigation ? "navigation-disabled" : "unsupported-scheme"; + emit(EVENT_NAVIGATION_BLOCKED, data().put("url", url).put("reason", reason)); + } + return !allowed; } @Override public void onPageStarted(WebView view, String url, Bitmap favicon) { super.onPageStarted(view, url, favicon); - // Best effort: gets the bridge in before the page's own scripts run. + // Best effort fallback: gets the bridge in before the page's scripts run + // on providers without document-start script support. injectBridge(view); + WebViewInstance.this.onPageStarted(url); } @Override @@ -506,19 +1017,227 @@ public void onPageFinished(WebView view, String url) { super.onPageFinished(view, url); WebViewInstance.this.onPageFinished(view); } + + @Override + public void onPageCommitVisible(WebView view, String url) { + super.onPageCommitVisible(view, url); + if (url != null) currentUrl = url; + emit(EVENT_PAGE_COMMIT_VISIBLE, data().put("url", url != null ? url : "")); + } + + @Override + public void onReceivedError( + WebView view, + WebResourceRequest request, + WebResourceError error + ) { + super.onReceivedError(view, request, error); + emit(EVENT_RESOURCE_ERROR, data() + .put("url", request.getUrl() != null ? request.getUrl().toString() : "") + .put("errorCode", error.getErrorCode()) + .put("description", String.valueOf(error.getDescription())) + .put("isForMainFrame", request.isForMainFrame())); + } + + @SuppressWarnings("deprecation") + @Override + public void onReceivedError( + WebView view, + int errorCode, + String description, + String failingUrl + ) { + super.onReceivedError(view, errorCode, description, failingUrl); + emit(EVENT_RESOURCE_ERROR, data() + .put("url", failingUrl != null ? failingUrl : "") + .put("errorCode", errorCode) + .put("description", description != null ? description : "") + .put("isForMainFrame", true)); + } + + @Override + public void onReceivedHttpError( + WebView view, + WebResourceRequest request, + WebResourceResponse errorResponse + ) { + super.onReceivedHttpError(view, request, errorResponse); + emit(EVENT_HTTP_ERROR, data() + .put("url", request.getUrl() != null ? request.getUrl().toString() : "") + .put("statusCode", errorResponse.getStatusCode()) + .put("reasonPhrase", errorResponse.getReasonPhrase() != null + ? errorResponse.getReasonPhrase() : "") + .put("isForMainFrame", request.isForMainFrame())); + } + + @Override + public void onReceivedSslError(WebView view, SslErrorHandler handler, android.net.http.SslError error) { + emit(EVENT_SSL_ERROR, data() + .put("url", error.getUrl() != null ? error.getUrl() : "") + .put("primaryError", error.getPrimaryError()) + .put("description", String.valueOf(error))); + // Never proceed past a certificate error. + handler.cancel(); + } + + @Override + public void doUpdateVisitedHistory(WebView view, String url, boolean isReload) { + super.doUpdateVisitedHistory(view, url, isReload); + emit(EVENT_HISTORY_CHANGED, data() + .put("url", url != null ? url : "") + .put("isReload", isReload) + .put("canGoBack", view.canGoBack()) + .put("canGoForward", view.canGoForward())); + } + + @Override + public boolean onRenderProcessGone(WebView view, RenderProcessGoneDetail detail) { + boolean didCrash = detail != null && detail.didCrash(); + emit(EVENT_RENDER_PROCESS_GONE, data().put("didCrash", didCrash)); + // The WebView can no longer be used; tear the instance down. + plugin.removeInstance(id); + destroy(); + return true; + } } private class InstanceWebChromeClient extends WebChromeClient { + + @Override + public void onProgressChanged(WebView view, int newProgress) { + super.onProgressChanged(view, newProgress); + progress = newProgress; + loading = newProgress < 100; + emit(EVENT_PROGRESS, data().put("progress", newProgress).put("url", currentUrl)); + } + @Override public void onReceivedTitle(WebView view, String pageTitle) { super.onReceivedTitle(view, pageTitle); - try { - JSONObject data = new JSONObject(); - data.put("title", pageTitle != null ? pageTitle : ""); - plugin.sendEventToCordova(id, "titleChanged", data); - } catch (JSONException e) { - Log.e(TAG, "onReceivedTitle error", e); + currentTitle = pageTitle != null ? pageTitle : ""; + emit(EVENT_TITLE_CHANGED, data().put("title", currentTitle)); + } + + @Override + public void onReceivedIcon(WebView view, Bitmap icon) { + super.onReceivedIcon(view, icon); + Payload payload = data().put("url", currentUrl); + if (icon != null) { + payload.put("width", icon.getWidth()); + payload.put("height", icon.getHeight()); } + emit(EVENT_FAVICON_CHANGED, payload); + } + + @Override + public boolean onConsoleMessage(ConsoleMessage consoleMessage) { + emit(EVENT_CONSOLE_MESSAGE, data() + .put("message", consoleMessage.message() != null ? consoleMessage.message() : "") + .put("level", consoleLevel(consoleMessage.messageLevel())) + .put("sourceId", consoleMessage.sourceId() != null ? consoleMessage.sourceId() : "") + .put("lineNumber", consoleMessage.lineNumber())); + return false; + } + + @Override + public boolean onJsAlert(WebView view, String url, String message, android.webkit.JsResult result) { + emit(EVENT_JS_ALERT, data().put("url", url).put("message", message)); + return false; // Let the WebView show its default dialog. + } + + @Override + public boolean onJsConfirm(WebView view, String url, String message, android.webkit.JsResult result) { + emit(EVENT_JS_CONFIRM, data().put("url", url).put("message", message)); + return false; + } + + @Override + public boolean onJsPrompt( + WebView view, + String url, + String message, + String defaultValue, + android.webkit.JsPromptResult result + ) { + emit(EVENT_JS_PROMPT, data() + .put("url", url) + .put("message", message) + .put("defaultValue", defaultValue != null ? defaultValue : "")); + return false; + } + + @Override + public boolean onJsBeforeUnload( + WebView view, + String url, + String message, + android.webkit.JsResult result + ) { + emit(EVENT_JS_BEFORE_UNLOAD, data().put("url", url).put("message", message)); + return false; + } + + @Override + public void onPermissionRequest(final PermissionRequest request) { + Payload payload = data(); + payload.put("origin", request.getOrigin() != null ? request.getOrigin().toString() : ""); + payload.put( + "resources", + new org.json.JSONArray(java.util.Arrays.asList(request.getResources())) + ); + emit(EVENT_PERMISSION_REQUEST, payload); + // Deny by default: hosted content never gets camera/mic/etc. implicitly. + request.deny(); + } + + @Override + public void onGeolocationPermissionsShowPrompt( + String origin, + GeolocationPermissions.Callback callback + ) { + emit(EVENT_GEOLOCATION_PERMISSION, data().put("origin", origin != null ? origin : "")); + boolean allow = options.settings().optBoolean("geolocation", false); + callback.invoke(origin, allow, false); + } + + @Override + public void onShowCustomView(View view, CustomViewCallback callback) { + WebViewInstance.this.onShowCustomView(view, callback); + } + + @Override + public void onHideCustomView() { + WebViewInstance.this.onHideCustomView(); + } + + @Override + public boolean onCreateWindow( + WebView view, + boolean isDialog, + boolean isUserGesture, + android.os.Message resultMsg + ) { + // Popups are not supported; announce and let the page keep running. + emit(EVENT_WINDOW_REQUESTED, data().put("url", view.getUrl() != null ? view.getUrl() : "")); + return false; + } + } + + private static String consoleLevel(ConsoleMessage.MessageLevel level) { + if (level == null) return "log"; + switch (level) { + case TIP: + return "tip"; + case LOG: + return "log"; + case WARNING: + return "warning"; + case ERROR: + return "error"; + case DEBUG: + return "debug"; + default: + return "log"; } } @@ -530,45 +1249,54 @@ private class InstanceDownloadListener implements DownloadListener { } @Override - public void onDownloadStart(final String url, final String userAgent, String contentDisposition, final String mimeType, long contentLength) { - if (isDestroyed) return; + public void onDownloadStart( + final String url, + final String userAgent, + String contentDisposition, + final String mimeType, + long contentLength + ) { + if (destroyed) return; if (context instanceof Activity && ((Activity) context).isFinishing()) return; // DownloadManager can only fetch http(s) URLs. String scheme = Uri.parse(url).getScheme(); if (scheme == null || !(scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https"))) { - runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(context, "This download type is not supported", Toast.LENGTH_SHORT).show(); - } - }); + runOnUiThread(() -> Toast.makeText( + context, + "This download type is not supported", + Toast.LENGTH_SHORT + ).show()); return; } final String fileName = URLUtil.guessFileName(url, contentDisposition, mimeType); String size = formatSize(contentLength); + + emit(EVENT_DOWNLOAD_REQUESTED, data() + .put("url", url) + .put("fileName", fileName) + .put("mimeType", mimeType != null ? mimeType : "") + .put("contentLength", contentLength) + .put("userAgent", userAgent != null ? userAgent : "") + .put("contentDisposition", contentDisposition != null ? contentDisposition : "")); + final String message = size.isEmpty() ? "Do you want to download \"" + fileName + "\"?" : "Do you want to download \"" + fileName + "\" (" + size + ")?"; - runOnUiThread(new Runnable() { - @Override - public void run() { - new AlertDialog.Builder(context) - .setTitle("Download file") - .setMessage(message) - .setPositiveButton("Download", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - plugin.download(url, userAgent, mimeType, fileName); - } - }) - .setNegativeButton("Cancel", null) - .show(); - } - }); + runOnUiThread(() -> new AlertDialog.Builder(context) + .setTitle("Download file") + .setMessage(message) + .setPositiveButton("Download", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + WebViewInstance.this.download(url, userAgent, mimeType, fileName); + } + }) + .setNegativeButton("Cancel", null) + .show()); } } @@ -576,10 +1304,42 @@ private static String formatSize(long bytes) { if (bytes <= 0) return ""; if (bytes < 1024) return bytes + " B"; if (bytes < 1024 * 1024) return String.format(Locale.US, "%.1f KB", bytes / 1024.0); - if (bytes < 1024L * 1024 * 1024) return String.format(Locale.US, "%.1f MB", bytes / (1024.0 * 1024)); + if (bytes < 1024L * 1024 * 1024) { + return String.format(Locale.US, "%.1f MB", bytes / (1024.0 * 1024)); + } return String.format(Locale.US, "%.1f GB", bytes / (1024.0 * 1024 * 1024)); } + /** + * Pads the view so content stays clear of the status and navigation bars. + * Required on API 35+ where edge-to-edge is enforced for the app; on older + * versions the window usually consumes the insets first, making the padding + * zero and this a no-op. + */ + @SuppressWarnings("deprecation") + static void applySystemBarInsets(final View view) { + view.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() { + @Override + public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) { + int left, top, right, bottom; + if (Build.VERSION.SDK_INT >= 30) { + Insets bars = insets.getInsets(WindowInsets.Type.systemBars()); + left = bars.left; + top = bars.top; + right = bars.right; + bottom = bars.bottom; + } else { + left = insets.getSystemWindowInsetLeft(); + top = insets.getSystemWindowInsetTop(); + right = insets.getSystemWindowInsetRight(); + bottom = insets.getSystemWindowInsetBottom(); + } + v.setPadding(left, top, right, bottom); + return insets; + } + }); + } + public class JsBridge { @JavascriptInterface public void postMessage(String message) { diff --git a/src/plugins/webview/src/android/com/foxdebug/webview/WebViewOptions.java b/src/plugins/webview/src/android/com/foxdebug/webview/WebViewOptions.java new file mode 100644 index 0000000000..a2ea79216f --- /dev/null +++ b/src/plugins/webview/src/android/com/foxdebug/webview/WebViewOptions.java @@ -0,0 +1,537 @@ +package com.foxdebug.webview; + +import android.content.Context; +import android.graphics.Color; +import android.util.Log; +import android.webkit.CookieManager; +import android.webkit.WebSettings; +import android.webkit.WebView; +import androidx.webkit.WebSettingsCompat; +import androidx.webkit.WebViewFeature; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import org.json.JSONObject; + +/** + * Configuration for a {@link WebViewInstance}. + * + *

    Behavioural options (mode, title, visibility, isolation) are kept as typed + * fields. Web settings are kept in a normalized {@link JSONObject} so they can + * be merged on partial updates and handed back to the caller verbatim. + * + *

    Only a known allow-list of settings is ever read, so a caller cannot + * switch on file/content access or otherwise break the navigation sandbox. + * Those stay pinned to the isolation-safe defaults in {@link #applyPartial}. + */ +final class WebViewOptions { + + private static final String TAG = "WebViewOptions"; + + static final String DEFAULT_MODE = "hidden"; + static final String DEFAULT_USER_AGENT_MODE = "default"; + static final String DEFAULT_CACHE_MODE = "default"; + static final String DEFAULT_MIXED_CONTENT_MODE = "never-allow"; + static final String DEFAULT_ALGORITHMIC_DARKENING = "auto"; + + /** Settings that may be changed at runtime through updateSettings(). */ + private static final Set SETTING_KEYS = new HashSet<>(Arrays.asList( + "userAgent", + "userAgentMode", + "javaScript", + "domStorage", + "databaseStorage", + "cacheMode", + "mediaPlaybackRequiresUserGesture", + "loadImages", + "mixedContentMode", + "textZoom", + "initialScale", + "useWideViewPort", + "loadWithOverviewMode", + "supportZoom", + "builtInZoomControls", + "displayZoomControls", + "geolocation", + "safeBrowsing", + "algorithmicDarkening", + "acceptThirdPartyCookies", + "backgroundColor" + )); + + final String mode; + final String title; + final boolean visible; + final boolean incognito; + final String profileName; + final boolean allowNavigation; + final boolean allowDownloads; + + /** Normalized, complete web-settings snapshot. */ + private final JSONObject values; + + private WebViewOptions( + String mode, + String title, + boolean visible, + boolean incognito, + String profileName, + boolean allowNavigation, + boolean allowDownloads, + JSONObject values + ) { + this.mode = mode; + this.title = title; + this.visible = visible; + this.incognito = incognito; + this.profileName = profileName; + this.allowNavigation = allowNavigation; + this.allowDownloads = allowDownloads; + this.values = values; + } + + static WebViewOptions fromJson(JSONObject input) { + JSONObject source = input != null ? input : new JSONObject(); + + String mode = source.optString("mode", DEFAULT_MODE); + if (!"fullscreen".equals(mode) && !"hidden".equals(mode)) { + throw new IllegalArgumentException( + "Unsupported WebView mode: \"" + mode + "\". Use \"fullscreen\" or \"hidden\"." + ); + } + + String userAgentMode = source.optString("userAgentMode", DEFAULT_USER_AGENT_MODE); + if (!"default".equals(userAgentMode) + && !"mobile".equals(userAgentMode) + && !"desktop".equals(userAgentMode)) { + throw new IllegalArgumentException( + "Unsupported userAgentMode: \"" + userAgentMode + + "\". Use \"default\", \"mobile\" or \"desktop\"." + ); + } + + boolean incognito = source.optBoolean("incognito", false); + + // Profile names are used verbatim; reject non-canonical input instead of + // rewriting it so two different names can never select the same profile. + String profileName = optString(source, "profileName"); + if (profileName != null) { + ProfileManager.requireValidUserName(profileName); + } + + JSONObject values = defaults(incognito); + merge(values, source); + clampSettings(values); + validateEnums(values); + + return new WebViewOptions( + mode, + source.optString("title", ""), + source.optBoolean("visible", true), + incognito, + profileName, + source.optBoolean("allowNavigation", true), + source.optBoolean("allowDownloads", false), + values + ); + } + + /** Full settings snapshot including behavioural keys, for the JS layer. */ + JSONObject toJson() { + JSONObject out = copy(values); + putQuietly(out, "mode", mode); + putQuietly(out, "title", title); + putQuietly(out, "visible", visible); + putQuietly(out, "incognito", incognito); + if (profileName != null) { + putQuietly(out, "profileName", profileName); + } + putQuietly(out, "allowNavigation", allowNavigation); + putQuietly(out, "allowDownloads", allowDownloads); + return out; + } + + private static JSONObject defaults(boolean incognito) { + JSONObject values = new JSONObject(); + putQuietly(values, "userAgent", JSONObject.NULL); + putQuietly(values, "userAgentMode", DEFAULT_USER_AGENT_MODE); + putQuietly(values, "javaScript", true); + putQuietly(values, "domStorage", true); + putQuietly(values, "databaseStorage", false); + putQuietly(values, "cacheMode", incognito ? "no-cache" : DEFAULT_CACHE_MODE); + putQuietly(values, "mediaPlaybackRequiresUserGesture", true); + putQuietly(values, "loadImages", true); + putQuietly(values, "mixedContentMode", DEFAULT_MIXED_CONTENT_MODE); + putQuietly(values, "textZoom", 100); + putQuietly(values, "initialScale", 0); + putQuietly(values, "useWideViewPort", true); + putQuietly(values, "loadWithOverviewMode", true); + putQuietly(values, "supportZoom", true); + putQuietly(values, "builtInZoomControls", false); + putQuietly(values, "displayZoomControls", false); + putQuietly(values, "geolocation", false); + putQuietly(values, "safeBrowsing", true); + putQuietly(values, "algorithmicDarkening", DEFAULT_ALGORITHMIC_DARKENING); + putQuietly(values, "acceptThirdPartyCookies", incognito ? false : JSONObject.NULL); + putQuietly(values, "backgroundColor", JSONObject.NULL); + return values; + } + + private static void validateEnums(JSONObject values) { + String cacheMode = values.optString("cacheMode", DEFAULT_CACHE_MODE); + if (!"default".equals(cacheMode) + && !"no-cache".equals(cacheMode) + && !"cache-only".equals(cacheMode) + && !"cache-else-network".equals(cacheMode)) { + throw new IllegalArgumentException( + "Unsupported cacheMode: \"" + cacheMode + + "\". Use \"default\", \"no-cache\", \"cache-only\" or \"cache-else-network\"." + ); + } + + String mixed = values.optString("mixedContentMode", DEFAULT_MIXED_CONTENT_MODE); + if (!"never-allow".equals(mixed) + && !"compatibility".equals(mixed) + && !"always-allow".equals(mixed)) { + throw new IllegalArgumentException( + "Unsupported mixedContentMode: \"" + mixed + + "\". Use \"never-allow\", \"compatibility\" or \"always-allow\"." + ); + } + + String darkening = values.optString("algorithmicDarkening", DEFAULT_ALGORITHMIC_DARKENING); + if (!"auto".equals(darkening) && !"on".equals(darkening) && !"off".equals(darkening)) { + throw new IllegalArgumentException( + "Unsupported algorithmicDarkening: \"" + darkening + + "\". Use \"auto\", \"on\" or \"off\"." + ); + } + + String userAgentMode = values.optString("userAgentMode", DEFAULT_USER_AGENT_MODE); + if (!"default".equals(userAgentMode) + && !"mobile".equals(userAgentMode) + && !"desktop".equals(userAgentMode)) { + throw new IllegalArgumentException( + "Unsupported userAgentMode: \"" + userAgentMode + + "\". Use \"default\", \"mobile\" or \"desktop\"." + ); + } + } + + private static void clampSettings(JSONObject values) { + if (values.has("textZoom")) { + putQuietly(values, "textZoom", clamp(values.optInt("textZoom", 100), 25, 500)); + } + if (values.has("initialScale")) { + putQuietly(values, "initialScale", clamp(values.optInt("initialScale", 0), 0, 1000)); + } + } + + /** Applies every setting in this snapshot to a freshly created WebView. */ + void applyTo(WebView view, Context context) { + applyPartial(view, context, values); + } + + /** + * Merges (and applies) a partial settings object. Unknown keys are ignored, + * isolation-critical settings are always forced, and the resulting normalized + * settings are returned. + */ + JSONObject update(WebView view, Context context, JSONObject partial) { + JSONObject applied = new JSONObject(); + if (partial != null) { + for (String key : SETTING_KEYS) { + if (partial.has(key)) { + putQuietly(applied, key, partial.opt(key)); + } + } + } + + validateEnums(mergeIntoSnapshot(applied)); + clampSettings(applied); + // A fullscreen instance may not have created its WebView yet; merge now so + // the settings apply when createWebView() runs. + if (view != null) { + applyPartial(view, context, settingsToApply(applied), true); + } + merge(values, applied); + if (applied.has("userAgentMode") && !applied.has("userAgent")) { + // The mode now decides the UA; drop any stale explicit override. + putQuietly(values, "userAgent", JSONObject.NULL); + } + return copy(values); + } + + /** + * A batch that sets or clears the explicit user agent without repeating the + * mode must resolve the preset from the current snapshot. Otherwise clearing + * a custom UA would fall back to "default" and silently undo a saved + * "desktop" (or "mobile") preset. + */ + private JSONObject settingsToApply(JSONObject applied) { + if (!applied.has("userAgent") || applied.has("userAgentMode")) { + return applied; + } + JSONObject effective = copy(applied); + putQuietly( + effective, + "userAgentMode", + values.optString("userAgentMode", DEFAULT_USER_AGENT_MODE) + ); + return effective; + } + + private JSONObject mergeIntoSnapshot(JSONObject partial) { + JSONObject merged = copy(values); + merge(merged, partial); + return merged; + } + + /** Current normalized settings snapshot. */ + JSONObject settings() { + return copy(values); + } + + /** + * Single source of truth for translating options into {@link WebSettings} + * calls. Only keys present in {@code source} are touched, so the same method + * serves both initial creation and runtime updates. + */ + static void applyPartial(WebView view, Context context, JSONObject source) { + applyPartial(view, context, source, false); + } + + private static void applyPartial( + WebView view, + Context context, + JSONObject source, + boolean runtimeUpdate + ) { + WebSettings settings = view.getSettings(); + + // Isolation is not configurable: hosted content must never be able to + // reach app/device data, and navigation below only permits http(s). + settings.setAllowFileAccess(false); + settings.setAllowContentAccess(false); + setFileUrlAccessFlags(settings); + settings.setSaveFormData(false); + settings.setSupportMultipleWindows(false); + settings.setJavaScriptCanOpenWindowsAutomatically(false); + + if (source.has("javaScript")) { + settings.setJavaScriptEnabled(source.optBoolean("javaScript", true)); + } + if (source.has("domStorage")) { + settings.setDomStorageEnabled(source.optBoolean("domStorage", true)); + } + if (source.has("databaseStorage")) { + settings.setDatabaseEnabled(source.optBoolean("databaseStorage", false)); + } + if (source.has("cacheMode")) { + settings.setCacheMode(cacheMode(source.optString("cacheMode", DEFAULT_CACHE_MODE))); + } + if (source.has("mediaPlaybackRequiresUserGesture")) { + settings.setMediaPlaybackRequiresUserGesture( + source.optBoolean("mediaPlaybackRequiresUserGesture", true) + ); + } + if (source.has("loadImages")) { + boolean loadImages = source.optBoolean("loadImages", true); + settings.setLoadsImagesAutomatically(loadImages); + settings.setBlockNetworkImage(!loadImages); + } + if (source.has("mixedContentMode")) { + settings.setMixedContentMode( + mixedContentMode(source.optString("mixedContentMode", DEFAULT_MIXED_CONTENT_MODE)) + ); + } + if (source.has("textZoom")) { + settings.setTextZoom(clamp(source.optInt("textZoom", 100), 25, 500)); + } + if (source.has("useWideViewPort")) { + settings.setUseWideViewPort(source.optBoolean("useWideViewPort", true)); + } + if (source.has("loadWithOverviewMode")) { + settings.setLoadWithOverviewMode(source.optBoolean("loadWithOverviewMode", true)); + } + if (source.has("supportZoom")) { + settings.setSupportZoom(source.optBoolean("supportZoom", true)); + } + if (source.has("builtInZoomControls")) { + settings.setBuiltInZoomControls(source.optBoolean("builtInZoomControls", false)); + } + if (source.has("displayZoomControls")) { + settings.setDisplayZoomControls(source.optBoolean("displayZoomControls", false)); + } + if (source.has("initialScale")) { + view.setInitialScale(clamp(source.optInt("initialScale", 0), 0, 1000)); + } + if (source.has("geolocation")) { + settings.setGeolocationEnabled(source.optBoolean("geolocation", false)); + } + if (source.has("acceptThirdPartyCookies")) { + if (!source.isNull("acceptThirdPartyCookies")) { + CookieManager.getInstance().setAcceptThirdPartyCookies( + view, + source.optBoolean("acceptThirdPartyCookies", false) + ); + } + } + if (source.has("safeBrowsing")) { + applyFeatureSafely("safeBrowsing", () -> { + if (WebViewFeature.isFeatureSupported(WebViewFeature.SAFE_BROWSING_ENABLE)) { + WebSettingsCompat.setSafeBrowsingEnabled( + settings, + source.optBoolean("safeBrowsing", true) + ); + } + }); + } + if (source.has("algorithmicDarkening")) { + String darkening = source.optString("algorithmicDarkening", DEFAULT_ALGORITHMIC_DARKENING); + if (!"auto".equals(darkening)) { + applyFeatureSafely("algorithmicDarkening", () -> { + if (WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) { + WebSettingsCompat.setAlgorithmicDarkeningAllowed(settings, "on".equals(darkening)); + } + }); + } + } + if (source.has("backgroundColor")) { + applyBackgroundColor(view, source); + } + // User agent is applied last so callers can override preset handling with + // an explicit string in the same batch. + if (source.has("userAgent") || source.has("userAgentMode")) { + resolveUserAgent(context, settings, source); + } + + if (runtimeUpdate) { + Log.d(TAG, "Applied runtime settings update"); + } + } + + private static void applyBackgroundColor(WebView view, JSONObject source) { + if (source.isNull("backgroundColor")) return; + String value = source.optString("backgroundColor", ""); + if (value == null || value.isEmpty()) return; + try { + view.setBackgroundColor(Color.parseColor(value)); + } catch (IllegalArgumentException e) { + Log.w(TAG, "Ignoring invalid backgroundColor: " + value); + } + } + + /** + * Resolves the user agent from either an explicit string or a preset mode. + * "desktop" is the platform default with the Mobile token removed; "mobile" + * restores the platform default; "default" clears any override. + */ + static String resolveUserAgent(Context context, WebSettings settings, JSONObject source) { + String explicit = optString(source, "userAgent"); + String mode = source.optString("userAgentMode", DEFAULT_USER_AGENT_MODE); + String result; + + if (explicit != null && !explicit.trim().isEmpty()) { + result = explicit.trim(); + } else if ("desktop".equals(mode)) { + result = desktopUserAgent(context); + } else if ("mobile".equals(mode)) { + result = WebSettings.getDefaultUserAgent(context); + } else { + result = null; + } + + settings.setUserAgentString(result); + String applied = settings.getUserAgentString(); + return applied != null ? applied : ""; + } + + private static String desktopUserAgent(Context context) { + String ua = WebSettings.getDefaultUserAgent(context); + if (ua == null) return null; + return ua.replace(" Mobile", "").replace("; wv", ""); + } + + static int cacheMode(String value) { + switch (value == null ? DEFAULT_CACHE_MODE : value) { + case "no-cache": + return WebSettings.LOAD_NO_CACHE; + case "cache-only": + return WebSettings.LOAD_CACHE_ONLY; + case "cache-else-network": + return WebSettings.LOAD_CACHE_ELSE_NETWORK; + default: + return WebSettings.LOAD_DEFAULT; + } + } + + static int mixedContentMode(String value) { + switch (value == null ? DEFAULT_MIXED_CONTENT_MODE : value) { + case "always-allow": + return WebSettings.MIXED_CONTENT_ALWAYS_ALLOW; + case "compatibility": + return WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE; + default: + return WebSettings.MIXED_CONTENT_NEVER_ALLOW; + } + } + + interface ThrowingRunnable { + void run() throws Exception; + } + + private static void applyFeatureSafely(String feature, ThrowingRunnable action) { + try { + action.run(); + } catch (Exception e) { + // Feature probes can throw on some WebView providers; a missing optional + // feature must never fail instance creation. + Log.w(TAG, "Could not apply " + feature + ": " + e.getMessage()); + } + } + + @SuppressWarnings("deprecation") + private static void setFileUrlAccessFlags(WebSettings settings) { + settings.setAllowFileAccessFromFileURLs(false); + settings.setAllowUniversalAccessFromFileURLs(false); + } + + private static int clamp(int value, int min, int max) { + return Math.max(min, Math.min(max, value)); + } + + private static String optString(JSONObject object, String key) { + if (object == null || !object.has(key) || object.isNull(key)) return null; + return object.optString(key, null); + } + + private static void putQuietly(JSONObject object, String key, Object value) { + try { + object.put(key, value); + } catch (Exception e) { + Log.w(TAG, "Could not set option " + key, e); + } + } + + private static void merge(JSONObject target, JSONObject source) { + if (source == null) return; + for (String key : SETTING_KEYS) { + if (source.has(key)) { + putQuietly(target, key, source.opt(key)); + } + } + } + + private static JSONObject copy(JSONObject source) { + JSONObject out = new JSONObject(); + if (source == null) return out; + // Android's org.json exposes keys() (Iterator), not keySet(). + java.util.Iterator keys = source.keys(); + while (keys.hasNext()) { + String key = keys.next(); + putQuietly(out, key, source.opt(key)); + } + return out; + } +} diff --git a/src/plugins/webview/src/android/com/foxdebug/webview/WebViewPlugin.java b/src/plugins/webview/src/android/com/foxdebug/webview/WebViewPlugin.java index db6adb85c6..068134d29a 100644 --- a/src/plugins/webview/src/android/com/foxdebug/webview/WebViewPlugin.java +++ b/src/plugins/webview/src/android/com/foxdebug/webview/WebViewPlugin.java @@ -8,6 +8,7 @@ import android.util.Log; import android.webkit.CookieManager; import android.widget.Toast; +import androidx.webkit.WebViewFeature; import java.util.ArrayList; import java.util.HashMap; import java.util.UUID; @@ -18,9 +19,17 @@ import org.json.JSONException; import org.json.JSONObject; +/** + * Cordova entry point for the Acode WebView API. + * + *

    Owns the instance registry, routes each JS call to the matching + * {@link WebViewInstance}, and forwards page/lifecycle events back over the + * single long-lived "setMessageCallback" channel. + */ public class WebViewPlugin extends CordovaPlugin { private static final String TAG = "AcodeWebView"; + private static final String PLUGIN_VERSION = "2.0.0"; private static WebViewPlugin instance; private final HashMap instances = new HashMap<>(); @@ -29,6 +38,9 @@ public class WebViewPlugin extends CordovaPlugin { @Override protected void pluginInitialize() { instance = this; + // Remove incognito profiles left behind if the process was killed before + // their instance could be destroyed. + ProfileManager.cleanupEphemeralProfiles(); } public static WebViewPlugin getInstance() { @@ -36,23 +48,23 @@ public static WebViewPlugin getInstance() { } @Override - public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException { + public boolean execute(String action, JSONArray args, CallbackContext callbackContext) { try { switch (action) { case "setMessageCallback": - this.messageCallback = callbackContext; - PluginResult keepResult = new PluginResult(PluginResult.Status.NO_RESULT); - keepResult.setKeepCallback(true); - callbackContext.sendPluginResult(keepResult); + setMessageCallback(callbackContext); + return true; + case "capabilities": + callbackContext.success(capabilities()); return true; case "create": - create(args.getJSONObject(0), callbackContext); + create(args.optJSONObject(0), callbackContext); return true; case "loadURL": - loadURL(args.getString(0), args.getString(1), callbackContext); + loadURL(args.getString(0), optionalString(args, 1), args.optJSONObject(2), callbackContext); return true; case "loadHTML": - loadHTML(args.getString(0), args.getString(1), callbackContext); + loadHTML(args.getString(0), args.getString(1), args.optJSONObject(2), callbackContext); return true; case "evaluate": evaluate(args.getString(0), args.getString(1), callbackContext); @@ -69,6 +81,50 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo case "reload": reload(args.getString(0), callbackContext); return true; + case "stopLoading": + stopLoading(args.getString(0), callbackContext); + return true; + case "goBack": + goBack(args.getString(0), callbackContext); + return true; + case "goForward": + goForward(args.getString(0), callbackContext); + return true; + case "canGoBack": + canGoBack(args.getString(0), callbackContext); + return true; + case "canGoForward": + canGoForward(args.getString(0), callbackContext); + return true; + case "clearCache": + clearCache(args.getString(0), args.optBoolean(1, true), callbackContext); + return true; + case "clearHistory": + clearHistory(args.getString(0), callbackContext); + return true; + case "clearFormData": + clearFormData(args.getString(0), callbackContext); + return true; + case "setUserAgent": + setUserAgent( + args.getString(0), + optionalString(args, 1), + optionalString(args, 2), + callbackContext + ); + return true; + case "getUserAgent": + getUserAgent(args.getString(0), callbackContext); + return true; + case "updateSettings": + updateSettings(args.getString(0), args.optJSONObject(1), callbackContext); + return true; + case "getSettings": + getSettings(args.getString(0), callbackContext); + return true; + case "getInfo": + getInfo(args.getString(0), callbackContext); + return true; case "destroy": destroy(args.getString(0), callbackContext); return true; @@ -77,55 +133,85 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo return true; } } catch (Exception e) { - Log.e(TAG, "Error: " + action, e); + Log.e(TAG, "Error handling action: " + action, e); callbackContext.error(e.getMessage()); } return true; } + private void setMessageCallback(CallbackContext callbackContext) { + this.messageCallback = callbackContext; + PluginResult keepResult = new PluginResult(PluginResult.Status.NO_RESULT); + keepResult.setKeepCallback(true); + callbackContext.sendPluginResult(keepResult); + } + + /** + * Reads an optional string argument, mapping JSON null/missing to Java null. + * Android's {@code JSONArray.optString(index, fallback)} returns the literal + * string "null" for a JSON null value, which would otherwise leak into + * options such as the user agent. + */ + private static String optionalString(JSONArray args, int index) { + if (args == null || args.isNull(index)) return null; + return args.optString(index, null); + } + private String generateId() { return "wv_" + UUID.randomUUID().toString().replace("-", "").substring(0, 12); } - private void create(JSONObject options, final CallbackContext callbackContext) throws JSONException { + private void create(final JSONObject rawOptions, final CallbackContext callbackContext) { + final WebViewOptions options; + try { + options = WebViewOptions.fromJson(rawOptions); + } catch (IllegalArgumentException e) { + callbackContext.error(e.getMessage()); + return; + } + final String id = generateId(); - final String mode = options.optString("mode", "hidden"); - final String title = options.optString("title", ""); - final boolean allowNavigation = options.optBoolean("allowNavigation", true); - final boolean allowDownloads = options.optBoolean("allowDownloads", false); - final boolean visible = options.optBoolean("visible", true); - - cordova.getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - WebViewInstance instance = new WebViewInstance( - id, mode, title, - allowNavigation, allowDownloads, - WebViewPlugin.this - ); - instances.put(id, instance); - try { - if (instance.isFullscreen()) { - // The WebView is created lazily by WebViewActivity. When the - // caller asked for an initially hidden instance, the launch is - // deferred until show() is called. - if (visible) { - showFullscreenActivity(id); - } - } else { - // "hidden" mode: a headless WebView that is never displayed. - instance.createWebView(cordova.getActivity()); + cordova.getActivity().runOnUiThread(() -> { + WebViewInstance instance = new WebViewInstance(id, options, WebViewPlugin.this); + instances.put(id, instance); + + try { + if (instance.isFullscreen()) { + // The WebView is created lazily by WebViewActivity. When the caller + // asked for an initially hidden instance, the launch is deferred + // until show() is called. + if (options.visible) { + showFullscreenActivity(id); } - callbackContext.success(id); - } catch (Exception e) { - instances.remove(id); - try { - instance.destroy(); - } catch (Exception ignored) {} - Log.e(TAG, "Create error: " + e.getMessage(), e); - callbackContext.error(e.getMessage()); + } else { + // "hidden" mode: a headless WebView that is never displayed. + instance.createWebView(cordova.getActivity()); + } + + JSONObject result = new JSONObject(); + result.put("id", id); + result.put("isolated", instance.isIsolated()); + result.put("ready", instance.isReady()); + if (instance.getProfileName() != null) { + result.put("profileName", instance.getProfileName()); } + JSONObject resolvedOptions = options.toJson(); + if (!instance.isIsolated()) { + // The requested profile was not acquired (unsupported provider or a + // failed bind); do not report a profile name that is not in use. + resolvedOptions.remove("profileName"); + } + result.put("options", resolvedOptions); + result.put("capabilities", capabilities()); + callbackContext.success(result); + } catch (Exception e) { + instances.remove(id); + try { + instance.destroy(); + } catch (Exception ignored) {} + Log.e(TAG, "Create error: " + e.getMessage(), e); + callbackContext.error(e.getMessage()); } }); } @@ -154,73 +240,215 @@ public void removeInstance(String id) { instances.remove(id); } - private void loadURL(String id, String url, CallbackContext callbackContext) { - WebViewInstance instance = getInstance(id); - if (instance == null) { callbackContext.error("WebView not found: " + id); return; } - instance.loadURL(url, callbackContext); + /** Context used for options that need a Context even before the WebView exists. */ + public Context getContext() { + return cordova.getContext(); } - private void loadHTML(String id, String html, CallbackContext callbackContext) { + private WebViewInstance requireInstance(String id, CallbackContext callbackContext) { WebViewInstance instance = getInstance(id); - if (instance == null) { callbackContext.error("WebView not found: " + id); return; } - instance.loadHTML(html, callbackContext); + if (instance == null) { + callbackContext.error("WebView not found: " + id); + } + return instance; + } + + private void loadURL( + String id, + String url, + JSONObject headers, + CallbackContext callbackContext + ) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.loadURL(url, headers, callbackContext); + } + + private void loadHTML( + String id, + String html, + JSONObject htmlOptions, + CallbackContext callbackContext + ) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.loadHTML(html, htmlOptions, callbackContext); } private void evaluate(String id, String js, CallbackContext callbackContext) { - WebViewInstance instance = getInstance(id); - if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; instance.evaluate(js, callbackContext); } private void postMessage(String id, String message, CallbackContext callbackContext) { - WebViewInstance instance = getInstance(id); - if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; instance.postMessage(message, callbackContext); } private void show(String id, CallbackContext callbackContext) { - WebViewInstance instance = getInstance(id); - if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; instance.show(callbackContext); } private void hide(String id, CallbackContext callbackContext) { - WebViewInstance instance = getInstance(id); - if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; instance.hide(callbackContext); } private void reload(String id, CallbackContext callbackContext) { - WebViewInstance instance = getInstance(id); - if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; instance.reload(callbackContext); } + private void stopLoading(String id, CallbackContext callbackContext) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.stopLoading(callbackContext); + } + + private void goBack(String id, CallbackContext callbackContext) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.goBack(callbackContext); + } + + private void goForward(String id, CallbackContext callbackContext) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.goForward(callbackContext); + } + + private void canGoBack(String id, CallbackContext callbackContext) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.canGoBack(callbackContext); + } + + private void canGoForward(String id, CallbackContext callbackContext) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.canGoForward(callbackContext); + } + + private void clearCache(String id, boolean includeDiskFiles, CallbackContext callbackContext) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.clearCache(includeDiskFiles, callbackContext); + } + + private void clearHistory(String id, CallbackContext callbackContext) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.clearHistory(callbackContext); + } + + private void clearFormData(String id, CallbackContext callbackContext) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.clearFormData(callbackContext); + } + + private void setUserAgent( + String id, + String userAgent, + String mode, + CallbackContext callbackContext + ) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.setUserAgent(userAgent, mode, callbackContext); + } + + private void getUserAgent(String id, CallbackContext callbackContext) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.getUserAgent(callbackContext); + } + + private void updateSettings(String id, JSONObject settings, CallbackContext callbackContext) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.updateSettings(settings, callbackContext); + } + + private void getSettings(String id, CallbackContext callbackContext) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.getSettings(callbackContext); + } + + private void getInfo(String id, CallbackContext callbackContext) { + WebViewInstance instance = requireInstance(id, callbackContext); + if (instance == null) return; + instance.getInfo(callbackContext); + } + private void destroy(String id, final CallbackContext callbackContext) { final WebViewInstance instance = instances.remove(id); - if (instance == null) { callbackContext.error("WebView not found: " + id); return; } + if (instance == null) { + callbackContext.error("WebView not found: " + id); + return; + } - cordova.getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - instance.destroy(); - callbackContext.success(); - } + cordova.getActivity().runOnUiThread(() -> { + instance.destroy(); + callbackContext.success(); }); } + /** Feature probes for the JS layer. */ + private JSONObject capabilities() { + JSONObject result = new JSONObject(); + try { + result.put("version", PLUGIN_VERSION); + result.put("multiProfile", ProfileManager.isSupported()); + result.put("deleteBrowsingData", ProfileManager.canDeleteBrowsingData()); + result.put("documentStartScript", isSupported(WebViewFeature.DOCUMENT_START_SCRIPT)); + result.put("safeBrowsing", isSupported(WebViewFeature.SAFE_BROWSING_ENABLE)); + result.put("algorithmicDarkening", isSupported(WebViewFeature.ALGORITHMIC_DARKENING)); + } catch (JSONException e) { + Log.e(TAG, "Error building capabilities", e); + } + return result; + } + + private static boolean isSupported(String feature) { + try { + return WebViewFeature.isFeatureSupported(feature); + } catch (Throwable t) { + return false; + } + } + /** - * Starts a confirmed download via the system DownloadManager into the - * public Downloads directory. The WebView's cookies are forwarded so - * authenticated downloads work. + * Starts a confirmed download via the system DownloadManager into the public + * Downloads directory. Cookies come from the originating instance's profile + * cookie jar, so isolated-profile sessions are neither dropped nor crossed + * with the default profile. Returns whether the download was enqueued. */ - void download(String url, String userAgent, String mimeType, String fileName) { + boolean download( + WebViewInstance instance, + String url, + String userAgent, + String mimeType, + String fileName + ) { Context context = cordova.getActivity(); try { DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url)); request.setMimeType(mimeType); - request.addRequestHeader("User-Agent", userAgent); - String cookie = CookieManager.getInstance().getCookie(url); + if (userAgent != null && !userAgent.isEmpty()) { + request.addRequestHeader("User-Agent", userAgent); + } + CookieManager cookieManager = instance != null + ? instance.getCookieManager() + : CookieManager.getInstance(); + String cookie = cookieManager != null ? cookieManager.getCookie(url) : null; if (cookie != null && !cookie.isEmpty()) { request.addRequestHeader("Cookie", cookie); } @@ -236,31 +464,26 @@ void download(String url, String userAgent, String mimeType, String fileName) { } dm.enqueue(request); Toast.makeText(context, "Download started...", Toast.LENGTH_SHORT).show(); + return true; } catch (Exception e) { Log.e(TAG, "Download failed", e); Toast.makeText(context, "Download failed", Toast.LENGTH_SHORT).show(); + return false; } } public void sendMessageToCordova(String id, String message) { - if (messageCallback == null) return; - try { JSONObject payload = new JSONObject(); payload.put("id", id); payload.put("message", message); - - PluginResult result = new PluginResult(PluginResult.Status.OK, payload); - result.setKeepCallback(true); - messageCallback.sendPluginResult(result); + sendPayload(payload); } catch (JSONException e) { Log.e(TAG, "Error building message payload", e); } } public void sendEventToCordova(String id, String event, JSONObject data) { - if (messageCallback == null) return; - try { JSONObject payload = new JSONObject(); payload.put("id", id); @@ -268,22 +491,36 @@ public void sendEventToCordova(String id, String event, JSONObject data) { if (data != null) { payload.put("data", data); } - - PluginResult result = new PluginResult(PluginResult.Status.OK, payload); - result.setKeepCallback(true); - messageCallback.sendPluginResult(result); + sendPayload(payload); } catch (JSONException e) { Log.e(TAG, "Error building event payload", e); } } + private void sendPayload(JSONObject payload) { + if (messageCallback == null) return; + PluginResult result = new PluginResult(PluginResult.Status.OK, payload); + result.setKeepCallback(true); + messageCallback.sendPluginResult(result); + } + + @Override + public void onReset() { + super.onReset(); + // The host WebView navigated and rebuilt its JS world, so the previous + // keep-callback is dead. The reloaded page registers a fresh one. + messageCallback = null; + } + @Override public void onDestroy() { super.onDestroy(); // Copy: destroying a fullscreen instance finishes its activity, whose // onDestroy() removes it from the map. for (WebViewInstance instance : new ArrayList<>(instances.values())) { - try { instance.destroy(); } catch (Exception ignored) {} + try { + instance.destroy(); + } catch (Exception ignored) {} } instances.clear(); instance = null; diff --git a/src/plugins/webview/www/webview.js b/src/plugins/webview/www/webview.js index b1935dddfe..55e06e3126 100644 --- a/src/plugins/webview/www/webview.js +++ b/src/plugins/webview/www/webview.js @@ -1,88 +1,174 @@ +/** + * Thin, promise-based wrapper over the native AcodeWebView Cordova plugin. + * + * Every call maps 1:1 to an action handled by WebViewPlugin.java. Higher-level + * behaviour (instance registry, event fan-out, option validation) lives in + * src/lib/webview.js. + */ + const SERVICE = "AcodeWebView"; -let messageCallback = null; +let messageHandler = null; +let messageCallbackRegistered = false; +/** + * Registers the single, long-lived callback used for page messages and + * lifecycle events. Calling it more than once only swaps the handler; the + * native keep-callback channel is registered exactly once. + */ function setMessageCallback(callback) { - messageCallback = callback; - cordova.exec( - (payload) => { - if (messageCallback) { - messageCallback(payload); - } - }, - (error) => { - console.error("WebView message callback error:", error); - }, - SERVICE, - "setMessageCallback", - [] - ); + messageHandler = typeof callback === "function" ? callback : null; + + if (messageCallbackRegistered) return; + + messageCallbackRegistered = true; + cordova.exec( + (payload) => { + if (messageHandler) { + messageHandler(payload); + } + }, + (error) => { + console.error("WebView message callback error:", error); + }, + SERVICE, + "setMessageCallback", + [], + ); +} + +function invoke(action, args) { + return new Promise((resolve, reject) => { + cordova.exec(resolve, reject, SERVICE, action, args || []); + }); +} + +/** Feature probes; resolves to a plain object of capability booleans. */ +function capabilities() { + return invoke("capabilities", []); } function create(options) { - return new Promise((resolve, reject) => { - cordova.exec(resolve, reject, SERVICE, "create", [options || {}]); - }); + return invoke("create", [options || {}]); } -function loadURL(id, url) { - return new Promise((resolve, reject) => { - cordova.exec(resolve, reject, SERVICE, "loadURL", [id, url]); - }); +function loadURL(id, url, headers) { + const args = [id, url]; + if (headers && Object.keys(headers).length > 0) { + args.push(headers); + } + return invoke("loadURL", args); } -function loadHTML(id, html) { - return new Promise((resolve, reject) => { - cordova.exec(resolve, reject, SERVICE, "loadHTML", [id, html]); - }); +function loadHTML(id, html, htmlOptions) { + const args = [id, html]; + if (htmlOptions && Object.keys(htmlOptions).length > 0) { + args.push(htmlOptions); + } + return invoke("loadHTML", args); } function evaluate(id, js) { - return new Promise((resolve, reject) => { - cordova.exec(resolve, reject, SERVICE, "evaluate", [id, js]); - }); + return invoke("evaluate", [id, js]); } function postMessage(id, message) { - return new Promise((resolve, reject) => { - const payload = typeof message === "string" ? message : JSON.stringify(message); - cordova.exec(resolve, reject, SERVICE, "postMessage", [id, payload]); - }); + const payload = + typeof message === "string" ? message : JSON.stringify(message); + return invoke("postMessage", [id, payload]); } function show(id) { - return new Promise((resolve, reject) => { - cordova.exec(resolve, reject, SERVICE, "show", [id]); - }); + return invoke("show", [id]); } function hide(id) { - return new Promise((resolve, reject) => { - cordova.exec(resolve, reject, SERVICE, "hide", [id]); - }); + return invoke("hide", [id]); } function reload(id) { - return new Promise((resolve, reject) => { - cordova.exec(resolve, reject, SERVICE, "reload", [id]); - }); + return invoke("reload", [id]); +} + +function stopLoading(id) { + return invoke("stopLoading", [id]); +} + +function goBack(id) { + return invoke("goBack", [id]); +} + +function goForward(id) { + return invoke("goForward", [id]); +} + +function canGoBack(id) { + return invoke("canGoBack", [id]); +} + +function canGoForward(id) { + return invoke("canGoForward", [id]); +} + +function clearCache(id, includeDiskFiles) { + return invoke("clearCache", [id, includeDiskFiles !== false]); +} + +function clearHistory(id) { + return invoke("clearHistory", [id]); +} + +function clearFormData(id) { + return invoke("clearFormData", [id]); +} + +function setUserAgent(id, userAgent, mode) { + return invoke("setUserAgent", [id, userAgent == null ? null : userAgent, mode || null]); +} + +function getUserAgent(id) { + return invoke("getUserAgent", [id]); +} + +function updateSettings(id, settings) { + return invoke("updateSettings", [id, settings || {}]); +} + +function getSettings(id) { + return invoke("getSettings", [id]); +} + +function getInfo(id) { + return invoke("getInfo", [id]); } function destroy(id) { - return new Promise((resolve, reject) => { - cordova.exec(resolve, reject, SERVICE, "destroy", [id]); - }); + return invoke("destroy", [id]); } export default { - setMessageCallback, - create, - loadURL, - loadHTML, - evaluate, - postMessage, - show, - hide, - reload, - destroy, + setMessageCallback, + capabilities, + create, + loadURL, + loadHTML, + evaluate, + postMessage, + show, + hide, + reload, + stopLoading, + goBack, + goForward, + canGoBack, + canGoForward, + clearCache, + clearHistory, + clearFormData, + setUserAgent, + getUserAgent, + updateSettings, + getSettings, + getInfo, + destroy, }; diff --git a/tests/unit/webview.test.js b/tests/unit/webview.test.js index 2d08ea3a81..14ba805d9c 100644 --- a/tests/unit/webview.test.js +++ b/tests/unit/webview.test.js @@ -3,8 +3,28 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; const { nativeBridge } = vi.hoisted(() => ({ nativeBridge: { setMessageCallback: vi.fn(), + capabilities: vi.fn(), create: vi.fn(), + loadURL: vi.fn(), + loadHTML: vi.fn(), evaluate: vi.fn(), + postMessage: vi.fn(), + show: vi.fn(), + hide: vi.fn(), + reload: vi.fn(), + stopLoading: vi.fn(), + goBack: vi.fn(), + goForward: vi.fn(), + canGoBack: vi.fn(), + canGoForward: vi.fn(), + clearCache: vi.fn(), + clearHistory: vi.fn(), + clearFormData: vi.fn(), + setUserAgent: vi.fn(), + getUserAgent: vi.fn(), + updateSettings: vi.fn(), + getSettings: vi.fn(), + getInfo: vi.fn(), destroy: vi.fn(), }, })); @@ -13,34 +33,708 @@ vi.mock("../../src/plugins/webview/www/webview", () => ({ default: nativeBridge, })); -import webviewAPI from "lib/webview"; +const CAPABILITIES = { + version: "2.0.0", + multiProfile: true, + deleteBrowsingData: true, + documentStartScript: true, + safeBrowsing: true, + algorithmicDarkening: true, +}; -describe("WebView lifecycle", () => { - beforeEach(() => { - vi.clearAllMocks(); - nativeBridge.create.mockResolvedValue("webview-1"); - nativeBridge.evaluate.mockResolvedValue("result"); - nativeBridge.destroy.mockResolvedValue(undefined); +const DEFAULT_OPTIONS = { + mode: "hidden", + title: "", + visible: true, + incognito: false, + allowNavigation: true, + allowDownloads: false, + userAgent: null, + userAgentMode: "default", + javaScript: true, + domStorage: true, + databaseStorage: false, + cacheMode: "default", + mediaPlaybackRequiresUserGesture: true, + loadImages: true, + mixedContentMode: "never-allow", + textZoom: 100, + initialScale: 0, + useWideViewPort: true, + loadWithOverviewMode: true, + supportZoom: true, + builtInZoomControls: false, + displayZoomControls: false, + geolocation: false, + safeBrowsing: true, + algorithmicDarkening: "auto", + acceptThirdPartyCookies: null, + backgroundColor: null, +}; + +let webviewAPI; +let WebViewEvents; +let AcodeWebView; + +/** Fresh module state per test: the registry is module-level. */ +async function loadModule() { + vi.resetModules(); + const module = await import("lib/webview"); + webviewAPI = module.default; + WebViewEvents = module.WebViewEvents; + AcodeWebView = module.AcodeWebView; +} + +async function createInstance(options) { + const instance = await webviewAPI.create(options); + return instance; +} + +function dispatch(payload) { + const callback = nativeBridge.setMessageCallback.mock.calls.at(-1)?.[0]; + if (!callback) throw new Error("message callback was never registered"); + callback(payload); +} + +beforeEach(async () => { + vi.clearAllMocks(); + + nativeBridge.capabilities.mockResolvedValue(CAPABILITIES); + nativeBridge.create.mockImplementation(async (options = {}) => ({ + id: "wv_test", + isolated: options.incognito === true, + ready: true, + options: { ...DEFAULT_OPTIONS, ...options }, + capabilities: CAPABILITIES, + })); + nativeBridge.evaluate.mockResolvedValue("result"); + nativeBridge.getUserAgent.mockResolvedValue("Agent/1.0"); + nativeBridge.getSettings.mockResolvedValue({ ...DEFAULT_OPTIONS }); + nativeBridge.getInfo.mockResolvedValue({ + id: "wv_test", + mode: "hidden", + incognito: false, + isolated: false, + destroyed: false, + ready: true, + url: "https://example.com", + title: "Example", + progress: 100, + loading: false, + canGoBack: true, + canGoForward: false, + userAgent: "Agent/1.0", + }); + nativeBridge.updateSettings.mockImplementation(async (id, settings) => ({ + ...DEFAULT_OPTIONS, + ...settings, + })); + nativeBridge.setUserAgent.mockImplementation(async (id, userAgent, mode) => ({ + ...DEFAULT_OPTIONS, + userAgent, + userAgentMode: mode || DEFAULT_OPTIONS.userAgentMode, + })); + nativeBridge.goBack.mockResolvedValue(true); + nativeBridge.goForward.mockResolvedValue(false); + nativeBridge.canGoBack.mockResolvedValue(true); + nativeBridge.canGoForward.mockResolvedValue(false); + nativeBridge.destroy.mockResolvedValue(undefined); + + await loadModule(); +}); + +describe("webview create", () => { + it("resolves an instance with native defaults merged in", async () => { + const instance = await createInstance({ mode: "fullscreen" }); + + expect(instance).toBeInstanceOf(AcodeWebView); + expect(instance.id).toBe("wv_test"); + expect(instance.options.mode).toBe("fullscreen"); + expect(instance.options.incognito).toBe(false); + expect(instance.options.userAgentMode).toBe("default"); + }); + + it("forwards only known options to the native layer", async () => { + await createInstance({ + incognito: true, + userAgentMode: "desktop", + cacheMode: "no-cache", + textZoom: 140, + unknownOption: "ignored", + }); + + expect(nativeBridge.create).toHaveBeenCalledWith({ + incognito: true, + userAgentMode: "desktop", + cacheMode: "no-cache", + textZoom: 140, + }); + }); + + it("rejects invalid enum options before touching native code", async () => { + await expect(createInstance({ mode: "floating" })).rejects.toThrow( + /Unsupported WebView mode/, + ); + await expect(createInstance({ cacheMode: "sometimes" })).rejects.toThrow( + /Unsupported WebView cacheMode/, + ); + await expect(createInstance({ userAgentMode: "tablet" })).rejects.toThrow( + /Unsupported WebView userAgentMode/, + ); + await expect(createInstance({ mixedContentMode: "maybe" })).rejects.toThrow( + /Unsupported WebView mixedContentMode/, + ); + expect(nativeBridge.create).not.toHaveBeenCalled(); + }); + + it("rejects non-canonical or reserved profile names instead of rewriting them", async () => { + for (const profileName of [ + "foo bar", + "foo+bar", + "foo.bar", + "a".repeat(65), + "", + ]) { + await expect(createInstance({ profileName })).rejects.toThrow( + /Unsupported WebView profileName/, + ); + } + await expect( + createInstance({ profileName: "acode_incognito_wv_test" }), + ).rejects.toThrow(/reserved/); + expect(nativeBridge.create).not.toHaveBeenCalled(); + }); + + it("forwards canonical profile names verbatim", async () => { + await createInstance({ incognito: true, profileName: "my-profile_1" }); + + expect(nativeBridge.create).toHaveBeenCalledWith({ + incognito: true, + profileName: "my-profile_1", + }); + }); + + it("reports isolation metadata for fullscreen instances immediately", async () => { + nativeBridge.create.mockResolvedValueOnce({ + id: "wv_fs", + isolated: true, + profileName: "acode_incognito_wv_fs", + options: { ...DEFAULT_OPTIONS, mode: "fullscreen", incognito: true }, + capabilities: CAPABILITIES, + }); + + const instance = await createInstance({ + mode: "fullscreen", + incognito: true, + }); + + expect(instance.isIsolated).toBe(true); + expect(instance.profileName).toBe("acode_incognito_wv_fs"); + }); + + it("clamps numeric settings", async () => { + await createInstance({ textZoom: 9000, initialScale: -5 }); + + expect(nativeBridge.create).toHaveBeenCalledWith({ + textZoom: 500, + initialScale: 0, + }); + }); + + it("rejects non-object options", async () => { + await expect(webviewAPI.create("nope")).rejects.toThrow(TypeError); + }); + + it("tolerates a native layer that returns just an id", async () => { + nativeBridge.create.mockResolvedValueOnce("wv_legacy"); + + const instance = await createInstance({ mode: "hidden" }); + + expect(instance.id).toBe("wv_legacy"); + expect(instance.options.mode).toBe("hidden"); + }); +}); + +describe("incognito", () => { + it("exposes incognito and isolation state", async () => { + const instance = await createInstance({ incognito: true }); + + expect(instance.isIncognito).toBe(true); + expect(instance.isIsolated).toBe(true); + }); + + it("reports when isolation is unavailable", async () => { + nativeBridge.create.mockResolvedValueOnce({ + id: "wv_x", + isolated: false, + options: { ...DEFAULT_OPTIONS, incognito: true }, + capabilities: { ...CAPABILITIES, multiProfile: false }, + }); + + const instance = await createInstance({ incognito: true }); + + expect(instance.isIncognito).toBe(true); + expect(instance.isIsolated).toBe(false); + expect(instance.capabilities.multiProfile).toBe(false); + }); + + it("exposes the resolved profile name", async () => { + nativeBridge.create.mockResolvedValueOnce({ + id: "wv_p", + isolated: true, + profileName: "acode_incognito_wv_p", + options: { ...DEFAULT_OPTIONS, incognito: true }, + capabilities: CAPABILITIES, + }); + + const instance = await createInstance({ incognito: true }); + + expect(instance.profileName).toBe("acode_incognito_wv_p"); + }); + + it("drops a requested profile name when native did not acquire it", async () => { + nativeBridge.create.mockResolvedValueOnce({ + id: "wv_fallback", + isolated: false, + options: { + ...DEFAULT_OPTIONS, + incognito: true, + profileName: "my-profile", + }, + capabilities: { ...CAPABILITIES, multiProfile: false }, + }); + + const instance = await createInstance({ + incognito: true, + profileName: "my-profile", + }); + + expect(instance.isIsolated).toBe(false); + expect(instance.profileName).toBeNull(); + }); + + it("updates isolation metadata from the ready event", async () => { + nativeBridge.create.mockResolvedValueOnce({ + id: "wv_deferred", + isolated: true, + profileName: "acode_incognito_wv_deferred", + ready: false, + options: { ...DEFAULT_OPTIONS, mode: "fullscreen", incognito: true }, + capabilities: CAPABILITIES, + }); + + const instance = await createInstance({ + mode: "fullscreen", + incognito: true, + }); + expect(instance.isIsolated).toBe(true); + + dispatch({ + id: "wv_deferred", + event: "ready", + data: { isolated: false, profileName: null }, + }); + + expect(instance.isIsolated).toBe(false); + expect(instance.profileName).toBeNull(); + }); + + it("refreshes isolation metadata from getInfo", async () => { + const instance = await createInstance({ incognito: true }); + expect(instance.isIsolated).toBe(true); + + nativeBridge.getInfo.mockResolvedValueOnce({ + id: "wv_test", + isolated: false, + destroyed: false, + ready: true, + }); + await instance.getInfo(); + + expect(instance.isIsolated).toBe(false); + expect(instance.profileName).toBeNull(); + }); +}); + +describe("user agent and settings", () => { + it("sets a custom user agent", async () => { + const instance = await createInstance(); + + const settings = await instance.setUserAgent("Custom/2.0", "mobile"); + + expect(nativeBridge.setUserAgent).toHaveBeenCalledWith( + "wv_test", + "Custom/2.0", + "mobile", + ); + expect(settings.userAgent).toBe("Custom/2.0"); + }); + + it("reads the user agent", async () => { + const instance = await createInstance(); + + await expect(instance.getUserAgent()).resolves.toBe("Agent/1.0"); + }); + + it("applies a validated batch of settings", async () => { + const instance = await createInstance(); + + const settings = await instance.configure({ + javaScript: false, + cacheMode: "cache-only", + textZoom: 300, + }); + + expect(nativeBridge.updateSettings).toHaveBeenCalledWith("wv_test", { + javaScript: false, + cacheMode: "cache-only", + textZoom: 300, + }); + expect(settings.textZoom).toBe(300); + }); + + it("rejects invalid settings values", async () => { + const instance = await createInstance(); + + await expect(instance.configure({ cacheMode: "whenever" })).rejects.toThrow( + /Unsupported WebView cacheMode/, + ); + expect(nativeBridge.updateSettings).not.toHaveBeenCalled(); + }); +}); + +describe("navigation helpers", () => { + it("passes headers and html options through", async () => { + const instance = await createInstance(); + + await instance.loadURL("https://example.com", { Authorization: "x" }); + await instance.loadHTML("

    hi

    ", { baseUrl: "https://example.com" }); + + expect(nativeBridge.loadURL).toHaveBeenCalledWith( + "wv_test", + "https://example.com", + { + Authorization: "x", + }, + ); + expect(nativeBridge.loadHTML).toHaveBeenCalledWith( + "wv_test", + "

    hi

    ", + { + baseUrl: "https://example.com", + }, + ); + }); + + it("returns whether goBack/goForward navigated", async () => { + const instance = await createInstance(); + + await expect(instance.goBack()).resolves.toBe(true); + await expect(instance.goForward()).resolves.toBe(false); + }); + + it("refreshes history flags", async () => { + const instance = await createInstance(); + + await expect(instance.refreshHistory()).resolves.toEqual({ + canGoBack: true, + canGoForward: false, + }); + expect(instance.canGoBack).toBe(true); + expect(instance.canGoForward).toBe(false); + }); + + it("passes includeDiskFiles to clearCache", async () => { + const instance = await createInstance(); + + await instance.clearCache(false); + await instance.clearHistory(); + + expect(nativeBridge.clearCache).toHaveBeenCalledWith("wv_test", false); + expect(instance.canGoBack).toBe(false); + }); + + it("forwards a null user agent so presets can take over", async () => { + const instance = await createInstance(); + + await instance.setUserAgent(null, "desktop"); + + expect(nativeBridge.setUserAgent).toHaveBeenCalledWith( + "wv_test", + null, + "desktop", + ); + }); +}); + +describe("waitForLoad", () => { + it("resolves when the main frame finishes", async () => { + const instance = await createInstance(); + const loaded = instance.waitForLoad(1000); + + dispatch({ + id: "wv_test", + event: "pageFinished", + data: { url: "https://acode.app", title: "Acode" }, + }); + + await expect(loaded).resolves.toEqual({ + url: "https://acode.app", + title: "Acode", + }); + }); + + it("rejects on a main-frame load error but ignores subresources", async () => { + const instance = await createInstance(); + const loaded = instance.waitForLoad(1000); + + dispatch({ + id: "wv_test", + event: "resourceError", + data: { url: "https://acode.app/x.png", isForMainFrame: false }, + }); + dispatch({ + id: "wv_test", + event: "resourceError", + data: { url: "https://acode.app", description: "net::ERR_FAILED" }, + }); + + await expect(loaded).rejects.toThrow(/failed to load/); + }); + + it("rejects when the instance is destroyed while loading", async () => { + const instance = await createInstance(); + const loaded = instance.waitForLoad(1000); + + await instance.destroy(); + + await expect(loaded).rejects.toThrow(/closed before it finished loading/); + }); + + it("rejects when the renderer process exits, even without a timeout", async () => { + const instance = await createInstance(); + const loaded = instance.waitForLoad(0); + + dispatch({ + id: "wv_test", + event: "renderProcessGone", + data: { didCrash: true }, + }); + + await expect(loaded).rejects.toThrow(/renderer process exited/); + expect(instance.isDestroyed).toBe(true); + }); +}); + +describe("waitForReady", () => { + it("is immediately ready when creation reported ready", async () => { + const instance = await createInstance(); + + expect(instance.ready).toBe(true); + await expect(instance.waitForReady(50)).resolves.toBeUndefined(); + }); + + it("waits for the ready event on a fullscreen instance", async () => { + nativeBridge.create.mockResolvedValueOnce({ + id: "wv_fs_ready", + ready: false, + options: { ...DEFAULT_OPTIONS, mode: "fullscreen" }, + capabilities: CAPABILITIES, + }); + nativeBridge.getInfo.mockResolvedValueOnce({ + id: "wv_fs_ready", + mode: "fullscreen", + ready: false, + destroyed: false, + }); + + const instance = await createInstance({ mode: "fullscreen" }); + expect(instance.ready).toBe(false); + + const ready = instance.waitForReady(1000); + dispatch({ + id: "wv_fs_ready", + event: "ready", + data: { mode: "fullscreen" }, + }); + + await expect(ready).resolves.toBeUndefined(); + expect(instance.ready).toBe(true); + }); + + it("rejects when the instance is destroyed before it is ready", async () => { + nativeBridge.create.mockResolvedValueOnce({ + id: "wv_fs_dead", + ready: false, + options: { ...DEFAULT_OPTIONS, mode: "fullscreen" }, + capabilities: CAPABILITIES, + }); + nativeBridge.getInfo.mockResolvedValueOnce({ + id: "wv_fs_dead", + ready: false, + destroyed: false, + }); + + const instance = await createInstance({ mode: "fullscreen" }); + const ready = instance.waitForReady(1000); + + await instance.destroy(); + + await expect(ready).rejects.toThrow(/closed before it became ready/); + }); +}); + +describe("events", () => { + it("dispatches events with (data, event) and updates state", async () => { + const instance = await createInstance(); + const seen = []; + instance.on(WebViewEvents.PAGE_FINISHED, (data, event) => { + seen.push([data, event]); + }); + + dispatch({ + id: "wv_test", + event: "pageFinished", + data: { url: "https://acode.app", title: "Acode" }, + }); + + expect(seen).toEqual([ + [{ url: "https://acode.app", title: "Acode" }, "pageFinished"], + ]); + expect(instance.url).toBe("https://acode.app"); + expect(instance.title).toBe("Acode"); + expect(instance.loading).toBe(false); + }); + + it("tracks progress and history events", async () => { + const instance = await createInstance(); + + dispatch({ + id: "wv_test", + event: "progressChanged", + data: { progress: 40 }, + }); + expect(instance.progress).toBe(40); + expect(instance.loading).toBe(true); + + dispatch({ + id: "wv_test", + event: "historyChanged", + data: { canGoBack: true, canGoForward: true }, + }); + expect(instance.canGoBack).toBe(true); + expect(instance.canGoForward).toBe(true); + }); + + it("supports once, off, wildcard and onAny listeners", async () => { + const instance = await createInstance(); + const once = vi.fn(); + const specific = vi.fn(); + const any = vi.fn(); + + instance.once(WebViewEvents.TITLE_CHANGED, once); + instance.on(WebViewEvents.TITLE_CHANGED, specific); + instance.onAny(any); + + dispatch({ id: "wv_test", event: "titleChanged", data: { title: "one" } }); + dispatch({ id: "wv_test", event: "titleChanged", data: { title: "two" } }); + + expect(once).toHaveBeenCalledTimes(1); + expect(specific).toHaveBeenCalledTimes(2); + expect(any).toHaveBeenCalledTimes(2); + expect(any).toHaveBeenLastCalledWith("titleChanged", { title: "two" }); + + instance.off(WebViewEvents.TITLE_CHANGED, specific); + instance.offAny(any); + dispatch({ + id: "wv_test", + event: "titleChanged", + data: { title: "three" }, + }); + + expect(specific).toHaveBeenCalledTimes(2); + expect(any).toHaveBeenCalledTimes(2); + }); + + it("removes a pending once listener by its original callback", async () => { + const instance = await createInstance(); + const pending = vi.fn(); + + instance.once(WebViewEvents.TITLE_CHANGED, pending); + instance.off(WebViewEvents.TITLE_CHANGED, pending); + dispatch({ id: "wv_test", event: "titleChanged", data: { title: "x" } }); + + expect(pending).not.toHaveBeenCalled(); + }); + + it("delivers parsed page messages", async () => { + const instance = await createInstance(); + const messages = []; + instance.onMessage((message) => messages.push(message)); + + dispatch({ id: "wv_test", message: JSON.stringify({ hello: "world" }) }); + dispatch({ id: "wv_test", message: "plain text" }); + + expect(messages).toEqual([{ hello: "world" }, "plain text"]); + }); + + it("emits local shown/hidden events", async () => { + const instance = await createInstance({ mode: "fullscreen" }); + const shown = vi.fn(); + const hidden = vi.fn(); + instance.on(WebViewEvents.SHOWN, shown); + instance.on(WebViewEvents.HIDDEN, hidden); + + await instance.show(); + await instance.hide(); + + expect(shown).toHaveBeenCalledTimes(1); + expect(hidden).toHaveBeenCalledTimes(1); + }); + + it("ignores events for unknown instances", async () => { + await createInstance(); + + expect(() => + dispatch({ id: "nope", event: "pageFinished", data: {} }), + ).not.toThrow(); + }); +}); + +describe("closed and destroyed", () => { + it("marks the instance destroyed on closed and notifies listeners first", async () => { + const instance = await createInstance(); + const closed = vi.fn(); + instance.on(WebViewEvents.CLOSED, closed); + + dispatch({ id: "wv_test", event: "closed" }); + + expect(closed).toHaveBeenCalledTimes(1); + expect(instance.isDestroyed).toBe(true); + expect(webviewAPI.get("wv_test")).toBe(null); + await expect(instance.evaluate("1")).rejects.toThrow( + "WebView has been destroyed", + ); }); it("keeps the instance usable when native destruction fails", async () => { - const webview = await webviewAPI.create(); + const instance = await createInstance(); nativeBridge.destroy.mockRejectedValueOnce(new Error("native failure")); - await expect(webview.destroy()).rejects.toThrow("native failure"); - await expect(webview.evaluate("1 + 1")).resolves.toBe("result"); - expect(nativeBridge.evaluate).toHaveBeenCalledWith("webview-1", "1 + 1"); + await expect(instance.destroy()).rejects.toThrow("native failure"); + await expect(instance.evaluate("1 + 1")).resolves.toBe("result"); + expect(nativeBridge.evaluate).toHaveBeenCalledWith("wv_test", "1 + 1"); - await expect(webview.destroy()).resolves.toBeUndefined(); + await expect(instance.destroy()).resolves.toBeUndefined(); expect(nativeBridge.destroy).toHaveBeenCalledTimes(2); }); it("marks the instance destroyed only after native destruction succeeds", async () => { - const webview = await webviewAPI.create(); + const instance = await createInstance(); - await webview.destroy(); + await instance.destroy(); - await expect(webview.evaluate("1 + 1")).rejects.toThrow( + await expect(instance.evaluate("1 + 1")).rejects.toThrow( "WebView has been destroyed", ); }); @@ -53,10 +747,10 @@ describe("WebView lifecycle", () => { resolveDestroy = resolve; }), ); - const webview = await webviewAPI.create(); + const instance = await createInstance(); - const firstDestroy = webview.destroy(); - const secondDestroy = webview.destroy(); + const firstDestroy = instance.destroy(); + const secondDestroy = instance.destroy(); expect(nativeBridge.destroy).toHaveBeenCalledTimes(1); resolveDestroy(); @@ -64,8 +758,45 @@ describe("WebView lifecycle", () => { undefined, undefined, ]); - await expect(webview.evaluate("1 + 1")).rejects.toThrow( + await expect(instance.evaluate("1 + 1")).rejects.toThrow( "WebView has been destroyed", ); }); }); + +describe("registry", () => { + it("lists, gets and destroys every instance", async () => { + nativeBridge.create + .mockResolvedValueOnce({ + id: "wv_a", + options: { ...DEFAULT_OPTIONS }, + capabilities: CAPABILITIES, + }) + .mockResolvedValueOnce({ + id: "wv_b", + options: { ...DEFAULT_OPTIONS }, + capabilities: CAPABILITIES, + }); + + await createInstance(); + await createInstance(); + + expect(webviewAPI.list()).toEqual(["wv_a", "wv_b"]); + expect(webviewAPI.get("wv_a")).toBeInstanceOf(AcodeWebView); + expect(webviewAPI.get("missing")).toBe(null); + + await webviewAPI.destroyAll(); + + expect(nativeBridge.destroy).toHaveBeenCalledTimes(2); + expect(webviewAPI.list()).toEqual([]); + }); + + it("caches plugin capabilities", async () => { + const first = await webviewAPI.getCapabilities(); + const second = await webviewAPI.getCapabilities(); + + expect(first.multiProfile).toBe(true); + expect(second).toBe(first); + expect(nativeBridge.capabilities).toHaveBeenCalledTimes(1); + }); +}); From f4b75304f5af12c7891d137517350fce6967d536 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Tue, 27 Oct 2026 00:01:30 +0530 Subject: [PATCH 162/195] chore(deps): bump @acode.app/canvas-view to 0.0.3 The canvas renderer's repeated flicks now add up like Android's list views, a magnifier shows the text under the finger while dragging a selection (like sora-editor), and touch selections no longer draw a blinking cursor at their end. --- bun.lock | 4 ++-- package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bun.lock b/bun.lock index 5bd4372c78..f5aca1df79 100644 --- a/bun.lock +++ b/bun.lock @@ -5,7 +5,7 @@ "": { "name": "com.foxdebug.acode", "dependencies": { - "@acode.app/canvas-view": "^0.0.2", + "@acode.app/canvas-view": "^0.0.3", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", @@ -160,7 +160,7 @@ "tar": "^7.5.22", }, "packages": { - "@acode.app/canvas-view": ["@acode.app/canvas-view@0.0.2", "", { "dependencies": { "@codemirror/language": "^6.13.1", "@codemirror/state": "^6.7.6", "@codemirror/view": "^6.43.14", "@lezer/common": "^1.5.4", "@lezer/highlight": "^1.2.5", "style-mod": "^4.1.2" } }, "sha512-Kt6/YSNtdDl6UavLGi3yK4qOK4qqrPDjr+GQoE6V/0oKRcijnz4pvhPy2a+TDCPljSfYOH/KzT0wxKPEXOatFA=="], + "@acode.app/canvas-view": ["@acode.app/canvas-view@0.0.3", "", { "dependencies": { "@codemirror/language": "^6.13.1", "@codemirror/state": "^6.7.6", "@codemirror/view": "^6.43.14", "@lezer/common": "^1.5.4", "@lezer/highlight": "^1.2.5", "style-mod": "^4.1.2" } }, "sha512-OqiaTijJYsAyhYfUXmd8bZuWJvc6n2GiG5AO4LNsl1qSRYfTx0UgpVI9DUNeVooDCFempuVBuZiOIh4sdUb/Hg=="], "@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], diff --git a/package-lock.json b/package-lock.json index a85009c92f..df5052d997 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.13.5", "license": "MIT", "dependencies": { - "@acode.app/canvas-view": "^0.0.2", + "@acode.app/canvas-view": "^0.0.3", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", @@ -172,9 +172,9 @@ } }, "node_modules/@acode.app/canvas-view": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/@acode.app/canvas-view/-/canvas-view-0.0.2.tgz", - "integrity": "sha512-Kt6/YSNtdDl6UavLGi3yK4qOK4qqrPDjr+GQoE6V/0oKRcijnz4pvhPy2a+TDCPljSfYOH/KzT0wxKPEXOatFA==", + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@acode.app/canvas-view/-/canvas-view-0.0.3.tgz", + "integrity": "sha512-OqiaTijJYsAyhYfUXmd8bZuWJvc6n2GiG5AO4LNsl1qSRYfTx0UgpVI9DUNeVooDCFempuVBuZiOIh4sdUb/Hg==", "license": "MIT", "dependencies": { "@codemirror/language": "^6.13.1", diff --git a/package.json b/package.json index 1e56bbfe1c..520b7c44b2 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "ws": "^8.21.3" }, "dependencies": { - "@acode.app/canvas-view": "^0.0.2", + "@acode.app/canvas-view": "^0.0.3", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", From dd6497033c62ee0c21b29945cf59c5976169a72e Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Wed, 28 Oct 2026 19:05:18 +0000 Subject: [PATCH 163/195] feat(sidebar): add multi-select & drag-drop to file tree (#2999) * feat(sidebar): add multi-select to file tree Select files and folders in the sidebar and act on them together: copy, cut, delete, copy relative paths, open and rename. The clipboard is now shared across open folders and pastes multiple entries. * feat(sidebar): drag to move, folder header actions, review fixes - Long-press and drag entries (or the whole selection) onto a folder to move them; closed folders open on hover and the list scrolls at edges. - Open folder headers get New file, New folder, Refresh and Collapse all: shown on hover with a mouse, behind a single "+" on touch. - Paste keeps skipped or failed entries in the clipboard and continues past failures. - Pasting across servers or storage transfers through both providers. - Open and copy path keep entries selected inside a selected folder. - Folder-into-itself warnings no longer block the paste. - Closing an open folder drops its entries from the selection. - Mock the new sidebar modules in the file icon sidebar test. * feat(sidebar): slide folder header actions out inline on touch Tapping "+" now reveals the actions as an inline strip in the header instead of a popup menu; it closes after an action or a tap elsewhere. * fix(sidebar): header menu, tree scrolling, long-press and review fixes - Header button opens the folder's select menu, which now also has Refresh and Collapse all. - Size open folders on every expand and measure real header heights, so the tree can scroll to its last entry. - Holding still after a long press opens the menu without lifting; a drag needs a deliberate move. - Release touch listeners after a drag ends. - Replacing an existing entry works when pasting across connections. * fix(sidebar): keep drags working across open folders Opening another folder mid-drag collapsed the source folder, which then collapsed the new one back, and detached the touched row so the drag stopped receiving touch events. Size folders only when they expand, listen for touch events on the touched row too, and cancel a drag on any stray touch. * fix(sidebar): check exclusions before replacing, recheck folder before sizing - Cross-connection copies skip excluded entries before deleting an existing destination. - Size a folder only if it's still open once the files app has loaded. --- src/lib/openFolder.js | 815 ++++++++++++++++++++------- src/sidebarApps/files/dragMove.js | 614 ++++++++++++++++++++ src/sidebarApps/files/dragMove.scss | 179 ++++++ src/sidebarApps/files/index.js | 25 +- src/sidebarApps/files/selection.js | 528 +++++++++++++++++ src/sidebarApps/files/selection.scss | 273 +++++++++ src/sidebarApps/files/style.scss | 74 +++ tests/unit/fileIconSidebar.test.ts | 4 + 8 files changed, 2302 insertions(+), 210 deletions(-) create mode 100644 src/sidebarApps/files/dragMove.js create mode 100644 src/sidebarApps/files/dragMove.scss create mode 100644 src/sidebarApps/files/selection.js create mode 100644 src/sidebarApps/files/selection.scss diff --git a/src/lib/openFolder.js b/src/lib/openFolder.js index fa300d0ce0..ba961ddac4 100644 --- a/src/lib/openFolder.js +++ b/src/lib/openFolder.js @@ -1,5 +1,6 @@ import fsOperation from "fileSystem"; import sidebarApps from "sidebarApps"; +import fileSelection from "sidebarApps/files/selection"; import collapsableList from "components/collapsableList"; import FileTree from "components/fileTree"; import Sidebar from "components/sidebar"; @@ -10,8 +11,10 @@ import confirm from "dialogs/confirm"; import prompt from "dialogs/prompt"; import select from "dialogs/select"; import escapeStringRegexp from "escape-string-regexp"; +import tag from "html-tag-js"; import fileIcons from "lib/fileIcons"; import copyEntry from "utils/copyEntry"; +import { isExcludedFileOperationPath } from "utils/fileOperationExclusions"; import helpers from "utils/helpers"; import Path from "utils/Path"; import Uri from "utils/Uri"; @@ -94,10 +97,15 @@ const convertToProotPath = (url = "") => { */ /** - * @typedef {object} ClipBoard + * @typedef {object} ClipBoardItem * @property {string} url - * @property {HTMLElement} $el - * @property {"cut"|"copy"} action + * @property {"file"|"dir"} type + */ + +/** + * @typedef {object} ClipBoard + * @property {ClipBoardItem[]} items + * @property {"cut"|"copy"|null} action */ /** @@ -116,6 +124,11 @@ const convertToProotPath = (url = "") => { /**@type {Folder[]} */ export const addedFolder = []; +/** + * Shared by every open folder so entries can be pasted across roots. + * @type {ClipBoard} + */ +const clipBoard = { items: [], action: null }; const ACODE_PLUGIN_MANIFEST_FILE = "plugin.json"; /** * Open a folder in the sidebar @@ -143,9 +156,23 @@ function openFolder(_path, opts = {}) { const $root = collapsableList(title, "folder", { allCaps: true, + tail: createRootActions(() => $root), ontoggle: () => { setFolderLeadIcon($root, title, { isRoot: true }); expandList($root); + // Folders also expand without a header tap (saved state, header + // actions, drag hover), so size them here rather than on click only. + // Only on expand: sizing collapses the other folders, and doing it on + // collapse would undo the folder that just opened. + // Imported lazily: the files app reads `strings` when it loads. + if ($root.unclasped) { + import("sidebarApps/files") + .then(({ fixHeight }) => { + // It may have closed again while the module loaded. + if ($root.unclasped) fixHeight($root); + }) + .catch(console.error); + } }, }); setFolderLeadIcon($root, title, { isRoot: true }); @@ -182,7 +209,7 @@ function openFolder(_path, opts = {}) { url: _path, $node: $root, id: opts.id, - clipBoard: {}, + clipBoard, reload() { $root.collapse(); $root.expand(); @@ -230,6 +257,89 @@ function openFolder(_path, opts = {}) { } } +/** + * Quick actions on an open folder's header. With a mouse they appear on + * hover; on touch a single button opens the folder's menu (the same one as a + * long press), so idle headers stay clean. + * @param {() => Collapsible} getRoot + * @returns {HTMLElement} + */ +function createRootActions(getRoot) { + const $actions = tag("span", { className: "root-actions" }); + const buttons = [ + ["new file", "document-add", strings["new file"]], + ["new folder", "folder-add", strings["new folder"]], + ["refresh", "autorenew", strings.refresh], + ["collapse-all", "expand_less", strings["collapse all"] || "Collapse all"], + ["menu", "more_vert more-actions", strings.more], + ]; + + for (const [action, icon, title] of buttons) { + // tile children only receive clicks when they carry data-action. + const $button = tag("span", { className: `icon ${icon}`, title }); + $button.dataset.action = action; + $actions.append($button); + } + + $actions.addEventListener("click", (e) => { + const $button = e.target.closest("[data-action]"); + if (!$button) return; + e.preventDefault(); + e.stopPropagation(); + + const $root = getRoot(); + const { action } = $button.dataset; + if (action === "menu") { + const { url, name } = $root.$title.dataset; + handleContextmenu("root", url, name, $root.$title); + return; + } + + runRootAction($root, action, $button).catch(helpers.error); + }); + + return $actions; +} + +/** + * @param {Collapsible} $root + * @param {string} action + * @param {HTMLElement} [$button] + */ +async function runRootAction($root, action, $button) { + const { url, name } = $root.$title.dataset; + + switch (action) { + case "new file": + case "new folder": + if ($root.collapsed) $root.expand(); + return execOperation("root", action, url, $root.$title, name); + + case "refresh": { + if ($root.collapsed) { + $root.expand(); + return; + } + $button?.classList.add("spinning"); + try { + await getLoadedFileTree($root.$title)?.refresh(); + } finally { + $button?.classList.remove("spinning"); + } + return; + } + + case "collapse-all": { + // Deepest first, so each folder records its own collapsed state. + const $open = Array.from( + $root.$ul.querySelectorAll(".list.collapsible:not(.hidden)"), + ).reverse(); + for (const $list of $open) $list.collapse(); + return; + } + } +} + /** * Expand the list * @param {Collapsible} $list @@ -317,8 +427,10 @@ async function handleContextmenu(type, url, name, $target) { if (appSettings.value.vibrateOnTap) { navigator.vibrate(config.VIBRATION_TIME); } - const { clipBoard, $node } = openFolder.find(url); - const cancel = `${strings.cancel}${clipBoard ? ` (${strings[clipBoard.action]})` : ""}`; + const { $node } = openFolder.find(url); + const hasClipboard = clipBoard.items.length > 0; + const cancel = `${strings.cancel}${hasClipboard ? ` (${strings[clipBoard.action]})` : ""}`; + const SELECT = ["select", strings.select, "check_circle_outline"]; const COPY = ["copy", strings.copy, "copy"]; const CUT = ["cut", strings.cut, "cut"]; const COPY_RELATIVE_PATH = [ @@ -328,13 +440,19 @@ async function handleContextmenu(type, url, name, $target) { ]; const REMOVE = ["delete", strings.delete, "delete"]; const RENAME = ["rename", strings.rename, "edit"]; - const PASTE = ["paste", strings.paste, "paste", !!clipBoard]; + const PASTE = ["paste", strings.paste, "paste", hasClipboard]; const NEW_FILE = ["new file", strings["new file"], "document-add"]; const NEW_FOLDER = ["new folder", strings["new folder"], "folder-add"]; const CANCEL = ["cancel", cancel, "clearclose"]; const OPEN_FOLDER = ["open-folder", strings["open folder"], "folder"]; const INSERT_FILE = ["insert-file", strings["insert file"], "file_copy"]; const CLOSE_FOLDER = ["close", strings["close"], "folder-remove"]; + const REFRESH = ["refresh", strings.refresh, "autorenew"]; + const COLLAPSE_ALL = [ + "collapse-all", + strings["collapse all"] || "Collapse all", + "expand_less", + ]; const INSTALL_PLUGIN = [ "install-plugin", strings["install as plugin"] || "Install as Plugin", @@ -349,7 +467,7 @@ async function handleContextmenu(type, url, name, $target) { let options; if (helpers.isFile(type)) { - options = [COPY, CUT, COPY_RELATIVE_PATH, RENAME, REMOVE]; + options = [SELECT, COPY, CUT, COPY_RELATIVE_PATH, RENAME, REMOVE]; if ( url.toLowerCase().endsWith(".zip") && (await fsOperation( @@ -359,9 +477,9 @@ async function handleContextmenu(type, url, name, $target) { options.push(INSTALL_PLUGIN); } } else if (helpers.isDir(type)) { - options = [COPY, CUT, COPY_RELATIVE_PATH, REMOVE, RENAME]; + options = [SELECT, COPY, CUT, COPY_RELATIVE_PATH, REMOVE, RENAME]; - if (clipBoard.url != null) { + if (hasClipboard) { options.push(PASTE); } @@ -380,7 +498,7 @@ async function handleContextmenu(type, url, name, $target) { } else if (type === "root") { options = []; - if (clipBoard.url != null) { + if (hasClipboard) { options.push(PASTE); } @@ -397,7 +515,7 @@ async function handleContextmenu(type, url, name, $target) { options.push(OPEN_SSH_TERMINAL); } - options.push(CLOSE_FOLDER); + options.push(REFRESH, COLLAPSE_ALL, CLOSE_FOLDER); } if (clipBoard.action) options.push(CANCEL); @@ -415,17 +533,20 @@ async function handleContextmenu(type, url, name, $target) { /** * @param {"dir"|"file"|"root"} type - * @param {"copy"|"cut"|"delete"|"rename"|"paste"|"new file"|"new folder"|"cancel"|"open-folder"|"install-plugin"|"open-in-terminal"|"open-ssh-terminal"|"copy-relative-path"} action + * @param {"select"|"copy"|"cut"|"delete"|"rename"|"paste"|"new file"|"new folder"|"cancel"|"open-folder"|"install-plugin"|"open-in-terminal"|"open-ssh-terminal"|"copy-relative-path"} action * @param {string} url target url * @param {HTMLElement} $target target element * @param {string} name Name of file or folder */ function execOperation(type, action, url, $target, name) { - const { clipBoard, $node, remove, url: rootUrl } = openFolder.find(url); + const { $node, remove, url: rootUrl } = openFolder.find(url); const startLoading = () => $node.$title.classList.add("loading"); const stopLoading = () => $node.$title.classList.remove("loading"); switch (action) { + case "select": + return fileSelection.start($target); + case "copy": case "cut": return clipBoardAction(); @@ -464,6 +585,10 @@ function execOperation(type, action, url, $target, name) { case "open-ssh-terminal": return openSshTerminal(); + case "refresh": + case "collapse-all": + return runRootAction($node, action); + case "copy-relative-path": return copyRelativePath(); } @@ -497,42 +622,14 @@ function execOperation(type, action, url, $target, name) { return; } - let relativePath; - - // Try using Url.pathname for protocol-based URLs - const rootPath = Url.pathname(rootUrl); - const targetPath = Url.pathname(url); - - if (rootPath && targetPath) { - // Both pathnames extracted successfully - relativePath = Path.convertToRelative(rootPath, targetPath); - } else { - // Fallback: Use simple string comparison for URIs where pathname extraction fails - const cleanRoot = rootUrl.endsWith("/") - ? rootUrl.slice(0, -1) - : rootUrl; - const cleanTarget = url.endsWith("/") ? url.slice(0, -1) : url; - - // Check if target URL starts with root URL - if (cleanTarget.startsWith(cleanRoot)) { - relativePath = cleanTarget.slice(cleanRoot.length + 1); - } else { - // If not a child path, just use basename - relativePath = Url.basename(url); - } - } + const relativePath = getRelativePath(url, rootUrl); if (!relativePath) { console.error("Unable to calculate relative path"); return; } - if (cordova.plugins.clipboard) { - cordova.plugins.clipboard.copy(relativePath); - } else { - console.error("Clipboard not available"); - toast("Clipboard not available"); - } + copyText(relativePath); } catch (error) { console.error("Failed to copy relative path:", error); } @@ -592,49 +689,8 @@ function execOperation(type, action, url, $target, name) { const confirmation = await confirm(strings.warning, msg); if (!confirmation) return; startLoading(); - if (!(await fsOperation(url).exists())) return; - // await fsOperation(url).delete(); - recents.removeFile(url); - if (helpers.isFile(type)) { - await fsOperation(url).delete(); - removeEntryFromOpenFolder(url); - const file = editorManager.getFile(url, "uri"); - if (file) file.uri = null; - editorManager.onupdate("delete-file"); - editorManager.emit("update", "delete-file"); - } else { - if (isTerminalSafUri(url)) { - const fs = fsOperation(url); - const entries = await fs.lsDir(); - if (entries.length === 0) { - await fs.delete(); - } else { - const deleteRecursively = async (currentUrl) => { - const currentFs = fsOperation(currentUrl); - const currentEntries = await currentFs.lsDir(); - for (const entry of currentEntries) { - if (entry.isDirectory) { - await deleteRecursively(entry.url); - } else { - await fsOperation(entry.url).delete(); - } - } - await currentFs.delete(); - }; - await deleteRecursively(url); - } - } else { - await fsOperation(url).delete(); - } - recents.removeFolder(url); - helpers.updateUriOfAllActiveFiles(url, null); - removeEntryFromOpenFolder(url); - editorManager.onupdate("delete-folder"); - editorManager.emit("update", "delete-folder"); - } - + if (!(await deleteEntry(url, type))) return; toast(strings.success); - FileList.remove(url); } async function renameFile() { @@ -725,124 +781,27 @@ function execOperation(type, action, url, $target, name) { } async function paste() { - if (clipBoard.url == null) { + if (!clipBoard.items.length) { alert(strings.warning, "Nothing to paste"); return; } - // Prevent pasting a folder into itself or its subdirectories - if (helpers.isDir(clipBoard.$el.dataset.type)) { - const sourceUrl = Url.parse(clipBoard.url).url; - const targetUrl = Url.parse(url).url; - - // Check if trying to paste folder into itself - if (sourceUrl === targetUrl) { - alert(strings.warning, "Cannot paste a folder into itself"); - return; - } - - // Check if trying to paste folder into one of its subdirectories - if ( - targetUrl.startsWith(sourceUrl + "/") || - targetUrl.startsWith(sourceUrl + "\\") - ) { - alert(strings.warning, "Cannot paste a folder into its subdirectory"); - return; - } - } - - const srcType = clipBoard.$el.dataset.type; - const IS_FILE = helpers.isFile(srcType); - const IS_DIR = helpers.isDir(srcType); + const { action: pasteAction, items } = clipBoard; startLoading(); try { - const fs = fsOperation(clipBoard.url); - const itemName = Url.basename(clipBoard.url); - const possibleConflictUrl = Url.join(url, itemName); - const doesExist = await fsOperation(possibleConflictUrl).exists(); - if (doesExist) { - let confirmation = await confirm( - strings.warning, - strings["already exists"] - ? strings["already exists"].replace("{name}", itemName) - : `"${itemName}" already exists in this location.`, - ); - if (!confirmation) return; - } - let newUrl; - if (clipBoard.action === "cut") { - // Special handling for SAF folders backed by terminal providers - move manually due to SAF limitations - if (isTerminalSafUri(clipBoard.url) && IS_DIR) { - const moveRecursively = async (sourceUrl, targetParentUrl) => { - const sourceFs = fsOperation(sourceUrl); - const sourceName = Url.basename(sourceUrl); - const targetUrl = Url.join(targetParentUrl, sourceName); - - // Create target folder - await fsOperation(targetParentUrl).createDirectory(sourceName); - - // Get all entries in source folder - const entries = await sourceFs.lsDir(); - - // Move all files and folders recursively - for (const entry of entries) { - if (entry.isDirectory) { - await moveRecursively(entry.url, targetUrl); - } else { - const fileContent = await fsOperation(entry.url).readFile(); - const fileName = entry.name || Url.basename(entry.url); - await fsOperation(targetUrl).createFile(fileName, fileContent); - await fsOperation(entry.url).delete(); - } - } - - // Delete the now-empty source folder - await sourceFs.delete(); - return targetUrl; - }; - - newUrl = await moveRecursively(clipBoard.url, url); - } else { - newUrl = await fs.moveTo(url); - } - } else { - if (appSettings.value.useFileOperationExclusions) { - const result = await copyEntry(clipBoard.url, url, { - excludePatterns: appSettings.value.excludeFolders, - }); - newUrl = result.url; - if (!newUrl) { - toast(strings.skipped); - clearClipboard(); - return; - } - } else { - newUrl = await fs.copyTo(url); - } - } - stopLoading(); + const { pasted, remaining, error } = await pasteEntries( + items, + url, + pasteAction, + ); - if (clipBoard.action === "cut") { - if (IS_FILE) { - const file = editorManager.getFile(clipBoard.url, "uri"); - if (file) file.uri = newUrl; - } else if (IS_DIR) { - helpers.updateUriOfAllActiveFiles(clipBoard.url, newUrl); - migrateOpenFolderStateUrls(clipBoard.url, newUrl); - } - removeEntryFromOpenFolder(clipBoard.url); - FileList.rename(clipBoard.url, newUrl); - } else { - FileList.append(url, newUrl); - } + // Keep skipped or failed entries so the paste can be retried. + if (remaining.length) setClipboard(remaining, pasteAction); + else clearClipboard(); - appendEntryToOpenFolder(url, newUrl, IS_DIR ? "folder" : "file"); - toast(strings.success); - clearClipboard(); - } catch (error) { - console.error(error); - helpers.error(error); + if (error) helpers.error(error); + else if (pasted) toast(strings.success); } finally { stopLoading(); } @@ -869,12 +828,7 @@ function execOperation(type, action, url, $target, name) { } async function clipBoardAction() { - clipBoard.url = url; - clipBoard.action = action; - clipBoard.$el = $target; - - if (action === "cut") $target.classList.add("cut"); - else $target.classList.remove("cut"); + setClipboard([{ url, type }], action); } async function open() { @@ -886,17 +840,466 @@ function execOperation(type, action, url, $target, name) { } function cancelAction() { - clipBoard.$el.classList.remove("cut"); clearClipboard(); } +} + +/** + * Delete a file or folder and update every view that references it. + * @param {string} url + * @param {"file"|"dir"} type + * @returns {Promise} false when the entry no longer exists + */ +async function deleteEntry(url, type) { + if (!(await fsOperation(url).exists())) return false; + recents.removeFile(url); + await deleteFromDisk(url, type); + if (helpers.isFile(type)) { + removeEntryFromOpenFolder(url); + const file = editorManager.getFile(url, "uri"); + if (file) file.uri = null; + editorManager.onupdate("delete-file"); + editorManager.emit("update", "delete-file"); + } else { + recents.removeFolder(url); + helpers.updateUriOfAllActiveFiles(url, null); + removeEntryFromOpenFolder(url); + editorManager.onupdate("delete-folder"); + editorManager.emit("update", "delete-folder"); + } + + FileList.remove(url); + return true; +} + +/** + * Remove a file or folder from its file system without touching any views. + * @param {string} url + * @param {"file"|"dir"} type + */ +async function deleteFromDisk(url, type) { + if (!helpers.isDir(type) || !isTerminalSafUri(url)) { + await fsOperation(url).delete(); + return; + } + + // Terminal SAF providers can't delete non-empty folders. + const deleteRecursively = async (currentUrl) => { + const currentFs = fsOperation(currentUrl); + const currentEntries = await currentFs.lsDir(); + for (const entry of currentEntries) { + if (entry.isDirectory) { + await deleteRecursively(entry.url); + } else { + await fsOperation(entry.url).delete(); + } + } + await currentFs.delete(); + }; + await deleteRecursively(url); +} + +/** + * Paste entries one by one so a failure doesn't stop the rest. + * @param {ClipBoardItem[]} items + * @param {string} targetUrl + * @param {"cut"|"copy"} action + * @returns {Promise<{pasted: number, remaining: ClipBoardItem[], error?: Error}>} + * `remaining` holds the entries that were skipped or failed. + */ +async function pasteEntries(items, targetUrl, action) { + const remaining = []; + let pasted = 0; + let error; + + for (const item of items) { + try { + if (await pasteEntry(item, targetUrl, action)) { + pasted++; + continue; + } + } catch (err) { + console.error(err); + error = err; + } + remaining.push(item); + } + + return { pasted, remaining, error }; +} + +/** + * Identify the connection a url belongs to. Providers can only move or copy + * within their own connection (e.g. one SFTP server or one SAF tree). + * @param {string} url + * @returns {string} + */ +function getConnectionKey(url) { + const { url: parsedUrl } = Url.parse(url); + const protocol = Url.getProtocol(parsedUrl); + + if (!protocol || protocol === "file:") return "file:"; + + if (protocol === "content:") { + try { + return `content:${Uri.parse(parsedUrl).rootUri}`; + } catch (error) { + return parsedUrl; + } + } + + const { username, hostname, port } = Url.decodeUrl(parsedUrl); + return `${protocol}//${username || ""}@${hostname}:${port || ""}`; +} + +/** + * Paste a clipboard entry into a folder. + * @param {ClipBoardItem} item + * @param {string} targetUrl + * @param {"cut"|"copy"} action + * @returns {Promise} New url, or null when skipped + */ +async function pasteEntry({ url: srcUrl, type: srcType }, targetUrl, action) { + const IS_FILE = helpers.isFile(srcType); + const IS_DIR = helpers.isDir(srcType); + + // Prevent pasting a folder into itself or its subdirectories + if (IS_DIR) { + const sourcePath = Url.parse(srcUrl).url; + const targetPath = Url.parse(targetUrl).url; + + if (sourcePath === targetPath) { + alert(strings.warning, "Cannot paste a folder into itself"); + return null; + } + + if ( + targetPath.startsWith(sourcePath + "/") || + targetPath.startsWith(sourcePath + "\\") + ) { + alert(strings.warning, "Cannot paste a folder into its subdirectory"); + return null; + } + } + + const fs = fsOperation(srcUrl); + const itemName = Url.basename(srcUrl); + const possibleConflictUrl = Url.join(targetUrl, itemName); + const doesExist = await fsOperation(possibleConflictUrl).exists(); + if (doesExist) { + const confirmation = await confirm( + strings.warning, + strings["already exists"] + ? strings["already exists"].replace("{name}", itemName) + : `"${itemName}" already exists in this location.`, + ); + if (!confirmation) return null; + } + + const excludePatterns = + action === "copy" && appSettings.value.useFileOperationExclusions + ? appSettings.value.excludeFolders + : null; + + let newUrl; + if (getConnectionKey(srcUrl) !== getConnectionKey(targetUrl)) { + // Different servers or storage: read from the source and write to the + // target, since the source provider can't reach the target. + // Check exclusions first so a skipped entry never replaces anything. + if ( + excludePatterns && + isExcludedFileOperationPath(srcUrl, excludePatterns) + ) { + toast(strings.skipped); + return null; + } + + if (doesExist && IS_FILE) { + // copyEntry only creates new files, so overwrite the confirmed one. + await fsOperation(possibleConflictUrl).writeFile(await fs.readFile()); + newUrl = possibleConflictUrl; + } else { + if (doesExist) { + // The user confirmed replacing what's there. + const { isDirectory } = await fsOperation(possibleConflictUrl).stat(); + await deleteFromDisk(possibleConflictUrl, isDirectory ? "dir" : "file"); + } + const result = await copyEntry(srcUrl, targetUrl, { + excludePatterns: excludePatterns || [], + }); + newUrl = result.url; + } + if (newUrl && action === "cut") await deleteFromDisk(srcUrl, srcType); + } else if (action === "cut") { + // Special handling for SAF folders backed by terminal providers - move manually due to SAF limitations + if (isTerminalSafUri(srcUrl) && IS_DIR) { + const moveRecursively = async (sourceUrl, targetParentUrl) => { + const sourceFs = fsOperation(sourceUrl); + const sourceName = Url.basename(sourceUrl); + const targetUrl = Url.join(targetParentUrl, sourceName); + + // Create target folder + await fsOperation(targetParentUrl).createDirectory(sourceName); + + // Get all entries in source folder + const entries = await sourceFs.lsDir(); + + // Move all files and folders recursively + for (const entry of entries) { + if (entry.isDirectory) { + await moveRecursively(entry.url, targetUrl); + } else { + const fileContent = await fsOperation(entry.url).readFile(); + const fileName = entry.name || Url.basename(entry.url); + await fsOperation(targetUrl).createFile(fileName, fileContent); + await fsOperation(entry.url).delete(); + } + } + + // Delete the now-empty source folder + await sourceFs.delete(); + return targetUrl; + }; + + newUrl = await moveRecursively(srcUrl, targetUrl); + } else { + newUrl = await fs.moveTo(targetUrl); + } + } else if (excludePatterns) { + const result = await copyEntry(srcUrl, targetUrl, { excludePatterns }); + newUrl = result.url; + } else { + newUrl = await fs.copyTo(targetUrl); + } + + if (!newUrl) { + toast(strings.skipped); + return null; + } + + if (action === "cut") { + if (IS_FILE) { + const file = editorManager.getFile(srcUrl, "uri"); + if (file) file.uri = newUrl; + } else if (IS_DIR) { + helpers.updateUriOfAllActiveFiles(srcUrl, newUrl); + migrateOpenFolderStateUrls(srcUrl, newUrl); + } + removeEntryFromOpenFolder(srcUrl); + FileList.rename(srcUrl, newUrl); + } else { + FileList.append(targetUrl, newUrl); + } + + appendEntryToOpenFolder(targetUrl, newUrl, IS_DIR ? "folder" : "file"); + return newUrl; +} + +/** + * Get the elements currently rendered for an entry. + * @param {string} url + * @returns {HTMLElement[]} + */ +function getRenderedEntries(url) { + const filesApp = sidebarApps.get("files"); + return Array.from(filesApp.getAll(`[data-url="${CSS.escape(url)}"]`)); +} + +/** + * @param {ClipBoardItem[]} items + * @param {"cut"|"copy"} action + */ +function setClipboard(items, action) { + clearClipboard(); + clipBoard.items = items.map(({ url, type }) => ({ url, type })); + clipBoard.action = action; + + if (action !== "cut") return; + for (const { url } of clipBoard.items) { + for (const $el of getRenderedEntries(url)) $el.classList.add("cut"); + } +} + +function clearClipboard() { + for (const { url } of clipBoard.items) { + for (const $el of getRenderedEntries(url)) $el.classList.remove("cut"); + } + clipBoard.items = []; + clipBoard.action = null; +} + +/** + * Get the path of an entry relative to its open folder. + * @param {string} url + * @param {string} rootUrl + * @returns {string} + */ +function getRelativePath(url, rootUrl) { + // Try using Url.pathname for protocol-based URLs + const rootPath = Url.pathname(rootUrl); + const targetPath = Url.pathname(url); + + if (rootPath && targetPath) { + // Both pathnames extracted successfully + return Path.convertToRelative(rootPath, targetPath); + } + + // Fallback: Use simple string comparison for URIs where pathname extraction fails + const cleanRoot = rootUrl.endsWith("/") ? rootUrl.slice(0, -1) : rootUrl; + const cleanTarget = url.endsWith("/") ? url.slice(0, -1) : url; + + // Check if target URL starts with root URL + if (cleanTarget.startsWith(cleanRoot)) { + return cleanTarget.slice(cleanRoot.length + 1); + } + + // If not a child path, just use basename + return Url.basename(url); +} + +/** + * @param {string} text + * @returns {boolean} Whether the text was copied + */ +function copyText(text) { + if (cordova.plugins.clipboard) { + cordova.plugins.clipboard.copy(text); + return true; + } + + console.error("Clipboard not available"); + toast("Clipboard not available"); + return false; +} + +/** + * Drop entries that are already covered by a selected parent folder. + * @template {ClipBoardItem} T + * @param {T[]} items + * @returns {T[]} + */ +function removeNestedItems(items) { + return items.filter( + (item) => + !items.some( + (other) => + other !== item && + helpers.isDir(other.type) && + !areSameOpenFolderUrl(other.url, item.url) && + isInsideOpenFolder(item.url, other.url), + ), + ); +} + +/** + * Run an action from the file selection bar. + * @param {import("sidebarApps/files/selection").SelectionAction} action + * @param {import("sidebarApps/files/selection").SelectedEntry[]} items + * @param {string} [targetUrl] Destination folder for "move" + * @returns {Promise} false keeps the selection open + */ +async function handleSelectionAction(action, items, targetUrl) { + // Entries inside a selected folder are handled with the folder, but open + // and copy path still act on everything that was picked. + if (["copy", "cut", "delete", "move"].includes(action)) { + items = removeNestedItems(items); + } + + switch (action) { + case "copy": + case "cut": + setClipboard(items, action); + return; + + case "delete": + return deleteEntries(items); + + case "move": + return moveEntries(items, targetUrl); + + case "copy-path": { + const paths = items.map(({ url }) => + getRelativePath(url, openFolder.find(url)?.url || url), + ); + if (copyText(paths.join("\n"))) toast(strings["copied to clipboard"]); + return; + } + + case "rename": { + const [{ type, url, $el, name }] = items; + return execOperation(type, "rename", url, $el, name); + } + + case "open": { + const files = items.filter(({ type }) => helpers.isFile(type)); + for (const [index, { url }] of files.entries()) { + await openFile(url, { render: index === files.length - 1 }); + } + Sidebar.hide(); + return; + } + } +} + +/** + * @param {ClipBoardItem[]} items + * @returns {Promise} false when cancelled + */ +async function deleteEntries(items) { + const msg = strings["delete entries"].replace("{count}", items.length); + const confirmation = await confirm(strings.warning, msg); + if (!confirmation) return false; + + const $titles = new Set( + items.map(({ url }) => openFolder.find(url)?.$node.$title).filter(Boolean), + ); + for (const $title of $titles) $title.classList.add("loading"); + + let failed = 0; + let lastError; + try { + for (const { url, type } of items) { + try { + await deleteEntry(url, type); + } catch (error) { + console.error(error); + failed++; + lastError = error; + } + } + } finally { + for (const $title of $titles) $title.classList.remove("loading"); + } + + if (failed) helpers.error(lastError); + else toast(strings.success); + return true; +} + +/** + * Move entries into a folder, skipping those already there. + * @param {ClipBoardItem[]} items + * @param {string} targetUrl + */ +async function moveEntries(items, targetUrl) { + const movable = items.filter( + ({ url }) => !areSameOpenFolderUrl(getParentUrl(url), targetUrl), + ); + if (!movable.length) return; - function clearClipboard() { - clipBoard.$el = null; - clipBoard.url = null; - clipBoard.action = null; + const $title = openFolder.find(targetUrl)?.$node.$title; + $title?.classList.add("loading"); + try { + const { pasted, error } = await pasteEntries(movable, targetUrl, "cut"); + if (error) helpers.error(error); + else if (pasted) toast(strings.success); + } finally { + $title?.classList.remove("loading"); } } +fileSelection.onAction(handleSelectionAction); + /** * * @param {"file"|"dir"|"root"} type diff --git a/src/sidebarApps/files/dragMove.js b/src/sidebarApps/files/dragMove.js new file mode 100644 index 0000000000..69a5b207ee --- /dev/null +++ b/src/sidebarApps/files/dragMove.js @@ -0,0 +1,614 @@ +import "./dragMove.scss"; +import tag from "html-tag-js"; +import config from "lib/config"; +import appSettings from "lib/settings"; +import selection from "./selection"; + +// Movement allowed before a touch counts as a scroll instead of a press. +const TOUCH_SLOP = 8; +// After a long press a resting finger still wobbles, so a drag needs a +// clearly deliberate move. +const DRAG_SLOP = 14; +const MOUSE_SLOP = 5; +// Holding still this long after the long press opens the menu without +// waiting for the finger to lift. +const MENU_HOLD_MS = 300; +// Distance from a scroll edge where the list starts scrolling on its own. +const SCROLL_EDGE = 48; +const MAX_SCROLL_SPEED = 14; +// Hovering a closed folder this long opens it. +const SPRING_OPEN_MS = 650; +// Fraction of the remaining distance the preview covers each frame. +const FOLLOW = 0.35; +const SETTLE_MS = 240; + +/** @type {HTMLElement} */ +let container; +/** + * Press that may turn into a drag. + * @type {{$tile: HTMLElement, x: number, y: number, pointer: "touch"|"mouse", armed: boolean, menuOpened?: boolean, menuTimer?: number, $target?: Element, $touchTarget?: EventTarget} | null} + */ +let press = null; +/** @type {DragState|null} */ +let drag = null; +let suppressClick = false; +/** Context menu events re-dispatched after a long press ends without moving. */ +const replayed = new WeakSet(); +/** Touch events already handled, since they can reach two listeners. */ +const handled = new WeakSet(); + +/** + * @typedef {object} DragState + * @property {import("./selection").SelectedEntry[]} items + * @property {HTMLElement[]} $sources + * @property {HTMLElement} $ghost + * @property {DOMRect} origin + * @property {"touch"|"mouse"} pointer + * @property {number} x Pointer position + * @property {number} y + * @property {number} gx Preview position + * @property {number} gy + * @property {number} tilt + * @property {HTMLElement|null} $list Folder the entries would drop into + * @property {HTMLElement|null} $scroller + * @property {number} raf + * @property {number} springTimer + */ + +/** + * Let entries in the files sidebar be dragged onto folders. + * Must run before the selection handlers so a long press can become a drag. + * @param {HTMLElement} $container + */ +function init($container) { + container = $container; + container.addEventListener("touchstart", onTouchStart, { + capture: true, + passive: true, + }); + container.addEventListener("mousedown", onMouseDown, true); + container.addEventListener("contextmenu", onContextMenu, true); + container.addEventListener("click", onClick, true); +} + +/** + * @param {TouchEvent} e + */ +function onTouchStart(e) { + // A drag that lost its touch stream ends with the next touch. + if (drag) finishDrag(false); + endPress(); + if (e.touches.length !== 1) { + endPress(); + return; + } + + const $tile = selection.getEntry(e.target); + if (!$tile) return; + + const { clientX, clientY } = e.touches[0]; + press = { + $tile, + x: clientX, + y: clientY, + pointer: "touch", + armed: false, + $touchTarget: e.target, + }; + // Touch events keep going to the touched element even after it leaves the + // DOM (e.g. its folder collapses mid-drag), where they no longer reach the + // window, so listen on both. + for (const $el of [window, e.target]) { + $el.addEventListener("touchmove", onTouchMove, { + capture: true, + passive: false, + }); + $el.addEventListener("touchend", onTouchEnd, true); + $el.addEventListener("touchcancel", onTouchCancel, true); + } +} + +/** + * @param {TouchEvent} e + */ +function onTouchMove(e) { + if (isHandled(e)) return; + const touch = e.touches[0]; + if (!touch) return; + + if (drag) { + consume(e); + moveDrag(touch.clientX, touch.clientY); + return; + } + + if (!press) return; + + if (!press.armed) { + // Moving before the long press is a scroll. + if (distance(press, touch) > TOUCH_SLOP) endPress(); + return; + } + + // Held long enough: keep the list (and the sidebar) still. + consume(e); + if (press.menuOpened) return; + if (distance(press, touch) > DRAG_SLOP) { + clearTimeout(press.menuTimer); + startDrag(touch.clientX, touch.clientY); + } +} + +/** + * @param {TouchEvent} e + */ +function onTouchEnd(e) { + if (isHandled(e)) return; + if (drag) { + const touch = e.changedTouches[0]; + if (touch) moveDrag(touch.clientX, touch.clientY); + finishDrag(true); + endPress(); + return; + } + + // A long press released in place is a normal context menu request. + if (press?.armed && !press.menuOpened) replayContextMenu(press); + endPress(); +} + +function onTouchCancel(e) { + if (isHandled(e)) return; + if (drag) finishDrag(false); + endPress(); +} + +/** + * Hold the long-press context menu until it's clear whether this is a drag. + * @param {MouseEvent} e + */ +function onContextMenu(e) { + if (replayed.has(e)) return; + if (press?.pointer !== "touch" || press.armed) return; + if (selection.getEntry(e.target) !== press.$tile) return; + + consume(e); + press.armed = true; + press.$target = e.target; + press.$tile.classList.add("drag-armed"); + vibrate(); + + // Holding still means the menu was wanted, not a drag. + const current = press; + current.menuTimer = setTimeout(() => { + if (press !== current || drag) return; + current.menuOpened = true; + current.$tile.classList.remove("drag-armed"); + replayContextMenu(current); + }, MENU_HOLD_MS); +} + +/** + * @param {MouseEvent} e + */ +function onMouseDown(e) { + suppressClick = false; + if (drag || e.button !== 0) return; + + const $tile = selection.getEntry(e.target); + if (!$tile) return; + + press = { + $tile, + x: e.clientX, + y: e.clientY, + pointer: "mouse", + armed: true, + }; + window.addEventListener("mousemove", onMouseMove, true); + window.addEventListener("mouseup", onMouseUp, true); +} + +/** + * @param {MouseEvent} e + */ +function onMouseMove(e) { + if (drag) { + e.preventDefault(); + moveDrag(e.clientX, e.clientY); + return; + } + + if (press && distance(press, e) > MOUSE_SLOP) { + e.preventDefault(); + startDrag(e.clientX, e.clientY); + } +} + +function onMouseUp() { + if (drag) { + // The click that follows mouseup must not open or toggle the entry. + suppressClick = true; + finishDrag(true); + } + endPress(); +} + +/** + * @param {MouseEvent} e + */ +function onClick(e) { + if (!suppressClick) return; + suppressClick = false; + consume(e); +} + +/** + * @param {KeyboardEvent} e + */ +function onKeydown(e) { + if (e.key === "Escape" && drag) { + finishDrag(false); + endPress(); + } +} + +/** + * Any new touch during a drag means its own touch stream was lost. + */ +function onStrayTouch() { + if (drag) finishDrag(false); + endPress(); +} + +/** + * @param {number} x + * @param {number} y + */ +function startDrag(x, y) { + const { $tile, pointer } = press; + const { url, type, name } = $tile.dataset; + + // Dragging a selected entry carries the whole selection along. + const items = selection.isSelected(url) + ? selection.getItems() + : [{ url, type, name, $el: $tile }]; + const $sources = items.flatMap(({ url }) => findTiles(url)); + const origin = $tile.getBoundingClientRect(); + + $tile.classList.remove("drag-armed"); + for (const $el of $sources) $el.classList.add("drag-source"); + document.body.classList.add("file-dragging"); + document.addEventListener("keydown", onKeydown, true); + document.addEventListener("touchstart", onStrayTouch, true); + + drag = { + items, + $sources, + $ghost: createGhost($tile, items), + origin, + pointer, + x, + y, + gx: origin.left, + gy: origin.top, + tilt: 0, + $list: null, + $scroller: null, + raf: 0, + springTimer: 0, + }; + + vibrate(); + updateTarget(); + drag.raf = requestAnimationFrame(frame); +} + +/** + * @param {number} x + * @param {number} y + */ +function moveDrag(x, y) { + drag.x = x; + drag.y = y; + updateTarget(); +} + +/** + * Ease the preview toward the pointer, tilting slightly with its motion, + * and scroll the list when the pointer nears an edge. + */ +function frame() { + if (!drag) return; + + // Keep the preview clear of the finger; beside the cursor for mice. + const isTouch = drag.pointer === "touch"; + const targetX = drag.x + (isTouch ? 16 : 14); + const targetY = drag.y + (isTouch ? -52 : 10); + const dx = targetX - drag.gx; + + drag.gx += dx * FOLLOW; + drag.gy += (targetY - drag.gy) * FOLLOW; + drag.tilt += (clamp(dx * 0.12, -6, 6) - drag.tilt) * 0.2; + drag.$ghost.style.transform = `translate3d(${drag.gx}px, ${drag.gy}px, 0) rotate(${drag.tilt}deg)`; + + autoScroll(); + drag.raf = requestAnimationFrame(frame); +} + +function autoScroll() { + const $scroller = drag.$scroller; + if (!$scroller) return; + + const { top, bottom } = $scroller.getBoundingClientRect(); + let speed = 0; + if (drag.y < top + SCROLL_EDGE) { + speed = + -MAX_SCROLL_SPEED * + Math.min(1, (top + SCROLL_EDGE - drag.y) / SCROLL_EDGE); + } else if (drag.y > bottom - SCROLL_EDGE) { + speed = + MAX_SCROLL_SPEED * + Math.min(1, (drag.y - bottom + SCROLL_EDGE) / SCROLL_EDGE); + } + if (!speed) return; + + const before = $scroller.scrollTop; + $scroller.scrollTop += speed; + if ($scroller.scrollTop !== before) updateTarget(); +} + +/** + * Find the folder under the pointer and highlight it if it can take the drop. + */ +function updateTarget() { + const $el = document.elementFromPoint(drag.x, drag.y); + const $scroller = getScroller($el); + if ($scroller) drag.$scroller = $scroller; + + let $list = getDropList($el); + if ($list && !canDropInto($list)) $list = null; + if ($list === drag.$list) return; + + clearTarget(); + drag.$list = $list; + if (!$list) return; + + $list.classList.add("drop-target"); + + // Spring-loaded folders: hovering a closed one opens it. + if ( + $list.classList.contains("hidden") && + typeof $list.expand === "function" + ) { + $list.classList.add("drop-pending"); + drag.springTimer = setTimeout(() => { + $list.classList.remove("drop-pending"); + if (drag?.$list === $list) $list.expand(); + }, SPRING_OPEN_MS); + } +} + +function clearTarget() { + clearTimeout(drag.springTimer); + drag.$list?.classList.remove("drop-target", "drop-pending"); +} + +/** + * @param {boolean} drop Whether to move the entries into the hovered folder + */ +function finishDrag(drop) { + const state = drag; + drag = null; + cancelAnimationFrame(state.raf); + clearTimeout(state.springTimer); + state.$list?.classList.remove("drop-target", "drop-pending"); + document.body.classList.remove("file-dragging"); + document.removeEventListener("keydown", onKeydown, true); + document.removeEventListener("touchstart", onStrayTouch, true); + for (const $el of state.$sources) $el.classList.remove("drag-source"); + + const $ghost = state.$ghost; + const $title = drop ? state.$list?.firstElementChild : null; + const targetUrl = $title?.dataset.url; + $ghost.classList.add("settling"); + + if (targetUrl) { + // Shrink into the folder it was dropped on. + const rect = $title.getBoundingClientRect(); + const y = rect.top + rect.height / 2 - $ghost.offsetHeight / 2; + $ghost.style.transform = `translate3d(${rect.left + 12}px, ${y}px, 0) scale(0.3)`; + $title.classList.add("drop-flash"); + setTimeout(() => $title.classList.remove("drop-flash"), 600); + vibrate(); + selection.perform("move", state.items, targetUrl); + } else { + // Nowhere to drop: return to where it came from. + const { left, top } = state.origin; + $ghost.style.transform = `translate3d(${left}px, ${top}px, 0)`; + } + + setTimeout(() => $ghost.remove(), SETTLE_MS); +} + +function endPress() { + clearTimeout(press?.menuTimer); + press?.$tile.classList.remove("drag-armed"); + for (const $el of [window, press?.$touchTarget]) { + $el?.removeEventListener("touchmove", onTouchMove, true); + $el?.removeEventListener("touchend", onTouchEnd, true); + $el?.removeEventListener("touchcancel", onTouchCancel, true); + } + press = null; + window.removeEventListener("mousemove", onMouseMove, true); + window.removeEventListener("mouseup", onMouseUp, true); +} + +/** + * Open the context menu the long press would have opened. + * @param {{x: number, y: number, $target?: Element}} state + */ +function replayContextMenu({ x, y, $target }) { + if (!$target?.isConnected) return; + const event = new MouseEvent("contextmenu", { + bubbles: true, + cancelable: true, + clientX: x, + clientY: y, + }); + replayed.add(event); + $target.dispatchEvent(event); +} + +/** + * @param {HTMLElement} $tile + * @param {import("./selection").SelectedEntry[]} items + */ +function createGhost($tile, items) { + const $icon = tag("span", { + className: $tile.firstElementChild?.className || "", + }); + const $chip = tag("div", { + className: "chip", + children: [ + $icon, + tag("span", { className: "name", textContent: items[0].name }), + ], + }); + + if (items.length > 1) { + $chip.append( + tag("span", { className: "badge", textContent: String(items.length) }), + ); + } + + const $ghost = tag("div", { + className: `file-drag-ghost${items.length > 1 ? " multi" : ""}`, + children: [$chip], + }); + const { left, top } = $tile.getBoundingClientRect(); + $ghost.style.transform = `translate3d(${left}px, ${top}px, 0)`; + document.body.append($ghost); + return $ghost; +} + +/** + * @param {Element|null} $el + * @returns {HTMLElement|null} The folder list an entry would be dropped into + */ +function getDropList($el) { + if (!$el || !container.contains($el)) return null; + + const $tile = $el.closest(".tile[data-type]"); + const type = $tile?.dataset.type; + const $list = + type === "dir" || type === "root" + ? $tile.parentElement + : $el.closest(".list.collapsible"); + + if (!$list || !container.contains($list)) return null; + if ($list.classList.contains("file-list")) return null; + return $list; +} + +/** + * @param {HTMLElement} $list + */ +function canDropInto($list) { + const url = $list.firstElementChild?.dataset.url; + if (!url) return false; + + for (const $source of drag.$sources) { + if ($source.dataset.url === url) return false; + // A folder can't go inside itself. + if ( + $source.dataset.type === "dir" && + $source.parentElement.contains($list) + ) { + return false; + } + } + + // Nothing to do if every entry is already in this folder. + return !drag.items.every(({ $el }) => getParentUrl($el) === url); +} + +/** + * @param {HTMLElement} [$el] + * @returns {string|undefined} + */ +function getParentUrl($el) { + if (!$el?.isConnected) return undefined; + const $own = $el.dataset.type === "dir" ? $el.parentElement : $el; + return $own.parentElement?.closest(".list.collapsible")?.firstElementChild + ?.dataset.url; +} + +/** + * @param {Element|null} $el + * @returns {HTMLElement|null} + */ +function getScroller($el) { + while ($el && $el !== container.parentElement) { + if ($el.scrollHeight > $el.clientHeight + 1) { + const { overflowY } = getComputedStyle($el); + if (overflowY === "auto" || overflowY === "scroll") return $el; + } + $el = $el.parentElement; + } + return null; +} + +/** + * @param {string} url + * @returns {HTMLElement[]} + */ +function findTiles(url) { + return Array.from( + container.querySelectorAll(`.tile[data-url="${CSS.escape(url)}"]`), + ).filter(($el) => selection.getEntry($el)); +} + +/** + * @param {{x: number, y: number}} from + * @param {{clientX: number, clientY: number}} to + */ +function distance(from, to) { + return Math.hypot(to.clientX - from.x, to.clientY - from.y); +} + +/** + * @param {Event} e + * @returns {boolean} Whether another listener already handled the event + */ +function isHandled(e) { + if (handled.has(e)) return true; + handled.add(e); + return false; +} + +/** + * @param {number} value + * @param {number} min + * @param {number} max + */ +function clamp(value, min, max) { + return Math.min(max, Math.max(min, value)); +} + +/** + * @param {Event} e + */ +function consume(e) { + if (e.cancelable) e.preventDefault(); + e.stopPropagation(); + e.stopImmediatePropagation(); +} + +function vibrate() { + if (appSettings.value.vibrateOnTap) { + navigator.vibrate(config.VIBRATION_TIME); + } +} + +export default { init }; diff --git a/src/sidebarApps/files/dragMove.scss b/src/sidebarApps/files/dragMove.scss new file mode 100644 index 0000000000..52e961e898 --- /dev/null +++ b/src/sidebarApps/files/dragMove.scss @@ -0,0 +1,179 @@ +// Written without inset, flex gap or unguarded color-mix() so it still works +// on old Android WebViews. +$ease: cubic-bezier(0.2, 0, 0, 1); +$spring: cubic-bezier(0.34, 1.56, 0.64, 1); + +body.file-dragging { + cursor: grabbing; + user-select: none; + -webkit-user-select: none; +} + +#sidebar .container.files { + .tile[data-type="file"], + .tile[data-type="dir"] { + transition: + opacity 160ms ease, + transform 160ms $ease, + background-color 180ms ease; + + // Long press recognised: the row lifts slightly, ready to be dragged. + &.drag-armed { + transform: scale(0.97); + background-color: rgba(127, 127, 127, 0.14); + } + + &.drag-source { + opacity: 0.35; + } + } + + // The whole folder the entries would land in lights up. + .list.collapsible.drop-target { + border-radius: 8px; + background-color: rgba(127, 127, 127, 0.1); + background-color: color-mix(in srgb, var(--active-color) 10%, transparent); + box-shadow: inset 0 0 0 1px rgba(127, 127, 127, 0.35); + box-shadow: inset 0 0 0 1px + color-mix(in srgb, var(--active-color) 45%, transparent); + + > .tile:first-child { + border-radius: 8px; + } + } + + // Closed folder about to spring open. + .list.collapsible.drop-pending > .tile:first-child { + animation: file-drop-pending 650ms ease-in-out; + } + + .tile.drop-flash { + animation: file-drop-flash 600ms ease-out; + } +} + +.file-drag-ghost { + position: fixed; + top: 0; + left: 0; + z-index: 1000; + pointer-events: none; + will-change: transform; + + &.settling { + opacity: 0; + transition: + transform 240ms $ease, + opacity 240ms ease; + } + + .chip { + position: relative; + display: flex; + align-items: center; + box-sizing: border-box; + height: 34px; + max-width: 220px; + padding: 0 10px 0 6px; + border-radius: 10px; + border: 1px solid var(--popup-border-color, var(--border-color)); + background-color: var(--popup-background-color); + color: var(--popup-text-color); + font-size: 13px; + box-shadow: + 0 14px 30px -8px rgba(0, 0, 0, 0.45), + 0 2px 6px rgba(0, 0, 0, 0.2); + animation: file-drag-pick 260ms $spring; + + > :first-child { + flex: none; + width: 22px; + height: 22px; + min-width: 0; + margin-right: 6px; + font-size: 15px; + line-height: 22px; + text-align: center; + background-size: 16px; + background-position: center; + background-repeat: no-repeat; + } + } + + .name { + min-width: 0; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + + .badge { + flex: none; + min-width: 18px; + height: 18px; + box-sizing: border-box; + margin-left: 8px; + padding: 0 5px; + border-radius: 9px; + background-color: var(--active-color); + color: var(--active-text-color); + font-size: 11px; + font-weight: 600; + line-height: 18px; + text-align: center; + } + + // Several entries: cards stacked behind the chip. + &.multi .chip::before, + &.multi .chip::after { + content: ""; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: -1; + box-sizing: border-box; + border-radius: 10px; + border: 1px solid var(--popup-border-color, var(--border-color)); + background-color: var(--popup-background-color); + } + + &.multi .chip::before { + transform: translate(4px, 4px) rotate(2deg); + opacity: 0.7; + } + + &.multi .chip::after { + transform: translate(8px, 8px) rotate(4deg); + opacity: 0.4; + } +} + +@keyframes file-drag-pick { + from { + transform: scale(0.85); + opacity: 0; + } +} + +@keyframes file-drop-pending { + 50% { + background-color: rgba(127, 127, 127, 0.22); + } +} + +@keyframes file-drop-flash { + from { + background-color: rgba(127, 127, 127, 0.3); + background-color: color-mix(in srgb, var(--active-color) 35%, transparent); + } +} + +body.no-animation { + .file-drag-ghost, + .file-drag-ghost * { + animation: none !important; + transition: none !important; + } +} diff --git a/src/sidebarApps/files/index.js b/src/sidebarApps/files/index.js index 4baca7cec7..f07e9a15ca 100644 --- a/src/sidebarApps/files/index.js +++ b/src/sidebarApps/files/index.js @@ -2,6 +2,8 @@ import "./style.scss"; import Sidebar from "components/sidebar"; import fileIcons from "lib/fileIcons"; import settings from "lib/settings"; +import dragMove from "./dragMove"; +import selection from "./selection"; /**@type {HTMLElement} */ let container; @@ -25,6 +27,10 @@ function initApp(el) { container.setAttribute("data-msg", strings["open folder"]); container.style.overflowX = "auto"; container.addEventListener("click", clickHandler); + // Drag listens first so a long press can become a drag before selection + // or the context menu sees it. + dragMove.init(container); + selection.init(container); editorManager.on( ["new-file", "int-open-file-list", "remove-file"], (position) => { @@ -49,6 +55,12 @@ function onSelected(el) { // Phone sidebars and inactive sidebar apps are detached, so document-wide // icon updates cannot reach them until this view is shown again. fileIcons.refreshRenderedIcons(container); + selection.syncBar(); + // Heights measured while the sidebar was detached come out wrong. + const $openFolder = container.querySelector( + ":scope > .list:not(.hidden):not(.file-list)", + ); + if ($openFolder) fixHeight($openFolder); const $scrollableLists = container.getAll(":scope .scroll[data-scroll-top]"); $scrollableLists.forEach(($el) => { $el.scrollTop = $el.dataset.scrollTop; @@ -79,8 +91,13 @@ function clickHandler(e) { export function fixHeight(target) { const lists = Array.from(container.getAll(":scope > div")); const ITEM_HEIGHT = 30; + // Headers are taller than rows (36px, 40px on wide screens); measure them so + // the expanded list doesn't overflow below the sidebar. + const headerHeight = + container.querySelector(":scope > .list > .tile")?.offsetHeight || + ITEM_HEIGHT; - let height = (lists.length - 1) * ITEM_HEIGHT; + let height = (lists.length - 1) * headerHeight; let activeFileList; if (settings.value.openFileListPos === settings.OPEN_FILE_LIST_POS_SIDEBAR) { @@ -88,9 +105,9 @@ export function fixHeight(target) { if (firstList.classList.contains("file-list")) { activeFileList = firstList; if (firstList.unclasped) { - const heightOffset = height - ITEM_HEIGHT; + const heightOffset = height - headerHeight; const totalHeight = - ITEM_HEIGHT * activeFileList.$ul.children.length + ITEM_HEIGHT; + ITEM_HEIGHT * activeFileList.$ul.children.length + headerHeight; const maxHeight = lists.length === 1 || !lists.slice(1).find((list) => list.unclasped) ? window.innerHeight @@ -99,7 +116,7 @@ export function fixHeight(target) { activeFileList.style.maxHeight = `${minHeight}px`; activeFileList.style.height = `${minHeight}px`; - height += minHeight - ITEM_HEIGHT; + height += minHeight - headerHeight; } } } diff --git a/src/sidebarApps/files/selection.js b/src/sidebarApps/files/selection.js new file mode 100644 index 0000000000..c6fd69fbbb --- /dev/null +++ b/src/sidebarApps/files/selection.js @@ -0,0 +1,528 @@ +import "./selection.scss"; +import select from "dialogs/select"; +import tag from "html-tag-js"; +import config from "lib/config"; +import appSettings from "lib/settings"; +import helpers from "utils/helpers"; + +/** + * @typedef {"copy"|"cut"|"delete"|"copy-path"|"rename"|"open"|"move"} SelectionAction + */ + +/** + * @typedef {object} SelectedEntry + * @property {string} url + * @property {"file"|"dir"} type + * @property {string} name + * @property {string} [rootUrl] Url of the open folder containing the entry + * @property {HTMLElement} [$el] + */ + +const ACTION_STACK_ID = "file-selection"; +const ENTRY_SELECTOR = + '.tile[data-url][data-type="file"], .tile[data-url][data-type="dir"]'; +// Bar widths below which the label and then the buttons are compacted. +const COMPACT_WIDTH = 270; +const TIGHT_WIDTH = 210; +// Range selections fill in as a short wave instead of all at once. +const WAVE_STEP_MS = 14; +const WAVE_MAX_MS = 180; + +/** @type {Map} */ +const selected = new Map(); +/** @type {HTMLElement} */ +let container; +/** @type {string|null} */ +let anchorUrl = null; +/** @type {(action: SelectionAction, items: SelectedEntry[], targetUrl?: string) => Promise} */ +let actionHandler; +/** @type {MutationObserver} */ +let observer; +/** @type {HTMLElement} */ +let $bar; +/** @type {HTMLElement} */ +let $count; +let busy = false; + +/** + * Attach selection handling to the files sidebar container. + * @param {HTMLElement} $container + */ +function init($container) { + container = $container; + // Capture phase runs before the tree's own tile listeners, so a tap can + // select instead of opening the file or toggling the folder. + container.addEventListener("click", onClick, true); + container.addEventListener("contextmenu", onContextMenu, true); + observer = new MutationObserver(onTreeMutation); + editorManager.on("remove-folder", onRemoveFolder); +} + +/** + * @param {(action: SelectionAction, items: SelectedEntry[], targetUrl?: string) => Promise} handler + * Return false from the handler to keep the selection open. + */ +function onAction(handler) { + actionHandler = handler; +} + +function isActive() { + return !!container?.classList.contains("selecting"); +} + +/** + * Enter selection mode, optionally selecting an entry. + * @param {HTMLElement} [$tile] + */ +function start($tile) { + if (!container) return; + + if (!isActive()) { + container.classList.add("selecting"); + observer.observe(container, { childList: true, subtree: true }); + document.addEventListener("keydown", onKeydown); + actionStack.push({ id: ACTION_STACK_ID, action: exit }); + syncBar(); + updateBarSize(); + vibrate(); + } + + if ($tile && getEntry($tile)) { + setSelected($tile, true); + anchorUrl = $tile.dataset.url; + } + + update(1); +} + +function exit() { + if (!isActive()) return; + + container.classList.remove("selecting"); + for (const $el of container.querySelectorAll(".tile.selected")) { + markEntry($el, false); + } + + selected.clear(); + anchorUrl = null; + observer.disconnect(); + document.removeEventListener("keydown", onKeydown); + actionStack.remove(ACTION_STACK_ID); +} + +/** + * Keep the bar right after the files container so the CSS sibling rule can + * show it only while the files app is the visible sidebar app. + */ +function syncBar() { + if (!container?.isConnected) return; + if (!$bar) createBar(); + if ($bar.previousElementSibling !== container) container.after($bar); +} + +/** + * @param {MouseEvent} e + */ +function onClick(e) { + const $tile = getEntry(e.target); + if (!$tile) return; + + const additive = e.ctrlKey || e.metaKey; + + if (!isActive()) { + if (!additive && !e.shiftKey) return; + consume(e); + start($tile); + return; + } + + // The folder icon keeps expanding folders so nested entries can be reached. + const isPlainTap = !additive && !e.shiftKey; + if (isPlainTap && helpers.isDir($tile.dataset.type) && isOnLead($tile, e)) { + return; + } + + consume(e); + if (e.shiftKey) selectRange($tile); + else toggle($tile); +} + +/** + * @param {PointerEvent} e + */ +function onContextMenu(e) { + if (!isActive()) return; + + const $tile = getEntry(e.target); + if (!$tile) return; + + consume(e); + + // Right click acts on the selection; long press extends it. + if (e.pointerType === "mouse") { + if (!selected.has($tile.dataset.url)) { + setSelected($tile, true); + anchorUrl = $tile.dataset.url; + update(1); + } + showMore(); + return; + } + + vibrate(); + if (anchorUrl && anchorUrl !== $tile.dataset.url) selectRange($tile); + else toggle($tile); +} + +/** + * @param {KeyboardEvent} e + */ +function onKeydown(e) { + if (e.key === "Escape") exit(); +} + +/** + * Re-apply selection to entries re-rendered by the tree (e.g. a folder + * collapsed and expanded again). + * @param {MutationRecord[]} records + */ +function onTreeMutation(records) { + for (const { addedNodes } of records) { + for (const node of addedNodes) { + if (!(node instanceof Element)) continue; + const $tiles = node.matches(ENTRY_SELECTOR) + ? [node] + : node.querySelectorAll(ENTRY_SELECTOR); + for (const $tile of $tiles) { + if (selected.has($tile.dataset.url)) markEntry($tile, true); + } + } + } +} + +/** + * Drop entries of an open folder that was closed. + * @param {{url: string}} folder + */ +function onRemoveFolder({ url } = {}) { + if (!isActive()) return; + for (const [key, entry] of selected) { + if (entry.rootUrl === url) selected.delete(key); + } + update(-1); +} + +/** + * @param {HTMLElement} $tile + */ +function toggle($tile) { + const { url } = $tile.dataset; + const value = !selected.has(url); + setSelected($tile, value); + anchorUrl = url; + update(value ? 1 : -1); +} + +/** + * Select every visible entry between the anchor and the given entry. + * @param {HTMLElement} $tile + */ +function selectRange($tile) { + const $tiles = getVisibleEntries(); + const to = $tiles.indexOf($tile); + const from = $tiles.findIndex(($el) => $el.dataset.url === anchorUrl); + + if (from === -1 || to === -1) { + toggle($tile); + return; + } + + const step = from < to ? 1 : -1; + const range = []; + for (let i = from; i !== to + step; i += step) range.push($tiles[i]); + selectWave(range); +} + +function selectAll() { + const roots = new Set( + Array.from(container.querySelectorAll(".tile.selected"), getRoot), + ); + const $tiles = getVisibleEntries().filter( + ($el) => !roots.size || roots.has(getRoot($el)), + ); + selectWave($tiles); +} + +/** + * Select entries in order with a slight stagger. + * @param {HTMLElement[]} $tiles + */ +function selectWave($tiles) { + let delay = 0; + for (const $tile of $tiles) { + if (selected.has($tile.dataset.url)) continue; + $tile.style.setProperty("--select-delay", `${delay}ms`); + setSelected($tile, true); + delay = Math.min(delay + WAVE_STEP_MS, WAVE_MAX_MS); + setTimeout(() => $tile.style.removeProperty("--select-delay"), 400); + } + update(1); +} + +/** + * @param {HTMLElement} $tile + * @param {boolean} value + */ +function setSelected($tile, value) { + const { url, type, name } = $tile.dataset; + const rootUrl = getRoot($tile).firstElementChild?.dataset.url; + if (value) selected.set(url, { url, type, name, rootUrl }); + else selected.delete(url); + + for (const $el of findEntries(url)) markEntry($el, value); +} + +/** + * @param {HTMLElement} $tile + * @param {boolean} value + */ +function markEntry($tile, value) { + $tile.classList.toggle("selected", value); + // Lets CSS tint a selected folder's contents without :has(). + if (helpers.isDir($tile.dataset.type)) { + $tile.parentElement?.classList.toggle("has-selected-title", value); + } +} + +/** + * Sync the bar with the selection, leaving selection mode once it's empty. + * @param {1|-1} direction Whether the count went up or down + */ +function update(direction) { + if (!selected.size) { + exit(); + return; + } + + if (!$bar) return; + const count = String(selected.size); + if ($count.textContent === count) return; + + $count.textContent = count; + $count.classList.remove("up", "down"); + void $count.offsetWidth; // restart the animation + $count.classList.add(direction > 0 ? "up" : "down"); +} + +/** + * @param {SelectionAction} action + */ +async function run(action) { + if (!selected.size) return; + await perform(action, getItems()); +} + +/** + * Run an action on the given entries, then leave selection mode. + * @param {SelectionAction} action + * @param {SelectedEntry[]} items + * @param {string} [targetUrl] + */ +async function perform(action, items, targetUrl) { + if (busy || !actionHandler || !items.length) return; + + busy = true; + $bar?.classList.add("busy"); + try { + const result = await actionHandler(action, items, targetUrl); + if (result !== false) exit(); + } catch (error) { + console.error(error); + helpers.error(error); + } finally { + busy = false; + $bar?.classList.remove("busy"); + } +} + +/** + * @returns {SelectedEntry[]} Selected entries with their rendered elements + */ +function getItems() { + return Array.from(selected.values(), (item) => ({ + ...item, + $el: findEntries(item.url)[0], + })); +} + +async function showMore() { + const items = Array.from(selected.values()); + const files = items.filter(({ type }) => helpers.isFile(type)).length; + const openText = strings.open || "Open"; + const options = [ + ["select-all", strings["select all"], "library_add_check"], + ["copy-path", strings["copy relative path"], "attach_file"], + ]; + + if (items.length === 1) { + options.push(["rename", strings.rename, "edit"]); + } + + if (files) { + const text = files > 1 ? `${openText} (${files})` : openText; + options.push(["open", text, "launchopen_in_new"]); + } + + const action = await select(getLabel(), options); + if (!isActive()) return; + if (action === "select-all") selectAll(); + else run(action); +} + +function createBar() { + $count = tag("span", { className: "count" }); + $bar = tag("div", { + className: "file-selection-bar", + children: [ + barButton("exit", "clearclose", strings.cancel), + tag("div", { + className: "label", + children: [ + $count, + tag("span", { + className: "unit", + textContent: strings.selected || "selected", + }), + ], + }), + barButton("copy", "copy", strings.copy), + barButton("cut", "cut", strings.cut), + barButton("delete", "delete danger", strings.delete), + barButton("more", "more_vert", strings.more || "More"), + ], + }); + + $bar.setAttribute("role", "toolbar"); + if (window.ResizeObserver) { + new ResizeObserver(updateBarSize).observe($bar); + } + $bar.addEventListener("click", (e) => { + const action = e.target.closest("[data-action]")?.dataset.action; + if (!action) return; + if (action === "exit") exit(); + else if (action === "more") showMore(); + else run(action); + }); +} + +/** + * Stand-in for container queries, which old WebViews don't support. + */ +function updateBarSize() { + if (!$bar) return; + const width = $bar.clientWidth; + if (!width) return; + $bar.classList.toggle("compact", width < COMPACT_WIDTH); + $bar.classList.toggle("tight", width < TIGHT_WIDTH); +} + +/** + * @param {string} action + * @param {string} icon + * @param {string} title + */ +function barButton(action, icon, title) { + const $button = tag("button", { type: "button", className: `icon ${icon}` }); + $button.dataset.action = action; + $button.title = title; + $button.setAttribute("aria-label", title); + return $button; +} + +function getLabel() { + return `${selected.size} ${strings.selected || "selected"}`; +} + +/** + * @param {EventTarget} target + * @returns {HTMLElement|null} The selectable tree entry for the target + */ +function getEntry(target) { + if (!(target instanceof Element)) return null; + const $tile = target.closest(ENTRY_SELECTOR); + if (!$tile || !container.contains($tile)) return null; + if ($tile.closest(".file-list")) return null; + return $tile; +} + +/** + * @param {string} url + * @returns {HTMLElement[]} + */ +function findEntries(url) { + return Array.from( + container.querySelectorAll(`.tile[data-url="${CSS.escape(url)}"]`), + ).filter(($el) => getEntry($el)); +} + +/** + * Entries in display order, skipping those inside collapsed folders. + * @returns {HTMLElement[]} + */ +function getVisibleEntries() { + return Array.from(container.querySelectorAll(ENTRY_SELECTOR)).filter( + ($el) => getEntry($el) && $el.getClientRects().length, + ); +} + +/** + * @param {HTMLElement} $el + * @returns {HTMLElement} The top level open folder containing the entry + */ +function getRoot($el) { + while ($el.parentElement && $el.parentElement !== container) { + $el = $el.parentElement; + } + return $el; +} + +/** + * @param {HTMLElement} $tile + * @param {MouseEvent} e + */ +function isOnLead($tile, e) { + const $lead = $tile.firstElementChild; + if (!$lead) return false; + const { left, right } = $lead.getBoundingClientRect(); + return e.clientX >= left && e.clientX <= right; +} + +/** + * @param {Event} e + */ +function consume(e) { + e.preventDefault(); + e.stopPropagation(); + e.stopImmediatePropagation(); +} + +function vibrate() { + if (appSettings.value.vibrateOnTap) { + navigator.vibrate(config.VIBRATION_TIME); + } +} + +export default { + init, + onAction, + start, + exit, + syncBar, + perform, + getItems, + getEntry, + isSelected: (url) => selected.has(url), + get active() { + return isActive(); + }, +}; diff --git a/src/sidebarApps/files/selection.scss b/src/sidebarApps/files/selection.scss new file mode 100644 index 0000000000..c8e0937a06 --- /dev/null +++ b/src/sidebarApps/files/selection.scss @@ -0,0 +1,273 @@ +// Avoids :is(), :has(), color-mix() without fallback, container queries and +// flex gap so the styles still work on old Android WebViews. +$ease: cubic-bezier(0.2, 0, 0, 1); +$spring: cubic-bezier(0.34, 1.56, 0.64, 1); +$delay: var(--select-delay, 0ms); + +@mixin entries { + > .list:not(.file-list) { + .tile[data-type="file"], + .tile[data-type="dir"] { + @content; + } + } +} + +#sidebar .container.files { + transition: padding-bottom 220ms $ease; + + &.selecting { + // Keeps the last entries reachable above the floating bar. + padding-bottom: 64px; + } + + @include entries { + transition: background-color 180ms ease $delay; + + &.selected { + background-color: rgba(127, 127, 127, 0.18); + background-color: color-mix(in srgb, var(--active-color) 18%, transparent); + } + } + + &.selecting { + user-select: none; + -webkit-user-select: none; + -webkit-touch-callout: none; + -webkit-tap-highlight-color: transparent; + + @include entries { + &:active { + background-color: rgba(127, 127, 127, 0.1); + } + + &.selected:active { + background-color: rgba(127, 127, 127, 0.26); + background-color: color-mix( + in srgb, + var(--active-color) 26%, + transparent + ); + } + } + + // Entries inside a selected folder are included implicitly. + .list.collapsible.has-selected-title > ul { + .tile[data-type="file"]:not(.selected), + .tile[data-type="dir"]:not(.selected) { + background-color: rgba(127, 127, 127, 0.08); + background-color: color-mix( + in srgb, + var(--active-color) 8%, + transparent + ); + } + } + } +} + +#sidebar .file-selection-bar { + position: absolute; + z-index: 111; + left: 60px; + right: 10px; + bottom: 12px; + bottom: calc(12px + env(safe-area-inset-bottom, 0px)); + height: 44px; + box-sizing: border-box; + display: flex; + align-items: center; + padding: 0 5px; + border-radius: 14px; + border: 1px solid var(--popup-border-color, var(--border-color)); + background-color: var(--popup-background-color); + color: var(--popup-text-color); + box-shadow: + 0 10px 28px -8px var(--box-shadow-color), + 0 2px 6px var(--box-shadow-color); + opacity: 0; + visibility: hidden; + pointer-events: none; + transform: translateY(16px) scale(0.96); + transform-origin: 50% 100%; + transition: + opacity 140ms ease, + transform 200ms $ease, + visibility 0s linear 200ms; + + .label { + flex: 1; + min-width: 0; + display: flex; + align-items: baseline; + padding: 0 4px; + overflow: hidden; + white-space: nowrap; + font-size: 0.9em; + } + + .count { + display: inline-block; + font-weight: 600; + font-variant-numeric: tabular-nums; + + &.up { + animation: file-selection-count-up 260ms $spring; + } + + &.down { + animation: file-selection-count-down 260ms $spring; + } + } + + .unit { + margin-left: 4px; + opacity: 0.6; + overflow: hidden; + text-overflow: ellipsis; + } + + button { + flex: none; + display: flex; + align-items: center; + justify-content: center; + width: 34px; + height: 34px; + padding: 0; + border: none; + border-radius: 10px; + background-color: transparent; + color: inherit; + font-size: 1.15em; + cursor: pointer; + margin-left: 2px; + transition: + transform 160ms $ease, + background-color 120ms ease, + color 120ms ease; + + &:active { + transform: scale(0.86); + background-color: rgba(127, 127, 127, 0.2); + } + + &:focus-visible { + outline: 2px solid var(--active-color); + outline-offset: -2px; + } + + &.danger:active { + color: var(--danger-color); + background-color: rgba(127, 127, 127, 0.2); + background-color: color-mix(in srgb, var(--danger-color) 16%, transparent); + } + } + + @media (hover: hover) { + button:hover { + background-color: rgba(127, 127, 127, 0.12); + } + + button.danger:hover { + color: var(--danger-color); + background-color: rgba(127, 127, 127, 0.12); + background-color: color-mix(in srgb, var(--danger-color) 12%, transparent); + } + } + + &.busy { + overflow: hidden; + pointer-events: none; + + &::after { + content: ""; + position: absolute; + left: 0; + bottom: 0; + width: 100%; + height: 2px; + background-color: var(--active-color); + animation: bar-loader-animation 1.5s cubic-bezier(0.4, 0, 0.2, 1) infinite; + } + + button { + opacity: 0.45; + } + } + + // Size classes are set from JS (container queries need newer WebViews). + // Too narrow for "3 selected": keep just the number. + &.compact .unit { + display: none; + } + + // Minimum sidebar width: tighten the buttons so they still fit. + &.tight button { + width: 28px; + } +} + +#sidebar .container.files.selecting + .file-selection-bar { + opacity: 1; + visibility: visible; + pointer-events: auto; + transform: none; + transition: + opacity 180ms ease, + transform 340ms $spring, + visibility 0s; + + // Bar contents settle in one after another. + > * { + animation: file-selection-item-in 300ms $spring backwards; + } + + @for $i from 2 through 6 { + > :nth-child(#{$i}) { + animation-delay: #{($i - 1) * 25}ms; + } + } +} + +@keyframes file-selection-item-in { + from { + opacity: 0; + transform: translateY(5px); + } +} + +@keyframes file-selection-count-up { + from { + opacity: 0; + transform: translateY(70%); + } +} + +@keyframes file-selection-count-down { + from { + opacity: 0; + transform: translateY(-70%); + } +} + +body.no-animation #sidebar { + .container.files, + .container.files *::before, + .container.files *::after, + .file-selection-bar, + .file-selection-bar * { + transition: none !important; + animation: none !important; + } +} + +@media (prefers-reduced-motion: reduce) { + #sidebar .container.files *::before, + #sidebar .container.files *::after, + #sidebar .file-selection-bar, + #sidebar .file-selection-bar * { + transition-duration: 1ms !important; + animation: none !important; + } +} diff --git a/src/sidebarApps/files/style.scss b/src/sidebarApps/files/style.scss index 4b3a8b7faa..2c740d17aa 100644 --- a/src/sidebarApps/files/style.scss +++ b/src/sidebarApps/files/style.scss @@ -104,3 +104,77 @@ } } } + +// Open folder header actions: on hover with a mouse, a single menu button on +// touch, and nothing on collapsed folders. +$root-actions-ease: cubic-bezier(0.2, 0, 0, 1); + +#sidebar .container.files > .list > .tile[data-type="root"] .root-actions { + display: flex; + flex: none; + align-items: center; + margin: 0 4px 0 auto; + + .icon { + display: none; + width: 28px; + min-width: 28px; + height: 28px; + border-radius: 8px; + font-size: 1em; + line-height: 28px; + opacity: 0.55; + transition: + opacity 120ms ease, + transform 160ms $root-actions-ease, + background-color 120ms ease; + + &:active { + opacity: 1; + transform: scale(0.86); + background-color: rgba(127, 127, 127, 0.2); + } + + &.spinning { + animation: root-action-spin 700ms linear infinite; + } + } + + .icon.more-actions { + display: block; + } + + @media (hover: hover) and (pointer: fine) { + opacity: 0; + transition: opacity 120ms ease; + + .icon { + display: block; + + &:hover { + opacity: 1; + background-color: rgba(127, 127, 127, 0.14); + } + } + + .icon.more-actions { + display: none; + } + } +} + +@media (hover: hover) and (pointer: fine) { + #sidebar .container.files > .list > .tile[data-type="root"]:hover .root-actions { + opacity: 1; + } +} + +#sidebar .container.files > .list.hidden > .tile[data-type="root"] .root-actions { + display: none; +} + +@keyframes root-action-spin { + to { + transform: rotate(360deg); + } +} diff --git a/tests/unit/fileIconSidebar.test.ts b/tests/unit/fileIconSidebar.test.ts index 2a6eef2769..bfd4e36491 100644 --- a/tests/unit/fileIconSidebar.test.ts +++ b/tests/unit/fileIconSidebar.test.ts @@ -6,6 +6,10 @@ import { afterEach, beforeEach, expect, it, vi } from "vitest"; const sidebar = vi.hoisted(() => ({ on: vi.fn() })); vi.mock("components/sidebar", () => ({ default: sidebar })); vi.mock("lib/settings", () => ({ default: {} })); +vi.mock("sidebarApps/files/dragMove", () => ({ default: { init: vi.fn() } })); +vi.mock("sidebarApps/files/selection", () => ({ + default: { init: vi.fn(), syncBar: vi.fn() }, +})); beforeEach(() => { vi.stubGlobal("strings", { files: "Files", "open folder": "Open folder" }); From 9960e6e227c79c6ed03b2de4231aca2506aeec30 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Thu, 29 Oct 2026 11:30:40 +0000 Subject: [PATCH 164/195] fix(sidebar): don't render a folder twice when toggled while loading (#3002) * fix(sidebar): don't render a folder twice when toggled while loading Collapsing and re-expanding a folder before its listing finished let the old load render alongside the new one. Stale loads now skip rendering, and a new expand or collapse cancels a tree that is still loading. * test(sidebar): cover root folders toggled while loading Drive a real root folder through expand, collapse and expand with the directory reads still pending, resolving them in both orders and failing the stale one, and check that only the latest tree renders, a stale error doesn't collapse the folder and the loading bar follows the latest read. openFolder's single JSX expression becomes a tag() call so the module can load in tests. * test(sidebar): stub global tag in root folder tests --- src/components/fileTree/index.js | 7 ++ src/lib/openFolder.js | 25 ++-- tests/unit/fileTreeRecycling.test.ts | 26 ++++ tests/unit/openFolderExpand.test.ts | 176 +++++++++++++++++++++++++++ 4 files changed, 226 insertions(+), 8 deletions(-) create mode 100644 tests/unit/openFolderExpand.test.ts diff --git a/src/components/fileTree/index.js b/src/components/fileTree/index.js index caf20bda00..6296b67e9d 100644 --- a/src/components/fileTree/index.js +++ b/src/components/fileTree/index.js @@ -35,6 +35,9 @@ export default class FileTree { this.isLoading = false; this.childTrees = new Map(); // Track child trees for cleanup this.depth = options._depth || 0; // Internal: nesting depth + // Bumped on every load and on destroy so a slow load that finishes + // late can tell it's stale and skip rendering. + this.generation = 0; } /** @@ -45,11 +48,14 @@ export default class FileTree { if (this.isLoading) return; this.isLoading = true; this.currentUrl = url; + const generation = ++this.generation; try { this.clear(); const entries = await this.options.getEntries(url); + // Destroyed (e.g. the folder collapsed) while listing. + if (generation !== this.generation) return; this.entries = helpers.sortDir(entries, { sortByName: true, showHiddenFiles: true, @@ -341,6 +347,7 @@ export default class FileTree { * Destroy the file tree and cleanup */ destroy() { + this.generation++; this.clear(); this.container.classList.remove("file-tree"); } diff --git a/src/lib/openFolder.js b/src/lib/openFolder.js index ba961ddac4..3fdda05ca8 100644 --- a/src/lib/openFolder.js +++ b/src/lib/openFolder.js @@ -354,20 +354,21 @@ async function expandList($list) { if (!$ul) return; - // Cleanup existing file tree - if ($ul._fileTree) { - $ul._fileTree.destroy(); - $ul._fileTree = null; - } + // Cleanup existing file tree, including one still loading: toggling while + // it loads would otherwise render both trees into the same list. + for (const tree of [$ul._fileTree, $ul._pendingFileTree]) tree?.destroy(); + $ul._fileTree = null; + $ul._pendingFileTree = null; $ul.innerHTML = ""; if (saveState) listState[url] = $list.unclasped; if (!$list.unclasped) return; + let fileTree; try { startLoading(); - const fileTree = new FileTree($ul, { + fileTree = new FileTree($ul, { getEntries: (dirUrl) => fsOperation(dirUrl).lsDir(), expandedState: listState, onExpandedChange: (folderUrl, isExpanded) => { @@ -381,9 +382,16 @@ async function expandList($list) { }, }); + $ul._pendingFileTree = fileTree; await fileTree.load(url); + // A later toggle replaced this tree while it loaded. + if ($ul._pendingFileTree !== fileTree) return; + $ul._pendingFileTree = null; $ul._fileTree = fileTree; } catch (err) { + // A newer toggle owns the list now; don't collapse it. + if ($ul._pendingFileTree !== fileTree) return; + $ul._pendingFileTree = null; $list.collapse(); if (err?.includes?.("Invalid message length")) { console.error(err); @@ -392,7 +400,8 @@ async function expandList($list) { } helpers.error(err); } finally { - stopLoading(); + // Leave the loading bar to a newer load that is still running. + if (!$ul._pendingFileTree) stopLoading(); } } @@ -1605,7 +1614,7 @@ fileIcons.onChange(() => { */ function createFileTile(name, url) { const $tile = tile({ - lead: , + lead: tag("span", { className: helpers.getIconForFile(name) }), text: name, }); $tile.dataset.url = url; diff --git a/tests/unit/fileTreeRecycling.test.ts b/tests/unit/fileTreeRecycling.test.ts index 74a3e48e2b..a9ee43cc76 100644 --- a/tests/unit/fileTreeRecycling.test.ts +++ b/tests/unit/fileTreeRecycling.test.ts @@ -71,3 +71,29 @@ it("uses recycled file identity for open and context actions", () => { ); tree.destroy(); }); + +it("renders a folder once when it is toggled while still loading", async () => { + const pending: Array<() => void> = []; + const getEntries = vi.fn( + () => + new Promise((resolve) => { + pending.push(() => + resolve([{ name: "a.js", url: "file:///src/a.js", isFile: true }]), + ); + }), + ); + const tree = new FileTree(document.createElement("div"), { getEntries }); + const row = tree.createFolderElement("src", "file:///src"); + + const first = row.expand(); + await row.collapse(); + const second = row.expand(); + for (const resolve of pending) resolve(); + await Promise.all([first, second]); + + expect(getEntries).toHaveBeenCalledTimes(2); + expect( + row.$ul.querySelectorAll('[data-url="file:///src/a.js"]'), + ).toHaveLength(1); + tree.destroy(); +}); diff --git a/tests/unit/openFolderExpand.test.ts b/tests/unit/openFolderExpand.test.ts new file mode 100644 index 0000000000..4c1451ed20 --- /dev/null +++ b/tests/unit/openFolderExpand.test.ts @@ -0,0 +1,176 @@ +// @vitest-environment happy-dom + +import tag from "html-tag-js"; +import { afterEach, beforeEach, expect, it, vi } from "vitest"; + +type Read = { + resolve: (entries: unknown[]) => void; + reject: (error: unknown) => void; +}; + +const fs = vi.hoisted(() => ({ reads: [] as Read[] })); +const files = vi.hoisted(() => ({ container: null as HTMLElement | null })); +const helpersError = vi.hoisted(() => vi.fn()); + +vi.mock("fileSystem", () => ({ + default: () => ({ + lsDir: () => + new Promise((resolve, reject) => fs.reads.push({ resolve, reject })), + }), +})); +vi.mock("sidebarApps", () => ({ default: { get: () => files.container } })); +vi.mock("sidebarApps/files", () => ({ fixHeight: vi.fn() })); +vi.mock("sidebarApps/files/selection", () => ({ + default: { onAction: vi.fn(), start: vi.fn() }, +})); +vi.mock("components/sidebar", () => ({ default: { hide: vi.fn() } })); +vi.mock("components/toast", () => ({ default: vi.fn() })); +vi.mock("dialogs/alert", () => ({ default: vi.fn() })); +vi.mock("dialogs/confirm", () => ({ default: vi.fn() })); +vi.mock("dialogs/prompt", () => ({ default: vi.fn() })); +vi.mock("dialogs/select", () => ({ default: vi.fn() })); +vi.mock("lib/fileIcons", () => ({ default: { onChange: vi.fn() } })); +vi.mock("lib/fileList", () => ({ + addRoot: vi.fn(async () => {}), + append: vi.fn(), + remove: vi.fn(), + rename: vi.fn(), +})); +vi.mock("lib/lazyImports", () => ({ loadFileBrowser: vi.fn() })); +vi.mock("lib/openFile", () => ({ default: vi.fn() })); +vi.mock("lib/recents", () => ({ + default: { addFolder: vi.fn(), removeFile: vi.fn(), removeFolder: vi.fn() }, +})); +vi.mock("lib/settings", () => ({ + default: { value: { fileBrowser: { listFiles: false } } }, +})); +vi.mock("utils/copyEntry", () => ({ default: vi.fn() })); +vi.mock("utils/helpers", () => ({ + default: { + getIconForFile: () => "icon file", + getIconForFolder: () => "icon folder", + sortDir: (entries: unknown[]) => entries, + error: helpersError, + isFile: (type: string) => type === "file", + isDir: (type: string) => type === "dir", + }, +})); + +const ROOT = "file:///project"; + +beforeEach(() => { + vi.resetModules(); + fs.reads = []; + files.container = document.createElement("div"); + helpersError.mockClear(); + // tile() and other components use the app's global `tag`. + vi.stubGlobal("tag", tag); + vi.stubGlobal("strings", {}); + vi.stubGlobal("editorManager", { emit: vi.fn(), onupdate: vi.fn() }); + // Helpers the app gets from the html-tag-js polyfill and utils/polyfill. + for (const [name, value] of [ + [ + "get", + function (this: HTMLElement, selector: string) { + return this.querySelector(selector); + }, + ], + [ + "getAll", + function (this: HTMLElement, selector: string) { + return this.querySelectorAll(selector); + }, + ], + ] as const) { + if (!(name in HTMLElement.prototype)) { + Object.defineProperty(HTMLElement.prototype, name, { + configurable: true, + value, + }); + } + } + if (!("hashCode" in String.prototype)) { + Object.defineProperty(String.prototype, "hashCode", { + configurable: true, + value: () => 1, + }); + } +}); +afterEach(() => vi.unstubAllGlobals()); + +/** + * Open a root folder and toggle it expand → collapse → expand, leaving two + * directory reads pending: the stale one and the latest one. + */ +async function openAndToggle() { + const { default: openFolder } = await import("lib/openFolder"); + openFolder(ROOT, { name: "project", saveState: false, listFiles: false }); + const { $node: $root } = openFolder.find(ROOT); + + $root.expand(); + $root.collapse(); + $root.expand(); + expect(fs.reads).toHaveLength(2); + + const [stale, latest] = fs.reads; + return { $root, stale, latest }; +} + +const entry = (name: string) => ({ + name, + url: `${ROOT}/${name}`, + isFile: true, +}); + +const rendered = ($root: HTMLElement & { $ul: HTMLElement }) => + Array.from($root.$ul.querySelectorAll('[data-type="file"]')).map( + ($el) => $el.dataset.name, + ); + +const isLoading = ($root: HTMLElement & { $title: HTMLElement }) => + $root.$title.classList.contains("loading"); + +const flush = () => new Promise((resolve) => setTimeout(resolve, 0)); + +it("renders only the latest tree when the stale read finishes first", async () => { + const { $root, stale, latest } = await openAndToggle(); + + stale.resolve([entry("stale.txt")]); + await flush(); + expect(rendered($root)).toEqual([]); + expect(isLoading($root)).toBe(true); + + latest.resolve([entry("latest.txt")]); + await flush(); + expect(rendered($root)).toEqual(["latest.txt"]); + expect(isLoading($root)).toBe(false); +}); + +it("renders only the latest tree when the stale read finishes last", async () => { + const { $root, stale, latest } = await openAndToggle(); + + latest.resolve([entry("latest.txt")]); + await flush(); + expect(rendered($root)).toEqual(["latest.txt"]); + expect(isLoading($root)).toBe(false); + + stale.resolve([entry("stale.txt")]); + await flush(); + expect(rendered($root)).toEqual(["latest.txt"]); + expect(isLoading($root)).toBe(false); +}); + +it("ignores a failed stale read instead of collapsing the folder", async () => { + const { $root, stale, latest } = await openAndToggle(); + + stale.reject(new Error("connection lost")); + await flush(); + expect($root.collapsed).toBe(false); + expect(helpersError).not.toHaveBeenCalled(); + expect(isLoading($root)).toBe(true); + + latest.resolve([entry("latest.txt")]); + await flush(); + expect(rendered($root)).toEqual(["latest.txt"]); + expect(isLoading($root)).toBe(false); +}); From 06db49298f8e4e1cf3c80f436f1b50c7dca17276 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Thu, 29 Oct 2026 11:33:06 +0000 Subject: [PATCH 165/195] fix(scrollbar): place thumb correctly when it reappears (#3003) * fix(scrollbar): place thumb correctly when it reappears The value was set while the scrollbar was detached, so it was measured against an empty rect and painted at 0 for a frame. Only check the track along the scroll axis, and measure again after appending. * fix(scrollbar): measure the track on every update while attached The parent can change size without a window resize (e.g. the sidebar opening), so a cached track length can go stale. --- src/components/scrollbar/index.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/components/scrollbar/index.js b/src/components/scrollbar/index.js index 1f5799d329..5317fb3cad 100644 --- a/src/components/scrollbar/index.js +++ b/src/components/scrollbar/index.js @@ -192,11 +192,22 @@ export default function ScrollBar(options) { if (height < 0) height = 0; if (width < 0) width = 0; - if (render && height && width) setValue(scroll); + if (render && trackLength()) setValue(scroll); + } + + /** + * Length the thumb travels along the scrollbar's axis. The cross axis is + * always 0 (the bar is thinner than the thumb), so only this one counts. + */ + function trackLength() { + return isVertical ? height : width; } function setValue(val) { - if (!height || !width) resize(false); + // Measure each time, as the parent can change size without a window + // resize (e.g. the sidebar opening). A detached bar has an empty rect; + // show() measures it once it's back on the page. + if ($scrollbar.isConnected) resize(false); //Make sure value is between 0 and 1 if (val < 0) val = 0; @@ -230,6 +241,9 @@ export default function ScrollBar(options) { $scrollbar.classList.remove("hide"); if (!$scrollbar.isConnected) { options.parent.append($scrollbar); + // The value may have been set while detached, against an empty + // rect; measure again so the thumb isn't painted at 0. + resize(); if (typeof onshow === "function") onshow(); } } From 6962af1e805b8996e743df97cad4df3ecef687e5 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Thu, 29 Oct 2026 12:17:29 +0000 Subject: [PATCH 166/195] feat(ui): polish dialogs, sidebar, search and file actions (#3004) * feat(ui): polish dialogs, sidebar, search and file actions - Rename selects the file name without its extension - Hide the search summary until there is a query - Show an unread dot on the notifications icon; clear-all icon - Pin the sponsor icon above the profile, out of the app list - Make the sidebar icon rail scrollable on touch - Show Delete in red in menus; distinct Save as icon - Map common native errors to readable messages - Theme-aware toast; sentence-case dialog buttons and titles - Title-case settings page names; fix inconsistent labels * style: format files command * fix(prompt): select whole file name when it has no extension --- src/components/sidebar/index.js | 6 ++++ src/components/sidebar/style.scss | 15 +++++++-- src/components/toast/style.scss | 11 ++++-- src/dialogs/prompt.js | 11 ++++-- src/dialogs/select.js | 1 + src/dialogs/style.scss | 41 ++++++++++++++++++++++- src/lang/ar-ye.json | 7 +++- src/lang/az-az.json | 7 +++- src/lang/be-by.json | 7 +++- src/lang/bn-bd.json | 7 +++- src/lang/cs-cz.json | 7 +++- src/lang/de-de.json | 7 +++- src/lang/en-us.json | 29 +++++++++------- src/lang/es-sv.json | 7 +++- src/lang/fr-fr.json | 7 +++- src/lang/he-il.json | 7 +++- src/lang/hi-in.json | 7 +++- src/lang/hu-hu.json | 7 +++- src/lang/id-id.json | 7 +++- src/lang/index.d.ts | 5 +++ src/lang/ir-fa.json | 7 +++- src/lang/it-it.json | 7 +++- src/lang/ja-jp.json | 7 +++- src/lang/ko-kr.json | 7 +++- src/lang/ln-ln.json | 7 +++- src/lang/ml-in.json | 7 +++- src/lang/mm-unicode.json | 7 +++- src/lang/mm-zawgyi.json | 7 +++- src/lang/pl-pl.json | 7 +++- src/lang/pt-br.json | 7 +++- src/lang/pu-in.json | 7 +++- src/lang/ru-ru.json | 7 +++- src/lang/tl-ph.json | 7 +++- src/lang/tr-tr.json | 7 +++- src/lang/uk-ua.json | 7 +++- src/lang/uz-uz.json | 7 +++- src/lang/vi-vn.json | 7 +++- src/lang/zh-cn.json | 7 +++- src/lang/zh-hant.json | 7 +++- src/lang/zh-tw.json | 7 +++- src/lib/actionStack.js | 2 +- src/lib/checkFiles.js | 4 +-- src/lib/commands.js | 6 ++-- src/lib/editorFile.js | 2 +- src/lib/notificationManager.js | 23 +++++++++++++ src/lib/openFile.js | 2 +- src/lib/openFolder.js | 13 ++++--- src/pages/customTheme/customTheme.js | 2 +- src/pages/fileBrowser/fileBrowser.hbs | 2 +- src/pages/fileBrowser/fileBrowser.js | 25 ++++++++------ src/pages/fileBrowser/index.js | 4 +-- src/pages/sponsor/sponsor.js | 4 +-- src/settings/backupRestore.js | 13 +++---- src/settings/terminalSettings.js | 12 ++----- src/sidebarApps/index.js | 3 +- src/sidebarApps/notification/index.js | 6 +++- src/sidebarApps/searchInFiles/index.js | 5 ++- src/sidebarApps/searchInFiles/styles.scss | 4 +++ src/utils/helpers.js | 41 ++++++++++++++++++++++- src/views/menu.hbs | 6 ++-- tests/unit/actionStack.test.js | 2 +- 61 files changed, 417 insertions(+), 107 deletions(-) diff --git a/src/components/sidebar/index.js b/src/components/sidebar/index.js index 7a862d8dc4..8075101539 100644 --- a/src/components/sidebar/index.js +++ b/src/components/sidebar/index.js @@ -739,6 +739,12 @@ preventSlideTests.push((target) => { } }); +// Let the app icon rail scroll when plugins add more icons than fit +preventSlideTests.push((target) => { + const $rail = target.closest?.(".app-icons-container"); + return !!$rail && $rail.scrollHeight > $rail.clientHeight; +}); + preventSlideTests.push((target) => { return ( target instanceof HTMLInputElement || diff --git a/src/components/sidebar/style.scss b/src/components/sidebar/style.scss index 8927015a24..92b6dbbd94 100644 --- a/src/components/sidebar/style.scss +++ b/src/components/sidebar/style.scss @@ -192,9 +192,20 @@ body.no-animation { } } - // Special styling for the favorites/sponsors icon + // Unread dot, drawn as a background so ::before/::after stay free + body.has-unread-notifications &[data-id="notification"] { + background-image: radial-gradient( + circle at 28px 12px, + var(--active-color, #3399ff) 3px, + transparent 3.5px + ); + background-size: 100% 100%; + background-position: 0 0; + } + + // Special styling for the favorites/sponsors icon, pinned above the profile &.favorite { - margin-top: 8px; + margin: 4px auto 8px; &::after { display: none; diff --git a/src/components/toast/style.scss b/src/components/toast/style.scss index 4f2654c52a..32dfeea65b 100644 --- a/src/components/toast/style.scss +++ b/src/components/toast/style.scss @@ -1,12 +1,17 @@ #toast { position: fixed; bottom: 10px; + bottom: calc(10px + env(safe-area-inset-bottom, 0px)); left: 0; right: 0; margin: 0 auto; + // Follow the theme's popup surface so toasts match menus and dialogs background-color: rgba(9, 14, 29, 0.9); - box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.5); + background-color: var(--popup-background-color); + border: 1px solid var(--border-color, rgba(122, 122, 122, 0.2)); + box-shadow: 0 4px 16px var(--box-shadow-color, rgba(0, 0, 0, 0.3)); color: white; + color: var(--popup-text-color); font-size: 0.95rem; font-weight: 300; display: flex; @@ -17,7 +22,7 @@ width: fit-content; overflow: auto; z-index: 9999; - border-radius: 4px; + border-radius: 8px; pointer-events: none; will-change: transform, opacity; @@ -26,7 +31,7 @@ } .message { - padding: 10px; + padding: 10px 14px; } .icon { diff --git a/src/dialogs/prompt.js b/src/dialogs/prompt.js index 4a0c988fa2..87c325cff7 100644 --- a/src/dialogs/prompt.js +++ b/src/dialogs/prompt.js @@ -16,7 +16,7 @@ import appSettings from "lib/settings"; * Opens a prompt dialog * @param {string} message * @param {string} defaultValue - * @param {"textarea"|"text"|"number"|"tel"|"search"|"email"|"url"} type + * @param {"textarea"|"text"|"filename"|"number"|"tel"|"search"|"email"|"url"} type * @param {PromptOptions} options * @returns {Promise} Returns null if cancelled */ @@ -34,7 +34,8 @@ export default function prompt( return new Promise((resolve) => { const inputType = type === "textarea" ? "textarea" : "input"; - type = type === "filename" ? "text" : type; + const isFilename = type === "filename"; + type = isFilename ? "text" : type; const messageSpan = tag("span", { textContent: message, @@ -143,7 +144,11 @@ export default function prompt( if (input.value) { try { const col = input.value.length; - input.setSelectionRange(col, col); + // Select the name without its extension (or the whole name when + // there is none), so typing replaces it + const dot = isFilename ? input.value.lastIndexOf(".") : -1; + if (isFilename) input.setSelectionRange(0, dot > 0 ? dot : col); + else input.setSelectionRange(col, col); } catch (error) { // ignore } diff --git a/src/dialogs/select.js b/src/dialogs/select.js index c34567f712..71b1f8bbba 100644 --- a/src/dialogs/select.js +++ b/src/dialogs/select.js @@ -162,6 +162,7 @@ function select(title, items, options = {}) { $item.setAttribute("aria-label", itemOptions.title); } if (itemOptions.disabled) $item.classList.add("disabled"); + if (itemOptions.value === "delete") $item.classList.add("destructive"); if (options.default === itemOptions.value) { $item.classList.add("selected"); $defaultVal = $item; diff --git a/src/dialogs/style.scss b/src/dialogs/style.scss index 52199568a1..9ca51020df 100644 --- a/src/dialogs/style.scss +++ b/src/dialogs/style.scss @@ -67,7 +67,7 @@ &.alert, &.app-icon-dialog { .title { - text-transform: uppercase; + text-transform: none; } .confirm-checkbox { @@ -94,6 +94,13 @@ justify-content: center; } + .tile.destructive { + &, + .icon { + color: #e5534b; + } + } + .no-text-transform { li { text-transform: initial !important; @@ -273,8 +280,26 @@ .message { overflow: auto; + overflow-wrap: anywhere; font-size: 0.9em; + .error-details { + margin-top: 12px; + font-size: 0.85em; + opacity: 0.75; + + summary { + cursor: pointer; + } + + code { + display: block; + margin-top: 6px; + white-space: pre-wrap; + word-break: break-word; + } + } + &.color-picker { position: relative; @@ -488,5 +513,19 @@ .button-container { margin-top: 20px; + padding: 0 8px 8px; + gap: 4px; + box-sizing: border-box; + + > button { + min-height: 40px; + border-radius: 6px; + text-transform: capitalize; + font-weight: 500; + + &:last-child { + font-weight: 600; + } + } } } diff --git a/src/lang/ar-ye.json b/src/lang/ar-ye.json index 4e79917b50..dab83007a9 100644 --- a/src/lang/ar-ye.json +++ b/src/lang/ar-ye.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/az-az.json b/src/lang/az-az.json index b7ee2ee9b5..34684ea4a2 100644 --- a/src/lang/az-az.json +++ b/src/lang/az-az.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/be-by.json b/src/lang/be-by.json index 4740aac8e7..4c8fb32605 100644 --- a/src/lang/be-by.json +++ b/src/lang/be-by.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/bn-bd.json b/src/lang/bn-bd.json index 081131579a..2b22d21e01 100644 --- a/src/lang/bn-bd.json +++ b/src/lang/bn-bd.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/cs-cz.json b/src/lang/cs-cz.json index 002613c29a..ceb3eb6734 100644 --- a/src/lang/cs-cz.json +++ b/src/lang/cs-cz.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/de-de.json b/src/lang/de-de.json index 4b0ec32516..3bd3950124 100644 --- a/src/lang/de-de.json +++ b/src/lang/de-de.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/en-us.json b/src/lang/en-us.json index 569c59521f..e6c7ea1454 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -20,7 +20,7 @@ "delete": "Delete", "dependencies": "Dependencies", "delay": "Time in milliseconds", - "editor settings": "Editor settings", + "editor settings": "Editor Settings", "editor theme": "Editor theme", "enter file name": "Enter file name", "enter folder name": "Enter folder name", @@ -51,7 +51,7 @@ "loading": "Loading", "my profile": "My profile", "new file": "New file", - "new folder": "New Folder", + "new folder": "New folder", "no": "No", "no editor message": "Open or create new file and folder from menu", "not set": "Not set", @@ -61,7 +61,7 @@ "open files and folders": "Open files and folders", "open folder": "Open folder", "open recent": "Open recent", - "ok": "ok", + "ok": "OK", "overwrite": "Overwrite", "paste": "Paste", "preview mode": "Preview mode", @@ -233,7 +233,7 @@ "folder name": "Folder name", "keyboard mode": "Keyboard mode", "normal": "Normal", - "app settings": "App settings", + "app settings": "App Settings", "disable in-app-browser caching": "Disable in-app-browser caching", "copied to clipboard": "Copied to clipboard", "clipboard not available": "Clipboard is not available.", @@ -262,7 +262,7 @@ "remove ads": "Remove ads", "fast": "Fast", "slow": "Slow", - "scroll settings": "Scroll settings", + "scroll settings": "Scroll Settings", "scroll speed": "Scroll speed", "loading...": "Loading...", "no plugins found": "No plugins found", @@ -292,7 +292,7 @@ "no app found to handle this file": "No app found to handle this file", "restore default settings": "Restore default settings", "server port": "Server port", - "preview settings": "Preview settings", + "preview settings": "Preview Settings", "preview settings note": "If preview port and server port are different, app will not start server and it will instead open https://: in browser or in-app browser. This is useful when you are running a server somewhere else.", "backup/restore note": "It will only backup your settings, custom theme, installed plugins and key bindings. It will not backup your FTP/SFTP or App state.", "host": "Host", @@ -315,7 +315,7 @@ "invalid plugin": "Invalid Plugin", "type command": "Type command", "plugin": "Plugin", - "quicktools trigger mode": "Quicktools trigger mode", + "quicktools trigger mode": "Quick tools trigger mode", "print margin": "Print margin", "touch move threshold": "Touch move threshold", "info-retryremotefsafterfail": "Retry FTP/SFTP connection when fails.", @@ -332,7 +332,7 @@ "info-animation": "If the app feels laggy, disable animation.", "info-quicktoolstriggermode": "If button in quick tools is not working, try to change this value.", "info-checkForAppUpdates": "Check for app updates automatically.", - "info-quickTools": "Show or hide quick tools.", + "info-quickTools": "Choose how tall the quick tools bar is, or hide it.", "info-showHiddenFiles": "Show hidden files and folders. (Start with .)", "info-listFiles": "Automatically list all files when a folder is opened", "info-all_file_access": "Enable access of /sdcard and /storage in terminal.", @@ -550,7 +550,7 @@ "shift click selection": "Shift + tap/click selection", "earn ad-free time": "Earn ad-free time", "indent guides": "Indent guides", - "language servers": "Language servers", + "language servers": "Language Servers", "lint gutter": "Show lint gutter", "rainbow brackets": "Rainbow brackets", "lsp-add-custom-server": "Add custom server", @@ -650,7 +650,7 @@ "settings-category-discover-apps": "Discover more apps", "settings-category-advanced": "Advanced", "settings-category-assistance": "Assistance", - "settings-category-core": "Core settings", + "settings-category-core": "Core Settings", "settings-category-cursor": "Cursor", "settings-category-cursor-selection": "Cursor & selection", "settings-category-custom-servers": "Custom servers", @@ -778,7 +778,7 @@ "pinned tab": "Pinned tab", "unpin tab before closing": "Unpin the tab before closing it.", "app font": "App font", - "app icon": "App icon", + "app icon": "App Icon", "app icon changed": "App icon changed", "app icon change warning": "The app will exit after the app icon is changed.", "settings-info-app-font-family": "Choose the font used across the app interface.", @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/es-sv.json b/src/lang/es-sv.json index 3ad4fd47ec..7953fd3fe4 100644 --- a/src/lang/es-sv.json +++ b/src/lang/es-sv.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/fr-fr.json b/src/lang/fr-fr.json index 5542fc28d4..a10925f4dc 100644 --- a/src/lang/fr-fr.json +++ b/src/lang/fr-fr.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/he-il.json b/src/lang/he-il.json index 8743df929e..958174afd6 100644 --- a/src/lang/he-il.json +++ b/src/lang/he-il.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/hi-in.json b/src/lang/hi-in.json index 8cf91745bf..46b4e6a5c2 100644 --- a/src/lang/hi-in.json +++ b/src/lang/hi-in.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index 3a740c4b62..09759df108 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Hova kerüljenek a szintaxisellenőrző és egyéb margójelölők: egy közös oszlopba, külön oszlopba mindegyiknek, vagy a sorszámok fölé a helytakarékosság érdekében.", "cursor blink rate": "Kurzor villogási sebessége", "settings-info-cursor-blink-rate": "Egy kurzorvillanás időtartama ezredmásodpercben. A 0 értéknél a kurzor nem villog.", - "settings-info-scroll-speed": "A görgetés mértéke egy lendítés vagy az egérkerék elfordításakor." + "settings-info-scroll-speed": "A görgetés mértéke egy lendítés vagy az egérkerék elfordításakor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/id-id.json b/src/lang/id-id.json index 5e48e7d93e..8a1c53fe69 100644 --- a/src/lang/id-id.json +++ b/src/lang/id-id.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/index.d.ts b/src/lang/index.d.ts index 64eed6cb1e..2b132910b8 100644 --- a/src/lang/index.d.ts +++ b/src/lang/index.d.ts @@ -910,6 +910,11 @@ declare type LangStrings = { "cursor blink rate": string; "settings-info-cursor-blink-rate": string; "settings-info-scroll-speed": string; + "clear all": string; + "error-permission-revoked": string; + "error-not-found": string; + "error-no-space": string; + "error-network": string; }; declare var strings: LangStrings; diff --git a/src/lang/ir-fa.json b/src/lang/ir-fa.json index 77126e16bb..722ab541de 100644 --- a/src/lang/ir-fa.json +++ b/src/lang/ir-fa.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/it-it.json b/src/lang/it-it.json index 1a4912f01c..6341a3f38d 100644 --- a/src/lang/it-it.json +++ b/src/lang/it-it.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/ja-jp.json b/src/lang/ja-jp.json index b35bd225a0..3763e83c89 100644 --- a/src/lang/ja-jp.json +++ b/src/lang/ja-jp.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/ko-kr.json b/src/lang/ko-kr.json index 5413bbd4b9..934a9b95fc 100644 --- a/src/lang/ko-kr.json +++ b/src/lang/ko-kr.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/ln-ln.json b/src/lang/ln-ln.json index 002ad75981..374277037d 100644 --- a/src/lang/ln-ln.json +++ b/src/lang/ln-ln.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/ml-in.json b/src/lang/ml-in.json index 7982934ab1..ee43c0510d 100644 --- a/src/lang/ml-in.json +++ b/src/lang/ml-in.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/mm-unicode.json b/src/lang/mm-unicode.json index 5cf1d2e41f..c6342176b4 100644 --- a/src/lang/mm-unicode.json +++ b/src/lang/mm-unicode.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/mm-zawgyi.json b/src/lang/mm-zawgyi.json index b6ae8a405c..7ee8820968 100644 --- a/src/lang/mm-zawgyi.json +++ b/src/lang/mm-zawgyi.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/pl-pl.json b/src/lang/pl-pl.json index 7bd6623217..86a57c9712 100644 --- a/src/lang/pl-pl.json +++ b/src/lang/pl-pl.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/pt-br.json b/src/lang/pt-br.json index f8b6eba9d8..7222b25d81 100644 --- a/src/lang/pt-br.json +++ b/src/lang/pt-br.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/pu-in.json b/src/lang/pu-in.json index fa5d2b46bb..a11d4bfb76 100644 --- a/src/lang/pu-in.json +++ b/src/lang/pu-in.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/ru-ru.json b/src/lang/ru-ru.json index 79b0196c57..e0ea1d7573 100644 --- a/src/lang/ru-ru.json +++ b/src/lang/ru-ru.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/tl-ph.json b/src/lang/tl-ph.json index 0e95b2f41c..f33e9fa701 100644 --- a/src/lang/tl-ph.json +++ b/src/lang/tl-ph.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/tr-tr.json b/src/lang/tr-tr.json index 2dd36d4069..32b867e55b 100644 --- a/src/lang/tr-tr.json +++ b/src/lang/tr-tr.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/uk-ua.json b/src/lang/uk-ua.json index fa2161245d..bbace5af76 100644 --- a/src/lang/uk-ua.json +++ b/src/lang/uk-ua.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/uz-uz.json b/src/lang/uz-uz.json index c03876491f..2fb439532a 100644 --- a/src/lang/uz-uz.json +++ b/src/lang/uz-uz.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/vi-vn.json b/src/lang/vi-vn.json index fdc61e41af..b6409ab682 100644 --- a/src/lang/vi-vn.json +++ b/src/lang/vi-vn.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index 39e9c7907f..601a44a967 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json index 9bba937281..9a56a6b35e 100644 --- a/src/lang/zh-hant.json +++ b/src/lang/zh-hant.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index 54d8e9c222..5d11488464 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -906,5 +906,10 @@ "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", "cursor blink rate": "Cursor blink rate", "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor." + "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", + "clear all": "Clear all", + "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", + "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", + "error-no-space": "There isn't enough storage space left on this device.", + "error-network": "Couldn't reach the server. Check your connection and try again." } diff --git a/src/lib/actionStack.js b/src/lib/actionStack.js index 2f2215ba65..f8cfcb391d 100644 --- a/src/lib/actionStack.js +++ b/src/lib/actionStack.js @@ -79,7 +79,7 @@ export default { if (appSettings.value.confirmOnExit) { let closeMessage = acode.exitAppMessage || strings["close app"].capitalize(0); - confirmation = await confirm(strings.warning.toUpperCase(), closeMessage); + confirmation = await confirm(strings.warning, closeMessage); } if (confirmation) { diff --git a/src/lib/checkFiles.js b/src/lib/checkFiles.js index 93751f1ee9..584ac1191a 100644 --- a/src/lib/checkFiles.js +++ b/src/lib/checkFiles.js @@ -87,7 +87,7 @@ export default async function checkFiles() { if (!alreadyWarnedConflict) { await new Promise((resolve) => { alert( - strings.warning.toUpperCase(), + strings.warning, `${file.filename} changed on disk while you have unsaved edits. Saving now may overwrite the external changes.`, resolve, ); @@ -108,7 +108,7 @@ export default async function checkFiles() { if (!currentDoc?.eq?.(diskDoc)) { try { const confirmation = await confirm( - strings.warning.toUpperCase(), + strings.warning, file.filename + strings["file changed"], ); diff --git a/src/lib/commands.js b/src/lib/commands.js index de3a005a8e..d6dfb45a8d 100644 --- a/src/lib/commands.js +++ b/src/lib/commands.js @@ -329,9 +329,7 @@ export default { }, async files() { const FileBrowser = await loadFileBrowser(); - FileBrowser("both", strings["file browser"]) - .then(FileBrowser.open) - .catch(FileBrowser.openError); + FileBrowser("both").then(FileBrowser.open).catch(FileBrowser.openError); }, find() { actions("search"); @@ -676,7 +674,7 @@ export default { file = file || editorManager.activeFile; if (file.SAFMode === "single") { - alert(strings.info.toUpperCase(), strings["unable to rename"]); + alert(strings.info, strings["unable to rename"]); return; } diff --git a/src/lib/editorFile.js b/src/lib/editorFile.js index 03a8c3ba0e..78fcb06881 100644 --- a/src/lib/editorFile.js +++ b/src/lib/editorFile.js @@ -1381,7 +1381,7 @@ export default class EditorFile { } if (!force && isUnsaved) { const confirmation = await confirm( - strings.warning.toUpperCase(), + strings.warning, strings["unsaved file"], ); if (!confirmation) return false; diff --git a/src/lib/notificationManager.js b/src/lib/notificationManager.js index 6ff6036e44..0ec79beea5 100644 --- a/src/lib/notificationManager.js +++ b/src/lib/notificationManager.js @@ -262,6 +262,7 @@ class NotificationManager { const index = this.notifications.findIndex((n) => n.id === id); if (index > -1) { this.notifications.splice(index, 1); + if (!this.notifications.length) this.#setUnread(false); this.renderNotifications(); } } @@ -293,6 +294,7 @@ class NotificationManager { } this.renderNotifications(); + if (!this.#isPanelVisible()) this.#setUnread(true); // show toast notification const $toastEl = this.createToastNotification(notification); @@ -372,8 +374,29 @@ class NotificationManager { return date.toLocaleDateString(); } + /** + * Clears the unread dot on the notifications sidebar icon + */ + markAllRead() { + this.#setUnread(false); + } + + #isPanelVisible() { + const $panel = sidebarApps.get("notification"); + return !!($panel?.isConnected && $panel.closest("#sidebar")?.activated); + } + + /** + * @param {boolean} unread + */ + #setUnread(unread) { + // Kept on so it applies even before the sidebar icon exists + document.body.classList.toggle("has-unread-notifications", unread); + } + clearAll() { this.notifications = []; + this.#setUnread(false); this.renderNotifications(); if (this.timeUpdateInterval) { clearInterval(this.timeUpdateInterval); diff --git a/src/lib/openFile.js b/src/lib/openFile.js index c84cee1fec..3b85114679 100644 --- a/src/lib/openFile.js +++ b/src/lib/openFile.js @@ -457,7 +457,7 @@ export default async function openFile(file, options = {}) { if (options.external) throw Object.assign(new Error("File too large"), { filename: name }); return alert( - strings.error.toUpperCase(), + strings.error, strings["file too large"].replace( "{size}", settings.maxFileSize + "MB", diff --git a/src/lib/openFolder.js b/src/lib/openFolder.js index 3fdda05ca8..90b69856b6 100644 --- a/src/lib/openFolder.js +++ b/src/lib/openFolder.js @@ -707,10 +707,15 @@ function execOperation(type, action, url, $target, name) { alert(strings.warning, strings["rename not supported"]); return; } - let newName = await prompt(strings.rename, name, "text", { - match: config.FILE_NAME_REGEX, - required: true, - }); + let newName = await prompt( + strings.rename, + name, + helpers.isFile(type) ? "filename" : "text", + { + match: config.FILE_NAME_REGEX, + required: true, + }, + ); newName = helpers.fixFilename(newName); if (!newName || newName === name) return; diff --git a/src/pages/customTheme/customTheme.js b/src/pages/customTheme/customTheme.js index 62345166d8..8131a7c329 100644 --- a/src/pages/customTheme/customTheme.js +++ b/src/pages/customTheme/customTheme.js @@ -62,7 +62,7 @@ export default function CustomThemeInclude() { if (action === "reset-theme") { const confirmation = await confirm( - strings["info"].toUpperCase(), + strings["info"], strings["reset warning"], ); if (!confirmation) return; diff --git a/src/pages/fileBrowser/fileBrowser.hbs b/src/pages/fileBrowser/fileBrowser.hbs index bf3f19634d..f35c89c786 100644 --- a/src/pages/fileBrowser/fileBrowser.hbs +++ b/src/pages/fileBrowser/fileBrowser.hbs @@ -1,4 +1,4 @@
    -
    ⓘ {{info}}
    + {{#info}}
    ⓘ {{info}}
    {{/info}}
    \ No newline at end of file diff --git a/src/pages/fileBrowser/fileBrowser.js b/src/pages/fileBrowser/fileBrowser.js index a093703f59..6ca4591abd 100644 --- a/src/pages/fileBrowser/fileBrowser.js +++ b/src/pages/fileBrowser/fileBrowser.js @@ -74,12 +74,10 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { let selectedItems = new Set(); let copiedItems = []; - if (!info) { - if (mode !== "both") { - info = IS_FOLDER_MODE ? strings["open folder"] : strings["open file"]; - } else { - info = strings["file browser"]; - } + // In "both" mode the page title already says "File browser", so the + // info row is only shown when the caller passes its own note. + if (!info && mode !== "both") { + info = IS_FOLDER_MODE ? strings["open folder"] : strings["open file"]; } return new Promise((resolve, reject) => { @@ -202,6 +200,8 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { if (IS_FOLDER_MODE) { $openFolder = tag("button", { className: "floating icon check", + title: strings["select folder"], + ariaLabel: strings["select folder"], style: { bottom: "10px", top: "auto", @@ -1098,7 +1098,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { currentDir.url === "/" ? strings.remove : strings.delete; const options = [ ["delete", deleteText, "delete"], - ["rename", strings.rename, "text_format"], + ["rename", strings.rename, "edit"], ]; if (/s?ftp/.test(storageType)) { @@ -1139,9 +1139,14 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) { } case "rename": { - let newname = await prompt(strings.rename, name, "text", { - match: config.FILE_NAME_REGEX, - }); + let newname = await prompt( + strings.rename, + name, + helpers.isFile(type) ? "filename" : "text", + { + match: config.FILE_NAME_REGEX, + }, + ); newname = helpers.fixFilename(newname); if (!newname || newname === name) break; diff --git a/src/pages/fileBrowser/index.js b/src/pages/fileBrowser/index.js index bd46f597c8..deed906719 100644 --- a/src/pages/fileBrowser/index.js +++ b/src/pages/fileBrowser/index.js @@ -49,7 +49,7 @@ FileBrowser.openFile = (res) => { }; FileBrowser.openFileError = (err) => { - const ERROR = strings.error.toUpperCase(); + const ERROR = strings.error; const message = `${strings["unable to open file"]}. ${helpers.errorMessage(err.code)}`; if (err.code) { alert(ERROR, message); @@ -78,7 +78,7 @@ FileBrowser.openFolder = async (res) => { }; FileBrowser.openFolderError = (err) => { - const ERROR = strings.error.toUpperCase(); + const ERROR = strings.error; const message = `${strings["unable to open folder"]}. ${helpers.errorMessage(err.code)}`; if (err.code) { alert(ERROR, message); diff --git a/src/pages/sponsor/sponsor.js b/src/pages/sponsor/sponsor.js index 02b53475fd..b4043d4ac7 100644 --- a/src/pages/sponsor/sponsor.js +++ b/src/pages/sponsor/sponsor.js @@ -98,7 +98,7 @@ export default function Sponsor(onclose) { if (res.error) { helpers.error(res.error); } else { - dialog(strings.info.toUpperCase(), msg); + dialog(strings.info, msg); localStorage.removeItem(`sponsor_${productId}`); $page.hide(); } @@ -112,7 +112,7 @@ export default function Sponsor(onclose) { }, (err) => { if (err !== iap.USER_CANCELED) { - alert(strings.error.toUpperCase(), err); + alert(strings.error, err); } loader.removeTitleLoader(); }, diff --git a/src/settings/backupRestore.js b/src/settings/backupRestore.js index 6eebf73c37..d23a576e8c 100644 --- a/src/settings/backupRestore.js +++ b/src/settings/backupRestore.js @@ -318,12 +318,12 @@ function backupRestore() { `${strings.plugins || "Plugins"}: ${installedPlugins.length}`, ].join("
    "); - alert(strings.success.toUpperCase(), message); + alert(strings.success, message); } catch (error) { loaderDialog.destroy(); console.error("Backup error:", error); alert( - strings.error.toUpperCase(), + strings.error, `${strings["error details"] || "Error"}: ${error.message || error}`, ); } @@ -373,7 +373,7 @@ backupRestore.restore = async function (url) { backup = JSON.parse(backupContent); } catch (error) { loaderDialog.destroy(); - alert(strings.error.toUpperCase(), strings["invalid backup file"]); + alert(strings.error, strings["invalid backup file"]); return; } @@ -389,7 +389,7 @@ backupRestore.restore = async function (url) { `${strings["issues found"]}:`, ...validation.errors.map((e) => `• ${e}`), ].join("\n"); - alert(strings.error.toUpperCase(), errorMessage); + alert(strings.error, errorMessage); return; } @@ -689,10 +689,7 @@ backupRestore.restore = async function (url) { } catch (err) { loaderDialog.destroy(); console.error("Restore error:", err); - alert( - strings.error.toUpperCase(), - `${strings["error details"]}: ${err.message || err}`, - ); + alert(strings.error, `${strings["error details"]}: ${err.message || err}`); } }; diff --git a/src/settings/terminalSettings.js b/src/settings/terminalSettings.js index e8e07112b6..408ed204cd 100644 --- a/src/settings/terminalSettings.js +++ b/src/settings/terminalSettings.js @@ -312,10 +312,7 @@ export default function terminalSettings() { Terminal.uninstall() .then(() => { loader.removeTitleLoader(); - alert( - strings.success.toUpperCase(), - `${strings["uninstalled successfully"]}.`, - ); + alert(strings.success, `${strings["uninstalled successfully"]}.`); }) .catch((error) => { loader.removeTitleLoader(); @@ -370,7 +367,7 @@ export default function terminalSettings() { console.error, ); loader.removeTitleLoader(); - alert(strings.success.toUpperCase(), `${strings["backup successful"]}.`); + alert(strings.success, `${strings["backup successful"]}.`); } catch (error) { loader.removeTitleLoader(); console.error("Terminal backup failed:", error); @@ -404,10 +401,7 @@ export default function terminalSettings() { await Executor.execute("rm -rf $PREFIX/aterm_backup.*"); loader.removeTitleLoader(); - alert( - strings.success.toUpperCase(), - `${strings["restored successfully"]}.`, - ); + alert(strings.success, `${strings["restored successfully"]}.`); }, toast, "application/x-tar", diff --git a/src/sidebarApps/index.js b/src/sidebarApps/index.js index 4172f79917..91ded69c5a 100644 --- a/src/sidebarApps/index.js +++ b/src/sidebarApps/index.js @@ -109,7 +109,8 @@ function setSponsorSidebarAppVisibility(visible) { onclick={Sponsors} /> ); - $apps.append($sponsorIcon); + // Keep it out of the app list so it isn't tapped by mistake (#2866) + $apps.after($sponsorIcon); return; } diff --git a/src/sidebarApps/notification/index.js b/src/sidebarApps/notification/index.js index d98760623a..0719604c79 100644 --- a/src/sidebarApps/notification/index.js +++ b/src/sidebarApps/notification/index.js @@ -23,9 +23,11 @@ const $header = (
    @@ -52,6 +54,8 @@ function initApp(el) { * @param {HTMLElement} el */ function onSelected(el) { + // Sidebar "show" fires for every app; only mark read when this one is open + if (container.isConnected) notificationManager.markAllRead(); const $scrollableLists = container.getAll(":scope .scroll[data-scroll-top]"); $scrollableLists.forEach(($el) => { $el.scrollTop = $el.dataset.scrollTop; diff --git a/src/sidebarApps/searchInFiles/index.js b/src/sidebarApps/searchInFiles/index.js index 9de507be65..5729f1e45f 100644 --- a/src/sidebarApps/searchInFiles/index.js +++ b/src/sidebarApps/searchInFiles/index.js @@ -37,6 +37,7 @@ const $caseSensitive = Ref(); const $useIndex = Ref(); const $btnReplaceAll = Ref(); const $resultOverview = Ref(); +const $resultHeader = Ref(); const $error = Reactive(); const $progress = Reactive(); const $indexStatus = Reactive(""); @@ -285,7 +286,7 @@ export default [ />
    -
    +
    {" "} ({$progress}%)
    @@ -618,6 +619,8 @@ function onInput(e) { clearNativeResultQueue(); searchResult.setValue(""); removeEvents(); + // Keep the result summary hidden until there is something to search for + $resultHeader.classList.toggle("idle", !$search.value); if (!$search.value) { searchResult.removeGhostText(); return; diff --git a/src/sidebarApps/searchInFiles/styles.scss b/src/sidebarApps/searchInFiles/styles.scss index d5cf3f1af1..32e08d10f4 100644 --- a/src/sidebarApps/searchInFiles/styles.scss +++ b/src/sidebarApps/searchInFiles/styles.scss @@ -171,6 +171,10 @@ } } + .search-result-header.idle { + display: none; + } + .search-result-header { flex-shrink: 0; padding: 8px 10px; diff --git a/src/utils/helpers.js b/src/utils/helpers.js index e48e94bea0..f9c092190c 100644 --- a/src/utils/helpers.js +++ b/src/utils/helpers.js @@ -127,6 +127,36 @@ export default { return msg + (extra ? "
    " + extra : ""); }, + /** + * Maps common native errors (e.g. revoked SAF permissions) to a message + * people can act on. Returns null when the error isn't recognised. + * @param {string} msg + * @returns {string|null} + */ + friendlyErrorMessage(msg) { + if (typeof msg !== "string") return null; + if ( + /Permission Denial|ACTION_OPEN_DOCUMENT|SecurityException|EACCES/i.test( + msg, + ) + ) { + return strings["error-permission-revoked"]; + } + if (/FileNotFoundException|ENOENT|No such file or directory/i.test(msg)) { + return strings["error-not-found"]; + } + if (/ENOSPC|No space left on device/i.test(msg)) { + return strings["error-no-space"]; + } + if ( + /UnknownHostException|ConnectException|SocketTimeoutException|ECONNREFUSED|ETIMEDOUT/i.test( + msg, + ) + ) { + return strings["error-network"]; + } + return null; + }, /** * * @param {Error} err @@ -144,7 +174,16 @@ export default { if (hide) hide(); }; - const msg = this.errorMessage(err, ...args); + let msg = this.errorMessage(err, ...args); + const base = this.errorMessage(err); + const friendly = this.friendlyErrorMessage(base); + if (friendly) { + // Keep the raw native message for bug reports, but out of the way + const raw = document.createElement("div"); + raw.textContent = base; + const extra = msg.slice(base.length); + msg = `${friendly}${extra}
    ${strings["error details"]}${raw.innerHTML}
    `; + } alert(strings.error, msg, onhide); return new Promise((resolve) => { diff --git a/src/views/menu.hbs b/src/views/menu.hbs index 8236243fbc..c12c7b8b8a 100644 --- a/src/views/menu.hbs +++ b/src/views/menu.hbs @@ -8,15 +8,15 @@
  • {{save as}} - +
  • {{files}} - +
  • {{close file}} - +
  • {{open recent}} diff --git a/tests/unit/actionStack.test.js b/tests/unit/actionStack.test.js index 7bfe827c03..75d78c08ae 100644 --- a/tests/unit/actionStack.test.js +++ b/tests/unit/actionStack.test.js @@ -80,7 +80,7 @@ describe("actionStack app exit", () => { await actionStack.pop(); - expect(mocks.confirm).toHaveBeenCalledWith("WARNING", "Close Acode?"); + expect(mocks.confirm).toHaveBeenCalledWith("Warning", "Close Acode?"); expect(mocks.showInterstitialIfReady).not.toHaveBeenCalled(); expect(mocks.exitApp).toHaveBeenCalledOnce(); }); From 1d163d301eaa0ca96ce9e2218d1c11d22e1b627c Mon Sep 17 00:00:00 2001 From: KARANKOYU <262628218+KARANKOYU@users.noreply.github.com> Date: Fri, 6 Nov 2026 15:45:48 +0000 Subject: [PATCH 167/195] feat(lang): update Turkish (tr-tr) translation (#2992) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(lang): update Turkish (tr-tr) translation * fix(lang): use "Yüklü" for "Installed" in tr-tr --- src/lang/tr-tr.json | 292 ++++++++++++++++++++++---------------------- 1 file changed, 146 insertions(+), 146 deletions(-) diff --git a/src/lang/tr-tr.json b/src/lang/tr-tr.json index 32b867e55b..d3b0f988f1 100644 --- a/src/lang/tr-tr.json +++ b/src/lang/tr-tr.json @@ -1,5 +1,5 @@ { - "lang": "Türkçe (by ibrahim)", + "lang": "Türkçe (by ibrahim / KARANKOYU)", "about": "Hakkında", "active files": "Aktif Dosyalar", "alert": "Uyarı", @@ -88,9 +88,9 @@ "tab size": "sekmeler Boyutu", "text wrap": "Sözcük Kaydırma", "theme": "Tema", - "title-listfiles": "List files", + "title-listfiles": "Dosyaları Listele", "unable to delete file": "Dosya silinemedi", - "document plugin required": "Plugins bölümünden Docs Workspace'i yükleyin veya etkinleştirin, ardından belgeyi yeniden açın.", + "document plugin required": "Eklentiler bölümünden Docs Workspace'i kurun veya etkinleştirin, ardından belgeyi yeniden açın.", "shared files unavailable": "Bu dosyalar açılamadı. Desteklenmiyor veya artık erişilemiyor olabilirler. Yeniden paylaşmayı deneyin.", "invalid shared file": "Paylaşılan dosya geçersiz", "unable to open file": "Dosya açılamadı", @@ -130,8 +130,8 @@ "animation": "animasyon", "backup": "yedekle", "restore": "restore", - "backup successful": "Backup successful", - "invalid backup file": "Invalid backup file", + "backup successful": "Yedekleme başarılı", + "invalid backup file": "Yedek Dosyası Geçersiz", "add path": "Yol ekle", "live autocompletion": "canlı Otomatik Düzenleme", "file properties": "dosya bilgileri", @@ -142,124 +142,124 @@ "last modified": "En Son değiştirilen", "size": "Boyut", "share": "paylaş", - "show print margin": "Show print margin", - "login": "login", + "show print margin": "Kenar Çizgisini Göster", + "login": "Giriş yap", "scrollbar size": "Scrollbar size", - "cursor controller size": "Cursor controller size", - "none": "none", - "small": "small", - "large": "large", - "confirm on exit": "Confirm on exit", - "show console": "Show console", - "image": "Image", - "insert file": "Insert file", - "insert color": "Insert color", - "powersave mode warning": "Turn off power saving mode to preview in external browser.", - "exit": "Exit", + "cursor controller size": "İmleç Kontrolcüsü Boyutu", + "none": "Yok", + "small": "Küçük", + "large": "Büyük", + "confirm on exit": "Çıkışta onay iste", + "show console": "Konsolu Göster", + "image": "Görsel", + "insert file": "Dosya Ekle", + "insert color": "Renk Ekle", + "powersave mode warning": "Harici tarayıcıda önizlemek için güç tasarrufu modunu kapatın.", + "exit": "Çık", "custom": "custom", - "reset warning": "Are you sure you want to reset theme?", - "theme type": "Theme type", - "light": "light", - "dark": "dark", - "file browser": "File Browser", - "operation not permitted": "Operation not permitted", - "no such file or directory": "No such file or directory", - "input/output error": "Input/output error", - "permission denied": "Permission denied", - "bad address": "Bad address", - "file exists": "File exists", - "not a directory": "Not a directory", - "is a directory": "Is a directory", - "invalid argument": "Invalid argument", - "too many open files in system": "Too many open files in system", - "too many open files": "Too many open files", - "text file busy": "Text file busy", - "no space left on device": "No space left on device", - "read-only file system": "Read-only file system", - "file name too long": "File name too long", - "too many users": "Too many users", - "connection timed out": "Connection timed out", - "connection refused": "Connection refused", - "owner died": "Owner died", - "an error occurred": "An error occurred", - "add ftp": "Add FTP", - "add sftp": "Add SFTP", - "save file": "Save file", - "save file as": "Save file as", - "files": "Files", - "help": "Help", - "file has been deleted": "{file} has been deleted!", + "reset warning": "Temayı sıfırlamak istediğinizden emin misiniz?", + "theme type": "Tema türü", + "light": "Açık", + "dark": "Koyu", + "file browser": "Dosya Gezgini", + "operation not permitted": "İşleme izin verilmiyor", + "no such file or directory": "Böyle bir dosya veya klasör yok", + "input/output error": "Giriş/çıkış hatası", + "permission denied": "İzin reddedildi", + "bad address": "Geçersiz adres", + "file exists": "Dosya zaten var", + "not a directory": "Klasör değil", + "is a directory": "Bu bir klasör", + "invalid argument": "Geçersiz argüman", + "too many open files in system": "Sistemde çok fazla açık dosya", + "too many open files": "Çok fazla açık dosya", + "text file busy": "Metin dosyası meşgul", + "no space left on device": "Cihazda yer kalmadı", + "read-only file system": "Salt okunur dosya sistemi", + "file name too long": "Dosya adı çok uzun", + "too many users": "Çok fazla kullanıcı", + "connection timed out": "Bağlantı zaman aşımına uğradı", + "connection refused": "Bağlantı Reddedildi", + "owner died": "Sahibi öldü", + "an error occurred": "Bir hata oluştu", + "add ftp": "FTP ekle", + "add sftp": "SFTP ekle", + "save file": "Dosyayı Kaydet", + "save file as": "Dosyayı Farklı Kaydet", + "files": "Dosyalar", + "help": "Yardım", + "file has been deleted": "{file} silindi!", "feature not available": "Bu özellik kullanılamıyor.", - "feature available in paid version": "This feature is only available in paid version of the app.", - "deleted file": "Deleted file", - "line height": "Line height", + "feature available in paid version": "Bu özellik yalnızca uygulamanın ücretli sürümünde mevcut.", + "deleted file": "Silinmiş Dosya", + "line height": "Satır yüksekliği", "preview info": "If you want run the active file, tap and hold on play icon.", "manage all files": "Allow Acode editor to manage all files in settings to edit files on your device easily.", - "close file": "Close file", - "reset connections": "Reset connections", - "check file changes": "Check file changes", - "open in browser": "Open in browser", - "desktop mode": "Desktop mode", - "toggle console": "Toggle console", - "new line mode": "New line mode", - "add a storage": "Add a storage", - "rate acode": "Rate Acode", - "support": "Support", - "downloading file": "Downloading {file}", - "downloading...": "Downloading...", - "folder name": "Folder name", - "keyboard mode": "Keyboard mode", + "close file": "Dosyayı Kapat", + "reset connections": "Bağlantıları Sıfırla", + "check file changes": "Dosya Değişikliklerini Kontrol et", + "open in browser": "Tarayıcıda Aç", + "desktop mode": "Masaüstü modu", + "toggle console": "Konsolu Aç/Kapat", + "new line mode": "Yeni satır modu", + "add a storage": "Depolama alanı ekle", + "rate acode": "Acode'u Değerlendir", + "support": "Destek", + "downloading file": "{file} indiriliyor", + "downloading...": "İndiriliyor...", + "folder name": "Klasör Adı", + "keyboard mode": "Klavye modu", "normal": "Normal", - "app settings": "App settings", + "app settings": "Uygulama Ayarları", "disable in-app-browser caching": "Disable in-app-browser caching", - "copied to clipboard": "Copied to clipboard", - "clipboard not available": "Clipboard is not available.", - "remember opened files": "Remember opened files", - "remember opened folders": "Remember opened folders", - "no suggestions": "No suggestions", + "copied to clipboard": "Panoya Kopyalandı", + "clipboard not available": "Panoya Erişilemiyor.", + "remember opened files": "Açılmış Dosyaları Hatırla", + "remember opened folders": "Açılmış Klasörleri Hatırla", + "no suggestions": "Öneri yok", "no suggestions aggressive": "No suggestions aggressive", - "install": "Install", - "installing": "Installing...", - "plugins": "Plugins", - "recently used": "Recently used", - "update": "Update", - "uninstall": "Uninstall", - "download acode pro": "Download Acode pro", - "loading plugins": "Loading plugins", + "install": "Kur", + "installing": "Kuruluyor...", + "plugins": "Eklentiler", + "recently used": "Son kullanılanlar", + "update": "Güncelle", + "uninstall": "Kaldır", + "download acode pro": "Acode Pro'yu indir", + "loading plugins": "Eklentiler Yükleniyor", "faqs": "FAQs", - "feedback": "Feedback", + "feedback": "Geri bildirim", "header": "Header", "sidebar": "Sidebar", "inapp": "Inapp", - "browser": "Browser", + "browser": "Tarayıcı", "diagonal scrolling": "Diagonal scrolling", - "reverse scrolling": "Reverse Scrolling", + "reverse scrolling": "Ters Kaydırma", "formatter": "Formatter", "format on save": "Format on save", - "remove ads": "Remove ads", - "fast": "Fast", - "slow": "Slow", - "scroll settings": "Scroll settings", - "scroll speed": "Scroll speed", + "remove ads": "Reklamları Kaldır", + "fast": "Hızlı", + "slow": "Yavaş", + "scroll settings": "Kaydırma Ayarları", + "scroll speed": "Kaydırma Hızı", "loading...": "Loading...", - "no plugins found": "No plugins found", - "name": "Name", - "username": "Username", - "optional": "optional", + "no plugins found": "Eklenti bulunamadı", + "name": "Ad", + "username": "Kullanıcı Adı", + "optional": "isteğe bağlı", "hostname": "Hostname", - "password": "Password", + "password": "Şifre", "security type": "Security Type", - "connection mode": "Connection mode", + "connection mode": "Bağlantı Modu", "port": "Port", - "key file": "Key file", - "select key file": "Select key file", + "key file": "Anahtar Dosyası", + "select key file": "Anahtar Dosyası Seç", "passphrase": "Passphrase", - "connecting...": "Connecting...", - "type filename": "Type filename", - "unable to load files": "Unable to load files", - "preview port": "Preview port", - "find file": "Find file", - "system": "System", + "connecting...": "Bağlanıyor...", + "type filename": "Dosya adını girin", + "unable to load files": "Dosyalar Yüklenemedi", + "preview port": "Önizleme portu", + "find file": "Dosya Bul", + "system": "Sistem", "please select a formatter": "Please select a formatter", "case sensitive": "Case sensitive", "regular expression": "Regular expression", @@ -268,18 +268,18 @@ "open with": "Open with", "no app found to handle this file": "No app found to handle this file", "restore default settings": "Restore default settings", - "server port": "Server port", - "preview settings": "Preview settings", + "server port": "Sunucu portu", + "preview settings": "Önizleme Ayarları", "preview settings note": "If preview port and server port are different, app will not start server and it will instead open https://: in browser or in-app browser. This is useful when you are running a server somewhere else.", "backup/restore note": "It will only backup your settings, custom theme and key bindings. It will not backup your FPT/SFTP.", "host": "Host", "retry ftp/sftp when fail": "Retry ftp/sftp when fail", - "more": "More", - "thank you :)": "Thank you :)", + "more": "Daha Fazla", + "thank you :)": "Teşekkürler :)", "purchase pending": "purchase pending", - "cancelled": "cancelled", - "local": "Local", - "remote": "Remote", + "cancelled": "İptal edildi", + "local": "Yerel", + "remote": "Uzak", "show console toggler": "Show console toggler", "binary file": "This file contains binary data, do you want to open it?", "relative line numbers": "Relative line numbers", @@ -289,9 +289,9 @@ "spellcheck": "Spellcheck", "wrap method": "Wrap Method", "use textarea for ime": "Use textarea for IME", - "invalid plugin": "Invalid Plugin", - "type command": "Type command", - "plugin": "Plugin", + "invalid plugin": "Geçersiz Eklenti", + "type command": "Komut girin", + "plugin": "Eklenti", "quicktools trigger mode": "Quicktools trigger mode", "print margin": "Print margin", "touch move threshold": "Touch move threshold", @@ -400,18 +400,18 @@ "delete entry": "Confirm deletion: '{name}'. This action cannot be undone. Proceed?", "change encoding": "Reopen '{file}' with '{encoding}' encoding? This action will result in the loss of any unsaved changes made to the file. Do you want to proceed with reopening?", "reopen file": "Are you sure you want to reopen '{file}'? Any unsaved changes will be lost.", - "plugin min version": "{name} only available in Acode - {v-code} and above. Click here to update.", - "color preview": "Color preview", - "confirm": "Confirm", - "problems": "Problems", - "show side buttons": "Show side buttons", + "plugin min version": "{name} yalnızca Acode {v-code} ve üzeri sürümlerde kullanılabilir. Güncellemek için buraya dokunun.", + "color preview": "Renk önizleme", + "confirm": "Onayla", + "problems": "Sorunlar", + "show side buttons": "Yan Butonları göster", "bug_report": "Submit a Bug Report", - "verified publisher": "Verified publisher", - "most_downloaded": "Most Downloaded", - "newly_added": "Newly Added", + "verified publisher": "Doğrulanmış Yayımlayıcı", + "most_downloaded": "En Çok İndirilenler", + "newly_added": "Yeni Eklenenler", "top_rated": "Top Rated", "rename not supported": "Rename on termux dir isn't supported", - "compress": "Compress", + "compress": "Sıkıştır", "copy uri": "Copy Uri", "delete entries": "Are you sure you want to delete {count} items?", "deleting items": "Deleting {count} items...", @@ -454,17 +454,17 @@ "terminal not installed prompt": "Terminal kurulu değil. Şimdi başlatmak ister misiniz?", "terminal first launch prompt": "Terminal ortamı kurulu değil. Komut çalıştırma, SSH ve betik yazmayı sağlar. Şimdi kur?", "allFileAccess": "All file access", - "fonts": "Fonts", + "fonts": "Yazı Tipleri", "sponsor": "Sponsor", - "downloads": "downloads", - "reviews": "reviews", + "downloads": "indirme", + "reviews": "değerlendirme", "overview": "Overview", - "contributors": "Contributors", + "contributors": "Katkıda Bulunanlar", "quicktools:hyphen": "Insert hyphen symbol", "check for app updates": "Check for app updates", "prompt update check consent message": "Acode can check for new app updates when you're online. Enable update checks?", - "keywords": "Keywords", - "author": "Author", + "keywords": "Anahtar Kelimeler", + "author": "Geliştirici", "filtered by": "Filtered by", "clean install state": "Clean Install State", "backup created": "Backup created", @@ -498,15 +498,15 @@ "backup invalid settings": "Invalid settings format", "backup invalid keybindings": "Invalid keyBindings format", "backup invalid plugins": "Invalid installedPlugins format", - "issues found": "Issues found", - "error details": "Error details", + "issues found": "Bulunan sorunlar", + "error details": "Hata detayları", "active tools": "Active tools", "available tools": "Available tools", "recent": "Recent Files", "command palette": "Open Command Palette", - "change theme": "Change Theme", + "change theme": "Temayı Değiştir", "documentation": "Documentation", - "open in terminal": "Open in Terminal", + "open in terminal": "Terminalde Aç", "developer mode": "Developer Mode", "info-developermode": "Enable developer tools (Eruda) for debugging plugins and inspecting app state. Inspector will be initialized on app start.", "developer mode enabled": "Developer mode enabled. Use command palette to toggle inspector (Ctrl+Shift+I).", @@ -531,10 +531,10 @@ "lsp-checking-installation-status": "Checking installation status...", "lsp-configured": "Configured", "lsp-custom-server-added": "Custom server added", - "lsp-default": "Default", - "lsp-details-line": "Details: {details}", + "lsp-default": "Varsayılan", + "lsp-details-line": "Detaylar: {details}", "lsp-edit-initialization-options": "Edit initialization options", - "lsp-empty": "Empty", + "lsp-empty": "Boş", "lsp-enabled": "Enabled", "lsp-error-add-server-failed": "Failed to add server", "lsp-error-args-must-be-array": "Arguments must be a JSON array", @@ -566,16 +566,16 @@ "lsp-install-info-unknown": "Installation status could not be checked automatically.", "lsp-install-info-version-available": "Version {version} is available.", "lsp-install-notification": "{server} is not installed. Tap to install.", - "lsp-install-method-apk": "APK package", - "lsp-install-method-cargo": "Cargo crate", + "lsp-install-method-apk": "APK paketi", + "lsp-install-method-cargo": "Cargo paketi", "lsp-install-method-manual": "Manual binary", - "lsp-install-method-npm": "npm package", + "lsp-install-method-npm": "npm paketi", "lsp-install-method-pip": "pip package", "lsp-install-method-shell": "Custom shell", - "lsp-install-method-title": "Install method", - "lsp-install-repair": "Install / repair", + "lsp-install-method-title": "Kurulum yöntemi", + "lsp-install-repair": "Kur / Onar", "lsp-installation-status": "Installation status", - "lsp-installed": "Installed", + "lsp-installed": "Yüklü", "lsp-invalid-timeout": "Invalid timeout value", "lsp-language-ids": "Language IDs (comma separated)", "lsp-packages-prompt": "{method} packages (comma separated)", @@ -593,7 +593,7 @@ "lsp-state-enabled": "enabled", "lsp-status": "Status", "lsp-status-check-failed": "Check failed", - "lsp-status-installed": "Installed", + "lsp-status-installed": "Yüklü", "lsp-status-installed-version": "Installed ({version})", "lsp-status-line": "Status: {status}", "lsp-status-not-installed": "Not installed", @@ -605,23 +605,23 @@ "lsp-update-command-optional": "Update command (optional)", "lsp-update-command-unavailable": "Update command not available", "lsp-update-server": "Update server", - "lsp-version-line": "Version: {version}", + "lsp-version-line": "Sürüm: {version}", "lsp-view-initialization-options": "View initialization options", "settings-category-about-acode": "About Acode", "settings-category-discover-apps": "Daha fazla uygulama keşfet", "settings-category-advanced": "Advanced", "settings-category-assistance": "Assistance", "settings-category-core": "Core settings", - "settings-category-cursor": "Cursor", + "settings-category-cursor": "İmleç", "settings-category-cursor-selection": "Cursor & selection", "settings-category-custom-servers": "Custom servers", "settings-category-customization": "Özelleştirme", "settings-category-tools": "Araçlar", "settings-category-display": "Display", - "settings-category-editing": "Editing", + "settings-category-editing": "Düzenleme", "settings-category-features": "Features", "settings-category-files-sessions": "Files & sessions", - "settings-category-fonts": "Fonts", + "settings-category-fonts": "Yazı Tipleri", "settings-category-general": "General", "settings-category-guides-indicators": "Guides & indicators", "settings-category-installation": "Installation", From 672750c4e53a554b8f45cfe3092b29ce8406d3c9 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sat, 7 Nov 2026 06:01:12 +0000 Subject: [PATCH 168/195] fix(editor): keep cursor in document when pasting CRLF text (#3018) * fix(editor): keep cursor in document when pasting CRLF text Also update @lezer/common to 1.5.5. * chore(deps): sync package-lock with @lezer/common 1.5.5 * test(editor): cover pasting CRLF text --- bun.lock | 6 +- package-lock.json | 8 +-- package.json | 4 +- src/cm/commandRegistry.js | 13 ++-- tests/unit/pasteCommand.test.js | 117 ++++++++++++++++++++++++++++++++ 5 files changed, 132 insertions(+), 16 deletions(-) create mode 100644 tests/unit/pasteCommand.test.js diff --git a/bun.lock b/bun.lock index f5aca1df79..cb6b0bac63 100644 --- a/bun.lock +++ b/bun.lock @@ -40,7 +40,7 @@ "@codemirror/view": "^6.43.14", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", - "@lezer/common": "^1.5.4", + "@lezer/common": "^1.5.5", "@lezer/highlight": "^1.2.5", "@lezer/lr": "^1.4.10", "@ungap/custom-elements": "^1.3.0", @@ -155,7 +155,7 @@ "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.7.6", "@codemirror/view": "^6.43.14", - "@lezer/common": "^1.5.4", + "@lezer/common": "^1.5.5", "@lezer/lr": "^1.4.10", "tar": "^7.5.22", }, @@ -470,7 +470,7 @@ "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="], - "@lezer/common": ["@lezer/common@1.5.4", "", {}, "sha512-xt3Q4z64xM+xhg4M7NXqw1N//1O74bUFo5kz6fwMeC4qwxSuRdwkYSmjcqCEEKYkNw5e67f2hcNqBoNERAEU0w=="], + "@lezer/common": ["@lezer/common@1.5.5", "", {}, "sha512-Pw7PVCndruF1pb3ebCxpSVpkMHSDjwRCLcTRw+RizUKco5QbWylwq2g4lnG/RYN7yTTQDXE9F77MwtkAyphrjg=="], "@lezer/cpp": ["@lezer/cpp@1.1.5", "", { "dependencies": { "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0" } }, "sha512-DIhSXmYtJKLehrjzDFN+2cPt547ySQ41nA8yqcDf/GxMc+YM736xqltFkvADL2M0VebU5I+3+4ks2Vv+Kyq3Aw=="], diff --git a/package-lock.json b/package-lock.json index df5052d997..0c6a05e142 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "@codemirror/view": "^6.43.14", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", - "@lezer/common": "^1.5.4", + "@lezer/common": "^1.5.5", "@lezer/highlight": "^1.2.5", "@lezer/lr": "^1.4.10", "@ungap/custom-elements": "^1.3.0", @@ -4262,9 +4262,9 @@ } }, "node_modules/@lezer/common": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.4.tgz", - "integrity": "sha512-xt3Q4z64xM+xhg4M7NXqw1N//1O74bUFo5kz6fwMeC4qwxSuRdwkYSmjcqCEEKYkNw5e67f2hcNqBoNERAEU0w==", + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.5.tgz", + "integrity": "sha512-Pw7PVCndruF1pb3ebCxpSVpkMHSDjwRCLcTRw+RizUKco5QbWylwq2g4lnG/RYN7yTTQDXE9F77MwtkAyphrjg==", "license": "MIT" }, "node_modules/@lezer/cpp": { diff --git a/package.json b/package.json index 520b7c44b2..e01f438448 100644 --- a/package.json +++ b/package.json @@ -160,7 +160,7 @@ "@codemirror/view": "^6.43.14", "@deadlyjack/ajax": "^1.2.6", "@emmetio/codemirror6-plugin": "^0.4.1", - "@lezer/common": "^1.5.4", + "@lezer/common": "^1.5.5", "@lezer/highlight": "^1.2.5", "@lezer/lr": "^1.4.10", "@ungap/custom-elements": "^1.3.0", @@ -213,7 +213,7 @@ "@codemirror/search": "^6.7.1", "@codemirror/state": "^6.7.6", "@codemirror/view": "^6.43.14", - "@lezer/common": "^1.5.4", + "@lezer/common": "^1.5.5", "@lezer/lr": "^1.4.10", "tar": "^7.5.22" }, diff --git a/src/cm/commandRegistry.js b/src/cm/commandRegistry.js index 5d53cb1747..16068769fe 100644 --- a/src/cm/commandRegistry.js +++ b/src/cm/commandRegistry.js @@ -1395,13 +1395,12 @@ function pasteCommand(view) { const resolvedView = resolveView(view); if (!resolvedView) return false; cordova.plugins.clipboard.paste((text = "") => { - const insertText = String(text); - resolvedView.dispatch( - resolvedView.state.changeByRange((range) => ({ - changes: { from: range.from, to: range.to, insert: insertText }, - range: EditorSelection.cursor(range.from + insertText.length), - })), - ); + // replaceSelection measures the inserted text after line-ending + // normalization, so CRLF clipboard text can't push the cursor past + // the end of the document. + resolvedView.dispatch(resolvedView.state.replaceSelection(String(text)), { + userEvent: "input.paste", + }); }); return true; } diff --git a/tests/unit/pasteCommand.test.js b/tests/unit/pasteCommand.test.js new file mode 100644 index 0000000000..34152cb127 --- /dev/null +++ b/tests/unit/pasteCommand.test.js @@ -0,0 +1,117 @@ +import * as cmState from "@codemirror/state"; +import { describe, expect, it } from "vitest"; +import { loadSourceModule } from "../helpers/loadSourceModule"; + +const { EditorSelection, EditorState } = cmState; + +const CRLF_TEXT = "print('a')\r\nprint('b')"; +const PASTED = "print('a')\nprint('b')"; + +// Load the real command registry with the clipboard stubbed to return `text`. +function loadRegistry(text) { + const dependencies = Object.fromEntries( + [ + "fileSystem", + "@codemirror/commands", + "@codemirror/language", + "@codemirror/lint", + "@codemirror/lsp-client", + "@codemirror/view", + "cm/editorReadOnly", + "cm/foldAwareLineCommands", + "cm/foldingCommands", + "cm/lsp", + "cm/lsp/references", + "components/symbolsPanel", + "components/toast", + "dialogs/prompt", + "handlers/quickTools", + "lib/settings", + "utils/Url", + ].map((id) => [id, {}]), + ); + return loadSourceModule( + "src/cm/commandRegistry.js", + { + ...dependencies, + "@codemirror/state": cmState, + "cm/keyBindingUtils": { toCodeMirrorKey: () => null }, + "lib/keyBindings": { + __esModule: true, + default: {}, + APP_KEY_BINDING_NAMES: new Set(), + CODEMIRROR_COMMAND_NAMES: new Set(), + }, + }, + { + editorManager: null, + cordova: { plugins: { clipboard: { paste: (done) => done(text) } } }, + }, + ); +} + +function createView(doc, selection) { + let state = EditorState.create({ + doc, + selection, + extensions: EditorState.allowMultipleSelections.of(true), + }); + return { + get state() { + return state; + }, + dispatch(...specs) { + state = state.update(...specs).state; + }, + }; +} + +function paste(view, text = CRLF_TEXT) { + const { executeCommand } = loadRegistry(text); + expect(executeCommand("paste", view)).toBe(true); + return view.state; +} + +describe("paste command with CRLF clipboard text", () => { + it("pastes into an empty document and leaves the cursor at the end", () => { + const state = paste(createView("")); + expect(state.doc.toString()).toBe(PASTED); + expect(state.selection.main.head).toBe(PASTED.length); + }); + + it("pastes at the end of a document", () => { + const doc = "x = 1\n"; + const state = paste(createView(doc, EditorSelection.cursor(doc.length))); + expect(state.doc.toString()).toBe(doc + PASTED); + expect(state.selection.main.head).toBe(state.doc.length); + }); + + it("pastes mid-document and places the cursor right after the text", () => { + const state = paste(createView("startend", EditorSelection.cursor(5))); + expect(state.doc.toString()).toBe(`start${PASTED}end`); + expect(state.selection.main.head).toBe(5 + PASTED.length); + }); + + it("replaces a selected range", () => { + const state = paste(createView("a[old]b", EditorSelection.range(1, 6))); + expect(state.doc.toString()).toBe(`a${PASTED}b`); + expect(state.selection.main.head).toBe(1 + PASTED.length); + }); + + it("pastes at every cursor of a multi-selection", () => { + const state = paste( + createView( + "ab", + EditorSelection.create([ + EditorSelection.cursor(1), + EditorSelection.cursor(2), + ]), + ), + ); + expect(state.doc.toString()).toBe(`a${PASTED}b${PASTED}`); + expect(state.selection.ranges.map((range) => range.head)).toEqual([ + 1 + PASTED.length, + state.doc.length, + ]); + }); +}); From 521d67c0c0ee573445b5ed5868c1b62aedceeb62 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sat, 7 Nov 2026 07:22:11 +0000 Subject: [PATCH 169/195] perf: keep the native Array.prototype.push on old WebViews (#3019) core-js forces its own Array.prototype.push below Chrome 122, because V8 there doesn't throw on push() with no arguments to an array whose length is read-only (V8 issue 12681). Nothing relies on that, but the replacement is plain JS and every push in the app goes through it: CodeMirror, the Lezer parser, the search workers. Swap core-js's global es.array.push module for an empty one at build time. core-js-pure (Babel's runtime helpers) is untouched, every other polyfill stays, and WebView 122+ already used the native push. On an Infinix X688C (2GB, Helio G35-class CPU, WebView 80), 1M pushes took 1032ms with the polyfill and 144ms without, and a full parse of a 4MB JS file in Acode went from ~25s to ~18s. --- rspack.config.js | 10 ++++++++++ utils/empty-module.js | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 utils/empty-module.js diff --git a/rspack.config.js b/rspack.config.js index c811c6b778..f24d34bf86 100644 --- a/rspack.config.js +++ b/rspack.config.js @@ -200,6 +200,16 @@ module.exports = (env, options) => { new rspack.CssExtractRspackPlugin({ filename: '[name].css', }), + // core-js replaces the native Array.prototype.push below Chrome 122, + // for edge cases (lengths past 2^32 - 1, push() with no arguments on an + // array with a read-only length) nothing relies on. Its JS version is + // ~8x slower, and the parser and CodeMirror push constantly, so keep the + // native one. Only core-js's global polyfill is dropped: core-js-pure, + // which Babel's runtime helpers import, is untouched. + new rspack.NormalModuleReplacementPlugin( + /[\\/]node_modules[\\/]core-js[\\/]modules[\\/]es\.array\.push\.js$/, + path.resolve(__dirname, 'utils/empty-module.js'), + ), ], }; diff --git a/utils/empty-module.js b/utils/empty-module.js new file mode 100644 index 0000000000..88b82ee156 --- /dev/null +++ b/utils/empty-module.js @@ -0,0 +1,2 @@ +// Stands in for modules the build drops (see NormalModuleReplacementPlugin in +// rspack.config.js). From c90c38a12c4b23e679df70b1843019cbafb8f7f5 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sat, 7 Nov 2026 14:44:15 +0530 Subject: [PATCH 170/195] chore(deps): bump @acode.app/canvas-view to 0.0.4 --- bun.lock | 4 ++-- package-lock.json | 18 +++++++++++++----- package.json | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/bun.lock b/bun.lock index cb6b0bac63..4ee2576bce 100644 --- a/bun.lock +++ b/bun.lock @@ -5,7 +5,7 @@ "": { "name": "com.foxdebug.acode", "dependencies": { - "@acode.app/canvas-view": "^0.0.3", + "@acode.app/canvas-view": "^0.0.4", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", @@ -160,7 +160,7 @@ "tar": "^7.5.22", }, "packages": { - "@acode.app/canvas-view": ["@acode.app/canvas-view@0.0.3", "", { "dependencies": { "@codemirror/language": "^6.13.1", "@codemirror/state": "^6.7.6", "@codemirror/view": "^6.43.14", "@lezer/common": "^1.5.4", "@lezer/highlight": "^1.2.5", "style-mod": "^4.1.2" } }, "sha512-OqiaTijJYsAyhYfUXmd8bZuWJvc6n2GiG5AO4LNsl1qSRYfTx0UgpVI9DUNeVooDCFempuVBuZiOIh4sdUb/Hg=="], + "@acode.app/canvas-view": ["@acode.app/canvas-view@0.0.4", "", { "dependencies": { "@codemirror/language": "^6.13.1", "@codemirror/state": "^6.7.6", "@codemirror/view": "^6.43.14", "@lezer/common": "^1.5.5", "@lezer/highlight": "^1.2.5", "style-mod": "^4.1.2" }, "peerDependencies": { "@codemirror/autocomplete": "^6.0.0" }, "optionalPeers": ["@codemirror/autocomplete"] }, "sha512-o88sexJ31AywiloTxu1RRqD1JLcfO7zcfKEHoDwUOSdsmHd9bptO7K6j8dov7XK6PdVaXk3IGwa1s0egRtz1yQ=="], "@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], diff --git a/package-lock.json b/package-lock.json index 0c6a05e142..bc1ce80a25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.13.5", "license": "MIT", "dependencies": { - "@acode.app/canvas-view": "^0.0.3", + "@acode.app/canvas-view": "^0.0.4", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", @@ -172,17 +172,25 @@ } }, "node_modules/@acode.app/canvas-view": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@acode.app/canvas-view/-/canvas-view-0.0.3.tgz", - "integrity": "sha512-OqiaTijJYsAyhYfUXmd8bZuWJvc6n2GiG5AO4LNsl1qSRYfTx0UgpVI9DUNeVooDCFempuVBuZiOIh4sdUb/Hg==", + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/@acode.app/canvas-view/-/canvas-view-0.0.4.tgz", + "integrity": "sha512-o88sexJ31AywiloTxu1RRqD1JLcfO7zcfKEHoDwUOSdsmHd9bptO7K6j8dov7XK6PdVaXk3IGwa1s0egRtz1yQ==", "license": "MIT", "dependencies": { "@codemirror/language": "^6.13.1", "@codemirror/state": "^6.7.6", "@codemirror/view": "^6.43.14", - "@lezer/common": "^1.5.4", + "@lezer/common": "^1.5.5", "@lezer/highlight": "^1.2.5", "style-mod": "^4.1.2" + }, + "peerDependencies": { + "@codemirror/autocomplete": "^6.0.0" + }, + "peerDependenciesMeta": { + "@codemirror/autocomplete": { + "optional": true + } } }, "node_modules/@babel/code-frame": { diff --git a/package.json b/package.json index e01f438448..e2b13d5f0f 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "ws": "^8.21.3" }, "dependencies": { - "@acode.app/canvas-view": "^0.0.3", + "@acode.app/canvas-view": "^0.0.4", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", From c8d102bae8d9d1d4f7d3745efdf7ecaf6fb2056f Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sat, 7 Nov 2026 14:44:15 +0530 Subject: [PATCH 171/195] feat(editor): canvas word completion from canvas-view's word index Canvas editors now complete words with canvas-view's completeWords, from an index that recounts only the changed lines, ranks words near the cursor first and returns at most 200 matches. The DOM editor keeps CodeMirror's completeAnyWord. completeAnyWord caches word lists per Text node only below 2000 distinct words, so in a big file it re-merges the upper nodes' lists on every query and returns every distinct word for autocomplete to filter. In a 4MB JS file on an Infinix X688C (2GB, WebView 80): 34.5-35.2ms per query (20,573 options) against 2.1ms (at most 200). wordIndex() is in the local word completion extension for every editor; it does nothing until a canvas editor asks for completions. --- src/cm/localWordCompletions.ts | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/cm/localWordCompletions.ts b/src/cm/localWordCompletions.ts index 4be1cc63e4..aac1cb177a 100644 --- a/src/cm/localWordCompletions.ts +++ b/src/cm/localWordCompletions.ts @@ -1,13 +1,32 @@ +import { completeWords, wordIndex } from "@acode.app/canvas-view"; import { type CompletionSource, completeAnyWord, } from "@codemirror/autocomplete"; import { EditorState, type Extension } from "@codemirror/state"; +import { isCanvasView } from "cm/createEditorView"; -export const localWordCompletionSource: CompletionSource = completeAnyWord; +/** + * Words from the document. Canvas editors answer from canvas-view's word + * index, which recounts only the changed lines, ranks words near the + * cursor first and returns at most 200 matches: CodeMirror's + * `completeAnyWord` re-merges a big file's word lists on every query (its + * per-node cache only holds nodes with under 2000 words) and returns every + * distinct word, ~35ms per query in a 4MB file on a 2GB phone against + * ~2ms. The DOM editor keeps CodeMirror's. + */ +export const localWordCompletionSource: CompletionSource = (context) => + isCanvasView(context.view) + ? completeWords(context) + : completeAnyWord(context); export default function localWordCompletions(): Extension { - return EditorState.languageData.of(() => [ - { autocomplete: localWordCompletionSource }, - ]); + return [ + EditorState.languageData.of(() => [ + { autocomplete: localWordCompletionSource }, + ]), + // Idle until a canvas editor asks for completions, so it costs + // nothing in DOM editors. + wordIndex(), + ]; } From dba9741f04a8e014093fbb50607fe0ff7cb8d90b Mon Sep 17 00:00:00 2001 From: Launch Lee <80872691+LaunchLee@users.noreply.github.com> Date: Mon, 9 Nov 2026 04:42:33 +0000 Subject: [PATCH 172/195] Update zh-cn.json and zh-hant.json (#3022) --- src/lang/zh-cn.json | 74 +++++++++++++++++----------------- src/lang/zh-hant.json | 92 +++++++++++++++++++++---------------------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index 601a44a967..06c28273a0 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -213,7 +213,7 @@ "app settings": "应用设置", "disable in-app-browser caching": "关闭内置浏览器缓存", "copied to clipboard": "复制到剪贴板", - "clipboard not available": "Clipboard is not available.", + "clipboard not available": "剪贴板不可用。", "remember opened files": "记住打开过的文件", "remember opened folders": "记住打开过的文件夹", "no suggestions": "不显示建议", @@ -385,11 +385,11 @@ "quicktools:exclamation": "插入感叹号", "quicktools:alt-key": "Alt 键", "quicktools:meta-key": "Windows/Meta 键", - "quicktools:search-prev": "Previous Match", - "quicktools:search-next": "Next Match", - "quicktools:search-settings": "Search Settings", - "quicktools:search-replace": "Replace", - "quicktools:search-replace-all": "Replace All", + "quicktools:search-prev": "上一个匹配项", + "quicktools:search-next": "下一个匹配项", + "quicktools:search-settings": "搜索设置", + "quicktools:search-replace": "替换", + "quicktools:search-replace-all": "全部替换", "info-quicktoolssettings": "个性化编辑器下边的快捷工具栏内的快捷键按钮和键盘按键以增强代码体验。", "info-excludefolders": "使用表达式 **/node_modules/** 以忽略所有 node_modules 文件夹下的文件。这将排除文件列表中列出的文件并阻止在这些文件中搜索。", "missed files": "自搜索开始后扫描了 {count} 个文件并将不会被包含在搜索中。", @@ -591,14 +591,14 @@ "lsp-startup-timeout-set": "启动超时已设置为 {timeout} ms", "lsp-state-disabled": "禁用", "lsp-state-enabled": "启用", - "lsp-status": "Status", + "lsp-status": "状态", "lsp-status-check-failed": "检查失败", "lsp-status-installed": "已安装", "lsp-status-installed-version": "已安装({version})", "lsp-status-line": "状态:{status}", "lsp-status-not-installed": "未安装", "lsp-status-unknown": "未知", - "lsp-timeout-ms": "{timeout} ms", + "lsp-timeout-ms": "{timeout} 毫秒", "lsp-uninstall-command-unavailable": "卸载命令不可用", "lsp-uninstall-notification": "点击卸载 {server}。", "lsp-uninstall-server": "卸载服务器", @@ -722,13 +722,13 @@ "unpin tab before closing": "关闭前请先取消固定该标签页。", "app font": "应用字体", "app icon": "应用图标", - "app icon changed": "App icon changed", - "app icon change warning": "The app will exit after the app icon is changed.", + "app icon changed": "应用图标已更改", + "app icon change warning": "更改应用图标后,应用将退出。", "settings-info-app-font-family": "选择在应用界面中使用的字体。", "settings-info-app-icon": "选择在设备上显示的应用图标。", "lsp-transport-method-stdio": "STDIO(启动可执行命令)", "lsp-transport-method-websocket": "WebSocket(连接到 ws/wss URL)", - "lsp-websocket-url": "WebSocket URL", + "lsp-websocket-url": "WebSocket 地址", "lsp-websocket-server-managed-externally": "该服务器通过 WebSocket 在外部管理。", "lsp-error-websocket-url-invalid": "WebSocket URL 必须以 ws:// 或 wss:// 开头", "lsp-error-websocket-url-required": "必须提供 WebSocket URL", @@ -801,7 +801,7 @@ "quicktools-trigger:touch": "触摸", "settings-info-terminal-uninstall": "确定要卸载终端?", "terminal:inactive outline": "方框", - "restored successfully": "终端重置成功", + "restored successfully": "终端恢复成功", "uninstalled successfully": "终端卸载成功", "enter plugin source": "输入插件源", "enter keywords": "输入关键字", @@ -884,32 +884,32 @@ "wrap-indent-same": "与首行对齐", "wrap-indent-indent": "缩进(+1 级)", "wrap-indent-deep": "深度缩进(+2 级)", - "settings-info-editor-wrapping-indent": "选择折行后的文本是从行首靠左对齐、保持原行的缩进,还是进一步向内缩进。每增加一级缩进将遵循您设定的制表符宽度。", + "settings-info-editor-wrapping-indent": "选择折行后的文本是靠左对齐、保持原行的缩进,还是进一步缩进。每增加一级缩进,宽度均为所设置的制表符宽度。", "icon pack": "图标包", "settings-info-icon-pack": "选择资源管理器及整个应用文件列表中文件和文件夹所使用的图标。", "unavailable": "不可用", - "editor renderer": "Renderer", - "editor renderer dom": "DOM (default)", - "editor renderer canvas": "Canvas (experimental)", - "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", - "canvas backend": "Canvas backend", - "canvas backend auto": "Auto (WebGL2)", - "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", - "sticky scroll": "Sticky scroll", - "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", - "sticky scroll max lines": "Sticky scroll lines", - "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", - "gutter markers": "Gutter markers", - "gutter markers shared": "One column", - "gutter markers columns": "Column per gutter", - "gutter markers overlay": "Over line numbers", - "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", - "cursor blink rate": "Cursor blink rate", - "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", - "clear all": "Clear all", - "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", - "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", - "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "editor renderer": "渲染器", + "editor renderer dom": "DOM(默认)", + "editor renderer canvas": "Canvas(实验性)", + "settings-info-editor-renderer": "Canvas 使用 GPU 绘制代码,使大文件中的滚动更流畅。此功能仍处于实验阶段,部分插件可能不兼容。重新加载后生效。", + "canvas backend": "Canvas 后端", + "canvas backend auto": "自动(WebGL2)", + "settings-info-canvas-backend": "Canvas 渲染器用于绘制的 GPU API。若 WebGPU 不可用,则回退至 WebGL2。重新加载后生效。", + "sticky scroll": "粘性滚动", + "settings-info-sticky-scroll": "滚动时,将当前顶部行所在函数、类和代码块的首行固定在编辑器顶部。", + "sticky scroll max lines": "粘性滚动行数", + "settings-info-sticky-scroll-max-lines": "粘性滚动固定在顶部的最大标题行数(1–10)。", + "gutter markers": "边栏标记", + "gutter markers shared": "共用一列", + "gutter markers columns": "每种边栏独占一列", + "gutter markers overlay": "覆盖行号", + "settings-info-gutter-markers": "设置语法检查等边栏标记的位置:共用一列、每种边栏独占一列,或覆盖在行号上以节省宽度。", + "cursor blink rate": "光标闪烁周期", + "settings-info-cursor-blink-rate": "光标闪烁一次所需的时间,单位为毫秒。设为 0 时,光标不闪烁。", + "settings-info-scroll-speed": "设置滑动手势或转动鼠标滚轮时编辑器的滚动距离。", + "clear all": "全部清除", + "error-permission-revoked": "Acode 已无法访问此位置。请重新打开文件夹以授予访问权限。", + "error-not-found": "此文件或文件夹已不存在,可能已被移动、重命名或删除。", + "error-no-space": "此设备的剩余存储空间不足。", + "error-network": "无法连接到服务器。请检查网络连接后重试。" } diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json index 9a56a6b35e..f528379853 100644 --- a/src/lang/zh-hant.json +++ b/src/lang/zh-hant.json @@ -213,7 +213,7 @@ "app settings": "應用設置", "disable in-app-browser caching": "關閉內置瀏覽器緩存", "copied to clipboard": "復製到剪貼板", - "clipboard not available": "Clipboard is not available.", + "clipboard not available": "剪貼簿無法使用。", "remember opened files": "記住打開過的文件", "remember opened folders": "記住打開過的文件夾", "no suggestions": "不顯示建議", @@ -385,11 +385,11 @@ "quicktools:exclamation": "插入感嘆號", "quicktools:alt-key": "Alt 鍵", "quicktools:meta-key": "Windows/Meta 鍵", - "quicktools:search-prev": "Previous Match", - "quicktools:search-next": "Next Match", - "quicktools:search-settings": "Search Settings", - "quicktools:search-replace": "Replace", - "quicktools:search-replace-all": "Replace All", + "quicktools:search-prev": "上一個符合項目", + "quicktools:search-next": "下一個符合項目", + "quicktools:search-settings": "搜尋設定", + "quicktools:search-replace": "替換", + "quicktools:search-replace-all": "全部替換", "info-quicktoolssettings": "個性化編輯器下邊的快捷工具欄內的快捷鍵按鈕和鍵盤按鍵以增強代碼體驗。", "info-excludefolders": "使用表達式 **/node_modules/** 以忽略所有 node_modules 文件夾下的文件。這將排除文件列表中列出的文件並阻止在這些文件中搜索。", "missed files": "自搜索開始後掃描了 {count} 個文件並將不會被包含在搜索中。", @@ -591,14 +591,14 @@ "lsp-startup-timeout-set": "啟動超時已設置為 {timeout} ms", "lsp-state-disabled": "禁用", "lsp-state-enabled": "啟用", - "lsp-status": "Status", + "lsp-status": "狀態", "lsp-status-check-failed": "檢查失敗", "lsp-status-installed": "已安裝", "lsp-status-installed-version": "已安裝({version})", "lsp-status-line": "狀態:{status}", "lsp-status-not-installed": "未安裝", "lsp-status-unknown": "未知", - "lsp-timeout-ms": "{timeout} ms", + "lsp-timeout-ms": "{timeout} 毫秒", "lsp-uninstall-command-unavailable": "卸載命令不可用", "lsp-uninstall-notification": "點擊卸載 {server}。", "lsp-uninstall-server": "卸載服務器", @@ -722,13 +722,13 @@ "unpin tab before closing": "關閉前請先取消固定該標籤頁。", "app font": "應用字體", "app icon": "應用程式圖示", - "app icon changed": "App icon changed", - "app icon change warning": "The app will exit after the app icon is changed.", + "app icon changed": "應用程式圖示已變更", + "app icon change warning": "變更應用程式圖示後,應用程式將結束。", "settings-info-app-font-family": "選擇在應用介面中使用的字體。", "settings-info-app-icon": "選擇在裝置上顯示的應用程式圖示。", "lsp-transport-method-stdio": "STDIO(啟動可執行命令)", "lsp-transport-method-websocket": "WebSocket(連線至 ws/wss URL)", - "lsp-websocket-url": "WebSocket URL", + "lsp-websocket-url": "WebSocket 位址", "lsp-websocket-server-managed-externally": "此伺服器透過 WebSocket 由外部管理。", "lsp-error-websocket-url-invalid": "WebSocket URL 必須以 ws:// 或 wss:// 開頭", "lsp-error-websocket-url-required": "必須提供 WebSocket URL", @@ -801,7 +801,7 @@ "quicktools-trigger:touch": "觸控", "settings-info-terminal-uninstall": "確定要卸載終端?", "terminal:inactive outline": "方框", - "restored successfully": "終端重置成功", + "restored successfully": "終端還原成功", "uninstalled successfully": "終端卸載成功", "enter plugin source": "輸入插件來源", "enter keywords": "輸入關鍵字", @@ -838,23 +838,23 @@ "command": "命令", "managed": "已託管", "acode service": "Acode 服務", - "info-terminal-show-scrollbar": "在終端旁邊顯示 xterm 滾動條。", - "terminal:show scrollbar": "顯示滾動條", + "info-terminal-show-scrollbar": "在終端旁邊顯示 xterm 捲動條。", + "terminal:show scrollbar": "顯示捲動條", "apply exclusions when copying": "複製時應用排除項", - "settings-info-app-use-file-operation-exclusions": "在複製和粘貼操作期間,跳過符合排除規則的文件和文件夾。", - "horizontal scroll margin": "水平滾動邊距", - "settings-info-horizontal-scroll-margin": "在關閉自動換行時,爲最長行的末尾添加空白區域。請輸入任意非負整數的像素值。", + "settings-info-app-use-file-operation-exclusions": "在複製和貼上操作期間,略過符合排除規則的檔案和資料夾。", + "horizontal scroll margin": "水平捲動邊距", + "settings-info-horizontal-scroll-margin": "關閉自動換行時,在最長行的末尾加入空白區域。請輸入以像素為單位的非負整數。", "confirm app icon reward": "觀看一則獎勵廣告以套用此應用程式圖示?", "rewarded ad unavailable": "獎勵廣告暫時無法使用,請再試一次。", "rewarded ad failed": "廣告未能完成,請再試一次。", "rewarded ad incomplete": "請完整觀看廣告以獲得獎勵。", - "plugin-review:dialog-label": "外掛評論", + "plugin-review:dialog-label": "插件評論", "plugin-review:account-check-failed": "無法檢查你的帳戶,請再試一次。", "plugin-review:sign-in": "登入以撰寫評論", "plugin-review:edit": "編輯你的評論", "plugin-review:add": "新增評論…", "plugin-review:placeholder": "分享你的使用體驗…", - "plugin-review:input-label": "外掛評論", + "plugin-review:input-label": "插件評論", "plugin-review:vote-group-label": "投票", "plugin-review:thumbs-up": "讚", "plugin-review:thumbs-down": "倒讚", @@ -875,7 +875,7 @@ "plugin-review:delete-failed": "無法刪除評論。", "plugin-review:you": "你", "plugin-review:edit-action": "編輯評論", - "plugin-review:recommended": "推薦了此外掛", + "plugin-review:recommended": "推薦了此插件", "plugin-review:error-max-length": "評論不得超過 {max} 個字元。", "plugin-review:error-downvote-comment": "告訴開發者哪些地方可以改進。", "plugin-review:error-empty": "新增留言或選擇「讚」。", @@ -884,32 +884,32 @@ "wrap-indent-same": "與首行對齊", "wrap-indent-indent": "縮排(+1 級)", "wrap-indent-deep": "深度縮排(+2 級)", - "settings-info-editor-wrapping-indent": "選擇換行後的文字是靠左對齊、保持原行的縮排,還是進一步向內縮排。每增加一級縮排將遵循您設定的製表符寬度。", + "settings-info-editor-wrapping-indent": "選擇換行後的文字是靠左對齊、保持原行的縮排,還是進一步縮排。每增加一級縮排,寬度均為所設定的定位字元寬度。", "icon pack": "圖標包", - "settings-info-icon-pack": "選擇檔案總管及整個應用程式檔案列表中檔案和文件夾所使用的圖標。", + "settings-info-icon-pack": "選擇檔案總管及整個應用程式檔案清單中,檔案和資料夾所使用的圖標。", "unavailable": "不可用", - "editor renderer": "Renderer", - "editor renderer dom": "DOM (default)", - "editor renderer canvas": "Canvas (experimental)", - "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", - "canvas backend": "Canvas backend", - "canvas backend auto": "Auto (WebGL2)", - "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", - "sticky scroll": "Sticky scroll", - "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", - "sticky scroll max lines": "Sticky scroll lines", - "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", - "gutter markers": "Gutter markers", - "gutter markers shared": "One column", - "gutter markers columns": "Column per gutter", - "gutter markers overlay": "Over line numbers", - "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", - "cursor blink rate": "Cursor blink rate", - "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", - "clear all": "Clear all", - "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", - "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", - "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "editor renderer": "渲染器", + "editor renderer dom": "DOM(預設)", + "editor renderer canvas": "Canvas(實驗性)", + "settings-info-editor-renderer": "Canvas 使用 GPU 繪製代碼,讓大型檔案中的捲動更流暢。此功能仍處於實驗階段,部分插件可能不相容。重新載入後生效。", + "canvas backend": "Canvas 後端", + "canvas backend auto": "自動(WebGL2)", + "settings-info-canvas-backend": "Canvas 渲染器用於繪製的 GPU API。若 WebGPU 無法使用,則改用 WebGL2。重新載入後生效。", + "sticky scroll": "黏性捲動", + "settings-info-sticky-scroll": "捲動時,將目前頂端行所在函式、類別和代碼區塊的首行固定在編輯器頂端。", + "sticky scroll max lines": "黏性捲動行數", + "settings-info-sticky-scroll-max-lines": "黏性捲動固定在頂端的標題行數上限(1–10)。", + "gutter markers": "側欄標記", + "gutter markers shared": "共用一欄", + "gutter markers columns": "每種側欄各佔一欄", + "gutter markers overlay": "覆蓋行號", + "settings-info-gutter-markers": "設定語法檢查等側欄標記的位置:共用一欄、每種側欄各佔一欄,或覆蓋在行號上以節省寬度。", + "cursor blink rate": "游標閃爍週期", + "settings-info-cursor-blink-rate": "游標閃爍一次所需的時間,單位為毫秒。設為 0 時,游標不閃爍。", + "settings-info-scroll-speed": "設定滑動手勢或轉動滑鼠滾輪時編輯器的捲動距離。", + "clear all": "全部清除", + "error-permission-revoked": "Acode 已無法存取此位置。請重新開啟資料夾以授予存取權限。", + "error-not-found": "此檔案或資料夾已不存在,可能已被移動、重新命名或刪除。", + "error-no-space": "此裝置的剩餘儲存空間不足。", + "error-network": "無法連線至伺服器。請檢查網路連線後重試。" } From 568286d5186ebf37334a86d24a93eb36c1f6daac Mon Sep 17 00:00:00 2001 From: Jamal Ali Date: Mon, 9 Nov 2026 04:56:14 +0000 Subject: [PATCH 173/195] chore(lang): translate remaining Azerbaijani UI strings (#3012) --- src/lang/az-az.json | 48 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/lang/az-az.json b/src/lang/az-az.json index 34684ea4a2..25e233f0ec 100644 --- a/src/lang/az-az.json +++ b/src/lang/az-az.json @@ -888,28 +888,28 @@ "plugin-review:error-downvote-comment": "Nəyin yaxşılaşdırıla biləcəyini tərtibatçıya bildir.", "plugin-review:error-empty": "Şərh əlavə et və ya «Bəyən» seçimini et.", "plugin-review:unrated": "Qiymətləndirilməyib", - "editor renderer": "Renderer", - "editor renderer dom": "DOM (default)", - "editor renderer canvas": "Canvas (experimental)", - "settings-info-editor-renderer": "Canvas draws code with the GPU for smoother scrolling in large files. It is experimental: some plugins may not work with it. Applies after a reload.", - "canvas backend": "Canvas backend", - "canvas backend auto": "Auto (WebGL2)", - "settings-info-canvas-backend": "The GPU API the canvas renderer draws with. WebGPU falls back to WebGL2 where it isn't available. Applies after a reload.", - "sticky scroll": "Sticky scroll", - "settings-info-sticky-scroll": "Keep the first lines of the functions, classes and blocks around the top line pinned while scrolling.", - "sticky scroll max lines": "Sticky scroll lines", - "settings-info-sticky-scroll-max-lines": "The most header lines sticky scroll keeps pinned at the top (1–10).", - "gutter markers": "Gutter markers", - "gutter markers shared": "One column", - "gutter markers columns": "Column per gutter", - "gutter markers overlay": "Over line numbers", - "settings-info-gutter-markers": "Where lint and other gutter markers go: one shared column, a column for each gutter, or over the line numbers to save width.", - "cursor blink rate": "Cursor blink rate", - "settings-info-cursor-blink-rate": "How long one cursor blink takes, in milliseconds. 0 keeps the cursor steady.", - "settings-info-scroll-speed": "How far a fling or a mouse wheel turn scrolls the editor.", - "clear all": "Clear all", - "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", - "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", - "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "editor renderer": "Göstərmə üsulu", + "editor renderer dom": "DOM (standart)", + "editor renderer canvas": "Canvas (sınaq mərhələsində)", + "settings-info-editor-renderer": "Canvas böyük fayllarda daha axıcı sürüşdürmə üçün kodu GPU ilə göstərir. Bu funksiya sınaq mərhələsindədir: bəzi qoşmalar onunla işləməyə bilər. Yenidən yüklədikdən sonra tətbiq olunur.", + "canvas backend": "Canvas qrafik interfeysi", + "canvas backend auto": "Avtomatik (WebGL2)", + "settings-info-canvas-backend": "Canvas ilə kodun göstərilməsi üçün istifadə olunan GPU interfeysi. WebGPU əlçatan olmadıqda WebGL2 istifadə olunur. Yenidən yüklədikdən sonra tətbiq olunur.", + "sticky scroll": "Sabit başlıq sətirləri", + "settings-info-sticky-scroll": "Sürüşdürərkən yuxarıda görünən sətri əhatə edən funksiyaların, siniflərin və blokların ilk sətirlərini yuxarıda bərkit.", + "sticky scroll max lines": "Sabit başlıq sətirlərinin sayı", + "settings-info-sticky-scroll-max-lines": "Yuxarıda bərkidilən başlıq sətirlərinin ən çox sayını təyin et (1–10).", + "gutter markers": "Kənar zolaq nişanları", + "gutter markers shared": "Bir ortaq sütun", + "gutter markers columns": "Hər zolaq üçün ayrı sütun", + "gutter markers overlay": "Sətir nömrələrinin üzərində", + "settings-info-gutter-markers": "Kod yoxlaması və digər kənar zolaq nişanlarının harada görünəcəyini seç: bir ortaq sütunda, hər zolaq üçün ayrı sütunda və ya enə qənaət etmək üçün sətir nömrələrinin üzərində.", + "cursor blink rate": "Kursorun yanıb-sönmə müddəti", + "settings-info-cursor-blink-rate": "Kursorun bir dəfə yanıb-sönməsi üçün lazım olan müddət, millisaniyə ilə. 0 dəyəri kursoru sabit saxlayır.", + "settings-info-scroll-speed": "Sürətli sürüşdürmə jestinin və ya siçan çarxının bir dövrəsinin redaktoru nə qədər sürüşdürdüyünü təyin et.", + "clear all": "Hamısını təmizlə", + "error-permission-revoked": "Acode artıq bu məkana daxil ola bilmir. Giriş icazəsi vermək üçün qovluğu yenidən aç.", + "error-not-found": "Bu fayl və ya qovluq artıq mövcud deyil. Yeri dəyişdirilmiş, adı dəyişdirilmiş və ya silinmiş ola bilər.", + "error-no-space": "Bu cihazda kifayət qədər boş yaddaş sahəsi qalmayıb.", + "error-network": "Serverlə əlaqə qurmaq mümkün olmadı. Əlaqəni yoxla və yenidən cəhd et." } From 84995d75692aedda68750cdf82998d845c1fe1e3 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Mon, 9 Nov 2026 16:19:57 +0000 Subject: [PATCH 174/195] fix(styles): guard color-mix() with @supports for old WebViews (#3025) --- postcss.config.js | 11 +++-- utils/postcss/colorMixSupports.js | 81 +++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 utils/postcss/colorMixSupports.js diff --git a/postcss.config.js b/postcss.config.js index c7db4e57f8..b0df55d3ad 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,5 +1,6 @@ -module.exports = { - plugins: [ - require('autoprefixer')({}) - ] -}; \ No newline at end of file +module.exports = { + plugins: [ + require('./utils/postcss/colorMixSupports'), + require('autoprefixer')({}) + ] +}; diff --git a/utils/postcss/colorMixSupports.js b/utils/postcss/colorMixSupports.js new file mode 100644 index 0000000000..60ac22144c --- /dev/null +++ b/utils/postcss/colorMixSupports.js @@ -0,0 +1,81 @@ +/** + * Moves every declaration that uses `color-mix()` into an + * `@supports (color: color-mix(...))` block placed right after its rule. + * + * Why: a declaration containing `var()` is always accepted at parse time, so + * on WebViews without `color-mix()` it becomes "invalid at computed-value + * time" and resets to `unset` (usually transparent) instead of falling back to + * the plain declaration written before it. Guarding it with `@supports` lets + * old WebViews keep the fallback while newer ones still get the mixed color. + */ +const SUPPORTS = "(color: color-mix(in srgb, red 50%, transparent))"; +const HAS_COLOR_MIX = /color-mix\(/i; + +const isColorMix = (node) => + node.type === "decl" && + !node.prop.startsWith("--") && + HAS_COLOR_MIX.test(node.value); + +const isKeyframes = (node) => + node?.type === "atrule" && /keyframes$/i.test(node.name); + +const isInsideSupportsGuard = (node) => { + for (let p = node.parent; p; p = p.parent) { + if (p.type === "atrule" && p.name === "supports" && p.params === SUPPORTS) + return true; + } + return false; +}; + +/** @type {import('postcss').PluginCreator} */ +module.exports = () => ({ + postcssPlugin: "color-mix-supports", + OnceExit(root, { AtRule }) { + const keyframes = new Set(); + const rules = []; + + root.walkRules((rule) => { + if (isInsideSupportsGuard(rule)) return; + if (!rule.nodes?.some(isColorMix)) return; + if (isKeyframes(rule.parent)) keyframes.add(rule.parent); + else rules.push(rule); + }); + + for (const rule of rules) { + const guarded = rule.clone({ nodes: [] }); + const decls = rule.nodes.filter(isColorMix); + for (const decl of decls) { + // A later declaration of the same property must keep winning. + if (hasLaterProp(decl, decl.prop)) continue; + guarded.append(decl.clone()); + decl.remove(); + } + if (!guarded.nodes.length) continue; + const supports = new AtRule({ name: "supports", params: SUPPORTS }); + supports.append(guarded); + rule.after(supports); + if (!rule.nodes.length) rule.remove(); + } + + // @supports can't go inside @keyframes, so the whole block is duplicated: + // the original keeps the fallbacks, the guarded copy (later, so it wins) + // keeps everything. + for (const atRule of keyframes) { + const supports = new AtRule({ name: "supports", params: SUPPORTS }); + supports.append(atRule.clone()); + atRule.walkDecls((decl) => { + if (isColorMix(decl)) decl.remove(); + }); + atRule.after(supports); + } + }, +}); + +function hasLaterProp(decl, prop) { + for (let n = decl.next(); n; n = n.next()) { + if (n.type === "decl" && n.prop === prop) return true; + } + return false; +} + +module.exports.postcss = true; From 59fadfc72c6023e7707f7e32660b02b804ac24cc Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Mon, 9 Nov 2026 21:52:35 +0530 Subject: [PATCH 175/195] chore(deps): bump @acode.app/canvas-view to 0.0.5 --- bun.lock | 4 ++-- package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bun.lock b/bun.lock index 4ee2576bce..3e526710d4 100644 --- a/bun.lock +++ b/bun.lock @@ -5,7 +5,7 @@ "": { "name": "com.foxdebug.acode", "dependencies": { - "@acode.app/canvas-view": "^0.0.4", + "@acode.app/canvas-view": "^0.0.5", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", @@ -160,7 +160,7 @@ "tar": "^7.5.22", }, "packages": { - "@acode.app/canvas-view": ["@acode.app/canvas-view@0.0.4", "", { "dependencies": { "@codemirror/language": "^6.13.1", "@codemirror/state": "^6.7.6", "@codemirror/view": "^6.43.14", "@lezer/common": "^1.5.5", "@lezer/highlight": "^1.2.5", "style-mod": "^4.1.2" }, "peerDependencies": { "@codemirror/autocomplete": "^6.0.0" }, "optionalPeers": ["@codemirror/autocomplete"] }, "sha512-o88sexJ31AywiloTxu1RRqD1JLcfO7zcfKEHoDwUOSdsmHd9bptO7K6j8dov7XK6PdVaXk3IGwa1s0egRtz1yQ=="], + "@acode.app/canvas-view": ["@acode.app/canvas-view@0.0.5", "", { "dependencies": { "@codemirror/language": "^6.13.1", "@codemirror/state": "^6.7.6", "@codemirror/view": "^6.43.14", "@lezer/common": "^1.5.5", "@lezer/highlight": "^1.2.5", "style-mod": "^4.1.2" }, "peerDependencies": { "@codemirror/autocomplete": "^6.0.0" }, "optionalPeers": ["@codemirror/autocomplete"] }, "sha512-cvrwvSH65clHN2XZpBQxy1NXYHhNf3u/sQTIwPR8SnFYzcmwYdh4vxZVQ3wqIxZr3u5yRWns4t9bs2T77aQDbw=="], "@babel/code-frame": ["@babel/code-frame@8.0.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^8.0.0", "js-tokens": "^10.0.0" } }, "sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw=="], diff --git a/package-lock.json b/package-lock.json index bc1ce80a25..e27f1cc97e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.13.5", "license": "MIT", "dependencies": { - "@acode.app/canvas-view": "^0.0.4", + "@acode.app/canvas-view": "^0.0.5", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", @@ -172,9 +172,9 @@ } }, "node_modules/@acode.app/canvas-view": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/@acode.app/canvas-view/-/canvas-view-0.0.4.tgz", - "integrity": "sha512-o88sexJ31AywiloTxu1RRqD1JLcfO7zcfKEHoDwUOSdsmHd9bptO7K6j8dov7XK6PdVaXk3IGwa1s0egRtz1yQ==", + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/@acode.app/canvas-view/-/canvas-view-0.0.5.tgz", + "integrity": "sha512-cvrwvSH65clHN2XZpBQxy1NXYHhNf3u/sQTIwPR8SnFYzcmwYdh4vxZVQ3wqIxZr3u5yRWns4t9bs2T77aQDbw==", "license": "MIT", "dependencies": { "@codemirror/language": "^6.13.1", diff --git a/package.json b/package.json index e2b13d5f0f..38ee0903ed 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "ws": "^8.21.3" }, "dependencies": { - "@acode.app/canvas-view": "^0.0.4", + "@acode.app/canvas-view": "^0.0.5", "@codemirror/autocomplete": "^6.20.3", "@codemirror/commands": "^6.11.0", "@codemirror/lang-angular": "^0.1.4", From 4e21bbe2e754e8f5991a15730776dfc37d69a5d1 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Wed, 11 Nov 2026 14:55:13 +0000 Subject: [PATCH 176/195] fix(search): expand regex capture groups in native replace (#3033) * fix(search): expand regex capture groups in native replace Replacements on file:// and SAF files escaped the replacement string, so $1, $& and $ were inserted literally. In regex mode, apply JS String.replace substitution rules so both search paths behave the same. Fixes #3026 * fix(search): ignore character classes when detecting named groups --- .../sdcard/src/android/WorkspaceIndex.java | 136 +++++++++++++++++- 1 file changed, 134 insertions(+), 2 deletions(-) diff --git a/src/plugins/sdcard/src/android/WorkspaceIndex.java b/src/plugins/sdcard/src/android/WorkspaceIndex.java index f3c6a56e5c..8215bee157 100644 --- a/src/plugins/sdcard/src/android/WorkspaceIndex.java +++ b/src/plugins/sdcard/src/android/WorkspaceIndex.java @@ -1009,8 +1009,11 @@ private void runSearch(Job job, JSONObject options, CallbackContext callback) } if ("replace".equals(mode)) { - String replacement = Matcher.quoteReplacement(replace == null ? "" : replace); - String text = pattern.matcher(new SearchInput(content, job)).replaceAll(replacement); + String replacement = replace == null ? "" : replace; + Matcher matcher = pattern.matcher(new SearchInput(content, job)); + String text = searchOptions.optBoolean("regExp", false) + ? replaceAllJs(matcher, content, replacement) + : matcher.replaceAll(Matcher.quoteReplacement(replacement)); JSONObject result = baseEvent(job.id, "replace-result"); result.put("file", file); result.put("text", text); @@ -1026,6 +1029,135 @@ private void runSearch(Job job, JSONObject options, CallbackContext callback) send(callback, baseEvent(job.id, "replace".equals(mode) ? "done-replacing" : "done-searching"), false); } + /** + * Replaces every match using JavaScript String.prototype.replace substitution + * rules ($$, $&, $`, $', $1..$99, $), so regex replacements behave the + * same as the JS worker path. + */ + static String replaceAllJs(Matcher matcher, String content, String replace) { + StringBuilder out = new StringBuilder(content.length()); + boolean namedGroups = hasNamedGroups(matcher.pattern().pattern()); + int last = 0; + while (matcher.find()) { + out.append(content, last, matcher.start()); + appendJsSubstitution(out, matcher, content, replace, namedGroups); + last = matcher.end(); + } + out.append(content, last, content.length()); + return out.toString(); + } + + /** + * Whether the pattern declares a named capture group, ignoring escaped text, + * \Q...\E quotes and character classes. + */ + static boolean hasNamedGroups(String pattern) { + int len = pattern.length(); + int classDepth = 0; + for (int i = 0; i < len; i++) { + char c = pattern.charAt(i); + if (c == '\\') { + if (i + 1 < len && pattern.charAt(i + 1) == 'Q') { + int end = pattern.indexOf("\\E", i + 2); + if (end == -1) return false; + i = end + 1; + } else { + i++; + } + } else if (classDepth > 0) { + if (c == '[') classDepth++; + else if (c == ']') classDepth--; + } else if (c == '[') { + classDepth = 1; + if (i + 1 < len && pattern.charAt(i + 1) == '^') i++; + if (i + 1 < len && pattern.charAt(i + 1) == ']') i++; + } else if ( + c == '(' && + i + 3 < len && + pattern.charAt(i + 1) == '?' && + pattern.charAt(i + 2) == '<' && + Character.isLetter(pattern.charAt(i + 3)) + ) { + return true; + } + } + return false; + } + + private static void appendJsSubstitution( + StringBuilder out, + Matcher matcher, + String content, + String replace, + boolean namedGroups + ) { + int groups = matcher.groupCount(); + int len = replace.length(); + for (int i = 0; i < len; i++) { + char c = replace.charAt(i); + if (c != '$' || i + 1 >= len) { + out.append(c); + continue; + } + + char next = replace.charAt(i + 1); + if (next == '$') { + out.append('$'); + i++; + } else if (next == '&') { + out.append(content, matcher.start(), matcher.end()); + i++; + } else if (next == '`') { + out.append(content, 0, matcher.start()); + i++; + } else if (next == '\'') { + out.append(content, matcher.end(), content.length()); + i++; + } else if (next >= '0' && next <= '9') { + int index = next - '0'; + int consumed = 1; + if (i + 2 < len) { + char digit = replace.charAt(i + 2); + if (digit >= '0' && digit <= '9') { + int twoDigit = index * 10 + (digit - '0'); + if (twoDigit >= 1 && twoDigit <= groups) { + index = twoDigit; + consumed = 2; + } + } + } + if (index >= 1 && index <= groups) { + String group = matcher.group(index); + if (group != null) out.append(group); + i += consumed; + } else { + out.append(c); + } + } else if (next == '<') { + int close = replace.indexOf('>', i + 2); + boolean found = false; + String group = null; + if (close != -1) { + try { + group = matcher.group(replace.substring(i + 2, close)); + found = true; + } catch (IllegalArgumentException ignored) { + // JS: an unknown name is empty when the pattern has named groups. + found = namedGroups; + } + } + if (found) { + if (group != null) out.append(group); + i = close; + } else { + out.append(c); + } + } else { + out.append(c); + } + } + } + private Pattern compileSearchPattern(String search, JSONObject options) throws PatternSyntaxException { boolean regExp = options.optBoolean("regExp", false); From 27454184a150d716bbe3e3057b344ca2d7cfd776 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Wed, 11 Nov 2026 16:28:54 +0000 Subject: [PATCH 177/195] perf(tabs): speed up closing and saving many tabs (#3035) * perf(tabs): speed up closing and saving many tabs - Close background tabs before active ones so no tab is activated only to be closed, and sync the tab list and session state once per batch. - Save all: save files with a location four at a time with a progress dialog, then retry the rest one by one with the usual prompts; files that fail stay open instead of aborting the whole operation. - Check the file mtime before reading it back for conflict detection. - Keep a save timer per file so concurrent saves all finish, and coalesce the session update. - Only run format-on-save when the saved file is the active one. Fixes #3030, fixes #3031, fixes #3032 * test(save): cover batched save-all and keep reporting save errors * fix(save): keep remote saves sequential and restore content conflict check - Only save local (file:) and SAF (content:) files in parallel; remote providers such as SFTP share a connection and now save one by one. - Restore the content comparison before overwriting so an external edit that keeps the mtime still triggers the conflict prompt. - Show how many files were saved, or could not be saved, once save all finishes. --- src/lang/ar-ye.json | 4 +- src/lang/az-az.json | 4 +- src/lang/be-by.json | 4 +- src/lang/bn-bd.json | 4 +- src/lang/cs-cz.json | 4 +- src/lang/de-de.json | 4 +- src/lang/en-us.json | 4 +- src/lang/es-sv.json | 4 +- src/lang/fr-fr.json | 4 +- src/lang/he-il.json | 4 +- src/lang/hi-in.json | 4 +- src/lang/hu-hu.json | 4 +- src/lang/id-id.json | 4 +- src/lang/index.d.ts | 2 + src/lang/ir-fa.json | 4 +- src/lang/it-it.json | 4 +- src/lang/ja-jp.json | 4 +- src/lang/ko-kr.json | 4 +- src/lang/ln-ln.json | 4 +- src/lang/ml-in.json | 4 +- src/lang/mm-unicode.json | 4 +- src/lang/mm-zawgyi.json | 4 +- src/lang/pl-pl.json | 4 +- src/lang/pt-br.json | 4 +- src/lang/pu-in.json | 4 +- src/lang/ru-ru.json | 4 +- src/lang/tl-ph.json | 4 +- src/lang/tr-tr.json | 4 +- src/lang/uk-ua.json | 4 +- src/lang/uz-uz.json | 4 +- src/lang/vi-vn.json | 4 +- src/lang/zh-cn.json | 4 +- src/lang/zh-hant.json | 4 +- src/lang/zh-tw.json | 4 +- src/lib/commands.js | 146 ++++++++++++++++++++++++++------ src/lib/editorManager.js | 26 +++++- src/lib/saveFile.js | 34 +++++--- src/lib/saveState.js | 32 ++++++- tests/unit/saveCommands.test.js | 110 ++++++++++++++++++++---- 39 files changed, 393 insertions(+), 89 deletions(-) diff --git a/src/lang/ar-ye.json b/src/lang/ar-ye.json index dab83007a9..4596167da3 100644 --- a/src/lang/ar-ye.json +++ b/src/lang/ar-ye.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/az-az.json b/src/lang/az-az.json index 25e233f0ec..01fe0207c5 100644 --- a/src/lang/az-az.json +++ b/src/lang/az-az.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode artıq bu məkana daxil ola bilmir. Giriş icazəsi vermək üçün qovluğu yenidən aç.", "error-not-found": "Bu fayl və ya qovluq artıq mövcud deyil. Yeri dəyişdirilmiş, adı dəyişdirilmiş və ya silinmiş ola bilər.", "error-no-space": "Bu cihazda kifayət qədər boş yaddaş sahəsi qalmayıb.", - "error-network": "Serverlə əlaqə qurmaq mümkün olmadı. Əlaqəni yoxla və yenidən cəhd et." + "error-network": "Serverlə əlaqə qurmaq mümkün olmadı. Əlaqəni yoxla və yenidən cəhd et.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/be-by.json b/src/lang/be-by.json index 4c8fb32605..cf32ddf997 100644 --- a/src/lang/be-by.json +++ b/src/lang/be-by.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/bn-bd.json b/src/lang/bn-bd.json index 2b22d21e01..fb414f10a5 100644 --- a/src/lang/bn-bd.json +++ b/src/lang/bn-bd.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/cs-cz.json b/src/lang/cs-cz.json index ceb3eb6734..863c5b3dbe 100644 --- a/src/lang/cs-cz.json +++ b/src/lang/cs-cz.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/de-de.json b/src/lang/de-de.json index 3bd3950124..b56e1ec6c0 100644 --- a/src/lang/de-de.json +++ b/src/lang/de-de.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/en-us.json b/src/lang/en-us.json index e6c7ea1454..3238f63217 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/es-sv.json b/src/lang/es-sv.json index 7953fd3fe4..5225db9254 100644 --- a/src/lang/es-sv.json +++ b/src/lang/es-sv.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/fr-fr.json b/src/lang/fr-fr.json index a10925f4dc..7a86b01e80 100644 --- a/src/lang/fr-fr.json +++ b/src/lang/fr-fr.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/he-il.json b/src/lang/he-il.json index 958174afd6..8896dfb34f 100644 --- a/src/lang/he-il.json +++ b/src/lang/he-il.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/hi-in.json b/src/lang/hi-in.json index 46b4e6a5c2..9be4b9356c 100644 --- a/src/lang/hi-in.json +++ b/src/lang/hi-in.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index 09759df108..894a33a148 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/id-id.json b/src/lang/id-id.json index 8a1c53fe69..1bd0bc82f1 100644 --- a/src/lang/id-id.json +++ b/src/lang/id-id.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/index.d.ts b/src/lang/index.d.ts index 2b132910b8..13130f14a4 100644 --- a/src/lang/index.d.ts +++ b/src/lang/index.d.ts @@ -915,6 +915,8 @@ declare type LangStrings = { "error-not-found": string; "error-no-space": string; "error-network": string; + "files saved count": string; + "files not saved count": string; }; declare var strings: LangStrings; diff --git a/src/lang/ir-fa.json b/src/lang/ir-fa.json index 722ab541de..b45b7a84c6 100644 --- a/src/lang/ir-fa.json +++ b/src/lang/ir-fa.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/it-it.json b/src/lang/it-it.json index 6341a3f38d..d9cfafd2af 100644 --- a/src/lang/it-it.json +++ b/src/lang/it-it.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/ja-jp.json b/src/lang/ja-jp.json index 3763e83c89..ca628d5628 100644 --- a/src/lang/ja-jp.json +++ b/src/lang/ja-jp.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/ko-kr.json b/src/lang/ko-kr.json index 934a9b95fc..40d87180f2 100644 --- a/src/lang/ko-kr.json +++ b/src/lang/ko-kr.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/ln-ln.json b/src/lang/ln-ln.json index 374277037d..8ee84d57e7 100644 --- a/src/lang/ln-ln.json +++ b/src/lang/ln-ln.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/ml-in.json b/src/lang/ml-in.json index ee43c0510d..031631306f 100644 --- a/src/lang/ml-in.json +++ b/src/lang/ml-in.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/mm-unicode.json b/src/lang/mm-unicode.json index c6342176b4..5cffc0d158 100644 --- a/src/lang/mm-unicode.json +++ b/src/lang/mm-unicode.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/mm-zawgyi.json b/src/lang/mm-zawgyi.json index 7ee8820968..41108562df 100644 --- a/src/lang/mm-zawgyi.json +++ b/src/lang/mm-zawgyi.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/pl-pl.json b/src/lang/pl-pl.json index 86a57c9712..5f10f2866d 100644 --- a/src/lang/pl-pl.json +++ b/src/lang/pl-pl.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/pt-br.json b/src/lang/pt-br.json index 7222b25d81..a7625de48f 100644 --- a/src/lang/pt-br.json +++ b/src/lang/pt-br.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/pu-in.json b/src/lang/pu-in.json index a11d4bfb76..02592449a5 100644 --- a/src/lang/pu-in.json +++ b/src/lang/pu-in.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/ru-ru.json b/src/lang/ru-ru.json index e0ea1d7573..c5669b134c 100644 --- a/src/lang/ru-ru.json +++ b/src/lang/ru-ru.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/tl-ph.json b/src/lang/tl-ph.json index f33e9fa701..b898659b07 100644 --- a/src/lang/tl-ph.json +++ b/src/lang/tl-ph.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/tr-tr.json b/src/lang/tr-tr.json index d3b0f988f1..c7a2e03b6e 100644 --- a/src/lang/tr-tr.json +++ b/src/lang/tr-tr.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/uk-ua.json b/src/lang/uk-ua.json index bbace5af76..a587bdb343 100644 --- a/src/lang/uk-ua.json +++ b/src/lang/uk-ua.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/uz-uz.json b/src/lang/uz-uz.json index 2fb439532a..83bafe77bd 100644 --- a/src/lang/uz-uz.json +++ b/src/lang/uz-uz.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/vi-vn.json b/src/lang/vi-vn.json index b6409ab682..a9301a242c 100644 --- a/src/lang/vi-vn.json +++ b/src/lang/vi-vn.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index 06c28273a0..689fbd809b 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode 已无法访问此位置。请重新打开文件夹以授予访问权限。", "error-not-found": "此文件或文件夹已不存在,可能已被移动、重命名或删除。", "error-no-space": "此设备的剩余存储空间不足。", - "error-network": "无法连接到服务器。请检查网络连接后重试。" + "error-network": "无法连接到服务器。请检查网络连接后重试。", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json index f528379853..de8d89e79f 100644 --- a/src/lang/zh-hant.json +++ b/src/lang/zh-hant.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode 已無法存取此位置。請重新開啟資料夾以授予存取權限。", "error-not-found": "此檔案或資料夾已不存在,可能已被移動、重新命名或刪除。", "error-no-space": "此裝置的剩餘儲存空間不足。", - "error-network": "無法連線至伺服器。請檢查網路連線後重試。" + "error-network": "無法連線至伺服器。請檢查網路連線後重試。", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index 5d11488464..4ff63c8129 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -911,5 +911,7 @@ "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again." + "error-network": "Couldn't reach the server. Check your connection and try again.", + "files saved count": "Files saved: {count}", + "files not saved count": "Files not saved: {count}" } diff --git a/src/lib/commands.js b/src/lib/commands.js index d6dfb45a8d..940d226183 100644 --- a/src/lib/commands.js +++ b/src/lib/commands.js @@ -3,6 +3,7 @@ import { selectAll } from "@codemirror/commands"; import { focusEditorIfEditable } from "cm/editorReadOnly"; import Sidebar from "components/sidebar"; import confirm from "dialogs/confirm"; +import loader from "dialogs/loader"; import prompt from "dialogs/prompt"; import select from "dialogs/select"; import actions from "handlers/quickTools"; @@ -12,12 +13,12 @@ import helpers from "utils/helpers"; import Url from "utils/Url"; import checkFiles from "./checkFiles"; import config from "./config"; -import EditorFile from "./editorFile"; +import EditorFile, { AUTO_SAVE } from "./editorFile"; import { loadFileBrowser } from "./lazyImports"; import openFile from "./openFile"; import openFolder from "./openFolder"; import run from "./run"; -import saveState from "./saveState"; +import saveState, { deferSaveState } from "./saveState"; import appSettings from "./settings"; import showFileInfo from "./showFileInfo"; @@ -139,22 +140,125 @@ async function closeTabs(files, options = {}) { } } - let complete = true; - for (const file of [...closableFiles]) { - if (save && file.isUnsaved) { - if (!canSaveFile(file)) { - complete = false; - continue; - } - const saved = await file.save(); - if (saved === false || file.hasUnsavedChanges?.() || file.isUnsaved) - return false; + // Files that could not be saved stay open so no changes are lost. + const failed = save ? await saveFiles(closableFiles) : new Set(); + await removeFiles(closableFiles.filter((file) => !failed.has(file))); + return !failed.size; +} + +const SAVE_CONCURRENCY = 4; + +/** + * Local and SAF files are independent, so they can be written in parallel. + * Remote providers (e.g. SFTP) share a connection and must save one by one. + * @param {string} uri + */ +function canSaveInParallel(uri) { + return /^(file|content):/.test(uri); +} + +/** + * Saves every unsaved file in `files`, showing progress while doing so. + * Files with a location are first saved without prompting (local files a few + * at a time, remote files one by one); anything that needs input (new files, + * conflicts, errors) is then saved one at a time with the usual dialogs. + * @param {EditorFile[]} files + * @returns {Promise>} Files that are still unsaved. + */ +async function saveFiles(files) { + const failed = new Set(); + const pending = files.filter((file) => file.isUnsaved); + const parallel = []; + const serial = []; + const interactive = []; + for (const file of pending) { + if (!canSaveFile(file)) failed.add(file); + else if (!file.uri) interactive.push(file); + else if (canSaveInParallel(file.uri)) parallel.push(file); + else serial.push(file); + } + + const total = parallel.length + serial.length; + let done = 0; + const progress = + total > 1 ? loader.create(strings.saving, `0 / ${total}`) : null; + const drain = async (queue) => { + while (queue.length) { + const file = queue.shift(); + if (!(await trySave(file, AUTO_SAVE))) interactive.push(file); + progress?.setMessage(`${++done} / ${total}`); } + }; + try { + await Promise.all( + Array.from({ length: Math.min(SAVE_CONCURRENCY, parallel.length) }, () => + drain(parallel), + ), + ); + await drain(serial); + } finally { + progress?.destroy(); + } - await file.remove(true, { silentPinned: true }); + for (const file of interactive) { + if (!(await trySave(file))) failed.add(file); } - return complete; + if (pending.length > 1) { + const message = failed.size + ? strings["files not saved count"] || "Files not saved: {count}" + : strings["files saved count"] || "Files saved: {count}"; + toast( + message.replace( + "{count}", + String(failed.size || pending.length - failed.size), + ), + ); + } + return failed; +} + +/** + * @param {EditorFile} file + * @param {symbol} [origin] + * @returns {Promise} Whether the file has no unsaved changes left. + */ +async function trySave(file, origin) { + try { + const saved = await file.save(origin); + return saved !== false && !file.hasUnsavedChanges?.() && !file.isUnsaved; + } catch (error) { + helpers.error(error); + return false; + } +} + +/** + * Closes `files` without prompting. Background tabs are closed before the + * active ones so no tab gets activated (and rendered) only to be closed, and + * the tab list and session are updated once at the end instead of per tab. + * @param {EditorFile[]} files + */ +async function removeFiles(files) { + const { activeFile } = editorManager; + const isPaneActive = (file) => + editorManager.getFilePane?.(file)?.activeFile === file; + const rank = (file) => { + if (file === activeFile) return 2; + return isPaneActive(file) ? 1 : 0; + }; + const ordered = [...files].sort((a, b) => rank(a) - rank(b)); + + const removeAll = async () => { + for (const file of ordered) { + await file.remove(true, { silentPinned: true }); + } + }; + await deferSaveState(() => + editorManager.batchFileRemoval + ? editorManager.batchFileRemoval(removeAll) + : removeAll(), + ); } export default { @@ -214,18 +318,8 @@ export default { strings["save all changes warning"], ); if (!doSave) return; - let complete = true; - for (const file of [...editorManager.files]) { - if (!file.isUnsaved) continue; - if (!canSaveFile(file)) { - complete = false; - continue; - } - const saved = await file.save(); - if (saved === false || file.hasUnsavedChanges?.() || file.isUnsaved) - return false; - } - return complete; + const failed = await saveFiles([...editorManager.files]); + return !failed.size; }, "close-current-tab"() { editorManager.activeFile?.remove(); diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js index d56f521b66..f07c4d69b2 100644 --- a/src/lib/editorManager.js +++ b/src/lib/editorManager.js @@ -139,6 +139,8 @@ async function EditorManager($header, $body) { let timeoutQuicktoolsToggler; let timeoutHeaderToggler; let isScrolling = false; + let fileRemovalBatchDepth = 0; + let fileListSyncPending = false; let lastScrollTop = 0; let lastScrollLeft = 0; let suppressCursorRevealUntil = 0; @@ -3338,6 +3340,7 @@ async function EditorManager($header, $body) { moveActiveFileToNewPane, moveFileToPane, removeFileFromPane, + batchFileRemoval, moveFileByPinnedState, normalizePinnedTabOrder, updatePaneFileOrderFromTabs, @@ -4385,10 +4388,31 @@ async function EditorManager($header, $body) { } } rebuildFileListFromPanes(); - syncOpenFileList(); + if (fileRemovalBatchDepth) fileListSyncPending = true; + else syncOpenFileList(); return { pane, wasPaneActive, nextFile }; } + /** + * Runs `task` (which removes files) while deferring the open file list + * sync to a single pass at the end, instead of one full sync per file. + * @template T + * @param {() => Promise|T} task + * @returns {Promise} + */ + async function batchFileRemoval(task) { + fileRemovalBatchDepth++; + try { + return await task(); + } finally { + fileRemovalBatchDepth--; + if (!fileRemovalBatchDepth && fileListSyncPending) { + fileListSyncPending = false; + syncOpenFileList(); + } + } + } + function updatePaneFileOrderFromTabs($tabList, options = {}) { const pane = $tabList?.__editorPane; if (!pane) return false; diff --git a/src/lib/saveFile.js b/src/lib/saveFile.js index 0f43feaac5..5ff14b853d 100644 --- a/src/lib/saveFile.js +++ b/src/lib/saveFile.js @@ -14,7 +14,9 @@ import EditorFile from "./editorFile"; import openFolder from "./openFolder"; import appSettings from "./settings"; -let saveTimeout; +/** @type {WeakMap} */ +const saveTimeouts = new WeakMap(); +let updateTimeout; const SELECT_FOLDER = "select-folder"; @@ -171,12 +173,14 @@ async function saveFile( } } - if (appSettings.value.formatOnSave) { - editorManager.activeFile.markChanged = false; + // The format command works on the active editor, so only format when the + // file being saved is the one shown (bulk saves cover background tabs). + if (appSettings.value.formatOnSave && editorManager.activeFile === file) { + file.markChanged = false; try { acode.exec("format", false); } finally { - editorManager.activeFile.markChanged = true; + file.markChanged = true; } } @@ -200,15 +204,23 @@ async function saveFile( recents.addFolder(file.location); } - clearTimeout(saveTimeout); - saveTimeout = setTimeout(() => { - if (!isCurrent()) return; - file.isSaving = false; - if (newUrl) recents.addFile(file.uri); + clearTimeout(saveTimeouts.get(file)); + saveTimeouts.set( + file, + setTimeout(() => { + saveTimeouts.delete(file); + if (!isCurrent()) return; + file.isSaving = false; + if (newUrl) recents.addFile(file.uri); + editorManager.emit("save-file", file); + resetText(); + }, editorManager.TIMEOUT_VALUE + 100), + ); + // Coalesce the session update so saving many files persists state once. + clearTimeout(updateTimeout); + updateTimeout = setTimeout(() => { editorManager.onupdate("save-file"); editorManager.emit("update", "save-file"); - editorManager.emit("save-file", file); - resetText(); }, editorManager.TIMEOUT_VALUE + 100); return true; } catch (err) { diff --git a/src/lib/saveState.js b/src/lib/saveState.js index 5d31b37324..7437dc22a7 100644 --- a/src/lib/saveState.js +++ b/src/lib/saveState.js @@ -3,8 +3,36 @@ import config from "./config"; import { addedFolder } from "./openFolder"; import appSettings from "./settings"; -export default () => { +let deferDepth = 0; +let deferredSave = false; + +/** + * Runs `task` while coalescing every session save it triggers into a single + * save once it finishes, so bulk tab operations don't re-serialize all open + * files per tab. + * @template T + * @param {() => Promise|T} task + * @returns {Promise} + */ +export async function deferSaveState(task) { + deferDepth++; + try { + return await task(); + } finally { + deferDepth--; + if (!deferDepth && deferredSave) { + deferredSave = false; + saveState(); + } + } +} + +export default function saveState() { if (!window.editorManager) return; + if (deferDepth) { + deferredSave = true; + return; + } const filesToSave = []; const folders = []; @@ -103,7 +131,7 @@ export default () => { localStorage.files = JSON.stringify(filesToSave); localStorage.folders = JSON.stringify(folders); -}; +} function collapseSelectionForRestore(selection) { if (!selection?.ranges?.length) return selection; diff --git a/tests/unit/saveCommands.test.js b/tests/unit/saveCommands.test.js index a6817bbd8b..01a46e54f8 100644 --- a/tests/unit/saveCommands.test.js +++ b/tests/unit/saveCommands.test.js @@ -9,6 +9,7 @@ function setup(files) { }; const toast = vi.fn(), error = vi.fn(); + const progress = { setMessage: vi.fn(), destroy: vi.fn() }; const dependencies = Object.fromEntries( [ "fileSystem", @@ -27,7 +28,6 @@ function setup(files) { "./openFile", "./openFolder", "./run", - "./saveState", "./settings", "./showFileInfo", ].map((id) => [id, {}]), @@ -38,11 +38,13 @@ function setup(files) { ...dependencies, "dialogs/confirm": async () => true, "dialogs/select": async () => "save", + "dialogs/loader": { create: () => progress }, + "./saveState": { deferSaveState: (task) => task() }, "utils/helpers": { error }, }, { editorManager: manager, strings: {}, toast }, ); - return { ...module, manager, toast, error }; + return { ...module, manager, toast, error, progress }; } function tab(id, type = "docs") { const file = { @@ -105,7 +107,7 @@ it("does not save pending editors or report a cancelled editor save as successfu await f.default["save-as"](true); expect(f.toast).not.toHaveBeenCalled(); }); -it("saves sequentially without clearing flags and stops at cancellation or newer edits", async () => { +it("saves sequentially without clearing flags and keeps going past cancellation or newer edits", async () => { const one = tab("one"), two = tab("two"), code = tab("code", "editor"); @@ -128,12 +130,47 @@ it("saves sequentially without clearing flags and stops at cancellation or newer release(); expect(await saving).toBe(false); expect(two.isUnsaved).toBe(true); - expect(code.save).not.toHaveBeenCalled(); + expect(code.save).toHaveBeenCalledOnce(); + expect(code.isUnsaved).toBe(false); two.save.mockResolvedValueOnce(true); // A newer edit remains dirty after the write. expect(await f.default["save-all-changes"]()).toBe(false); - expect(code.save).not.toHaveBeenCalled(); + expect(two.isUnsaved).toBe(true); expect(await f.default["save-all-changes"]()).toBe(true); - expect(code.isUnsaved).toBe(false); + expect(two.isUnsaved).toBe(false); +}); + +it("saves files with a location concurrently behind a progress dialog", async () => { + const files = ["a", "b", "c", "d", "e", "f"].map((id) => { + const file = tab(id, "editor"); + file.uri = `file:///${id}`; + return file; + }); + const releases = []; + for (const file of files) { + file.save.mockImplementationOnce( + () => + new Promise((resolve) => { + releases.push(() => { + file.isUnsaved = false; + resolve(true); + }); + }), + ); + } + const f = setup(files); + const saving = f.default["save-all-changes"](); + await vi.waitFor(() => expect(releases).toHaveLength(4)); + expect(files[4].save).not.toHaveBeenCalled(); + while (releases.length) { + releases.shift()(); + await Promise.resolve(); + await Promise.resolve(); + } + await vi.waitFor(() => expect(files[5].save).toHaveBeenCalled()); + while (releases.length) releases.shift()(); + expect(await saving).toBe(true); + expect(f.progress.setMessage).toHaveBeenCalledTimes(files.length); + expect(f.progress.destroy).toHaveBeenCalledOnce(); }); it.each([ false, @@ -145,9 +182,8 @@ it.each([ if (outcome === "failure") file.save.mockRejectedValueOnce(Error("disk full")); else file.save.mockResolvedValueOnce(outcome); - const result = f.default["close-all-tabs"](); - if (outcome === "failure") await expect(result).rejects.toThrow("disk full"); - else await result; + expect(await f.default["close-all-tabs"]()).toBe(false); + expect(f.error).toHaveBeenCalledTimes(outcome === "failure" ? 1 : 0); expect(file.remove).not.toHaveBeenCalled(); expect(file.isUnsaved).toBe(true); }); @@ -181,7 +217,7 @@ it.each([ false, true, "failure", -])("still stops after a savable write fails or remains dirty (%s)", async (outcome) => { +])("keeps a failed file open and still saves the rest (%s)", async (outcome) => { for (const command of ["save-all-changes", "close-all-tabs"]) { const unsupported = tab("unsupported", "terminal"), failed = tab("failed"), @@ -190,13 +226,15 @@ it.each([ if (outcome === "failure") failed.save.mockRejectedValueOnce(Error("disk full")); else failed.save.mockResolvedValueOnce(outcome); - const saving = f.default[command](); - if (outcome === "failure") - await expect(saving).rejects.toThrow("disk full"); - else expect(await saving).toBe(false); + expect(await f.default[command]()).toBe(false); + expect(f.error).toHaveBeenCalledTimes(outcome === "failure" ? 1 : 0); expect(failed.remove).not.toHaveBeenCalled(); - expect(later.save).not.toHaveBeenCalled(); - expect(later.remove).not.toHaveBeenCalled(); + expect(failed.isUnsaved).toBe(true); + expect(later.save).toHaveBeenCalledOnce(); + expect(later.isUnsaved).toBe(false); + expect(later.remove).toHaveBeenCalledTimes( + command === "close-all-tabs" ? 1 : 0, + ); } }); @@ -210,3 +248,43 @@ it("keeps pinned tabs untouched by save-and-close and reports complete success f expect(pinned.remove).not.toHaveBeenCalled(); expect(file.remove).toHaveBeenCalledOnce(); }); + +it("saves remote files one at a time after local files and reports the result", async () => { + const local = ["a", "b"].map((id) => { + const file = tab(id, "editor"); + file.uri = `file:///${id}`; + return file; + }); + const remote = ["c", "d"].map((id) => { + const file = tab(id, "editor"); + file.uri = `sftp://host/${id}`; + return file; + }); + let active = 0; + let maxRemoteActive = 0; + for (const file of remote) { + file.save.mockImplementationOnce(async () => { + active++; + maxRemoteActive = Math.max(maxRemoteActive, active); + await new Promise((resolve) => setTimeout(resolve, 5)); + active--; + file.isUnsaved = false; + return true; + }); + } + const f = setup([...local, ...remote]); + expect(await f.default["save-all-changes"]()).toBe(true); + expect(maxRemoteActive).toBe(1); + for (const file of local) { + expect(file.save.mock.invocationCallOrder[0]).toBeLessThan( + remote[0].save.mock.invocationCallOrder[0], + ); + } + expect(f.toast).toHaveBeenCalledWith("Files saved: 4"); + + remote[0].isUnsaved = true; + remote[0].save.mockResolvedValue(false); + local[0].isUnsaved = true; + expect(await f.default["save-all-changes"]()).toBe(false); + expect(f.toast).toHaveBeenLastCalledWith("Files not saved: 1"); +}); From 40209f438c236b6d46f8810069335f44948dcb9e Mon Sep 17 00:00:00 2001 From: summoner Date: Thu, 12 Nov 2026 16:45:33 +0000 Subject: [PATCH 178/195] Translation: Update hu-hu.json (#3046) Translte new strings fix translation --- src/lang/hu-hu.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lang/hu-hu.json b/src/lang/hu-hu.json index 894a33a148..ee9008221f 100644 --- a/src/lang/hu-hu.json +++ b/src/lang/hu-hu.json @@ -9,7 +9,7 @@ "cancel": "Mégse", "change language": "Nyelv módosítása", "choose color": "Válasszon színt", - "clear": "Tisztítás", + "clear": "Törlés", "close app": "Biztosan bezárja az alkalmazást?", "commit message": "Véglegesítési üzenet", "console": "Konzol", @@ -896,9 +896,9 @@ "canvas backend auto": "Automatikus (WebGL2)", "settings-info-canvas-backend": "A GPU API, amellyel a Canvas megjelenítő rajzol. A WebGPU ott, ahol nem érhető el, WebGL2-re vált vissza. Újratöltés után lép érvénybe.", "sticky scroll": "Rögzített görgetés", - "settings-info-sticky-scroll": "Görgetés közben a felső sor körüli függvények, osztályok és blokkok első sorait a képernyő tetejére rögzíti.", + "settings-info-sticky-scroll": "Görgetés közben a felső sor körüli függvények, osztályok és blokkok első sorait a képernyő tetejére lesznek rögzítve.", "sticky scroll max lines": "Rögzített görgetés sorai", - "settings-info-sticky-scroll-max-lines": "A rögzített görgetés által a tetején tartott fejlécsorok maximális száma (1–10).", + "settings-info-sticky-scroll-max-lines": "A rögzített görgetés által a képernyő tetejére rögzített fejlécsorok maximális száma (1–10).", "gutter markers": "Margójelölők", "gutter markers shared": "Egy közös oszlop", "gutter markers columns": "Külön oszlop margónként", @@ -907,11 +907,11 @@ "cursor blink rate": "Kurzor villogási sebessége", "settings-info-cursor-blink-rate": "Egy kurzorvillanás időtartama ezredmásodpercben. A 0 értéknél a kurzor nem villog.", "settings-info-scroll-speed": "A görgetés mértéke egy lendítés vagy az egérkerék elfordításakor.", - "clear all": "Clear all", - "error-permission-revoked": "Acode can no longer access this location. Open the folder again to grant access.", - "error-not-found": "This file or folder no longer exists. It may have been moved, renamed or deleted.", - "error-no-space": "There isn't enough storage space left on this device.", - "error-network": "Couldn't reach the server. Check your connection and try again.", - "files saved count": "Files saved: {count}", - "files not saved count": "Files not saved: {count}" + "clear all": "Összes törlése", + "error-permission-revoked": "Az Acode már nem fér hozzá ehhez a helyhez. Nyissa meg újra a mappát a hozzáférés engedélyezéséhez.", + "error-not-found": "Ez a fájl vagy mappa már nem létezik. Lehet, hogy áthelyezték, átnevezték vagy törölték.", + "error-no-space": "Ezen az eszközön nincs elegendő szabad tárhely.", + "error-network": "Nem sikerült kapcsolódni a kiszolgálóhoz. Ellenőrizze az internetkapcsolatát, majd próbálja meg újra.", + "files saved count": "{count} fájl mentve", + "files not saved count": "{count} fájl nem lett mentve" } From f3b31dcbb0d9b39c5bb6b276380f29c7a5738941 Mon Sep 17 00:00:00 2001 From: bardrop Date: Fri, 13 Nov 2026 05:19:30 +0000 Subject: [PATCH 179/195] fix: allow replace all with an empty replacement (#3048) * fix: allow replace all with an empty replacement Search in files returned early from replaceAll() when the replace field was empty, so there was no way to delete every match. Both the worker and the native replace already handle an empty string, so only the search query is required now. Fixes #3044 * fix: keep empty replacement text for files that are not open openFile ignored supplied text when it was an empty string, so a closed file whose whole content was replaced with "" was reloaded from disk. --- src/lib/openFile.js | 4 +- src/sidebarApps/searchInFiles/index.js | 3 +- tests/unit/openFileCancellation.test.js | 8 +++ tests/unit/searchReplaceAll.test.js | 70 +++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 tests/unit/searchReplaceAll.test.js diff --git a/src/lib/openFile.js b/src/lib/openFile.js index 3b85114679..c90b4f8523 100644 --- a/src/lib/openFile.js +++ b/src/lib/openFile.js @@ -189,8 +189,8 @@ export default async function openFile(file, options = {}) { } } - if (text) { - // If file is not opened and has unsaved text + if (text != null) { + // If file is not opened and has unsaved text (may be "" after a replace) createEditor(true, text); return; } diff --git a/src/sidebarApps/searchInFiles/index.js b/src/sidebarApps/searchInFiles/index.js index 5729f1e45f..336fc3ef1f 100644 --- a/src/sidebarApps/searchInFiles/index.js +++ b/src/sidebarApps/searchInFiles/index.js @@ -930,7 +930,8 @@ async function replaceAll() { const search = $search.value; const replace = $replace.value; const options = getOptions(); - if (!search || !replace) return; + // An empty replacement is valid: it deletes every match. + if (!search) return; const regex = toRegex(search, options); if (!regex) return; diff --git a/tests/unit/openFileCancellation.test.js b/tests/unit/openFileCancellation.test.js index 80f4d4b0d9..5e97d5b94c 100644 --- a/tests/unit/openFileCancellation.test.js +++ b/tests/unit/openFileCancellation.test.js @@ -103,6 +103,14 @@ describe("openFile cancellation", () => { expect(recents.addFile).toHaveBeenCalledWith("target"); }); + it("opens supplied empty text as unsaved instead of reading the file", async () => { + await openFile("target", { render: true, text: "" }); + expect(createEditor).toHaveBeenCalledOnce(); + expect(manager.activeFile.text).toBe(""); + expect(manager.activeFile.isUnsaved).toBe(true); + expect(readFile).not.toHaveBeenCalled(); + }); + it.each([ "pdf", "docx", diff --git a/tests/unit/searchReplaceAll.test.js b/tests/unit/searchReplaceAll.test.js new file mode 100644 index 0000000000..fdc77e1581 --- /dev/null +++ b/tests/unit/searchReplaceAll.test.js @@ -0,0 +1,70 @@ +import { readFileSync } from "node:fs"; +import vm from "node:vm"; +import { describe, expect, it, vi } from "vitest"; + +const source = readFileSync( + `${process.cwd()}/src/sidebarApps/searchInFiles/index.js`, + "utf8", +); + +function createReplaceAll({ search, replace, native = false }) { + const context = vm.createContext({ + $search: { value: search }, + $replace: { value: replace }, + filesSearched: [{ url: "file:///a.js" }, { url: "file:///b.js" }], + filesReplaced: [], + replacing: false, + activeReplaceTasks: 0, + terminateWorker: vi.fn(), + getOptions: () => ({ regExp: false }), + toRegex: (value) => new RegExp(value, "g"), + supportsNativeSearch: () => native, + sendNativeSearch: vi.fn(), + sendMessage: vi.fn(), + }); + vm.runInContext( + source.slice( + source.indexOf("async function replaceAll()"), + source.indexOf("function sendMessage("), + ), + context, + ); + return context; +} + +describe("search in files replace all", () => { + it("replaces matches with an empty string", async () => { + const context = createReplaceAll({ search: "foo", replace: "" }); + await vm.runInContext("replaceAll()", context); + + expect(context.sendMessage).toHaveBeenCalledTimes(1); + const [action, files, , , replace] = context.sendMessage.mock.calls[0]; + expect(action).toBe("replace-files"); + expect(files).toHaveLength(2); + expect(replace).toBe(""); + expect(context.replacing).toBe(true); + }); + + it("sends an empty replacement to the native search", async () => { + const context = createReplaceAll({ + search: "foo", + replace: "", + native: true, + }); + await vm.runInContext("replaceAll()", context); + + expect(context.sendNativeSearch).toHaveBeenCalledTimes(1); + expect(context.sendNativeSearch.mock.calls[0][0]).toBe("replace"); + expect(context.sendNativeSearch.mock.calls[0][4]).toBe(""); + expect(context.sendMessage).not.toHaveBeenCalled(); + }); + + it("does nothing without a search query", async () => { + const context = createReplaceAll({ search: "", replace: "bar" }); + await vm.runInContext("replaceAll()", context); + + expect(context.sendMessage).not.toHaveBeenCalled(); + expect(context.sendNativeSearch).not.toHaveBeenCalled(); + expect(context.replacing).toBe(false); + }); +}); From 2827118eadadb1968096674001f2b7d97f89953a Mon Sep 17 00:00:00 2001 From: Mittal Singh <111978266+Mittalnew@users.noreply.github.com> Date: Fri, 13 Nov 2026 05:45:02 +0000 Subject: [PATCH 180/195] feat: add hints to search in files search options (#3042) * feat: add hints to search in files search options * test: use a real checkbox input in search option tooltip test --------- Co-authored-by: mittal Co-authored-by: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> --- src/components/checkbox/index.js | 25 ++++++++++- src/components/tooltip/longPress.js | 3 +- src/lang/ar-ye.json | 4 +- src/lang/az-az.json | 4 +- src/lang/be-by.json | 4 +- src/lang/bn-bd.json | 4 +- src/lang/cs-cz.json | 4 +- src/lang/de-de.json | 4 +- src/lang/en-us.json | 4 +- src/lang/es-sv.json | 4 +- src/lang/fr-fr.json | 4 +- src/lang/he-il.json | 4 +- src/lang/hi-in.json | 4 +- src/lang/hu-hu.json | 4 +- src/lang/id-id.json | 4 +- src/lang/index.d.ts | 2 + src/lang/ir-fa.json | 4 +- src/lang/it-it.json | 4 +- src/lang/ja-jp.json | 4 +- src/lang/ko-kr.json | 4 +- src/lang/ln-ln.json | 4 +- src/lang/ml-in.json | 4 +- src/lang/mm-unicode.json | 4 +- src/lang/mm-zawgyi.json | 4 +- src/lang/pl-pl.json | 4 +- src/lang/pt-br.json | 4 +- src/lang/pu-in.json | 4 +- src/lang/ru-ru.json | 4 +- src/lang/tl-ph.json | 4 +- src/lang/tr-tr.json | 4 +- src/lang/uk-ua.json | 4 +- src/lang/uz-uz.json | 4 +- src/lang/vi-vn.json | 4 +- src/lang/zh-cn.json | 4 +- src/lang/zh-hant.json | 4 +- src/lang/zh-tw.json | 4 +- src/sidebarApps/searchInFiles/index.js | 5 +++ tests/unit/iconTooltips.test.js | 62 ++++++++++++++++++++++++++ 38 files changed, 194 insertions(+), 35 deletions(-) diff --git a/src/components/checkbox/index.js b/src/components/checkbox/index.js index 17e3e44b10..967cca1fdc 100644 --- a/src/components/checkbox/index.js +++ b/src/components/checkbox/index.js @@ -37,6 +37,9 @@ export function updateSwitchHandle($handle, checked, animateToggle = true) { * @property {string} [id] * @property {string} [size] * @property {"checkbox"|"radio"} [type] + * @property {string} [title] + * @property {string} [ariaLabel] + * @property {string} [description] */ /** @@ -51,14 +54,30 @@ export function updateSwitchHandle($handle, checked, animateToggle = true) { * @returns {Checkbox & HTMLLabelElement} */ function Checkbox(text, checked, name, id, type, ref, size, isSwitch) { + let title; + let ariaLabel; + let description; if (typeof text === "object") { - ({ text, checked, name, id, type, ref, size, isSwitch } = text); + ({ + text, + checked, + name, + id, + type, + ref, + size, + isSwitch, + title, + ariaLabel, + description, + } = text); } size = size || "1rem"; const $input = ref || Ref(); const $handle = Ref(); + const label = ariaLabel || title; const $checkbox = (