From 9acf1d22f68437b35f3349bda965a91718f23558 Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Thu, 14 May 2026 17:41:50 -0400 Subject: [PATCH 01/15] feat: add log dictionary to build assets and fix path resolution Add log_dictionary.json as a build asset shown in the sidebar. Replace the brittle extractChipName path computation with a file search that handles sysbuild, non-sysbuild, and chip-qualified build directories. Co-Authored-By: Claude Opus 4.6 (1M context) --- CHANGELOG.md | 8 +++ package.json | 2 +- src/build/build-assets-manager.ts | 102 ++++++++++++++++++------------ 3 files changed, 69 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3c811e..e4bc520 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to the "zephyr-tools" extension will be documented in this file. +### [0.5.25] - 2026-05-14 + +**Added:** +- Show `log_dictionary.json` under Build Assets in the sidebar when present in the build output + +**Fixed:** +- Build assets now discovered via file search instead of hardcoded chip path — fixes missing assets for native_sim, sysbuild, and other non-nRF91 board configurations + ### [0.5.24] - 2026-05-08 **Added:** diff --git a/package.json b/package.json index 250321b..89fca03 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "zephyr-tools", "displayName": "Circuit Dojo Zephyr SDK Tools", "description": "Used for building your Zephyr projects.", - "version": "0.5.24", + "version": "0.5.25", "license": "Apache-2.0", "publisher": "circuitdojo", "icon": "img/bulb.png", diff --git a/src/build/build-assets-manager.ts b/src/build/build-assets-manager.ts index 79c14bb..0480eb5 100644 --- a/src/build/build-assets-manager.ts +++ b/src/build/build-assets-manager.ts @@ -52,6 +52,11 @@ export class BuildAssetsManager { displayName: "Zephyr Hex", location: "zephyr" as const, }, + { + name: "log_dictionary.json", + displayName: "Log Dictionary", + location: "zephyr" as const, + }, ]; /** @@ -64,27 +69,29 @@ export class BuildAssetsManager { let lastBuild: Date | undefined; for (const assetDef of this.ASSET_DEFINITIONS) { - const assetPath = this.getAssetPath(buildPath, assetDef.name, assetDef.location, project); + const assetPath = await this.findAssetPath(buildPath, assetDef.name, assetDef.location); const assetInfo: BuildAssetInfo = { name: assetDef.name, displayName: assetDef.displayName, - path: assetPath, + path: assetPath || "", exists: false, }; - try { - const stats = await fs.stat(assetPath); - assetInfo.exists = true; - assetInfo.size = stats.size; - assetInfo.lastModified = stats.mtime; - hasAssets = true; + if (assetPath) { + try { + const stats = await fs.stat(assetPath); + assetInfo.exists = true; + assetInfo.size = stats.size; + assetInfo.lastModified = stats.mtime; + hasAssets = true; - // Track the most recent build time - if (!lastBuild || stats.mtime > lastBuild) { - lastBuild = stats.mtime; + // Track the most recent build time + if (!lastBuild || stats.mtime > lastBuild) { + lastBuild = stats.mtime; + } + } catch { + // File doesn't exist, keep exists: false } - } catch { - // File doesn't exist, keep exists: false } assets.push(assetInfo); @@ -114,38 +121,48 @@ export class BuildAssetsManager { } /** - * Get the full path to a specific asset + * Find a build asset file under the build path. + * Zephyr build output structure varies (sysbuild vs non-sysbuild, chip qualifiers), + * so we search for the file rather than computing a fixed path. */ - private static getAssetPath(buildPath: string, assetName: string, location: "root" | "zephyr", project?: ProjectConfig): string { - if (location === "zephyr") { - // For zephyr assets, they're typically in build/board/chip/zephyr/ - // e.g., build/circuitdojo_feather_nrf9151/nrf9160/zephyr/ - const chipName = this.extractChipName(project?.board); - return path.join(buildPath, chipName, "zephyr", assetName); + private static async findAssetPath(buildPath: string, assetName: string, location: "root" | "zephyr"): Promise { + if (location === "root") { + const candidate = path.join(buildPath, assetName); + if (await fs.pathExists(candidate)) { + return candidate; + } + return null; } - return path.join(buildPath, assetName); - } - /** - * Extract chip name from board configuration - * e.g., "circuitdojo_feather_nrf9151/nrf9151/ns" -> "nrf9160" (based on common patterns) - */ - private static extractChipName(board?: string): string { - if (!board) {return "zephyr";} - - // For nRF91 series boards, the chip is typically nrf9160 - if (board.includes('nrf91')) { - return 'nrf9160'; - } - - // For other boards, try to extract from the board path - const parts = board.split('/'); - if (parts.length > 1) { - return parts[1]; // Second part is usually the chip + // For "zephyr" location, search for */zephyr/{assetName} under buildPath + // Covers: build/{board}/zephyr/ (non-sysbuild) and build/{board}/{app}/zephyr/ (sysbuild) + try { + const entries = await fs.readdir(buildPath, { withFileTypes: true }); + for (const entry of entries) { + if (!entry.isDirectory()) {continue;} + // Direct: {subdir}/zephyr/{asset} + const direct = path.join(buildPath, entry.name, "zephyr", assetName); + if (await fs.pathExists(direct)) { + return direct; + } + // One level deeper: {subdir}/{sub2}/zephyr/{asset} + try { + const subEntries = await fs.readdir(path.join(buildPath, entry.name), { withFileTypes: true }); + for (const sub of subEntries) { + if (!sub.isDirectory()) {continue;} + const nested = path.join(buildPath, entry.name, sub.name, "zephyr", assetName); + if (await fs.pathExists(nested)) { + return nested; + } + } + } catch { + // subdirectory not readable, skip + } + } + } catch { + // build path not readable } - - // Default fallback - return "zephyr"; + return null; } /** @@ -217,7 +234,8 @@ export class BuildAssetsManager { 'build/**/zephyr.hex', 'build/**/merged.hex', 'build/**/dfu_application.zip', - 'build/**/dfu_application.zip_manifest.json' + 'build/**/dfu_application.zip_manifest.json', + 'build/**/log_dictionary.json' ]; const watchers: vscode.FileSystemWatcher[] = []; From 47da6a03c459a3350c3200fe68fa2301cd08b0c3 Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Thu, 18 Jun 2026 17:32:02 -0400 Subject: [PATCH 02/15] fix: preserve existing venv during setup instead of recreating it Upgrade in place with --upgrade when the venv is healthy; only remove and recreate if the Python binary is missing or the upgrade fails. --- src/environment/dependency-installer.ts | 29 +++++++++++++++++-------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/environment/dependency-installer.ts b/src/environment/dependency-installer.ts index 730d659..61eb948 100644 --- a/src/environment/dependency-installer.ts +++ b/src/environment/dependency-installer.ts @@ -16,18 +16,29 @@ export async function createVirtualEnvironment(pythonCmd: string, env: { [key: s const currentToolsDir = SettingsManager.getToolsDirectory(); const pythonenv = path.join(currentToolsDir, "env"); - // Check if virtual environment already exists if (fs.existsSync(pythonenv)) { - output.appendLine(`[SETUP] Existing virtual environment found at ${pythonenv}`); - output.appendLine("[SETUP] Removing old virtual environment..."); + const venvPython = platform === "win32" + ? path.join(pythonenv, "Scripts", "python.exe") + : path.join(pythonenv, "bin", "python"); + + if (fs.existsSync(venvPython)) { + output.appendLine(`[SETUP] Existing virtual environment found at ${pythonenv}, upgrading in place...`); + try { + const result = await exec(`${pythonCmd} -m venv --upgrade "${pythonenv}"`, { env }); + output.append(result.stdout); + output.appendLine("[SETUP] Virtual environment upgraded"); + return true; + } catch (error) { + output.appendLine(`[SETUP] Upgrade failed (${error}), recreating virtual environment...`); + } + } else { + output.appendLine("[SETUP] Virtual environment is broken, recreating..."); + } try { - // Remove the existing directory fs.rmSync(pythonenv, { recursive: true, force: true }); - output.appendLine("[SETUP] Old virtual environment removed"); } catch (error) { - output.appendLine("[SETUP] Failed to remove old virtual environment"); - output.appendLine(`[SETUP] Error: ${error}`); + output.appendLine(`[SETUP] Failed to remove old virtual environment: ${error}`); output.appendLine("[SETUP] Please manually delete: " + pythonenv); return false; } @@ -38,10 +49,10 @@ export async function createVirtualEnvironment(pythonCmd: string, env: { [key: s output.appendLine(cmd); const result = await exec(cmd, { env }); output.append(result.stdout); - output.appendLine("[SETUP] virtual python environment created"); + output.appendLine("[SETUP] Virtual environment created"); return true; } catch (error) { - output.appendLine("[SETUP] unable to setup virtualenv"); + output.appendLine("[SETUP] Unable to create virtual environment"); output.appendLine(`[SETUP] Error: ${error}`); console.error(error); return false; From e8317d4b0e0f1cde5cc8c6ce1eaaf4440b259e61 Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Fri, 19 Jun 2026 15:45:15 -0400 Subject: [PATCH 03/15] chore: update dependencies and migrate test runner to @vscode/test-electron - Bump @types/node, @types/vscode, esbuild, eslint, typescript, and others - Replace deprecated vscode-test with @vscode/test-electron - Fix mocha import for updated typings - Add qs override; ignore local agent state (.claude/, .codex) --- .gitignore | 6 +- package-lock.json | 2251 +++++++++++++++++---------------------- package.json | 30 +- src/test/runTest.ts | 2 +- src/test/suite/index.ts | 3 +- 5 files changed, 1026 insertions(+), 1266 deletions(-) diff --git a/.gitignore b/.gitignore index 894fcf7..322accf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,8 @@ dist node_modules .vscode-test/ *.vsix -extension.js \ No newline at end of file +extension.js + +# Local agent / editor state +.claude/ +.codex \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index fbb6772..667bff6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,37 +1,34 @@ { "name": "zephyr-tools", - "version": "0.5.24", + "version": "0.5.25", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "zephyr-tools", - "version": "0.5.24", + "version": "0.5.25", "license": "Apache-2.0", "dependencies": { "7zip-bin": "^5.2.0", - "fs-extra": "^11.3.0", + "fs-extra": "^11.3.5", "node-7z": "^3.0.0", "node-stream-zip": "^1.15.0", - "typed-rest-client": "^2.3.0", - "yaml": "^2.8.3" + "typed-rest-client": "^3.0.0", + "yaml": "^2.9.0" }, "devDependencies": { "@types/fs-extra": "^11.0.4", - "@types/glob": "^9.0.0", "@types/mocha": "^10.0.10", - "@types/node": "^24.0.12", - "@types/node-7z": "^2.1.10", - "@types/vscode": "^1.101.0", - "@typescript-eslint/eslint-plugin": "^8.58.0", - "@typescript-eslint/parser": "^8.58.0", - "esbuild": "^0.25.6", - "eslint": "^10.1.0", + "@types/node": "^25.9.1", + "@types/node-7z": "^2.1.11", + "@types/vscode": "^1.120.0", + "@vscode/test-electron": "^2.5.2", + "esbuild": "^0.28.0", + "eslint": "^10.4.1", "glob": "^13.0.6", - "mocha": "^11.7.5", - "typescript": "^5.8.3", - "typescript-eslint": "^8.59.2", - "vscode-test": "^1.6.1" + "mocha": "^11.7.6", + "typescript": "^6.0.3", + "typescript-eslint": "^8.60.1" }, "engines": { "node": ">=16", @@ -39,9 +36,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.6.tgz", - "integrity": "sha512-ShbM/3XxwuxjFiuVBHA+d3j5dyac0aEVVq1oluIDf71hUw0aRF59dV/efUsIwFnR6m8JNM2FjZOzmaZ8yG61kw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz", + "integrity": "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==", "cpu": [ "ppc64" ], @@ -56,9 +53,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.6.tgz", - "integrity": "sha512-S8ToEOVfg++AU/bHwdksHNnyLyVM+eMVAOf6yRKFitnwnbwwPNqKr3srzFRe7nzV69RQKb5DgchIX5pt3L53xg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.0.tgz", + "integrity": "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==", "cpu": [ "arm" ], @@ -73,9 +70,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.6.tgz", - "integrity": "sha512-hd5zdUarsK6strW+3Wxi5qWws+rJhCCbMiC9QZyzoxfk5uHRIE8T287giQxzVpEvCwuJ9Qjg6bEjcRJcgfLqoA==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz", + "integrity": "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==", "cpu": [ "arm64" ], @@ -90,9 +87,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.6.tgz", - "integrity": "sha512-0Z7KpHSr3VBIO9A/1wcT3NTy7EB4oNC4upJ5ye3R7taCc2GUdeynSLArnon5G8scPwaU866d3H4BCrE5xLW25A==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.0.tgz", + "integrity": "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==", "cpu": [ "x64" ], @@ -107,9 +104,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.6.tgz", - "integrity": "sha512-FFCssz3XBavjxcFxKsGy2DYK5VSvJqa6y5HXljKzhRZ87LvEi13brPrf/wdyl/BbpbMKJNOr1Sd0jtW4Ge1pAA==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz", + "integrity": "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==", "cpu": [ "arm64" ], @@ -124,9 +121,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.6.tgz", - "integrity": "sha512-GfXs5kry/TkGM2vKqK2oyiLFygJRqKVhawu3+DOCk7OxLy/6jYkWXhlHwOoTb0WqGnWGAS7sooxbZowy+pK9Yg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz", + "integrity": "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==", "cpu": [ "x64" ], @@ -141,9 +138,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.6.tgz", - "integrity": "sha512-aoLF2c3OvDn2XDTRvn8hN6DRzVVpDlj2B/F66clWd/FHLiHaG3aVZjxQX2DYphA5y/evbdGvC6Us13tvyt4pWg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz", + "integrity": "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==", "cpu": [ "arm64" ], @@ -158,9 +155,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.6.tgz", - "integrity": "sha512-2SkqTjTSo2dYi/jzFbU9Plt1vk0+nNg8YC8rOXXea+iA3hfNJWebKYPs3xnOUf9+ZWhKAaxnQNUf2X9LOpeiMQ==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz", + "integrity": "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==", "cpu": [ "x64" ], @@ -175,9 +172,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.6.tgz", - "integrity": "sha512-SZHQlzvqv4Du5PrKE2faN0qlbsaW/3QQfUUc6yO2EjFcA83xnwm91UbEEVx4ApZ9Z5oG8Bxz4qPE+HFwtVcfyw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz", + "integrity": "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==", "cpu": [ "arm" ], @@ -192,9 +189,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.6.tgz", - "integrity": "sha512-b967hU0gqKd9Drsh/UuAm21Khpoh6mPBSgz8mKRq4P5mVK8bpA+hQzmm/ZwGVULSNBzKdZPQBRT3+WuVavcWsQ==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz", + "integrity": "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==", "cpu": [ "arm64" ], @@ -209,9 +206,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.6.tgz", - "integrity": "sha512-aHWdQ2AAltRkLPOsKdi3xv0mZ8fUGPdlKEjIEhxCPm5yKEThcUjHpWB1idN74lfXGnZ5SULQSgtr5Qos5B0bPw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz", + "integrity": "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==", "cpu": [ "ia32" ], @@ -226,9 +223,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.6.tgz", - "integrity": "sha512-VgKCsHdXRSQ7E1+QXGdRPlQ/e08bN6WMQb27/TMfV+vPjjTImuT9PmLXupRlC90S1JeNNW5lzkAEO/McKeJ2yg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz", + "integrity": "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==", "cpu": [ "loong64" ], @@ -243,9 +240,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.6.tgz", - "integrity": "sha512-WViNlpivRKT9/py3kCmkHnn44GkGXVdXfdc4drNmRl15zVQ2+D2uFwdlGh6IuK5AAnGTo2qPB1Djppj+t78rzw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz", + "integrity": "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==", "cpu": [ "mips64el" ], @@ -260,9 +257,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.6.tgz", - "integrity": "sha512-wyYKZ9NTdmAMb5730I38lBqVu6cKl4ZfYXIs31Baf8aoOtB4xSGi3THmDYt4BTFHk7/EcVixkOV2uZfwU3Q2Jw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz", + "integrity": "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==", "cpu": [ "ppc64" ], @@ -277,9 +274,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.6.tgz", - "integrity": "sha512-KZh7bAGGcrinEj4qzilJ4hqTY3Dg2U82c8bv+e1xqNqZCrCyc+TL9AUEn5WGKDzm3CfC5RODE/qc96OcbIe33w==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz", + "integrity": "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==", "cpu": [ "riscv64" ], @@ -294,9 +291,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.6.tgz", - "integrity": "sha512-9N1LsTwAuE9oj6lHMyyAM+ucxGiVnEqUdp4v7IaMmrwb06ZTEVCIs3oPPplVsnjPfyjmxwHxHMF8b6vzUVAUGw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz", + "integrity": "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==", "cpu": [ "s390x" ], @@ -311,9 +308,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.6.tgz", - "integrity": "sha512-A6bJB41b4lKFWRKNrWoP2LHsjVzNiaurf7wyj/XtFNTsnPuxwEBWHLty+ZE0dWBKuSK1fvKgrKaNjBS7qbFKig==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz", + "integrity": "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==", "cpu": [ "x64" ], @@ -328,9 +325,9 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.6.tgz", - "integrity": "sha512-IjA+DcwoVpjEvyxZddDqBY+uJ2Snc6duLpjmkXm/v4xuS3H+3FkLZlDm9ZsAbF9rsfP3zeA0/ArNDORZgrxR/Q==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz", + "integrity": "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==", "cpu": [ "arm64" ], @@ -345,9 +342,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.6.tgz", - "integrity": "sha512-dUXuZr5WenIDlMHdMkvDc1FAu4xdWixTCRgP7RQLBOkkGgwuuzaGSYcOpW4jFxzpzL1ejb8yF620UxAqnBrR9g==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz", + "integrity": "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==", "cpu": [ "x64" ], @@ -362,9 +359,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.6.tgz", - "integrity": "sha512-l8ZCvXP0tbTJ3iaqdNf3pjaOSd5ex/e6/omLIQCVBLmHTlfXW3zAxQ4fnDmPLOB1x9xrcSi/xtCWFwCZRIaEwg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz", + "integrity": "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==", "cpu": [ "arm64" ], @@ -379,9 +376,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.6.tgz", - "integrity": "sha512-hKrmDa0aOFOr71KQ/19JC7az1P0GWtCN1t2ahYAf4O007DHZt/dW8ym5+CUdJhQ/qkZmI1HAF8KkJbEFtCL7gw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz", + "integrity": "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==", "cpu": [ "x64" ], @@ -396,9 +393,9 @@ } }, "node_modules/@esbuild/openharmony-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.6.tgz", - "integrity": "sha512-+SqBcAWoB1fYKmpWoQP4pGtx+pUUC//RNYhFdbcSA16617cchuryuhOCRpPsjCblKukAckWsV+aQ3UKT/RMPcA==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz", + "integrity": "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==", "cpu": [ "arm64" ], @@ -413,9 +410,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.6.tgz", - "integrity": "sha512-dyCGxv1/Br7MiSC42qinGL8KkG4kX0pEsdb0+TKhmJZgCUDBGmyo1/ArCjNGiOLiIAgdbWgmWgib4HoCi5t7kA==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz", + "integrity": "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==", "cpu": [ "x64" ], @@ -430,9 +427,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.6.tgz", - "integrity": "sha512-42QOgcZeZOvXfsCBJF5Afw73t4veOId//XD3i+/9gSkhSV6Gk3VPlWncctI+JcOyERv85FUo7RxuxGy+z8A43Q==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz", + "integrity": "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==", "cpu": [ "arm64" ], @@ -447,9 +444,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.6.tgz", - "integrity": "sha512-4AWhgXmDuYN7rJI6ORB+uU9DHLq/erBbuMoAuB4VWJTu5KtCgcKYPynF0YI1VkBNuEfjNlLrFr9KZPJzrtLkrQ==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz", + "integrity": "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==", "cpu": [ "ia32" ], @@ -464,9 +461,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.6.tgz", - "integrity": "sha512-NgJPHHbEpLQgDH2MjQu90pzW/5vvXIZ7KOnPyNBm92A6WgZ/7b6fJyUBjoumLqeOQQGqY2QjQxRo97ah4Sj0cA==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz", + "integrity": "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==", "cpu": [ "x64" ], @@ -510,13 +507,13 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.23.3", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.3.tgz", - "integrity": "sha512-j+eEWmB6YYLwcNOdlwQ6L2OsptI/LO6lNBuLIqe5R7RetD658HLoF+Mn7LzYmAWWNNzdC6cqP+L6r8ujeYXWLw==", + "version": "0.23.5", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.5.tgz", + "integrity": "sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/object-schema": "^3.0.3", + "@eslint/object-schema": "^3.0.5", "debug": "^4.3.1", "minimatch": "^10.2.4" }, @@ -524,29 +521,6 @@ "node": "^20.19.0 || ^22.13.0 || >=24" } }, - "node_modules/@eslint/config-array/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/@eslint/config-array/node_modules/brace-expansion": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", - "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^4.0.2" - }, - "engines": { - "node": "18 || 20 || >=22" - } - }, "node_modules/@eslint/config-array/node_modules/minimatch": { "version": "10.2.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", @@ -564,22 +538,22 @@ } }, "node_modules/@eslint/config-helpers": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.3.tgz", - "integrity": "sha512-lzGN0onllOZCGroKJmRwY6QcEHxbjBw1gwB8SgRSqK8YbbtEXMvKynsXc3553ckIEBxsbMBU7oOZXKIPGZNeZw==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.6.0.tgz", + "integrity": "sha512-ii6Bw9jJ2zi2cWA2Z+9/QZ/+3DX6kwaV5Q986D/CdP3Lap3w/pgQZ373FV7byY/i7L4IRH/G43I5dz1ClsCbpA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^1.1.1" + "@eslint/core": "^1.2.1" }, "engines": { "node": "^20.19.0 || ^22.13.0 || >=24" } }, "node_modules/@eslint/core": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.1.1.tgz", - "integrity": "sha512-QUPblTtE51/7/Zhfv8BDwO0qkkzQL7P/aWWbqcf4xWLEYn1oKjdO0gglQBB4GAsu7u6wjijbCmzsUTy6mnk6oQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.1.tgz", + "integrity": "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -590,9 +564,9 @@ } }, "node_modules/@eslint/object-schema": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.3.tgz", - "integrity": "sha512-iM869Pugn9Nsxbh/YHRqYiqd23AmIbxJOcpUMOuWCVNdoQJ5ZtwL6h3t0bcZzJUlC3Dq9jCFCESBZnX0GTv7iQ==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz", + "integrity": "sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==", "dev": true, "license": "Apache-2.0", "engines": { @@ -600,13 +574,13 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.6.1.tgz", - "integrity": "sha512-iH1B076HoAshH1mLpHMgwdGeTs0CYwL0SPMkGuSebZrwBp16v415e9NZXg2jtrqPVQjf6IANe2Vtlr5KswtcZQ==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.2.tgz", + "integrity": "sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^1.1.1", + "@eslint/core": "^1.2.1", "levn": "^0.4.1" }, "engines": { @@ -694,16 +668,6 @@ "node": ">=14" } }, - "node_modules/@tootallnate/once": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-3.0.1.tgz", - "integrity": "sha512-VyMVKRrpHTT8PnotUeV8L/mDaMwD5DaAKCFLP73zAqAtvF0FCqky+Ki7BYbFCYQmqFyTe9316Ed5zS70QUR9eg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, "node_modules/@types/esrecurse": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/@types/esrecurse/-/esrecurse-4.3.1.tgz", @@ -729,17 +693,6 @@ "@types/node": "*" } }, - "node_modules/@types/glob": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-9.0.0.tgz", - "integrity": "sha512-00UxlRaIUvYm4R4W9WYkN8/J+kV8fmOQ7okeH6YFtGWFMt3odD45tpG5yA5wnL7HE6lLgjaTW5n14ju2hl2NNA==", - "deprecated": "This is a stub types definition. glob provides its own type definitions, so you do not need this installed.", - "dev": true, - "license": "MIT", - "dependencies": { - "glob": "*" - } - }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -765,19 +718,19 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "24.0.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.12.tgz", - "integrity": "sha512-LtOrbvDf5ndC9Xi+4QZjVL0woFymF/xSTKZKPgrrl7H7XoeDvnD+E2IclKVDyaK9UM756W/3BXqSU+JEHopA9g==", + "version": "25.9.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.1.tgz", + "integrity": "sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~7.8.0" + "undici-types": ">=7.24.0 <7.24.7" } }, "node_modules/@types/node-7z": { - "version": "2.1.10", - "resolved": "https://registry.npmjs.org/@types/node-7z/-/node-7z-2.1.10.tgz", - "integrity": "sha512-LdfuQcGAKsLafyM96+F8VekToCuGQnFy9DMM0UdS6f5pEnaP5kAixp3TQPc1NJU4C6IwLwnednktYBjp/z2LRw==", + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/@types/node-7z/-/node-7z-2.1.11.tgz", + "integrity": "sha512-7gwLx44tqZqjyrvjkX41CWW4h7+aXrazFg/JR6N5g+R5BW1eqsNuw8SNLWrh7KcnfKhAYFiWyNb10ti5v5eCmQ==", "dev": true, "license": "MIT", "dependencies": { @@ -785,24 +738,24 @@ } }, "node_modules/@types/vscode": { - "version": "1.101.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.101.0.tgz", - "integrity": "sha512-ZWf0IWa+NGegdW3iU42AcDTFHWW7fApLdkdnBqwYEtHVIBGbTu0ZNQKP/kX3Ds/uMJXIMQNAojHR4vexCEEz5Q==", + "version": "1.120.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.120.0.tgz", + "integrity": "sha512-feaT4Rst+FkTch5zz/ZbNCxoIvo55YU80Be2kiL7OJcod4+CUYf2lUBPdIJzozNnSEMq1VRTGrWEcCGFB3fBmA==", "dev": true, "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.2.tgz", - "integrity": "sha512-j/bwmkBvHUtPNxzuWe5z6BEk3q54YRyGlBXkSsmfoih7zNrBvl5A9A98anlp/7JbyZcWIJ8KXo/3Tq/DjFLtuQ==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.60.1.tgz", + "integrity": "sha512-JQ4S5GB0tfjO8BuJ4fcX+HodkzJjYBV+7OJ+wLygaX7OGQ7FudyHL4NSCA6ob+w3Yn+5MkKIozOwQhXeM7opVg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.59.2", - "@typescript-eslint/type-utils": "8.59.2", - "@typescript-eslint/utils": "8.59.2", - "@typescript-eslint/visitor-keys": "8.59.2", + "@typescript-eslint/scope-manager": "8.60.1", + "@typescript-eslint/type-utils": "8.60.1", + "@typescript-eslint/utils": "8.60.1", + "@typescript-eslint/visitor-keys": "8.60.1", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" @@ -815,22 +768,22 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.59.2", + "@typescript-eslint/parser": "^8.60.1", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.2.tgz", - "integrity": "sha512-plR3pp6D+SSUn1HM7xvSkx12/DhoHInI2YF35KAcVFNZvlC0gtrWqx7Qq1oH2Ssgi0vlFRCTbP+DZc7B9+TtsQ==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.60.1.tgz", + "integrity": "sha512-A0M6ua6H252bVjPvvtSgl2QA4+ET9S5Mtkb2GDyTxIhH/C4qDItT7RQNO5PhMC6NXGYXOR9dIalcDDgBKT7oFA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.59.2", - "@typescript-eslint/types": "8.59.2", - "@typescript-eslint/typescript-estree": "8.59.2", - "@typescript-eslint/visitor-keys": "8.59.2", + "@typescript-eslint/scope-manager": "8.60.1", + "@typescript-eslint/types": "8.60.1", + "@typescript-eslint/typescript-estree": "8.60.1", + "@typescript-eslint/visitor-keys": "8.60.1", "debug": "^4.4.3" }, "engines": { @@ -846,14 +799,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.2.tgz", - "integrity": "sha512-+2hqvEkeyf/0FBor67duF0Ll7Ot8jyKzDQOSrxazF/danillRq2DwR9dLptsXpoZQqxE1UisSmoZewrlPas9Vw==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.60.1.tgz", + "integrity": "sha512-eXkTH2bxmXlqD1RnOPmLZ9ZM9D3VwSx04JOwBnP9RQ+yUA5a2Mu7SfW8uaV2Aon53NJzZlZYuX7tn91Izf+xaw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.59.2", - "@typescript-eslint/types": "^8.59.2", + "@typescript-eslint/tsconfig-utils": "^8.60.1", + "@typescript-eslint/types": "^8.60.1", "debug": "^4.4.3" }, "engines": { @@ -868,14 +821,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.2.tgz", - "integrity": "sha512-JzfyEpEtOU89CcFSwyNS3mu4MLvLSXqnmX05+aKBDM+TdR5jzcGOEBwxwGNxrEQ7p/z6kK2WyioCGBf2zZBnvg==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.60.1.tgz", + "integrity": "sha512-gvI5OQoptnxQnchOirukCuQ55svJSTuD/4k5+pC267xyBtYry748R9/c3tYUzb/iE6RZfllRz2lVulLCHkTm4w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.59.2", - "@typescript-eslint/visitor-keys": "8.59.2" + "@typescript-eslint/types": "8.60.1", + "@typescript-eslint/visitor-keys": "8.60.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -886,9 +839,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.2.tgz", - "integrity": "sha512-BKK4alN7oi4C/zv4VqHQ+uRU+lTa6JGIZ7s1juw7b3RHo9OfKB+bKX3u0iVZetdsUCBBkSbdWbarJbmN0fTeSw==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.1.tgz", + "integrity": "sha512-nh8w4qAteiKuZu3pSSzG/yGKpw0OlkrKnzFmbVRenKaD4qc+7i1GrmZaLVkr8rk4uipiPGMOW4YsM6WmKZ5CvA==", "dev": true, "license": "MIT", "engines": { @@ -903,15 +856,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.59.2.tgz", - "integrity": "sha512-nhqaj1nmTdVVl/BP5omXNRGO38jn5iosis2vbdmupF2txCf8ylWT8lx+JlvMYYVqzGVKtjojUFoQ3JRWK+mfzQ==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.60.1.tgz", + "integrity": "sha512-sdwTrpjosW7ANQYJ39ZBF1ZyEMEGVB2UsikrserVM/30a/F1dTLnu9bGxEdosugyu5caigjLrR2qiD11asjI1A==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.59.2", - "@typescript-eslint/typescript-estree": "8.59.2", - "@typescript-eslint/utils": "8.59.2", + "@typescript-eslint/types": "8.60.1", + "@typescript-eslint/typescript-estree": "8.60.1", + "@typescript-eslint/utils": "8.60.1", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, @@ -928,9 +881,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.2.tgz", - "integrity": "sha512-e82GVOE8Ps3E++Egvb6Y3Dw0S10u8NkQ9KXmtRhCWJJ8kDhOJTvtMAWnFL16kB1583goCWXsr0NieKCZMs2/0Q==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.60.1.tgz", + "integrity": "sha512-4h0tY8ppCkdCzcrl2YM5M3my0xsE1Tf8om3owEu5oPWmXwkKRmk0j0LGDzYBGUcAlesEbxBhazqu/K4cu3Ug7w==", "dev": true, "license": "MIT", "engines": { @@ -942,16 +895,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.2.tgz", - "integrity": "sha512-o0XPGNwcWw+FIwStOWn+BwBuEmL6QXP0rsvAFg7ET1dey1Nr6Wb1ac8p5HEsK0ygO/6mUxlk+YWQD9xcb/nnXg==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.1.tgz", + "integrity": "sha512-alpRkfG8hlVE5kdJW2GkfgDgXxold3e8e4l6EnmhRmRLbekgAPCCGDVD++sABy9FcgPFroq+uFcCSM1vR57Cew==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.59.2", - "@typescript-eslint/tsconfig-utils": "8.59.2", - "@typescript-eslint/types": "8.59.2", - "@typescript-eslint/visitor-keys": "8.59.2", + "@typescript-eslint/project-service": "8.60.1", + "@typescript-eslint/tsconfig-utils": "8.60.1", + "@typescript-eslint/types": "8.60.1", + "@typescript-eslint/visitor-keys": "8.60.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -969,29 +922,6 @@ "typescript": ">=4.8.4 <6.1.0" } }, - "node_modules/@typescript-eslint/typescript-estree/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/@typescript-eslint/typescript-estree/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==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^4.0.2" - }, - "engines": { - "node": "18 || 20 || >=22" - } - }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { "version": "10.2.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", @@ -1009,16 +939,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.2.tgz", - "integrity": "sha512-Juw3EinkXqjaffxz6roowvV7GZT/kET5vSKKZT6upl5TXdWkLkYmNPXwDDL2Vkt2DPn0nODIS4egC/0AGxKo/Q==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.60.1.tgz", + "integrity": "sha512-h2MPBLoNtjc3qZWfY3Tl51yPorQ2McHn8pJfcMNTcIvrrZrr90Ykffit0yjrPFWQcRcUxzH20+6OcVdW4yHtUg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.59.2", - "@typescript-eslint/types": "8.59.2", - "@typescript-eslint/typescript-estree": "8.59.2" + "@typescript-eslint/scope-manager": "8.60.1", + "@typescript-eslint/types": "8.60.1", + "@typescript-eslint/typescript-estree": "8.60.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1033,13 +963,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.2.tgz", - "integrity": "sha512-NwjLUnGy8/Zfx23fl50tRC8rYaYnM52xNRYFAXvmiil9yh1+K6aRVQMnzW6gQB/1DLgWt977lYQn7C+wtgXZiA==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.1.tgz", + "integrity": "sha512-EbGRQg4FhrmwLodl+t3JNAnXHWVr9Vp+Zl1QBZVPY4ByfkzIT8cX3K6QWODHtkIZqqJVEWvhHSx3v5PDHsaQag==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.59.2", + "@typescript-eslint/types": "8.60.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -1063,6 +993,61 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/@vscode/test-electron": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.5.2.tgz", + "integrity": "sha512-8ukpxv4wYe0iWMRQU18jhzJOHkeGKbnw7xWRX3Zw1WJA4cEKbHcmmLPdPrPtL6rhDcrlCZN+xKRpv09n4gRHYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.5", + "jszip": "^3.10.1", + "ora": "^8.1.0", + "semver": "^7.6.2" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/@vscode/test-electron/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/@vscode/test-electron/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/@vscode/test-electron/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/7zip-bin": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz", @@ -1091,18 +1076,6 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "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, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, "node_modules/ajv": { "version": "6.14.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", @@ -1161,43 +1134,27 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, - "node_modules/big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/binary": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", - "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==", + "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==", "dev": true, + "license": "MIT", "dependencies": { - "buffers": "~0.1.1", - "chainsaw": "~0.1.0" + "balanced-match": "^4.0.2" }, "engines": { - "node": "*" + "node": "18 || 20 || >=22" } }, - "node_modules/bluebird": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", - "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==", - "dev": true - }, - "node_modules/brace-expansion": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz", - "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==", + "node_modules/brace-expansion/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", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/browser-stdout": { @@ -1206,24 +1163,6 @@ "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true }, - "node_modules/buffer-indexof-polyfill": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz", - "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==", - "dev": true, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/buffers": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", - "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==", - "dev": true, - "engines": { - "node": ">=0.2.0" - } - }, "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", @@ -1265,18 +1204,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/chainsaw": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", - "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==", - "dev": true, - "dependencies": { - "traverse": ">=0.3.0 <0.4" - }, - "engines": { - "node": "*" - } - }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -1309,6 +1236,35 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/cli-cursor": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", + "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", + "dev": true, + "license": "MIT", + "dependencies": { + "restore-cursor": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-spinners": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "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", @@ -1405,12 +1361,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "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 - }, "node_modules/core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", @@ -1502,15 +1452,6 @@ "node": ">= 0.4" } }, - "node_modules/duplexer2": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", - "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==", - "dev": true, - "dependencies": { - "readable-stream": "^2.0.2" - } - }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -1544,9 +1485,9 @@ } }, "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==", + "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==", "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -1556,9 +1497,9 @@ } }, "node_modules/esbuild": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.6.tgz", - "integrity": "sha512-GVuzuUwtdsghE3ocJ9Bs8PNoF13HNQ5TXbEi2AhvVb8xU1Iwt9Fos9FEamfoee+u/TOsn7GUWc04lz46n2bbTg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.0.tgz", + "integrity": "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -1569,32 +1510,32 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.25.6", - "@esbuild/android-arm": "0.25.6", - "@esbuild/android-arm64": "0.25.6", - "@esbuild/android-x64": "0.25.6", - "@esbuild/darwin-arm64": "0.25.6", - "@esbuild/darwin-x64": "0.25.6", - "@esbuild/freebsd-arm64": "0.25.6", - "@esbuild/freebsd-x64": "0.25.6", - "@esbuild/linux-arm": "0.25.6", - "@esbuild/linux-arm64": "0.25.6", - "@esbuild/linux-ia32": "0.25.6", - "@esbuild/linux-loong64": "0.25.6", - "@esbuild/linux-mips64el": "0.25.6", - "@esbuild/linux-ppc64": "0.25.6", - "@esbuild/linux-riscv64": "0.25.6", - "@esbuild/linux-s390x": "0.25.6", - "@esbuild/linux-x64": "0.25.6", - "@esbuild/netbsd-arm64": "0.25.6", - "@esbuild/netbsd-x64": "0.25.6", - "@esbuild/openbsd-arm64": "0.25.6", - "@esbuild/openbsd-x64": "0.25.6", - "@esbuild/openharmony-arm64": "0.25.6", - "@esbuild/sunos-x64": "0.25.6", - "@esbuild/win32-arm64": "0.25.6", - "@esbuild/win32-ia32": "0.25.6", - "@esbuild/win32-x64": "0.25.6" + "@esbuild/aix-ppc64": "0.28.0", + "@esbuild/android-arm": "0.28.0", + "@esbuild/android-arm64": "0.28.0", + "@esbuild/android-x64": "0.28.0", + "@esbuild/darwin-arm64": "0.28.0", + "@esbuild/darwin-x64": "0.28.0", + "@esbuild/freebsd-arm64": "0.28.0", + "@esbuild/freebsd-x64": "0.28.0", + "@esbuild/linux-arm": "0.28.0", + "@esbuild/linux-arm64": "0.28.0", + "@esbuild/linux-ia32": "0.28.0", + "@esbuild/linux-loong64": "0.28.0", + "@esbuild/linux-mips64el": "0.28.0", + "@esbuild/linux-ppc64": "0.28.0", + "@esbuild/linux-riscv64": "0.28.0", + "@esbuild/linux-s390x": "0.28.0", + "@esbuild/linux-x64": "0.28.0", + "@esbuild/netbsd-arm64": "0.28.0", + "@esbuild/netbsd-x64": "0.28.0", + "@esbuild/openbsd-arm64": "0.28.0", + "@esbuild/openbsd-x64": "0.28.0", + "@esbuild/openharmony-arm64": "0.28.0", + "@esbuild/sunos-x64": "0.28.0", + "@esbuild/win32-arm64": "0.28.0", + "@esbuild/win32-ia32": "0.28.0", + "@esbuild/win32-x64": "0.28.0" } }, "node_modules/escalade": { @@ -1620,18 +1561,18 @@ } }, "node_modules/eslint": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.1.0.tgz", - "integrity": "sha512-S9jlY/ELKEUwwQnqWDO+f+m6sercqOPSqXM5Go94l7DOmxHVDgmSFGWEzeE/gwgTAr0W103BWt0QLe/7mabIvA==", + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.4.1.tgz", + "integrity": "sha512-AyIKhnOBuOAdueD7RB3xB+YeAWScb9jHsJBgH2Hcde8InP5JYhqrRR6iTMHyTEwgENK54Cp44e4v8BwNhsuHuw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.2", - "@eslint/config-array": "^0.23.3", - "@eslint/config-helpers": "^0.5.3", - "@eslint/core": "^1.1.1", - "@eslint/plugin-kit": "^0.6.1", + "@eslint/config-array": "^0.23.5", + "@eslint/config-helpers": "^0.6.0", + "@eslint/core": "^1.2.1", + "@eslint/plugin-kit": "^0.7.2", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", @@ -1707,29 +1648,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/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/eslint/node_modules/brace-expansion": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", - "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^4.0.2" - }, - "engines": { - "node": "18 || 20 || >=22" - } - }, "node_modules/eslint/node_modules/eslint-visitor-keys": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", @@ -1962,9 +1880,9 @@ } }, "node_modules/fs-extra": { - "version": "11.3.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", - "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", + "version": "11.3.5", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.5.tgz", + "integrity": "sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==", "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", @@ -1975,62 +1893,6 @@ "node": ">=14.14" } }, - "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/fstream": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", - "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - }, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/fstream/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "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/fstream/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -2050,6 +1912,19 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-east-asian-width": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz", + "integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/get-intrinsic": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", @@ -2118,29 +1993,6 @@ "node": ">=10.13.0" } }, - "node_modules/glob/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/glob/node_modules/brace-expansion": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", - "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^4.0.2" - }, - "engines": { - "node": "18 || 20 || >=22" - } - }, "node_modules/glob/node_modules/minimatch": { "version": "10.2.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", @@ -2196,9 +2048,9 @@ } }, "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "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" @@ -2216,33 +2068,6 @@ "he": "bin/he" } }, - "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, - "dependencies": { - "@tootallnate/once": "1", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "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, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/ignore": { "version": "7.0.5", "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", @@ -2253,6 +2078,13 @@ "node": ">= 4" } }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "dev": true, + "license": "MIT" + }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -2263,18 +2095,6 @@ "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", @@ -2313,6 +2133,19 @@ "node": ">=0.10.0" } }, + "node_modules/is-interactive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", + "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "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", @@ -2408,6 +2241,19 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dev": true, + "license": "(MIT OR GPL-3.0-or-later)", + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -2432,11 +2278,15 @@ "node": ">= 0.8.0" } }, - "node_modules/listenercount": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz", - "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==", - "dev": true + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "immediate": "~3.0.5" + } }, "node_modules/locate-path": { "version": "6.0.0", @@ -2513,34 +2363,25 @@ "node": ">= 0.4" } }, + "node_modules/mimic-function": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", + "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", "license": "ISC" }, - "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/minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", - "dev": true, - "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", @@ -2551,22 +2392,10 @@ "node": ">=16 || 14 >=14.17" } }, - "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, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, "node_modules/mocha": { - "version": "11.7.5", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.5.tgz", - "integrity": "sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig==", + "version": "11.7.6", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.6.tgz", + "integrity": "sha512-nS9xOGbw2I3cjCpxwZAEJ9xK9lmJ08vEkQvLtz4du9ZrF9UrjRpeJGiIgl2Z+Qs++pmB4ecDe48Fwsh+j+j7xA==", "dev": true, "license": "MIT", "dependencies": { @@ -2765,14 +2594,20 @@ "url": "https://github.com/sponsors/ljharb" } }, - "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==", + "node_modules/onetime": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", + "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", "dev": true, - "license": "ISC", + "license": "MIT", "dependencies": { - "wrappy": "1" + "mimic-function": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/optionator": { @@ -2793,6 +2628,111 @@ "node": ">= 0.8.0" } }, + "node_modules/ora": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/ora/-/ora-8.2.0.tgz", + "integrity": "sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^5.3.0", + "cli-cursor": "^5.0.0", + "cli-spinners": "^2.9.2", + "is-interactive": "^2.0.0", + "is-unicode-supported": "^2.0.0", + "log-symbols": "^6.0.0", + "stdin-discarder": "^0.2.2", + "string-width": "^7.2.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/chalk": { + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz", + "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/ora/node_modules/emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", + "dev": true, + "license": "MIT" + }, + "node_modules/ora/node_modules/is-unicode-supported": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz", + "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/log-symbols": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-6.0.0.tgz", + "integrity": "sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^5.3.0", + "is-unicode-supported": "^1.3.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/log-symbols/node_modules/is-unicode-supported": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz", + "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/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==", + "dev": true, + "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/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -2830,6 +2770,13 @@ "dev": true, "license": "BlueOak-1.0.0" }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true, + "license": "(MIT AND Zlib)" + }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -2839,16 +2786,6 @@ "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-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -2923,9 +2860,9 @@ } }, "node_modules/qs": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz", - "integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==", + "version": "6.15.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz", + "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==", "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.1.0" @@ -2982,41 +2919,21 @@ "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==", + "node_modules/restore-cursor": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", + "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", "dev": true, + "license": "MIT", "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "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": "Glob versions prior to v9 are no longer supported", - "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" + "onetime": "^7.0.0", + "signal-exit": "^4.1.0" }, "engines": { - "node": "*" + "node": ">=18" }, "funding": { - "url": "https://github.com/sponsors/isaacs" + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/semver": { @@ -3091,13 +3008,13 @@ } }, "node_modules/side-channel-list": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", - "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "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==", "license": "MIT", "dependencies": { "es-errors": "^1.3.0", - "object-inspect": "^1.13.3" + "object-inspect": "^1.13.4" }, "engines": { "node": ">= 0.4" @@ -3156,6 +3073,19 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/stdin-discarder": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.2.2.tgz", + "integrity": "sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -3300,9 +3230,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==", "dev": true, "license": "MIT", "dependencies": { @@ -3316,15 +3246,6 @@ "url": "https://github.com/sponsors/SuperchupuDev" } }, - "node_modules/traverse": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", - "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==", - "dev": true, - "engines": { - "node": "*" - } - }, "node_modules/ts-api-utils": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz", @@ -3360,14 +3281,14 @@ } }, "node_modules/typed-rest-client": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.3.0.tgz", - "integrity": "sha512-FfBj5tjviexjIus3La4n4s9i+f81Zj7HU+lUlQWK219HMRfmzLsbIf4PZF2+X6EouJKyuANpvvef5VrUWM4AFw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-3.0.0.tgz", + "integrity": "sha512-J1KaEgK4jvnShMs+Y/oRbWYUKG5chdE5jgCinPWqlP+qXcznJqY2SiGcckKEHeQEiRZQAE4kAfepvCzx5ACQtw==", "license": "MIT", "dependencies": { "des.js": "^1.1.0", "js-md4": "^0.3.2", - "qs": "^6.14.1", + "qs": "6.15.1", "tunnel": "0.0.6", "underscore": "^1.13.8" }, @@ -3376,9 +3297,9 @@ } }, "node_modules/typescript": { - "version": "5.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", - "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "dev": true, "license": "Apache-2.0", "bin": { @@ -3390,16 +3311,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.59.2.tgz", - "integrity": "sha512-pJw051uomb3ZeCzGTpRb8RbEqB5Y4WWet8gl/GcTlU35BSx0PVdZ86/bqkQCyKKuraVQEK7r6kBHQXF+fBhkoQ==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.60.1.tgz", + "integrity": "sha512-6m5hkkRAp8lKvhVpcprAIn5KkehQEh+47oHH2VGnExEh7dhNxXlg6GPAOIu6TxbVQxhebrJDvjl3020ooiWCMA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.59.2", - "@typescript-eslint/parser": "8.59.2", - "@typescript-eslint/typescript-estree": "8.59.2", - "@typescript-eslint/utils": "8.59.2" + "@typescript-eslint/eslint-plugin": "8.60.1", + "@typescript-eslint/parser": "8.60.1", + "@typescript-eslint/typescript-estree": "8.60.1", + "@typescript-eslint/utils": "8.60.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3420,36 +3341,18 @@ "license": "MIT" }, "node_modules/undici-types": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz", - "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==", + "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" }, "node_modules/universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/unzipper": { - "version": "0.10.11", - "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz", - "integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==", - "dev": true, - "dependencies": { - "big-integer": "^1.6.17", - "binary": "~0.3.0", - "bluebird": "~3.4.1", - "buffer-indexof-polyfill": "~1.0.0", - "duplexer2": "~0.1.4", - "fstream": "^1.0.12", - "graceful-fs": "^4.2.2", - "listenercount": "~1.0.1", - "readable-stream": "~2.3.6", - "setimmediate": "~1.0.4" + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "engines": { + "node": ">= 10.0.0" } }, "node_modules/uri-js": { @@ -3468,22 +3371,6 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true }, - "node_modules/vscode-test": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.6.1.tgz", - "integrity": "sha512-086q88T2ca1k95mUzffvbzb7esqQNvJgiwY4h29ukPhFo8u+vXOOmelUoU5EQUHs3Of8+JuQ3oGdbVCqaxuTXA==", - "deprecated": "This package has been renamed to @vscode/test-electron, please update to the new name", - "dev": true, - "dependencies": { - "http-proxy-agent": "^4.0.1", - "https-proxy-agent": "^5.0.0", - "rimraf": "^3.0.2", - "unzipper": "^0.10.11" - }, - "engines": { - "node": ">=8.9.3" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -3612,13 +3499,6 @@ "url": "https://github.com/chalk/ansi-styles?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/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -3630,9 +3510,9 @@ } }, "node_modules/yaml": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz", - "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.0.tgz", + "integrity": "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==", "license": "ISC", "bin": { "yaml": "bin.mjs" @@ -3748,184 +3628,184 @@ }, "dependencies": { "@esbuild/aix-ppc64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.6.tgz", - "integrity": "sha512-ShbM/3XxwuxjFiuVBHA+d3j5dyac0aEVVq1oluIDf71hUw0aRF59dV/efUsIwFnR6m8JNM2FjZOzmaZ8yG61kw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz", + "integrity": "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==", "dev": true, "optional": true }, "@esbuild/android-arm": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.6.tgz", - "integrity": "sha512-S8ToEOVfg++AU/bHwdksHNnyLyVM+eMVAOf6yRKFitnwnbwwPNqKr3srzFRe7nzV69RQKb5DgchIX5pt3L53xg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.0.tgz", + "integrity": "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==", "dev": true, "optional": true }, "@esbuild/android-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.6.tgz", - "integrity": "sha512-hd5zdUarsK6strW+3Wxi5qWws+rJhCCbMiC9QZyzoxfk5uHRIE8T287giQxzVpEvCwuJ9Qjg6bEjcRJcgfLqoA==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz", + "integrity": "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==", "dev": true, "optional": true }, "@esbuild/android-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.6.tgz", - "integrity": "sha512-0Z7KpHSr3VBIO9A/1wcT3NTy7EB4oNC4upJ5ye3R7taCc2GUdeynSLArnon5G8scPwaU866d3H4BCrE5xLW25A==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.0.tgz", + "integrity": "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==", "dev": true, "optional": true }, "@esbuild/darwin-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.6.tgz", - "integrity": "sha512-FFCssz3XBavjxcFxKsGy2DYK5VSvJqa6y5HXljKzhRZ87LvEi13brPrf/wdyl/BbpbMKJNOr1Sd0jtW4Ge1pAA==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz", + "integrity": "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==", "dev": true, "optional": true }, "@esbuild/darwin-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.6.tgz", - "integrity": "sha512-GfXs5kry/TkGM2vKqK2oyiLFygJRqKVhawu3+DOCk7OxLy/6jYkWXhlHwOoTb0WqGnWGAS7sooxbZowy+pK9Yg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz", + "integrity": "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==", "dev": true, "optional": true }, "@esbuild/freebsd-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.6.tgz", - "integrity": "sha512-aoLF2c3OvDn2XDTRvn8hN6DRzVVpDlj2B/F66clWd/FHLiHaG3aVZjxQX2DYphA5y/evbdGvC6Us13tvyt4pWg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz", + "integrity": "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==", "dev": true, "optional": true }, "@esbuild/freebsd-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.6.tgz", - "integrity": "sha512-2SkqTjTSo2dYi/jzFbU9Plt1vk0+nNg8YC8rOXXea+iA3hfNJWebKYPs3xnOUf9+ZWhKAaxnQNUf2X9LOpeiMQ==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz", + "integrity": "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==", "dev": true, "optional": true }, "@esbuild/linux-arm": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.6.tgz", - "integrity": "sha512-SZHQlzvqv4Du5PrKE2faN0qlbsaW/3QQfUUc6yO2EjFcA83xnwm91UbEEVx4ApZ9Z5oG8Bxz4qPE+HFwtVcfyw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz", + "integrity": "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==", "dev": true, "optional": true }, "@esbuild/linux-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.6.tgz", - "integrity": "sha512-b967hU0gqKd9Drsh/UuAm21Khpoh6mPBSgz8mKRq4P5mVK8bpA+hQzmm/ZwGVULSNBzKdZPQBRT3+WuVavcWsQ==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz", + "integrity": "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==", "dev": true, "optional": true }, "@esbuild/linux-ia32": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.6.tgz", - "integrity": "sha512-aHWdQ2AAltRkLPOsKdi3xv0mZ8fUGPdlKEjIEhxCPm5yKEThcUjHpWB1idN74lfXGnZ5SULQSgtr5Qos5B0bPw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz", + "integrity": "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==", "dev": true, "optional": true }, "@esbuild/linux-loong64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.6.tgz", - "integrity": "sha512-VgKCsHdXRSQ7E1+QXGdRPlQ/e08bN6WMQb27/TMfV+vPjjTImuT9PmLXupRlC90S1JeNNW5lzkAEO/McKeJ2yg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz", + "integrity": "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==", "dev": true, "optional": true }, "@esbuild/linux-mips64el": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.6.tgz", - "integrity": "sha512-WViNlpivRKT9/py3kCmkHnn44GkGXVdXfdc4drNmRl15zVQ2+D2uFwdlGh6IuK5AAnGTo2qPB1Djppj+t78rzw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz", + "integrity": "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==", "dev": true, "optional": true }, "@esbuild/linux-ppc64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.6.tgz", - "integrity": "sha512-wyYKZ9NTdmAMb5730I38lBqVu6cKl4ZfYXIs31Baf8aoOtB4xSGi3THmDYt4BTFHk7/EcVixkOV2uZfwU3Q2Jw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz", + "integrity": "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==", "dev": true, "optional": true }, "@esbuild/linux-riscv64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.6.tgz", - "integrity": "sha512-KZh7bAGGcrinEj4qzilJ4hqTY3Dg2U82c8bv+e1xqNqZCrCyc+TL9AUEn5WGKDzm3CfC5RODE/qc96OcbIe33w==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz", + "integrity": "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==", "dev": true, "optional": true }, "@esbuild/linux-s390x": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.6.tgz", - "integrity": "sha512-9N1LsTwAuE9oj6lHMyyAM+ucxGiVnEqUdp4v7IaMmrwb06ZTEVCIs3oPPplVsnjPfyjmxwHxHMF8b6vzUVAUGw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz", + "integrity": "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==", "dev": true, "optional": true }, "@esbuild/linux-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.6.tgz", - "integrity": "sha512-A6bJB41b4lKFWRKNrWoP2LHsjVzNiaurf7wyj/XtFNTsnPuxwEBWHLty+ZE0dWBKuSK1fvKgrKaNjBS7qbFKig==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz", + "integrity": "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==", "dev": true, "optional": true }, "@esbuild/netbsd-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.6.tgz", - "integrity": "sha512-IjA+DcwoVpjEvyxZddDqBY+uJ2Snc6duLpjmkXm/v4xuS3H+3FkLZlDm9ZsAbF9rsfP3zeA0/ArNDORZgrxR/Q==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz", + "integrity": "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==", "dev": true, "optional": true }, "@esbuild/netbsd-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.6.tgz", - "integrity": "sha512-dUXuZr5WenIDlMHdMkvDc1FAu4xdWixTCRgP7RQLBOkkGgwuuzaGSYcOpW4jFxzpzL1ejb8yF620UxAqnBrR9g==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz", + "integrity": "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==", "dev": true, "optional": true }, "@esbuild/openbsd-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.6.tgz", - "integrity": "sha512-l8ZCvXP0tbTJ3iaqdNf3pjaOSd5ex/e6/omLIQCVBLmHTlfXW3zAxQ4fnDmPLOB1x9xrcSi/xtCWFwCZRIaEwg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz", + "integrity": "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==", "dev": true, "optional": true }, "@esbuild/openbsd-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.6.tgz", - "integrity": "sha512-hKrmDa0aOFOr71KQ/19JC7az1P0GWtCN1t2ahYAf4O007DHZt/dW8ym5+CUdJhQ/qkZmI1HAF8KkJbEFtCL7gw==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz", + "integrity": "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==", "dev": true, "optional": true }, "@esbuild/openharmony-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.6.tgz", - "integrity": "sha512-+SqBcAWoB1fYKmpWoQP4pGtx+pUUC//RNYhFdbcSA16617cchuryuhOCRpPsjCblKukAckWsV+aQ3UKT/RMPcA==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz", + "integrity": "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==", "dev": true, "optional": true }, "@esbuild/sunos-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.6.tgz", - "integrity": "sha512-dyCGxv1/Br7MiSC42qinGL8KkG4kX0pEsdb0+TKhmJZgCUDBGmyo1/ArCjNGiOLiIAgdbWgmWgib4HoCi5t7kA==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz", + "integrity": "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==", "dev": true, "optional": true }, "@esbuild/win32-arm64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.6.tgz", - "integrity": "sha512-42QOgcZeZOvXfsCBJF5Afw73t4veOId//XD3i+/9gSkhSV6Gk3VPlWncctI+JcOyERv85FUo7RxuxGy+z8A43Q==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz", + "integrity": "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==", "dev": true, "optional": true }, "@esbuild/win32-ia32": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.6.tgz", - "integrity": "sha512-4AWhgXmDuYN7rJI6ORB+uU9DHLq/erBbuMoAuB4VWJTu5KtCgcKYPynF0YI1VkBNuEfjNlLrFr9KZPJzrtLkrQ==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz", + "integrity": "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==", "dev": true, "optional": true }, "@esbuild/win32-x64": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.6.tgz", - "integrity": "sha512-NgJPHHbEpLQgDH2MjQu90pzW/5vvXIZ7KOnPyNBm92A6WgZ/7b6fJyUBjoumLqeOQQGqY2QjQxRo97ah4Sj0cA==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz", + "integrity": "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==", "dev": true, "optional": true }, @@ -3945,31 +3825,16 @@ "dev": true }, "@eslint/config-array": { - "version": "0.23.3", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.3.tgz", - "integrity": "sha512-j+eEWmB6YYLwcNOdlwQ6L2OsptI/LO6lNBuLIqe5R7RetD658HLoF+Mn7LzYmAWWNNzdC6cqP+L6r8ujeYXWLw==", + "version": "0.23.5", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.5.tgz", + "integrity": "sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==", "dev": true, "requires": { - "@eslint/object-schema": "^3.0.3", + "@eslint/object-schema": "^3.0.5", "debug": "^4.3.1", "minimatch": "^10.2.4" }, "dependencies": { - "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 - }, - "brace-expansion": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", - "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", - "dev": true, - "requires": { - "balanced-match": "^4.0.2" - } - }, "minimatch": { "version": "10.2.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", @@ -3982,36 +3847,36 @@ } }, "@eslint/config-helpers": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.3.tgz", - "integrity": "sha512-lzGN0onllOZCGroKJmRwY6QcEHxbjBw1gwB8SgRSqK8YbbtEXMvKynsXc3553ckIEBxsbMBU7oOZXKIPGZNeZw==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.6.0.tgz", + "integrity": "sha512-ii6Bw9jJ2zi2cWA2Z+9/QZ/+3DX6kwaV5Q986D/CdP3Lap3w/pgQZ373FV7byY/i7L4IRH/G43I5dz1ClsCbpA==", "dev": true, "requires": { - "@eslint/core": "^1.1.1" + "@eslint/core": "^1.2.1" } }, "@eslint/core": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.1.1.tgz", - "integrity": "sha512-QUPblTtE51/7/Zhfv8BDwO0qkkzQL7P/aWWbqcf4xWLEYn1oKjdO0gglQBB4GAsu7u6wjijbCmzsUTy6mnk6oQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.1.tgz", + "integrity": "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.15" } }, "@eslint/object-schema": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.3.tgz", - "integrity": "sha512-iM869Pugn9Nsxbh/YHRqYiqd23AmIbxJOcpUMOuWCVNdoQJ5ZtwL6h3t0bcZzJUlC3Dq9jCFCESBZnX0GTv7iQ==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz", + "integrity": "sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==", "dev": true }, "@eslint/plugin-kit": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.6.1.tgz", - "integrity": "sha512-iH1B076HoAshH1mLpHMgwdGeTs0CYwL0SPMkGuSebZrwBp16v415e9NZXg2jtrqPVQjf6IANe2Vtlr5KswtcZQ==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.2.tgz", + "integrity": "sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==", "dev": true, "requires": { - "@eslint/core": "^1.1.1", + "@eslint/core": "^1.2.1", "levn": "^0.4.1" } }, @@ -4064,12 +3929,6 @@ "dev": true, "optional": true }, - "@tootallnate/once": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-3.0.1.tgz", - "integrity": "sha512-VyMVKRrpHTT8PnotUeV8L/mDaMwD5DaAKCFLP73zAqAtvF0FCqky+Ki7BYbFCYQmqFyTe9316Ed5zS70QUR9eg==", - "dev": true - }, "@types/esrecurse": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/@types/esrecurse/-/esrecurse-4.3.1.tgz", @@ -4092,15 +3951,6 @@ "@types/node": "*" } }, - "@types/glob": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-9.0.0.tgz", - "integrity": "sha512-00UxlRaIUvYm4R4W9WYkN8/J+kV8fmOQ7okeH6YFtGWFMt3odD45tpG5yA5wnL7HE6lLgjaTW5n14ju2hl2NNA==", - "dev": true, - "requires": { - "glob": "*" - } - }, "@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -4123,115 +3973,115 @@ "dev": true }, "@types/node": { - "version": "24.0.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.12.tgz", - "integrity": "sha512-LtOrbvDf5ndC9Xi+4QZjVL0woFymF/xSTKZKPgrrl7H7XoeDvnD+E2IclKVDyaK9UM756W/3BXqSU+JEHopA9g==", + "version": "25.9.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.1.tgz", + "integrity": "sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==", "dev": true, "requires": { - "undici-types": "~7.8.0" + "undici-types": ">=7.24.0 <7.24.7" } }, "@types/node-7z": { - "version": "2.1.10", - "resolved": "https://registry.npmjs.org/@types/node-7z/-/node-7z-2.1.10.tgz", - "integrity": "sha512-LdfuQcGAKsLafyM96+F8VekToCuGQnFy9DMM0UdS6f5pEnaP5kAixp3TQPc1NJU4C6IwLwnednktYBjp/z2LRw==", + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/@types/node-7z/-/node-7z-2.1.11.tgz", + "integrity": "sha512-7gwLx44tqZqjyrvjkX41CWW4h7+aXrazFg/JR6N5g+R5BW1eqsNuw8SNLWrh7KcnfKhAYFiWyNb10ti5v5eCmQ==", "dev": true, "requires": { "@types/node": "*" } }, "@types/vscode": { - "version": "1.101.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.101.0.tgz", - "integrity": "sha512-ZWf0IWa+NGegdW3iU42AcDTFHWW7fApLdkdnBqwYEtHVIBGbTu0ZNQKP/kX3Ds/uMJXIMQNAojHR4vexCEEz5Q==", + "version": "1.120.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.120.0.tgz", + "integrity": "sha512-feaT4Rst+FkTch5zz/ZbNCxoIvo55YU80Be2kiL7OJcod4+CUYf2lUBPdIJzozNnSEMq1VRTGrWEcCGFB3fBmA==", "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.2.tgz", - "integrity": "sha512-j/bwmkBvHUtPNxzuWe5z6BEk3q54YRyGlBXkSsmfoih7zNrBvl5A9A98anlp/7JbyZcWIJ8KXo/3Tq/DjFLtuQ==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.60.1.tgz", + "integrity": "sha512-JQ4S5GB0tfjO8BuJ4fcX+HodkzJjYBV+7OJ+wLygaX7OGQ7FudyHL4NSCA6ob+w3Yn+5MkKIozOwQhXeM7opVg==", "dev": true, "requires": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.59.2", - "@typescript-eslint/type-utils": "8.59.2", - "@typescript-eslint/utils": "8.59.2", - "@typescript-eslint/visitor-keys": "8.59.2", + "@typescript-eslint/scope-manager": "8.60.1", + "@typescript-eslint/type-utils": "8.60.1", + "@typescript-eslint/utils": "8.60.1", + "@typescript-eslint/visitor-keys": "8.60.1", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" } }, "@typescript-eslint/parser": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.2.tgz", - "integrity": "sha512-plR3pp6D+SSUn1HM7xvSkx12/DhoHInI2YF35KAcVFNZvlC0gtrWqx7Qq1oH2Ssgi0vlFRCTbP+DZc7B9+TtsQ==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.60.1.tgz", + "integrity": "sha512-A0M6ua6H252bVjPvvtSgl2QA4+ET9S5Mtkb2GDyTxIhH/C4qDItT7RQNO5PhMC6NXGYXOR9dIalcDDgBKT7oFA==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "8.59.2", - "@typescript-eslint/types": "8.59.2", - "@typescript-eslint/typescript-estree": "8.59.2", - "@typescript-eslint/visitor-keys": "8.59.2", + "@typescript-eslint/scope-manager": "8.60.1", + "@typescript-eslint/types": "8.60.1", + "@typescript-eslint/typescript-estree": "8.60.1", + "@typescript-eslint/visitor-keys": "8.60.1", "debug": "^4.4.3" } }, "@typescript-eslint/project-service": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.2.tgz", - "integrity": "sha512-+2hqvEkeyf/0FBor67duF0Ll7Ot8jyKzDQOSrxazF/danillRq2DwR9dLptsXpoZQqxE1UisSmoZewrlPas9Vw==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.60.1.tgz", + "integrity": "sha512-eXkTH2bxmXlqD1RnOPmLZ9ZM9D3VwSx04JOwBnP9RQ+yUA5a2Mu7SfW8uaV2Aon53NJzZlZYuX7tn91Izf+xaw==", "dev": true, "requires": { - "@typescript-eslint/tsconfig-utils": "^8.59.2", - "@typescript-eslint/types": "^8.59.2", + "@typescript-eslint/tsconfig-utils": "^8.60.1", + "@typescript-eslint/types": "^8.60.1", "debug": "^4.4.3" } }, "@typescript-eslint/scope-manager": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.2.tgz", - "integrity": "sha512-JzfyEpEtOU89CcFSwyNS3mu4MLvLSXqnmX05+aKBDM+TdR5jzcGOEBwxwGNxrEQ7p/z6kK2WyioCGBf2zZBnvg==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.60.1.tgz", + "integrity": "sha512-gvI5OQoptnxQnchOirukCuQ55svJSTuD/4k5+pC267xyBtYry748R9/c3tYUzb/iE6RZfllRz2lVulLCHkTm4w==", "dev": true, "requires": { - "@typescript-eslint/types": "8.59.2", - "@typescript-eslint/visitor-keys": "8.59.2" + "@typescript-eslint/types": "8.60.1", + "@typescript-eslint/visitor-keys": "8.60.1" } }, "@typescript-eslint/tsconfig-utils": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.2.tgz", - "integrity": "sha512-BKK4alN7oi4C/zv4VqHQ+uRU+lTa6JGIZ7s1juw7b3RHo9OfKB+bKX3u0iVZetdsUCBBkSbdWbarJbmN0fTeSw==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.1.tgz", + "integrity": "sha512-nh8w4qAteiKuZu3pSSzG/yGKpw0OlkrKnzFmbVRenKaD4qc+7i1GrmZaLVkr8rk4uipiPGMOW4YsM6WmKZ5CvA==", "dev": true, "requires": {} }, "@typescript-eslint/type-utils": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.59.2.tgz", - "integrity": "sha512-nhqaj1nmTdVVl/BP5omXNRGO38jn5iosis2vbdmupF2txCf8ylWT8lx+JlvMYYVqzGVKtjojUFoQ3JRWK+mfzQ==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.60.1.tgz", + "integrity": "sha512-sdwTrpjosW7ANQYJ39ZBF1ZyEMEGVB2UsikrserVM/30a/F1dTLnu9bGxEdosugyu5caigjLrR2qiD11asjI1A==", "dev": true, "requires": { - "@typescript-eslint/types": "8.59.2", - "@typescript-eslint/typescript-estree": "8.59.2", - "@typescript-eslint/utils": "8.59.2", + "@typescript-eslint/types": "8.60.1", + "@typescript-eslint/typescript-estree": "8.60.1", + "@typescript-eslint/utils": "8.60.1", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" } }, "@typescript-eslint/types": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.2.tgz", - "integrity": "sha512-e82GVOE8Ps3E++Egvb6Y3Dw0S10u8NkQ9KXmtRhCWJJ8kDhOJTvtMAWnFL16kB1583goCWXsr0NieKCZMs2/0Q==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.60.1.tgz", + "integrity": "sha512-4h0tY8ppCkdCzcrl2YM5M3my0xsE1Tf8om3owEu5oPWmXwkKRmk0j0LGDzYBGUcAlesEbxBhazqu/K4cu3Ug7w==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.2.tgz", - "integrity": "sha512-o0XPGNwcWw+FIwStOWn+BwBuEmL6QXP0rsvAFg7ET1dey1Nr6Wb1ac8p5HEsK0ygO/6mUxlk+YWQD9xcb/nnXg==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.1.tgz", + "integrity": "sha512-alpRkfG8hlVE5kdJW2GkfgDgXxold3e8e4l6EnmhRmRLbekgAPCCGDVD++sABy9FcgPFroq+uFcCSM1vR57Cew==", "dev": true, "requires": { - "@typescript-eslint/project-service": "8.59.2", - "@typescript-eslint/tsconfig-utils": "8.59.2", - "@typescript-eslint/types": "8.59.2", - "@typescript-eslint/visitor-keys": "8.59.2", + "@typescript-eslint/project-service": "8.60.1", + "@typescript-eslint/tsconfig-utils": "8.60.1", + "@typescript-eslint/types": "8.60.1", + "@typescript-eslint/visitor-keys": "8.60.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -4239,21 +4089,6 @@ "ts-api-utils": "^2.5.0" }, "dependencies": { - "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 - }, - "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==", - "dev": true, - "requires": { - "balanced-match": "^4.0.2" - } - }, "minimatch": { "version": "10.2.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", @@ -4266,24 +4101,24 @@ } }, "@typescript-eslint/utils": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.2.tgz", - "integrity": "sha512-Juw3EinkXqjaffxz6roowvV7GZT/kET5vSKKZT6upl5TXdWkLkYmNPXwDDL2Vkt2DPn0nODIS4egC/0AGxKo/Q==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.60.1.tgz", + "integrity": "sha512-h2MPBLoNtjc3qZWfY3Tl51yPorQ2McHn8pJfcMNTcIvrrZrr90Ykffit0yjrPFWQcRcUxzH20+6OcVdW4yHtUg==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.59.2", - "@typescript-eslint/types": "8.59.2", - "@typescript-eslint/typescript-estree": "8.59.2" + "@typescript-eslint/scope-manager": "8.60.1", + "@typescript-eslint/types": "8.60.1", + "@typescript-eslint/typescript-estree": "8.60.1" } }, "@typescript-eslint/visitor-keys": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.2.tgz", - "integrity": "sha512-NwjLUnGy8/Zfx23fl50tRC8rYaYnM52xNRYFAXvmiil9yh1+K6aRVQMnzW6gQB/1DLgWt977lYQn7C+wtgXZiA==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.1.tgz", + "integrity": "sha512-EbGRQg4FhrmwLodl+t3JNAnXHWVr9Vp+Zl1QBZVPY4ByfkzIT8cX3K6QWODHtkIZqqJVEWvhHSx3v5PDHsaQag==", "dev": true, "requires": { - "@typescript-eslint/types": "8.59.2", + "@typescript-eslint/types": "8.60.1", "eslint-visitor-keys": "^5.0.0" }, "dependencies": { @@ -4295,6 +4130,47 @@ } } }, + "@vscode/test-electron": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.5.2.tgz", + "integrity": "sha512-8ukpxv4wYe0iWMRQU18jhzJOHkeGKbnw7xWRX3Zw1WJA4cEKbHcmmLPdPrPtL6rhDcrlCZN+xKRpv09n4gRHYg==", + "dev": true, + "requires": { + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.5", + "jszip": "^3.10.1", + "ora": "^8.1.0", + "semver": "^7.6.2" + }, + "dependencies": { + "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 + }, + "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, + "requires": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + } + }, + "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, + "requires": { + "agent-base": "^7.1.2", + "debug": "4" + } + } + } + }, "7zip-bin": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz", @@ -4313,15 +4189,6 @@ "dev": true, "requires": {} }, - "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, - "requires": { - "debug": "4" - } - }, "ajv": { "version": "6.14.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", @@ -4361,36 +4228,21 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, - "big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", - "dev": true - }, - "binary": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", - "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==", - "dev": true, - "requires": { - "buffers": "~0.1.1", - "chainsaw": "~0.1.0" - } - }, - "bluebird": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", - "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==", - "dev": true - }, "brace-expansion": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz", - "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", + "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", "dev": true, "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "balanced-match": "^4.0.2" + }, + "dependencies": { + "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 + } } }, "browser-stdout": { @@ -4399,18 +4251,6 @@ "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true }, - "buffer-indexof-polyfill": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz", - "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==", - "dev": true - }, - "buffers": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", - "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==", - "dev": true - }, "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", @@ -4435,15 +4275,6 @@ "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true }, - "chainsaw": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", - "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==", - "dev": true, - "requires": { - "traverse": ">=0.3.0 <0.4" - } - }, "chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -4463,6 +4294,21 @@ "readdirp": "^4.0.1" } }, + "cli-cursor": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", + "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", + "dev": true, + "requires": { + "restore-cursor": "^5.0.0" + } + }, + "cli-spinners": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "dev": true + }, "cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", @@ -4534,12 +4380,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, "core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", @@ -4602,15 +4442,6 @@ "gopd": "^1.2.0" } }, - "duplexer2": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", - "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==", - "dev": true, - "requires": { - "readable-stream": "^2.0.2" - } - }, "eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -4634,45 +4465,45 @@ "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" }, "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==", + "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==", "requires": { "es-errors": "^1.3.0" } }, "esbuild": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.6.tgz", - "integrity": "sha512-GVuzuUwtdsghE3ocJ9Bs8PNoF13HNQ5TXbEi2AhvVb8xU1Iwt9Fos9FEamfoee+u/TOsn7GUWc04lz46n2bbTg==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.0.tgz", + "integrity": "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==", "dev": true, "requires": { - "@esbuild/aix-ppc64": "0.25.6", - "@esbuild/android-arm": "0.25.6", - "@esbuild/android-arm64": "0.25.6", - "@esbuild/android-x64": "0.25.6", - "@esbuild/darwin-arm64": "0.25.6", - "@esbuild/darwin-x64": "0.25.6", - "@esbuild/freebsd-arm64": "0.25.6", - "@esbuild/freebsd-x64": "0.25.6", - "@esbuild/linux-arm": "0.25.6", - "@esbuild/linux-arm64": "0.25.6", - "@esbuild/linux-ia32": "0.25.6", - "@esbuild/linux-loong64": "0.25.6", - "@esbuild/linux-mips64el": "0.25.6", - "@esbuild/linux-ppc64": "0.25.6", - "@esbuild/linux-riscv64": "0.25.6", - "@esbuild/linux-s390x": "0.25.6", - "@esbuild/linux-x64": "0.25.6", - "@esbuild/netbsd-arm64": "0.25.6", - "@esbuild/netbsd-x64": "0.25.6", - "@esbuild/openbsd-arm64": "0.25.6", - "@esbuild/openbsd-x64": "0.25.6", - "@esbuild/openharmony-arm64": "0.25.6", - "@esbuild/sunos-x64": "0.25.6", - "@esbuild/win32-arm64": "0.25.6", - "@esbuild/win32-ia32": "0.25.6", - "@esbuild/win32-x64": "0.25.6" + "@esbuild/aix-ppc64": "0.28.0", + "@esbuild/android-arm": "0.28.0", + "@esbuild/android-arm64": "0.28.0", + "@esbuild/android-x64": "0.28.0", + "@esbuild/darwin-arm64": "0.28.0", + "@esbuild/darwin-x64": "0.28.0", + "@esbuild/freebsd-arm64": "0.28.0", + "@esbuild/freebsd-x64": "0.28.0", + "@esbuild/linux-arm": "0.28.0", + "@esbuild/linux-arm64": "0.28.0", + "@esbuild/linux-ia32": "0.28.0", + "@esbuild/linux-loong64": "0.28.0", + "@esbuild/linux-mips64el": "0.28.0", + "@esbuild/linux-ppc64": "0.28.0", + "@esbuild/linux-riscv64": "0.28.0", + "@esbuild/linux-s390x": "0.28.0", + "@esbuild/linux-x64": "0.28.0", + "@esbuild/netbsd-arm64": "0.28.0", + "@esbuild/netbsd-x64": "0.28.0", + "@esbuild/openbsd-arm64": "0.28.0", + "@esbuild/openbsd-x64": "0.28.0", + "@esbuild/openharmony-arm64": "0.28.0", + "@esbuild/sunos-x64": "0.28.0", + "@esbuild/win32-arm64": "0.28.0", + "@esbuild/win32-ia32": "0.28.0", + "@esbuild/win32-x64": "0.28.0" } }, "escalade": { @@ -4688,17 +4519,17 @@ "dev": true }, "eslint": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.1.0.tgz", - "integrity": "sha512-S9jlY/ELKEUwwQnqWDO+f+m6sercqOPSqXM5Go94l7DOmxHVDgmSFGWEzeE/gwgTAr0W103BWt0QLe/7mabIvA==", + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.4.1.tgz", + "integrity": "sha512-AyIKhnOBuOAdueD7RB3xB+YeAWScb9jHsJBgH2Hcde8InP5JYhqrRR6iTMHyTEwgENK54Cp44e4v8BwNhsuHuw==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.2", - "@eslint/config-array": "^0.23.3", - "@eslint/config-helpers": "^0.5.3", - "@eslint/core": "^1.1.1", - "@eslint/plugin-kit": "^0.6.1", + "@eslint/config-array": "^0.23.5", + "@eslint/config-helpers": "^0.6.0", + "@eslint/core": "^1.2.1", + "@eslint/plugin-kit": "^0.7.2", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", @@ -4725,21 +4556,6 @@ "optionator": "^0.9.3" }, "dependencies": { - "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 - }, - "brace-expansion": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", - "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", - "dev": true, - "requires": { - "balanced-match": "^4.0.2" - } - }, "eslint-visitor-keys": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", @@ -4907,58 +4723,15 @@ } }, "fs-extra": { - "version": "11.3.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", - "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", + "version": "11.3.5", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.5.tgz", + "integrity": "sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==", "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, - "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 - }, - "fstream": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", - "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - }, - "dependencies": { - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "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" - } - }, - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - } - } - }, "function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -4970,6 +4743,12 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, + "get-east-asian-width": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz", + "integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==", + "dev": true + }, "get-intrinsic": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", @@ -5007,21 +4786,6 @@ "path-scurry": "^2.0.2" }, "dependencies": { - "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 - }, - "brace-expansion": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", - "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", - "dev": true, - "requires": { - "balanced-match": "^4.0.2" - } - }, "minimatch": { "version": "10.2.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", @@ -5064,9 +4828,9 @@ "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==" }, "hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "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==", "requires": { "function-bind": "^1.1.2" } @@ -5077,49 +4841,24 @@ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true }, - "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, - "requires": { - "@tootallnate/once": ">=3.0.1", - "agent-base": "6", - "debug": "4" - } - }, - "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, - "requires": { - "agent-base": "6", - "debug": "4" - } - }, "ignore": { "version": "7.0.5", "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==", "dev": true }, + "immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "dev": true + }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -5146,6 +4885,12 @@ "is-extglob": "^2.1.1" } }, + "is-interactive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", + "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==", + "dev": true + }, "is-path-inside": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", @@ -5217,6 +4962,18 @@ "universalify": "^2.0.0" } }, + "jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dev": true, + "requires": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, "keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -5236,11 +4993,14 @@ "type-check": "~0.4.0" } }, - "listenercount": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz", - "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==", - "dev": true + "lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dev": true, + "requires": { + "immediate": "~3.0.5" + } }, "locate-path": { "version": "6.0.0", @@ -5297,45 +5057,27 @@ "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==" }, + "mimic-function": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", + "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", + "dev": true + }, "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" }, - "minimatch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", - "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", - "dev": true - }, "minipass": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", "dev": true }, - "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, - "requires": { - "minimist": "^1.2.6" - } - }, "mocha": { - "version": "11.7.5", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.5.tgz", - "integrity": "sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig==", + "version": "11.7.6", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.6.tgz", + "integrity": "sha512-nS9xOGbw2I3cjCpxwZAEJ9xK9lmJ08vEkQvLtz4du9ZrF9UrjRpeJGiIgl2Z+Qs++pmB4ecDe48Fwsh+j+j7xA==", "dev": true, "requires": { "browser-stdout": "^1.3.1", @@ -5470,13 +5212,13 @@ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==" }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "onetime": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", + "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", "dev": true, "requires": { - "wrappy": "1" + "mimic-function": "^5.0.0" } }, "optionator": { @@ -5493,6 +5235,72 @@ "word-wrap": "^1.2.5" } }, + "ora": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/ora/-/ora-8.2.0.tgz", + "integrity": "sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==", + "dev": true, + "requires": { + "chalk": "^5.3.0", + "cli-cursor": "^5.0.0", + "cli-spinners": "^2.9.2", + "is-interactive": "^2.0.0", + "is-unicode-supported": "^2.0.0", + "log-symbols": "^6.0.0", + "stdin-discarder": "^0.2.2", + "string-width": "^7.2.0", + "strip-ansi": "^7.1.0" + }, + "dependencies": { + "chalk": { + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz", + "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==", + "dev": true + }, + "emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", + "dev": true + }, + "is-unicode-supported": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz", + "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==", + "dev": true + }, + "log-symbols": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-6.0.0.tgz", + "integrity": "sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==", + "dev": true, + "requires": { + "chalk": "^5.3.0", + "is-unicode-supported": "^1.3.0" + }, + "dependencies": { + "is-unicode-supported": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz", + "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==", + "dev": true + } + } + }, + "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==", + "dev": true, + "requires": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + } + } + } + }, "p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -5517,18 +5325,18 @@ "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", "dev": true }, + "pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true + }, "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 }, - "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 - }, "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -5576,9 +5384,9 @@ "dev": true }, "qs": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz", - "integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==", + "version": "6.15.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz", + "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==", "requires": { "side-channel": "^1.1.0" } @@ -5618,29 +5426,14 @@ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "restore-cursor": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", + "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", "dev": true, "requires": { - "glob": "^7.1.3" - }, - "dependencies": { - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "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" - } - } + "onetime": "^7.0.0", + "signal-exit": "^4.1.0" } }, "semver": { @@ -5689,12 +5482,12 @@ } }, "side-channel-list": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", - "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "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==", "requires": { "es-errors": "^1.3.0", - "object-inspect": "^1.13.3" + "object-inspect": "^1.13.4" } }, "side-channel-map": { @@ -5726,6 +5519,12 @@ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true }, + "stdin-discarder": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.2.2.tgz", + "integrity": "sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==", + "dev": true + }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -5830,21 +5629,15 @@ } }, "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==", "dev": true, "requires": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, - "traverse": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", - "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==", - "dev": true - }, "ts-api-utils": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz", @@ -5867,33 +5660,33 @@ } }, "typed-rest-client": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.3.0.tgz", - "integrity": "sha512-FfBj5tjviexjIus3La4n4s9i+f81Zj7HU+lUlQWK219HMRfmzLsbIf4PZF2+X6EouJKyuANpvvef5VrUWM4AFw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-3.0.0.tgz", + "integrity": "sha512-J1KaEgK4jvnShMs+Y/oRbWYUKG5chdE5jgCinPWqlP+qXcznJqY2SiGcckKEHeQEiRZQAE4kAfepvCzx5ACQtw==", "requires": { "des.js": "^1.1.0", "js-md4": "^0.3.2", - "qs": "^6.14.1", + "qs": ">=6.15.2", "tunnel": "0.0.6", "underscore": "^1.13.8" } }, "typescript": { - "version": "5.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", - "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "dev": true }, "typescript-eslint": { - "version": "8.59.2", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.59.2.tgz", - "integrity": "sha512-pJw051uomb3ZeCzGTpRb8RbEqB5Y4WWet8gl/GcTlU35BSx0PVdZ86/bqkQCyKKuraVQEK7r6kBHQXF+fBhkoQ==", + "version": "8.60.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.60.1.tgz", + "integrity": "sha512-6m5hkkRAp8lKvhVpcprAIn5KkehQEh+47oHH2VGnExEh7dhNxXlg6GPAOIu6TxbVQxhebrJDvjl3020ooiWCMA==", "dev": true, "requires": { - "@typescript-eslint/eslint-plugin": "8.59.2", - "@typescript-eslint/parser": "8.59.2", - "@typescript-eslint/typescript-estree": "8.59.2", - "@typescript-eslint/utils": "8.59.2" + "@typescript-eslint/eslint-plugin": "8.60.1", + "@typescript-eslint/parser": "8.60.1", + "@typescript-eslint/typescript-estree": "8.60.1", + "@typescript-eslint/utils": "8.60.1" } }, "underscore": { @@ -5902,9 +5695,9 @@ "integrity": "sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ==" }, "undici-types": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz", - "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==", + "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 }, "universalify": { @@ -5912,24 +5705,6 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" }, - "unzipper": { - "version": "0.10.11", - "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz", - "integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==", - "dev": true, - "requires": { - "big-integer": "^1.6.17", - "binary": "~0.3.0", - "bluebird": "~3.4.1", - "buffer-indexof-polyfill": "~1.0.0", - "duplexer2": "~0.1.4", - "fstream": "^1.0.12", - "graceful-fs": "^4.2.2", - "listenercount": "~1.0.1", - "readable-stream": "~2.3.6", - "setimmediate": "~1.0.4" - } - }, "uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -5945,18 +5720,6 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true }, - "vscode-test": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.6.1.tgz", - "integrity": "sha512-086q88T2ca1k95mUzffvbzb7esqQNvJgiwY4h29ukPhFo8u+vXOOmelUoU5EQUHs3Of8+JuQ3oGdbVCqaxuTXA==", - "dev": true, - "requires": { - "http-proxy-agent": "^4.0.1", - "https-proxy-agent": "^5.0.0", - "rimraf": "^3.0.2", - "unzipper": "^0.10.11" - } - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -6042,12 +5805,6 @@ } } }, - "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 - }, "y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -6055,9 +5812,9 @@ "dev": true }, "yaml": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz", - "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==" + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.0.tgz", + "integrity": "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==" }, "yargs": { "version": "17.7.2", diff --git a/package.json b/package.json index 89fca03..56bf80b 100644 --- a/package.json +++ b/package.json @@ -353,32 +353,30 @@ }, "devDependencies": { "@types/fs-extra": "^11.0.4", - "@types/glob": "^9.0.0", "@types/mocha": "^10.0.10", - "@types/node": "^24.0.12", - "@types/node-7z": "^2.1.10", - "@types/vscode": "^1.101.0", - "@typescript-eslint/eslint-plugin": "^8.58.0", - "@typescript-eslint/parser": "^8.58.0", - "esbuild": "^0.25.6", - "eslint": "^10.1.0", + "@types/node": "^25.9.1", + "@types/node-7z": "^2.1.11", + "@types/vscode": "^1.120.0", + "@vscode/test-electron": "^2.5.2", + "esbuild": "^0.28.0", + "eslint": "^10.4.1", "glob": "^13.0.6", - "mocha": "^11.7.5", - "typescript": "^5.8.3", - "typescript-eslint": "^8.59.2", - "vscode-test": "^1.6.1" + "mocha": "^11.7.6", + "typescript": "^6.0.3", + "typescript-eslint": "^8.60.1" }, "dependencies": { "7zip-bin": "^5.2.0", - "fs-extra": "^11.3.0", + "fs-extra": "^11.3.5", "node-7z": "^3.0.0", "node-stream-zip": "^1.15.0", - "typed-rest-client": "^2.3.0", - "yaml": "^2.8.3" + "typed-rest-client": "^3.0.0", + "yaml": "^2.9.0" }, "overrides": { "serialize-javascript": ">=7.0.5", "diff": ">=8.0.3", - "@tootallnate/once": ">=3.0.1" + "@tootallnate/once": ">=3.0.1", + "qs": ">=6.15.2" } } diff --git a/src/test/runTest.ts b/src/test/runTest.ts index 42bd53f..057421a 100644 --- a/src/test/runTest.ts +++ b/src/test/runTest.ts @@ -1,6 +1,6 @@ import * as path from 'path'; -import { runTests } from 'vscode-test'; +import { runTests } from '@vscode/test-electron'; async function main() { try { diff --git a/src/test/suite/index.ts b/src/test/suite/index.ts index 0489e0f..8163863 100644 --- a/src/test/suite/index.ts +++ b/src/test/suite/index.ts @@ -1,5 +1,6 @@ import * as path from "path"; -import * as Mocha from "mocha"; +// eslint-disable-next-line @typescript-eslint/no-require-imports +import Mocha = require("mocha"); import { glob } from "glob"; export function run(): Promise { From 8420e2d7d5bf51004f05ce16d198af6225b92bb7 Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Fri, 19 Jun 2026 15:45:40 -0400 Subject: [PATCH 04/15] feat: migrate manifest checksums to sha256 and add SDK 1.0 toolchains - Switch download verification from md5 to sha256 - Drop unused validateMd5 helper - Update manifest entries with sha256 checksums and zephyr-sdk-1.0.0 toolchains --- manifest/manifest.json | 171 ++++++++++++++++++++++++++++------- src/files/file-downloader.ts | 8 +- src/files/file-validator.ts | 24 ----- src/types/manifest.ts | 2 +- 4 files changed, 141 insertions(+), 64 deletions(-) diff --git a/manifest/manifest.json b/manifest/manifest.json index d7f87ac..e8fe714 100644 --- a/manifest/manifest.json +++ b/manifest/manifest.json @@ -1,5 +1,5 @@ { - "version": 19, + "version": 20, "win32": [ { "arch": "x64", @@ -8,41 +8,76 @@ "name": "zephyr-tools", "filename": "zephyr-tools-v0.1.9-x86_64-pc-windows-msvc.zip", "url": "https://github.com/circuitdojo/zephyr-tools-cli/releases/download/v0.1.9/zephyr-tools-v0.1.9-x86_64-pc-windows-msvc.zip", - "md5": "553cdc729b6ad5f00584221673f7478a" + "sha256": "f6f7dc29cd7f8b289a75013ba62be456e7cd6767995cc50f1732730da5bd2efd" }, { "name": "newtmgr", "filename": "newtmgr.zip", "url": "https://docs.jaredwolff.com/files/newtmgr/windows/newtmgr.zip", - "md5": "3ed9e43ff509a54fd5010c144e45697b" + "sha256": "cab66a70a5e5e976ff42289160193ba92103f9ef6148679371fc4d99c956a95c" }, { "name": "ninja", "filename": "ninja-win.zip", "url": "https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip", - "md5": "8dad6a63141d57aae277e68ef7658ca1" + "sha256": "bbde850d247d2737c5764c927d1071cbb1f1957dcabda4a130fa8547c12c695f" }, { "name": "cmake", "filename": "cmake-3.22.0-windows-x86_64.zip", "url": "https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0-windows-x86_64.zip", - "md5": "1a273903dcb295455b69af7c9c10efa2", + "sha256": "fcce74d1d7eaf825234c036702df3f0874dcd3cee8fdf90b56d0c7bfedd29465", "suffix": "cmake-3.22.0-windows-x86_64\\bin" }, { "name": "probe-rs", "filename": "probe-rs-tools-x86_64-pc-windows-msvc.zip", "url": "https://github.com/probe-rs/probe-rs/releases/download/v0.29.1/probe-rs-tools-x86_64-pc-windows-msvc.zip", - "md5": "ca52232aaa944e53fa27960f9d180470" + "sha256": "a1e220225cd09c9474fdf2db219adff4030074e6bdaf6e4f669ff97661d55413" }, { "name": "recovery", "filename": "recovery-x86_64-windows.zip", "url": "https://github.com/circuitdojo/recovery/releases/download/v0.2.2/recovery-x86_64-windows.zip", - "md5": "40fd8bf6df178a7b8f9bcdadd4013cf0" + "sha256": "f45e0d1d557c40db298e0401c1b79c91315d129174b2f2829f8303bb8ea7ad4f" } ], "toolchains": [ + { + "name": "zephyr-sdk-1.0.0", + "downloads": [ + { + "name": "toolchain", + "filename": "zephyr-sdk-1.0.0_windows-x86_64_minimal.7z", + "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v1.0.0/zephyr-sdk-1.0.0_windows-x86_64_minimal.7z", + "sha256": "453659ea5a9fcc5e2fa3e731139b7268bb82907004dc8a24e382f937cf7d06a6", + "suffix": "zephyr-sdk-1.0.0\\arm-zephyr-eabi\\bin", + "env": [ + { + "name": "ZEPHYR_TOOLCHAIN_VARIANT", + "value": "zephyr", + "usepath": false, + "append": false + }, + { + "name": "ZEPHYR_SDK_INSTALL_DIR", + "suffix": "zephyr-sdk-1.0.0", + "usepath": true, + "append": false + } + ] + }, + { + "name": "toolchain", + "filename": "toolchain_gnu_windows-x86_64_arm-zephyr-eabi.7z", + "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v1.0.0/toolchain_gnu_windows-x86_64_arm-zephyr-eabi.7z", + "sha256": "388edf8d788ab85a61e6f97305285f16b4dfe0ae196e9258c8c6dc9bcb9e6f4b", + "suffix": "zephyr-sdk-1.0.0\\arm-zephyr-eabi\\bin", + "clear_target": false, + "copy_to_subfolder": "zephyr-sdk-1.0.0" + } + ] + }, { "name": "zephyr-sdk-0.16.4", "downloads": [ @@ -50,7 +85,7 @@ "name": "toolchain", "filename": "zephyr-sdk-0.16.4_windows-x86_64_minimal.7z", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_windows-x86_64_minimal.7z", - "md5": "fbf2ffa00c77227537514fa43075607f", + "sha256": "eed143e37739b090a80afcd25c44aa18d32d19481cbb307b9aeb066e72505a2f", "suffix": "zephyr-sdk-0.16.4\\arm-zephyr-eabi\\bin", "env": [ { @@ -71,7 +106,7 @@ "name": "toolchain", "filename": "toolchain_windows-x86_64_arm-zephyr-eabi.7z", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/toolchain_windows-x86_64_arm-zephyr-eabi.7z", - "md5": "37e3d358aae2ee055f34b97fd24aadd5", + "sha256": "2b994422722ee7d2685d877234d63b5ef601f93fa44b24a1462cae3e9649ea5f", "suffix": "zephyr-sdk-0.16.4\\arm-zephyr-eabi\\bin", "clear_target": false, "copy_to_subfolder": "zephyr-sdk-0.16.4" @@ -85,7 +120,7 @@ "name": "toolchain", "filename": "zephyr-sdk-0.15.1_windows-x86_64_minimal.zip", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.1/zephyr-sdk-0.15.1_windows-x86_64_minimal.zip", - "md5": "4c73427373995d1ac53412383a2f6610", + "sha256": "180dfab15c9df4304419260b05422cb6330570645d617cec1d98d21d85419c19", "suffix": "zephyr-sdk-0.15.1\\arm-zephyr-eabi\\bin", "env": [ { @@ -106,7 +141,7 @@ "name": "toolchain", "filename": "toolchain_windows-x86_64_arm-zephyr-eabi.zip", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.1/toolchain_windows-x86_64_arm-zephyr-eabi.zip", - "md5": "1786d58c03f3e380d683b1e5ded45131", + "sha256": "97acb97741d204bb34687ba6da5d63ec58fa9bf4d8e70854663c9481dc4f5234", "suffix": "zephyr-sdk-0.15.1\\arm-zephyr-eabi\\bin", "clear_target": false, "copy_to_subfolder": "zephyr-sdk-0.15.1" @@ -124,32 +159,32 @@ "name": "zephyr-tools", "filename": "zephyr-tools-v0.1.9-x86_64-apple-darwin.tar.gz", "url": "https://github.com/circuitdojo/zephyr-tools-cli/releases/download/v0.1.9/zephyr-tools-v0.1.9-x86_64-apple-darwin.tar.gz", - "md5": "6bf8a2da7b3f3ee6db0f2d581f5cdf02" + "sha256": "90f0bff8ac01635ddbcd9762778f63bf7249f603362c174d2c54e13120c480eb" }, { "name": "newtmgr", "filename": "newtmgr.zip", "url": "https://docs.jaredwolff.com/files/newtmgr/darwin/newtmgr.zip", - "md5": "7a707d8e518d46d92758a7b1b87366ed" + "sha256": "06df73f872ba7dd9ed3b7a237d5c8f2595f68e663a8ebb4c9493f84c2e31ca95" }, { "name": "ninja", "filename": "ninja-mac.zip", "url": "https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-mac.zip", - "md5": "4ac3da15e1ace3a0f846021e018a3acd" + "sha256": "6fa359f491fac7e5185273c6421a000eea6a2f0febf0ac03ac900bd4d80ed2a5" }, { "name": "cmake", "filename": "cmake-3.22.0-macos-universal.tar.gz", "url": "https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0-macos-universal.tar.gz", - "md5": "438fc508b37b70a1d1bb112a4ffd4ad7", + "sha256": "84526401d8cc0a0b0551f2f899164e2fbc2c69cbc8573b67bfa7441bae7ad051", "suffix": "cmake-3.22.0-macos-universal/CMake.app/Contents/bin" }, { "name": "probe-rs", "filename": "probe-rs-tools-x86_64-apple-darwin.tar.xz", "url": "https://github.com/probe-rs/probe-rs/releases/download/v0.29.1/probe-rs-tools-x86_64-apple-darwin.tar.xz", - "md5": "453cd9dd049b8a2e80fb8eb61ac03993", + "sha256": "b6b8ccfd367ddf0ddcd04a23bc0e440087d49c333472b259fe79340fb63e119e", "suffix": "probe-rs-tools-x86_64-apple-darwin/" } ], @@ -161,7 +196,7 @@ "name": "toolchain", "filename": "zephyr-sdk-0.16.4_macos-x86_64_minimal.tar.xz", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_macos-x86_64_minimal.tar.xz", - "md5": "4771443abfc72c1442a2cdf01034ab95", + "sha256": "5708f832dcefb6733f7a1ad90a1db7e396349760904e006f87b07dec3dc43f07", "suffix": "zephyr-sdk-0.16.4/arm-zephyr-eabi/bin", "env": [ { @@ -193,7 +228,7 @@ "name": "toolchain", "filename": "zephyr-sdk-0.15.1_macos-x86_64_minimal.tar.gz", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.1/zephyr-sdk-0.15.1_macos-x86_64_minimal.tar.gz", - "md5": "2e6900c9ea1d03fbf67cd784e18f53bf", + "sha256": "d0417d12a70d83eb7b9c02aa7ee72a3fc88dff1149d45add5185b67465c2267a", "suffix": "zephyr-sdk-0.15.1/arm-zephyr-eabi/bin", "env": [ { @@ -227,36 +262,68 @@ "name": "zephyr-tools", "filename": "zephyr-tools-v0.1.9-aarch64-apple-darwin.tar.gz", "url": "https://github.com/circuitdojo/zephyr-tools-cli/releases/download/v0.1.9/zephyr-tools-v0.1.9-aarch64-apple-darwin.tar.gz", - "md5": "ec8a186be2fb927ae63850284b6546f0" + "sha256": "ba36990f6b467ff8a75b23948b5b699a0f9f8edec609ad16b224d0dac6572acf" }, { "name": "newtmgr", "filename": "newtmgr.zip", "url": "https://docs.jaredwolff.com/files/newtmgr/darwin/newtmgr.zip", - "md5": "7a707d8e518d46d92758a7b1b87366ed" + "sha256": "06df73f872ba7dd9ed3b7a237d5c8f2595f68e663a8ebb4c9493f84c2e31ca95" }, { "name": "cmake", "filename": "cmake-3.22.0-macos-universal.tar.gz", "url": "https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0-macos-universal.tar.gz", - "md5": "438fc508b37b70a1d1bb112a4ffd4ad7", + "sha256": "84526401d8cc0a0b0551f2f899164e2fbc2c69cbc8573b67bfa7441bae7ad051", "suffix": "cmake-3.22.0-macos-universal/CMake.app/Contents/bin" }, { "name": "probe-rs", "filename": "probe-rs-tools-aarch64-apple-darwin.tar.xz", "url": "https://github.com/probe-rs/probe-rs/releases/download/v0.29.1/probe-rs-tools-aarch64-apple-darwin.tar.xz", - "md5": "7627fcd90b2a9399a535cef434767ee3", + "sha256": "74af375061589671644cdfb7fd406b0346da736001f97f33f74d229d7fe5ef6f", "suffix": "probe-rs-tools-aarch64-apple-darwin/" }, { "name": "recovery", "filename": "recovery-aarch64-macos.tar.gz", "url": "https://github.com/circuitdojo/recovery/releases/download/v0.2.2/recovery-aarch64-macos.tar.gz", - "md5": "34f03b399550c24cee8118c369d8e935" + "sha256": "888ab9ddd8c2b6ce8be9049ee534ad86ca0a979309db11bc7f5ce9cb11a20365" } ], "toolchains": [ + { + "name": "zephyr-sdk-1.0.0", + "downloads": [ + { + "name": "toolchain", + "filename": "zephyr-sdk-1.0.0_macos-aarch64_minimal.tar.xz", + "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v1.0.0/zephyr-sdk-1.0.0_macos-aarch64_minimal.tar.xz", + "sha256": "d69cf4dc72ee7faf41c563b27bfa451d38d407ad39fd515f64487a0c33207cdb", + "suffix": "zephyr-sdk-1.0.0/arm-zephyr-eabi/bin", + "env": [ + { + "name": "ZEPHYR_TOOLCHAIN_VARIANT", + "value": "zephyr", + "usepath": false, + "append": false + }, + { + "name": "ZEPHYR_SDK_INSTALL_DIR", + "suffix": "zephyr-sdk-1.0.0", + "usepath": true, + "append": false + } + ], + "cmd": [ + { + "cmd": "zephyr-sdk-1.0.0/setup.sh -t arm-zephyr-eabi", + "usepath": true + } + ] + } + ] + }, { "name": "zephyr-sdk-0.16.4", "downloads": [ @@ -264,7 +331,7 @@ "name": "toolchain", "filename": "zephyr-sdk-0.16.4_macos-aarch64_minimal.tar.xz", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_macos-aarch64_minimal.tar.xz", - "md5": "4aa2aa3b8313e04dd93a8bbee4b31754", + "sha256": "12adf6f80a3233df83f83f3872b4b8eec7b9b6024f97835c7741feeb19d0d94e", "suffix": "zephyr-sdk-0.16.4/arm-zephyr-eabi/bin", "env": [ { @@ -296,7 +363,7 @@ "name": "toolchain", "filename": "zephyr-sdk-0.15.1_macos-aarch64_minimal.tar.gz", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.1/zephyr-sdk-0.15.1_macos-aarch64_minimal.tar.gz", - "md5": "6b0d6e08ad5753a29d96df4d6ccfed72", + "sha256": "fc83bf6eb38ccf9f8cfde91bc69b0fa8c409cd5fd81c2511f36a178a461b8aa9", "suffix": "zephyr-sdk-0.15.1/arm-zephyr-eabi/bin", "env": [ { @@ -332,42 +399,76 @@ "name": "zephyr-tools", "filename": "zephyr-tools-v0.1.9-x86_64-unknown-linux-gnu.tar.gz", "url": "https://github.com/circuitdojo/zephyr-tools-cli/releases/download/v0.1.9/zephyr-tools-v0.1.9-x86_64-unknown-linux-gnu.tar.gz", - "md5": "492949a0a50ef64b95ccf5c890b82b5e" + "sha256": "e01ca1f4c47e73429405ccec49954f71bd2be9cef74f38b1393ae743033609df" }, { "name": "newtmgr", "filename": "newtmgr.zip", "url": "https://docs.jaredwolff.com/files/newtmgr/linux/newtmgr.zip", - "md5": "9900ec263d39264787903688cdefeed1" + "sha256": "2c4c4037260af0709ae2ef541460a80c26768d34dfe43b87b41e9f646bd6c9fe" }, { "name": "ninja", "filename": "ninja-linux.zip", "url": "https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip", - "md5": "817e12e06e2463aeb5cb4e1d19ced606" + "sha256": "763464859c7ef2ea3a0a10f4df40d2025d3bb9438fcb1228404640410c0ec22d" }, { "name": "cmake", "filename": "cmake-3.22.0-linux-x86_64.tar.gz", "url": "https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0-linux-x86_64.tar.gz", - "md5": "5537bbc683e364e5408a393a737f53a1", + "sha256": "dc73115520d13bb64202383d3df52bc3d6bbb8422ecc5b2c05f803491cb215b0", "suffix": "cmake-3.22.0-linux-x86_64/bin" }, { "name": "probe-rs", "filename": "probe-rs-tools-x86_64-unknown-linux-gnu.tar.xz", "url": "https://github.com/probe-rs/probe-rs/releases/download/v0.29.1/probe-rs-tools-x86_64-unknown-linux-gnu.tar.xz", - "md5": "01be4d05d6b7ced308f43a0c55865f03", + "sha256": "f2ccb2ee5058559d663a3a4d1947ca1ce80802546aadd48cf355455126ae9758", "suffix": "probe-rs-tools-x86_64-unknown-linux-gnu/" }, { "name": "recovery", "filename": "recovery-x86_64-linux.tar.gz", "url": "https://github.com/circuitdojo/recovery/releases/download/v0.2.2/recovery-x86_64-linux.tar.gz", - "md5": "a9a3791aaf020cd9f7343f98a877b372" + "sha256": "e2322587ff9e783cd640fc00a2023a32605f29200be49e87d13cb141d61b9891" } ], "toolchains": [ + { + "name": "zephyr-sdk-1.0.0", + "downloads": [ + { + "name": "toolchain", + "filename": "zephyr-sdk-1.0.0_linux-x86_64_minimal.tar.xz", + "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v1.0.0/zephyr-sdk-1.0.0_linux-x86_64_minimal.tar.xz", + "sha256": "6b69a4b54b470e3aa21cdaf95cdc808431e8ca73a7b822a33a682e5b5d2c5512", + "suffix": "zephyr-sdk-1.0.0/arm-zephyr-eabi/bin", + "env": [ + { + "name": "ZEPHYR_TOOLCHAIN_VARIANT", + "value": "zephyr", + "usepath": false, + "append": false + }, + { + "name": "ZEPHYR_SDK_INSTALL_DIR", + "suffix": "zephyr-sdk-1.0.0", + "usepath": true, + "append": false + } + ] + }, + { + "name": "toolchain", + "filename": "toolchain_gnu_linux-x86_64_arm-zephyr-eabi.tar.xz", + "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v1.0.0/toolchain_gnu_linux-x86_64_arm-zephyr-eabi.tar.xz", + "sha256": "4b467e2fb26307b464915d0c9a87e47ab4d94d560888f239a76eeb56b4d9011f", + "clear_target": false, + "copy_to_subfolder": "zephyr-sdk-1.0.0" + } + ] + }, { "name": "zephyr-sdk-0.16.4", "downloads": [ @@ -375,7 +476,7 @@ "name": "toolchain", "filename": "zephyr-sdk-0.16.4_linux-x86_64_minimal.tar.xz", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_linux-x86_64_minimal.tar.xz", - "md5": "5f10ac5111476d4e069b52f07aa3f4d5", + "sha256": "3cb9d97f08fe75d52afddd3d48e74955a421b64214ccbdf49c5ad0e0d7530b2d", "suffix": "zephyr-sdk-0.16.4/arm-zephyr-eabi/bin", "env": [ { @@ -396,7 +497,7 @@ "name": "toolchain", "filename": "toolchain_linux-x86_64_arm-zephyr-eabi.tar.xz", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/toolchain_linux-x86_64_arm-zephyr-eabi.tar.xz", - "md5": "4386d940c085670fc54480eb7eaebff8", + "sha256": "2061e58534c57f98f1b05b557d9a5d0e1873ac38b310841562d360f9715f96fb", "clear_target": false, "copy_to_subfolder": "zephyr-sdk-0.16.4" } @@ -409,7 +510,7 @@ "name": "toolchain", "filename": "zephyr-sdk-0.15.1_linux-x86_64_minimal.tar.gz", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.1/zephyr-sdk-0.15.1_linux-x86_64_minimal.tar.gz", - "md5": "e74588785a291867feacf14134aaec61", + "sha256": "ee8bb764e53570bfdd93caff988d4460f9b4dd6570fd15a0d8f3e8ccaf816ac4", "suffix": "zephyr-sdk-0.15.1/arm-zephyr-eabi/bin", "env": [ { @@ -430,7 +531,7 @@ "name": "toolchain", "filename": "toolchain_linux-x86_64_arm-zephyr-eabi.tar.gz", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.1/toolchain_linux-x86_64_arm-zephyr-eabi.tar.gz", - "md5": "bf75b7db76bd5ad260be7e708e29c90d", + "sha256": "555cb14e89d55bfc4b89c07e836dbe198f0f054e747114bd56f97390b95dbfc9", "clear_target": false, "copy_to_subfolder": "zephyr-sdk-0.15.1" } diff --git a/src/files/file-downloader.ts b/src/files/file-downloader.ts index 782fd71..db710cd 100644 --- a/src/files/file-downloader.ts +++ b/src/files/file-downloader.ts @@ -42,10 +42,10 @@ export class FileDownloader { const fileBuffer = fs.readFileSync(dest); // Create hash - const hashSum = crypto.createHash('md5'); + const hashSum = crypto.createHash('sha256'); hashSum.update(fileBuffer); - // Get hex representation + // Get hex representation const hex = hashSum.digest('hex'); return hex === hash; @@ -117,7 +117,7 @@ export class FileDownloader { } // Validate checksum of downloaded file - public static async validateChecksum(file: string, expectedMd5: string): Promise { - return this.check(file, expectedMd5); + public static async validateChecksum(file: string, expectedSha256: string): Promise { + return this.check(file, expectedSha256); } } diff --git a/src/files/file-validator.ts b/src/files/file-validator.ts index beef74b..807ea2b 100644 --- a/src/files/file-validator.ts +++ b/src/files/file-validator.ts @@ -9,30 +9,6 @@ import * as crypto from "crypto"; import * as path from "path"; export class FileValidator { - static async validateMd5(filePath: string, expectedMd5: string): Promise { - try { - if (!(await fs.pathExists(filePath))) { - console.log(`File doesn't exist: ${filePath}`); - return false; - } - - const fileBuffer = fs.readFileSync(filePath); - const hashSum = crypto.createHash('md5'); - hashSum.update(fileBuffer); - const hex = hashSum.digest('hex'); - - const isValid = hex === expectedMd5; - if (!isValid) { - console.log(`MD5 mismatch for ${filePath}. Expected: ${expectedMd5}, Got: ${hex}`); - } - - return isValid; - } catch (error) { - console.error(`MD5 validation error for ${filePath}:`, error); - return false; - } - } - static async validateSha256(filePath: string, expectedSha256: string): Promise { try { if (!(await fs.pathExists(filePath))) { diff --git a/src/types/manifest.ts b/src/types/manifest.ts index 24060a2..3835e18 100644 --- a/src/types/manifest.ts +++ b/src/types/manifest.ts @@ -25,7 +25,7 @@ export interface ManifestToolchainEntry { export interface ManifestDownloadEntry { name: string; url: string; - md5: string; + sha256: string; suffix?: string; env?: ManifestEnvEntry[]; cmd?: CmdEntry[]; From 70acf6e6cac52d4e44418bc0301ed533f7443fe7 Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Fri, 19 Jun 2026 15:46:00 -0400 Subject: [PATCH 05/15] feat: decouple Zephyr SDK management from setup with per-workspace auto-selection Separate SDK/toolchain management from the host-tools Setup so multiple SDK versions can coexist and each workspace uses the one its Zephyr tree requires. - Setup now installs host tooling only; SDKs are managed separately - Add 'Install SDK' command and on-demand install prompt before builds - Add 'Manage SDKs' command to list/activate/uninstall installed SDKs - Make ZEPHYR_SDK_INSTALL_DIR workspace-scoped (paths.sdkInstallDir) - Auto-switch to a compatible installed SDK based on the Zephyr tree's required version, accounting for the SDK's minimum-compatible floor - Resync the environment variable collection before builds so tasks use the active SDK instead of a stale value - Extract shared download engine into download-processor.ts - Surface SDK state and a Manage SDKs action in the sidebar --- media/sidebar.js | 63 +++-- package.json | 18 +- src/commands/build.ts | 16 ++ src/commands/download-processor.ts | 220 ++++++++++++++++++ src/commands/index.ts | 1 + src/commands/install-sdk.ts | 362 +++++++++++++++++++++++++++++ src/commands/setup.ts | 273 ++-------------------- src/config/manifest-validator.ts | 159 ++++++++++++- src/config/settings-manager.ts | 38 ++- src/config/validation.ts | 10 +- src/environment/path-manager.ts | 18 +- src/extension.ts | 44 +++- src/ui/sidebar-webview.ts | 9 +- 13 files changed, 932 insertions(+), 299 deletions(-) create mode 100644 src/commands/download-processor.ts create mode 100644 src/commands/install-sdk.ts diff --git a/media/sidebar.js b/media/sidebar.js index 7f8e9e3..4e30a2a 100644 --- a/media/sidebar.js +++ b/media/sidebar.js @@ -146,17 +146,17 @@ function generateBuildAssetsHtml(buildAssets) { // Update UI with project data function updateUI(data) { - const { state, config, project, buildAssets } = data; + const { state, config, project, buildAssets, sdkInstallDir } = data; console.log('Updating UI with data:', data); console.log('Build assets:', buildAssets); - + // Handle different states switch (state.type) { case 'loading': showLoadingState(); break; case 'setup-required': - showSetupRequiredState(); + showSetupRequiredState(state.error); break; case 'project-required': showProjectRequiredState(); @@ -171,32 +171,42 @@ function updateUI(data) { showSetupInProgressState(); break; case 'ready': - showReadyState(config, project, buildAssets); + showReadyState(config, project, buildAssets, sdkInstallDir); break; default: console.warn('Unknown state type:', state.type); - showReadyState(config, project, buildAssets); // fallback + showReadyState(config, project, buildAssets, sdkInstallDir); // fallback } } // Show setup required state -function showSetupRequiredState() { +function showSetupRequiredState(error) { const container = document.querySelector('.container'); if (!container) return; - + + // An SDK problem is resolved by installing/selecting an SDK, not by re-running + // the host-tools setup, so point the action at the dedicated Install SDK command. + const isSdkIssue = error && (error.includes('SDK version mismatch') || error.includes('SDK')); + const title = isSdkIssue ? '⚠️ SDK Required' : '⚠️ Setup Required'; + const defaultMessage = 'Zephyr Tools needs to be set up before you can start building projects.'; + const message = error || defaultMessage; + const actionCommand = isSdkIssue ? 'zephyr-tools.install-sdk' : 'zephyr-tools.setup'; + const actionIcon = isSdkIssue ? '📦' : '🔧'; + const actionText = isSdkIssue ? 'Install SDK' : 'Run Setup'; + container.innerHTML = `
-

⚠️ Setup Required

-

Zephyr Tools needs to be set up before you can start building projects.

+

${title}

+

${message}

-
`; - + // Re-setup event listeners for the new buttons setupEventListeners(); } @@ -346,7 +356,7 @@ function showSetupInProgressState() { } // Show ready state (original functionality) -function showReadyState(config, project, buildAssets) { +function showReadyState(config, project, buildAssets, sdkInstallDir) { const container = document.querySelector('.container'); if (!container) return; @@ -399,6 +409,11 @@ function showReadyState(config, project, buildAssets) { Loading... ✏️ +
+ SDK: + Loading... + ✏️ +
@@ -476,13 +491,13 @@ function showReadyState(config, project, buildAssets) { // Re-setup event listeners for the new buttons setupEventListeners(); - + // Update values with actual data - updateReadyStateValues(config, project); + updateReadyStateValues(config, project, sdkInstallDir); } // Update values in ready state -function updateReadyStateValues(config, project) { +function updateReadyStateValues(config, project, sdkInstallDir) { // Update board value const boardElement = document.getElementById('board-value'); if (boardElement) { @@ -573,6 +588,20 @@ function updateReadyStateValues(config, project) { } cmakeDefinesElement.classList.toggle('loading', false); } + + // Update SDK value — show the version folder name (e.g. "zephyr-sdk-1.0.0") + const sdkElement = document.getElementById('sdk-value'); + if (sdkElement) { + if (sdkInstallDir) { + const sdkName = sdkInstallDir.split('/').pop() || sdkInstallDir; + sdkElement.textContent = sdkName; + sdkElement.title = sdkInstallDir; + } else { + sdkElement.textContent = 'Not configured'; + sdkElement.title = 'Run setup to install an SDK'; + } + sdkElement.classList.toggle('loading', false); + } } // Listen for messages from the extension diff --git a/package.json b/package.json index 56bf80b..8765db6 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,8 @@ "activationEvents": [ "onStartupFinished", "onCommand:zephyr-tools.setup", + "onCommand:zephyr-tools.install-sdk", + "onCommand:zephyr-tools.manage-sdks", "onCommand:zephyr-tools.create-project", "onCommand:zephyr-tools.build", "onCommand:zephyr-tools.build-pristine", @@ -66,6 +68,14 @@ "command": "zephyr-tools.setup", "title": "Zephyr Tools: Setup" }, + { + "command": "zephyr-tools.install-sdk", + "title": "Zephyr Tools: Install SDK" + }, + { + "command": "zephyr-tools.manage-sdks", + "title": "Zephyr Tools: Manage SDKs" + }, { "command": "zephyr-tools.build-pristine", "title": "Zephyr Tools: Build Pristine" @@ -273,13 +283,19 @@ "description": "Custom path to West executable (auto-detected if empty)", "scope": "machine-overridable" }, + "zephyr-tools.paths.sdkInstallDir": { + "type": "string", + "default": "", + "description": "Path to the active Zephyr SDK installation for this workspace (e.g. ~/.zephyrtools/toolchain/zephyr-sdk-1.0.0)", + "scope": "workspace" + }, "zephyr-tools.paths.allPaths": { "type": "array", "items": { "type": "string" }, "default": [], - "description": "All paths added to PATH environment by Zephyr Tools", + "description": "Non-SDK tool paths added to PATH by Zephyr Tools (cmake, ninja, probe-rs, etc.)", "scope": "machine" }, "zephyr-tools.environment.variables": { diff --git a/src/commands/build.ts b/src/commands/build.ts index 2b846f5..0982e99 100644 --- a/src/commands/build.ts +++ b/src/commands/build.ts @@ -12,6 +12,7 @@ import { ProjectOverridesManager, ProjectOverrides } from "../config/project-ove import { TaskManager, TaskManagerTaskOptions } from "../tasks"; import { changeBoardCommand, discoverBoards } from "./board-management"; import { changeProjectCommand } from "./project-management"; +import { ensureCompatibleSdkInteractive } from "./install-sdk"; import { EnvironmentUtils, readCMakeCache } from "../utils"; import { SettingsManager } from "../config/settings-manager"; import { QuickPickManager } from "../ui"; @@ -118,6 +119,13 @@ export async function buildCommand( return; } + // Verify a compatible SDK is active for the current Zephyr tree before building. + // Auto-switches to a compatible installed SDK, or prompts to install one. Catches + // version mismatches introduced by west update without waiting for CMake to fail. + if (!(await ensureCompatibleSdkInteractive(context))) { + return; + } + // Fetch the project config let project = await ProjectConfigManager.load(context); @@ -422,6 +430,10 @@ export async function buildMultiCommand( return; } + if (!(await ensureCompatibleSdkInteractive(context))) { + return; + } + let project = await ProjectConfigManager.load(context); const projectValidation = ConfigValidator.validateProjectInit(project); @@ -463,6 +475,10 @@ export async function buildAllCommand( return; } + if (!(await ensureCompatibleSdkInteractive(context))) { + return; + } + let project = await ProjectConfigManager.load(context); const projectValidation = ConfigValidator.validateProjectInit(project); diff --git a/src/commands/download-processor.ts b/src/commands/download-processor.ts new file mode 100644 index 0000000..fcef0c0 --- /dev/null +++ b/src/commands/download-processor.ts @@ -0,0 +1,220 @@ +/** + * @author Jared Wolff + * @copyright Circuit Dojo LLC + * @license Apache 2.0 + */ + +import * as vscode from "vscode"; +import * as fs from "fs-extra"; +import * as path from "path"; +import * as util from "util"; +import * as cp from "child_process"; +import { GlobalConfig, ManifestDownloadEntry } from "../types"; +import { GlobalConfigManager, SettingsManager } from "../config"; +import { pathdivider } from "../config"; +import { FileDownloader, ArchiveExtractor } from "../files"; + +/** + * Process a download entry with validation and logging. + * + * Shared by the host-tools setup flow and the standalone SDK installer so both + * download/extract/PATH/env logic stays in one place. + */ +export async function processDownloadWithValidation( + download: ManifestDownloadEntry, + config: GlobalConfig, + context: vscode.ExtensionContext, + output: vscode.OutputChannel, + allAddedPaths: string[] +): Promise { + output.appendLine(`[SETUP] Starting processing: ${download.name}`); + output.appendLine(`[SETUP] URL: ${download.url}`); + output.appendLine(`[SETUP] Expected SHA256: ${download.sha256}`); + + const result = await processDownload(download, config, context, output, allAddedPaths); + + if (result) { + output.appendLine(`[SETUP] Successfully completed: ${download.name}`); + } else { + output.appendLine(`[SETUP] FAILED to process: ${download.name}`); + } + + return result; +} + +/** + * Process a single download entry from the manifest + */ +export async function processDownload( + download: ManifestDownloadEntry, + config: GlobalConfig, + context: vscode.ExtensionContext, + output: vscode.OutputChannel, + allAddedPaths: string[] +): Promise { + const exec = util.promisify(cp.exec); + + // Check if file already exists + let filepath: string | null = await FileDownloader.exists(download.filename); + + // Download if doesn't exist or hash doesn't match + if (filepath === null || !(await FileDownloader.check(download.filename, download.sha256))) { + output.appendLine(`[SETUP] downloading ${download.url}`); + + try { + filepath = await FileDownloader.fetch(download.url); + } catch (error) { + output.appendLine(`[SETUP] Failed to download ${download.filename}: ${error}`); + return false; + } + + // Check hash again + if (!(await FileDownloader.check(download.filename, download.sha256))) { + output.appendLine(`[SETUP] Checksum mismatch for ${download.filename}`); + return false; + } + } + + // Ensure filepath is not null + if (filepath === null) { + output.appendLine(`[SETUP] Critical error: filepath is null for ${download.filename}`); + return false; + } + + // Determine target path - use settings-based tools directory + const currentToolsDir = SettingsManager.getToolsDirectory(); + let copytopath = path.join(currentToolsDir, download.name); + output.appendLine(`[SETUP] Initial copytopath: ${copytopath}`); + + // Add subfolder if specified + if (download.copy_to_subfolder) { + copytopath = path.join(copytopath, download.copy_to_subfolder); + output.appendLine(`[SETUP] Updated copytopath with subfolder: ${copytopath}`); + } + + // Create target directory if it doesn't exist + if (!(await fs.pathExists(copytopath))) { + await fs.mkdirp(copytopath); + output.appendLine(`[SETUP] Created target directory: ${copytopath}`); + } + + // Clear target directory if specified (default behavior). + // For toolchain archives whose suffix begins with a versioned SDK directory + // (e.g. "zephyr-sdk-1.0.0/arm-zephyr-eabi/bin"), only remove that specific + // version directory so multiple SDK versions can coexist in the parent dir. + if (download.clear_target !== false) { + try { + const suffixFirstComponent = download.suffix?.split('/')[0]; + const isSdkVersionDir = suffixFirstComponent?.startsWith('zephyr-sdk-'); + const clearTarget = isSdkVersionDir + ? path.join(copytopath, suffixFirstComponent!) + : copytopath; + + await fs.remove(clearTarget); + await fs.mkdirp(copytopath); + output.appendLine(`[SETUP] Cleared target: ${clearTarget}`); + } catch (error) { + output.appendLine(`[SETUP] Failed to prepare target directory: ${error}`); + return false; + } + } else { + output.appendLine(`[SETUP] Preserving existing target directory: ${copytopath}`); + } + + // Extract archive based on file type + try { + if (download.url.includes(".zip") || download.url.includes(".7z") || download.url.includes(".tar")) { + output.appendLine(`[SETUP] Extracting ${filepath} to ${copytopath}`); + + const extractionSuccess = await ArchiveExtractor.extractArchive(filepath, copytopath); + if (!extractionSuccess) { + output.appendLine(`[SETUP] Archive extraction failed for ${download.name}`); + return false; + } + } + } catch (error) { + output.appendLine(`[SETUP] Extraction error for ${download.name}: ${error}`); + return false; + } + + // Set up PATH environment variable + if (download.suffix) { + const setpath = path.join(copytopath, download.suffix); + + // Add to VS Code environment collection + context.environmentVariableCollection.prepend("PATH", setpath + pathdivider); + + // Track this path + allAddedPaths.push(setpath); + output.appendLine(`[SETUP] Added to PATH: ${setpath}`); + } else { + // If no suffix, assume the copytopath contains executables and should be added to PATH + + // Add to VS Code environment collection + context.environmentVariableCollection.prepend("PATH", copytopath + pathdivider); + + // Track this path + allAddedPaths.push(copytopath); + output.appendLine(`[SETUP] Added to PATH: ${copytopath}`); + } + + // Set remaining environment variables in settings + for (const entry of download.env ?? []) { + let envValue: string; + if (entry.value) { + envValue = entry.value; + } else if (entry.usepath && !entry.append) { + envValue = path.join(copytopath, entry.suffix ?? ""); + } else if (entry.usepath && entry.append) { + const existingValue = SettingsManager.getZephyrBase() || ""; // For ZEPHYR_BASE mainly + envValue = path.join( + copytopath, + (entry.suffix ?? "") + pathdivider + existingValue + ); + } else { + continue; + } + + // Save environment variable to settings + await SettingsManager.setEnvironmentVariable(entry.name, envValue); + + // Also save ZEPHYR_BASE to its dedicated setting + if (entry.name === "ZEPHYR_BASE") { + await SettingsManager.setZephyrBase(envValue); + } + + // Set environment variable in VS Code environment collection + context.environmentVariableCollection.replace(entry.name, envValue); + + output.appendLine(`[SETUP] Set ${entry.name}: ${envValue}`); + } + + // Save configuration to disk + await GlobalConfigManager.save(context, config); + + // Run any required commands + for (const entry of download.cmd ?? []) { + output.appendLine(`[SETUP] Running command: ${entry.cmd}`); + + let cmd = entry.cmd; + if (entry.usepath) { + cmd = path.join(copytopath, entry.cmd); + } + + try { + const result = await exec(cmd, { env: SettingsManager.buildEnvironmentForExecution() }); + output.append(result.stdout); + if (result.stderr) { + output.append(result.stderr); + } + } catch (error: unknown) { + const errObj = error as { message?: string; stdout?: string; stderr?: string }; + output.appendLine(`[SETUP] Command failed: ${errObj.message}`); + if (errObj.stdout) {output.append(errObj.stdout);} + if (errObj.stderr) {output.append(errObj.stderr);} + return false; + } + } + + return true; +} diff --git a/src/commands/index.ts b/src/commands/index.ts index 9cd2599..781a4f5 100644 --- a/src/commands/index.ts +++ b/src/commands/index.ts @@ -5,6 +5,7 @@ */ export * from './setup'; +export * from './install-sdk'; export * from './build'; export * from './flash'; export * from './load'; diff --git a/src/commands/install-sdk.ts b/src/commands/install-sdk.ts new file mode 100644 index 0000000..73e9d94 --- /dev/null +++ b/src/commands/install-sdk.ts @@ -0,0 +1,362 @@ +/** + * @author Jared Wolff + * @copyright Circuit Dojo LLC + * @license Apache 2.0 + */ + +import * as vscode from "vscode"; +import * as fs from "fs-extra"; +import * as path from "path"; +import { Manifest, ManifestEntry, ManifestToolchainEntry } from "../types"; +import { GlobalConfigManager, SettingsManager, ManifestValidator } from "../config"; +import { arch, platform } from "../config"; +import { OutputChannelManager } from "../ui"; +import { PathManager } from "../environment"; +import { FileDownloader } from "../files"; +import { processDownloadWithValidation } from "./download-processor"; + +// eslint-disable-next-line @typescript-eslint/no-require-imports +const manifest: Manifest = require("../../manifest/manifest.json"); + +/** + * Returns the manifest entry for the current platform + architecture, if supported. + */ +function getPlatformArchEntry(): ManifestEntry | undefined { + let platformManifest: ManifestEntry[] | undefined; + switch (platform) { + case "darwin": + platformManifest = manifest.darwin; + break; + case "linux": + platformManifest = manifest.linux; + break; + case "win32": + platformManifest = manifest.win32; + break; + } + return platformManifest?.find(entry => entry.arch === arch); +} + +/** + * The SDK toolchains the manifest can install on this platform/arch. + */ +export function getAvailableSdks(): ManifestToolchainEntry[] { + return getPlatformArchEntry()?.toolchains ?? []; +} + +// Parses a "zephyr-sdk-1.0.0" / "1.0.0" string into a numeric tuple for comparison. +function parseSdkVersion(name: string): number[] { + const match = name.match(/(\d+)\.(\d+)(?:\.(\d+))?/); + if (!match) { return [0, 0, 0]; } + return [Number(match[1]), Number(match[2]), Number(match[3] ?? 0)]; +} + +function compareVersionTuples(a: number[], b: number[]): number { + for (let i = 0; i < Math.max(a.length, b.length); i++) { + const diff = (a[i] ?? 0) - (b[i] ?? 0); + if (diff !== 0) { return diff; } + } + return 0; +} + +/** + * Picks the best manifest SDK to satisfy a Zephyr tree's required SDK version. + * + * A Zephyr tree requesting e.g. "0.16" needs an SDK that is >= 0.16 and on the + * same major line (SDK 1.0 dropped backward compatibility with 0.x trees), so we + * choose the lowest manifest version on the required major line that is >= required. + */ +export function recommendSdkForRequired(required: string): ManifestToolchainEntry | undefined { + const req = parseSdkVersion(required); + const candidates = getAvailableSdks() + .map(sdk => ({ sdk, version: parseSdkVersion(sdk.name) })) + .filter(({ version }) => version[0] === req[0] && compareVersionTuples(version, req) >= 0) + .sort((a, b) => compareVersionTuples(a.version, b.version)); + return candidates[0]?.sdk; +} + +/** + * Installs a Zephyr SDK toolchain into the shared toolchain directory. + * + * Multiple SDK versions coexist; after installing, the workspace's active SDK is + * re-resolved (auto-selecting the best installed SDK compatible with this project's + * Zephyr tree) and the environment is rebuilt. Returns true on success. + * + * @param version Optional SDK name (e.g. "zephyr-sdk-0.16.4") to install without prompting. + */ +export async function installSdkCommand( + context: vscode.ExtensionContext, + version?: string +): Promise { + const config = await GlobalConfigManager.load(context); + + // Host tooling must be present first — the SDK install reuses the tools dir, + // downloader and environment created by Setup. + if (!config.isSetup) { + vscode.window.showErrorMessage("Run `Zephyr Tools: Setup` before installing an SDK."); + return false; + } + + const archEntry = getPlatformArchEntry(); + if (!archEntry || archEntry.toolchains.length === 0) { + vscode.window.showErrorMessage(`No Zephyr SDKs are available for ${platform}-${arch}.`); + return false; + } + + // Resolve which SDK to install. + let selectedEntry: ManifestToolchainEntry | undefined; + if (version) { + selectedEntry = archEntry.toolchains.find(t => t.name === version); + if (!selectedEntry) { + vscode.window.showErrorMessage(`Unknown Zephyr SDK: ${version}`); + return false; + } + } else { + const selection = await vscode.window.showQuickPick( + archEntry.toolchains.map(t => t.name), + { ignoreFocusOut: true, placeHolder: "Which Zephyr SDK would you like to install?" } + ); + if (selection === undefined) { + return false; // user canceled + } + selectedEntry = archEntry.toolchains.find(t => t.name === selection); + } + + if (!selectedEntry) { + vscode.window.showErrorMessage("Unable to find the selected Zephyr SDK entry."); + return false; + } + + const entry = selectedEntry; + + return await vscode.window.withProgress( + { + location: vscode.ProgressLocation.Notification, + title: `Installing ${entry.name}`, + cancellable: false, + }, + async (progress): Promise => { + const output = OutputChannelManager.getChannel(); + output.clear(); + output.show(); + + const currentToolsDir = SettingsManager.getToolsDirectory(); + await fs.mkdirp(currentToolsDir); + FileDownloader.init(path.join(currentToolsDir, "downloads")); + + output.appendLine(`[SETUP] Installing ${entry.name} toolchain...`); + const addedPaths: string[] = []; + for (const download of entry.downloads) { + progress.report({ message: `Downloading ${download.name}...` }); + const result = await processDownloadWithValidation(download, config, context, output, addedPaths); + if (!result) { + output.appendLine(`[SETUP] ABORTING: Failed to process toolchain ${download.name}`); + vscode.window.showErrorMessage(`Failed to install ${entry.name}. Check output for details.`); + return false; + } + } + + // The SDK install dir is the version-named directory under the toolchain dir. + const sdkInstallDir = path.join(currentToolsDir, "toolchain", entry.name); + + // Re-resolve the workspace's active SDK. This auto-selects the best installed + // SDK compatible with the current Zephyr tree (which may be the one just + // installed), keeping selection consistent with on-the-fly switching. + const sdkError = await ManifestValidator.checkSdkCompatibility(); + + // If there is no Zephyr tree yet (no required version to resolve against), + // make the just-installed SDK the active one so the workspace has a default. + if (sdkError === undefined && !SettingsManager.getSdkInstallDir()) { + await SettingsManager.setSdkInstallDir(sdkInstallDir); + } + + // Rebuild PATH / ZEPHYR_SDK_INSTALL_DIR from the (possibly switched) setting. + await PathManager.setupEnvironmentPaths(context, config); + + output.appendLine(`[SETUP] ${entry.name} installed.`); + vscode.window.showInformationMessage(`${entry.name} installed.`); + return true; + } + ); +} + +export interface InstalledSdk { + name: string; + version: string; + path: string; +} + +/** + * Lists the Zephyr SDKs currently installed under the shared toolchain directory, + * sorted highest version first. + */ +export async function getInstalledSdks(): Promise { + const toolchainDir = path.join(SettingsManager.getToolsDirectory(), "toolchain"); + if (!(await fs.pathExists(toolchainDir))) { return []; } + + const entries = await fs.readdir(toolchainDir); + const installed: InstalledSdk[] = []; + for (const entry of entries) { + if (!entry.startsWith("zephyr-sdk-")) { continue; } + const sdkPath = path.join(toolchainDir, entry); + const version = await ManifestValidator.getInstalledSdkVersion(sdkPath); + if (!version) { continue; } + installed.push({ name: entry, version, path: sdkPath }); + } + + installed.sort((a, b) => compareVersionTuples(parseSdkVersion(b.version), parseSdkVersion(a.version))); + return installed; +} + +interface SdkQuickPickItem extends vscode.QuickPickItem { + sdkPath?: string; + install?: boolean; +} + +/** + * Interactive management of installed Zephyr SDKs: shows the installed versions + * (marking the active one), lets the user activate a different version for this + * workspace, uninstall versions, or install a new one. + */ +export async function manageSdkCommand(context: vscode.ExtensionContext): Promise { + const config = await GlobalConfigManager.load(context); + if (!config.isSetup) { + vscode.window.showErrorMessage("Run `Zephyr Tools: Setup` before managing SDKs."); + return; + } + + const uninstallButton: vscode.QuickInputButton = { + iconPath: new vscode.ThemeIcon("trash"), + tooltip: "Uninstall", + }; + + const qp = vscode.window.createQuickPick(); + qp.title = "Manage Zephyr SDKs"; + qp.placeholder = "Select an SDK to activate for this workspace, or install a new one"; + + const refresh = async (): Promise => { + qp.busy = true; + const installed = await getInstalledSdks(); + const active = SettingsManager.getSdkInstallDir(); + + const items: SdkQuickPickItem[] = installed.map(sdk => ({ + label: sdk.name, + description: sdk.path === active ? "$(check) active" : `v${sdk.version}`, + detail: sdk.path, + sdkPath: sdk.path, + buttons: [uninstallButton], + })); + + if (installed.length === 0) { + items.push({ label: "No SDKs installed yet", alwaysShow: true }); + } + + items.push({ label: "", kind: vscode.QuickPickItemKind.Separator }); + items.push({ label: "$(cloud-download) Install new SDK…", install: true, alwaysShow: true }); + + qp.items = items; + qp.busy = false; + }; + + // Re-resolve the active SDK after a change to the installed set, rebuilding the + // environment so PATH / ZEPHYR_SDK_INSTALL_DIR reflect the current selection. + const reselectActiveSdk = async (removedPath: string): Promise => { + if (SettingsManager.getSdkInstallDir() !== removedPath) { return; } + + const zephyrBase = SettingsManager.getZephyrBase(); + const required = zephyrBase ? await ManifestValidator.getRequiredSdkVersion(zephyrBase) : undefined; + + let next: string | undefined; + if (required) { + next = await ManifestValidator.findCompatibleInstalledSdk(required, removedPath); + } + if (!next) { + next = (await getInstalledSdks())[0]?.path; + } + + await SettingsManager.setSdkInstallDir(next); + await PathManager.setupEnvironmentPaths(context, config); + }; + + qp.onDidTriggerItemButton(async (event) => { + const sdkPath = event.item.sdkPath; + if (!sdkPath) { return; } + + const confirm = await vscode.window.showWarningMessage( + `Uninstall ${event.item.label}?`, + { modal: true, detail: sdkPath }, + "Uninstall" + ); + if (confirm !== "Uninstall") { return; } + + qp.busy = true; + await fs.remove(sdkPath); + await reselectActiveSdk(sdkPath); + await refresh(); + vscode.window.showInformationMessage(`Uninstalled ${event.item.label}.`); + }); + + qp.onDidAccept(async () => { + const item = qp.selectedItems[0]; + if (!item) { return; } + + if (item.install) { + qp.hide(); + await installSdkCommand(context); + return; + } + + if (item.sdkPath) { + await SettingsManager.setSdkInstallDir(item.sdkPath); + await PathManager.setupEnvironmentPaths(context, config); + vscode.window.showInformationMessage(`Active Zephyr SDK: ${item.label}`); + qp.hide(); + } + }); + + qp.onDidHide(() => qp.dispose()); + + await refresh(); + qp.show(); +} + +/** + * Ensures a compatible SDK is available for the current workspace's Zephyr tree, + * prompting the user to install one if needed. + * + * Returns true if a compatible SDK is active (or no Zephyr tree requires one), + * false if the user declined or installation failed. + */ +export async function ensureCompatibleSdkInteractive( + context: vscode.ExtensionContext +): Promise { + // checkSdkCompatibility auto-switches to a compatible installed SDK if possible. + const sdkError = await ManifestValidator.checkSdkCompatibility(); + if (!sdkError) { + // The active SDK may have been auto-switched here (or by the sidebar's + // background validation) without updating VS Code's environment variable + // collection. That collection is persistent and is applied on top of a task's + // own env, so a stale ZEPHYR_SDK_INSTALL_DIR there would override the correct + // value in the build task. Resync it before building. + const config = await GlobalConfigManager.load(context); + await PathManager.setupEnvironmentPaths(context, config); + return true; + } + + // Nothing installed is compatible. Recommend the right manifest SDK to install. + const zephyrBase = SettingsManager.getZephyrBase(); + const required = zephyrBase ? await ManifestValidator.getRequiredSdkVersion(zephyrBase) : undefined; + const recommended = required ? recommendSdkForRequired(required) : undefined; + + const installLabel = recommended ? `Install ${recommended.name}` : "Install SDK…"; + const chooseLabel = "Choose Version…"; + const choice = await vscode.window.showWarningMessage(sdkError, installLabel, chooseLabel); + + if (choice === installLabel) { + return await installSdkCommand(context, recommended?.name); + } + if (choice === chooseLabel) { + return await installSdkCommand(context); + } + return false; +} diff --git a/src/commands/setup.ts b/src/commands/setup.ts index 3f7ac28..f5d50c4 100644 --- a/src/commands/setup.ts +++ b/src/commands/setup.ts @@ -7,219 +7,26 @@ import * as vscode from "vscode"; import * as fs from "fs-extra"; import * as path from "path"; -import * as util from "util"; -import * as cp from "child_process"; -import { GlobalConfig, Manifest, ManifestEntry, ManifestToolchainEntry, ManifestDownloadEntry } from "../types"; +import { Manifest, ManifestEntry } from "../types"; import { GlobalConfigManager, SettingsManager } from "../config"; -import { - findSuitablePython, - validateGitInstallation, +import { + findSuitablePython, + validateGitInstallation, createVirtualEnvironment, installWest, setupVirtualEnvironmentPaths } from "../environment"; import { OutputChannelManager } from "../ui"; import { TaskManager } from "../tasks"; -import { arch, platform, pathdivider } from "../config"; -import { FileDownloader, ArchiveExtractor } from "../files"; +import { arch, platform } from "../config"; +import { FileDownloader } from "../files"; +import { processDownloadWithValidation } from "./download-processor"; +import { ensureCompatibleSdkInteractive } from "./install-sdk"; // Manifest data // eslint-disable-next-line @typescript-eslint/no-require-imports const manifest: Manifest = require("../../manifest/manifest.json"); -/** - * Process a download entry with validation and error handling - */ -async function processDownloadWithValidation( - download: ManifestDownloadEntry, - config: GlobalConfig, - context: vscode.ExtensionContext, - output: vscode.OutputChannel, - allAddedPaths: string[] -): Promise { - output.appendLine(`[SETUP] Starting processing: ${download.name}`); - output.appendLine(`[SETUP] URL: ${download.url}`); - output.appendLine(`[SETUP] Expected MD5: ${download.md5}`); - - const result = await processDownload(download, config, context, output, allAddedPaths); - - if (result) { - output.appendLine(`[SETUP] Successfully completed: ${download.name}`); - } else { - output.appendLine(`[SETUP] FAILED to process: ${download.name}`); - } - - return result; -} - -/** - * Process a single download entry from the manifest - */ -async function processDownload( - download: ManifestDownloadEntry, - config: GlobalConfig, - context: vscode.ExtensionContext, - output: vscode.OutputChannel, - allAddedPaths: string[] -): Promise { - const exec = util.promisify(cp.exec); - - // Check if file already exists - let filepath: string | null = await FileDownloader.exists(download.filename); - - // Download if doesn't exist or hash doesn't match - if (filepath === null || !(await FileDownloader.check(download.filename, download.md5))) { - output.appendLine(`[SETUP] downloading ${download.url}`); - - try { - filepath = await FileDownloader.fetch(download.url); - } catch (error) { - output.appendLine(`[SETUP] Failed to download ${download.filename}: ${error}`); - return false; - } - - // Check hash again - if (!(await FileDownloader.check(download.filename, download.md5))) { - output.appendLine(`[SETUP] Checksum mismatch for ${download.filename}`); - return false; - } - } - - // Ensure filepath is not null - if (filepath === null) { - output.appendLine(`[SETUP] Critical error: filepath is null for ${download.filename}`); - return false; - } - - // Determine target path - use settings-based tools directory - const currentToolsDir = SettingsManager.getToolsDirectory(); - let copytopath = path.join(currentToolsDir, download.name); - output.appendLine(`[SETUP] Initial copytopath: ${copytopath}`); - - // Add subfolder if specified - if (download.copy_to_subfolder) { - copytopath = path.join(copytopath, download.copy_to_subfolder); - output.appendLine(`[SETUP] Updated copytopath with subfolder: ${copytopath}`); - } - - // Create target directory if it doesn't exist - if (!(await fs.pathExists(copytopath))) { - await fs.mkdirp(copytopath); - output.appendLine(`[SETUP] Created target directory: ${copytopath}`); - } - - // Clear target directory if specified (default behavior) - if (download.clear_target !== false) { - try { - await fs.remove(copytopath); - await fs.mkdirp(copytopath); - output.appendLine(`[SETUP] Cleared and recreated target directory: ${copytopath}`); - } catch (error) { - output.appendLine(`[SETUP] Failed to prepare target directory: ${error}`); - return false; - } - } else { - output.appendLine(`[SETUP] Preserving existing target directory: ${copytopath}`); - } - - // Extract archive based on file type - try { - if (download.url.includes(".zip") || download.url.includes(".7z") || download.url.includes(".tar")) { - output.appendLine(`[SETUP] Extracting ${filepath} to ${copytopath}`); - - const extractionSuccess = await ArchiveExtractor.extractArchive(filepath, copytopath); - if (!extractionSuccess) { - output.appendLine(`[SETUP] Archive extraction failed for ${download.name}`); - return false; - } - } - } catch (error) { - output.appendLine(`[SETUP] Extraction error for ${download.name}: ${error}`); - return false; - } - - // Set up PATH environment variable - if (download.suffix) { - const setpath = path.join(copytopath, download.suffix); - - // Add to VS Code environment collection - context.environmentVariableCollection.prepend("PATH", setpath + pathdivider); - - // Track this path - allAddedPaths.push(setpath); - output.appendLine(`[SETUP] Added to PATH: ${setpath}`); - } else { - // If no suffix, assume the copytopath contains executables and should be added to PATH - - // Add to VS Code environment collection - context.environmentVariableCollection.prepend("PATH", copytopath + pathdivider); - - // Track this path - allAddedPaths.push(copytopath); - output.appendLine(`[SETUP] Added to PATH: ${copytopath}`); - } - - // Set remaining environment variables in settings - for (const entry of download.env ?? []) { - let envValue: string; - if (entry.value) { - envValue = entry.value; - } else if (entry.usepath && !entry.append) { - envValue = path.join(copytopath, entry.suffix ?? ""); - } else if (entry.usepath && entry.append) { - const existingValue = SettingsManager.getZephyrBase() || ""; // For ZEPHYR_BASE mainly - envValue = path.join( - copytopath, - (entry.suffix ?? "") + pathdivider + existingValue - ); - } else { - continue; - } - - // Save environment variable to settings - await SettingsManager.setEnvironmentVariable(entry.name, envValue); - - // Also save ZEPHYR_BASE to its dedicated setting - if (entry.name === "ZEPHYR_BASE") { - await SettingsManager.setZephyrBase(envValue); - } - - // Set environment variable in VS Code environment collection - context.environmentVariableCollection.replace(entry.name, envValue); - - output.appendLine(`[SETUP] Set ${entry.name}: ${envValue}`); - } - - // Save configuration to disk - await GlobalConfigManager.save(context, config); - - // Run any required commands - for (const entry of download.cmd ?? []) { - output.appendLine(`[SETUP] Running command: ${entry.cmd}`); - - let cmd = entry.cmd; - if (entry.usepath) { - cmd = path.join(copytopath, entry.cmd); - } - - try { - const result = await exec(cmd, { env: SettingsManager.buildEnvironmentForExecution() }); - output.append(result.stdout); - if (result.stderr) { - output.append(result.stderr); - } - } catch (error: unknown) { - const errObj = error as { message?: string; stdout?: string; stderr?: string }; - output.appendLine(`[SETUP] Command failed: ${errObj.message}`); - if (errObj.stdout) {output.append(errObj.stdout);} - if (errObj.stderr) {output.append(errObj.stderr);} - return false; - } - } - - return true; -} - export async function setupCommand(context: vscode.ExtensionContext): Promise { // Reset configuration await GlobalConfigManager.reset(context); @@ -258,39 +65,9 @@ export async function setupCommand(context: vscode.ExtensionContext): Promise element.name === selection); - - if (selectedEntry === undefined) { - vscode.window.showErrorMessage("Unable to find toolchain entry."); - return; - } - - break; - } - } + // Setup installs host tooling only. The Zephyr SDK is managed separately by the + // `Zephyr Tools: Install SDK` command, so multiple SDK versions can coexist and + // be selected per-workspace. We prompt to install one at the end of setup. // Show setup progress await vscode.window.withProgress( @@ -362,10 +139,10 @@ export async function setupCommand(context: vscode.ExtensionContext): Promise 0) { await SettingsManager.setAllPaths(allAddedPaths); } @@ -432,6 +195,12 @@ export async function setupCommand(context: vscode.ExtensionContext): Promise { + // Resolve the SDK for this workspace's Zephyr tree first. This auto-switches + // the workspace's selected SDK to a compatible installed version when needed, + // so the directory checks below operate on the correct (switched) SDK. + const sdkError = await ManifestValidator.checkSdkCompatibility(); + if (sdkError) { + result.isValid = false; + result.errors.push(sdkError); + } + // Check for SDK environment variable to determine which toolchain is installed const sdkInstallDir = SettingsManager.getZephyrSdkInstallDir(); const toolchainVariant = SettingsManager.getZephyrToolchainVariant(); @@ -291,15 +300,12 @@ export class ManifestValidator { config: GlobalConfig, result: ManifestValidationResult ): void { - const requiredEnvVars = [ - 'ZEPHYR_TOOLCHAIN_VARIANT', - 'ZEPHYR_SDK_INSTALL_DIR' - ]; - - for (const envVar of requiredEnvVars) { - if (!SettingsManager.getEnvironmentVariable(envVar)) { - result.warnings.push(`Missing environment variable: ${envVar}`); - } + if (!SettingsManager.getEnvironmentVariable('ZEPHYR_TOOLCHAIN_VARIANT')) { + result.warnings.push('Missing environment variable: ZEPHYR_TOOLCHAIN_VARIANT'); + } + // ZEPHYR_SDK_INSTALL_DIR is workspace-scoped (paths.sdkInstallDir) — read via getSdkInstallDir + if (!SettingsManager.getSdkInstallDir()) { + result.warnings.push('Missing environment variable: ZEPHYR_SDK_INSTALL_DIR'); } } @@ -406,4 +412,139 @@ export class ManifestValidator { return true; } + + // Ensures the workspace's selected SDK is compatible with the current Zephyr tree. + // If the selected SDK is missing or incompatible, this auto-switches the workspace + // setting to a compatible installed SDK (multiple SDK versions coexist under the + // toolchain directory). Returns an error message only if no compatible SDK is + // installed, or undefined if everything is OK / settings aren't configured yet. + static async checkSdkCompatibility(): Promise { + const zephyrBase = SettingsManager.getZephyrBase(); + if (!zephyrBase) { return undefined; } + + const required = await ManifestValidator.getRequiredSdkVersion(zephyrBase); + if (!required) { return undefined; } + + const sdkInstallDir = SettingsManager.getZephyrSdkInstallDir(); + + // If the currently-selected SDK is present and compatible, nothing to do. + if (sdkInstallDir && (await ManifestValidator.isSdkCompatible(sdkInstallDir, required))) { + return undefined; + } + + // The selected SDK is missing or incompatible. Try to auto-switch to a + // compatible installed SDK before reporting an error. + const compatible = await ManifestValidator.findCompatibleInstalledSdk(required, sdkInstallDir); + if (compatible) { + await SettingsManager.setSdkInstallDir(compatible); + return undefined; + } + + // No compatible SDK is installed — surface an actionable error. + if (!sdkInstallDir) { + return `Zephyr SDK not configured for this workspace, and no compatible SDK is installed for Zephyr >= ${required}. Run setup to install it.`; + } + + const installed = await ManifestValidator.getInstalledSdkVersion(sdkInstallDir); + if (!installed) { + return `Zephyr SDK not found at configured path: ${sdkInstallDir}. Run setup to install the correct SDK.`; + } + + return `Zephyr SDK version mismatch: installed ${installed}, but this Zephyr requires >= ${required}. No compatible SDK is installed — run setup to install it.`; + } + + // Returns true if the SDK at the given path is installed and compatible with the + // requested Zephyr SDK version (accounting for the SDK's own minimum-compatible floor). + private static async isSdkCompatible(sdkInstallDir: string, required: string): Promise { + const installed = await ManifestValidator.getInstalledSdkVersion(sdkInstallDir); + if (!installed) { return false; } + const minimumCompatible = await ManifestValidator.getSdkMinimumCompatibleVersion(sdkInstallDir); + return ManifestValidator.sdkVersionSatisfies(installed, required, minimumCompatible); + } + + // Scans the directory holding installed SDKs (siblings of the current SDK, or the + // manifest's toolchain directory) and returns the path of the highest-version SDK + // compatible with the requested Zephyr SDK version, or undefined if none qualify. + static async findCompatibleInstalledSdk( + required: string, + currentSdkInstallDir?: string + ): Promise { + // Installed SDKs live as `zephyr-sdk-` siblings of the selected SDK. + const searchDir = currentSdkInstallDir + ? path.dirname(currentSdkInstallDir) + : path.join(SettingsManager.getToolsDirectory(), 'toolchain'); + + if (!(await fs.pathExists(searchDir))) { return undefined; } + + const entries = await fs.readdir(searchDir); + const candidates: { path: string; version: string }[] = []; + for (const entry of entries) { + if (!entry.startsWith('zephyr-sdk-')) { continue; } + const candidatePath = path.join(searchDir, entry); + const installed = await ManifestValidator.getInstalledSdkVersion(candidatePath); + if (!installed) { continue; } + const minimumCompatible = await ManifestValidator.getSdkMinimumCompatibleVersion(candidatePath); + if (ManifestValidator.sdkVersionSatisfies(installed, required, minimumCompatible)) { + candidates.push({ path: candidatePath, version: installed }); + } + } + + if (candidates.length === 0) { return undefined; } + + // Prefer the highest compatible installed version. + candidates.sort((a, b) => ManifestValidator.compareSdkVersions(b.version, a.version)); + return candidates[0].path; + } + + // Compares two full SDK version strings (major.minor.patch). Returns a positive + // number if a > b, negative if a < b, and 0 if equal. + private static compareSdkVersions(a: string, b: string): number { + const pa = a.split('.').map(Number); + const pb = b.split('.').map(Number); + for (let i = 0; i < Math.max(pa.length, pb.length); i++) { + const diff = (pa[i] ?? 0) - (pb[i] ?? 0); + if (diff !== 0) { return diff; } + } + return 0; + } + + static async getRequiredSdkVersion(zephyrBase: string): Promise { + const cmakePath = path.join(zephyrBase, 'cmake', 'modules', 'FindHostTools.cmake'); + if (!(await fs.pathExists(cmakePath))) { return undefined; } + const content = await fs.readFile(cmakePath, 'utf-8'); + return content.match(/find_package\s*\(\s*Zephyr-sdk\s+([\d.]+)/)?.[1]; + } + + static async getInstalledSdkVersion(sdkInstallDir: string): Promise { + const versionPath = path.join(sdkInstallDir, 'sdk_version'); + if (!(await fs.pathExists(versionPath))) { return undefined; } + return (await fs.readFile(versionPath, 'utf-8')).trim(); + } + + // Reads ZEPHYR_SDK_MINIMUM_COMPATIBLE_VERSION from the SDK's own version config. + // This is the minimum Zephyr-requested version the SDK will accept (SDK 1.0 sets this to 1.0, + // explicitly refusing to serve older Zephyr trees that ask for 0.x). + static async getSdkMinimumCompatibleVersion(sdkInstallDir: string): Promise { + const configVersionPath = path.join(sdkInstallDir, 'cmake', 'Zephyr-sdkConfigVersion.cmake'); + if (!(await fs.pathExists(configVersionPath))) { return undefined; } + const content = await fs.readFile(configVersionPath, 'utf-8'); + return content.match(/set\s*\(\s*ZEPHYR_SDK_MINIMUM_COMPATIBLE_VERSION\s+([\d.]+)/)?.[1]; + } + + // Returns true if the installed SDK is compatible with the requested version. + // Accounts for the SDK's own MINIMUM_COMPATIBLE_VERSION floor (SDK 1.0 rejects requests < 1.0). + static sdkVersionSatisfies(installed: string, required: string, minimumCompatible?: string): boolean { + const parse = (v: string): [number, number] => { + const [major = 0, minor = 0] = v.split('.').map(Number); + return [major, minor]; + }; + const cmp = ([aMaj, aMin]: [number, number], [bMaj, bMin]: [number, number]): number => + aMaj !== bMaj ? aMaj - bMaj : aMin - bMin; + + const req = parse(required); + if (minimumCompatible && cmp(req, parse(minimumCompatible)) < 0) { + return false; + } + return cmp(parse(installed), req) >= 0; + } } diff --git a/src/config/settings-manager.ts b/src/config/settings-manager.ts index ae0ab9c..470387f 100644 --- a/src/config/settings-manager.ts +++ b/src/config/settings-manager.ts @@ -142,12 +142,32 @@ export class SettingsManager { } // Convenience methods for specific environment variables - static getZephyrSdkInstallDir(): string | undefined { + + // Workspace-scoped SDK install dir. Falls back to the legacy global env-var entry + // so existing setups continue to work until the user runs setup again. + static getSdkInstallDir(): string | undefined { + const config = vscode.workspace.getConfiguration(this.CONFIG_SECTION); + const workspaceSetting = config.get("paths.sdkInstallDir"); + if (workspaceSetting) { return workspaceSetting; } return this.getEnvironmentVariable("ZEPHYR_SDK_INSTALL_DIR"); } - static async setZephyrSdkInstallDir(path: string): Promise { - await this.setEnvironmentVariable("ZEPHYR_SDK_INSTALL_DIR", path); + // Sets the workspace-scoped SDK install dir. Pass undefined to clear it (e.g. when + // the active SDK has been uninstalled and no replacement is available). + static async setSdkInstallDir(sdkPath: string | undefined): Promise { + const config = vscode.workspace.getConfiguration(this.CONFIG_SECTION); + const target = vscode.workspace.workspaceFolders + ? vscode.ConfigurationTarget.Workspace + : vscode.ConfigurationTarget.Global; + await config.update("paths.sdkInstallDir", sdkPath || undefined, target); + } + + static getZephyrSdkInstallDir(): string | undefined { + return this.getSdkInstallDir(); + } + + static async setZephyrSdkInstallDir(sdkPath: string): Promise { + await this.setSdkInstallDir(sdkPath); } static getZephyrToolchainVariant(): string | undefined { @@ -202,7 +222,17 @@ export class SettingsManager { // Join path components with platform-appropriate separator const platformConfig = getPlatformConfig(); env.PATH = pathComponents.filter(p => p).join(platformConfig.pathDivider); - + + // Inject workspace-scoped SDK dir and prepend its ARM toolchain path. + // getSdkInstallDir() reads the workspace setting first, so this correctly + // overrides the legacy global env-var value when both are present. + const sdkDir = this.getSdkInstallDir(); + if (sdkDir) { + env["ZEPHYR_SDK_INSTALL_DIR"] = sdkDir; + const armPath = path.join(sdkDir, "arm-zephyr-eabi", "bin"); + env.PATH = armPath + platformConfig.pathDivider + env.PATH; + } + return env; } diff --git a/src/config/validation.ts b/src/config/validation.ts index c29df32..0f0fe7d 100644 --- a/src/config/validation.ts +++ b/src/config/validation.ts @@ -49,11 +49,13 @@ export class ConfigValidator { }; } - // Check basic setup flag + // Check basic setup flag. Try to give a specific reason (e.g. SDK mismatch) + // so the sidebar can show actionable context rather than a generic message. if (!config.isSetup) { + const sdkError = await ManifestValidator.checkSdkCompatibility(); return { isValid: false, - error: "Run `Zephyr Tools: Setup` command first.", + error: sdkError ?? "Run `Zephyr Tools: Setup` command first.", details: ["Setup has not been completed"] }; } @@ -69,9 +71,11 @@ export class ConfigValidator { config.isSetup = false; await GlobalConfigManager.save(context, config); + const primaryError = physicalValidation.errors[0] ?? + "Setup validation failed. Run `Zephyr Tools: Setup` command again."; return { isValid: false, - error: "Setup validation failed. Run `Zephyr Tools: Setup` command again.", + error: primaryError, details: [ "Physical validation detected missing or corrupted components:", ...physicalValidation.errors, diff --git a/src/environment/path-manager.ts b/src/environment/path-manager.ts index a779171..2971faf 100644 --- a/src/environment/path-manager.ts +++ b/src/environment/path-manager.ts @@ -133,17 +133,29 @@ export class PathManager { } static async setupEnvironmentPaths(context: vscode.ExtensionContext, _config: GlobalConfig): Promise { - // Restore all environment variables from settings + // Restore global environment variables from settings, but let the + // workspace-scoped SDK setting take precedence (handled below). const envVars = SettingsManager.getEnvironmentVariables(); for (const [key, value] of Object.entries(envVars)) { - if (value) { + if (value && key !== "ZEPHYR_SDK_INSTALL_DIR") { context.environmentVariableCollection.replace(key, value); } } - + // VIRTUAL_ENV should be based on current tools directory const pythonenv = path.join(SettingsManager.getToolsDirectory(), "env"); context.environmentVariableCollection.replace("VIRTUAL_ENV", pythonenv); + + // Apply workspace-scoped SDK install dir. getSdkInstallDir() reads the + // workspace setting first and falls back to the global env-var for existing + // setups, so this is always the right value for this workspace window. + const sdkInstallDir = SettingsManager.getSdkInstallDir(); + if (sdkInstallDir) { + context.environmentVariableCollection.replace("ZEPHYR_SDK_INSTALL_DIR", sdkInstallDir); + const armPath = path.join(sdkInstallDir, "arm-zephyr-eabi", "bin"); + const pathDivider = getPlatformConfig().pathDivider; + context.environmentVariableCollection.prepend("PATH", armPath + pathDivider); + } } } diff --git a/src/extension.ts b/src/extension.ts index 73ab794..a229e7b 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -7,13 +7,15 @@ import * as vscode from "vscode"; import * as fs from "fs"; import * as path from "path"; -import { GlobalConfigManager, ProjectConfigManager, ProjectOverridesManager, SettingsManager } from "./config"; +import { GlobalConfigManager, ProjectConfigManager, ProjectOverridesManager, SettingsManager, ManifestValidator } from "./config"; import { TaskManager } from "./tasks"; import { StatusBarManager, OutputChannelManager, DialogManager, SidebarWebviewProvider } from "./ui"; import { PathManager } from "./environment"; import { GlobalConfig } from "./types"; import { setupCommand, + installSdkCommand, + manageSdkCommand, buildCommand, buildPristineCommand, buildMultiCommand, @@ -68,12 +70,8 @@ export async function activate(context: vscode.ExtensionContext) { // Reload global config in case it was modified during cleanup globalConfig = await GlobalConfigManager.load(context); - // Set up environment variable collection - await setupEnvironmentVariables(context); - - // Extension initialization complete - - // Auto-detect and populate ZEPHYR_BASE if not set + // Auto-detect and populate ZEPHYR_BASE if not set. Done before environment setup + // so SDK resolution below sees the correct Zephyr tree. if (!SettingsManager.getZephyrBase()) { const detectedZephyrBase = await SettingsManager.detectZephyrBase(); if (detectedZephyrBase) { @@ -83,6 +81,15 @@ export async function activate(context: vscode.ExtensionContext) { } } + // Auto-select a compatible installed SDK for this workspace's Zephyr tree before + // building the environment, so PATH/ZEPHYR_SDK_INSTALL_DIR reflect the right SDK. + await ManifestValidator.checkSdkCompatibility().catch(console.error); + + // Set up environment variable collection + await setupEnvironmentVariables(context); + + // Extension initialization complete + // Initialize status bar StatusBarManager.initializeStatusBarItems(context); @@ -98,6 +105,9 @@ export async function activate(context: vscode.ExtensionContext) { // Check if Python dependencies are still present in venv await validateProjectDependencies(context); + // Check SDK version compatibility on activation (advisory — build commands enforce it hard). + validateToolchainVersion(context).catch(console.error); + // Auto-save project overrides whenever config changes context.subscriptions.push( ProjectConfigManager.onDidChangeConfig(async () => { @@ -164,6 +174,12 @@ async function validateProjectDependencies(context: vscode.ExtensionContext): Pr } } +async function validateToolchainVersion(_context: vscode.ExtensionContext): Promise { + // SDK compatibility is surfaced through the sidebar's physical validation + // ("SDK Update Required") and enforced at build time. A separate popup on + // every activation is redundant noise — the sidebar already shows what's wrong. +} + async function setupEnvironmentVariables(context: vscode.ExtensionContext): Promise { context.environmentVariableCollection.persistent = true; @@ -184,6 +200,20 @@ function registerCommands(context: vscode.ExtensionContext, sidebar?: SidebarWeb }) ); + // Install SDK command — manages Zephyr SDK toolchains separately from setup. + context.subscriptions.push( + vscode.commands.registerCommand("zephyr-tools.install-sdk", async () => { + await installSdkCommand(context); + }) + ); + + // Manage SDKs command — list/activate/uninstall installed Zephyr SDKs. + context.subscriptions.push( + vscode.commands.registerCommand("zephyr-tools.manage-sdks", async () => { + await manageSdkCommand(context); + }) + ); + // Create project command context.subscriptions.push( vscode.commands.registerCommand("zephyr-tools.create-project", async (dest: vscode.Uri | undefined) => { diff --git a/src/ui/sidebar-webview.ts b/src/ui/sidebar-webview.ts index 2dacab3..daadd0c 100644 --- a/src/ui/sidebar-webview.ts +++ b/src/ui/sidebar-webview.ts @@ -5,7 +5,7 @@ */ import * as vscode from "vscode"; -import { GlobalConfigManager, ProjectConfigManager } from "../config"; +import { GlobalConfigManager, ProjectConfigManager, SettingsManager } from "../config"; import { GlobalConfig, ProjectConfig } from "../types"; import { BuildAssetsManager, BuildAssetsState } from "../build/build-assets-manager"; @@ -15,6 +15,7 @@ interface SidebarState { project: ProjectConfig; hasWorkspace: boolean; buildAssets?: BuildAssetsState; + error?: string; } export class SidebarWebviewProvider implements vscode.WebviewViewProvider { @@ -128,7 +129,8 @@ export class SidebarWebviewProvider implements vscode.WebviewViewProvider { }, config, project, - buildAssets + buildAssets, + sdkInstallDir: SettingsManager.getSdkInstallDir() } }); } @@ -157,7 +159,8 @@ export class SidebarWebviewProvider implements vscode.WebviewViewProvider { type: 'setup-required', config, project, - hasWorkspace + hasWorkspace, + error: setupValidation.error }; } From b811c4f31781fe9ad2d7ca420133e8ced967fdc9 Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Fri, 19 Jun 2026 18:34:01 -0400 Subject: [PATCH 06/15] feat: refresh Python requirements on update; add Install Python Requirements command Keep the venv in sync when a Zephyr version bump changes dependencies, instead of requiring a full re-init. - Update now runs west update -> re-resolve SDK -> reinstall Python requirements - Prefer "west packages pip --install" (collects requirements across all west modules) with a fallback to zephyr/scripts/requirements.txt on older trees - Add standalone "Zephyr Tools: Install Python Requirements" command - Refresh the sidebar after update so SDK state reflects the updated tree --- package.json | 5 + src/commands/project-management.ts | 19 ++-- src/commands/update.ts | 142 ++++++++++++++++++++---- src/environment/dependency-installer.ts | 64 +++++++---- src/extension.ts | 10 +- 5 files changed, 187 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index 8765db6..96be0f4 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "onCommand:zephyr-tools.init-repo", "onCommand:zephyr-tools.clean", "onCommand:zephyr-tools.update", + "onCommand:zephyr-tools.install-requirements", "onCommand:zephyr-tools.change-runner", "onCommand:zephyr-tools.change-sysbuild", "onCommand:zephyr-tools.change-extra-conf-files", @@ -176,6 +177,10 @@ "command": "zephyr-tools.update", "title": "Zephyr Tools: Update Dependencies" }, + { + "command": "zephyr-tools.install-requirements", + "title": "Zephyr Tools: Install Python Requirements" + }, { "command": "zephyr-tools.change-runner", "title": "Zephyr Tools: Change Runner" diff --git a/src/commands/project-management.ts b/src/commands/project-management.ts index 5648dc3..3b6c4fc 100644 --- a/src/commands/project-management.ts +++ b/src/commands/project-management.ts @@ -13,7 +13,8 @@ import { GlobalConfig, ZephyrTask } from "../types"; import { ProjectConfigManager, ProjectOverridesManager } from "../config"; import { QuickPickManager, DialogManager, OutputChannelManager, StatusBarManager } from "../ui"; import { TaskManager } from "../tasks"; -import { platform, SettingsManager } from "../config"; +import { SettingsManager } from "../config"; +import { getRequirementsInstallCommand } from "../environment"; export async function changeProjectCommand( config: GlobalConfig, @@ -246,14 +247,14 @@ export async function initRepoCommand( } output.appendLine(`[INIT] Determined zephyr base path: ${base}`); - // Install python dependencies - const pythonenv = path.join(SettingsManager.getToolsDirectory(), "env"); - const venvPython = platform === "win32" - ? path.join(pythonenv, "Scripts", "python.exe") - : path.join(pythonenv, "bin", "python"); - - const installCmd = `"${venvPython}" -m pip install -r ${path.join(base, "scripts", "requirements.txt")}`; - output.appendLine(`[INIT] Starting pip install: ${installCmd}`); + // Install python dependencies for the current tree (all west modules where + // supported, falling back to zephyr/scripts/requirements.txt on older trees). + const installCmd = await getRequirementsInstallCommand( + base, + SettingsManager.buildEnvironmentForExecution(), + dest.fsPath + ); + output.appendLine(`[INIT] Starting Python dependency install: ${installCmd}`); const installExec = new vscode.ShellExecution(installCmd, shellOptions); diff --git a/src/commands/update.ts b/src/commands/update.ts index 7ed3084..c6b71d4 100644 --- a/src/commands/update.ts +++ b/src/commands/update.ts @@ -9,47 +9,141 @@ import { GlobalConfig } from "../types"; import { ProjectConfigManager, ConfigValidator } from "../config"; import { EnvironmentUtils } from "../utils"; import { SettingsManager } from "../config/settings-manager"; +import { TaskManager } from "../tasks"; +import { OutputChannelManager } from "../ui"; +import { getRequirementsInstallCommand } from "../environment"; +import { ensureCompatibleSdkInteractive } from "./install-sdk"; +const TASK_TYPE = "zephyr-tools"; + +function getWorkspaceCwd(): string | undefined { + return vscode.workspace.workspaceFolders?.[0]?.uri.fsPath; +} + +/** + * Builds a task that (re)installs the Zephyr tree's Python requirements. The + * underlying command tracks whatever the current tree needs, so it stays correct + * across Zephyr version changes. + */ +async function buildRequirementsTask(cwd: string, taskName: string): Promise { + const env = EnvironmentUtils.normalizeEnvironment(SettingsManager.buildEnvironmentForExecution()); + const cmd = await getRequirementsInstallCommand( + SettingsManager.getZephyrBase() ?? "zephyr", + env, + cwd + ); + + const exec = new vscode.ShellExecution(cmd, { env, cwd }); + return new vscode.Task( + { type: TASK_TYPE, command: taskName }, + vscode.TaskScope.Workspace, + taskName, + TASK_TYPE, + exec, + ); +} + +/** + * Updates west projects and then refreshes Python requirements, keeping the + * virtual environment in sync when a Zephyr version bump changes dependencies. + */ export async function updateCommand( config: GlobalConfig, - context: vscode.ExtensionContext + context: vscode.ExtensionContext, + sidebarProvider?: { refresh?(): void } ): Promise { - // Check manifest version and setup state const validationResult = await ConfigValidator.validateSetupState(config, context, false); if (!validationResult.isValid) { vscode.window.showErrorMessage(validationResult.error!); return; } - - await ProjectConfigManager.load(context); - const rootPaths = vscode.workspace.workspaceFolders; - - if (!rootPaths) { - vscode.window.showErrorMessage('No workspace folder found.'); + + const cwd = getWorkspaceCwd(); + if (!cwd) { + vscode.window.showErrorMessage("No workspace folder found."); return; } - - const options: vscode.ShellExecutionOptions = { - env: EnvironmentUtils.normalizeEnvironment(SettingsManager.buildEnvironmentForExecution()), - cwd: rootPaths[0].uri.fsPath, - }; - + + const env = EnvironmentUtils.normalizeEnvironment(SettingsManager.buildEnvironmentForExecution()); const taskName = "Zephyr Tools: Update Dependencies"; - const cmd = "west update"; - const exec = new vscode.ShellExecution(cmd, options); - - const task = new vscode.Task( - { type: "zephyr-tools", command: taskName }, + + const updateExec = new vscode.ShellExecution("west update", { env, cwd }); + const updateTask = new vscode.Task( + { type: TASK_TYPE, command: taskName }, vscode.TaskScope.Workspace, taskName, - "zephyr-tools", - exec, + TASK_TYPE, + updateExec, ); - + + // After `west update` succeeds, bring the rest of the toolchain in line with the + // (possibly bumped) Zephyr revision: re-resolve the required SDK — prompting to + // install/repair it if it's missing or incomplete — then refresh Python deps. + const refreshDependencies = async () => { + await ensureCompatibleSdkInteractive(context); + + // The Zephyr tree's required SDK may have changed with the update. Refresh the + // sidebar so it reflects the new SDK state (active version or "SDK Required"), + // even when no SDK switch occurred (which wouldn't fire a config-change event). + sidebarProvider?.refresh?.(); + + OutputChannelManager.getChannel().appendLine("[UPDATE] Refreshing Python requirements..."); + const requirementsTask = await buildRequirementsTask(cwd, taskName); + await TaskManager.push(requirementsTask, { + ignoreError: false, + lastTask: true, + successMessage: "Dependencies updated.", + }); + }; + try { - await vscode.tasks.executeTask(task); - vscode.window.showInformationMessage('Updating dependencies for project.'); + await TaskManager.push(updateTask, { + ignoreError: false, + lastTask: false, + callback: refreshDependencies, + }); + vscode.window.showInformationMessage("Updating dependencies for project."); } catch (error) { vscode.window.showErrorMessage(`Update failed: ${error}`); } } + +/** + * Reinstalls the Zephyr tree's Python requirements without running `west update`. + * Useful when dependencies change but the west projects are already up to date. + */ +export async function installRequirementsCommand( + config: GlobalConfig, + context: vscode.ExtensionContext +): Promise { + const validationResult = await ConfigValidator.validateSetupState(config, context, false); + if (!validationResult.isValid) { + vscode.window.showErrorMessage(validationResult.error!); + return; + } + + const project = await ProjectConfigManager.load(context); + const projectValidation = ConfigValidator.validateProjectInit(project); + if (!projectValidation.isValid) { + vscode.window.showErrorMessage(projectValidation.error!); + return; + } + + const cwd = getWorkspaceCwd(); + if (!cwd) { + vscode.window.showErrorMessage("No workspace folder found."); + return; + } + + const taskName = "Zephyr Tools: Install Python Requirements"; + try { + const requirementsTask = await buildRequirementsTask(cwd, taskName); + await TaskManager.push(requirementsTask, { + ignoreError: false, + lastTask: true, + successMessage: "Python requirements installed.", + }); + } catch (error) { + vscode.window.showErrorMessage(`Failed to install Python requirements: ${error}`); + } +} diff --git a/src/environment/dependency-installer.ts b/src/environment/dependency-installer.ts index 61eb948..859f591 100644 --- a/src/environment/dependency-installer.ts +++ b/src/environment/dependency-installer.ts @@ -92,28 +92,54 @@ export async function setupVirtualEnvironmentPaths(env: { [key: string]: string context.environmentVariableCollection.prepend("PATH", path.join(pythonenv, "bin") + pathDivider); } -export async function installPythonDependencies(pythonCmd: string, zephyrBasePath: string, env: { [key: string]: string | undefined }, output: vscode.OutputChannel): Promise { - const exec = util.promisify(cp.exec); - const currentToolsDir = SettingsManager.getToolsDirectory(); - const pythonenv = path.join(currentToolsDir, "env"); - - const venvPython = platform === "win32" - ? path.join(pythonenv, "Scripts", "python.exe") +/** + * Path to the workspace's virtual-environment Python interpreter. + */ +export function getVenvPython(): string { + const pythonenv = path.join(SettingsManager.getToolsDirectory(), "env"); + return platform === "win32" + ? path.join(pythonenv, "Scripts", "python.exe") : path.join(pythonenv, "bin", "python"); - - const requirementsPath = path.join(zephyrBasePath, "scripts", "requirements.txt"); - const cmd = `"${venvPython}" -m pip install -r ${requirementsPath}`; - +} + +/** + * Detects whether the active west provides the `packages` extension command + * (Zephyr >= 3.6 / NCS >= 2.6). This command must be run from within the + * initialized workspace so west can resolve the manifest's extension commands. + */ +export async function westSupportsPackages( + env: { [key: string]: string | undefined }, + cwd: string +): Promise { + const exec = util.promisify(cp.exec); try { - output.appendLine(`[INIT] Starting pip install: ${cmd}`); - const result = await exec(cmd, { env }); - output.append(result.stdout); - output.append(result.stderr); - output.appendLine("[INIT] Python dependencies installed"); + await exec("west packages pip --help", { env, cwd }); return true; - } catch (error) { - output.appendLine("[INIT] Failed to install Python dependencies"); - output.append(String(error)); + } catch { return false; } } + +/** + * Builds the shell command used to (re)install the Zephyr tree's Python + * requirements. + * + * Prefers `west packages pip --install`, which collects requirements across every + * west module (zephyr, nrf, mcuboot, etc.) and tracks whatever the current tree + * needs. Falls back to installing `zephyr/scripts/requirements.txt` directly on + * trees too old to provide the `west packages` extension command. + * + * @param zephyrBase Path to the Zephyr base (absolute, or relative to `cwd`). + */ +export async function getRequirementsInstallCommand( + zephyrBase: string, + env: { [key: string]: string | undefined }, + cwd: string +): Promise { + if (await westSupportsPackages(env, cwd)) { + return "west packages pip --install"; + } + + const requirementsPath = path.join(zephyrBase, "scripts", "requirements.txt"); + return `"${getVenvPython()}" -m pip install -r "${requirementsPath}"`; +} diff --git a/src/extension.ts b/src/extension.ts index a229e7b..33e73ef 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -46,6 +46,7 @@ import { cleanCommand, cleanIncompleteProjectCommand, updateCommand, + installRequirementsCommand, openBuildFolderCommand, revealBuildAssetCommand, openZephyrTerminalCommand @@ -485,7 +486,14 @@ function registerCommands(context: vscode.ExtensionContext, sidebar?: SidebarWeb // Update command context.subscriptions.push( vscode.commands.registerCommand("zephyr-tools.update", async () => { - await updateCommand(globalConfig, context); + await updateCommand(globalConfig, context, sidebar); + }) + ); + + // Install Python requirements command — refresh deps without running west update. + context.subscriptions.push( + vscode.commands.registerCommand("zephyr-tools.install-requirements", async () => { + await installRequirementsCommand(globalConfig, context); }) ); From 124da9c9f685c6b589904eb50793e750b8205ffd Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Fri, 19 Jun 2026 18:34:19 -0400 Subject: [PATCH 07/15] fix: correct SDK 1.0 toolchain layout and decouple SDK from host setup SDK 1.0 moved GNU toolchains under /gnu/, which broke installs and conflated SDK state with the host-tools setup flag. - Extract the SDK 1.0 GNU toolchain into gnu/ and fix its PATH suffix (linux/win/mac) - Resolve the SDK ARM toolchain bin path layout-aware (gnu/ for 1.0+, root for 0.x) - Verify the toolchain payload is actually present (not just the version) when judging SDK compatibility; report incomplete installs distinctly - Stop SDK problems from clearing the host-setup flag, and self-heal isSetup when host tooling is present - Surface SDK readiness in the sidebar independently and refresh on sdkInstallDir change - Split clear-target path on both separators so Windows clears the right directory --- manifest/manifest.json | 11 ++-- src/commands/download-processor.ts | 2 +- src/config/manifest-validator.ts | 87 +++++++++++++----------------- src/config/settings-manager.ts | 14 ++++- src/config/validation.ts | 54 +++++++++++-------- src/environment/path-manager.ts | 2 +- src/ui/sidebar-webview.ts | 30 ++++++++++- 7 files changed, 118 insertions(+), 82 deletions(-) diff --git a/manifest/manifest.json b/manifest/manifest.json index e8fe714..e54bf49 100644 --- a/manifest/manifest.json +++ b/manifest/manifest.json @@ -51,7 +51,7 @@ "filename": "zephyr-sdk-1.0.0_windows-x86_64_minimal.7z", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v1.0.0/zephyr-sdk-1.0.0_windows-x86_64_minimal.7z", "sha256": "453659ea5a9fcc5e2fa3e731139b7268bb82907004dc8a24e382f937cf7d06a6", - "suffix": "zephyr-sdk-1.0.0\\arm-zephyr-eabi\\bin", + "suffix": "zephyr-sdk-1.0.0\\gnu\\arm-zephyr-eabi\\bin", "env": [ { "name": "ZEPHYR_TOOLCHAIN_VARIANT", @@ -72,9 +72,8 @@ "filename": "toolchain_gnu_windows-x86_64_arm-zephyr-eabi.7z", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v1.0.0/toolchain_gnu_windows-x86_64_arm-zephyr-eabi.7z", "sha256": "388edf8d788ab85a61e6f97305285f16b4dfe0ae196e9258c8c6dc9bcb9e6f4b", - "suffix": "zephyr-sdk-1.0.0\\arm-zephyr-eabi\\bin", "clear_target": false, - "copy_to_subfolder": "zephyr-sdk-1.0.0" + "copy_to_subfolder": "zephyr-sdk-1.0.0\\gnu" } ] }, @@ -300,7 +299,7 @@ "filename": "zephyr-sdk-1.0.0_macos-aarch64_minimal.tar.xz", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v1.0.0/zephyr-sdk-1.0.0_macos-aarch64_minimal.tar.xz", "sha256": "d69cf4dc72ee7faf41c563b27bfa451d38d407ad39fd515f64487a0c33207cdb", - "suffix": "zephyr-sdk-1.0.0/arm-zephyr-eabi/bin", + "suffix": "zephyr-sdk-1.0.0/gnu/arm-zephyr-eabi/bin", "env": [ { "name": "ZEPHYR_TOOLCHAIN_VARIANT", @@ -443,7 +442,7 @@ "filename": "zephyr-sdk-1.0.0_linux-x86_64_minimal.tar.xz", "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v1.0.0/zephyr-sdk-1.0.0_linux-x86_64_minimal.tar.xz", "sha256": "6b69a4b54b470e3aa21cdaf95cdc808431e8ca73a7b822a33a682e5b5d2c5512", - "suffix": "zephyr-sdk-1.0.0/arm-zephyr-eabi/bin", + "suffix": "zephyr-sdk-1.0.0/gnu/arm-zephyr-eabi/bin", "env": [ { "name": "ZEPHYR_TOOLCHAIN_VARIANT", @@ -465,7 +464,7 @@ "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v1.0.0/toolchain_gnu_linux-x86_64_arm-zephyr-eabi.tar.xz", "sha256": "4b467e2fb26307b464915d0c9a87e47ab4d94d560888f239a76eeb56b4d9011f", "clear_target": false, - "copy_to_subfolder": "zephyr-sdk-1.0.0" + "copy_to_subfolder": "zephyr-sdk-1.0.0/gnu" } ] }, diff --git a/src/commands/download-processor.ts b/src/commands/download-processor.ts index fcef0c0..a41de24 100644 --- a/src/commands/download-processor.ts +++ b/src/commands/download-processor.ts @@ -104,7 +104,7 @@ export async function processDownload( // version directory so multiple SDK versions can coexist in the parent dir. if (download.clear_target !== false) { try { - const suffixFirstComponent = download.suffix?.split('/')[0]; + const suffixFirstComponent = download.suffix?.split(/[\\/]/)[0]; const isSdkVersionDir = suffixFirstComponent?.startsWith('zephyr-sdk-'); const clearTarget = isSdkVersionDir ? path.join(copytopath, suffixFirstComponent!) diff --git a/src/config/manifest-validator.ts b/src/config/manifest-validator.ts index 762b0b9..df1deb3 100644 --- a/src/config/manifest-validator.ts +++ b/src/config/manifest-validator.ts @@ -59,12 +59,12 @@ export class ManifestValidator { return result; } - // Validate core dependencies + // Validate core (host) dependencies. The Zephyr SDK is intentionally NOT + // validated here — it is managed separately (per-workspace, multiple versions) + // and its readiness is surfaced through checkSdkCompatibility, not by gating + // the host-tools setup flag. await this.validateDependencies(archEntry.downloads, config, result); - // Validate toolchain (need to determine which was installed) - await this.validateInstalledToolchain(archEntry, config, result); - // Validate environment variables this.validateEnvironmentVariables(config, result); @@ -252,46 +252,6 @@ export class ManifestValidator { }); } - /** - * Validates the installed toolchain matches expected configuration - */ - private static async validateInstalledToolchain( - archEntry: ManifestEntry, - config: GlobalConfig, - result: ManifestValidationResult - ): Promise { - // Resolve the SDK for this workspace's Zephyr tree first. This auto-switches - // the workspace's selected SDK to a compatible installed version when needed, - // so the directory checks below operate on the correct (switched) SDK. - const sdkError = await ManifestValidator.checkSdkCompatibility(); - if (sdkError) { - result.isValid = false; - result.errors.push(sdkError); - } - - // Check for SDK environment variable to determine which toolchain is installed - const sdkInstallDir = SettingsManager.getZephyrSdkInstallDir(); - const toolchainVariant = SettingsManager.getZephyrToolchainVariant(); - - if (!sdkInstallDir || !toolchainVariant) { - result.warnings.push('Toolchain environment variables not found. Toolchain may not be properly configured.'); - return; - } - - // Verify SDK directory exists - if (!(await fs.pathExists(sdkInstallDir))) { - result.isValid = false; - result.errors.push(`Zephyr SDK directory not found: ${sdkInstallDir}`); - result.missingComponents.push('toolchain'); - return; - } - - // Check for ARM toolchain specifically (most common) - const armToolchainPath = path.join(sdkInstallDir, 'arm-zephyr-eabi', 'bin'); - if (!(await fs.pathExists(armToolchainPath))) { - result.warnings.push(`ARM toolchain directory not found: ${armToolchainPath}`); - } - } /** * Validates environment variables are correctly set @@ -450,16 +410,42 @@ export class ManifestValidator { return `Zephyr SDK not found at configured path: ${sdkInstallDir}. Run setup to install the correct SDK.`; } + // Version is fine but the toolchain payload is missing/incomplete — distinguish + // this from a true version mismatch so the user knows to reinstall, not downgrade. + const minimumCompatible = await ManifestValidator.getSdkMinimumCompatibleVersion(sdkInstallDir); + if ( + ManifestValidator.sdkVersionSatisfies(installed, required, minimumCompatible) && + !(await ManifestValidator.sdkToolchainPresent(sdkInstallDir, installed)) + ) { + return `Zephyr SDK ${installed} is installed but its toolchain is missing or incomplete. Install the SDK again to repair it.`; + } + return `Zephyr SDK version mismatch: installed ${installed}, but this Zephyr requires >= ${required}. No compatible SDK is installed — run setup to install it.`; } - // Returns true if the SDK at the given path is installed and compatible with the - // requested Zephyr SDK version (accounting for the SDK's own minimum-compatible floor). + // Returns true if the SDK at the given path is installed, version-compatible with + // the requested Zephyr SDK version (accounting for the SDK's own minimum-compatible + // floor), AND has its toolchain payload actually present on disk. private static async isSdkCompatible(sdkInstallDir: string, required: string): Promise { const installed = await ManifestValidator.getInstalledSdkVersion(sdkInstallDir); if (!installed) { return false; } const minimumCompatible = await ManifestValidator.getSdkMinimumCompatibleVersion(sdkInstallDir); - return ManifestValidator.sdkVersionSatisfies(installed, required, minimumCompatible); + if (!ManifestValidator.sdkVersionSatisfies(installed, required, minimumCompatible)) { return false; } + return ManifestValidator.sdkToolchainPresent(sdkInstallDir, installed); + } + + // Verifies the ARM toolchain binaries are present where the SDK's CMake expects + // them. SDK 1.0+ moved GNU toolchains under /gnu/; older SDKs keep + // them at /. A version match alone is not enough — a "minimal" SDK + // can be installed with its sdk_version file but no toolchain, which only fails + // deep in CMake otherwise. + static async sdkToolchainPresent(sdkInstallDir: string, installedVersion?: string): Promise { + const version = installedVersion ?? await ManifestValidator.getInstalledSdkVersion(sdkInstallDir); + const major = version ? Number(version.split('.')[0]) : 0; + const binPath = major >= 1 + ? path.join(sdkInstallDir, 'gnu', 'arm-zephyr-eabi', 'bin') + : path.join(sdkInstallDir, 'arm-zephyr-eabi', 'bin'); + return fs.pathExists(binPath); } // Scans the directory holding installed SDKs (siblings of the current SDK, or the @@ -484,9 +470,10 @@ export class ManifestValidator { const installed = await ManifestValidator.getInstalledSdkVersion(candidatePath); if (!installed) { continue; } const minimumCompatible = await ManifestValidator.getSdkMinimumCompatibleVersion(candidatePath); - if (ManifestValidator.sdkVersionSatisfies(installed, required, minimumCompatible)) { - candidates.push({ path: candidatePath, version: installed }); - } + if (!ManifestValidator.sdkVersionSatisfies(installed, required, minimumCompatible)) { continue; } + // Skip version-compatible SDKs whose toolchain payload is missing/incomplete. + if (!(await ManifestValidator.sdkToolchainPresent(candidatePath, installed))) { continue; } + candidates.push({ path: candidatePath, version: installed }); } if (candidates.length === 0) { return undefined; } diff --git a/src/config/settings-manager.ts b/src/config/settings-manager.ts index 470387f..ee45bb5 100644 --- a/src/config/settings-manager.ts +++ b/src/config/settings-manager.ts @@ -7,12 +7,24 @@ import * as vscode from "vscode"; import * as os from "os"; import * as path from "path"; +import * as fs from "fs"; import { TOOLS_FOLDER_NAME, getPlatformConfig } from "./constants"; import { EnvironmentUtils } from "../utils/environment-utils"; export class SettingsManager { private static readonly CONFIG_SECTION = "zephyr-tools"; + // Resolves the ARM toolchain bin directory inside a Zephyr SDK, accounting for + // the layout change in SDK 1.0+ (GNU toolchains moved to /gnu/); + // older SDKs keep them at /. + static getSdkArmToolchainBin(sdkInstallDir: string): string { + const gnuPath = path.join(sdkInstallDir, "gnu", "arm-zephyr-eabi", "bin"); + if (fs.existsSync(gnuPath)) { + return gnuPath; + } + return path.join(sdkInstallDir, "arm-zephyr-eabi", "bin"); + } + static getToolsDirectory(): string { const config = vscode.workspace.getConfiguration(this.CONFIG_SECTION); const customPath = config.get("paths.toolsDirectory"); @@ -229,7 +241,7 @@ export class SettingsManager { const sdkDir = this.getSdkInstallDir(); if (sdkDir) { env["ZEPHYR_SDK_INSTALL_DIR"] = sdkDir; - const armPath = path.join(sdkDir, "arm-zephyr-eabi", "bin"); + const armPath = this.getSdkArmToolchainBin(sdkDir); env.PATH = armPath + platformConfig.pathDivider + env.PATH; } diff --git a/src/config/validation.ts b/src/config/validation.ts index 0f0fe7d..706a23e 100644 --- a/src/config/validation.ts +++ b/src/config/validation.ts @@ -48,29 +48,23 @@ export class ConfigValidator { details: [`Expected manifest version ${manifest.version}, found ${config.manifestVersion}`] }; } - - // Check basic setup flag. Try to give a specific reason (e.g. SDK mismatch) - // so the sidebar can show actionable context rather than a generic message. - if (!config.isSetup) { - const sdkError = await ManifestValidator.checkSdkCompatibility(); - return { - isValid: false, - error: sdkError ?? "Run `Zephyr Tools: Setup` command first.", - details: ["Setup has not been completed"] - }; - } - // Perform physical validation if requested and context available + // Physical validation of the host tooling (cmake, ninja, west, etc.). This is + // intentionally independent of the Zephyr SDK, which is managed separately and + // whose readiness is surfaced via checkSdkCompatibility — an SDK problem must + // not mark the host setup as incomplete. if (performPhysicalValidation && context) { try { const physicalValidation = await ManifestValidator.validateCompleteSetup(config); - + if (!physicalValidation.isValid) { - // Reset setup flag due to physical validation failure - console.log("Physical validation failed, resetting setup flag"); - config.isSetup = false; - await GlobalConfigManager.save(context, config); - + // Host tooling is genuinely missing/corrupted — reflect that in the flag. + if (config.isSetup) { + console.log("Physical validation failed, resetting setup flag"); + config.isSetup = false; + await GlobalConfigManager.save(context, config); + } + const primaryError = physicalValidation.errors[0] ?? "Setup validation failed. Run `Zephyr Tools: Setup` command again."; return { @@ -83,11 +77,20 @@ export class ConfigValidator { ] }; } - - // Log warnings but don't fail validation + + // Host tooling is present. Self-heal the flag if a prior run (or an older + // build that conflated the SDK with setup) left it incorrectly cleared. + if (!config.isSetup) { + console.log("Host tooling present, restoring setup flag"); + config.isSetup = true; + await GlobalConfigManager.save(context, config); + } + if (physicalValidation.warnings.length > 0) { console.log("Setup validation warnings:", physicalValidation.warnings); } + + return { isValid: true }; } catch (error) { console.warn("Physical validation failed with error:", error); // Don't fail validation due to validation errors, but log them @@ -98,7 +101,16 @@ export class ConfigValidator { }; } } - + + // Quick path (no physical validation): trust the setup flag. + if (!config.isSetup) { + return { + isValid: false, + error: "Run `Zephyr Tools: Setup` command first.", + details: ["Setup has not been completed"] + }; + } + return { isValid: true }; } diff --git a/src/environment/path-manager.ts b/src/environment/path-manager.ts index 2971faf..e654208 100644 --- a/src/environment/path-manager.ts +++ b/src/environment/path-manager.ts @@ -152,7 +152,7 @@ export class PathManager { const sdkInstallDir = SettingsManager.getSdkInstallDir(); if (sdkInstallDir) { context.environmentVariableCollection.replace("ZEPHYR_SDK_INSTALL_DIR", sdkInstallDir); - const armPath = path.join(sdkInstallDir, "arm-zephyr-eabi", "bin"); + const armPath = SettingsManager.getSdkArmToolchainBin(sdkInstallDir); const pathDivider = getPlatformConfig().pathDivider; context.environmentVariableCollection.prepend("PATH", armPath + pathDivider); } diff --git a/src/ui/sidebar-webview.ts b/src/ui/sidebar-webview.ts index daadd0c..0969795 100644 --- a/src/ui/sidebar-webview.ts +++ b/src/ui/sidebar-webview.ts @@ -5,7 +5,7 @@ */ import * as vscode from "vscode"; -import { GlobalConfigManager, ProjectConfigManager, SettingsManager } from "../config"; +import { GlobalConfigManager, ProjectConfigManager, SettingsManager, ManifestValidator } from "../config"; import { GlobalConfig, ProjectConfig } from "../types"; import { BuildAssetsManager, BuildAssetsState } from "../build/build-assets-manager"; @@ -29,6 +29,17 @@ export class SidebarWebviewProvider implements vscode.WebviewViewProvider { // Subscribe to configuration changes to refresh the webview ProjectConfigManager.onDidChangeConfig(() => this.refresh()); GlobalConfigManager.onDidChangeConfig(() => this.refresh()); + + // The active SDK is a workspace setting (changed by auto-switch during a build, + // or by Install/Manage SDK), so refresh when it changes rather than waiting for + // the build to finish. + context.subscriptions.push( + vscode.workspace.onDidChangeConfiguration((e) => { + if (e.affectsConfiguration("zephyr-tools.paths.sdkInstallDir")) { + this.refresh(); + } + }) + ); } public resolveWebviewView( @@ -200,7 +211,22 @@ export class SidebarWebviewProvider implements vscode.WebviewViewProvider { hasWorkspace }; } - + + // Host setup and project are good — now check the SDK separately. This + // auto-switches to a compatible installed SDK when possible and only returns an + // error if none is available, prompting the user to install/repair one. It does + // NOT affect the host-setup flag. + const sdkError = await ManifestValidator.checkSdkCompatibility(); + if (sdkError) { + return { + type: 'setup-required', + config, + project, + hasWorkspace, + error: sdkError + }; + } + // All good - ready state // Load build assets for ready state let buildAssets: BuildAssetsState | undefined; From 519bf1523ccc5e8ad92fcda7dd3a6f72cb2bc785 Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Fri, 19 Jun 2026 20:17:59 -0400 Subject: [PATCH 08/15] feat: streamline setup -> init -> SDK flow and harden state resolution Make the SDK install automatic and keep the host-setup/project state from drifting, so a fresh Setup -> Init Repo reaches a build-ready state with no extra prompts or dead-ends. - Install the required SDK automatically (no version prompt); Init Repo now installs it as its final step, and build/update do so as a silent safety net - Setup installs host tooling only; the SDK is handled once the tree is known - Persist ZEPHYR_BASE during init and resolve it robustly in checkSdkCompatibility (detect + persist) so the SDK check never silently skips - Keep the in-memory global config in sync after self-heal, and reload it in the init-repo guard, so Resume no longer wrongly reports "Run setup first" - Self-heal isInit when .west and a fetched Zephyr tree are present, so a complete-on-disk project is not mislabeled "incomplete" --- src/commands/build.ts | 8 ++++---- src/commands/install-sdk.ts | 31 +++++++++++++----------------- src/commands/project-management.ts | 18 +++++++++++++++++ src/commands/setup.ts | 9 +++------ src/commands/update.ts | 8 ++++---- src/config/manifest-validator.ts | 13 ++++++++++++- src/extension.ts | 20 ++++++++++++++++--- src/ui/sidebar-webview.ts | 17 ++++++++++++++-- 8 files changed, 86 insertions(+), 38 deletions(-) diff --git a/src/commands/build.ts b/src/commands/build.ts index 0982e99..d5d178b 100644 --- a/src/commands/build.ts +++ b/src/commands/build.ts @@ -12,7 +12,7 @@ import { ProjectOverridesManager, ProjectOverrides } from "../config/project-ove import { TaskManager, TaskManagerTaskOptions } from "../tasks"; import { changeBoardCommand, discoverBoards } from "./board-management"; import { changeProjectCommand } from "./project-management"; -import { ensureCompatibleSdkInteractive } from "./install-sdk"; +import { ensureCompatibleSdk } from "./install-sdk"; import { EnvironmentUtils, readCMakeCache } from "../utils"; import { SettingsManager } from "../config/settings-manager"; import { QuickPickManager } from "../ui"; @@ -122,7 +122,7 @@ export async function buildCommand( // Verify a compatible SDK is active for the current Zephyr tree before building. // Auto-switches to a compatible installed SDK, or prompts to install one. Catches // version mismatches introduced by west update without waiting for CMake to fail. - if (!(await ensureCompatibleSdkInteractive(context))) { + if (!(await ensureCompatibleSdk(context))) { return; } @@ -430,7 +430,7 @@ export async function buildMultiCommand( return; } - if (!(await ensureCompatibleSdkInteractive(context))) { + if (!(await ensureCompatibleSdk(context))) { return; } @@ -475,7 +475,7 @@ export async function buildAllCommand( return; } - if (!(await ensureCompatibleSdkInteractive(context))) { + if (!(await ensureCompatibleSdk(context))) { return; } diff --git a/src/commands/install-sdk.ts b/src/commands/install-sdk.ts index 73e9d94..19fce04 100644 --- a/src/commands/install-sdk.ts +++ b/src/commands/install-sdk.ts @@ -321,13 +321,14 @@ export async function manageSdkCommand(context: vscode.ExtensionContext): Promis } /** - * Ensures a compatible SDK is available for the current workspace's Zephyr tree, - * prompting the user to install one if needed. + * Ensures a compatible SDK is active for the current workspace's Zephyr tree. * - * Returns true if a compatible SDK is active (or no Zephyr tree requires one), - * false if the user declined or installation failed. + * If the active SDK is missing or incompatible, the version the tree requires is + * installed automatically — no prompt, since the extension already knows exactly + * which SDK is needed. Falls back to a version picker only when the required + * version can't be determined. Returns true if a compatible SDK ends up active. */ -export async function ensureCompatibleSdkInteractive( +export async function ensureCompatibleSdk( context: vscode.ExtensionContext ): Promise { // checkSdkCompatibility auto-switches to a compatible installed SDK if possible. @@ -343,20 +344,14 @@ export async function ensureCompatibleSdkInteractive( return true; } - // Nothing installed is compatible. Recommend the right manifest SDK to install. - const zephyrBase = SettingsManager.getZephyrBase(); + // Nothing installed is compatible. Determine the exact SDK the tree requires and + // install it automatically; if it can't be determined, fall back to a picker. + let zephyrBase = SettingsManager.getZephyrBase(); + if (!zephyrBase) { + zephyrBase = await SettingsManager.detectZephyrBase(); + } const required = zephyrBase ? await ManifestValidator.getRequiredSdkVersion(zephyrBase) : undefined; const recommended = required ? recommendSdkForRequired(required) : undefined; - const installLabel = recommended ? `Install ${recommended.name}` : "Install SDK…"; - const chooseLabel = "Choose Version…"; - const choice = await vscode.window.showWarningMessage(sdkError, installLabel, chooseLabel); - - if (choice === installLabel) { - return await installSdkCommand(context, recommended?.name); - } - if (choice === chooseLabel) { - return await installSdkCommand(context); - } - return false; + return await installSdkCommand(context, recommended?.name); } diff --git a/src/commands/project-management.ts b/src/commands/project-management.ts index 3b6c4fc..be7341f 100644 --- a/src/commands/project-management.ts +++ b/src/commands/project-management.ts @@ -15,6 +15,7 @@ import { QuickPickManager, DialogManager, OutputChannelManager, StatusBarManager import { TaskManager } from "../tasks"; import { SettingsManager } from "../config"; import { getRequirementsInstallCommand } from "../environment"; +import { ensureCompatibleSdk } from "./install-sdk"; export async function changeProjectCommand( config: GlobalConfig, @@ -247,6 +248,12 @@ export async function initRepoCommand( } output.appendLine(`[INIT] Determined zephyr base path: ${base}`); + // Persist ZEPHYR_BASE so SDK compatibility checks and the build environment can + // resolve the Zephyr tree without relying on activation-time auto-detection. + const absoluteZephyrBase = path.join(dest.fsPath, base); + await SettingsManager.setZephyrBase(absoluteZephyrBase); + output.appendLine(`[INIT] Set ZEPHYR_BASE: ${absoluteZephyrBase}`); + // Install python dependencies for the current tree (all west modules where // supported, falling back to zephyr/scripts/requirements.txt on older trees). const installCmd = await getRequirementsInstallCommand( @@ -304,6 +311,17 @@ export async function initRepoCommand( } catch { // Non-critical — marker is a best-effort optimization } + + // Init does everything except the SDK download; install the version this + // tree requires automatically so the project is build-ready with no extra + // steps. The project is already marked initialized, so an interrupted SDK + // download is recovered later by build/update rather than blocking init. + try { + output.appendLine("[INIT] Ensuring the required Zephyr SDK is installed..."); + await ensureCompatibleSdk(context); + } catch (error) { + output.appendLine(`[INIT] SDK install will be completed later: ${error}`); + } }; // Start execution diff --git a/src/commands/setup.ts b/src/commands/setup.ts index f5d50c4..4f4ae4c 100644 --- a/src/commands/setup.ts +++ b/src/commands/setup.ts @@ -21,7 +21,6 @@ import { TaskManager } from "../tasks"; import { arch, platform } from "../config"; import { FileDownloader } from "../files"; import { processDownloadWithValidation } from "./download-processor"; -import { ensureCompatibleSdkInteractive } from "./install-sdk"; // Manifest data // eslint-disable-next-line @typescript-eslint/no-require-imports @@ -196,11 +195,9 @@ export async function setupCommand(context: vscode.ExtensionContext): Promise { - await ensureCompatibleSdkInteractive(context); + await ensureCompatibleSdk(context); // The Zephyr tree's required SDK may have changed with the update. Refresh the // sidebar so it reflects the new SDK state (active version or "SDK Required"), diff --git a/src/config/manifest-validator.ts b/src/config/manifest-validator.ts index df1deb3..cd025c4 100644 --- a/src/config/manifest-validator.ts +++ b/src/config/manifest-validator.ts @@ -379,7 +379,18 @@ export class ManifestValidator { // toolchain directory). Returns an error message only if no compatible SDK is // installed, or undefined if everything is OK / settings aren't configured yet. static async checkSdkCompatibility(): Promise { - const zephyrBase = SettingsManager.getZephyrBase(); + // Resolve the Zephyr tree robustly. The configured setting can be absent (e.g. + // after a fresh init that never persisted it, or a workspace that only has the + // legacy global env var), in which case we detect it from the workspace and + // persist it. Without this the SDK check would silently no-op and let an + // incompatible SDK through to CMake. + let zephyrBase = SettingsManager.getZephyrBase(); + if (!zephyrBase) { + zephyrBase = await SettingsManager.detectZephyrBase(); + if (zephyrBase) { + await SettingsManager.setZephyrBase(zephyrBase); + } + } if (!zephyrBase) { return undefined; } const required = await ManifestValidator.getRequiredSdkVersion(zephyrBase); diff --git a/src/extension.ts b/src/extension.ts index 33e73ef..e4b9b4d 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -14,7 +14,7 @@ import { PathManager } from "./environment"; import { GlobalConfig } from "./types"; import { setupCommand, - installSdkCommand, + ensureCompatibleSdk, manageSdkCommand, buildCommand, buildPristineCommand, @@ -109,6 +109,16 @@ export async function activate(context: vscode.ExtensionContext) { // Check SDK version compatibility on activation (advisory — build commands enforce it hard). validateToolchainVersion(context).catch(console.error); + // Keep the in-memory global config in sync with persisted changes. Validation can + // self-heal the setup flag (e.g. the sidebar restoring isSetup after host tools are + // confirmed present), and command guards read this variable — without this they + // would see a stale value and wrongly report "Run setup first". + context.subscriptions.push( + GlobalConfigManager.onDidChangeConfig(async () => { + globalConfig = await GlobalConfigManager.load(context); + }) + ); + // Auto-save project overrides whenever config changes context.subscriptions.push( ProjectConfigManager.onDidChangeConfig(async () => { @@ -201,10 +211,11 @@ function registerCommands(context: vscode.ExtensionContext, sidebar?: SidebarWeb }) ); - // Install SDK command — manages Zephyr SDK toolchains separately from setup. + // Install SDK command — installs the SDK version this workspace's Zephyr tree + // requires automatically (no version prompt). Use Manage SDKs to pick a version. context.subscriptions.push( vscode.commands.registerCommand("zephyr-tools.install-sdk", async () => { - await installSdkCommand(context); + await ensureCompatibleSdk(context); }) ); @@ -225,6 +236,9 @@ function registerCommands(context: vscode.ExtensionContext, sidebar?: SidebarWeb // Init repo command context.subscriptions.push( vscode.commands.registerCommand("zephyr-tools.init-repo", async (dest: vscode.Uri | undefined) => { + // Load fresh: validation may have self-healed isSetup since activation, and the + // in-memory copy can lag. Avoids a wrong "Run setup first" on Resume. + globalConfig = await GlobalConfigManager.load(context); if (!globalConfig.isSetup) { vscode.window.showErrorMessage("Run `Zephyr Tools: Setup` command first."); return; diff --git a/src/ui/sidebar-webview.ts b/src/ui/sidebar-webview.ts index 0969795..67c047a 100644 --- a/src/ui/sidebar-webview.ts +++ b/src/ui/sidebar-webview.ts @@ -191,8 +191,21 @@ export class SidebarWebviewProvider implements vscode.WebviewViewProvider { const path = await import('path'); const workspaceRoot = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath; const westFolderExists = workspaceRoot ? await fs.pathExists(path.join(workspaceRoot, '.west')) : false; - - // Check for incomplete project (west folder exists but not marked as initialized) + + // Self-heal: a .west plus a fetched Zephyr tree (zephyr/VERSION exists, i.e. + // `west update` has run) means the project is already initialized on disk — + // e.g. it was cloned, or the extension's project state was reset. Mark it + // initialized instead of mislabeling it "incomplete" and forcing a Resume. + if (westFolderExists && !project.isInit && workspaceRoot) { + const zephyrReady = await fs.pathExists(path.join(workspaceRoot, 'zephyr', 'VERSION')); + if (zephyrReady) { + console.log('Detected an initialized project on disk, restoring isInit flag'); + project.isInit = true; + await ProjectConfigManager.save(this.context, project); + } + } + + // Check for incomplete project (.west exists but the tree was never fetched) if (westFolderExists && !project.isInit) { return { type: 'project-incomplete', From 3cfff9edc2c6852045c7012e096e0e94e5d8a032 Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Fri, 19 Jun 2026 21:02:50 -0400 Subject: [PATCH 09/15] fix: prevent stale/incompatible Zephyr SDK from being used Two correctness fixes for the multi-SDK/workspace selection flow: - installSdkCommand now fails when checkSdkCompatibility still reports an error after extraction, instead of returning true and letting build/update proceed into CMake with an unusable SDK. - Make the workspace-scoped paths.sdkInstallDir the single source of truth. Stop persisting ZEPHYR_SDK_INSTALL_DIR through the generic global env path, remove the global env-var fallback in getSdkInstallDir, and migrate any legacy global value into the workspace setting once on activation. Rebuild the PATH/ZEPHYR_SDK_INSTALL_DIR env-collection mutators in setupEnvironmentPaths, explicitly deleting them when no SDK is selected, so an uninstalled or switched-away SDK can no longer linger. --- src/commands/download-processor.ts | 8 ++++++++ src/commands/install-sdk.ts | 12 +++++++++++- src/config/settings-manager.ts | 29 ++++++++++++++++++++++++----- src/environment/path-manager.ts | 30 ++++++++++++++++++++++++------ src/extension.ts | 5 +++++ 5 files changed, 72 insertions(+), 12 deletions(-) diff --git a/src/commands/download-processor.ts b/src/commands/download-processor.ts index a41de24..10b5586 100644 --- a/src/commands/download-processor.ts +++ b/src/commands/download-processor.ts @@ -160,6 +160,14 @@ export async function processDownload( // Set remaining environment variables in settings for (const entry of download.env ?? []) { + // The SDK install dir is workspace-scoped (paths.sdkInstallDir) and managed by + // the SDK install/selection flow. Never persist it through the generic global + // env path: a global ZEPHYR_SDK_INSTALL_DIR acts as a fallback that can + // resurrect an uninstalled SDK after the workspace setting is cleared. + if (entry.name === "ZEPHYR_SDK_INSTALL_DIR") { + continue; + } + let envValue: string; if (entry.value) { envValue = entry.value; diff --git a/src/commands/install-sdk.ts b/src/commands/install-sdk.ts index 19fce04..abb82fc 100644 --- a/src/commands/install-sdk.ts +++ b/src/commands/install-sdk.ts @@ -164,9 +164,19 @@ export async function installSdkCommand( // installed), keeping selection consistent with on-the-fly switching. const sdkError = await ManifestValidator.checkSdkCompatibility(); + // Extraction succeeded but the workspace's Zephyr tree still has no compatible + // SDK active (e.g. an incomplete payload, or — via the picker fallback — the + // user chose a version this tree can't use). Surface the error and fail rather + // than letting build/update proceed into CMake with an unusable SDK. + if (sdkError) { + output.appendLine(`[SETUP] ${sdkError}`); + vscode.window.showErrorMessage(sdkError); + return false; + } + // If there is no Zephyr tree yet (no required version to resolve against), // make the just-installed SDK the active one so the workspace has a default. - if (sdkError === undefined && !SettingsManager.getSdkInstallDir()) { + if (!SettingsManager.getSdkInstallDir()) { await SettingsManager.setSdkInstallDir(sdkInstallDir); } diff --git a/src/config/settings-manager.ts b/src/config/settings-manager.ts index ee45bb5..054da46 100644 --- a/src/config/settings-manager.ts +++ b/src/config/settings-manager.ts @@ -155,13 +155,32 @@ export class SettingsManager { // Convenience methods for specific environment variables - // Workspace-scoped SDK install dir. Falls back to the legacy global env-var entry - // so existing setups continue to work until the user runs setup again. + // Workspace-scoped SDK install dir. This is the single source of truth — there is + // intentionally no fallback to a global env-var, since such a fallback could + // resurrect an uninstalled SDK after the workspace setting is cleared. Legacy + // global values are moved into this setting once by migrateLegacySdkInstallDir(). static getSdkInstallDir(): string | undefined { const config = vscode.workspace.getConfiguration(this.CONFIG_SECTION); - const workspaceSetting = config.get("paths.sdkInstallDir"); - if (workspaceSetting) { return workspaceSetting; } - return this.getEnvironmentVariable("ZEPHYR_SDK_INSTALL_DIR"); + return config.get("paths.sdkInstallDir") || undefined; + } + + // One-time migration of the legacy global ZEPHYR_SDK_INSTALL_DIR env-var into the + // workspace-scoped paths.sdkInstallDir setting. Older versions stored the SDK dir + // in environment.variables, which then acted as a fallback. This adopts that value + // for the workspace (only if one isn't already chosen) and removes the legacy entry + // so it can never resurrect a removed SDK. + static async migrateLegacySdkInstallDir(): Promise { + const legacy = this.getEnvironmentVariable("ZEPHYR_SDK_INSTALL_DIR"); + if (!legacy) { return; } + + const config = vscode.workspace.getConfiguration(this.CONFIG_SECTION); + if (!config.get("paths.sdkInstallDir")) { + await this.setSdkInstallDir(legacy); + } + + const vars = this.getEnvironmentVariables(); + delete vars["ZEPHYR_SDK_INSTALL_DIR"]; + await this.setEnvironmentVariables(vars); } // Sets the workspace-scoped SDK install dir. Pass undefined to clear it (e.g. when diff --git a/src/environment/path-manager.ts b/src/environment/path-manager.ts index e654208..402d4de 100644 --- a/src/environment/path-manager.ts +++ b/src/environment/path-manager.ts @@ -146,15 +146,33 @@ export class PathManager { const pythonenv = path.join(SettingsManager.getToolsDirectory(), "env"); context.environmentVariableCollection.replace("VIRTUAL_ENV", pythonenv); - // Apply workspace-scoped SDK install dir. getSdkInstallDir() reads the - // workspace setting first and falls back to the global env-var for existing - // setups, so this is always the right value for this workspace window. + // Apply the workspace-scoped SDK install dir and its ARM toolchain path. + // + // The env collection allows only ONE mutator per variable, so each prepend to + // PATH overwrites the previous one. We therefore rebuild PATH as a single + // mutator combining the saved tool paths with the active SDK's toolchain, and + // explicitly delete the SDK entries when no SDK is selected. Without this an + // uninstalled/switched-away SDK would linger in PATH and ZEPHYR_SDK_INSTALL_DIR. + const pathDivider = getPlatformConfig().pathDivider; const sdkInstallDir = SettingsManager.getSdkInstallDir(); + + const pathEntries: string[] = []; + if (sdkInstallDir) { + pathEntries.push(SettingsManager.getSdkArmToolchainBin(sdkInstallDir)); + } + pathEntries.push(...SettingsManager.getAllPaths()); + + const pathPrefix = pathEntries.filter(p => p && p.trim()).join(pathDivider); + if (pathPrefix) { + context.environmentVariableCollection.prepend("PATH", pathPrefix + pathDivider); + } else { + context.environmentVariableCollection.delete("PATH"); + } + if (sdkInstallDir) { context.environmentVariableCollection.replace("ZEPHYR_SDK_INSTALL_DIR", sdkInstallDir); - const armPath = SettingsManager.getSdkArmToolchainBin(sdkInstallDir); - const pathDivider = getPlatformConfig().pathDivider; - context.environmentVariableCollection.prepend("PATH", armPath + pathDivider); + } else { + context.environmentVariableCollection.delete("ZEPHYR_SDK_INSTALL_DIR"); } } } diff --git a/src/extension.ts b/src/extension.ts index e4b9b4d..a462bfa 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -82,6 +82,11 @@ export async function activate(context: vscode.ExtensionContext) { } } + // Move any legacy global ZEPHYR_SDK_INSTALL_DIR into the workspace-scoped setting + // (and drop the global entry) before resolving the SDK, so the fallback can't + // resurrect a removed SDK. + await SettingsManager.migrateLegacySdkInstallDir().catch(console.error); + // Auto-select a compatible installed SDK for this workspace's Zephyr tree before // building the environment, so PATH/ZEPHYR_SDK_INSTALL_DIR reflect the right SDK. await ManifestValidator.checkSdkCompatibility().catch(console.error); From 49ceab00051aceede0d256b58025c400ee828266 Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Fri, 19 Jun 2026 21:05:35 -0400 Subject: [PATCH 10/15] test: add SDK logic unit tests and CI matrix for linux/windows/macos-arm64 - Unit tests for version compatibility (minimum-compatible floor, >= check) and SDK recommendation - Fixture-based tests for required/installed/min-compat parsing, the gnu/ vs root toolchain layout, and compatible-SDK selection (incl. skipping incomplete SDKs) - GitHub Actions workflow running tests + lint + compile on ubuntu, windows, and macos-14 (arm64) --- .github/workflows/ci.yml | 37 +++++++++ .gitignore | 6 +- src/test/suite/sdk-detection.test.ts | 113 +++++++++++++++++++++++++++ src/test/suite/sdk-version.test.ts | 45 +++++++++++ 4 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/ci.yml create mode 100644 src/test/suite/sdk-detection.test.ts create mode 100644 src/test/suite/sdk-version.test.ts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..d3f522b --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,37 @@ +name: CI + +on: + push: + branches: [main] + pull_request: + workflow_dispatch: + +jobs: + test: + name: Test (${{ matrix.os }}) + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + # Covers the three supported targets: Linux x64, Windows x64, + # and macOS arm64 (macos-14 runners are Apple Silicon). + os: [ubuntu-latest, windows-latest, macos-14] + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-node@v4 + with: + node-version: 20 + cache: npm + + - run: npm ci + + # `npm test` runs pretest (tsc compile + eslint) and then the VS Code + # extension test host. Linux runners are headless, so wrap in xvfb. + - name: Test (Linux) + if: runner.os == 'Linux' + run: xvfb-run -a npm test + + - name: Test (Windows / macOS) + if: runner.os != 'Linux' + run: npm test diff --git a/.gitignore b/.gitignore index 322accf..a66fcda 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,8 @@ extension.js # Local agent / editor state .claude/ -.codex \ No newline at end of file +.codex + +# Local docs +CLAUDE.md +PUBLISHING.md diff --git a/src/test/suite/sdk-detection.test.ts b/src/test/suite/sdk-detection.test.ts new file mode 100644 index 0000000..c3a4602 --- /dev/null +++ b/src/test/suite/sdk-detection.test.ts @@ -0,0 +1,113 @@ +import * as assert from "assert"; +import * as os from "os"; +import * as path from "path"; +import * as fs from "fs-extra"; +import { ManifestValidator } from "../../config"; + +// These exercise the file/layout detection against real fixture trees in a temp +// dir, covering the SDK 1.0 layout change (gnu/) and the parsing the SDK gate +// depends on. No network or real SDK required. +suite("SDK detection (fixtures)", () => { + let tmp: string; + + setup(async () => { + tmp = await fs.mkdtemp(path.join(os.tmpdir(), "zt-sdk-")); + }); + + teardown(async () => { + await fs.remove(tmp); + }); + + // Writes a minimal installed-SDK tree and returns its path. + async function writeSdk( + name: string, + version: string, + layout: "gnu" | "root" | "none", + minimumCompatible?: string + ): Promise { + const sdk = path.join(tmp, name); + await fs.mkdirp(sdk); + await fs.writeFile(path.join(sdk, "sdk_version"), `${version}\n`); + if (layout === "gnu") { + await fs.mkdirp(path.join(sdk, "gnu", "arm-zephyr-eabi", "bin")); + } else if (layout === "root") { + await fs.mkdirp(path.join(sdk, "arm-zephyr-eabi", "bin")); + } + if (minimumCompatible) { + await fs.mkdirp(path.join(sdk, "cmake")); + await fs.writeFile( + path.join(sdk, "cmake", "Zephyr-sdkConfigVersion.cmake"), + ` set(ZEPHYR_SDK_MINIMUM_COMPATIBLE_VERSION ${minimumCompatible})\n` + ); + } + return sdk; + } + + test("getRequiredSdkVersion parses a find_package literal", async () => { + const zb = path.join(tmp, "zephyr"); + await fs.mkdirp(path.join(zb, "cmake", "modules")); + await fs.writeFile( + path.join(zb, "cmake", "modules", "FindHostTools.cmake"), + "include(...)\nfind_package(Zephyr-sdk 0.16)\n" + ); + assert.strictEqual(await ManifestValidator.getRequiredSdkVersion(zb), "0.16"); + }); + + test("getRequiredSdkVersion returns undefined when the file is missing", async () => { + assert.strictEqual( + await ManifestValidator.getRequiredSdkVersion(path.join(tmp, "missing")), + undefined + ); + }); + + test("getInstalledSdkVersion reads and trims sdk_version", async () => { + const sdk = await writeSdk("zephyr-sdk-1.0.0", "1.0.0", "gnu"); + assert.strictEqual(await ManifestValidator.getInstalledSdkVersion(sdk), "1.0.0"); + }); + + test("getSdkMinimumCompatibleVersion parses the SDK 1.0 config", async () => { + const sdk = await writeSdk("zephyr-sdk-1.0.0", "1.0.0", "gnu", "1.0"); + assert.strictEqual(await ManifestValidator.getSdkMinimumCompatibleVersion(sdk), "1.0"); + }); + + test("sdkToolchainPresent: SDK 1.0 requires the gnu/ layout", async () => { + // Root layout alone must NOT count as present for a 1.0 SDK. + const sdk = await writeSdk("zephyr-sdk-1.0.0", "1.0.0", "root"); + assert.strictEqual(await ManifestValidator.sdkToolchainPresent(sdk), false); + // Adding the gnu/ layout makes it present. + await fs.mkdirp(path.join(sdk, "gnu", "arm-zephyr-eabi", "bin")); + assert.strictEqual(await ManifestValidator.sdkToolchainPresent(sdk), true); + }); + + test("sdkToolchainPresent: SDK 0.x uses the root layout", async () => { + const sdk = await writeSdk("zephyr-sdk-0.16.4", "0.16.4", "root"); + assert.strictEqual(await ManifestValidator.sdkToolchainPresent(sdk), true); + }); + + test("findCompatibleInstalledSdk selects by version AND toolchain presence", async () => { + await writeSdk("zephyr-sdk-0.16.4", "0.16.4", "root"); + await writeSdk("zephyr-sdk-1.0.0", "1.0.0", "gnu", "1.0"); + const sibling = path.join(tmp, "zephyr-sdk-x"); // dirname() -> tmp + + // A 0.16 tree must get 0.16.4 (1.0 refuses < 1.0). + assert.strictEqual( + await ManifestValidator.findCompatibleInstalledSdk("0.16", sibling), + path.join(tmp, "zephyr-sdk-0.16.4") + ); + // A 1.0 tree must get 1.0.0. + assert.strictEqual( + await ManifestValidator.findCompatibleInstalledSdk("1.0", sibling), + path.join(tmp, "zephyr-sdk-1.0.0") + ); + }); + + test("findCompatibleInstalledSdk skips a version-match with a missing toolchain", async () => { + // Right version, but no gnu/ payload -> incomplete -> must not be selected. + await writeSdk("zephyr-sdk-1.0.0", "1.0.0", "none", "1.0"); + const sibling = path.join(tmp, "zephyr-sdk-x"); + assert.strictEqual( + await ManifestValidator.findCompatibleInstalledSdk("1.0", sibling), + undefined + ); + }); +}); diff --git a/src/test/suite/sdk-version.test.ts b/src/test/suite/sdk-version.test.ts new file mode 100644 index 0000000..68bc04f --- /dev/null +++ b/src/test/suite/sdk-version.test.ts @@ -0,0 +1,45 @@ +import * as assert from "assert"; +import { ManifestValidator } from "../../config"; +import { recommendSdkForRequired, getAvailableSdks } from "../../commands/install-sdk"; + +// Pure version-compatibility logic. These guard the exact regressions hit while +// adding SDK 1.0 support: the minimum-compatible floor and the >= comparison. +suite("ManifestValidator.sdkVersionSatisfies", () => { + test("SDK 1.0 refuses a tree requesting < 1.0 (minimum-compatible floor)", () => { + // installed 1.0.0 is newer, but it declares MINIMUM_COMPATIBLE_VERSION 1.0, + // so it must NOT serve a 0.16 tree. + assert.strictEqual(ManifestValidator.sdkVersionSatisfies("1.0.0", "0.16", "1.0"), false); + }); + + test("installed must be >= required", () => { + assert.strictEqual(ManifestValidator.sdkVersionSatisfies("0.16.4", "1.0", "0.16"), false); + assert.strictEqual(ManifestValidator.sdkVersionSatisfies("0.16.4", "0.17", undefined), false); + assert.strictEqual(ManifestValidator.sdkVersionSatisfies("0.16.4", "0.16", undefined), true); + }); + + test("exact and patch-level matches are compatible", () => { + assert.strictEqual(ManifestValidator.sdkVersionSatisfies("1.0.0", "1.0", "1.0"), true); + assert.strictEqual(ManifestValidator.sdkVersionSatisfies("0.16.4", "0.16", undefined), true); + }); + + test("no minimum-compatible floor falls back to a plain >= check", () => { + assert.strictEqual(ManifestValidator.sdkVersionSatisfies("1.0.0", "0.16", undefined), true); + }); +}); + +// Recommendation maps a tree's required version to a manifest SDK. Only versions +// present on every platform are asserted unconditionally. +suite("recommendSdkForRequired", () => { + test("recommends the lowest same-major version that satisfies the requirement", () => { + assert.strictEqual(recommendSdkForRequired("0.16")?.name, "zephyr-sdk-0.16.4"); + assert.strictEqual(recommendSdkForRequired("0.15")?.name, "zephyr-sdk-0.15.1"); + assert.strictEqual(recommendSdkForRequired("0.14")?.name, "zephyr-sdk-0.15.1"); + }); + + test("recommends a 1.x SDK for a 1.0 tree where one is available", function () { + if (!getAvailableSdks().some(sdk => sdk.name.startsWith("zephyr-sdk-1."))) { + this.skip(); + } + assert.strictEqual(recommendSdkForRequired("1.0")?.name, "zephyr-sdk-1.0.0"); + }); +}); From a60f32a52b848aa31bc4d701dbbd57bff6d03ec7 Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Fri, 19 Jun 2026 21:10:17 -0400 Subject: [PATCH 11/15] ci: run on all branch pushes with concurrency cancellation --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3f522b..5bec8ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,10 +2,15 @@ name: CI on: push: - branches: [main] + branches: ['**'] pull_request: workflow_dispatch: +# Cancel an in-progress run when a newer commit is pushed to the same ref. +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + cancel-in-progress: true + jobs: test: name: Test (${{ matrix.os }}) From a2a8423cc86b92c950f6d43ecd36588f615defd6 Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Fri, 19 Jun 2026 21:13:44 -0400 Subject: [PATCH 12/15] ci: use Node 22 to satisfy eslint 10 engine requirement --- .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 5bec8ef..70cfe6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 cache: npm - run: npm ci From 6413b11a2ecee3f6c83d9f2699f085a2aab6fb5f Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Fri, 19 Jun 2026 21:17:53 -0400 Subject: [PATCH 13/15] chore: release 0.6.0 - Changelog entry and version bump for SDK 1.0 support - Clear dependency advisories: esbuild 0.28.1, js-yaml override >=4.2.0 (qs already pinned to patched 6.15.2 via override) --- CHANGELOG.md | 28 +++ package-lock.json | 460 +++++++++++++++++++++++----------------------- package.json | 7 +- 3 files changed, 267 insertions(+), 228 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4bc520..c486138 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,34 @@ All notable changes to the "zephyr-tools" extension will be documented in this file. +### [0.6.0] - 2026-06-20 + +**Added:** +- Zephyr SDK 1.0 support, including its new `gnu/` toolchain layout +- SDK management decoupled from Setup — multiple SDK versions coexist and the version each workspace's Zephyr tree requires is selected automatically +- "Install SDK" command — installs the SDK version the current tree requires, with no version prompt +- "Manage SDKs" command — list installed SDKs, switch the active one per workspace, uninstall, or install another version +- Init Repo now installs the required SDK automatically as its final step +- "Install Python Requirements" command — reinstall the tree's Python dependencies without a full `west update` +- `Update Dependencies` now re-resolves the SDK and refreshes Python requirements after `west update`, keeping the venv in sync across Zephyr version changes +- Python requirements installed via `west packages pip --install` (covers all west modules), falling back to `zephyr/scripts/requirements.txt` on older trees +- Workspace-scoped `zephyr-tools.paths.sdkInstallDir` setting and an SDK row in the sidebar's Project Settings + +**Fixed:** +- SDK compatibility now respects each SDK's minimum-compatible floor — SDK 1.0 correctly refuses Zephyr trees requesting < 1.0, and a compatible installed SDK is auto-selected instead +- SDK 1.0 toolchain is extracted to the correct `gnu/` location; toolchain bin-path resolution is layout-aware (Linux/Windows/macOS) +- An SDK's toolchain payload is verified present (not just its version) before it is considered usable, so incomplete installs are repaired rather than failing deep in CMake +- SDK problems no longer mark host setup as incomplete; `isSetup`/`isInit` self-heal when host tools and an initialized tree are present on disk — fixes spurious "Run setup first" and a fully-cloned project being mislabeled "Incomplete Project Found" +- `ZEPHYR_BASE` is persisted during init and resolved robustly, so the SDK compatibility check no longer silently skips +- Removed the global `ZEPHYR_SDK_INSTALL_DIR` fallback that could resurrect an uninstalled SDK; the legacy value is migrated to the workspace setting + +**Technical Changes:** +- Manifest version bumped to 20; download checksums migrated from md5 to sha256 +- Shared download engine extracted to `download-processor.ts` +- Migrated test runner from `vscode-test` to `@vscode/test-electron`; dependency updates +- Added unit tests for SDK version/layout logic and a GitHub Actions CI matrix (Linux, Windows, macOS arm64) +- Cleared dependency advisories: bumped `esbuild` to 0.28.1 and overrode `js-yaml` to `>=4.2.0` (build/test-only dependencies) + ### [0.5.25] - 2026-05-14 **Added:** diff --git a/package-lock.json b/package-lock.json index 667bff6..07c22c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "zephyr-tools", - "version": "0.5.25", + "version": "0.6.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "zephyr-tools", - "version": "0.5.25", + "version": "0.6.0", "license": "Apache-2.0", "dependencies": { "7zip-bin": "^5.2.0", @@ -23,7 +23,7 @@ "@types/node-7z": "^2.1.11", "@types/vscode": "^1.120.0", "@vscode/test-electron": "^2.5.2", - "esbuild": "^0.28.0", + "esbuild": "^0.28.1", "eslint": "^10.4.1", "glob": "^13.0.6", "mocha": "^11.7.6", @@ -36,9 +36,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz", - "integrity": "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz", + "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==", "cpu": [ "ppc64" ], @@ -53,9 +53,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.0.tgz", - "integrity": "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.1.tgz", + "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==", "cpu": [ "arm" ], @@ -70,9 +70,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz", - "integrity": "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz", + "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==", "cpu": [ "arm64" ], @@ -87,9 +87,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.0.tgz", - "integrity": "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.1.tgz", + "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==", "cpu": [ "x64" ], @@ -104,9 +104,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz", - "integrity": "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz", + "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==", "cpu": [ "arm64" ], @@ -121,9 +121,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz", - "integrity": "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz", + "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==", "cpu": [ "x64" ], @@ -138,9 +138,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz", - "integrity": "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz", + "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==", "cpu": [ "arm64" ], @@ -155,9 +155,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz", - "integrity": "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz", + "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==", "cpu": [ "x64" ], @@ -172,9 +172,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz", - "integrity": "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz", + "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==", "cpu": [ "arm" ], @@ -189,9 +189,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz", - "integrity": "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz", + "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==", "cpu": [ "arm64" ], @@ -206,9 +206,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz", - "integrity": "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz", + "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==", "cpu": [ "ia32" ], @@ -223,9 +223,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz", - "integrity": "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz", + "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==", "cpu": [ "loong64" ], @@ -240,9 +240,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz", - "integrity": "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz", + "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==", "cpu": [ "mips64el" ], @@ -257,9 +257,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz", - "integrity": "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz", + "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==", "cpu": [ "ppc64" ], @@ -274,9 +274,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz", - "integrity": "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz", + "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==", "cpu": [ "riscv64" ], @@ -291,9 +291,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz", - "integrity": "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz", + "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==", "cpu": [ "s390x" ], @@ -308,9 +308,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz", - "integrity": "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz", + "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==", "cpu": [ "x64" ], @@ -325,9 +325,9 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz", - "integrity": "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz", + "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==", "cpu": [ "arm64" ], @@ -342,9 +342,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz", - "integrity": "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz", + "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==", "cpu": [ "x64" ], @@ -359,9 +359,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz", - "integrity": "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz", + "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==", "cpu": [ "arm64" ], @@ -376,9 +376,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz", - "integrity": "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz", + "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==", "cpu": [ "x64" ], @@ -393,9 +393,9 @@ } }, "node_modules/@esbuild/openharmony-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz", - "integrity": "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz", + "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==", "cpu": [ "arm64" ], @@ -410,9 +410,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz", - "integrity": "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz", + "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==", "cpu": [ "x64" ], @@ -427,9 +427,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz", - "integrity": "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz", + "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==", "cpu": [ "arm64" ], @@ -444,9 +444,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz", - "integrity": "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz", + "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==", "cpu": [ "ia32" ], @@ -461,9 +461,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz", - "integrity": "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz", + "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==", "cpu": [ "x64" ], @@ -1497,9 +1497,9 @@ } }, "node_modules/esbuild": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.0.tgz", - "integrity": "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz", + "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -1510,32 +1510,32 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.28.0", - "@esbuild/android-arm": "0.28.0", - "@esbuild/android-arm64": "0.28.0", - "@esbuild/android-x64": "0.28.0", - "@esbuild/darwin-arm64": "0.28.0", - "@esbuild/darwin-x64": "0.28.0", - "@esbuild/freebsd-arm64": "0.28.0", - "@esbuild/freebsd-x64": "0.28.0", - "@esbuild/linux-arm": "0.28.0", - "@esbuild/linux-arm64": "0.28.0", - "@esbuild/linux-ia32": "0.28.0", - "@esbuild/linux-loong64": "0.28.0", - "@esbuild/linux-mips64el": "0.28.0", - "@esbuild/linux-ppc64": "0.28.0", - "@esbuild/linux-riscv64": "0.28.0", - "@esbuild/linux-s390x": "0.28.0", - "@esbuild/linux-x64": "0.28.0", - "@esbuild/netbsd-arm64": "0.28.0", - "@esbuild/netbsd-x64": "0.28.0", - "@esbuild/openbsd-arm64": "0.28.0", - "@esbuild/openbsd-x64": "0.28.0", - "@esbuild/openharmony-arm64": "0.28.0", - "@esbuild/sunos-x64": "0.28.0", - "@esbuild/win32-arm64": "0.28.0", - "@esbuild/win32-ia32": "0.28.0", - "@esbuild/win32-x64": "0.28.0" + "@esbuild/aix-ppc64": "0.28.1", + "@esbuild/android-arm": "0.28.1", + "@esbuild/android-arm64": "0.28.1", + "@esbuild/android-x64": "0.28.1", + "@esbuild/darwin-arm64": "0.28.1", + "@esbuild/darwin-x64": "0.28.1", + "@esbuild/freebsd-arm64": "0.28.1", + "@esbuild/freebsd-x64": "0.28.1", + "@esbuild/linux-arm": "0.28.1", + "@esbuild/linux-arm64": "0.28.1", + "@esbuild/linux-ia32": "0.28.1", + "@esbuild/linux-loong64": "0.28.1", + "@esbuild/linux-mips64el": "0.28.1", + "@esbuild/linux-ppc64": "0.28.1", + "@esbuild/linux-riscv64": "0.28.1", + "@esbuild/linux-s390x": "0.28.1", + "@esbuild/linux-x64": "0.28.1", + "@esbuild/netbsd-arm64": "0.28.1", + "@esbuild/netbsd-x64": "0.28.1", + "@esbuild/openbsd-arm64": "0.28.1", + "@esbuild/openbsd-x64": "0.28.1", + "@esbuild/openharmony-arm64": "0.28.1", + "@esbuild/sunos-x64": "0.28.1", + "@esbuild/win32-arm64": "0.28.1", + "@esbuild/win32-ia32": "0.28.1", + "@esbuild/win32-x64": "0.28.1" } }, "node_modules/escalade": { @@ -2197,10 +2197,20 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", - "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", - "dev": true, + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz", + "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -3628,184 +3638,184 @@ }, "dependencies": { "@esbuild/aix-ppc64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz", - "integrity": "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz", + "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==", "dev": true, "optional": true }, "@esbuild/android-arm": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.0.tgz", - "integrity": "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.1.tgz", + "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==", "dev": true, "optional": true }, "@esbuild/android-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz", - "integrity": "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz", + "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==", "dev": true, "optional": true }, "@esbuild/android-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.0.tgz", - "integrity": "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.1.tgz", + "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==", "dev": true, "optional": true }, "@esbuild/darwin-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz", - "integrity": "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz", + "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==", "dev": true, "optional": true }, "@esbuild/darwin-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz", - "integrity": "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz", + "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==", "dev": true, "optional": true }, "@esbuild/freebsd-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz", - "integrity": "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz", + "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==", "dev": true, "optional": true }, "@esbuild/freebsd-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz", - "integrity": "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz", + "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==", "dev": true, "optional": true }, "@esbuild/linux-arm": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz", - "integrity": "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz", + "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==", "dev": true, "optional": true }, "@esbuild/linux-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz", - "integrity": "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz", + "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==", "dev": true, "optional": true }, "@esbuild/linux-ia32": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz", - "integrity": "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz", + "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==", "dev": true, "optional": true }, "@esbuild/linux-loong64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz", - "integrity": "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz", + "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==", "dev": true, "optional": true }, "@esbuild/linux-mips64el": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz", - "integrity": "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz", + "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==", "dev": true, "optional": true }, "@esbuild/linux-ppc64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz", - "integrity": "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz", + "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==", "dev": true, "optional": true }, "@esbuild/linux-riscv64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz", - "integrity": "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz", + "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==", "dev": true, "optional": true }, "@esbuild/linux-s390x": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz", - "integrity": "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz", + "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==", "dev": true, "optional": true }, "@esbuild/linux-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz", - "integrity": "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz", + "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==", "dev": true, "optional": true }, "@esbuild/netbsd-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz", - "integrity": "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz", + "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==", "dev": true, "optional": true }, "@esbuild/netbsd-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz", - "integrity": "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz", + "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==", "dev": true, "optional": true }, "@esbuild/openbsd-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz", - "integrity": "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz", + "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==", "dev": true, "optional": true }, "@esbuild/openbsd-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz", - "integrity": "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz", + "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==", "dev": true, "optional": true }, "@esbuild/openharmony-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz", - "integrity": "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz", + "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==", "dev": true, "optional": true }, "@esbuild/sunos-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz", - "integrity": "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz", + "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==", "dev": true, "optional": true }, "@esbuild/win32-arm64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz", - "integrity": "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz", + "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==", "dev": true, "optional": true }, "@esbuild/win32-ia32": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz", - "integrity": "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz", + "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==", "dev": true, "optional": true }, "@esbuild/win32-x64": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz", - "integrity": "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz", + "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==", "dev": true, "optional": true }, @@ -4473,37 +4483,37 @@ } }, "esbuild": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.0.tgz", - "integrity": "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz", + "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==", "dev": true, "requires": { - "@esbuild/aix-ppc64": "0.28.0", - "@esbuild/android-arm": "0.28.0", - "@esbuild/android-arm64": "0.28.0", - "@esbuild/android-x64": "0.28.0", - "@esbuild/darwin-arm64": "0.28.0", - "@esbuild/darwin-x64": "0.28.0", - "@esbuild/freebsd-arm64": "0.28.0", - "@esbuild/freebsd-x64": "0.28.0", - "@esbuild/linux-arm": "0.28.0", - "@esbuild/linux-arm64": "0.28.0", - "@esbuild/linux-ia32": "0.28.0", - "@esbuild/linux-loong64": "0.28.0", - "@esbuild/linux-mips64el": "0.28.0", - "@esbuild/linux-ppc64": "0.28.0", - "@esbuild/linux-riscv64": "0.28.0", - "@esbuild/linux-s390x": "0.28.0", - "@esbuild/linux-x64": "0.28.0", - "@esbuild/netbsd-arm64": "0.28.0", - "@esbuild/netbsd-x64": "0.28.0", - "@esbuild/openbsd-arm64": "0.28.0", - "@esbuild/openbsd-x64": "0.28.0", - "@esbuild/openharmony-arm64": "0.28.0", - "@esbuild/sunos-x64": "0.28.0", - "@esbuild/win32-arm64": "0.28.0", - "@esbuild/win32-ia32": "0.28.0", - "@esbuild/win32-x64": "0.28.0" + "@esbuild/aix-ppc64": "0.28.1", + "@esbuild/android-arm": "0.28.1", + "@esbuild/android-arm64": "0.28.1", + "@esbuild/android-x64": "0.28.1", + "@esbuild/darwin-arm64": "0.28.1", + "@esbuild/darwin-x64": "0.28.1", + "@esbuild/freebsd-arm64": "0.28.1", + "@esbuild/freebsd-x64": "0.28.1", + "@esbuild/linux-arm": "0.28.1", + "@esbuild/linux-arm64": "0.28.1", + "@esbuild/linux-ia32": "0.28.1", + "@esbuild/linux-loong64": "0.28.1", + "@esbuild/linux-mips64el": "0.28.1", + "@esbuild/linux-ppc64": "0.28.1", + "@esbuild/linux-riscv64": "0.28.1", + "@esbuild/linux-s390x": "0.28.1", + "@esbuild/linux-x64": "0.28.1", + "@esbuild/netbsd-arm64": "0.28.1", + "@esbuild/netbsd-x64": "0.28.1", + "@esbuild/openbsd-arm64": "0.28.1", + "@esbuild/openbsd-x64": "0.28.1", + "@esbuild/openharmony-arm64": "0.28.1", + "@esbuild/sunos-x64": "0.28.1", + "@esbuild/win32-arm64": "0.28.1", + "@esbuild/win32-ia32": "0.28.1", + "@esbuild/win32-x64": "0.28.1" } }, "escalade": { @@ -4927,9 +4937,9 @@ "integrity": "sha512-/GDnfQYsltsjRswQhN9fhv3EMw2sCpUdrdxyWDOUK7eyD++r3gRhzgiQgc/x4MAv2i1iuQ4lxO5mvqM3vj4bwA==" }, "js-yaml": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", - "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz", + "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==", "dev": true, "requires": { "argparse": "^2.0.1" @@ -5089,7 +5099,7 @@ "glob": "^10.4.5", "he": "^1.2.0", "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", + "js-yaml": ">=4.2.0", "log-symbols": "^4.1.0", "minimatch": "^9.0.5", "ms": "^2.1.3", diff --git a/package.json b/package.json index 96be0f4..e31e239 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "zephyr-tools", "displayName": "Circuit Dojo Zephyr SDK Tools", "description": "Used for building your Zephyr projects.", - "version": "0.5.25", + "version": "0.6.0", "license": "Apache-2.0", "publisher": "circuitdojo", "icon": "img/bulb.png", @@ -379,7 +379,7 @@ "@types/node-7z": "^2.1.11", "@types/vscode": "^1.120.0", "@vscode/test-electron": "^2.5.2", - "esbuild": "^0.28.0", + "esbuild": "^0.28.1", "eslint": "^10.4.1", "glob": "^13.0.6", "mocha": "^11.7.6", @@ -398,6 +398,7 @@ "serialize-javascript": ">=7.0.5", "diff": ">=8.0.3", "@tootallnate/once": ">=3.0.1", - "qs": ">=6.15.2" + "qs": ">=6.15.2", + "js-yaml": ">=4.2.0" } } From 64505d3c2d59512fc40cf45785f7871f882119d1 Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Fri, 19 Jun 2026 21:29:42 -0400 Subject: [PATCH 14/15] fix: align @types/vscode with engines.vscode (1.101) and tidy VSIX contents - Pin @types/vscode to ~1.101.0 so it matches engines.vscode ^1.101.0 (vsce rejects types newer than the declared minimum); regression from the dep bump - Exclude local agent state (.claude/, .codex) and the flat eslint config from the packaged VSIX --- .vscodeignore | 3 +++ package-lock.json | 14 +++++++------- package.json | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.vscodeignore b/.vscodeignore index a11f7b5..2b17ea1 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -12,6 +12,9 @@ tsconfig.json esbuild.js webpack.config.js .eslintrc.json +eslint.config.mjs +.claude/** +.codex **/*.vsix .git/** *.log diff --git a/package-lock.json b/package-lock.json index 07c22c3..a4f004e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@types/mocha": "^10.0.10", "@types/node": "^25.9.1", "@types/node-7z": "^2.1.11", - "@types/vscode": "^1.120.0", + "@types/vscode": "~1.101.0", "@vscode/test-electron": "^2.5.2", "esbuild": "^0.28.1", "eslint": "^10.4.1", @@ -738,9 +738,9 @@ } }, "node_modules/@types/vscode": { - "version": "1.120.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.120.0.tgz", - "integrity": "sha512-feaT4Rst+FkTch5zz/ZbNCxoIvo55YU80Be2kiL7OJcod4+CUYf2lUBPdIJzozNnSEMq1VRTGrWEcCGFB3fBmA==", + "version": "1.101.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.101.0.tgz", + "integrity": "sha512-ZWf0IWa+NGegdW3iU42AcDTFHWW7fApLdkdnBqwYEtHVIBGbTu0ZNQKP/kX3Ds/uMJXIMQNAojHR4vexCEEz5Q==", "dev": true, "license": "MIT" }, @@ -4001,9 +4001,9 @@ } }, "@types/vscode": { - "version": "1.120.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.120.0.tgz", - "integrity": "sha512-feaT4Rst+FkTch5zz/ZbNCxoIvo55YU80Be2kiL7OJcod4+CUYf2lUBPdIJzozNnSEMq1VRTGrWEcCGFB3fBmA==", + "version": "1.101.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.101.0.tgz", + "integrity": "sha512-ZWf0IWa+NGegdW3iU42AcDTFHWW7fApLdkdnBqwYEtHVIBGbTu0ZNQKP/kX3Ds/uMJXIMQNAojHR4vexCEEz5Q==", "dev": true }, "@typescript-eslint/eslint-plugin": { diff --git a/package.json b/package.json index e31e239..01477e2 100644 --- a/package.json +++ b/package.json @@ -377,7 +377,7 @@ "@types/mocha": "^10.0.10", "@types/node": "^25.9.1", "@types/node-7z": "^2.1.11", - "@types/vscode": "^1.120.0", + "@types/vscode": "~1.101.0", "@vscode/test-electron": "^2.5.2", "esbuild": "^0.28.1", "eslint": "^10.4.1", From a794edc04ebea1dbf202790454b4eca005275e2d Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Sat, 20 Jun 2026 14:36:52 -0400 Subject: [PATCH 15/15] fix: avoid spaces in Windows SDK install path (breaks linking) A space anywhere in the Zephyr SDK install path breaks GNU-toolchain linking on Windows: GCC emits its built-in library search paths unquoted, so ld splits the -L flag at the space and fails. This is a hard toolchain limitation, not fixable by quoting our own commands. - Default install location falls back to a space-free path at the root of the home drive (e.g. C:\.zephyrtools) when the home directory contains a space - Setup refuses a spaced install path on Windows with a clear message instead of failing cryptically deep in the build - Add deterministic cross-platform tests for both behaviors Release 0.6.1. --- CHANGELOG.md | 6 ++++ package-lock.json | 4 +-- package.json | 2 +- src/commands/setup.ts | 9 ++++++ src/config/settings-manager.ts | 33 +++++++++++++++++++++- src/test/suite/tools-directory.test.ts | 38 ++++++++++++++++++++++++++ 6 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 src/test/suite/tools-directory.test.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index c486138..4798050 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to the "zephyr-tools" extension will be documented in this file. +### [0.6.1] - 2026-06-20 + +**Fixed:** +- Windows: the Zephyr SDK no longer installs under a path containing a space (e.g. `C:\Users\Jared Wolff\.zephyrtools`), which broke linking — GCC emits its built-in library search paths unquoted, so `ld` split the `-L` flag at the space and failed with "cannot find ...". When the home directory contains a space, the default install location now falls back to a space-free path at the root of the home drive (e.g. `C:\.zephyrtools`) +- Setup now refuses an install path containing a space on Windows with a clear message, instead of failing cryptically deep in the build + ### [0.6.0] - 2026-06-20 **Added:** diff --git a/package-lock.json b/package-lock.json index a4f004e..21440e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "zephyr-tools", - "version": "0.6.0", + "version": "0.6.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "zephyr-tools", - "version": "0.6.0", + "version": "0.6.1", "license": "Apache-2.0", "dependencies": { "7zip-bin": "^5.2.0", diff --git a/package.json b/package.json index 01477e2..e09f31f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "zephyr-tools", "displayName": "Circuit Dojo Zephyr SDK Tools", "description": "Used for building your Zephyr projects.", - "version": "0.6.0", + "version": "0.6.1", "license": "Apache-2.0", "publisher": "circuitdojo", "icon": "img/bulb.png", diff --git a/src/commands/setup.ts b/src/commands/setup.ts index 4f4ae4c..22c1332 100644 --- a/src/commands/setup.ts +++ b/src/commands/setup.ts @@ -88,6 +88,15 @@ export async function setupCommand(context: vscode.ExtensionContext): Promise("paths.toolsDirectory"); - return customPath || path.join(os.homedir(), TOOLS_FOLDER_NAME); + return customPath || this.getDefaultToolsDirectory(); + } + + // Default location for the Zephyr Tools install (SDK, toolchain, host tools). + // The Zephyr SDK / GNU toolchain cannot tolerate a space in its install path on + // Windows: GCC emits its built-in library search paths unquoted, so the linker + // splits the `-L` flag at the space and fails. When the home directory contains + // a space (e.g. C:\Users\Jared Wolff), fall back to a space-free location at the + // root of the home drive (e.g. C:\.zephyrtools). + static getDefaultToolsDirectory(home: string = os.homedir(), platform: NodeJS.Platform = process.platform): string { + const pathImpl = platform === "win32" ? path.win32 : path.posix; + if (platform === "win32" && /\s/.test(home)) { + const root = pathImpl.parse(home).root || "C:\\"; + return pathImpl.join(root, TOOLS_FOLDER_NAME); + } + return pathImpl.join(home, TOOLS_FOLDER_NAME); + } + + // Returns an error message if the given install path is unusable for the Zephyr + // SDK on the current platform, otherwise undefined. A space anywhere in the path + // breaks GNU-toolchain linking on Windows; this is a hard toolchain limitation + // that no SDK version fixes, so we refuse rather than fail cryptically at link. + static validateToolsDirectory(toolsDir: string, platform: NodeJS.Platform = process.platform): string | undefined { + if (platform === "win32" && /\s/.test(toolsDir)) { + return ( + `The Zephyr Tools install path contains a space, which breaks the Zephyr ` + + `SDK linker on Windows:\n\n ${toolsDir}\n\n` + + `Set "zephyr-tools.paths.toolsDirectory" to a space-free path (e.g. ` + + `C:\\${TOOLS_FOLDER_NAME}) and run Setup again.` + ); + } + return undefined; } static async setToolsDirectory(toolsPath: string): Promise { diff --git a/src/test/suite/tools-directory.test.ts b/src/test/suite/tools-directory.test.ts new file mode 100644 index 0000000..2d1fb2d --- /dev/null +++ b/src/test/suite/tools-directory.test.ts @@ -0,0 +1,38 @@ +import * as assert from "assert"; +import * as path from "path"; +import { SettingsManager } from "../../config"; +import { TOOLS_FOLDER_NAME } from "../../config/constants"; + +// A space anywhere in the Zephyr SDK install path breaks GNU-toolchain linking on +// Windows (GCC emits its built-in -L paths unquoted, so ld splits at the space). +// These guard the space-free Windows default and the setup-time refusal. +suite("SettingsManager tools directory (Windows space handling)", () => { + test("Windows home with a space falls back to a space-free root", () => { + const result = SettingsManager.getDefaultToolsDirectory("C:\\Users\\Jared Wolff", "win32"); + assert.strictEqual(/\s/.test(result), false); + assert.strictEqual(result, path.win32.join("C:\\", TOOLS_FOLDER_NAME)); + }); + + test("Windows home without a space stays under the home directory", () => { + const result = SettingsManager.getDefaultToolsDirectory("C:\\Users\\jared", "win32"); + assert.strictEqual(result, path.win32.join("C:\\Users\\jared", TOOLS_FOLDER_NAME)); + }); + + test("non-Windows keeps the home directory even with a space", () => { + const result = SettingsManager.getDefaultToolsDirectory("/home/jared wolff", "linux"); + assert.strictEqual(result, path.posix.join("/home/jared wolff", TOOLS_FOLDER_NAME)); + }); + + test("validateToolsDirectory rejects a spaced path on Windows", () => { + const error = SettingsManager.validateToolsDirectory("C:\\Users\\Jared Wolff\\.zephyrtools", "win32"); + assert.ok(error && error.includes("space")); + }); + + test("validateToolsDirectory accepts a space-free path on Windows", () => { + assert.strictEqual(SettingsManager.validateToolsDirectory("C:\\.zephyrtools", "win32"), undefined); + }); + + test("validateToolsDirectory ignores spaces on non-Windows", () => { + assert.strictEqual(SettingsManager.validateToolsDirectory("/home/jared wolff/.zephyrtools", "linux"), undefined); + }); +});