Skip to content

Commit b7577d2

Browse files
GordonSmithGordonSmith
authored
chore: bump versions (#472)
Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
1 parent 54f50db commit b7577d2

File tree

10 files changed

+3175
-2036
lines changed

10 files changed

+3175
-2036
lines changed

‎package-lock.json‎

Lines changed: 3103 additions & 1966 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"main": "./dist/extension.js",
1616
"browser": "./dist/web-extension",
1717
"scripts": {
18+
"uninstall": "rimraf package-lock.json ./node_modules",
1819
"clean": "rimraf --glob out lib* dist* types *.vsix coverage",
1920
"gen-grammar": "run-script-os",
2021
"gen-grammar:linux": "./scripts/grammar-generate.sh",
@@ -56,71 +57,71 @@
5657
"html-to-text": "9.0.5"
5758
},
5859
"devDependencies": {
59-
"@eslint/js": "9.36.0",
60-
"@fluentui/react": "8.123.6",
61-
"@fluentui/react-hooks": "8.8.19",
62-
"@hpcc-js/api": "3.3.11",
63-
"@hpcc-js/common": "3.4.1",
64-
"@hpcc-js/comms": "3.8.1",
65-
"@hpcc-js/dgrid": "3.3.1",
66-
"@hpcc-js/dgrid-shim": "3.2.0",
67-
"@hpcc-js/esbuild-plugins": "1.5.1",
60+
"@eslint/js": "9.39.1",
61+
"@fluentui/react": "8.125.1",
62+
"@fluentui/react-hooks": "8.10.1",
63+
"@hpcc-js/api": "3.4.1",
64+
"@hpcc-js/common": "3.5.1",
65+
"@hpcc-js/comms": "3.11.1",
66+
"@hpcc-js/dgrid": "3.5.1",
67+
"@hpcc-js/dgrid-shim": "3.3.1",
68+
"@hpcc-js/esbuild-plugins": "1.6.1",
6869
"@hpcc-js/observable-shim": "3.1.0",
69-
"@hpcc-js/observablehq-compiler": "3.5.2",
70-
"@hpcc-js/util": "3.3.11",
71-
"@hpcc-js/wasm-expat": "1.6.1",
70+
"@hpcc-js/observablehq-compiler": "3.6.1",
71+
"@hpcc-js/util": "3.4.1",
72+
"@hpcc-js/wasm-expat": "1.8.0",
7273
"@hpcc-js/wasm-llama": "1.0.0",
73-
"@hpcc-js/wasm-zstd": "1.5.1",
74-
"@langchain/community": "0.3.56",
75-
"@langchain/core": "0.3.77",
74+
"@hpcc-js/wasm-zstd": "1.7.0",
75+
"@langchain/community": "0.3.58",
76+
"@langchain/core": "0.3.79",
7677
"@langchain/ollama": "0.2.4",
7778
"@observablehq/inspector": "5.0.1",
7879
"@observablehq/parser": "6.1.0",
7980
"@observablehq/runtime": "6.0.0",
8081
"@observablehq/stdlib": "5.8.8",
81-
"@octokit/rest": "22.0.0",
82+
"@octokit/rest": "22.0.1",
8283
"@types/mocha": "10.0.10",
83-
"@types/node": "24.5.2",
84-
"@types/react": "18.3.24",
84+
"@types/node": "24.10.1",
85+
"@types/react": "18.3.27",
8586
"@types/react-dom": "18.3.7",
8687
"@types/tmp": "0.2.6",
87-
"@types/vscode": "1.104.0",
88+
"@types/vscode": "1.105.0",
8889
"@types/vscode-notebook-renderer": "1.72.4",
89-
"@vscode/test-cli": "0.0.11",
90+
"@vscode/test-cli": "0.0.12",
9091
"@vscode/test-electron": "2.5.2",
91-
"@typescript-eslint/parser": "8.44.1",
92-
"@vitest/coverage-v8": "3.2.4",
93-
"@vitest/ui": "3.2.4",
92+
"@typescript-eslint/parser": "8.47.0",
93+
"@vitest/coverage-v8": "4.0.10",
94+
"@vitest/ui": "4.0.10",
9495
"@vscode/debugadapter": "1.68.0",
9596
"@vscode/debugprotocol": "1.68.0",
96-
"@vscode/extension-telemetry": "1.0.0",
97-
"@vscode/vsce": "3.6.1",
97+
"@vscode/extension-telemetry": "1.2.0",
98+
"@vscode/vsce": "3.7.0",
9899
"adm-zip": "0.5.16",
99100
"antlr4": "4.13.2",
100101
"assert": "2.1.0",
101102
"copy-to-clipboard": "3.3.3",
102103
"copyfiles": "2.4.1",
103104
"csv-writer": "1.6.0",
104105
"diff": "8.0.2",
105-
"esbuild": "0.25.10",
106+
"esbuild": "0.27.0",
106107
"esbuild-copy-static-files": "0.1.0",
107108
"esbuild-plugin-text-replace": "1.3.0",
108109
"esbuild-plugin-umd-wrapper": "3.0.0",
109-
"eslint": "9.36.0",
110-
"eslint-plugin-react-hooks": "5.2.0",
111-
"jsdom": "27.0.0",
112-
"langchain": "0.3.34",
110+
"eslint": "9.39.1",
111+
"eslint-plugin-react-hooks": "7.0.1",
112+
"jsdom": "27.2.0",
113+
"langchain": "0.3.36",
113114
"npm-run-all": "4.1.5",
114115
"react": "18.3.1",
115116
"react-dom": "18.3.1",
116-
"rimraf": "6.0.1",
117+
"rimraf": "6.1.0",
117118
"run-script-os": "1.1.6",
118119
"tslib": "2.8.1",
119-
"typescript": "5.9.2",
120-
"typescript-eslint": "8.44.1",
120+
"typescript": "5.9.3",
121+
"typescript-eslint": "8.47.0",
121122
"use-resize-observer": "9.1.0",
122123
"uuid": "13.0.0",
123-
"vitest": "3.2.4",
124+
"vitest": "4.0.10",
124125
"yargs": "18.0.0"
125126
},
126127
"author": {
@@ -131,7 +132,7 @@
131132
"url": "https://github.com/hpcc-systems/vscode-ecl.git"
132133
},
133134
"engines": {
134-
"vscode": "^1.104.0"
135+
"vscode": "^1.105.0"
135136
},
136137
"galleryBanner": {
137138
"color": "#CFB69A",

‎src/ecl/util.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export function initLogger(level: Level) {
2727
}
2828

2929
export function formatECLWatchURL(baseUrl: string): string {
30-
const eclConfig = vscode.workspace.getConfiguration("ecl");
30+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
3131
if (eclConfig.get("preferredECLWatch") === "v5") {
3232
return `${baseUrl}esp/files/stub.htm`;
3333
} else {
@@ -36,7 +36,7 @@ export function formatECLWatchURL(baseUrl: string): string {
3636
}
3737

3838
export function formatWorkunitURL(baseUrl: string, wuid: string): string {
39-
const eclConfig = vscode.workspace.getConfiguration("ecl");
39+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
4040
if (eclConfig.get("preferredECLWatch") === "v5") {
4141
return `${baseUrl}esp/files/stub.htm?Wuid=${wuid}&Widget=WUDetailsWidget#/stub/Summary`;
4242
} else {
@@ -45,7 +45,7 @@ export function formatWorkunitURL(baseUrl: string, wuid: string): string {
4545
}
4646

4747
export function formatResultsURL(baseUrl: string, wuid: string): string {
48-
const eclConfig = vscode.workspace.getConfiguration("ecl");
48+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
4949
if (eclConfig.get("preferredECLWatch") === "v5") {
5050
return `${baseUrl}esp/files/stub.htm?Wuid=${wuid}&Widget=ResultsWidget#/stub/Grid`;
5151
} else {
@@ -54,7 +54,7 @@ export function formatResultsURL(baseUrl: string, wuid: string): string {
5454
}
5555

5656
export function formatMetricsURL(baseUrl: string, wuid: string): string {
57-
const eclConfig = vscode.workspace.getConfiguration("ecl");
57+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
5858
if (eclConfig.get("preferredECLWatch") === "v5") {
5959
return `${baseUrl}esp/files/stub.htm?Wuid=${wuid}&Widget=GraphsWUWidget#/stub/Grid`;
6060
} else {
@@ -63,7 +63,7 @@ export function formatMetricsURL(baseUrl: string, wuid: string): string {
6363
}
6464

6565
export function formatResultURL(baseUrl: string, wuid: string, name: string): string {
66-
const eclConfig = vscode.workspace.getConfiguration("ecl");
66+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
6767
if (eclConfig.get("preferredECLWatch") === "v5") {
6868
return `${baseUrl}esp/files/stub.htm?Wuid=${wuid}&Name=${name}&Widget=ResultWidget`;
6969
} else {

‎src/eclwatch/Message.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react";
22
import { useOnEvent, useEventCallback } from "@fluentui/react-hooks";
33
import { LoadedMessage, ProxyCancelMessage, ProxySendMessage, State, vscode } from "./messages";
4-
import { hookSend } from "@hpcc-js/comms/dist/browser/index.js";
4+
import { hookSend } from "@hpcc-js/comms";
55

66
interface executor<T> {
77
resolve: (value: T | PromiseLike<T>) => void;

‎src/eclwatch/WUDetails.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from "react";
22
import { Pivot, PivotItem, IPivotStyles, Spinner, MessageBar, MessageBarType, IStyleFunctionOrObject, IPivotStyleProps, Stack } from "@fluentui/react";
3-
import { Workunit, type WsWorkunits, type Result, type IOptions } from "@hpcc-js/comms/dist/browser/index.js";
3+
import { Workunit, type WsWorkunits, type Result, type IOptions } from "@hpcc-js/comms";
44
import { WUIssues, WUResult } from "./WUResult";
55
import { HolyGrail } from "./HolyGrail";
66

‎src/eclwatch/WUResult.tsx‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from "react";
22
import { createRoot } from "react-dom/client";
33
import { useConst } from "@fluentui/react-hooks";
4-
import { Result, type XSDXMLNode, type IOptions, type WsWorkunits } from "@hpcc-js/comms/dist/browser/index.js";
4+
import { Result, type XSDXMLNode, type IOptions, type WsWorkunits } from "@hpcc-js/comms";
55
import { Common, Table } from "@hpcc-js/dgrid";
66
import { hashSum } from "@hpcc-js/util";
77
import { Stack, Checkbox, ContextualMenu, ContextualMenuItemType, DefaultButton, Dialog, DialogFooter, DialogType, IContextualMenuItem, PrimaryButton, ProgressIndicator, SpinButton } from "@fluentui/react";
@@ -468,14 +468,15 @@ export const WUIssues: React.FunctionComponent<WUIssues> = ({
468468
exceptions
469469
}) => {
470470

471-
const table = React.useRef(
472-
new Table()
473-
).current;
471+
const table = useConst(() => new Table());
474472

475-
table
476-
.columns(["Severity", "Source", "Code", "Message", "Col", "Line", "File Name"])
477-
.data(exceptions.map(e => [e.Severity, e.Source, e.Code, e.Message, e.Column, e.LineNo, e.FileName]))
478-
;
473+
React.useEffect(() => {
474+
475+
table
476+
.columns(["Severity", "Source", "Code", "Message", "Col", "Line", "File Name"])
477+
.data(exceptions.map(e => [e.Severity, e.Source, e.Code, e.Message, e.Column, e.LineNo, e.FileName]))
478+
;
479+
}, [exceptions, table]);
479480

480481
return <VisualizationComponent widget={table} debounce={false} >
481482
</VisualizationComponent>;

‎src/eclwatch/WUResultStore.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Result, XSDSchema, XSDXMLNode } from "@hpcc-js/comms/dist/browser/index.js";
1+
import { Result, XSDSchema, XSDXMLNode } from "@hpcc-js/comms";
22
import { ColumnType, Deferred, domConstruct, QueryResults, RowFormatter } from "@hpcc-js/dgrid";
33

44
function entitiesEncode(str) {

‎src/hpccplatform/launchConfig.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as vscode from "vscode";
22
import * as os from "os";
33
import * as path from "path";
4-
import { AccountService, Activity, CodesignService, Workunit, WsWorkunits, WUUpdate, WsTopology, Topology, EclccErrors, IOptions, LogicalFile, attachWorkspace, IECLErrorWarning, locateClientTools, ClientTools, WorkunitsService, DFUService, WsDfu } from "@hpcc-js/comms";
4+
import { AccountService, Activity, CodesignService, Workunit, WsWorkunits, WUUpdate, WsTopology, Topology, EclccErrors, IOptions, LogicalFile, attachWorkspace, IECLErrorWarning, locateClientTools, ClientTools, WorkunitsService, DFUService, WsDfu, WsCodesign } from "@hpcc-js/comms";
55
import { join, scopedLogger } from "@hpcc-js/util";
66
import { LaunchConfigState, LaunchMode, LaunchProtocol, LaunchRequestArguments } from "../debugger/launchRequestArguments";
77
import { showEclStatus } from "../ecl/clientTools";
@@ -97,11 +97,11 @@ function config<T extends keyof LaunchRequestArguments>(id: string, key: T, defa
9797
const config = launchConfiguration(id);
9898
let retVal = config[key];
9999
if (retVal === undefined) {
100-
const eclConfig = vscode.workspace.getConfiguration("ecl");
100+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
101101
retVal = eclConfig.get(key);
102102
} else if (typeof retVal === "string" && retVal.indexOf(configPrefix) === 0) {
103103
const configKey = retVal.substring(configPrefix.length, retVal.length - 1);
104-
const eclConfig = vscode.workspace.getConfiguration("ecl");
104+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
105105
retVal = eclConfig.get(configKey);
106106
}
107107
if (retVal === undefined) {
@@ -260,9 +260,9 @@ export class LaunchConfig implements LaunchRequestArguments {
260260

261261
private async checkProxy(opts: IOptions) {
262262
if (opts.baseUrl.indexOf("https:") === 0) {
263-
const config = vscode.workspace.getConfiguration();
263+
const config = vscode.workspace.getConfiguration(undefined, null);
264264
if (config.get("http.proxySupport") === "override") {
265-
const eclConfig = vscode.workspace.getConfiguration("ecl");
265+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
266266
const response = eclConfig.get("forceProxySupport") ? SET_FALLBACK : await vscode.window.showWarningMessage(PROXY_WARNING, { modal: true }, SET_FALLBACK);
267267
switch (response) {
268268
case SET_FALLBACK:
@@ -610,15 +610,15 @@ export class LaunchConfig implements LaunchRequestArguments {
610610
digitalKeys() {
611611
return this.checkCredentials().then(credentials => {
612612
const csService = new CodesignService(this.opts(credentials));
613-
return csService.ListUserIDs({});
613+
return csService.ListUserIDs({}).then(response => response?.UserIDs?.Item ?? []);
614614
});
615615
}
616616

617617
sign(key: string, passphrase: string, ecl: string) {
618618
return this.checkCredentials().then(credentials => {
619619
const csService = new CodesignService(this.opts(credentials));
620620
return csService.Sign({
621-
SigningMethod: "gpg",
621+
SigningMethod: WsCodesign.SigningMethodType.gpg,
622622
UserID: key,
623623
KeyPass: passphrase,
624624
Text: ecl

‎src/hpccplatform/session.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class SessionManager {
151151
this._statusBarPin.command = "hpccPlatform.pin";
152152

153153
vscode.commands.registerCommand("hpccPlatform.pin", async () => {
154-
const eclConfig = vscode.workspace.getConfiguration("ecl");
154+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
155155
const activeUri: string = vscode.window.activeTextEditor?.document?.uri.toString(true) || "";
156156
if (activeUri) {
157157
const pinnedLaunchConfigurations = eclConfig.get<object>("pinnedLaunchConfigurations");
@@ -184,7 +184,7 @@ class SessionManager {
184184
const prevBaseUrl = this.session.baseUrl();
185185
this._pinnedSession = undefined;
186186
if (this.isActiveECL) {
187-
const eclConfig = vscode.workspace.getConfiguration("ecl");
187+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
188188
const pinnedLaunchConfiguration = eclConfig.get<object>("pinnedLaunchConfigurations")[this.activePath];
189189
const launchConfigName = pinnedLaunchConfiguration?.launchConfiguration;
190190
if (launchConfigName) {
@@ -231,7 +231,7 @@ class SessionManager {
231231
}
232232
});
233233

234-
const eclConfig = vscode.workspace.getConfiguration("ecl");
234+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
235235
const launchConfig = eclConfig.get<string>("launchConfiguration");
236236
const targetCluster = eclConfig.get<object>("targetCluster")[launchConfig];
237237
this.switchTo(launchConfig, targetCluster);
@@ -266,7 +266,7 @@ class SessionManager {
266266
private get pinnedSession() {
267267
const activeUri = this.activePath;
268268
if (activeUri) {
269-
const eclConfig = vscode.workspace.getConfiguration("ecl");
269+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
270270
const pinnedLaunchConfigurations = eclConfig.get<object>("pinnedLaunchConfigurations");
271271
return pinnedLaunchConfigurations[activeUri];
272272
}
@@ -338,7 +338,7 @@ class SessionManager {
338338

339339
async submit(context: vscode.ExtensionContext, doc: vscode.TextDocument, mode: LaunchMode = "submit") {
340340
if (this.session) {
341-
const eclConfig = vscode.workspace.getConfiguration("ecl");
341+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
342342
if (eclConfig.get("saveOnSubmit", false)) {
343343
await doc.save();
344344
}
@@ -359,7 +359,7 @@ class SessionManager {
359359

360360
protected _monitor = {};
361361
monitorConnection() {
362-
const eclConfig = vscode.workspace.getConfiguration("ecl");
362+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
363363
const pingInterval = eclConfig.get("pingInterval", 5);
364364
for (const key in this._monitor) {
365365
clearInterval(this._monitor[key]);
@@ -392,7 +392,7 @@ class SessionManager {
392392
}
393393

394394
updateSettings() {
395-
const eclConfig = vscode.workspace.getConfiguration("ecl");
395+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
396396
if (this._pinnedSession) {
397397
const activeUri = this.activePath;
398398
if (activeUri) {
@@ -455,7 +455,7 @@ class SessionManager {
455455
let isPinned = false;
456456
const activeUri: string = vscode.window.activeTextEditor?.document?.uri.toString(true) || "";
457457
if (activeUri) {
458-
const eclConfig = vscode.workspace.getConfiguration("ecl");
458+
const eclConfig = vscode.workspace.getConfiguration("ecl", null);
459459
isPinned = false;
460460
const pinnedLaunchConfigurations = eclConfig.get<object>("pinnedLaunchConfigurations");
461461
isPinned = !!pinnedLaunchConfigurations[activeUri];

‎src/kel/clientTools.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class KELClientTools extends ClientTools {
6767

6868
genFolder(uri: Uri): string {
6969
const filePath = uri.fsPath;
70-
const kelConfig = workspace.getConfiguration("kel");
70+
const kelConfig = workspace.getConfiguration("kel", null);
7171
if (kelConfig.get<string>("generateLocation") === "Child Folder") {
7272
const ext = path.extname(filePath);
7373
const folder = path.basename(filePath, ext);
@@ -125,7 +125,7 @@ class KELClientTools extends ClientTools {
125125
}
126126

127127
private spawnJava(cwd: string, args: string[]): Promise<KelResponse> {
128-
const kelConfig = workspace.getConfiguration("kel");
128+
const kelConfig = workspace.getConfiguration("kel", null);
129129
const javaArgs = kelConfig.get<string[]>("javaArgs");
130130
return this.spawnProc("java", cwd, this.args([
131131
...javaArgs,
@@ -231,7 +231,7 @@ function showKelStatus(version: string, overriden: boolean, tooltip: string) {
231231
}
232232

233233
export function locateClientTools(): Promise<KELClientTools | undefined> {
234-
const kelConfig = workspace.getConfiguration("kel");
234+
const kelConfig = workspace.getConfiguration("kel", null);
235235
const kelPath = kelConfig.get<string>("kelPath");
236236
if (kelPath) {
237237
return Promise.resolve(new KELClientTools(kelPath));
@@ -274,7 +274,7 @@ export function selectCTVersion() {
274274
input.onDidChangeSelection(items => {
275275
const item = items[0];
276276
if (item) {
277-
const eclConfig = workspace.getConfiguration("kel");
277+
const eclConfig = workspace.getConfiguration("kel", null);
278278
eclConfig.update("kelPath", item.kelPath);
279279
showKelStatus(item.label, !!item.kelPath, item.kelPath ? item.kelPath : "");
280280
}

0 commit comments

Comments
 (0)