@zowe/cli 7.0.0-next.202204011929 → 7.0.0-next.202204111523

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.
@@ -20,8 +20,10 @@ 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 path = require("path");
23
24
  const stream_1 = require("stream");
24
25
  const imperative_1 = require("@zowe/imperative");
26
+ const DaemonUtil_1 = require("./DaemonUtil");
25
27
  /**
26
28
  * Class for handling client connections to our persistent service (e.g. daemon mode)
27
29
  * @export
@@ -78,6 +80,16 @@ class DaemonClient {
78
80
  */
79
81
  shutdown() {
80
82
  imperative_1.Imperative.api.appLogger.debug("shutting down");
83
+ const pidFilePath = path.join(DaemonUtil_1.DaemonUtil.getDaemonDir(), "daemon_pid.json");
84
+ if (imperative_1.IO.existsSync(pidFilePath)) {
85
+ try {
86
+ imperative_1.IO.deleteFile(pidFilePath);
87
+ }
88
+ catch (err) {
89
+ imperative_1.Imperative.api.appLogger.error("Failed to delete file '" + pidFilePath +
90
+ "'\nDetails = " + err.message);
91
+ }
92
+ }
81
93
  this.mClient.end();
82
94
  this.mServer.close();
83
95
  }
@@ -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":";AAAA;;;;;;;;;EASE;;;;;;;;;;;;AAGF,6BAA6B;AAC7B,mCAA+C;AAC/C,iDAAmH;AACnH,6CAA0C;AAE1C;;;;GAIG;AACH,MAAa,YAAY;IAYrB;;;;;;OAMG;IACH,YAAoB,OAAmB,EAAU,OAAmB,EAAU,MAAc;QAAxE,YAAO,GAAP,OAAO,CAAY;QAAU,YAAO,GAAP,OAAO,CAAY;QAAU,WAAM,GAAN,MAAM,CAAQ;QAZ5F;;WAEG;QACK,wBAAmB,GAAG,CAAC,CAAC;IAUhC,CAAC;IAED;;;OAGG;IACI,GAAG;QACN,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAChD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;IAED;;;;OAIG;IACK,GAAG;QACP,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;IACjE,CAAC;IAED;;;;OAIG;IACK,KAAK;QACT,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACpD,CAAC;IAED;;;;;OAKG;IACK,QAAQ;QACZ,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAEhD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,uBAAU,CAAC,YAAY,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAC5E,IAAI,eAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YAC5B,IAAI;gBACA,eAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;aAC9B;YAAC,OAAM,GAAG,EAAE;gBACT,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,yBAAyB,GAAG,WAAW;oBAClE,eAAe,GAAG,GAAG,CAAC,OAAO,CAChC,CAAC;aACL;SACJ;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAED;;;;;;OAMG;IACK,iBAAiB,CAAC,IAAY,EAAE,cAAsB;QAC1D,MAAM,MAAM,GAAG,IAAI,oBAAW,EAAE,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnB,IAAI,CAAC,mBAAmB,GAAG,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC;QAE5D,IAAI,IAAI,CAAC,mBAAmB,GAAG,CAAC,EAAE;YAC9B,kFAAkF;YAClF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1B,MAAM,KAAK,GAAiB,IAAI,CAAC,CAAE,uDAAuD;YAC1F,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,QAAQ,CAAC,IAAI;gBAC1C,KAAK,CAAC,mBAAmB,IAAI,IAAI,CAAC,UAAU,CAAC;gBAE7C,IAAI,KAAK,CAAC,mBAAmB,IAAI,CAAC,EAAE;oBAChC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBAC/C,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;oBAC7B,MAAM,CAAC,GAAG,EAAE,CAAC;iBAChB;YACL,CAAC,CAAC,CAAC;SACN;aAAM;YACH,MAAM,CAAC,GAAG,EAAE,CAAC;SAChB;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;;;OAKG;IACW,IAAI,CAAC,IAAY;;YAC3B,IAAI,IAAI,CAAC,mBAAmB,GAAG,CAAC;gBAAE,OAAO;YAEzC,0DAA0D;YAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,0BAAa,CAAC,aAAa,CAAC,CAAC;YACnE,IAAI,QAAyB,CAAC;YAC9B,IAAI,SAAiB,CAAC;YAEtB,IAAI;gBACA,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC7F,SAAS,GAAG,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;aAC1E;YAAC,OAAO,KAAK,EAAE;gBACZ,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,4BAAe,CAAC;oBAClD,GAAG,EAAE,kDAAkD;oBACvD,WAAW,EAAE,KAAK;iBACrB,CAAC,CAAC,CAAC;gBACJ,+DAA+D;gBAC/D,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,uCAAuC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACxG,MAAM,eAAe,GAAW,0BAAa,CAAC,MAAM,CAAC;oBACjD,MAAM,EAAE,qDAAqD,GAAG,KAAK,CAAC,KAAK;oBAC3E,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBACpC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;gBACnB,OAAO;aACV;YAED,IAAI,WAAW,GAAW,SAAS,CAAC;YACpC,IAAI,QAAQ,CAAC,IAAI,IAAI,IAAI,EAAE;gBACvB,IAAI;oBACA,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;iBACjE;gBAAC,OAAO,GAAG,EAAE;oBACV,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;iBACvF;aACJ;YAED,IAAI,WAAW,IAAI,IAAI,IAAI,WAAW,KAAK,EAAE,EAAE;gBAC3C,+DAA+D;gBAC/D,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;gBAClF,MAAM,eAAe,GAAW,0BAAa,CAAC,MAAM,CAAC;oBACjD,MAAM,EAAE,kFAAkF;oBAC1F,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBACpC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;gBACnB,OAAO;aACV;iBAAM,IAAI,WAAW,IAAI,IAAI,CAAC,MAAM,EAAE;gBACnC,mEAAmE;gBACnE,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,GAAG,WAAW,GAAG,yBAAyB,CAAC,CAAC;gBACtF,MAAM,eAAe,GAAW,0BAAa,CAAC,MAAM,CAAC;oBACjD,MAAM,EAAE,YAAY,GAAG,WAAW,GAAG,6BAA6B;oBAClE,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBACpC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;gBACnB,OAAO;aACV;YAED,IAAI,QAAQ,CAAC,KAAK,IAAI,IAAI,EAAE;gBACxB,IAAI,QAAQ,CAAC,KAAK,KAAK,YAAY,CAAC,WAAW,EAAE;oBAC7C,yDAAyD;oBACzD,OAAO;iBACV;qBAAM,IAAI,IAAI,CAAC,OAAO,EAAE;oBACrB,mDAAmD;oBACnD,IAAI,CAAC,QAAQ,EAAE,CAAC;iBACnB;aACJ;iBAAM;gBACH,uBAAU,CAAC,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACjD,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,yBAAyB,uBAAU,CAAC,WAAW,EAAE,CAAC,CAAC;gBAClF,MAAM,OAAO,GAAmB,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;gBAC7E,IAAI,SAAS,IAAI,IAAI,EAAE;oBACnB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;iBACjF;gBACD,uBAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aAC5C;QACL,CAAC;KAAA;;AA5LL,oCA6LC;AA5LG;;;GAGG;AACoB,wBAAW,GAAG,MAAM,CAAC"}
@@ -57,6 +57,14 @@ export declare class DaemonDecider {
57
57
  * @memberof DaemonDecider
58
58
  */
59
59
  runOrUseDaemon(): void;
60
+ /**
61
+ * Record the process ID of the daemon that is being started for the current user.
62
+ * On a multi-user system, each user gets his/her own daemon.
63
+ *
64
+ * @private
65
+ * @memberof DaemonDecider
66
+ */
67
+ private recordDaemonPid;
60
68
  /**
61
69
  * Server close handler
62
70
  * @private
@@ -17,6 +17,7 @@ const os = require("os");
17
17
  const path = require("path");
18
18
  const imperative_1 = require("@zowe/imperative");
19
19
  const DaemonClient_1 = require("./DaemonClient");
20
+ const DaemonUtil_1 = require("./DaemonUtil");
20
21
  // TODO(Kelosky): handle prompting cases from login command
21
22
  // TODO(Kelosky): prompt* broken - hangs, must restart daemon
22
23
  // TODO(Kelosky): colors do not come through on some terminals (must be started via `node lib/main --daemon` to see colors)
@@ -49,6 +50,7 @@ class DaemonDecider {
49
50
  });
50
51
  this.mServer.on('error', this.error.bind(this));
51
52
  this.mServer.on('close', this.close.bind(this));
53
+ this.recordDaemonPid();
52
54
  }
53
55
  }
54
56
  /**
@@ -58,8 +60,8 @@ class DaemonDecider {
58
60
  */
59
61
  runOrUseDaemon() {
60
62
  if (this.mServer) {
61
- if (process.platform !== "win32" && fs.existsSync(this.mSocket)) {
62
- fs.unlinkSync(this.mSocket);
63
+ if (process.platform !== "win32" && imperative_1.IO.existsSync(this.mSocket)) {
64
+ imperative_1.IO.deleteFile(this.mSocket);
63
65
  }
64
66
  ["exit", "SIGINT", "SIGQUIT", "SIGTERM"].forEach((eventType) => {
65
67
  process.on(eventType, this.close.bind(this, true));
@@ -74,6 +76,31 @@ class DaemonDecider {
74
76
  imperative_1.Imperative.parse();
75
77
  }
76
78
  }
79
+ /**
80
+ * Record the process ID of the daemon that is being started for the current user.
81
+ * On a multi-user system, each user gets his/her own daemon.
82
+ *
83
+ * @private
84
+ * @memberof DaemonDecider
85
+ */
86
+ recordDaemonPid() {
87
+ const pidForUser = {
88
+ user: os.userInfo().username,
89
+ pid: process.pid
90
+ };
91
+ const pidFilePath = path.join(DaemonUtil_1.DaemonUtil.getDaemonDir(), "daemon_pid.json");
92
+ const pidForUserStr = JSON.stringify(pidForUser, null, 2);
93
+ try {
94
+ fs.writeFileSync(pidFilePath, pidForUserStr);
95
+ const ownerReadWrite = 0o600;
96
+ fs.chmodSync(pidFilePath, ownerReadWrite);
97
+ }
98
+ catch (err) {
99
+ throw new Error("Failed to write file '" + pidFilePath + "'\nDetails = " + err.message);
100
+ }
101
+ imperative_1.Imperative.api.appLogger.trace("Recorded daemon process ID into " + pidFilePath +
102
+ "\n" + pidForUserStr);
103
+ }
77
104
  /**
78
105
  * Server close handler
79
106
  * @private
@@ -101,6 +128,7 @@ class DaemonDecider {
101
128
  * @memberof DaemonDecider
102
129
  */
103
130
  initialParse() {
131
+ var _a, _b;
104
132
  if (this.mParms.length > 2) {
105
133
  /**
106
134
  * NOTE(Kelosky): For now, we use an undocumented parameter `--daemon`. If found first,
@@ -110,17 +138,20 @@ class DaemonDecider {
110
138
  const daemonOffset = parm.indexOf(DaemonDecider.DAEMON_KEY);
111
139
  if (daemonOffset > -1) {
112
140
  this.startServer = true;
113
- if (process.env.ZOWE_DAEMON) {
114
- this.mSocket = process.env.ZOWE_DAEMON;
115
- if (process.platform === "win32") {
116
- this.mSocket = `\\\\.\\pipe\\${this.mSocket}`;
141
+ if (process.platform === "win32") {
142
+ // On windows we use a pipe instead of a socket
143
+ if (((_b = (_a = process.env) === null || _a === void 0 ? void 0 : _a.ZOWE_DAEMON_PIPE) === null || _b === void 0 ? void 0 : _b.length) > 0) {
144
+ // user can choose some pipe path
145
+ this.mSocket = "\\\\.\\pipe\\" + process.env.ZOWE_DAEMON_PIPE;
146
+ }
147
+ else {
148
+ // use default pipe path name
149
+ this.mSocket = `\\\\.\\pipe\\${os.userInfo().username}\\ZoweDaemon`;
117
150
  }
118
- }
119
- else if (process.platform !== "win32") {
120
- this.mSocket = path.join(os.homedir(), ".zowe-daemon.sock");
121
151
  }
122
152
  else {
123
- this.mSocket = `\\\\.\\pipe\\${os.userInfo().username}\\ZoweDaemon`;
153
+ // Linux-like systems use domain sockets
154
+ this.mSocket = path.join(DaemonUtil_1.DaemonUtil.getDaemonDir(), "daemon.sock");
124
155
  }
125
156
  imperative_1.Imperative.api.appLogger.debug(`daemon server will listen on ${this.mSocket}`);
126
157
  }
@@ -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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"}
@@ -0,0 +1,14 @@
1
+ /**
2
+ * Class containing daemon utility functions.
3
+ * @export
4
+ * @class DaemonUtil
5
+ */
6
+ export declare class DaemonUtil {
7
+ /**
8
+ * Get the directory that holds daemon-related runtime files.
9
+ * Ensures that the directory exists, or we create it.
10
+ *
11
+ * @returns The absolute path to the daemon directory.
12
+ */
13
+ static getDaemonDir(): string;
14
+ }
@@ -0,0 +1,55 @@
1
+ "use strict";
2
+ /*
3
+ * This program and the accompanying materials are made available under the terms of the
4
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
5
+ * https://www.eclipse.org/legal/epl-v20.html
6
+ *
7
+ * SPDX-License-Identifier: EPL-2.0
8
+ *
9
+ * Copyright Contributors to the Zowe Project.
10
+ *
11
+ */
12
+ Object.defineProperty(exports, "__esModule", { value: true });
13
+ exports.DaemonUtil = void 0;
14
+ const fs = require("fs");
15
+ const os = require("os");
16
+ const path = require("path");
17
+ const imperative_1 = require("@zowe/imperative");
18
+ /**
19
+ * Class containing daemon utility functions.
20
+ * @export
21
+ * @class DaemonUtil
22
+ */
23
+ class DaemonUtil {
24
+ /**
25
+ * Get the directory that holds daemon-related runtime files.
26
+ * Ensures that the directory exists, or we create it.
27
+ *
28
+ * @returns The absolute path to the daemon directory.
29
+ */
30
+ static getDaemonDir() {
31
+ var _a, _b;
32
+ let daemonDir;
33
+ if (((_b = (_a = process.env) === null || _a === void 0 ? void 0 : _a.ZOWE_DAEMON_DIR) === null || _b === void 0 ? void 0 : _b.length) > 0) {
34
+ // user can choose a daemon directory for storing runtime artifacts
35
+ daemonDir = process.env.ZOWE_DAEMON_DIR;
36
+ }
37
+ else {
38
+ // our default location.
39
+ daemonDir = path.join(os.homedir(), ".zowe", "daemon");
40
+ }
41
+ if (!imperative_1.IO.existsSync(daemonDir)) {
42
+ try {
43
+ imperative_1.IO.mkdirp(daemonDir);
44
+ const ownerReadWriteTraverse = 0o700;
45
+ fs.chmodSync(daemonDir, ownerReadWriteTraverse);
46
+ }
47
+ catch (err) {
48
+ throw new Error("Failed to create directory '" + daemonDir + "'\nDetails = " + err.message);
49
+ }
50
+ }
51
+ return daemonDir;
52
+ }
53
+ }
54
+ exports.DaemonUtil = DaemonUtil;
55
+ //# sourceMappingURL=DaemonUtil.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DaemonUtil.js","sourceRoot":"","sources":["../../src/daemon/DaemonUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAEF,yBAAyB;AACzB,yBAAyB;AACzB,6BAA6B;AAC7B,iDAAsC;AAEtC;;;;GAIG;AACH,MAAa,UAAU;IACnB;;;;;OAKG;IACI,MAAM,CAAC,YAAY;;QACtB,IAAI,SAAiB,CAAC;QACtB,IAAI,aAAA,OAAO,CAAC,GAAG,0CAAE,eAAe,0CAAE,MAAM,IAAG,CAAC,EAAE;YAC1C,mEAAmE;YACnE,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;SAC3C;aAAM;YACH,wBAAwB;YACxB,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;SAC1D;QACD,IAAI,CAAC,eAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC3B,IAAI;gBACA,eAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBACrB,MAAM,sBAAsB,GAAG,KAAK,CAAC;gBACrC,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;aACnD;YAAC,OAAM,GAAG,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,8BAA8B,GAAG,SAAS,GAAG,eAAe,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;aAC/F;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AA3BD,gCA2BC"}
@@ -0,0 +1,8 @@
1
+ /**
2
+ * Represents the content of the JSON file into which the Zowe Daemon
3
+ * stores the process ID for a given user.
4
+ */
5
+ export interface IDaemonPidForUser {
6
+ user: string;
7
+ pid: number;
8
+ }
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ /*
3
+ * This program and the accompanying materials are made available under the terms of the
4
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
5
+ * https://www.eclipse.org/legal/epl-v20.html
6
+ *
7
+ * SPDX-License-Identifier: EPL-2.0
8
+ *
9
+ * Copyright Contributors to the Zowe Project.
10
+ *
11
+ */
12
+ Object.defineProperty(exports, "__esModule", { value: true });
13
+ //# sourceMappingURL=IDaemonPidForUser.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"IDaemonPidForUser.js","sourceRoot":"","sources":["../../../src/daemon/doc/IDaemonPidForUser.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE"}
@@ -1,27 +1,27 @@
1
1
  {
2
2
  "name": "@zowe/cli",
3
- "version": "7.0.0-next.202204011929",
3
+ "version": "7.0.0-next.202204111523",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@zowe/cli",
9
- "version": "7.0.0-next.202204011929",
9
+ "version": "7.0.0-next.202204111523",
10
10
  "hasInstallScript": true,
11
11
  "license": "EPL-2.0",
12
12
  "dependencies": {
13
- "@zowe/core-for-zowe-sdk": "7.0.0-next.202204011929",
14
- "@zowe/imperative": "5.0.0-next.202203311701",
13
+ "@zowe/core-for-zowe-sdk": "7.0.0-next.202204111523",
14
+ "@zowe/imperative": "5.0.0-next.202204111131",
15
15
  "@zowe/perf-timing": "1.0.7",
16
- "@zowe/provisioning-for-zowe-sdk": "7.0.0-next.202204011929",
17
- "@zowe/zos-console-for-zowe-sdk": "7.0.0-next.202204011929",
18
- "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202204011929",
19
- "@zowe/zos-jobs-for-zowe-sdk": "7.0.0-next.202204011929",
20
- "@zowe/zos-logs-for-zowe-sdk": "7.0.0-next.202204011929",
21
- "@zowe/zos-tso-for-zowe-sdk": "7.0.0-next.202204011929",
22
- "@zowe/zos-uss-for-zowe-sdk": "7.0.0-next.202204011929",
23
- "@zowe/zos-workflows-for-zowe-sdk": "7.0.0-next.202204011929",
24
- "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202204011929",
16
+ "@zowe/provisioning-for-zowe-sdk": "7.0.0-next.202204111523",
17
+ "@zowe/zos-console-for-zowe-sdk": "7.0.0-next.202204111523",
18
+ "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202204111523",
19
+ "@zowe/zos-jobs-for-zowe-sdk": "7.0.0-next.202204111523",
20
+ "@zowe/zos-logs-for-zowe-sdk": "7.0.0-next.202204111523",
21
+ "@zowe/zos-tso-for-zowe-sdk": "7.0.0-next.202204111523",
22
+ "@zowe/zos-uss-for-zowe-sdk": "7.0.0-next.202204111523",
23
+ "@zowe/zos-workflows-for-zowe-sdk": "7.0.0-next.202204111523",
24
+ "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202204111523",
25
25
  "find-process": "1.4.7",
26
26
  "get-stream": "6.0.1",
27
27
  "lodash": "4.17.21",
@@ -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.202204011929",
40
+ "@zowe/cli-test-utils": "7.0.0-next.202204111523",
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.202204011929",
253
- "resolved": "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.0.0-next.202204011929.tgz",
254
- "integrity": "sha512-3oNG3H3KN3ID/AElrBvbIQeaZNWORpXpptWifoNTwRwVx8GCbMOwdApCzL/Phg2l3cyxHu50kKfH78GmhT1GPg==",
252
+ "version": "7.0.0-next.202204111523",
253
+ "resolved": "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.0.0-next.202204111523.tgz",
254
+ "integrity": "sha512-PGagbEHvKpm9MsC9rHGvNajsSzh4YOSgYVaC9LxZeupSNxGFxoYRIJv9tusM6s+8nH2D10HeVg6+ItJfsSQIaw==",
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.202203311701",
266
- "resolved": "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.0.0-next.202203311701.tgz",
267
- "integrity": "sha512-4Nhxpjirz2wSrNNule0ov6G+0nmewNiwqBGHt121otKEl4SOzLsi8LzrH0QuY1vvMj+YSLqEWqfFu22xEPnIIw==",
265
+ "version": "5.0.0-next.202204111131",
266
+ "resolved": "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.0.0-next.202204111131.tgz",
267
+ "integrity": "sha512-oGSxPPe2RZ+rpgZysjva2HsVh1swCyBONZS4VtTwoDMGCNbkHJcPcMPJJ6bGFVceY4iswbyjUdPF9qAudyKg9g==",
268
268
  "license": "EPL-2.0",
269
269
  "dependencies": {
270
270
  "@types/lodash-deep": "2.0.0",
@@ -288,7 +288,7 @@
288
288
  "lodash-deep": "2.0.0",
289
289
  "log4js": "6.4.0",
290
290
  "markdown-it": "12.3.2",
291
- "moment": "2.20.1",
291
+ "moment": "2.29.2",
292
292
  "mustache": "2.3.0",
293
293
  "npm-package-arg": "8.1.1",
294
294
  "opener": "1.5.2",
@@ -385,6 +385,14 @@
385
385
  "node": ">=8"
386
386
  }
387
387
  },
388
+ "node_modules/@zowe/imperative/node_modules/moment": {
389
+ "version": "2.29.2",
390
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.2.tgz",
391
+ "integrity": "sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==",
392
+ "engines": {
393
+ "node": "*"
394
+ }
395
+ },
388
396
  "node_modules/@zowe/imperative/node_modules/p-limit": {
389
397
  "version": "2.3.0",
390
398
  "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -454,9 +462,9 @@
454
462
  }
455
463
  },
456
464
  "node_modules/@zowe/provisioning-for-zowe-sdk": {
457
- "version": "7.0.0-next.202204011929",
458
- "resolved": "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.0.0-next.202204011929.tgz",
459
- "integrity": "sha512-gJRGDqByULGOngcVxzXqThRw1zrvjGXTxCSPqh1mPJPDbXkdfep8goZzOFGv8D721PI7nyMnlWh0byoVDONPsg==",
465
+ "version": "7.0.0-next.202204111523",
466
+ "resolved": "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.0.0-next.202204111523.tgz",
467
+ "integrity": "sha512-E2wYzBtdWuJWIyMPvZF5s0IAFXZjQuHAWFL9/kujJEm5/qCmh/ApipO9h6rrsizawZGapO0whuO4kfMPgXVngg==",
460
468
  "license": "EPL-2.0",
461
469
  "dependencies": {
462
470
  "js-yaml": "3.14.1"
@@ -467,9 +475,9 @@
467
475
  }
468
476
  },
469
477
  "node_modules/@zowe/zos-console-for-zowe-sdk": {
470
- "version": "7.0.0-next.202204011929",
471
- "resolved": "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.0.0-next.202204011929.tgz",
472
- "integrity": "sha512-Zp9I/P4siDKkLX/gM4ll84F69B1X/o7GfdaZviI1L68F2r1RDXHv8EJ8uJRGnCavL+NT3W0zm1yfKqGI7/QzQA==",
478
+ "version": "7.0.0-next.202204111523",
479
+ "resolved": "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.0.0-next.202204111523.tgz",
480
+ "integrity": "sha512-zIwu2ZzEqZfggvV6uRGNBx6IHuqduba1cEnves6QLlfirRbm97FpNk0uaC2pMzhn12K2hkb+gvGXgPtn0bKL+g==",
473
481
  "license": "EPL-2.0",
474
482
  "peerDependencies": {
475
483
  "@zowe/core-for-zowe-sdk": ">=7.0.0-next <7.0.0",
@@ -477,9 +485,9 @@
477
485
  }
478
486
  },
479
487
  "node_modules/@zowe/zos-files-for-zowe-sdk": {
480
- "version": "7.0.0-next.202204011929",
481
- "resolved": "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.0.0-next.202204011929.tgz",
482
- "integrity": "sha512-0ekV3BxlTjOb5xZQlddF9Isq4/n8uDHTtRjzmbnljUspYhYBAIN/EzhVdNrGXOPU0SkpvTvP+OQyYDsxVLzuhA==",
488
+ "version": "7.0.0-next.202204111523",
489
+ "resolved": "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.0.0-next.202204111523.tgz",
490
+ "integrity": "sha512-25KEeXicEJmNmNJH88zb57zSb8WJOaa5SRuqx14/xahgAnyKon7+OHZNNyXR05aHrUNodAPdQT5Sodt/OKldFQ==",
483
491
  "license": "EPL-2.0",
484
492
  "dependencies": {
485
493
  "minimatch": "3.0.4"
@@ -490,12 +498,12 @@
490
498
  }
491
499
  },
492
500
  "node_modules/@zowe/zos-jobs-for-zowe-sdk": {
493
- "version": "7.0.0-next.202204011929",
494
- "resolved": "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.0.0-next.202204011929.tgz",
495
- "integrity": "sha512-CN9imy+51iBNxwuEylfDC8aBUic5aXmPV2bUHCoj+oUs5KW1AetPA4Dz5eEkSx+En8dAiDxYCif9dh2+w7ucgA==",
501
+ "version": "7.0.0-next.202204111523",
502
+ "resolved": "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.0.0-next.202204111523.tgz",
503
+ "integrity": "sha512-+h1UBrn/DbKCAr+oIPWqDxvRvPjkKVnHLfyacEuVO3euPaIP5Z+CF35zLl7s+uL9LGItkrRnDVH5LCs5t6SozA==",
496
504
  "license": "EPL-2.0",
497
505
  "dependencies": {
498
- "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202204011929"
506
+ "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202204111523"
499
507
  },
500
508
  "peerDependencies": {
501
509
  "@zowe/core-for-zowe-sdk": ">=7.0.0-next <7.0.0",
@@ -503,9 +511,9 @@
503
511
  }
504
512
  },
505
513
  "node_modules/@zowe/zos-logs-for-zowe-sdk": {
506
- "version": "7.0.0-next.202204011929",
507
- "resolved": "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.0.0-next.202204011929.tgz",
508
- "integrity": "sha512-mLU7QWF6ZaDPVM6IJMasit9zSWBYdG7KXjlXBLKjkv5/Rgl/rXTjmPbledsMwvDq3U5Y6crqULfCsDmgMA0dIg==",
514
+ "version": "7.0.0-next.202204111523",
515
+ "resolved": "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.0.0-next.202204111523.tgz",
516
+ "integrity": "sha512-B80L5BCKBM48y8VUJwMK/rQZhJwzLQ7eKCvohb+pGRbLiZby9W1RXEK393mPVfwN0Qtr4NpZr7KryOfQqGEGAA==",
509
517
  "license": "EPL-2.0",
510
518
  "peerDependencies": {
511
519
  "@zowe/core-for-zowe-sdk": ">=7.0.0-next <7.0.0",
@@ -513,12 +521,12 @@
513
521
  }
514
522
  },
515
523
  "node_modules/@zowe/zos-tso-for-zowe-sdk": {
516
- "version": "7.0.0-next.202204011929",
517
- "resolved": "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.0.0-next.202204011929.tgz",
518
- "integrity": "sha512-duJfOPJSiKbqPmT5TWlf1Z48c6ZgFpvCvMEUAoHelQHJvGmYNbwSQiIECsHkUc94LeVwLrZJwqUpmXWZJrLwmg==",
524
+ "version": "7.0.0-next.202204111523",
525
+ "resolved": "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.0.0-next.202204111523.tgz",
526
+ "integrity": "sha512-A2lRGlACztdEj1EWgP1u/VQXmIVc8Su4skbvt66FxaC0Vb0gvY7UXFSgAoX1Bs4VP+YuNdo0CYjWFTabwnrBkQ==",
519
527
  "license": "EPL-2.0",
520
528
  "dependencies": {
521
- "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202204011929"
529
+ "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202204111523"
522
530
  },
523
531
  "peerDependencies": {
524
532
  "@zowe/core-for-zowe-sdk": ">=7.0.0-next <7.0.0",
@@ -526,9 +534,9 @@
526
534
  }
527
535
  },
528
536
  "node_modules/@zowe/zos-uss-for-zowe-sdk": {
529
- "version": "7.0.0-next.202204011929",
530
- "resolved": "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.0.0-next.202204011929.tgz",
531
- "integrity": "sha512-P71Vp92FJFieOblvCym+x0qXiU2kPXScubo8H0rCV7M0uZAp5bSciLIPDXaYHbWUXIqESQedCg3/tnTwNh1M0A==",
537
+ "version": "7.0.0-next.202204111523",
538
+ "resolved": "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.0.0-next.202204111523.tgz",
539
+ "integrity": "sha512-3T03LHzMuadcdXcpQh9YS9jlroILfgbB+2aarkWoAC5H2df13mtoLNfHstZcz6VcgO7yXxoAjTQLZE+n4FBjCQ==",
532
540
  "license": "EPL-2.0",
533
541
  "dependencies": {
534
542
  "ssh2": "1.4.0"
@@ -538,12 +546,12 @@
538
546
  }
539
547
  },
540
548
  "node_modules/@zowe/zos-workflows-for-zowe-sdk": {
541
- "version": "7.0.0-next.202204011929",
542
- "resolved": "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.0.0-next.202204011929.tgz",
543
- "integrity": "sha512-oDIPV7APVjTTVQ0xYgo95LlRqPNPSCJ9iZtlLHXVyxnrBNkITvAU6vrF1BxatvOPL5yiDKOKP3Ih29bMi4ZPKg==",
549
+ "version": "7.0.0-next.202204111523",
550
+ "resolved": "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.0.0-next.202204111523.tgz",
551
+ "integrity": "sha512-eoJleoRNITUa5G677jCC1hVcX8DqWsbgzF6cP2uYJSFaVJA5ddvzgwd5K87G2PDUPPc8Zu7WycjHNlTz4DPZ5g==",
544
552
  "license": "EPL-2.0",
545
553
  "dependencies": {
546
- "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202204011929"
554
+ "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202204111523"
547
555
  },
548
556
  "peerDependencies": {
549
557
  "@zowe/core-for-zowe-sdk": ">=7.0.0-next <7.0.0",
@@ -551,9 +559,9 @@
551
559
  }
552
560
  },
553
561
  "node_modules/@zowe/zosmf-for-zowe-sdk": {
554
- "version": "7.0.0-next.202204011929",
555
- "resolved": "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.0.0-next.202204011929.tgz",
556
- "integrity": "sha512-Ngr3/OT0UkOKBsdgVVTbpVBzuZQQCINNgFcheyrUTeeMt7D6JnqyqrgPlF1oKukDZsoE0Fl/lb6Pb8XJg/QjQw==",
562
+ "version": "7.0.0-next.202204111523",
563
+ "resolved": "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.0.0-next.202204111523.tgz",
564
+ "integrity": "sha512-7Ok6fROiDUk+LYxyk3db1Vb4CKnTq7I0yETlX6tiQOUmyIfeSixI6GAtqFY3RPfH5Eij97ZaLR0KsHbGmQ2zZQ==",
557
565
  "license": "EPL-2.0",
558
566
  "peerDependencies": {
559
567
  "@zowe/core-for-zowe-sdk": ">=7.0.0-next <7.0.0",
@@ -1885,14 +1893,6 @@
1885
1893
  "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
1886
1894
  "optional": true
1887
1895
  },
1888
- "node_modules/moment": {
1889
- "version": "2.20.1",
1890
- "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz",
1891
- "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==",
1892
- "engines": {
1893
- "node": "*"
1894
- }
1895
- },
1896
1896
  "node_modules/ms": {
1897
1897
  "version": "2.1.2",
1898
1898
  "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -2657,35 +2657,27 @@
2657
2657
  "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
2658
2658
  },
2659
2659
  "node_modules/semver": {
2660
- "version": "7.3.5",
2661
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
2662
- "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
2660
+ "version": "7.3.6",
2661
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
2662
+ "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
2663
2663
  "dependencies": {
2664
- "lru-cache": "^6.0.0"
2664
+ "lru-cache": "^7.4.0"
2665
2665
  },
2666
2666
  "bin": {
2667
2667
  "semver": "bin/semver.js"
2668
2668
  },
2669
2669
  "engines": {
2670
- "node": ">=10"
2670
+ "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
2671
2671
  }
2672
2672
  },
2673
2673
  "node_modules/semver/node_modules/lru-cache": {
2674
- "version": "6.0.0",
2675
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
2676
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
2677
- "dependencies": {
2678
- "yallist": "^4.0.0"
2679
- },
2674
+ "version": "7.8.1",
2675
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.1.tgz",
2676
+ "integrity": "sha512-E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg==",
2680
2677
  "engines": {
2681
- "node": ">=10"
2678
+ "node": ">=12"
2682
2679
  }
2683
2680
  },
2684
- "node_modules/semver/node_modules/yallist": {
2685
- "version": "4.0.0",
2686
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
2687
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
2688
- },
2689
2681
  "node_modules/set-blocking": {
2690
2682
  "version": "2.0.0",
2691
2683
  "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -3347,18 +3339,18 @@
3347
3339
  "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="
3348
3340
  },
3349
3341
  "@zowe/core-for-zowe-sdk": {
3350
- "version": "7.0.0-next.202204011929",
3351
- "resolved": "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.0.0-next.202204011929.tgz",
3352
- "integrity": "sha512-3oNG3H3KN3ID/AElrBvbIQeaZNWORpXpptWifoNTwRwVx8GCbMOwdApCzL/Phg2l3cyxHu50kKfH78GmhT1GPg==",
3342
+ "version": "7.0.0-next.202204111523",
3343
+ "resolved": "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.0.0-next.202204111523.tgz",
3344
+ "integrity": "sha512-PGagbEHvKpm9MsC9rHGvNajsSzh4YOSgYVaC9LxZeupSNxGFxoYRIJv9tusM6s+8nH2D10HeVg6+ItJfsSQIaw==",
3353
3345
  "requires": {
3354
3346
  "comment-json": "4.1.0",
3355
3347
  "string-width": "4.2.3"
3356
3348
  }
3357
3349
  },
3358
3350
  "@zowe/imperative": {
3359
- "version": "5.0.0-next.202203311701",
3360
- "resolved": "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.0.0-next.202203311701.tgz",
3361
- "integrity": "sha512-4Nhxpjirz2wSrNNule0ov6G+0nmewNiwqBGHt121otKEl4SOzLsi8LzrH0QuY1vvMj+YSLqEWqfFu22xEPnIIw==",
3351
+ "version": "5.0.0-next.202204111131",
3352
+ "resolved": "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.0.0-next.202204111131.tgz",
3353
+ "integrity": "sha512-oGSxPPe2RZ+rpgZysjva2HsVh1swCyBONZS4VtTwoDMGCNbkHJcPcMPJJ6bGFVceY4iswbyjUdPF9qAudyKg9g==",
3362
3354
  "requires": {
3363
3355
  "@types/lodash-deep": "2.0.0",
3364
3356
  "@types/yargs": "13.0.4",
@@ -3381,7 +3373,7 @@
3381
3373
  "lodash-deep": "2.0.0",
3382
3374
  "log4js": "6.4.0",
3383
3375
  "markdown-it": "12.3.2",
3384
- "moment": "2.20.1",
3376
+ "moment": "2.29.2",
3385
3377
  "mustache": "2.3.0",
3386
3378
  "npm-package-arg": "8.1.1",
3387
3379
  "opener": "1.5.2",
@@ -3457,6 +3449,11 @@
3457
3449
  "p-locate": "^4.1.0"
3458
3450
  }
3459
3451
  },
3452
+ "moment": {
3453
+ "version": "2.29.2",
3454
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.2.tgz",
3455
+ "integrity": "sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg=="
3456
+ },
3460
3457
  "p-limit": {
3461
3458
  "version": "2.3.0",
3462
3459
  "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -3506,69 +3503,69 @@
3506
3503
  }
3507
3504
  },
3508
3505
  "@zowe/provisioning-for-zowe-sdk": {
3509
- "version": "7.0.0-next.202204011929",
3510
- "resolved": "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.0.0-next.202204011929.tgz",
3511
- "integrity": "sha512-gJRGDqByULGOngcVxzXqThRw1zrvjGXTxCSPqh1mPJPDbXkdfep8goZzOFGv8D721PI7nyMnlWh0byoVDONPsg==",
3506
+ "version": "7.0.0-next.202204111523",
3507
+ "resolved": "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.0.0-next.202204111523.tgz",
3508
+ "integrity": "sha512-E2wYzBtdWuJWIyMPvZF5s0IAFXZjQuHAWFL9/kujJEm5/qCmh/ApipO9h6rrsizawZGapO0whuO4kfMPgXVngg==",
3512
3509
  "requires": {
3513
3510
  "js-yaml": "3.14.1"
3514
3511
  }
3515
3512
  },
3516
3513
  "@zowe/zos-console-for-zowe-sdk": {
3517
- "version": "7.0.0-next.202204011929",
3518
- "resolved": "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.0.0-next.202204011929.tgz",
3519
- "integrity": "sha512-Zp9I/P4siDKkLX/gM4ll84F69B1X/o7GfdaZviI1L68F2r1RDXHv8EJ8uJRGnCavL+NT3W0zm1yfKqGI7/QzQA==",
3514
+ "version": "7.0.0-next.202204111523",
3515
+ "resolved": "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.0.0-next.202204111523.tgz",
3516
+ "integrity": "sha512-zIwu2ZzEqZfggvV6uRGNBx6IHuqduba1cEnves6QLlfirRbm97FpNk0uaC2pMzhn12K2hkb+gvGXgPtn0bKL+g==",
3520
3517
  "requires": {}
3521
3518
  },
3522
3519
  "@zowe/zos-files-for-zowe-sdk": {
3523
- "version": "7.0.0-next.202204011929",
3524
- "resolved": "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.0.0-next.202204011929.tgz",
3525
- "integrity": "sha512-0ekV3BxlTjOb5xZQlddF9Isq4/n8uDHTtRjzmbnljUspYhYBAIN/EzhVdNrGXOPU0SkpvTvP+OQyYDsxVLzuhA==",
3520
+ "version": "7.0.0-next.202204111523",
3521
+ "resolved": "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.0.0-next.202204111523.tgz",
3522
+ "integrity": "sha512-25KEeXicEJmNmNJH88zb57zSb8WJOaa5SRuqx14/xahgAnyKon7+OHZNNyXR05aHrUNodAPdQT5Sodt/OKldFQ==",
3526
3523
  "requires": {
3527
3524
  "minimatch": "3.0.4"
3528
3525
  }
3529
3526
  },
3530
3527
  "@zowe/zos-jobs-for-zowe-sdk": {
3531
- "version": "7.0.0-next.202204011929",
3532
- "resolved": "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.0.0-next.202204011929.tgz",
3533
- "integrity": "sha512-CN9imy+51iBNxwuEylfDC8aBUic5aXmPV2bUHCoj+oUs5KW1AetPA4Dz5eEkSx+En8dAiDxYCif9dh2+w7ucgA==",
3528
+ "version": "7.0.0-next.202204111523",
3529
+ "resolved": "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.0.0-next.202204111523.tgz",
3530
+ "integrity": "sha512-+h1UBrn/DbKCAr+oIPWqDxvRvPjkKVnHLfyacEuVO3euPaIP5Z+CF35zLl7s+uL9LGItkrRnDVH5LCs5t6SozA==",
3534
3531
  "requires": {
3535
- "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202204011929"
3532
+ "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202204111523"
3536
3533
  }
3537
3534
  },
3538
3535
  "@zowe/zos-logs-for-zowe-sdk": {
3539
- "version": "7.0.0-next.202204011929",
3540
- "resolved": "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.0.0-next.202204011929.tgz",
3541
- "integrity": "sha512-mLU7QWF6ZaDPVM6IJMasit9zSWBYdG7KXjlXBLKjkv5/Rgl/rXTjmPbledsMwvDq3U5Y6crqULfCsDmgMA0dIg==",
3536
+ "version": "7.0.0-next.202204111523",
3537
+ "resolved": "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.0.0-next.202204111523.tgz",
3538
+ "integrity": "sha512-B80L5BCKBM48y8VUJwMK/rQZhJwzLQ7eKCvohb+pGRbLiZby9W1RXEK393mPVfwN0Qtr4NpZr7KryOfQqGEGAA==",
3542
3539
  "requires": {}
3543
3540
  },
3544
3541
  "@zowe/zos-tso-for-zowe-sdk": {
3545
- "version": "7.0.0-next.202204011929",
3546
- "resolved": "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.0.0-next.202204011929.tgz",
3547
- "integrity": "sha512-duJfOPJSiKbqPmT5TWlf1Z48c6ZgFpvCvMEUAoHelQHJvGmYNbwSQiIECsHkUc94LeVwLrZJwqUpmXWZJrLwmg==",
3542
+ "version": "7.0.0-next.202204111523",
3543
+ "resolved": "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.0.0-next.202204111523.tgz",
3544
+ "integrity": "sha512-A2lRGlACztdEj1EWgP1u/VQXmIVc8Su4skbvt66FxaC0Vb0gvY7UXFSgAoX1Bs4VP+YuNdo0CYjWFTabwnrBkQ==",
3548
3545
  "requires": {
3549
- "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202204011929"
3546
+ "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202204111523"
3550
3547
  }
3551
3548
  },
3552
3549
  "@zowe/zos-uss-for-zowe-sdk": {
3553
- "version": "7.0.0-next.202204011929",
3554
- "resolved": "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.0.0-next.202204011929.tgz",
3555
- "integrity": "sha512-P71Vp92FJFieOblvCym+x0qXiU2kPXScubo8H0rCV7M0uZAp5bSciLIPDXaYHbWUXIqESQedCg3/tnTwNh1M0A==",
3550
+ "version": "7.0.0-next.202204111523",
3551
+ "resolved": "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.0.0-next.202204111523.tgz",
3552
+ "integrity": "sha512-3T03LHzMuadcdXcpQh9YS9jlroILfgbB+2aarkWoAC5H2df13mtoLNfHstZcz6VcgO7yXxoAjTQLZE+n4FBjCQ==",
3556
3553
  "requires": {
3557
3554
  "ssh2": "1.4.0"
3558
3555
  }
3559
3556
  },
3560
3557
  "@zowe/zos-workflows-for-zowe-sdk": {
3561
- "version": "7.0.0-next.202204011929",
3562
- "resolved": "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.0.0-next.202204011929.tgz",
3563
- "integrity": "sha512-oDIPV7APVjTTVQ0xYgo95LlRqPNPSCJ9iZtlLHXVyxnrBNkITvAU6vrF1BxatvOPL5yiDKOKP3Ih29bMi4ZPKg==",
3558
+ "version": "7.0.0-next.202204111523",
3559
+ "resolved": "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.0.0-next.202204111523.tgz",
3560
+ "integrity": "sha512-eoJleoRNITUa5G677jCC1hVcX8DqWsbgzF6cP2uYJSFaVJA5ddvzgwd5K87G2PDUPPc8Zu7WycjHNlTz4DPZ5g==",
3564
3561
  "requires": {
3565
- "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202204011929"
3562
+ "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202204111523"
3566
3563
  }
3567
3564
  },
3568
3565
  "@zowe/zosmf-for-zowe-sdk": {
3569
- "version": "7.0.0-next.202204011929",
3570
- "resolved": "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.0.0-next.202204011929.tgz",
3571
- "integrity": "sha512-Ngr3/OT0UkOKBsdgVVTbpVBzuZQQCINNgFcheyrUTeeMt7D6JnqyqrgPlF1oKukDZsoE0Fl/lb6Pb8XJg/QjQw==",
3566
+ "version": "7.0.0-next.202204111523",
3567
+ "resolved": "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.0.0-next.202204111523.tgz",
3568
+ "integrity": "sha512-7Ok6fROiDUk+LYxyk3db1Vb4CKnTq7I0yETlX6tiQOUmyIfeSixI6GAtqFY3RPfH5Eij97ZaLR0KsHbGmQ2zZQ==",
3572
3569
  "requires": {}
3573
3570
  },
3574
3571
  "aggregate-error": {
@@ -4593,11 +4590,6 @@
4593
4590
  "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
4594
4591
  "optional": true
4595
4592
  },
4596
- "moment": {
4597
- "version": "2.20.1",
4598
- "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz",
4599
- "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="
4600
- },
4601
4593
  "ms": {
4602
4594
  "version": "2.1.2",
4603
4595
  "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -5184,25 +5176,17 @@
5184
5176
  "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
5185
5177
  },
5186
5178
  "semver": {
5187
- "version": "7.3.5",
5188
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
5189
- "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
5179
+ "version": "7.3.6",
5180
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
5181
+ "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
5190
5182
  "requires": {
5191
- "lru-cache": "^6.0.0"
5183
+ "lru-cache": "^7.4.0"
5192
5184
  },
5193
5185
  "dependencies": {
5194
5186
  "lru-cache": {
5195
- "version": "6.0.0",
5196
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
5197
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
5198
- "requires": {
5199
- "yallist": "^4.0.0"
5200
- }
5201
- },
5202
- "yallist": {
5203
- "version": "4.0.0",
5204
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
5205
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
5187
+ "version": "7.8.1",
5188
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.8.1.tgz",
5189
+ "integrity": "sha512-E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg=="
5206
5190
  }
5207
5191
  }
5208
5192
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zowe/cli",
3
- "version": "7.0.0-next.202204011929",
3
+ "version": "7.0.0-next.202204111523",
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,18 +56,18 @@
56
56
  "typedocSpecifySrc": "typedoc --options ./typedoc.json"
57
57
  },
58
58
  "dependencies": {
59
- "@zowe/core-for-zowe-sdk": "7.0.0-next.202204011929",
60
- "@zowe/imperative": "5.0.0-next.202203311701",
59
+ "@zowe/core-for-zowe-sdk": "7.0.0-next.202204111523",
60
+ "@zowe/imperative": "5.0.0-next.202204111131",
61
61
  "@zowe/perf-timing": "1.0.7",
62
- "@zowe/provisioning-for-zowe-sdk": "7.0.0-next.202204011929",
63
- "@zowe/zos-console-for-zowe-sdk": "7.0.0-next.202204011929",
64
- "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202204011929",
65
- "@zowe/zos-jobs-for-zowe-sdk": "7.0.0-next.202204011929",
66
- "@zowe/zos-logs-for-zowe-sdk": "7.0.0-next.202204011929",
67
- "@zowe/zos-tso-for-zowe-sdk": "7.0.0-next.202204011929",
68
- "@zowe/zos-uss-for-zowe-sdk": "7.0.0-next.202204011929",
69
- "@zowe/zos-workflows-for-zowe-sdk": "7.0.0-next.202204011929",
70
- "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202204011929",
62
+ "@zowe/provisioning-for-zowe-sdk": "7.0.0-next.202204111523",
63
+ "@zowe/zos-console-for-zowe-sdk": "7.0.0-next.202204111523",
64
+ "@zowe/zos-files-for-zowe-sdk": "7.0.0-next.202204111523",
65
+ "@zowe/zos-jobs-for-zowe-sdk": "7.0.0-next.202204111523",
66
+ "@zowe/zos-logs-for-zowe-sdk": "7.0.0-next.202204111523",
67
+ "@zowe/zos-tso-for-zowe-sdk": "7.0.0-next.202204111523",
68
+ "@zowe/zos-uss-for-zowe-sdk": "7.0.0-next.202204111523",
69
+ "@zowe/zos-workflows-for-zowe-sdk": "7.0.0-next.202204111523",
70
+ "@zowe/zosmf-for-zowe-sdk": "7.0.0-next.202204111523",
71
71
  "find-process": "1.4.7",
72
72
  "get-stream": "6.0.1",
73
73
  "lodash": "4.17.21",
@@ -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.202204011929",
82
+ "@zowe/cli-test-utils": "7.0.0-next.202204111523",
83
83
  "comment-json": "^4.1.0",
84
84
  "eslint": "^7.32.0",
85
85
  "js-yaml": "^3.13.1",