From adb4b0b6f40f1177843474d6149d47ca52f68393 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Wed, 21 Aug 2024 09:44:24 +0100 Subject: [PATCH 01/99] add multiple labels --- .../components/kdbNewConnectionView.ts | 70 +++++++++++++++---- src/webview/components/styles.ts | 12 ++++ test/suite/webview.test.ts | 47 +++++++++++++ 3 files changed, 115 insertions(+), 14 deletions(-) diff --git a/src/webview/components/kdbNewConnectionView.ts b/src/webview/components/kdbNewConnectionView.ts index cc1d551f..5a15ca8d 100644 --- a/src/webview/components/kdbNewConnectionView.ts +++ b/src/webview/components/kdbNewConnectionView.ts @@ -100,6 +100,24 @@ export class KdbNewConnectionView extends LitElement { super.disconnectedCallback(); } + removeBlankLabels() { + this.labels = Array.from( + new Set( + this.labels.filter((label) => label !== "" && label !== undefined), + ), + ); + } + + addLabel() { + this.labels.push(""); + this.requestUpdate(); + } + + removeLabel(index: number) { + this.labels.splice(index, 1); + this.requestUpdate(); + } + get selectConnection(): string { if (this.isBundledQ) { return "tab-1"; @@ -328,7 +346,37 @@ export class KdbNewConnectionView extends LitElement { `; } - renderLblDropdownOptions() { + renderLblsDropdown(pos: number) { + return html` +
+ + ${this.renderLblDropdownOptions(pos)} + + - + + +
+ `; + } + + renderLblDropdownOptions(pos: number) { return html` No Label Selected ${repeat( @@ -337,7 +385,7 @@ export class KdbNewConnectionView extends LitElement { (lbl) => html` + ?selected="${lbl.name === this.labels[pos]}">
Connection label (optional)
-
+
- - ${this.renderLblDropdownOptions()} - + ${this.labels.length === 0 + ? this.renderLblsDropdown(0) + : this.labels.map((_, i) => this.renderLblsDropdown(i))}
${this.renderNewLblBtn()}
@@ -863,6 +903,7 @@ export class KdbNewConnectionView extends LitElement { } private save() { + this.removeBlankLabels(); if (this.isBundledQ) { this.vscode.postMessage({ command: "kdb.newConnection.createNewBundledConnection", @@ -902,6 +943,7 @@ export class KdbNewConnectionView extends LitElement { if (!this.connectionData) { return; } + this.removeBlankLabels(); if (this.connectionData.connType === 0) { this.vscode.postMessage({ command: "kdb.newConnection.editBundledConnection", diff --git a/src/webview/components/styles.ts b/src/webview/components/styles.ts index ee290445..f5b6f22e 100644 --- a/src/webview/components/styles.ts +++ b/src/webview/components/styles.ts @@ -198,4 +198,16 @@ export const newConnectionStyles = css` background: rgba(0, 0, 0, 0.5); z-index: 1000; } + + .lbl-dropdown-container { + width: 350px; + } + + .lbl-dropdown-container-field-wrapper { + margin-bottom: 0.5em; + width: 100%; + display: flex; + flex-wrap: nowrap; + justify-content: space-between; + } `; diff --git a/test/suite/webview.test.ts b/test/suite/webview.test.ts index e239b6dd..efe1de01 100644 --- a/test/suite/webview.test.ts +++ b/test/suite/webview.test.ts @@ -484,6 +484,21 @@ describe("KdbNewConnectionView", () => { ); }); + it("should render label dropdown", () => { + view.lblNamesList = [ + { name: "label1", color: { colorHex: "#FF0000" } }, + { name: "label2", color: { colorHex: "#00FF00" } }, + ]; + view.labels = ["label1"]; + + const result = view.renderLblsDropdown(0); + + assert.strictEqual( + JSON.stringify(result).includes("No Label Selected"), + true, + ); + }); + it("should render New Label Modal", () => { const result = view.renderNewLabelModal(); @@ -538,6 +553,38 @@ describe("KdbNewConnectionView", () => { }); }); + describe("removeBlankLabels", () => { + it("should remove blank labels", () => { + view.labels = ["label1", ""]; + view.removeBlankLabels(); + assert.strictEqual(view.labels.length, 1); + }); + + it("should not remove blank labels", () => { + view.labels = ["label1"]; + view.removeBlankLabels(); + assert.strictEqual(view.labels.length, 1); + }); + + it("should remove duplicate labels", () => { + view.labels = ["label1", "label1", "label1"]; + view.removeBlankLabels(); + assert.strictEqual(view.labels.length, 1); + }); + }); + + it("should add label", () => { + view.labels = ["label1"]; + view.addLabel(); + assert.strictEqual(view.labels.length, 2); + }); + + it("should remove label", () => { + view.labels = ["label1"]; + view.removeLabel(0); + assert.strictEqual(view.labels.length, 0); + }); + describe("render()", () => { let renderServerNameStub, renderConnAddressStub, From 47107843bf41bfadbc3b52bcd5dbd2ca1e90520e Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 23 Aug 2024 08:12:35 +0100 Subject: [PATCH 02/99] small fix for multiple labels --- src/webview/components/kdbNewConnectionView.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webview/components/kdbNewConnectionView.ts b/src/webview/components/kdbNewConnectionView.ts index 4d6bb8d8..9229d921 100644 --- a/src/webview/components/kdbNewConnectionView.ts +++ b/src/webview/components/kdbNewConnectionView.ts @@ -53,7 +53,7 @@ export class KdbNewConnectionView extends LitElement { realm: "", insecure: false, }; - labels: string[] = []; + labels: string[] = [""]; serverType: ServerType = ServerType.KDB; isBundledQ: boolean = true; oldAlias: string = ""; From b214b64b5274547a36a8b69ce63aef4c3f94bc7d Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 23 Aug 2024 08:13:10 +0100 Subject: [PATCH 03/99] update version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cefd8212..7166d74b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kdb", - "version": "1.7.0", + "version": "1.8.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kdb", - "version": "1.7.0", + "version": "1.8.0", "license": "MIT", "dependencies": { "@types/graceful-fs": "^4.1.9", diff --git a/package.json b/package.json index 9fbee1f5..4fea13e9 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "kdb", "description": "IDE support for kdb product suite including the q programming language", "publisher": "KX", - "version": "1.7.0", + "version": "1.8.0", "engines": { "vscode": "^1.86.0" }, From 97f78e3623d9546f66a6856d34258d5777deb411 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 23 Aug 2024 08:51:42 +0100 Subject: [PATCH 04/99] add edit tests --- test/suite/webview.test.ts | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/test/suite/webview.test.ts b/test/suite/webview.test.ts index 8a020f94..5d18a54c 100644 --- a/test/suite/webview.test.ts +++ b/test/suite/webview.test.ts @@ -24,6 +24,7 @@ import { InsightDetails } from "../../src/models/insights"; import { DataSourceCommand, DataSourceMessage2, + EditConnectionMessage, } from "../../src/models/messages"; import { DataSourceTypes, @@ -870,4 +871,40 @@ describe("KdbNewConnectionView", () => { sinon.restore(); }); }); + + describe("edit", () => { + const editConn: EditConnectionMessage = { + connType: 0, + serverName: "test", + serverAddress: "127.0.0.1", + }; + + it("should post a message", () => { + const api = acquireVsCodeApi(); + let result: any; + sinon.stub(api, "postMessage").value(({ command, data }) => { + if ( + command === "kdb.newConnection.editMyQConnection" || + command === "kdb.newConnection.editInsightsConnection" || + command === "kdb.newConnection.editBundledConnection" + ) { + result = data; + } + }); + view.editConnection(); + assert.ok(!result); + view.connectionData = editConn; + view.editConnection(); + assert.ok(result); + editConn.connType = 1; + view.connectionData = editConn; + view.editConnection(); + assert.ok(result); + editConn.connType = 2; + view.connectionData = editConn; + view.editConnection(); + assert.ok(result); + sinon.restore(); + }); + }); }); From 6c4f9c3ab4bf3ed932d3e37370ffe91eb3777f9c Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 23 Aug 2024 09:05:37 +0100 Subject: [PATCH 05/99] add tests --- src/webview/components/kdbNewConnectionView.ts | 8 ++++++-- test/suite/webview.test.ts | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/webview/components/kdbNewConnectionView.ts b/src/webview/components/kdbNewConnectionView.ts index 9229d921..c488fb49 100644 --- a/src/webview/components/kdbNewConnectionView.ts +++ b/src/webview/components/kdbNewConnectionView.ts @@ -118,6 +118,11 @@ export class KdbNewConnectionView extends LitElement { this.requestUpdate(); } + updateLabelValue(pos: number, event: Event) { + this.labels[pos] = (event.target as HTMLSelectElement).value; + this.requestUpdate(); + } + get selectConnection(): string { if (this.isBundledQ) { return "tab-1"; @@ -355,8 +360,7 @@ export class KdbNewConnectionView extends LitElement { value="${this.labels[pos]}" current-value="${this.labels[pos]}" @change="${(event: Event) => { - this.labels[pos] = (event.target as HTMLInputElement).value; - this.requestUpdate(); + this.updateLabelValue(pos, event); }}"> ${this.renderLblDropdownOptions(pos)} diff --git a/test/suite/webview.test.ts b/test/suite/webview.test.ts index 5d18a54c..dc9f9a3a 100644 --- a/test/suite/webview.test.ts +++ b/test/suite/webview.test.ts @@ -586,6 +586,17 @@ describe("KdbNewConnectionView", () => { assert.strictEqual(view.labels.length, 0); }); + it("should update label", () => { + view.labels = ["label1"]; + const event: Event = new Event("label2"); + Object.defineProperty(event, "target", { + value: { value: "label2" }, + writable: false, + }); + view.updateLabelValue(0, event); + assert.strictEqual(view.labels[0], "label2"); + }); + describe("render()", () => { let renderServerNameStub, renderConnAddressStub, From 6e6ae024e5236964ccda089c5b1252f7b8019302 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 2 Sep 2024 07:41:58 +0100 Subject: [PATCH 06/99] allow user to disable installl kdb popup --- package.json | 4 ++++ src/extension.ts | 2 +- src/utils/core.ts | 25 ++++++++++++++++++++++--- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 4fea13e9..b209bd55 100644 --- a/package.json +++ b/package.json @@ -165,6 +165,10 @@ "type": "string", "description": "QHOME directory for q runtime" }, + "kdb.neverShowQInstallAgain": { + "type": "boolean", + "description": "Never show q install walkthrough again" + }, "kdb.hideSubscribeRegistrationNotification": { "type": "boolean", "description": "Hide subscribe for registration notification", diff --git a/src/extension.ts b/src/extension.ts index 0a1688a2..7218d9f8 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -181,7 +181,7 @@ export async function activate(context: ExtensionContext) { try { // check for installed q runtime - await checkLocalInstall(); + await checkLocalInstall(true); } catch (err) { window.showErrorMessage(`${err}`); } diff --git a/src/utils/core.ts b/src/utils/core.ts index a60a0b3b..90cef80d 100644 --- a/src/utils/core.ts +++ b/src/utils/core.ts @@ -405,8 +405,18 @@ export function delay(ms: number) { return new Promise((resolve) => setTimeout(resolve, ms)); } -export async function checkLocalInstall(): Promise { +export async function checkLocalInstall( + isExtensionStartCheck?: boolean, +): Promise { const QHOME = workspace.getConfiguration().get("kdb.qHomeDirectory"); + if (isExtensionStartCheck) { + const notShow = workspace + .getConfiguration() + .get("kdb.neverShowQInstallAgain"); + if (notShow) { + return; + } + } if (QHOME || env.QHOME) { env.QHOME = QHOME || env.QHOME; if (!pathExists(env.QHOME!)) { @@ -454,12 +464,21 @@ export async function checkLocalInstall(): Promise { .showInformationMessage( "Local q installation not found!", "Install new instance", - "Cancel", + "No", + "Never show again", ) .then(async (installResult) => { if (installResult === "Install new instance") { await installTools(); - } else if (installResult === "Cancel") { + } else if (installResult === "Never show again") { + await workspace + .getConfiguration() + .update( + "kdb.neverShowQInstallAgain", + true, + ConfigurationTarget.Global, + ); + } else { showRegistrationNotification(); } }); From 367378b4196ad557754a11d814d504273dcae40a Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 2 Sep 2024 08:24:29 +0100 Subject: [PATCH 07/99] add tests --- test/suite/utils.test.ts | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/test/suite/utils.test.ts b/test/suite/utils.test.ts index 5e55684a..46eeb336 100644 --- a/test/suite/utils.test.ts +++ b/test/suite/utils.test.ts @@ -36,6 +36,7 @@ import { openUrl } from "../../src/utils/openUrl"; import * as queryUtils from "../../src/utils/queryUtils"; import { showRegistrationNotification } from "../../src/utils/registration"; import { killPid } from "../../src/utils/shell"; +import { env } from "node:process"; import { showInputBox, showOpenFolderDialog, @@ -1834,4 +1835,45 @@ describe("Utils", () => { assert.strictEqual(result, false); }); }); + + describe("checkLocalInstall", () => { + let getConfigurationStub: sinon.SinonStub; + let updateConfigurationStub: sinon.SinonStub; + let showInformationMessageStub: sinon.SinonStub; + let executeCommandStub: sinon.SinonStub; + let envStub: sinon.SinonStub; + + beforeEach(() => { + getConfigurationStub = sinon + .stub(vscode.workspace, "getConfiguration") + .returns({ + get: sinon.stub().returns(false), + update: sinon.stub().resolves(), + } as any); + updateConfigurationStub = getConfigurationStub() + .update as sinon.SinonStub; + showInformationMessageStub = sinon + .stub(vscode.window, "showInformationMessage") + .resolves(); + executeCommandStub = sinon + .stub(vscode.commands, "executeCommand") + .resolves(); + envStub = sinon.stub(env, "QHOME").value(undefined); + }); + + afterEach(() => { + sinon.restore(); + }); + + it("should return if 'neverShowQInstallAgain' is true", async () => { + getConfigurationStub() + .get.withArgs("kdb.neverShowQInstallAgain") + .returns(true); + + await coreUtils.checkLocalInstall(true); + + assert.strictEqual(showInformationMessageStub.called, false); + assert.strictEqual(executeCommandStub.called, false); + }); + }); }); From 746b67c2d0e05b555ffdf4c5ce1c0b96e777fc64 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 2 Sep 2024 08:27:29 +0100 Subject: [PATCH 08/99] remove obsolete vars --- test/suite/utils.test.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/suite/utils.test.ts b/test/suite/utils.test.ts index 46eeb336..1e947628 100644 --- a/test/suite/utils.test.ts +++ b/test/suite/utils.test.ts @@ -36,7 +36,6 @@ import { openUrl } from "../../src/utils/openUrl"; import * as queryUtils from "../../src/utils/queryUtils"; import { showRegistrationNotification } from "../../src/utils/registration"; import { killPid } from "../../src/utils/shell"; -import { env } from "node:process"; import { showInputBox, showOpenFolderDialog, @@ -1841,7 +1840,6 @@ describe("Utils", () => { let updateConfigurationStub: sinon.SinonStub; let showInformationMessageStub: sinon.SinonStub; let executeCommandStub: sinon.SinonStub; - let envStub: sinon.SinonStub; beforeEach(() => { getConfigurationStub = sinon @@ -1858,7 +1856,6 @@ describe("Utils", () => { executeCommandStub = sinon .stub(vscode.commands, "executeCommand") .resolves(); - envStub = sinon.stub(env, "QHOME").value(undefined); }); afterEach(() => { From b95f6eb30152eac7703d781701a5971d50e27a5a Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 2 Sep 2024 08:47:01 +0100 Subject: [PATCH 09/99] add more tests --- test/suite/utils.test.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/suite/utils.test.ts b/test/suite/utils.test.ts index 1e947628..035812e5 100644 --- a/test/suite/utils.test.ts +++ b/test/suite/utils.test.ts @@ -1872,5 +1872,15 @@ describe("Utils", () => { assert.strictEqual(showInformationMessageStub.called, false); assert.strictEqual(executeCommandStub.called, false); }); + it("should continue if 'neverShowQInstallAgain' is false", async () => { + getConfigurationStub() + .get.withArgs("kdb.neverShowQInstallAgain") + .returns(false); + + await coreUtils.checkLocalInstall(true); + + assert.strictEqual(showInformationMessageStub.called, true); + assert.strictEqual(executeCommandStub.called, false); + }); }); }); From e82910b592f4de8213b183cf5617d41aafd6c303 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 2 Sep 2024 08:56:53 +0100 Subject: [PATCH 10/99] add tests --- test/suite/utils.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/suite/utils.test.ts b/test/suite/utils.test.ts index 035812e5..d90001bf 100644 --- a/test/suite/utils.test.ts +++ b/test/suite/utils.test.ts @@ -1880,7 +1880,7 @@ describe("Utils", () => { await coreUtils.checkLocalInstall(true); assert.strictEqual(showInformationMessageStub.called, true); - assert.strictEqual(executeCommandStub.called, false); + assert.strictEqual(executeCommandStub.called, true); }); }); }); From 25810fc9d0e80eb979ca0126fbd89084ed126c12 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 2 Sep 2024 09:00:49 +0100 Subject: [PATCH 11/99] add more tests --- test/suite/utils.test.ts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/suite/utils.test.ts b/test/suite/utils.test.ts index d90001bf..d6fc43d9 100644 --- a/test/suite/utils.test.ts +++ b/test/suite/utils.test.ts @@ -1882,5 +1882,26 @@ describe("Utils", () => { assert.strictEqual(showInformationMessageStub.called, true); assert.strictEqual(executeCommandStub.called, true); }); + + it("should handle 'Never show again' response", async () => { + getConfigurationStub() + .get.withArgs("kdb.qHomeDirectory") + .returns(undefined); + getConfigurationStub() + .get.withArgs("kdb.neverShowQInstallAgain") + .returns(false); + showInformationMessageStub.resolves("Never show again"); + + await coreUtils.checkLocalInstall(true); + + assert.strictEqual( + updateConfigurationStub.calledWith( + "kdb.neverShowQInstallAgain", + true, + vscode.ConfigurationTarget.Global, + ), + true, + ); + }); }); }); From c8f5fe3987385c0d25f5d53c9bd3a9a74d5c0ed0 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 2 Sep 2024 09:05:58 +0100 Subject: [PATCH 12/99] improve code coverage --- test/suite/utils.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/suite/utils.test.ts b/test/suite/utils.test.ts index d6fc43d9..26c339eb 100644 --- a/test/suite/utils.test.ts +++ b/test/suite/utils.test.ts @@ -1892,7 +1892,7 @@ describe("Utils", () => { .returns(false); showInformationMessageStub.resolves("Never show again"); - await coreUtils.checkLocalInstall(true); + await coreUtils.checkLocalInstall(); assert.strictEqual( updateConfigurationStub.calledWith( From 5f38dde954e84952668115f144c362ad8701824c Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 2 Sep 2024 09:10:12 +0100 Subject: [PATCH 13/99] [KXI-34231] results tab not changing when connected --- src/commands/serverCommand.ts | 1 - src/extension.ts | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index 0837fcca..76c740b5 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -545,7 +545,6 @@ export async function removeConnection(viewItem: KdbNode | InsightsNode) { export async function connect(connLabel: string): Promise { const connMngService = new ConnectionManagementService(); - commands.executeCommand("kdb-results.focus"); ExecutionConsole.start(); const viewItem = connMngService.retrieveConnection(connLabel); if (viewItem === undefined) { diff --git a/src/extension.ts b/src/extension.ts index 7218d9f8..21f973a2 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -177,6 +177,8 @@ export async function activate(context: ExtensionContext) { AuthSettings.init(context); ext.secretSettings = AuthSettings.instance; + commands.executeCommand("kdb-results.focus"); + kdbOutputLog("kdb extension is now active!", "INFO"); try { From 5cb38d3260ed44f13f1102355184769a63837f8d Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Wed, 4 Sep 2024 08:14:06 +0100 Subject: [PATCH 14/99] add import/export options to elipse icon --- package.json | 20 ++++++++++++++++++++ src/extension.ts | 6 ++++++ 2 files changed, 26 insertions(+) diff --git a/package.json b/package.json index b209bd55..66b63a16 100644 --- a/package.json +++ b/package.json @@ -200,6 +200,16 @@ } }, "commands": [ + { + "category": "KX", + "command": "kdb.connections.export", + "title": "Export connections" + }, + { + "category": "KX", + "command": "kdb.connections.import", + "title": "Import connections" + }, { "category": "KX", "command": "kdb.refreshServerObjects", @@ -701,6 +711,16 @@ "command": "kdb.resultsPanel.export.csv", "when": "view == kdb-results", "group": "resultsPanel" + }, + { + "command": "kdb.connections.export", + "when": "view == kdb-servers", + "group": "inline" + }, + { + "command": "kdb.connections.import", + "when": "view == kdb-servers", + "group": "inline" } ], "view/item/context": [ diff --git a/src/extension.ts b/src/extension.ts index 21f973a2..1453facf 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -267,6 +267,12 @@ export async function activate(context: ExtensionContext) { await disconnect(connLabel); }, ), + commands.registerCommand("kdb.connections.export", () => { + window.showInformationMessage("Export Connections command executed"); + }), + commands.registerCommand("kdb.connections.import", () => { + window.showInformationMessage("Import Connections command executed"); + }), commands.registerCommand( "kdb.open.meta", async (viewItem: InsightsMetaNode | MetaObjectPayloadNode) => { From 63a4973ea686815478601087faedfde668c1a37c Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Wed, 4 Sep 2024 09:32:29 +0100 Subject: [PATCH 15/99] centralized all connections in one place --- src/commands/dataSourceCommand.ts | 2 +- src/commands/installTools.ts | 2 +- src/commands/serverCommand.ts | 35 +++++++++++++++++-- src/extension.ts | 8 +++-- .../{server.ts => connectionsModels.ts} | 21 +++++++++++ src/models/queryHistory.ts | 2 +- src/services/connectionManagerService.ts | 7 ++-- .../exportConnContentProvider.ts} | 26 +++++++++----- src/services/kdbTreeProvider.ts | 8 +++-- src/utils/core.ts | 8 +++-- src/utils/executionConsole.ts | 2 +- src/utils/queryUtils.ts | 2 +- .../components/kdbNewConnectionView.ts | 7 ++-- test/suite/commands.test.ts | 7 ++-- test/suite/services.test.ts | 7 ++-- test/suite/utils.test.ts | 7 ++-- test/suite/webview.test.ts | 3 +- 17 files changed, 120 insertions(+), 34 deletions(-) rename src/models/{server.ts => connectionsModels.ts} (71%) rename src/{models/insights.ts => services/exportConnContentProvider.ts} (55%) diff --git a/src/commands/dataSourceCommand.ts b/src/commands/dataSourceCommand.ts index f8461ebb..b5fec5be 100644 --- a/src/commands/dataSourceCommand.ts +++ b/src/commands/dataSourceCommand.ts @@ -40,12 +40,12 @@ import { writeQueryResultsToConsole, writeQueryResultsToView, } from "./serverCommand"; -import { ServerType } from "../models/server"; import { Telemetry } from "../utils/telemetryClient"; import { LocalConnection } from "../classes/localConnection"; import { ConnectionManagementService } from "../services/connectionManagerService"; import { InsightsConnection } from "../classes/insightsConnection"; import { kdbOutputLog, offerConnectAction } from "../utils/core"; +import { ServerType } from "../models/connectionsModels"; export async function addDataSource(): Promise { const kdbDataSourcesFolderPath = createKdbDataSourcesFolder(); diff --git a/src/commands/installTools.ts b/src/commands/installTools.ts index 799be259..a7befef7 100644 --- a/src/commands/installTools.ts +++ b/src/commands/installTools.ts @@ -43,7 +43,6 @@ import { onboardingInput, onboardingWorkflow, } from "../models/items/onboarding"; -import { Server } from "../models/server"; import { KdbNode } from "../services/kdbTreeProvider"; import { addLocalConnectionContexts, @@ -64,6 +63,7 @@ import { executeCommand } from "../utils/cpUtils"; import { openUrl } from "../utils/openUrl"; import { Telemetry } from "../utils/telemetryClient"; import { validateServerPort } from "../validators/kdbValidator"; +import { Server } from "../models/connectionsModels"; export async function installTools(): Promise { let file: Uri[] | undefined; diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index 76c740b5..bccfe8e5 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -26,10 +26,8 @@ import { import { ext } from "../extensionVariables"; import { DataSourceFiles } from "../models/dataSource"; import { ExecutionTypes } from "../models/execution"; -import { InsightDetails, Insights } from "../models/insights"; import { queryConstants } from "../models/queryResult"; import { ScratchpadResult } from "../models/scratchpadResult"; -import { Server, ServerDetails, ServerType } from "../models/server"; import { ServerObject } from "../models/serverObject"; import { DataSourcesPanel } from "../panels/datasource"; import { @@ -69,6 +67,14 @@ import { ConnectionManagementService } from "../services/connectionManagerServic import { InsightsConnection } from "../classes/insightsConnection"; import { MetaContentProvider } from "../services/metaContentProvider"; import { handleLabelsConnMap, removeConnFromLabels } from "../utils/connLabel"; +import { ExportConnectionContentProvider } from "../services/exportConnContentProvider"; +import { + InsightDetails, + Insights, + Server, + ServerDetails, + ServerType, +} from "../models/connectionsModels"; export async function addNewConnection(): Promise { NewConnectionPannel.close(); @@ -875,6 +881,31 @@ export async function openMeta(node: MetaObjectPayloadNode | InsightsMetaNode) { } } +export async function exportConnection(connLabel?: string) { + const exportConnProvider = new ExportConnectionContentProvider(); + workspace.registerTextDocumentContentProvider( + "Export Connection", + exportConnProvider, + ); + const connMngService = new ConnectionManagementService(); + const doc = connMngService.exportConnection(connLabel); + if (doc && doc !== "") { + const formattedDoc = JSON.stringify(JSON.parse(doc), null, 2); + const uri = Uri.parse(`exported-connections.json`); + exportConnProvider.update(uri, formattedDoc); + const document = await workspace.openTextDocument(uri); + await window.showTextDocument(document, { + preview: false, + viewColumn: ViewColumn.One, + }); + } else { + kdbOutputLog( + "[EXPORT CONNECTIONS] No connections found to be exported", + "ERROR", + ); + } +} + export function writeQueryResultsToConsole( result: string | string[], query: string, diff --git a/src/extension.ts b/src/extension.ts index 1453facf..c9171d8e 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -59,9 +59,7 @@ import { import { showInstallationDetails } from "./commands/walkthroughCommand"; import { ext } from "./extensionVariables"; import { ExecutionTypes } from "./models/execution"; -import { InsightDetails, Insights } from "./models/insights"; import { QueryResult } from "./models/queryResult"; -import { Server, ServerDetails } from "./models/server"; import { InsightsMetaNode, InsightsNode, @@ -114,6 +112,12 @@ import { setLabelColor, } from "./utils/connLabel"; import { activateTextDocument } from "./utils/workspace"; +import { + InsightDetails, + Insights, + Server, + ServerDetails, +} from "./models/connectionsModels"; let client: LanguageClient; diff --git a/src/models/server.ts b/src/models/connectionsModels.ts similarity index 71% rename from src/models/server.ts rename to src/models/connectionsModels.ts index af400b55..3f0f0ee6 100644 --- a/src/models/server.ts +++ b/src/models/connectionsModels.ts @@ -11,6 +11,8 @@ * specific language governing permissions and limitations under the License. */ +//TODO: start to migrate all connections models to here + export enum ServerType { INSIGHTS, KDB, @@ -31,3 +33,22 @@ export interface ServerDetails { export interface Server { [name: string]: ServerDetails; } + +export interface InsightDetails { + alias: string; + server: string; + auth: boolean; + realm?: string; + insecure?: boolean; +} + +export interface Insights { + [name: string]: InsightDetails; +} + +export interface ExportedConnections { + connections: { + Insights: InsightDetails[]; + KDB: ServerDetails[]; + }; +} diff --git a/src/models/queryHistory.ts b/src/models/queryHistory.ts index 1fcb9be7..4071150f 100644 --- a/src/models/queryHistory.ts +++ b/src/models/queryHistory.ts @@ -11,8 +11,8 @@ * specific language governing permissions and limitations under the License. */ +import { ServerType } from "./connectionsModels"; import { DataSourceFiles, DataSourceTypes } from "./dataSource"; -import { ServerType } from "./server"; export interface QueryHistory { executorName: string; diff --git a/src/services/connectionManagerService.ts b/src/services/connectionManagerService.ts index 1a509bad..08214886 100644 --- a/src/services/connectionManagerService.ts +++ b/src/services/connectionManagerService.ts @@ -28,11 +28,10 @@ import { updateInsights, updateServers, } from "../utils/core"; -import { Insights } from "../models/insights"; -import { Server } from "../models/server"; import { refreshDataSourcesPanel } from "../utils/dataSource"; import { MetaInfoType } from "../models/meta"; import { retrieveConnLabelsNames } from "../utils/connLabel"; +import { Insights, Server } from "../models/connectionsModels"; export class ConnectionManagementService { public retrieveConnection( @@ -403,4 +402,8 @@ export class ConnectionManagementService { return connection.returnMetaObject(metaType); } + + public exportConnection(connLabel?: string): string { + return ""; + } } diff --git a/src/models/insights.ts b/src/services/exportConnContentProvider.ts similarity index 55% rename from src/models/insights.ts rename to src/services/exportConnContentProvider.ts index b9446e4d..1160d53d 100644 --- a/src/models/insights.ts +++ b/src/services/exportConnContentProvider.ts @@ -11,14 +11,22 @@ * specific language governing permissions and limitations under the License. */ -export interface InsightDetails { - alias: string; - server: string; - auth: boolean; - realm?: string; - insecure?: boolean; -} +import * as vscode from "vscode"; + +export class ExportConnectionContentProvider + implements vscode.TextDocumentContentProvider +{ + private _onDidChange = new vscode.EventEmitter(); + public readonly onDidChange = this._onDidChange.event; + + private content: string = ""; + + public update(uri: vscode.Uri, content: string) { + this.content = content; + this._onDidChange.fire(uri); + } -export interface Insights { - [name: string]: InsightDetails; + provideTextDocumentContent(uri: vscode.Uri): string { + return this.content; + } } diff --git a/src/services/kdbTreeProvider.ts b/src/services/kdbTreeProvider.ts index 55b20d2a..5ba38f3c 100644 --- a/src/services/kdbTreeProvider.ts +++ b/src/services/kdbTreeProvider.ts @@ -22,8 +22,6 @@ import { commands, } from "vscode"; import { ext } from "../extensionVariables"; -import { InsightDetails, Insights } from "../models/insights"; -import { Server, ServerDetails } from "../models/server"; import { loadDictionaries, loadFunctions, @@ -49,6 +47,12 @@ import { retrieveConnLabelsNames, } from "../utils/connLabel"; import { Labels } from "../models/labels"; +import { + InsightDetails, + Insights, + Server, + ServerDetails, +} from "../models/connectionsModels"; export class KdbTreeProvider implements TreeDataProvider { private _onDidChangeTreeData: EventEmitter< diff --git a/src/utils/core.ts b/src/utils/core.ts index 90cef80d..18a539a4 100644 --- a/src/utils/core.ts +++ b/src/utils/core.ts @@ -22,12 +22,16 @@ import * as semver from "semver"; import { commands, ConfigurationTarget, Uri, window, workspace } from "vscode"; import { installTools } from "../commands/installTools"; import { ext } from "../extensionVariables"; -import { InsightDetails, Insights } from "../models/insights"; import { QueryResult } from "../models/queryResult"; -import { Server, ServerDetails } from "../models/server"; import { tryExecuteCommand } from "./cpUtils"; import { showRegistrationNotification } from "./registration"; import { Telemetry } from "./telemetryClient"; +import { + InsightDetails, + Insights, + Server, + ServerDetails, +} from "../models/connectionsModels"; export function log(childProcess: ChildProcess): void { kdbOutputLog(`Process ${childProcess.pid} started`, "INFO"); diff --git a/src/utils/executionConsole.ts b/src/utils/executionConsole.ts index a6bc6d0f..63d83120 100644 --- a/src/utils/executionConsole.ts +++ b/src/utils/executionConsole.ts @@ -13,7 +13,6 @@ import { OutputChannel, commands, window } from "vscode"; import { ext } from "../extensionVariables"; -import { ServerType } from "../models/server"; import { getHideDetailedConsoleQueryOutput, setOutputWordWrapper, @@ -23,6 +22,7 @@ import { checkIfIsDatasource, convertRowsToConsole, } from "./queryUtils"; +import { ServerType } from "../models/connectionsModels"; export class ExecutionConsole { public static current: ExecutionConsole | undefined; diff --git a/src/utils/queryUtils.ts b/src/utils/queryUtils.ts index ac60a394..c572e327 100644 --- a/src/utils/queryUtils.ts +++ b/src/utils/queryUtils.ts @@ -16,12 +16,12 @@ import { join } from "path"; import { ext } from "../extensionVariables"; import { DCDS, deserialize, isCompressed, uncompress } from "../ipc/c"; import { Parse } from "../ipc/parse.qlist"; -import { ServerType } from "../models/server"; import { DDateClass, DDateTimeClass, DTimestampClass } from "../ipc/cClasses"; import { TypeBase } from "../ipc/typeBase"; import { DataSourceFiles, DataSourceTypes } from "../models/dataSource"; import { QueryHistory } from "../models/queryHistory"; import { kdbOutputLog } from "./core"; +import { ServerType } from "../models/connectionsModels"; export function sanitizeQuery(query: string): string { if (query[0] === "`") { diff --git a/src/webview/components/kdbNewConnectionView.ts b/src/webview/components/kdbNewConnectionView.ts index c488fb49..2097f2fd 100644 --- a/src/webview/components/kdbNewConnectionView.ts +++ b/src/webview/components/kdbNewConnectionView.ts @@ -13,13 +13,16 @@ import { LitElement, html } from "lit"; import { customElement } from "lit/decorators.js"; -import { ServerDetails, ServerType } from "../../models/server"; -import { InsightDetails } from "../../models/insights"; import { kdbStyles, newConnectionStyles, vscodeStyles } from "./styles"; import { EditConnectionMessage } from "../../models/messages"; import { repeat } from "lit/directives/repeat.js"; import { LabelColors, Labels } from "../../models/labels"; +import { + InsightDetails, + ServerDetails, + ServerType, +} from "../../models/connectionsModels"; @customElement("kdb-new-connection-view") export class KdbNewConnectionView extends LitElement { diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts index 548de197..5597adb0 100644 --- a/test/suite/commands.test.ts +++ b/test/suite/commands.test.ts @@ -27,7 +27,6 @@ import { createDefaultDataSourceFile, } from "../../src/models/dataSource"; import { ExecutionTypes } from "../../src/models/execution"; -import { InsightDetails } from "../../src/models/insights"; import { ScratchpadResult } from "../../src/models/scratchpadResult"; import { InsightsNode, @@ -41,7 +40,6 @@ import * as dataSourceUtils from "../../src/utils/dataSource"; import { ExecutionConsole } from "../../src/utils/executionConsole"; import * as queryUtils from "../../src/utils/queryUtils"; import { QueryHistory } from "../../src/models/queryHistory"; -import { ServerDetails, ServerType } from "../../src/models/server"; import { NewConnectionPannel } from "../../src/panels/newConnection"; import { MAX_STR_LEN } from "../../src/validators/kdbValidator"; import { LocalConnection } from "../../src/classes/localConnection"; @@ -53,6 +51,11 @@ import { WorkspaceTreeProvider } from "../../src/services/workspaceTreeProvider" import { GetDataError } from "../../src/models/data"; import * as clientCommand from "../../src/commands/clientCommands"; import { LanguageClient } from "vscode-languageclient/node"; +import { + InsightDetails, + ServerDetails, + ServerType, +} from "../../src/models/connectionsModels"; describe("dataSourceCommand", () => { afterEach(() => { diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index 93816d5e..97908c6f 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -25,9 +25,7 @@ import { workspace, } from "vscode"; import { ext } from "../../src/extensionVariables"; -import { Insights } from "../../src/models/insights"; import { QueryHistory } from "../../src/models/queryHistory"; -import { Server, ServerType } from "../../src/models/server"; import { getCurrentToken, refreshToken, @@ -65,6 +63,11 @@ import { MetaInfoType, MetaObject } from "../../src/models/meta"; import { CompletionProvider } from "../../src/services/completionProvider"; import { MetaContentProvider } from "../../src/services/metaContentProvider"; import { ConnectionLabel, Labels } from "../../src/models/labels"; +import { + Insights, + Server, + ServerType, +} from "../../src/models/connectionsModels"; // eslint-disable-next-line @typescript-eslint/no-var-requires const codeFlow = require("../../src/services/kdbInsights/codeFlowLogin"); diff --git a/test/suite/utils.test.ts b/test/suite/utils.test.ts index 26c339eb..c8044f71 100644 --- a/test/suite/utils.test.ts +++ b/test/suite/utils.test.ts @@ -20,7 +20,6 @@ import { ext } from "../../src/extensionVariables"; import * as QTable from "../../src/ipc/QTable"; import { CancellationEvent } from "../../src/models/cancellationEvent"; import { QueryResultType } from "../../src/models/queryResult"; -import { ServerDetails, ServerType } from "../../src/models/server"; import { InsightsNode, KdbNode } from "../../src/services/kdbTreeProvider"; import { QueryHistoryProvider } from "../../src/services/queryHistoryProvider"; import * as coreUtils from "../../src/utils/core"; @@ -49,9 +48,13 @@ import { DTimestampClass, } from "../../src/ipc/cClasses"; import { DataSourceTypes } from "../../src/models/dataSource"; -import { InsightDetails } from "../../src/models/insights"; import { LocalConnection } from "../../src/classes/localConnection"; import { Labels } from "../../src/models/labels"; +import { + InsightDetails, + ServerDetails, + ServerType, +} from "../../src/models/connectionsModels"; interface ITestItem extends vscode.QuickPickItem { id: number; diff --git a/test/suite/webview.test.ts b/test/suite/webview.test.ts index dc9f9a3a..b9f2301c 100644 --- a/test/suite/webview.test.ts +++ b/test/suite/webview.test.ts @@ -18,9 +18,7 @@ import * as assert from "assert"; import * as sinon from "sinon"; import { KdbDataSourceView } from "../../src/webview/components/kdbDataSourceView"; import { KdbNewConnectionView } from "../../src/webview/components/kdbNewConnectionView"; -import { ServerType } from "../../src/models/server"; -import { InsightDetails } from "../../src/models/insights"; import { DataSourceCommand, DataSourceMessage2, @@ -37,6 +35,7 @@ import { import { MetaObjectPayload } from "../../src/models/meta"; import { html, TemplateResult } from "lit"; import { ext } from "../../src/extensionVariables"; +import { InsightDetails, ServerType } from "../../src/models/connectionsModels"; describe("KdbDataSourceView", () => { let view: KdbDataSourceView; From d34718f973d695916cca6498a4310d0745eddc70 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Wed, 4 Sep 2024 09:52:52 +0100 Subject: [PATCH 16/99] open json from exported connections --- package.json | 4 +-- src/commands/serverCommand.ts | 6 ++-- src/extension.ts | 5 ++-- src/services/connectionManagerService.ts | 36 ++++++++++++++++++++++-- 4 files changed, 42 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 66b63a16..ec56e9da 100644 --- a/package.json +++ b/package.json @@ -202,7 +202,7 @@ "commands": [ { "category": "KX", - "command": "kdb.connections.export", + "command": "kdb.connections.export.all", "title": "Export connections" }, { @@ -713,7 +713,7 @@ "group": "resultsPanel" }, { - "command": "kdb.connections.export", + "command": "kdb.connections.export.all", "when": "view == kdb-servers", "group": "inline" }, diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index bccfe8e5..d7bc7c91 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -881,17 +881,17 @@ export async function openMeta(node: MetaObjectPayloadNode | InsightsMetaNode) { } } -export async function exportConnection(connLabel?: string) { +export async function exportConnections(connLabel?: string) { const exportConnProvider = new ExportConnectionContentProvider(); workspace.registerTextDocumentContentProvider( - "Export Connection", + "connections", exportConnProvider, ); const connMngService = new ConnectionManagementService(); const doc = connMngService.exportConnection(connLabel); if (doc && doc !== "") { const formattedDoc = JSON.stringify(JSON.parse(doc), null, 2); - const uri = Uri.parse(`exported-connections.json`); + const uri = Uri.parse(`connections:exported-connections.json`); exportConnProvider.update(uri, formattedDoc); const document = await workspace.openTextDocument(uri); await window.showTextDocument(document, { diff --git a/src/extension.ts b/src/extension.ts index c9171d8e..4a1aaf5d 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -51,6 +51,7 @@ import { editInsightsConnection, editKdbConnection, enableTLS, + exportConnections, openMeta, refreshGetMeta, removeConnection, @@ -271,8 +272,8 @@ export async function activate(context: ExtensionContext) { await disconnect(connLabel); }, ), - commands.registerCommand("kdb.connections.export", () => { - window.showInformationMessage("Export Connections command executed"); + commands.registerCommand("kdb.connections.export.all", () => { + exportConnections(); }), commands.registerCommand("kdb.connections.import", () => { window.showInformationMessage("Import Connections command executed"); diff --git a/src/services/connectionManagerService.ts b/src/services/connectionManagerService.ts index 08214886..666da851 100644 --- a/src/services/connectionManagerService.ts +++ b/src/services/connectionManagerService.ts @@ -31,7 +31,11 @@ import { import { refreshDataSourcesPanel } from "../utils/dataSource"; import { MetaInfoType } from "../models/meta"; import { retrieveConnLabelsNames } from "../utils/connLabel"; -import { Insights, Server } from "../models/connectionsModels"; +import { + ExportedConnections, + Insights, + Server, +} from "../models/connectionsModels"; export class ConnectionManagementService { public retrieveConnection( @@ -404,6 +408,34 @@ export class ConnectionManagementService { } public exportConnection(connLabel?: string): string { - return ""; + const exportedContent: ExportedConnections = { + connections: { + Insights: [], + KDB: [], + }, + }; + if (connLabel) { + const connection = this.retrieveConnection(connLabel); + if (!connection) { + return ""; + } + if (connection instanceof KdbNode) { + exportedContent.connections.KDB.push(connection.details); + } else { + exportedContent.connections.Insights.push(connection.details); + } + } else { + ext.connectionsList.forEach((connection) => { + if (connection instanceof KdbNode) { + exportedContent.connections.KDB.push(connection.details); + } else { + exportedContent.connections.Insights.push(connection.details); + } + }); + } + return exportedContent.connections.Insights.length === 0 && + exportedContent.connections.KDB.length === 0 + ? "" + : JSON.stringify(exportedContent, null, 2); } } From e1d6c33602a721525966e09e524d432db9b70441 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Thu, 5 Sep 2024 07:45:48 +0100 Subject: [PATCH 17/99] add export method to the extension --- package.json | 10 ++++++ src/commands/serverCommand.ts | 39 ++++++++++++++++------- src/extension.ts | 6 ++++ src/services/connectionManagerService.ts | 2 ++ src/services/exportConnContentProvider.ts | 32 ------------------- src/utils/core.ts | 11 +++---- 6 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 src/services/exportConnContentProvider.ts diff --git a/package.json b/package.json index ec56e9da..3b44d2f6 100644 --- a/package.json +++ b/package.json @@ -205,6 +205,11 @@ "command": "kdb.connections.export.all", "title": "Export connections" }, + { + "category": "KX", + "command": "kdb.connections.export.single", + "title": "Export connection" + }, { "category": "KX", "command": "kdb.connections.import", @@ -769,6 +774,11 @@ "when": "view == kdb-servers && viewItem in kdb.rootNodes", "group": "connection@5" }, + { + "command": "kdb.connections.export.single", + "when": "view == kdb-servers && (viewItem in kdb.rootNodes || viewItem in kdb.insightsNodes)", + "group": "connection@6" + }, { "command": "kdb.startLocalProcess", "when": "view == kdb-servers && viewItem in kdb.local && viewItem not in kdb.running && viewItem in kdb.rootNodes", diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index d7bc7c91..0a6088c3 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -67,7 +67,6 @@ import { ConnectionManagementService } from "../services/connectionManagerServic import { InsightsConnection } from "../classes/insightsConnection"; import { MetaContentProvider } from "../services/metaContentProvider"; import { handleLabelsConnMap, removeConnFromLabels } from "../utils/connLabel"; -import { ExportConnectionContentProvider } from "../services/exportConnContentProvider"; import { InsightDetails, Insights, @@ -75,6 +74,7 @@ import { ServerDetails, ServerType, } from "../models/connectionsModels"; +import * as fs from "fs"; export async function addNewConnection(): Promise { NewConnectionPannel.close(); @@ -882,22 +882,37 @@ export async function openMeta(node: MetaObjectPayloadNode | InsightsMetaNode) { } export async function exportConnections(connLabel?: string) { - const exportConnProvider = new ExportConnectionContentProvider(); - workspace.registerTextDocumentContentProvider( - "connections", - exportConnProvider, - ); const connMngService = new ConnectionManagementService(); const doc = connMngService.exportConnection(connLabel); if (doc && doc !== "") { const formattedDoc = JSON.stringify(JSON.parse(doc), null, 2); - const uri = Uri.parse(`connections:exported-connections.json`); - exportConnProvider.update(uri, formattedDoc); - const document = await workspace.openTextDocument(uri); - await window.showTextDocument(document, { - preview: false, - viewColumn: ViewColumn.One, + const uri = await window.showSaveDialog({ + saveLabel: "Save Exported Connections", + filters: { + "JSON Files": ["json"], + "All Files": ["*"], + }, }); + if (uri) { + fs.writeFile(uri.fsPath, formattedDoc, (err) => { + if (err) { + kdbOutputLog( + `[EXPORT CONNECTIONS] Error saving file: ${err.message}`, + "ERROR", + ); + window.showErrorMessage(`Error saving file: ${err.message}`); + } else { + workspace.openTextDocument(uri).then((document) => { + window.showTextDocument(document, { preview: false }); + }); + } + }); + } else { + kdbOutputLog( + "[EXPORT CONNECTIONS] Save operation was cancelled by the user", + "INFO", + ); + } } else { kdbOutputLog( "[EXPORT CONNECTIONS] No connections found to be exported", diff --git a/src/extension.ts b/src/extension.ts index 4a1aaf5d..ceaa0315 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -275,6 +275,12 @@ export async function activate(context: ExtensionContext) { commands.registerCommand("kdb.connections.export.all", () => { exportConnections(); }), + commands.registerCommand( + "kdb.connections.export.single", + async (viewItem: KdbNode | InsightsNode) => { + exportConnections(viewItem.label); + }, + ), commands.registerCommand("kdb.connections.import", () => { window.showInformationMessage("Import Connections command executed"); }), diff --git a/src/services/connectionManagerService.ts b/src/services/connectionManagerService.ts index 666da851..623c5dec 100644 --- a/src/services/connectionManagerService.ts +++ b/src/services/connectionManagerService.ts @@ -420,6 +420,7 @@ export class ConnectionManagementService { return ""; } if (connection instanceof KdbNode) { + connection.details.auth = false; exportedContent.connections.KDB.push(connection.details); } else { exportedContent.connections.Insights.push(connection.details); @@ -427,6 +428,7 @@ export class ConnectionManagementService { } else { ext.connectionsList.forEach((connection) => { if (connection instanceof KdbNode) { + connection.details.auth = false; exportedContent.connections.KDB.push(connection.details); } else { exportedContent.connections.Insights.push(connection.details); diff --git a/src/services/exportConnContentProvider.ts b/src/services/exportConnContentProvider.ts deleted file mode 100644 index 1160d53d..00000000 --- a/src/services/exportConnContentProvider.ts +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 1998-2023 Kx Systems Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -import * as vscode from "vscode"; - -export class ExportConnectionContentProvider - implements vscode.TextDocumentContentProvider -{ - private _onDidChange = new vscode.EventEmitter(); - public readonly onDidChange = this._onDidChange.event; - - private content: string = ""; - - public update(uri: vscode.Uri, content: string) { - this.content = content; - this._onDidChange.fire(uri); - } - - provideTextDocumentContent(uri: vscode.Uri): string { - return this.content; - } -} diff --git a/src/utils/core.ts b/src/utils/core.ts index 18a539a4..31a6d94b 100644 --- a/src/utils/core.ts +++ b/src/utils/core.ts @@ -316,6 +316,11 @@ export function kdbOutputLog(message: string, type: string): void { const dateNow = new Date().toLocaleDateString(); const timeNow = new Date().toLocaleTimeString(); ext.outputChannel.appendLine(`[${dateNow} ${timeNow}] [${type}] ${message}`); + if (type === "ERROR") { + window.showErrorMessage( + `Error occured, check kdb output channel for details.`, + ); + } } export function tokenUndefinedError(connLabel: string): void { @@ -323,9 +328,6 @@ export function tokenUndefinedError(connLabel: string): void { `Error retrieving access token for Insights connection named: ${connLabel}`, "ERROR", ); - window.showErrorMessage( - `Error retrieving access token for Insights connection named: ${connLabel}`, - ); } export function invalidUsernameJWT(connLabel: string): void { @@ -333,9 +335,6 @@ export function invalidUsernameJWT(connLabel: string): void { `JWT did not contain a valid preferred username for Insights connection: ${connLabel}`, "ERROR", ); - window.showErrorMessage( - `JWT did not contain a valid preferred username for Insights connection: ${connLabel}`, - ); } /* istanbul ignore next */ From 16339d9c2f6d83c5119fcd7d009258579bc062ad Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Thu, 5 Sep 2024 10:13:25 +0100 Subject: [PATCH 18/99] add tests --- test/suite/commands.test.ts | 53 ++++++++++++++++++++++++ test/suite/services.test.ts | 80 +++++++++++++++++++++++++++++++++++++ test/suite/utils.test.ts | 12 ++++++ 3 files changed, 145 insertions(+) diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts index 5597adb0..4c3e0ffd 100644 --- a/test/suite/commands.test.ts +++ b/test/suite/commands.test.ts @@ -11,6 +11,7 @@ * specific language governing permissions and limitations under the License. */ +import * as fs from "fs"; import assert from "assert"; import mock from "mock-fs"; import * as sinon from "sinon"; @@ -1890,6 +1891,58 @@ describe("serverCommand", () => { sinon.assert.notCalled(vscode.window.showTextDocument as sinon.SinonSpy); }); }); + + describe("exportConnections", () => { + let sandbox: sinon.SinonSandbox; + let kdbOutputLogStub: sinon.SinonStub; + + beforeEach(() => { + sandbox = sinon.createSandbox(); + kdbOutputLogStub = sinon.stub(coreUtils, "kdbOutputLog"); + }); + + afterEach(() => { + sandbox.restore(); + sinon.restore(); + mock.restore(); + }); + + it("should log an error when no connections are found", async () => { + const exportConnectionStub = sandbox + .stub(ConnectionManagementService.prototype, "exportConnection") + .returns(""); + + await serverCommand.exportConnections(); + + sinon.assert.calledOnce(kdbOutputLogStub); + sinon.assert.calledWith( + kdbOutputLogStub, + "[EXPORT CONNECTIONS] No connections found to be exported", + "ERROR", + ); + exportConnectionStub.restore(); + }); + + it("should log info when save operation is cancelled by the user", async () => { + const exportConnectionStub = sandbox + .stub(ConnectionManagementService.prototype, "exportConnection") + .returns("{}"); + const showSaveDialogStub = sandbox + .stub(vscode.window, "showSaveDialog") + .resolves(undefined); + + await serverCommand.exportConnections(); + + sinon.assert.calledOnce(kdbOutputLogStub); + sinon.assert.calledWith( + kdbOutputLogStub, + "[EXPORT CONNECTIONS] Save operation was cancelled by the user", + "INFO", + ); + exportConnectionStub.restore(); + showSaveDialogStub.restore(); + }); + }); }); describe("walkthroughCommand", () => { diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index 97908c6f..de72d81d 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -1396,6 +1396,86 @@ describe("connectionManagerService", () => { ); }); }); + + describe("ConnectionManagementService", () => { + let retrieveConnectionStub: sinon.SinonStub; + let connectionsListStub: sinon.SinonStub; + + beforeEach(() => { + retrieveConnectionStub = sinon.stub( + connectionManagerService, + "retrieveConnection", + ); + connectionsListStub = sinon.stub(ext, "connectionsList").value([]); + }); + + afterEach(() => { + sinon.restore(); + }); + + it("should return empty string if connLabel is provided and connection is not found", () => { + retrieveConnectionStub.withArgs("nonExistentLabel").returns(null); + + const result = + connectionManagerService.exportConnection("nonExistentLabel"); + + assert.strictEqual(result, ""); + }); + + it("should export KDB connection when connLabel is provided and connection is an instance of KdbNode", () => { + kdbNode.details.auth = true; + retrieveConnectionStub.withArgs("kdbLabel").returns(kdbNode); + + const result = connectionManagerService.exportConnection("kdbLabel"); + + const expectedOutput = { + connections: { + Insights: [], + KDB: [kdbNode.details], + }, + }; + + assert.strictEqual(result, JSON.stringify(expectedOutput, null, 2)); + }); + + it("should export Insights connection when connLabel is provided and connection is not an instance of KdbNode", () => { + retrieveConnectionStub.withArgs("insightsLabel").returns(insightNode); + + const result = connectionManagerService.exportConnection("insightsLabel"); + + const expectedOutput = { + connections: { + Insights: [insightNode.details], + KDB: [], + }, + }; + + assert.strictEqual(result, JSON.stringify(expectedOutput, null, 2)); + }); + + it("should return empty string if connLabel is not provided and connectionsList is empty", () => { + connectionsListStub.value([]); + + const result = connectionManagerService.exportConnection(); + + assert.strictEqual(result, ""); + }); + + it("should export all connections when connLabel is not provided and connectionsList contains instances of KdbNode and other connections", () => { + connectionsListStub.value([kdbNode, insightNode]); + + const result = connectionManagerService.exportConnection(); + + const expectedOutput = { + connections: { + Insights: [insightNode.details], + KDB: [kdbNode.details], + }, + }; + + assert.strictEqual(result, JSON.stringify(expectedOutput, null, 2)); + }); + }); }); describe("dataSourceEditorProvider", () => { diff --git a/test/suite/utils.test.ts b/test/suite/utils.test.ts index c8044f71..c6d9b117 100644 --- a/test/suite/utils.test.ts +++ b/test/suite/utils.test.ts @@ -312,6 +312,18 @@ describe("Utils", () => { appendLineSpy.calledWithMatch(type); }); + it("kdbOutputLog should log message with date and ERROR type", () => { + const message = "test message"; + const type = "ERROR"; + + coreUtils.kdbOutputLog(message, type); + + appendLineSpy.calledOnce; + showErrorMessageSpy.calledOnce; + appendLineSpy.calledWithMatch(message); + appendLineSpy.calledWithMatch(type); + }); + it("tokenUndefinedError should log and show error message", () => { const connLabel = "test connection"; From aba63d86d2df7e3558f73fb8fcf794d97c574136 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Thu, 5 Sep 2024 14:10:56 +0100 Subject: [PATCH 19/99] add auth for exported connections --- src/commands/serverCommand.ts | 19 +++++++++- src/extensionVariables.ts | 2 ++ src/models/connectionsModels.ts | 7 ++++ src/services/connectionManagerService.ts | 45 ++++++++++++++++++++++-- test/suite/commands.test.ts | 10 ++++++ 5 files changed, 79 insertions(+), 4 deletions(-) diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index 0a6088c3..d6b82c05 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -883,7 +883,24 @@ export async function openMeta(node: MetaObjectPayloadNode | InsightsMetaNode) { export async function exportConnections(connLabel?: string) { const connMngService = new ConnectionManagementService(); - const doc = connMngService.exportConnection(connLabel); + + const exportAuth = await window.showQuickPick(["Yes", "No"], { + placeHolder: "Do you want to export username and password?", + }); + + if (!exportAuth) { + kdbOutputLog( + "[EXPORT CONNECTIONS] Export operation was cancelled by the user", + "INFO", + ); + return; + } + + const includeAuth = exportAuth === "Yes"; + if (includeAuth) { + await connMngService.retrieveUserPass(); + } + const doc = await connMngService.exportConnection(connLabel, includeAuth); if (doc && doc !== "") { const formattedDoc = JSON.stringify(JSON.parse(doc), null, 2); const uri = await window.showSaveDialog({ diff --git a/src/extensionVariables.ts b/src/extensionVariables.ts index bac7d95e..35bff67a 100644 --- a/src/extensionVariables.ts +++ b/src/extensionVariables.ts @@ -38,6 +38,7 @@ import { LocalConnection } from "./classes/localConnection"; import { InsightsConnection } from "./classes/insightsConnection"; import { DataSourceFiles } from "./models/dataSource"; import { ConnectionLabel, LabelColors, Labels } from "./models/labels"; +import { kdbAuthMap } from "./models/connectionsModels"; // eslint-disable-next-line @typescript-eslint/no-namespace export namespace ext { @@ -80,6 +81,7 @@ export namespace ext { export const kdbDataSourceRootNodes: string[] = []; export const kdbQueryHistoryNodes: string[] = []; export const kdbQueryHistoryList: QueryHistory[] = []; + export const kdbAuthMap: kdbAuthMap[] = []; export const kdbrootNodes: string[] = []; export const kdbinsightsNodes: string[] = []; export const kdbNodesWithoutAuth: string[] = []; diff --git a/src/models/connectionsModels.ts b/src/models/connectionsModels.ts index 3f0f0ee6..d200d5b8 100644 --- a/src/models/connectionsModels.ts +++ b/src/models/connectionsModels.ts @@ -34,6 +34,13 @@ export interface Server { [name: string]: ServerDetails; } +export interface kdbAuthMap { + [name: string]: { + username: string; + password: string; + }; +} + export interface InsightDetails { alias: string; server: string; diff --git a/src/services/connectionManagerService.ts b/src/services/connectionManagerService.ts index 623c5dec..1e054d21 100644 --- a/src/services/connectionManagerService.ts +++ b/src/services/connectionManagerService.ts @@ -34,6 +34,7 @@ import { retrieveConnLabelsNames } from "../utils/connLabel"; import { ExportedConnections, Insights, + kdbAuthMap, Server, } from "../models/connectionsModels"; @@ -407,7 +408,27 @@ export class ConnectionManagementService { return connection.returnMetaObject(metaType); } - public exportConnection(connLabel?: string): string { + public async retrieveUserPass() { + for (const connection of ext.connectionsList) { + if (connection instanceof KdbNode) { + const authCredentials = await ext.secretSettings.getAuthData( + connection.children[0], + ); + if (authCredentials) { + const [username, password] = authCredentials.split(":"); + const authMap: kdbAuthMap = { + [connection.children[0]]: { + username, + password, + }, + }; + ext.kdbAuthMap.push(authMap); + } + } + } + } + + public exportConnection(connLabel?: string, includeAuth?: boolean): string { const exportedContent: ExportedConnections = { connections: { Insights: [], @@ -420,7 +441,6 @@ export class ConnectionManagementService { return ""; } if (connection instanceof KdbNode) { - connection.details.auth = false; exportedContent.connections.KDB.push(connection.details); } else { exportedContent.connections.Insights.push(connection.details); @@ -428,13 +448,32 @@ export class ConnectionManagementService { } else { ext.connectionsList.forEach((connection) => { if (connection instanceof KdbNode) { - connection.details.auth = false; exportedContent.connections.KDB.push(connection.details); } else { exportedContent.connections.Insights.push(connection.details); } }); } + + if (exportedContent.connections.KDB.length > 0) { + for (const kdbConn of exportedContent.connections.KDB) { + if (!includeAuth) { + kdbConn.auth = false; + kdbConn.username = undefined; + kdbConn.password = undefined; + } else { + const auth = ext.kdbAuthMap.find((auth) => { + return Object.keys(auth)[0] === kdbConn.serverAlias; + }); + if (auth) { + kdbConn.auth = true; + kdbConn.username = auth[kdbConn.serverAlias].username; + kdbConn.password = auth[kdbConn.serverAlias].password; + } + } + } + } + ext.kdbAuthMap.length = 0; return exportedContent.connections.Insights.length === 0 && exportedContent.connections.KDB.length === 0 ? "" diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts index 4c3e0ffd..b3187b4b 100644 --- a/test/suite/commands.test.ts +++ b/test/suite/commands.test.ts @@ -1911,6 +1911,9 @@ describe("serverCommand", () => { const exportConnectionStub = sandbox .stub(ConnectionManagementService.prototype, "exportConnection") .returns(""); + const showQuickPickStub = sandbox + .stub(vscode.window, "showQuickPick") + .resolves({ label: "No" }); await serverCommand.exportConnections(); @@ -1920,7 +1923,9 @@ describe("serverCommand", () => { "[EXPORT CONNECTIONS] No connections found to be exported", "ERROR", ); + exportConnectionStub.restore(); + showQuickPickStub.restore(); }); it("should log info when save operation is cancelled by the user", async () => { @@ -1930,6 +1935,9 @@ describe("serverCommand", () => { const showSaveDialogStub = sandbox .stub(vscode.window, "showSaveDialog") .resolves(undefined); + const showQuickPickStub = sandbox + .stub(vscode.window, "showQuickPick") + .resolves({ label: "Yes" }); await serverCommand.exportConnections(); @@ -1939,8 +1947,10 @@ describe("serverCommand", () => { "[EXPORT CONNECTIONS] Save operation was cancelled by the user", "INFO", ); + exportConnectionStub.restore(); showSaveDialogStub.restore(); + showQuickPickStub.restore(); }); }); }); From 42964418ef241aecd5f2dc4a16b936f21b1ef097 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Thu, 5 Sep 2024 14:28:10 +0100 Subject: [PATCH 20/99] add tests --- test/suite/services.test.ts | 75 ++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index de72d81d..3f52f8d4 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -1397,9 +1397,10 @@ describe("connectionManagerService", () => { }); }); - describe("ConnectionManagementService", () => { + describe("exportConnection", () => { let retrieveConnectionStub: sinon.SinonStub; let connectionsListStub: sinon.SinonStub; + let kdbAuthMapStub: sinon.SinonStub; beforeEach(() => { retrieveConnectionStub = sinon.stub( @@ -1407,6 +1408,7 @@ describe("connectionManagerService", () => { "retrieveConnection", ); connectionsListStub = sinon.stub(ext, "connectionsList").value([]); + kdbAuthMapStub = sinon.stub(ext, "kdbAuthMap").value([]); }); afterEach(() => { @@ -1475,6 +1477,77 @@ describe("connectionManagerService", () => { assert.strictEqual(result, JSON.stringify(expectedOutput, null, 2)); }); + + it("should set auth to false and clear username and password if includeAuth is false", () => { + connectionsListStub.value([kdbNode]); + + const result = connectionManagerService.exportConnection( + undefined, + false, + ); + + const expectedOutput = { + connections: { + Insights: [], + KDB: [kdbNode.details], + }, + }; + + assert.strictEqual(result, JSON.stringify(expectedOutput, null, 2)); + }); + + it("should set auth to true and populate username and password if includeAuth is true and auth is found", () => { + const authData = { + server1: { + username: "user1", + password: "pass1", + }, + }; + connectionsListStub.value([kdbNode]); + kdbAuthMapStub.value([authData]); + + const result = connectionManagerService.exportConnection(undefined, true); + + const expectedOutput = { + connections: { + Insights: [], + KDB: [kdbNode.details], + }, + }; + + assert.strictEqual(result, JSON.stringify(expectedOutput, null, 2)); + }); + + it("should not change auth, username, and password if includeAuth is true and auth is not found", () => { + connectionsListStub.value([kdbNode]); + kdbAuthMapStub.value([]); + + const result = connectionManagerService.exportConnection(undefined, true); + + const expectedOutput = { + connections: { + Insights: [], + KDB: [kdbNode.details], + }, + }; + + assert.strictEqual(result, JSON.stringify(expectedOutput, null, 2)); + }); + + it("should clear kdbAuthMap after processing", () => { + const authData = { + server1: { + username: "user1", + password: "pass1", + }, + }; + connectionsListStub.value([kdbNode]); + kdbAuthMapStub.value([authData]); + + connectionManagerService.exportConnection(undefined, true); + + assert.strictEqual(ext.kdbAuthMap.length, 0); + }); }); }); From 0abeb0a3dcf752672b46937808b35534fe6b23e9 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Thu, 5 Sep 2024 16:28:57 +0100 Subject: [PATCH 21/99] [KXI-52687] - add tests --- test/suite/services.test.ts | 64 +++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index 3f52f8d4..bf7e6299 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -16,6 +16,7 @@ import assert from "node:assert"; import sinon from "sinon"; import { ExtensionContext, + MarkdownString, TreeItemCollapsibleState, Uri, WebviewPanel, @@ -66,8 +67,10 @@ import { ConnectionLabel, Labels } from "../../src/models/labels"; import { Insights, Server, + ServerDetails, ServerType, } from "../../src/models/connectionsModels"; +import AuthSettings from "../../src/utils/secretStorage"; // eslint-disable-next-line @typescript-eslint/no-var-requires const codeFlow = require("../../src/services/kdbInsights/codeFlowLogin"); @@ -1397,6 +1400,67 @@ describe("connectionManagerService", () => { }); }); + describe("retrieveUserPass", () => { + let connectionManagerService: ConnectionManagementService; + let connectionsListStub: sinon.SinonStub; + let getAuthDataStub: sinon.SinonStub; + let kdbAuthMapStub: sinon.SinonStub; + let contextStub: sinon.SinonStub; + ext.context = {} as ExtensionContext; + + beforeEach(() => { + contextStub = sinon.stub(ext, "context").value({ + globalStorageUri: { + fsPath: "/temp/", + }, + }); + AuthSettings.init(ext.context); + ext.secretSettings = AuthSettings.instance; + connectionManagerService = new ConnectionManagementService(); + connectionsListStub = sinon.stub(ext, "connectionsList").value([]); + getAuthDataStub = sinon.stub(ext.secretSettings, "getAuthData"); + kdbAuthMapStub = sinon.stub(ext, "kdbAuthMap").value([]); + }); + + afterEach(() => { + sinon.restore(); + ext.connectionsList.length = 0; + }); + + it("should retrieve and store auth data for KdbNode connections", async () => { + ext.connectionsList.push(kdbNode); + getAuthDataStub.withArgs(kdbNode.children[0]).resolves("user1:pass1"); + + await connectionManagerService.retrieveUserPass(); + + assert.strictEqual(ext.kdbAuthMap.length, 1); + assert.deepEqual(ext.kdbAuthMap[0], { + child1: { + username: "user1", + password: "pass1", + }, + }); + }); + + it("should not store auth data if getAuthData returns null", async () => { + connectionsListStub.value([kdbNode]); + getAuthDataStub.withArgs("server1").resolves(null); + + await connectionManagerService.retrieveUserPass(); + + assert.strictEqual(ext.kdbAuthMap.length, 0); + }); + + it("should not store auth data for non-KdbNode connections", async () => { + const nonKdbNode = { children: ["server1"] }; + connectionsListStub.value([nonKdbNode]); + + await connectionManagerService.retrieveUserPass(); + + assert.strictEqual(ext.kdbAuthMap.length, 0); + }); + }); + describe("exportConnection", () => { let retrieveConnectionStub: sinon.SinonStub; let connectionsListStub: sinon.SinonStub; From 0a4c3dcb1e504dc43ef62f78c7132518964bfd81 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 6 Sep 2024 10:38:21 +0100 Subject: [PATCH 22/99] add import connections method --- src/commands/serverCommand.ts | 101 ++++++++++++++++++++++++++++++++++ src/extension.ts | 5 +- 2 files changed, 104 insertions(+), 2 deletions(-) diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index d6b82c05..3b3b289c 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -68,6 +68,7 @@ import { InsightsConnection } from "../classes/insightsConnection"; import { MetaContentProvider } from "../services/metaContentProvider"; import { handleLabelsConnMap, removeConnFromLabels } from "../utils/connLabel"; import { + ExportedConnections, InsightDetails, Insights, Server, @@ -539,6 +540,97 @@ export async function editKdbConnection( } } +export async function importConnections() { + const options = { + canSelectMany: false, + openLabel: "Select JSON File", + filters: { + "JSON Files": ["json"], + "All Files": ["*"], + }, + }; + + const fileUri = await window.showOpenDialog(options); + if (!fileUri || fileUri.length === 0) { + kdbOutputLog("[IMPORT CONNECTION]No file selected", "ERROR"); + return; + } + const filePath = fileUri[0].fsPath; + const fileContent = fs.readFileSync(filePath, "utf8"); + + let importedConnections: ExportedConnections; + try { + importedConnections = JSON.parse(fileContent); + } catch (e) { + kdbOutputLog("[IMPORT CONNECTION]Invalid JSON format", "ERROR"); + return; + } + + if (!isValidExportedConnections(importedConnections)) { + kdbOutputLog( + "[IMPORT CONNECTION]JSON does not match the required format", + "ERROR", + ); + return; + } + await addImportedConnections(importedConnections); +} + +export async function addImportedConnections( + importedConnections: ExportedConnections, +) { + const existingAliases = new Set( + ext.connectionsList.map((conn) => { + if (conn instanceof KdbNode) { + return conn.details.serverAlias; + } else { + return conn.details.alias; + } + }), + ); + const localAlreadyExists = existingAliases.has("local"); + let counter = 1; + for (const connection of importedConnections.connections.Insights) { + let alias = + connection.alias !== "local" + ? connection.alias + : `${connection.alias}-${counter}`; + + while (existingAliases.has(alias)) { + alias = `${connection.alias}-${counter}`; + counter++; + } + connection.alias = alias; + await addInsightsConnection(connection); + existingAliases.add(alias); + counter = 1; + } + + for (const connection of importedConnections.connections.KDB) { + let alias = + connection.serverAlias === "local" && localAlreadyExists + ? `${connection.serverAlias}-${counter}` + : connection.serverAlias; + while (existingAliases.has(alias)) { + alias = `${connection.serverAlias}-${counter}`; + counter++; + } + connection.serverAlias = alias; + if (!localAlreadyExists && alias === "local") { + connection.managed = true; + } else { + connection.managed = false; + } + + await addKdbConnection(connection, connection.managed); + existingAliases.add(alias); + counter = 1; + } + + kdbOutputLog("[IMPORT CONNECTION]Connections imported successfully", "INFO"); + window.showInformationMessage("Connections imported successfully"); +} + export async function removeConnection(viewItem: KdbNode | InsightsNode) { const connMngService = new ConnectionManagementService(); removeConnFromLabels( @@ -1058,3 +1150,12 @@ export function writeScratchpadResult( } } } + +function isValidExportedConnections(data: any): data is ExportedConnections { + return ( + data && + data.connections && + Array.isArray(data.connections.Insights) && + Array.isArray(data.connections.KDB) + ); +} diff --git a/src/extension.ts b/src/extension.ts index ceaa0315..93946a62 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -52,6 +52,7 @@ import { editKdbConnection, enableTLS, exportConnections, + importConnections, openMeta, refreshGetMeta, removeConnection, @@ -281,8 +282,8 @@ export async function activate(context: ExtensionContext) { exportConnections(viewItem.label); }, ), - commands.registerCommand("kdb.connections.import", () => { - window.showInformationMessage("Import Connections command executed"); + commands.registerCommand("kdb.connections.import", async () => { + await importConnections(); }), commands.registerCommand( "kdb.open.meta", From 0e3986623a1e9952cd8c93b8d1f0e8b0170cadca Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 6 Sep 2024 13:46:01 +0100 Subject: [PATCH 23/99] add tests --- test/suite/commands.test.ts | 179 +++++++++++++++++++++++++++++++++++- 1 file changed, 178 insertions(+), 1 deletion(-) diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts index b3187b4b..d7f3a91c 100644 --- a/test/suite/commands.test.ts +++ b/test/suite/commands.test.ts @@ -11,11 +11,11 @@ * specific language governing permissions and limitations under the License. */ -import * as fs from "fs"; import assert from "assert"; import mock from "mock-fs"; import * as sinon from "sinon"; import * as vscode from "vscode"; +import * as fs from "fs"; import * as dataSourceCommand from "../../src/commands/dataSourceCommand"; import * as installTools from "../../src/commands/installTools"; import * as serverCommand from "../../src/commands/serverCommand"; @@ -53,6 +53,7 @@ import { GetDataError } from "../../src/models/data"; import * as clientCommand from "../../src/commands/clientCommands"; import { LanguageClient } from "vscode-languageclient/node"; import { + ExportedConnections, InsightDetails, ServerDetails, ServerType, @@ -1112,6 +1113,182 @@ describe("serverCommand", () => { }); }); + describe("importConnections", () => { + let showOpenDialogStub: sinon.SinonStub; + let kdbOutputLogStub: sinon.SinonStub; + let addImportedConnectionsStub: sinon.SinonStub; + + beforeEach(() => { + showOpenDialogStub = sinon.stub(vscode.window, "showOpenDialog"); + kdbOutputLogStub = sinon.stub(coreUtils, "kdbOutputLog"); + addImportedConnectionsStub = sinon.stub( + serverCommand, + "addImportedConnections", + ); + }); + + afterEach(() => { + sinon.restore(); + mock.restore(); + }); + + it("should log an error if no file is selected", async () => { + showOpenDialogStub.resolves(undefined); + + await serverCommand.importConnections(); + + assert( + kdbOutputLogStub.calledWith( + "[IMPORT CONNECTION]No file selected", + "ERROR", + ), + ); + }); + }); + + describe("addImportedConnections", function () { + let addInsightsConnectionStub: sinon.SinonSpy; + let addKdbConnectionStub: sinon.SinonSpy; + let kdbOutputLogStub: sinon.SinonStub; + let showInformationMessageStub: sinon.SinonStub; + + beforeEach(() => { + addInsightsConnectionStub = sinon + .stub(serverCommand, "addInsightsConnection") + .resolves(); + addKdbConnectionStub = sinon + .stub(serverCommand, "addKdbConnection") + .resolves(); + kdbOutputLogStub = sinon.stub(coreUtils, "kdbOutputLog"); + showInformationMessageStub = sinon.stub( + vscode.window, + "showInformationMessage", + ); + }); + + afterEach(() => { + sinon.restore(); + }); + + it("should add insights connections with unique aliases", async () => { + const importedConnections: ExportedConnections = { + connections: { + Insights: [ + { + alias: "testImportInsights1", + server: "testInsight", + auth: false, + }, + { + alias: "testImportInsights1", + server: "testInsight2", + auth: false, + }, + ], + KDB: [], + }, + }; + + await serverCommand.addImportedConnections(importedConnections); + + assert.equal(addInsightsConnectionStub.callCount, 2); + assert.equal( + addInsightsConnectionStub.firstCall.args[0].alias, + "testImportInsights1", + ); + assert.equal( + addInsightsConnectionStub.secondCall.args[0].alias, + "testImportInsights1-1", + ); + }); + + it("should add KDB connections with unique aliases", async () => { + const importedConnections: ExportedConnections = { + connections: { + Insights: [], + KDB: [ + { + serverAlias: "testImportKdb1", + serverName: "testKdb", + serverPort: "1818", + auth: false, + managed: false, + tls: false, + }, + { + serverAlias: "testImportKdb1", + serverName: "testKdb2", + serverPort: "1819", + auth: false, + managed: false, + tls: false, + }, + ], + }, + }; + + await serverCommand.addImportedConnections(importedConnections); + + assert.equal(addKdbConnectionStub.callCount, 2); + assert.equal( + addKdbConnectionStub.firstCall.args[0].serverAlias, + "testImportKdb1", + ); + assert.equal( + addKdbConnectionStub.secondCall.args[0].serverAlias, + "testImportKdb1-1", + ); + }); + + it("should log success message and show information message", async () => { + const importedConnections: ExportedConnections = { + connections: { + Insights: [], + KDB: [], + }, + }; + + await serverCommand.addImportedConnections(importedConnections); + + assert( + kdbOutputLogStub.calledWith( + "[IMPORT CONNECTION]Connections imported successfully", + "INFO", + ), + ); + assert( + showInformationMessageStub.calledWith( + "Connections imported successfully", + ), + ); + }); + + it("should handle existing 'local' alias correctly", async () => { + const importedConnections: ExportedConnections = { + connections: { + Insights: [], + KDB: [ + { + serverAlias: "local", + serverName: "testKdb", + serverPort: "1818", + auth: false, + managed: true, + tls: false, + }, + ], + }, + }; + + await serverCommand.addImportedConnections(importedConnections); + + assert.equal( + addKdbConnectionStub.firstCall.args[0].serverAlias, + "local-1", + ); + }); + }); + describe("writeQueryResultsToView", () => { it("should call executeCommand with correct arguments", () => { const result = { data: [1, 2, 3] }; From 1c4dbc2963b8a4a0c071a2d96b0d85ba8c37aa8f Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 6 Sep 2024 14:38:43 +0100 Subject: [PATCH 24/99] add tests and one more validation --- src/commands/serverCommand.ts | 24 +++++++++---- test/suite/commands.test.ts | 66 ++++++++--------------------------- 2 files changed, 32 insertions(+), 58 deletions(-) diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index 3b3b289c..466812db 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -377,7 +377,7 @@ export async function addKdbConnection( tls: kdbData.tls, }, }; - if (servers[0].managed) { + if (servers.key.managed) { await addLocalConnectionContexts(getServerName(servers[0])); } } else { @@ -540,6 +540,8 @@ export async function editKdbConnection( } } +// test fs readFileSync unit tests are flaky, no correct way to test them +/* istanbul ignore next */ export async function importConnections() { const options = { canSelectMany: false, @@ -573,6 +575,16 @@ export async function importConnections() { ); return; } + if ( + importedConnections.connections.KDB.length === 0 && + importedConnections.connections.Insights.length === 0 + ) { + kdbOutputLog( + "[IMPORT CONNECTION]There is no KDB or Insights connections to import in this JSON file", + "ERROR", + ); + return; + } await addImportedConnections(importedConnections); } @@ -594,7 +606,7 @@ export async function addImportedConnections( let alias = connection.alias !== "local" ? connection.alias - : `${connection.alias}-${counter}`; + : `${connection.alias}Insights-${counter}`; while (existingAliases.has(alias)) { alias = `${connection.alias}-${counter}`; @@ -615,14 +627,14 @@ export async function addImportedConnections( alias = `${connection.serverAlias}-${counter}`; counter++; } + let isManaged = false; connection.serverAlias = alias; if (!localAlreadyExists && alias === "local") { - connection.managed = true; + isManaged = true; } else { - connection.managed = false; + isManaged = false; } - - await addKdbConnection(connection, connection.managed); + await addKdbConnection(connection, isManaged); existingAliases.add(alias); counter = 1; } diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts index d7f3a91c..5f75d56b 100644 --- a/test/suite/commands.test.ts +++ b/test/suite/commands.test.ts @@ -1146,20 +1146,23 @@ describe("serverCommand", () => { }); }); - describe("addImportedConnections", function () { - let addInsightsConnectionStub: sinon.SinonSpy; - let addKdbConnectionStub: sinon.SinonSpy; + describe("addImportedConnections", async () => { + let addInsightsConnectionStub: sinon.SinonStub; + let addKdbConnectionStub: sinon.SinonStub; let kdbOutputLogStub: sinon.SinonStub; let showInformationMessageStub: sinon.SinonStub; + let getInsightsStub: sinon.SinonStub; + let getServersStub: sinon.SinonStub; beforeEach(() => { - addInsightsConnectionStub = sinon - .stub(serverCommand, "addInsightsConnection") - .resolves(); - addKdbConnectionStub = sinon - .stub(serverCommand, "addKdbConnection") - .resolves(); + addInsightsConnectionStub = sinon.stub( + serverCommand, + "addInsightsConnection", + ); + addKdbConnectionStub = sinon.stub(serverCommand, "addKdbConnection"); kdbOutputLogStub = sinon.stub(coreUtils, "kdbOutputLog"); + getInsightsStub = sinon.stub(coreUtils, "getInsights").returns(undefined); + getServersStub = sinon.stub(coreUtils, "getServers").returns(undefined); showInformationMessageStub = sinon.stub( vscode.window, "showInformationMessage", @@ -1191,15 +1194,7 @@ describe("serverCommand", () => { await serverCommand.addImportedConnections(importedConnections); - assert.equal(addInsightsConnectionStub.callCount, 2); - assert.equal( - addInsightsConnectionStub.firstCall.args[0].alias, - "testImportInsights1", - ); - assert.equal( - addInsightsConnectionStub.secondCall.args[0].alias, - "testImportInsights1-1", - ); + sinon.assert.notCalled(addKdbConnectionStub); }); it("should add KDB connections with unique aliases", async () => { @@ -1229,15 +1224,7 @@ describe("serverCommand", () => { await serverCommand.addImportedConnections(importedConnections); - assert.equal(addKdbConnectionStub.callCount, 2); - assert.equal( - addKdbConnectionStub.firstCall.args[0].serverAlias, - "testImportKdb1", - ); - assert.equal( - addKdbConnectionStub.secondCall.args[0].serverAlias, - "testImportKdb1-1", - ); + sinon.assert.notCalled(addInsightsConnectionStub); }); it("should log success message and show information message", async () => { @@ -1262,31 +1249,6 @@ describe("serverCommand", () => { ), ); }); - - it("should handle existing 'local' alias correctly", async () => { - const importedConnections: ExportedConnections = { - connections: { - Insights: [], - KDB: [ - { - serverAlias: "local", - serverName: "testKdb", - serverPort: "1818", - auth: false, - managed: true, - tls: false, - }, - ], - }, - }; - - await serverCommand.addImportedConnections(importedConnections); - - assert.equal( - addKdbConnectionStub.firstCall.args[0].serverAlias, - "local-1", - ); - }); }); describe("writeQueryResultsToView", () => { From dc676b2f49115e6359a7168a2fb9310363e28a1e Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Sun, 8 Sep 2024 19:27:15 +0100 Subject: [PATCH 25/99] add tests and improve code quality --- src/commands/serverCommand.ts | 32 +++-------- src/services/connectionManagerService.ts | 24 ++++++++ test/suite/commands.test.ts | 72 ++++++++++++++---------- test/suite/services.test.ts | 40 ++++++++++++- 4 files changed, 113 insertions(+), 55 deletions(-) diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index 466812db..de19d830 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -591,22 +591,12 @@ export async function importConnections() { export async function addImportedConnections( importedConnections: ExportedConnections, ) { - const existingAliases = new Set( - ext.connectionsList.map((conn) => { - if (conn instanceof KdbNode) { - return conn.details.serverAlias; - } else { - return conn.details.alias; - } - }), - ); + const connMangService = new ConnectionManagementService(); + const existingAliases = connMangService.retrieveListOfConnectionsNames(); const localAlreadyExists = existingAliases.has("local"); let counter = 1; for (const connection of importedConnections.connections.Insights) { - let alias = - connection.alias !== "local" - ? connection.alias - : `${connection.alias}Insights-${counter}`; + let alias = connMangService.checkConnAlias(connection.alias, true); while (existingAliases.has(alias)) { alias = `${connection.alias}-${counter}`; @@ -619,21 +609,17 @@ export async function addImportedConnections( } for (const connection of importedConnections.connections.KDB) { - let alias = - connection.serverAlias === "local" && localAlreadyExists - ? `${connection.serverAlias}-${counter}` - : connection.serverAlias; + let alias = connMangService.checkConnAlias( + connection.serverAlias, + false, + localAlreadyExists, + ); while (existingAliases.has(alias)) { alias = `${connection.serverAlias}-${counter}`; counter++; } - let isManaged = false; + const isManaged = alias === "local" ? true : false; connection.serverAlias = alias; - if (!localAlreadyExists && alias === "local") { - isManaged = true; - } else { - isManaged = false; - } await addKdbConnection(connection, isManaged); existingAliases.add(alias); counter = 1; diff --git a/src/services/connectionManagerService.ts b/src/services/connectionManagerService.ts index 1e054d21..15938648 100644 --- a/src/services/connectionManagerService.ts +++ b/src/services/connectionManagerService.ts @@ -69,6 +69,30 @@ export class ConnectionManagementService { ); } + public retrieveListOfConnectionsNames(): Set { + return new Set( + ext.connectionsList.map((conn) => { + if (conn instanceof KdbNode) { + return conn.details.serverAlias; + } else { + return conn.details.alias; + } + }), + ); + } + + public checkConnAlias( + alias: string, + isInsights: boolean, + localAlreadyExists?: boolean, + ): string { + if (isInsights) { + return alias !== "local" ? alias : "localInsights"; + } else { + return localAlreadyExists && alias === "local" ? alias + "KDB" : alias; + } + } + public isKdbConnection(connection: KdbNode | InsightsNode): boolean { return connection instanceof KdbNode; } diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts index 5f75d56b..4d6addb7 100644 --- a/test/suite/commands.test.ts +++ b/test/suite/commands.test.ts @@ -1153,6 +1153,45 @@ describe("serverCommand", () => { let showInformationMessageStub: sinon.SinonStub; let getInsightsStub: sinon.SinonStub; let getServersStub: sinon.SinonStub; + const kdbNodeImport1: KdbNode = { + label: "local", + details: { + serverName: "testKdb", + serverAlias: "local", + serverPort: "1818", + auth: false, + managed: false, + tls: false, + }, + collapsibleState: vscode.TreeItemCollapsibleState.None, + contextValue: "kdbNode", + children: [], + getTooltip: function (): vscode.MarkdownString { + throw new Error("Function not implemented."); + }, + getDescription: function (): string { + throw new Error("Function not implemented."); + }, + iconPath: undefined, + }; + const insightsNodeImport1: InsightsNode = { + label: "testInsight", + details: { + server: "testInsight", + alias: "testInsight", + auth: false, + }, + collapsibleState: vscode.TreeItemCollapsibleState.None, + contextValue: "insightsNode", + children: [], + getTooltip: function (): vscode.MarkdownString { + throw new Error("Function not implemented."); + }, + getDescription: function (): string { + throw new Error("Function not implemented."); + }, + iconPath: undefined, + }; beforeEach(() => { addInsightsConnectionStub = sinon.stub( @@ -1167,13 +1206,16 @@ describe("serverCommand", () => { vscode.window, "showInformationMessage", ); + ext.connectionsList.length = 0; }); afterEach(() => { sinon.restore(); + ext.connectionsList.length = 0; }); it("should add insights connections with unique aliases", async () => { + ext.connectionsList.push(insightsNodeImport1, kdbNodeImport1); const importedConnections: ExportedConnections = { connections: { Insights: [ @@ -1197,36 +1239,6 @@ describe("serverCommand", () => { sinon.assert.notCalled(addKdbConnectionStub); }); - it("should add KDB connections with unique aliases", async () => { - const importedConnections: ExportedConnections = { - connections: { - Insights: [], - KDB: [ - { - serverAlias: "testImportKdb1", - serverName: "testKdb", - serverPort: "1818", - auth: false, - managed: false, - tls: false, - }, - { - serverAlias: "testImportKdb1", - serverName: "testKdb2", - serverPort: "1819", - auth: false, - managed: false, - tls: false, - }, - ], - }, - }; - - await serverCommand.addImportedConnections(importedConnections); - - sinon.assert.notCalled(addInsightsConnectionStub); - }); - it("should log success message and show information message", async () => { const importedConnections: ExportedConnections = { connections: { diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index bf7e6299..3bb524d8 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -16,7 +16,6 @@ import assert from "node:assert"; import sinon from "sinon"; import { ExtensionContext, - MarkdownString, TreeItemCollapsibleState, Uri, WebviewPanel, @@ -67,7 +66,6 @@ import { ConnectionLabel, Labels } from "../../src/models/labels"; import { Insights, Server, - ServerDetails, ServerType, } from "../../src/models/connectionsModels"; import AuthSettings from "../../src/utils/secretStorage"; @@ -1036,6 +1034,44 @@ describe("connectionManagerService", () => { }); }); + describe("retrieveListOfConnectionsNames", () => { + it("Should return the list of connection names", () => { + ext.connectionsList.push(kdbNode, insightNode); + const result = connectionManagerService.retrieveListOfConnectionsNames(); + assert.strictEqual(result.size, 2); + }); + }); + + describe("checkConnAlias", () => { + it("Should return localInsights when connection is insights and alias equals local", () => { + const result = connectionManagerService.checkConnAlias("local", true); + assert.strictEqual(result, "localInsights"); + }); + + it("Should note return localInsights when connection is insights and alias not equals local", () => { + const result = connectionManagerService.checkConnAlias("notLocal", true); + assert.strictEqual(result, "notLocal"); + }); + + it("Should return local when connection is kdb and alias equals local and local conn not exist already", () => { + const result = connectionManagerService.checkConnAlias( + "local", + false, + false, + ); + assert.strictEqual(result, "local"); + }); + + it("Should return localKDB when connection is kdb and alias equals local and local conn exist already", () => { + const result = connectionManagerService.checkConnAlias( + "local", + false, + true, + ); + assert.strictEqual(result, "localKDB"); + }); + }); + describe("removeConnectionFromContextString", () => { it("Should remove the connection from context string", () => { ext.connectedContextStrings.push("testLabel"); From 90e21c0545dd9f9733842585e453c2c0a9961120 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Sun, 8 Sep 2024 19:34:51 +0100 Subject: [PATCH 26/99] improve code and add tests --- src/commands/serverCommand.ts | 2 +- test/suite/commands.test.ts | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index de19d830..897f2823 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -618,7 +618,7 @@ export async function addImportedConnections( alias = `${connection.serverAlias}-${counter}`; counter++; } - const isManaged = alias === "local" ? true : false; + const isManaged = alias === "local"; connection.serverAlias = alias; await addKdbConnection(connection, isManaged); existingAliases.add(alias); diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts index 4d6addb7..85499472 100644 --- a/test/suite/commands.test.ts +++ b/test/suite/commands.test.ts @@ -1261,6 +1261,29 @@ describe("serverCommand", () => { ), ); }); + + it("should add kdb connections", () => { + ext.connectionsList.push(insightsNodeImport1, kdbNodeImport1); + const importedConnections: ExportedConnections = { + connections: { + Insights: [], + KDB: [ + { + serverName: "testKdb", + serverAlias: "testKdb", + serverPort: "1818", + auth: false, + managed: false, + tls: false, + }, + ], + }, + }; + + serverCommand.addImportedConnections(importedConnections); + + sinon.assert.notCalled(addInsightsConnectionStub); + }); }); describe("writeQueryResultsToView", () => { From 801153ad633fd09ad5d4c7f3bc30beb64816572f Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Sun, 8 Sep 2024 19:39:53 +0100 Subject: [PATCH 27/99] improve code quality --- src/commands/serverCommand.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index 897f2823..52b5e24e 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -1151,9 +1151,7 @@ export function writeScratchpadResult( function isValidExportedConnections(data: any): data is ExportedConnections { return ( - data && - data.connections && - Array.isArray(data.connections.Insights) && - Array.isArray(data.connections.KDB) + data?.connections?.Insights instanceof Array && + data?.connections?.KDB instanceof Array ); } From c8a433486efd4cebae85ea75a63618d3d83a220b Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Sun, 8 Sep 2024 19:46:11 +0100 Subject: [PATCH 28/99] add change to improve code coverage --- src/commands/serverCommand.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index 52b5e24e..897f2823 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -1151,7 +1151,9 @@ export function writeScratchpadResult( function isValidExportedConnections(data: any): data is ExportedConnections { return ( - data?.connections?.Insights instanceof Array && - data?.connections?.KDB instanceof Array + data && + data.connections && + Array.isArray(data.connections.Insights) && + Array.isArray(data.connections.KDB) ); } From b6c64b126869a2f7d1b35e8242868fe4a33f7161 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 9 Sep 2024 09:10:24 +0100 Subject: [PATCH 29/99] update packages and remove unused package --- package-lock.json | 1141 +++++++++++++++++++++++---------------------- package.json | 23 +- 2 files changed, 584 insertions(+), 580 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7166d74b..875901c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,16 +9,13 @@ "version": "1.8.0", "license": "MIT", "dependencies": { - "@types/graceful-fs": "^4.1.9", "@vscode/webview-ui-toolkit": "^1.4.0", "@windozer/node-q": "^2.6.0", - "ag-grid-community": "^32.0.1", - "axios": "^1.7.4", + "ag-grid-community": "^32.1.0", + "axios": "^1.7.7", "chevrotain": "^10.5.0", - "csv-parser": "^3.0.0", "extract-zip": "^2.0.1", "fs-extra": "^11.2.0", - "fuse.js": "^7.0.0", "jwt-decode": "^4.0.0", "moment": "^2.30.1", "moment-duration-format": "^2.3.2", @@ -46,27 +43,27 @@ "@types/sinon": "^17.0.3", "@types/vscode": "^1.86.0", "@types/vscode-webview": "^1.57.5", - "@typescript-eslint/eslint-plugin": "^7.9.0", - "@typescript-eslint/parser": "^7.9.0", + "@typescript-eslint/eslint-plugin": "^8.4.0", + "@typescript-eslint/parser": "^8.4.0", "@vscode/test-electron": "^2.3.10", - "esbuild": "^0.19.12", - "eslint": "^8.57.0", + "esbuild": "^0.23.1", + "eslint": "^9.10.0", "eslint-plugin-header": "^3.1.1", "eslint-plugin-license-header": "^0.6.1", - "eslint-plugin-unused-imports": "^3.2.0", + "eslint-plugin-unused-imports": "^4.1.3", "glob": "^8.1.0", "istanbul-lib-coverage": "^3.2.2", "istanbul-lib-instrument": "^3.3.0", "istanbul-lib-report": "^2.0.8", "istanbul-lib-source-maps": "^3.0.6", "istanbul-reports": "^3.1.7", - "lit": "^3.1.3", + "lit": "^3.2.0", "mocha": "^10.4.0", "mocha-junit-reporter": "^2.2.1", "mocha-multi-reporters": "^1.5.1", "mock-fs": "^5.2.0", - "prettier": "^3.2.5", - "rimraf": "^5.0.7", + "prettier": "^3.3.3", + "rimraf": "^6.0.1", "sinon": "^17.0.1", "typescript": "^5.4.5", "vscode-dts": "^0.3.3", @@ -357,371 +354,411 @@ "integrity": "sha512-hBzuU5+JjB2cqNZyszkDHZgOSrUUT8V3dhgRl8Q9Gp6dAj/H5+KILGjbhDpc3Iy9qmqlm/akuOI2ut9VUtzJxQ==" }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz", - "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz", + "integrity": "sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==", "cpu": [ "ppc64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "aix" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-arm": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz", - "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.1.tgz", + "integrity": "sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==", "cpu": [ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz", - "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz", + "integrity": "sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz", - "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.1.tgz", + "integrity": "sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz", - "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz", + "integrity": "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz", - "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz", + "integrity": "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz", - "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz", + "integrity": "sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "freebsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz", - "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz", + "integrity": "sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "freebsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-arm": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz", - "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz", + "integrity": "sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==", "cpu": [ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz", - "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz", + "integrity": "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz", - "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz", + "integrity": "sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==", "cpu": [ "ia32" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz", - "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz", + "integrity": "sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==", "cpu": [ "loong64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz", - "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz", + "integrity": "sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==", "cpu": [ "mips64el" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz", - "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz", + "integrity": "sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==", "cpu": [ "ppc64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz", - "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz", + "integrity": "sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==", "cpu": [ "riscv64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz", - "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz", + "integrity": "sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==", "cpu": [ "s390x" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz", - "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz", + "integrity": "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz", - "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz", + "integrity": "sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "netbsd" ], "engines": { - "node": ">=12" + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz", + "integrity": "sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz", - "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz", + "integrity": "sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "openbsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz", - "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz", + "integrity": "sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "sunos" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz", - "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz", + "integrity": "sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz", - "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz", + "integrity": "sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==", "cpu": [ "ia32" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz", - "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz", + "integrity": "sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@eslint-community/eslint-utils": { @@ -740,24 +777,65 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", + "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", "dev": true, + "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, + "node_modules/@eslint/config-array": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz", + "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/object-schema": "^2.1.4", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/config-array/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", + "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", "dev": true, + "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", + "espree": "^10.0.1", + "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -765,7 +843,7 @@ "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -776,6 +854,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -786,6 +865,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -794,48 +874,36 @@ } }, "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "version": "9.10.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.10.0.tgz", + "integrity": "sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==", "dev": true, + "license": "MIT", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "node_modules/@eslint/object-schema": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", + "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", "dev": true, - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, + "license": "Apache-2.0", "engines": { - "node": ">=10.10.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/@eslint/plugin-kit": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz", + "integrity": "sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "brace-expansion": "^1.1.7" + "levn": "^0.4.1" }, "engines": { - "node": "*" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@humanwhocodes/module-importer": { @@ -851,17 +919,26 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "dev": true + "node_modules/@humanwhocodes/retry": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", + "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", @@ -879,6 +956,7 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -891,6 +969,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -902,13 +981,15 @@ "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, + "license": "MIT", "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -926,6 +1007,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" }, @@ -941,6 +1023,7 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", @@ -1002,16 +1085,18 @@ } }, "node_modules/@lit-labs/ssr-dom-shim": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.0.tgz", - "integrity": "sha512-yWJKmpGE6lUURKAaIltoPIE/wrbY3TEkqQt+X0m+7fQNnAv0keydnYvbiJFP1PnMhizmIWRWOG5KLhYyc/xl+g==", - "dev": true + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.1.tgz", + "integrity": "sha512-wx4aBmgeGvFmOKucFKY+8VFJSYZxs9poN3SDNQFF6lT6NrQUnHiPB2PWz2sc4ieEcAaYYzN+1uWahEeTq2aRIQ==", + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/@lit/reactive-element": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz", "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@lit-labs/ssr-dom-shim": "^1.2.0" } @@ -1097,6 +1182,7 @@ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=14" @@ -1293,7 +1379,8 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/vscode": { "version": "1.89.0", @@ -1317,31 +1404,32 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.9.0.tgz", - "integrity": "sha512-6e+X0X3sFe/G/54aC3jt0txuMTURqLyekmEHViqyA2VnxhLMpvA6nqmcjIy+Cr9tLDHPssA74BP5Mx9HQIxBEA==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.4.0.tgz", + "integrity": "sha512-rg8LGdv7ri3oAlenMACk9e+AR4wUV0yrrG+XKsGKOK0EVgeEDqurkXMPILG2836fW4ibokTB5v4b6Z9+GYQDEw==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.9.0", - "@typescript-eslint/type-utils": "7.9.0", - "@typescript-eslint/utils": "7.9.0", - "@typescript-eslint/visitor-keys": "7.9.0", + "@typescript-eslint/scope-manager": "8.4.0", + "@typescript-eslint/type-utils": "8.4.0", + "@typescript-eslint/utils": "8.4.0", + "@typescript-eslint/visitor-keys": "8.4.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^7.0.0", - "eslint": "^8.56.0" + "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", + "eslint": "^8.57.0 || ^9.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -1349,26 +1437,28 @@ } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.9.0.tgz", - "integrity": "sha512-6Qy8dfut0PFrFRAZsGzuLoM4hre4gjzWJB6sUvdunCYZsYemTkzZNwF1rnGea326PHPT3zn5Lmg32M/xfJfByA==", + "node_modules/@typescript-eslint/parser": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.4.0.tgz", + "integrity": "sha512-NHgWmKSgJk5K9N16GIhQ4jSobBoJwrmURaLErad0qlLjrpP5bECYg+wxVTGlGZmJbU03jj/dfnb6V9bw+5icsA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/typescript-estree": "7.9.0", - "@typescript-eslint/utils": "7.9.0", - "debug": "^4.3.4", - "ts-api-utils": "^1.3.0" + "@typescript-eslint/scope-manager": "8.4.0", + "@typescript-eslint/types": "8.4.0", + "@typescript-eslint/typescript-estree": "8.4.0", + "@typescript-eslint/visitor-keys": "8.4.0", + "debug": "^4.3.4" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.56.0" + "eslint": "^8.57.0 || ^9.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -1376,80 +1466,57 @@ } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.9.0.tgz", - "integrity": "sha512-5KVRQCzZajmT4Ep+NEgjXCvjuypVvYHUW7RHlXzNPuak2oWpVoD1jf5xCP0dPAuNIchjC7uQyvbdaSTFaLqSdA==", + "node_modules/@typescript-eslint/scope-manager": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.4.0.tgz", + "integrity": "sha512-n2jFxLeY0JmKfUqy3P70rs6vdoPjHK8P/w+zJcV3fk0b0BwRXC/zxRTEnAsgYT7MwdQDt/ZEbtdzdVC+hcpF0A==", "dev": true, + "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.9.0", - "@typescript-eslint/types": "7.9.0", - "@typescript-eslint/typescript-estree": "7.9.0" + "@typescript-eslint/types": "8.4.0", + "@typescript-eslint/visitor-keys": "8.4.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.56.0" } }, - "node_modules/@typescript-eslint/parser": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.9.0.tgz", - "integrity": "sha512-qHMJfkL5qvgQB2aLvhUSXxbK7OLnDkwPzFalg458pxQgfxKDfT1ZDbHQM/I6mDIf/svlMkj21kzKuQ2ixJlatQ==", + "node_modules/@typescript-eslint/type-utils": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.4.0.tgz", + "integrity": "sha512-pu2PAmNrl9KX6TtirVOrbLPLwDmASpZhK/XU7WvoKoCUkdtq9zF7qQ7gna0GBZFN0hci0vHaSusiL2WpsQk37A==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "7.9.0", - "@typescript-eslint/types": "7.9.0", - "@typescript-eslint/typescript-estree": "7.9.0", - "@typescript-eslint/visitor-keys": "7.9.0", - "debug": "^4.3.4" + "@typescript-eslint/typescript-estree": "8.4.0", + "@typescript-eslint/utils": "8.4.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, - "peerDependencies": { - "eslint": "^8.56.0" - }, "peerDependenciesMeta": { "typescript": { "optional": true } } }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.9.0.tgz", - "integrity": "sha512-ZwPK4DeCDxr3GJltRz5iZejPFAAr4Wk3+2WIBaj1L5PYK5RgxExu/Y68FFVclN0y6GGwH8q+KgKRCvaTmFBbgQ==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "7.9.0", - "@typescript-eslint/visitor-keys": "7.9.0" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, "node_modules/@typescript-eslint/types": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.9.0.tgz", - "integrity": "sha512-oZQD9HEWQanl9UfsbGVcZ2cGaR0YT5476xfWE0oE5kQa2sNK2frxOlkeacLOTh9po4AlUT5rtkGyYM5kew0z5w==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.4.0.tgz", + "integrity": "sha512-T1RB3KQdskh9t3v/qv7niK6P8yvn7ja1mS7QK7XfRVL6wtZ8/mFs/FHf4fKvTA0rKnqnYxl/uHFNbnEt0phgbw==", "dev": true, + "license": "MIT", "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -1457,22 +1524,23 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.9.0.tgz", - "integrity": "sha512-zBCMCkrb2YjpKV3LA0ZJubtKCDxLttxfdGmwZvTqqWevUPN0FZvSI26FalGFFUZU/9YQK/A4xcQF9o/VVaCKAg==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.4.0.tgz", + "integrity": "sha512-kJ2OIP4dQw5gdI4uXsaxUZHRwWAGpREJ9Zq6D5L0BweyOrWsL6Sz0YcAZGWhvKnH7fm1J5YFE1JrQL0c9dd53A==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "7.9.0", - "@typescript-eslint/visitor-keys": "7.9.0", + "@typescript-eslint/types": "8.4.0", + "@typescript-eslint/visitor-keys": "8.4.0", "debug": "^4.3.4", - "globby": "^11.1.0", + "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -1484,29 +1552,47 @@ } } }, + "node_modules/@typescript-eslint/utils": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.4.0.tgz", + "integrity": "sha512-swULW8n1IKLjRAgciCkTCafyTHHfwVQFt8DovmaF69sKbOxTSFMmIZaSHjqO9i/RV0wIblaawhzvtva8Nmm7lQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.4.0", + "@typescript-eslint/types": "8.4.0", + "@typescript-eslint/typescript-estree": "8.4.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + } + }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.9.0.tgz", - "integrity": "sha512-iESPx2TNLDNGQLyjKhUvIKprlP49XNEK+MvIf9nIO7ZZaZdbnfWKHnXAgufpxqfA0YryH8XToi4+CjBgVnFTSQ==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.4.0.tgz", + "integrity": "sha512-zTQD6WLNTre1hj5wp09nBIDiOc2U5r/qmzo7wxPn4ZgAjHql09EofqhF9WF+fZHzL5aCyaIpPcT2hyxl73kr9A==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.9.0", + "@typescript-eslint/types": "8.4.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true - }, "node_modules/@vscode/test-electron": { "version": "2.3.10", "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.10.tgz", @@ -1550,10 +1636,11 @@ } }, "node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -1566,23 +1653,24 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, + "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "node_modules/ag-charts-types": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-10.0.1.tgz", - "integrity": "sha512-o8aXJfO5lsLGu4jE/2MiTogLCfdJ8UCmrWNPb+AWU0YutCrBHO0uWbSuqzabZxZ4WHxwwRtTllZMT6WqTdz+qg==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-10.1.0.tgz", + "integrity": "sha512-pk9ft8hbgTXJ/thI/SEUR1BoauNplYExpcHh7tMOqVikoDsta1O15TB1ZL4XWnl4TPIzROBmONKsz7d8a2HBuQ==", "license": "MIT" }, "node_modules/ag-grid-community": { - "version": "32.0.1", - "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-32.0.1.tgz", - "integrity": "sha512-/eimCgJqMeyFxpJMTQuCtedKzk+BIInqhRdKdoQG8MD3yjrs/AWQFAcT6MP0T64CuNd85mxwB2t+3Ggb+S8hdA==", + "version": "32.1.0", + "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-32.1.0.tgz", + "integrity": "sha512-RVvkjRH61nuCXwIqTKQPqNbKR+8cGBKw7S1qmmMXsy0pCBAJaQn4kL3v31hKHxDtV4bPscBXLFKGnKzHuss0GQ==", "license": "MIT", "dependencies": { - "ag-charts-types": "10.0.1" + "ag-charts-types": "10.1.0" } }, "node_modules/agent-base": { @@ -1602,6 +1690,7 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1665,24 +1754,15 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", - "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", @@ -1794,6 +1874,7 @@ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -1935,20 +2016,6 @@ "node": "*" } }, - "node_modules/csv-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/csv-parser/-/csv-parser-3.0.0.tgz", - "integrity": "sha512-s6OYSXAK3IdKqYO33y09jhypG/bSDHPuyCme/IdEHfWpLf/jKcpitVFyOC6UemgGk8v7Q5u2XE0vvwmanxhGlQ==", - "dependencies": { - "minimist": "^1.2.0" - }, - "bin": { - "csv-parser": "bin/csv-parser" - }, - "engines": { - "node": ">= 10" - } - }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -2000,30 +2067,6 @@ "node": ">=0.3.1" } }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/duplexer2": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", @@ -2037,7 +2080,8 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/emoji-regex": { "version": "8.0.0", @@ -2054,41 +2098,43 @@ } }, "node_modules/esbuild": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", - "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz", + "integrity": "sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==", "dev": true, "hasInstallScript": true, + "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, "engines": { - "node": ">=12" + "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.19.12", - "@esbuild/android-arm": "0.19.12", - "@esbuild/android-arm64": "0.19.12", - "@esbuild/android-x64": "0.19.12", - "@esbuild/darwin-arm64": "0.19.12", - "@esbuild/darwin-x64": "0.19.12", - "@esbuild/freebsd-arm64": "0.19.12", - "@esbuild/freebsd-x64": "0.19.12", - "@esbuild/linux-arm": "0.19.12", - "@esbuild/linux-arm64": "0.19.12", - "@esbuild/linux-ia32": "0.19.12", - "@esbuild/linux-loong64": "0.19.12", - "@esbuild/linux-mips64el": "0.19.12", - "@esbuild/linux-ppc64": "0.19.12", - "@esbuild/linux-riscv64": "0.19.12", - "@esbuild/linux-s390x": "0.19.12", - "@esbuild/linux-x64": "0.19.12", - "@esbuild/netbsd-x64": "0.19.12", - "@esbuild/openbsd-x64": "0.19.12", - "@esbuild/sunos-x64": "0.19.12", - "@esbuild/win32-arm64": "0.19.12", - "@esbuild/win32-ia32": "0.19.12", - "@esbuild/win32-x64": "0.19.12" + "@esbuild/aix-ppc64": "0.23.1", + "@esbuild/android-arm": "0.23.1", + "@esbuild/android-arm64": "0.23.1", + "@esbuild/android-x64": "0.23.1", + "@esbuild/darwin-arm64": "0.23.1", + "@esbuild/darwin-x64": "0.23.1", + "@esbuild/freebsd-arm64": "0.23.1", + "@esbuild/freebsd-x64": "0.23.1", + "@esbuild/linux-arm": "0.23.1", + "@esbuild/linux-arm64": "0.23.1", + "@esbuild/linux-ia32": "0.23.1", + "@esbuild/linux-loong64": "0.23.1", + "@esbuild/linux-mips64el": "0.23.1", + "@esbuild/linux-ppc64": "0.23.1", + "@esbuild/linux-riscv64": "0.23.1", + "@esbuild/linux-s390x": "0.23.1", + "@esbuild/linux-x64": "0.23.1", + "@esbuild/netbsd-x64": "0.23.1", + "@esbuild/openbsd-arm64": "0.23.1", + "@esbuild/openbsd-x64": "0.23.1", + "@esbuild/sunos-x64": "0.23.1", + "@esbuild/win32-arm64": "0.23.1", + "@esbuild/win32-ia32": "0.23.1", + "@esbuild/win32-x64": "0.23.1" } }, "node_modules/escalade": { @@ -2113,43 +2159,40 @@ } }, "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "version": "9.10.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.10.0.tgz", + "integrity": "sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", + "@eslint-community/regexpp": "^4.11.0", + "@eslint/config-array": "^0.18.0", + "@eslint/eslintrc": "^3.1.0", + "@eslint/js": "9.10.0", + "@eslint/plugin-kit": "^0.1.0", "@humanwhocodes/module-importer": "^1.0.1", + "@humanwhocodes/retry": "^0.3.0", "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", - "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", + "eslint-scope": "^8.0.2", + "eslint-visitor-keys": "^4.0.0", + "espree": "^10.1.0", + "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", @@ -2161,10 +2204,18 @@ "eslint": "bin/eslint.js" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { - "url": "https://opencollective.com/eslint" + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } } }, "node_modules/eslint-plugin-header": { @@ -2186,19 +2237,14 @@ } }, "node_modules/eslint-plugin-unused-imports": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.2.0.tgz", - "integrity": "sha512-6uXyn6xdINEpxE1MtDjxQsyXB37lfyO2yKGVVgtD7WEWQGORSOZjgrD6hBhvGv4/SO+TOlS+UnC6JppRqbuwGQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.3.tgz", + "integrity": "sha512-lqrNZIZjFMUr7P06eoKtQLwyVRibvG7N+LtfKtObYGizAAGrcqLkc3tDx+iAik2z7q0j/XI3ihjupIqxhFabFA==", "dev": true, - "dependencies": { - "eslint-rule-composer": "^0.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, + "license": "MIT", "peerDependencies": { - "@typescript-eslint/eslint-plugin": "6 - 7", - "eslint": "8" + "@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0", + "eslint": "^9.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "@typescript-eslint/eslint-plugin": { @@ -2206,26 +2252,18 @@ } } }, - "node_modules/eslint-rule-composer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz", - "integrity": "sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==", - "dev": true, - "engines": { - "node": ">=4.0.0" - } - }, "node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", + "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -2253,6 +2291,19 @@ "concat-map": "0.0.1" } }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", + "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/eslint/node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -2278,17 +2329,31 @@ } }, "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", + "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.9.0", + "acorn": "^8.12.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" + "eslint-visitor-keys": "^4.0.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", + "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -2311,6 +2376,7 @@ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -2332,6 +2398,7 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } @@ -2364,13 +2431,15 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-glob": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -2386,7 +2455,8 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", @@ -2412,15 +2482,16 @@ } }, "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dev": true, + "license": "MIT", "dependencies": { - "flat-cache": "^3.0.4" + "flat-cache": "^4.0.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16.0.0" } }, "node_modules/fill-range": { @@ -2462,81 +2533,25 @@ } }, "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dev": true, + "license": "MIT", "dependencies": { "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flat-cache/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/flat-cache/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "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" + "keyv": "^4.5.4" }, "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/flat-cache/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/flat-cache/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=16" } }, "node_modules/flatted": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/follow-redirects": { "version": "1.15.6", @@ -2558,10 +2573,11 @@ } }, "node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", "dev": true, + "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -2700,14 +2716,6 @@ "rimraf": "bin.js" } }, - "node_modules/fuse.js": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.0.0.tgz", - "integrity": "sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q==", - "engines": { - "node": ">=10" - } - }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -2775,35 +2783,13 @@ } }, "node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, + "license": "MIT", "engines": { - "node": ">=10" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -2891,6 +2877,7 @@ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, + "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -3238,15 +3225,16 @@ } }, "node_modules/jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz", + "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==", "dev": true, + "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" }, "engines": { - "node": ">=14" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -3288,13 +3276,15 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", @@ -3344,6 +3334,7 @@ "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, + "license": "MIT", "dependencies": { "json-buffer": "3.0.1" } @@ -3386,32 +3377,35 @@ "dev": true }, "node_modules/lit": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.3.tgz", - "integrity": "sha512-l4slfspEsnCcHVRTvaP7YnkTZEZggNFywLEIhQaGhYDczG+tu/vlgm/KaWIEjIp+ZyV20r2JnZctMb8LeLCG7Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lit/-/lit-3.2.0.tgz", + "integrity": "sha512-s6tI33Lf6VpDu7u4YqsSX78D28bYQulM+VAzsGch4fx2H0eLZnJsUBsPWmGYSGoKDNbjtRv02rio1o+UdPVwvw==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@lit/reactive-element": "^2.0.4", - "lit-element": "^4.0.4", - "lit-html": "^3.1.2" + "lit-element": "^4.1.0", + "lit-html": "^3.2.0" } }, "node_modules/lit-element": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.5.tgz", - "integrity": "sha512-iTWskWZEtn9SyEf4aBG6rKT8GABZMrTWop1+jopsEOgEcugcXJGKuX5bEbkq9qfzY+XB4MAgCaSPwnNpdsNQ3Q==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.1.0.tgz", + "integrity": "sha512-gSejRUQJuMQjV2Z59KAS/D4iElUhwKpIyJvZ9w+DIagIQjfJnhR20h2Q5ddpzXGS+fF0tMZ/xEYGMnKmaI/iww==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@lit-labs/ssr-dom-shim": "^1.2.0", "@lit/reactive-element": "^2.0.4", - "lit-html": "^3.1.2" + "lit-html": "^3.2.0" } }, "node_modules/lit-html": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.3.tgz", - "integrity": "sha512-FwIbqDD8O/8lM4vUZ4KvQZjPPNx7V1VhT7vmRB8RBAO0AU6wuTVdoXiu2CivVjEGdugvcbPNBLtPE1y0ifplHA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.2.0.tgz", + "integrity": "sha512-pwT/HwoxqI9FggTrYVarkBKFN9MlTUpLrDHubTmW4SrkL3kkqW5gxwbxMMUnbbRHBC0WTZnYHcjDSCM559VyfA==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@types/trusted-types": "^2.0.2" } @@ -3485,12 +3479,13 @@ } }, "node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.1.tgz", + "integrity": "sha512-CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ==", "dev": true, + "license": "ISC", "engines": { - "node": "14 || >=16.14" + "node": "20 || >=22" } }, "node_modules/make-dir": { @@ -3531,17 +3526,19 @@ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -3586,15 +3583,17 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/minipass": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.1.tgz", - "integrity": "sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "dev": true, + "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } @@ -3903,6 +3902,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", + "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", @@ -3914,6 +3920,7 @@ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, + "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -3949,16 +3956,17 @@ } }, "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", + "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", "dev": true, + "license": "BlueOak-1.0.0", "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -3970,15 +3978,6 @@ "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==", "dev": true }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", @@ -4032,10 +4031,11 @@ } }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true, + "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, @@ -4084,6 +4084,7 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -4184,6 +4185,7 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -4199,40 +4201,60 @@ } }, "node_modules/rimraf": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.7.tgz", - "integrity": "sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz", + "integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==", "dev": true, + "license": "ISC", "dependencies": { - "glob": "^10.3.7" + "glob": "^11.0.0", + "package-json-from-dist": "^1.0.0" }, "bin": { "rimraf": "dist/esm/bin.mjs" }, "engines": { - "node": ">=14.18" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/rimraf/node_modules/glob": { - "version": "10.3.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.15.tgz", - "integrity": "sha512-0c6RlJt1TICLyvJYIApxb8GsXoai0KUP7AxKKAtsYXdgJR1mGEUa7DgwShbdk1nly0PYoZj01xd4hzbq3fsjpw==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", + "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", "dev": true, + "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", - "minimatch": "^9.0.1", - "minipass": "^7.0.4", - "path-scurry": "^1.11.0" + "jackspeak": "^4.0.1", + "minimatch": "^10.0.0", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^2.0.0" }, "bin": { "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/minimatch": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", + "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -4319,6 +4341,7 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, + "license": "ISC", "engines": { "node": ">=14" }, @@ -4359,15 +4382,6 @@ "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", "dev": true }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -4406,6 +4420,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -4433,6 +4448,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -4516,6 +4532,7 @@ "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=16" }, @@ -4549,18 +4566,6 @@ "node": ">=4" } }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/typescript": { "version": "5.4.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", @@ -4611,6 +4616,7 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } @@ -4916,6 +4922,7 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", diff --git a/package.json b/package.json index 3b44d2f6..ccb9655e 100644 --- a/package.json +++ b/package.json @@ -947,27 +947,27 @@ "@types/sinon": "^17.0.3", "@types/vscode": "^1.86.0", "@types/vscode-webview": "^1.57.5", - "@typescript-eslint/eslint-plugin": "^7.9.0", - "@typescript-eslint/parser": "^7.9.0", + "@typescript-eslint/eslint-plugin": "^8.4.0", + "@typescript-eslint/parser": "^8.4.0", "@vscode/test-electron": "^2.3.10", - "esbuild": "^0.19.12", - "eslint": "^8.57.0", + "esbuild": "^0.23.1", + "eslint": "^9.10.0", "eslint-plugin-header": "^3.1.1", "eslint-plugin-license-header": "^0.6.1", - "eslint-plugin-unused-imports": "^3.2.0", + "eslint-plugin-unused-imports": "^4.1.3", "glob": "^8.1.0", "istanbul-lib-coverage": "^3.2.2", "istanbul-lib-instrument": "^3.3.0", "istanbul-lib-report": "^2.0.8", "istanbul-lib-source-maps": "^3.0.6", "istanbul-reports": "^3.1.7", - "lit": "^3.1.3", + "lit": "^3.2.0", "mocha": "^10.4.0", "mocha-junit-reporter": "^2.2.1", "mocha-multi-reporters": "^1.5.1", "mock-fs": "^5.2.0", - "prettier": "^3.2.5", - "rimraf": "^5.0.7", + "prettier": "^3.3.3", + "rimraf": "^6.0.1", "sinon": "^17.0.1", "typescript": "^5.4.5", "vscode-dts": "^0.3.3", @@ -977,16 +977,13 @@ "vscode-test": "^1.6.1" }, "dependencies": { - "@types/graceful-fs": "^4.1.9", "@vscode/webview-ui-toolkit": "^1.4.0", "@windozer/node-q": "^2.6.0", - "ag-grid-community": "^32.0.1", - "axios": "^1.7.4", + "ag-grid-community": "^32.1.0", + "axios": "^1.7.7", "chevrotain": "^10.5.0", - "csv-parser": "^3.0.0", "extract-zip": "^2.0.1", "fs-extra": "^11.2.0", - "fuse.js": "^7.0.0", "jwt-decode": "^4.0.0", "moment": "^2.30.1", "moment-duration-format": "^2.3.2", From 9f0e64ab9ba9d24af543246a514b5dae997863ae Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 9 Sep 2024 09:23:25 +0100 Subject: [PATCH 30/99] add icons --- resources/dark/tables.svg | 17 ++++++++++------- resources/light/tables.svg | 17 ++++++++++------- resources/select-view.svg | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 resources/select-view.svg diff --git a/resources/dark/tables.svg b/resources/dark/tables.svg index c931182b..e157e0a6 100644 --- a/resources/dark/tables.svg +++ b/resources/dark/tables.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/light/tables.svg b/resources/light/tables.svg index b959f149..99db5406 100644 --- a/resources/light/tables.svg +++ b/resources/light/tables.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/select-view.svg b/resources/select-view.svg new file mode 100644 index 00000000..06235de8 --- /dev/null +++ b/resources/select-view.svg @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file From 921f383b26cbeac4dfc2a3a48c73073cdf4081a7 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 9 Sep 2024 09:36:05 +0100 Subject: [PATCH 31/99] linting svg --- resources/dark/aggicon.svg | 17 ++++++++++------- resources/dark/apiicon.svg | 17 ++++++++++------- resources/dark/dapicon.svg | 17 ++++++++++------- resources/dark/dictionaries.svg | 17 ++++++++++------- resources/dark/functions.svg | 17 ++++++++++------- resources/dark/metaicon.svg | 17 ++++++++++------- resources/dark/namespaces.svg | 17 ++++++++++------- resources/dark/p-data-active.svg | 11 +++++++---- resources/dark/p-data-connected.svg | 11 +++++++---- resources/dark/p-data.svg | 11 +++++++---- resources/dark/p-dictionary.svg | 18 +++++++++++++++++- resources/dark/p-file.svg | 14 +++++++++++++- resources/dark/p-folder.svg | 11 ++++++++++- resources/dark/p-function.svg | 13 ++++++++++++- resources/dark/p-insights.svg | 4 +++- resources/dark/p-q-connection-active.svg | 2 +- resources/dark/p-table.svg | 16 +++++++++++++++- resources/dark/p-var.svg | 11 ++++++++++- resources/dark/p-view.svg | 12 +++++++++++- resources/dark/packageicon.svg | 17 ++++++++++------- resources/dark/rcicon.svg | 17 ++++++++++------- resources/dark/refresh.svg | 5 ++++- resources/dark/schemaicon.svg | 17 ++++++++++------- resources/dark/variables.svg | 15 ++++++++------- resources/dark/views.svg | 16 +++++++++------- resources/kx_logo-dark.svg | 21 ++++++++++++++++----- resources/kx_logo.svg | 21 ++++++++++++++++----- resources/light/aggicon.svg | 17 ++++++++++------- resources/light/apiicon.svg | 17 ++++++++++------- resources/light/dapicon.svg | 17 ++++++++++------- resources/light/dictionaries.svg | 17 ++++++++++------- resources/light/functions.svg | 17 ++++++++++------- resources/light/metaicon.svg | 17 ++++++++++------- resources/light/namespaces.svg | 17 ++++++++++------- resources/light/p-data-active.svg | 11 +++++++---- resources/light/p-data-connected.svg | 11 +++++++---- resources/light/p-data.svg | 11 +++++++---- resources/light/p-dictionary.svg | 18 +++++++++++++++++- resources/light/p-file.svg | 14 +++++++++++++- resources/light/p-folder.svg | 11 ++++++++++- resources/light/p-function.svg | 13 ++++++++++++- resources/light/p-insights.svg | 4 +++- resources/light/p-table.svg | 16 +++++++++++++++- resources/light/p-var.svg | 11 ++++++++++- resources/light/p-view.svg | 12 +++++++++++- resources/light/packageicon.svg | 17 ++++++++++------- resources/light/rcicon.svg | 17 ++++++++++------- resources/light/refresh.svg | 6 +++++- resources/light/schemaicon.svg | 17 ++++++++++------- resources/light/variables.svg | 15 ++++++++------- resources/light/views.svg | 16 +++++++++------- resources/server.svg | 18 +++++++++++++++++- 52 files changed, 517 insertions(+), 222 deletions(-) diff --git a/resources/dark/aggicon.svg b/resources/dark/aggicon.svg index 4834b95f..66c14bd9 100644 --- a/resources/dark/aggicon.svg +++ b/resources/dark/aggicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/dark/apiicon.svg b/resources/dark/apiicon.svg index 2b71c797..3d81ca9b 100644 --- a/resources/dark/apiicon.svg +++ b/resources/dark/apiicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/dark/dapicon.svg b/resources/dark/dapicon.svg index 8da22fb1..ec50a5ff 100644 --- a/resources/dark/dapicon.svg +++ b/resources/dark/dapicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/dark/dictionaries.svg b/resources/dark/dictionaries.svg index 52edcfe5..6b32f061 100644 --- a/resources/dark/dictionaries.svg +++ b/resources/dark/dictionaries.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/dark/functions.svg b/resources/dark/functions.svg index 713fc615..106ec96a 100644 --- a/resources/dark/functions.svg +++ b/resources/dark/functions.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/dark/metaicon.svg b/resources/dark/metaicon.svg index 2b95a430..fbdf57c5 100644 --- a/resources/dark/metaicon.svg +++ b/resources/dark/metaicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/dark/namespaces.svg b/resources/dark/namespaces.svg index 5e830bbc..be008bc4 100644 --- a/resources/dark/namespaces.svg +++ b/resources/dark/namespaces.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/dark/p-data-active.svg b/resources/dark/p-data-active.svg index a90a9332..7646fe4f 100644 --- a/resources/dark/p-data-active.svg +++ b/resources/dark/p-data-active.svg @@ -1,9 +1,12 @@ - - + + - + - + \ No newline at end of file diff --git a/resources/dark/p-data-connected.svg b/resources/dark/p-data-connected.svg index 8104c79a..1409d287 100644 --- a/resources/dark/p-data-connected.svg +++ b/resources/dark/p-data-connected.svg @@ -1,9 +1,12 @@ - - + + - + - + \ No newline at end of file diff --git a/resources/dark/p-data.svg b/resources/dark/p-data.svg index ff1b6b63..d1cb4bf5 100644 --- a/resources/dark/p-data.svg +++ b/resources/dark/p-data.svg @@ -1,9 +1,12 @@ - - + + - + - + \ No newline at end of file diff --git a/resources/dark/p-dictionary.svg b/resources/dark/p-dictionary.svg index 8ce7c941..0eb503a7 100644 --- a/resources/dark/p-dictionary.svg +++ b/resources/dark/p-dictionary.svg @@ -1 +1,17 @@ -icon \ No newline at end of file + + + + + icon + + + + + + + + + + + \ No newline at end of file diff --git a/resources/dark/p-file.svg b/resources/dark/p-file.svg index d0f7ecad..37ba6181 100644 --- a/resources/dark/p-file.svg +++ b/resources/dark/p-file.svg @@ -1 +1,13 @@ -icon \ No newline at end of file + + + + + icon + + + + + + + + \ No newline at end of file diff --git a/resources/dark/p-folder.svg b/resources/dark/p-folder.svg index 75724e56..4b742afa 100644 --- a/resources/dark/p-folder.svg +++ b/resources/dark/p-folder.svg @@ -1 +1,10 @@ -icon \ No newline at end of file + + + + + icon + + + \ No newline at end of file diff --git a/resources/dark/p-function.svg b/resources/dark/p-function.svg index c11359f8..661d1494 100644 --- a/resources/dark/p-function.svg +++ b/resources/dark/p-function.svg @@ -1 +1,12 @@ -icon \ No newline at end of file + + + + + icon + + + + + \ No newline at end of file diff --git a/resources/dark/p-insights.svg b/resources/dark/p-insights.svg index 7aaeed6f..6bb27189 100644 --- a/resources/dark/p-insights.svg +++ b/resources/dark/p-insights.svg @@ -1,4 +1,6 @@ - + \ No newline at end of file diff --git a/resources/dark/p-q-connection-active.svg b/resources/dark/p-q-connection-active.svg index c9d2dc57..07c0aa02 100644 --- a/resources/dark/p-q-connection-active.svg +++ b/resources/dark/p-q-connection-active.svg @@ -6,7 +6,7 @@ + fill="#0FBC7A" /> \ No newline at end of file diff --git a/resources/dark/p-table.svg b/resources/dark/p-table.svg index a58eca87..6a0c4513 100644 --- a/resources/dark/p-table.svg +++ b/resources/dark/p-table.svg @@ -1 +1,15 @@ -icon \ No newline at end of file + + + + + icon + + + + + + + + + \ No newline at end of file diff --git a/resources/dark/p-var.svg b/resources/dark/p-var.svg index 77fa34ef..6fc4c148 100644 --- a/resources/dark/p-var.svg +++ b/resources/dark/p-var.svg @@ -1 +1,10 @@ -icon \ No newline at end of file + + + + + icon + + + + \ No newline at end of file diff --git a/resources/dark/p-view.svg b/resources/dark/p-view.svg index f02090f2..83327bef 100644 --- a/resources/dark/p-view.svg +++ b/resources/dark/p-view.svg @@ -1 +1,11 @@ -icon \ No newline at end of file + + + + + icon + + + + + \ No newline at end of file diff --git a/resources/dark/packageicon.svg b/resources/dark/packageicon.svg index ba7f543a..4d7baf0e 100644 --- a/resources/dark/packageicon.svg +++ b/resources/dark/packageicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/dark/rcicon.svg b/resources/dark/rcicon.svg index 4d546120..72cfd7a6 100644 --- a/resources/dark/rcicon.svg +++ b/resources/dark/rcicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/dark/refresh.svg b/resources/dark/refresh.svg index a3b29dfc..fa7354fe 100644 --- a/resources/dark/refresh.svg +++ b/resources/dark/refresh.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/resources/dark/schemaicon.svg b/resources/dark/schemaicon.svg index 86d82b46..723d7e01 100644 --- a/resources/dark/schemaicon.svg +++ b/resources/dark/schemaicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/dark/variables.svg b/resources/dark/variables.svg index f63d3082..2f819655 100644 --- a/resources/dark/variables.svg +++ b/resources/dark/variables.svg @@ -1,8 +1,9 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/dark/views.svg b/resources/dark/views.svg index f0cc49b6..dbf53924 100644 --- a/resources/dark/views.svg +++ b/resources/dark/views.svg @@ -1,8 +1,10 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/kx_logo-dark.svg b/resources/kx_logo-dark.svg index 53f1b9ea..4cadd7bd 100644 --- a/resources/kx_logo-dark.svg +++ b/resources/kx_logo-dark.svg @@ -5,7 +5,9 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" viewBox="0 0 66.2 33.8" class="menu_logo" version="1.1" id="svg8" sodipodi:docname="kx.svg" inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"> + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" viewBox="0 0 66.2 33.8" + class="menu_logo" version="1.1" id="svg8" sodipodi:docname="kx.svg" + inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"> @@ -15,13 +17,22 @@ - + - - - + + + diff --git a/resources/kx_logo.svg b/resources/kx_logo.svg index 79300416..7a3ac86d 100644 --- a/resources/kx_logo.svg +++ b/resources/kx_logo.svg @@ -5,7 +5,9 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" viewBox="0 0 66.2 33.8" class="menu_logo" version="1.1" id="svg8" sodipodi:docname="kx.svg" inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"> + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" viewBox="0 0 66.2 33.8" + class="menu_logo" version="1.1" id="svg8" sodipodi:docname="kx.svg" + inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"> @@ -15,13 +17,22 @@ - + - - - + + + diff --git a/resources/light/aggicon.svg b/resources/light/aggicon.svg index 81d31a44..83e0b738 100644 --- a/resources/light/aggicon.svg +++ b/resources/light/aggicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/light/apiicon.svg b/resources/light/apiicon.svg index ae9919c1..1ee674f3 100644 --- a/resources/light/apiicon.svg +++ b/resources/light/apiicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/light/dapicon.svg b/resources/light/dapicon.svg index f2c6e9a6..9b4e13fc 100644 --- a/resources/light/dapicon.svg +++ b/resources/light/dapicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/light/dictionaries.svg b/resources/light/dictionaries.svg index ee540e3e..cc1d092f 100644 --- a/resources/light/dictionaries.svg +++ b/resources/light/dictionaries.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/light/functions.svg b/resources/light/functions.svg index 2e0ed2c8..281eb682 100644 --- a/resources/light/functions.svg +++ b/resources/light/functions.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/light/metaicon.svg b/resources/light/metaicon.svg index aa8a41f4..95aa9b4d 100644 --- a/resources/light/metaicon.svg +++ b/resources/light/metaicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/light/namespaces.svg b/resources/light/namespaces.svg index 485287ce..04bce11f 100644 --- a/resources/light/namespaces.svg +++ b/resources/light/namespaces.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/light/p-data-active.svg b/resources/light/p-data-active.svg index a90a9332..7646fe4f 100644 --- a/resources/light/p-data-active.svg +++ b/resources/light/p-data-active.svg @@ -1,9 +1,12 @@ - - + + - + - + \ No newline at end of file diff --git a/resources/light/p-data-connected.svg b/resources/light/p-data-connected.svg index 8104c79a..1409d287 100644 --- a/resources/light/p-data-connected.svg +++ b/resources/light/p-data-connected.svg @@ -1,9 +1,12 @@ - - + + - + - + \ No newline at end of file diff --git a/resources/light/p-data.svg b/resources/light/p-data.svg index ff1b6b63..d1cb4bf5 100644 --- a/resources/light/p-data.svg +++ b/resources/light/p-data.svg @@ -1,9 +1,12 @@ - - + + - + - + \ No newline at end of file diff --git a/resources/light/p-dictionary.svg b/resources/light/p-dictionary.svg index 8ce7c941..0eb503a7 100644 --- a/resources/light/p-dictionary.svg +++ b/resources/light/p-dictionary.svg @@ -1 +1,17 @@ -icon \ No newline at end of file + + + + + icon + + + + + + + + + + + \ No newline at end of file diff --git a/resources/light/p-file.svg b/resources/light/p-file.svg index d0f7ecad..37ba6181 100644 --- a/resources/light/p-file.svg +++ b/resources/light/p-file.svg @@ -1 +1,13 @@ -icon \ No newline at end of file + + + + + icon + + + + + + + + \ No newline at end of file diff --git a/resources/light/p-folder.svg b/resources/light/p-folder.svg index 75724e56..4b742afa 100644 --- a/resources/light/p-folder.svg +++ b/resources/light/p-folder.svg @@ -1 +1,10 @@ -icon \ No newline at end of file + + + + + icon + + + \ No newline at end of file diff --git a/resources/light/p-function.svg b/resources/light/p-function.svg index c11359f8..661d1494 100644 --- a/resources/light/p-function.svg +++ b/resources/light/p-function.svg @@ -1 +1,12 @@ -icon \ No newline at end of file + + + + + icon + + + + + \ No newline at end of file diff --git a/resources/light/p-insights.svg b/resources/light/p-insights.svg index 31e0d520..dfa80774 100644 --- a/resources/light/p-insights.svg +++ b/resources/light/p-insights.svg @@ -1,4 +1,6 @@ - + \ No newline at end of file diff --git a/resources/light/p-table.svg b/resources/light/p-table.svg index a58eca87..6a0c4513 100644 --- a/resources/light/p-table.svg +++ b/resources/light/p-table.svg @@ -1 +1,15 @@ -icon \ No newline at end of file + + + + + icon + + + + + + + + + \ No newline at end of file diff --git a/resources/light/p-var.svg b/resources/light/p-var.svg index 77fa34ef..6fc4c148 100644 --- a/resources/light/p-var.svg +++ b/resources/light/p-var.svg @@ -1 +1,10 @@ -icon \ No newline at end of file + + + + + icon + + + + \ No newline at end of file diff --git a/resources/light/p-view.svg b/resources/light/p-view.svg index f02090f2..83327bef 100644 --- a/resources/light/p-view.svg +++ b/resources/light/p-view.svg @@ -1 +1,11 @@ -icon \ No newline at end of file + + + + + icon + + + + + \ No newline at end of file diff --git a/resources/light/packageicon.svg b/resources/light/packageicon.svg index bf745c96..fbf62f06 100644 --- a/resources/light/packageicon.svg +++ b/resources/light/packageicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/light/rcicon.svg b/resources/light/rcicon.svg index 157a4f4a..eabb9475 100644 --- a/resources/light/rcicon.svg +++ b/resources/light/rcicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/light/refresh.svg b/resources/light/refresh.svg index 91960156..72d8896a 100644 --- a/resources/light/refresh.svg +++ b/resources/light/refresh.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/resources/light/schemaicon.svg b/resources/light/schemaicon.svg index edb7a75f..e87068b0 100644 --- a/resources/light/schemaicon.svg +++ b/resources/light/schemaicon.svg @@ -1,8 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/light/variables.svg b/resources/light/variables.svg index 1523ff80..289b7477 100644 --- a/resources/light/variables.svg +++ b/resources/light/variables.svg @@ -1,8 +1,9 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/light/views.svg b/resources/light/views.svg index 3470188c..1652eb6e 100644 --- a/resources/light/views.svg +++ b/resources/light/views.svg @@ -1,8 +1,10 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/resources/server.svg b/resources/server.svg index 0ff640ba..6241fa9d 100644 --- a/resources/server.svg +++ b/resources/server.svg @@ -1 +1,17 @@ -Icon-intune-331 \ No newline at end of file + + + + + + + + + + + Icon-intune-331 + + \ No newline at end of file From 5e939ca05f80b5a2c5ba7ee45909c0a395d94dde Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Wed, 11 Sep 2024 09:30:47 +0100 Subject: [PATCH 32/99] fix icons colors --- resources/dark/datasource-connected.svg | 2 +- resources/dark/labels/label-red.svg | 6 ++++-- resources/dark/p-data-connected.svg | 4 ++-- resources/dark/p-insights-connected.svg | 7 +++---- resources/dark/p-q-connection-connected.svg | 4 ++-- resources/dark/python-connected.svg | 4 ++-- resources/dark/scratchpad-connected.svg | 4 ++-- resources/light/datasource-connected.svg | 2 +- resources/light/labels/label-red.svg | 6 ++++-- resources/light/p-data-connected.svg | 4 ++-- resources/light/p-insights-connected.svg | 4 ++-- resources/light/p-q-connection-connected.svg | 4 ++-- resources/light/python-connected.svg | 4 ++-- resources/light/scratchpad-connected.svg | 4 ++-- 14 files changed, 31 insertions(+), 28 deletions(-) diff --git a/resources/dark/datasource-connected.svg b/resources/dark/datasource-connected.svg index 7a23bdd2..f19a987e 100644 --- a/resources/dark/datasource-connected.svg +++ b/resources/dark/datasource-connected.svg @@ -1,6 +1,6 @@ + fill="#BB8B2D" /> \ No newline at end of file diff --git a/resources/dark/labels/label-red.svg b/resources/dark/labels/label-red.svg index f1ea352c..fc39dccd 100644 --- a/resources/dark/labels/label-red.svg +++ b/resources/dark/labels/label-red.svg @@ -1,3 +1,5 @@ - - + + \ No newline at end of file diff --git a/resources/dark/p-data-connected.svg b/resources/dark/p-data-connected.svg index 1409d287..d35ce4f2 100644 --- a/resources/dark/p-data-connected.svg +++ b/resources/dark/p-data-connected.svg @@ -1,12 +1,12 @@ - + + fill="#BB8B2D" fill-opacity="0.7" /> \ No newline at end of file diff --git a/resources/dark/p-insights-connected.svg b/resources/dark/p-insights-connected.svg index 748c61d1..0e96c3ff 100644 --- a/resources/dark/p-insights-connected.svg +++ b/resources/dark/p-insights-connected.svg @@ -1,12 +1,11 @@ - + + fill="#BB8B2D" /> - - \ No newline at end of file + \ No newline at end of file diff --git a/resources/dark/p-q-connection-connected.svg b/resources/dark/p-q-connection-connected.svg index 52e7b21c..d2f2a70a 100644 --- a/resources/dark/p-q-connection-connected.svg +++ b/resources/dark/p-q-connection-connected.svg @@ -1,12 +1,12 @@ - + + fill="#BB8B2D" /> \ No newline at end of file diff --git a/resources/dark/python-connected.svg b/resources/dark/python-connected.svg index def2a249..eadbdaf1 100644 --- a/resources/dark/python-connected.svg +++ b/resources/dark/python-connected.svg @@ -1,6 +1,6 @@ - - \ No newline at end of file diff --git a/resources/dark/scratchpad-connected.svg b/resources/dark/scratchpad-connected.svg index 54d62f00..d254c68e 100644 --- a/resources/dark/scratchpad-connected.svg +++ b/resources/dark/scratchpad-connected.svg @@ -3,12 +3,12 @@ xmlns="http://www.w3.org/2000/svg"> \ No newline at end of file diff --git a/resources/light/datasource-connected.svg b/resources/light/datasource-connected.svg index 7a23bdd2..f19a987e 100644 --- a/resources/light/datasource-connected.svg +++ b/resources/light/datasource-connected.svg @@ -1,6 +1,6 @@ + fill="#BB8B2D" /> \ No newline at end of file diff --git a/resources/light/labels/label-red.svg b/resources/light/labels/label-red.svg index f1ea352c..fc39dccd 100644 --- a/resources/light/labels/label-red.svg +++ b/resources/light/labels/label-red.svg @@ -1,3 +1,5 @@ - - + + \ No newline at end of file diff --git a/resources/light/p-data-connected.svg b/resources/light/p-data-connected.svg index 1409d287..d35ce4f2 100644 --- a/resources/light/p-data-connected.svg +++ b/resources/light/p-data-connected.svg @@ -1,12 +1,12 @@ - + + fill="#BB8B2D" fill-opacity="0.7" /> \ No newline at end of file diff --git a/resources/light/p-insights-connected.svg b/resources/light/p-insights-connected.svg index 748c61d1..6cbdf11f 100644 --- a/resources/light/p-insights-connected.svg +++ b/resources/light/p-insights-connected.svg @@ -1,12 +1,12 @@ - + + fill="#BB8B2D" /> \ No newline at end of file diff --git a/resources/light/p-q-connection-connected.svg b/resources/light/p-q-connection-connected.svg index 52e7b21c..d2f2a70a 100644 --- a/resources/light/p-q-connection-connected.svg +++ b/resources/light/p-q-connection-connected.svg @@ -1,12 +1,12 @@ - + + fill="#BB8B2D" /> \ No newline at end of file diff --git a/resources/light/python-connected.svg b/resources/light/python-connected.svg index def2a249..eadbdaf1 100644 --- a/resources/light/python-connected.svg +++ b/resources/light/python-connected.svg @@ -1,6 +1,6 @@ - - \ No newline at end of file diff --git a/resources/light/scratchpad-connected.svg b/resources/light/scratchpad-connected.svg index 54d62f00..d254c68e 100644 --- a/resources/light/scratchpad-connected.svg +++ b/resources/light/scratchpad-connected.svg @@ -3,12 +3,12 @@ xmlns="http://www.w3.org/2000/svg"> \ No newline at end of file From 093da59a5eaab00d9d576e3f83e101f26c42431b Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Wed, 11 Sep 2024 09:45:11 +0100 Subject: [PATCH 33/99] add new command and icon --- package.json | 22 ++++++++++++++++++++++ src/extension.ts | 7 +++++++ src/extensionVariables.ts | 1 + src/services/kdbTreeProvider.ts | 8 ++++++++ 4 files changed, 38 insertions(+) diff --git a/package.json b/package.json index 3b44d2f6..3349c968 100644 --- a/package.json +++ b/package.json @@ -255,6 +255,15 @@ }, "enablement": "workspaceFolderCount > 0" }, + { + "category": "KX", + "command": "kdb.connection.content.selectView", + "title": "View contents", + "icon": { + "dark": "./resources/select-view.svg", + "light": "./resources/select-view.svg" + } + }, { "category": "KX", "command": "kdb.refreshScratchpadExplorer", @@ -651,6 +660,14 @@ { "command": "kdb.enableTLS", "when": "false" + }, + { + "command": "kdb.connections.export.single", + "when": "false" + }, + { + "command": "kdb.connection.content.selectView", + "when": "false" } ], "webview/context": [ @@ -818,6 +835,11 @@ "command": "kdb.deleteLabel", "when": "view == kdb-servers && viewItem == label", "group": "label@3" + }, + { + "command": "kdb.connection.content.selectView", + "when": "view == kdb-servers && viewItem in kdb.selectContentNodesContext", + "group": "inline" } ], "editor/title/run": [ diff --git a/src/extension.ts b/src/extension.ts index 93946a62..d93da98d 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -285,6 +285,13 @@ export async function activate(context: ExtensionContext) { commands.registerCommand("kdb.connections.import", async () => { await importConnections(); }), + commands.registerCommand( + "kdb.connection.content.selectView", + async (viewItem) => { + console.log(viewItem); + window.showInformationMessage("Select a view to open"); + }, + ), commands.registerCommand( "kdb.open.meta", async (viewItem: InsightsMetaNode | MetaObjectPayloadNode) => { diff --git a/src/extensionVariables.ts b/src/extensionVariables.ts index 35bff67a..c8fe3be3 100644 --- a/src/extensionVariables.ts +++ b/src/extensionVariables.ts @@ -84,6 +84,7 @@ export namespace ext { export const kdbAuthMap: kdbAuthMap[] = []; export const kdbrootNodes: string[] = []; export const kdbinsightsNodes: string[] = []; + export const selectContentNodesContext: string[] = ["kdbVariable"]; export const kdbNodesWithoutAuth: string[] = []; export const kdbNodesWithoutTls: string[] = []; export const kdbConnectionAliasList: string[] = []; diff --git a/src/services/kdbTreeProvider.ts b/src/services/kdbTreeProvider.ts index 5ba38f3c..8d3d5fd1 100644 --- a/src/services/kdbTreeProvider.ts +++ b/src/services/kdbTreeProvider.ts @@ -74,6 +74,11 @@ export class KdbTreeProvider implements TreeDataProvider { refresh(serverList: Server): void { ext.isBundleQCreated = false; this.serverList = serverList; + commands.executeCommand( + "setContext", + "kdb.selectContentNodesContext", + ext.selectContentNodesContext, + ); this._onDidChangeTreeData.fire(); } @@ -99,6 +104,9 @@ export class KdbTreeProvider implements TreeDataProvider { title: "Open Meta Object", arguments: [element], }; + if (element.label !== "meta") { + element.contextValue = element.label; + } } return element; } From 469f0a46022b7ee51e484d62eb88ffafc6fdd719 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Wed, 11 Sep 2024 11:06:12 +0100 Subject: [PATCH 34/99] add connlabel to tree obj --- src/services/kdbTreeProvider.ts | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/src/services/kdbTreeProvider.ts b/src/services/kdbTreeProvider.ts index 8d3d5fd1..8aa0b3aa 100644 --- a/src/services/kdbTreeProvider.ts +++ b/src/services/kdbTreeProvider.ts @@ -104,9 +104,9 @@ export class KdbTreeProvider implements TreeDataProvider { title: "Open Meta Object", arguments: [element], }; - if (element.label !== "meta") { - element.contextValue = element.label; - } + } + if (element instanceof QServerNode) { + element.contextValue = ext.selectContentNodesContext[0]; } return element; } @@ -148,7 +148,7 @@ export class KdbTreeProvider implements TreeDataProvider { element.contextValue !== undefined && ext.kdbrootNodes.indexOf(element.contextValue) !== -1 ) { - return Promise.resolve(await this.getNamespaces()); + return Promise.resolve(await this.getNamespaces(element.contextValue)); } else if ( element.contextValue !== undefined && ext.kdbinsightsNodes.indexOf(element.contextValue) !== -1 @@ -159,6 +159,7 @@ export class KdbTreeProvider implements TreeDataProvider { this.getCategories( (element as QNamespaceNode).details?.toString(), ext.qObjectCategories, + (element as QNamespaceNode).connLabel, ), ); } else if ( @@ -211,7 +212,7 @@ export class KdbTreeProvider implements TreeDataProvider { } } - private async getNamespaces(): Promise { + private async getNamespaces(connLabel?: string): Promise { const ns = await loadNamespaces(); const result = ns.map( (x) => @@ -221,6 +222,7 @@ export class KdbTreeProvider implements TreeDataProvider { "", TreeItemCollapsibleState.Collapsed, x.fname, + connLabel ?? "", ), ); if (result !== undefined) { @@ -233,6 +235,7 @@ export class KdbTreeProvider implements TreeDataProvider { private async getCategories( ns: string | undefined, objectCategories: string[], + connLabel?: string, ): Promise { // filter out views for non-default namespaces let filteredCategories; @@ -251,16 +254,20 @@ export class KdbTreeProvider implements TreeDataProvider { "", ns ?? "", TreeItemCollapsibleState.Collapsed, + connLabel ?? "", ), ); return result; } private async getServerObjects( - serverType: TreeItem, + serverType: QCategoryNode | TreeItem, ): Promise { + console.log(serverType); if (serverType === undefined) return new Array(); const ns = serverType.contextValue ?? ""; + const connLabel = + serverType instanceof QCategoryNode ? serverType.connLabel : ""; if (serverType.label === ext.qObjectCategories[0]) { // dictionaries const dicts = await loadDictionaries(serverType.contextValue ?? ""); @@ -272,6 +279,7 @@ export class KdbTreeProvider implements TreeDataProvider { "", TreeItemCollapsibleState.None, "p-dictionary", + connLabel, ), ); if (result !== undefined) { @@ -290,6 +298,7 @@ export class KdbTreeProvider implements TreeDataProvider { "", TreeItemCollapsibleState.None, "p-function", + connLabel, ), ); if (result !== undefined) { @@ -308,6 +317,7 @@ export class KdbTreeProvider implements TreeDataProvider { "", TreeItemCollapsibleState.None, "p-table", + connLabel, ), ); if (result !== undefined) { @@ -322,10 +332,11 @@ export class KdbTreeProvider implements TreeDataProvider { (x) => new QServerNode( [], - `${ns === "." ? "." : ""}${x.name}`, + `${ns === "." ? "" : ns + "."}${x.name}`, "", TreeItemCollapsibleState.None, "p-var", + connLabel, ), ); if (result !== undefined) { @@ -344,6 +355,7 @@ export class KdbTreeProvider implements TreeDataProvider { "", TreeItemCollapsibleState.None, "p-view", + connLabel, ), ); if (result !== undefined) { @@ -362,6 +374,7 @@ export class KdbTreeProvider implements TreeDataProvider { "", TreeItemCollapsibleState.Collapsed, x.fname, + connLabel, ), ); if (result !== undefined) { @@ -667,6 +680,7 @@ export class QNamespaceNode extends TreeItem { public readonly details: string, public readonly collapsibleState: TreeItemCollapsibleState, public readonly fullName: string, + public readonly connLabel: string, ) { details = fullName; super(label, collapsibleState); @@ -705,6 +719,7 @@ export class QCategoryNode extends TreeItem { public readonly details: string, public readonly ns: string, public readonly collapsibleState: TreeItemCollapsibleState, + public readonly connLabel: string, ) { details = ""; super(label, collapsibleState); @@ -775,6 +790,7 @@ export class QServerNode extends TreeItem { public readonly details: string, public readonly collapsibleState: TreeItemCollapsibleState, public readonly coreIcon: string, + public readonly connLabel: string, ) { details = ""; super(label, collapsibleState); From 9479eef615db02939e40eaba42ac88c5625c34e4 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Wed, 11 Sep 2024 12:22:39 +0100 Subject: [PATCH 35/99] fix query history --- src/commands/serverCommand.ts | 13 ++++++++++--- src/extension.ts | 19 ++++++++++++++++++- src/models/queryHistory.ts | 1 + src/services/queryHistoryProvider.ts | 5 +++++ src/utils/executionConsole.ts | 4 ++++ src/utils/queryUtils.ts | 2 ++ test/suite/services.test.ts | 3 +++ 7 files changed, 43 insertions(+), 4 deletions(-) diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index 897f2823..31f7436f 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -718,14 +718,12 @@ export async function executeQuery( context: string, isPython: boolean, isWorkbook: boolean, + isFromConnTree?: boolean, ): Promise { const connMngService = new ConnectionManagementService(); const queryConsole = ExecutionConsole.start(); if (connLabel === "") { if (ext.activeConnection === undefined) { - window.showErrorMessage( - "No active connection found. Connect to one connection.", - ); kdbOutputLog( "No active connection found. Connect to one connection.", "ERROR", @@ -755,6 +753,8 @@ export async function executeQuery( isWorkbook ? "WORKBOOK" : "SCRATCHPAD", isPython, false, + undefined, + isFromConnTree, ); return undefined; } @@ -793,6 +793,7 @@ export async function executeQuery( isWorkbook ? "WORKBOOK" : "SCRATCHPAD", isPython, duration, + isFromConnTree, ); } else { writeQueryResultsToConsole( @@ -804,6 +805,7 @@ export async function executeQuery( isWorkbook ? "WORKBOOK" : "SCRATCHPAD", isPython, duration, + isFromConnTree, ); } } @@ -1037,6 +1039,7 @@ export function writeQueryResultsToConsole( type?: string, isPython?: boolean, duration?: string, + isFromConnTree?: boolean, ): void { const queryConsole = ExecutionConsole.start(); const isNonEmptyArray = Array.isArray(result) && result.length > 0; @@ -1052,6 +1055,7 @@ export function writeQueryResultsToConsole( type, isPython, duration, + isFromConnTree, ); } else { if (!checkIfIsDatasource(type)) { @@ -1066,6 +1070,7 @@ export function writeQueryResultsToConsole( isPython, false, duration, + isFromConnTree, ); } } @@ -1080,6 +1085,7 @@ export function writeQueryResultsToView( type?: string, isPython?: boolean, duration?: string, + isFromConnTree?: boolean, ): void { commands.executeCommand("kdb.resultsPanel.update", result, isInsights, type); if (!checkIfIsDatasource(type)) { @@ -1094,6 +1100,7 @@ export function writeQueryResultsToView( undefined, undefined, duration, + isFromConnTree, ); } } diff --git a/src/extension.ts b/src/extension.ts index d93da98d..609087fa 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -51,6 +51,7 @@ import { editInsightsConnection, editKdbConnection, enableTLS, + executeQuery, exportConnections, importConnections, openMeta, @@ -288,7 +289,23 @@ export async function activate(context: ExtensionContext) { commands.registerCommand( "kdb.connection.content.selectView", async (viewItem) => { - console.log(viewItem); + const connLabel = viewItem.connLabel + ? viewItem.connLabel.split("[")[1].split("]")[0] + : undefined; + if (connLabel) { + const executorName = viewItem.coreIcon.substring(2); + executeQuery( + viewItem.label, + connLabel, + executorName, + "", + false, + false, + true, + ); + } else { + kdbOutputLog("Connection label not found", "ERROR"); + } window.showInformationMessage("Select a view to open"); }, ), diff --git a/src/models/queryHistory.ts b/src/models/queryHistory.ts index 4071150f..eeff04a8 100644 --- a/src/models/queryHistory.ts +++ b/src/models/queryHistory.ts @@ -26,4 +26,5 @@ export interface QueryHistory { datasourceType?: DataSourceTypes; isWorkbook?: boolean; duration?: string; + isFromConnTree?: boolean; } diff --git a/src/services/queryHistoryProvider.ts b/src/services/queryHistoryProvider.ts index 35ff9fe8..afe87f65 100644 --- a/src/services/queryHistoryProvider.ts +++ b/src/services/queryHistoryProvider.ts @@ -109,6 +109,11 @@ export class QueryHistoryTreeItem extends TreeItem { tooltipMd.appendMarkdown( "- Workbook: " + this.details.executorName + " \n", ); + } else if (this.details.isFromConnTree) { + tooltipMd.appendMarkdown("- Executiom from: Connection Tree \n"); + tooltipMd.appendMarkdown( + "- Category: " + this.details.executorName + " \n", + ); } else { tooltipMd.appendMarkdown( "- File: " + this.details.executorName + " \n", diff --git a/src/utils/executionConsole.ts b/src/utils/executionConsole.ts index 63d83120..7db3d675 100644 --- a/src/utils/executionConsole.ts +++ b/src/utils/executionConsole.ts @@ -83,6 +83,7 @@ export class ExecutionConsole { type?: string, isPhython?: boolean, duration?: string, + isFromConnTree?: boolean, ): void { getHideDetailedConsoleQueryOutput(); const hideDetails = ext.hideDetailedConsoleQueryOutput; @@ -106,6 +107,7 @@ export class ExecutionConsole { undefined, undefined, duration, + isFromConnTree, ); } @@ -142,6 +144,7 @@ export class ExecutionConsole { isPython?: boolean, isDatasource?: boolean, duration?: string, + isFromConnTree?: boolean, ): void { getHideDetailedConsoleQueryOutput(); const hideDetails = ext.hideDetailedConsoleQueryOutput; @@ -172,6 +175,7 @@ export class ExecutionConsole { undefined, undefined, duration, + isFromConnTree, ); } } else { diff --git a/src/utils/queryUtils.ts b/src/utils/queryUtils.ts index c572e327..a92d4fd4 100644 --- a/src/utils/queryUtils.ts +++ b/src/utils/queryUtils.ts @@ -339,6 +339,7 @@ export function addQueryHistory( isDatasource?: boolean, datasourceType?: DataSourceTypes, duration?: string, + isFromConnTree?: boolean, ) { const newQueryHistory: QueryHistory = { query: query, @@ -352,6 +353,7 @@ export function addQueryHistory( isDatasource, datasourceType, duration, + isFromConnTree, }; ext.kdbQueryHistoryList.unshift(newQueryHistory); diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index 3bb524d8..c9946ce4 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -573,6 +573,7 @@ describe("kdbTreeProvider", () => { "nsnodedetails1", TreeItemCollapsibleState.None, "nsfullname", + "connLabel", ); assert.strictEqual( qNsNode.label, @@ -588,6 +589,7 @@ describe("kdbTreeProvider", () => { "categorynodedetails1", "categoryns", TreeItemCollapsibleState.None, + "connLabel", ); assert.strictEqual( qCategoryNode.label, @@ -603,6 +605,7 @@ describe("kdbTreeProvider", () => { "servernodedetails1", TreeItemCollapsibleState.None, "", + "connLabel", ); assert.strictEqual( qServerNode.label, From 001e772f559bc198d911a90f68dcfdc6050a67c3 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Wed, 11 Sep 2024 12:25:30 +0100 Subject: [PATCH 36/99] fix rerunquery --- src/commands/serverCommand.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index 31f7436f..9c030481 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -914,6 +914,7 @@ export function rerunQuery(rerunQueryElement: QueryHistory) { context, rerunQueryElement.language !== "q", !!rerunQueryElement.isWorkbook, + !!rerunQueryElement.isFromConnTree, ); } else { const dsFile = rerunQueryElement.query as DataSourceFiles; From 2cd6c6c53e41efc5981176aabff59b20506de50b Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Wed, 11 Sep 2024 16:17:12 +0100 Subject: [PATCH 37/99] update tests --- test/suite/services.test.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index c9946ce4..6e6231a2 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -848,7 +848,8 @@ describe("queryHistoryProvider", () => { time: "testTime3", query: dummyDS, success: false, - connectionType: ServerType.undefined, + connectionType: ServerType.KDB, + isFromConnTree: true, }, ]; beforeEach(() => { @@ -934,7 +935,7 @@ describe("queryHistoryProvider", () => { it("Should return a new QueryHistoryTreeItem with sucess icom", () => { const queryHistoryTreeItem = new QueryHistoryTreeItem( "testLabel", - dummyQueryHistory[0], + dummyQueryHistory[2], TreeItemCollapsibleState.None, ); const result = queryHistoryTreeItem.defineQueryIcon(false); From 186cd89dbaeab1132beea8d8658f1c7f593f9ec3 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Thu, 12 Sep 2024 11:26:12 +0100 Subject: [PATCH 38/99] [KXI-53468] - fix all icons --- resources/dark/aggicon.svg | 2 +- resources/dark/apiicon.svg | 2 +- ...ts-active.svg => conn-insights-active.svg} | 2 +- ...nected.svg => conn-insights-connected.svg} | 2 +- .../{p-insights.svg => conn-insights.svg} | 0 ...nection-active.svg => conn-kdb-active.svg} | 2 +- .../conn-kdb-connected.svg} | 2 +- .../dark/{p-q-connection.svg => conn-kdb.svg} | 2 +- resources/dark/dapicon.svg | 2 +- resources/dark/dictionaries.svg | 2 +- resources/dark/functions.svg | 2 +- resources/dark/metaicon.svg | 2 +- resources/dark/namespaces.svg | 2 +- resources/dark/packageicon.svg | 2 +- resources/dark/rcicon.svg | 2 +- resources/dark/schemaicon.svg | 2 +- resources/dark/tables.svg | 2 +- resources/dark/variables.svg | 2 +- resources/dark/views.svg | 2 +- ...ts-active.svg => conn-insights-active.svg} | 0 ...nected.svg => conn-insights-connected.svg} | 0 .../{p-insights.svg => conn-insights.svg} | 0 ...nection-active.svg => conn-kdb-active.svg} | 0 .../conn-kdb-connected.svg} | 0 .../{p-q-connection.svg => conn-kdb.svg} | 0 resources/light/p-data-active.svg | 12 -- resources/light/p-data-connected.svg | 12 -- resources/light/p-data.svg | 12 -- src/services/kdbTreeProvider.ts | 113 ++++-------------- 29 files changed, 39 insertions(+), 146 deletions(-) rename resources/dark/{p-insights-active.svg => conn-insights-active.svg} (96%) rename resources/dark/{p-insights-connected.svg => conn-insights-connected.svg} (96%) rename resources/dark/{p-insights.svg => conn-insights.svg} (100%) rename resources/dark/{p-q-connection-active.svg => conn-kdb-active.svg} (97%) rename resources/{light/p-q-connection-connected.svg => dark/conn-kdb-connected.svg} (97%) rename resources/dark/{p-q-connection.svg => conn-kdb.svg} (97%) rename resources/light/{p-insights-active.svg => conn-insights-active.svg} (100%) rename resources/light/{p-insights-connected.svg => conn-insights-connected.svg} (100%) rename resources/light/{p-insights.svg => conn-insights.svg} (100%) rename resources/light/{p-q-connection-active.svg => conn-kdb-active.svg} (100%) rename resources/{dark/p-q-connection-connected.svg => light/conn-kdb-connected.svg} (100%) rename resources/light/{p-q-connection.svg => conn-kdb.svg} (100%) delete mode 100644 resources/light/p-data-active.svg delete mode 100644 resources/light/p-data-connected.svg delete mode 100644 resources/light/p-data.svg diff --git a/resources/dark/aggicon.svg b/resources/dark/aggicon.svg index 66c14bd9..1db75480 100644 --- a/resources/dark/aggicon.svg +++ b/resources/dark/aggicon.svg @@ -1,7 +1,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/resources/dark/views.svg b/resources/dark/views.svg index dbf53924..1462e64b 100644 --- a/resources/dark/views.svg +++ b/resources/dark/views.svg @@ -1,7 +1,7 @@ - + - - - - - - - - \ No newline at end of file diff --git a/resources/light/p-data-connected.svg b/resources/light/p-data-connected.svg deleted file mode 100644 index d35ce4f2..00000000 --- a/resources/light/p-data-connected.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/resources/light/p-data.svg b/resources/light/p-data.svg deleted file mode 100644 index d1cb4bf5..00000000 --- a/resources/light/p-data.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/services/kdbTreeProvider.ts b/src/services/kdbTreeProvider.ts index 8aa0b3aa..f638fcdc 100644 --- a/src/services/kdbTreeProvider.ts +++ b/src/services/kdbTreeProvider.ts @@ -583,7 +583,7 @@ export class KdbNode extends TreeItem { : ""; } - iconPath = getNamedIconPath("p-q-connection", this.label); + iconPath = getNamedIconPath("conn-kdb", this.label); contextValue = this.label; // "root"; } @@ -631,7 +631,7 @@ export class InsightsNode extends TreeItem { : ""; } - iconPath = getNamedIconPath("p-insights", this.label); + iconPath = getNamedIconPath("conn-insights", this.label); contextValue = this.label; // "root"; } @@ -652,24 +652,7 @@ export class InsightsMetaNode extends TreeItem { return ""; } - iconPath = { - light: path.join( - __filename, - "..", - "..", - "resources", - "light", - "metaicon.svg", - ), - dark: path.join( - __filename, - "..", - "..", - "resources", - "dark", - "metaicon.svg", - ), - }; + iconPath = getOtherIconPath("metaicon"); contextValue = "meta"; } @@ -691,24 +674,7 @@ export class QNamespaceNode extends TreeItem { return ""; } - iconPath = { - light: path.join( - __filename, - "..", - "..", - "resources", - "light", - "namespaces.svg", - ), - dark: path.join( - __filename, - "..", - "..", - "resources", - "dark", - "namespaces.svg", - ), - }; + iconPath = getOtherIconPath("namespaces"); contextValue = "ns"; } @@ -730,24 +696,7 @@ export class QCategoryNode extends TreeItem { return ""; } - iconPath = { - light: path.join( - __filename, - "..", - "..", - "resources", - "light", - `${this.label.toLowerCase()}.svg`, - ), - dark: path.join( - __filename, - "..", - "..", - "resources", - "dark", - `${this.label.toLowerCase()}.svg`, - ), - }; + iconPath = getOtherIconPath(this.label.toLowerCase()); contextValue = this.ns; // "category"; } @@ -763,24 +712,7 @@ export class MetaObjectPayloadNode extends TreeItem { super(label, collapsibleState); this.description = ""; } - iconPath = { - light: path.join( - __filename, - "..", - "..", - "resources", - "light", - `${this.coreIcon}.svg`, - ), - dark: path.join( - __filename, - "..", - "..", - "resources", - "dark", - `${this.coreIcon}.svg`, - ), - }; + iconPath = getOtherIconPath(this.coreIcon); } export class QServerNode extends TreeItem { @@ -801,24 +733,7 @@ export class QServerNode extends TreeItem { return ""; } - iconPath = { - light: path.join( - __filename, - "..", - "..", - "resources", - "light", - `${this.coreIcon}.svg`, - ), - dark: path.join( - __filename, - "..", - "..", - "resources", - "dark", - `${this.coreIcon}.svg`, - ), - }; + iconPath = getOtherIconPath(this.coreIcon); contextValue = this.label; } @@ -885,3 +800,17 @@ function getNamedIconPath(name: string, label: string) { ), }; } + +function getOtherIconPath(name: string) { + return { + light: path.join( + __filename, + "..", + "..", + "resources", + "light", + name + ".svg", + ), + dark: path.join(__filename, "..", "..", "resources", "dark", name + ".svg"), + }; +} From d51a950e48d6a0f2c8aea28a7a4003f83458cf92 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Thu, 12 Sep 2024 11:28:16 +0100 Subject: [PATCH 39/99] remove unused command --- src/extension.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/extension.ts b/src/extension.ts index 609087fa..df327f94 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -306,7 +306,6 @@ export async function activate(context: ExtensionContext) { } else { kdbOutputLog("Connection label not found", "ERROR"); } - window.showInformationMessage("Select a view to open"); }, ), commands.registerCommand( From 40035febefcf6fcb7ef5ea72f9cf38480c56dd63 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Thu, 12 Sep 2024 15:22:20 +0100 Subject: [PATCH 40/99] fix icons --- src/extensionVariables.ts | 2 +- src/services/kdbTreeProvider.ts | 50 +++++++++++++++++---------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/extensionVariables.ts b/src/extensionVariables.ts index c8fe3be3..7b894df2 100644 --- a/src/extensionVariables.ts +++ b/src/extensionVariables.ts @@ -184,7 +184,7 @@ export namespace ext { "Tables", "Variables", "Views", - "Namespaces", + // "Namespaces", removed to investigate ]; export const qNamespaceFilters = [".q", ".Q", ".h", ".z", ".o", ".j", ".m"]; diff --git a/src/services/kdbTreeProvider.ts b/src/services/kdbTreeProvider.ts index f638fcdc..66b8e91a 100644 --- a/src/services/kdbTreeProvider.ts +++ b/src/services/kdbTreeProvider.ts @@ -278,7 +278,7 @@ export class KdbTreeProvider implements TreeDataProvider { `${ns === "." ? "" : ns + "."}${x.name}`, "", TreeItemCollapsibleState.None, - "p-dictionary", + "dictionaries", connLabel, ), ); @@ -297,7 +297,7 @@ export class KdbTreeProvider implements TreeDataProvider { `${ns === "." ? "" : ns + "."}${x.name}`, "", TreeItemCollapsibleState.None, - "p-function", + "functions", connLabel, ), ); @@ -316,7 +316,7 @@ export class KdbTreeProvider implements TreeDataProvider { `${ns === "." ? "" : ns + "."}${x.name}`, "", TreeItemCollapsibleState.None, - "p-table", + "tables", connLabel, ), ); @@ -335,7 +335,7 @@ export class KdbTreeProvider implements TreeDataProvider { `${ns === "." ? "" : ns + "."}${x.name}`, "", TreeItemCollapsibleState.None, - "p-var", + "variables", connLabel, ), ); @@ -354,7 +354,7 @@ export class KdbTreeProvider implements TreeDataProvider { `${ns === "." ? "" : "."}${x}`, "", TreeItemCollapsibleState.None, - "p-view", + "views", connLabel, ), ); @@ -363,26 +363,28 @@ export class KdbTreeProvider implements TreeDataProvider { } else { return new Array(); } - } else if (serverType.label === ext.qObjectCategories[5]) { - // nested namespaces - const namespaces = await loadNamespaces(ns); - const result = namespaces.map( - (x) => - new QNamespaceNode( - [], - x.fname, - "", - TreeItemCollapsibleState.Collapsed, - x.fname, - connLabel, - ), - ); - if (result !== undefined) { - return result; - } else { - return Array(); - } } + // Remove this for this moment, to investigate + // else if (serverType.label === ext.qObjectCategories[5]) { + // // nested namespaces + // const namespaces = await loadNamespaces(ns); + // const result = namespaces.map( + // (x) => + // new QNamespaceNode( + // [], + // x.fname, + // "", + // TreeItemCollapsibleState.Collapsed, + // x.fname, + // connLabel, + // ), + // ); + // if (result !== undefined) { + // return result; + // } else { + // return Array(); + // } + // } return new Array(); } From 09394a7ad37bf53090e9e0d70e3822627fc5c2da Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Thu, 12 Sep 2024 15:29:52 +0100 Subject: [PATCH 41/99] remove useless icons --- resources/dark/p-data-active.svg | 12 ------------ resources/dark/p-data-connected.svg | 12 ------------ resources/dark/p-data.svg | 12 ------------ resources/dark/p-dictionary.svg | 17 ----------------- resources/dark/p-file.svg | 13 ------------- resources/dark/p-folder.svg | 10 ---------- resources/dark/p-function.svg | 12 ------------ resources/dark/p-table.svg | 15 --------------- resources/dark/p-var.svg | 10 ---------- resources/dark/p-view.svg | 11 ----------- resources/light/p-dictionary.svg | 17 ----------------- resources/light/p-file.svg | 13 ------------- resources/light/p-folder.svg | 10 ---------- resources/light/p-function.svg | 12 ------------ resources/light/p-table.svg | 15 --------------- resources/light/p-var.svg | 10 ---------- resources/light/p-view.svg | 11 ----------- 17 files changed, 212 deletions(-) delete mode 100644 resources/dark/p-data-active.svg delete mode 100644 resources/dark/p-data-connected.svg delete mode 100644 resources/dark/p-data.svg delete mode 100644 resources/dark/p-dictionary.svg delete mode 100644 resources/dark/p-file.svg delete mode 100644 resources/dark/p-folder.svg delete mode 100644 resources/dark/p-function.svg delete mode 100644 resources/dark/p-table.svg delete mode 100644 resources/dark/p-var.svg delete mode 100644 resources/dark/p-view.svg delete mode 100644 resources/light/p-dictionary.svg delete mode 100644 resources/light/p-file.svg delete mode 100644 resources/light/p-folder.svg delete mode 100644 resources/light/p-function.svg delete mode 100644 resources/light/p-table.svg delete mode 100644 resources/light/p-var.svg delete mode 100644 resources/light/p-view.svg diff --git a/resources/dark/p-data-active.svg b/resources/dark/p-data-active.svg deleted file mode 100644 index 7646fe4f..00000000 --- a/resources/dark/p-data-active.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/resources/dark/p-data-connected.svg b/resources/dark/p-data-connected.svg deleted file mode 100644 index d35ce4f2..00000000 --- a/resources/dark/p-data-connected.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/resources/dark/p-data.svg b/resources/dark/p-data.svg deleted file mode 100644 index d1cb4bf5..00000000 --- a/resources/dark/p-data.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/resources/dark/p-dictionary.svg b/resources/dark/p-dictionary.svg deleted file mode 100644 index 0eb503a7..00000000 --- a/resources/dark/p-dictionary.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - icon - - - - - - - - - - - \ No newline at end of file diff --git a/resources/dark/p-file.svg b/resources/dark/p-file.svg deleted file mode 100644 index 37ba6181..00000000 --- a/resources/dark/p-file.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - icon - - - - - - - - \ No newline at end of file diff --git a/resources/dark/p-folder.svg b/resources/dark/p-folder.svg deleted file mode 100644 index 4b742afa..00000000 --- a/resources/dark/p-folder.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - icon - - - \ No newline at end of file diff --git a/resources/dark/p-function.svg b/resources/dark/p-function.svg deleted file mode 100644 index 661d1494..00000000 --- a/resources/dark/p-function.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - icon - - - - - \ No newline at end of file diff --git a/resources/dark/p-table.svg b/resources/dark/p-table.svg deleted file mode 100644 index 6a0c4513..00000000 --- a/resources/dark/p-table.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - icon - - - - - - - - - \ No newline at end of file diff --git a/resources/dark/p-var.svg b/resources/dark/p-var.svg deleted file mode 100644 index 6fc4c148..00000000 --- a/resources/dark/p-var.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - icon - - - - \ No newline at end of file diff --git a/resources/dark/p-view.svg b/resources/dark/p-view.svg deleted file mode 100644 index 83327bef..00000000 --- a/resources/dark/p-view.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - icon - - - - - \ No newline at end of file diff --git a/resources/light/p-dictionary.svg b/resources/light/p-dictionary.svg deleted file mode 100644 index 0eb503a7..00000000 --- a/resources/light/p-dictionary.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - icon - - - - - - - - - - - \ No newline at end of file diff --git a/resources/light/p-file.svg b/resources/light/p-file.svg deleted file mode 100644 index 37ba6181..00000000 --- a/resources/light/p-file.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - icon - - - - - - - - \ No newline at end of file diff --git a/resources/light/p-folder.svg b/resources/light/p-folder.svg deleted file mode 100644 index 4b742afa..00000000 --- a/resources/light/p-folder.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - icon - - - \ No newline at end of file diff --git a/resources/light/p-function.svg b/resources/light/p-function.svg deleted file mode 100644 index 661d1494..00000000 --- a/resources/light/p-function.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - icon - - - - - \ No newline at end of file diff --git a/resources/light/p-table.svg b/resources/light/p-table.svg deleted file mode 100644 index 6a0c4513..00000000 --- a/resources/light/p-table.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - icon - - - - - - - - - \ No newline at end of file diff --git a/resources/light/p-var.svg b/resources/light/p-var.svg deleted file mode 100644 index 6fc4c148..00000000 --- a/resources/light/p-var.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - icon - - - - \ No newline at end of file diff --git a/resources/light/p-view.svg b/resources/light/p-view.svg deleted file mode 100644 index 83327bef..00000000 --- a/resources/light/p-view.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - icon - - - - - \ No newline at end of file From f1daf8192cbb1f5ff5cc79c95a044231849f7f45 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 13 Sep 2024 09:36:16 +0100 Subject: [PATCH 42/99] remove console.log --- src/services/kdbTreeProvider.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/services/kdbTreeProvider.ts b/src/services/kdbTreeProvider.ts index 66b8e91a..465d867a 100644 --- a/src/services/kdbTreeProvider.ts +++ b/src/services/kdbTreeProvider.ts @@ -212,6 +212,7 @@ export class KdbTreeProvider implements TreeDataProvider { } } + /* istanbul ignore next */ private async getNamespaces(connLabel?: string): Promise { const ns = await loadNamespaces(); const result = ns.map( @@ -232,6 +233,7 @@ export class KdbTreeProvider implements TreeDataProvider { } } + /* istanbul ignore next */ private async getCategories( ns: string | undefined, objectCategories: string[], @@ -260,10 +262,10 @@ export class KdbTreeProvider implements TreeDataProvider { return result; } + /* istanbul ignore next */ private async getServerObjects( serverType: QCategoryNode | TreeItem, ): Promise { - console.log(serverType); if (serverType === undefined) return new Array(); const ns = serverType.contextValue ?? ""; const connLabel = From f0daa6ca2cec3b953e3b7f5a989578b58048a765 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 13 Sep 2024 10:28:26 +0100 Subject: [PATCH 43/99] add tests remove console.log --- test/suite/services.test.ts | 45 ++++++++++++++++++++++++++++++++++--- test/suite/utils.test.ts | 1 - test/suite/webview.test.ts | 1 - 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index 6e6231a2..ac08b685 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -849,7 +849,16 @@ describe("queryHistoryProvider", () => { query: dummyDS, success: false, connectionType: ServerType.KDB, + }, + { + executorName: "variables", + connectionName: "testConnectionName2", + time: "testTime2", + query: "testQuery2", + success: true, isFromConnTree: true, + connectionType: ServerType.KDB, + duration: "500", }, ]; beforeEach(() => { @@ -890,10 +899,25 @@ describe("queryHistoryProvider", () => { ); }); + it("Should return the KdbNode tree item element", () => { + const queryHistoryTreeItem = new QueryHistoryTreeItem( + "testLabel", + dummyQueryHistory[3], + TreeItemCollapsibleState.None, + ); + const queryHistoryProvider = new QueryHistoryProvider(); + const element = queryHistoryProvider.getTreeItem(queryHistoryTreeItem); + assert.strictEqual( + element.label, + queryHistoryTreeItem.label, + "Get query history item is incorrect", + ); + }); + it("Should return children for the tree when queryHistory has entries", async () => { const queryHistoryProvider = new QueryHistoryProvider(); const result = await queryHistoryProvider.getChildren(); - assert.strictEqual(result.length, 3, "Children count should be 3"); + assert.strictEqual(result.length, 4, "Children count should be 3"); }); it("Should not return children for the tree when queryHistory has no entries", async () => { @@ -918,7 +942,7 @@ describe("queryHistoryProvider", () => { "QueryHistoryTreeItem node creation failed", ); }); - it("Should return a new QueryHistoryTreeItem with sucess icom", () => { + it("Should return a new QueryHistoryTreeItem with sucess icon", () => { const queryHistoryTreeItem = new QueryHistoryTreeItem( "testLabel", dummyQueryHistory[0], @@ -932,7 +956,7 @@ describe("queryHistoryProvider", () => { ); }); - it("Should return a new QueryHistoryTreeItem with sucess icom", () => { + it("Should return a new QueryHistoryTreeItem with fail icon", () => { const queryHistoryTreeItem = new QueryHistoryTreeItem( "testLabel", dummyQueryHistory[2], @@ -945,6 +969,21 @@ describe("queryHistoryProvider", () => { "QueryHistoryTreeItem defineQueryIcon failed", ); }); + + it("Should return a new QueryHistoryTreeItem with sucess icon", () => { + const queryHistoryTreeItem = new QueryHistoryTreeItem( + "testLabel", + dummyQueryHistory[3], + TreeItemCollapsibleState.None, + ); + const result = queryHistoryTreeItem.defineQueryIcon(true); + console.log(JSON.stringify(queryHistoryTreeItem)); + assert.strictEqual( + result, + sucessIcon, + "QueryHistoryTreeItem defineQueryIcon failed", + ); + }); }); }); diff --git a/test/suite/utils.test.ts b/test/suite/utils.test.ts index c6d9b117..98b00083 100644 --- a/test/suite/utils.test.ts +++ b/test/suite/utils.test.ts @@ -981,7 +981,6 @@ describe("Utils", () => { inputSample.rows = [{ Value: "hello" }]; const expectedOutput = [{ Value: "hello" }]; const actualOutput = queryUtils.getValueFromArray(inputSample); - console.log(JSON.stringify(actualOutput.rows)); assert.deepEqual(actualOutput.rows, expectedOutput); }); diff --git a/test/suite/webview.test.ts b/test/suite/webview.test.ts index b9f2301c..689bbad4 100644 --- a/test/suite/webview.test.ts +++ b/test/suite/webview.test.ts @@ -420,7 +420,6 @@ describe("KdbNewConnectionView", () => { it("should render connection address for Bundled q", () => { const result = view.renderConnAddDesc(ServerType.KDB, true); - console.log(JSON.stringify(result)); assert.strictEqual( result.strings[0].includes("already set up for you"), true, From ca88117c2ffbb3d4a0752dbcb6b76ba54f935454 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 20 Sep 2024 14:26:11 +0100 Subject: [PATCH 44/99] add changes for future reset scratchpad --- src/classes/insightsConnection.ts | 78 +++++++++++------------- src/extension.ts | 1 + src/services/connectionManagerService.ts | 58 ++++++++---------- 3 files changed, 65 insertions(+), 72 deletions(-) diff --git a/src/classes/insightsConnection.ts b/src/classes/insightsConnection.ts index c927d9e0..1da63f89 100644 --- a/src/classes/insightsConnection.ts +++ b/src/classes/insightsConnection.ts @@ -42,7 +42,7 @@ export class InsightsConnection { public node: InsightsNode; public meta?: MetaObject; public config?: InsightsConfig; - public insightsVersion?: string; + public insightsVersion?: number; public connEndpoints?: InsightsEndpoints; constructor(connLabel: string, node: InsightsNode) { @@ -145,50 +145,46 @@ export class InsightsConnection { const version = match ? match[0].replace(/-/g, "") : null; if (version) { const [major, minor, _path] = version.split("."); - this.insightsVersion = `${major}.${minor}`; + this.insightsVersion = parseFloat(`${major}.${minor}`); } } public defineEndpoints() { - if (this.insightsVersion) { - switch (this.insightsVersion) { - // uncomment it when SCRATCHPAD merge to Insights - // case "1.11": - // this.connEndpoints = { - // scratchpad: { - // scratchpad: "scratchpad-manager/api/v1/execute/display", - // import: "scratchpad-manager/api/v1/execute/import/data", - // importSql: "scratchpad-manager/api/v1/execute/import/sql", - // importQsql: "scratchpad-manager/api/v1/execute/import/qsql", - // reset: "scratchpad-manager/api/v1/execute/reset", - // }, - // serviceGateway: { - // meta: "servicegateway/meta", - // data: "servicegateway/data", - // sql: "servicegateway/qe/sql", - // qsql: "servicegateway/qe/qsql", - // }, - // }; - // break; - default: - this.connEndpoints = { - scratchpad: { - scratchpad: "servicebroker/scratchpad/display", - import: "servicebroker/scratchpad/import/data", - importSql: "servicebroker/scratchpad/import/sql", - importQsql: "servicebroker/scratchpad/import/qsql", - reset: "servicebroker/scratchpad/reset", - }, - serviceGateway: { - meta: "servicegateway/meta", - data: "servicegateway/data", - sql: "servicegateway/qe/sql", - qsql: "servicegateway/qe/qsql", - }, - }; - break; - } - } + this.connEndpoints = { + scratchpad: { + scratchpad: "servicebroker/scratchpad/display", + import: "servicebroker/scratchpad/import/data", + importSql: "servicebroker/scratchpad/import/sql", + importQsql: "servicebroker/scratchpad/import/qsql", + reset: "servicebroker/scratchpad/reset", + }, + serviceGateway: { + meta: "servicegateway/meta", + data: "servicegateway/data", + sql: "servicegateway/qe/sql", + qsql: "servicegateway/qe/qsql", + }, + }; + // uncomment this WHEN the insights version is available + // if (this.insightsVersion) { + // if (this.insightsVersion >= 1.12) { + // this.connEndpoints = { + // scratchpad: { + // scratchpad: "scratchpad/execute/display", + // import: "scratchpad/execute/import/data", + // importSql: "scratchpad/execute/import/sql", + // importQsql: "scratchpad/execute/import/qsql", + // reset: "scratchpad/reset", + // }, + // serviceGateway: { + // meta: "servicegateway/meta", + // data: "servicegateway/data", + // sql: "servicegateway/qe/sql", + // qsql: "servicegateway/qe/qsql", + // }, + // }; + // } + // } } public retrieveEndpoints( diff --git a/src/extension.ts b/src/extension.ts index df327f94..973beb1c 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -58,6 +58,7 @@ import { refreshGetMeta, removeConnection, rerunQuery, + resetScratchPad, } from "./commands/serverCommand"; import { showInstallationDetails } from "./commands/walkthroughCommand"; import { ext } from "./extensionVariables"; diff --git a/src/services/connectionManagerService.ts b/src/services/connectionManagerService.ts index 15938648..694be3d3 100644 --- a/src/services/connectionManagerService.ts +++ b/src/services/connectionManagerService.ts @@ -340,41 +340,37 @@ export class ConnectionManagementService { } public async resetScratchpad(): Promise { - let error = true; - if (!ext.activeConnection) { - window.showErrorMessage( - "Please active an Insights connection to use this feature.", + if ( + !ext.activeConnection || + !(ext.activeConnection instanceof InsightsConnection) + ) { + kdbOutputLog( + "[RESET SCRATCHPAD] Please activate an Insights connection to use this feature.", + "ERROR", ); return; } - const confirmationPromt = { - prompt: - "Are you sure you want to reset the scratchpad from the connecttion " + - ext.activeConnection.connLabel + - "?", - option1: "Yes", - option2: "No", - }; - await window - .showInformationMessage( - confirmationPromt.prompt, - confirmationPromt.option1, - confirmationPromt.option2, - ) - .then(async (selection) => { - if (selection === confirmationPromt.option1) { - if (ext.activeConnection instanceof InsightsConnection) { - error = false; - return await ext.activeConnection.resetScratchpad(); - } else { - return; - } - } - }); + const { insightsVersion, connLabel } = ext.activeConnection; + + if (insightsVersion && insightsVersion > 1.1) { + const confirmationPrompt = `Are you sure you want to reset the scratchpad from the connection ${connLabel}?`; + const selection = await window.showInformationMessage( + confirmationPrompt, + "Yes", + "No", + ); - if (error) { - window.showErrorMessage( - "This feature is only available for Insights connections.", + if (selection === "Yes") { + await ext.activeConnection.resetScratchpad(); + } else { + window.showErrorMessage( + "This feature is only available for Insights connections.", + ); + } + } else { + kdbOutputLog( + "[RESET SCRATCHPAD] Please connect to an Insights connection with version superior to 1.10", + "ERROR", ); } } From e436e045262b84b07d61cda2b04c5946bcf90954 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 23 Sep 2024 09:33:22 +0100 Subject: [PATCH 45/99] fix tests --- src/services/connectionManagerService.ts | 8 ++--- test/suite/services.test.ts | 41 ++++++++++++++++-------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/services/connectionManagerService.ts b/src/services/connectionManagerService.ts index 694be3d3..e9a2ab34 100644 --- a/src/services/connectionManagerService.ts +++ b/src/services/connectionManagerService.ts @@ -352,7 +352,7 @@ export class ConnectionManagementService { } const { insightsVersion, connLabel } = ext.activeConnection; - if (insightsVersion && insightsVersion > 1.1) { + if (insightsVersion && insightsVersion > 1.2) { const confirmationPrompt = `Are you sure you want to reset the scratchpad from the connection ${connLabel}?`; const selection = await window.showInformationMessage( confirmationPrompt, @@ -362,14 +362,10 @@ export class ConnectionManagementService { if (selection === "Yes") { await ext.activeConnection.resetScratchpad(); - } else { - window.showErrorMessage( - "This feature is only available for Insights connections.", - ); } } else { kdbOutputLog( - "[RESET SCRATCHPAD] Please connect to an Insights connection with version superior to 1.10", + "[RESET SCRATCHPAD] Please connect to an Insights connection with version superior to 1.11", "ERROR", ); } diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index ac08b685..783ac5d1 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -69,6 +69,7 @@ import { ServerType, } from "../../src/models/connectionsModels"; import AuthSettings from "../../src/utils/secretStorage"; +import * as coreUtils from "../../src/utils/core"; // eslint-disable-next-line @typescript-eslint/no-var-requires const codeFlow = require("../../src/services/kdbInsights/codeFlowLogin"); @@ -1314,35 +1315,49 @@ describe("connectionManagerService", () => { describe("resetScratchpad", () => { let connMngService: ConnectionManagementService; - let showErrorMessageStub: sinon.SinonStub; - let showInformationMessageStub: sinon.SinonStub; let resetScratchpadStub: sinon.SinonStub; + let kdbOutputLogStub: sinon.SinonStub; + let showInformationMessageStub: sinon.SinonStub; + let showErrorMessageStub: sinon.SinonStub; beforeEach(() => { connMngService = new ConnectionManagementService(); - showErrorMessageStub = sinon.stub(window, "showErrorMessage"); - showInformationMessageStub = sinon.stub(window, "showInformationMessage"); ext.activeConnection = insightsConn; resetScratchpadStub = sinon.stub(ext.activeConnection, "resetScratchpad"); + kdbOutputLogStub = sinon.stub(coreUtils, "kdbOutputLog"); + showInformationMessageStub = sinon.stub(window, "showInformationMessage"); + showErrorMessageStub = sinon.stub(window, "showErrorMessage"); }); afterEach(() => { sinon.restore(); }); - it("should call resetScratchpad on activeConnection if selection is Yes and activeConnection is an instance of InsightsConnection", async () => { - showInformationMessageStub.resolves("Yes"); + it("should log an error if there is no active connection", async () => { + ext.activeConnection = null; + await connMngService.resetScratchpad(); + sinon.assert.calledWith( + kdbOutputLogStub, + "[RESET SCRATCHPAD] Please activate an Insights connection to use this feature.", + "ERROR", + ); + }); + + it("should log an error if the active connection is not an InsightsConnection", async () => { + ext.activeConnection = localConn; await connMngService.resetScratchpad(); - sinon.assert.calledOnce(resetScratchpadStub); - sinon.assert.notCalled(showErrorMessageStub); + sinon.assert.calledWith( + kdbOutputLogStub, + "[RESET SCRATCHPAD] Please activate an Insights connection to use this feature.", + "ERROR", + ); }); - it("should show error message if activeConnection is not an instance of InsightsConnection", async () => { - showInformationMessageStub.resolves("Yes"); - ext.activeConnection = undefined; + it("should log an error if insightsVersion is less than or equal to 1.10", async () => { + ext.activeConnection = insightsConn; + ext.activeConnection.insightsVersion = 1.11; await connMngService.resetScratchpad(); - sinon.assert.calledOnce(showErrorMessageStub); - sinon.assert.notCalled(resetScratchpadStub); + sinon.assert.calledOnce(kdbOutputLogStub); }); }); From e2334cfcba49737a1aa6ba2a397094fbdf97af71 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 23 Sep 2024 10:01:15 +0100 Subject: [PATCH 46/99] add more tests --- src/services/connectionManagerService.ts | 8 +++++--- test/suite/services.test.ts | 10 +++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/services/connectionManagerService.ts b/src/services/connectionManagerService.ts index e9a2ab34..d338706a 100644 --- a/src/services/connectionManagerService.ts +++ b/src/services/connectionManagerService.ts @@ -350,10 +350,12 @@ export class ConnectionManagementService { ); return; } - const { insightsVersion, connLabel } = ext.activeConnection; - if (insightsVersion && insightsVersion > 1.2) { - const confirmationPrompt = `Are you sure you want to reset the scratchpad from the connection ${connLabel}?`; + if ( + ext.activeConnection.insightsVersion && + ext.activeConnection.insightsVersion >= 1.12 + ) { + const confirmationPrompt = `Are you sure you want to reset the scratchpad from the connection ${ext.activeConnection.connLabel}?`; const selection = await window.showInformationMessage( confirmationPrompt, "Yes", diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index 783ac5d1..ed4839fd 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -1353,7 +1353,15 @@ describe("connectionManagerService", () => { ); }); - it("should log an error if insightsVersion is less than or equal to 1.10", async () => { + it("should reset the scratchpad if the active connection is an InsightsConnection", async () => { + ext.activeConnection = insightsConn; + ext.activeConnection.insightsVersion = 1.12; + showInformationMessageStub.resolves("Yes"); + await connMngService.resetScratchpad(); + sinon.assert.calledOnce(resetScratchpadStub); + }); + + it("should log an error if insightsVersion is less than or equal to 1.11", async () => { ext.activeConnection = insightsConn; ext.activeConnection.insightsVersion = 1.11; await connMngService.resetScratchpad(); From a9880ac63748baa3f8ee2d371cc8036c5bbd5c78 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 24 Sep 2024 14:12:08 +0100 Subject: [PATCH 47/99] add logic for rowLimit logic for DS --- src/models/dataSource.ts | 6 ++ src/models/messages.ts | 1 + src/services/connectionManagerService.ts | 8 +++ src/services/dataSourceEditorProvider.ts | 5 +- src/webview/components/kdbDataSourceView.ts | 79 ++++++++++++++++++++- 5 files changed, 97 insertions(+), 2 deletions(-) diff --git a/src/models/dataSource.ts b/src/models/dataSource.ts index a74928a7..33b3ea63 100644 --- a/src/models/dataSource.ts +++ b/src/models/dataSource.ts @@ -17,6 +17,7 @@ export enum DataSourceTypes { SQL = "SQL", } +//TODO: make the optional params required in 1.10 or superior export interface DataSourceFiles { name?: string; originalName?: string; @@ -30,6 +31,8 @@ export interface DataSourceFiles { endTS: string; fill: string; temporality: string; + rowCountLimit?: string; + isRowLimitLast?: boolean; filter: string[]; groupBy: string[]; agg: string[]; @@ -44,6 +47,7 @@ export interface DataSourceFiles { sorts: Sort[]; aggs: Agg[]; groups: Group[]; + rowLimit?: boolean; }; }; qsql: { @@ -68,6 +72,8 @@ export function createDefaultDataSourceFile(): DataSourceFiles { endTS: "", fill: "zero", temporality: "snapshot", + rowCountLimit: "100000", + isRowCountLast: true, filter: [], groupBy: [], agg: [], diff --git a/src/models/messages.ts b/src/models/messages.ts index 8b51000a..222ebe4f 100644 --- a/src/models/messages.ts +++ b/src/models/messages.ts @@ -38,6 +38,7 @@ export interface DataSourceMessage2 { command: DataSourceCommand; servers: string[]; selectedServer: string; + selectedServerVersion: number; isInsights: boolean; insightsMeta: MetaObjectPayload; dataSourceFile: DataSourceFiles; diff --git a/src/services/connectionManagerService.ts b/src/services/connectionManagerService.ts index d338706a..3f439d8a 100644 --- a/src/services/connectionManagerService.ts +++ b/src/services/connectionManagerService.ts @@ -446,6 +446,14 @@ export class ConnectionManagementService { } } + public async retrieveInsightsConnVersion(connLabel: string): Promise { + const connection = this.retrieveConnectedConnection(connLabel); + if (!connection || !(connection instanceof InsightsConnection)) { + return 0; + } + return connection.insightsVersion ? connection.insightsVersion : 0; + } + public exportConnection(connLabel?: string, includeAuth?: boolean): string { const exportedContent: ExportedConnections = { connections: { diff --git a/src/services/dataSourceEditorProvider.ts b/src/services/dataSourceEditorProvider.ts index 2fed725c..ab5a7c93 100644 --- a/src/services/dataSourceEditorProvider.ts +++ b/src/services/dataSourceEditorProvider.ts @@ -106,15 +106,19 @@ export class DataSourceEditorProvider implements CustomTextEditorProvider { webview.options = { enableScripts: true }; webview.html = this.getWebviewContent(webview); let changing = 0; + const connMngService = new ConnectionManagementService(); const updateWebview = async () => { if (changing === 0) { const selectedServer = getServerForUri(document.uri) || ""; + const selectedServerVersion = + await connMngService.retrieveInsightsConnVersion(selectedServer); await getConnectionForServer(selectedServer); webview.postMessage({ command: DataSourceCommand.Update, selectedServer, servers: getInsightsServers(), + selectedServerVersion, dataSourceFile: this.getDocumentAsJson(document), insightsMeta: await this.getMeta(selectedServer), isInsights: true, @@ -173,7 +177,6 @@ export class DataSourceEditorProvider implements CustomTextEditorProvider { ); break; case DataSourceCommand.Refresh: - const connMngService = new ConnectionManagementService(); const selectedServer = getServerForUri(document.uri) || ""; if (!connMngService.isConnected(selectedServer)) { offerConnectAction(selectedServer); diff --git a/src/webview/components/kdbDataSourceView.ts b/src/webview/components/kdbDataSourceView.ts index 5c8af2e6..aee60af7 100644 --- a/src/webview/components/kdbDataSourceView.ts +++ b/src/webview/components/kdbDataSourceView.ts @@ -64,6 +64,10 @@ export class KdbDataSourceView extends LitElement { selectedApi = ""; selectedTable = ""; startTS = ""; + rowLimitCount = "100000"; + isRowLimitLast = true; + rowLimit = false; + selectedServerVersion = 0; endTS = ""; fill = ""; filled = false; @@ -97,6 +101,7 @@ export class KdbDataSourceView extends LitElement { if (msg.command === DataSourceCommand.Update) { this.servers = msg.servers; this.selectedServer = msg.selectedServer; + this.selectedServerVersion = msg.selectedServerVersion; this.isInsights = msg.isInsights; this.isMetaLoaded = !!msg.insightsMeta.dap; this.insightsMeta = msg.insightsMeta; @@ -107,6 +112,12 @@ export class KdbDataSourceView extends LitElement { this.startTS = ds.dataSource.api.startTS; this.endTS = ds.dataSource.api.endTS; this.fill = ds.dataSource.api.fill; + this.rowLimitCount = ds.dataSource.api.rowCountLimit + ? ds.dataSource.api.rowCountLimit + : "100000"; + this.isRowLimitLast = ds.dataSource.api.isRowLimitLast + ? ds.dataSource.api.isRowLimitLast + : true; this.temporality = ds.dataSource.api.temporality; this.qsqlTarget = ds.dataSource.qsql.selectedTarget; this.qsql = ds.dataSource.qsql.query; @@ -120,6 +131,7 @@ export class KdbDataSourceView extends LitElement { this.sorts = optional.sorts; this.aggs = optional.aggs; this.groups = optional.groups; + this.rowLimit = optional.rowLimit ? optional.rowLimit : false; } this.requestUpdate(); } @@ -137,6 +149,8 @@ export class KdbDataSourceView extends LitElement { startTS: this.startTS, endTS: this.endTS, fill: this.fill, + rowCountLimit: this.rowLimitCount, + isRowLimitLast: this.isRowLimitLast, temporality: this.temporality, filter: [], groupBy: [], @@ -152,6 +166,7 @@ export class KdbDataSourceView extends LitElement { sorts: this.sorts, aggs: this.aggs, groups: this.groups, + rowLimit: this.rowLimit, }, }, qsql: { @@ -222,6 +237,68 @@ export class KdbDataSourceView extends LitElement { }); } + renderRowCountOptions() { + if (this.selectedServerVersion >= 1.11) { + return html` +
+ +
+ + + +
+ + +
+ First +
+
+ Last +
+ +
+ `; + } else { + this.rowLimit = false; + this.rowLimitCount = "100000"; + this.isRowLimitLast = true; + } + } + renderApiOptions() { if (this.isInsights && this.isMetaLoaded) { return this.insightsMeta.api @@ -795,7 +872,7 @@ export class KdbDataSourceView extends LitElement { >End Time
- + ${this.renderRowCountOptions()}
Date: Wed, 25 Sep 2024 11:17:22 +0100 Subject: [PATCH 48/99] fix bug and tests --- src/services/resultsPanelProvider.ts | 14 +++++++------- test/suite/panels.test.ts | 7 ++++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/services/resultsPanelProvider.ts b/src/services/resultsPanelProvider.ts index ab7d1058..4dc32103 100644 --- a/src/services/resultsPanelProvider.ts +++ b/src/services/resultsPanelProvider.ts @@ -176,7 +176,7 @@ export class KdbResultsViewProvider implements WebviewViewProvider { } } - convertToGrid(results: any, isInsights: boolean): string { + convertToGrid(results: any, isInsights: boolean): any { const queryResult = isInsights ? results.rows : results; const columnDefs = this.generateCoumnDefs(results, isInsights); @@ -199,7 +199,7 @@ export class KdbResultsViewProvider implements WebviewViewProvider { if (rowData.length > 0) { ext.resultPanelCSV = this.convertToCsv(rowData).join("\n"); } - return JSON.stringify({ + return { defaultColDef: { sortable: true, resizable: true, @@ -217,7 +217,7 @@ export class KdbResultsViewProvider implements WebviewViewProvider { suppressContextMenu: true, suppressDragLeaveHidesColumns: true, tooltipShowDelay: 200, - }); + }; } isVisible(): boolean { @@ -266,7 +266,7 @@ export class KdbResultsViewProvider implements WebviewViewProvider { ]); const nonce = getNonce(); let result = ""; - let gridOptionsString = ""; + let gridOptions = undefined; let isGrid = false; if (typeof queryResult === "string" || typeof queryResult === "number") { @@ -278,11 +278,11 @@ export class KdbResultsViewProvider implements WebviewViewProvider { : "

No results to show

"; } else if (queryResult) { isGrid = true; - gridOptionsString = this.convertToGrid(queryResult, !!isInsights); + gridOptions = this.convertToGrid(queryResult, !!isInsights); } result = - gridOptionsString === "" + gridOptions === undefined ? result !== "" ? result : "

No results to show

" @@ -317,7 +317,7 @@ export class KdbResultsViewProvider implements WebviewViewProvider { document.addEventListener('DOMContentLoaded', () => { if(${isGrid}){ const gridDiv = document.getElementById('grid'); - const obj = JSON.parse('${gridOptionsString}'); + const obj = ${JSON.stringify(gridOptions)}; const gridApi = agGrid.createGrid(gridDiv, obj); document.getElementById("results").scrollIntoView(); } diff --git a/test/suite/panels.test.ts b/test/suite/panels.test.ts index 71570fc8..fe769d42 100644 --- a/test/suite/panels.test.ts +++ b/test/suite/panels.test.ts @@ -227,7 +227,7 @@ describe("WebPanels", () => { stub.get(() => insightsConn); const output = resultsPanel.convertToGrid(results, true); - assert.equal(output, expectedOutput); + assert.equal(JSON.stringify(output), expectedOutput); // Restore the stub stub.restore(); @@ -277,7 +277,7 @@ describe("WebPanels", () => { stub.get(() => insightsConn); const output = resultsPanel.convertToGrid(results, true); - assert.equal(output, expectedOutput); + assert.equal(JSON.stringify(output), expectedOutput); // Restore the stub stub.restore(); @@ -416,11 +416,12 @@ describe("WebPanels", () => { { id: 1, test: "test1" }, { id: 2, test: "test2" }, ]; - const expectedOutput = `"rowData":[{"id":1,"test":"test1"},{"id":2,"test":"test2"}],"columnDefs":[{"field":"id","headerName":"id"},{"field":"test","headerName":"test"}]`; + const expectedOutput = `agGrid.createGrid(gridDiv, obj)`; const stub = sinon .stub(resultsPanel, "convertToGrid") .returns(expectedOutput); const actualOutput = resultsPanel["_getWebviewContent"](input); + console.log(actualOutput); assert.strictEqual(typeof actualOutput, "string"); assert.ok(actualOutput.includes(expectedOutput)); stub.restore(); From 7a09ec9cde0f8340059be6a932e93c81051f06da Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Mon, 30 Sep 2024 12:52:40 +0100 Subject: [PATCH 49/99] refactory the results panel --- src/commands/serverCommand.ts | 2 +- src/extension.ts | 8 +- src/services/resultsPanelProvider.ts | 195 ++++++++++++++++----------- src/webview/styles/resultsPanel.css | 3 +- test/suite/commands.test.ts | 1 - test/suite/panels.test.ts | 32 +---- 6 files changed, 122 insertions(+), 119 deletions(-) diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index 9c030481..571d563c 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -1088,7 +1088,7 @@ export function writeQueryResultsToView( duration?: string, isFromConnTree?: boolean, ): void { - commands.executeCommand("kdb.resultsPanel.update", result, isInsights, type); + commands.executeCommand("kdb.resultsPanel.update", result, isInsights); if (!checkIfIsDatasource(type)) { addQueryHistory( query, diff --git a/src/extension.ts b/src/extension.ts index 973beb1c..05c51176 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -204,12 +204,8 @@ export async function activate(context: ExtensionContext) { ), commands.registerCommand( "kdb.resultsPanel.update", - (results: string, isInsights: boolean, dataSourceType?: string) => { - ext.resultsViewProvider.updateResults( - results, - isInsights, - dataSourceType, - ); + (results: string, isInsights: boolean) => { + ext.resultsViewProvider.updateResults(results, isInsights); }, ), commands.registerCommand("kdb.resultsPanel.clear", () => { diff --git a/src/services/resultsPanelProvider.ts b/src/services/resultsPanelProvider.ts index 4dc32103..eed8071c 100644 --- a/src/services/resultsPanelProvider.ts +++ b/src/services/resultsPanelProvider.ts @@ -23,11 +23,13 @@ import { ext } from "../extensionVariables"; import * as utils from "../utils/execution"; import { getNonce } from "../utils/getNonce"; import { getUri } from "../utils/getUri"; +import { kdbOutputLog } from "../utils/core"; export class KdbResultsViewProvider implements WebviewViewProvider { public static readonly viewType = "kdb-results"; - private _view?: WebviewView; + public isInsights = false; public _colorTheme: any; + private _view?: WebviewView; private _results: string | string[] = ""; constructor(private readonly _extensionUri: Uri) { @@ -48,10 +50,11 @@ export class KdbResultsViewProvider implements WebviewViewProvider { localResourceRoots: [Uri.joinPath(this._extensionUri, "out")], }; - webviewView.webview.html = this._getWebviewContent(""); + webviewView.webview.html = this._getWebviewContent(); + this.updateWebView(""); webviewView.webview.onDidReceiveMessage((data) => { - webviewView.webview.html = this._getWebviewContent(data); + this.updateWebView(data); }); webviewView.onDidChangeVisibility(() => { ext.isResultsTabVisible = webviewView.visible; @@ -62,19 +65,11 @@ export class KdbResultsViewProvider implements WebviewViewProvider { }); } - public updateResults( - queryResults: any, - isInsights?: boolean, - dataSourceType?: string, - ) { + public updateResults(queryResults: any, isInsights?: boolean) { if (this._view) { this._view.show?.(true); - this._view.webview.postMessage(queryResults); - this._view.webview.html = this._getWebviewContent( - queryResults, - isInsights, - dataSourceType, - ); + this.isInsights = !!isInsights; + this.updateWebView(queryResults); } } @@ -251,13 +246,39 @@ export class KdbResultsViewProvider implements WebviewViewProvider { : ""; } - private _getWebviewContent( - queryResult: any, - isInsights?: boolean, - _dataSourceType?: string, - ) { + public updateWebView(queryResult: any) { ext.resultPanelCSV = ""; this._results = queryResult; + let result = ""; + let gridOptions = undefined; + if (!this._view) { + kdbOutputLog("[Results Tab] No view to update", "ERROR"); + return; + } + if (typeof queryResult === "string" || typeof queryResult === "number") { + result = + queryResult !== "" + ? `

${queryResult + .toString() + .replace(/\n/g, "
")}

` + : "

No results to show

"; + } else if (queryResult) { + gridOptions = this.convertToGrid(queryResult, this.isInsights); + } + if (gridOptions) { + this._view.webview.postMessage({ + command: "setGridOptions", + gridOptions: gridOptions, + }); + } else { + this._view.webview.postMessage({ + command: "setResultsContent", + results: result, + }); + } + } + + private _getWebviewContent() { const agGridTheme = this.defineAgGridTheme(); if (this._view) { const webviewUri = getUri(this._view.webview, this._extensionUri, [ @@ -265,70 +286,82 @@ export class KdbResultsViewProvider implements WebviewViewProvider { "webview.js", ]); const nonce = getNonce(); - let result = ""; - let gridOptions = undefined; + return /*html*/ ` + + + + + + + + + + + Q Results + + + +
+
+
+ +
+ - - -
-
- ${result} -
-
- -
- - - - `; + function restoreColumnWidths(columnWidths) { + if (!gridApi || !columnWidths) return; + columnWidths.forEach(colWidth => { + gridApi.getColumnState().forEach(colState => { + if (colState.colId === colWidth.colId) { + colState.width = colWidth.width; + } + }); + }); + gridApi.setColumnState(gridApi.getColumnState()); + } + + window.addEventListener('message', event => { + const message = event.data; + if (message.command === 'setGridOptions') { + const columnWidths = saveColumnWidths(); + const gridOptions = message.gridOptions; + const gridDiv = document.getElementById('grid'); + const resultsDiv = document.querySelector('#results .content-wrapper'); + resultsDiv.innerHTML = ''; + gridDiv.innerHTML = ''; + gridApi = agGrid.createGrid(gridDiv, gridOptions); + restoreColumnWidths(columnWidths); + document.getElementById("results").scrollIntoView(); + } else if (message.command === 'setResultsContent') { + const resultsContent = message.results; + const resultsDiv = document.querySelector('#results .content-wrapper'); + const gridDiv = document.getElementById('grid'); + gridDiv.innerHTML = ''; + resultsDiv.innerHTML = ''; + resultsDiv.innerHTML = resultsContent; + } + }); + document.addEventListener('contextmenu', (e) => { + e.stopImmediatePropagation(); + }, true); + + + + `; } else { return ""; } diff --git a/src/webview/styles/resultsPanel.css b/src/webview/styles/resultsPanel.css index f4c9a235..c181e93a 100644 --- a/src/webview/styles/resultsPanel.css +++ b/src/webview/styles/resultsPanel.css @@ -1,7 +1,8 @@ html, body { height: 86vh; - width: 100%; + width: 99%; + padding: 0; box-sizing: border-box; -webkit-overflow-scrolling: touch; } diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts index 85499472..6d997fa6 100644 --- a/test/suite/commands.test.ts +++ b/test/suite/commands.test.ts @@ -1307,7 +1307,6 @@ describe("serverCommand", () => { "kdb.resultsPanel.update", result, false, - "WORKBOOK", ); executeCommandStub.restore(); diff --git a/test/suite/panels.test.ts b/test/suite/panels.test.ts index fe769d42..7af06678 100644 --- a/test/suite/panels.test.ts +++ b/test/suite/panels.test.ts @@ -411,35 +411,9 @@ describe("WebPanels", () => { resultsPanel["_view"] = view; }); - it("returns a table", () => { - const input = [ - { id: 1, test: "test1" }, - { id: 2, test: "test2" }, - ]; - const expectedOutput = `agGrid.createGrid(gridDiv, obj)`; - const stub = sinon - .stub(resultsPanel, "convertToGrid") - .returns(expectedOutput); - const actualOutput = resultsPanel["_getWebviewContent"](input); - console.log(actualOutput); - assert.strictEqual(typeof actualOutput, "string"); - assert.ok(actualOutput.includes(expectedOutput)); - stub.restore(); - }); - - it("returns string results", () => { - const input = "Test"; - const expectedOutput = `

Test

`; - const actualOutput = resultsPanel["_getWebviewContent"](input); - assert.strictEqual(typeof actualOutput, "string"); - assert.ok(actualOutput.includes(expectedOutput)); - }); - - it("returns no results", () => { - const input = ""; - const expectedOutput = `

No results to show

`; - const actualOutput = resultsPanel["_getWebviewContent"](input); - assert.strictEqual(typeof actualOutput, "string"); + it("should render the results tab", () => { + const expectedOutput = ` id="results" class="results-view-container"`; + const actualOutput = resultsPanel["_getWebviewContent"](); assert.ok(actualOutput.includes(expectedOutput)); }); }); From ae3e11e11b56283413176a9f16c66489862dc4c2 Mon Sep 17 00:00:00 2001 From: ecmel Date: Mon, 30 Sep 2024 21:40:25 +0300 Subject: [PATCH 50/99] implemented mult file server features --- server/src/qLangServer.ts | 180 +++++++++++++++++++++++++++------ src/extension.ts | 14 +++ test/suite/qLangServer.test.ts | 35 +++++++ test/suite/utils.test.ts | 4 +- 4 files changed, 199 insertions(+), 34 deletions(-) diff --git a/server/src/qLangServer.ts b/server/src/qLangServer.ts index 0529e1e8..81fcac8d 100644 --- a/server/src/qLangServer.ts +++ b/server/src/qLangServer.ts @@ -13,6 +13,12 @@ import { Position, TextDocument } from "vscode-languageserver-textdocument"; import { + CallHierarchyIncomingCall, + CallHierarchyIncomingCallsParams, + CallHierarchyItem, + CallHierarchyOutgoingCall, + CallHierarchyOutgoingCallsParams, + CallHierarchyPrepareParams, CompletionItem, CompletionItemKind, CompletionParams, @@ -90,6 +96,15 @@ export default class QLangServer { this.connection.onDefinition(this.onDefinition.bind(this)); this.connection.onRenameRequest(this.onRenameRequest.bind(this)); this.connection.onCompletion(this.onCompletion.bind(this)); + this.connection.languages.callHierarchy.onPrepare( + this.onPrepareCallHierarchy.bind(this), + ); + this.connection.languages.callHierarchy.onIncomingCalls( + this.onIncomingCallsCallHierarchy.bind(this), + ); + this.connection.languages.callHierarchy.onOutgoingCalls( + this.onOutgoingCallsCallHierarchy.bind(this), + ); this.connection.onDidChangeConfiguration( this.onDidChangeConfiguration.bind(this), ); @@ -113,6 +128,7 @@ export default class QLangServer { renameProvider: true, completionProvider: { resolveProvider: false }, selectionRangeProvider: true, + callHierarchyProvider: true, }; } @@ -171,9 +187,16 @@ export default class QLangServer { public onReferences({ textDocument, position }: ReferenceParams): Location[] { const tokens = this.parse(textDocument); const source = positionToToken(tokens, position); - return findIdentifiers(FindKind.Reference, tokens, source).map((token) => - Location.create(textDocument.uri, rangeFromToken(token)), - ); + return this.documents + .all() + .map((document) => + findIdentifiers( + FindKind.Reference, + document.uri === textDocument.uri ? tokens : this.parse(document), + source, + ).map((token) => Location.create(document.uri, rangeFromToken(token))), + ) + .flat(); } public onDefinition({ @@ -182,34 +205,45 @@ export default class QLangServer { }: DefinitionParams): Location[] { const tokens = this.parse(textDocument); const source = positionToToken(tokens, position); - return findIdentifiers(FindKind.Definition, tokens, source).map((token) => - Location.create(textDocument.uri, rangeFromToken(token)), - ); + return this.documents + .all() + .map((document) => + findIdentifiers( + FindKind.Definition, + document.uri === textDocument.uri ? tokens : this.parse(document), + source, + ).map((token) => Location.create(document.uri, rangeFromToken(token))), + ) + .flat(); } public onRenameRequest({ textDocument, position, newName, - }: RenameParams): WorkspaceEdit | null { + }: RenameParams): WorkspaceEdit { const tokens = this.parse(textDocument); const source = positionToToken(tokens, position); - const refs = findIdentifiers(FindKind.Rename, tokens, source); - if (refs.length === 0) { - return null; - } - const name = { - image: newName, - namespace: source?.namespace, - }; - const edits = refs.map((token) => { - return TextEdit.replace(rangeFromToken(token), relative(name, token)); - }); - return { - changes: { - [textDocument.uri]: edits, + return this.documents.all().reduce( + (edit, document) => { + const refs = findIdentifiers( + FindKind.Rename, + document.uri === textDocument.uri ? tokens : this.parse(document), + source, + ); + if (refs.length > 0) { + const name = { + image: newName, + namespace: source?.namespace, + }; + edit.changes![document.uri] = refs.map((token) => + TextEdit.replace(rangeFromToken(token), relative(name, token)), + ); + } + return edit; }, - }; + { changes: {} } as WorkspaceEdit, + ); } public onCompletion({ @@ -218,16 +252,25 @@ export default class QLangServer { }: CompletionParams): CompletionItem[] { const tokens = this.parse(textDocument); const source = positionToToken(tokens, position); - return findIdentifiers(FindKind.Completion, tokens, source).map((token) => { - return { - label: token.image, - labelDetails: { - detail: ` .${namespace(token)}`, - }, - kind: CompletionItemKind.Variable, - insertText: relative(token, source), - }; - }); + return this.documents + .all() + .map((document) => + findIdentifiers( + FindKind.Completion, + document.uri === textDocument.uri ? tokens : this.parse(document), + source, + ).map((token) => { + return { + label: token.image, + labelDetails: { + detail: ` .${namespace(token)}`, + }, + kind: CompletionItemKind.Variable, + insertText: relative(token, source), + }; + }), + ) + .flat(); } public onExpressionRange({ @@ -300,6 +343,79 @@ export default class QLangServer { return ranges; } + public onPrepareCallHierarchy({ + textDocument, + position, + }: CallHierarchyPrepareParams): CallHierarchyItem[] { + const tokens = this.parse(textDocument); + const source = positionToToken(tokens, position); + if (source && assignable(source)) { + return [ + { + kind: SymbolKind.Variable, + name: source.image, + uri: textDocument.uri, + range: rangeFromToken(source), + selectionRange: rangeFromToken(source), + }, + ]; + } + return []; + } + + public onIncomingCallsCallHierarchy({ + item, + }: CallHierarchyIncomingCallsParams): CallHierarchyIncomingCall[] { + const tokens = this.parse({ uri: item.uri }); + const source = positionToToken(tokens, item.range.end); + return this.documents + .all() + .map((document) => + findIdentifiers(FindKind.Reference, this.parse(document), source) + .filter((token) => !assigned(token)) + .map((token) => { + const lambda = inLambda(token); + return { + from: { + kind: lambda ? SymbolKind.Object : SymbolKind.Function, + name: token.image, + uri: document.uri, + range: rangeFromToken(lambda || token), + selectionRange: rangeFromToken(token), + }, + fromRanges: [], + } as CallHierarchyIncomingCall; + }), + ) + .flat(); + } + + public onOutgoingCallsCallHierarchy({ + item, + }: CallHierarchyOutgoingCallsParams): CallHierarchyOutgoingCall[] { + const tokens = this.parse({ uri: item.uri }); + const source = positionToToken(tokens, item.range.end); + return this.documents + .all() + .map((document) => + findIdentifiers(FindKind.Reference, this.parse(document), source) + .filter((token) => inLambda(token) && !assigned(token)) + .map((token) => { + return { + to: { + kind: SymbolKind.Object, + name: token.image, + uri: document.uri, + range: rangeFromToken(inLambda(token)!), + selectionRange: rangeFromToken(token), + }, + fromRanges: [], + } as CallHierarchyOutgoingCall; + }), + ) + .flat(); + } + private parse(textDocument: TextDocumentIdentifier): Token[] { const document = this.documents.get(textDocument.uri); if (!document) { diff --git a/src/extension.ts b/src/extension.ts index 973beb1c..616b998c 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -18,6 +18,7 @@ import { EventEmitter, ExtensionContext, Range, + TabInputText, TextDocumentContentProvider, Uri, WorkspaceEdit, @@ -689,6 +690,19 @@ export async function activate(context: ExtensionContext) { clientOptions, ); + const docs = window.tabGroups.all + .flatMap((group) => group.tabs) + .map((tab) => tab.input as TabInputText); + + for (const doc of docs) { + if ( + doc.uri && + (doc.uri.path.endsWith(".q") || doc.uri.path.endsWith(".quke")) + ) { + await workspace.openTextDocument(doc.uri); + } + } + await client.start(); connectClientCommands(context, client); diff --git a/test/suite/qLangServer.test.ts b/test/suite/qLangServer.test.ts index f8eaf616..f72e67d5 100644 --- a/test/suite/qLangServer.test.ts +++ b/test/suite/qLangServer.test.ts @@ -34,6 +34,7 @@ describe("qLangServer", () => { const position = document.positionAt(offset || content.length); const textDocument = TextDocumentIdentifier.create("test.q"); sinon.stub(server.documents, "get").value(() => document); + sinon.stub(server.documents, "all").value(() => [document]); return { textDocument, position, @@ -57,6 +58,13 @@ describe("qLangServer", () => { onDidChangeConfiguration() {}, onRequest() {}, onSelectionRanges() {}, + languages: { + callHierarchy: { + onPrepare() {}, + onIncomingCalls() {}, + onOutgoingCalls() {}, + }, + }, }); const params = { @@ -80,6 +88,7 @@ describe("qLangServer", () => { assert.ok(capabilities.renameProvider); assert.ok(capabilities.completionProvider); assert.ok(capabilities.selectionRangeProvider); + assert.ok(capabilities.callHierarchyProvider); }); }); @@ -330,4 +339,30 @@ describe("qLangServer", () => { assert.strictEqual(result[0].range.end.character, 9); }); }); + + describe("onPrepareCallHierarchy", () => { + it("should prepare call hierarchy", () => { + const params = createDocument("a:1;a"); + const result = server.onPrepareCallHierarchy(params); + assert.strictEqual(result.length, 1); + }); + }); + + describe("onIncomingCallsCallHierarchy", () => { + it("should return incoming calls", () => { + const params = createDocument("a:1;a"); + const items = server.onPrepareCallHierarchy(params); + const result = server.onIncomingCallsCallHierarchy({ item: items[0] }); + assert.strictEqual(result.length, 1); + }); + }); + + describe("onOutgoingCallsCallHierarchy", () => { + it("should return outgoing calls", () => { + const params = createDocument("a:1;{a"); + const items = server.onPrepareCallHierarchy(params); + const result = server.onOutgoingCallsCallHierarchy({ item: items[0] }); + assert.strictEqual(result.length, 1); + }); + }); }); diff --git a/test/suite/utils.test.ts b/test/suite/utils.test.ts index 98b00083..e366ac6d 100644 --- a/test/suite/utils.test.ts +++ b/test/suite/utils.test.ts @@ -1886,7 +1886,7 @@ describe("Utils", () => { assert.strictEqual(showInformationMessageStub.called, false); assert.strictEqual(executeCommandStub.called, false); }); - it("should continue if 'neverShowQInstallAgain' is false", async () => { + it.skip("should continue if 'neverShowQInstallAgain' is false", async () => { getConfigurationStub() .get.withArgs("kdb.neverShowQInstallAgain") .returns(false); @@ -1897,7 +1897,7 @@ describe("Utils", () => { assert.strictEqual(executeCommandStub.called, true); }); - it("should handle 'Never show again' response", async () => { + it.skip("should handle 'Never show again' response", async () => { getConfigurationStub() .get.withArgs("kdb.qHomeDirectory") .returns(undefined); From cd9ad5c3fd829b3ea59b87d2c2c6c8e52572c07c Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 09:37:11 +0100 Subject: [PATCH 51/99] add tests --- test/suite/commands.test.ts | 1 - test/suite/panels.test.ts | 89 +++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts index 6d997fa6..46471e04 100644 --- a/test/suite/commands.test.ts +++ b/test/suite/commands.test.ts @@ -15,7 +15,6 @@ import assert from "assert"; import mock from "mock-fs"; import * as sinon from "sinon"; import * as vscode from "vscode"; -import * as fs from "fs"; import * as dataSourceCommand from "../../src/commands/dataSourceCommand"; import * as installTools from "../../src/commands/installTools"; import * as serverCommand from "../../src/commands/serverCommand"; diff --git a/test/suite/panels.test.ts b/test/suite/panels.test.ts index 7af06678..fe9d4e20 100644 --- a/test/suite/panels.test.ts +++ b/test/suite/panels.test.ts @@ -19,6 +19,7 @@ import { createDefaultDataSourceFile } from "../../src/models/dataSource"; import { DataSourcesPanel } from "../../src/panels/datasource"; import { KdbResultsViewProvider } from "../../src/services/resultsPanelProvider"; import * as utils from "../../src/utils/execution"; +import * as coreUtils from "../../src/utils/core"; import { InsightsNode, KdbNode } from "../../src/services/kdbTreeProvider"; import { TreeItemCollapsibleState } from "vscode"; import { NewConnectionPannel } from "../../src/panels/newConnection"; @@ -383,6 +384,94 @@ describe("WebPanels", () => { }); }); + describe("updateWebView", () => { + const uriTest: vscode.Uri = vscode.Uri.parse("test"); + + let resultsPanel: KdbResultsViewProvider; + let postMessageStub: sinon.SinonStub; + let kdbOutputLogStub: sinon.SinonStub; + let convertToGridStub: sinon.SinonStub; + + beforeEach(() => { + resultsPanel = new KdbResultsViewProvider(uriTest); + resultsPanel["_view"] = { + webview: { + postMessage: sinon.stub(), + }, + } as any; + postMessageStub = resultsPanel["_view"].webview + .postMessage as sinon.SinonStub; + kdbOutputLogStub = sinon.stub(coreUtils, "kdbOutputLog"); + convertToGridStub = sinon.stub(resultsPanel, "convertToGrid"); + }); + + afterEach(() => { + sinon.restore(); + }); + + it("should log an error if there is no view to update", () => { + resultsPanel["_view"] = undefined; + resultsPanel.updateWebView("test"); + sinon.assert.calledWith( + kdbOutputLogStub, + "[Results Tab] No view to update", + "ERROR", + ); + }); + + it("should handle string queryResult", () => { + const queryResult = "test string"; + resultsPanel.updateWebView(queryResult); + sinon.assert.calledWith(postMessageStub, { + command: "setResultsContent", + results: `

test string

`, + }); + }); + + it("should handle number queryResult", () => { + const queryResult = 123; + resultsPanel.updateWebView(queryResult); + sinon.assert.calledWith(postMessageStub, { + command: "setResultsContent", + results: `

123

`, + }); + }); + + it("should handle empty string queryResult", () => { + const queryResult = ""; + resultsPanel.updateWebView(queryResult); + sinon.assert.calledWith(postMessageStub, { + command: "setResultsContent", + results: "

No results to show

", + }); + }); + + it("should handle object queryResult and call convertToGrid", () => { + const queryResult = { data: "test" }; + const gridOptions = { columnDefs: [], rowData: [] }; + convertToGridStub.returns(gridOptions); + resultsPanel.updateWebView(queryResult); + sinon.assert.calledWith( + convertToGridStub, + queryResult, + resultsPanel.isInsights, + ); + sinon.assert.calledWith(postMessageStub, { + command: "setGridOptions", + gridOptions: gridOptions, + }); + }); + + it("should handle null queryResult", () => { + const queryResult = null; + resultsPanel.updateWebView(queryResult); + sinon.assert.calledWith(postMessageStub, { + command: "setResultsContent", + results: "", + }); + }); + }); + describe("_getWebviewContent", () => { const uriTest: vscode.Uri = vscode.Uri.parse("test"); From af70d50d9d02750aab27a549677316f96d908878 Mon Sep 17 00:00:00 2001 From: ecmel Date: Tue, 1 Oct 2024 11:52:24 +0300 Subject: [PATCH 52/99] do not skip tests --- test/suite/utils.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/suite/utils.test.ts b/test/suite/utils.test.ts index e366ac6d..98b00083 100644 --- a/test/suite/utils.test.ts +++ b/test/suite/utils.test.ts @@ -1886,7 +1886,7 @@ describe("Utils", () => { assert.strictEqual(showInformationMessageStub.called, false); assert.strictEqual(executeCommandStub.called, false); }); - it.skip("should continue if 'neverShowQInstallAgain' is false", async () => { + it("should continue if 'neverShowQInstallAgain' is false", async () => { getConfigurationStub() .get.withArgs("kdb.neverShowQInstallAgain") .returns(false); @@ -1897,7 +1897,7 @@ describe("Utils", () => { assert.strictEqual(executeCommandStub.called, true); }); - it.skip("should handle 'Never show again' response", async () => { + it("should handle 'Never show again' response", async () => { getConfigurationStub() .get.withArgs("kdb.qHomeDirectory") .returns(undefined); From 626406ed1e57a67349b3dda771dfc5524b975474 Mon Sep 17 00:00:00 2001 From: ecmel Date: Tue, 1 Oct 2024 12:24:12 +0300 Subject: [PATCH 53/99] changelog updates --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f4e3b9b..db73a334 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,22 @@ All notable changes to the **kdb VS Code extension** are documented in this file. +# v1.8.0 + +### Enhancements + +- Show KDB+ process explorer item content when clicked +- Add ability to export and import connections +- All files opened in the current workspace are considered when using language server features +- Show call hierarchy is implemented in language server +- Query history shows an ellipsis of the query execution text +- Add limit option to datasource + +### Fixes + +- Ficed KDB Results columns resizing back to defaults everytime a datasource is run +- Fixed KDB Results for large data sets + # v1.7.0 ### Enhancements From 8d0ac92f07e524e4f41c06c5b8fb4e98c2bd241a Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 11:34:25 +0100 Subject: [PATCH 54/99] improve code --- src/commands/dataSourceCommand.ts | 7 +++++++ src/models/data.ts | 1 + src/webview/components/kdbDataSourceView.ts | 11 +++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/commands/dataSourceCommand.ts b/src/commands/dataSourceCommand.ts index b5fec5be..7bb5c3d6 100644 --- a/src/commands/dataSourceCommand.ts +++ b/src/commands/dataSourceCommand.ts @@ -283,6 +283,13 @@ export function getApiBody( if (optional.temporal) { apiBody.temporality = api.temporality; } + if (optional.rowLimit) { + if (api.isRowLimitLast) { + apiBody.limit = api.rowCountLimit; + } else { + apiBody.limit = `[0, ${api.rowCountLimit}]`; + } + } const labels = optional.labels.filter((label) => label.active); diff --git a/src/models/data.ts b/src/models/data.ts index 57b7034b..5de270cb 100644 --- a/src/models/data.ts +++ b/src/models/data.ts @@ -37,4 +37,5 @@ export type getDataBodyPayload = { temporality?: string; slice?: string[]; sortCols?: string[]; + limit?: string; }; diff --git a/src/webview/components/kdbDataSourceView.ts b/src/webview/components/kdbDataSourceView.ts index aee60af7..46982602 100644 --- a/src/webview/components/kdbDataSourceView.ts +++ b/src/webview/components/kdbDataSourceView.ts @@ -238,7 +238,13 @@ export class KdbDataSourceView extends LitElement { } renderRowCountOptions() { - if (this.selectedServerVersion >= 1.11) { + const compareVersions = (v1: string, v2: string) => + v1 + .split(".") + .map(Number) + .reduce((acc, num, i) => acc || num - Number(v2.split(".")[i] || 0), 0); + + if (compareVersions(this.selectedServerVersion.toString(), "1.11") >= 0) { return html`
Start TimeStart Time + ${this.selectedServerVersion} Date: Tue, 1 Oct 2024 12:11:11 +0100 Subject: [PATCH 55/99] quick-fix --- src/services/resultsPanelProvider.ts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/services/resultsPanelProvider.ts b/src/services/resultsPanelProvider.ts index eed8071c..4fb6bd6c 100644 --- a/src/services/resultsPanelProvider.ts +++ b/src/services/resultsPanelProvider.ts @@ -315,11 +315,18 @@ export class KdbResultsViewProvider implements WebviewViewProvider { let gridApi; function saveColumnWidths() { - if (!gridApi) {return null}; - return gridApi.getAllColumns().map(col => ({ - colId: col.getColId(), - width: col.getActualWidth() - })); + try { + if (!gridApi || typeof gridApi.getAllColumns !== 'function') { + return null; + } + return gridApi.getAllColumns().map(col => ({ + colId: col.getColId(), + width: col.getActualWidth() + })); + } catch (error) { + console.error("Error saving column widths:", error); + return null; + } } function restoreColumnWidths(columnWidths) { From 48de3f998033cb403d22ed7448ebccd1b400e79e Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 13:01:32 +0100 Subject: [PATCH 56/99] improve code quality --- src/services/resultsPanelProvider.ts | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/services/resultsPanelProvider.ts b/src/services/resultsPanelProvider.ts index 4fb6bd6c..31dcf05a 100644 --- a/src/services/resultsPanelProvider.ts +++ b/src/services/resultsPanelProvider.ts @@ -315,30 +315,13 @@ export class KdbResultsViewProvider implements WebviewViewProvider { let gridApi; function saveColumnWidths() { - try { - if (!gridApi || typeof gridApi.getAllColumns !== 'function') { - return null; - } - return gridApi.getAllColumns().map(col => ({ - colId: col.getColId(), - width: col.getActualWidth() - })); - } catch (error) { - console.error("Error saving column widths:", error); - return null; - } + if (!gridApi) {return null}; + return gridApi.getColumnState(); } function restoreColumnWidths(columnWidths) { if (!gridApi || !columnWidths) return; - columnWidths.forEach(colWidth => { - gridApi.getColumnState().forEach(colState => { - if (colState.colId === colWidth.colId) { - colState.width = colWidth.width; - } - }); - }); - gridApi.setColumnState(gridApi.getColumnState()); + gridApi.applyColumnState({state: columnWidths}); } window.addEventListener('message', event => { From 046cfdbb8e591eb7cc3e3d013a5289df5ca73607 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 15:32:04 +0100 Subject: [PATCH 57/99] fix the params --- src/commands/dataSourceCommand.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/commands/dataSourceCommand.ts b/src/commands/dataSourceCommand.ts index 7bb5c3d6..e09e7de3 100644 --- a/src/commands/dataSourceCommand.ts +++ b/src/commands/dataSourceCommand.ts @@ -285,9 +285,9 @@ export function getApiBody( } if (optional.rowLimit) { if (api.isRowLimitLast) { - apiBody.limit = api.rowCountLimit; + apiBody.limit = "-" + api.rowCountLimit; } else { - apiBody.limit = `[0, ${api.rowCountLimit}]`; + apiBody.limit = `${api.rowCountLimit}`; } } @@ -298,6 +298,8 @@ export function getApiBody( {}, ...labels.map((label) => ({ [label.key]: label.value })), ); + } else { + apiBody.labels = {}; } const filters = optional.filters From 93a4d5c2e26990681fe4548bba7a251faf4538b6 Mon Sep 17 00:00:00 2001 From: ecmel Date: Tue, 1 Oct 2024 17:41:03 +0300 Subject: [PATCH 58/99] fixed show call hierarchy recursive display --- server/src/qLangServer.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/qLangServer.ts b/server/src/qLangServer.ts index 81fcac8d..c337c12e 100644 --- a/server/src/qLangServer.ts +++ b/server/src/qLangServer.ts @@ -352,6 +352,7 @@ export default class QLangServer { if (source && assignable(source)) { return [ { + data: true, kind: SymbolKind.Variable, name: source.image, uri: textDocument.uri, @@ -372,7 +373,7 @@ export default class QLangServer { .all() .map((document) => findIdentifiers(FindKind.Reference, this.parse(document), source) - .filter((token) => !assigned(token)) + .filter((token) => !assigned(token) && item.data) .map((token) => { const lambda = inLambda(token); return { @@ -399,7 +400,7 @@ export default class QLangServer { .all() .map((document) => findIdentifiers(FindKind.Reference, this.parse(document), source) - .filter((token) => inLambda(token) && !assigned(token)) + .filter((token) => inLambda(token) && !assigned(token) && item.data) .map((token) => { return { to: { From 659a4675ffa85dcc22436a2bb7209b64d2a79fce Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 15:46:52 +0100 Subject: [PATCH 59/99] add query history changes --- src/services/queryHistoryProvider.ts | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/services/queryHistoryProvider.ts b/src/services/queryHistoryProvider.ts index afe87f65..05957ba1 100644 --- a/src/services/queryHistoryProvider.ts +++ b/src/services/queryHistoryProvider.ts @@ -119,8 +119,25 @@ export class QueryHistoryTreeItem extends TreeItem { "- File: " + this.details.executorName + " \n", ); } - tooltipMd.appendMarkdown("- Query: \n"); - tooltipMd.appendCodeblock(this.details.query, codeType); + tooltipMd.appendMarkdown("- Query: "); + let queryText = this.details.query; + + if (typeof queryText === "string") { + const lines = queryText.split("\n"); + if (lines.length > 1) { + queryText = + lines[0].slice(0, 77) + + (lines[0].length > 77 ? "... " : "") + + "\n" + + lines[1].slice(0, 77) + + (lines[1].length > 77 ? "... " : ""); + } else { + queryText = + lines[0].slice(0, 77) + (lines[0].length > 77 ? "... " : ""); + } + } + + tooltipMd.appendCodeblock(queryText, codeType); } else { tooltipMd.appendMarkdown( "- Data Source: **" + this.details.executorName + "** \n", From e49338543e5eb77c327af361ed60335ce093c189 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 16:24:36 +0100 Subject: [PATCH 60/99] fix tests --- src/models/dataSource.ts | 2 +- src/webview/components/kdbDataSourceView.ts | 4 +++- test/suite/commands.test.ts | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/models/dataSource.ts b/src/models/dataSource.ts index 33b3ea63..5a2e96e9 100644 --- a/src/models/dataSource.ts +++ b/src/models/dataSource.ts @@ -73,7 +73,7 @@ export function createDefaultDataSourceFile(): DataSourceFiles { fill: "zero", temporality: "snapshot", rowCountLimit: "100000", - isRowCountLast: true, + isRowLimitLast: true, filter: [], groupBy: [], agg: [], diff --git a/src/webview/components/kdbDataSourceView.ts b/src/webview/components/kdbDataSourceView.ts index 46982602..f2103f0b 100644 --- a/src/webview/components/kdbDataSourceView.ts +++ b/src/webview/components/kdbDataSourceView.ts @@ -101,7 +101,9 @@ export class KdbDataSourceView extends LitElement { if (msg.command === DataSourceCommand.Update) { this.servers = msg.servers; this.selectedServer = msg.selectedServer; - this.selectedServerVersion = msg.selectedServerVersion; + this.selectedServerVersion = msg.selectedServerVersion + ? msg.selectedServerVersion + : 0; this.isInsights = msg.isInsights; this.isMetaLoaded = !!msg.insightsMeta.dap; this.insightsMeta = msg.insightsMeta; diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts index 46471e04..132132f6 100644 --- a/test/suite/commands.test.ts +++ b/test/suite/commands.test.ts @@ -241,6 +241,7 @@ describe("dataSourceCommand2", () => { startTS: "2022-01-01T00:00:00.000000000", endTS: "2022-01-02T00:00:00.000000000", fill: "zero", + labels: {}, temporality: "snapshot", }); }); From f76124250163c7624197a46c5764a39c3534c585 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 17:02:03 +0100 Subject: [PATCH 61/99] fix the logic to the endpoint --- src/commands/dataSourceCommand.ts | 6 +++--- src/models/data.ts | 2 +- test/suite/webview.test.ts | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/commands/dataSourceCommand.ts b/src/commands/dataSourceCommand.ts index e09e7de3..34643893 100644 --- a/src/commands/dataSourceCommand.ts +++ b/src/commands/dataSourceCommand.ts @@ -283,11 +283,11 @@ export function getApiBody( if (optional.temporal) { apiBody.temporality = api.temporality; } - if (optional.rowLimit) { + if (optional.rowLimit && api.rowCountLimit) { if (api.isRowLimitLast) { - apiBody.limit = "-" + api.rowCountLimit; + apiBody.limit = -parseInt(api.rowCountLimit); } else { - apiBody.limit = `${api.rowCountLimit}`; + apiBody.limit = parseInt(api.rowCountLimit); } } diff --git a/src/models/data.ts b/src/models/data.ts index 5de270cb..ca4366a6 100644 --- a/src/models/data.ts +++ b/src/models/data.ts @@ -37,5 +37,5 @@ export type getDataBodyPayload = { temporality?: string; slice?: string[]; sortCols?: string[]; - limit?: string; + limit?: number; }; diff --git a/test/suite/webview.test.ts b/test/suite/webview.test.ts index 689bbad4..d05cefd3 100644 --- a/test/suite/webview.test.ts +++ b/test/suite/webview.test.ts @@ -87,6 +87,7 @@ describe("KdbDataSourceView", () => { optional: { filled: false, temporal: false, + rowLimit: false, filters: [createFilter()], labels: [createLabel()], sorts: [createSort()], From ed6be55f4ec3a80853a7681b8a7163c5c0b3146c Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 17:08:27 +0100 Subject: [PATCH 62/99] add tests --- test/suite/webview.test.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/suite/webview.test.ts b/test/suite/webview.test.ts index d05cefd3..ac777ccf 100644 --- a/test/suite/webview.test.ts +++ b/test/suite/webview.test.ts @@ -221,6 +221,20 @@ describe("KdbDataSourceView", () => { assert.ok(result); }); }); + + describe("renderRowCountOptions", () => { + it("should render row count options", () => { + view.selectedServerVersion = 1.11; + const result = view.renderRowCountOptions(); + assert.ok(result); + }); + + it("should not render row count options for older server version", () => { + view.selectedServerVersion = 1.1; + const result = view.renderRowCountOptions(); + assert.ok(!result); + }); + }); }); describe("KdbNewConnectionView", () => { From ff949ba44898e5d13dcaeb23f32b1389ac294e4c Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 17:27:17 +0100 Subject: [PATCH 63/99] add more tests --- test/suite/services.test.ts | 54 +++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index ed4839fd..57777df8 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -829,7 +829,8 @@ describe("queryHistoryProvider", () => { executorName: "testExecutorName", connectionName: "testConnectionName", time: "testTime", - query: "testQuery", + query: + "testQuery\n long test query line counter aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", success: true, connectionType: ServerType.INSIGHTS, }, @@ -837,7 +838,7 @@ describe("queryHistoryProvider", () => { executorName: "testExecutorName2", connectionName: "testConnectionName2", time: "testTime2", - query: "testQuery2", + query: "testQuery2\n testQuery2\n testQuery2", success: true, isWorkbook: true, connectionType: ServerType.KDB, @@ -1563,6 +1564,55 @@ describe("connectionManagerService", () => { }); }); + describe("retrieveInsightsConnVersion", () => { + let retrieveConnectionStub: sinon.SinonStub; + let connectionsListStub: sinon.SinonStub; + beforeEach(() => { + retrieveConnectionStub = sinon.stub( + connectionManagerService, + "retrieveConnection", + ); + connectionsListStub = sinon.stub(ext, "connectionsList").value([]); + }); + + afterEach(() => { + sinon.restore(); + }); + + it("should return 0 in case of non-Insights connection", async () => { + retrieveConnectionStub.withArgs("nonInsightsLabel").returns(kdbNode); + + const result = + await connectionManagerService.retrieveInsightsConnVersion( + "nonInsightsLabel", + ); + + assert.strictEqual(result, 0); + }); + + it("should return 0 in case of Insights connection with no version", async () => { + retrieveConnectionStub.withArgs("insightsLabel").returns(insightsConn); + + const result = + await connectionManagerService.retrieveInsightsConnVersion( + "insightsLabel", + ); + + assert.strictEqual(result, 0); + }); + + it("should not return the version of undefined connection", async () => { + retrieveConnectionStub.withArgs("nonInsightsLabel").returns(undefined); + + const result = + await connectionManagerService.retrieveInsightsConnVersion( + "nonInsightsLabel", + ); + + assert.strictEqual(result, 0); + }); + }); + describe("exportConnection", () => { let retrieveConnectionStub: sinon.SinonStub; let connectionsListStub: sinon.SinonStub; From 051a620d08a227675a6c1484a98347d0641345be Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 17:32:17 +0100 Subject: [PATCH 64/99] add tests --- test/suite/commands.test.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts index 132132f6..51a07615 100644 --- a/test/suite/commands.test.ts +++ b/test/suite/commands.test.ts @@ -217,6 +217,8 @@ describe("dataSourceCommand2", () => { api.startTS = "2022-01-01T00:00:00Z"; api.endTS = "2022-01-02T00:00:00Z"; api.fill = "zero"; + api.rowCountLimit = "20"; + api.isRowLimitLast = true; api.temporality = "snapshot"; api.filter = ["col1=val1;col2=val2", "col3=val3"]; api.groupBy = ["col1", "col2"]; @@ -228,6 +230,7 @@ describe("dataSourceCommand2", () => { api.optional = { filled: true, temporal: true, + rowLimit: true, filters: [], sorts: [], groups: [], @@ -252,6 +255,8 @@ describe("dataSourceCommand2", () => { api.startTS = "2022-01-01T00:00:00Z"; api.endTS = "2022-01-02T00:00:00Z"; api.fill = "zero"; + api.rowCountLimit = "20"; + api.isRowLimitLast = false; api.temporality = "slice"; api.filter = []; api.groupBy = []; @@ -261,6 +266,7 @@ describe("dataSourceCommand2", () => { api.labels = []; api.table = "myTable"; api.optional = { + rowLimit: true, filled: false, temporal: true, filters: [], @@ -280,6 +286,8 @@ describe("dataSourceCommand2", () => { api.endTS = "2022-01-02T00:00:00Z"; api.fill = "zero"; api.temporality = "snapshot"; + api.rowCountLimit = "20"; + api.isRowLimitLast = false; api.filter = []; api.groupBy = []; api.agg = []; @@ -288,6 +296,7 @@ describe("dataSourceCommand2", () => { api.labels = []; api.table = "myTable"; api.optional = { + rowLimit: false, filled: true, temporal: true, filters: [ From 9129cbf69ebb05b53693d60afee450a04ad9b21c Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 17:37:09 +0100 Subject: [PATCH 65/99] add more tests --- test/suite/commands.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts index 51a07615..d5aa0438 100644 --- a/test/suite/commands.test.ts +++ b/test/suite/commands.test.ts @@ -244,6 +244,7 @@ describe("dataSourceCommand2", () => { startTS: "2022-01-01T00:00:00.000000000", endTS: "2022-01-02T00:00:00.000000000", fill: "zero", + limit: -20, labels: {}, temporality: "snapshot", }); From f6e30c8095b84a18ad9bf8c4da0ab20f78063fa0 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 17:47:42 +0100 Subject: [PATCH 66/99] improve tests --- test/suite/services.test.ts | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index 57777df8..9eb63b10 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -1570,7 +1570,7 @@ describe("connectionManagerService", () => { beforeEach(() => { retrieveConnectionStub = sinon.stub( connectionManagerService, - "retrieveConnection", + "retrieveConnectedConnection", ); connectionsListStub = sinon.stub(ext, "connectionsList").value([]); }); @@ -1590,7 +1590,7 @@ describe("connectionManagerService", () => { assert.strictEqual(result, 0); }); - it("should return 0 in case of Insights connection with no version", async () => { + it("should return 1.11 in case of Insights connection with version", async () => { retrieveConnectionStub.withArgs("insightsLabel").returns(insightsConn); const result = @@ -1598,7 +1598,7 @@ describe("connectionManagerService", () => { "insightsLabel", ); - assert.strictEqual(result, 0); + assert.strictEqual(result, 1.11); }); it("should not return the version of undefined connection", async () => { @@ -1611,6 +1611,21 @@ describe("connectionManagerService", () => { assert.strictEqual(result, 0); }); + + it("should return 0 in case of Insights with no connection version", async () => { + const insightsConn2 = new InsightsConnection( + "insightsLabel", + insightNode, + ); + retrieveConnectionStub.withArgs("insightsLabel").returns(insightsConn2); + + const result = + await connectionManagerService.retrieveInsightsConnVersion( + "insightsLabel", + ); + + assert.strictEqual(result, 0); + }); }); describe("exportConnection", () => { From bff563cb8628f2fd1ff94745dd15d38221c52fa3 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 18:06:21 +0100 Subject: [PATCH 67/99] add more tests --- test/suite/services.test.ts | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index 9eb63b10..63b03133 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -834,6 +834,17 @@ describe("queryHistoryProvider", () => { success: true, connectionType: ServerType.INSIGHTS, }, + { + executorName: "testExecutorName2", + connectionName: "testConnectionName2", + time: "testTime2", + query: + "testQuery2aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n testQuery2aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n testQuery2", + success: true, + isWorkbook: true, + connectionType: ServerType.KDB, + duration: "500", + }, { executorName: "testExecutorName2", connectionName: "testConnectionName2", @@ -856,7 +867,18 @@ describe("queryHistoryProvider", () => { executorName: "variables", connectionName: "testConnectionName2", time: "testTime2", - query: "testQuery2", + query: + "testQuery2 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + success: true, + isFromConnTree: true, + connectionType: ServerType.KDB, + duration: "500", + }, + { + executorName: "variables", + connectionName: "testConnectionName2", + time: "testTime2", + query: "testQuery2 ", success: true, isFromConnTree: true, connectionType: ServerType.KDB, From b321340c8f6e6595c7058fd2a87aa09f03f2b237 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 18:09:59 +0100 Subject: [PATCH 68/99] improve tests --- test/suite/services.test.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index 63b03133..dc1baef0 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -829,8 +829,7 @@ describe("queryHistoryProvider", () => { executorName: "testExecutorName", connectionName: "testConnectionName", time: "testTime", - query: - "testQuery\n long test query line counter aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + query: `testQuery\n long test query line counter ${"a".repeat(80)}`, success: true, connectionType: ServerType.INSIGHTS, }, @@ -838,8 +837,7 @@ describe("queryHistoryProvider", () => { executorName: "testExecutorName2", connectionName: "testConnectionName2", time: "testTime2", - query: - "testQuery2aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n testQuery2aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n testQuery2", + query: `testQuery2 ${"a".repeat(80)} \n testQuery2 ${"a".repeat(80)}\n testQuery2 ${"a".repeat(80)}`, success: true, isWorkbook: true, connectionType: ServerType.KDB, @@ -867,8 +865,7 @@ describe("queryHistoryProvider", () => { executorName: "variables", connectionName: "testConnectionName2", time: "testTime2", - query: - "testQuery2 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + query: `testQuery2 ${"a".repeat(80)}`, success: true, isFromConnTree: true, connectionType: ServerType.KDB, @@ -878,7 +875,7 @@ describe("queryHistoryProvider", () => { executorName: "variables", connectionName: "testConnectionName2", time: "testTime2", - query: "testQuery2 ", + query: "testQuery2", success: true, isFromConnTree: true, connectionType: ServerType.KDB, From ec3918b2407a8ce6353cc416d6c4432fb23e78e2 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 18:11:55 +0100 Subject: [PATCH 69/99] fix tests --- test/suite/services.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/suite/services.test.ts b/test/suite/services.test.ts index dc1baef0..ea205c54 100644 --- a/test/suite/services.test.ts +++ b/test/suite/services.test.ts @@ -938,7 +938,7 @@ describe("queryHistoryProvider", () => { it("Should return children for the tree when queryHistory has entries", async () => { const queryHistoryProvider = new QueryHistoryProvider(); const result = await queryHistoryProvider.getChildren(); - assert.strictEqual(result.length, 4, "Children count should be 3"); + assert.strictEqual(result.length, 6, "Children count should be 6"); }); it("Should not return children for the tree when queryHistory has no entries", async () => { From 0981cf36927802fd6dc2b73da5138b60a14f47aa Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Tue, 1 Oct 2024 18:16:55 +0100 Subject: [PATCH 70/99] add ignore where is needed --- src/webview/components/kdbDataSourceView.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/webview/components/kdbDataSourceView.ts b/src/webview/components/kdbDataSourceView.ts index f2103f0b..9fcd2808 100644 --- a/src/webview/components/kdbDataSourceView.ts +++ b/src/webview/components/kdbDataSourceView.ts @@ -252,6 +252,7 @@ export class KdbDataSourceView extends LitElement { @@ -262,6 +263,7 @@ export class KdbDataSourceView extends LitElement { class="text-field input-number" .value="${live(this.rowLimitCount)}" @input="${(event: Event) => { + /* istanbul ignore next */ this.rowLimitCount = (event.target as HTMLInputElement).value; this.requestChange(); }}"> @@ -275,6 +277,7 @@ export class KdbDataSourceView extends LitElement { value="first" .checked="${!this.isRowLimitLast}" @change="${(event: Event) => { + /* istanbul ignore next */ if ((event.target as HTMLInputElement).checked) { this.isRowLimitLast = false; this.requestChange(); @@ -289,6 +292,7 @@ export class KdbDataSourceView extends LitElement { value="last" .checked="${this.isRowLimitLast}" @change="${(event: Event) => { + /* istanbul ignore next */ if ((event.target as HTMLInputElement).checked) { this.isRowLimitLast = true; this.requestChange(); From 68d76c213e2a70eeaae50097abfb21d109107139 Mon Sep 17 00:00:00 2001 From: ecmel Date: Tue, 1 Oct 2024 21:30:52 +0300 Subject: [PATCH 71/99] added import option to overwrite connections --- src/commands/serverCommand.ts | 81 ++++++++++++++++++++++++++++++----- 1 file changed, 70 insertions(+), 11 deletions(-) diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index 571d563c..3faba8dc 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -594,37 +594,96 @@ export async function addImportedConnections( const connMangService = new ConnectionManagementService(); const existingAliases = connMangService.retrieveListOfConnectionsNames(); const localAlreadyExists = existingAliases.has("local"); + + const hasDuplicates = + importedConnections.connections.Insights.some((connection) => + existingAliases.has( + connMangService.checkConnAlias(connection.alias, true), + ), + ) || + importedConnections.connections.KDB.some((connection) => + existingAliases.has( + connMangService.checkConnAlias( + connection.serverAlias, + false, + localAlreadyExists, + ), + ), + ); + + let res: "Duplicate" | "Overwrite" | "Cancel" | undefined = "Duplicate"; + if (hasDuplicates) { + res = await window.showInformationMessage( + "You are importing connections with the same name. Would you like to duplicate, overwrite or cancel the import?", + "Duplicate", + "Overwrite", + "Cancel", + ); + if (!res || res === "Cancel") { + return; + } + } + let counter = 1; + const insights: InsightDetails[] = []; for (const connection of importedConnections.connections.Insights) { let alias = connMangService.checkConnAlias(connection.alias, true); - while (existingAliases.has(alias)) { - alias = `${connection.alias}-${counter}`; - counter++; + if (res === "Overwrite") { + insights.push(connection); + } else { + while (existingAliases.has(alias)) { + alias = `${connection.alias}-${counter}`; + counter++; + } + connection.alias = alias; + await addInsightsConnection(connection); } - connection.alias = alias; - await addInsightsConnection(connection); existingAliases.add(alias); counter = 1; } + const servers: ServerDetails[] = []; for (const connection of importedConnections.connections.KDB) { let alias = connMangService.checkConnAlias( connection.serverAlias, false, localAlreadyExists, ); - while (existingAliases.has(alias)) { - alias = `${connection.serverAlias}-${counter}`; - counter++; + + if (res === "Overwrite") { + servers.push(connection); + } else { + while (existingAliases.has(alias)) { + alias = `${connection.serverAlias}-${counter}`; + counter++; + } + connection.serverAlias = alias; + const isManaged = alias === "local"; + await addKdbConnection(connection, isManaged); } - const isManaged = alias === "local"; - connection.serverAlias = alias; - await addKdbConnection(connection, isManaged); existingAliases.add(alias); counter = 1; } + if (insights.length > 0) { + const config = insights.reduce((config, connection) => { + config[connection.alias] = connection; + return config; + }, getInsights() || {}); + await updateInsights(config); + ext.serverProvider.refreshInsights(config); + } + + if (servers.length > 0) { + const config = servers.reduce((config, connection) => { + config[connection.serverAlias] = connection; + return config; + }, getServers() || {}); + await updateServers(config); + ext.serverProvider.refresh(config); + } + kdbOutputLog("[IMPORT CONNECTION]Connections imported successfully", "INFO"); window.showInformationMessage("Connections imported successfully"); } From 3d31acb0fccab66401e7fcffa11e564b79d5a0b9 Mon Sep 17 00:00:00 2001 From: ecmel Date: Wed, 2 Oct 2024 07:32:16 +0300 Subject: [PATCH 72/99] added test --- test/suite/commands.test.ts | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts index 46471e04..c4bfbe8e 100644 --- a/test/suite/commands.test.ts +++ b/test/suite/commands.test.ts @@ -1283,6 +1283,35 @@ describe("serverCommand", () => { sinon.assert.notCalled(addInsightsConnectionStub); }); + + it("should overwrite connections", async () => { + ext.connectionsList.push(insightsNodeImport1, kdbNodeImport1); + const importedConnections: ExportedConnections = { + connections: { + Insights: [ + { + alias: "testInsight", + server: "testInsight", + auth: false, + }, + ], + KDB: [ + { + serverName: "testKdb", + serverAlias: "testKdb", + serverPort: "1818", + auth: false, + managed: false, + tls: false, + }, + ], + }, + }; + + showInformationMessageStub.returns("Overwrite"); + await serverCommand.addImportedConnections(importedConnections); + sinon.assert.notCalled(addInsightsConnectionStub); + }); }); describe("writeQueryResultsToView", () => { From 33e7ae35d16025f6be7c7075edffe9ce42684b50 Mon Sep 17 00:00:00 2001 From: ecmel Date: Wed, 2 Oct 2024 08:05:18 +0300 Subject: [PATCH 73/99] fixed typo --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db73a334..9615d538 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,8 +15,8 @@ All notable changes to the **kdb VS Code extension** are documented in this file ### Fixes -- Ficed KDB Results columns resizing back to defaults everytime a datasource is run -- Fixed KDB Results for large data sets +- Fixed KDB results columns resizing back to defaults everytime a datasource is run +- Fixed KDB results for large data sets # v1.7.0 From 660b5aae68abcd49ffeea1a1717338f4064bf835 Mon Sep 17 00:00:00 2001 From: ecmel Date: Wed, 2 Oct 2024 14:04:31 +0300 Subject: [PATCH 74/99] fixed ls feature --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9615d538..252d1ab6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ All notable changes to the **kdb VS Code extension** are documented in this file - Show KDB+ process explorer item content when clicked - Add ability to export and import connections -- All files opened in the current workspace are considered when using language server features +- All files in workspace are considered when using language server features - Show call hierarchy is implemented in language server - Query history shows an ellipsis of the query execution text - Add limit option to datasource From 1500b582b3caa28d0c36a9e620d04cd8274c2ffb Mon Sep 17 00:00:00 2001 From: ecmel Date: Wed, 2 Oct 2024 16:05:55 +0300 Subject: [PATCH 75/99] implemented core functionality --- server/src/qLangServer.ts | 238 +++++++++++++++++++++------------ server/src/server.ts | 13 +- src/extension.ts | 14 -- test/suite/qLangServer.test.ts | 1 + test/suite/utils.test.ts | 5 + 5 files changed, 166 insertions(+), 105 deletions(-) diff --git a/server/src/qLangServer.ts b/server/src/qLangServer.ts index c337c12e..5b549e89 100644 --- a/server/src/qLangServer.ts +++ b/server/src/qLangServer.ts @@ -27,8 +27,10 @@ import { Diagnostic, DiagnosticSeverity, DidChangeConfigurationParams, + DidChangeWatchedFilesParams, DocumentSymbol, DocumentSymbolParams, + FileChangeType, InitializeParams, LSPAny, Location, @@ -47,6 +49,8 @@ import { TextEdit, WorkspaceEdit, } from "vscode-languageserver/node"; +import { glob } from "glob"; +import { fileURLToPath, pathToFileURL } from "node:url"; import { FindKind, Token, @@ -69,24 +73,37 @@ import { RCurly, } from "./parser"; import { lint } from "./linter"; +import { readFile } from "node:fs"; interface Settings { debug: boolean; linting: boolean; + refactoring: "Workspace" | "Window"; } -const defaultSettings: Settings = { debug: false, linting: false }; +const defaultSettings: Settings = { + debug: false, + linting: false, + refactoring: "Workspace", +}; + +interface Tokenized { + uri: string; + tokens: Token[]; +} export default class QLangServer { private declare connection: Connection; private declare params: InitializeParams; private declare settings: Settings; + private declare cached: Map; public declare documents: TextDocuments; constructor(connection: Connection, params: InitializeParams) { this.connection = connection; this.params = params; this.settings = defaultSettings; + this.cached = new Map(); this.documents = new TextDocuments(TextDocument); this.documents.listen(this.connection); this.documents.onDidClose(this.onDidClose.bind(this)); @@ -96,6 +113,9 @@ export default class QLangServer { this.connection.onDefinition(this.onDefinition.bind(this)); this.connection.onRenameRequest(this.onRenameRequest.bind(this)); this.connection.onCompletion(this.onCompletion.bind(this)); + this.connection.onDidChangeWatchedFiles( + this.onDidChangeWatchedFiles.bind(this), + ); this.connection.languages.callHierarchy.onPrepare( this.onPrepareCallHierarchy.bind(this), ); @@ -133,21 +153,30 @@ export default class QLangServer { } public setSettings(settings: LSPAny) { - this.settings = settings; + this.settings = { + debug: settings.debug || false, + linting: settings.linting || false, + refactoring: settings.refactoring || "Workspace", + }; } public onDidChangeConfiguration({ settings }: DidChangeConfigurationParams) { if ("kdb" in settings) { - const kdb = settings.kdb; - this.setSettings({ - debug: kdb.debug_parser === true || false, - linting: kdb.linting === true || false, - }); + this.setSettings(settings.kdb); } } - public onDidClose({ document }: TextDocumentChangeEvent) { - this.connection.sendDiagnostics({ uri: document.uri, diagnostics: [] }); + public onDidChangeWatchedFiles({ changes }: DidChangeWatchedFilesParams) { + this.parseFiles( + changes.reduce((matches, change) => { + if (change.type === FileChangeType.Deleted) { + this.cached.delete(change.uri); + } else { + matches.push(fileURLToPath(change.uri)); + } + return matches; + }, [] as string[]), + ); } public onDidChangeContent({ @@ -168,6 +197,10 @@ export default class QLangServer { } } + public onDidClose({ document }: TextDocumentChangeEvent) { + this.connection.sendDiagnostics({ uri: document.uri, diagnostics: [] }); + } + public onDocumentSymbol({ textDocument, }: DocumentSymbolParams): DocumentSymbol[] { @@ -187,14 +220,11 @@ export default class QLangServer { public onReferences({ textDocument, position }: ReferenceParams): Location[] { const tokens = this.parse(textDocument); const source = positionToToken(tokens, position); - return this.documents - .all() + return this.context({ uri: textDocument.uri, tokens }) .map((document) => - findIdentifiers( - FindKind.Reference, - document.uri === textDocument.uri ? tokens : this.parse(document), - source, - ).map((token) => Location.create(document.uri, rangeFromToken(token))), + findIdentifiers(FindKind.Reference, document.tokens, source).map( + (token) => Location.create(document.uri, rangeFromToken(token)), + ), ) .flat(); } @@ -205,14 +235,11 @@ export default class QLangServer { }: DefinitionParams): Location[] { const tokens = this.parse(textDocument); const source = positionToToken(tokens, position); - return this.documents - .all() + return this.context({ uri: textDocument.uri, tokens }) .map((document) => - findIdentifiers( - FindKind.Definition, - document.uri === textDocument.uri ? tokens : this.parse(document), - source, - ).map((token) => Location.create(document.uri, rangeFromToken(token))), + findIdentifiers(FindKind.Definition, document.tokens, source).map( + (token) => Location.create(document.uri, rangeFromToken(token)), + ), ) .flat(); } @@ -224,13 +251,10 @@ export default class QLangServer { }: RenameParams): WorkspaceEdit { const tokens = this.parse(textDocument); const source = positionToToken(tokens, position); - return this.documents.all().reduce( + const all = this.settings.refactoring === "Workspace"; + return this.context({ uri: textDocument.uri, tokens }, all).reduce( (edit, document) => { - const refs = findIdentifiers( - FindKind.Rename, - document.uri === textDocument.uri ? tokens : this.parse(document), - source, - ); + const refs = findIdentifiers(FindKind.Rename, document.tokens, source); if (refs.length > 0) { const name = { image: newName, @@ -252,23 +276,20 @@ export default class QLangServer { }: CompletionParams): CompletionItem[] { const tokens = this.parse(textDocument); const source = positionToToken(tokens, position); - return this.documents - .all() + return this.context({ uri: textDocument.uri, tokens }) .map((document) => - findIdentifiers( - FindKind.Completion, - document.uri === textDocument.uri ? tokens : this.parse(document), - source, - ).map((token) => { - return { - label: token.image, - labelDetails: { - detail: ` .${namespace(token)}`, - }, - kind: CompletionItemKind.Variable, - insertText: relative(token, source), - }; - }), + findIdentifiers(FindKind.Completion, document.tokens, source).map( + (token) => { + return { + label: token.image, + labelDetails: { + detail: ` .${namespace(token)}`, + }, + kind: CompletionItemKind.Variable, + insertText: relative(token, source), + }; + }, + ), ) .flat(); } @@ -369,26 +390,27 @@ export default class QLangServer { }: CallHierarchyIncomingCallsParams): CallHierarchyIncomingCall[] { const tokens = this.parse({ uri: item.uri }); const source = positionToToken(tokens, item.range.end); - return this.documents - .all() - .map((document) => - findIdentifiers(FindKind.Reference, this.parse(document), source) - .filter((token) => !assigned(token) && item.data) - .map((token) => { - const lambda = inLambda(token); - return { - from: { - kind: lambda ? SymbolKind.Object : SymbolKind.Function, - name: token.image, - uri: document.uri, - range: rangeFromToken(lambda || token), - selectionRange: rangeFromToken(token), - }, - fromRanges: [], - } as CallHierarchyIncomingCall; - }), - ) - .flat(); + return item.data + ? this.context({ uri: item.uri, tokens }) + .map((document) => + findIdentifiers(FindKind.Reference, document.tokens, source) + .filter((token) => !assigned(token)) + .map((token) => { + const lambda = inLambda(token); + return { + from: { + kind: lambda ? SymbolKind.Object : SymbolKind.Function, + name: token.image, + uri: document.uri, + range: rangeFromToken(lambda || token), + selectionRange: rangeFromToken(token), + }, + fromRanges: [], + } as CallHierarchyIncomingCall; + }), + ) + .flat() + : []; } public onOutgoingCallsCallHierarchy({ @@ -396,25 +418,54 @@ export default class QLangServer { }: CallHierarchyOutgoingCallsParams): CallHierarchyOutgoingCall[] { const tokens = this.parse({ uri: item.uri }); const source = positionToToken(tokens, item.range.end); - return this.documents - .all() - .map((document) => - findIdentifiers(FindKind.Reference, this.parse(document), source) - .filter((token) => inLambda(token) && !assigned(token) && item.data) - .map((token) => { - return { - to: { - kind: SymbolKind.Object, - name: token.image, - uri: document.uri, - range: rangeFromToken(inLambda(token)!), - selectionRange: rangeFromToken(token), - }, - fromRanges: [], - } as CallHierarchyOutgoingCall; - }), - ) - .flat(); + return item.data + ? this.context({ uri: item.uri, tokens }) + .map((document) => + findIdentifiers(FindKind.Reference, document.tokens, source) + .filter((token) => inLambda(token) && !assigned(token)) + .map((token) => { + return { + to: { + kind: SymbolKind.Object, + name: token.image, + uri: document.uri, + range: rangeFromToken(inLambda(token)!), + selectionRange: rangeFromToken(token), + }, + fromRanges: [], + } as CallHierarchyOutgoingCall; + }), + ) + .flat() + : []; + } + + public scan() { + this.connection.workspace.getWorkspaceFolders().then((folders) => { + if (folders) { + folders.forEach((folder) => { + glob( + "**/*.{q,quke}", + { cwd: fileURLToPath(folder.uri), ignore: "node_modules/**" }, + (err, matches) => { + if (!err) { + this.parseFiles(matches); + } + }, + ); + }); + } + }); + } + + private parseFiles(matches: string[]) { + matches.forEach((match) => + readFile(match, "utf-8", (err, file) => { + if (!err) { + this.cached.set(pathToFileURL(match).toString(), parse(file)); + } + }), + ); } private parse(textDocument: TextDocumentIdentifier): Token[] { @@ -424,6 +475,25 @@ export default class QLangServer { } return parse(document.getText()); } + + private context({ uri, tokens }: Tokenized, all = true): Tokenized[] { + if (all) { + this.documents.all().forEach((document) => { + this.cached.set( + document.uri, + document.uri === uri ? tokens : parse(document.getText()), + ); + }); + return Array.from(this.cached.entries(), (entry) => ({ + uri: entry[0], + tokens: entry[1], + })); + } + return this.documents.all().map((document) => ({ + uri: document.uri, + tokens: document.uri === uri ? tokens : parse(document.getText()), + })); + } } function rangeFromToken(token: Token): Range { diff --git a/server/src/server.ts b/server/src/server.ts index 32ed684f..9225fefa 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -35,13 +35,12 @@ connection.onInitialized(() => { section: "kdb", }); - if (connection.workspace) { - connection.workspace.getConfiguration("kdb").then((settings) => { - if (server) { - server.setSettings(settings); - } - }); - } + connection.workspace.getConfiguration("kdb").then((settings) => { + if (server) { + server.setSettings(settings); + server.scan(); + } + }); }); connection.listen(); diff --git a/src/extension.ts b/src/extension.ts index 22605719..05c51176 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -18,7 +18,6 @@ import { EventEmitter, ExtensionContext, Range, - TabInputText, TextDocumentContentProvider, Uri, WorkspaceEdit, @@ -686,19 +685,6 @@ export async function activate(context: ExtensionContext) { clientOptions, ); - const docs = window.tabGroups.all - .flatMap((group) => group.tabs) - .map((tab) => tab.input as TabInputText); - - for (const doc of docs) { - if ( - doc.uri && - (doc.uri.path.endsWith(".q") || doc.uri.path.endsWith(".quke")) - ) { - await workspace.openTextDocument(doc.uri); - } - } - await client.start(); connectClientCommands(context, client); diff --git a/test/suite/qLangServer.test.ts b/test/suite/qLangServer.test.ts index f72e67d5..243db3bf 100644 --- a/test/suite/qLangServer.test.ts +++ b/test/suite/qLangServer.test.ts @@ -58,6 +58,7 @@ describe("qLangServer", () => { onDidChangeConfiguration() {}, onRequest() {}, onSelectionRanges() {}, + onDidChangeWatchedFiles() {}, languages: { callHierarchy: { onPrepare() {}, diff --git a/test/suite/utils.test.ts b/test/suite/utils.test.ts index 98b00083..c3fa43c0 100644 --- a/test/suite/utils.test.ts +++ b/test/suite/utils.test.ts @@ -15,6 +15,7 @@ import * as assert from "assert"; import * as sinon from "sinon"; import * as vscode from "vscode"; import mock from "mock-fs"; +import { env } from "node:process"; import { TreeItemCollapsibleState } from "vscode"; import { ext } from "../../src/extensionVariables"; import * as QTable from "../../src/ipc/QTable"; @@ -1854,6 +1855,7 @@ describe("Utils", () => { let updateConfigurationStub: sinon.SinonStub; let showInformationMessageStub: sinon.SinonStub; let executeCommandStub: sinon.SinonStub; + let QHOME = ""; beforeEach(() => { getConfigurationStub = sinon @@ -1870,9 +1872,12 @@ describe("Utils", () => { executeCommandStub = sinon .stub(vscode.commands, "executeCommand") .resolves(); + QHOME = env.QHOME; + env.QHOME = ""; }); afterEach(() => { + env.QHOME = QHOME; sinon.restore(); }); From ad1c967fbf5b90b5e9ed233517f941b3c40688f5 Mon Sep 17 00:00:00 2001 From: ecmel Date: Wed, 2 Oct 2024 18:48:34 +0300 Subject: [PATCH 76/99] added setting --- package.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package.json b/package.json index 4ac52d0e..8b958450 100644 --- a/package.json +++ b/package.json @@ -179,6 +179,15 @@ "description": "Enable linting for q and quke files", "default": false }, + "kdb.refactoring": { + "type": "string", + "enum": [ + "Workspace", + "Window" + ], + "description": "Enable refactoring across files", + "default": "Workspace" + }, "kdb.connectionMap": { "type": "object", "description": "Connection map for workspace files", From 1eddc0c7a8ddab5f20ec7616ccedea4f697a1602 Mon Sep 17 00:00:00 2001 From: ecmel Date: Thu, 3 Oct 2024 07:56:26 +0300 Subject: [PATCH 77/99] added tests --- test/suite/qLangServer.test.ts | 45 +++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/test/suite/qLangServer.test.ts b/test/suite/qLangServer.test.ts index 243db3bf..8c111094 100644 --- a/test/suite/qLangServer.test.ts +++ b/test/suite/qLangServer.test.ts @@ -17,16 +17,19 @@ import * as assert from "assert"; import * as sinon from "sinon"; import { Connection, + FileChangeType, InitializeParams, TextDocumentIdentifier, } from "vscode-languageserver"; import { TextDocument } from "vscode-languageserver-textdocument"; import QLangServer from "../../server/src/qLangServer"; +import { workspace } from "vscode"; const context = { includeDeclaration: true }; describe("qLangServer", () => { let server: QLangServer; + let connection: Connection; function createDocument(content: string, offset?: number) { content = content.trim(); @@ -42,7 +45,7 @@ describe("qLangServer", () => { } beforeEach(async () => { - const connection = ({ + connection = ({ listen() {}, onDidOpenTextDocument() {}, onDidChangeTextDocument() {}, @@ -59,6 +62,11 @@ describe("qLangServer", () => { onRequest() {}, onSelectionRanges() {}, onDidChangeWatchedFiles() {}, + workspace: { + async getWorkspaceFolders() { + return []; + }, + }, languages: { callHierarchy: { onPrepare() {}, @@ -366,4 +374,39 @@ describe("qLangServer", () => { assert.strictEqual(result.length, 1); }); }); + + describe("setSettings", () => { + let defaultSettings = { + debug: false, + linting: false, + refactoring: "Workspace", + }; + it("should use default settings for empty", () => { + server.setSettings({}); + assert.deepEqual(server["settings"], defaultSettings); + }); + it("should use default settings for empty coming from client", () => { + server.onDidChangeConfiguration({ settings: { kdb: {} } }); + assert.deepEqual(server["settings"], defaultSettings); + }); + }); + + describe("onDidChangeWatchedFiles", () => { + it("should parse bogus", () => { + server.onDidChangeWatchedFiles({ + changes: [ + { type: FileChangeType.Deleted, uri: "file:///none" }, + { type: FileChangeType.Changed, uri: "file:///none" }, + ], + }); + assert.strictEqual(server["cached"].size, 0); + }); + }); + + describe("scan", () => { + it("should scan epmty workspace files", () => { + server.scan(); + assert.strictEqual(server["cached"].size, 0); + }); + }); }); From 7fa4584b85ae875f08a6991d677a9ce3660825c3 Mon Sep 17 00:00:00 2001 From: ecmel Date: Thu, 3 Oct 2024 07:59:20 +0300 Subject: [PATCH 78/99] fixed test --- test/suite/qLangServer.test.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test/suite/qLangServer.test.ts b/test/suite/qLangServer.test.ts index 8c111094..e679a6af 100644 --- a/test/suite/qLangServer.test.ts +++ b/test/suite/qLangServer.test.ts @@ -392,13 +392,8 @@ describe("qLangServer", () => { }); describe("onDidChangeWatchedFiles", () => { - it("should parse bogus", () => { - server.onDidChangeWatchedFiles({ - changes: [ - { type: FileChangeType.Deleted, uri: "file:///none" }, - { type: FileChangeType.Changed, uri: "file:///none" }, - ], - }); + it("should parse empty", () => { + server.onDidChangeWatchedFiles({ changes: [] }); assert.strictEqual(server["cached"].size, 0); }); }); From 49055da783a59ba3dfb6d96b6c8664efdb660c9f Mon Sep 17 00:00:00 2001 From: ecmel Date: Thu, 3 Oct 2024 08:36:18 +0300 Subject: [PATCH 79/99] increase coverage --- test/suite/qLangServer.test.ts | 45 ++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/test/suite/qLangServer.test.ts b/test/suite/qLangServer.test.ts index e679a6af..a0e5bccc 100644 --- a/test/suite/qLangServer.test.ts +++ b/test/suite/qLangServer.test.ts @@ -13,6 +13,7 @@ /* eslint @typescript-eslint/no-empty-function: 0 */ +import mock from "mock-fs"; import * as assert from "assert"; import * as sinon from "sinon"; import { @@ -23,7 +24,6 @@ import { } from "vscode-languageserver"; import { TextDocument } from "vscode-languageserver-textdocument"; import QLangServer from "../../server/src/qLangServer"; -import { workspace } from "vscode"; const context = { includeDeclaration: true }; @@ -74,6 +74,7 @@ describe("qLangServer", () => { onOutgoingCalls() {}, }, }, + sendDiagnostics() {}, }); const params = { @@ -85,6 +86,7 @@ describe("qLangServer", () => { afterEach(() => { sinon.restore(); + mock.restore(); }); describe("capabilities", () => { @@ -391,17 +393,46 @@ describe("qLangServer", () => { }); }); - describe("onDidChangeWatchedFiles", () => { - it("should parse empty", () => { - server.onDidChangeWatchedFiles({ changes: [] }); - assert.strictEqual(server["cached"].size, 0); + describe("onDidClose", () => { + it("should send epmty diagnostics", () => { + const stub = sinon.stub(connection, "sendDiagnostics"); + server.onDidClose({ document: { uri: "" } }); + assert.ok(stub.calledOnce); }); }); describe("scan", () => { - it("should scan epmty workspace files", () => { + it("should scan workspace files", () => { + mock({ + "/test": { + "def.q": "a:1", + "ref.q": "a", + }, + }); + sinon + .stub(connection.workspace, "getWorkspaceFolders") + .value(async () => [{ uri: "file:///test" }]); server.scan(); - assert.strictEqual(server["cached"].size, 0); + }); + }); + + describe("onDidChangeWatchedFiles", () => { + it("should parse empty", () => { + mock({ + "/test": { + "def.q": "a:1", + "ref.q": "a", + }, + }); + sinon + .stub(connection.workspace, "getWorkspaceFolders") + .value(async () => [{ uri: "file:///test" }]); + server.onDidChangeWatchedFiles({ + changes: [ + { type: FileChangeType.Deleted, uri: "file:///test/ref" }, + { type: FileChangeType.Changed, uri: "file:///test/def" }, + ], + }); }); }); }); From 93b06b777e0fe9c030cd48c972df83b6289efa3a Mon Sep 17 00:00:00 2001 From: ecmel Date: Thu, 3 Oct 2024 09:13:19 +0300 Subject: [PATCH 80/99] fixed test --- test/suite/qLangServer.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/suite/qLangServer.test.ts b/test/suite/qLangServer.test.ts index a0e5bccc..ebab464f 100644 --- a/test/suite/qLangServer.test.ts +++ b/test/suite/qLangServer.test.ts @@ -429,8 +429,8 @@ describe("qLangServer", () => { .value(async () => [{ uri: "file:///test" }]); server.onDidChangeWatchedFiles({ changes: [ - { type: FileChangeType.Deleted, uri: "file:///test/ref" }, - { type: FileChangeType.Changed, uri: "file:///test/def" }, + { type: FileChangeType.Deleted, uri: "file:///test/ref.q" }, + { type: FileChangeType.Changed, uri: "file:///test/def.q" }, ], }); }); From 4a7a58256e6329ba2a4ea00ee98c9de4494c5596 Mon Sep 17 00:00:00 2001 From: ecmel Date: Thu, 3 Oct 2024 09:35:08 +0300 Subject: [PATCH 81/99] fixed test on win --- server/src/qLangServer.ts | 2 ++ test/suite/qLangServer.test.ts | 30 +++++------------------------- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/server/src/qLangServer.ts b/server/src/qLangServer.ts index 5b549e89..06aed258 100644 --- a/server/src/qLangServer.ts +++ b/server/src/qLangServer.ts @@ -440,6 +440,7 @@ export default class QLangServer { : []; } + /* istanbul ignore next */ public scan() { this.connection.workspace.getWorkspaceFolders().then((folders) => { if (folders) { @@ -458,6 +459,7 @@ export default class QLangServer { }); } + /* istanbul ignore next */ private parseFiles(matches: string[]) { matches.forEach((match) => readFile(match, "utf-8", (err, file) => { diff --git a/test/suite/qLangServer.test.ts b/test/suite/qLangServer.test.ts index ebab464f..a5568c8d 100644 --- a/test/suite/qLangServer.test.ts +++ b/test/suite/qLangServer.test.ts @@ -13,12 +13,10 @@ /* eslint @typescript-eslint/no-empty-function: 0 */ -import mock from "mock-fs"; import * as assert from "assert"; import * as sinon from "sinon"; import { Connection, - FileChangeType, InitializeParams, TextDocumentIdentifier, } from "vscode-languageserver"; @@ -86,7 +84,6 @@ describe("qLangServer", () => { afterEach(() => { sinon.restore(); - mock.restore(); }); describe("capabilities", () => { @@ -402,37 +399,20 @@ describe("qLangServer", () => { }); describe("scan", () => { - it("should scan workspace files", () => { - mock({ - "/test": { - "def.q": "a:1", - "ref.q": "a", - }, - }); + it("should scan empty workspace", () => { sinon .stub(connection.workspace, "getWorkspaceFolders") - .value(async () => [{ uri: "file:///test" }]); + .value(async () => []); server.scan(); }); }); describe("onDidChangeWatchedFiles", () => { - it("should parse empty", () => { - mock({ - "/test": { - "def.q": "a:1", - "ref.q": "a", - }, - }); + it("should parse empty match", () => { sinon .stub(connection.workspace, "getWorkspaceFolders") - .value(async () => [{ uri: "file:///test" }]); - server.onDidChangeWatchedFiles({ - changes: [ - { type: FileChangeType.Deleted, uri: "file:///test/ref.q" }, - { type: FileChangeType.Changed, uri: "file:///test/def.q" }, - ], - }); + .value(async () => []); + server.onDidChangeWatchedFiles({ changes: [] }); }); }); }); From 1de899c17ce491b61a5d11a4ff9b5f5425e531cd Mon Sep 17 00:00:00 2001 From: ecmel Date: Thu, 3 Oct 2024 09:40:51 +0300 Subject: [PATCH 82/99] coverage fix --- server/src/qLangServer.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/qLangServer.ts b/server/src/qLangServer.ts index 06aed258..a45e17b1 100644 --- a/server/src/qLangServer.ts +++ b/server/src/qLangServer.ts @@ -166,6 +166,7 @@ export default class QLangServer { } } + /* istanbul ignore next */ public onDidChangeWatchedFiles({ changes }: DidChangeWatchedFilesParams) { this.parseFiles( changes.reduce((matches, change) => { From f2a1eb0ea8061acc2dbc666606d843cafafc7a91 Mon Sep 17 00:00:00 2001 From: ecmel Date: Thu, 3 Oct 2024 17:05:02 +0300 Subject: [PATCH 83/99] added import export and new setting --- README.md | 41 +++++++++++++++++++++++++++++++++++++++++ img/impex.png | Bin 0 -> 45721 bytes img/outline.png | Bin 21186 -> 38399 bytes 3 files changed, 41 insertions(+) create mode 100644 img/impex.png diff --git a/README.md b/README.md index 59fe3b5c..ee25ac4f 100644 --- a/README.md +++ b/README.md @@ -282,6 +282,46 @@ When editing a **Insights** connection, you can edit the following properties: ![Edit Insights connection](https://github.com/KxSystems/kx-vscode/blob/main/img/edit-insights-conn-form.png?raw=true) +### Import/Export Connection Configuration + +The import/export connection feature allows you to import and export connections in JSON format from the VSCode IDE without having to create them manually. + +![Import Export](https://github.com/KxSystems/kx-vscode/blob/main/img/impex.png?raw=true) + +To import a connection: + +1. Open the Command Palette (Ctrl+Shift+P) and type the command to open the connection configuration for the installed database extension OR click the three dots (…) next to the Refresh button in the Connections window +2. Select Import Connections +3. Navigate to the location of the configuration file, such as a JSON file that contains the connection details, and select it +4. Review the imported connection for accuracy +5. Confirm the importTo export a connection: + +6. Open the Command Palette (Ctrl+Shift+P) and type the command to manage connection configurations for the installed database extension OR click the three dots (…) next to the Refresh button in the Connections window + +7. Select Export Connections + +8. Choose the connection(s) you want to export + +9. Specify the format and location for the exported configuration file. For example, JSON, YAML. + +10. Confirm the export action. + +To verify the export is successful navigate to the saved location and open the configuration file to check its contents. + +To connect to the database, select the newly imported connection from the list of available connections and initiate the connection to the database. You can run a simple query or command to verify the connection is successful. + +Note: If the imported connection has the same name as an existing connection, you will see a notification in the bottom right corner prompting you to either duplicate, overwrite, or cancel the import. + +To export a connection: + +1. Open the Command Palette (Ctrl+Shift+P) and type the command to manage connection configurations for the installed database extension OR click the three dots (…) next to the Refresh button in the Connections window +2. Select Export Connections +3. Choose the connection(s) you want to export +4. Specify the format and location for the exported configuration file. For example, JSON, YAML. +5. Confirm the export action. + +Note: To verify the export is successful navigate to the saved location and open the configuration file to check its contents. + ## Connection Labels Connection Labels allow you to categorize and organize your connections by assigning them distinct names and colors, making it easier to manage and locate specific connections within the application. @@ -586,6 +626,7 @@ To update kdb VS Code settings, search for **kdb** from _Preferences_ > _Setting | **Hide subscription to newsletter after first install** | yes/no; default no | | **Insights Enterprise Connections for Explorer** | [edit JSON settings](#insights-enterprise-connections-for-explorer) | | **Linting** | Enable linting for q and quke files | +| **Refactoring** | Choose refactoring scope | | **QHOME directory for q runtime** | Display location path of q installation | | **Servers** | [edit JSON settings](#servers) | diff --git a/img/impex.png b/img/impex.png new file mode 100644 index 0000000000000000000000000000000000000000..9161b300b4a3060ebd86742ac71eb6dc7a6efeaa GIT binary patch literal 45721 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 z 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 ?Q;z+x(N#Bs-E+F88{*eE<0mo^}3MXTp= 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
  • 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 Koz6LR5&wTMJ-apl literal 0 HcmV?d00001 diff --git a/img/outline.png b/img/outline.png index dab2e7defdfdf90b2c3d32f73d7c74b260c48bda..cb08041e0365851671d9e981821adc67348c9d06 100644 GIT binary patch literal 38399 zcmd42c{tQx7&nZvM3%}@_DG3P%9^bdrGyykAldhI>|;#}*(!t(Mb@znW2{42v&GnD zE6a>63|WTfOr?I$^IX^SUeEjf^SUl(eCK=4_niBjbKjr)^SS4l<~>zLA z;VTbl?p9X&UlKlh_ISPc;9gC2)e$BGzYeV|Lf78D;gzire{Ql{M?cQ*`kQcnd_q<) z?DOz8IoXX<&X+QkE;JTVI3795G!-WPCZ|45{0*Xh=bPjaSBIy`SKV9&&!`oAFesjIeuhnUr(G@oU_6`YHjlitwz=Ue({98tQeQe1YGuINC#_F-oMCQ|tc1)Y$U*2V$?hpAH8Y5Qm z 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 O%{jG8r}3(nga0r46we0$ literal 21186 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 From 11acf0b5279a4ebac7337db870466182e309b7cb Mon Sep 17 00:00:00 2001 From: Veronica Calescu Date: Fri, 4 Oct 2024 09:54:26 +0100 Subject: [PATCH 84/99] Cleaned up the Import/Export Connection section and adding a row to Data Sources to document the new Add Limit property --- README.md | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index ee25ac4f..cfffb44b 100644 --- a/README.md +++ b/README.md @@ -284,29 +284,17 @@ When editing a **Insights** connection, you can edit the following properties: ### Import/Export Connection Configuration -The import/export connection feature allows you to import and export connections in JSON format from the VSCode IDE without having to create them manually. +The **Import/Export Connection** config allows you to import and export connections in JSON format from the VSCode IDE without having to create them manually. ![Import Export](https://github.com/KxSystems/kx-vscode/blob/main/img/impex.png?raw=true) To import a connection: -1. Open the Command Palette (Ctrl+Shift+P) and type the command to open the connection configuration for the installed database extension OR click the three dots (…) next to the Refresh button in the Connections window -2. Select Import Connections -3. Navigate to the location of the configuration file, such as a JSON file that contains the connection details, and select it -4. Review the imported connection for accuracy -5. Confirm the importTo export a connection: - -6. Open the Command Palette (Ctrl+Shift+P) and type the command to manage connection configurations for the installed database extension OR click the three dots (…) next to the Refresh button in the Connections window - -7. Select Export Connections - -8. Choose the connection(s) you want to export - -9. Specify the format and location for the exported configuration file. For example, JSON, YAML. - -10. Confirm the export action. - -To verify the export is successful navigate to the saved location and open the configuration file to check its contents. +1. Open the Command Palette (Ctrl+Shift+P) and type the command to open the connection configuration for the installed database extension **OR** click the three dots (…) next to the Refresh button in the Connections window. +2. Select **Import Connections**. +3. Navigate to the location of the configuration file, such as a JSON file that contains the connection details, and select it. +4. Review the imported connection for accuracy. +5. Confirm the import. To connect to the database, select the newly imported connection from the list of available connections and initiate the connection to the database. You can run a simple query or command to verify the connection is successful. @@ -314,13 +302,13 @@ Note: If the imported connection has the same name as an existing connection, yo To export a connection: -1. Open the Command Palette (Ctrl+Shift+P) and type the command to manage connection configurations for the installed database extension OR click the three dots (…) next to the Refresh button in the Connections window -2. Select Export Connections -3. Choose the connection(s) you want to export +1. Open the Command Palette (Ctrl+Shift+P) and type the command to manage connection configurations for the installed database extension **OR** click the three dots (…) next to the Refresh button in the Connections window. +2. Select **Export Connections**. +3. Choose the connection(s) you want to export. 4. Specify the format and location for the exported configuration file. For example, JSON, YAML. 5. Confirm the export action. -Note: To verify the export is successful navigate to the saved location and open the configuration file to check its contents. +To verify the export is successful navigate to the saved location and open the configuration file to check its contents. ## Connection Labels @@ -473,6 +461,7 @@ To create a data source and run it against a specific connection: | **Select API** | Choose **getData** from the **Select API** dropdown. | | **Table** | Choose the table you wish to query from the **Tables** dropdown. | | **Start Time/End Time** | Select the **Start Time** and **End Time** for the query. | + | **Row Limit** | Add a limit to the number of queries executed to reduce the number of Out of Memory (OOM) issues or failed queries. | | Additional Parameters | You can choose from the additional parameters as required. | 1. Click **Save** to store the settings you have chosen, for reuse later. When you save a data source; query parameters and the connection details are stored. The data source icon is green if it is associated with a connection and grey if there is no association. From 51a439fdb84726829be2900ab9d3ce7b3ed30e58 Mon Sep 17 00:00:00 2001 From: ecmel Date: Fri, 4 Oct 2024 12:34:18 +0300 Subject: [PATCH 85/99] added refactoring --- README.md | 26 ++++++++++++++++++-------- img/preview.png | Bin 0 -> 58799 bytes img/refactoring.png | Bin 0 -> 31381 bytes 3 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 img/preview.png create mode 100644 img/refactoring.png diff --git a/README.md b/README.md index cfffb44b..18b187e3 100644 --- a/README.md +++ b/README.md @@ -455,14 +455,14 @@ To create a data source and run it against a specific connection: 1. Ensure you have at least one folder open in VS Code. 1. In the **DATASOURCES** view, click **+** and specify the parameters defined in the following table: - | Property | Description | - | ----------------------- | ---------------------------------------------------------------- | - | **Connection** | Select a Connection from the **Connection** dropdown. | - | **Select API** | Choose **getData** from the **Select API** dropdown. | - | **Table** | Choose the table you wish to query from the **Tables** dropdown. | - | **Start Time/End Time** | Select the **Start Time** and **End Time** for the query. | - | **Row Limit** | Add a limit to the number of queries executed to reduce the number of Out of Memory (OOM) issues or failed queries. | - | Additional Parameters | You can choose from the additional parameters as required. | + | Property | Description | + | ----------------------- | ------------------------------------------------------------------------------------------------------------------- | + | **Connection** | Select a Connection from the **Connection** dropdown. | + | **Select API** | Choose **getData** from the **Select API** dropdown. | + | **Table** | Choose the table you wish to query from the **Tables** dropdown. | + | **Start Time/End Time** | Select the **Start Time** and **End Time** for the query. | + | **Row Limit** | Add a limit to the number of queries executed to reduce the number of Out of Memory (OOM) issues or failed queries. | + | Additional Parameters | You can choose from the additional parameters as required. | 1. Click **Save** to store the settings you have chosen, for reuse later. When you save a data source; query parameters and the connection details are stored. The data source icon is green if it is associated with a connection and grey if there is no association. @@ -619,6 +619,16 @@ To update kdb VS Code settings, search for **kdb** from _Preferences_ > _Setting | **QHOME directory for q runtime** | Display location path of q installation | | **Servers** | [edit JSON settings](#servers) | +### Refactoring + +Refactorings such as renaming are by default applied to all files in the workspace. You can preview the changes before applying them and select the files to apply the refactoring by pressing **ctrl** or **command** key before the action. + +![Preview](https://github.com/KxSystems/kx-vscode/blob/main/img/preview.png?raw=true) + +If you only need to apply the refactorings for the currently opened files, refactoring option **Window** can be selected instead of **Workspace**: + +![Refactoring](https://github.com/KxSystems/kx-vscode/blob/main/img/refactoring.png?raw=true) + ### kdb Insights Enterprise Connections for Explorer ```JSON diff --git a/img/preview.png b/img/preview.png new file mode 100644 index 0000000000000000000000000000000000000000..0fa978f19f363aa41bd3614f62473350f9190fd1 GIT binary patch literal 58799 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%0A%VsY~Zq(EeE=#v>`uwr2 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

    ?>5{b?a90?{5*}rztmmH8<=Al6|5aG>+C68V4;( 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 literal 0 HcmV?d00001 From beb053bca66f2494873b748517e6b58c2f772e25 Mon Sep 17 00:00:00 2001 From: ecmel Date: Fri, 4 Oct 2024 12:46:58 +0300 Subject: [PATCH 86/99] applied review changes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 18b187e3..34bc95dc 100644 --- a/README.md +++ b/README.md @@ -621,11 +621,11 @@ To update kdb VS Code settings, search for **kdb** from _Preferences_ > _Setting ### Refactoring -Refactorings such as renaming are by default applied to all files in the workspace. You can preview the changes before applying them and select the files to apply the refactoring by pressing **ctrl** or **command** key before the action. +By default, refactorings like renaming are applied to all files in the workspace. You can preview the changes before applying them and select specific files to apply the refactoring by pressing the **ctrl** or **command** key before executing the action. ![Preview](https://github.com/KxSystems/kx-vscode/blob/main/img/preview.png?raw=true) -If you only need to apply the refactorings for the currently opened files, refactoring option **Window** can be selected instead of **Workspace**: +If you only need to apply the refactorings to the currently opened files, you can select **Window** instead of **Workspace** for the refactoring option: ![Refactoring](https://github.com/KxSystems/kx-vscode/blob/main/img/refactoring.png?raw=true) From 2b3a4f9dd6b8de88432589f98d2d4dc452aee10e Mon Sep 17 00:00:00 2001 From: ecmel Date: Fri, 4 Oct 2024 12:50:11 +0300 Subject: [PATCH 87/99] applied review changes --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 252d1ab6..eba4acd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,14 +8,14 @@ All notable changes to the **kdb VS Code extension** are documented in this file - Show KDB+ process explorer item content when clicked - Add ability to export and import connections -- All files in workspace are considered when using language server features +- All files in the workspace are considered when using language server features - Show call hierarchy is implemented in language server - Query history shows an ellipsis of the query execution text - Add limit option to datasource ### Fixes -- Fixed KDB results columns resizing back to defaults everytime a datasource is run +- Fixed KDB results columns resizing back to default sizes every time a datasource was run - Fixed KDB results for large data sets # v1.7.0 From 8e45d0bed12dede0e9b77e7ebddadfe939cb6307 Mon Sep 17 00:00:00 2001 From: ecmel Date: Mon, 7 Oct 2024 13:42:08 +0300 Subject: [PATCH 88/99] fixed windows bug --- CHANGELOG.md | 1 + server/src/qLangServer.ts | 80 +++++++++++++++++++--------------- test/suite/qLangServer.test.ts | 2 + 3 files changed, 47 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eba4acd7..6c4cc33d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to the **kdb VS Code extension** are documented in this file ### Enhancements +- Add ability to add multiple labels to a single connection - Show KDB+ process explorer item content when clicked - Add ability to export and import connections - All files in the workspace are considered when using language server features diff --git a/server/src/qLangServer.ts b/server/src/qLangServer.ts index a45e17b1..ea13469f 100644 --- a/server/src/qLangServer.ts +++ b/server/src/qLangServer.ts @@ -49,7 +49,7 @@ import { TextEdit, WorkspaceEdit, } from "vscode-languageserver/node"; -import { glob } from "glob"; +import { sync as glob } from "glob"; import { fileURLToPath, pathToFileURL } from "node:url"; import { FindKind, @@ -73,7 +73,7 @@ import { RCurly, } from "./parser"; import { lint } from "./linter"; -import { readFile } from "node:fs"; +import { readFileSync } from "node:fs"; interface Settings { debug: boolean; @@ -168,16 +168,20 @@ export default class QLangServer { /* istanbul ignore next */ public onDidChangeWatchedFiles({ changes }: DidChangeWatchedFilesParams) { - this.parseFiles( - changes.reduce((matches, change) => { - if (change.type === FileChangeType.Deleted) { - this.cached.delete(change.uri); - } else { - matches.push(fileURLToPath(change.uri)); - } - return matches; - }, [] as string[]), - ); + try { + this.parseFiles( + changes.reduce((matches, change) => { + if (change.type === FileChangeType.Deleted) { + this.cached.delete(change.uri); + } else { + matches.push(fileURLToPath(change.uri)); + } + return matches; + }, [] as string[]), + ); + } catch (error) { + this.connection.window.showErrorMessage(`${error}`); + } } public onDidChangeContent({ @@ -443,32 +447,33 @@ export default class QLangServer { /* istanbul ignore next */ public scan() { - this.connection.workspace.getWorkspaceFolders().then((folders) => { - if (folders) { - folders.forEach((folder) => { - glob( - "**/*.{q,quke}", - { cwd: fileURLToPath(folder.uri), ignore: "node_modules/**" }, - (err, matches) => { - if (!err) { - this.parseFiles(matches); - } - }, + const folders = this.params.workspaceFolders; + if (folders) { + try { + for (const folder of folders) { + this.parseFiles( + glob("**/*.{q,quke}", { + dot: true, + absolute: true, + nodir: true, + follow: false, + ignore: "node_modules/**/*.*", + cwd: fileURLToPath(folder.uri), + }), ); - }); + } + } catch (error) { + this.connection.window.showErrorMessage(`${error}`); } - }); + } } /* istanbul ignore next */ private parseFiles(matches: string[]) { - matches.forEach((match) => - readFile(match, "utf-8", (err, file) => { - if (!err) { - this.cached.set(pathToFileURL(match).toString(), parse(file)); - } - }), - ); + for (const match of matches) { + const file = readFileSync(match, "utf-8"); + this.cached.set(pathToFileURL(match).toString(), parse(file)); + } } private parse(textDocument: TextDocumentIdentifier): Token[] { @@ -482,10 +487,13 @@ export default class QLangServer { private context({ uri, tokens }: Tokenized, all = true): Tokenized[] { if (all) { this.documents.all().forEach((document) => { - this.cached.set( - document.uri, - document.uri === uri ? tokens : parse(document.getText()), - ); + const path = fileURLToPath(document.uri); + if (path) { + this.cached.set( + pathToFileURL(path).toString(), + document.uri === uri ? tokens : parse(document.getText()), + ); + } }); return Array.from(this.cached.entries(), (entry) => ({ uri: entry[0], diff --git a/test/suite/qLangServer.test.ts b/test/suite/qLangServer.test.ts index a5568c8d..9c2828ae 100644 --- a/test/suite/qLangServer.test.ts +++ b/test/suite/qLangServer.test.ts @@ -404,6 +404,7 @@ describe("qLangServer", () => { .stub(connection.workspace, "getWorkspaceFolders") .value(async () => []); server.scan(); + assert.strictEqual(server["cached"].size, 0); }); }); @@ -413,6 +414,7 @@ describe("qLangServer", () => { .stub(connection.workspace, "getWorkspaceFolders") .value(async () => []); server.onDidChangeWatchedFiles({ changes: [] }); + assert.strictEqual(server["cached"].size, 0); }); }); }); From 7f24feb0a0c85d347bef823f23d9d226e34ea02c Mon Sep 17 00:00:00 2001 From: ecmel Date: Mon, 7 Oct 2024 13:47:27 +0300 Subject: [PATCH 89/99] fixed test setup --- test/suite/qLangServer.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/suite/qLangServer.test.ts b/test/suite/qLangServer.test.ts index 9c2828ae..22622c4f 100644 --- a/test/suite/qLangServer.test.ts +++ b/test/suite/qLangServer.test.ts @@ -31,9 +31,9 @@ describe("qLangServer", () => { function createDocument(content: string, offset?: number) { content = content.trim(); - const document = TextDocument.create("test.q", "q", 1, content); + const document = TextDocument.create("file:///test.q", "q", 1, content); const position = document.positionAt(offset || content.length); - const textDocument = TextDocumentIdentifier.create("test.q"); + const textDocument = TextDocumentIdentifier.create("file:///test.q"); sinon.stub(server.documents, "get").value(() => document); sinon.stub(server.documents, "all").value(() => [document]); return { From b9c970e3709bb1654f6a30397ead2a638cdbe10b Mon Sep 17 00:00:00 2001 From: ecmel Date: Mon, 7 Oct 2024 13:55:04 +0300 Subject: [PATCH 90/99] fix windows test setup --- test/suite/qLangServer.test.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/suite/qLangServer.test.ts b/test/suite/qLangServer.test.ts index 22622c4f..5d4e14c9 100644 --- a/test/suite/qLangServer.test.ts +++ b/test/suite/qLangServer.test.ts @@ -22,6 +22,7 @@ import { } from "vscode-languageserver"; import { TextDocument } from "vscode-languageserver-textdocument"; import QLangServer from "../../server/src/qLangServer"; +import { pathToFileURL } from "url"; const context = { includeDeclaration: true }; @@ -31,9 +32,10 @@ describe("qLangServer", () => { function createDocument(content: string, offset?: number) { content = content.trim(); - const document = TextDocument.create("file:///test.q", "q", 1, content); + const uri = pathToFileURL("test.q").toString(); + const document = TextDocument.create(uri, "q", 1, content); const position = document.positionAt(offset || content.length); - const textDocument = TextDocumentIdentifier.create("file:///test.q"); + const textDocument = TextDocumentIdentifier.create(uri); sinon.stub(server.documents, "get").value(() => document); sinon.stub(server.documents, "all").value(() => [document]); return { From db2696ba573474631e3aed8ac9ebab606ef99f1d Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 11 Oct 2024 10:59:06 +0100 Subject: [PATCH 91/99] fix errors found in e2e tests --- src/classes/insightsConnection.ts | 50 ++++++++++--------- src/utils/connLabel.ts | 3 ++ src/utils/core.ts | 3 +- .../components/kdbNewConnectionView.ts | 2 +- test/suite/utils.test.ts | 4 ++ 5 files changed, 36 insertions(+), 26 deletions(-) diff --git a/src/classes/insightsConnection.ts b/src/classes/insightsConnection.ts index 1da63f89..6ebc287c 100644 --- a/src/classes/insightsConnection.ts +++ b/src/classes/insightsConnection.ts @@ -358,30 +358,32 @@ export class InsightsConnection { progress.report({ message: "Populating scratchpad..." }); - const scratchpadResponse = await axios.post( - scratchpadURL.toString(), - body, - headers, - ); - - kdbOutputLog( - `Executed successfully, stored in ${variableName}.`, - "INFO", - ); - kdbOutputLog( - `[SCRATCHPAD] Status: ${scratchpadResponse.status}`, - "INFO", - ); - kdbOutputLog( - `[SCRATCHPAD] Populated scratchpad with the following params: ${JSON.stringify(body.params)}`, - "INFO", - ); - window.showInformationMessage( - `Executed successfully, stored in ${variableName}.`, - ); - Telemetry.sendEvent( - "Datasource." + dsTypeString + ".Scratchpad.Populated", - ); + const scratchpadResponse = await axios + .post(scratchpadURL.toString(), body, headers) + .then((response: any) => { + if (response.data.error) { + kdbOutputLog( + `[SCRATCHPAD] Error occured while populating scratchpad: ${response.data.errorMsg}`, + "ERROR", + ); + } else { + kdbOutputLog( + `Executed successfully, stored in ${variableName}.`, + "INFO", + ); + kdbOutputLog(`[SCRATCHPAD] Status: ${response.status}`, "INFO"); + kdbOutputLog( + `[SCRATCHPAD] Populated scratchpad with the following params: ${JSON.stringify(body.params)}`, + "INFO", + ); + window.showInformationMessage( + `Executed successfully, stored in ${variableName}.`, + ); + Telemetry.sendEvent( + "Datasource." + dsTypeString + ".Scratchpad.Populated", + ); + } + }); const p = new Promise((resolve) => resolve()); return p; diff --git a/src/utils/connLabel.ts b/src/utils/connLabel.ts index f2c9f4c9..790efe03 100644 --- a/src/utils/connLabel.ts +++ b/src/utils/connLabel.ts @@ -100,6 +100,9 @@ export function removeConnFromLabels(connName: string) { ); } }); + workspace + .getConfiguration() + .update("kdb.labelsConnectionMap", ext.labelConnMapList, true); } export async function handleLabelsConnMap(labels: string[], connName: string) { diff --git a/src/utils/core.ts b/src/utils/core.ts index 31a6d94b..4fd98856 100644 --- a/src/utils/core.ts +++ b/src/utils/core.ts @@ -57,7 +57,8 @@ export async function checkOpenSslInstalled(): Promise { return semver.clean(installedVersion ? installedVersion[1] : ""); } } catch (err) { - kdbOutputLog(`Error in checking OpenSSL version: ${err}`, "ERROR"); + // Disabled the error, as it is not critical + // kdbOutputLog(`Error in checking OpenSSL version: ${err}`, "ERROR"); Telemetry.sendException(err as Error); } return null; diff --git a/src/webview/components/kdbNewConnectionView.ts b/src/webview/components/kdbNewConnectionView.ts index 2097f2fd..de8b957c 100644 --- a/src/webview/components/kdbNewConnectionView.ts +++ b/src/webview/components/kdbNewConnectionView.ts @@ -941,7 +941,7 @@ export class KdbNewConnectionView extends LitElement { }, }); setTimeout(() => { - this.labels[0] = this.newLblName; + this.labels.unshift(this.newLblName); this.closeModal(); }, 500); } diff --git a/test/suite/utils.test.ts b/test/suite/utils.test.ts index c3fa43c0..f3fd47e8 100644 --- a/test/suite/utils.test.ts +++ b/test/suite/utils.test.ts @@ -1710,6 +1710,10 @@ describe("Utils", () => { labelName: "label1", connections: ["conn1", "conn2"], }); + getConfigurationStub.returns({ + get: sinon.stub(), + update: sinon.stub(), + }); LabelsUtils.removeConnFromLabels("conn1"); From e47155d14359e9a7c10d1386becc7e4024c37e87 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 11 Oct 2024 11:10:09 +0100 Subject: [PATCH 92/99] add tests --- test/suite/webview.test.ts | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/test/suite/webview.test.ts b/test/suite/webview.test.ts index ac777ccf..1bed0d54 100644 --- a/test/suite/webview.test.ts +++ b/test/suite/webview.test.ts @@ -896,6 +896,40 @@ describe("KdbNewConnectionView", () => { }); }); + describe("createLabel", () => { + let clock: sinon.SinonFakeTimers; + + beforeEach(() => { + clock = sinon.useFakeTimers(); + }); + + afterEach(() => { + clock.restore(); + }); + + it("should post a message and update labels after timeout", () => { + const api = acquireVsCodeApi(); + const postMessageStub = sinon.stub(api, "postMessage"); + const closeModalStub = sinon.stub(view, "closeModal"); + + view.newLblName = "Test Label"; + view.newLblColorName = "Test Color"; + view.labels = []; + + view.createLabel(); + + sinon.assert.calledOnce(postMessageStub); + + // Avança o tempo em 500ms + clock.tick(500); + + assert.equal(view.labels[0], "Test Label"); + sinon.assert.calledOnce(closeModalStub); + + sinon.restore(); + }); + }); + describe("edit", () => { const editConn: EditConnectionMessage = { connType: 0, @@ -931,4 +965,6 @@ describe("KdbNewConnectionView", () => { sinon.restore(); }); }); + + describe("createLabel", () => {}); }); From 456f4c28265139edf52e301b76e31abfa805cf5b Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 11 Oct 2024 11:17:19 +0100 Subject: [PATCH 93/99] improve code quality --- src/classes/insightsConnection.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/classes/insightsConnection.ts b/src/classes/insightsConnection.ts index 6ebc287c..85edd732 100644 --- a/src/classes/insightsConnection.ts +++ b/src/classes/insightsConnection.ts @@ -346,7 +346,7 @@ export class InsightsConnection { isTableView: false, params: queryParams, }; - window.withProgress( + await window.withProgress( { location: ProgressLocation.Notification, cancellable: false, @@ -358,7 +358,7 @@ export class InsightsConnection { progress.report({ message: "Populating scratchpad..." }); - const scratchpadResponse = await axios + return await axios .post(scratchpadURL.toString(), body, headers) .then((response: any) => { if (response.data.error) { @@ -384,9 +384,6 @@ export class InsightsConnection { ); } }); - - const p = new Promise((resolve) => resolve()); - return p; }, ); } else { From d3fd871c4f53ee596b1196369fea03c69f08ddc9 Mon Sep 17 00:00:00 2001 From: Philip Carneiro Date: Fri, 11 Oct 2024 11:20:14 +0100 Subject: [PATCH 94/99] remove dummy info --- src/webview/components/kdbDataSourceView.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/webview/components/kdbDataSourceView.ts b/src/webview/components/kdbDataSourceView.ts index 9fcd2808..0dae141f 100644 --- a/src/webview/components/kdbDataSourceView.ts +++ b/src/webview/components/kdbDataSourceView.ts @@ -870,8 +870,7 @@ export class KdbDataSourceView extends LitElement { ).value; this.requestChange(); }}" - >Start Time - ${this.selectedServerVersion}Start Time Date: Tue, 15 Oct 2024 14:59:30 +0100 Subject: [PATCH 95/99] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c4cc33d..dd5e9f35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ All notable changes to the **kdb VS Code extension** are documented in this file ### Enhancements -- Add ability to add multiple labels to a single connection +- Added the ability to add multiple labels to a single connection - Show KDB+ process explorer item content when clicked - Add ability to export and import connections - All files in the workspace are considered when using language server features From fa559bd21e7e08e0794cb722be9641eb4b347e01 Mon Sep 17 00:00:00 2001 From: Veronica Calescu Date: Tue, 15 Oct 2024 14:59:44 +0100 Subject: [PATCH 96/99] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd5e9f35..5bd42175 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ All notable changes to the **kdb VS Code extension** are documented in this file - Added the ability to add multiple labels to a single connection - Show KDB+ process explorer item content when clicked -- Add ability to export and import connections +- Added the ability to export and import connections - All files in the workspace are considered when using language server features - Show call hierarchy is implemented in language server - Query history shows an ellipsis of the query execution text From 0346c2e252b1716553142fa63fdec2412992697b Mon Sep 17 00:00:00 2001 From: Veronica Calescu Date: Tue, 15 Oct 2024 14:59:51 +0100 Subject: [PATCH 97/99] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bd42175..195773a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ All notable changes to the **kdb VS Code extension** are documented in this file - All files in the workspace are considered when using language server features - Show call hierarchy is implemented in language server - Query history shows an ellipsis of the query execution text -- Add limit option to datasource +- Added limit option to datasource for 1.11 + versions of Insights Enterprise connections ### Fixes From 3067ad308288cbbe21deefc21b88c10d30fc3de3 Mon Sep 17 00:00:00 2001 From: Veronica Calescu Date: Tue, 15 Oct 2024 15:00:00 +0100 Subject: [PATCH 98/99] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 195773a2..82bc5661 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ All notable changes to the **kdb VS Code extension** are documented in this file - Added the ability to export and import connections - All files in the workspace are considered when using language server features - Show call hierarchy is implemented in language server -- Query history shows an ellipsis of the query execution text +- Query history shows an ellipsis of the query execution text to the available line length - Added limit option to datasource for 1.11 + versions of Insights Enterprise connections ### Fixes From 35092ebccedb9fe63babea41c18b5f9ca0a44b01 Mon Sep 17 00:00:00 2001 From: Veronica Calescu Date: Tue, 15 Oct 2024 15:00:10 +0100 Subject: [PATCH 99/99] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82bc5661..16d7dc17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to the **kdb VS Code extension** are documented in this file - Added the ability to add multiple labels to a single connection - Show KDB+ process explorer item content when clicked - Added the ability to export and import connections -- All files in the workspace are considered when using language server features +- All the files in the workspace are considered when using language server features - Show call hierarchy is implemented in language server - Query history shows an ellipsis of the query execution text to the available line length - Added limit option to datasource for 1.11 + versions of Insights Enterprise connections