@zowe/cli 7.0.0-next.202202112312 → 7.0.0-next.202202242016

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -17,7 +17,7 @@ export declare class DaemonClient {
17
17
  /**
18
18
  * The number of stdin bytes remaining to read from the daemon client.
19
19
  */
20
- private pendingStdinLength;
20
+ private stdinBytesRemaining;
21
21
  /**
22
22
  * Creates an instance of DaemonClient.
23
23
  * @param {net.Socket} mClient
@@ -50,13 +50,13 @@ export declare class DaemonClient {
50
50
  */
51
51
  private shutdown;
52
52
  /**
53
- * Write data received from the daemon client to stdin.
54
- * @param data Data to write to stdin
55
- * @param expectedLength Expected length of the data to validate
53
+ * Create readable stream for stdin data received from the daemon client.
54
+ * @param data First chunk of stdin data
55
+ * @param expectedLength Expected byte length of stdin data
56
56
  * @private
57
57
  * @memberof DaemonClient
58
58
  */
59
- private writeToStdin;
59
+ private createStdinStream;
60
60
  /**
61
61
  * Data event handler triggered for whenever data comes in on a connection
62
62
  * @private
@@ -20,6 +20,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
20
20
  };
21
21
  Object.defineProperty(exports, "__esModule", { value: true });
22
22
  exports.DaemonClient = void 0;
23
+ const stream_1 = require("stream");
23
24
  const imperative_1 = require("@zowe/imperative");
24
25
  /**
25
26
  * Class for handling client connections to our persistent service (e.g. daemon mode)
@@ -41,7 +42,7 @@ class DaemonClient {
41
42
  /**
42
43
  * The number of stdin bytes remaining to read from the daemon client.
43
44
  */
44
- this.pendingStdinLength = 0;
45
+ this.stdinBytesRemaining = 0;
45
46
  }
46
47
  /**
47
48
  * Run an instance of this client and wait for proper events
@@ -84,51 +85,33 @@ class DaemonClient {
84
85
  this.mServer.close();
85
86
  }
86
87
  /**
87
- * Write data received from the daemon client to stdin.
88
- * @param data Data to write to stdin
89
- * @param expectedLength Expected length of the data to validate
88
+ * Create readable stream for stdin data received from the daemon client.
89
+ * @param data First chunk of stdin data
90
+ * @param expectedLength Expected byte length of stdin data
90
91
  * @private
91
92
  * @memberof DaemonClient
92
93
  */
93
- writeToStdin(data, expectedLength) {
94
- return __awaiter(this, void 0, void 0, function* () {
95
- // stdin.isTTY is checked by get-stdin and should be false if stdin contains valid data.
96
- const stdin = process.stdin;
97
- Object.defineProperty(process.stdin, "isTTY", { value: false });
98
- // Normally Node.js reads from process.stdin only once, and the stream is not reusable.
99
- // To work around this, we store a copy of the `_readableState` object before stdin has been used.
100
- // To reuse stdin, we clear any old data and reset the `_readableState` object back to its initial value.
101
- if (stdin._readableStateOld == null) {
102
- stdin._readableStateOld = Object.assign({}, stdin._readableState);
103
- }
104
- else {
105
- if (!process.stdin.readableEnded) {
106
- process.stdin.read();
94
+ createStdinStream(data, expectedLength) {
95
+ const stream = new stream_1.PassThrough();
96
+ stream.write(data);
97
+ this.stdinBytesRemaining = expectedLength - data.byteLength;
98
+ if (this.stdinBytesRemaining > 0) {
99
+ // Handle really large stdin data that is buffered and received in multiple chunks
100
+ this.mClient.pipe(stream);
101
+ const outer = this; // eslint-disable-line @typescript-eslint/no-this-alias
102
+ this.mClient.on("data", function listener(data) {
103
+ outer.stdinBytesRemaining -= data.byteLength;
104
+ if (outer.stdinBytesRemaining <= 0) {
105
+ outer.mClient.removeListener("data", listener);
106
+ outer.mClient.unpipe(stream);
107
+ stream.end();
107
108
  }
108
- process.stdin.removeAllListeners();
109
- stdin._readableState = Object.assign({}, stdin._readableStateOld);
110
- }
111
- // Calling stdin.write throws an EPIPE error because Node.js thinks the stream is read-only.
112
- // So we simulate calls to stdin.write and stdin.end by pushing to the internal buffer.
113
- process.stdin.push(data);
114
- this.pendingStdinLength = expectedLength - data.byteLength;
115
- if (this.pendingStdinLength > 0) {
116
- // Handle really large stdin data that is buffered and received in multiple chunks
117
- // TODO Handle multiple concurrent sources of piped input
118
- yield new Promise((resolve, reject) => {
119
- const outer = this; // eslint-disable-line @typescript-eslint/no-this-alias
120
- this.mClient.on("data", function listener(data) {
121
- process.stdin.push(data);
122
- outer.pendingStdinLength -= data.byteLength;
123
- if (outer.pendingStdinLength <= 0) {
124
- outer.mClient.removeListener("data", listener);
125
- resolve();
126
- }
127
- });
128
- });
129
- }
130
- process.stdin.push(null);
131
- });
109
+ });
110
+ }
111
+ else {
112
+ stream.end();
113
+ }
114
+ return stream;
132
115
  }
133
116
  /**
134
117
  * Data event handler triggered for whenever data comes in on a connection
@@ -138,7 +121,7 @@ class DaemonClient {
138
121
  */
139
122
  data(data) {
140
123
  return __awaiter(this, void 0, void 0, function* () {
141
- if (this.pendingStdinLength > 0)
124
+ if (this.stdinBytesRemaining > 0)
142
125
  return;
143
126
  // Split JSON body and binary data from multipart response
144
127
  const jsonEndIdx = data.indexOf("}" + imperative_1.DaemonRequest.EOW_DELIMITER);
@@ -205,12 +188,13 @@ class DaemonClient {
205
188
  }
206
189
  }
207
190
  else {
208
- if (stdinData != null) {
209
- yield this.writeToStdin(stdinData, jsonData.stdinLength);
210
- }
211
191
  imperative_1.Imperative.commandLine = jsonData.argv.join(" ");
212
192
  imperative_1.Imperative.api.appLogger.trace(`daemon input command: ${imperative_1.Imperative.commandLine}`);
213
- imperative_1.Imperative.parse(jsonData.argv, { stream: this.mClient, daemonResponse: jsonData });
193
+ const context = { stream: this.mClient, response: jsonData };
194
+ if (stdinData != null) {
195
+ context.stdinStream = this.createStdinStream(stdinData, jsonData.stdinLength);
196
+ }
197
+ imperative_1.Imperative.parse(jsonData.argv, context);
214
198
  }
215
199
  });
216
200
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DaemonClient.js","sourceRoot":"","sources":["../../src/daemon/DaemonClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DaemonClient.js","sourceRoot":"","sources":["../../src/daemon/DaemonClient.ts"],"names":[],"mappings":"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"}
@@ -5,13 +5,6 @@
5
5
  */
6
6
  export declare class DaemonDecider {
7
7
  private mParms;
8
- /**
9
- * Default port number
10
- * @private
11
- * @static
12
- * @memberof DaemonDecider
13
- */
14
- private static readonly DEFAULT_PORT;
15
8
  /**
16
9
  * Undocumented paramter for launching in server mode
17
10
  * @private
@@ -27,12 +20,12 @@ export declare class DaemonDecider {
27
20
  */
28
21
  private mServer;
29
22
  /**
30
- * Hold current port number for the server
23
+ * Hold current socket path for the server
31
24
  * @private
32
25
  * @type {number}
33
26
  * @memberof DaemonDecider
34
27
  */
35
- private mPort;
28
+ private mSocket;
36
29
  /**
37
30
  * Hold current owner for the server
38
31
  * @private
@@ -11,9 +11,11 @@
11
11
  */
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
13
  exports.DaemonDecider = void 0;
14
- const imperative_1 = require("@zowe/imperative");
14
+ const fs = require("fs");
15
15
  const net = require("net");
16
- const os_1 = require("os");
16
+ const os = require("os");
17
+ const path = require("path");
18
+ const imperative_1 = require("@zowe/imperative");
17
19
  const DaemonClient_1 = require("./DaemonClient");
18
20
  // TODO(Kelosky): handle prompting cases from login command
19
21
  // TODO(Kelosky): prompt* broken - hangs, must restart daemon
@@ -41,7 +43,7 @@ class DaemonDecider {
41
43
  init() {
42
44
  this.initialParse();
43
45
  if (this.startServer) {
44
- this.mUser = os_1.userInfo().username;
46
+ this.mUser = os.userInfo().username;
45
47
  this.mServer = net.createServer((c) => {
46
48
  new DaemonClient_1.DaemonClient(c, this.mServer, this.mUser).run();
47
49
  });
@@ -56,9 +58,16 @@ class DaemonDecider {
56
58
  */
57
59
  runOrUseDaemon() {
58
60
  if (this.mServer) {
59
- this.mServer.listen(this.mPort, "127.0.0.1", () => {
60
- imperative_1.Imperative.api.appLogger.debug(`daemon server bound ${this.mPort}`);
61
- imperative_1.Imperative.console.info(`server bound ${this.mPort}`);
61
+ if (process.platform !== "win32" && fs.existsSync(this.mSocket)) {
62
+ fs.unlinkSync(this.mSocket);
63
+ }
64
+ ["exit", "SIGINT", "SIGQUIT", "SIGTERM"].forEach((eventType) => {
65
+ process.on(eventType, this.close.bind(this, true));
66
+ });
67
+ this.mServer.maxConnections = 1;
68
+ this.mServer.listen(this.mSocket, () => {
69
+ imperative_1.Imperative.api.appLogger.debug(`daemon server bound ${this.mSocket}`);
70
+ imperative_1.Imperative.console.info(`server bound ${this.mSocket}`);
62
71
  });
63
72
  }
64
73
  else {
@@ -70,8 +79,11 @@ class DaemonDecider {
70
79
  * @private
71
80
  * @memberof DaemonDecider
72
81
  */
73
- close() {
82
+ close(shouldExit) {
74
83
  imperative_1.Imperative.api.appLogger.debug(`server closed`);
84
+ if (shouldExit) {
85
+ process.exit();
86
+ }
75
87
  }
76
88
  /**
77
89
  * Server error handler
@@ -89,26 +101,28 @@ class DaemonDecider {
89
101
  * @memberof DaemonDecider
90
102
  */
91
103
  initialParse() {
92
- const numOfParms = this.mParms.length - 2;
93
- this.mPort = DaemonDecider.DEFAULT_PORT;
94
- if (numOfParms > 0) {
95
- const parm = this.mParms[2];
104
+ if (this.mParms.length > 2) {
96
105
  /**
97
- * NOTE(Kelosky): For now, we use an undocumented paramter `--daemon`. If found first,
106
+ * NOTE(Kelosky): For now, we use an undocumented parameter `--daemon`. If found first,
98
107
  * we bypass `yargs` and begin running this as a persistent Processor.
99
108
  */
100
- const portOffset = parm.indexOf(DaemonDecider.DAEMON_KEY);
101
- if (portOffset > -1) {
109
+ const parm = this.mParms[2];
110
+ const daemonOffset = parm.indexOf(DaemonDecider.DAEMON_KEY);
111
+ if (daemonOffset > -1) {
102
112
  this.startServer = true;
103
113
  if (process.env.ZOWE_DAEMON) {
104
- try {
105
- this.mPort = parseInt(process.env.ZOWE_DAEMON, 10);
106
- }
107
- catch (err) {
108
- // do nothing
114
+ this.mSocket = process.env.ZOWE_DAEMON;
115
+ if (process.platform === "win32") {
116
+ this.mSocket = `\\\\.\\pipe\\${this.mSocket}`;
109
117
  }
110
118
  }
111
- imperative_1.Imperative.api.appLogger.debug(`daemon server port ${this.mPort}`);
119
+ else if (process.platform !== "win32") {
120
+ this.mSocket = path.join(os.homedir(), ".zowe-daemon.sock");
121
+ }
122
+ else {
123
+ this.mSocket = `\\\\.\\pipe\\${os.userInfo().username}\\ZoweDaemon`;
124
+ }
125
+ imperative_1.Imperative.api.appLogger.debug(`daemon server will listen on ${this.mSocket}`);
112
126
  }
113
127
  }
114
128
  }
@@ -130,13 +144,6 @@ class DaemonDecider {
130
144
  }
131
145
  }
132
146
  exports.DaemonDecider = DaemonDecider;
133
- /**
134
- * Default port number
135
- * @private
136
- * @static
137
- * @memberof DaemonDecider
138
- */
139
- DaemonDecider.DEFAULT_PORT = 4000;
140
147
  /**
141
148
  * Undocumented paramter for launching in server mode
142
149
  * @private
@@ -1 +1 @@
1
- {"version":3,"file":"DaemonDecider.js","sourceRoot":"","sources":["../../src/daemon/DaemonDecider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DaemonDecider.js","sourceRoot":"","sources":["../../src/daemon/DaemonDecider.ts"],"names":[],"mappings":"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"}
@@ -35,12 +35,7 @@ class StdinToDataSetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
35
35
  stageName: imperative_1.TaskStage.IN_PROGRESS
36
36
  };
37
37
  commandParameters.response.progress.startBar({ task });
38
- const result = yield zos_files_for_zowe_sdk_1.Upload.streamToDataSet(session, process.stdin,
39
- /* process.stdin has all the functions/properties we need to treat it as a Readable stream
40
- * from the rest client,
41
- * such as .on("data"), and .on("error")
42
- */
43
- commandParameters.arguments.dataSetName, {
38
+ const result = yield zos_files_for_zowe_sdk_1.Upload.streamToDataSet(session, commandParameters.stdin, commandParameters.arguments.dataSetName, {
44
39
  volume: commandParameters.arguments.volumeSerial,
45
40
  binary: commandParameters.arguments.binary,
46
41
  task,
@@ -1 +1 @@
1
- {"version":3,"file":"StdinToDataSet.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/upload/stds/StdinToDataSet.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,iDAA8G;AAC9G,yEAAyE;AACzE,qEAAiE;AAGjE;;;GAGG;AACH,MAAqB,qBAAsB,SAAQ,0CAAmB;IACrD,kBAAkB,CAAC,iBAAqC,EACjE,OAAwB;;YAExB,MAAM,IAAI,GAAoB;gBAC1B,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,6BAA6B;gBAC5C,SAAS,EAAE,sBAAS,CAAC,WAAW;aACnC,CAAC;YACF,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAC,IAAI,EAAC,CAAC,CAAC;YAErD,MAAM,MAAM,GAAG,MAAM,+BAAM,CAAC,eAAe,CAAC,OAAO,EAC/C,OAAO,CAAC,KAA4B;YACpC;;;cAGE;YACF,iBAAiB,CAAC,SAAS,CAAC,WAAW,EAAE;gBACrC,MAAM,EAAE,iBAAiB,CAAC,SAAS,CAAC,YAAY;gBAChD,MAAM,EAAE,iBAAiB,CAAC,SAAS,CAAC,MAAM;gBAC1C,IAAI;gBACJ,eAAe,EAAE,iBAAiB,CAAC,SAAS,CAAC,eAAe;aAC/D,CAAC,CAAC;YAEP,IAAI,MAAM,CAAC,OAAO,EAAE;gBAChB,MAAM,aAAa,GAAG,sBAAS,CAAC,UAAU,CAAC;oBACvC,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,IAAI,EAAE,OAAO;oBACb,EAAE,EAAE,iBAAiB,CAAC,SAAS,CAAC,WAAW;iBAC9C,CAAC,CAAC;gBACH,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;aACzD;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;CACJ;AAlCD,wCAkCC"}
1
+ {"version":3,"file":"StdinToDataSet.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/upload/stds/StdinToDataSet.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,iDAA8G;AAC9G,yEAAyE;AACzE,qEAAiE;AAEjE;;;GAGG;AACH,MAAqB,qBAAsB,SAAQ,0CAAmB;IACrD,kBAAkB,CAAC,iBAAqC,EACjE,OAAwB;;YAExB,MAAM,IAAI,GAAoB;gBAC1B,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,6BAA6B;gBAC5C,SAAS,EAAE,sBAAS,CAAC,WAAW;aACnC,CAAC;YACF,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAC,IAAI,EAAC,CAAC,CAAC;YAErD,MAAM,MAAM,GAAG,MAAM,+BAAM,CAAC,eAAe,CAAC,OAAO,EAC/C,iBAAiB,CAAC,KAAK,EACvB,iBAAiB,CAAC,SAAS,CAAC,WAAW,EAAE;gBACrC,MAAM,EAAE,iBAAiB,CAAC,SAAS,CAAC,YAAY;gBAChD,MAAM,EAAE,iBAAiB,CAAC,SAAS,CAAC,MAAM;gBAC1C,IAAI;gBACJ,eAAe,EAAE,iBAAiB,CAAC,SAAS,CAAC,eAAe;aAC/D,CAAC,CAAC;YAEP,IAAI,MAAM,CAAC,OAAO,EAAE;gBAChB,MAAM,aAAa,GAAG,sBAAS,CAAC,UAAU,CAAC;oBACvC,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,IAAI,EAAE,OAAO;oBACb,EAAE,EAAE,iBAAiB,CAAC,SAAS,CAAC,WAAW;iBAC9C,CAAC,CAAC;gBACH,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;aACzD;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;CACJ;AA9BD,wCA8BC"}
@@ -25,7 +25,7 @@ const fs = require("fs");
25
25
  const zos_jobs_for_zowe_sdk_1 = require("@zowe/zos-jobs-for-zowe-sdk");
26
26
  const zos_files_for_zowe_sdk_1 = require("@zowe/zos-files-for-zowe-sdk");
27
27
  const zosmf_for_zowe_sdk_1 = require("@zowe/zosmf-for-zowe-sdk");
28
- const getStdin = require("get-stdin");
28
+ const getStream = require("get-stream");
29
29
  /**
30
30
  * "zos-jobs submit data-set" command handler. Submits a job (JCL) contained within a z/OS data set (PS or PDS member).
31
31
  * @export
@@ -116,7 +116,7 @@ class SharedSubmitHandler extends zosmf_for_zowe_sdk_1.ZosmfBaseHandler {
116
116
  }
117
117
  // Submit the JCL piped in on stdin
118
118
  case "stdin": {
119
- const Jcl = yield getStdin();
119
+ const Jcl = yield getStream(params.stdin);
120
120
  apiObj = yield zos_jobs_for_zowe_sdk_1.SubmitJobs.submitJclString(this.mSession, Jcl, parms);
121
121
  source = "stdin";
122
122
  if (parms.viewAllSpoolContent) {
@@ -1 +1 @@
1
- {"version":3,"file":"Submit.shared.handler.js","sourceRoot":"","sources":["../../../src/zosjobs/submit/Submit.shared.handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Submit.shared.handler.js","sourceRoot":"","sources":["../../../src/zosjobs/submit/Submit.shared.handler.ts"],"names":[],"mappings":"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"}
@@ -1,29 +1,29 @@
1
1
  {
2
2
  "name": "@zowe/cli",
3
- "version": "7.0.0-next.202202112312",
3
+ "version": "7.0.0-next.202202242016",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@zowe/cli",
9
- "version": "7.0.0-next.202202112312",
9
+ "version": "7.0.0-next.202202242016",
10
10
  "hasInstallScript": true,
11
11
  "license": "EPL-2.0",
12
12
  "dependencies": {
13
- "@zowe/core-for-zowe-sdk": "7.0.0-next.202202112312",
14
- "@zowe/imperative": "5.0.0-next.202202111730",
13
+ "@zowe/core-for-zowe-sdk": "7.0.0-next.202202242016",
14
+ "@zowe/imperative": "5.0.0-next.202202232039",
15
15
  "@zowe/perf-timing": "1.0.7",
16
- "@zowe/provisioning-for-zowe-sdk": "7.0.0-next.202202112312",
17
- "@zowe/zos-console-for-zowe-sdk": "7.0.0-next.202202112312",
18
- "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202202112312",
19
- "@zowe/zos-jobs-for-zowe-sdk": "7.0.0-next.202202112312",
20
- "@zowe/zos-logs-for-zowe-sdk": "7.0.0-next.202202112312",
21
- "@zowe/zos-tso-for-zowe-sdk": "7.0.0-next.202202112312",
22
- "@zowe/zos-uss-for-zowe-sdk": "7.0.0-next.202202112312",
23
- "@zowe/zos-workflows-for-zowe-sdk": "7.0.0-next.202202112312",
24
- "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202202112312",
16
+ "@zowe/provisioning-for-zowe-sdk": "7.0.0-next.202202242016",
17
+ "@zowe/zos-console-for-zowe-sdk": "7.0.0-next.202202242016",
18
+ "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202202242016",
19
+ "@zowe/zos-jobs-for-zowe-sdk": "7.0.0-next.202202242016",
20
+ "@zowe/zos-logs-for-zowe-sdk": "7.0.0-next.202202242016",
21
+ "@zowe/zos-tso-for-zowe-sdk": "7.0.0-next.202202242016",
22
+ "@zowe/zos-uss-for-zowe-sdk": "7.0.0-next.202202242016",
23
+ "@zowe/zos-workflows-for-zowe-sdk": "7.0.0-next.202202242016",
24
+ "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202202242016",
25
25
  "find-process": "1.4.7",
26
- "get-stdin": "7.0.0",
26
+ "get-stream": "6.0.1",
27
27
  "lodash": "4.17.21",
28
28
  "minimatch": "3.0.4",
29
29
  "tar": "6.1.11"
@@ -37,7 +37,7 @@
37
37
  "@types/node": "^12.12.24",
38
38
  "@types/tar": "6.1.1",
39
39
  "@types/which": "2.0.1",
40
- "@zowe/cli-test-utils": "7.0.0-next.202202112312",
40
+ "@zowe/cli-test-utils": "7.0.0-next.202202242016",
41
41
  "comment-json": "^4.1.0",
42
42
  "eslint": "^7.32.0",
43
43
  "js-yaml": "^3.13.1",
@@ -249,9 +249,9 @@
249
249
  "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="
250
250
  },
251
251
  "node_modules/@zowe/core-for-zowe-sdk": {
252
- "version": "7.0.0-next.202202112312",
253
- "resolved": "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.0.0-next.202202112312.tgz",
254
- "integrity": "sha512-kPYGXMDBOYqfZgRG017M5fYhVd32QsORlIuTYaPge+QC/DCo2ufssRi2QaMAZ5pZUOafM8dcel3LBb+7bQGZ1w==",
252
+ "version": "7.0.0-next.202202242016",
253
+ "resolved": "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.0.0-next.202202242016.tgz",
254
+ "integrity": "sha512-tBXsk9hi5CHPATadkPd7jdO+nwIrjx4AVSvL1mIMhoRgYe4ZdIkJ535DjgAra6BEfTAzJtZYebTob35JAS48Bw==",
255
255
  "license": "EPL-2.0",
256
256
  "dependencies": {
257
257
  "comment-json": "4.1.0",
@@ -262,9 +262,9 @@
262
262
  }
263
263
  },
264
264
  "node_modules/@zowe/imperative": {
265
- "version": "5.0.0-next.202202111730",
266
- "resolved": "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.0.0-next.202202111730.tgz",
267
- "integrity": "sha512-V8CQ1TGXPtkAGiLO6WutfYAIzsNZwOryQmTexPYtvK7Kj+niwucPCvzbndoHCmWY7oE+6eFChNB/Dgevoc/Hvw==",
265
+ "version": "5.0.0-next.202202232039",
266
+ "resolved": "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.0.0-next.202202232039.tgz",
267
+ "integrity": "sha512-7xXSiiknYyyE8M9Ot4FcGl83TusojElVbaeOBOir3VAGVov6G1+MBiW4gkhGVW/f3QJu7/Fo9+f54CklfLZntA==",
268
268
  "license": "EPL-2.0",
269
269
  "dependencies": {
270
270
  "@types/lodash-deep": "2.0.0",
@@ -454,9 +454,9 @@
454
454
  }
455
455
  },
456
456
  "node_modules/@zowe/provisioning-for-zowe-sdk": {
457
- "version": "7.0.0-next.202202112312",
458
- "resolved": "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.0.0-next.202202112312.tgz",
459
- "integrity": "sha512-FelZDTdou2eSK8kjiGijubecYYm/gw/IRe3yFPiHPdMX+JsCB2GdM11itCIegn1PfEdr1Qka4oCIe56EXnTmKQ==",
457
+ "version": "7.0.0-next.202202242016",
458
+ "resolved": "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.0.0-next.202202242016.tgz",
459
+ "integrity": "sha512-zbrq80YfIAX5OvNhaB93aDZDXqcbSHJhUECzAU0nDYh0/EhUD7HwvttNptemtUNcBnY3QWJ3rhIfWj0ey+Wx/g==",
460
460
  "license": "EPL-2.0",
461
461
  "dependencies": {
462
462
  "js-yaml": "3.14.1"
@@ -467,9 +467,9 @@
467
467
  }
468
468
  },
469
469
  "node_modules/@zowe/zos-console-for-zowe-sdk": {
470
- "version": "7.0.0-next.202202112312",
471
- "resolved": "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.0.0-next.202202112312.tgz",
472
- "integrity": "sha512-Dr96sZJUfPG6uoSQNO680VP1Z5eeQtUM3lzeYVgaCiAQpyP7FJMsqayHJkyJn5ht0W/zEDVoKmicNrfr6o96vQ==",
470
+ "version": "7.0.0-next.202202242016",
471
+ "resolved": "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.0.0-next.202202242016.tgz",
472
+ "integrity": "sha512-McW9NAn0SEN7LlFxbFOPhnGXD7ajSwDZ424VR+yBP4fC8Ig5v+HoShGwG6mVkEKldu4YJvIpBDz/lGOjv3jqMQ==",
473
473
  "license": "EPL-2.0",
474
474
  "peerDependencies": {
475
475
  "@zowe/core-for-zowe-sdk": ">=7.0.0-next <7.0.0",
@@ -477,9 +477,9 @@
477
477
  }
478
478
  },
479
479
  "node_modules/@zowe/zos-files-for-zowe-sdk": {
480
- "version": "7.0.0-next.202202112312",
481
- "resolved": "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.0.0-next.202202112312.tgz",
482
- "integrity": "sha512-uVIlHvuLaRi8M1BDNbF2eVQjrgHDp2Qcc8Wb5yNy49/VbN9CGwjQScq5/vTVEho1aNJKaw//mw64jZYiW6Rzlw==",
480
+ "version": "7.0.0-next.202202242016",
481
+ "resolved": "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.0.0-next.202202242016.tgz",
482
+ "integrity": "sha512-4PdID1QiQLc3RGy6IM9yvZKTeFUhVrYcpnHVExoJ0luSj45OSY5Wz9jqZGTWsJDMXnbmh+tQh9DTcq8y3ded3Q==",
483
483
  "license": "EPL-2.0",
484
484
  "dependencies": {
485
485
  "minimatch": "3.0.4"
@@ -490,12 +490,12 @@
490
490
  }
491
491
  },
492
492
  "node_modules/@zowe/zos-jobs-for-zowe-sdk": {
493
- "version": "7.0.0-next.202202112312",
494
- "resolved": "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.0.0-next.202202112312.tgz",
495
- "integrity": "sha512-gRRYt/22/5xGwPzXaYLeeCc0tMRGwtA58RCHeH4OVGOsJkYml0437L+Z01URUJ7t/HKsd1gcc6hXf3VhQlW+Rg==",
493
+ "version": "7.0.0-next.202202242016",
494
+ "resolved": "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.0.0-next.202202242016.tgz",
495
+ "integrity": "sha512-LOoYiTh5Thpl+FDRyRtMsPjA374fuELL+VQ1lprphRQIh9CjUXMlHiCPnvqk9po8xmhcAafHq+BisxX+/7xN6w==",
496
496
  "license": "EPL-2.0",
497
497
  "dependencies": {
498
- "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202202112312"
498
+ "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202202242016"
499
499
  },
500
500
  "peerDependencies": {
501
501
  "@zowe/core-for-zowe-sdk": ">=7.0.0-next <7.0.0",
@@ -503,9 +503,9 @@
503
503
  }
504
504
  },
505
505
  "node_modules/@zowe/zos-logs-for-zowe-sdk": {
506
- "version": "7.0.0-next.202202112312",
507
- "resolved": "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.0.0-next.202202112312.tgz",
508
- "integrity": "sha512-qhL2ryVqlHkncgxO2wyTQ5dJzhpfMT6Rb4aX6516lxB2WdCuARShj3uIL75XJ153MQYpPwgzeCUnCgIoLg46Rw==",
506
+ "version": "7.0.0-next.202202242016",
507
+ "resolved": "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.0.0-next.202202242016.tgz",
508
+ "integrity": "sha512-S9JM2X/wudQ98RMwMak1wmMj5PTgJMM8hkgwHcpxCXStIi2VHug4+ML+edsTHXy05BZCTnpuBZhR4QnvaOgYZQ==",
509
509
  "license": "EPL-2.0",
510
510
  "peerDependencies": {
511
511
  "@zowe/core-for-zowe-sdk": ">=7.0.0-next <7.0.0",
@@ -513,12 +513,12 @@
513
513
  }
514
514
  },
515
515
  "node_modules/@zowe/zos-tso-for-zowe-sdk": {
516
- "version": "7.0.0-next.202202112312",
517
- "resolved": "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.0.0-next.202202112312.tgz",
518
- "integrity": "sha512-etdjw9dH0KNm8Vdnmy6nWN68phQkOfKhvuF0wtb4rw4D9vE4C+GkOuQeeBNSME6MxBJFCVHzSjnT48U4cCeuFg==",
516
+ "version": "7.0.0-next.202202242016",
517
+ "resolved": "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.0.0-next.202202242016.tgz",
518
+ "integrity": "sha512-NUABg+P4lLdelFJpdl4Y62Y5xEYvGtqwOId3NuZoxWHmZCBQs/+5+sboPEGBxkb8o/835i+OkXpI2eyDtBhFyw==",
519
519
  "license": "EPL-2.0",
520
520
  "dependencies": {
521
- "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202202112312"
521
+ "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202202242016"
522
522
  },
523
523
  "peerDependencies": {
524
524
  "@zowe/core-for-zowe-sdk": ">=7.0.0-next <7.0.0",
@@ -526,9 +526,9 @@
526
526
  }
527
527
  },
528
528
  "node_modules/@zowe/zos-uss-for-zowe-sdk": {
529
- "version": "7.0.0-next.202202112312",
530
- "resolved": "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.0.0-next.202202112312.tgz",
531
- "integrity": "sha512-lGO8Gv0S6vtdzCheK+nuO+MMd+eLBdg5aqSmn63y1RfIW4xVQf3jdGb8heCYBy83O5iLUVEAi7yBa3uXL0H0pw==",
529
+ "version": "7.0.0-next.202202242016",
530
+ "resolved": "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.0.0-next.202202242016.tgz",
531
+ "integrity": "sha512-Rbc0flOPQ8MH1RwG0KhSpMbYqDT77InkYxtnqpjkaVgi8MBn1AgJ2h0raeO1wzaRm4ko9ytIS0d7syrjSqqFaA==",
532
532
  "license": "EPL-2.0",
533
533
  "dependencies": {
534
534
  "ssh2": "1.4.0"
@@ -538,12 +538,12 @@
538
538
  }
539
539
  },
540
540
  "node_modules/@zowe/zos-workflows-for-zowe-sdk": {
541
- "version": "7.0.0-next.202202112312",
542
- "resolved": "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.0.0-next.202202112312.tgz",
543
- "integrity": "sha512-nJXAnrjQnbFIeETv3KHWUf2NBE610Z5B+mfH9b/qZ6CEOAcHGDrINobDrpNMeD1haNVqS6IRiGYfc4m8//7QjA==",
541
+ "version": "7.0.0-next.202202242016",
542
+ "resolved": "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.0.0-next.202202242016.tgz",
543
+ "integrity": "sha512-wbS7Ysd05Sd7IltALeYKmMeF0+GAzg9f5lMoPkIiKYlcQS3JhipqFHLZmsgPcbzHTVh4hTcXd0FsMB5XsnsrjQ==",
544
544
  "license": "EPL-2.0",
545
545
  "dependencies": {
546
- "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202202112312"
546
+ "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202202242016"
547
547
  },
548
548
  "peerDependencies": {
549
549
  "@zowe/core-for-zowe-sdk": ">=7.0.0-next <7.0.0",
@@ -551,9 +551,9 @@
551
551
  }
552
552
  },
553
553
  "node_modules/@zowe/zosmf-for-zowe-sdk": {
554
- "version": "7.0.0-next.202202112312",
555
- "resolved": "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.0.0-next.202202112312.tgz",
556
- "integrity": "sha512-nAlVG/Nc8JyQfk7E6W5pX1tUaaOyxnHsUxDr1vDq1ovTrrgbwFIBSj+cTZrJhv6tL6gMuZ0n66C6Ed0IVYqHzQ==",
554
+ "version": "7.0.0-next.202202242016",
555
+ "resolved": "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.0.0-next.202202242016.tgz",
556
+ "integrity": "sha512-XOgiaczjP5X1VooUqdROs7l5tQb/DxDaFjIwGNz8g6yABev6R0lZlxoC4ZF/ufH3hU5v9U3ko8yNI44Q5vMYzg==",
557
557
  "license": "EPL-2.0",
558
558
  "peerDependencies": {
559
559
  "@zowe/core-for-zowe-sdk": ">=7.0.0-next <7.0.0",
@@ -1272,12 +1272,15 @@
1272
1272
  "node": "6.* || 8.* || >= 10.*"
1273
1273
  }
1274
1274
  },
1275
- "node_modules/get-stdin": {
1276
- "version": "7.0.0",
1277
- "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz",
1278
- "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==",
1275
+ "node_modules/get-stream": {
1276
+ "version": "6.0.1",
1277
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
1278
+ "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
1279
1279
  "engines": {
1280
- "node": ">=8"
1280
+ "node": ">=10"
1281
+ },
1282
+ "funding": {
1283
+ "url": "https://github.com/sponsors/sindresorhus"
1281
1284
  }
1282
1285
  },
1283
1286
  "node_modules/github-from-package": {
@@ -2816,9 +2819,9 @@
2816
2819
  }
2817
2820
  },
2818
2821
  "node_modules/streamroller/node_modules/fs-extra": {
2819
- "version": "10.0.0",
2820
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
2821
- "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
2822
+ "version": "10.0.1",
2823
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
2824
+ "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
2822
2825
  "dependencies": {
2823
2826
  "graceful-fs": "^4.2.0",
2824
2827
  "jsonfile": "^6.0.1",
@@ -3344,18 +3347,18 @@
3344
3347
  "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="
3345
3348
  },
3346
3349
  "@zowe/core-for-zowe-sdk": {
3347
- "version": "7.0.0-next.202202112312",
3348
- "resolved": "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.0.0-next.202202112312.tgz",
3349
- "integrity": "sha512-kPYGXMDBOYqfZgRG017M5fYhVd32QsORlIuTYaPge+QC/DCo2ufssRi2QaMAZ5pZUOafM8dcel3LBb+7bQGZ1w==",
3350
+ "version": "7.0.0-next.202202242016",
3351
+ "resolved": "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.0.0-next.202202242016.tgz",
3352
+ "integrity": "sha512-tBXsk9hi5CHPATadkPd7jdO+nwIrjx4AVSvL1mIMhoRgYe4ZdIkJ535DjgAra6BEfTAzJtZYebTob35JAS48Bw==",
3350
3353
  "requires": {
3351
3354
  "comment-json": "4.1.0",
3352
3355
  "string-width": "4.2.3"
3353
3356
  }
3354
3357
  },
3355
3358
  "@zowe/imperative": {
3356
- "version": "5.0.0-next.202202111730",
3357
- "resolved": "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.0.0-next.202202111730.tgz",
3358
- "integrity": "sha512-V8CQ1TGXPtkAGiLO6WutfYAIzsNZwOryQmTexPYtvK7Kj+niwucPCvzbndoHCmWY7oE+6eFChNB/Dgevoc/Hvw==",
3359
+ "version": "5.0.0-next.202202232039",
3360
+ "resolved": "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.0.0-next.202202232039.tgz",
3361
+ "integrity": "sha512-7xXSiiknYyyE8M9Ot4FcGl83TusojElVbaeOBOir3VAGVov6G1+MBiW4gkhGVW/f3QJu7/Fo9+f54CklfLZntA==",
3359
3362
  "requires": {
3360
3363
  "@types/lodash-deep": "2.0.0",
3361
3364
  "@types/yargs": "13.0.4",
@@ -3503,69 +3506,69 @@
3503
3506
  }
3504
3507
  },
3505
3508
  "@zowe/provisioning-for-zowe-sdk": {
3506
- "version": "7.0.0-next.202202112312",
3507
- "resolved": "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.0.0-next.202202112312.tgz",
3508
- "integrity": "sha512-FelZDTdou2eSK8kjiGijubecYYm/gw/IRe3yFPiHPdMX+JsCB2GdM11itCIegn1PfEdr1Qka4oCIe56EXnTmKQ==",
3509
+ "version": "7.0.0-next.202202242016",
3510
+ "resolved": "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.0.0-next.202202242016.tgz",
3511
+ "integrity": "sha512-zbrq80YfIAX5OvNhaB93aDZDXqcbSHJhUECzAU0nDYh0/EhUD7HwvttNptemtUNcBnY3QWJ3rhIfWj0ey+Wx/g==",
3509
3512
  "requires": {
3510
3513
  "js-yaml": "3.14.1"
3511
3514
  }
3512
3515
  },
3513
3516
  "@zowe/zos-console-for-zowe-sdk": {
3514
- "version": "7.0.0-next.202202112312",
3515
- "resolved": "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.0.0-next.202202112312.tgz",
3516
- "integrity": "sha512-Dr96sZJUfPG6uoSQNO680VP1Z5eeQtUM3lzeYVgaCiAQpyP7FJMsqayHJkyJn5ht0W/zEDVoKmicNrfr6o96vQ==",
3517
+ "version": "7.0.0-next.202202242016",
3518
+ "resolved": "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.0.0-next.202202242016.tgz",
3519
+ "integrity": "sha512-McW9NAn0SEN7LlFxbFOPhnGXD7ajSwDZ424VR+yBP4fC8Ig5v+HoShGwG6mVkEKldu4YJvIpBDz/lGOjv3jqMQ==",
3517
3520
  "requires": {}
3518
3521
  },
3519
3522
  "@zowe/zos-files-for-zowe-sdk": {
3520
- "version": "7.0.0-next.202202112312",
3521
- "resolved": "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.0.0-next.202202112312.tgz",
3522
- "integrity": "sha512-uVIlHvuLaRi8M1BDNbF2eVQjrgHDp2Qcc8Wb5yNy49/VbN9CGwjQScq5/vTVEho1aNJKaw//mw64jZYiW6Rzlw==",
3523
+ "version": "7.0.0-next.202202242016",
3524
+ "resolved": "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.0.0-next.202202242016.tgz",
3525
+ "integrity": "sha512-4PdID1QiQLc3RGy6IM9yvZKTeFUhVrYcpnHVExoJ0luSj45OSY5Wz9jqZGTWsJDMXnbmh+tQh9DTcq8y3ded3Q==",
3523
3526
  "requires": {
3524
3527
  "minimatch": "3.0.4"
3525
3528
  }
3526
3529
  },
3527
3530
  "@zowe/zos-jobs-for-zowe-sdk": {
3528
- "version": "7.0.0-next.202202112312",
3529
- "resolved": "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.0.0-next.202202112312.tgz",
3530
- "integrity": "sha512-gRRYt/22/5xGwPzXaYLeeCc0tMRGwtA58RCHeH4OVGOsJkYml0437L+Z01URUJ7t/HKsd1gcc6hXf3VhQlW+Rg==",
3531
+ "version": "7.0.0-next.202202242016",
3532
+ "resolved": "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.0.0-next.202202242016.tgz",
3533
+ "integrity": "sha512-LOoYiTh5Thpl+FDRyRtMsPjA374fuELL+VQ1lprphRQIh9CjUXMlHiCPnvqk9po8xmhcAafHq+BisxX+/7xN6w==",
3531
3534
  "requires": {
3532
- "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202202112312"
3535
+ "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202202242016"
3533
3536
  }
3534
3537
  },
3535
3538
  "@zowe/zos-logs-for-zowe-sdk": {
3536
- "version": "7.0.0-next.202202112312",
3537
- "resolved": "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.0.0-next.202202112312.tgz",
3538
- "integrity": "sha512-qhL2ryVqlHkncgxO2wyTQ5dJzhpfMT6Rb4aX6516lxB2WdCuARShj3uIL75XJ153MQYpPwgzeCUnCgIoLg46Rw==",
3539
+ "version": "7.0.0-next.202202242016",
3540
+ "resolved": "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.0.0-next.202202242016.tgz",
3541
+ "integrity": "sha512-S9JM2X/wudQ98RMwMak1wmMj5PTgJMM8hkgwHcpxCXStIi2VHug4+ML+edsTHXy05BZCTnpuBZhR4QnvaOgYZQ==",
3539
3542
  "requires": {}
3540
3543
  },
3541
3544
  "@zowe/zos-tso-for-zowe-sdk": {
3542
- "version": "7.0.0-next.202202112312",
3543
- "resolved": "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.0.0-next.202202112312.tgz",
3544
- "integrity": "sha512-etdjw9dH0KNm8Vdnmy6nWN68phQkOfKhvuF0wtb4rw4D9vE4C+GkOuQeeBNSME6MxBJFCVHzSjnT48U4cCeuFg==",
3545
+ "version": "7.0.0-next.202202242016",
3546
+ "resolved": "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.0.0-next.202202242016.tgz",
3547
+ "integrity": "sha512-NUABg+P4lLdelFJpdl4Y62Y5xEYvGtqwOId3NuZoxWHmZCBQs/+5+sboPEGBxkb8o/835i+OkXpI2eyDtBhFyw==",
3545
3548
  "requires": {
3546
- "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202202112312"
3549
+ "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202202242016"
3547
3550
  }
3548
3551
  },
3549
3552
  "@zowe/zos-uss-for-zowe-sdk": {
3550
- "version": "7.0.0-next.202202112312",
3551
- "resolved": "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.0.0-next.202202112312.tgz",
3552
- "integrity": "sha512-lGO8Gv0S6vtdzCheK+nuO+MMd+eLBdg5aqSmn63y1RfIW4xVQf3jdGb8heCYBy83O5iLUVEAi7yBa3uXL0H0pw==",
3553
+ "version": "7.0.0-next.202202242016",
3554
+ "resolved": "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.0.0-next.202202242016.tgz",
3555
+ "integrity": "sha512-Rbc0flOPQ8MH1RwG0KhSpMbYqDT77InkYxtnqpjkaVgi8MBn1AgJ2h0raeO1wzaRm4ko9ytIS0d7syrjSqqFaA==",
3553
3556
  "requires": {
3554
3557
  "ssh2": "1.4.0"
3555
3558
  }
3556
3559
  },
3557
3560
  "@zowe/zos-workflows-for-zowe-sdk": {
3558
- "version": "7.0.0-next.202202112312",
3559
- "resolved": "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.0.0-next.202202112312.tgz",
3560
- "integrity": "sha512-nJXAnrjQnbFIeETv3KHWUf2NBE610Z5B+mfH9b/qZ6CEOAcHGDrINobDrpNMeD1haNVqS6IRiGYfc4m8//7QjA==",
3561
+ "version": "7.0.0-next.202202242016",
3562
+ "resolved": "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.0.0-next.202202242016.tgz",
3563
+ "integrity": "sha512-wbS7Ysd05Sd7IltALeYKmMeF0+GAzg9f5lMoPkIiKYlcQS3JhipqFHLZmsgPcbzHTVh4hTcXd0FsMB5XsnsrjQ==",
3561
3564
  "requires": {
3562
- "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202202112312"
3565
+ "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202202242016"
3563
3566
  }
3564
3567
  },
3565
3568
  "@zowe/zosmf-for-zowe-sdk": {
3566
- "version": "7.0.0-next.202202112312",
3567
- "resolved": "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.0.0-next.202202112312.tgz",
3568
- "integrity": "sha512-nAlVG/Nc8JyQfk7E6W5pX1tUaaOyxnHsUxDr1vDq1ovTrrgbwFIBSj+cTZrJhv6tL6gMuZ0n66C6Ed0IVYqHzQ==",
3569
+ "version": "7.0.0-next.202202242016",
3570
+ "resolved": "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.0.0-next.202202242016.tgz",
3571
+ "integrity": "sha512-XOgiaczjP5X1VooUqdROs7l5tQb/DxDaFjIwGNz8g6yABev6R0lZlxoC4ZF/ufH3hU5v9U3ko8yNI44Q5vMYzg==",
3569
3572
  "requires": {}
3570
3573
  },
3571
3574
  "aggregate-error": {
@@ -4112,10 +4115,10 @@
4112
4115
  "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
4113
4116
  "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
4114
4117
  },
4115
- "get-stdin": {
4116
- "version": "7.0.0",
4117
- "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz",
4118
- "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ=="
4118
+ "get-stream": {
4119
+ "version": "6.0.1",
4120
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
4121
+ "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
4119
4122
  },
4120
4123
  "github-from-package": {
4121
4124
  "version": "0.0.0",
@@ -5285,9 +5288,9 @@
5285
5288
  },
5286
5289
  "dependencies": {
5287
5290
  "fs-extra": {
5288
- "version": "10.0.0",
5289
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
5290
- "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
5291
+ "version": "10.0.1",
5292
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
5293
+ "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
5291
5294
  "requires": {
5292
5295
  "graceful-fs": "^4.2.0",
5293
5296
  "jsonfile": "^6.0.1",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zowe/cli",
3
- "version": "7.0.0-next.202202112312",
3
+ "version": "7.0.0-next.202202242016",
4
4
  "description": "Zowe CLI is a command line interface (CLI) that provides a simple and streamlined way to interact with IBM z/OS.",
5
5
  "author": "Broadcom",
6
6
  "license": "EPL-2.0",
@@ -56,20 +56,20 @@
56
56
  "typedocSpecifySrc": "typedoc --options ./typedoc.json"
57
57
  },
58
58
  "dependencies": {
59
- "@zowe/core-for-zowe-sdk": "7.0.0-next.202202112312",
60
- "@zowe/imperative": "5.0.0-next.202202111730",
59
+ "@zowe/core-for-zowe-sdk": "7.0.0-next.202202242016",
60
+ "@zowe/imperative": "5.0.0-next.202202232039",
61
61
  "@zowe/perf-timing": "1.0.7",
62
- "@zowe/provisioning-for-zowe-sdk": "7.0.0-next.202202112312",
63
- "@zowe/zos-console-for-zowe-sdk": "7.0.0-next.202202112312",
64
- "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202202112312",
65
- "@zowe/zos-jobs-for-zowe-sdk": "7.0.0-next.202202112312",
66
- "@zowe/zos-logs-for-zowe-sdk": "7.0.0-next.202202112312",
67
- "@zowe/zos-tso-for-zowe-sdk": "7.0.0-next.202202112312",
68
- "@zowe/zos-uss-for-zowe-sdk": "7.0.0-next.202202112312",
69
- "@zowe/zos-workflows-for-zowe-sdk": "7.0.0-next.202202112312",
70
- "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202202112312",
62
+ "@zowe/provisioning-for-zowe-sdk": "7.0.0-next.202202242016",
63
+ "@zowe/zos-console-for-zowe-sdk": "7.0.0-next.202202242016",
64
+ "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202202242016",
65
+ "@zowe/zos-jobs-for-zowe-sdk": "7.0.0-next.202202242016",
66
+ "@zowe/zos-logs-for-zowe-sdk": "7.0.0-next.202202242016",
67
+ "@zowe/zos-tso-for-zowe-sdk": "7.0.0-next.202202242016",
68
+ "@zowe/zos-uss-for-zowe-sdk": "7.0.0-next.202202242016",
69
+ "@zowe/zos-workflows-for-zowe-sdk": "7.0.0-next.202202242016",
70
+ "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202202242016",
71
71
  "find-process": "1.4.7",
72
- "get-stdin": "7.0.0",
72
+ "get-stream": "6.0.1",
73
73
  "lodash": "4.17.21",
74
74
  "minimatch": "3.0.4",
75
75
  "tar": "6.1.11"
@@ -79,7 +79,7 @@
79
79
  "@types/node": "^12.12.24",
80
80
  "@types/tar": "6.1.1",
81
81
  "@types/which": "2.0.1",
82
- "@zowe/cli-test-utils": "7.0.0-next.202202112312",
82
+ "@zowe/cli-test-utils": "7.0.0-next.202202242016",
83
83
  "comment-json": "^4.1.0",
84
84
  "eslint": "^7.32.0",
85
85
  "js-yaml": "^3.13.1",
@@ -99,6 +99,16 @@ version = "1.6.1"
99
99
  source = "registry+https://github.com/rust-lang/crates.io-index"
100
100
  checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
101
101
 
102
+ [[package]]
103
+ name = "fslock"
104
+ version = "0.2.1"
105
+ source = "registry+https://github.com/rust-lang/crates.io-index"
106
+ checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb"
107
+ dependencies = [
108
+ "libc",
109
+ "winapi",
110
+ ]
111
+
102
112
  [[package]]
103
113
  name = "hermit-abi"
104
114
  version = "0.1.19"
@@ -108,6 +118,15 @@ dependencies = [
108
118
  "libc",
109
119
  ]
110
120
 
121
+ [[package]]
122
+ name = "home"
123
+ version = "0.5.3"
124
+ source = "registry+https://github.com/rust-lang/crates.io-index"
125
+ checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654"
126
+ dependencies = [
127
+ "winapi",
128
+ ]
129
+
111
130
  [[package]]
112
131
  name = "itoa"
113
132
  version = "0.4.8"
@@ -153,6 +172,15 @@ dependencies = [
153
172
  "autocfg",
154
173
  ]
155
174
 
175
+ [[package]]
176
+ name = "named_pipe"
177
+ version = "0.4.1"
178
+ source = "registry+https://github.com/rust-lang/crates.io-index"
179
+ checksum = "ad9c443cce91fc3e12f017290db75dde490d685cdaaf508d7159d7cf41f0eb2b"
180
+ dependencies = [
181
+ "winapi",
182
+ ]
183
+
156
184
  [[package]]
157
185
  name = "ntapi"
158
186
  version = "0.3.6"
@@ -414,10 +442,13 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
414
442
 
415
443
  [[package]]
416
444
  name = "zowe"
417
- version = "0.6.2"
445
+ version = "0.7.1"
418
446
  dependencies = [
419
447
  "atty",
420
448
  "base64",
449
+ "fslock",
450
+ "home",
451
+ "named_pipe",
421
452
  "pathsearch",
422
453
  "rpassword",
423
454
  "serde",
@@ -1,6 +1,6 @@
1
1
  [package]
2
2
  name = "zowe"
3
- version = "0.6.2"
3
+ version = "0.7.1"
4
4
  authors = ["Zowe Project"]
5
5
  edition = "2018"
6
6
  license = "EPL-2.0"
@@ -11,9 +11,14 @@ repository = "https://github.com/zowe/zowe-cli"
11
11
  [dependencies]
12
12
  atty = "0.2.14"
13
13
  base64 = "0.13.0"
14
+ home = "0.5.3"
14
15
  pathsearch = "0.2.0"
15
16
  rpassword = "5.0.1"
16
17
  serde = { version = "1.0.130", features = ["derive"]}
17
18
  serde_json = "1.0.69"
18
19
  sysinfo = "0.22.5"
19
- whoami = "1.2.1"
20
+ whoami = "1.2.1"
21
+
22
+ [target.'cfg(windows)'.dependencies]
23
+ fslock = "0.2.1"
24
+ named_pipe = "0.4.1"
Binary file
Binary file
Binary file
@@ -9,28 +9,10 @@
9
9
  *
10
10
  */
11
11
 
12
+ // For global installs, configure prebuild-install to find Keytar prebuilds bundled with CLI
12
13
  const fs = require("fs");
13
14
  const { join } = require("path");
14
-
15
- try {
16
- // Skip preinstall script if top-level prebuilds folder doesn't exist
17
- const rootPbDir = join(__dirname, "..", "prebuilds");
18
- if (!fs.existsSync(rootPbDir)) {
19
- process.exit(0);
20
- }
21
-
22
- // Ensure that prebuilds folder exists in Keytar node_modules
23
- const keytarPbDir = join(__dirname, "..", "node_modules", "keytar", "prebuilds");
24
- if (!fs.existsSync(keytarPbDir)) {
25
- fs.mkdirSync(keytarPbDir, { recursive: true });
26
- }
27
-
28
- // Copy prebuilt Keytar binaries from top-level folder to Keytar node_modules
29
- fs.readdirSync(rootPbDir).forEach((filename) => {
30
- if (filename.match(/keytar-.*-napi-.*\.tar\.gz/)) {
31
- fs.copyFileSync(join(rootPbDir, filename), join(keytarPbDir, filename));
32
- }
33
- });
34
- } catch (err) {
35
- console.error(err);
15
+ const prebuildsDir = join(__dirname, "..", "prebuilds");
16
+ if (process.env.npm_config_global && fs.existsSync(prebuildsDir)) {
17
+ fs.writeFileSync(".prebuild-installrc", `local-prebuilds=${prebuildsDir}`);
36
18
  }