@sasjs/cli 3.6.2 → 3.6.6
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 +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.d.ts +7 -0
- package/build/commands/deploy/deploy.js +131 -81
- 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 +15 -15
- 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 +56 -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
|
@@ -82,7 +82,7 @@ function runSasCode(target, filePath, compile) {
|
|
|
82
82
|
if (content && content.startsWith('<')) {
|
|
83
83
|
throw new Error(invalidSasError);
|
|
84
84
|
}
|
|
85
|
-
return [4 /*yield*/, utils_1.createFile(tempFilePath, content)];
|
|
85
|
+
return [4 /*yield*/, (0, utils_1.createFile)(tempFilePath, content)];
|
|
86
86
|
case 1:
|
|
87
87
|
_a.sent();
|
|
88
88
|
isFileCreated = true;
|
|
@@ -91,7 +91,7 @@ function runSasCode(target, filePath, compile) {
|
|
|
91
91
|
});
|
|
92
92
|
}); })
|
|
93
93
|
.catch(function (err) {
|
|
94
|
-
throw new Error(err.message
|
|
94
|
+
throw new Error("".concat(err.message, "\nUrl: ").concat(filePath));
|
|
95
95
|
})];
|
|
96
96
|
case 1:
|
|
97
97
|
_b.sent();
|
|
@@ -107,14 +107,14 @@ function runSasCode(target, filePath, compile) {
|
|
|
107
107
|
sourcefilePathParts = path_1.default.normalize(filePath).split(path_1.default.sep);
|
|
108
108
|
sourcefilePathParts.splice(-1, 1);
|
|
109
109
|
sourceFolderPath = sourcefilePathParts.join(path_1.default.sep);
|
|
110
|
-
return [4 /*yield*/, __1.compileSingleFile(target, 'identify', filePath, getDestinationPath_1.getDestinationServicePath(sourceFolderPath), true)];
|
|
110
|
+
return [4 /*yield*/, (0, __1.compileSingleFile)(target, 'identify', filePath, (0, getDestinationPath_1.getDestinationServicePath)(sourceFolderPath), true)];
|
|
111
111
|
case 3:
|
|
112
112
|
(filePath = (_b.sent()).destinationPath);
|
|
113
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("File Compiled and placed at: "
|
|
113
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("File Compiled and placed at: ".concat(filePath, " ."));
|
|
114
114
|
_b.label = 4;
|
|
115
115
|
case 4:
|
|
116
|
-
sasFilePath = utils_1.getAbsolutePath(filePath, process.currentDir);
|
|
117
|
-
return [4 /*yield*/, utils_1.readFile(sasFilePath)];
|
|
116
|
+
sasFilePath = (0, utils_1.getAbsolutePath)(filePath, process.currentDir);
|
|
117
|
+
return [4 /*yield*/, (0, utils_1.readFile)(sasFilePath)];
|
|
118
118
|
case 5:
|
|
119
119
|
sasFileContent = _b.sent();
|
|
120
120
|
linesToExecute = sasFileContent.replace(/\r\n/g, '\n').split('\n');
|
|
@@ -136,7 +136,7 @@ function executeOnSasViya(filePath, isTempFile, target, linesToExecute) {
|
|
|
136
136
|
return __generator(this, function (_f) {
|
|
137
137
|
switch (_f.label) {
|
|
138
138
|
case 0:
|
|
139
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Sending "
|
|
139
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Sending ".concat(path_1.default.basename(filePath), " to SAS server for execution."));
|
|
140
140
|
sasjs = new node_1.default({
|
|
141
141
|
serverUrl: target.serverUrl,
|
|
142
142
|
httpsAgentOptions: target.httpsAgentOptions,
|
|
@@ -149,7 +149,7 @@ function executeOnSasViya(filePath, isTempFile, target, linesToExecute) {
|
|
|
149
149
|
if (!contextName) {
|
|
150
150
|
contextName = sasjs.getSasjsConfig().contextName;
|
|
151
151
|
}
|
|
152
|
-
return [4 /*yield*/, config_1.getAuthConfig(target)];
|
|
152
|
+
return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
|
|
153
153
|
case 1:
|
|
154
154
|
authConfig = _f.sent();
|
|
155
155
|
return [4 /*yield*/, sasjs
|
|
@@ -166,7 +166,7 @@ function executeOnSasViya(filePath, isTempFile, target, linesToExecute) {
|
|
|
166
166
|
return [4 /*yield*/, createOutputFile(log)];
|
|
167
167
|
case 1:
|
|
168
168
|
createdFilePath = _b.sent();
|
|
169
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Log file has been created at "
|
|
169
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Log file has been created at ".concat(createdFilePath, " ."));
|
|
170
170
|
throw new node_2.ErrorResponse('Find more error details in the log file.');
|
|
171
171
|
}
|
|
172
172
|
});
|
|
@@ -180,20 +180,20 @@ function executeOnSasViya(filePath, isTempFile, target, linesToExecute) {
|
|
|
180
180
|
: executionResult.log;
|
|
181
181
|
}
|
|
182
182
|
catch (e) {
|
|
183
|
-
utils_2.displayError(e, 'An error occurred when parsing the execution log');
|
|
183
|
+
(0, utils_2.displayError)(e, 'An error occurred when parsing the execution log');
|
|
184
184
|
(_b = process.logger) === null || _b === void 0 ? void 0 : _b.info('The execution output will be saved to the log file.');
|
|
185
185
|
log = JSON.stringify(executionResult);
|
|
186
186
|
isOutput = true;
|
|
187
187
|
}
|
|
188
188
|
(_c = process.logger) === null || _c === void 0 ? void 0 : _c.success('Job execution completed!');
|
|
189
189
|
buildDestinationResultsFolder = process.sasjsConstants.buildDestinationResultsFolder;
|
|
190
|
-
(_d = process.logger) === null || _d === void 0 ? void 0 : _d.info("Creating "
|
|
190
|
+
(_d = process.logger) === null || _d === void 0 ? void 0 : _d.info("Creating ".concat(isOutput ? 'output' : 'log', " file in ").concat(buildDestinationResultsFolder, " ."));
|
|
191
191
|
return [4 /*yield*/, createOutputFile(log)];
|
|
192
192
|
case 3:
|
|
193
193
|
createdFilePath = _f.sent();
|
|
194
|
-
(_e = process.logger) === null || _e === void 0 ? void 0 : _e.success((isOutput ? 'Output' : 'Log'
|
|
194
|
+
(_e = process.logger) === null || _e === void 0 ? void 0 : _e.success("".concat(isOutput ? 'Output' : 'Log', " file has been created at ").concat(createdFilePath, " ."));
|
|
195
195
|
if (!isTempFile) return [3 /*break*/, 5];
|
|
196
|
-
return [4 /*yield*/, utils_1.deleteFile(filePath)];
|
|
196
|
+
return [4 /*yield*/, (0, utils_1.deleteFile)(filePath)];
|
|
197
197
|
case 4:
|
|
198
198
|
_f.sent();
|
|
199
199
|
_f.label = 5;
|
|
@@ -222,7 +222,7 @@ function executeOnSas9(filePath, isTempFile, target, linesToExecute) {
|
|
|
222
222
|
sas9CredentialsError = process.sasjsConstants.sas9CredentialsError;
|
|
223
223
|
throw new Error(sas9CredentialsError);
|
|
224
224
|
}
|
|
225
|
-
password = utils_1.decodeFromBase64(password);
|
|
225
|
+
password = (0, utils_1.decodeFromBase64)(password);
|
|
226
226
|
sasjs = new node_1.default({
|
|
227
227
|
serverUrl: target.serverUrl,
|
|
228
228
|
httpsAgentOptions: target.httpsAgentOptions,
|
|
@@ -241,15 +241,15 @@ function executeOnSas9(filePath, isTempFile, target, linesToExecute) {
|
|
|
241
241
|
case 0:
|
|
242
242
|
if (!(err && err.payload && err.payload.log)) return [3 /*break*/, 2];
|
|
243
243
|
log = err.payload.log;
|
|
244
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Creating log file in "
|
|
244
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Creating log file in ".concat(buildDestinationResultsFolder, " ."));
|
|
245
245
|
return [4 /*yield*/, createOutputFile(log)];
|
|
246
246
|
case 1:
|
|
247
247
|
createdFilePath_1 = _c.sent();
|
|
248
|
-
(_b = process.logger) === null || _b === void 0 ? void 0 : _b.success("Log file has been created at "
|
|
248
|
+
(_b = process.logger) === null || _b === void 0 ? void 0 : _b.success("Log file has been created at ".concat(createdFilePath_1, " ."));
|
|
249
249
|
throw new node_2.ErrorResponse('Find more error details in the log file.');
|
|
250
250
|
case 2:
|
|
251
251
|
if (err && err.errorCode === 404) {
|
|
252
|
-
utils_2.displaySasjsRunnerError(username);
|
|
252
|
+
(0, utils_2.displaySasjsRunnerError)(username);
|
|
253
253
|
}
|
|
254
254
|
throw err;
|
|
255
255
|
}
|
|
@@ -258,13 +258,13 @@ function executeOnSas9(filePath, isTempFile, target, linesToExecute) {
|
|
|
258
258
|
case 1:
|
|
259
259
|
executionResult = _d.sent();
|
|
260
260
|
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.success('Job execution completed!');
|
|
261
|
-
(_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Creating log file in "
|
|
261
|
+
(_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Creating log file in ".concat(buildDestinationResultsFolder, " ."));
|
|
262
262
|
return [4 /*yield*/, createOutputFile(executionResult || '')];
|
|
263
263
|
case 2:
|
|
264
264
|
createdFilePath = _d.sent();
|
|
265
|
-
(_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Log file has been created at "
|
|
265
|
+
(_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Log file has been created at ".concat(createdFilePath, " ."));
|
|
266
266
|
if (!isTempFile) return [3 /*break*/, 4];
|
|
267
|
-
return [4 /*yield*/, utils_1.deleteFile(filePath)];
|
|
267
|
+
return [4 /*yield*/, (0, utils_1.deleteFile)(filePath)];
|
|
268
268
|
case 3:
|
|
269
269
|
_d.sent();
|
|
270
270
|
_d.label = 4;
|
|
@@ -279,10 +279,10 @@ function createOutputFile(log) {
|
|
|
279
279
|
return __generator(this, function (_a) {
|
|
280
280
|
switch (_a.label) {
|
|
281
281
|
case 0:
|
|
282
|
-
timestamp = utils_1.generateTimestamp();
|
|
282
|
+
timestamp = (0, utils_1.generateTimestamp)();
|
|
283
283
|
buildDestinationResultsFolder = process.sasjsConstants.buildDestinationResultsFolder;
|
|
284
|
-
outputFilePath = path_1.default.join(buildDestinationResultsFolder, "sasjs-run-"
|
|
285
|
-
return [4 /*yield*/, utils_1.createFile(outputFilePath, log)];
|
|
284
|
+
outputFilePath = path_1.default.join(buildDestinationResultsFolder, "sasjs-run-".concat(timestamp, ".log"));
|
|
285
|
+
return [4 /*yield*/, (0, utils_1.createFile)(outputFilePath, log)];
|
|
286
286
|
case 1:
|
|
287
287
|
_a.sent();
|
|
288
288
|
return [2 /*return*/, outputFilePath];
|
|
@@ -101,12 +101,12 @@ var RunCommand = /** @class */ (function (_super) {
|
|
|
101
101
|
case 1:
|
|
102
102
|
target = (_b.sent()).target;
|
|
103
103
|
_a = this.parsed, sasFilePath = _a.sasFilePath, compile = _a.compile;
|
|
104
|
-
return [4 /*yield*/, run_1.runSasCode(target, sasFilePath, compile)
|
|
104
|
+
return [4 /*yield*/, (0, run_1.runSasCode)(target, sasFilePath, compile)
|
|
105
105
|
.then(function () {
|
|
106
106
|
return command_1.ReturnCode.Success;
|
|
107
107
|
})
|
|
108
108
|
.catch(function (err) {
|
|
109
|
-
utils_1.displayError(err, 'An error has occurred when running your SAS code.');
|
|
109
|
+
(0, utils_1.displayError)(err, 'An error has occurred when running your SAS code.');
|
|
110
110
|
return command_1.ReturnCode.InternalError;
|
|
111
111
|
})];
|
|
112
112
|
case 2: return [2 /*return*/, _b.sent()];
|
|
@@ -54,17 +54,17 @@ describe('sasjs run', function () {
|
|
|
54
54
|
return __generator(this, function (_a) {
|
|
55
55
|
switch (_a.label) {
|
|
56
56
|
case 0:
|
|
57
|
-
appName = 'cli-tests-run-' + utils_1.generateTimestamp();
|
|
58
|
-
return [4 /*yield*/, test_1.createTestApp(__dirname, appName)];
|
|
57
|
+
appName = 'cli-tests-run-' + (0, utils_1.generateTimestamp)();
|
|
58
|
+
return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
|
|
59
59
|
case 1:
|
|
60
60
|
_a.sent();
|
|
61
|
-
target = test_1.generateTestTarget(appName, "/Public/app/cli-tests/"
|
|
61
|
+
target = (0, test_1.generateTestTarget)(appName, "/Public/app/cli-tests/".concat(appName), {
|
|
62
62
|
serviceFolders: [path_1.default.join('sasjs', 'testServices')],
|
|
63
63
|
initProgram: '',
|
|
64
64
|
termProgram: '',
|
|
65
65
|
macroVars: {}
|
|
66
66
|
}, utils_1.ServerType.SasViya);
|
|
67
|
-
return [4 /*yield*/, utils_1.copy(path_1.default.join(__dirname, 'testServices'), path_1.default.join(process.projectDir, 'sasjs', 'testServices'))];
|
|
67
|
+
return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'testServices'), path_1.default.join(process.projectDir, 'sasjs', 'testServices'))];
|
|
68
68
|
case 2:
|
|
69
69
|
_a.sent();
|
|
70
70
|
return [2 /*return*/];
|
|
@@ -74,10 +74,10 @@ describe('sasjs run', function () {
|
|
|
74
74
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
75
75
|
return __generator(this, function (_a) {
|
|
76
76
|
switch (_a.label) {
|
|
77
|
-
case 0: return [4 /*yield*/, test_1.removeTestServerFolder(target.appLoc, target)];
|
|
77
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestServerFolder)(target.appLoc, target)];
|
|
78
78
|
case 1:
|
|
79
79
|
_a.sent();
|
|
80
|
-
return [4 /*yield*/, test_1.removeTestApp(__dirname, target.name)];
|
|
80
|
+
return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, target.name)];
|
|
81
81
|
case 2:
|
|
82
82
|
_a.sent();
|
|
83
83
|
return [2 /*return*/];
|
|
@@ -91,7 +91,7 @@ describe('sasjs run', function () {
|
|
|
91
91
|
case 0:
|
|
92
92
|
file = 'test.sas.txt';
|
|
93
93
|
error = new Error("'sasjs run' command supports only *.sas files.");
|
|
94
|
-
return [4 /*yield*/, expect(__1.runSasCode(target, file)).rejects.toEqual(error)];
|
|
94
|
+
return [4 /*yield*/, expect((0, __1.runSasCode)(target, file)).rejects.toEqual(error)];
|
|
95
95
|
case 1:
|
|
96
96
|
_a.sent();
|
|
97
97
|
return [2 /*return*/];
|
|
@@ -104,7 +104,7 @@ describe('sasjs run', function () {
|
|
|
104
104
|
switch (_a.label) {
|
|
105
105
|
case 0:
|
|
106
106
|
url = 'https://raw.githubusercontent.com/sasjs/cli/issues/808';
|
|
107
|
-
return [4 /*yield*/, expect(__1.runSasCode(target, url)).rejects.toThrow()];
|
|
107
|
+
return [4 /*yield*/, expect((0, __1.runSasCode)(target, url)).rejects.toThrow()];
|
|
108
108
|
case 1:
|
|
109
109
|
_a.sent();
|
|
110
110
|
return [2 /*return*/];
|
|
@@ -118,8 +118,8 @@ describe('sasjs run', function () {
|
|
|
118
118
|
case 0:
|
|
119
119
|
url = 'https://github.com/sasjs/cli/issues/808';
|
|
120
120
|
invalidSasError = process.sasjsConstants.invalidSasError;
|
|
121
|
-
error = new Error(invalidSasError
|
|
122
|
-
return [4 /*yield*/, expect(__1.runSasCode(target, url)).rejects.toThrowError(error)];
|
|
121
|
+
error = new Error("".concat(invalidSasError, "\nUrl: ").concat(url));
|
|
122
|
+
return [4 /*yield*/, expect((0, __1.runSasCode)(target, url)).rejects.toThrowError(error)];
|
|
123
123
|
case 1:
|
|
124
124
|
_a.sent();
|
|
125
125
|
return [2 /*return*/];
|
|
@@ -133,8 +133,8 @@ describe('sasjs run', function () {
|
|
|
133
133
|
case 0:
|
|
134
134
|
url = 'https://api.agify.io/?name=sabir';
|
|
135
135
|
invalidSasError = process.sasjsConstants.invalidSasError;
|
|
136
|
-
error = new Error(invalidSasError
|
|
137
|
-
return [4 /*yield*/, expect(__1.runSasCode(target, url)).rejects.toThrowError(error)];
|
|
136
|
+
error = new Error("".concat(invalidSasError, "\nUrl: ").concat(url));
|
|
137
|
+
return [4 /*yield*/, expect((0, __1.runSasCode)(target, url)).rejects.toThrowError(error)];
|
|
138
138
|
case 1:
|
|
139
139
|
_a.sent();
|
|
140
140
|
return [2 /*return*/];
|
|
@@ -147,7 +147,7 @@ describe('sasjs run', function () {
|
|
|
147
147
|
switch (_a.label) {
|
|
148
148
|
case 0:
|
|
149
149
|
logPart = "1 data;\n2 do x=1 to 100;\n3 output;\n4 end;\n5 run;";
|
|
150
|
-
return [4 /*yield*/, __1.runSasCode(target, 'sasjs/testServices/logJob.sas')];
|
|
150
|
+
return [4 /*yield*/, (0, __1.runSasCode)(target, 'sasjs/testServices/logJob.sas')];
|
|
151
151
|
case 1:
|
|
152
152
|
result = _a.sent();
|
|
153
153
|
expect(result.log.includes(logPart)).toBeTruthy();
|
|
@@ -161,7 +161,7 @@ describe('sasjs run', function () {
|
|
|
161
161
|
switch (_a.label) {
|
|
162
162
|
case 0:
|
|
163
163
|
logPart = "1 data;\n2 do x=1 to 100;\n3 output;\n4 end;\n5 run;";
|
|
164
|
-
return [4 /*yield*/, __1.runSasCode(target, process.projectDir
|
|
164
|
+
return [4 /*yield*/, (0, __1.runSasCode)(target, "".concat(process.projectDir, "/sasjs/testServices/logJob.sas"))];
|
|
165
165
|
case 1:
|
|
166
166
|
result = _a.sent();
|
|
167
167
|
expect(result.log.includes(logPart)).toBeTruthy();
|
|
@@ -175,7 +175,7 @@ describe('sasjs run', function () {
|
|
|
175
175
|
switch (_a.label) {
|
|
176
176
|
case 0:
|
|
177
177
|
logPartRegex = /[0-9]* data;\n[0-9]* do x=1 to 100;\n[0-9]* output;\n[0-9]* end;\n[0-9]* run;\n/;
|
|
178
|
-
return [4 /*yield*/, __1.runSasCode(target, "sasjs/testServices/logJob.sas", true)];
|
|
178
|
+
return [4 /*yield*/, (0, __1.runSasCode)(target, "sasjs/testServices/logJob.sas", true)];
|
|
179
179
|
case 1:
|
|
180
180
|
result = _a.sent();
|
|
181
181
|
expect(logPartRegex.test(result.log)).toBeTruthy();
|
|
@@ -189,7 +189,7 @@ describe('sasjs run', function () {
|
|
|
189
189
|
switch (_a.label) {
|
|
190
190
|
case 0:
|
|
191
191
|
logPartRegex = /[0-9]* data;\n[0-9]* do x=1 to 100;\n[0-9]* output;\n[0-9]* end;\n[0-9]* run;\n/;
|
|
192
|
-
return [4 /*yield*/, __1.runSasCode(target, process.projectDir
|
|
192
|
+
return [4 /*yield*/, (0, __1.runSasCode)(target, "".concat(process.projectDir, "/sasjs/testServices/logJob.sas"), true)];
|
|
193
193
|
case 1:
|
|
194
194
|
result = _a.sent();
|
|
195
195
|
expect(logPartRegex.test(result.log)).toBeTruthy();
|
|
@@ -205,12 +205,12 @@ describe('sasjs run', function () {
|
|
|
205
205
|
switch (_a.label) {
|
|
206
206
|
case 0:
|
|
207
207
|
dotenv_1.default.config();
|
|
208
|
-
appName = 'cli-tests-run-' + utils_1.generateTimestamp();
|
|
209
|
-
return [4 /*yield*/, test_1.createTestMinimalApp(__dirname, appName)];
|
|
208
|
+
appName = 'cli-tests-run-' + (0, utils_1.generateTimestamp)();
|
|
209
|
+
return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, appName)];
|
|
210
210
|
case 1:
|
|
211
211
|
_a.sent();
|
|
212
|
-
return [4 /*yield*/, test_1.updateTarget({
|
|
213
|
-
appLoc: "/Public/app/cli-tests/"
|
|
212
|
+
return [4 /*yield*/, (0, test_1.updateTarget)({
|
|
213
|
+
appLoc: "/Public/app/cli-tests/".concat(appName),
|
|
214
214
|
streamConfig: {
|
|
215
215
|
assetPaths: [],
|
|
216
216
|
streamWeb: true,
|
|
@@ -234,10 +234,10 @@ describe('sasjs run', function () {
|
|
|
234
234
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
235
235
|
return __generator(this, function (_a) {
|
|
236
236
|
switch (_a.label) {
|
|
237
|
-
case 0: return [4 /*yield*/, test_1.removeTestServerFolder(target.appLoc, target)];
|
|
237
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestServerFolder)(target.appLoc, target)];
|
|
238
238
|
case 1:
|
|
239
239
|
_a.sent();
|
|
240
|
-
return [4 /*yield*/, test_1.removeTestApp(__dirname, appName)];
|
|
240
|
+
return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, appName)];
|
|
241
241
|
case 2:
|
|
242
242
|
_a.sent();
|
|
243
243
|
return [2 /*return*/];
|
|
@@ -249,11 +249,11 @@ describe('sasjs run', function () {
|
|
|
249
249
|
return __generator(this, function (_a) {
|
|
250
250
|
switch (_a.label) {
|
|
251
251
|
case 0:
|
|
252
|
-
logPart = "SASjs Streaming App Created! Check it out here:\n \n \n \n \n sas.analytium.co.uk/SASJobExecution?_FILE="
|
|
253
|
-
return [4 /*yield*/, build_1.build(target)];
|
|
252
|
+
logPart = "SASjs Streaming App Created! Check it out here:\n \n \n \n \n sas.analytium.co.uk/SASJobExecution?_FILE=".concat(target.appLoc, "/services/clickme.html&_debug=2\n");
|
|
253
|
+
return [4 /*yield*/, (0, build_1.build)(target)];
|
|
254
254
|
case 1:
|
|
255
255
|
_a.sent();
|
|
256
|
-
return [4 /*yield*/, __1.runSasCode(target, 'sasjsbuild/myviyadeploy.sas')];
|
|
256
|
+
return [4 /*yield*/, (0, __1.runSasCode)(target, 'sasjsbuild/myviyadeploy.sas')];
|
|
257
257
|
case 2:
|
|
258
258
|
result = _a.sent();
|
|
259
259
|
expect(result.log.includes(logPart)).toBeTruthy();
|
|
@@ -269,14 +269,14 @@ describe('sasjs run', function () {
|
|
|
269
269
|
return __generator(this, function (_a) {
|
|
270
270
|
switch (_a.label) {
|
|
271
271
|
case 0:
|
|
272
|
-
sharedAppName = "cli-tests-run-"
|
|
273
|
-
return [4 /*yield*/, test_1.createTestApp(homedir, sharedAppName)];
|
|
272
|
+
sharedAppName = "cli-tests-run-".concat((0, utils_1.generateTimestamp)());
|
|
273
|
+
return [4 /*yield*/, (0, test_1.createTestApp)(homedir, sharedAppName)];
|
|
274
274
|
case 1:
|
|
275
275
|
_a.sent();
|
|
276
|
-
return [4 /*yield*/, test_1.updateConfig({
|
|
276
|
+
return [4 /*yield*/, (0, test_1.updateConfig)({
|
|
277
277
|
macroFolders: [
|
|
278
|
-
"./"
|
|
279
|
-
"./"
|
|
278
|
+
"./".concat(sharedAppName, "/sasjs/macros"),
|
|
279
|
+
"./".concat(sharedAppName, "/sasjs/targets/viya/macros")
|
|
280
280
|
]
|
|
281
281
|
}, false)];
|
|
282
282
|
case 2:
|
|
@@ -290,19 +290,19 @@ describe('sasjs run', function () {
|
|
|
290
290
|
return __generator(this, function (_a) {
|
|
291
291
|
switch (_a.label) {
|
|
292
292
|
case 0:
|
|
293
|
-
appName = "cli-tests-run-"
|
|
294
|
-
target = test_1.generateTestTarget(appName, "/Public/app/cli-tests/"
|
|
293
|
+
appName = "cli-tests-run-".concat((0, utils_1.generateTimestamp)());
|
|
294
|
+
target = (0, test_1.generateTestTarget)(appName, "/Public/app/cli-tests/".concat(appName), {
|
|
295
295
|
serviceFolders: [path_1.default.join(__dirname, 'testServices')],
|
|
296
296
|
initProgram: '',
|
|
297
297
|
termProgram: '',
|
|
298
298
|
macroVars: {}
|
|
299
299
|
}, utils_1.ServerType.SasViya);
|
|
300
300
|
process.projectDir = '';
|
|
301
|
-
return [4 /*yield*/, utils_2.setConstants()];
|
|
301
|
+
return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
302
302
|
case 1:
|
|
303
303
|
_a.sent();
|
|
304
304
|
process.currentDir = path_1.default.join(__dirname, appName);
|
|
305
|
-
return [4 /*yield*/, utils_1.createFolder(process.currentDir)];
|
|
305
|
+
return [4 /*yield*/, (0, utils_1.createFolder)(process.currentDir)];
|
|
306
306
|
case 2:
|
|
307
307
|
_a.sent();
|
|
308
308
|
return [2 /*return*/];
|
|
@@ -312,10 +312,10 @@ describe('sasjs run', function () {
|
|
|
312
312
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
313
313
|
return __generator(this, function (_a) {
|
|
314
314
|
switch (_a.label) {
|
|
315
|
-
case 0: return [4 /*yield*/, utils_1.deleteFolder(process.currentDir)];
|
|
315
|
+
case 0: return [4 /*yield*/, (0, utils_1.deleteFolder)(process.currentDir)];
|
|
316
316
|
case 1:
|
|
317
317
|
_a.sent();
|
|
318
|
-
return [4 /*yield*/, test_1.removeTestServerFolder(target.appLoc, target)];
|
|
318
|
+
return [4 /*yield*/, (0, test_1.removeTestServerFolder)(target.appLoc, target)];
|
|
319
319
|
case 2:
|
|
320
320
|
_a.sent();
|
|
321
321
|
return [2 /*return*/];
|
|
@@ -325,13 +325,13 @@ describe('sasjs run', function () {
|
|
|
325
325
|
afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
326
326
|
return __generator(this, function (_a) {
|
|
327
327
|
switch (_a.label) {
|
|
328
|
-
case 0: return [4 /*yield*/, test_1.removeTestApp(homedir, sharedAppName)];
|
|
328
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestApp)(homedir, sharedAppName)];
|
|
329
329
|
case 1:
|
|
330
330
|
_a.sent();
|
|
331
|
-
return [4 /*yield*/, utils_1.deleteFolder(path_1.default.join(homedir, 'sasjsbuild'))];
|
|
331
|
+
return [4 /*yield*/, (0, utils_1.deleteFolder)(path_1.default.join(homedir, 'sasjsbuild'))];
|
|
332
332
|
case 2:
|
|
333
333
|
_a.sent();
|
|
334
|
-
return [4 /*yield*/, utils_1.deleteFolder(path_1.default.join(homedir, 'sasjsresults'))];
|
|
334
|
+
return [4 /*yield*/, (0, utils_1.deleteFolder)(path_1.default.join(homedir, 'sasjsresults'))];
|
|
335
335
|
case 3:
|
|
336
336
|
_a.sent();
|
|
337
337
|
return [2 /*return*/];
|
|
@@ -344,7 +344,7 @@ describe('sasjs run', function () {
|
|
|
344
344
|
switch (_a.label) {
|
|
345
345
|
case 0:
|
|
346
346
|
logPart = "1 data;\n2 do x=1 to 100;\n3 output;\n4 end;\n5 run;";
|
|
347
|
-
return [4 /*yield*/, __1.runSasCode(target, '../testServices/logJob.sas')];
|
|
347
|
+
return [4 /*yield*/, (0, __1.runSasCode)(target, '../testServices/logJob.sas')];
|
|
348
348
|
case 1:
|
|
349
349
|
result = _a.sent();
|
|
350
350
|
expect(result.log.includes(logPart)).toBeTruthy();
|
|
@@ -358,7 +358,7 @@ describe('sasjs run', function () {
|
|
|
358
358
|
switch (_a.label) {
|
|
359
359
|
case 0:
|
|
360
360
|
logPart = "1 data;\n2 do x=1 to 100;\n3 output;\n4 end;\n5 run;";
|
|
361
|
-
return [4 /*yield*/, __1.runSasCode(target, __dirname
|
|
361
|
+
return [4 /*yield*/, (0, __1.runSasCode)(target, "".concat(__dirname, "/testServices/logJob.sas"))];
|
|
362
362
|
case 1:
|
|
363
363
|
result = _a.sent();
|
|
364
364
|
expect(result.log.includes(logPart)).toBeTruthy();
|
|
@@ -372,7 +372,7 @@ describe('sasjs run', function () {
|
|
|
372
372
|
switch (_a.label) {
|
|
373
373
|
case 0:
|
|
374
374
|
logPartRegex = /[0-9]* data;\n[0-9]* do x=1 to 100;\n[0-9]* output;\n[0-9]* end;\n[0-9]* run;\n/;
|
|
375
|
-
return [4 /*yield*/, __1.runSasCode(target, '../testServices/logJob.sas', true)];
|
|
375
|
+
return [4 /*yield*/, (0, __1.runSasCode)(target, '../testServices/logJob.sas', true)];
|
|
376
376
|
case 1:
|
|
377
377
|
result = _a.sent();
|
|
378
378
|
expect(logPartRegex.test(result.log)).toBeTruthy();
|
|
@@ -386,7 +386,7 @@ describe('sasjs run', function () {
|
|
|
386
386
|
switch (_a.label) {
|
|
387
387
|
case 0:
|
|
388
388
|
logPartRegex = /[0-9]* data;\n[0-9]* do x=1 to 100;\n[0-9]* output;\n[0-9]* end;\n[0-9]* run;\n/;
|
|
389
|
-
return [4 /*yield*/, __1.runSasCode(target, __dirname
|
|
389
|
+
return [4 /*yield*/, (0, __1.runSasCode)(target, "".concat(__dirname, "/testServices/logJob.sas"), true)];
|
|
390
390
|
case 1:
|
|
391
391
|
result = _a.sent();
|
|
392
392
|
expect(logPartRegex.test(result.log)).toBeTruthy();
|
|
@@ -401,17 +401,17 @@ describe('sasjs run', function () {
|
|
|
401
401
|
return __generator(this, function (_a) {
|
|
402
402
|
switch (_a.label) {
|
|
403
403
|
case 0:
|
|
404
|
-
appName = 'cli-tests-run-sas9-' + utils_1.generateTimestamp();
|
|
405
|
-
return [4 /*yield*/, test_1.createTestApp(__dirname, appName)];
|
|
404
|
+
appName = 'cli-tests-run-sas9-' + (0, utils_1.generateTimestamp)();
|
|
405
|
+
return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
|
|
406
406
|
case 1:
|
|
407
407
|
_a.sent();
|
|
408
|
-
target = test_1.generateTestTarget(appName, "/Public/app/cli-tests/"
|
|
408
|
+
target = (0, test_1.generateTestTarget)(appName, "/Public/app/cli-tests/".concat(appName), {
|
|
409
409
|
serviceFolders: ['sasjs/testServices'],
|
|
410
410
|
initProgram: '',
|
|
411
411
|
termProgram: '',
|
|
412
412
|
macroVars: {}
|
|
413
413
|
}, utils_1.ServerType.Sas9);
|
|
414
|
-
return [4 /*yield*/, utils_1.copy(path_1.default.join(__dirname, 'testServices'), path_1.default.join(process.projectDir, 'sasjs', 'testServices'))];
|
|
414
|
+
return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'testServices'), path_1.default.join(process.projectDir, 'sasjs', 'testServices'))];
|
|
415
415
|
case 2:
|
|
416
416
|
_a.sent();
|
|
417
417
|
return [2 /*return*/];
|
|
@@ -421,10 +421,10 @@ describe('sasjs run', function () {
|
|
|
421
421
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
422
422
|
return __generator(this, function (_a) {
|
|
423
423
|
switch (_a.label) {
|
|
424
|
-
case 0: return [4 /*yield*/, test_1.removeTestServerFolder(target.appLoc, target)];
|
|
424
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestServerFolder)(target.appLoc, target)];
|
|
425
425
|
case 1:
|
|
426
426
|
_a.sent();
|
|
427
|
-
return [4 /*yield*/, test_1.removeTestApp(__dirname, target.name)];
|
|
427
|
+
return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, target.name)];
|
|
428
428
|
case 2:
|
|
429
429
|
_a.sent();
|
|
430
430
|
return [2 /*return*/];
|
|
@@ -437,7 +437,7 @@ describe('sasjs run', function () {
|
|
|
437
437
|
switch (_a.label) {
|
|
438
438
|
case 0:
|
|
439
439
|
logParts = ['data;', 'do x=1 to 100;', 'output;', 'end;', 'run;'];
|
|
440
|
-
return [4 /*yield*/, __1.runSasCode(target, 'sasjs/testServices/logJob.sas')];
|
|
440
|
+
return [4 /*yield*/, (0, __1.runSasCode)(target, 'sasjs/testServices/logJob.sas')];
|
|
441
441
|
case 1:
|
|
442
442
|
result = _a.sent();
|
|
443
443
|
logParts.forEach(function (logPart) {
|
|
@@ -453,7 +453,7 @@ describe('sasjs run', function () {
|
|
|
453
453
|
switch (_a.label) {
|
|
454
454
|
case 0:
|
|
455
455
|
logParts = ['data;', 'do x=1 to 100;', 'output;', 'end;', 'run;'];
|
|
456
|
-
return [4 /*yield*/, __1.runSasCode(target, process.projectDir
|
|
456
|
+
return [4 /*yield*/, (0, __1.runSasCode)(target, "".concat(process.projectDir, "/sasjs/testServices/logJob.sas"))];
|
|
457
457
|
case 1:
|
|
458
458
|
result = _a.sent();
|
|
459
459
|
logParts.forEach(function (logPart) {
|
|
@@ -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 runModule = __importStar(require("../run"));
|
|
@@ -94,7 +98,7 @@ describe('RunCommand', function () {
|
|
|
94
98
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
95
99
|
return __generator(this, function (_a) {
|
|
96
100
|
switch (_a.label) {
|
|
97
|
-
case 0: return [4 /*yield*/, utils_2.setConstants()];
|
|
101
|
+
case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
98
102
|
case 1:
|
|
99
103
|
_a.sent();
|
|
100
104
|
return [2 /*return*/];
|
|
@@ -185,7 +189,7 @@ var executeCommandWrapper = function (additionalParams) { return __awaiter(void
|
|
|
185
189
|
return __generator(this, function (_a) {
|
|
186
190
|
switch (_a.label) {
|
|
187
191
|
case 0:
|
|
188
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), __read(additionalParams));
|
|
192
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), __read(additionalParams), false);
|
|
189
193
|
command = new runCommand_1.RunCommand(args);
|
|
190
194
|
return [4 /*yield*/, command.execute()];
|
|
191
195
|
case 1:
|
|
@@ -55,21 +55,21 @@ function servicePackDeploy(target, isLocal, jsonFilePath, isForced) {
|
|
|
55
55
|
if (path_1.default.extname(jsonFilePath) !== '.json') {
|
|
56
56
|
throw new Error('Provided data file must be valid json.');
|
|
57
57
|
}
|
|
58
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Deploying service pack to "
|
|
58
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Deploying service pack to ".concat(target.serverUrl, " at location ").concat(target.appLoc, " ."));
|
|
59
59
|
if (jsonFilePath) {
|
|
60
|
-
jsonFilePath = utils_1.getAbsolutePath(jsonFilePath, process.cwd());
|
|
60
|
+
jsonFilePath = (0, utils_1.getAbsolutePath)(jsonFilePath, process.cwd());
|
|
61
61
|
}
|
|
62
62
|
else {
|
|
63
63
|
buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
|
|
64
|
-
jsonFilePath = path_1.default.join(buildDestinationFolder, target.name
|
|
64
|
+
jsonFilePath = path_1.default.join(buildDestinationFolder, "".concat(target.name, ".json"));
|
|
65
65
|
}
|
|
66
|
-
return [4 /*yield*/, deployToSasViyaWithServicePack_1.deployToSasViyaWithServicePack(jsonFilePath, target, isLocal, isForced)
|
|
66
|
+
return [4 /*yield*/, (0, deployToSasViyaWithServicePack_1.deployToSasViyaWithServicePack)(jsonFilePath, target, isLocal, isForced)
|
|
67
67
|
.then(function (_) {
|
|
68
|
-
displayResult_1.displaySuccess('Servicepack successfully deployed!');
|
|
68
|
+
(0, displayResult_1.displaySuccess)('Servicepack successfully deployed!');
|
|
69
69
|
success = true;
|
|
70
70
|
})
|
|
71
71
|
.catch(function (err) {
|
|
72
|
-
displayResult_1.displayError(err, 'Servicepack deploy failed.');
|
|
72
|
+
(0, displayResult_1.displayError)(err, 'Servicepack deploy failed.');
|
|
73
73
|
success = false;
|
|
74
74
|
})];
|
|
75
75
|
case 1:
|
|
@@ -104,16 +104,16 @@ var ServicePackCommand = /** @class */ (function (_super) {
|
|
|
104
104
|
case 1:
|
|
105
105
|
_b = _d.sent(), target = _b.target, isLocal = _b.isLocal;
|
|
106
106
|
if (target.serverType !== utils_1.ServerType.SasViya) {
|
|
107
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Unable to deploy service pack to target "
|
|
107
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Unable to deploy service pack to target ".concat(target.name, ". This command is only supported for server type ").concat(utils_1.ServerType.SasViya, "."));
|
|
108
108
|
return [2 /*return*/, command_1.ReturnCode.InternalError];
|
|
109
109
|
}
|
|
110
110
|
_c = this.parsed, source = _c.source, force = _c.force;
|
|
111
|
-
return [4 /*yield*/, deploy_1.servicePackDeploy(target, isLocal, source, force)
|
|
111
|
+
return [4 /*yield*/, (0, deploy_1.servicePackDeploy)(target, isLocal, source, force)
|
|
112
112
|
.then(function () {
|
|
113
113
|
return command_1.ReturnCode.Success;
|
|
114
114
|
})
|
|
115
115
|
.catch(function (err) {
|
|
116
|
-
utils_2.displayError(err, 'An error has occurred when processing servicepack.');
|
|
116
|
+
(0, utils_2.displayError)(err, 'An error has occurred when processing servicepack.');
|
|
117
117
|
return command_1.ReturnCode.InternalError;
|
|
118
118
|
})];
|
|
119
119
|
case 2: return [2 /*return*/, _d.sent()];
|
|
@@ -53,15 +53,15 @@ describe('sasjs servicepack', function () {
|
|
|
53
53
|
switch (_a.label) {
|
|
54
54
|
case 0:
|
|
55
55
|
dotenv_1.default.config();
|
|
56
|
-
return [4 /*yield*/, utils_2.setConstants()];
|
|
56
|
+
return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
57
57
|
case 1:
|
|
58
58
|
_a.sent();
|
|
59
|
-
targetName = 'cli-tests-servicepack-' + utils_1.generateTimestamp();
|
|
59
|
+
targetName = 'cli-tests-servicepack-' + (0, utils_1.generateTimestamp)();
|
|
60
60
|
target = new utils_1.Target({
|
|
61
61
|
name: targetName,
|
|
62
62
|
serverType: utils_1.ServerType.SasViya,
|
|
63
63
|
serverUrl: process.env.VIYA_SERVER_URL,
|
|
64
|
-
appLoc: "/Public/app/cli-tests/"
|
|
64
|
+
appLoc: "/Public/app/cli-tests/".concat(targetName),
|
|
65
65
|
contextName: utils_2.contextName,
|
|
66
66
|
authConfig: {
|
|
67
67
|
client: process.env.CLIENT,
|
|
@@ -82,7 +82,7 @@ describe('sasjs servicepack', function () {
|
|
|
82
82
|
it('should deploy servicepack', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
83
83
|
return __generator(this, function (_a) {
|
|
84
84
|
switch (_a.label) {
|
|
85
|
-
case 0: return [4 /*yield*/, expect(deploy_1.servicePackDeploy(target, false, 'src/commands/servicepack/spec/testServicepack.json', true)).resolves.toEqual(true)];
|
|
85
|
+
case 0: return [4 /*yield*/, expect((0, deploy_1.servicePackDeploy)(target, false, 'src/commands/servicepack/spec/testServicepack.json', true)).resolves.toEqual(true)];
|
|
86
86
|
case 1:
|
|
87
87
|
_a.sent();
|
|
88
88
|
return [2 /*return*/];
|
|
@@ -92,7 +92,7 @@ describe('sasjs servicepack', function () {
|
|
|
92
92
|
it('should fail because servicepack already been deployed', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
93
93
|
return __generator(this, function (_a) {
|
|
94
94
|
switch (_a.label) {
|
|
95
|
-
case 0: return [4 /*yield*/, expect(deploy_1.servicePackDeploy(target, false, 'src/commands/servicepack/spec/testServicepack.json')).resolves.toEqual(false)];
|
|
95
|
+
case 0: return [4 /*yield*/, expect((0, deploy_1.servicePackDeploy)(target, false, 'src/commands/servicepack/spec/testServicepack.json')).resolves.toEqual(false)];
|
|
96
96
|
case 1:
|
|
97
97
|
_a.sent();
|
|
98
98
|
return [2 /*return*/];
|
|
@@ -103,7 +103,7 @@ describe('sasjs servicepack', function () {
|
|
|
103
103
|
afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
104
104
|
return __generator(this, function (_a) {
|
|
105
105
|
switch (_a.label) {
|
|
106
|
-
case 0: return [4 /*yield*/, test_1.removeTestServerFolder(target.appLoc, target)];
|
|
106
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestServerFolder)(target.appLoc, target)];
|
|
107
107
|
case 1:
|
|
108
108
|
_a.sent();
|
|
109
109
|
return [2 /*return*/];
|