Merge zowex staging branch into main

.eslintrc.yaml

@@ -8,6 +8,8 @@ env:
   es6: true
 ignorePatterns:
   [
+    "**/benchmarks",
+    "**/russh-native-loader.js",
     "**/scripts",
     "**/__mocks__",
     "**/lib",
@@ -68,7 +70,12 @@ rules:
   "@typescript-eslint/no-unsafe-argument": off
   "@typescript-eslint/no-unsafe-call": off
   "@typescript-eslint/no-unsafe-member-access": off
-
+  "@typescript-eslint/no-namespace": warn
+  "@typescript-eslint/no-explicit-any": warn
+  "@typescript-eslint/no-redundant-type-constituents": warn
+  "@typescript-eslint/no-unsafe-enum-comparison": warn
+  "@typescript-eslint/no-base-to-string": warn
+  "@typescript-eslint/no-non-null-asserted-optional-chain": warn
   "@typescript-eslint/no-shadow": error
   "@typescript-eslint/no-unused-expressions": error
   "@typescript-eslint/no-var-requires": warn

.github/release.config.js

@@ -33,6 +33,7 @@ module.exports = {
                     "zowe-explorer": "Zowe Explorer",
                     "zowe-explorer-ftp-extension": "IBM z/OS FTP for Zowe Explorer",
                     "zowe-explorer-api": "Zowe Explorer APIs",
+                    "zowex-for-zowe-explorer": "Zowe Remote SSH APIs",
                 },
                 headerLine: "## TBD Release",
             },

.github/workflows/report-artifact-pr.yml

@@ -5,6 +5,7 @@ on:
     paths:
       - packages/zowe-explorer/**
       - packages/zowe-explorer-api/**
+      - packages/zowex-for-zowe-explorer/**
       - .github/workflows/report-artifact-pr.yml
       - .github/resources/artifact-template.hbs
 

.github/workflows/zowe-explorer-ci.yml

@@ -5,11 +5,13 @@ on:
     paths:
       - packages/zowe-explorer/**
       - packages/zowe-explorer-api/**
+      - packages/zowex-for-zowe-explorer/**
       - .github/workflows/zowe-explorer-ci.yml
   pull_request:
     paths:
       - packages/zowe-explorer/**
       - packages/zowe-explorer-api/**
+      - packages/zowex-for-zowe-explorer/**
       - .github/workflows/zowe-explorer-ci.yml
 
 jobs:

.gitignore

@@ -33,3 +33,4 @@ package.nls.*.json
 bundle.l10n.*.json
 bundle.l10n.json.template
 zedc/target
+packages/zowe-explorer/bin

package.json

@@ -21,8 +21,8 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^22.13.14",
     "@types/vscode": "^1.73.0",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.62.0",
+    "@typescript-eslint/eslint-plugin": "^6.4.0",
+    "@typescript-eslint/parser": "^6.4.0",
     "@vitest/coverage-v8": "^3.2.6",
     "@vitest/ui": "^3.2.6",
     "@vscode/l10n-dev": "^0.0.35",
@@ -46,7 +46,7 @@
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
     "node-loader": "^2.1.0",
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.0",
     "rimraf": "^3.0.2",
     "terser-webpack-plugin": "^5.3.16",
     "tsx": "^4.21.0",
@@ -70,6 +70,6 @@
     "test:parallel": "pnpm -r --parallel --color test",
     "package": "pnpm -r --sequential package",
     "preinstall": "npx only-allow pnpm",
-    "update-sdks": "pnpm -r update \"@zowe/*@zowe-v3-lts\" \"!@zowe/zowe-explorer-api\" \"!@zowe/zos-ftp-for-zowe-cli\""
+    "update-sdks": "pnpm -r update \"@zowe/*@zowe-v3-lts\" \"!@zowe/zowe-explorer-api\" \"!@zowe/zos-ftp-for-zowe-cli\" \"!zowex-for-zowe-explorer\""
   }
 }

packages/eslint-plugin-zowe-explorer/lib/rules/no-floating-promises.js

@@ -3,9 +3,11 @@
  * difference. We permit floating Thenable objects that don't implement a
  * .catch function and have no risk of an uncaught promise exception.
  */
+const path = require("path");
 const rewire = require("rewire");
 const tsutils = require("tsutils");
-const oldRule = rewire("@typescript-eslint/eslint-plugin/dist/rules/no-floating-promises");
+const eslintPluginPath = path.dirname(require.resolve("@typescript-eslint/eslint-plugin"));
+const oldRule = rewire(eslintPluginPath + "/rules/no-floating-promises");
 const oldIsPromiseLike = oldRule.__get__("isPromiseLike");
 oldRule.__set__("isPromiseLike", (checker, node) => {
     const type = checker.getTypeAtLocation(node);

packages/eslint-plugin-zowe-explorer/package.json

@@ -21,6 +21,7 @@
     "package": "echo \"eslint-plugin: nothing to package.\""
   },
   "devDependencies": {
+    "@typescript-eslint/rule-tester": "^6.4.0",
     "requireindex": "^1.1.0",
     "rewire": "^6.0.0",
     "vitest": "^3.2.6"

packages/eslint-plugin-zowe-explorer/tests/lib/rules/no-floating-promises.js

@@ -1,9 +1,9 @@
 "use strict";
 
 const rule = require("../../../lib/rules/no-floating-promises");
-const { ESLintUtils } = require("@typescript-eslint/utils");
+const { RuleTester } = require("@typescript-eslint/rule-tester");
 
-const ruleTester = new ESLintUtils.RuleTester({
+const ruleTester = new RuleTester({
   parser: "@typescript-eslint/parser",
   parserOptions: {
     ecmaVersion: 2015,

packages/zowe-explorer-api/CHANGELOG.md

@@ -442,13 +442,11 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
 - Added the `onVaultUpdate` VSCode event to notify extenders when credentials are updated on the OS vault by other applications. [#2994](https://github.com/zowe/zowe-explorer-vscode/pull/2994)
 - Added the `onCredMgrsUpdate` VSCode event to notify extenders when the local PC's credential manager has been updated by other applications. [#2994](https://github.com/zowe/zowe-explorer-vscode/pull/2994)
 - **LTS Breaking:** Updated most function signatures for exported programmatic interfaces. Changes make developing with the Zowe Explorer API more efficient for extenders by showing which properties they can expect when calling our APIs. [#2952](https://github.com/zowe/zowe-explorer-vscode/issues/2952)
-
   - Updated `IApiExplorerExtender.ts`, see changes below:
     - Allowed `reloadProfiles` and `initForZowe` to be synchronous methods (non-breaking)
   - Updated `MainframeInteraction.ts`, see changes below:
     - Modified `getStatus` to add `string` type to the optional parameter `profileType`
   - Updated `IZoweTree.ts`, see changes below:
-
     - Modified `checkCurrentProfile(node: IZoweTreeNode);` to return `Validation.IValidationProfile | Promise<Validation.IValidationProfile>`
     - Modified `getSearchHistory()` to return `string[]`
     - Modified `getAllLoadedItems()` to return `IZoweTreeNode[] | Promise<IZoweTreeNode[]>`

packages/zowe-explorer-api/__tests__/__unit__/profiles/ZoweExplorerZosmfApi.unit.test.ts

@@ -925,64 +925,41 @@ describe("ZosmfCommandApi", () => {
         const spy = sharedSpyOn(zosuss.Shell, "executeSshCwd");
         spy.mockClear().mockResolvedValue(undefined);
         await obj.issueUnixCommand("ls", "dir'with'quotes", SshSessionobj);
-        expect(spy).toHaveBeenCalledWith(
-            SshSessionobj,
-            "ls",
-            "dir'with'quotes",
-            expect.any(Function),
-            true
-        );
+        expect(spy).toHaveBeenCalledWith(SshSessionobj, "ls", "dir'with'quotes", expect.any(Function), true);
     });
 
     it("issueUnixCommand should pass cwd raw to executeSshCwd even with shell metacharacters", async () => {
         const obj = new ZoweExplorerZosmf.CommandApi();
         const spy = sharedSpyOn(zosuss.Shell, "executeSshCwd");
         spy.mockClear().mockResolvedValue(undefined);
-        
+
         await obj.issueUnixCommand("pwd", "test'dir$(sleep 5)`whoami`", SshSessionobj);
-
-        expect(spy).toHaveBeenCalledWith(
-            SshSessionobj,
-            "pwd",
-            "test'dir$(sleep 5)`whoami`", 
-            expect.any(Function),
-            true
-        );
+
+        expect(spy).toHaveBeenCalledWith(SshSessionobj, "pwd", "test'dir$(sleep 5)`whoami`", expect.any(Function), true);
     });
 
     it("issueUnixCommand should pass cwd raw to executeSshCwd even with consecutive/edge single quotes", async () => {
         const obj = new ZoweExplorerZosmf.CommandApi();
         const spy = sharedSpyOn(zosuss.Shell, "executeSshCwd");
         spy.mockClear().mockResolvedValue(undefined);
-        
+
         await obj.issueUnixCommand("ls", "''weird''dir'", SshSessionobj);
-
-        expect(spy).toHaveBeenCalledWith(
-            SshSessionobj,
-            "ls",
-            "''weird''dir'",
-            expect.any(Function),
-            true
-        );
+
+        expect(spy).toHaveBeenCalledWith(SshSessionobj, "ls", "''weird''dir'", expect.any(Function), true);
     });
 
     it("issueUnixCommand should call executeSsh directly if cwd is empty", async () => {
         const obj = new ZoweExplorerZosmf.CommandApi();
         const spySsh = sharedSpyOn(zosuss.Shell, "executeSsh");
         const spySshCwd = sharedSpyOn(zosuss.Shell, "executeSshCwd");
-        
+
         spySsh.mockClear().mockResolvedValue(undefined);
         spySshCwd.mockClear().mockResolvedValue(undefined);
-        
+
         await obj.issueUnixCommand("ls", "", SshSessionobj);
-        
+
         expect(spySshCwd).not.toHaveBeenCalled();
-        expect(spySsh).toHaveBeenCalledWith(
-            SshSessionobj,
-            "ls",
-            expect.any(Function),
-            true
-        );
+        expect(spySsh).toHaveBeenCalledWith(SshSessionobj, "ls", expect.any(Function), true);
     });
 
     it("check whether sshProfileNeeded", () => {

packages/zowe-explorer-api/__tests__/__unit__/utils/ErrorCorrelator.unit.test.ts

@@ -181,4 +181,25 @@ describe("displayCorrelatedError", () => {
         expect(correlateErrorMock).toHaveBeenCalledWith(ZoweExplorerApiType.All, initialError, { profileType: "zosmf" });
         expect(errorMessageMock).toHaveBeenCalledWith("Network Error. Initial error.", { items: ["More info"] });
     });
+
+    it("displays an error exposing the additionalDetails field", async () => {
+        const initialError = new ImperativeError({
+            msg: "Imperative Error.",
+            additionalDetails: "Failed to acquire ENQ on the data set!",
+            causeErrors: new Error("Initial error."),
+        });
+        const error = new CorrelatedError({
+            correlation: { summary: "Network Error." },
+            initialError: initialError,
+        });
+        const correlateErrorMock = vi.spyOn(ErrorCorrelator.getInstance(), "correlateError").mockReturnValueOnce(error);
+        const errorMessageMock = vi.spyOn(Gui, "errorMessage");
+        await ErrorCorrelator.getInstance().displayError(ZoweExplorerApiType.All, initialError, {
+            profileType: "zosmf",
+        });
+        expect(correlateErrorMock).toHaveBeenCalledWith(ZoweExplorerApiType.All, initialError, { profileType: "zosmf" });
+        expect(errorMessageMock).toHaveBeenCalledWith("Network Error. Failed to acquire ENQ on the data set! Initial error.", {
+            items: ["More info"],
+        });
+    });
 });

packages/zowe-explorer-api/__tests__/__unit__/vscode/ui/PaginationCodeLens.unit.test.ts

@@ -14,15 +14,23 @@ import { PaginationCodeLens } from "../../../../src/vscode/ui/PaginationCodeLens
 vi.mock("vscode", () => {
     return {
         Range: class {
-            public constructor(public startLine: number, public _startChar: number, public endLine: number, public _endChar: number) {
+            public constructor(
+                public startLine: number,
+                public _startChar: number,
+                public endLine: number,
+                public _endChar: number
+            ) {
                 this.start = { line: startLine };
                 this.end = { line: endLine };
             }
             public start: { line: number };
             public end: { line: number };
         },
         CodeLens: class {
-            public constructor(public range: any, public command: any) {}
+            public constructor(
+                public range: any,
+                public command: any
+            ) {}
         },
         l10n: {
             t: (str: string) => str,

packages/zowe-explorer-api/src/fs/types/datasets.ts

@@ -39,7 +39,10 @@ export enum DsType {
 export class DsEntry extends FileEntry implements DsEntryProps {
     public metadata: DsEntryMetadata;
 
-    public constructor(name: string, public isMember: boolean = false) {
+    public constructor(
+        name: string,
+        public isMember: boolean = false
+    ) {
         super(name);
     }
 

packages/zowe-explorer-api/src/logger/IZoweLogger.ts

@@ -28,7 +28,10 @@ export class IZoweLogger {
     /**
      * Creates an instance of the Imperative logger
      */
-    public constructor(private extensionName: string, loggingPath: string) {
+    public constructor(
+        private extensionName: string,
+        loggingPath: string
+    ) {
         for (const appenderName of Object.keys(loggerConfig.log4jsConfig.appenders)) {
             this.LOGGER_CONFIG.log4jsConfig.appenders[appenderName].filename = path.join(
                 loggingPath,

packages/zowe-explorer-api/src/profiles/ProfilesCache.ts

@@ -41,7 +41,10 @@ export class ProfilesCache {
     protected defaultProfileByType = new Map<string, imperative.IProfileLoaded>();
     protected overrideWithEnv = false;
 
-    public constructor(protected log: imperative.Logger, protected cwd?: string) {
+    public constructor(
+        protected log: imperative.Logger,
+        protected cwd?: string
+    ) {
         this.cwd = cwd != null ? FileManagement.getFullPath(cwd) : undefined;
     }
 

packages/zowe-explorer-api/src/utils/ErrorCorrelator.ts

@@ -281,7 +281,7 @@ export class ErrorCorrelator {
         }
 
         for (const apiError of [
-            ...(opts?.profileType ? this.errorMatches.get(api)?.[opts.profileType] ?? [] : []),
+            ...(opts?.profileType ? (this.errorMatches.get(api)?.[opts.profileType] ?? []) : []),
             ...(this.errorMatches.get(api)?.any ?? []),
             ...this.errorMatches.get(ZoweExplorerApiType.All).any,
         ]) {
@@ -315,8 +315,16 @@ export class ErrorCorrelator {
      */
     public async displayCorrelatedError(error: CorrelatedError, opts?: DisplayCorrelatedErrorOpts): Promise<string | undefined> {
         const errorCodeStr = error.properties.errorCode ? ` (Error Code ${error.properties.errorCode})` : "";
-        const additionalDetails =
-            error.initial instanceof ImperativeError && error.initial.causeErrors instanceof Error ? error.initial.causeErrors.message : undefined;
+        let additionalDetails = "";
+        if (error.initial instanceof ImperativeError) {
+            if (error.initial.additionalDetails) {
+                additionalDetails = error.initial.additionalDetails + " ";
+            }
+            if (error.initial.causeErrors instanceof Error) {
+                additionalDetails += error.initial.causeErrors.message;
+            }
+        }
+
         const userSelection = await Gui.errorMessage(
             `${opts?.additionalContext ? opts.additionalContext + ": " : ""}${error.message}${errorCodeStr}${
                 additionalDetails ? " " + additionalDetails : ""

packages/zowe-explorer-api/src/vscode/ui/PaginationCodeLens.ts

@@ -12,7 +12,10 @@
 import * as vscode from "vscode";
 
 export class PaginationCodeLens implements vscode.CodeLensProvider {
-    public constructor(private commandId: string, private shouldShowCodeLens?: (document: vscode.TextDocument) => boolean) {}
+    public constructor(
+        private commandId: string,
+        private shouldShowCodeLens?: (document: vscode.TextDocument) => boolean
+    ) {}
     public provideCodeLenses(document: vscode.TextDocument, token: vscode.CancellationToken): vscode.ProviderResult<vscode.CodeLens[]> {
         const lineCount = document.lineCount;
         const lastLine = lineCount - 1;

packages/zowe-explorer-api/src/vscode/ui/TableView.ts

@@ -1022,10 +1022,13 @@ export namespace Table {
                 });
             }
 
-            const rowsObject = rows.reduce((acc, row, index) => {
-                acc[index] = row;
-                return acc;
-            }, {} as Record<number, RowData>);
+            const rowsObject = rows.reduce(
+                (acc, row, index) => {
+                    acc[index] = row;
+                    return acc;
+                },
+                {} as Record<number, RowData>
+            );
 
             return this.request<boolean>("pin-rows", { rows: rowsObject });
         }
@@ -1036,10 +1039,13 @@ export namespace Table {
          * @returns Whether the webview successfully unpinned the rows
          */
         public async unpinRows(rows: RowData[]): Promise<boolean> {
-            const rowsObject = rows.reduce((acc, row, index) => {
-                acc[index] = row;
-                return acc;
-            }, {} as Record<number, RowData>);
+            const rowsObject = rows.reduce(
+                (acc, row, index) => {
+                    acc[index] = row;
+                    return acc;
+                },
+                {} as Record<number, RowData>
+            );
 
             return this.request<boolean>("unpin-rows", { rows: rowsObject });
         }

packages/zowe-explorer-api/src/vscode/ui/utils/TableProviderRegistry.ts

@@ -70,7 +70,7 @@ export class TableProviderRegistry {
             this.providers.set(tableId, []);
         }
 
-        const existingProviders = this.providers.get(tableId)!;
+        const existingProviders = this.providers.get(tableId);
         if (!existingProviders.includes(provider)) {
             existingProviders.push(provider);
         }

packages/zowe-explorer/.vscodeignore

@@ -3,6 +3,7 @@
 */**
 
 # Allowlist what we need
+!bin/**
 !l10n/bundle*.json
 !out/src/**.js
 !out/src/nls.metadata*.json

packages/zowe-explorer/CHANGELOG.md

@@ -11,6 +11,8 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 
 ### Bug fixes
 
+- Fixed an issue where additional error details were not displayed, particularly using SSH profiles. [zowex/#766](https://github.com/zowe/zowex/issues/766)
+
 ## `3.5.1`
 
 ### Bug fixes