@sasjs/cli 3.6.1 → 3.6.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -3
- package/build/cli.js +4 -4
- package/build/cli.spec.js +6 -6
- package/build/commands/add/addCommand.js +2 -2
- package/build/commands/add/addCredential.js +27 -27
- package/build/commands/add/addTarget.js +10 -10
- package/build/commands/add/internal/input.js +30 -30
- package/build/commands/add/internal/saveConfig.js +2 -2
- package/build/commands/add/spec/addCommand.spec.js +24 -20
- package/build/commands/add/spec/addCredential.spec.js +14 -14
- package/build/commands/add/spec/addTarget.spec.js +22 -22
- package/build/commands/build/build.js +81 -77
- package/build/commands/build/buildCommand.js +3 -3
- package/build/commands/build/compileBuildCommand.js +4 -4
- package/build/commands/build/internal/config.js +8 -8
- package/build/commands/build/internal/getLaunchPageCode.js +2 -2
- package/build/commands/build/spec/build.spec.js +10 -10
- package/build/commands/build/spec/buildCommand.spec.js +16 -12
- package/build/commands/build/spec/cb.spec.server.js +18 -18
- package/build/commands/build/spec/compileBuildCommand.spec.js +17 -13
- package/build/commands/compile/compile.js +61 -61
- package/build/commands/compile/compileCommand.js +10 -10
- package/build/commands/compile/compileSingleFile.js +17 -17
- package/build/commands/compile/internal/checkCompileStatus.js +11 -11
- package/build/commands/compile/internal/compareFolders.js +11 -11
- package/build/commands/compile/internal/compileJobFile.js +3 -3
- package/build/commands/compile/internal/compileServiceFile.js +14 -14
- package/build/commands/compile/internal/compileTestFile.js +41 -37
- package/build/commands/compile/internal/getAllJobFolders.js +13 -9
- package/build/commands/compile/internal/getAllServiceFolders.js +13 -9
- package/build/commands/compile/internal/getServerType.js +1 -1
- package/build/commands/compile/internal/identifySasFile.js +2 -2
- package/build/commands/compile/internal/loadDependencies.js +5 -5
- package/build/commands/compile/internal/spec/compileTestFile.spec.js +40 -40
- package/build/commands/compile/spec/compareFolders.spec.js +27 -27
- package/build/commands/compile/spec/compile.spec.js +93 -93
- package/build/commands/compile/spec/compileCommand.spec.js +37 -33
- package/build/commands/compile/spec/compileJobFile.spec.js +12 -22
- package/build/commands/compile/spec/compileServiceFile.spec.js +12 -22
- package/build/commands/compile/spec/copyFilesToBuildFolder.spec.js +7 -7
- package/build/commands/compile/spec/loadDependencies.spec.js +31 -162
- package/build/commands/context/contextCommand.js +16 -16
- package/build/commands/context/create.js +1 -1
- package/build/commands/context/delete.js +2 -2
- package/build/commands/context/edit.js +1 -1
- package/build/commands/context/export.js +5 -5
- package/build/commands/context/internal/validateConfigPath.js +1 -1
- package/build/commands/context/list.js +4 -4
- package/build/commands/context/spec/contextCommand.spec.js +80 -76
- package/build/commands/context/spec/create.spec.js +3 -3
- package/build/commands/context/spec/delete.spec.js +3 -3
- package/build/commands/context/spec/edit.spec.js +3 -3
- package/build/commands/context/spec/export.spec.js +8 -8
- package/build/commands/context/spec/list.spec.js +5 -5
- package/build/commands/create/create.js +12 -12
- package/build/commands/create/createCommand.js +2 -2
- package/build/commands/create/internal/createReadme.js +2 -2
- package/build/commands/create/spec/create.spec.js +39 -39
- package/build/commands/create/spec/createCommand.spec.js +14 -10
- package/build/commands/db/db.js +22 -22
- package/build/commands/db/dbCommand.js +1 -1
- package/build/commands/db/spec/db.spec.js +8 -8
- package/build/commands/db/spec/dbCommand.spec.js +11 -7
- package/build/commands/deploy/compileBuildDeployCommand.js +6 -6
- package/build/commands/deploy/deploy.js +39 -39
- package/build/commands/deploy/deployCommand.js +2 -2
- package/build/commands/deploy/internal/getDeployScripts.js +14 -10
- package/build/commands/deploy/spec/cbd.spec.js +14 -14
- package/build/commands/deploy/spec/cbd.spec.server.js +40 -40
- package/build/commands/deploy/spec/compileBuildDeployCommand.spec.js +18 -14
- package/build/commands/deploy/spec/deployCommand.spec.js +15 -11
- package/build/commands/deploy/spec/getDeployScripts.spec.js +8 -8
- package/build/commands/deploy/spec/utils.js +17 -17
- package/build/commands/docs/docsCommand.js +7 -7
- package/build/commands/docs/generateDocs.js +33 -29
- package/build/commands/docs/generateDot.js +12 -8
- package/build/commands/docs/initDocs.js +1 -1
- package/build/commands/docs/internal/createDotFiles.js +6 -6
- package/build/commands/docs/internal/getDotFileContent.js +17 -17
- package/build/commands/docs/internal/getFileInputs.js +1 -1
- package/build/commands/docs/internal/getFileOutputs.js +1 -1
- package/build/commands/docs/internal/getFoldersForDocs.js +4 -4
- package/build/commands/docs/internal/populateNodeDictionary.js +1 -1
- package/build/commands/docs/spec/docsCommand.spec.js +25 -21
- package/build/commands/docs/spec/generateDocs.spec.js +60 -60
- package/build/commands/docs/spec/generateDot.spec.js +23 -23
- package/build/commands/docs/spec/getDocConfig.spec.js +2 -2
- package/build/commands/docs/spec/initDocs.spec.js +7 -7
- package/build/commands/flow/execute.js +8 -8
- package/build/commands/flow/flowCommand.js +5 -5
- package/build/commands/flow/internal/checkPredecessorDeadlock.js +11 -7
- package/build/commands/flow/internal/executeFlow.js +23 -23
- package/build/commands/flow/internal/failAllSuccessors.js +1 -1
- package/build/commands/flow/internal/generateFileName.js +2 -2
- package/build/commands/flow/internal/normalizeFilePath.js +1 -1
- package/build/commands/flow/internal/parseJobDetails.js +3 -3
- package/build/commands/flow/internal/printError.js +1 -1
- package/build/commands/flow/internal/saveLog.js +8 -8
- package/build/commands/flow/internal/saveToCsv.js +2 -2
- package/build/commands/flow/internal/spec/allFlowsCompleted.spec.js +4 -4
- package/build/commands/flow/internal/spec/checkPredecessorDeadlock.spec.js +4 -4
- package/build/commands/flow/internal/spec/executeFlow.spec.js +10 -10
- package/build/commands/flow/internal/spec/failAllSuccessors.spec.js +1 -1
- package/build/commands/flow/internal/spec/saveToCsv.spec.js +16 -16
- package/build/commands/flow/internal/spec/validateParams.spec.js +33 -33
- package/build/commands/flow/internal/validateParams.js +17 -17
- package/build/commands/flow/spec/flow.spec.js +1 -1
- package/build/commands/flow/spec/flow.spec.server.js +60 -60
- package/build/commands/flow/spec/flowCommand.spec.js +16 -12
- package/build/commands/folder/create.js +2 -2
- package/build/commands/folder/delete.js +2 -2
- package/build/commands/folder/folderCommand.js +11 -11
- package/build/commands/folder/move.js +2 -2
- package/build/commands/folder/spec/folder.spec.server.js +35 -35
- package/build/commands/folder/spec/folderCommand.spec.js +23 -19
- package/build/commands/help/help.js +50 -48
- package/build/commands/help/helpCommand.js +1 -1
- package/build/commands/help/spec/help.spec.js +8 -8
- package/build/commands/help/spec/helpCommand.spec.js +11 -7
- package/build/commands/init/init.js +7 -7
- package/build/commands/init/initCommand.js +1 -1
- package/build/commands/init/spec/init.spec.server.js +17 -17
- package/build/commands/init/spec/initCommand.spec.js +11 -7
- package/build/commands/job/internal/execute/sasjs.js +1 -1
- package/build/commands/job/internal/execute/viya.js +35 -35
- package/build/commands/job/internal/utils.js +6 -6
- package/build/commands/job/jobCommand.js +6 -6
- package/build/commands/job/spec/execute.spec.js +6 -6
- package/build/commands/job/spec/getContextName.spec.js +2 -2
- package/build/commands/job/spec/job.spec.server.js +53 -53
- package/build/commands/job/spec/jobCommand.spec.js +17 -13
- package/build/commands/lint/initLint.js +2 -2
- package/build/commands/lint/lintCommand.js +10 -10
- package/build/commands/lint/processLint.js +5 -5
- package/build/commands/lint/spec/lintCommand.spec.js +19 -15
- package/build/commands/request/request.js +16 -16
- package/build/commands/request/requestCommand.js +5 -5
- package/build/commands/request/spec/request.spec.server.js +71 -71
- package/build/commands/request/spec/requestCommand.spec.js +17 -13
- package/build/commands/run/run.js +23 -23
- package/build/commands/run/runCommand.js +2 -2
- package/build/commands/run/spec/run.spec.server.js +51 -51
- package/build/commands/run/spec/runCommand.spec.js +10 -6
- package/build/commands/servicepack/deploy.js +6 -6
- package/build/commands/servicepack/servicePackCommand.js +3 -3
- package/build/commands/servicepack/spec/servicepack.spec.server.js +6 -6
- package/build/commands/servicepack/spec/servicepackCommand.spec.js +10 -6
- package/build/commands/shared/createConfigFile.js +2 -2
- package/build/commands/shared/createFileStructure.js +6 -6
- package/build/commands/shared/createLintConfigFile.js +1 -1
- package/build/commands/shared/deployToSasViyaWithServicePack.js +4 -4
- package/build/commands/shared/fetchLogFileContent.js +10 -6
- package/build/commands/testing/internal/saveOutput.js +38 -34
- package/build/commands/testing/spec/testCommand.spec.js +17 -13
- package/build/commands/testing/spec/testing.spec.server.js +38 -38
- package/build/commands/testing/test.js +45 -41
- package/build/commands/testing/testCommand.js +2 -2
- package/build/commands/version/spec/version.spec.js +1 -1
- package/build/commands/version/spec/versionCommand.spec.js +11 -7
- package/build/commands/version/version.js +3 -3
- package/build/commands/version/versionCommand.js +2 -2
- package/build/commands/web/internal/createAssetServices.js +28 -24
- package/build/commands/web/internal/getWebServiceContent.js +6 -6
- package/build/commands/web/internal/sasjsout.d.ts +1 -1
- package/build/commands/web/internal/sasjsout.js +1 -1
- package/build/commands/web/internal/spec/updateLinkTag.spec.js +2 -2
- package/build/commands/web/internal/spec/updateScriptTag.spec.js +10 -10
- package/build/commands/web/internal/updateAllTags.js +19 -15
- package/build/commands/web/internal/updateLinkTag.js +2 -2
- package/build/commands/web/internal/updateScriptTag.js +6 -6
- package/build/commands/web/spec/web.spec.js +23 -23
- package/build/commands/web/spec/webCommand.spec.js +16 -12
- package/build/commands/web/web.js +25 -25
- package/build/commands/web/webCommand.js +3 -3
- package/build/types/command/commandBase.js +19 -15
- package/build/types/command/parse.js +1 -1
- package/build/types/command/spec/commandBase.spec.js +16 -12
- package/build/types/command/targetCommand.js +4 -4
- package/build/types/command/unalias.js +9 -5
- package/build/utils/auth.js +7 -7
- package/build/utils/config.js +53 -49
- package/build/utils/displayResult.js +4 -4
- package/build/utils/file.js +11 -11
- package/build/utils/fileStructures/builtFiles.js +2 -2
- package/build/utils/fileStructures/builtFilesCustom1.js +2 -2
- package/build/utils/getLogFilePath.js +1 -1
- package/build/utils/loadEnvVariables.js +3 -3
- package/build/utils/prefixAppLoc.js +1 -1
- package/build/utils/saveLog.js +7 -7
- package/build/utils/setConstants.js +4 -4
- package/build/utils/setProjectDir.js +2 -2
- package/build/utils/spec/config.spec.js +80 -80
- package/build/utils/spec/displayResult.spec.js +7 -7
- package/build/utils/spec/file.spec.js +15 -15
- package/build/utils/spec/removeComments.spec.js +11 -11
- package/build/utils/spec/setConstants.spec.js +3 -3
- package/build/utils/spec/utils.spec.js +55 -55
- package/build/utils/test.js +59 -59
- package/build/utils/utils.js +47 -43
- package/package.json +11 -11
|
@@ -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
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
79
83
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
@@ -99,7 +103,7 @@ describe('CompileCommand', function () {
|
|
|
99
103
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
100
104
|
return __generator(this, function (_a) {
|
|
101
105
|
switch (_a.label) {
|
|
102
|
-
case 0: return [4 /*yield*/, utils_2.setConstants()];
|
|
106
|
+
case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
103
107
|
case 1:
|
|
104
108
|
_a.sent();
|
|
105
109
|
return [2 /*return*/];
|
|
@@ -110,13 +114,13 @@ describe('CompileCommand', function () {
|
|
|
110
114
|
setupMocks();
|
|
111
115
|
});
|
|
112
116
|
it('should parse a simple sasjs compile command', function () {
|
|
113
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['compile']);
|
|
117
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['compile'], false);
|
|
114
118
|
var command = new compileCommand_1.CompileCommand(args);
|
|
115
119
|
expect(command.name).toEqual('compile');
|
|
116
120
|
expect(command.subCommand).toEqual('');
|
|
117
121
|
});
|
|
118
122
|
it('should parse a shorthand sasjs compile command', function () {
|
|
119
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['c']);
|
|
123
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['c'], false);
|
|
120
124
|
var command = new compileCommand_1.CompileCommand(args);
|
|
121
125
|
expect(command.name).toEqual('compile');
|
|
122
126
|
expect(command.subCommand).toEqual('');
|
|
@@ -126,7 +130,7 @@ describe('CompileCommand', function () {
|
|
|
126
130
|
return __generator(this, function (_a) {
|
|
127
131
|
switch (_a.label) {
|
|
128
132
|
case 0:
|
|
129
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['compile', '--target', 'test']);
|
|
133
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['compile', '--target', 'test'], false);
|
|
130
134
|
command = new compileCommand_1.CompileCommand(args);
|
|
131
135
|
return [4 /*yield*/, command.getTargetInfo()];
|
|
132
136
|
case 1:
|
|
@@ -144,7 +148,7 @@ describe('CompileCommand', function () {
|
|
|
144
148
|
return __generator(this, function (_a) {
|
|
145
149
|
switch (_a.label) {
|
|
146
150
|
case 0:
|
|
147
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['compile', '-t', 'test']);
|
|
151
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['compile', '-t', 'test'], false);
|
|
148
152
|
command = new compileCommand_1.CompileCommand(args);
|
|
149
153
|
return [4 /*yield*/, command.getTargetInfo()];
|
|
150
154
|
case 1:
|
|
@@ -162,7 +166,7 @@ describe('CompileCommand', function () {
|
|
|
162
166
|
return __generator(this, function (_a) {
|
|
163
167
|
switch (_a.label) {
|
|
164
168
|
case 0:
|
|
165
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['compile', '-t', 'test']);
|
|
169
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['compile', '-t', 'test'], false);
|
|
166
170
|
command = new compileCommand_1.CompileCommand(args);
|
|
167
171
|
return [4 /*yield*/, command.execute()];
|
|
168
172
|
case 1:
|
|
@@ -177,7 +181,7 @@ describe('CompileCommand', function () {
|
|
|
177
181
|
return __generator(this, function (_a) {
|
|
178
182
|
switch (_a.label) {
|
|
179
183
|
case 0:
|
|
180
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['compile', '-t', 'test']);
|
|
184
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['compile', '-t', 'test'], false);
|
|
181
185
|
command = new compileCommand_1.CompileCommand(args);
|
|
182
186
|
return [4 /*yield*/, command.execute()];
|
|
183
187
|
case 1:
|
|
@@ -193,7 +197,7 @@ describe('CompileCommand', function () {
|
|
|
193
197
|
return __generator(this, function (_a) {
|
|
194
198
|
switch (_a.label) {
|
|
195
199
|
case 0:
|
|
196
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['compile', '-t', 'test']);
|
|
200
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['compile', '-t', 'test'], false);
|
|
197
201
|
jest
|
|
198
202
|
.spyOn(compileModule, 'compile')
|
|
199
203
|
.mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
|
|
@@ -219,7 +223,7 @@ describe('CompileCommand', function () {
|
|
|
219
223
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
220
224
|
return __generator(this, function (_a) {
|
|
221
225
|
switch (_a.label) {
|
|
222
|
-
case 0: return [4 /*yield*/, utils_2.setConstants()];
|
|
226
|
+
case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
223
227
|
case 1:
|
|
224
228
|
_a.sent();
|
|
225
229
|
return [2 /*return*/];
|
|
@@ -230,13 +234,13 @@ describe('CompileCommand', function () {
|
|
|
230
234
|
setupMocks();
|
|
231
235
|
});
|
|
232
236
|
it('should parse a simple sasjs compile command', function () {
|
|
233
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['compile', 'service', '--source', 'test.sas']);
|
|
237
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['compile', 'service', '--source', 'test.sas'], false);
|
|
234
238
|
var command = new compileCommand_1.CompileCommand(args);
|
|
235
239
|
expect(command.name).toEqual('compile');
|
|
236
240
|
expect(command.subCommand).toEqual('service');
|
|
237
241
|
});
|
|
238
242
|
it('should parse a shorthand sasjs compile command', function () {
|
|
239
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['c', 'job', '-s', './test.sas']);
|
|
243
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['c', 'job', '-s', './test.sas'], false);
|
|
240
244
|
var command = new compileCommand_1.CompileCommand(args);
|
|
241
245
|
expect(command.name).toEqual('compile');
|
|
242
246
|
expect(command.subCommand).toEqual('job');
|
|
@@ -246,14 +250,14 @@ describe('CompileCommand', function () {
|
|
|
246
250
|
return __generator(this, function (_a) {
|
|
247
251
|
switch (_a.label) {
|
|
248
252
|
case 0:
|
|
249
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), [
|
|
253
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [
|
|
250
254
|
'compile',
|
|
251
255
|
'job',
|
|
252
256
|
'--target',
|
|
253
257
|
'test',
|
|
254
258
|
'-s',
|
|
255
259
|
'test.sas'
|
|
256
|
-
]);
|
|
260
|
+
], false);
|
|
257
261
|
command = new compileCommand_1.CompileCommand(args);
|
|
258
262
|
return [4 /*yield*/, command.getTargetInfo()];
|
|
259
263
|
case 1:
|
|
@@ -271,14 +275,14 @@ describe('CompileCommand', function () {
|
|
|
271
275
|
return __generator(this, function (_a) {
|
|
272
276
|
switch (_a.label) {
|
|
273
277
|
case 0:
|
|
274
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), [
|
|
278
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [
|
|
275
279
|
'compile',
|
|
276
280
|
'job',
|
|
277
281
|
'-t',
|
|
278
282
|
'test',
|
|
279
283
|
'-s',
|
|
280
284
|
'test.sas'
|
|
281
|
-
]);
|
|
285
|
+
], false);
|
|
282
286
|
command = new compileCommand_1.CompileCommand(args);
|
|
283
287
|
return [4 /*yield*/, command.getTargetInfo()];
|
|
284
288
|
case 1:
|
|
@@ -296,14 +300,14 @@ describe('CompileCommand', function () {
|
|
|
296
300
|
return __generator(this, function (_a) {
|
|
297
301
|
switch (_a.label) {
|
|
298
302
|
case 0:
|
|
299
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), [
|
|
303
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [
|
|
300
304
|
'compile',
|
|
301
305
|
'job',
|
|
302
306
|
'-t',
|
|
303
307
|
'test',
|
|
304
308
|
'-s',
|
|
305
309
|
path_1.default.join(os_1.default.homedir(), 'test.sas')
|
|
306
|
-
]);
|
|
310
|
+
], false);
|
|
307
311
|
command = new compileCommand_1.CompileCommand(args);
|
|
308
312
|
return [4 /*yield*/, command.execute()];
|
|
309
313
|
case 1:
|
|
@@ -318,14 +322,14 @@ describe('CompileCommand', function () {
|
|
|
318
322
|
return __generator(this, function (_a) {
|
|
319
323
|
switch (_a.label) {
|
|
320
324
|
case 0:
|
|
321
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), [
|
|
325
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [
|
|
322
326
|
'compile',
|
|
323
327
|
'job',
|
|
324
328
|
'-t',
|
|
325
329
|
'test',
|
|
326
330
|
'-s',
|
|
327
331
|
path_1.default.join(os_1.default.homedir(), 'test.sas')
|
|
328
|
-
]);
|
|
332
|
+
], false);
|
|
329
333
|
command = new compileCommand_1.CompileCommand(args);
|
|
330
334
|
return [4 /*yield*/, command.execute()];
|
|
331
335
|
case 1:
|
|
@@ -341,14 +345,14 @@ describe('CompileCommand', function () {
|
|
|
341
345
|
return __generator(this, function (_a) {
|
|
342
346
|
switch (_a.label) {
|
|
343
347
|
case 0:
|
|
344
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), [
|
|
348
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [
|
|
345
349
|
'compile',
|
|
346
350
|
'job',
|
|
347
351
|
'-t',
|
|
348
352
|
'test',
|
|
349
353
|
'-s',
|
|
350
354
|
path_1.default.join(os_1.default.homedir(), 'test.sas')
|
|
351
|
-
]);
|
|
355
|
+
], false);
|
|
352
356
|
jest
|
|
353
357
|
.spyOn(compileSingleFileModule, 'compileSingleFile')
|
|
354
358
|
.mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
|
|
@@ -363,7 +367,7 @@ describe('CompileCommand', function () {
|
|
|
363
367
|
});
|
|
364
368
|
}); });
|
|
365
369
|
it('should return the output path for a job when specified', function () {
|
|
366
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), [
|
|
370
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [
|
|
367
371
|
'compile',
|
|
368
372
|
'job',
|
|
369
373
|
'-t',
|
|
@@ -372,13 +376,13 @@ describe('CompileCommand', function () {
|
|
|
372
376
|
'./test.sas',
|
|
373
377
|
'-o',
|
|
374
378
|
os_1.default.homedir()
|
|
375
|
-
]);
|
|
379
|
+
], false);
|
|
376
380
|
var command = new compileCommand_1.CompileCommand(args);
|
|
377
381
|
var output = command.output;
|
|
378
382
|
expect(output).toEqual(path_1.default.join(os_1.default.homedir(), 'jobs'));
|
|
379
383
|
});
|
|
380
384
|
it('should return the output path for a service when specified', function () {
|
|
381
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), [
|
|
385
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [
|
|
382
386
|
'compile',
|
|
383
387
|
'service',
|
|
384
388
|
'-t',
|
|
@@ -387,34 +391,34 @@ describe('CompileCommand', function () {
|
|
|
387
391
|
'./test.sas',
|
|
388
392
|
'-o',
|
|
389
393
|
os_1.default.homedir()
|
|
390
|
-
]);
|
|
394
|
+
], false);
|
|
391
395
|
var command = new compileCommand_1.CompileCommand(args);
|
|
392
396
|
var output = command.output;
|
|
393
397
|
expect(output).toEqual(path_1.default.join(os_1.default.homedir(), 'services'));
|
|
394
398
|
});
|
|
395
399
|
it('should return the output path for a job when not specified', function () {
|
|
396
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), [
|
|
400
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [
|
|
397
401
|
'compile',
|
|
398
402
|
'job',
|
|
399
403
|
'-t',
|
|
400
404
|
'test',
|
|
401
405
|
'-s',
|
|
402
406
|
'/dev/test.sas'
|
|
403
|
-
]);
|
|
407
|
+
], false);
|
|
404
408
|
var buildDestinationJobsFolder = process.sasjsConstants.buildDestinationJobsFolder;
|
|
405
409
|
var command = new compileCommand_1.CompileCommand(args);
|
|
406
410
|
var output = command.output;
|
|
407
411
|
expect(output).toEqual(path_1.default.join(buildDestinationJobsFolder, 'dev'));
|
|
408
412
|
});
|
|
409
413
|
it('should return the output path for a service when not specified', function () {
|
|
410
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), [
|
|
414
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [
|
|
411
415
|
'compile',
|
|
412
416
|
'service',
|
|
413
417
|
'-t',
|
|
414
418
|
'test',
|
|
415
419
|
'-s',
|
|
416
420
|
'/dev/test.sas'
|
|
417
|
-
]);
|
|
421
|
+
], false);
|
|
418
422
|
var buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
|
|
419
423
|
var command = new compileCommand_1.CompileCommand(args);
|
|
420
424
|
var output = command.output;
|
|
@@ -61,6 +61,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
61
61
|
var path_1 = __importDefault(require("path"));
|
|
62
62
|
var utils_1 = require("@sasjs/utils");
|
|
63
63
|
var internalModule = __importStar(require("@sasjs/utils/sasjsCli/getInitTerm"));
|
|
64
|
+
var getInitTerm_1 = require("@sasjs/utils/sasjsCli/getInitTerm");
|
|
64
65
|
var test_1 = require("../../../utils/test");
|
|
65
66
|
var compileJobFile_1 = require("../internal/compileJobFile");
|
|
66
67
|
var utils_2 = require("@sasjs/utils");
|
|
@@ -74,8 +75,8 @@ var fakeProgramLines = [
|
|
|
74
75
|
'run;'
|
|
75
76
|
];
|
|
76
77
|
describe('compileJobFile', function () {
|
|
77
|
-
var appName = "cli-tests-compile-job-file-"
|
|
78
|
-
var target = test_1.generateTestTarget(appName, '/Public/app', {
|
|
78
|
+
var appName = "cli-tests-compile-job-file-".concat((0, utils_1.generateTimestamp)());
|
|
79
|
+
var target = (0, test_1.generateTestTarget)(appName, '/Public/app', {
|
|
79
80
|
serviceFolders: [path_1.default.join('sasjs', 'services')],
|
|
80
81
|
initProgram: '',
|
|
81
82
|
termProgram: '',
|
|
@@ -84,7 +85,7 @@ describe('compileJobFile', function () {
|
|
|
84
85
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
85
86
|
return __generator(this, function (_a) {
|
|
86
87
|
switch (_a.label) {
|
|
87
|
-
case 0: return [4 /*yield*/, test_1.createTestMinimalApp(__dirname, target.name)];
|
|
88
|
+
case 0: return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, target.name)];
|
|
88
89
|
case 1:
|
|
89
90
|
_a.sent();
|
|
90
91
|
return [2 /*return*/];
|
|
@@ -94,7 +95,7 @@ describe('compileJobFile', function () {
|
|
|
94
95
|
afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
95
96
|
return __generator(this, function (_a) {
|
|
96
97
|
switch (_a.label) {
|
|
97
|
-
case 0: return [4 /*yield*/, test_1.removeTestApp(__dirname, target.name)];
|
|
98
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, target.name)];
|
|
98
99
|
case 1:
|
|
99
100
|
_a.sent();
|
|
100
101
|
return [2 /*return*/];
|
|
@@ -106,38 +107,27 @@ describe('compileJobFile', function () {
|
|
|
106
107
|
return __generator(this, function (_a) {
|
|
107
108
|
switch (_a.label) {
|
|
108
109
|
case 0:
|
|
109
|
-
|
|
110
|
-
return Promise.resolve({
|
|
111
|
-
content: "\n* JobInit start;\n" + fakeJobInit + "\n* JobInit end;",
|
|
112
|
-
filePath: ''
|
|
113
|
-
});
|
|
114
|
-
});
|
|
115
|
-
jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
|
|
116
|
-
return Promise.resolve({
|
|
117
|
-
content: "\n* JobTerm start;\n" + fakeJobTerm + "\n* JobTerm end;",
|
|
118
|
-
filePath: ''
|
|
119
|
-
});
|
|
120
|
-
});
|
|
110
|
+
(0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit, fakeJobTerm);
|
|
121
111
|
filePath = path_1.default.join(__dirname, './service.sas');
|
|
122
112
|
buildPath = path_1.default.join(process.projectDir, 'sasjsbuild');
|
|
123
113
|
destinationPath = path_1.default.join(buildPath, 'service.sas');
|
|
124
|
-
return [4 /*yield*/, utils_2.createFolder(buildPath)];
|
|
114
|
+
return [4 /*yield*/, (0, utils_2.createFolder)(buildPath)];
|
|
125
115
|
case 1:
|
|
126
116
|
_a.sent();
|
|
127
|
-
return [4 /*yield*/, utils_2.copy(filePath, destinationPath)];
|
|
117
|
+
return [4 /*yield*/, (0, utils_2.copy)(filePath, destinationPath)];
|
|
128
118
|
case 2:
|
|
129
119
|
_a.sent();
|
|
130
|
-
return [4 /*yield*/, expect(compileJobFile_1.compileJobFile(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')])).toResolve()];
|
|
120
|
+
return [4 /*yield*/, expect((0, compileJobFile_1.compileJobFile)(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')])).toResolve()];
|
|
131
121
|
case 3:
|
|
132
122
|
_a.sent();
|
|
133
|
-
return [4 /*yield*/, expect(utils_2.fileExists(destinationPath)).resolves.toEqual(true)];
|
|
123
|
+
return [4 /*yield*/, expect((0, utils_2.fileExists)(destinationPath)).resolves.toEqual(true)];
|
|
134
124
|
case 4:
|
|
135
125
|
_a.sent();
|
|
136
|
-
return [4 /*yield*/, utils_2.readFile(destinationPath)];
|
|
126
|
+
return [4 /*yield*/, (0, utils_2.readFile)(destinationPath)];
|
|
137
127
|
case 5:
|
|
138
128
|
compiledContent = _a.sent();
|
|
139
129
|
macrosToTest = ['mf_abort', 'mf_existds'];
|
|
140
|
-
return [4 /*yield*/, test_1.verifyCompiledJob(compiledContent, macrosToTest)];
|
|
130
|
+
return [4 /*yield*/, (0, test_1.verifyCompiledJob)(compiledContent, macrosToTest)];
|
|
141
131
|
case 6:
|
|
142
132
|
_a.sent();
|
|
143
133
|
expect(compiledContent).toEqual(expect.stringContaining(fakeProgramLines.join('\n')));
|
|
@@ -61,6 +61,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
61
61
|
var path_1 = __importDefault(require("path"));
|
|
62
62
|
var utils_1 = require("@sasjs/utils");
|
|
63
63
|
var internalModule = __importStar(require("@sasjs/utils/sasjsCli/getInitTerm"));
|
|
64
|
+
var getInitTerm_1 = require("@sasjs/utils/sasjsCli/getInitTerm");
|
|
64
65
|
var test_1 = require("../../../utils/test");
|
|
65
66
|
var compileServiceFile_1 = require("../internal/compileServiceFile");
|
|
66
67
|
var utils_2 = require("@sasjs/utils");
|
|
@@ -75,8 +76,8 @@ var fakeProgramLines = [
|
|
|
75
76
|
];
|
|
76
77
|
var preCode = '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n';
|
|
77
78
|
describe('compileServiceFile', function () {
|
|
78
|
-
var appName = "cli-tests-compile-service-file-"
|
|
79
|
-
var target = test_1.generateTestTarget(appName, '/Public/app', {
|
|
79
|
+
var appName = "cli-tests-compile-service-file-".concat((0, utils_1.generateTimestamp)());
|
|
80
|
+
var target = (0, test_1.generateTestTarget)(appName, '/Public/app', {
|
|
80
81
|
serviceFolders: [path_1.default.join('sasjs', 'services')],
|
|
81
82
|
initProgram: '',
|
|
82
83
|
termProgram: '',
|
|
@@ -85,7 +86,7 @@ describe('compileServiceFile', function () {
|
|
|
85
86
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
86
87
|
return __generator(this, function (_a) {
|
|
87
88
|
switch (_a.label) {
|
|
88
|
-
case 0: return [4 /*yield*/, test_1.createTestMinimalApp(__dirname, target.name)];
|
|
89
|
+
case 0: return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, target.name)];
|
|
89
90
|
case 1:
|
|
90
91
|
_a.sent();
|
|
91
92
|
return [2 /*return*/];
|
|
@@ -95,7 +96,7 @@ describe('compileServiceFile', function () {
|
|
|
95
96
|
afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
96
97
|
return __generator(this, function (_a) {
|
|
97
98
|
switch (_a.label) {
|
|
98
|
-
case 0: return [4 /*yield*/, test_1.removeTestApp(__dirname, target.name)];
|
|
99
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, target.name)];
|
|
99
100
|
case 1:
|
|
100
101
|
_a.sent();
|
|
101
102
|
return [2 /*return*/];
|
|
@@ -107,38 +108,27 @@ describe('compileServiceFile', function () {
|
|
|
107
108
|
return __generator(this, function (_a) {
|
|
108
109
|
switch (_a.label) {
|
|
109
110
|
case 0:
|
|
110
|
-
|
|
111
|
-
return Promise.resolve({
|
|
112
|
-
content: "\n* ServiceInit start;\n" + fakeJobInit + "\n* ServiceInit end;",
|
|
113
|
-
filePath: ''
|
|
114
|
-
});
|
|
115
|
-
});
|
|
116
|
-
jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
|
|
117
|
-
return Promise.resolve({
|
|
118
|
-
content: "\n* ServiceTerm start;\n" + fakeJobTerm + "\n* ServiceTerm end;",
|
|
119
|
-
filePath: ''
|
|
120
|
-
});
|
|
121
|
-
});
|
|
111
|
+
(0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit, fakeJobTerm);
|
|
122
112
|
filePath = path_1.default.join(__dirname, './service.sas');
|
|
123
113
|
buildPath = path_1.default.join(process.projectDir, 'sasjsbuild');
|
|
124
114
|
destinationPath = path_1.default.join(buildPath, 'service.sas');
|
|
125
|
-
return [4 /*yield*/, utils_2.createFolder(buildPath)];
|
|
115
|
+
return [4 /*yield*/, (0, utils_2.createFolder)(buildPath)];
|
|
126
116
|
case 1:
|
|
127
117
|
_a.sent();
|
|
128
|
-
return [4 /*yield*/, utils_2.copy(filePath, destinationPath)];
|
|
118
|
+
return [4 /*yield*/, (0, utils_2.copy)(filePath, destinationPath)];
|
|
129
119
|
case 2:
|
|
130
120
|
_a.sent();
|
|
131
|
-
return [4 /*yield*/, expect(compileServiceFile_1.compileServiceFile(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')])).toResolve()];
|
|
121
|
+
return [4 /*yield*/, expect((0, compileServiceFile_1.compileServiceFile)(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')])).toResolve()];
|
|
132
122
|
case 3:
|
|
133
123
|
_a.sent();
|
|
134
|
-
return [4 /*yield*/, expect(utils_2.fileExists(destinationPath)).resolves.toEqual(true)];
|
|
124
|
+
return [4 /*yield*/, expect((0, utils_2.fileExists)(destinationPath)).resolves.toEqual(true)];
|
|
135
125
|
case 4:
|
|
136
126
|
_a.sent();
|
|
137
|
-
return [4 /*yield*/, utils_2.readFile(destinationPath)];
|
|
127
|
+
return [4 /*yield*/, (0, utils_2.readFile)(destinationPath)];
|
|
138
128
|
case 5:
|
|
139
129
|
compiledContent = _a.sent();
|
|
140
130
|
macrosToTest = ['mf_abort', 'mf_existds'];
|
|
141
|
-
return [4 /*yield*/, test_1.verifyCompiledService(compiledContent, macrosToTest)];
|
|
131
|
+
return [4 /*yield*/, (0, test_1.verifyCompiledService)(compiledContent, macrosToTest)];
|
|
142
132
|
case 6:
|
|
143
133
|
_a.sent();
|
|
144
134
|
expect(compiledContent).toEqual(expect.stringContaining(fakeProgramLines.join('\n')));
|
|
@@ -66,8 +66,8 @@ describe('copyFilesToBuildFolder', function () {
|
|
|
66
66
|
return __generator(this, function (_a) {
|
|
67
67
|
switch (_a.label) {
|
|
68
68
|
case 0:
|
|
69
|
-
appName = "cli-tests-copyFilesToBuildFolder-"
|
|
70
|
-
return [4 /*yield*/, test_1.createTestApp(__dirname, appName)];
|
|
69
|
+
appName = "cli-tests-copyFilesToBuildFolder-".concat((0, utils_1.generateTimestamp)());
|
|
70
|
+
return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
|
|
71
71
|
case 1:
|
|
72
72
|
_a.sent();
|
|
73
73
|
return [2 /*return*/];
|
|
@@ -77,7 +77,7 @@ describe('copyFilesToBuildFolder', function () {
|
|
|
77
77
|
afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
78
78
|
return __generator(this, function (_a) {
|
|
79
79
|
switch (_a.label) {
|
|
80
|
-
case 0: return [4 /*yield*/, test_1.removeTestApp(__dirname, appName)];
|
|
80
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, appName)];
|
|
81
81
|
case 1:
|
|
82
82
|
_a.sent();
|
|
83
83
|
return [2 /*return*/];
|
|
@@ -88,7 +88,7 @@ describe('copyFilesToBuildFolder', function () {
|
|
|
88
88
|
var target;
|
|
89
89
|
return __generator(this, function (_a) {
|
|
90
90
|
switch (_a.label) {
|
|
91
|
-
case 0: return [4 /*yield*/, config_1.findTargetInConfiguration('viya')];
|
|
91
|
+
case 0: return [4 /*yield*/, (0, config_1.findTargetInConfiguration)('viya')];
|
|
92
92
|
case 1:
|
|
93
93
|
target = (_a.sent()).target;
|
|
94
94
|
return [4 /*yield*/, expect(compileModule.copyFilesToBuildFolder(target)).toResolve()];
|
|
@@ -111,7 +111,7 @@ describe('copyFilesToBuildFolder', function () {
|
|
|
111
111
|
.mockImplementation(function () {
|
|
112
112
|
throw new Error('Test Error');
|
|
113
113
|
});
|
|
114
|
-
return [4 /*yield*/, config_1.findTargetInConfiguration('viya')];
|
|
114
|
+
return [4 /*yield*/, (0, config_1.findTargetInConfiguration)('viya')];
|
|
115
115
|
case 1:
|
|
116
116
|
target = (_a.sent()).target;
|
|
117
117
|
return [4 /*yield*/, expect(compileModule.copyFilesToBuildFolder(target)).rejects.toThrowError('Test Error')];
|
|
@@ -155,10 +155,10 @@ var verifyBuildFolder = function () { return __awaiter(void 0, void 0, void 0, f
|
|
|
155
155
|
]
|
|
156
156
|
}
|
|
157
157
|
];
|
|
158
|
-
return [4 /*yield*/, utils_1.asyncForEach(folders, function (folder) { return __awaiter(void 0, void 0, void 0, function () {
|
|
158
|
+
return [4 /*yield*/, (0, utils_1.asyncForEach)(folders, function (folder) { return __awaiter(void 0, void 0, void 0, function () {
|
|
159
159
|
return __generator(this, function (_a) {
|
|
160
160
|
switch (_a.label) {
|
|
161
|
-
case 0: return [4 /*yield*/, test_1.verifyFolder(folder)];
|
|
161
|
+
case 0: return [4 /*yield*/, (0, test_1.verifyFolder)(folder)];
|
|
162
162
|
case 1:
|
|
163
163
|
_a.sent();
|
|
164
164
|
return [2 /*return*/];
|