@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
|
@@ -88,8 +88,8 @@ describe('sasjs compile', function () {
|
|
|
88
88
|
return __generator(this, function (_a) {
|
|
89
89
|
switch (_a.label) {
|
|
90
90
|
case 0:
|
|
91
|
-
sharedAppName = "cli-tests-compile-"
|
|
92
|
-
return [4 /*yield*/, test_1.createTestApp(homedir, sharedAppName)];
|
|
91
|
+
sharedAppName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
|
|
92
|
+
return [4 /*yield*/, (0, test_1.createTestApp)(homedir, sharedAppName)];
|
|
93
93
|
case 1:
|
|
94
94
|
_a.sent();
|
|
95
95
|
return [2 /*return*/];
|
|
@@ -100,11 +100,11 @@ describe('sasjs compile', function () {
|
|
|
100
100
|
return __generator(this, function (_a) {
|
|
101
101
|
switch (_a.label) {
|
|
102
102
|
case 0:
|
|
103
|
-
appName = "cli-tests-compile-"
|
|
104
|
-
return [4 /*yield*/, test_1.createTestApp(__dirname, appName)];
|
|
103
|
+
appName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
|
|
104
|
+
return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
|
|
105
105
|
case 1:
|
|
106
106
|
_a.sent();
|
|
107
|
-
return [4 /*yield*/, config_1.findTargetInConfiguration('viya')];
|
|
107
|
+
return [4 /*yield*/, (0, config_1.findTargetInConfiguration)('viya')];
|
|
108
108
|
case 2:
|
|
109
109
|
target = (_a.sent()).target;
|
|
110
110
|
jest.spyOn(compileModule, 'copyFilesToBuildFolder');
|
|
@@ -116,7 +116,7 @@ describe('sasjs compile', function () {
|
|
|
116
116
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
117
117
|
return __generator(this, function (_a) {
|
|
118
118
|
switch (_a.label) {
|
|
119
|
-
case 0: return [4 /*yield*/, test_1.removeTestApp(__dirname, appName)];
|
|
119
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, appName)];
|
|
120
120
|
case 1:
|
|
121
121
|
_a.sent();
|
|
122
122
|
return [2 /*return*/];
|
|
@@ -126,7 +126,7 @@ describe('sasjs compile', function () {
|
|
|
126
126
|
afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
127
127
|
return __generator(this, function (_a) {
|
|
128
128
|
switch (_a.label) {
|
|
129
|
-
case 0: return [4 /*yield*/, test_1.removeTestApp(homedir, sharedAppName)];
|
|
129
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestApp)(homedir, sharedAppName)];
|
|
130
130
|
case 1:
|
|
131
131
|
_a.sent();
|
|
132
132
|
return [2 /*return*/];
|
|
@@ -143,20 +143,20 @@ describe('sasjs compile', function () {
|
|
|
143
143
|
wrongSasjsBuildFolder = path_1.default.join(serviceFolder, 'sasjsbuild');
|
|
144
144
|
correctSasjsBuildFolder = path_1.default.join(process.currentDir, 'sasjsbuild');
|
|
145
145
|
correctBuildFile = path_1.default.join(correctSasjsBuildFolder, 'tests', 'services', 'admin', testFile);
|
|
146
|
-
return [4 /*yield*/, utils_1.createFile(path_1.default.join(serviceFolder, testFile), '')];
|
|
146
|
+
return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(serviceFolder, testFile), '')];
|
|
147
147
|
case 1:
|
|
148
148
|
_a.sent();
|
|
149
149
|
process.currentDir = serviceFolder;
|
|
150
150
|
return [4 /*yield*/, expect(compileModule.compile(target)).toResolve()];
|
|
151
151
|
case 2:
|
|
152
152
|
_a.sent();
|
|
153
|
-
return [4 /*yield*/, expect(utils_1.folderExists(wrongSasjsBuildFolder)).resolves.toEqual(false)];
|
|
153
|
+
return [4 /*yield*/, expect((0, utils_1.folderExists)(wrongSasjsBuildFolder)).resolves.toEqual(false)];
|
|
154
154
|
case 3:
|
|
155
155
|
_a.sent();
|
|
156
|
-
return [4 /*yield*/, expect(utils_1.folderExists(correctSasjsBuildFolder)).resolves.toEqual(true)];
|
|
156
|
+
return [4 /*yield*/, expect((0, utils_1.folderExists)(correctSasjsBuildFolder)).resolves.toEqual(true)];
|
|
157
157
|
case 4:
|
|
158
158
|
_a.sent();
|
|
159
|
-
return [4 /*yield*/, expect(utils_1.fileExists(correctBuildFile)).resolves.toEqual(true)];
|
|
159
|
+
return [4 /*yield*/, expect((0, utils_1.fileExists)(correctBuildFile)).resolves.toEqual(true)];
|
|
160
160
|
case 5:
|
|
161
161
|
_a.sent();
|
|
162
162
|
return [2 /*return*/];
|
|
@@ -181,13 +181,13 @@ describe('sasjs compile', function () {
|
|
|
181
181
|
switch (_a.label) {
|
|
182
182
|
case 0:
|
|
183
183
|
absolutePathToSharedApp = path_1.default.join(homedir, sharedAppName);
|
|
184
|
-
return [4 /*yield*/, test_1.updateConfig({
|
|
185
|
-
macroFolders: [absolutePathToSharedApp
|
|
184
|
+
return [4 /*yield*/, (0, test_1.updateConfig)({
|
|
185
|
+
macroFolders: ["".concat(absolutePathToSharedApp, "/sasjs/macros")]
|
|
186
186
|
}, true)];
|
|
187
187
|
case 1:
|
|
188
188
|
_a.sent();
|
|
189
|
-
return [4 /*yield*/, test_1.updateTarget({
|
|
190
|
-
macroFolders: [absolutePathToSharedApp
|
|
189
|
+
return [4 /*yield*/, (0, test_1.updateTarget)({
|
|
190
|
+
macroFolders: ["".concat(absolutePathToSharedApp, "/sasjs/targets/viya/macros")]
|
|
191
191
|
}, 'viya', true)];
|
|
192
192
|
case 2:
|
|
193
193
|
_a.sent();
|
|
@@ -206,10 +206,10 @@ describe('sasjs compile', function () {
|
|
|
206
206
|
switch (_a.label) {
|
|
207
207
|
case 0:
|
|
208
208
|
tildePathToApp = path_1.default.join(__dirname, appName).replace(homedir, '~');
|
|
209
|
-
return [4 /*yield*/, test_1.updateConfig(prefixConfigWithPath(tildePathToApp), true)];
|
|
209
|
+
return [4 /*yield*/, (0, test_1.updateConfig)(prefixConfigWithPath(tildePathToApp), true)];
|
|
210
210
|
case 1:
|
|
211
211
|
_a.sent();
|
|
212
|
-
return [4 /*yield*/, test_1.updateTarget(prefixTargetConfigWithPath(tildePathToApp), 'viya', true)];
|
|
212
|
+
return [4 /*yield*/, (0, test_1.updateTarget)(prefixTargetConfigWithPath(tildePathToApp), 'viya', true)];
|
|
213
213
|
case 2:
|
|
214
214
|
_a.sent();
|
|
215
215
|
return [4 /*yield*/, expect(compileModule.compile(target)).toResolve()];
|
|
@@ -224,7 +224,7 @@ describe('sasjs compile', function () {
|
|
|
224
224
|
it('should compile an uncompiled project having no target', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
225
225
|
return __generator(this, function (_a) {
|
|
226
226
|
switch (_a.label) {
|
|
227
|
-
case 0: return [4 /*yield*/, test_1.removeAllTargetsFromConfigs()];
|
|
227
|
+
case 0: return [4 /*yield*/, (0, test_1.removeAllTargetsFromConfigs)()];
|
|
228
228
|
case 1:
|
|
229
229
|
_a.sent();
|
|
230
230
|
return [4 /*yield*/, expect(compileModule.compile({})).toResolve()];
|
|
@@ -248,7 +248,7 @@ describe('sasjs compile', function () {
|
|
|
248
248
|
"1. 'doesnotexist.sas' with fileRef 'SOMEREF'\n" +
|
|
249
249
|
'Please check that they exist in the folder(s) listed in the `programFolders` array in your sasjsconfig.json file.\n' +
|
|
250
250
|
'Program Folders:\n' +
|
|
251
|
-
|
|
251
|
+
"- ".concat(path_1.default.join(__dirname, appName, 'sasjs/programs'));
|
|
252
252
|
return [4 /*yield*/, expect(compileModule.compile(newTarget)).rejects.toThrow(errorMessage)];
|
|
253
253
|
case 1:
|
|
254
254
|
_a.sent();
|
|
@@ -283,7 +283,7 @@ describe('sasjs compile single file', function () {
|
|
|
283
283
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
284
284
|
return __generator(this, function (_a) {
|
|
285
285
|
switch (_a.label) {
|
|
286
|
-
case 0: return [4 /*yield*/, test_1.removeTestApp(__dirname, appName)];
|
|
286
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, appName)];
|
|
287
287
|
case 1:
|
|
288
288
|
_a.sent();
|
|
289
289
|
return [2 /*return*/];
|
|
@@ -295,11 +295,11 @@ describe('sasjs compile single file', function () {
|
|
|
295
295
|
return __generator(this, function (_a) {
|
|
296
296
|
switch (_a.label) {
|
|
297
297
|
case 0:
|
|
298
|
-
appName = "cli-tests-compile-"
|
|
299
|
-
return [4 /*yield*/, test_1.createTestJobsApp(__dirname, appName)];
|
|
298
|
+
appName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
|
|
299
|
+
return [4 /*yield*/, (0, test_1.createTestJobsApp)(__dirname, appName)];
|
|
300
300
|
case 1:
|
|
301
301
|
_a.sent();
|
|
302
|
-
return [4 /*yield*/, config_1.findTargetInConfiguration('viya')];
|
|
302
|
+
return [4 /*yield*/, (0, config_1.findTargetInConfiguration)('viya')];
|
|
303
303
|
case 2:
|
|
304
304
|
target = (_a.sent()).target;
|
|
305
305
|
jest.spyOn(compileJobFile, 'compileJobFile');
|
|
@@ -323,7 +323,7 @@ describe('sasjs compile single file', function () {
|
|
|
323
323
|
return [4 /*yield*/, command.output];
|
|
324
324
|
case 1:
|
|
325
325
|
output = _a.sent();
|
|
326
|
-
return [4 /*yield*/, expect(compileSingleFile_1.compileSingleFile(target, 'job', command.source, output)).toResolve()];
|
|
326
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(target, 'job', command.source, output)).toResolve()];
|
|
327
327
|
case 2:
|
|
328
328
|
_a.sent();
|
|
329
329
|
expect(compileJobFile.compileJobFile).toHaveBeenCalled();
|
|
@@ -347,7 +347,7 @@ describe('sasjs compile single file', function () {
|
|
|
347
347
|
return [4 /*yield*/, command.output];
|
|
348
348
|
case 1:
|
|
349
349
|
output = _a.sent();
|
|
350
|
-
return [4 /*yield*/, expect(compileSingleFile_1.compileSingleFile(target, 'job', command.source, output)).toResolve()];
|
|
350
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(target, 'job', command.source, output)).toResolve()];
|
|
351
351
|
case 2:
|
|
352
352
|
_a.sent();
|
|
353
353
|
expect(compileJobFile.compileJobFile).toHaveBeenCalled();
|
|
@@ -361,11 +361,11 @@ describe('sasjs compile single file', function () {
|
|
|
361
361
|
return __generator(this, function (_a) {
|
|
362
362
|
switch (_a.label) {
|
|
363
363
|
case 0:
|
|
364
|
-
appName = "cli-tests-compile-"
|
|
365
|
-
return [4 /*yield*/, test_1.createTestApp(__dirname, appName)];
|
|
364
|
+
appName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
|
|
365
|
+
return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
|
|
366
366
|
case 1:
|
|
367
367
|
_a.sent();
|
|
368
|
-
return [4 /*yield*/, config_1.findTargetInConfiguration('viya')];
|
|
368
|
+
return [4 /*yield*/, (0, config_1.findTargetInConfiguration)('viya')];
|
|
369
369
|
case 2:
|
|
370
370
|
target = (_a.sent()).target;
|
|
371
371
|
jest.spyOn(compileServiceFile, 'compileServiceFile');
|
|
@@ -389,7 +389,7 @@ describe('sasjs compile single file', function () {
|
|
|
389
389
|
return [4 /*yield*/, command.output];
|
|
390
390
|
case 1:
|
|
391
391
|
output = _a.sent();
|
|
392
|
-
return [4 /*yield*/, expect(compileSingleFile_1.compileSingleFile(target, 'service', command.source, output)).toResolve()];
|
|
392
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(target, 'service', command.source, output)).toResolve()];
|
|
393
393
|
case 2:
|
|
394
394
|
_a.sent();
|
|
395
395
|
expect(compileServiceFile.compileServiceFile).toHaveBeenCalled();
|
|
@@ -408,12 +408,12 @@ describe('sasjs compile single file', function () {
|
|
|
408
408
|
'compile',
|
|
409
409
|
'service',
|
|
410
410
|
'-s',
|
|
411
|
-
process.projectDir
|
|
411
|
+
"".concat(process.projectDir, "/sasjs/services/common/example.sas")
|
|
412
412
|
]);
|
|
413
413
|
return [4 /*yield*/, command.output];
|
|
414
414
|
case 1:
|
|
415
415
|
output = _a.sent();
|
|
416
|
-
return [4 /*yield*/, expect(compileSingleFile_1.compileSingleFile(target, 'service', command.source, output)).toResolve()];
|
|
416
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(target, 'service', command.source, output)).toResolve()];
|
|
417
417
|
case 2:
|
|
418
418
|
_a.sent();
|
|
419
419
|
expect(compileServiceFile.compileServiceFile).toHaveBeenCalled();
|
|
@@ -440,8 +440,8 @@ describe('sasjs compile outside project', function () {
|
|
|
440
440
|
return __generator(this, function (_a) {
|
|
441
441
|
switch (_a.label) {
|
|
442
442
|
case 0:
|
|
443
|
-
sharedAppName = "cli-tests-compile-"
|
|
444
|
-
return [4 /*yield*/, test_1.createTestApp(homedir, sharedAppName)];
|
|
443
|
+
sharedAppName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
|
|
444
|
+
return [4 /*yield*/, (0, test_1.createTestApp)(homedir, sharedAppName)];
|
|
445
445
|
case 1:
|
|
446
446
|
_a.sent();
|
|
447
447
|
return [2 /*return*/];
|
|
@@ -452,21 +452,21 @@ describe('sasjs compile outside project', function () {
|
|
|
452
452
|
return __generator(this, function (_a) {
|
|
453
453
|
switch (_a.label) {
|
|
454
454
|
case 0:
|
|
455
|
-
appName = "cli-tests-compile-"
|
|
456
|
-
return [4 /*yield*/, test_1.updateConfig({
|
|
455
|
+
appName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
|
|
456
|
+
return [4 /*yield*/, (0, test_1.updateConfig)({
|
|
457
457
|
macroFolders: [
|
|
458
|
-
"./"
|
|
459
|
-
"./"
|
|
458
|
+
"./".concat(sharedAppName, "/sasjs/macros"),
|
|
459
|
+
"./".concat(sharedAppName, "/sasjs/targets/viya/macros")
|
|
460
460
|
]
|
|
461
461
|
}, false)];
|
|
462
462
|
case 1:
|
|
463
463
|
_a.sent();
|
|
464
464
|
process.projectDir = '';
|
|
465
|
-
return [4 /*yield*/, utils_2.setConstants()];
|
|
465
|
+
return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
466
466
|
case 2:
|
|
467
467
|
_a.sent();
|
|
468
468
|
process.currentDir = path_1.default.join(__dirname, appName);
|
|
469
|
-
return [4 /*yield*/, utils_1.createFolder(process.currentDir)];
|
|
469
|
+
return [4 /*yield*/, (0, utils_1.createFolder)(process.currentDir)];
|
|
470
470
|
case 3:
|
|
471
471
|
_a.sent();
|
|
472
472
|
return [2 /*return*/];
|
|
@@ -476,16 +476,16 @@ describe('sasjs compile outside project', function () {
|
|
|
476
476
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
477
477
|
return __generator(this, function (_a) {
|
|
478
478
|
switch (_a.label) {
|
|
479
|
-
case 0: return [4 /*yield*/, test_1.updateConfig({
|
|
479
|
+
case 0: return [4 /*yield*/, (0, test_1.updateConfig)({
|
|
480
480
|
macroFolders: [],
|
|
481
481
|
buildConfig: defaultBuildConfig
|
|
482
482
|
}, false)];
|
|
483
483
|
case 1:
|
|
484
484
|
_a.sent();
|
|
485
|
-
return [4 /*yield*/, utils_1.deleteFolder(parentOutputFolder)];
|
|
485
|
+
return [4 /*yield*/, (0, utils_1.deleteFolder)(parentOutputFolder)];
|
|
486
486
|
case 2:
|
|
487
487
|
_a.sent();
|
|
488
|
-
return [4 /*yield*/, utils_1.deleteFolder(process.currentDir)];
|
|
488
|
+
return [4 /*yield*/, (0, utils_1.deleteFolder)(process.currentDir)];
|
|
489
489
|
case 3:
|
|
490
490
|
_a.sent();
|
|
491
491
|
return [2 /*return*/];
|
|
@@ -495,10 +495,10 @@ describe('sasjs compile outside project', function () {
|
|
|
495
495
|
afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
496
496
|
return __generator(this, function (_a) {
|
|
497
497
|
switch (_a.label) {
|
|
498
|
-
case 0: return [4 /*yield*/, test_1.removeTestApp(homedir, sharedAppName)];
|
|
498
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestApp)(homedir, sharedAppName)];
|
|
499
499
|
case 1:
|
|
500
500
|
_a.sent();
|
|
501
|
-
return [4 /*yield*/, utils_1.deleteFolder(path_1.default.join(homedir, '.sasjs'))];
|
|
501
|
+
return [4 /*yield*/, (0, utils_1.deleteFolder)(path_1.default.join(homedir, '.sasjs'))];
|
|
502
502
|
case 2:
|
|
503
503
|
_a.sent();
|
|
504
504
|
return [2 /*return*/];
|
|
@@ -524,15 +524,15 @@ describe('sasjs compile outside project', function () {
|
|
|
524
524
|
return [4 /*yield*/, command.output];
|
|
525
525
|
case 1:
|
|
526
526
|
output = _a.sent();
|
|
527
|
-
return [4 /*yield*/, expect(compileSingleFile_1.compileSingleFile(undefined, 'service', command.source, output)).resolves.toEqual({
|
|
527
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(undefined, 'service', command.source, output)).resolves.toEqual({
|
|
528
528
|
destinationPath: destinationPath
|
|
529
529
|
})];
|
|
530
530
|
case 2:
|
|
531
531
|
_a.sent();
|
|
532
|
-
return [4 /*yield*/, expect(utils_1.fileExists(destinationPath)).resolves.toEqual(true)];
|
|
532
|
+
return [4 /*yield*/, expect((0, utils_1.fileExists)(destinationPath)).resolves.toEqual(true)];
|
|
533
533
|
case 3:
|
|
534
534
|
_a.sent();
|
|
535
|
-
return [4 /*yield*/, utils_1.readFile(destinationPath)];
|
|
535
|
+
return [4 /*yield*/, (0, utils_1.readFile)(destinationPath)];
|
|
536
536
|
case 4:
|
|
537
537
|
compiledContent = _a.sent();
|
|
538
538
|
macrosToTest = [
|
|
@@ -540,7 +540,7 @@ describe('sasjs compile outside project', function () {
|
|
|
540
540
|
'examplemacro',
|
|
541
541
|
'yetanothermacro'
|
|
542
542
|
];
|
|
543
|
-
return [4 /*yield*/, test_1.verifyCompiledService(compiledContent, macrosToTest, false, false)];
|
|
543
|
+
return [4 /*yield*/, (0, test_1.verifyCompiledService)(compiledContent, macrosToTest, false, false)];
|
|
544
544
|
case 5:
|
|
545
545
|
_a.sent();
|
|
546
546
|
return [2 /*return*/];
|
|
@@ -556,10 +556,10 @@ describe('sasjs compile outside project', function () {
|
|
|
556
556
|
destinationPath = path_1.default.join(buildOutputFolder, 'services', 'services', 'example1.sas');
|
|
557
557
|
absolutePathToSharedApp = path_1.default.join(homedir, sharedAppName);
|
|
558
558
|
parentOutputFolder = buildOutputFolder;
|
|
559
|
-
return [4 /*yield*/, test_1.updateConfig({
|
|
559
|
+
return [4 /*yield*/, (0, test_1.updateConfig)({
|
|
560
560
|
macroFolders: [
|
|
561
|
-
absolutePathToSharedApp
|
|
562
|
-
absolutePathToSharedApp
|
|
561
|
+
"".concat(absolutePathToSharedApp, "/sasjs/macros"),
|
|
562
|
+
"".concat(absolutePathToSharedApp, "/sasjs/targets/viya/macros")
|
|
563
563
|
]
|
|
564
564
|
}, false)];
|
|
565
565
|
case 1:
|
|
@@ -575,15 +575,15 @@ describe('sasjs compile outside project', function () {
|
|
|
575
575
|
return [4 /*yield*/, command.output];
|
|
576
576
|
case 2:
|
|
577
577
|
output = _a.sent();
|
|
578
|
-
return [4 /*yield*/, expect(compileSingleFile_1.compileSingleFile(undefined, 'service', command.source, output)).resolves.toEqual({
|
|
578
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(undefined, 'service', command.source, output)).resolves.toEqual({
|
|
579
579
|
destinationPath: destinationPath
|
|
580
580
|
})];
|
|
581
581
|
case 3:
|
|
582
582
|
_a.sent();
|
|
583
|
-
return [4 /*yield*/, expect(utils_1.fileExists(destinationPath)).resolves.toEqual(true)];
|
|
583
|
+
return [4 /*yield*/, expect((0, utils_1.fileExists)(destinationPath)).resolves.toEqual(true)];
|
|
584
584
|
case 4:
|
|
585
585
|
_a.sent();
|
|
586
|
-
return [4 /*yield*/, utils_1.readFile(destinationPath)];
|
|
586
|
+
return [4 /*yield*/, (0, utils_1.readFile)(destinationPath)];
|
|
587
587
|
case 5:
|
|
588
588
|
compiledContent = _a.sent();
|
|
589
589
|
macrosToTest = [
|
|
@@ -591,7 +591,7 @@ describe('sasjs compile outside project', function () {
|
|
|
591
591
|
'examplemacro',
|
|
592
592
|
'yetanothermacro'
|
|
593
593
|
];
|
|
594
|
-
return [4 /*yield*/, test_1.verifyCompiledService(compiledContent, macrosToTest, false, false)];
|
|
594
|
+
return [4 /*yield*/, (0, test_1.verifyCompiledService)(compiledContent, macrosToTest, false, false)];
|
|
595
595
|
case 6:
|
|
596
596
|
_a.sent();
|
|
597
597
|
return [2 /*return*/];
|
|
@@ -606,7 +606,7 @@ describe('sasjs compile outside project', function () {
|
|
|
606
606
|
buildOutputFolder = path_1.default.join(homedir, '.sasjs', 'sasjsbuild');
|
|
607
607
|
parentOutputFolder = buildOutputFolder;
|
|
608
608
|
dependencies = ['examplemacro.sas', 'yetanothermacro.sas'];
|
|
609
|
-
return [4 /*yield*/, test_1.updateConfig({
|
|
609
|
+
return [4 /*yield*/, (0, test_1.updateConfig)({
|
|
610
610
|
macroFolders: []
|
|
611
611
|
}, false)];
|
|
612
612
|
case 1:
|
|
@@ -622,7 +622,7 @@ describe('sasjs compile outside project', function () {
|
|
|
622
622
|
return [4 /*yield*/, command.output];
|
|
623
623
|
case 2:
|
|
624
624
|
output = _a.sent();
|
|
625
|
-
return [4 /*yield*/, expect(compileSingleFile_1.compileSingleFile(undefined, 'service', command.source, output)).rejects.toEqual("Unable to locate dependencies: "
|
|
625
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(undefined, 'service', command.source, output)).rejects.toEqual("Unable to locate dependencies: ".concat(dependencies.join(', ')))];
|
|
626
626
|
case 3:
|
|
627
627
|
_a.sent();
|
|
628
628
|
return [2 /*return*/];
|
|
@@ -637,12 +637,12 @@ describe('sasjs compile outside project', function () {
|
|
|
637
637
|
buildOutputFolder = path_1.default.join(__dirname, 'random-folder', appName);
|
|
638
638
|
destinationPath = path_1.default.join(buildOutputFolder, 'services', 'services', 'example1.sas');
|
|
639
639
|
parentOutputFolder = path_1.default.join(__dirname, 'random-folder');
|
|
640
|
-
return [4 /*yield*/, test_1.updateConfig({
|
|
640
|
+
return [4 /*yield*/, (0, test_1.updateConfig)({
|
|
641
641
|
buildConfig: __assign(__assign({}, defaultBuildConfig), { buildOutputFolder: buildOutputFolder })
|
|
642
642
|
}, false)];
|
|
643
643
|
case 1:
|
|
644
644
|
_a.sent();
|
|
645
|
-
return [4 /*yield*/, utils_2.setConstants()];
|
|
645
|
+
return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
646
646
|
case 2:
|
|
647
647
|
_a.sent();
|
|
648
648
|
command = new compileCommand_1.CompileCommand([
|
|
@@ -656,15 +656,15 @@ describe('sasjs compile outside project', function () {
|
|
|
656
656
|
return [4 /*yield*/, command.output];
|
|
657
657
|
case 3:
|
|
658
658
|
output = _a.sent();
|
|
659
|
-
return [4 /*yield*/, expect(compileSingleFile_1.compileSingleFile(undefined, 'service', command.source, output)).resolves.toEqual({
|
|
659
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(undefined, 'service', command.source, output)).resolves.toEqual({
|
|
660
660
|
destinationPath: destinationPath
|
|
661
661
|
})];
|
|
662
662
|
case 4:
|
|
663
663
|
_a.sent();
|
|
664
|
-
return [4 /*yield*/, expect(utils_1.fileExists(destinationPath)).resolves.toEqual(true)];
|
|
664
|
+
return [4 /*yield*/, expect((0, utils_1.fileExists)(destinationPath)).resolves.toEqual(true)];
|
|
665
665
|
case 5:
|
|
666
666
|
_a.sent();
|
|
667
|
-
return [4 /*yield*/, utils_1.readFile(destinationPath)];
|
|
667
|
+
return [4 /*yield*/, (0, utils_1.readFile)(destinationPath)];
|
|
668
668
|
case 6:
|
|
669
669
|
compiledContent = _a.sent();
|
|
670
670
|
macrosToTest = [
|
|
@@ -672,7 +672,7 @@ describe('sasjs compile outside project', function () {
|
|
|
672
672
|
'examplemacro',
|
|
673
673
|
'yetanothermacro'
|
|
674
674
|
];
|
|
675
|
-
return [4 /*yield*/, test_1.verifyCompiledService(compiledContent, macrosToTest, false, false)];
|
|
675
|
+
return [4 /*yield*/, (0, test_1.verifyCompiledService)(compiledContent, macrosToTest, false, false)];
|
|
676
676
|
case 7:
|
|
677
677
|
_a.sent();
|
|
678
678
|
return [2 /*return*/];
|
|
@@ -687,12 +687,12 @@ describe('sasjs compile outside project', function () {
|
|
|
687
687
|
buildOutputFolder = path_1.default.join(homedir, appName, 'random-folder');
|
|
688
688
|
destinationPath = path_1.default.join(buildOutputFolder, 'services', 'services', 'example1.sas');
|
|
689
689
|
parentOutputFolder = path_1.default.join(homedir, appName);
|
|
690
|
-
return [4 /*yield*/, test_1.updateConfig({
|
|
690
|
+
return [4 /*yield*/, (0, test_1.updateConfig)({
|
|
691
691
|
buildConfig: __assign(__assign({}, defaultBuildConfig), { buildOutputFolder: appName + '/random-folder' })
|
|
692
692
|
}, false)];
|
|
693
693
|
case 1:
|
|
694
694
|
_a.sent();
|
|
695
|
-
return [4 /*yield*/, utils_2.setConstants()];
|
|
695
|
+
return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
696
696
|
case 2:
|
|
697
697
|
_a.sent();
|
|
698
698
|
command = new compileCommand_1.CompileCommand([
|
|
@@ -706,15 +706,15 @@ describe('sasjs compile outside project', function () {
|
|
|
706
706
|
return [4 /*yield*/, command.output];
|
|
707
707
|
case 3:
|
|
708
708
|
output = _a.sent();
|
|
709
|
-
return [4 /*yield*/, expect(compileSingleFile_1.compileSingleFile(undefined, 'service', command.source, output)).resolves.toEqual({
|
|
709
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(undefined, 'service', command.source, output)).resolves.toEqual({
|
|
710
710
|
destinationPath: destinationPath
|
|
711
711
|
})];
|
|
712
712
|
case 4:
|
|
713
713
|
_a.sent();
|
|
714
|
-
return [4 /*yield*/, expect(utils_1.fileExists(destinationPath)).resolves.toEqual(true)];
|
|
714
|
+
return [4 /*yield*/, expect((0, utils_1.fileExists)(destinationPath)).resolves.toEqual(true)];
|
|
715
715
|
case 5:
|
|
716
716
|
_a.sent();
|
|
717
|
-
return [4 /*yield*/, utils_1.readFile(destinationPath)];
|
|
717
|
+
return [4 /*yield*/, (0, utils_1.readFile)(destinationPath)];
|
|
718
718
|
case 6:
|
|
719
719
|
compiledContent = _a.sent();
|
|
720
720
|
macrosToTest = [
|
|
@@ -722,7 +722,7 @@ describe('sasjs compile outside project', function () {
|
|
|
722
722
|
'examplemacro',
|
|
723
723
|
'yetanothermacro'
|
|
724
724
|
];
|
|
725
|
-
return [4 /*yield*/, test_1.verifyCompiledService(compiledContent, macrosToTest, false, false)];
|
|
725
|
+
return [4 /*yield*/, (0, test_1.verifyCompiledService)(compiledContent, macrosToTest, false, false)];
|
|
726
726
|
case 7:
|
|
727
727
|
_a.sent();
|
|
728
728
|
return [2 /*return*/];
|
|
@@ -735,16 +735,16 @@ describe('sasjs compile outside project', function () {
|
|
|
735
735
|
return __generator(this, function (_a) {
|
|
736
736
|
switch (_a.label) {
|
|
737
737
|
case 0:
|
|
738
|
-
appName = "cli-tests-compile-"
|
|
739
|
-
return [4 /*yield*/, config_1.saveGlobalRcFile('')];
|
|
738
|
+
appName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
|
|
739
|
+
return [4 /*yield*/, (0, config_1.saveGlobalRcFile)('')];
|
|
740
740
|
case 1:
|
|
741
741
|
_a.sent();
|
|
742
742
|
process.projectDir = '';
|
|
743
|
-
return [4 /*yield*/, utils_2.setConstants()];
|
|
743
|
+
return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
744
744
|
case 2:
|
|
745
745
|
_a.sent();
|
|
746
746
|
process.currentDir = path_1.default.join(__dirname, appName);
|
|
747
|
-
return [4 /*yield*/, utils_1.createFolder(process.currentDir)];
|
|
747
|
+
return [4 /*yield*/, (0, utils_1.createFolder)(process.currentDir)];
|
|
748
748
|
case 3:
|
|
749
749
|
_a.sent();
|
|
750
750
|
return [2 /*return*/];
|
|
@@ -754,7 +754,7 @@ describe('sasjs compile outside project', function () {
|
|
|
754
754
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
755
755
|
return __generator(this, function (_a) {
|
|
756
756
|
switch (_a.label) {
|
|
757
|
-
case 0: return [4 /*yield*/, utils_1.deleteFolder(process.currentDir)];
|
|
757
|
+
case 0: return [4 /*yield*/, (0, utils_1.deleteFolder)(process.currentDir)];
|
|
758
758
|
case 1:
|
|
759
759
|
_a.sent();
|
|
760
760
|
return [2 /*return*/];
|
|
@@ -778,7 +778,7 @@ describe('sasjs compile outside project', function () {
|
|
|
778
778
|
return [4 /*yield*/, command.output];
|
|
779
779
|
case 1:
|
|
780
780
|
output = _a.sent();
|
|
781
|
-
return [4 /*yield*/, expect(compileSingleFile_1.compileSingleFile(undefined, 'service', command.source, output)).rejects.toEqual("Unable to locate dependencies: "
|
|
781
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(undefined, 'service', command.source, output)).rejects.toEqual("Unable to locate dependencies: ".concat(dependencies.join(', ')))];
|
|
782
782
|
case 2:
|
|
783
783
|
_a.sent();
|
|
784
784
|
return [2 /*return*/];
|
|
@@ -789,10 +789,10 @@ describe('sasjs compile outside project', function () {
|
|
|
789
789
|
});
|
|
790
790
|
var prefixConfigWithPath = function (prefixPath) { return ({
|
|
791
791
|
buildConfig: {
|
|
792
|
-
initProgram: prefixPath
|
|
793
|
-
termProgram: prefixPath
|
|
794
|
-
buildOutputFolder: prefixPath
|
|
795
|
-
buildResultsFolder: prefixPath
|
|
792
|
+
initProgram: "".concat(prefixPath, "/sasjs/build/buildinit.sas"),
|
|
793
|
+
termProgram: "".concat(prefixPath, "/sasjs/build/buildterm.sas"),
|
|
794
|
+
buildOutputFolder: "".concat(prefixPath, "/sasjsbuild"),
|
|
795
|
+
buildResultsFolder: "".concat(prefixPath, "/sasjsresults"),
|
|
796
796
|
macroVars: {
|
|
797
797
|
name: 'value',
|
|
798
798
|
numvar: '42'
|
|
@@ -801,28 +801,28 @@ var prefixConfigWithPath = function (prefixPath) { return ({
|
|
|
801
801
|
},
|
|
802
802
|
deployConfig: {
|
|
803
803
|
deployServicePack: false,
|
|
804
|
-
deployScripts: [prefixPath
|
|
804
|
+
deployScripts: ["".concat(prefixPath, "/sasjs/build/deployscript.sh")]
|
|
805
805
|
},
|
|
806
806
|
serviceConfig: {
|
|
807
807
|
serviceFolders: [
|
|
808
|
-
prefixPath
|
|
809
|
-
prefixPath
|
|
808
|
+
"".concat(prefixPath, "/sasjs/services/common"),
|
|
809
|
+
"".concat(prefixPath, "/sasjs/services/admin")
|
|
810
810
|
],
|
|
811
|
-
initProgram: prefixPath
|
|
812
|
-
termProgram: prefixPath
|
|
811
|
+
initProgram: "".concat(prefixPath, "/sasjs/build/serviceinit.sas"),
|
|
812
|
+
termProgram: "".concat(prefixPath, "/sasjs/build/serviceterm.sas"),
|
|
813
813
|
macroVars: {
|
|
814
814
|
name: 'value',
|
|
815
815
|
numvar: '42'
|
|
816
816
|
}
|
|
817
817
|
},
|
|
818
|
-
macroFolders: [prefixPath
|
|
819
|
-
programFolders: [prefixPath
|
|
818
|
+
macroFolders: ["".concat(prefixPath, "/sasjs/macros")],
|
|
819
|
+
programFolders: ["".concat(prefixPath, "/sasjs/programs")]
|
|
820
820
|
}); };
|
|
821
821
|
var prefixTargetConfigWithPath = function (prefixPath) { return ({
|
|
822
822
|
buildConfig: {
|
|
823
823
|
buildOutputFileName: 'myviyadeploy.sas',
|
|
824
|
-
initProgram: prefixPath
|
|
825
|
-
termProgram: prefixPath
|
|
824
|
+
initProgram: "".concat(prefixPath, "/sasjs/build/buildinitviya.sas"),
|
|
825
|
+
termProgram: "".concat(prefixPath, "/sasjs/targets/viya/viyabuildterm.sas"),
|
|
826
826
|
macroVars: {
|
|
827
827
|
name: 'viyavalue',
|
|
828
828
|
extravar: 'this too'
|
|
@@ -830,16 +830,16 @@ var prefixTargetConfigWithPath = function (prefixPath) { return ({
|
|
|
830
830
|
},
|
|
831
831
|
deployConfig: {
|
|
832
832
|
deployServicePack: true,
|
|
833
|
-
deployScripts: [prefixPath
|
|
833
|
+
deployScripts: ["".concat(prefixPath, "/sasjsbuild/myviyadeploy.sas")]
|
|
834
834
|
},
|
|
835
835
|
serviceConfig: {
|
|
836
|
-
serviceFolders: [prefixPath
|
|
837
|
-
initProgram: prefixPath
|
|
838
|
-
termProgram: prefixPath
|
|
836
|
+
serviceFolders: ["".concat(prefixPath, "/sasjs/targets/viya/services/admin")],
|
|
837
|
+
initProgram: "".concat(prefixPath, "/sasjs/build/serviceinit.sas"),
|
|
838
|
+
termProgram: "".concat(prefixPath, "/sasjs/build/serviceinit.sas"),
|
|
839
839
|
macroVars: {
|
|
840
840
|
name: 'viyavalue',
|
|
841
841
|
extravar: 'this too'
|
|
842
842
|
}
|
|
843
843
|
},
|
|
844
|
-
macroFolders: [prefixPath
|
|
844
|
+
macroFolders: ["".concat(prefixPath, "/sasjs/targets/viya/macros")]
|
|
845
845
|
}); };
|