@sasjs/cli 3.6.1 → 3.6.5
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/README.md +0 -3
- 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 +12 -22
- package/build/commands/compile/spec/compileServiceFile.spec.js +12 -22
- package/build/commands/compile/spec/copyFilesToBuildFolder.spec.js +7 -7
- package/build/commands/compile/spec/loadDependencies.spec.js +31 -162
- 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 +50 -48
- 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 +11 -11
|
@@ -86,24 +86,24 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
|
|
|
86
86
|
_c.label = 2;
|
|
87
87
|
case 2:
|
|
88
88
|
if (!returnStatusOnly) {
|
|
89
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Job located at "
|
|
89
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Job located at ".concat(jobPath, " has been submitted for execution..."));
|
|
90
90
|
}
|
|
91
91
|
contextName = getContextName(target, returnStatusOnly);
|
|
92
92
|
if (!source) return [3 /*break*/, 5];
|
|
93
|
-
if (!file_1.isJsonFile(source))
|
|
93
|
+
if (!(0, file_1.isJsonFile)(source))
|
|
94
94
|
throw 'Source file has to be JSON.';
|
|
95
|
-
return [4 /*yield*/, utils_1.fileExists(source).catch(function (_) {
|
|
95
|
+
return [4 /*yield*/, (0, utils_1.fileExists)(source).catch(function (_) {
|
|
96
96
|
throw 'Error while checking if source file exists.';
|
|
97
97
|
})];
|
|
98
98
|
case 3:
|
|
99
99
|
_c.sent();
|
|
100
|
-
return [4 /*yield*/, utils_1.readFile(source).catch(function (_) {
|
|
100
|
+
return [4 /*yield*/, (0, utils_1.readFile)(source).catch(function (_) {
|
|
101
101
|
throw 'Error while reading source file.';
|
|
102
102
|
})];
|
|
103
103
|
case 4:
|
|
104
104
|
source = _c.sent();
|
|
105
105
|
macroVars = JSON.parse(source);
|
|
106
|
-
if (!utils_1.isMacroVars(macroVars)) {
|
|
106
|
+
if (!(0, utils_1.isMacroVars)(macroVars)) {
|
|
107
107
|
throw "Provided source is not valid. An example of valid source:\n{ macroVars: { name1: 'value1', name2: 'value2' } }";
|
|
108
108
|
}
|
|
109
109
|
_c.label = 5;
|
|
@@ -117,34 +117,34 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
|
|
|
117
117
|
case 0:
|
|
118
118
|
if (!(err instanceof node_1.NoSessionStateError)) return [3 /*break*/, 4];
|
|
119
119
|
if (!(err === null || err === void 0 ? void 0 : err.logUrl)) return [3 /*break*/, 3];
|
|
120
|
-
return [4 /*yield*/, fetchLogFileContent_1.fetchLogFileContent(sasjs, authConfig.access_token, err.logUrl, 100000)];
|
|
120
|
+
return [4 /*yield*/, (0, fetchLogFileContent_1.fetchLogFileContent)(sasjs, authConfig.access_token, err.logUrl, 100000)];
|
|
121
121
|
case 1:
|
|
122
122
|
logData = _b.sent();
|
|
123
|
-
return [4 /*yield*/, utils_3.saveLog(logData, logFile, jobPath, returnStatusOnly)];
|
|
123
|
+
return [4 /*yield*/, (0, utils_3.saveLog)(logData, logFile, jobPath, returnStatusOnly)];
|
|
124
124
|
case 2:
|
|
125
125
|
_b.sent();
|
|
126
126
|
_b.label = 3;
|
|
127
127
|
case 3:
|
|
128
|
-
displayResult_1.displayError(err);
|
|
129
|
-
utils_2.terminateProcess(2);
|
|
128
|
+
(0, displayResult_1.displayError)(err);
|
|
129
|
+
(0, utils_2.terminateProcess)(2);
|
|
130
130
|
_b.label = 4;
|
|
131
131
|
case 4:
|
|
132
132
|
if (!(err === null || err === void 0 ? void 0 : err.log)) return [3 /*break*/, 6];
|
|
133
|
-
return [4 /*yield*/, utils_3.saveLog(err.log, logFile, jobPath, returnStatusOnly)];
|
|
133
|
+
return [4 /*yield*/, (0, utils_3.saveLog)(err.log, logFile, jobPath, returnStatusOnly)];
|
|
134
134
|
case 5:
|
|
135
135
|
_b.sent();
|
|
136
136
|
_b.label = 6;
|
|
137
137
|
case 6:
|
|
138
138
|
if (returnStatusOnly)
|
|
139
|
-
utils_2.terminateProcess(2);
|
|
139
|
+
(0, utils_2.terminateProcess)(2);
|
|
140
140
|
if ((err === null || err === void 0 ? void 0 : err.name) === 'NotFoundError') {
|
|
141
|
-
throw new Error("Job located at '"
|
|
141
|
+
throw new Error("Job located at '".concat(jobPath, "' was not found."));
|
|
142
142
|
}
|
|
143
143
|
result = returnStatusOnly
|
|
144
144
|
? command_1.ReturnCode.InternalError
|
|
145
145
|
: typeof err === 'object' && Object.keys(err).length
|
|
146
146
|
? JSON.stringify({ state: (_a = err.job) === null || _a === void 0 ? void 0 : _a.state })
|
|
147
|
-
: ""
|
|
147
|
+
: "".concat(err);
|
|
148
148
|
if (err.job) {
|
|
149
149
|
return [2 /*return*/, err.job];
|
|
150
150
|
}
|
|
@@ -156,7 +156,7 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
|
|
|
156
156
|
submittedJob = _c.sent();
|
|
157
157
|
endTime = new Date().getTime();
|
|
158
158
|
if (result && !returnStatusOnly) {
|
|
159
|
-
displayResult_1.displayError(result, 'An error has occurred when executing a job.');
|
|
159
|
+
(0, displayResult_1.displayError)(result, 'An error has occurred when executing a job.');
|
|
160
160
|
}
|
|
161
161
|
if (submittedJob && submittedJob.job)
|
|
162
162
|
submittedJob = submittedJob.job;
|
|
@@ -185,18 +185,18 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
|
|
|
185
185
|
folderPath = outputPath.split(path_1.default.sep);
|
|
186
186
|
folderPath.pop();
|
|
187
187
|
parentFolderPath = folderPath.join(path_1.default.sep);
|
|
188
|
-
return [4 /*yield*/, utils_1.folderExists(parentFolderPath)];
|
|
188
|
+
return [4 /*yield*/, (0, utils_1.folderExists)(parentFolderPath)];
|
|
189
189
|
case 10:
|
|
190
190
|
if (!!(_c.sent())) return [3 /*break*/, 12];
|
|
191
|
-
return [4 /*yield*/, utils_1.createFolder(parentFolderPath)];
|
|
191
|
+
return [4 /*yield*/, (0, utils_1.createFolder)(parentFolderPath)];
|
|
192
192
|
case 11:
|
|
193
193
|
_c.sent();
|
|
194
194
|
_c.label = 12;
|
|
195
|
-
case 12: return [4 /*yield*/, utils_1.createFile(outputPath, outputJson)];
|
|
195
|
+
case 12: return [4 /*yield*/, (0, utils_1.createFile)(outputPath, outputJson)];
|
|
196
196
|
case 13:
|
|
197
197
|
_c.sent();
|
|
198
198
|
if (!returnStatusOnly)
|
|
199
|
-
displayResult_1.displaySuccess("Output saved to: "
|
|
199
|
+
(0, displayResult_1.displaySuccess)("Output saved to: ".concat(outputPath));
|
|
200
200
|
return [3 /*break*/, 15];
|
|
201
201
|
case 14:
|
|
202
202
|
if (output) {
|
|
@@ -210,10 +210,10 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
|
|
|
210
210
|
if (!logObj) return [3 /*break*/, 18];
|
|
211
211
|
logUrl = target.serverUrl + logObj.href;
|
|
212
212
|
logCount = submittedJob.logStatistics.lineCount;
|
|
213
|
-
return [4 /*yield*/, fetchLogFileContent_1.fetchLogFileContent(sasjs, authConfig.access_token, logUrl, logCount)];
|
|
213
|
+
return [4 /*yield*/, (0, fetchLogFileContent_1.fetchLogFileContent)(sasjs, authConfig.access_token, logUrl, logCount)];
|
|
214
214
|
case 16:
|
|
215
215
|
logData = _c.sent();
|
|
216
|
-
return [4 /*yield*/, utils_3.saveLog(logData, logFile, jobPath, returnStatusOnly)];
|
|
216
|
+
return [4 /*yield*/, (0, utils_3.saveLog)(logData, logFile, jobPath, returnStatusOnly)];
|
|
217
217
|
case 17:
|
|
218
218
|
_c.sent();
|
|
219
219
|
_c.label = 18;
|
|
@@ -224,18 +224,18 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
|
|
|
224
224
|
error_1 = _c.sent();
|
|
225
225
|
result = false;
|
|
226
226
|
if (!returnStatusOnly) {
|
|
227
|
-
displayResult_1.displayError(null, 'An error has occurred when parsing an output of the job.');
|
|
227
|
+
(0, displayResult_1.displayError)(null, 'An error has occurred when parsing an output of the job.');
|
|
228
228
|
}
|
|
229
229
|
return [3 /*break*/, 20];
|
|
230
230
|
case 20:
|
|
231
231
|
if (waitForJob && returnStatusOnly && submittedJob.state) {
|
|
232
232
|
switch (submittedJob.state) {
|
|
233
233
|
case 'completed':
|
|
234
|
-
utils_2.terminateProcess(0);
|
|
234
|
+
(0, utils_2.terminateProcess)(0);
|
|
235
235
|
case 'warning':
|
|
236
|
-
utils_2.terminateProcess(ignoreWarnings ? 0 : 1);
|
|
236
|
+
(0, utils_2.terminateProcess)(ignoreWarnings ? 0 : 1);
|
|
237
237
|
case 'error':
|
|
238
|
-
utils_2.terminateProcess(2);
|
|
238
|
+
(0, utils_2.terminateProcess)(2);
|
|
239
239
|
default:
|
|
240
240
|
break;
|
|
241
241
|
}
|
|
@@ -243,12 +243,12 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
|
|
|
243
243
|
return [3 /*break*/, 22];
|
|
244
244
|
case 21:
|
|
245
245
|
if (returnStatusOnly && result === 2) {
|
|
246
|
-
utils_2.terminateProcess(2);
|
|
246
|
+
(0, utils_2.terminateProcess)(2);
|
|
247
247
|
}
|
|
248
248
|
_c.label = 22;
|
|
249
249
|
case 22:
|
|
250
250
|
if (!returnStatusOnly) {
|
|
251
|
-
(_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("This job was executed in "
|
|
251
|
+
(_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("This job was executed in ".concat((endTime - startTime) / 1000, " seconds"));
|
|
252
252
|
}
|
|
253
253
|
return [2 /*return*/, result];
|
|
254
254
|
}
|
|
@@ -264,7 +264,7 @@ function getContextName(target, returnStatusOnly) {
|
|
|
264
264
|
if (target === null || target === void 0 ? void 0 : target.contextName)
|
|
265
265
|
return target.contextName;
|
|
266
266
|
if (!returnStatusOnly) {
|
|
267
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.warn("`contextName` was not provided in your target configuration. Falling back to context "
|
|
267
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.warn("`contextName` was not provided in your target configuration. Falling back to context ".concat(defaultContextName));
|
|
268
268
|
}
|
|
269
269
|
return defaultContextName;
|
|
270
270
|
}
|
|
@@ -281,28 +281,28 @@ function displayStatus(submittedJob, statusFile, error, displayStatusFilePath) {
|
|
|
281
281
|
? submittedJob.state
|
|
282
282
|
: 'Not Available';
|
|
283
283
|
status = adapterStatus === 'Not Available'
|
|
284
|
-
? "Job Status: "
|
|
285
|
-
: "Job Status: "
|
|
284
|
+
? "Job Status: ".concat(adapterStatus, "\nDetails: ").concat(error, "\n")
|
|
285
|
+
: "Job Status: ".concat(adapterStatus);
|
|
286
286
|
if (adapterStatus === 'Initiating' || adapterStatus === 'completed')
|
|
287
|
-
displayResult_1.displaySuccess(status);
|
|
287
|
+
(0, displayResult_1.displaySuccess)(status);
|
|
288
288
|
else
|
|
289
|
-
displayResult_1.displayError({}, status);
|
|
289
|
+
(0, displayResult_1.displayError)({}, status);
|
|
290
290
|
if (!statusFile) return [3 /*break*/, 5];
|
|
291
291
|
folderPath = statusFile.split(path_1.default.sep);
|
|
292
292
|
folderPath.pop();
|
|
293
293
|
parentFolderPath = folderPath.join(path_1.default.sep);
|
|
294
|
-
return [4 /*yield*/, utils_1.folderExists(parentFolderPath)];
|
|
294
|
+
return [4 /*yield*/, (0, utils_1.folderExists)(parentFolderPath)];
|
|
295
295
|
case 1:
|
|
296
296
|
if (!!(_a.sent())) return [3 /*break*/, 3];
|
|
297
|
-
return [4 /*yield*/, utils_1.createFolder(parentFolderPath)];
|
|
297
|
+
return [4 /*yield*/, (0, utils_1.createFolder)(parentFolderPath)];
|
|
298
298
|
case 2:
|
|
299
299
|
_a.sent();
|
|
300
300
|
_a.label = 3;
|
|
301
|
-
case 3: return [4 /*yield*/, utils_1.createFile(statusFile, status)];
|
|
301
|
+
case 3: return [4 /*yield*/, (0, utils_1.createFile)(statusFile, status)];
|
|
302
302
|
case 4:
|
|
303
303
|
_a.sent();
|
|
304
304
|
if (displayStatusFilePath)
|
|
305
|
-
displayResult_1.displaySuccess("Status saved to: "
|
|
305
|
+
(0, displayResult_1.displaySuccess)("Status saved to: ".concat(statusFile));
|
|
306
306
|
_a.label = 5;
|
|
307
307
|
case 5: return [2 /*return*/];
|
|
308
308
|
}
|
|
@@ -53,25 +53,25 @@ var saveLog = function (logData, logFile, jobPath, returnStatusOnly) { return __
|
|
|
53
53
|
logPath = logFile;
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
|
-
logPath = path_1.default.join(process.projectDir, jobPath.split(path_1.default.sep).slice(-1).pop()
|
|
56
|
+
logPath = path_1.default.join(process.projectDir, "".concat(jobPath.split(path_1.default.sep).slice(-1).pop(), ".log"));
|
|
57
57
|
}
|
|
58
58
|
folderPath = logPath.split(path_1.default.sep);
|
|
59
59
|
folderPath.pop();
|
|
60
60
|
parentFolderPath = folderPath.join(path_1.default.sep);
|
|
61
|
-
return [4 /*yield*/, utils_1.folderExists(parentFolderPath)];
|
|
61
|
+
return [4 /*yield*/, (0, utils_1.folderExists)(parentFolderPath)];
|
|
62
62
|
case 1:
|
|
63
63
|
if (!!(_a.sent())) return [3 /*break*/, 3];
|
|
64
|
-
return [4 /*yield*/, utils_1.createFolder(parentFolderPath)];
|
|
64
|
+
return [4 /*yield*/, (0, utils_1.createFolder)(parentFolderPath)];
|
|
65
65
|
case 2:
|
|
66
66
|
_a.sent();
|
|
67
67
|
_a.label = 3;
|
|
68
68
|
case 3:
|
|
69
|
-
logLines = typeof logData === 'object' ? utils_2.parseLogLines(logData) : logData;
|
|
70
|
-
return [4 /*yield*/, utils_1.createFile(logPath, logLines)];
|
|
69
|
+
logLines = typeof logData === 'object' ? (0, utils_2.parseLogLines)(logData) : logData;
|
|
70
|
+
return [4 /*yield*/, (0, utils_1.createFile)(logPath, logLines)];
|
|
71
71
|
case 4:
|
|
72
72
|
_a.sent();
|
|
73
73
|
if (!returnStatusOnly)
|
|
74
|
-
displayResult_1.displaySuccess("Log saved to "
|
|
74
|
+
(0, displayResult_1.displaySuccess)("Log saved to ".concat(logPath));
|
|
75
75
|
return [2 /*return*/];
|
|
76
76
|
}
|
|
77
77
|
});
|
|
@@ -163,7 +163,7 @@ var JobCommand = /** @class */ (function (_super) {
|
|
|
163
163
|
serverType: target.serverType,
|
|
164
164
|
debug: true
|
|
165
165
|
});
|
|
166
|
-
return [4 /*yield*/, utils_2.getAuthConfig(target).catch(function (err) {
|
|
166
|
+
return [4 /*yield*/, (0, utils_2.getAuthConfig)(target).catch(function (err) {
|
|
167
167
|
var _a;
|
|
168
168
|
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. Error fetching auth config: ', err);
|
|
169
169
|
return null;
|
|
@@ -210,8 +210,8 @@ var JobCommand = /** @class */ (function (_super) {
|
|
|
210
210
|
return __generator(this, function (_a) {
|
|
211
211
|
switch (_a.label) {
|
|
212
212
|
case 0:
|
|
213
|
-
jobPath = prefixAppLoc_1.prefixAppLoc(target.appLoc, this.parsed.jobPath);
|
|
214
|
-
return [4 /*yield*/, execute_1.executeJobSasjs(sasjs, jobPath, this.parsed.log)
|
|
213
|
+
jobPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.jobPath);
|
|
214
|
+
return [4 /*yield*/, (0, execute_1.executeJobSasjs)(sasjs, jobPath, this.parsed.log)
|
|
215
215
|
.then(function () { return command_1.ReturnCode.Success; })
|
|
216
216
|
.catch(function (err) {
|
|
217
217
|
var _a;
|
|
@@ -232,8 +232,8 @@ var JobCommand = /** @class */ (function (_super) {
|
|
|
232
232
|
return __generator(this, function (_d) {
|
|
233
233
|
switch (_d.label) {
|
|
234
234
|
case 0:
|
|
235
|
-
jobPath = prefixAppLoc_1.prefixAppLoc(target.appLoc, this.parsed.jobPath);
|
|
236
|
-
log = getLogFilePath_1.getLogFilePath(this.parsed.log, jobPath);
|
|
235
|
+
jobPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.jobPath);
|
|
236
|
+
log = (0, getLogFilePath_1.getLogFilePath)(this.parsed.log, jobPath);
|
|
237
237
|
wait = this.parsed.wait || !!log;
|
|
238
238
|
output = ((_a = this.parsed.output) === null || _a === void 0 ? void 0 : _a.length)
|
|
239
239
|
? this.parsed.output
|
|
@@ -250,7 +250,7 @@ var JobCommand = /** @class */ (function (_super) {
|
|
|
250
250
|
if (ignoreWarnings && !returnStatusOnly) {
|
|
251
251
|
(_c = process.logger) === null || _c === void 0 ? void 0 : _c.warn("Using the 'ignoreWarnings' flag without 'returnStatusOnly' flag will not affect the sasjs job execute command.");
|
|
252
252
|
}
|
|
253
|
-
return [4 /*yield*/, execute_1.executeJobViya(sasjs, authConfig, jobPath, target, wait, output, log, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog)
|
|
253
|
+
return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, authConfig, jobPath, target, wait, output, log, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog)
|
|
254
254
|
.then(function () {
|
|
255
255
|
return command_1.ReturnCode.Success;
|
|
256
256
|
})
|
|
@@ -70,7 +70,7 @@ describe('executeJobViya', function () {
|
|
|
70
70
|
it('should set streamLog to true when the flag is passed in', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
71
71
|
return __generator(this, function (_a) {
|
|
72
72
|
switch (_a.label) {
|
|
73
|
-
case 0: return [4 /*yield*/, execute_1.executeJobViya(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, false, undefined, true)];
|
|
73
|
+
case 0: return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, false, undefined, true)];
|
|
74
74
|
case 1:
|
|
75
75
|
_a.sent();
|
|
76
76
|
expect(sasjs.startComputeJob).toHaveBeenCalledWith('test/job', null, {
|
|
@@ -81,7 +81,7 @@ describe('executeJobViya', function () {
|
|
|
81
81
|
streamLog: true,
|
|
82
82
|
logFolderPath: testLogsPath
|
|
83
83
|
}, true, undefined);
|
|
84
|
-
return [4 /*yield*/, utils_1.deleteFile(testFilePath)];
|
|
84
|
+
return [4 /*yield*/, (0, utils_1.deleteFile)(testFilePath)];
|
|
85
85
|
case 2:
|
|
86
86
|
_a.sent();
|
|
87
87
|
return [2 /*return*/];
|
|
@@ -91,7 +91,7 @@ describe('executeJobViya', function () {
|
|
|
91
91
|
it('should set streamLog to false when the flag is false', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
92
92
|
return __generator(this, function (_a) {
|
|
93
93
|
switch (_a.label) {
|
|
94
|
-
case 0: return [4 /*yield*/, execute_1.executeJobViya(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, false, undefined, false)];
|
|
94
|
+
case 0: return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, false, undefined, false)];
|
|
95
95
|
case 1:
|
|
96
96
|
_a.sent();
|
|
97
97
|
expect(sasjs.startComputeJob).toHaveBeenCalledWith('test/job', null, {
|
|
@@ -102,7 +102,7 @@ describe('executeJobViya', function () {
|
|
|
102
102
|
streamLog: false,
|
|
103
103
|
logFolderPath: testLogsPath
|
|
104
104
|
}, true, undefined);
|
|
105
|
-
return [4 /*yield*/, utils_1.deleteFile(testFilePath)];
|
|
105
|
+
return [4 /*yield*/, (0, utils_1.deleteFile)(testFilePath)];
|
|
106
106
|
case 2:
|
|
107
107
|
_a.sent();
|
|
108
108
|
return [2 /*return*/];
|
|
@@ -124,7 +124,7 @@ describe('executeJobSasjs', function () {
|
|
|
124
124
|
it('should pass job pass as a _program parameter', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
125
125
|
return __generator(this, function (_a) {
|
|
126
126
|
switch (_a.label) {
|
|
127
|
-
case 0: return [4 /*yield*/, execute_1.executeJobSasjs(sasjs, 'test/job', path_1.default.join(process.projectDir, 'logs'))];
|
|
127
|
+
case 0: return [4 /*yield*/, (0, execute_1.executeJobSasjs)(sasjs, 'test/job', path_1.default.join(process.projectDir, 'logs'))];
|
|
128
128
|
case 1:
|
|
129
129
|
_a.sent();
|
|
130
130
|
expect(sasjs.executeJobSASjs).toHaveBeenCalledWith({ _program: 'test/job' });
|
|
@@ -138,7 +138,7 @@ var setupMocks = function (serverType) { return __awaiter(void 0, void 0, void 0
|
|
|
138
138
|
switch (_a.label) {
|
|
139
139
|
case 0:
|
|
140
140
|
process.projectDir = process.cwd();
|
|
141
|
-
return [4 /*yield*/, utils_2.setConstants()];
|
|
141
|
+
return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
142
142
|
case 1:
|
|
143
143
|
_a.sent();
|
|
144
144
|
jest.restoreAllMocks();
|
|
@@ -43,7 +43,7 @@ describe('getContextName', function () {
|
|
|
43
43
|
var target;
|
|
44
44
|
return __generator(this, function (_a) {
|
|
45
45
|
target = { contextName: 'Test Context' };
|
|
46
|
-
expect(execute_1.getContextName(target)).toEqual('Test Context');
|
|
46
|
+
expect((0, execute_1.getContextName)(target)).toEqual('Test Context');
|
|
47
47
|
return [2 /*return*/];
|
|
48
48
|
});
|
|
49
49
|
}); });
|
|
@@ -51,7 +51,7 @@ describe('getContextName', function () {
|
|
|
51
51
|
var target;
|
|
52
52
|
return __generator(this, function (_a) {
|
|
53
53
|
target = { contextName: undefined };
|
|
54
|
-
expect(execute_1.getContextName(target)).toEqual(utils_1.contextName);
|
|
54
|
+
expect((0, execute_1.getContextName)(target)).toEqual(utils_1.contextName);
|
|
55
55
|
return [2 /*return*/];
|
|
56
56
|
});
|
|
57
57
|
}); });
|