@sasjs/cli 3.6.0 → 3.6.4
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 +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 +210 -178
- 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 +39 -35
- 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 +2 -3
- 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
|
@@ -84,11 +84,11 @@ describe('sasjs cbd with global config', function () {
|
|
|
84
84
|
return __generator(this, function (_a) {
|
|
85
85
|
switch (_a.label) {
|
|
86
86
|
case 0:
|
|
87
|
-
target = utils_3.generateTarget(false);
|
|
88
|
-
return [4 /*yield*/, test_1.createTestMinimalApp(__dirname, target.name)];
|
|
87
|
+
target = (0, utils_3.generateTarget)(false);
|
|
88
|
+
return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, target.name)];
|
|
89
89
|
case 1:
|
|
90
90
|
_a.sent();
|
|
91
|
-
return [4 /*yield*/, utils_3.copyJobsAndServices(target.name)];
|
|
91
|
+
return [4 /*yield*/, (0, utils_3.copyJobsAndServices)(target.name)];
|
|
92
92
|
case 2:
|
|
93
93
|
_a.sent();
|
|
94
94
|
return [2 /*return*/];
|
|
@@ -98,10 +98,10 @@ describe('sasjs cbd with global config', function () {
|
|
|
98
98
|
afterEach(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(target.appLoc, target)];
|
|
101
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestServerFolder)(target.appLoc, target)];
|
|
102
102
|
case 1:
|
|
103
103
|
_a.sent();
|
|
104
|
-
return [4 /*yield*/, test_1.removeTestApp(__dirname, target.name)];
|
|
104
|
+
return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, target.name)];
|
|
105
105
|
case 2:
|
|
106
106
|
_a.sent();
|
|
107
107
|
return [2 /*return*/];
|
|
@@ -115,24 +115,24 @@ describe('sasjs cbd with global config', function () {
|
|
|
115
115
|
case 0:
|
|
116
116
|
servicePath = path_1.default.join(__dirname, target.name, 'sasjsbuild/services/testJob/job.sas');
|
|
117
117
|
jobPath = path_1.default.join(__dirname, target.name, 'sasjsbuild/jobs/testJob/job.sas');
|
|
118
|
-
buildJsonPath = path_1.default.join(__dirname, target.name, "sasjsbuild/"
|
|
119
|
-
return [4 /*yield*/, expect(build_1.build(target)).toResolve()];
|
|
118
|
+
buildJsonPath = path_1.default.join(__dirname, target.name, "sasjsbuild/".concat(target.name, ".json"));
|
|
119
|
+
return [4 /*yield*/, expect((0, build_1.build)(target)).toResolve()];
|
|
120
120
|
case 1:
|
|
121
121
|
_c.sent();
|
|
122
|
-
return [4 /*yield*/, expect(deploy_1.deploy(target, false)).toResolve()];
|
|
122
|
+
return [4 /*yield*/, expect((0, deploy_1.deploy)(target, false)).toResolve()];
|
|
123
123
|
case 2:
|
|
124
124
|
_c.sent();
|
|
125
|
-
return [4 /*yield*/, expect(utils_1.fileExists(servicePath)).resolves.toEqual(true)];
|
|
125
|
+
return [4 /*yield*/, expect((0, utils_1.fileExists)(servicePath)).resolves.toEqual(true)];
|
|
126
126
|
case 3:
|
|
127
127
|
_c.sent();
|
|
128
|
-
return [4 /*yield*/, expect(utils_1.fileExists(jobPath)).resolves.toEqual(true)
|
|
128
|
+
return [4 /*yield*/, expect((0, utils_1.fileExists)(jobPath)).resolves.toEqual(true)
|
|
129
129
|
/**
|
|
130
130
|
* test to ensure that jobs do not have web service pre code
|
|
131
131
|
*/
|
|
132
132
|
];
|
|
133
133
|
case 4:
|
|
134
134
|
_c.sent();
|
|
135
|
-
return [4 /*yield*/, utils_1.readFile(jobPath)];
|
|
135
|
+
return [4 /*yield*/, (0, utils_1.readFile)(jobPath)];
|
|
136
136
|
case 5:
|
|
137
137
|
jobContent = _c.sent();
|
|
138
138
|
expect(jobContent).not.toEqual('');
|
|
@@ -140,11 +140,11 @@ describe('sasjs cbd with global config', function () {
|
|
|
140
140
|
expect(jobContent.includes("* JobInit start;")).toEqual(true);
|
|
141
141
|
expect(jobContent.includes("* JobTerm start;")).toEqual(true);
|
|
142
142
|
_b = (_a = JSON).parse;
|
|
143
|
-
return [4 /*yield*/, utils_1.readFile(buildJsonPath)];
|
|
143
|
+
return [4 /*yield*/, (0, utils_1.readFile)(buildJsonPath)];
|
|
144
144
|
case 6:
|
|
145
145
|
jsonContent = _b.apply(_a, [_c.sent()]);
|
|
146
146
|
expect(!!jsonContent.members.find(function (x) { return x.name === 'services'; })).toEqual(true);
|
|
147
|
-
return [4 /*yield*/, utils_1.readFile(servicePath)];
|
|
147
|
+
return [4 /*yield*/, (0, utils_1.readFile)(servicePath)];
|
|
148
148
|
case 7:
|
|
149
149
|
serviceContent = _c.sent();
|
|
150
150
|
expect(serviceContent).not.toEqual('');
|
|
@@ -163,15 +163,15 @@ describe('sasjs cbd with local config', function () {
|
|
|
163
163
|
return __generator(this, function (_a) {
|
|
164
164
|
switch (_a.label) {
|
|
165
165
|
case 0:
|
|
166
|
-
appName = "cli-tests-cbd-local-"
|
|
167
|
-
return [4 /*yield*/, test_1.createTestApp(__dirname, appName)];
|
|
166
|
+
appName = "cli-tests-cbd-local-".concat((0, utils_2.generateTimestamp)());
|
|
167
|
+
return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
|
|
168
168
|
case 1:
|
|
169
169
|
_a.sent();
|
|
170
|
-
target = utils_3.generateTarget(true);
|
|
171
|
-
return [4 /*yield*/, utils_3.copyJobsAndServices(appName)];
|
|
170
|
+
target = (0, utils_3.generateTarget)(true);
|
|
171
|
+
return [4 /*yield*/, (0, utils_3.copyJobsAndServices)(appName)];
|
|
172
172
|
case 2:
|
|
173
173
|
_a.sent();
|
|
174
|
-
return [4 /*yield*/, utils_1.copy(path_1.default.join(__dirname, 'testScript', 'copyscript.sh'), path_1.default.join(process.projectDir, 'sasjs', 'build', 'copyscript.sh'))];
|
|
174
|
+
return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'testScript', 'copyscript.sh'), path_1.default.join(process.projectDir, 'sasjs', 'build', 'copyscript.sh'))];
|
|
175
175
|
case 3:
|
|
176
176
|
_a.sent();
|
|
177
177
|
return [2 /*return*/];
|
|
@@ -181,10 +181,10 @@ describe('sasjs cbd with local config', function () {
|
|
|
181
181
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
182
182
|
return __generator(this, function (_a) {
|
|
183
183
|
switch (_a.label) {
|
|
184
|
-
case 0: return [4 /*yield*/, test_1.removeTestServerFolder(target.appLoc, target)];
|
|
184
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestServerFolder)(target.appLoc, target)];
|
|
185
185
|
case 1:
|
|
186
186
|
_a.sent();
|
|
187
|
-
return [4 /*yield*/, test_1.removeTestApp(__dirname, appName)];
|
|
187
|
+
return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, appName)];
|
|
188
188
|
case 2:
|
|
189
189
|
_a.sent();
|
|
190
190
|
jest.resetAllMocks();
|
|
@@ -195,10 +195,10 @@ describe('sasjs cbd with local config', function () {
|
|
|
195
195
|
it('should deploy service pack when deployServicePack is true', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
196
196
|
return __generator(this, function (_a) {
|
|
197
197
|
switch (_a.label) {
|
|
198
|
-
case 0: return [4 /*yield*/, expect(build_1.build(target)).toResolve()];
|
|
198
|
+
case 0: return [4 /*yield*/, expect((0, build_1.build)(target)).toResolve()];
|
|
199
199
|
case 1:
|
|
200
200
|
_a.sent();
|
|
201
|
-
return [4 /*yield*/, expect(deploy_1.deploy(target, true)).toResolve()];
|
|
201
|
+
return [4 /*yield*/, expect((0, deploy_1.deploy)(target, true)).toResolve()];
|
|
202
202
|
case 2:
|
|
203
203
|
_a.sent();
|
|
204
204
|
return [2 /*return*/];
|
|
@@ -214,10 +214,10 @@ describe('sasjs cbd with local config', function () {
|
|
|
214
214
|
deployServicePack: false,
|
|
215
215
|
deployScripts: ['sasjs/build/copyscript.sh']
|
|
216
216
|
} }));
|
|
217
|
-
return [4 /*yield*/, expect(build_1.build(customTarget)).toResolve()];
|
|
217
|
+
return [4 /*yield*/, expect((0, build_1.build)(customTarget)).toResolve()];
|
|
218
218
|
case 1:
|
|
219
219
|
_a.sent();
|
|
220
|
-
return [4 /*yield*/, expect(deploy_1.deploy(customTarget, true)).toResolve()];
|
|
220
|
+
return [4 /*yield*/, expect((0, deploy_1.deploy)(customTarget, true)).toResolve()];
|
|
221
221
|
case 2:
|
|
222
222
|
_a.sent();
|
|
223
223
|
return [2 /*return*/];
|
|
@@ -236,10 +236,10 @@ describe('sasjs cbd with local config', function () {
|
|
|
236
236
|
jest
|
|
237
237
|
.spyOn(getDeployScriptsModule, 'getDeployScripts')
|
|
238
238
|
.mockImplementation(function () { return Promise.resolve([]); });
|
|
239
|
-
return [4 /*yield*/, build_1.build(customTarget)];
|
|
239
|
+
return [4 /*yield*/, (0, build_1.build)(customTarget)];
|
|
240
240
|
case 1:
|
|
241
241
|
_a.sent();
|
|
242
|
-
return [4 /*yield*/, expect(deploy_1.deploy(customTarget, true)).rejects.toEqual(new Error("Deployment failed.\nPlease either enable the 'deployServicePack' option or add deployment script paths to 'deployScripts' in your target's 'deployConfig'."))];
|
|
242
|
+
return [4 /*yield*/, expect((0, deploy_1.deploy)(customTarget, true)).rejects.toEqual(new Error("Deployment failed.\nPlease either enable the 'deployServicePack' option or add deployment script paths to 'deployScripts' in your target's 'deployConfig'."))];
|
|
243
243
|
case 2:
|
|
244
244
|
_a.sent();
|
|
245
245
|
return [2 /*return*/];
|
|
@@ -253,10 +253,10 @@ describe('sasjs cbd with local config', function () {
|
|
|
253
253
|
jest.spyOn(configUtils, 'getAccessToken').mockImplementation(function () {
|
|
254
254
|
return Promise.reject('Token error');
|
|
255
255
|
});
|
|
256
|
-
return [4 /*yield*/, build_1.build(target)];
|
|
256
|
+
return [4 /*yield*/, (0, build_1.build)(target)];
|
|
257
257
|
case 1:
|
|
258
258
|
_a.sent();
|
|
259
|
-
return [4 /*yield*/, expect(deploy_1.deploy(target, true)).rejects.toEqual(new Error("Deployment failed. Request is not authenticated.\nPlease add the following variables to your .env."
|
|
259
|
+
return [4 /*yield*/, expect((0, deploy_1.deploy)(target, true)).rejects.toEqual(new Error("Deployment failed. Request is not authenticated.\nPlease add the following variables to your .env.".concat(target.name, " file:\nCLIENT, SECRET, ACCESS_TOKEN, REFRESH_TOKEN")))];
|
|
260
260
|
case 2:
|
|
261
261
|
_a.sent();
|
|
262
262
|
return [2 /*return*/];
|
|
@@ -278,11 +278,11 @@ describe('sasjs cbd having stream app', function () {
|
|
|
278
278
|
return __generator(this, function (_a) {
|
|
279
279
|
switch (_a.label) {
|
|
280
280
|
case 0:
|
|
281
|
-
appName = "cli-tests-cbd-local-stream-"
|
|
282
|
-
return [4 /*yield*/, test_1.createTestMinimalApp(__dirname, appName)];
|
|
281
|
+
appName = "cli-tests-cbd-local-stream-".concat((0, utils_2.generateTimestamp)());
|
|
282
|
+
return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, appName)];
|
|
283
283
|
case 1:
|
|
284
284
|
_a.sent();
|
|
285
|
-
target = utils_3.generateTarget(true);
|
|
285
|
+
target = (0, utils_3.generateTarget)(true);
|
|
286
286
|
return [2 /*return*/];
|
|
287
287
|
}
|
|
288
288
|
});
|
|
@@ -290,10 +290,10 @@ describe('sasjs cbd having stream app', function () {
|
|
|
290
290
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
291
291
|
return __generator(this, function (_a) {
|
|
292
292
|
switch (_a.label) {
|
|
293
|
-
case 0: return [4 /*yield*/, test_1.removeTestServerFolder(target.appLoc, target)];
|
|
293
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestServerFolder)(target.appLoc, target)];
|
|
294
294
|
case 1:
|
|
295
295
|
_a.sent();
|
|
296
|
-
return [4 /*yield*/, test_1.removeTestApp(__dirname, appName)];
|
|
296
|
+
return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, appName)];
|
|
297
297
|
case 2:
|
|
298
298
|
_a.sent();
|
|
299
299
|
jest.resetAllMocks();
|
|
@@ -306,23 +306,23 @@ describe('sasjs cbd having stream app', function () {
|
|
|
306
306
|
return __generator(this, function (_a) {
|
|
307
307
|
switch (_a.label) {
|
|
308
308
|
case 0:
|
|
309
|
-
appLoc = "/Public/app/cli-tests/"
|
|
310
|
-
appLocWithSpaces = appLoc
|
|
309
|
+
appLoc = "/Public/app/cli-tests/".concat(target.name);
|
|
310
|
+
appLocWithSpaces = "".concat(appLoc, "/with some/space s");
|
|
311
311
|
customTarget = new utils_2.Target(__assign(__assign({}, target.toJson()), { appLoc: appLocWithSpaces, streamConfig: streamConfig, jobConfig: undefined, serviceConfig: undefined, deployConfig: {
|
|
312
312
|
deployServicePack: false,
|
|
313
|
-
deployScripts: ["sasjsbuild/"
|
|
313
|
+
deployScripts: ["sasjsbuild/".concat(target.name, ".sas")]
|
|
314
314
|
} }));
|
|
315
|
-
return [4 /*yield*/, expect(build_1.build(customTarget)).toResolve()];
|
|
315
|
+
return [4 /*yield*/, expect((0, build_1.build)(customTarget)).toResolve()];
|
|
316
316
|
case 1:
|
|
317
317
|
_a.sent();
|
|
318
|
-
return [4 /*yield*/, expect(deploy_1.deploy(customTarget, true)).toResolve()];
|
|
318
|
+
return [4 /*yield*/, expect((0, deploy_1.deploy)(customTarget, true)).toResolve()];
|
|
319
319
|
case 2:
|
|
320
320
|
_a.sent();
|
|
321
|
-
return [4 /*yield*/, utils_1.readFile(path_1.default.join(__dirname, appName, 'sasjsbuild', target.name
|
|
321
|
+
return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(__dirname, appName, 'sasjsbuild', "".concat(target.name, ".log")))];
|
|
322
322
|
case 3:
|
|
323
323
|
logFileContent = _a.sent();
|
|
324
324
|
appLocTransformed = '/with%20some/space%20s';
|
|
325
|
-
streamingApplink = target.serverUrl.replace('https://', '')
|
|
325
|
+
streamingApplink = "".concat(target.serverUrl.replace('https://', ''), "/SASJobExecution?_FILE=").concat(appLoc).concat(appLocTransformed, "/services/").concat(streamConfig.streamServiceName, ".html&_debug=2");
|
|
326
326
|
expect(logFileContent.replace(/\s/g, '')).toEqual(expect.stringContaining(streamingApplink));
|
|
327
327
|
return [2 /*return*/];
|
|
328
328
|
}
|
|
@@ -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 buildModule = __importStar(require("../../build/build"));
|
|
@@ -95,7 +99,7 @@ describe('CompileBuildDeployCommand', function () {
|
|
|
95
99
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
96
100
|
return __generator(this, function (_a) {
|
|
97
101
|
switch (_a.label) {
|
|
98
|
-
case 0: return [4 /*yield*/, utils_2.setConstants()];
|
|
102
|
+
case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
99
103
|
case 1:
|
|
100
104
|
_a.sent();
|
|
101
105
|
return [2 /*return*/];
|
|
@@ -123,25 +127,25 @@ describe('CompileBuildDeployCommand', function () {
|
|
|
123
127
|
jest.spyOn(process.logger, 'error');
|
|
124
128
|
});
|
|
125
129
|
it('should parse a simple sasjs compilebuilddeploy command', function () {
|
|
126
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['compilebuilddeploy']);
|
|
130
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['compilebuilddeploy'], false);
|
|
127
131
|
var command = new compileBuildDeployCommand_1.CompileBuildDeployCommand(args);
|
|
128
132
|
expect(command.name).toEqual('compilebuilddeploy');
|
|
129
133
|
expect(command.subCommand).toEqual('');
|
|
130
134
|
});
|
|
131
135
|
it('should parse a shorthand sasjs compilebuilddeploy command', function () {
|
|
132
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['cbd']);
|
|
136
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['cbd'], false);
|
|
133
137
|
var command = new compileBuildDeployCommand_1.CompileBuildDeployCommand(args);
|
|
134
138
|
expect(command.name).toEqual('compilebuilddeploy');
|
|
135
139
|
expect(command.subCommand).toEqual('');
|
|
136
140
|
});
|
|
137
141
|
it('should parse a sasjs compilebuilddeploy command with a target', function () {
|
|
138
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['compilebuilddeploy', '--target', 'test']);
|
|
142
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['compilebuilddeploy', '--target', 'test'], false);
|
|
139
143
|
var command = new compileBuildDeployCommand_1.CompileBuildDeployCommand(args);
|
|
140
144
|
expect(command.name).toEqual('compilebuilddeploy');
|
|
141
145
|
expect(command.subCommand).toEqual('');
|
|
142
146
|
});
|
|
143
147
|
it('should parse a sasjs compilebuild command with a shorthand target argument', function () {
|
|
144
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['cbd', '-t', 'test']);
|
|
148
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['cbd', '-t', 'test'], false);
|
|
145
149
|
var command = new compileBuildDeployCommand_1.CompileBuildDeployCommand(args);
|
|
146
150
|
expect(command.name).toEqual('compilebuilddeploy');
|
|
147
151
|
expect(command.subCommand).toEqual('');
|
|
@@ -151,7 +155,7 @@ describe('CompileBuildDeployCommand', function () {
|
|
|
151
155
|
return __generator(this, function (_a) {
|
|
152
156
|
switch (_a.label) {
|
|
153
157
|
case 0:
|
|
154
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['cbd', '-t', 'test']);
|
|
158
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['cbd', '-t', 'test'], false);
|
|
155
159
|
command = new compileBuildDeployCommand_1.CompileBuildDeployCommand(args);
|
|
156
160
|
return [4 /*yield*/, command.execute()];
|
|
157
161
|
case 1:
|
|
@@ -168,7 +172,7 @@ describe('CompileBuildDeployCommand', function () {
|
|
|
168
172
|
return __generator(this, function (_a) {
|
|
169
173
|
switch (_a.label) {
|
|
170
174
|
case 0:
|
|
171
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['cbd', '-t', 'test']);
|
|
175
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['cbd', '-t', 'test'], false);
|
|
172
176
|
command = new compileBuildDeployCommand_1.CompileBuildDeployCommand(args);
|
|
173
177
|
return [4 /*yield*/, command.execute()];
|
|
174
178
|
case 1:
|
|
@@ -184,7 +188,7 @@ describe('CompileBuildDeployCommand', function () {
|
|
|
184
188
|
return __generator(this, function (_a) {
|
|
185
189
|
switch (_a.label) {
|
|
186
190
|
case 0:
|
|
187
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['cbd', '-t', 'test']);
|
|
191
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['cbd', '-t', 'test'], false);
|
|
188
192
|
jest
|
|
189
193
|
.spyOn(compileModule, 'compile')
|
|
190
194
|
.mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
|
|
@@ -203,7 +207,7 @@ describe('CompileBuildDeployCommand', function () {
|
|
|
203
207
|
return __generator(this, function (_a) {
|
|
204
208
|
switch (_a.label) {
|
|
205
209
|
case 0:
|
|
206
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['compilebuilddeploy', '-t', 'test']);
|
|
210
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['compilebuilddeploy', '-t', 'test'], false);
|
|
207
211
|
jest
|
|
208
212
|
.spyOn(buildModule, 'build')
|
|
209
213
|
.mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
|
|
@@ -222,7 +226,7 @@ describe('CompileBuildDeployCommand', function () {
|
|
|
222
226
|
return __generator(this, function (_a) {
|
|
223
227
|
switch (_a.label) {
|
|
224
228
|
case 0:
|
|
225
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['compilebuilddeploy', '-t', 'test']);
|
|
229
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['compilebuilddeploy', '-t', 'test'], false);
|
|
226
230
|
jest
|
|
227
231
|
.spyOn(deployModule, 'deploy')
|
|
228
232
|
.mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
|
|
@@ -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 deployModule = __importStar(require("../deploy"));
|
|
@@ -93,25 +97,25 @@ describe('DeployCommand', function () {
|
|
|
93
97
|
setupMocks();
|
|
94
98
|
});
|
|
95
99
|
it('should parse a simple sasjs deploy command', function () {
|
|
96
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['deploy']);
|
|
100
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['deploy'], false);
|
|
97
101
|
var command = new deployCommand_1.DeployCommand(args);
|
|
98
102
|
expect(command.name).toEqual('deploy');
|
|
99
103
|
expect(command.subCommand).toEqual('');
|
|
100
104
|
});
|
|
101
105
|
it('should parse a shorthand sasjs deploy command', function () {
|
|
102
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['d']);
|
|
106
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['d'], false);
|
|
103
107
|
var command = new deployCommand_1.DeployCommand(args);
|
|
104
108
|
expect(command.name).toEqual('deploy');
|
|
105
109
|
expect(command.subCommand).toEqual('');
|
|
106
110
|
});
|
|
107
111
|
it('should parse a sasjs deploy command with a target', function () {
|
|
108
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['deploy', '--target', 'test']);
|
|
112
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['deploy', '--target', 'test'], false);
|
|
109
113
|
var command = new deployCommand_1.DeployCommand(args);
|
|
110
114
|
expect(command.name).toEqual('deploy');
|
|
111
115
|
expect(command.subCommand).toEqual('');
|
|
112
116
|
});
|
|
113
117
|
it('should parse a sasjs deploy command with a shorthand target argument', function () {
|
|
114
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['deploy', '-t', 'test']);
|
|
118
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['deploy', '-t', 'test'], false);
|
|
115
119
|
var command = new deployCommand_1.DeployCommand(args);
|
|
116
120
|
expect(command.name).toEqual('deploy');
|
|
117
121
|
expect(command.subCommand).toEqual('');
|
|
@@ -121,7 +125,7 @@ describe('DeployCommand', function () {
|
|
|
121
125
|
return __generator(this, function (_a) {
|
|
122
126
|
switch (_a.label) {
|
|
123
127
|
case 0:
|
|
124
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['deploy', '-t', 'test']);
|
|
128
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['deploy', '-t', 'test'], false);
|
|
125
129
|
command = new deployCommand_1.DeployCommand(args);
|
|
126
130
|
return [4 /*yield*/, command.execute()];
|
|
127
131
|
case 1:
|
|
@@ -136,7 +140,7 @@ describe('DeployCommand', function () {
|
|
|
136
140
|
return __generator(this, function (_a) {
|
|
137
141
|
switch (_a.label) {
|
|
138
142
|
case 0:
|
|
139
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['deploy', '-t', 'test']);
|
|
143
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['deploy', '-t', 'test'], false);
|
|
140
144
|
command = new deployCommand_1.DeployCommand(args);
|
|
141
145
|
return [4 /*yield*/, command.execute()];
|
|
142
146
|
case 1:
|
|
@@ -152,7 +156,7 @@ describe('DeployCommand', function () {
|
|
|
152
156
|
return __generator(this, function (_a) {
|
|
153
157
|
switch (_a.label) {
|
|
154
158
|
case 0:
|
|
155
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['deploy', '-t', 'test']);
|
|
159
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['deploy', '-t', 'test'], false);
|
|
156
160
|
jest
|
|
157
161
|
.spyOn(deployModule, 'deploy')
|
|
158
162
|
.mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
|
|
@@ -51,11 +51,11 @@ describe('getDeployScripts', function () {
|
|
|
51
51
|
return __generator(this, function (_a) {
|
|
52
52
|
switch (_a.label) {
|
|
53
53
|
case 0:
|
|
54
|
-
appName = "cli-tests-"
|
|
55
|
-
return [4 /*yield*/, test_1.createTestApp(__dirname, appName)];
|
|
54
|
+
appName = "cli-tests-".concat((0, utils_1.generateTimestamp)());
|
|
55
|
+
return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
|
|
56
56
|
case 1:
|
|
57
57
|
_a.sent();
|
|
58
|
-
target = test_1.generateTestTarget(appName, "/Public/app/cli-tests/"
|
|
58
|
+
target = (0, test_1.generateTestTarget)(appName, "/Public/app/cli-tests/".concat(appName), {
|
|
59
59
|
serviceFolders: [path_1.default.join('sasjs', 'services')],
|
|
60
60
|
initProgram: '',
|
|
61
61
|
termProgram: '',
|
|
@@ -68,10 +68,10 @@ describe('getDeployScripts', function () {
|
|
|
68
68
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
69
69
|
return __generator(this, function (_a) {
|
|
70
70
|
switch (_a.label) {
|
|
71
|
-
case 0: return [4 /*yield*/, test_1.removeTestApp(__dirname, target.name)];
|
|
71
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, target.name)];
|
|
72
72
|
case 1:
|
|
73
73
|
_a.sent();
|
|
74
|
-
return [4 /*yield*/, config_1.removeFromGlobalConfig(target.name)];
|
|
74
|
+
return [4 /*yield*/, (0, config_1.removeFromGlobalConfig)(target.name)];
|
|
75
75
|
case 2:
|
|
76
76
|
_a.sent();
|
|
77
77
|
return [2 /*return*/];
|
|
@@ -84,7 +84,7 @@ describe('getDeployScripts', function () {
|
|
|
84
84
|
switch (_a.label) {
|
|
85
85
|
case 0:
|
|
86
86
|
target.buildConfig.buildOutputFileName = 'output-test.sas';
|
|
87
|
-
return [4 /*yield*/, getDeployScripts_1.getDeployScripts(target)];
|
|
87
|
+
return [4 /*yield*/, (0, getDeployScripts_1.getDeployScripts)(target)];
|
|
88
88
|
case 1:
|
|
89
89
|
deployScripts = _a.sent();
|
|
90
90
|
buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
|
|
@@ -101,12 +101,12 @@ describe('getDeployScripts', function () {
|
|
|
101
101
|
switch (_a.label) {
|
|
102
102
|
case 0:
|
|
103
103
|
target.buildConfig.buildOutputFileName = '';
|
|
104
|
-
return [4 /*yield*/, getDeployScripts_1.getDeployScripts(target)];
|
|
104
|
+
return [4 /*yield*/, (0, getDeployScripts_1.getDeployScripts)(target)];
|
|
105
105
|
case 1:
|
|
106
106
|
deployScripts = _a.sent();
|
|
107
107
|
buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
|
|
108
108
|
expect(deployScripts).toIncludeAllMembers([
|
|
109
|
-
path_1.default.join(buildDestinationFolder, target.name
|
|
109
|
+
path_1.default.join(buildDestinationFolder, "".concat(target.name, ".sas"))
|
|
110
110
|
]);
|
|
111
111
|
return [2 /*return*/];
|
|
112
112
|
}
|
|
@@ -66,9 +66,9 @@ var createGlobalTarget = function (serverType) {
|
|
|
66
66
|
switch (_a.label) {
|
|
67
67
|
case 0:
|
|
68
68
|
dotenv_1.default.config();
|
|
69
|
-
timestamp = utils_1.generateTimestamp();
|
|
70
|
-
targetName = "cli-tests-cbd-"
|
|
71
|
-
return [4 /*yield*/, utils_2.setConstants()];
|
|
69
|
+
timestamp = (0, utils_1.generateTimestamp)();
|
|
70
|
+
targetName = "cli-tests-cbd-".concat(timestamp);
|
|
71
|
+
return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
72
72
|
case 1:
|
|
73
73
|
_a.sent();
|
|
74
74
|
target = new utils_1.Target({
|
|
@@ -77,7 +77,7 @@ var createGlobalTarget = function (serverType) {
|
|
|
77
77
|
serverUrl: (serverType === utils_1.ServerType.SasViya
|
|
78
78
|
? process.env.VIYA_SERVER_URL
|
|
79
79
|
: process.env.SAS9_SERVER_URL),
|
|
80
|
-
appLoc: "/Public/app/cli-tests/"
|
|
80
|
+
appLoc: "/Public/app/cli-tests/".concat(targetName),
|
|
81
81
|
contextName: process.sasjsConstants.contextName,
|
|
82
82
|
serviceConfig: {
|
|
83
83
|
serviceFolders: ['sasjs/testServices', 'sasjs/testJob'],
|
|
@@ -102,7 +102,7 @@ var createGlobalTarget = function (serverType) {
|
|
|
102
102
|
deployScripts: []
|
|
103
103
|
}
|
|
104
104
|
});
|
|
105
|
-
return [4 /*yield*/, config_1.saveToGlobalConfig(target)];
|
|
105
|
+
return [4 /*yield*/, (0, config_1.saveToGlobalConfig)(target)];
|
|
106
106
|
case 2:
|
|
107
107
|
_a.sent();
|
|
108
108
|
return [2 /*return*/, target];
|
|
@@ -119,15 +119,15 @@ var createLocalTarget = function (serverType) {
|
|
|
119
119
|
switch (_a.label) {
|
|
120
120
|
case 0:
|
|
121
121
|
dotenv_1.default.config();
|
|
122
|
-
timestamp = utils_1.generateTimestamp();
|
|
123
|
-
targetName = "cli-tests-cbd-"
|
|
122
|
+
timestamp = (0, utils_1.generateTimestamp)();
|
|
123
|
+
targetName = "cli-tests-cbd-".concat(timestamp);
|
|
124
124
|
target = new utils_1.Target({
|
|
125
125
|
name: targetName,
|
|
126
126
|
serverType: serverType,
|
|
127
127
|
serverUrl: (serverType === utils_1.ServerType.SasViya
|
|
128
128
|
? process.env.VIYA_SERVER_URL
|
|
129
129
|
: process.env.SAS9_SERVER_URL),
|
|
130
|
-
appLoc: "/Public/app/cli-tests/"
|
|
130
|
+
appLoc: "/Public/app/cli-tests/".concat(targetName),
|
|
131
131
|
contextName: process.sasjsConstants.contextName,
|
|
132
132
|
serviceConfig: {
|
|
133
133
|
serviceFolders: ['sasjs/testServices', 'sasjs/testJob', 'sasjs/services'],
|
|
@@ -146,7 +146,7 @@ var createLocalTarget = function (serverType) {
|
|
|
146
146
|
deployScripts: []
|
|
147
147
|
}
|
|
148
148
|
});
|
|
149
|
-
return [4 /*yield*/, utils_3.readFile(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json'))];
|
|
149
|
+
return [4 /*yield*/, (0, utils_3.readFile)(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json'))];
|
|
150
150
|
case 1:
|
|
151
151
|
configContent = _a.sent();
|
|
152
152
|
configJSON = JSON.parse(configContent);
|
|
@@ -156,7 +156,7 @@ var createLocalTarget = function (serverType) {
|
|
|
156
156
|
deployServicePack: true
|
|
157
157
|
} })
|
|
158
158
|
];
|
|
159
|
-
return [4 /*yield*/, utils_3.createFile(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json'), JSON.stringify(configJSON, null, 2))];
|
|
159
|
+
return [4 /*yield*/, (0, utils_3.createFile)(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json'), JSON.stringify(configJSON, null, 2))];
|
|
160
160
|
case 2:
|
|
161
161
|
_a.sent();
|
|
162
162
|
return [2 /*return*/, target];
|
|
@@ -172,7 +172,7 @@ var updateLocalTarget = function (targetName, data) { return __awaiter(void 0, v
|
|
|
172
172
|
switch (_b.label) {
|
|
173
173
|
case 0:
|
|
174
174
|
dotenv_1.default.config();
|
|
175
|
-
return [4 /*yield*/, utils_3.readFile(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json'))];
|
|
175
|
+
return [4 /*yield*/, (0, utils_3.readFile)(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json'))];
|
|
176
176
|
case 1:
|
|
177
177
|
configContent = _b.sent();
|
|
178
178
|
configJSON = JSON.parse(configContent);
|
|
@@ -180,7 +180,7 @@ var updateLocalTarget = function (targetName, data) { return __awaiter(void 0, v
|
|
|
180
180
|
configJSON.targets = [
|
|
181
181
|
__assign(__assign({}, target), data)
|
|
182
182
|
];
|
|
183
|
-
return [4 /*yield*/, utils_3.createFile(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json'), JSON.stringify(configJSON, null, 2))];
|
|
183
|
+
return [4 /*yield*/, (0, utils_3.createFile)(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json'), JSON.stringify(configJSON, null, 2))];
|
|
184
184
|
case 2:
|
|
185
185
|
_b.sent();
|
|
186
186
|
return [2 /*return*/];
|
|
@@ -191,10 +191,10 @@ exports.updateLocalTarget = updateLocalTarget;
|
|
|
191
191
|
var copyJobsAndServices = function (appName) { return __awaiter(void 0, void 0, void 0, function () {
|
|
192
192
|
return __generator(this, function (_a) {
|
|
193
193
|
switch (_a.label) {
|
|
194
|
-
case 0: return [4 /*yield*/, utils_3.copy(path_1.default.join(__dirname, 'testJob'), path_1.default.join(__dirname, appName, 'sasjs', 'testJob'))];
|
|
194
|
+
case 0: return [4 /*yield*/, (0, utils_3.copy)(path_1.default.join(__dirname, 'testJob'), path_1.default.join(__dirname, appName, 'sasjs', 'testJob'))];
|
|
195
195
|
case 1:
|
|
196
196
|
_a.sent();
|
|
197
|
-
return [4 /*yield*/, utils_3.copy(path_1.default.join(__dirname, 'testServices'), path_1.default.join(__dirname, appName, 'sasjs', 'testServices'))];
|
|
197
|
+
return [4 /*yield*/, (0, utils_3.copy)(path_1.default.join(__dirname, 'testServices'), path_1.default.join(__dirname, appName, 'sasjs', 'testServices'))];
|
|
198
198
|
case 2:
|
|
199
199
|
_a.sent();
|
|
200
200
|
return [2 /*return*/];
|
|
@@ -204,8 +204,8 @@ var copyJobsAndServices = function (appName) { return __awaiter(void 0, void 0,
|
|
|
204
204
|
exports.copyJobsAndServices = copyJobsAndServices;
|
|
205
205
|
var generateTarget = function (isLocal) {
|
|
206
206
|
dotenv_1.default.config();
|
|
207
|
-
var timestamp = utils_1.generateTimestamp();
|
|
208
|
-
var targetName = "cli-tests-cbd-"
|
|
207
|
+
var timestamp = (0, utils_1.generateTimestamp)();
|
|
208
|
+
var targetName = "cli-tests-cbd-".concat(timestamp);
|
|
209
209
|
var authConfig = isLocal
|
|
210
210
|
? undefined
|
|
211
211
|
: {
|
|
@@ -218,7 +218,7 @@ var generateTarget = function (isLocal) {
|
|
|
218
218
|
name: targetName,
|
|
219
219
|
serverType: utils_1.ServerType.SasViya,
|
|
220
220
|
serverUrl: process.env.VIYA_SERVER_URL,
|
|
221
|
-
appLoc: "/Public/app/cli-tests/"
|
|
221
|
+
appLoc: "/Public/app/cli-tests/".concat(targetName),
|
|
222
222
|
contextName: utils_4.contextName,
|
|
223
223
|
serviceConfig: {
|
|
224
224
|
serviceFolders: ['sasjs/testServices', 'sasjs/testJob', 'sasjs/services'],
|
|
@@ -139,13 +139,13 @@ var DocsCommand = /** @class */ (function (_super) {
|
|
|
139
139
|
case 0: return [4 /*yield*/, this.getTargetInfo()];
|
|
140
140
|
case 1:
|
|
141
141
|
target = (_a.sent()).target;
|
|
142
|
-
return [4 /*yield*/, utils_1.getLocalConfig()];
|
|
142
|
+
return [4 /*yield*/, (0, utils_1.getLocalConfig)()];
|
|
143
143
|
case 2:
|
|
144
144
|
config = _a.sent();
|
|
145
|
-
return [4 /*yield*/, __1.generateDocs(target, config, this.parsed.outDirectory)
|
|
145
|
+
return [4 /*yield*/, (0, __1.generateDocs)(target, config, this.parsed.outDirectory)
|
|
146
146
|
.then(function (res) {
|
|
147
147
|
var _a;
|
|
148
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Docs have been generated!\nThe docs are located in the "
|
|
148
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Docs have been generated!\nThe docs are located in the ".concat(res.outDirectory, "' directory.\nClick to open: ").concat(res.outDirectory, "/index.html"));
|
|
149
149
|
return command_1.ReturnCode.Success;
|
|
150
150
|
})
|
|
151
151
|
.catch(function (err) {
|
|
@@ -168,13 +168,13 @@ var DocsCommand = /** @class */ (function (_super) {
|
|
|
168
168
|
case 0: return [4 /*yield*/, this.getTargetInfo()];
|
|
169
169
|
case 1:
|
|
170
170
|
target = (_a.sent()).target;
|
|
171
|
-
return [4 /*yield*/, utils_1.getLocalConfig()];
|
|
171
|
+
return [4 /*yield*/, (0, utils_1.getLocalConfig)()];
|
|
172
172
|
case 2:
|
|
173
173
|
config = _a.sent();
|
|
174
|
-
return [4 /*yield*/, __1.generateDot(target, config, this.parsed.outDirectory)
|
|
174
|
+
return [4 /*yield*/, (0, __1.generateDot)(target, config, this.parsed.outDirectory)
|
|
175
175
|
.then(function (res) {
|
|
176
176
|
var _a;
|
|
177
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Dot files have been generated!\nFiles are located in the "
|
|
177
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Dot files have been generated!\nFiles are located in the ".concat(res.outDirectory, "' directory."));
|
|
178
178
|
return command_1.ReturnCode.Success;
|
|
179
179
|
})
|
|
180
180
|
.catch(function (err) {
|
|
@@ -194,7 +194,7 @@ var DocsCommand = /** @class */ (function (_super) {
|
|
|
194
194
|
var returnCode;
|
|
195
195
|
return __generator(this, function (_a) {
|
|
196
196
|
switch (_a.label) {
|
|
197
|
-
case 0: return [4 /*yield*/, __1.initDocs()
|
|
197
|
+
case 0: return [4 /*yield*/, (0, __1.initDocs)()
|
|
198
198
|
.then(function () {
|
|
199
199
|
var _a;
|
|
200
200
|
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.success('The doxygen configuration files have been initialised under `/sasjs/doxy/`. You can now run `sasjs doc`.');
|