@zowe/cli 7.10.3 → 7.11.0

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 (41) hide show
  1. package/lib/zosfiles/compare/CompareBase.handler.d.ts +38 -0
  2. package/lib/zosfiles/compare/CompareBase.handler.js +62 -0
  3. package/lib/zosfiles/compare/CompareBase.handler.js.map +1 -0
  4. package/lib/zosfiles/compare/CompareBaseHelper.d.ts +92 -0
  5. package/lib/zosfiles/compare/CompareBaseHelper.js +173 -0
  6. package/lib/zosfiles/compare/CompareBaseHelper.js.map +1 -0
  7. package/lib/zosfiles/compare/doc/ICompareFileOptions.d.ts +14 -0
  8. package/lib/zosfiles/compare/doc/ICompareFileOptions.js +13 -0
  9. package/lib/zosfiles/compare/doc/ICompareFileOptions.js.map +1 -0
  10. package/lib/zosfiles/compare/ds/Dataset.handler.d.ts +7 -5
  11. package/lib/zosfiles/compare/ds/Dataset.handler.js +9 -80
  12. package/lib/zosfiles/compare/ds/Dataset.handler.js.map +1 -1
  13. package/lib/zosfiles/compare/lf-ds/LocalfileDataset.handler.d.ts +8 -6
  14. package/lib/zosfiles/compare/lf-ds/LocalfileDataset.handler.js +10 -94
  15. package/lib/zosfiles/compare/lf-ds/LocalfileDataset.handler.js.map +1 -1
  16. package/lib/zosfiles/compare/lf-sdd/LocalfileSpooldd.handler.d.ts +7 -5
  17. package/lib/zosfiles/compare/lf-sdd/LocalfileSpooldd.handler.js +10 -90
  18. package/lib/zosfiles/compare/lf-sdd/LocalfileSpooldd.handler.js.map +1 -1
  19. package/lib/zosfiles/compare/lf-uss/LocalfileUss.handler.d.ts +7 -5
  20. package/lib/zosfiles/compare/lf-uss/LocalfileUss.handler.js +9 -91
  21. package/lib/zosfiles/compare/lf-uss/LocalfileUss.handler.js.map +1 -1
  22. package/lib/zosfiles/compare/sdd/Spooldd.handler.d.ts +7 -5
  23. package/lib/zosfiles/compare/sdd/Spooldd.handler.js +11 -58
  24. package/lib/zosfiles/compare/sdd/Spooldd.handler.js.map +1 -1
  25. package/lib/zosfiles/compare/uss/UssFile.handler.d.ts +7 -5
  26. package/lib/zosfiles/compare/uss/UssFile.handler.js +9 -71
  27. package/lib/zosfiles/compare/uss/UssFile.handler.js.map +1 -1
  28. package/lib/zosjobs/-strings-/en.d.ts +5 -6
  29. package/lib/zosjobs/-strings-/en.js +6 -8
  30. package/lib/zosjobs/-strings-/en.js.map +1 -1
  31. package/lib/zosjobs/ZosJobs.options.d.ts +4 -0
  32. package/lib/zosjobs/ZosJobs.options.js +29 -0
  33. package/lib/zosjobs/ZosJobs.options.js.map +1 -0
  34. package/lib/zosjobs/cancel/job/Job.definition.js +2 -9
  35. package/lib/zosjobs/cancel/job/Job.definition.js.map +1 -1
  36. package/lib/zosjobs/delete/job/Job.definition.js +2 -9
  37. package/lib/zosjobs/delete/job/Job.definition.js.map +1 -1
  38. package/lib/zosjobs/delete/old-jobs/OldJobs.definition.js +2 -7
  39. package/lib/zosjobs/delete/old-jobs/OldJobs.definition.js.map +1 -1
  40. package/npm-shrinkwrap.json +86 -86
  41. package/package.json +13 -13
@@ -19,105 +19,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
19
19
  });
20
20
  };
21
21
  Object.defineProperty(exports, "__esModule", { value: true });
22
- const fs = require("fs");
23
- const path = require("path");
24
- const imperative_1 = require("@zowe/imperative");
25
22
  const zos_files_for_zowe_sdk_1 = require("@zowe/zos-files-for-zowe-sdk");
26
- const ZosFilesBase_handler_1 = require("../../ZosFilesBase.handler");
23
+ const CompareBase_handler_1 = require("../CompareBase.handler");
27
24
  /**
28
- * Handler to view a data set's content
25
+ * Handler to compare a localfile and a dataset content
29
26
  * @export
30
27
  */
31
- class LocalfileDatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
32
- processWithSession(commandParameters, session) {
28
+ class LocalfileDatasetHandler extends CompareBase_handler_1.CompareBaseHandler {
29
+ getFile1(session, args, helper) {
33
30
  return __awaiter(this, void 0, void 0, function* () {
34
- const task = {
35
- percentComplete: 0,
36
- statusMessage: "Retrieving local file",
37
- stageName: imperative_1.TaskStage.IN_PROGRESS
38
- };
39
- // CHECKING IF LOCAL FILE EXISTS, THEN RETRIEVING IT
40
- commandParameters.response.progress.startBar({ task });
41
- let localFile;
42
- if (path.isAbsolute(commandParameters.arguments.localFilePath)) {
43
- // resolving to full path if local path passed is not absolute
44
- localFile = commandParameters.arguments.localFilePath;
45
- }
46
- else {
47
- localFile = path.resolve(commandParameters.arguments.localFilePath);
48
- }
49
- const localFileHandle = fs.openSync(localFile, 'r');
50
- let lfContentBuf;
51
- try {
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;
63
- throw new imperative_1.ImperativeError({
64
- msg: 'Path not found. Please check the path and try again'
65
- });
66
- }
67
- // reading local file as buffer
68
- lfContentBuf = fs.readFileSync(localFileHandle);
69
- }
70
- finally {
71
- fs.closeSync(localFileHandle);
72
- }
73
- commandParameters.response.progress.endBar();
74
- // RETRIEVING THE DATA-SET TO COMPARE
75
- task.statusMessage = "Retrieving dataset";
76
- commandParameters.response.progress.startBar({ task });
77
- const dsContentBuf = yield zos_files_for_zowe_sdk_1.Get.dataSet(session, commandParameters.arguments.dataSetName, {
78
- binary: commandParameters.arguments.binary,
79
- encoding: commandParameters.arguments.encoding,
80
- record: commandParameters.arguments.record,
81
- volume: commandParameters.arguments.volumeSerial,
82
- responseTimeout: commandParameters.arguments.responseTimeout,
83
- task: task
84
- });
85
- commandParameters.response.progress.endBar();
86
- //CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
87
- let lfContentString = "";
88
- let dsContentString = "";
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");
97
- }
98
- else {
99
- lfContentString = lfContentBuf.toString();
100
- dsContentString = dsContentBuf.toString();
101
- }
102
- // CHECK TO OPEN UP DIFF IN BROWSER WINDOW
103
- if (commandParameters.arguments.browserView) {
104
- yield imperative_1.DiffUtils.openDiffInbrowser(lfContentString, dsContentString);
105
- return {
106
- success: true,
107
- commandResponse: "Launching local-file and data-set diffs in browser...",
108
- apiResponse: {}
109
- };
110
- }
111
- // RETURNING DIFF
112
- const jsonDiff = yield imperative_1.DiffUtils.getDiffString(imperative_1.IO.processNewlines(lfContentString), imperative_1.IO.processNewlines(dsContentString), {
113
- outputFormat: 'terminal',
114
- contextLinesArg: commandParameters.arguments.contextLines
115
- });
116
- return {
117
- success: true,
118
- commandResponse: jsonDiff,
119
- apiResponse: {}
120
- };
31
+ return helper.prepareLocalFile(args.localFilePath);
32
+ });
33
+ }
34
+ getFile2(session, args, helper) {
35
+ return __awaiter(this, void 0, void 0, function* () {
36
+ return yield zos_files_for_zowe_sdk_1.Get.dataSet(session, args.dataSetName, Object.assign(Object.assign({}, helper.file2Options), { task: helper.task }));
121
37
  });
122
38
  }
123
39
  }
@@ -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":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAGF,yEAAmD;AAEnD,gEAA4D;AAE5D;;;GAGG;AACH,MAAqB,uBAAwB,SAAQ,wCAAkB;IACtD,QAAQ,CAAC,OAAwB,EAAE,IAAuB,EAAE,MAAyB;;YAC9F,OAAO,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvD,CAAC;KAAA;IACY,QAAQ,CAAC,OAAwB,EAAE,IAAuB,EAAE,MAAyB;;YAC9F,OAAO,MAAM,4BAAG,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,kCAAO,MAAM,CAAC,YAAY,KAAE,IAAI,EAAE,MAAM,CAAC,IAAI,IAAG,CAAC;QACvG,CAAC;KAAA;CACJ;AAPD,0CAOC"}
@@ -1,10 +1,12 @@
1
- import { AbstractSession, IHandlerParameters } from "@zowe/imperative";
2
- import { IZosFilesResponse } from "@zowe/zos-files-for-zowe-sdk";
3
- import { ZosFilesBaseHandler } from "../../ZosFilesBase.handler";
1
+ /// <reference types="node" />
2
+ import { AbstractSession, ICommandArguments } from "@zowe/imperative";
3
+ import { CompareBaseHelper } from "../CompareBaseHelper";
4
+ import { CompareBaseHandler } from "../CompareBase.handler";
4
5
  /**
5
6
  * Handler to compare spooldd's content
6
7
  * @export
7
8
  */
8
- export default class LocalfileSpoolddHandler extends ZosFilesBaseHandler {
9
- processWithSession(commandParameters: IHandlerParameters, session: AbstractSession): Promise<IZosFilesResponse>;
9
+ export default class LocalfileSpoolddHandler extends CompareBaseHandler {
10
+ getFile1(session: AbstractSession, args: ICommandArguments, helper: CompareBaseHelper): Promise<string | Buffer>;
11
+ getFile2(session: AbstractSession, args: ICommandArguments, helper: CompareBaseHelper): Promise<string | Buffer>;
10
12
  }
@@ -19,102 +19,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
19
19
  });
20
20
  };
21
21
  Object.defineProperty(exports, "__esModule", { value: true });
22
- const path = require("path");
23
- const fs = require("fs");
24
- const imperative_1 = require("@zowe/imperative");
25
22
  const zos_jobs_for_zowe_sdk_1 = require("@zowe/zos-jobs-for-zowe-sdk");
26
- const ZosFilesBase_handler_1 = require("../../ZosFilesBase.handler");
23
+ const CompareBase_handler_1 = require("../CompareBase.handler");
27
24
  /**
28
25
  * Handler to compare spooldd's content
29
26
  * @export
30
27
  */
31
- class LocalfileSpoolddHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
32
- processWithSession(commandParameters, session) {
28
+ class LocalfileSpoolddHandler extends CompareBase_handler_1.CompareBaseHandler {
29
+ getFile1(session, args, helper) {
33
30
  return __awaiter(this, void 0, void 0, function* () {
34
- const descriptionSeperator = ":";
35
- const task = {
36
- percentComplete: 0,
37
- statusMessage: "Retrieving local file",
38
- stageName: imperative_1.TaskStage.IN_PROGRESS
39
- };
40
- // CHECKING IF LOCAL FILE EXISTS, THEN RETRIEVING IT
41
- commandParameters.response.progress.startBar({ task });
42
- let localFile;
43
- if (path.isAbsolute(commandParameters.arguments.localFilePath)) {
44
- // resolving to full path if local path passed is not absolute
45
- localFile = commandParameters.arguments.localFilePath;
46
- }
47
- else {
48
- localFile = path.resolve(commandParameters.arguments.localFilePath);
49
- }
50
- const localFileHandle = fs.openSync(localFile, 'r');
51
- let lfContentBuf;
52
- try {
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;
64
- throw new imperative_1.ImperativeError({
65
- msg: 'Path not found. Please check the path and try again'
66
- });
67
- }
68
- // reading local file as buffer
69
- lfContentBuf = fs.readFileSync(localFileHandle);
70
- }
71
- finally {
72
- fs.closeSync(localFileHandle);
73
- }
74
- commandParameters.response.progress.endBar();
75
- // RETRIEVING SPOOLDD
76
- task.statusMessage = "Retrieving spooldd";
77
- commandParameters.response.progress.startBar({ task });
78
- const spoolDescription = commandParameters.arguments.spoolDescription;
79
- const spoolDescArr = spoolDescription.split(descriptionSeperator);
80
- const jobName = spoolDescArr[0];
81
- const jobId = spoolDescArr[1];
82
- const spoolId = Number(spoolDescArr[2]);
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
100
- if (commandParameters.arguments.browserView) {
101
- yield imperative_1.DiffUtils.openDiffInbrowser(lfContentString, spoolContentString);
102
- return {
103
- success: true,
104
- commandResponse: "Launching local-file and spool-dd diffs in browser...",
105
- apiResponse: {}
106
- };
107
- }
108
- // RETURNING DIFF
109
- const jsonDiff = yield imperative_1.DiffUtils.getDiffString(lfContentString, spoolContentString, {
110
- outputFormat: 'terminal',
111
- contextLinesArg: commandParameters.arguments.contextLines
112
- });
113
- return {
114
- success: true,
115
- commandResponse: jsonDiff,
116
- apiResponse: {}
117
- };
31
+ return helper.prepareLocalFile(args.localFilePath);
32
+ });
33
+ }
34
+ getFile2(session, args, helper) {
35
+ return __awaiter(this, void 0, void 0, function* () {
36
+ const { jobName, jobId, spoolId } = helper.prepareSpoolDescriptor(args.spoolDescription);
37
+ return yield zos_jobs_for_zowe_sdk_1.GetJobs.getSpoolContentById(session, jobName, jobId, spoolId);
118
38
  });
119
39
  }
120
40
  }
@@ -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":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAGF,uEAAsD;AAEtD,gEAA4D;AAE5D;;;GAGG;AACH,MAAqB,uBAAwB,SAAQ,wCAAkB;IACtD,QAAQ,CAAC,OAAwB,EAAE,IAAuB,EAAE,MAAyB;;YAC9F,OAAO,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvD,CAAC;KAAA;IACY,QAAQ,CAAC,OAAwB,EAAE,IAAuB,EAAE,MAAyB;;YAC9F,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACzF,OAAO,MAAM,+BAAO,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAC/E,CAAC;KAAA;CACJ;AARD,0CAQC"}
@@ -1,10 +1,12 @@
1
- import { AbstractSession, IHandlerParameters } from "@zowe/imperative";
2
- import { IZosFilesResponse } from "@zowe/zos-files-for-zowe-sdk";
3
- import { ZosFilesBaseHandler } from "../../ZosFilesBase.handler";
1
+ /// <reference types="node" />
2
+ import { AbstractSession, ICommandArguments } from "@zowe/imperative";
3
+ import { CompareBaseHelper } from '../CompareBaseHelper';
4
+ import { CompareBaseHandler } from '../CompareBase.handler';
4
5
  /**
5
6
  * Handler to compare the local file and uss file's content
6
7
  * @export
7
8
  */
8
- export default class LocalfileUssHandler extends ZosFilesBaseHandler {
9
- processWithSession(commandParameters: IHandlerParameters, session: AbstractSession): Promise<IZosFilesResponse>;
9
+ export default class LocalfileUssHandler extends CompareBaseHandler {
10
+ getFile1(session: AbstractSession, args: ICommandArguments, helper: CompareBaseHelper): Promise<string | Buffer>;
11
+ getFile2(session: AbstractSession, args: ICommandArguments, helper: CompareBaseHelper): Promise<string | Buffer>;
10
12
  }
@@ -19,103 +19,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
19
19
  });
20
20
  };
21
21
  Object.defineProperty(exports, "__esModule", { value: true });
22
- const fs = require("fs");
23
- const path = require("path");
24
- const imperative_1 = require("@zowe/imperative");
25
22
  const zos_files_for_zowe_sdk_1 = require("@zowe/zos-files-for-zowe-sdk");
26
- const ZosFilesBase_handler_1 = require("../../ZosFilesBase.handler");
23
+ const CompareBase_handler_1 = require("../CompareBase.handler");
27
24
  /**
28
25
  * Handler to compare the local file and uss file's content
29
26
  * @export
30
27
  */
31
- class LocalfileUssHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
32
- processWithSession(commandParameters, session) {
28
+ class LocalfileUssHandler extends CompareBase_handler_1.CompareBaseHandler {
29
+ getFile1(session, args, helper) {
33
30
  return __awaiter(this, void 0, void 0, function* () {
34
- const task = {
35
- percentComplete: 0,
36
- statusMessage: "Retrieving local file",
37
- stageName: imperative_1.TaskStage.IN_PROGRESS
38
- };
39
- // CHECKING IF LOCAL FILE EXISTS, THEN RETRIEVING IT
40
- commandParameters.response.progress.startBar({ task });
41
- let localFile;
42
- if (path.isAbsolute(commandParameters.arguments.localFilePath)) {
43
- // resolving to full path if local path passed is not absolute
44
- localFile = commandParameters.arguments.localFilePath;
45
- }
46
- else {
47
- localFile = path.resolve(commandParameters.arguments.localFilePath);
48
- }
49
- const localFileHandle = fs.openSync(localFile, 'r');
50
- let lfContentBuf;
51
- try {
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;
63
- throw new imperative_1.ImperativeError({
64
- msg: 'Path not found. Please check the path and try again'
65
- });
66
- }
67
- // reading local file as buffer
68
- lfContentBuf = fs.readFileSync(localFileHandle);
69
- }
70
- finally {
71
- fs.closeSync(localFileHandle);
72
- }
73
- commandParameters.response.progress.endBar();
74
- // RETRIEVING USS FILE TO COMPARE
75
- task.statusMessage = "Retrieving uss file";
76
- commandParameters.response.progress.startBar({ task });
77
- const ussContentBuf = yield zos_files_for_zowe_sdk_1.Get.USSFile(session, commandParameters.arguments.ussFilePath, {
78
- binary: commandParameters.arguments.binary,
79
- encoding: commandParameters.arguments.encoding,
80
- responseTimeout: commandParameters.arguments.responseTimeout,
81
- task: task
82
- });
83
- commandParameters.response.progress.endBar();
84
- //CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
85
- let lfContentString = "";
86
- let ussContentString = "";
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");
95
- }
96
- else {
97
- lfContentString = lfContentBuf.toString();
98
- ussContentString = ussContentBuf.toString();
99
- }
100
- // CHECK TO OPEN UP DIFF IN BROWSER WINDOW
101
- if (commandParameters.arguments.browserView) {
102
- yield imperative_1.DiffUtils.openDiffInbrowser(lfContentString, ussContentString);
103
- return {
104
- success: true,
105
- commandResponse: "Launching local-filee and uss-file diffs in browser...",
106
- apiResponse: {}
107
- };
108
- }
109
- // RETURNING DIFF
110
- const jsonDiff = yield imperative_1.DiffUtils.getDiffString(lfContentString, ussContentString, {
111
- outputFormat: 'terminal',
112
- contextLinesArg: commandParameters.arguments.contextLines
113
- });
114
- return {
115
- success: true,
116
- commandResponse: jsonDiff,
117
- apiResponse: {}
118
- };
31
+ return helper.prepareLocalFile(args.localFilePath);
32
+ });
33
+ }
34
+ getFile2(session, args, helper) {
35
+ return __awaiter(this, void 0, void 0, function* () {
36
+ return yield zos_files_for_zowe_sdk_1.Get.USSFile(session, args.ussFilePath, Object.assign(Object.assign({}, helper.file2Options), { task: helper.task }));
119
37
  });
120
38
  }
121
39
  }
@@ -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;;;;;;;;;;;AAGF,yEAAmD;AAEnD,gEAA4D;AAE5D;;;GAGG;AACH,MAAqB,mBAAoB,SAAQ,wCAAkB;IAClD,QAAQ,CAAC,OAAwB,EAAE,IAAuB,EAAE,MAAyB;;YAC9F,OAAO,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvD,CAAC;KAAA;IACY,QAAQ,CAAC,OAAwB,EAAE,IAAuB,EAAE,MAAyB;;YAC9F,OAAO,MAAM,4BAAG,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,kCAAO,MAAM,CAAC,YAAY,KAAE,IAAI,EAAE,MAAM,CAAC,IAAI,IAAG,CAAC;QACvG,CAAC;KAAA;CACJ;AAPD,sCAOC"}
@@ -1,10 +1,12 @@
1
- import { AbstractSession, IHandlerParameters } from "@zowe/imperative";
2
- import { IZosFilesResponse } from "@zowe/zos-files-for-zowe-sdk";
3
- import { ZosFilesBaseHandler } from "../../ZosFilesBase.handler";
1
+ /// <reference types="node" />
2
+ import { AbstractSession, ICommandArguments } from "@zowe/imperative";
3
+ import { CompareBaseHandler } from "../CompareBase.handler";
4
+ import { CompareBaseHelper } from "../CompareBaseHelper";
4
5
  /**
5
6
  * Handler to compare spooldd's content
6
7
  * @export
7
8
  */
8
- export default class SpoolddHandler extends ZosFilesBaseHandler {
9
- processWithSession(commandParameters: IHandlerParameters, session: AbstractSession): Promise<IZosFilesResponse>;
9
+ export default class SpoolddHandler extends CompareBaseHandler {
10
+ getFile1(session: AbstractSession, args: ICommandArguments, helper: CompareBaseHelper): Promise<string | Buffer>;
11
+ getFile2(session: AbstractSession, args: ICommandArguments, helper: CompareBaseHelper): Promise<string | Buffer>;
10
12
  }
@@ -19,70 +19,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
19
19
  });
20
20
  };
21
21
  Object.defineProperty(exports, "__esModule", { value: true });
22
- const imperative_1 = require("@zowe/imperative");
23
22
  const zos_jobs_for_zowe_sdk_1 = require("@zowe/zos-jobs-for-zowe-sdk");
24
- const ZosFilesBase_handler_1 = require("../../ZosFilesBase.handler");
23
+ const CompareBase_handler_1 = require("../CompareBase.handler");
25
24
  /**
26
25
  * Handler to compare spooldd's content
27
26
  * @export
28
27
  */
29
- class SpoolddHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
30
- processWithSession(commandParameters, session) {
28
+ class SpoolddHandler extends CompareBase_handler_1.CompareBaseHandler {
29
+ getFile1(session, args, helper) {
31
30
  return __awaiter(this, void 0, void 0, function* () {
32
- const descriptionSeperator = ":";
33
- const task = {
34
- percentComplete: 0,
35
- statusMessage: "Retrieving first spool dd",
36
- stageName: imperative_1.TaskStage.IN_PROGRESS
37
- };
38
- // RETRIEVING INFO FOR FIRST SPOOLDD
39
- commandParameters.response.progress.startBar({ task });
40
- const spoolDescription1 = commandParameters.arguments.spoolDescription1;
41
- const spoolDescArr1 = spoolDescription1.split(descriptionSeperator);
42
- const jobName1 = spoolDescArr1[0];
43
- const jobId1 = spoolDescArr1[1];
44
- const spoolId1 = Number(spoolDescArr1[2]);
45
- let spoolContentString1 = yield zos_jobs_for_zowe_sdk_1.GetJobs.getSpoolContentById(session, jobName1, jobId1, spoolId1);
46
- commandParameters.response.progress.endBar();
47
- // RETRIEVING INFO FOR SECOND SPOOLDD
48
- task.statusMessage = "Retrieving second spooldd";
49
- commandParameters.response.progress.startBar({ task });
50
- const spoolDescription2 = commandParameters.arguments.spoolDescription2;
51
- const spoolDescArr2 = spoolDescription2.split(descriptionSeperator);
52
- const jobName2 = spoolDescArr2[0];
53
- const jobId2 = spoolDescArr2[1];
54
- const spoolId2 = Number(spoolDescArr2[2]);
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
68
- if (commandParameters.arguments.browserView) {
69
- yield imperative_1.DiffUtils.openDiffInbrowser(spoolContentString1, spoolContentString2);
70
- return {
71
- success: true,
72
- commandResponse: "Launching spool-dds' diffs in browser...",
73
- apiResponse: {}
74
- };
75
- }
76
- // RETURNING DIFF
77
- const jsonDiff = yield imperative_1.DiffUtils.getDiffString(spoolContentString1, spoolContentString2, {
78
- outputFormat: 'terminal',
79
- contextLinesArg: commandParameters.arguments.contextLines
80
- });
81
- return {
82
- success: true,
83
- commandResponse: jsonDiff,
84
- apiResponse: {}
85
- };
31
+ const { jobName, jobId, spoolId } = helper.prepareSpoolDescriptor(args.spoolDescription1);
32
+ return yield zos_jobs_for_zowe_sdk_1.GetJobs.getSpoolContentById(session, jobName, jobId, spoolId);
33
+ });
34
+ }
35
+ getFile2(session, args, helper) {
36
+ return __awaiter(this, void 0, void 0, function* () {
37
+ const { jobName, jobId, spoolId } = helper.prepareSpoolDescriptor(args.spoolDescription2);
38
+ return yield zos_jobs_for_zowe_sdk_1.GetJobs.getSpoolContentById(session, jobName, jobId, spoolId);
86
39
  });
87
40
  }
88
41
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Spooldd.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/sdd/Spooldd.handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Spooldd.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/sdd/Spooldd.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAGF,uEAAsD;AACtD,gEAA4D;AAG5D;;;GAGG;AACH,MAAqB,cAAe,SAAQ,wCAAkB;IAC7C,QAAQ,CAAC,OAAwB,EAAE,IAAuB,EAAE,MAAyB;;YAC9F,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC1F,OAAO,MAAM,+BAAO,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAC/E,CAAC;KAAA;IACY,QAAQ,CAAC,OAAwB,EAAE,IAAuB,EAAE,MAAyB;;YAC9F,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC1F,OAAO,MAAM,+BAAO,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAC/E,CAAC;KAAA;CACJ;AATD,iCASC"}
@@ -1,10 +1,12 @@
1
- import { AbstractSession, IHandlerParameters } from "@zowe/imperative";
2
- import { IZosFilesResponse } from "@zowe/zos-files-for-zowe-sdk";
3
- import { ZosFilesBaseHandler } from "../../ZosFilesBase.handler";
1
+ /// <reference types="node" />
2
+ import { AbstractSession, ICommandArguments } from "@zowe/imperative";
3
+ import { CompareBaseHandler } from "../CompareBase.handler";
4
+ import { CompareBaseHelper } from "../CompareBaseHelper";
4
5
  /**
5
6
  * Handler to view a data set's content
6
7
  * @export
7
8
  */
8
- export default class UssFileHandler extends ZosFilesBaseHandler {
9
- processWithSession(commandParameters: IHandlerParameters, session: AbstractSession): Promise<IZosFilesResponse>;
9
+ export default class UssFileHandler extends CompareBaseHandler {
10
+ getFile1(session: AbstractSession, args: ICommandArguments, helper: CompareBaseHelper): Promise<string | Buffer>;
11
+ getFile2(session: AbstractSession, args: ICommandArguments, helper: CompareBaseHelper): Promise<string | Buffer>;
10
12
  }