@sasjs/cli 3.6.2 → 3.6.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.
- package/build/cli.js +4 -4
- package/build/cli.spec.js +6 -6
- package/build/commands/add/addCommand.js +2 -2
- package/build/commands/add/addCredential.js +27 -27
- package/build/commands/add/addTarget.js +10 -10
- package/build/commands/add/internal/input.js +30 -30
- package/build/commands/add/internal/saveConfig.js +2 -2
- package/build/commands/add/spec/addCommand.spec.js +24 -20
- package/build/commands/add/spec/addCredential.spec.js +14 -14
- package/build/commands/add/spec/addTarget.spec.js +22 -22
- package/build/commands/build/build.js +81 -77
- package/build/commands/build/buildCommand.js +3 -3
- package/build/commands/build/compileBuildCommand.js +4 -4
- package/build/commands/build/internal/config.js +8 -8
- package/build/commands/build/internal/getLaunchPageCode.js +2 -2
- package/build/commands/build/spec/build.spec.js +10 -10
- package/build/commands/build/spec/buildCommand.spec.js +16 -12
- package/build/commands/build/spec/cb.spec.server.js +18 -18
- package/build/commands/build/spec/compileBuildCommand.spec.js +17 -13
- package/build/commands/compile/compile.js +61 -61
- package/build/commands/compile/compileCommand.js +10 -10
- package/build/commands/compile/compileSingleFile.js +17 -17
- package/build/commands/compile/internal/checkCompileStatus.js +11 -11
- package/build/commands/compile/internal/compareFolders.js +11 -11
- package/build/commands/compile/internal/compileJobFile.js +3 -3
- package/build/commands/compile/internal/compileServiceFile.js +14 -14
- package/build/commands/compile/internal/compileTestFile.js +41 -37
- package/build/commands/compile/internal/getAllJobFolders.js +13 -9
- package/build/commands/compile/internal/getAllServiceFolders.js +13 -9
- package/build/commands/compile/internal/getServerType.js +1 -1
- package/build/commands/compile/internal/identifySasFile.js +2 -2
- package/build/commands/compile/internal/loadDependencies.js +5 -5
- package/build/commands/compile/internal/spec/compileTestFile.spec.js +40 -40
- package/build/commands/compile/spec/compareFolders.spec.js +27 -27
- package/build/commands/compile/spec/compile.spec.js +93 -93
- package/build/commands/compile/spec/compileCommand.spec.js +37 -33
- package/build/commands/compile/spec/compileJobFile.spec.js +11 -11
- package/build/commands/compile/spec/compileServiceFile.spec.js +11 -11
- package/build/commands/compile/spec/copyFilesToBuildFolder.spec.js +7 -7
- package/build/commands/compile/spec/loadDependencies.spec.js +30 -30
- package/build/commands/context/contextCommand.js +16 -16
- package/build/commands/context/create.js +1 -1
- package/build/commands/context/delete.js +2 -2
- package/build/commands/context/edit.js +1 -1
- package/build/commands/context/export.js +5 -5
- package/build/commands/context/internal/validateConfigPath.js +1 -1
- package/build/commands/context/list.js +4 -4
- package/build/commands/context/spec/contextCommand.spec.js +80 -76
- package/build/commands/context/spec/create.spec.js +3 -3
- package/build/commands/context/spec/delete.spec.js +3 -3
- package/build/commands/context/spec/edit.spec.js +3 -3
- package/build/commands/context/spec/export.spec.js +8 -8
- package/build/commands/context/spec/list.spec.js +5 -5
- package/build/commands/create/create.js +12 -12
- package/build/commands/create/createCommand.js +2 -2
- package/build/commands/create/internal/createReadme.js +2 -2
- package/build/commands/create/spec/create.spec.js +39 -39
- package/build/commands/create/spec/createCommand.spec.js +14 -10
- package/build/commands/db/db.js +22 -22
- package/build/commands/db/dbCommand.js +1 -1
- package/build/commands/db/spec/db.spec.js +8 -8
- package/build/commands/db/spec/dbCommand.spec.js +11 -7
- package/build/commands/deploy/compileBuildDeployCommand.js +6 -6
- package/build/commands/deploy/deploy.js +39 -39
- package/build/commands/deploy/deployCommand.js +2 -2
- package/build/commands/deploy/internal/getDeployScripts.js +14 -10
- package/build/commands/deploy/spec/cbd.spec.js +14 -14
- package/build/commands/deploy/spec/cbd.spec.server.js +40 -40
- package/build/commands/deploy/spec/compileBuildDeployCommand.spec.js +18 -14
- package/build/commands/deploy/spec/deployCommand.spec.js +15 -11
- package/build/commands/deploy/spec/getDeployScripts.spec.js +8 -8
- package/build/commands/deploy/spec/utils.js +17 -17
- package/build/commands/docs/docsCommand.js +7 -7
- package/build/commands/docs/generateDocs.js +33 -29
- package/build/commands/docs/generateDot.js +12 -8
- package/build/commands/docs/initDocs.js +1 -1
- package/build/commands/docs/internal/createDotFiles.js +6 -6
- package/build/commands/docs/internal/getDotFileContent.js +17 -17
- package/build/commands/docs/internal/getFileInputs.js +1 -1
- package/build/commands/docs/internal/getFileOutputs.js +1 -1
- package/build/commands/docs/internal/getFoldersForDocs.js +4 -4
- package/build/commands/docs/internal/populateNodeDictionary.js +1 -1
- package/build/commands/docs/spec/docsCommand.spec.js +25 -21
- package/build/commands/docs/spec/generateDocs.spec.js +60 -60
- package/build/commands/docs/spec/generateDot.spec.js +23 -23
- package/build/commands/docs/spec/getDocConfig.spec.js +2 -2
- package/build/commands/docs/spec/initDocs.spec.js +7 -7
- package/build/commands/flow/execute.js +8 -8
- package/build/commands/flow/flowCommand.js +5 -5
- package/build/commands/flow/internal/checkPredecessorDeadlock.js +11 -7
- package/build/commands/flow/internal/executeFlow.js +23 -23
- package/build/commands/flow/internal/failAllSuccessors.js +1 -1
- package/build/commands/flow/internal/generateFileName.js +2 -2
- package/build/commands/flow/internal/normalizeFilePath.js +1 -1
- package/build/commands/flow/internal/parseJobDetails.js +3 -3
- package/build/commands/flow/internal/printError.js +1 -1
- package/build/commands/flow/internal/saveLog.js +8 -8
- package/build/commands/flow/internal/saveToCsv.js +2 -2
- package/build/commands/flow/internal/spec/allFlowsCompleted.spec.js +4 -4
- package/build/commands/flow/internal/spec/checkPredecessorDeadlock.spec.js +4 -4
- package/build/commands/flow/internal/spec/executeFlow.spec.js +10 -10
- package/build/commands/flow/internal/spec/failAllSuccessors.spec.js +1 -1
- package/build/commands/flow/internal/spec/saveToCsv.spec.js +16 -16
- package/build/commands/flow/internal/spec/validateParams.spec.js +33 -33
- package/build/commands/flow/internal/validateParams.js +17 -17
- package/build/commands/flow/spec/flow.spec.js +1 -1
- package/build/commands/flow/spec/flow.spec.server.js +60 -60
- package/build/commands/flow/spec/flowCommand.spec.js +16 -12
- package/build/commands/folder/create.js +2 -2
- package/build/commands/folder/delete.js +2 -2
- package/build/commands/folder/folderCommand.js +11 -11
- package/build/commands/folder/move.js +2 -2
- package/build/commands/folder/spec/folder.spec.server.js +35 -35
- package/build/commands/folder/spec/folderCommand.spec.js +23 -19
- package/build/commands/help/help.js +46 -46
- package/build/commands/help/helpCommand.js +1 -1
- package/build/commands/help/spec/help.spec.js +8 -8
- package/build/commands/help/spec/helpCommand.spec.js +11 -7
- package/build/commands/init/init.js +7 -7
- package/build/commands/init/initCommand.js +1 -1
- package/build/commands/init/spec/init.spec.server.js +17 -17
- package/build/commands/init/spec/initCommand.spec.js +11 -7
- package/build/commands/job/internal/execute/sasjs.js +1 -1
- package/build/commands/job/internal/execute/viya.js +35 -35
- package/build/commands/job/internal/utils.js +6 -6
- package/build/commands/job/jobCommand.js +6 -6
- package/build/commands/job/spec/execute.spec.js +6 -6
- package/build/commands/job/spec/getContextName.spec.js +2 -2
- package/build/commands/job/spec/job.spec.server.js +53 -53
- package/build/commands/job/spec/jobCommand.spec.js +17 -13
- package/build/commands/lint/initLint.js +2 -2
- package/build/commands/lint/lintCommand.js +10 -10
- package/build/commands/lint/processLint.js +5 -5
- package/build/commands/lint/spec/lintCommand.spec.js +19 -15
- package/build/commands/request/request.js +16 -16
- package/build/commands/request/requestCommand.js +5 -5
- package/build/commands/request/spec/request.spec.server.js +71 -71
- package/build/commands/request/spec/requestCommand.spec.js +17 -13
- package/build/commands/run/run.js +23 -23
- package/build/commands/run/runCommand.js +2 -2
- package/build/commands/run/spec/run.spec.server.js +51 -51
- package/build/commands/run/spec/runCommand.spec.js +10 -6
- package/build/commands/servicepack/deploy.js +6 -6
- package/build/commands/servicepack/servicePackCommand.js +3 -3
- package/build/commands/servicepack/spec/servicepack.spec.server.js +6 -6
- package/build/commands/servicepack/spec/servicepackCommand.spec.js +10 -6
- package/build/commands/shared/createConfigFile.js +2 -2
- package/build/commands/shared/createFileStructure.js +6 -6
- package/build/commands/shared/createLintConfigFile.js +1 -1
- package/build/commands/shared/deployToSasViyaWithServicePack.js +4 -4
- package/build/commands/shared/fetchLogFileContent.js +10 -6
- package/build/commands/testing/internal/saveOutput.js +38 -34
- package/build/commands/testing/spec/testCommand.spec.js +17 -13
- package/build/commands/testing/spec/testing.spec.server.js +38 -38
- package/build/commands/testing/test.js +45 -41
- package/build/commands/testing/testCommand.js +2 -2
- package/build/commands/version/spec/version.spec.js +1 -1
- package/build/commands/version/spec/versionCommand.spec.js +11 -7
- package/build/commands/version/version.js +3 -3
- package/build/commands/version/versionCommand.js +2 -2
- package/build/commands/web/internal/createAssetServices.js +28 -24
- package/build/commands/web/internal/getWebServiceContent.js +6 -6
- package/build/commands/web/internal/sasjsout.d.ts +1 -1
- package/build/commands/web/internal/sasjsout.js +1 -1
- package/build/commands/web/internal/spec/updateLinkTag.spec.js +2 -2
- package/build/commands/web/internal/spec/updateScriptTag.spec.js +10 -10
- package/build/commands/web/internal/updateAllTags.js +19 -15
- package/build/commands/web/internal/updateLinkTag.js +2 -2
- package/build/commands/web/internal/updateScriptTag.js +6 -6
- package/build/commands/web/spec/web.spec.js +23 -23
- package/build/commands/web/spec/webCommand.spec.js +16 -12
- package/build/commands/web/web.js +25 -25
- package/build/commands/web/webCommand.js +3 -3
- package/build/types/command/commandBase.js +19 -15
- package/build/types/command/parse.js +1 -1
- package/build/types/command/spec/commandBase.spec.js +16 -12
- package/build/types/command/targetCommand.js +4 -4
- package/build/types/command/unalias.js +9 -5
- package/build/utils/auth.js +7 -7
- package/build/utils/config.js +53 -49
- package/build/utils/displayResult.js +4 -4
- package/build/utils/file.js +11 -11
- package/build/utils/fileStructures/builtFiles.js +2 -2
- package/build/utils/fileStructures/builtFilesCustom1.js +2 -2
- package/build/utils/getLogFilePath.js +1 -1
- package/build/utils/loadEnvVariables.js +3 -3
- package/build/utils/prefixAppLoc.js +1 -1
- package/build/utils/saveLog.js +7 -7
- package/build/utils/setConstants.js +4 -4
- package/build/utils/setProjectDir.js +2 -2
- package/build/utils/spec/config.spec.js +80 -80
- package/build/utils/spec/displayResult.spec.js +7 -7
- package/build/utils/spec/file.spec.js +15 -15
- package/build/utils/spec/removeComments.spec.js +11 -11
- package/build/utils/spec/setConstants.spec.js +3 -3
- package/build/utils/spec/utils.spec.js +55 -55
- package/build/utils/test.js +59 -59
- package/build/utils/utils.js +47 -43
- package/package.json +10 -10
|
@@ -64,19 +64,19 @@ describe('sasjs flow', function () {
|
|
|
64
64
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
65
65
|
return __generator(this, function (_a) {
|
|
66
66
|
switch (_a.label) {
|
|
67
|
-
case 0: return [4 /*yield*/, config_1.getAuthConfig(target)];
|
|
67
|
+
case 0: return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
|
|
68
68
|
case 1:
|
|
69
69
|
authConfig = _a.sent();
|
|
70
|
-
return [4 /*yield*/, test_1.createTestApp(__dirname, target.name)];
|
|
70
|
+
return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, target.name)];
|
|
71
71
|
case 2:
|
|
72
72
|
_a.sent();
|
|
73
73
|
return [4 /*yield*/, copyJobsAndServices(target.name)];
|
|
74
74
|
case 3:
|
|
75
75
|
_a.sent();
|
|
76
|
-
return [4 /*yield*/, __1.build(target)];
|
|
76
|
+
return [4 /*yield*/, (0, __1.build)(target)];
|
|
77
77
|
case 4:
|
|
78
78
|
_a.sent();
|
|
79
|
-
return [4 /*yield*/, __1.deploy(target, false)];
|
|
79
|
+
return [4 /*yield*/, (0, __1.deploy)(target, false)];
|
|
80
80
|
case 5:
|
|
81
81
|
_a.sent();
|
|
82
82
|
process.logger = new utils_2.Logger(utils_2.LogLevel.Off);
|
|
@@ -87,7 +87,7 @@ describe('sasjs flow', function () {
|
|
|
87
87
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
88
88
|
return __generator(this, function (_a) {
|
|
89
89
|
switch (_a.label) {
|
|
90
|
-
case 0: return [4 /*yield*/, utils_1.deleteFolder(logPath)];
|
|
90
|
+
case 0: return [4 /*yield*/, (0, utils_1.deleteFolder)(logPath)];
|
|
91
91
|
case 1:
|
|
92
92
|
_a.sent();
|
|
93
93
|
jest.resetAllMocks();
|
|
@@ -98,16 +98,16 @@ describe('sasjs flow', function () {
|
|
|
98
98
|
afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
99
99
|
return __generator(this, function (_a) {
|
|
100
100
|
switch (_a.label) {
|
|
101
|
-
case 0: return [4 /*yield*/, test_1.removeTestServerFolder("/Public/app/cli-tests/"
|
|
101
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestServerFolder)("/Public/app/cli-tests/".concat(target.name), target)];
|
|
102
102
|
case 1:
|
|
103
103
|
_a.sent();
|
|
104
|
-
return [4 /*yield*/, utils_1.deleteFile(csvPath)];
|
|
104
|
+
return [4 /*yield*/, (0, utils_1.deleteFile)(csvPath)];
|
|
105
105
|
case 2:
|
|
106
106
|
_a.sent();
|
|
107
|
-
return [4 /*yield*/, test_1.removeTestApp(__dirname, target.name)];
|
|
107
|
+
return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, target.name)];
|
|
108
108
|
case 3:
|
|
109
109
|
_a.sent();
|
|
110
|
-
return [4 /*yield*/, config_1.removeFromGlobalConfig(target.name)];
|
|
110
|
+
return [4 /*yield*/, (0, config_1.removeFromGlobalConfig)(target.name)];
|
|
111
111
|
case 4:
|
|
112
112
|
_a.sent();
|
|
113
113
|
return [2 /*return*/];
|
|
@@ -120,20 +120,20 @@ describe('sasjs flow', function () {
|
|
|
120
120
|
switch (_a.label) {
|
|
121
121
|
case 0:
|
|
122
122
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'testFlow_1.json');
|
|
123
|
-
return [4 /*yield*/, execute_1.execute(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
123
|
+
return [4 /*yield*/, (0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
124
124
|
case 1:
|
|
125
125
|
_a.sent();
|
|
126
|
-
return [4 /*yield*/, expect(utils_1.fileExists(csvPath)).resolves.toEqual(true)];
|
|
126
|
+
return [4 /*yield*/, expect((0, utils_1.fileExists)(csvPath)).resolves.toEqual(true)];
|
|
127
127
|
case 2:
|
|
128
128
|
_a.sent();
|
|
129
|
-
return [4 /*yield*/, expect(utils_1.folderExists(logPath)).resolves.toEqual(true)];
|
|
129
|
+
return [4 /*yield*/, expect((0, utils_1.folderExists)(logPath)).resolves.toEqual(true)];
|
|
130
130
|
case 3:
|
|
131
131
|
_a.sent();
|
|
132
|
-
return [4 /*yield*/, utils_1.readFile(csvPath)];
|
|
132
|
+
return [4 /*yield*/, (0, utils_1.readFile)(csvPath)];
|
|
133
133
|
case 4:
|
|
134
134
|
csvData = (_a.sent());
|
|
135
135
|
csvColumnsRegExp = new RegExp('^id,Flow,Predecessors,Location,Status,Log location,Details');
|
|
136
|
-
csvRowRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/"
|
|
136
|
+
csvRowRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/job,completed,"), 'gm');
|
|
137
137
|
expect(csvData.match(csvColumnsRegExp).length).toEqual(1);
|
|
138
138
|
expect(csvData.match(csvRowRegExp).length).toEqual(2);
|
|
139
139
|
return [2 /*return*/];
|
|
@@ -147,17 +147,17 @@ describe('sasjs flow', function () {
|
|
|
147
147
|
case 0:
|
|
148
148
|
largeLogFileLines = 21 * 1000;
|
|
149
149
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'testFlow_8.json');
|
|
150
|
-
return [4 /*yield*/, execute_1.execute(target, sasjs, authConfig, sourcePath, logPath)];
|
|
150
|
+
return [4 /*yield*/, (0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath)];
|
|
151
151
|
case 1:
|
|
152
152
|
_a.sent();
|
|
153
|
-
return [4 /*yield*/, expect(utils_1.folderExists(logPath)).resolves.toEqual(true)];
|
|
153
|
+
return [4 /*yield*/, expect((0, utils_1.folderExists)(logPath)).resolves.toEqual(true)];
|
|
154
154
|
case 2:
|
|
155
155
|
_a.sent();
|
|
156
|
-
return [4 /*yield*/, utils_1.listFilesInFolder(logPath)];
|
|
156
|
+
return [4 /*yield*/, (0, utils_1.listFilesInFolder)(logPath)];
|
|
157
157
|
case 3:
|
|
158
158
|
filesInLogFolder = _a.sent();
|
|
159
159
|
logFilePath = path_1.default.join(logPath, filesInLogFolder[0]);
|
|
160
|
-
return [4 /*yield*/, utils_1.readFile(logFilePath)];
|
|
160
|
+
return [4 /*yield*/, (0, utils_1.readFile)(logFilePath)];
|
|
161
161
|
case 4:
|
|
162
162
|
logContent = _a.sent();
|
|
163
163
|
count = 0;
|
|
@@ -178,7 +178,7 @@ describe('sasjs flow', function () {
|
|
|
178
178
|
switch (_a.label) {
|
|
179
179
|
case 0:
|
|
180
180
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'not_valid.txt');
|
|
181
|
-
return [4 /*yield*/, expect(execute_1.execute(target, sasjs, authConfig, sourcePath, logPath, csvPath)).rejects.toEqual("Please provide flow source (--source) file.\n"
|
|
181
|
+
return [4 /*yield*/, expect((0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath, csvPath)).rejects.toEqual("Please provide flow source (--source) file.\n".concat(examples_1.default.command))];
|
|
182
182
|
case 1:
|
|
183
183
|
_a.sent();
|
|
184
184
|
return [2 /*return*/];
|
|
@@ -191,7 +191,7 @@ describe('sasjs flow', function () {
|
|
|
191
191
|
switch (_a.label) {
|
|
192
192
|
case 0:
|
|
193
193
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'does_not_exist.json');
|
|
194
|
-
return [4 /*yield*/, expect(execute_1.execute(target, sasjs, authConfig, sourcePath, logPath, csvPath)).rejects.toEqual("Source file does not exist.\n"
|
|
194
|
+
return [4 /*yield*/, expect((0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath, csvPath)).rejects.toEqual("Source file does not exist.\n".concat(examples_1.default.command))];
|
|
195
195
|
case 1:
|
|
196
196
|
_a.sent();
|
|
197
197
|
return [2 /*return*/];
|
|
@@ -204,7 +204,7 @@ describe('sasjs flow', function () {
|
|
|
204
204
|
switch (_a.label) {
|
|
205
205
|
case 0:
|
|
206
206
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'not_valid_1.json');
|
|
207
|
-
return [4 /*yield*/, expect(execute_1.execute(target, sasjs, authConfig, sourcePath, logPath, csvPath)).rejects.toEqual("Unable to parse JSON of provided source file.\n" + examples_1.default.source)];
|
|
207
|
+
return [4 /*yield*/, expect((0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath, csvPath)).rejects.toEqual("Unable to parse JSON of provided source file.\n" + examples_1.default.source)];
|
|
208
208
|
case 1:
|
|
209
209
|
_a.sent();
|
|
210
210
|
return [2 /*return*/];
|
|
@@ -217,7 +217,7 @@ describe('sasjs flow', function () {
|
|
|
217
217
|
switch (_a.label) {
|
|
218
218
|
case 0:
|
|
219
219
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'not_valid_2.json');
|
|
220
|
-
return [4 /*yield*/, expect(execute_1.execute(target, sasjs, authConfig, sourcePath, logPath, csvPath)).rejects.toEqual("There are no flows present in source JSON.\n" + examples_1.default.source)];
|
|
220
|
+
return [4 /*yield*/, expect((0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath, csvPath)).rejects.toEqual("There are no flows present in source JSON.\n" + examples_1.default.source)];
|
|
221
221
|
case 1:
|
|
222
222
|
_a.sent();
|
|
223
223
|
return [2 /*return*/];
|
|
@@ -230,7 +230,7 @@ describe('sasjs flow', function () {
|
|
|
230
230
|
switch (_a.label) {
|
|
231
231
|
case 0:
|
|
232
232
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'not_valid_3.json');
|
|
233
|
-
return [4 /*yield*/, expect(execute_1.execute(target, sasjs, authConfig, sourcePath, logPath, csvPath)).rejects.toEqual(examples_1.default.source)];
|
|
233
|
+
return [4 /*yield*/, expect((0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath, csvPath)).rejects.toEqual(examples_1.default.source)];
|
|
234
234
|
case 1:
|
|
235
235
|
_a.sent();
|
|
236
236
|
return [2 /*return*/];
|
|
@@ -243,15 +243,15 @@ describe('sasjs flow', function () {
|
|
|
243
243
|
switch (_a.label) {
|
|
244
244
|
case 0:
|
|
245
245
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'testFlow_2.json');
|
|
246
|
-
return [4 /*yield*/, execute_1.execute(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
246
|
+
return [4 /*yield*/, (0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
247
247
|
case 1:
|
|
248
248
|
_a.sent();
|
|
249
|
-
return [4 /*yield*/, utils_1.readFile(csvPath)];
|
|
249
|
+
return [4 /*yield*/, (0, utils_1.readFile)(csvPath)];
|
|
250
250
|
case 2:
|
|
251
251
|
csvData = _a.sent();
|
|
252
252
|
csvColumnsRegExp = new RegExp('^id,Flow,Predecessors,Location,Status,Log location,Details');
|
|
253
|
-
csvRowCompletedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/"
|
|
254
|
-
csvRowFailedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/"
|
|
253
|
+
csvRowCompletedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/job,completed,"), 'gm');
|
|
254
|
+
csvRowFailedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/failingJob,failure,"), 'gm');
|
|
255
255
|
expect(csvData.match(csvColumnsRegExp).length).toEqual(1);
|
|
256
256
|
expect(csvData.match(csvRowCompletedRegExp).length).toEqual(2);
|
|
257
257
|
expect(csvData.match(csvRowFailedRegExp).length).toEqual(1);
|
|
@@ -266,15 +266,15 @@ describe('sasjs flow', function () {
|
|
|
266
266
|
case 0:
|
|
267
267
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'testFlow_3.json');
|
|
268
268
|
jest.spyOn(process.logger, 'error');
|
|
269
|
-
return [4 /*yield*/, execute_1.execute(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
269
|
+
return [4 /*yield*/, (0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
270
270
|
case 1:
|
|
271
271
|
_a.sent();
|
|
272
|
-
return [4 /*yield*/, utils_1.readFile(csvPath)];
|
|
272
|
+
return [4 /*yield*/, (0, utils_1.readFile)(csvPath)];
|
|
273
273
|
case 2:
|
|
274
274
|
csvData = _a.sent();
|
|
275
275
|
csvColumnsRegExp = new RegExp('^id,Flow,Predecessors,Location,Status,Log location,Details');
|
|
276
|
-
csvRowCompletedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/"
|
|
277
|
-
csvRowFailedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/"
|
|
276
|
+
csvRowCompletedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/job,completed,"), 'gm');
|
|
277
|
+
csvRowFailedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/DOES_NOT_EXIST,failure,,Job was not found."), 'gm');
|
|
278
278
|
expect(csvData.match(csvColumnsRegExp).length).toEqual(1);
|
|
279
279
|
expect(csvData.match(csvRowCompletedRegExp).length).toEqual(1);
|
|
280
280
|
expect(csvData.match(csvRowFailedRegExp).length).toEqual(1);
|
|
@@ -289,15 +289,15 @@ describe('sasjs flow', function () {
|
|
|
289
289
|
switch (_a.label) {
|
|
290
290
|
case 0:
|
|
291
291
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'testFlow_4.json');
|
|
292
|
-
return [4 /*yield*/, execute_1.execute(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
292
|
+
return [4 /*yield*/, (0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
293
293
|
case 1:
|
|
294
294
|
_a.sent();
|
|
295
|
-
return [4 /*yield*/, utils_1.readFile(csvPath)];
|
|
295
|
+
return [4 /*yield*/, (0, utils_1.readFile)(csvPath)];
|
|
296
296
|
case 2:
|
|
297
297
|
csvData = _a.sent();
|
|
298
298
|
csvColumnsRegExp = new RegExp('^id,Flow,Predecessors,Location,Status,Log location,Details');
|
|
299
|
-
csvRowCompletedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/"
|
|
300
|
-
csvRowFailedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/"
|
|
299
|
+
csvRowCompletedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/job,completed,"), 'gm');
|
|
300
|
+
csvRowFailedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/failingJob,failure,"), 'gm');
|
|
301
301
|
expect(csvData.match(csvColumnsRegExp).length).toEqual(1);
|
|
302
302
|
expect(csvData.match(csvRowCompletedRegExp).length).toEqual(1);
|
|
303
303
|
expect(csvData.match(csvRowFailedRegExp).length).toEqual(1);
|
|
@@ -311,16 +311,16 @@ describe('sasjs flow', function () {
|
|
|
311
311
|
switch (_a.label) {
|
|
312
312
|
case 0:
|
|
313
313
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'testFlow_5.json');
|
|
314
|
-
return [4 /*yield*/, execute_1.execute(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
314
|
+
return [4 /*yield*/, (0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
315
315
|
case 1:
|
|
316
316
|
_a.sent();
|
|
317
|
-
return [4 /*yield*/, utils_1.readFile(csvPath)];
|
|
317
|
+
return [4 /*yield*/, (0, utils_1.readFile)(csvPath)];
|
|
318
318
|
case 2:
|
|
319
319
|
csvData = _a.sent();
|
|
320
320
|
csvColumnsRegExp = new RegExp('^id,Flow,Predecessors,Location,Status,Log location,Details');
|
|
321
|
-
csvRowFirstFlowCompletedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/"
|
|
322
|
-
csvRowSecondFlowCompletedRegExp = new RegExp("\\d,secondFlow,firstFlow,/Public/app/cli-tests/"
|
|
323
|
-
csvRowFailedRegExp = new RegExp("\\d,secondFlow,firstFlow,/Public/app/cli-tests/"
|
|
321
|
+
csvRowFirstFlowCompletedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/job,completed,"), 'gm');
|
|
322
|
+
csvRowSecondFlowCompletedRegExp = new RegExp("\\d,secondFlow,firstFlow,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/job,completed,"), 'gm');
|
|
323
|
+
csvRowFailedRegExp = new RegExp("\\d,secondFlow,firstFlow,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/failingJob,failure,"), 'gm');
|
|
324
324
|
expect(csvData.match(csvColumnsRegExp).length).toEqual(1);
|
|
325
325
|
expect(csvData.match(csvRowFirstFlowCompletedRegExp).length).toEqual(2);
|
|
326
326
|
expect(csvData.match(csvRowSecondFlowCompletedRegExp).length).toEqual(1);
|
|
@@ -335,15 +335,15 @@ describe('sasjs flow', function () {
|
|
|
335
335
|
switch (_a.label) {
|
|
336
336
|
case 0:
|
|
337
337
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'testFlow_6.json');
|
|
338
|
-
return [4 /*yield*/, execute_1.execute(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
338
|
+
return [4 /*yield*/, (0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
339
339
|
case 1:
|
|
340
340
|
_a.sent();
|
|
341
|
-
return [4 /*yield*/, utils_1.readFile(csvPath)];
|
|
341
|
+
return [4 /*yield*/, (0, utils_1.readFile)(csvPath)];
|
|
342
342
|
case 2:
|
|
343
343
|
csvData = _a.sent();
|
|
344
344
|
csvColumnsRegExp = new RegExp('^id,Flow,Predecessors,Location,Status,Log location,Details');
|
|
345
|
-
csvRowFirstFlowCompletedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/"
|
|
346
|
-
csvRowFailedRegExp = new RegExp("\\d,secondFlow,firstFlow,/Public/app/cli-tests/"
|
|
345
|
+
csvRowFirstFlowCompletedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/job,completed,"), 'gm');
|
|
346
|
+
csvRowFailedRegExp = new RegExp("\\d,secondFlow,firstFlow,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/failingJob,failure,"), 'gm');
|
|
347
347
|
expect(csvData.match(csvColumnsRegExp).length).toEqual(1);
|
|
348
348
|
expect(csvData.match(csvRowFirstFlowCompletedRegExp).length).toEqual(2);
|
|
349
349
|
expect(csvData.match(csvRowFailedRegExp).length).toEqual(1);
|
|
@@ -357,18 +357,18 @@ describe('sasjs flow', function () {
|
|
|
357
357
|
switch (_a.label) {
|
|
358
358
|
case 0:
|
|
359
359
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'testFlow_7.json');
|
|
360
|
-
return [4 /*yield*/, execute_1.execute(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
360
|
+
return [4 /*yield*/, (0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath, csvPath)];
|
|
361
361
|
case 1:
|
|
362
362
|
_a.sent();
|
|
363
|
-
return [4 /*yield*/, utils_1.readFile(csvPath)];
|
|
363
|
+
return [4 /*yield*/, (0, utils_1.readFile)(csvPath)];
|
|
364
364
|
case 2:
|
|
365
365
|
csvData = _a.sent();
|
|
366
366
|
csvColumnsRegExp = new RegExp('^id,Flow,Predecessors,Location,Status,Log location,Details');
|
|
367
|
-
csvRowFirstFlowCompletedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/"
|
|
368
|
-
csvRowSecondFlowCompletedRegExp = new RegExp("\\d,secondFlow,firstFlow,/Public/app/cli-tests/"
|
|
369
|
-
csvRowThirdFlowCompletedRegExp = new RegExp("\\d,thirdFlow,firstFlow \\| secondFlow,/Public/app/cli-tests/"
|
|
370
|
-
csvRowThirdFlowFailedRegExp = new RegExp("\\d,thirdFlow,firstFlow \\| secondFlow,/Public/app/cli-tests/"
|
|
371
|
-
csvRowFourthFlowCompletedRegExp = new RegExp("\\d,fourthFlow,secondFlow,/Public/app/cli-tests/"
|
|
367
|
+
csvRowFirstFlowCompletedRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/job,completed,"), 'gm');
|
|
368
|
+
csvRowSecondFlowCompletedRegExp = new RegExp("\\d,secondFlow,firstFlow,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/job,completed,"), 'gm');
|
|
369
|
+
csvRowThirdFlowCompletedRegExp = new RegExp("\\d,thirdFlow,firstFlow \\| secondFlow,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/job,completed,"), 'gm');
|
|
370
|
+
csvRowThirdFlowFailedRegExp = new RegExp("\\d,thirdFlow,firstFlow \\| secondFlow,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/failingJob,failure,"), 'gm');
|
|
371
|
+
csvRowFourthFlowCompletedRegExp = new RegExp("\\d,fourthFlow,secondFlow,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/job,completed,"), 'gm');
|
|
372
372
|
csvRowFailedRegExp = new RegExp("fifthFlow", 'gm');
|
|
373
373
|
expect(csvData.match(csvColumnsRegExp).length).toEqual(1);
|
|
374
374
|
expect(csvData.match(csvRowFirstFlowCompletedRegExp).length).toEqual(2);
|
|
@@ -388,17 +388,17 @@ describe('sasjs flow', function () {
|
|
|
388
388
|
case 0:
|
|
389
389
|
sourcePath = path_1.default.join(__dirname, 'sourceFiles', 'testFlow_1.json');
|
|
390
390
|
csvLoc = path_1.default.join(__dirname, target.name, 'sasjsbuild', 'flowResults.csv');
|
|
391
|
-
return [4 /*yield*/, execute_1.execute(target, sasjs, authConfig, sourcePath, logPath, csvLoc)];
|
|
391
|
+
return [4 /*yield*/, (0, execute_1.execute)(target, sasjs, authConfig, sourcePath, logPath, csvLoc)];
|
|
392
392
|
case 1:
|
|
393
393
|
_a.sent();
|
|
394
|
-
return [4 /*yield*/, expect(utils_1.fileExists(csvLoc)).resolves.toEqual(true)];
|
|
394
|
+
return [4 /*yield*/, expect((0, utils_1.fileExists)(csvLoc)).resolves.toEqual(true)];
|
|
395
395
|
case 2:
|
|
396
396
|
_a.sent();
|
|
397
|
-
return [4 /*yield*/, utils_1.readFile(csvLoc)];
|
|
397
|
+
return [4 /*yield*/, (0, utils_1.readFile)(csvLoc)];
|
|
398
398
|
case 3:
|
|
399
399
|
csvData = (_a.sent());
|
|
400
400
|
csvColumnsRegExp = new RegExp('^id,Flow,Predecessors,Location,Status,Log location,Details');
|
|
401
|
-
csvRowRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/"
|
|
401
|
+
csvRowRegExp = new RegExp("\\d,firstFlow,none,/Public/app/cli-tests/".concat(target.name, "/jobs/testJob/job,completed,"), 'gm');
|
|
402
402
|
expect(csvData.match(csvColumnsRegExp).length).toEqual(1);
|
|
403
403
|
expect(csvData.match(csvRowRegExp).length).toEqual(2);
|
|
404
404
|
return [2 /*return*/];
|
|
@@ -409,15 +409,15 @@ describe('sasjs flow', function () {
|
|
|
409
409
|
function generateTarget(serverType) {
|
|
410
410
|
if (serverType === void 0) { serverType = utils_2.ServerType.SasViya; }
|
|
411
411
|
dotenv_1.default.config();
|
|
412
|
-
var timestamp = utils_2.generateTimestamp();
|
|
413
|
-
var targetName = "cli-tests-flow-"
|
|
412
|
+
var timestamp = (0, utils_2.generateTimestamp)();
|
|
413
|
+
var targetName = "cli-tests-flow-".concat(timestamp);
|
|
414
414
|
return new utils_2.Target({
|
|
415
415
|
name: targetName,
|
|
416
416
|
serverType: serverType,
|
|
417
417
|
serverUrl: (serverType === utils_2.ServerType.SasViya
|
|
418
418
|
? process.env.VIYA_SERVER_URL
|
|
419
419
|
: process.env.SAS9_SERVER_URL),
|
|
420
|
-
appLoc: "/Public/app/cli-tests/"
|
|
420
|
+
appLoc: "/Public/app/cli-tests/".concat(targetName),
|
|
421
421
|
contextName: utils_3.contextName,
|
|
422
422
|
serviceConfig: {
|
|
423
423
|
serviceFolders: ['sasjs/testServices', 'sasjs/testJob', 'sasjs/services'],
|
|
@@ -446,10 +446,10 @@ function generateTarget(serverType) {
|
|
|
446
446
|
var copyJobsAndServices = function (appName) { return __awaiter(void 0, void 0, void 0, function () {
|
|
447
447
|
return __generator(this, function (_a) {
|
|
448
448
|
switch (_a.label) {
|
|
449
|
-
case 0: return [4 /*yield*/, utils_1.copy(path_1.default.join(__dirname, 'testJob'), path_1.default.join(__dirname, appName, 'sasjs', 'testJob'))];
|
|
449
|
+
case 0: return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'testJob'), path_1.default.join(__dirname, appName, 'sasjs', 'testJob'))];
|
|
450
450
|
case 1:
|
|
451
451
|
_a.sent();
|
|
452
|
-
return [4 /*yield*/, utils_1.copy(path_1.default.join(__dirname, 'testServices'), path_1.default.join(__dirname, appName, 'sasjs', 'testServices'))];
|
|
452
|
+
return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'testServices'), path_1.default.join(__dirname, appName, 'sasjs', 'testServices'))];
|
|
453
453
|
case 2:
|
|
454
454
|
_a.sent();
|
|
455
455
|
return [2 /*return*/];
|
|
@@ -70,10 +70,14 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
70
70
|
}
|
|
71
71
|
return ar;
|
|
72
72
|
};
|
|
73
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
74
|
-
for (var i = 0,
|
|
75
|
-
|
|
76
|
-
|
|
73
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
74
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
75
|
+
if (ar || !(i in from)) {
|
|
76
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
77
|
+
ar[i] = from[i];
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
77
81
|
};
|
|
78
82
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
79
83
|
var executeModule = __importStar(require("../execute"));
|
|
@@ -97,7 +101,7 @@ describe('FlowCommand', function () {
|
|
|
97
101
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
98
102
|
return __generator(this, function (_a) {
|
|
99
103
|
switch (_a.label) {
|
|
100
|
-
case 0: return [4 /*yield*/, utils_2.setConstants()];
|
|
104
|
+
case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
101
105
|
case 1:
|
|
102
106
|
_a.sent();
|
|
103
107
|
return [2 /*return*/];
|
|
@@ -112,7 +116,7 @@ describe('FlowCommand', function () {
|
|
|
112
116
|
return __generator(this, function (_a) {
|
|
113
117
|
switch (_a.label) {
|
|
114
118
|
case 0:
|
|
115
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['flow', 'execute', '--source', source]);
|
|
119
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['flow', 'execute', '--source', source], false);
|
|
116
120
|
command = new flowCommand_1.FlowCommand(args);
|
|
117
121
|
return [4 /*yield*/, command.execute()];
|
|
118
122
|
case 1:
|
|
@@ -134,7 +138,7 @@ describe('FlowCommand', function () {
|
|
|
134
138
|
return __generator(this, function (_a) {
|
|
135
139
|
switch (_a.label) {
|
|
136
140
|
case 0:
|
|
137
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), [
|
|
141
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [
|
|
138
142
|
'flow',
|
|
139
143
|
'execute',
|
|
140
144
|
'--target',
|
|
@@ -146,7 +150,7 @@ describe('FlowCommand', function () {
|
|
|
146
150
|
'--csvFile',
|
|
147
151
|
csvFile,
|
|
148
152
|
'--streamLog'
|
|
149
|
-
]);
|
|
153
|
+
], false);
|
|
150
154
|
command = new flowCommand_1.FlowCommand(args);
|
|
151
155
|
return [4 /*yield*/, command.execute()];
|
|
152
156
|
case 1:
|
|
@@ -168,7 +172,7 @@ describe('FlowCommand', function () {
|
|
|
168
172
|
return __generator(this, function (_a) {
|
|
169
173
|
switch (_a.label) {
|
|
170
174
|
case 0:
|
|
171
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), [
|
|
175
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [
|
|
172
176
|
'flow',
|
|
173
177
|
'execute',
|
|
174
178
|
'-t',
|
|
@@ -180,7 +184,7 @@ describe('FlowCommand', function () {
|
|
|
180
184
|
'-c',
|
|
181
185
|
csvFile,
|
|
182
186
|
'--streamLog'
|
|
183
|
-
]);
|
|
187
|
+
], false);
|
|
184
188
|
command = new flowCommand_1.FlowCommand(args);
|
|
185
189
|
return [4 /*yield*/, command.execute()];
|
|
186
190
|
case 1:
|
|
@@ -202,7 +206,7 @@ describe('FlowCommand', function () {
|
|
|
202
206
|
return __generator(this, function (_a) {
|
|
203
207
|
switch (_a.label) {
|
|
204
208
|
case 0:
|
|
205
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['flow', 'execute', '--source', source]);
|
|
209
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['flow', 'execute', '--source', source], false);
|
|
206
210
|
command = new flowCommand_1.FlowCommand(args);
|
|
207
211
|
return [4 /*yield*/, command.execute()];
|
|
208
212
|
case 1:
|
|
@@ -217,7 +221,7 @@ describe('FlowCommand', function () {
|
|
|
217
221
|
return __generator(this, function (_a) {
|
|
218
222
|
switch (_a.label) {
|
|
219
223
|
case 0:
|
|
220
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['flow', 'execute', '--source', source]);
|
|
224
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['flow', 'execute', '--source', source], false);
|
|
221
225
|
jest
|
|
222
226
|
.spyOn(executeModule, 'execute')
|
|
223
227
|
.mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
|
|
@@ -57,7 +57,7 @@ var create = function (path, sasjs, accessToken, isForced) { return __awaiter(vo
|
|
|
57
57
|
.createFolder(folder, parentFolderPath, undefined, accessToken, undefined, isForced)
|
|
58
58
|
.catch(function (err) {
|
|
59
59
|
var _a;
|
|
60
|
-
displayResult_1.displayError(err, "An error has occurred when creating the folder "
|
|
60
|
+
(0, displayResult_1.displayError)(err, "An error has occurred when creating the folder ".concat(folder));
|
|
61
61
|
if (err.status && err.status === 409) {
|
|
62
62
|
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Consider using '-f' or '--force' flag, eg 'sasjs folder create /Public/folderToCreate -f'.\nWARNING: When using force, any existing content and subfolders of the target folder will be deleted.");
|
|
63
63
|
}
|
|
@@ -65,7 +65,7 @@ var create = function (path, sasjs, accessToken, isForced) { return __awaiter(vo
|
|
|
65
65
|
case 1:
|
|
66
66
|
createdFolder = _a.sent();
|
|
67
67
|
if (createdFolder) {
|
|
68
|
-
displayResult_1.displaySuccess("Folder '"
|
|
68
|
+
(0, displayResult_1.displaySuccess)("Folder '".concat(parentFolderPath + '/' + folder, "' has been successfully created."));
|
|
69
69
|
}
|
|
70
70
|
return [2 /*return*/];
|
|
71
71
|
}
|
|
@@ -52,13 +52,13 @@ var deleteFolder = function (path, sasjs, accessToken) { return __awaiter(void 0
|
|
|
52
52
|
.deleteFolder(path, accessToken)
|
|
53
53
|
.catch(function (err) {
|
|
54
54
|
var _a;
|
|
55
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Error deleting folder "
|
|
55
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Error deleting folder ".concat(path, ": "), err);
|
|
56
56
|
throw err;
|
|
57
57
|
})];
|
|
58
58
|
case 1:
|
|
59
59
|
deletedFolder = _b.sent();
|
|
60
60
|
if (deletedFolder) {
|
|
61
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Folder '"
|
|
61
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Folder '".concat(path, "' has been moved to 'Recycle Bin'."));
|
|
62
62
|
}
|
|
63
63
|
return [2 /*return*/];
|
|
64
64
|
}
|
|
@@ -136,7 +136,7 @@ var FolderCommand = /** @class */ (function (_super) {
|
|
|
136
136
|
appLoc: target.appLoc,
|
|
137
137
|
serverType: target.serverType
|
|
138
138
|
});
|
|
139
|
-
return [4 /*yield*/, utils_2.getAuthConfig(target).catch(function (err) {
|
|
139
|
+
return [4 /*yield*/, (0, utils_2.getAuthConfig)(target).catch(function (err) {
|
|
140
140
|
var _a;
|
|
141
141
|
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute folder command. Error fetching auth config: ', err);
|
|
142
142
|
return null;
|
|
@@ -183,8 +183,8 @@ var FolderCommand = /** @class */ (function (_super) {
|
|
|
183
183
|
return __generator(this, function (_a) {
|
|
184
184
|
switch (_a.label) {
|
|
185
185
|
case 0:
|
|
186
|
-
folderPath = prefixAppLoc_1.prefixAppLoc(target.appLoc, this.parsed.folderPath);
|
|
187
|
-
return [4 /*yield*/, create_1.create(folderPath, sasjs, authConfig.access_token, !!this.parsed.force)
|
|
186
|
+
folderPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.folderPath);
|
|
187
|
+
return [4 /*yield*/, (0, create_1.create)(folderPath, sasjs, authConfig.access_token, !!this.parsed.force)
|
|
188
188
|
.then(function () {
|
|
189
189
|
return command_1.ReturnCode.Success;
|
|
190
190
|
})
|
|
@@ -206,8 +206,8 @@ var FolderCommand = /** @class */ (function (_super) {
|
|
|
206
206
|
return __generator(this, function (_a) {
|
|
207
207
|
switch (_a.label) {
|
|
208
208
|
case 0:
|
|
209
|
-
folderPath = prefixAppLoc_1.prefixAppLoc(target.appLoc, this.parsed.folderPath);
|
|
210
|
-
return [4 /*yield*/, delete_1.deleteFolder(folderPath, sasjs, authConfig.access_token)
|
|
209
|
+
folderPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.folderPath);
|
|
210
|
+
return [4 /*yield*/, (0, delete_1.deleteFolder)(folderPath, sasjs, authConfig.access_token)
|
|
211
211
|
.then(function () {
|
|
212
212
|
return command_1.ReturnCode.Success;
|
|
213
213
|
})
|
|
@@ -227,8 +227,8 @@ var FolderCommand = /** @class */ (function (_super) {
|
|
|
227
227
|
return __generator(this, function (_a) {
|
|
228
228
|
switch (_a.label) {
|
|
229
229
|
case 0:
|
|
230
|
-
folderPath = prefixAppLoc_1.prefixAppLoc(target.appLoc, this.parsed.folderPath);
|
|
231
|
-
return [4 /*yield*/, list_1.list(folderPath, sasjs, authConfig.access_token)
|
|
230
|
+
folderPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.folderPath);
|
|
231
|
+
return [4 /*yield*/, (0, list_1.list)(folderPath, sasjs, authConfig.access_token)
|
|
232
232
|
.then(function () {
|
|
233
233
|
return command_1.ReturnCode.Success;
|
|
234
234
|
})
|
|
@@ -263,7 +263,7 @@ var FolderCommand = /** @class */ (function (_super) {
|
|
|
263
263
|
appLoc: target.appLoc,
|
|
264
264
|
serverType: target.serverType
|
|
265
265
|
});
|
|
266
|
-
return [4 /*yield*/, utils_2.getAuthConfig(target).catch(function (err) {
|
|
266
|
+
return [4 /*yield*/, (0, utils_2.getAuthConfig)(target).catch(function (err) {
|
|
267
267
|
var _a;
|
|
268
268
|
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to list folder. Error fetching auth config: ', err);
|
|
269
269
|
return null;
|
|
@@ -273,9 +273,9 @@ var FolderCommand = /** @class */ (function (_super) {
|
|
|
273
273
|
if (!authConfig) {
|
|
274
274
|
return [2 /*return*/, command_1.ReturnCode.InternalError];
|
|
275
275
|
}
|
|
276
|
-
sourceFolderPath = prefixAppLoc_1.prefixAppLoc(target.appLoc, this.parsed.sourceFolderPath);
|
|
277
|
-
targetFolderPath = prefixAppLoc_1.prefixAppLoc(target.appLoc, this.parsed.targetFolderPath);
|
|
278
|
-
return [4 /*yield*/, move_1.move(sourceFolderPath, targetFolderPath, sasjs, authConfig.access_token)
|
|
276
|
+
sourceFolderPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.sourceFolderPath);
|
|
277
|
+
targetFolderPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.targetFolderPath);
|
|
278
|
+
return [4 /*yield*/, (0, move_1.move)(sourceFolderPath, targetFolderPath, sasjs, authConfig.access_token)
|
|
279
279
|
.then(function () {
|
|
280
280
|
return command_1.ReturnCode.Success;
|
|
281
281
|
})
|
|
@@ -55,12 +55,12 @@ var move = function (sourcePath, destinationPath, sasjs, accessToken) { return _
|
|
|
55
55
|
return [4 /*yield*/, sasjs
|
|
56
56
|
.moveFolder(sourceFolder, targetFolder, targetFolderName, accessToken)
|
|
57
57
|
.catch(function (err) {
|
|
58
|
-
displayResult_1.displayError(err, "An error occurred when moving folder "
|
|
58
|
+
(0, displayResult_1.displayError)(err, "An error occurred when moving folder ".concat(sourceFolder, "."));
|
|
59
59
|
})];
|
|
60
60
|
case 1:
|
|
61
61
|
movedFolder = _a.sent();
|
|
62
62
|
if (movedFolder) {
|
|
63
|
-
displayResult_1.displaySuccess("Folder successfully moved from '"
|
|
63
|
+
(0, displayResult_1.displaySuccess)("Folder successfully moved from '".concat(sourceFolder, "' to '").concat(targetFolder, "'."));
|
|
64
64
|
}
|
|
65
65
|
return [2 /*return*/];
|
|
66
66
|
}
|