@zowe/cli 7.10.1 → 7.10.3

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.
Files changed (14) hide show
  1. package/lib/zosfiles/compare/ds/Dataset.handler.js +18 -22
  2. package/lib/zosfiles/compare/ds/Dataset.handler.js.map +1 -1
  3. package/lib/zosfiles/compare/lf-ds/LocalfileDataset.handler.js +37 -36
  4. package/lib/zosfiles/compare/lf-ds/LocalfileDataset.handler.js.map +1 -1
  5. package/lib/zosfiles/compare/lf-sdd/LocalfileSpooldd.handler.js +43 -34
  6. package/lib/zosfiles/compare/lf-sdd/LocalfileSpooldd.handler.js.map +1 -1
  7. package/lib/zosfiles/compare/lf-uss/LocalfileUss.handler.js +37 -35
  8. package/lib/zosfiles/compare/lf-uss/LocalfileUss.handler.js.map +1 -1
  9. package/lib/zosfiles/compare/sdd/Spooldd.handler.js +21 -11
  10. package/lib/zosfiles/compare/sdd/Spooldd.handler.js.map +1 -1
  11. package/lib/zosfiles/compare/uss/UssFile.handler.js +18 -22
  12. package/lib/zosfiles/compare/uss/UssFile.handler.js.map +1 -1
  13. package/npm-shrinkwrap.json +92 -92
  14. package/package.json +13 -13
package/lib/zosfiles/compare/ds/Dataset.handler.js CHANGED
@@ -34,6 +34,7 @@ class DatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
34
34
  statusMessage: "Retrieving first dataset",
35
35
  stageName: imperative_1.TaskStage.IN_PROGRESS
36
36
  };
37
+ // RETRIEVING THE FIRST DATA-SET
37
38
  commandParameters.response.progress.startBar({ task });
38
39
  const dsContentBuf1 = yield zos_files_for_zowe_sdk_1.Get.dataSet(session, commandParameters.arguments.dataSetName1, {
39
40
  binary: commandParameters.arguments.binary,
@@ -44,11 +45,12 @@ class DatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
44
45
  task: task
45
46
  });
46
47
  commandParameters.response.progress.endBar();
48
+ // RETRIEVING THE DATA-SET TO COMPARE
49
+ task.statusMessage = "Retrieving second dataset";
47
50
  commandParameters.response.progress.startBar({ task });
48
51
  let binary2 = commandParameters.arguments.binary2;
49
52
  let encoding2 = commandParameters.arguments.encoding2;
50
53
  let record2 = commandParameters.arguments.record2;
51
- const browserView = commandParameters.arguments.browserView;
52
54
  const volumeSerial2 = commandParameters.arguments.volumeSerial2;
53
55
  if (binary2 == undefined) {
54
56
  binary2 = commandParameters.arguments.binary;
@@ -59,7 +61,6 @@ class DatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
59
61
  if (record2 == undefined) {
60
62
  record2 = commandParameters.arguments.record;
61
63
  }
62
- task.statusMessage = "Retrieving second dataset";
63
64
  const dsContentBuf2 = yield zos_files_for_zowe_sdk_1.Get.dataSet(session, commandParameters.arguments.dataSetName2, {
64
65
  binary: binary2,
65
66
  encoding: encoding2,
@@ -68,29 +69,25 @@ class DatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
68
69
  responseTimeout: commandParameters.arguments.responseTimeout,
69
70
  task: task
70
71
  });
72
+ commandParameters.response.progress.endBar();
73
+ //CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
71
74
  let dsContentString1 = "";
72
75
  let dsContentString2 = "";
73
- if (!commandParameters.arguments.seqnum) {
74
- const seqnumlen = 8;
75
- const dsStringArray1 = dsContentBuf1.toString().split("\n");
76
- for (const i in dsStringArray1) {
77
- const sl = dsStringArray1[i].length;
78
- const tempString = dsStringArray1[i].substring(0, sl - seqnumlen);
79
- dsContentString1 += tempString + "\n";
80
- }
81
- const dsStringArray2 = dsContentBuf2.toString().split("\n");
82
- for (const i in dsStringArray2) {
83
- const sl = dsStringArray2[i].length;
84
- const tempString = dsStringArray2[i].substring(0, sl - seqnumlen);
85
- dsContentString2 += tempString + "\n";
86
- }
76
+ const seqnumlen = 8;
77
+ if (commandParameters.arguments.seqnum === false) {
78
+ dsContentString1 = dsContentBuf1.toString().split("\n")
79
+ .map((line) => line.slice(0, -seqnumlen))
80
+ .join("\n");
81
+ dsContentString2 = dsContentBuf2.toString().split("\n")
82
+ .map((line) => line.slice(0, -seqnumlen))
83
+ .join("\n");
87
84
  }
88
85
  else {
89
86
  dsContentString1 = dsContentBuf1.toString();
90
87
  dsContentString2 = dsContentBuf2.toString();
91
88
  }
92
- // CHECHKING IIF THE BROWSER VIEW IS TRUE, OPEN UP THE DIFFS IN BROWSER
93
- if (browserView) {
89
+ // CHECK TO OPEN UP DIFF IN BROWSER WINDOW
90
+ if (commandParameters.arguments.browserView) {
94
91
  yield imperative_1.DiffUtils.openDiffInbrowser(dsContentString1, dsContentString2);
95
92
  return {
96
93
  success: true,
@@ -98,11 +95,10 @@ class DatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
98
95
  apiResponse: {}
99
96
  };
100
97
  }
101
- let jsonDiff = "";
102
- const contextLinesArg = commandParameters.arguments.contextlines;
103
- jsonDiff = yield imperative_1.DiffUtils.getDiffString(dsContentString1, dsContentString2, {
98
+ // RETURNING DIFF
99
+ const jsonDiff = yield imperative_1.DiffUtils.getDiffString(dsContentString1, dsContentString2, {
104
100
  outputFormat: 'terminal',
105
- contextLinesArg: contextLinesArg
101
+ contextLinesArg: commandParameters.arguments.contextLines
106
102
  });
107
103
  return {
108
104
  success: true,
package/lib/zosfiles/compare/ds/Dataset.handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Dataset.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/ds/Dataset.handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Dataset.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/ds/Dataset.handler.ts"],"names":[],"mappings":"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"}
package/lib/zosfiles/compare/lf-ds/LocalfileDataset.handler.js CHANGED
@@ -36,36 +36,44 @@ class LocalfileDatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler
36
36
  statusMessage: "Retrieving local file",
37
37
  stageName: imperative_1.TaskStage.IN_PROGRESS
38
38
  };
39
+ // CHECKING IF LOCAL FILE EXISTS, THEN RETRIEVING IT
39
40
  commandParameters.response.progress.startBar({ task });
40
41
  let localFile;
41
- // resolving to full path if local path passed is not absolute
42
42
  if (path.isAbsolute(commandParameters.arguments.localFilePath)) {
43
+ // resolving to full path if local path passed is not absolute
43
44
  localFile = commandParameters.arguments.localFilePath;
44
45
  }
45
46
  else {
46
47
  localFile = path.resolve(commandParameters.arguments.localFilePath);
47
48
  }
48
- // check if the path given is of a file or not
49
+ const localFileHandle = fs.openSync(localFile, 'r');
50
+ let lfContentBuf;
49
51
  try {
50
- if (!fs.lstatSync(localFile).isFile()) {
52
+ // check if the path given is of a file or not
53
+ try {
54
+ if (!fs.fstatSync(localFileHandle).isFile()) {
55
+ throw new imperative_1.ImperativeError({
56
+ msg: 'Path given is not of a file, do recheck your path again'
57
+ });
58
+ }
59
+ }
60
+ catch (error) {
61
+ if (error instanceof imperative_1.ImperativeError)
62
+ throw error;
51
63
  throw new imperative_1.ImperativeError({
52
- msg: 'Path given is not of a file, do recheck your path again'
64
+ msg: 'Path not found. Please check the path and try again'
53
65
  });
54
66
  }
67
+ // reading local file as buffer
68
+ lfContentBuf = fs.readFileSync(localFileHandle);
55
69
  }
56
- catch (error) {
57
- if (error instanceof imperative_1.ImperativeError)
58
- throw error;
59
- throw new imperative_1.ImperativeError({
60
- msg: 'Path not found. Please check the path and try again'
61
- });
70
+ finally {
71
+ fs.closeSync(localFileHandle);
62
72
  }
63
- // reading local file as buffer
64
- const lfContentBuf = fs.readFileSync(localFile);
65
73
  commandParameters.response.progress.endBar();
66
- // retrieving the data-set to compare
67
- commandParameters.response.progress.startBar({ task });
74
+ // RETRIEVING THE DATA-SET TO COMPARE
68
75
  task.statusMessage = "Retrieving dataset";
76
+ commandParameters.response.progress.startBar({ task });
69
77
  const dsContentBuf = yield zos_files_for_zowe_sdk_1.Get.dataSet(session, commandParameters.arguments.dataSetName, {
70
78
  binary: commandParameters.arguments.binary,
71
79
  encoding: commandParameters.arguments.encoding,
@@ -74,30 +82,25 @@ class LocalfileDatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler
74
82
  responseTimeout: commandParameters.arguments.responseTimeout,
75
83
  task: task
76
84
  });
77
- const browserView = commandParameters.arguments.browserView;
85
+ commandParameters.response.progress.endBar();
86
+ //CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
78
87
  let lfContentString = "";
79
88
  let dsContentString = "";
80
- if (!commandParameters.arguments.seqnum) {
81
- const seqnumlen = 8;
82
- const lfStringArray = lfContentBuf.toString().split("\n");
83
- for (const i in lfStringArray) {
84
- const sl = lfStringArray[i].length;
85
- const tempString = lfStringArray[i].substring(0, sl - seqnumlen);
86
- lfContentString += tempString + "\n";
87
- }
88
- const dsStringArray = dsContentBuf.toString().split("\n");
89
- for (const i in dsStringArray) {
90
- const sl = dsStringArray[i].length;
91
- const tempString = dsStringArray[i].substring(0, sl - seqnumlen);
92
- dsContentString += tempString + "\n";
93
- }
89
+ const seqnumlen = 8;
90
+ if (commandParameters.arguments.seqnum === false) {
91
+ lfContentString = lfContentBuf.toString().split("\n")
92
+ .map((line) => line.slice(0, -seqnumlen))
93
+ .join("\n");
94
+ dsContentString = dsContentBuf.toString().split("\n")
95
+ .map((line) => line.slice(0, -seqnumlen))
96
+ .join("\n");
94
97
  }
95
98
  else {
96
99
  lfContentString = lfContentBuf.toString();
97
100
  dsContentString = dsContentBuf.toString();
98
101
  }
99
- // CHECHKING IIF THE BROWSER VIEW IS TRUE, OPEN UP THE DIFFS IN BROWSER
100
- if (browserView) {
102
+ // CHECK TO OPEN UP DIFF IN BROWSER WINDOW
103
+ if (commandParameters.arguments.browserView) {
101
104
  yield imperative_1.DiffUtils.openDiffInbrowser(lfContentString, dsContentString);
102
105
  return {
103
106
  success: true,
@@ -105,12 +108,10 @@ class LocalfileDatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler
105
108
  apiResponse: {}
106
109
  };
107
110
  }
108
- let jsonDiff = "";
109
- const contextLinesArg = commandParameters.arguments.contextlines;
110
- //remove all line break encodings from strings
111
- jsonDiff = yield imperative_1.DiffUtils.getDiffString(imperative_1.IO.processNewlines(lfContentString), imperative_1.IO.processNewlines(dsContentString), {
111
+ // RETURNING DIFF
112
+ const jsonDiff = yield imperative_1.DiffUtils.getDiffString(imperative_1.IO.processNewlines(lfContentString), imperative_1.IO.processNewlines(dsContentString), {
112
113
  outputFormat: 'terminal',
113
- contextLinesArg: contextLinesArg
114
+ contextLinesArg: commandParameters.arguments.contextLines
114
115
  });
115
116
  return {
116
117
  success: true,
package/lib/zosfiles/compare/lf-ds/LocalfileDataset.handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"LocalfileDataset.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/lf-ds/LocalfileDataset.handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LocalfileDataset.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/lf-ds/LocalfileDataset.handler.ts"],"names":[],"mappings":"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"}
package/lib/zosfiles/compare/lf-sdd/LocalfileSpooldd.handler.js CHANGED
@@ -31,62 +31,72 @@ const ZosFilesBase_handler_1 = require("../../ZosFilesBase.handler");
31
31
  class LocalfileSpoolddHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
32
32
  processWithSession(commandParameters, session) {
33
33
  return __awaiter(this, void 0, void 0, function* () {
34
+ const descriptionSeperator = ":";
34
35
  const task = {
35
36
  percentComplete: 0,
36
37
  statusMessage: "Retrieving local file",
37
38
  stageName: imperative_1.TaskStage.IN_PROGRESS
38
39
  };
39
- const descriptionSeperator = ":";
40
+ // CHECKING IF LOCAL FILE EXISTS, THEN RETRIEVING IT
40
41
  commandParameters.response.progress.startBar({ task });
41
- // retrieving local file
42
42
  let localFile;
43
- // resolving to full path if local path passed is not absolute
44
43
  if (path.isAbsolute(commandParameters.arguments.localFilePath)) {
44
+ // resolving to full path if local path passed is not absolute
45
45
  localFile = commandParameters.arguments.localFilePath;
46
46
  }
47
47
  else {
48
48
  localFile = path.resolve(commandParameters.arguments.localFilePath);
49
49
  }
50
- // check if the path given is of a file or not
50
+ const localFileHandle = fs.openSync(localFile, 'r');
51
+ let lfContentBuf;
51
52
  try {
52
- if (!fs.lstatSync(localFile).isFile()) {
53
+ // check if the path given is of a file or not
54
+ try {
55
+ if (!fs.fstatSync(localFileHandle).isFile()) {
56
+ throw new imperative_1.ImperativeError({
57
+ msg: 'Path given is not of a file, do recheck your path again'
58
+ });
59
+ }
60
+ }
61
+ catch (error) {
62
+ if (error instanceof imperative_1.ImperativeError)
63
+ throw error;
53
64
  throw new imperative_1.ImperativeError({
54
- msg: 'Path given is not of a file, do recheck your path again'
65
+ msg: 'Path not found. Please check the path and try again'
55
66
  });
56
67
  }
68
+ // reading local file as buffer
69
+ lfContentBuf = fs.readFileSync(localFileHandle);
57
70
  }
58
- catch (error) {
59
- if (error instanceof imperative_1.ImperativeError)
60
- throw error;
61
- throw new imperative_1.ImperativeError({
62
- msg: 'Path not found. Please check the path and try again'
63
- });
64
- }
65
- const lfContentBuf = fs.readFileSync(localFile);
66
- let lfContentString = "";
67
- if (!commandParameters.arguments.seqnum) {
68
- const seqnumlen = 8;
69
- const lfStringArray = lfContentBuf.toString().split("\n");
70
- for (const i in lfStringArray) {
71
- const sl = lfStringArray[i].length;
72
- const tempString = lfStringArray[i].substring(0, sl - seqnumlen);
73
- lfContentString += tempString + "\n";
74
- }
75
- }
76
- else {
77
- lfContentString = lfContentBuf.toString();
71
+ finally {
72
+ fs.closeSync(localFileHandle);
78
73
  }
79
74
  commandParameters.response.progress.endBar();
80
- commandParameters.response.progress.startBar({ task });
75
+ // RETRIEVING SPOOLDD
81
76
  task.statusMessage = "Retrieving spooldd";
82
- // retrieving information for spooldd
77
+ commandParameters.response.progress.startBar({ task });
83
78
  const spoolDescription = commandParameters.arguments.spoolDescription;
84
79
  const spoolDescArr = spoolDescription.split(descriptionSeperator);
85
80
  const jobName = spoolDescArr[0];
86
81
  const jobId = spoolDescArr[1];
87
82
  const spoolId = Number(spoolDescArr[2]);
88
- const spoolContentString = yield zos_jobs_for_zowe_sdk_1.GetJobs.getSpoolContentById(session, jobName, jobId, spoolId);
89
- // CHECHKING IIF THE BROWSER VIEW IS TRUE, OPEN UP THE DIFFS IN BROWSER
83
+ let spoolContentString = yield zos_jobs_for_zowe_sdk_1.GetJobs.getSpoolContentById(session, jobName, jobId, spoolId);
84
+ commandParameters.response.progress.endBar();
85
+ //CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
86
+ let lfContentString = "";
87
+ const seqnumlen = 8;
88
+ if (commandParameters.arguments.seqnum === false) {
89
+ lfContentString = lfContentBuf.toString().split("\n")
90
+ .map((line) => line.slice(0, -seqnumlen))
91
+ .join("\n");
92
+ spoolContentString = spoolContentString.split("\n")
93
+ .map((line) => line.slice(0, -seqnumlen))
94
+ .join("\n");
95
+ }
96
+ else {
97
+ lfContentString = lfContentBuf.toString();
98
+ }
99
+ // CHECK TO OPEN UP DIFF IN BROWSER WINDOW
90
100
  if (commandParameters.arguments.browserView) {
91
101
  yield imperative_1.DiffUtils.openDiffInbrowser(lfContentString, spoolContentString);
92
102
  return {
@@ -95,11 +105,10 @@ class LocalfileSpoolddHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler
95
105
  apiResponse: {}
96
106
  };
97
107
  }
98
- let jsonDiff = "";
99
- const contextLinesArg = commandParameters.arguments.contextlines;
100
- jsonDiff = yield imperative_1.DiffUtils.getDiffString(lfContentString, spoolContentString, {
108
+ // RETURNING DIFF
109
+ const jsonDiff = yield imperative_1.DiffUtils.getDiffString(lfContentString, spoolContentString, {
101
110
  outputFormat: 'terminal',
102
- contextLinesArg: contextLinesArg
111
+ contextLinesArg: commandParameters.arguments.contextLines
103
112
  });
104
113
  return {
105
114
  success: true,
package/lib/zosfiles/compare/lf-sdd/LocalfileSpooldd.handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"LocalfileSpooldd.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/lf-sdd/LocalfileSpooldd.handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LocalfileSpooldd.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/lf-sdd/LocalfileSpooldd.handler.ts"],"names":[],"mappings":"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"}
package/lib/zosfiles/compare/lf-uss/LocalfileUss.handler.js CHANGED
@@ -36,66 +36,69 @@ class LocalfileUssHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
36
36
  statusMessage: "Retrieving local file",
37
37
  stageName: imperative_1.TaskStage.IN_PROGRESS
38
38
  };
39
+ // CHECKING IF LOCAL FILE EXISTS, THEN RETRIEVING IT
39
40
  commandParameters.response.progress.startBar({ task });
40
41
  let localFile;
41
- // resolving to full path if local path passed is not absolute
42
42
  if (path.isAbsolute(commandParameters.arguments.localFilePath)) {
43
+ // resolving to full path if local path passed is not absolute
43
44
  localFile = commandParameters.arguments.localFilePath;
44
45
  }
45
46
  else {
46
47
  localFile = path.resolve(commandParameters.arguments.localFilePath);
47
48
  }
48
- // check if the path given is of a file or not
49
+ const localFileHandle = fs.openSync(localFile, 'r');
50
+ let lfContentBuf;
49
51
  try {
50
- if (!fs.lstatSync(localFile).isFile()) {
52
+ // check if the path given is of a file or not
53
+ try {
54
+ if (!fs.fstatSync(localFileHandle).isFile()) {
55
+ throw new imperative_1.ImperativeError({
56
+ msg: 'Path given is not of a file, do recheck your path again'
57
+ });
58
+ }
59
+ }
60
+ catch (error) {
61
+ if (error instanceof imperative_1.ImperativeError)
62
+ throw error;
51
63
  throw new imperative_1.ImperativeError({
52
- msg: 'Path given is not of a file, do recheck your path again'
64
+ msg: 'Path not found. Please check the path and try again'
53
65
  });
54
66
  }
67
+ // reading local file as buffer
68
+ lfContentBuf = fs.readFileSync(localFileHandle);
55
69
  }
56
- catch (error) {
57
- if (error instanceof imperative_1.ImperativeError)
58
- throw error;
59
- throw new imperative_1.ImperativeError({
60
- msg: 'Path not found. Please check the path and try again'
61
- });
70
+ finally {
71
+ fs.closeSync(localFileHandle);
62
72
  }
63
- // reading local file as buffer
64
- const lfContentBuf = fs.readFileSync(localFile);
65
73
  commandParameters.response.progress.endBar();
66
- // retrieving the data-set to compare
67
- commandParameters.response.progress.startBar({ task });
74
+ // RETRIEVING USS FILE TO COMPARE
68
75
  task.statusMessage = "Retrieving uss file";
76
+ commandParameters.response.progress.startBar({ task });
69
77
  const ussContentBuf = yield zos_files_for_zowe_sdk_1.Get.USSFile(session, commandParameters.arguments.ussFilePath, {
70
78
  binary: commandParameters.arguments.binary,
71
79
  encoding: commandParameters.arguments.encoding,
72
80
  responseTimeout: commandParameters.arguments.responseTimeout,
73
81
  task: task
74
82
  });
75
- const browserView = commandParameters.arguments.browserView;
83
+ commandParameters.response.progress.endBar();
84
+ //CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
76
85
  let lfContentString = "";
77
86
  let ussContentString = "";
78
- if (!commandParameters.arguments.seqnum) {
79
- const seqnumlen = 8;
80
- const lfStringArray = lfContentBuf.toString().split("\n");
81
- for (const i in lfStringArray) {
82
- const sl = lfStringArray[i].length;
83
- const tempString = lfStringArray[i].substring(0, sl - seqnumlen);
84
- lfContentString += tempString + "\n";
85
- }
86
- const ussStringArray = ussContentBuf.toString().split("\n");
87
- for (const i in ussStringArray) {
88
- const sl = ussStringArray[i].length;
89
- const tempString = ussStringArray[i].substring(0, sl - seqnumlen);
90
- ussContentString += tempString + "\n";
91
- }
87
+ const seqnumlen = 8;
88
+ if (commandParameters.arguments.seqnum === false) {
89
+ lfContentString = lfContentBuf.toString().split("\n")
90
+ .map((line) => line.slice(0, -seqnumlen))
91
+ .join("\n");
92
+ ussContentString = ussContentBuf.toString().split("\n")
93
+ .map((line) => line.slice(0, -seqnumlen))
94
+ .join("\n");
92
95
  }
93
96
  else {
94
97
  lfContentString = lfContentBuf.toString();
95
98
  ussContentString = ussContentBuf.toString();
96
99
  }
97
- // CHECHKING IIF THE BROWSER VIEW IS TRUE, OPEN UP THE DIFFS IN BROWSER
98
- if (browserView) {
100
+ // CHECK TO OPEN UP DIFF IN BROWSER WINDOW
101
+ if (commandParameters.arguments.browserView) {
99
102
  yield imperative_1.DiffUtils.openDiffInbrowser(lfContentString, ussContentString);
100
103
  return {
101
104
  success: true,
@@ -103,11 +106,10 @@ class LocalfileUssHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
103
106
  apiResponse: {}
104
107
  };
105
108
  }
106
- let jsonDiff = "";
107
- const contextLinesArg = commandParameters.arguments.contextlines;
108
- jsonDiff = yield imperative_1.DiffUtils.getDiffString(lfContentString, ussContentString, {
109
+ // RETURNING DIFF
110
+ const jsonDiff = yield imperative_1.DiffUtils.getDiffString(lfContentString, ussContentString, {
109
111
  outputFormat: 'terminal',
110
- contextLinesArg: contextLinesArg
112
+ contextLinesArg: commandParameters.arguments.contextLines
111
113
  });
112
114
  return {
113
115
  success: true,
package/lib/zosfiles/compare/lf-uss/LocalfileUss.handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"LocalfileUss.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/lf-uss/LocalfileUss.handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LocalfileUss.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/lf-uss/LocalfileUss.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,yBAAyB;AACzB,6BAA6B;AAE7B,iDAA+H;AAC/H,yEAAsE;AACtE,qEAAiE;AAEjE;;;GAGG;AACH,MAAqB,mBAAoB,SAAQ,0CAAmB;IACnD,kBAAkB,CAAC,iBAAqC,EAAE,OAAwB;;YAC3F,MAAM,IAAI,GAAoB;gBAC1B,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,uBAAuB;gBACtC,SAAS,EAAE,sBAAS,CAAC,WAAW;aACnC,CAAC;YAGF,oDAAoD;YACpD,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YACvD,IAAI,SAAiB,CAAC;YACtB,IAAI,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE;gBAC5D,8DAA8D;gBAC9D,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC,aAAa,CAAC;aACzD;iBAAM;gBACH,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;aACvE;YACD,MAAM,eAAe,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YACpD,IAAI,YAAoB,CAAC;YACzB,IAAI;gBACA,8CAA8C;gBAC9C,IAAI;oBACA,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,MAAM,EAAE,EAAE;wBACzC,MAAM,IAAI,4BAAe,CAAC;4BACtB,GAAG,EAAE,yDAAyD;yBACjE,CAAC,CAAC;qBACN;iBACJ;gBAAC,OAAO,KAAK,EAAE;oBACZ,IAAI,KAAK,YAAY,4BAAe;wBAAE,MAAM,KAAK,CAAC;oBAClD,MAAM,IAAI,4BAAe,CAAC;wBACtB,GAAG,EAAE,qDAAqD;qBAC7D,CAAC,CAAC;iBACN;gBACD,+BAA+B;gBAC/B,YAAY,GAAG,EAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;aACnD;oBAAS;gBACN,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;aACjC;YACD,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAG7C,iCAAiC;YACjC,IAAI,CAAC,aAAa,GAAG,qBAAqB,CAAC;YAC3C,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YACvD,MAAM,aAAa,GAAG,MAAM,4BAAG,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,WAAW,EACpF;gBACI,MAAM,EAAE,iBAAiB,CAAC,SAAS,CAAC,MAAM;gBAC1C,QAAQ,EAAE,iBAAiB,CAAC,SAAS,CAAC,QAAQ;gBAC9C,eAAe,EAAE,iBAAiB,CAAC,SAAS,CAAC,eAAe;gBAC5D,IAAI,EAAE,IAAI;aACb,CACJ,CAAC;YACF,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAG7C,gEAAgE;YAChE,IAAI,eAAe,GAAG,EAAE,CAAC;YACzB,IAAI,gBAAgB,GAAG,EAAE,CAAC;YAC1B,MAAM,SAAS,GAAG,CAAC,CAAC;YACpB,IAAG,iBAAiB,CAAC,SAAS,CAAC,MAAM,KAAK,KAAK,EAAC;gBAC5C,eAAe,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;qBAChD,GAAG,CAAC,CAAC,IAAI,EAAC,EAAE,CAAA,IAAI,CAAC,KAAK,CAAC,CAAC,EAAC,CAAC,SAAS,CAAC,CAAC;qBACrC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChB,gBAAgB,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;qBAClD,GAAG,CAAC,CAAC,IAAI,EAAC,EAAE,CAAA,IAAI,CAAC,KAAK,CAAC,CAAC,EAAC,CAAC,SAAS,CAAC,CAAC;qBACrC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;iBACI;gBACD,eAAe,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAC1C,gBAAgB,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;aAC/C;YAGD,0CAA0C;YAC1C,IAAI,iBAAiB,CAAC,SAAS,CAAC,WAAW,EAAE;gBACzC,MAAM,sBAAS,CAAC,iBAAiB,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;gBACrE,OAAO;oBACH,OAAO,EAAE,IAAI;oBACb,eAAe,EAAE,wDAAwD;oBACzE,WAAW,EAAE,EAAE;iBAClB,CAAC;aACL;YAGD,iBAAiB;YACjB,MAAM,QAAQ,GAAG,MAAM,sBAAS,CAAC,aAAa,CAAC,eAAe,EAAE,gBAAgB,EAAE;gBAC9E,YAAY,EAAE,UAAU;gBACxB,eAAe,EAAE,iBAAiB,CAAC,SAAS,CAAC,YAAY;aAC5D,CAAC,CAAC;YACH,OAAO;gBACH,OAAO,EAAE,IAAI;gBACb,eAAe,EAAE,QAAQ;gBACzB,WAAW,EAAE,EAAE;aAClB,CAAC;QACN,CAAC;KAAA;CACJ;AAhGD,sCAgGC"}
package/lib/zosfiles/compare/sdd/Spooldd.handler.js CHANGED
@@ -29,31 +29,42 @@ const ZosFilesBase_handler_1 = require("../../ZosFilesBase.handler");
29
29
  class SpoolddHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
30
30
  processWithSession(commandParameters, session) {
31
31
  return __awaiter(this, void 0, void 0, function* () {
32
+ const descriptionSeperator = ":";
32
33
  const task = {
33
34
  percentComplete: 0,
34
35
  statusMessage: "Retrieving first spool dd",
35
36
  stageName: imperative_1.TaskStage.IN_PROGRESS
36
37
  };
37
- const descriptionSeperator = ":";
38
+ // RETRIEVING INFO FOR FIRST SPOOLDD
38
39
  commandParameters.response.progress.startBar({ task });
39
40
  const spoolDescription1 = commandParameters.arguments.spoolDescription1;
40
- // retrieving information for first spooldd
41
41
  const spoolDescArr1 = spoolDescription1.split(descriptionSeperator);
42
42
  const jobName1 = spoolDescArr1[0];
43
43
  const jobId1 = spoolDescArr1[1];
44
44
  const spoolId1 = Number(spoolDescArr1[2]);
45
- const spoolContentString1 = yield zos_jobs_for_zowe_sdk_1.GetJobs.getSpoolContentById(session, jobName1, jobId1, spoolId1);
45
+ let spoolContentString1 = yield zos_jobs_for_zowe_sdk_1.GetJobs.getSpoolContentById(session, jobName1, jobId1, spoolId1);
46
46
  commandParameters.response.progress.endBar();
47
- commandParameters.response.progress.startBar({ task });
47
+ // RETRIEVING INFO FOR SECOND SPOOLDD
48
48
  task.statusMessage = "Retrieving second spooldd";
49
- // retrieving information for second spooldd
49
+ commandParameters.response.progress.startBar({ task });
50
50
  const spoolDescription2 = commandParameters.arguments.spoolDescription2;
51
51
  const spoolDescArr2 = spoolDescription2.split(descriptionSeperator);
52
52
  const jobName2 = spoolDescArr2[0];
53
53
  const jobId2 = spoolDescArr2[1];
54
54
  const spoolId2 = Number(spoolDescArr2[2]);
55
- const spoolContentString2 = yield zos_jobs_for_zowe_sdk_1.GetJobs.getSpoolContentById(session, jobName2, jobId2, spoolId2);
56
- // CHECHKING IIF THE BROWSER VIEW IS TRUE, OPEN UP THE DIFFS IN BROWSER
55
+ let spoolContentString2 = yield zos_jobs_for_zowe_sdk_1.GetJobs.getSpoolContentById(session, jobName2, jobId2, spoolId2);
56
+ commandParameters.response.progress.endBar();
57
+ //CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
58
+ const seqnumlen = 8;
59
+ if (commandParameters.arguments.seqnum === false) {
60
+ spoolContentString1 = spoolContentString1.split("\n")
61
+ .map((line) => line.slice(0, -seqnumlen))
62
+ .join("\n");
63
+ spoolContentString2 = spoolContentString2.split("\n")
64
+ .map((line) => line.slice(0, -seqnumlen))
65
+ .join("\n");
66
+ }
67
+ // CHECK TO OPEN UP DIFF IN BROWSER WINDOW
57
68
  if (commandParameters.arguments.browserView) {
58
69
  yield imperative_1.DiffUtils.openDiffInbrowser(spoolContentString1, spoolContentString2);
59
70
  return {
@@ -62,11 +73,10 @@ class SpoolddHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
62
73
  apiResponse: {}
63
74
  };
64
75
  }
65
- let jsonDiff = "";
66
- const contextLinesArg = commandParameters.arguments.contextlines;
67
- jsonDiff = yield imperative_1.DiffUtils.getDiffString(spoolContentString1, spoolContentString2, {
76
+ // RETURNING DIFF
77
+ const jsonDiff = yield imperative_1.DiffUtils.getDiffString(spoolContentString1, spoolContentString2, {
68
78
  outputFormat: 'terminal',
69
- contextLinesArg: contextLinesArg
79
+ contextLinesArg: commandParameters.arguments.contextLines
70
80
  });
71
81
  return {
72
82
  success: true,
package/lib/zosfiles/compare/sdd/Spooldd.handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Spooldd.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/sdd/Spooldd.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,iDAA8G;AAE9G,uEAAsD;AACtD,qEAAiE;AACjE;;;GAGG;AACH,MAAqB,cAAe,SAAQ,0CAAmB;IAC9C,kBAAkB,CAAC,iBAAqC,EAAE,OAAwB;;YAC3F,MAAM,IAAI,GAAoB;gBAC1B,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,2BAA2B;gBAC1C,SAAS,EAAE,sBAAS,CAAC,WAAW;aACnC,CAAC;YACF,MAAM,oBAAoB,GAAW,GAAG,CAAC;YACzC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YACvD,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,SAAS,CAAC,iBAAiB,CAAC;YAExE,2CAA2C;YAC3C,MAAM,aAAa,GAAG,iBAAiB,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACpE,MAAM,QAAQ,GAAW,aAAa,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAW,aAAa,CAAC,CAAC,CAAC,CAAC;YACxC,MAAM,QAAQ,GAAW,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,MAAM,mBAAmB,GAAG,MAAM,+BAAO,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YAEnG,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC7C,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAEvD,IAAI,CAAC,aAAa,GAAG,2BAA2B,CAAC;YACjD,4CAA4C;YAC5C,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,SAAS,CAAC,iBAAiB,CAAC;YACxE,MAAM,aAAa,GAAG,iBAAiB,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACpE,MAAM,QAAQ,GAAW,aAAa,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAW,aAAa,CAAC,CAAC,CAAC,CAAC;YACxC,MAAM,QAAQ,GAAW,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAElD,MAAM,mBAAmB,GAAG,MAAM,+BAAO,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YAGnG,wEAAwE;YACxE,IAAI,iBAAiB,CAAC,SAAS,CAAC,WAAW,EAAE;gBAEzC,MAAM,sBAAS,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;gBAE5E,OAAO;oBACH,OAAO,EAAE,IAAI;oBACb,eAAe,EAAE,0CAA0C;oBAC3D,WAAW,EAAE,EAAE;iBAClB,CAAC;aACL;YAED,IAAI,QAAQ,GAAG,EAAE,CAAC;YAClB,MAAM,eAAe,GAAG,iBAAiB,CAAC,SAAS,CAAC,YAAY,CAAC;YAEjE,QAAQ,GAAG,MAAM,sBAAS,CAAC,aAAa,CAAC,mBAAmB,EAAE,mBAAmB,EAAE;gBAC/E,YAAY,EAAE,UAAU;gBACxB,eAAe,EAAE,eAAe;aACnC,CAAC,CAAC;YAGH,OAAO;gBACH,OAAO,EAAE,IAAI;gBACb,eAAe,EAAE,QAAQ;gBACzB,WAAW,EAAE,EAAE;aAClB,CAAC;QACN,CAAC;KAAA;CACJ;AA3DD,iCA2DC"}
1
+ {"version":3,"file":"Spooldd.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/sdd/Spooldd.handler.ts"],"names":[],"mappings":"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"}
package/lib/zosfiles/compare/uss/UssFile.handler.js CHANGED
@@ -34,6 +34,7 @@ class UssFileHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
34
34
  statusMessage: "Retrieving first uss file",
35
35
  stageName: imperative_1.TaskStage.IN_PROGRESS
36
36
  };
37
+ // RETRIEVING USS FILE
37
38
  commandParameters.response.progress.startBar({ task });
38
39
  const ussFileContentBuf1 = yield zos_files_for_zowe_sdk_1.Get.USSFile(session, commandParameters.arguments.ussFilePath1, {
39
40
  binary: commandParameters.arguments.binary,
@@ -42,46 +43,42 @@ class UssFileHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
42
43
  task: task
43
44
  });
44
45
  commandParameters.response.progress.endBar();
46
+ // RETRIEVING THE SECOND USS FILE TO COMPARE
47
+ task.statusMessage = "Retrieving second uss-file";
45
48
  commandParameters.response.progress.startBar({ task });
46
49
  let binary2 = commandParameters.arguments.binary2;
47
50
  let encoding2 = commandParameters.arguments.encoding2;
48
- const browserView = commandParameters.arguments.browserView;
49
51
  if (binary2 == undefined) {
50
52
  binary2 = commandParameters.arguments.binary;
51
53
  }
52
54
  if (encoding2 == undefined) {
53
55
  encoding2 = commandParameters.arguments.encoding;
54
56
  }
55
- task.statusMessage = "Retrieving second uss-file";
56
57
  const ussFileContentBuf2 = yield zos_files_for_zowe_sdk_1.Get.USSFile(session, commandParameters.arguments.ussFilePath2, {
57
58
  binary: binary2,
58
59
  encoding: encoding2,
59
60
  responseTimeout: commandParameters.arguments.responseTimeout,
60
61
  task: task
61
62
  });
63
+ commandParameters.response.progress.endBar();
64
+ //CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
62
65
  let ussContentString1 = "";
63
66
  let ussContentString2 = "";
64
- if (!commandParameters.arguments.seqnum) {
65
- const seqnumlen = 8;
66
- const ussFileStringArray1 = ussFileContentBuf1.toString().split("\n");
67
- for (const i in ussFileStringArray1) {
68
- const sl = ussFileStringArray1[i].length;
69
- const tempString = ussFileStringArray1[i].substring(0, sl - seqnumlen);
70
- ussContentString1 += tempString + "\n";
71
- }
72
- const ussFileStringArray2 = ussFileContentBuf2.toString().split("\n");
73
- for (const i in ussFileStringArray2) {
74
- const sl = ussFileStringArray2[i].length;
75
- const tempString = ussFileStringArray2[i].substring(0, sl - seqnumlen);
76
- ussContentString2 += tempString + "\n";
77
- }
67
+ const seqnumlen = 8;
68
+ if (commandParameters.arguments.seqnum === false) {
69
+ ussContentString1 = ussFileContentBuf1.toString().split("\n")
70
+ .map((line) => line.slice(0, -seqnumlen))
71
+ .join("\n");
72
+ ussContentString2 = ussFileContentBuf2.toString().split("\n")
73
+ .map((line) => line.slice(0, -seqnumlen))
74
+ .join("\n");
78
75
  }
79
76
  else {
80
77
  ussContentString1 = ussFileContentBuf1.toString();
81
78
  ussContentString2 = ussFileContentBuf2.toString();
82
79
  }
83
- // CHECHKING IsetsF THE BROWSER VIEW IS TRUE, OPEN UP THE DIFFS IN BROWSER
84
- if (browserView) {
80
+ // CHECKING IF THE BROWSER VIEW IS TRUE, OPEN UP THE DIFFS IN BROWSER
81
+ if (commandParameters.arguments.browserView) {
85
82
  yield imperative_1.DiffUtils.openDiffInbrowser(ussContentString1, ussContentString2);
86
83
  return {
87
84
  success: true,
@@ -89,11 +86,10 @@ class UssFileHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
89
86
  apiResponse: {}
90
87
  };
91
88
  }
92
- let jsonDiff = "";
93
- const contextLinesArg = commandParameters.arguments.contextlines;
94
- jsonDiff = yield imperative_1.DiffUtils.getDiffString(ussContentString1, ussContentString2, {
89
+ // RETURNING DIFF
90
+ const jsonDiff = yield imperative_1.DiffUtils.getDiffString(ussContentString1, ussContentString2, {
95
91
  outputFormat: 'terminal',
96
- contextLinesArg: contextLinesArg
92
+ contextLinesArg: commandParameters.arguments.contextLines
97
93
  });
98
94
  return {
99
95
  success: true,
package/lib/zosfiles/compare/uss/UssFile.handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"UssFile.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/uss/UssFile.handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"UssFile.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/uss/UssFile.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,iDAA8G;AAC9G,yEAAsE;AACtE,qEAAiE;AACjE;;;GAGG;AACH,MAAqB,cAAe,SAAQ,0CAAmB;IAC9C,kBAAkB,CAAC,iBAAqC,EAAE,OAAwB;;YAC3F,MAAM,IAAI,GAAoB;gBAC1B,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,2BAA2B;gBAC1C,SAAS,EAAE,sBAAS,CAAC,WAAW;aACnC,CAAC;YAGF,sBAAsB;YACtB,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YACvD,MAAM,kBAAkB,GAAG,MAAM,4BAAG,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,YAAY,EAC1F;gBACI,MAAM,EAAE,iBAAiB,CAAC,SAAS,CAAC,MAAM;gBAC1C,QAAQ,EAAE,iBAAiB,CAAC,SAAS,CAAC,QAAQ;gBAC9C,eAAe,EAAE,iBAAiB,CAAC,SAAS,CAAC,eAAe;gBAC5D,IAAI,EAAE,IAAI;aACb,CACJ,CAAC;YACF,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAG7C,4CAA4C;YAC5C,IAAI,CAAC,aAAa,GAAG,4BAA4B,CAAC;YAClD,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YACvD,IAAI,OAAO,GAAG,iBAAiB,CAAC,SAAS,CAAC,OAAO,CAAC;YAClD,IAAI,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC,SAAS,CAAC;YACtD,IAAI,OAAO,IAAI,SAAS,EAAE;gBACtB,OAAO,GAAG,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC;aAChD;YACD,IAAI,SAAS,IAAI,SAAS,EAAE;gBACxB,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC,QAAQ,CAAC;aACpD;YACD,MAAM,kBAAkB,GAAG,MAAM,4BAAG,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,YAAY,EAC1F;gBACI,MAAM,EAAE,OAAO;gBACf,QAAQ,EAAE,SAAS;gBACnB,eAAe,EAAE,iBAAiB,CAAC,SAAS,CAAC,eAAe;gBAC5D,IAAI,EAAE,IAAI;aACb,CACJ,CAAC;YACF,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAG7C,gEAAgE;YAChE,IAAI,iBAAiB,GAAG,EAAE,CAAC;YAC3B,IAAI,iBAAiB,GAAG,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,CAAC,CAAC;YACpB,IAAG,iBAAiB,CAAC,SAAS,CAAC,MAAM,KAAK,KAAK,EAAC;gBAC5C,iBAAiB,GAAG,kBAAkB,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;qBACxD,GAAG,CAAC,CAAC,IAAI,EAAC,EAAE,CAAA,IAAI,CAAC,KAAK,CAAC,CAAC,EAAC,CAAC,SAAS,CAAC,CAAC;qBACrC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChB,iBAAiB,GAAG,kBAAkB,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;qBACxD,GAAG,CAAC,CAAC,IAAI,EAAC,EAAE,CAAA,IAAI,CAAC,KAAK,CAAC,CAAC,EAAC,CAAC,SAAS,CAAC,CAAC;qBACrC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;iBACI;gBACD,iBAAiB,GAAG,kBAAkB,CAAC,QAAQ,EAAE,CAAC;gBAClD,iBAAiB,GAAG,kBAAkB,CAAC,QAAQ,EAAE,CAAC;aACrD;YAGD,qEAAqE;YACrE,IAAI,iBAAiB,CAAC,SAAS,CAAC,WAAW,EAAE;gBACzC,MAAM,sBAAS,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;gBACxE,OAAO;oBACH,OAAO,EAAE,IAAI;oBACb,eAAe,EAAE,yCAAyC;oBAC1D,WAAW,EAAE,EAAE;iBAClB,CAAC;aACL;YAGD,iBAAiB;YACjB,MAAM,QAAQ,GAAG,MAAM,sBAAS,CAAC,aAAa,CAAC,iBAAiB,EAAE,iBAAiB,EAAE;gBACjF,YAAY,EAAE,UAAU;gBACxB,eAAe,EAAE,iBAAiB,CAAC,SAAS,CAAC,YAAY;aAC5D,CAAC,CAAC;YACH,OAAO;gBACH,OAAO,EAAE,IAAI;gBACb,eAAe,EAAE,QAAQ;gBACzB,WAAW,EAAE,EAAE;aAClB,CAAC;QACN,CAAC;KAAA;CACJ;AApFD,iCAoFC"}
package/npm-shrinkwrap.json CHANGED
@@ -1,27 +1,27 @@
1
1
  {
2
2
  "name": "@zowe/cli",
3
- "version": "7.10.1",
3
+ "version": "7.10.3",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@zowe/cli",
9
- "version": "7.10.1",
9
+ "version": "7.10.3",
10
10
  "hasInstallScript": true,
11
11
  "license": "EPL-2.0",
12
12
  "dependencies": {
13
- "@zowe/core-for-zowe-sdk": "7.10.1",
14
- "@zowe/imperative": "5.8.0",
13
+ "@zowe/core-for-zowe-sdk": "7.10.2",
14
+ "@zowe/imperative": "5.8.2",
15
15
  "@zowe/perf-timing": "1.0.7",
16
- "@zowe/provisioning-for-zowe-sdk": "7.10.1",
17
- "@zowe/zos-console-for-zowe-sdk": "7.10.1",
18
- "@zowe/zos-files-for-zowe-sdk": "7.10.1",
19
- "@zowe/zos-jobs-for-zowe-sdk": "7.10.1",
20
- "@zowe/zos-logs-for-zowe-sdk": "7.10.1",
21
- "@zowe/zos-tso-for-zowe-sdk": "7.10.1",
22
- "@zowe/zos-uss-for-zowe-sdk": "7.10.1",
23
- "@zowe/zos-workflows-for-zowe-sdk": "7.10.1",
24
- "@zowe/zosmf-for-zowe-sdk": "7.10.1",
16
+ "@zowe/provisioning-for-zowe-sdk": "7.10.2",
17
+ "@zowe/zos-console-for-zowe-sdk": "7.10.2",
18
+ "@zowe/zos-files-for-zowe-sdk": "7.10.2",
19
+ "@zowe/zos-jobs-for-zowe-sdk": "7.10.2",
20
+ "@zowe/zos-logs-for-zowe-sdk": "7.10.2",
21
+ "@zowe/zos-tso-for-zowe-sdk": "7.10.2",
22
+ "@zowe/zos-uss-for-zowe-sdk": "7.10.2",
23
+ "@zowe/zos-workflows-for-zowe-sdk": "7.10.2",
24
+ "@zowe/zosmf-for-zowe-sdk": "7.10.2",
25
25
  "find-process": "1.4.7",
26
26
  "get-stream": "6.0.1",
27
27
  "lodash": "4.17.21",
@@ -38,7 +38,7 @@
38
38
  "@types/node": "^14.18.28",
39
39
  "@types/tar": "^6.1.2",
40
40
  "@types/which": "^2.0.1",
41
- "@zowe/cli-test-utils": "7.10.1",
41
+ "@zowe/cli-test-utils": "7.10.2",
42
42
  "comment-json": "^4.1.1",
43
43
  "eslint": "^8.22.0",
44
44
  "js-yaml": "^4.1.0",
@@ -303,9 +303,9 @@
303
303
  "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="
304
304
  },
305
305
  "node_modules/@zowe/core-for-zowe-sdk": {
306
- "version": "7.10.1",
307
- "resolved": "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.10.1.tgz",
308
- "integrity": "sha512-P2lajSt9Dr+6hVYoY8ZNkhpbSn3T4VX77A60qP24WuBUNv9jHfWf3DMapnV2vEC4NvMeUGNgDL+ceXhWbYvLUg==",
306
+ "version": "7.10.2",
307
+ "resolved": "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.10.2.tgz",
308
+ "integrity": "sha512-fRvRjQjEfvzrR0IbsunDCGbFcma+w7cAMT8JVZWzqRigacY92zk9ERLwXvW7vhtdWurdr75bDMjz5k1ZgtdzYA==",
309
309
  "dependencies": {
310
310
  "comment-json": "4.1.1",
311
311
  "string-width": "4.2.3"
@@ -315,9 +315,9 @@
315
315
  }
316
316
  },
317
317
  "node_modules/@zowe/imperative": {
318
- "version": "5.8.0",
319
- "resolved": "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.8.0.tgz",
320
- "integrity": "sha512-K7RNgagGmU2l+Ezr7ixBfDBr54NAb0YJjlpDTqDnOp691ippvEPg/G6QJQ63BJeIOoikae8ClYlr2T4OhhCyFw==",
318
+ "version": "5.8.2",
319
+ "resolved": "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.8.2.tgz",
320
+ "integrity": "sha512-oKZEsl+mT93LjFsTqNzZbuFHbwufVYhkn6cdUUR+voEsdKA10JVaAF90kvbGdo1lgolXvhCFPUIsnz1RTfw9dw==",
321
321
  "dependencies": {
322
322
  "@types/yargs": "13.0.4",
323
323
  "@zowe/perf-timing": "1.0.7",
@@ -659,9 +659,9 @@
659
659
  }
660
660
  },
661
661
  "node_modules/@zowe/provisioning-for-zowe-sdk": {
662
- "version": "7.10.1",
663
- "resolved": "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.10.1.tgz",
664
- "integrity": "sha512-MKCRL56bskHqi3o3kGGTeb4JdCO2NELiEz1IS0N6MIKvA1JG+Pluhdbs9I7sJTQF/YCLeMjNhCu+wnqK6q3lwA==",
662
+ "version": "7.10.2",
663
+ "resolved": "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.10.2.tgz",
664
+ "integrity": "sha512-cZYPI3DRalXt0TV/7f9XZADMcLtlZE7rWhfOg8gzEYT415g1H7xLz1UTknn3dSLGL9LaeianB8xzoMncUwZZ1w==",
665
665
  "dependencies": {
666
666
  "js-yaml": "4.1.0"
667
667
  },
@@ -671,18 +671,18 @@
671
671
  }
672
672
  },
673
673
  "node_modules/@zowe/zos-console-for-zowe-sdk": {
674
- "version": "7.10.1",
675
- "resolved": "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.10.1.tgz",
676
- "integrity": "sha512-VG8hvUYMqbhw6xq82bZn/GuWM0rem1kwvw8XBAAqnnmxtpbJ3Js/k4gS8SLe4lr8gMJpX8kphLUkQF7/hDDpdw==",
674
+ "version": "7.10.2",
675
+ "resolved": "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.10.2.tgz",
676
+ "integrity": "sha512-CpB5xqGXw3AogAUdznLH1hz1aY57tesqakTqAYfuPsanP5XMvsknm3cCbkXjZUoy2OcVBSa+TtKC9AXe8un4Zw==",
677
677
  "peerDependencies": {
678
678
  "@zowe/core-for-zowe-sdk": "^7.0.0",
679
679
  "@zowe/imperative": "^5.0.0"
680
680
  }
681
681
  },
682
682
  "node_modules/@zowe/zos-files-for-zowe-sdk": {
683
- "version": "7.10.1",
684
- "resolved": "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.10.1.tgz",
685
- "integrity": "sha512-A9KHrJeWxpLnvAO9pRxvr7vHID0S3UcnzfDac+34z+WU/aZl0y/R1KJZrF/+aXmmJmPfIHQTCr4rbQtFFMdepg==",
683
+ "version": "7.10.2",
684
+ "resolved": "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.10.2.tgz",
685
+ "integrity": "sha512-e4lJBpBDm8Oo8HM7mOabcuvdLWONO0S/cL9AyAAbY6vT2cVnq0Uic1sW9uJKnuyHMRqZJjw8BsEf2ko4PCPeeQ==",
686
686
  "dependencies": {
687
687
  "minimatch": "5.0.1"
688
688
  },
@@ -692,11 +692,11 @@
692
692
  }
693
693
  },
694
694
  "node_modules/@zowe/zos-jobs-for-zowe-sdk": {
695
- "version": "7.10.1",
696
- "resolved": "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.10.1.tgz",
697
- "integrity": "sha512-mKCKtlnsUVy0tfgZXmsezt5uSzJ+usBVpUdN2znnyaEep5JJCH9W1Qsyty9bKIiKmnn5SMAZMsmJ010fuioFoA==",
695
+ "version": "7.10.2",
696
+ "resolved": "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.10.2.tgz",
697
+ "integrity": "sha512-jI3NTg+PFxfcIKRu4yRkCoc0HQ5nfnfuwb9rJx0dke6io6I0fa6lKsn+3R6NYWlHmXoyWysf1DDMqUmgJ0zkNQ==",
698
698
  "dependencies": {
699
- "@zowe/zos-files-for-zowe-sdk": "7.10.1"
699
+ "@zowe/zos-files-for-zowe-sdk": "7.10.2"
700
700
  },
701
701
  "peerDependencies": {
702
702
  "@zowe/core-for-zowe-sdk": "^7.0.0",
@@ -704,20 +704,20 @@
704
704
  }
705
705
  },
706
706
  "node_modules/@zowe/zos-logs-for-zowe-sdk": {
707
- "version": "7.10.1",
708
- "resolved": "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.10.1.tgz",
709
- "integrity": "sha512-s7BCkHcTc6PXOCqC2vh1GuHqTHAR/v7tM1S8D/RsU8rpSeDotHgd2gpp98BxqcR8Kc3gDsbKF3zbvWuZXG1XKw==",
707
+ "version": "7.10.2",
708
+ "resolved": "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.10.2.tgz",
709
+ "integrity": "sha512-4+Zx86dnatNamVoq/+WHYk0zIlf/ESrb9dQN9Y234u2wZ1FUJoLitQyREMNu9mYGuI38m/+2H3NDMteam0t0/Q==",
710
710
  "peerDependencies": {
711
711
  "@zowe/core-for-zowe-sdk": "^7.0.0",
712
712
  "@zowe/imperative": "^5.0.0"
713
713
  }
714
714
  },
715
715
  "node_modules/@zowe/zos-tso-for-zowe-sdk": {
716
- "version": "7.10.1",
717
- "resolved": "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.10.1.tgz",
718
- "integrity": "sha512-H6CEmPyKtgFjrDdxJ/krRH75dCzfYFf36pemDde73H1xjV7ncvodSOl6aS3WRm9Lv1qkHsT78faUCZfymdGzRA==",
716
+ "version": "7.10.2",
717
+ "resolved": "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.10.2.tgz",
718
+ "integrity": "sha512-uDeN2gDLxw9j+KD6WB1DUDyPO5iBBixhjbDdfryvjl0YbV8fSf8W50T09O5DoURthZqSih1Le8IpsNQrVA123g==",
719
719
  "dependencies": {
720
- "@zowe/zosmf-for-zowe-sdk": "7.10.1"
720
+ "@zowe/zosmf-for-zowe-sdk": "7.10.2"
721
721
  },
722
722
  "peerDependencies": {
723
723
  "@zowe/core-for-zowe-sdk": "^7.0.0",
@@ -725,9 +725,9 @@
725
725
  }
726
726
  },
727
727
  "node_modules/@zowe/zos-uss-for-zowe-sdk": {
728
- "version": "7.10.1",
729
- "resolved": "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.10.1.tgz",
730
- "integrity": "sha512-igTBZ0zxSCpbDM3EQ9r1KT0wU65Hqr715MgugCVXDBm9ttEZ0F1iWvupbG3zsHgEXMuyqpGkZLF9ATvPcqqESQ==",
728
+ "version": "7.10.2",
729
+ "resolved": "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.10.2.tgz",
730
+ "integrity": "sha512-c0q4+9WJGy71AFBwXWwfAdGhNi+V6OofpWIzyrYvZVl2fxXmX4A//8uySEi3FCISdMxGsoMDDQ1Fqt46hGrB9Q==",
731
731
  "dependencies": {
732
732
  "ssh2": "1.11.0"
733
733
  },
@@ -736,11 +736,11 @@
736
736
  }
737
737
  },
738
738
  "node_modules/@zowe/zos-workflows-for-zowe-sdk": {
739
- "version": "7.10.1",
740
- "resolved": "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.10.1.tgz",
741
- "integrity": "sha512-7SpFDmO4krVtqPbqnLZiyYrR1WRSL9OiJImDtCRpFZx5kNp4EbLnJ2NUAgjTYttlLHpVrLSoO5KjoYQDW7sDEg==",
739
+ "version": "7.10.2",
740
+ "resolved": "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.10.2.tgz",
741
+ "integrity": "sha512-Yx1GdNbs82+hT/C3selcnvY85hFFjAMQCWXqvkfoHnD4UCUipxOOjgfilKhze2yMgRwz8yG45kxfm2UhnoStZA==",
742
742
  "dependencies": {
743
- "@zowe/zos-files-for-zowe-sdk": "7.10.1"
743
+ "@zowe/zos-files-for-zowe-sdk": "7.10.2"
744
744
  },
745
745
  "peerDependencies": {
746
746
  "@zowe/core-for-zowe-sdk": "^7.0.0",
@@ -748,9 +748,9 @@
748
748
  }
749
749
  },
750
750
  "node_modules/@zowe/zosmf-for-zowe-sdk": {
751
- "version": "7.10.1",
752
- "resolved": "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.10.1.tgz",
753
- "integrity": "sha512-/im0qNzZwMMvXedxEHfVCE8eltR65sJGo4Y3LBTCH5jelo1Ptjlh7BIfJcFC+I/k5KU3gyCXeVQzHN9G0LKEPw==",
751
+ "version": "7.10.2",
752
+ "resolved": "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.10.2.tgz",
753
+ "integrity": "sha512-q05l1+uHiCD2ISHLOMlWa8S9yj7/RNVBxHVe1rjCmJ+PvMzpsuOiK7fhKs3TPJhNZaKwpbhVld0LYivhIWb5GA==",
754
754
  "peerDependencies": {
755
755
  "@zowe/core-for-zowe-sdk": "^7.0.0",
756
756
  "@zowe/imperative": "^5.0.0"
@@ -1514,9 +1514,9 @@
1514
1514
  "optional": true
1515
1515
  },
1516
1516
  "node_modules/http-cache-semantics": {
1517
- "version": "4.1.0",
1518
- "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
1519
- "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
1517
+ "version": "4.1.1",
1518
+ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
1519
+ "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
1520
1520
  },
1521
1521
  "node_modules/https-proxy-agent": {
1522
1522
  "version": "5.0.1",
@@ -3694,18 +3694,18 @@
3694
3694
  "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="
3695
3695
  },
3696
3696
  "@zowe/core-for-zowe-sdk": {
3697
- "version": "7.10.1",
3698
- "resolved": "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.10.1.tgz",
3699
- "integrity": "sha512-P2lajSt9Dr+6hVYoY8ZNkhpbSn3T4VX77A60qP24WuBUNv9jHfWf3DMapnV2vEC4NvMeUGNgDL+ceXhWbYvLUg==",
3697
+ "version": "7.10.2",
3698
+ "resolved": "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.10.2.tgz",
3699
+ "integrity": "sha512-fRvRjQjEfvzrR0IbsunDCGbFcma+w7cAMT8JVZWzqRigacY92zk9ERLwXvW7vhtdWurdr75bDMjz5k1ZgtdzYA==",
3700
3700
  "requires": {
3701
3701
  "comment-json": "4.1.1",
3702
3702
  "string-width": "4.2.3"
3703
3703
  }
3704
3704
  },
3705
3705
  "@zowe/imperative": {
3706
- "version": "5.8.0",
3707
- "resolved": "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.8.0.tgz",
3708
- "integrity": "sha512-K7RNgagGmU2l+Ezr7ixBfDBr54NAb0YJjlpDTqDnOp691ippvEPg/G6QJQ63BJeIOoikae8ClYlr2T4OhhCyFw==",
3706
+ "version": "5.8.2",
3707
+ "resolved": "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.8.2.tgz",
3708
+ "integrity": "sha512-oKZEsl+mT93LjFsTqNzZbuFHbwufVYhkn6cdUUR+voEsdKA10JVaAF90kvbGdo1lgolXvhCFPUIsnz1RTfw9dw==",
3709
3709
  "requires": {
3710
3710
  "@types/yargs": "13.0.4",
3711
3711
  "@zowe/perf-timing": "1.0.7",
@@ -3960,69 +3960,69 @@
3960
3960
  }
3961
3961
  },
3962
3962
  "@zowe/provisioning-for-zowe-sdk": {
3963
- "version": "7.10.1",
3964
- "resolved": "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.10.1.tgz",
3965
- "integrity": "sha512-MKCRL56bskHqi3o3kGGTeb4JdCO2NELiEz1IS0N6MIKvA1JG+Pluhdbs9I7sJTQF/YCLeMjNhCu+wnqK6q3lwA==",
3963
+ "version": "7.10.2",
3964
+ "resolved": "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.10.2.tgz",
3965
+ "integrity": "sha512-cZYPI3DRalXt0TV/7f9XZADMcLtlZE7rWhfOg8gzEYT415g1H7xLz1UTknn3dSLGL9LaeianB8xzoMncUwZZ1w==",
3966
3966
  "requires": {
3967
3967
  "js-yaml": "4.1.0"
3968
3968
  }
3969
3969
  },
3970
3970
  "@zowe/zos-console-for-zowe-sdk": {
3971
- "version": "7.10.1",
3972
- "resolved": "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.10.1.tgz",
3973
- "integrity": "sha512-VG8hvUYMqbhw6xq82bZn/GuWM0rem1kwvw8XBAAqnnmxtpbJ3Js/k4gS8SLe4lr8gMJpX8kphLUkQF7/hDDpdw==",
3971
+ "version": "7.10.2",
3972
+ "resolved": "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.10.2.tgz",
3973
+ "integrity": "sha512-CpB5xqGXw3AogAUdznLH1hz1aY57tesqakTqAYfuPsanP5XMvsknm3cCbkXjZUoy2OcVBSa+TtKC9AXe8un4Zw==",
3974
3974
  "requires": {}
3975
3975
  },
3976
3976
  "@zowe/zos-files-for-zowe-sdk": {
3977
- "version": "7.10.1",
3978
- "resolved": "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.10.1.tgz",
3979
- "integrity": "sha512-A9KHrJeWxpLnvAO9pRxvr7vHID0S3UcnzfDac+34z+WU/aZl0y/R1KJZrF/+aXmmJmPfIHQTCr4rbQtFFMdepg==",
3977
+ "version": "7.10.2",
3978
+ "resolved": "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.10.2.tgz",
3979
+ "integrity": "sha512-e4lJBpBDm8Oo8HM7mOabcuvdLWONO0S/cL9AyAAbY6vT2cVnq0Uic1sW9uJKnuyHMRqZJjw8BsEf2ko4PCPeeQ==",
3980
3980
  "requires": {
3981
3981
  "minimatch": "5.0.1"
3982
3982
  }
3983
3983
  },
3984
3984
  "@zowe/zos-jobs-for-zowe-sdk": {
3985
- "version": "7.10.1",
3986
- "resolved": "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.10.1.tgz",
3987
- "integrity": "sha512-mKCKtlnsUVy0tfgZXmsezt5uSzJ+usBVpUdN2znnyaEep5JJCH9W1Qsyty9bKIiKmnn5SMAZMsmJ010fuioFoA==",
3985
+ "version": "7.10.2",
3986
+ "resolved": "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.10.2.tgz",
3987
+ "integrity": "sha512-jI3NTg+PFxfcIKRu4yRkCoc0HQ5nfnfuwb9rJx0dke6io6I0fa6lKsn+3R6NYWlHmXoyWysf1DDMqUmgJ0zkNQ==",
3988
3988
  "requires": {
3989
- "@zowe/zos-files-for-zowe-sdk": "7.10.1"
3989
+ "@zowe/zos-files-for-zowe-sdk": "7.10.2"
3990
3990
  }
3991
3991
  },
3992
3992
  "@zowe/zos-logs-for-zowe-sdk": {
3993
- "version": "7.10.1",
3994
- "resolved": "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.10.1.tgz",
3995
- "integrity": "sha512-s7BCkHcTc6PXOCqC2vh1GuHqTHAR/v7tM1S8D/RsU8rpSeDotHgd2gpp98BxqcR8Kc3gDsbKF3zbvWuZXG1XKw==",
3993
+ "version": "7.10.2",
3994
+ "resolved": "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.10.2.tgz",
3995
+ "integrity": "sha512-4+Zx86dnatNamVoq/+WHYk0zIlf/ESrb9dQN9Y234u2wZ1FUJoLitQyREMNu9mYGuI38m/+2H3NDMteam0t0/Q==",
3996
3996
  "requires": {}
3997
3997
  },
3998
3998
  "@zowe/zos-tso-for-zowe-sdk": {
3999
- "version": "7.10.1",
4000
- "resolved": "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.10.1.tgz",
4001
- "integrity": "sha512-H6CEmPyKtgFjrDdxJ/krRH75dCzfYFf36pemDde73H1xjV7ncvodSOl6aS3WRm9Lv1qkHsT78faUCZfymdGzRA==",
3999
+ "version": "7.10.2",
4000
+ "resolved": "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.10.2.tgz",
4001
+ "integrity": "sha512-uDeN2gDLxw9j+KD6WB1DUDyPO5iBBixhjbDdfryvjl0YbV8fSf8W50T09O5DoURthZqSih1Le8IpsNQrVA123g==",
4002
4002
  "requires": {
4003
- "@zowe/zosmf-for-zowe-sdk": "7.10.1"
4003
+ "@zowe/zosmf-for-zowe-sdk": "7.10.2"
4004
4004
  }
4005
4005
  },
4006
4006
  "@zowe/zos-uss-for-zowe-sdk": {
4007
- "version": "7.10.1",
4008
- "resolved": "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.10.1.tgz",
4009
- "integrity": "sha512-igTBZ0zxSCpbDM3EQ9r1KT0wU65Hqr715MgugCVXDBm9ttEZ0F1iWvupbG3zsHgEXMuyqpGkZLF9ATvPcqqESQ==",
4007
+ "version": "7.10.2",
4008
+ "resolved": "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.10.2.tgz",
4009
+ "integrity": "sha512-c0q4+9WJGy71AFBwXWwfAdGhNi+V6OofpWIzyrYvZVl2fxXmX4A//8uySEi3FCISdMxGsoMDDQ1Fqt46hGrB9Q==",
4010
4010
  "requires": {
4011
4011
  "ssh2": "1.11.0"
4012
4012
  }
4013
4013
  },
4014
4014
  "@zowe/zos-workflows-for-zowe-sdk": {
4015
- "version": "7.10.1",
4016
- "resolved": "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.10.1.tgz",
4017
- "integrity": "sha512-7SpFDmO4krVtqPbqnLZiyYrR1WRSL9OiJImDtCRpFZx5kNp4EbLnJ2NUAgjTYttlLHpVrLSoO5KjoYQDW7sDEg==",
4015
+ "version": "7.10.2",
4016
+ "resolved": "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.10.2.tgz",
4017
+ "integrity": "sha512-Yx1GdNbs82+hT/C3selcnvY85hFFjAMQCWXqvkfoHnD4UCUipxOOjgfilKhze2yMgRwz8yG45kxfm2UhnoStZA==",
4018
4018
  "requires": {
4019
- "@zowe/zos-files-for-zowe-sdk": "7.10.1"
4019
+ "@zowe/zos-files-for-zowe-sdk": "7.10.2"
4020
4020
  }
4021
4021
  },
4022
4022
  "@zowe/zosmf-for-zowe-sdk": {
4023
- "version": "7.10.1",
4024
- "resolved": "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.10.1.tgz",
4025
- "integrity": "sha512-/im0qNzZwMMvXedxEHfVCE8eltR65sJGo4Y3LBTCH5jelo1Ptjlh7BIfJcFC+I/k5KU3gyCXeVQzHN9G0LKEPw==",
4023
+ "version": "7.10.2",
4024
+ "resolved": "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.10.2.tgz",
4025
+ "integrity": "sha512-q05l1+uHiCD2ISHLOMlWa8S9yj7/RNVBxHVe1rjCmJ+PvMzpsuOiK7fhKs3TPJhNZaKwpbhVld0LYivhIWb5GA==",
4026
4026
  "requires": {}
4027
4027
  },
4028
4028
  "agent-base": {
@@ -4600,9 +4600,9 @@
4600
4600
  "optional": true
4601
4601
  },
4602
4602
  "http-cache-semantics": {
4603
- "version": "4.1.0",
4604
- "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
4605
- "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
4603
+ "version": "4.1.1",
4604
+ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
4605
+ "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
4606
4606
  },
4607
4607
  "https-proxy-agent": {
4608
4608
  "version": "5.0.1",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zowe/cli",
3
- "version": "7.10.1",
3
+ "version": "7.10.3",
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": "Zowe",
6
6
  "license": "EPL-2.0",
@@ -57,18 +57,18 @@
57
57
  "preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js"
58
58
  },
59
59
  "dependencies": {
60
- "@zowe/core-for-zowe-sdk": "7.10.1",
61
- "@zowe/imperative": "5.8.0",
60
+ "@zowe/core-for-zowe-sdk": "7.10.2",
61
+ "@zowe/imperative": "5.8.2",
62
62
  "@zowe/perf-timing": "1.0.7",
63
- "@zowe/provisioning-for-zowe-sdk": "7.10.1",
64
- "@zowe/zos-console-for-zowe-sdk": "7.10.1",
65
- "@zowe/zos-files-for-zowe-sdk": "7.10.1",
66
- "@zowe/zos-jobs-for-zowe-sdk": "7.10.1",
67
- "@zowe/zos-logs-for-zowe-sdk": "7.10.1",
68
- "@zowe/zos-tso-for-zowe-sdk": "7.10.1",
69
- "@zowe/zos-uss-for-zowe-sdk": "7.10.1",
70
- "@zowe/zos-workflows-for-zowe-sdk": "7.10.1",
71
- "@zowe/zosmf-for-zowe-sdk": "7.10.1",
63
+ "@zowe/provisioning-for-zowe-sdk": "7.10.2",
64
+ "@zowe/zos-console-for-zowe-sdk": "7.10.2",
65
+ "@zowe/zos-files-for-zowe-sdk": "7.10.2",
66
+ "@zowe/zos-jobs-for-zowe-sdk": "7.10.2",
67
+ "@zowe/zos-logs-for-zowe-sdk": "7.10.2",
68
+ "@zowe/zos-tso-for-zowe-sdk": "7.10.2",
69
+ "@zowe/zos-uss-for-zowe-sdk": "7.10.2",
70
+ "@zowe/zos-workflows-for-zowe-sdk": "7.10.2",
71
+ "@zowe/zosmf-for-zowe-sdk": "7.10.2",
72
72
  "find-process": "1.4.7",
73
73
  "get-stream": "6.0.1",
74
74
  "lodash": "4.17.21",
@@ -81,7 +81,7 @@
81
81
  "@types/node": "^14.18.28",
82
82
  "@types/tar": "^6.1.2",
83
83
  "@types/which": "^2.0.1",
84
- "@zowe/cli-test-utils": "7.10.1",
84
+ "@zowe/cli-test-utils": "7.10.2",
85
85
  "comment-json": "^4.1.1",
86
86
  "eslint": "^8.22.0",
87
87
  "js-yaml": "^4.1.0",