@sasjs/cli 4.0.6 → 4.1.0
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/build/commands/build/build.js +3 -3
- package/build/commands/compile/compile.js +52 -55
- package/build/commands/compile/compileCommand.js +5 -3
- package/build/commands/compile/compileSingleFile.d.ts +5 -0
- package/build/commands/compile/compileSingleFile.js +36 -25
- package/build/commands/compile/internal/checkCompileStatus.js +7 -9
- package/build/commands/compile/internal/compileFile.js +2 -2
- package/build/commands/compile/internal/compileTestFile.d.ts +1 -1
- package/build/commands/compile/internal/compileTestFile.js +16 -14
- package/build/commands/compile/internal/getAllFolders.d.ts +3 -2
- package/build/commands/compile/internal/getAllFolders.js +1 -0
- package/build/commands/compile/internal/identifySasFile.d.ts +2 -1
- package/build/commands/compile/internal/identifySasFile.js +20 -11
- package/build/commands/compile/internal/index.d.ts +9 -0
- package/build/commands/compile/internal/index.js +25 -0
- package/build/commands/compile/internal/spec/compileTestFile.spec.js +4 -4
- package/build/commands/compile/internal/spec/getAllFolders.spec.js +3 -3
- package/build/commands/compile/spec/compareFolders.spec.js +8 -8
- package/build/commands/compile/spec/compile.spec.js +42 -0
- package/build/commands/compile/spec/compileFile.spec.js +5 -6
- package/build/commands/compile/spec/compileSingleFile.spec.d.ts +1 -0
- package/build/commands/compile/spec/compileSingleFile.spec.js +162 -0
- package/build/commands/compile/spec/loadDependencies.spec.js +13 -13
- package/build/commands/run/run.js +2 -2
- package/build/types/command/commandBase.js +1 -1
- package/package.json +1 -1
- package/build/commands/compile/internal/getServerType.d.ts +0 -9
- package/build/commands/compile/internal/getServerType.js +0 -60
|
@@ -67,6 +67,7 @@ var SasFileType;
|
|
|
67
67
|
(function (SasFileType) {
|
|
68
68
|
SasFileType["Service"] = "service";
|
|
69
69
|
SasFileType["Job"] = "job";
|
|
70
|
+
SasFileType["Test"] = "test";
|
|
70
71
|
})(SasFileType = exports.SasFileType || (exports.SasFileType = {}));
|
|
71
72
|
var getAllFolders = function (target, type, rootConfig) { return __awaiter(void 0, void 0, void 0, function () {
|
|
72
73
|
var configuration, allFolders, config, folders, addFolders, buildSourceFolder;
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import { Target } from '@sasjs/utils';
|
|
2
|
-
|
|
2
|
+
import { SasFileType } from './';
|
|
3
|
+
export declare const identifySasFile: (target: Target, sourcePath: string) => Promise<SasFileType>;
|
|
@@ -35,26 +35,35 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
|
+
};
|
|
38
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
42
|
exports.identifySasFile = void 0;
|
|
40
|
-
var
|
|
43
|
+
var utils_1 = require("@sasjs/utils");
|
|
44
|
+
var _1 = require("./");
|
|
45
|
+
var path_1 = __importDefault(require("path"));
|
|
41
46
|
var identifySasFile = function (target, sourcePath) { return __awaiter(void 0, void 0, void 0, function () {
|
|
42
|
-
var serviceFolders,
|
|
47
|
+
var serviceFolders, jobFolders;
|
|
43
48
|
return __generator(this, function (_a) {
|
|
44
49
|
switch (_a.label) {
|
|
45
|
-
case 0:
|
|
50
|
+
case 0:
|
|
51
|
+
if ((0, utils_1.isTestFile)(sourcePath.split(path_1.default.sep).pop())) {
|
|
52
|
+
return [2 /*return*/, _1.SasFileType.Test];
|
|
53
|
+
}
|
|
54
|
+
return [4 /*yield*/, (0, _1.getAllFolders)(target, _1.SasFileType.Service)];
|
|
46
55
|
case 1:
|
|
47
56
|
serviceFolders = _a.sent();
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
return [4 /*yield*/, (0,
|
|
57
|
+
if (serviceFolders.find(function (folder) { return sourcePath.includes(folder); })) {
|
|
58
|
+
return [2 /*return*/, _1.SasFileType.Service];
|
|
59
|
+
}
|
|
60
|
+
return [4 /*yield*/, (0, _1.getAllFolders)(target, _1.SasFileType.Job)];
|
|
52
61
|
case 2:
|
|
53
62
|
jobFolders = _a.sent();
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
throw
|
|
63
|
+
if (jobFolders.find(function (folder) { return sourcePath.includes(folder); })) {
|
|
64
|
+
return [2 /*return*/, _1.SasFileType.Job];
|
|
65
|
+
}
|
|
66
|
+
throw "Unable to identify file as ".concat(_1.SasFileType.Service, ", ").concat(_1.SasFileType.Job, " or ").concat(_1.SasFileType.Test);
|
|
58
67
|
}
|
|
59
68
|
});
|
|
60
69
|
}); };
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export * from './checkCompileStatus';
|
|
2
|
+
export * from './compareFolders';
|
|
3
|
+
export * from './compileFile';
|
|
4
|
+
export * from './compileTestFile';
|
|
5
|
+
export * from './copySyncFolder';
|
|
6
|
+
export * from './getAllFolders';
|
|
7
|
+
export * from './getDestinationPath';
|
|
8
|
+
export * from './identifySasFile';
|
|
9
|
+
export * from './loadDependencies';
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./checkCompileStatus"), exports);
|
|
18
|
+
__exportStar(require("./compareFolders"), exports);
|
|
19
|
+
__exportStar(require("./compileFile"), exports);
|
|
20
|
+
__exportStar(require("./compileTestFile"), exports);
|
|
21
|
+
__exportStar(require("./copySyncFolder"), exports);
|
|
22
|
+
__exportStar(require("./getAllFolders"), exports);
|
|
23
|
+
__exportStar(require("./getDestinationPath"), exports);
|
|
24
|
+
__exportStar(require("./identifySasFile"), exports);
|
|
25
|
+
__exportStar(require("./loadDependencies"), exports);
|
|
@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
50
50
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
51
51
|
};
|
|
52
52
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
|
-
var
|
|
53
|
+
var __1 = require("../");
|
|
54
54
|
var utils_1 = require("@sasjs/utils");
|
|
55
55
|
var test_1 = require("../../../../utils/test");
|
|
56
56
|
var path_1 = __importDefault(require("path"));
|
|
@@ -171,7 +171,7 @@ describe('compileTestFile', function () {
|
|
|
171
171
|
return [4 /*yield*/, (0, compile_1.compile)(target)];
|
|
172
172
|
case 1:
|
|
173
173
|
_d.sent();
|
|
174
|
-
return [4 /*yield*/, (0,
|
|
174
|
+
return [4 /*yield*/, (0, __1.compileTestFlow)(target)];
|
|
175
175
|
case 2:
|
|
176
176
|
_d.sent();
|
|
177
177
|
testFlowPath = path_1.default.join(buildPath, 'testFlow.json');
|
|
@@ -304,9 +304,9 @@ describe('compileTestFile', function () {
|
|
|
304
304
|
};
|
|
305
305
|
expectedWarn = "'testFolders' is not supported 'testConfig' entry, please use 'serviceFolders' entry in 'serviceConfig' or 'jobFolders' entry in 'jobConfig'.";
|
|
306
306
|
jest.spyOn(process.logger, 'warn');
|
|
307
|
-
(0,
|
|
307
|
+
(0, __1.compileTestFlow)(testTarget);
|
|
308
308
|
expect(process.logger.warn).toHaveBeenCalledWith(expectedWarn);
|
|
309
|
-
(0,
|
|
309
|
+
(0, __1.compileTestFlow)(testTarget, testConfig);
|
|
310
310
|
expect(process.logger.warn).toHaveBeenCalledWith(expectedWarn);
|
|
311
311
|
return [2 /*return*/];
|
|
312
312
|
});
|
|
@@ -98,7 +98,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
98
98
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
99
99
|
};
|
|
100
100
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
101
|
-
var
|
|
101
|
+
var __1 = require("../");
|
|
102
102
|
var utils_1 = require("@sasjs/utils");
|
|
103
103
|
var test_1 = require("../../../../utils/test");
|
|
104
104
|
var configUtils = __importStar(require("../../../../utils/config"));
|
|
@@ -167,14 +167,14 @@ describe('getAllFolders', function () {
|
|
|
167
167
|
});
|
|
168
168
|
}); });
|
|
169
169
|
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
170
|
-
return [4 /*yield*/, expect((0,
|
|
170
|
+
return [4 /*yield*/, expect((0, __1.getAllFolders)(target, __1.SasFileType.Service, config)).resolves.toEqual(__spreadArray([], __read(new Set(Array.prototype.concat((_a = config.serviceConfig) === null || _a === void 0 ? void 0 : _a.serviceFolders.map(function (folder) {
|
|
171
171
|
return path_1.default.join(buildSourceFolder, folder);
|
|
172
172
|
}), (_b = target.serviceConfig) === null || _b === void 0 ? void 0 : _b.serviceFolders.map(function (folder) {
|
|
173
173
|
return path_1.default.join(buildSourceFolder, folder);
|
|
174
174
|
})))), false))];
|
|
175
175
|
case 1:
|
|
176
176
|
_e.sent();
|
|
177
|
-
return [4 /*yield*/, expect((0,
|
|
177
|
+
return [4 /*yield*/, expect((0, __1.getAllFolders)(target, __1.SasFileType.Job, config)).resolves.toEqual(__spreadArray([], __read(new Set(Array.prototype.concat((_c = config.jobConfig) === null || _c === void 0 ? void 0 : _c.jobFolders.map(function (folder) {
|
|
178
178
|
return path_1.default.join(buildSourceFolder, folder);
|
|
179
179
|
}), (_d = target.jobConfig) === null || _d === void 0 ? void 0 : _d.jobFolders.map(function (folder) {
|
|
180
180
|
return path_1.default.join(buildSourceFolder, folder);
|
|
@@ -41,7 +41,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
41
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
42
|
var path_1 = __importDefault(require("path"));
|
|
43
43
|
var utils_1 = require("@sasjs/utils");
|
|
44
|
-
var
|
|
44
|
+
var internal_1 = require("../internal");
|
|
45
45
|
describe('compareFolders', function () {
|
|
46
46
|
var sourceFolderPath;
|
|
47
47
|
var destinationFolderPath;
|
|
@@ -82,7 +82,7 @@ describe('compareFolders', function () {
|
|
|
82
82
|
switch (_a.label) {
|
|
83
83
|
case 0:
|
|
84
84
|
nonExistentSourcePath = path_1.default.join(__dirname, 'nothing');
|
|
85
|
-
return [4 /*yield*/, expect((0,
|
|
85
|
+
return [4 /*yield*/, expect((0, internal_1.compareFolders)(nonExistentSourcePath, destinationFolderPath)).rejects.toThrowError("Source path ".concat(nonExistentSourcePath, " does not exist. Please check the `serviceFolders` and `jobFolders` in your target configuration and try again."))];
|
|
86
86
|
case 1:
|
|
87
87
|
_a.sent();
|
|
88
88
|
return [2 /*return*/];
|
|
@@ -95,7 +95,7 @@ describe('compareFolders', function () {
|
|
|
95
95
|
switch (_a.label) {
|
|
96
96
|
case 0:
|
|
97
97
|
nonExistentDestinationPath = path_1.default.join(__dirname, 'nothing');
|
|
98
|
-
return [4 /*yield*/, (0,
|
|
98
|
+
return [4 /*yield*/, (0, internal_1.compareFolders)(sourceFolderPath, nonExistentDestinationPath)];
|
|
99
99
|
case 1:
|
|
100
100
|
response = _a.sent();
|
|
101
101
|
expect(response.equal).toBeFalse();
|
|
@@ -111,7 +111,7 @@ describe('compareFolders', function () {
|
|
|
111
111
|
case 0: return [4 /*yield*/, (0, utils_1.createFolder)(path_1.default.join(sourceFolderPath, 'missing-subfolder'))];
|
|
112
112
|
case 1:
|
|
113
113
|
_a.sent();
|
|
114
|
-
return [4 /*yield*/, (0,
|
|
114
|
+
return [4 /*yield*/, (0, internal_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
|
|
115
115
|
case 2:
|
|
116
116
|
response = _a.sent();
|
|
117
117
|
expect(response.equal).toBeFalse();
|
|
@@ -130,7 +130,7 @@ describe('compareFolders', function () {
|
|
|
130
130
|
return [4 /*yield*/, (0, utils_1.createFolder)(path_1.default.join(sourceFolderPath, 'missing-subfolder-2'))];
|
|
131
131
|
case 2:
|
|
132
132
|
_a.sent();
|
|
133
|
-
return [4 /*yield*/, (0,
|
|
133
|
+
return [4 /*yield*/, (0, internal_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
|
|
134
134
|
case 3:
|
|
135
135
|
response = _a.sent();
|
|
136
136
|
expect(response.equal).toBeFalse();
|
|
@@ -146,7 +146,7 @@ describe('compareFolders', function () {
|
|
|
146
146
|
case 0: return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(sourceFolderPath, 'test.sas'), "%put 'hello, world!'")];
|
|
147
147
|
case 1:
|
|
148
148
|
_a.sent();
|
|
149
|
-
return [4 /*yield*/, (0,
|
|
149
|
+
return [4 /*yield*/, (0, internal_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
|
|
150
150
|
case 2:
|
|
151
151
|
response = _a.sent();
|
|
152
152
|
expect(response.equal).toBeFalse();
|
|
@@ -165,7 +165,7 @@ describe('compareFolders', function () {
|
|
|
165
165
|
return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(sourceFolderPath, 'test2.sas'), "%put 'hello, world!'")];
|
|
166
166
|
case 2:
|
|
167
167
|
_a.sent();
|
|
168
|
-
return [4 /*yield*/, (0,
|
|
168
|
+
return [4 /*yield*/, (0, internal_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
|
|
169
169
|
case 3:
|
|
170
170
|
response = _a.sent();
|
|
171
171
|
expect(response.equal).toBeFalse();
|
|
@@ -184,7 +184,7 @@ describe('compareFolders', function () {
|
|
|
184
184
|
return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(destinationFolderPath, 'test1.sas'), "%put 'hello, world!'")];
|
|
185
185
|
case 2:
|
|
186
186
|
_a.sent();
|
|
187
|
-
return [4 /*yield*/, (0,
|
|
187
|
+
return [4 /*yield*/, (0, internal_1.compareFolders)(sourceFolderPath, destinationFolderPath)];
|
|
188
188
|
case 3:
|
|
189
189
|
response = _a.sent();
|
|
190
190
|
expect(response.equal).toBeTrue();
|
|
@@ -82,6 +82,8 @@ var compileSingleFile_1 = require("../compileSingleFile");
|
|
|
82
82
|
var compileFile = __importStar(require("../internal/compileFile"));
|
|
83
83
|
var utils_2 = require("../../../utils");
|
|
84
84
|
var compileCommand_1 = require("../compileCommand");
|
|
85
|
+
var error_1 = require("@sasjs/utils/error");
|
|
86
|
+
var compileTestFileModule = __importStar(require("../internal/compileTestFile"));
|
|
85
87
|
describe('sasjs compile', function () {
|
|
86
88
|
var sharedAppName;
|
|
87
89
|
var appName;
|
|
@@ -280,6 +282,46 @@ describe('sasjs compile', function () {
|
|
|
280
282
|
}
|
|
281
283
|
});
|
|
282
284
|
}); });
|
|
285
|
+
it('should fail to compile if testSetUp is present and test file compilation failed', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
286
|
+
var testSetUpFile, compileTestFileError, testTarget, expectedError;
|
|
287
|
+
return __generator(this, function (_a) {
|
|
288
|
+
switch (_a.label) {
|
|
289
|
+
case 0:
|
|
290
|
+
testSetUpFile = 'WRONG.sas';
|
|
291
|
+
compileTestFileError = "ENOENT: no such file or directory, open '".concat(testSetUpFile, "'");
|
|
292
|
+
testTarget = __assign({}, target);
|
|
293
|
+
testTarget.testConfig = { testSetUp: testSetUpFile };
|
|
294
|
+
jest
|
|
295
|
+
.spyOn(compileTestFileModule, 'compileTestFile')
|
|
296
|
+
.mockImplementation(function () { return Promise.reject(compileTestFileError); });
|
|
297
|
+
expectedError = (0, error_1.prefixMessage)(compileTestFileError, 'Test set up compilation has failed. ');
|
|
298
|
+
return [4 /*yield*/, expect(compileModule.compile(testTarget)).rejects.toEqual(expectedError)];
|
|
299
|
+
case 1:
|
|
300
|
+
_a.sent();
|
|
301
|
+
return [2 /*return*/];
|
|
302
|
+
}
|
|
303
|
+
});
|
|
304
|
+
}); });
|
|
305
|
+
it('should fail to compile if testTearDown is present and test file compilation failed', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
306
|
+
var testTearDownFile, compileTestFileError, testTarget, expectedError;
|
|
307
|
+
return __generator(this, function (_a) {
|
|
308
|
+
switch (_a.label) {
|
|
309
|
+
case 0:
|
|
310
|
+
testTearDownFile = 'WRONG.sas';
|
|
311
|
+
compileTestFileError = "ENOENT: no such file or directory, open '".concat(testTearDownFile, "'");
|
|
312
|
+
testTarget = __assign({}, target);
|
|
313
|
+
testTarget.testConfig = { testTearDown: testTearDownFile };
|
|
314
|
+
jest
|
|
315
|
+
.spyOn(compileTestFileModule, 'compileTestFile')
|
|
316
|
+
.mockImplementation(function () { return Promise.reject(compileTestFileError); });
|
|
317
|
+
expectedError = (0, error_1.prefixMessage)(compileTestFileError, 'Test tear down compilation has failed. ');
|
|
318
|
+
return [4 /*yield*/, expect(compileModule.compile(testTarget)).rejects.toEqual(expectedError)];
|
|
319
|
+
case 1:
|
|
320
|
+
_a.sent();
|
|
321
|
+
return [2 /*return*/];
|
|
322
|
+
}
|
|
323
|
+
});
|
|
324
|
+
}); });
|
|
283
325
|
});
|
|
284
326
|
describe('sasjs compile single file', function () {
|
|
285
327
|
var appName;
|
|
@@ -67,9 +67,8 @@ var utils_1 = require("@sasjs/utils");
|
|
|
67
67
|
var internalModule = __importStar(require("@sasjs/utils/sasjsCli/getInitTerm"));
|
|
68
68
|
var getInitTerm_1 = require("@sasjs/utils/sasjsCli/getInitTerm");
|
|
69
69
|
var test_1 = require("../../../utils/test");
|
|
70
|
-
var
|
|
70
|
+
var internal_1 = require("../internal");
|
|
71
71
|
var utils_2 = require("@sasjs/utils");
|
|
72
|
-
var loadDependencies_1 = require("../internal/loadDependencies");
|
|
73
72
|
var fakeJobInit = "/**\n @file\n @brief This code is inserted into the beginning of each Viya Job.\n @details Inserted during the `sasjs compile` step. Add any code here that\n should go at the beginning of every deployed job.\n\n The path to this file should be listed in the `jobInit` property of the\n sasjsconfig file.\n\n ".concat(utils_1.DependencyHeader.DeprecatedInclude, "\n @li test.sas TEST\n\n ").concat(utils_1.DependencyHeader.Macro, "\n @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;");
|
|
74
73
|
var fakeJobTerm = "/**\n @file serviceterm.sas\n @brief this file is called at the end of every service\n @details This file is included at the *end* of every service.\n\n ".concat(utils_1.DependencyHeader.Macro, "\n @li mf_abort.sas\n @li mf_existds.sas\n\n**/\n\n%put service is finishing. Thanks, SASjs!;");
|
|
75
74
|
var fakeProgramLines = [
|
|
@@ -118,14 +117,14 @@ describe('compileFile', function () {
|
|
|
118
117
|
filePath = path_1.default.join(__dirname, './service.sas');
|
|
119
118
|
buildPath = path_1.default.join(process.projectDir, 'sasjsbuild');
|
|
120
119
|
destinationPath = path_1.default.join(buildPath, 'service.sas');
|
|
121
|
-
compileTree = (0,
|
|
120
|
+
compileTree = (0, internal_1.getCompileTree)(target);
|
|
122
121
|
return [4 /*yield*/, (0, utils_2.createFolder)(buildPath)];
|
|
123
122
|
case 1:
|
|
124
123
|
_a.sent();
|
|
125
124
|
return [4 /*yield*/, (0, utils_2.copy)(filePath, destinationPath)];
|
|
126
125
|
case 2:
|
|
127
126
|
_a.sent();
|
|
128
|
-
return [4 /*yield*/, expect((0,
|
|
127
|
+
return [4 /*yield*/, expect((0, internal_1.compileFile)(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], undefined, compileTree, utils_1.SASJsFileType.service, __dirname)).toResolve()];
|
|
129
128
|
case 3:
|
|
130
129
|
_a.sent();
|
|
131
130
|
return [4 /*yield*/, expect((0, utils_2.fileExists)(destinationPath)).resolves.toEqual(true)];
|
|
@@ -155,14 +154,14 @@ describe('compileFile', function () {
|
|
|
155
154
|
filePath = path_1.default.join(__dirname, './service.sas');
|
|
156
155
|
buildPath = path_1.default.join(process.projectDir, 'sasjsbuild');
|
|
157
156
|
destinationPath = path_1.default.join(buildPath, 'service.sas');
|
|
158
|
-
compileTree = (0,
|
|
157
|
+
compileTree = (0, internal_1.getCompileTree)(target);
|
|
159
158
|
return [4 /*yield*/, (0, utils_2.createFolder)(buildPath)];
|
|
160
159
|
case 1:
|
|
161
160
|
_a.sent();
|
|
162
161
|
return [4 /*yield*/, (0, utils_2.copy)(filePath, destinationPath)];
|
|
163
162
|
case 2:
|
|
164
163
|
_a.sent();
|
|
165
|
-
return [4 /*yield*/, expect((0,
|
|
164
|
+
return [4 /*yield*/, expect((0, internal_1.compileFile)(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], undefined, compileTree, utils_1.SASJsFileType.job, __dirname)).toResolve()];
|
|
166
165
|
case 3:
|
|
167
166
|
_a.sent();
|
|
168
167
|
return [4 /*yield*/, expect((0, utils_2.fileExists)(destinationPath)).resolves.toEqual(true)];
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
35
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
36
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
37
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
38
|
+
function step(op) {
|
|
39
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
40
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
41
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
42
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
43
|
+
switch (op[0]) {
|
|
44
|
+
case 0: case 1: t = op; break;
|
|
45
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
46
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
47
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
48
|
+
default:
|
|
49
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
50
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
51
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
52
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
53
|
+
if (t[2]) _.ops.pop();
|
|
54
|
+
_.trys.pop(); continue;
|
|
55
|
+
}
|
|
56
|
+
op = body.call(thisArg, _);
|
|
57
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
58
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
59
|
+
}
|
|
60
|
+
};
|
|
61
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
62
|
+
var compileSingleFile_1 = require("../compileSingleFile");
|
|
63
|
+
var identifySasFileModule = __importStar(require("../internal/identifySasFile"));
|
|
64
|
+
var fileModule = __importStar(require("@sasjs/utils/file"));
|
|
65
|
+
var configModule = __importStar(require("../../../utils/config"));
|
|
66
|
+
var loadDependenciesModule = __importStar(require("../internal/loadDependencies"));
|
|
67
|
+
var compileTestFileModule = __importStar(require("../internal/compileTestFile"));
|
|
68
|
+
var internal_1 = require("../internal");
|
|
69
|
+
describe('compileSingleFile', function () {
|
|
70
|
+
it('should throw an error provided not supported subcommand', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
71
|
+
var expectedError;
|
|
72
|
+
return __generator(this, function (_a) {
|
|
73
|
+
switch (_a.label) {
|
|
74
|
+
case 0:
|
|
75
|
+
expectedError = new Error("Unsupported context command. Supported commands are:\n".concat(Object.values(compileSingleFile_1.CompileSingleFileSubCommands).join('\n')));
|
|
76
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)({}, 'WRONG', 'testSource', 'testOutput')).rejects.toEqual(expectedError)];
|
|
77
|
+
case 1:
|
|
78
|
+
_a.sent();
|
|
79
|
+
return [2 /*return*/];
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
}); });
|
|
83
|
+
it('should throw an error source was not provided', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
84
|
+
var expectedError;
|
|
85
|
+
return __generator(this, function (_a) {
|
|
86
|
+
switch (_a.label) {
|
|
87
|
+
case 0:
|
|
88
|
+
expectedError = new Error("'--source' flag is missing (eg 'sasjs compile <command> --source myjob.sas --target targetName -output /some/folder')");
|
|
89
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)({}, compileSingleFile_1.CompileSingleFileSubCommands.Test, '', 'testOutput')).rejects.toEqual(expectedError)];
|
|
90
|
+
case 1:
|
|
91
|
+
_a.sent();
|
|
92
|
+
return [2 /*return*/];
|
|
93
|
+
}
|
|
94
|
+
});
|
|
95
|
+
}); });
|
|
96
|
+
it('should throw an error provided source path is not valid', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
97
|
+
var expectedError;
|
|
98
|
+
return __generator(this, function (_a) {
|
|
99
|
+
switch (_a.label) {
|
|
100
|
+
case 0:
|
|
101
|
+
expectedError = new Error("Provide a valid path to source file (eg 'sasjs compile <command> --source myjob.sas --target targetName -output /some/folder')");
|
|
102
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)({}, compileSingleFile_1.CompileSingleFileSubCommands.Test, 'not valid', 'testOutput', false, 'testCurrentDir')).rejects.toEqual(expectedError)];
|
|
103
|
+
case 1:
|
|
104
|
+
_a.sent();
|
|
105
|
+
return [2 /*return*/];
|
|
106
|
+
}
|
|
107
|
+
});
|
|
108
|
+
}); });
|
|
109
|
+
it("should identify sas file if a sub command is 'identify'", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
110
|
+
var testFile;
|
|
111
|
+
return __generator(this, function (_a) {
|
|
112
|
+
switch (_a.label) {
|
|
113
|
+
case 0:
|
|
114
|
+
testFile = 'testSource.test.sas';
|
|
115
|
+
jest
|
|
116
|
+
.spyOn(fileModule, 'fileExists')
|
|
117
|
+
.mockImplementation(function (filePath) {
|
|
118
|
+
return Promise.resolve(filePath.includes(testFile));
|
|
119
|
+
});
|
|
120
|
+
jest.spyOn(fileModule, 'copy').mockImplementation(function () { return Promise.resolve(); });
|
|
121
|
+
jest
|
|
122
|
+
.spyOn(configModule, 'getMacroFolders')
|
|
123
|
+
.mockImplementation(function () { return Promise.resolve([]); });
|
|
124
|
+
jest
|
|
125
|
+
.spyOn(configModule, 'getProgramFolders')
|
|
126
|
+
.mockImplementation(function () { return Promise.resolve([]); });
|
|
127
|
+
jest
|
|
128
|
+
.spyOn(loadDependenciesModule, 'getCompileTree')
|
|
129
|
+
.mockImplementation(function () { return ({ saveTree: function () { return Promise.resolve(); } }); });
|
|
130
|
+
jest
|
|
131
|
+
.spyOn(compileTestFileModule, 'compileTestFile')
|
|
132
|
+
.mockImplementation(function () { return Promise.resolve(); });
|
|
133
|
+
jest.spyOn(identifySasFileModule, 'identifySasFile');
|
|
134
|
+
return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({}, 'identify', testFile, 'testOutput', false, 'testCurrentDir')];
|
|
135
|
+
case 1:
|
|
136
|
+
_a.sent();
|
|
137
|
+
expect(identifySasFileModule.identifySasFile).toHaveBeenCalledTimes(1);
|
|
138
|
+
return [2 /*return*/];
|
|
139
|
+
}
|
|
140
|
+
});
|
|
141
|
+
}); });
|
|
142
|
+
it("should throw an error if a sas file was not identified", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
143
|
+
var identificationError, expectedError;
|
|
144
|
+
return __generator(this, function (_a) {
|
|
145
|
+
switch (_a.label) {
|
|
146
|
+
case 0:
|
|
147
|
+
identificationError = "Unable to identify file as ".concat(internal_1.SasFileType.Service, ", ").concat(internal_1.SasFileType.Job, " or ").concat(internal_1.SasFileType.Test);
|
|
148
|
+
jest
|
|
149
|
+
.spyOn(fileModule, 'fileExists')
|
|
150
|
+
.mockImplementation(function () { return Promise.resolve(true); });
|
|
151
|
+
jest
|
|
152
|
+
.spyOn(identifySasFileModule, 'identifySasFile')
|
|
153
|
+
.mockImplementation(function () { return Promise.reject(identificationError); });
|
|
154
|
+
expectedError = "Single file compilation failed. ".concat(identificationError);
|
|
155
|
+
return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)({}, 'identify', 'testSource.sas', 'testOutput', false, 'testCurrentDir')).rejects.toEqual(expectedError)];
|
|
156
|
+
case 1:
|
|
157
|
+
_a.sent();
|
|
158
|
+
return [2 /*return*/];
|
|
159
|
+
}
|
|
160
|
+
});
|
|
161
|
+
}); });
|
|
162
|
+
});
|
|
@@ -79,8 +79,8 @@ var internalModule = __importStar(require("@sasjs/utils/sasjsCli/getInitTerm"));
|
|
|
79
79
|
var getInitTerm_1 = require("@sasjs/utils/sasjsCli/getInitTerm");
|
|
80
80
|
var test_1 = require("../../../utils/test");
|
|
81
81
|
var utils_2 = require("../../../utils");
|
|
82
|
+
var internal_1 = require("../internal");
|
|
82
83
|
var loadDependencies_1 = require("../internal/loadDependencies");
|
|
83
|
-
var getAllFolders_1 = require("../internal/getAllFolders");
|
|
84
84
|
var fakeInit = "/**\n @file serviceinit.sas\n @brief this file is called with every service\n @details This file is included in *every* service, *after* the macros and *before* the service code.\n\n ".concat(utils_1.DependencyHeader.Macro, "\n @li mf_abort.sas\n\n**/\n\noptions\n DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;");
|
|
85
85
|
var fakeTerm = "/**\n @file serviceterm.sas\n @brief this file is called at the end of every service\n @details This file is included at the *end* of every service.\n\n ".concat(utils_1.DependencyHeader.Macro, "\n @li mf_abort.sas\n @li mf_existds.sas\n\n**/\n\n%put service is finishing. Thanks, SASjs!;");
|
|
86
86
|
var fakeInit2 = "/**\n @file serviceinit.sas\n @brief this file is called with every service\n @details This file is included in *every* service, *after* the macros and *before* the service code.\n\n ".concat(utils_1.DependencyHeader.Macro, "\n @li mf_abort.sas\n\n**/\n\noptions\n DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;");
|
|
@@ -183,7 +183,7 @@ describe('loadDependencies', function () {
|
|
|
183
183
|
return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service, compileTree)];
|
|
184
184
|
case 1:
|
|
185
185
|
dependencies = _a.sent();
|
|
186
|
-
expect(dependencies).toContain(compiledVars(
|
|
186
|
+
expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Service));
|
|
187
187
|
expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
|
|
188
188
|
expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
|
|
189
189
|
expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
|
|
@@ -203,7 +203,7 @@ describe('loadDependencies', function () {
|
|
|
203
203
|
return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job, compileTree)];
|
|
204
204
|
case 1:
|
|
205
205
|
dependencies = _a.sent();
|
|
206
|
-
expect(dependencies).toContain(compiledVars(
|
|
206
|
+
expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Job));
|
|
207
207
|
expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
|
|
208
208
|
expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
|
|
209
209
|
expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
|
|
@@ -223,7 +223,7 @@ describe('loadDependencies', function () {
|
|
|
223
223
|
return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service, compileTree)];
|
|
224
224
|
case 1:
|
|
225
225
|
dependencies = _a.sent();
|
|
226
|
-
expect(dependencies).toContain(compiledVars(
|
|
226
|
+
expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Service));
|
|
227
227
|
expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
|
|
228
228
|
expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
|
|
229
229
|
expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
|
|
@@ -243,7 +243,7 @@ describe('loadDependencies', function () {
|
|
|
243
243
|
return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job, compileTree)];
|
|
244
244
|
case 1:
|
|
245
245
|
dependencies = _a.sent();
|
|
246
|
-
expect(dependencies).toContain(compiledVars(
|
|
246
|
+
expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Job));
|
|
247
247
|
expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
|
|
248
248
|
expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
|
|
249
249
|
expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
|
|
@@ -263,7 +263,7 @@ describe('loadDependencies', function () {
|
|
|
263
263
|
return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
|
|
264
264
|
case 1:
|
|
265
265
|
dependencies = _a.sent();
|
|
266
|
-
expect(dependencies).toContain(compiledVars(
|
|
266
|
+
expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Service));
|
|
267
267
|
expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
|
|
268
268
|
expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
|
|
269
269
|
expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
|
|
@@ -283,7 +283,7 @@ describe('loadDependencies', function () {
|
|
|
283
283
|
return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
|
|
284
284
|
case 1:
|
|
285
285
|
dependencies = _a.sent();
|
|
286
|
-
expect(dependencies).toContain(compiledVars(
|
|
286
|
+
expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Job));
|
|
287
287
|
expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
|
|
288
288
|
expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
|
|
289
289
|
expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
|
|
@@ -303,7 +303,7 @@ describe('loadDependencies', function () {
|
|
|
303
303
|
return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
|
|
304
304
|
case 1:
|
|
305
305
|
dependencies = _a.sent();
|
|
306
|
-
expect(dependencies).toContain(compiledVars(
|
|
306
|
+
expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Service));
|
|
307
307
|
expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
|
|
308
308
|
expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
|
|
309
309
|
expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
|
|
@@ -323,7 +323,7 @@ describe('loadDependencies', function () {
|
|
|
323
323
|
return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
|
|
324
324
|
case 1:
|
|
325
325
|
dependencies = _a.sent();
|
|
326
|
-
expect(dependencies).toContain(compiledVars(
|
|
326
|
+
expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Job));
|
|
327
327
|
expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
|
|
328
328
|
expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
|
|
329
329
|
expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
|
|
@@ -343,7 +343,7 @@ describe('loadDependencies', function () {
|
|
|
343
343
|
return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
|
|
344
344
|
case 1:
|
|
345
345
|
dependencies = _a.sent();
|
|
346
|
-
expect(dependencies).toContain(compiledVars(
|
|
346
|
+
expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Job));
|
|
347
347
|
expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
|
|
348
348
|
expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
|
|
349
349
|
expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
|
|
@@ -366,7 +366,7 @@ describe('loadDependencies', function () {
|
|
|
366
366
|
return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
|
|
367
367
|
case 1:
|
|
368
368
|
dependencies = _a.sent();
|
|
369
|
-
expect(dependencies).toContain(compiledVars(
|
|
369
|
+
expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Job));
|
|
370
370
|
expect(/\* JobInit start;/.test(dependencies)).toEqual(true);
|
|
371
371
|
expect(/\* JobInit end;/.test(dependencies)).toEqual(true);
|
|
372
372
|
expect(/\* JobTerm start;/.test(dependencies)).toEqual(true);
|
|
@@ -388,7 +388,7 @@ describe('loadDependencies', function () {
|
|
|
388
388
|
return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
|
|
389
389
|
case 1:
|
|
390
390
|
dependencies = _a.sent();
|
|
391
|
-
expect(dependencies).toContain(compiledVars(
|
|
391
|
+
expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Service));
|
|
392
392
|
expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
|
|
393
393
|
expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
|
|
394
394
|
expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
|
|
@@ -411,7 +411,7 @@ describe('loadDependencies', function () {
|
|
|
411
411
|
return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
|
|
412
412
|
case 1:
|
|
413
413
|
dependencies = _a.sent();
|
|
414
|
-
expect(dependencies).toContain(compiledVars(
|
|
414
|
+
expect(dependencies).toContain(compiledVars(internal_1.SasFileType.Service));
|
|
415
415
|
expect(/\* ServiceInit start;/.test(dependencies)).toEqual(true);
|
|
416
416
|
expect(/\* ServiceInit end;/.test(dependencies)).toEqual(true);
|
|
417
417
|
expect(/\* ServiceTerm start;/.test(dependencies)).toEqual(true);
|