feat: Introduce integrated terminal

package.json

@@ -17,44 +17,44 @@
   },
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
-    "disposablestack": "^1.1.4"
+    "disposablestack": "^1.1.6"
   },
   "devDependencies": {
-    "@types/jest": "^29.2.3",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^18.19.14",
-    "@types/vscode": "^1.73.0",
-    "@typescript-eslint/eslint-plugin": "^5.53.0",
-    "@typescript-eslint/parser": "^5.53.0",
+    "@types/jest": "^29.5.14",
+    "@types/mocha": "^10.0.9",
+    "@types/node": "^18.19.64",
+    "@types/vscode": "^1.95.0",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
     "@vscode/l10n-dev": "^0.0.35",
-    "@vscode/test-electron": "^1.6.0",
-    "@vscode/vsce": "^3.1.0",
+    "@vscode/test-electron": "^1.6.2",
+    "@vscode/vsce": "^3.2.1",
     "concurrently": "^6.5.1",
-    "esbuild-loader": "^4.1.0",
-    "eslint": "^8.34.0",
-    "eslint-config-prettier": "^8.6.0",
+    "esbuild-loader": "^4.2.2",
+    "eslint": "^8.57.1",
+    "eslint-config-prettier": "^8.10.0",
     "eslint-plugin-deprecation": "^2.0.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-zowe-explorer": "workspace:./packages/eslint-plugin-zowe-explorer",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "husky": "^6.0.0",
-    "jest": "^29.3.1",
-    "jest-html-reporter": "^3.7.0",
+    "jest": "^29.7.0",
+    "jest-html-reporter": "^3.10.2",
     "jest-junit": "^15.0.0",
     "jest-mock-vscode": "^3.0.5",
-    "jest-stare": "^2.4.1",
+    "jest-stare": "^2.5.2",
     "madge": "^7.0.0",
-    "mocha": "^10.2.0",
-    "mocha-junit-reporter": "^2.2.0",
+    "mocha": "^10.8.2",
+    "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
     "node-loader": "^2.0.0",
-    "prettier": "^2.6.0",
+    "prettier": "^2.8.8",
     "rimraf": "^3.0.2",
     "terser-webpack-plugin": "^5.3.10",
-    "ts-jest": "^29.0.3",
-    "tsx": "^4.9.3",
-    "typescript": "^5.3.3",
-    "webpack": "^5.94.0",
+    "ts-jest": "^29.2.5",
+    "tsx": "^4.19.2",
+    "typescript": "^5.6.3",
+    "webpack": "^5.96.1",
     "webpack-cli": "^5.1.4"
   },
   "pnpm": {

packages/zowe-explorer-api/CHANGELOG.md

@@ -7,11 +7,13 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
 ### New features and enhancements
 
 - Update Zowe SDKs to `8.2.0` to get the latest enhancements from Imperative.
+- Added individual user settings for MVS, TSO, and Unix commands. [#3079](https://github.com/zowe/zowe-explorer-vscode/pull/3079)
 
 ### Bug fixes
 
 - Fixed an issue to review inconsistent capitalization across translation strings. [#2935](https://github.com/zowe/zowe-explorer-vscode/issues/2935)
 - Fixed an issue where the `responseTimeout` profile property was ignored for z/OSMF MVS and USS API calls. [#3225](https://github.com/zowe/zowe-explorer-vscode/issues/3225)
+- Updated dependecies for technical currency. [#3786](https://github.com/zowe/zowe-explorer-vscode/issues/3786)
 
 ## `3.0.2`
 

packages/zowe-explorer-api/__tests__/__unit__/fs/BaseProvider.unit.test.ts

@@ -544,8 +544,8 @@ describe("_handleConflict", () => {
     });
 });
 describe("_handleError", () => {
-    it("calls ErrorCorrelator.displayError to display error to user - no options provided", async () => {
-        const displayErrorMock = jest.spyOn(ErrorCorrelator.prototype, "displayError").mockReturnValue(new Promise((res, rej) => {}));
+    it("calls ErrorCorrelator.displayError to display error to user - no options provided", () => {
+        const displayErrorMock = jest.spyOn(ErrorCorrelator.prototype, "displayError").mockReturnValue(new Promise((_res, _rej) => {}));
         const prov = new (BaseProvider as any)();
         prov._handleError(new Error("example"));
         expect(displayErrorMock).toHaveBeenCalledWith(ZoweExplorerApiType.All, new Error("example"), {
@@ -555,8 +555,8 @@ describe("_handleError", () => {
             templateArgs: undefined,
         });
     });
-    it("calls ErrorCorrelator.displayError to display error to user - options provided", async () => {
-        const displayErrorMock = jest.spyOn(ErrorCorrelator.prototype, "displayError").mockReturnValue(new Promise((res, rej) => {}));
+    it("calls ErrorCorrelator.displayError to display error to user - options provided", () => {
+        const displayErrorMock = jest.spyOn(ErrorCorrelator.prototype, "displayError").mockReturnValue(new Promise((_res, _rej) => {}));
         const prov = new (BaseProvider as any)();
         prov._handleError(new Error("example"), {
             additionalContext: "Failed to list data sets",

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

@@ -65,13 +65,17 @@ async function expectUnixCommandApiWithSshSession<T>(
     sshobj: zosuss.SshSession
 ): Promise<void> {
     spy.mockClear().mockResolvedValue(undefined);
-    spy.mockImplementation((sshobject: zosuss.SshSession, command: string, cwd: string, callback: (data: string) => void) => {
-        callback("test");
-    });
+    spy.mockImplementation(
+        (_sshobject: zosuss.SshSession, _command: string, _cwd: string, callback: (data: string) => void, _cleanStdout?: boolean) => {
+            callback("test");
+        }
+    );
     const spywhenpathnotspecified = jest.spyOn(zosuss.Shell, "executeSsh");
-    spywhenpathnotspecified.mockImplementation((sshobject: zosuss.SshSession, command: string, callback: (data: string) => void) => {
-        callback("test");
-    });
+    spywhenpathnotspecified.mockImplementation(
+        (_sshobject: zosuss.SshSession, _command: string, callback: (data: string) => void, _cleanStdout?: boolean) => {
+            callback("test");
+        }
+    );
     await apiInstance[name as string](sshobj, ...args, true, () => {});
     await apiInstance[name as string](sshobj, ...args, false, () => {});
     expect(spy).toHaveBeenCalled();
@@ -648,6 +652,12 @@ describe("ZosmfCommandApi", () => {
             args: ["command", { account: "ACCT#" }],
             transform: (args) => [args[1].account, ...args],
         },
+        {
+            name: "issueTsoCmdWithParms",
+            spy: jest.spyOn(zostso.IssueTso, "issueTsoCmd"),
+            args: ["command"],
+            transform: (args) => [...args, { addressSpaceOptions: undefined }],
+        },
         {
             name: "issueMvsCommand",
             spy: jest.spyOn(zosconsole.IssueCommand, "issue"),

packages/zowe-explorer-api/package.json

@@ -28,15 +28,15 @@
   },
   "dependencies": {
     "@types/vscode": "^1.53.2",
-    "@zowe/core-for-zowe-sdk": "^8.2.0",
-    "@zowe/imperative": "^8.2.0",
+    "@zowe/core-for-zowe-sdk": "^8.7.0",
+    "@zowe/imperative": "^8.7.0",
     "@zowe/secrets-for-zowe-sdk": "^8.1.2",
-    "@zowe/zos-console-for-zowe-sdk": "^8.2.0",
-    "@zowe/zos-files-for-zowe-sdk": "^8.2.0",
-    "@zowe/zos-jobs-for-zowe-sdk": "^8.2.0",
-    "@zowe/zos-tso-for-zowe-sdk": "^8.2.0",
-    "@zowe/zos-uss-for-zowe-sdk": "^8.2.0",
-    "@zowe/zosmf-for-zowe-sdk": "^8.2.0",
+    "@zowe/zos-console-for-zowe-sdk": "^8.7.0",
+    "@zowe/zos-files-for-zowe-sdk": "^8.7.0",
+    "@zowe/zos-jobs-for-zowe-sdk": "^8.7.0",
+    "@zowe/zos-tso-for-zowe-sdk": "^8.7.0",
+    "@zowe/zos-uss-for-zowe-sdk": "^8.7.0",
+    "@zowe/zosmf-for-zowe-sdk": "^8.7.0",
     "deep-object-diff": "^1.1.9",
     "mustache": "^4.2.0",
     "semver": "^7.6.0"

packages/zowe-explorer-api/src/extend/MainframeInteraction.ts

@@ -500,6 +500,16 @@ export namespace MainframeInteraction {
          */
         issueTsoCommandWithParms?(command: string, parms?: zostso.IStartTsoParms): Promise<zostso.IIssueResponse>;
 
+        /**
+         * Issues a TSO Command without the need for account information
+         *
+         * @param {string} command
+         * @param {zostso.IStartTsoParms} parms
+         * @returns {Promise<zostso.IIssueResponse>}
+         * @memberof ICommand
+         */
+        issueTsoCmdWithParms?(command: string, parms?: zostso.IStartTsoParms): Promise<zostso.IIssueResponse>;
+
         /**
          * Issues a MVS Command and returns a Console Command API response.
          *

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

@@ -16,5 +16,7 @@ export enum PersistenceSchemaEnum {
     Dataset = "zowe.ds.history",
     USS = "zowe.uss.history",
     Job = "zowe.jobs.history",
-    Commands = "zowe.commands.history",
+    MvsCommands = "zowe.commands.mvs.history",
+    TsoCommands = "zowe.commands.tso.history",
+    UssCommands = "zowe.commands.uss.history",
 }

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

@@ -443,20 +443,35 @@
             return zostso.IssueTso.issueTsoCommand(this.getSession(), parms.account, command, parms);
         }
 
+        public issueTsoCmdWithParms(command: string, parms: zostso.IStartTsoParms): Promise<zostso.IIssueResponse> {
+            return zostso.IssueTso.issueTsoCmd(this.getSession(), command, { addressSpaceOptions: parms });
+        }
+
         public issueMvsCommand(command: string, consoleName?: string): Promise<zosconsole.IConsoleResponse> {
             return zosconsole.IssueCommand.issue(this.getSession(), { command, consoleName, processResponses: true });
         }
 
         public async issueUnixCommand(command: string, cwd: string, sshSession: zosuss.SshSession): Promise<string> {
             let stdout = "";
             if (cwd) {
-                await zosuss.Shell.executeSshCwd(sshSession, command, '"' + cwd + '"', (data: string) => {
-                    stdout += data;
-                });
+                await zosuss.Shell.executeSshCwd(
+                    sshSession,
+                    command,
+                    '"' + cwd + '"',
+                    (data: string) => {
+                        stdout += data;
+                    },
+                    true
+                );
             } else {
-                await zosuss.Shell.executeSsh(sshSession, command, (data: string) => {
-                    stdout += data;
-                });
+                await zosuss.Shell.executeSsh(
+                    sshSession,
+                    command,
+                    (data: string) => {
+                        stdout += data;
+                    },
+                    true
+                );
             }
             return stdout;
         }

packages/zowe-explorer-ftp-extension/CHANGELOG.md

@@ -6,6 +6,8 @@ All notable changes to the "zowe-explorer-ftp-extension" extension will be docum
 
 ### Bug fixes
 
+- Updated dependecies for technical currency. [#3786](https://github.com/zowe/zowe-explorer-vscode/issues/3786)
+
 ## `3.0.2`
 
 ## `3.0.1`

packages/zowe-explorer-ftp-extension/package.json

@@ -52,9 +52,9 @@
     "vscode": "^1.79.0"
   },
   "dependencies": {
-    "@zowe/zos-files-for-zowe-sdk": "^8.2.0",
+    "@zowe/zos-files-for-zowe-sdk": "^8.7.0",
     "@zowe/zos-ftp-for-zowe-cli": "^3.0.0",
-    "@zowe/zos-jobs-for-zowe-sdk": "^8.2.0",
+    "@zowe/zos-jobs-for-zowe-sdk": "^8.7.0",
     "@zowe/zowe-explorer-api": "3.1.0-SNAPSHOT",
     "tmp": "0.2.3"
   },

packages/zowe-explorer/CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 
 - Update Zowe SDKs to `8.2.0` to get the latest enhancements from Imperative.
 - Added expired JSON web token detection for profiles in each tree view (Data Sets, USS, Jobs). When a user performs a search on a profile, they are prompted to log in if their token expired. [#3175](https://github.com/zowe/zowe-explorer-vscode/issues/3175)
+- Added integrated terminals for z/OS Unix, TSO, and MVS commands which can be enabled via the `Zowe › Commands: Use Integrated Terminals` setting. [#3079](https://github.com/zowe/zowe-explorer-vscode/pull/3079)
 - Add a data set or USS resource to a virtual workspace with the new "Add to Workspace" context menu option. [#3265](https://github.com/zowe/zowe-explorer-vscode/issues/3265)
 - Power users and developers can now build links to efficiently open mainframe resources in Zowe Explorer. Use the **Copy External Link** option in the context menu to get the URL for a data set or USS resource, or create a link in the format `vscode://Zowe.vscode-extension-for-zowe?<ZoweResourceUri>`. For more information on building resource URIs, see the [FileSystemProvider wiki article](https://github.com/zowe/zowe-explorer-vscode/wiki/FileSystemProvider#file-paths-vs-uris). [#3271](https://github.com/zowe/zowe-explorer-vscode/pull/3271)
 - Implemented more user-friendly error messages for API or network errors within Zowe Explorer. [#3243](https://github.com/zowe/zowe-explorer-vscode/pull/3243)
@@ -23,6 +24,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 - Fixed issue where Zowe Explorer would present the "No configs detected" notification when initialized in a workspace without a Zowe team configuration. [#3280](https://github.com/zowe/zowe-explorer-vscode/issues/3280)
 - Reduced the number of MVS API calls performed by `vscode.workspace.fs.readFile` when fetching the contents of a data set entry. [#3278](https://github.com/zowe/zowe-explorer-vscode/issues/3278)
 - Fixed an issue to review inconsistent capitalization across translation strings. [#2935](https://github.com/zowe/zowe-explorer-vscode/issues/2935)
+- Updated dependecies for technical currency. [#3786](https://github.com/zowe/zowe-explorer-vscode/issues/3786)
 
 ## `3.0.2`
 

packages/zowe-explorer/__tests__/__mocks__/@zowe/imperative.ts

@@ -150,6 +150,7 @@ export interface ICommandArguments {
 export interface IImperativeError {
     msg: string;
     errorCode?: number;
+    causeErrors?: any;
     additionalDetails?: string;
 }
 
@@ -297,13 +298,20 @@ export class ConfigUtils {
 }
 export class ImperativeError extends Error {
     private msg: string;
-    constructor(public mDetails: IImperativeError) {
+    public causeErrors: any;
+    public additionalDetails: any;
+    constructor(private mDetails: IImperativeError) {
         super();
         this.msg = mDetails.msg;
+        this.causeErrors = this.mDetails.causeErrors;
+        this.additionalDetails = this.mDetails.additionalDetails;
     }
     public get message() {
         return this.msg;
     }
+    public get details() {
+        return this.mDetails;
+    }
 }
 
 export class ProfInfoErr extends ImperativeError {
@@ -420,6 +428,7 @@ export class TextUtils {
     public static prettyJson(object: any, options?: any, color?: boolean, append?: string): string {
         return JSON.stringify(object);
     }
+    public static chalk = jest.requireActual("chalk");
 }
 
 export namespace SessConstants {