@sasjs/cli 3.6.1 → 3.6.2

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.
Files changed (4) hide show
  1. package/build/commands/compile/spec/compileJobFile.spec.js +2 -12
  2. package/build/commands/compile/spec/compileServiceFile.spec.js +2 -12
  3. package/build/commands/compile/spec/loadDependencies.spec.js +13 -144
  4. package/package.json +2 -2
package/build/commands/compile/spec/compileJobFile.spec.js CHANGED
@@ -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");
@@ -106,18 +107,7 @@ describe('compileJobFile', function () {
106
107
  return __generator(this, function (_a) {
107
108
  switch (_a.label) {
108
109
  case 0:
109
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
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
+ 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');
package/build/commands/compile/spec/compileServiceFile.spec.js CHANGED
@@ -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");
@@ -107,18 +108,7 @@ describe('compileServiceFile', function () {
107
108
  return __generator(this, function (_a) {
108
109
  switch (_a.label) {
109
110
  case 0:
110
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
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
+ 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');
package/build/commands/compile/spec/loadDependencies.spec.js CHANGED
@@ -72,6 +72,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
72
72
  var path_1 = __importDefault(require("path"));
73
73
  var utils_1 = require("@sasjs/utils");
74
74
  var internalModule = __importStar(require("@sasjs/utils/sasjsCli/getInitTerm"));
75
+ var getInitTerm_1 = require("@sasjs/utils/sasjsCli/getInitTerm");
75
76
  var test_1 = require("../../../utils/test");
76
77
  var loadDependencies_1 = require("../internal/loadDependencies");
77
78
  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 <h4> SAS Macros </h4>\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!!;";
@@ -162,18 +163,7 @@ describe('loadDependencies', function () {
162
163
  return __generator(this, function (_a) {
163
164
  switch (_a.label) {
164
165
  case 0:
165
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
166
- return Promise.resolve({
167
- content: "\n* ServiceInit start;\n" + fakeInit + "\n* ServiceInit end;",
168
- filePath: ''
169
- });
170
- });
171
- jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
172
- return Promise.resolve({
173
- content: "\n* ServiceTerm start;\n" + fakeTerm + "\n* ServiceTerm end;",
174
- filePath: ''
175
- });
176
- });
166
+ getInitTerm_1.mockGetProgram(internalModule, fakeInit, fakeTerm);
177
167
  return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service)];
178
168
  case 1:
179
169
  dependencies = _a.sent();
@@ -193,18 +183,7 @@ describe('loadDependencies', function () {
193
183
  return __generator(this, function (_a) {
194
184
  switch (_a.label) {
195
185
  case 0:
196
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
197
- return Promise.resolve({
198
- content: "\n* JobInit start;\n" + fakeInit + "\n* JobInit end;",
199
- filePath: ''
200
- });
201
- });
202
- jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
203
- return Promise.resolve({
204
- content: "\n* JobTerm start;\n" + fakeTerm + "\n* JobTerm end;",
205
- filePath: ''
206
- });
207
- });
186
+ getInitTerm_1.mockGetProgram(internalModule, fakeInit, fakeTerm);
208
187
  return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job)];
209
188
  case 1:
210
189
  dependencies = _a.sent();
@@ -224,18 +203,7 @@ describe('loadDependencies', function () {
224
203
  return __generator(this, function (_a) {
225
204
  switch (_a.label) {
226
205
  case 0:
227
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
228
- return Promise.resolve({
229
- content: "\n* ServiceInit start;\n" + fakeInit2 + "\n* ServiceInit end;",
230
- filePath: ''
231
- });
232
- });
233
- jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
234
- return Promise.resolve({
235
- content: "\n* ServiceTerm start;\n" + fakeTerm2 + "\n* ServiceTerm end;",
236
- filePath: ''
237
- });
238
- });
206
+ getInitTerm_1.mockGetProgram(internalModule, fakeInit2, fakeTerm2);
239
207
  return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service)];
240
208
  case 1:
241
209
  dependencies = _a.sent();
@@ -255,18 +223,7 @@ describe('loadDependencies', function () {
255
223
  return __generator(this, function (_a) {
256
224
  switch (_a.label) {
257
225
  case 0:
258
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
259
- return Promise.resolve({
260
- content: "\n* JobInit start;\n" + fakeInit2 + "\n* JobInit end;",
261
- filePath: ''
262
- });
263
- });
264
- jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
265
- return Promise.resolve({
266
- content: "\n* JobTerm start;\n" + fakeTerm2 + "\n* JobTerm end;",
267
- filePath: ''
268
- });
269
- });
226
+ getInitTerm_1.mockGetProgram(internalModule, fakeInit2, fakeTerm2);
270
227
  return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job)];
271
228
  case 1:
272
229
  dependencies = _a.sent();
@@ -286,18 +243,7 @@ describe('loadDependencies', function () {
286
243
  return __generator(this, function (_a) {
287
244
  switch (_a.label) {
288
245
  case 0:
289
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
290
- return Promise.resolve({
291
- content: "\n* ServiceInit start;\n" + fakeJobInit + "\n* ServiceInit end;",
292
- filePath: ''
293
- });
294
- });
295
- jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
296
- return Promise.resolve({
297
- content: "\n* ServiceTerm start;\n" + fakeTerm + "\n* ServiceTerm end;",
298
- filePath: ''
299
- });
300
- });
246
+ getInitTerm_1.mockGetProgram(internalModule, fakeJobInit, fakeTerm);
301
247
  return [4 /*yield*/, 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)];
302
248
  case 1:
303
249
  dependencies = _a.sent();
@@ -317,18 +263,7 @@ describe('loadDependencies', function () {
317
263
  return __generator(this, function (_a) {
318
264
  switch (_a.label) {
319
265
  case 0:
320
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
321
- return Promise.resolve({
322
- content: "\n* JobInit start;\n" + fakeJobInit + "\n* JobInit end;",
323
- filePath: ''
324
- });
325
- });
326
- jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
327
- return Promise.resolve({
328
- content: "\n* JobTerm start;\n" + fakeTerm + "\n* JobTerm end;",
329
- filePath: ''
330
- });
331
- });
266
+ getInitTerm_1.mockGetProgram(internalModule, fakeJobInit, fakeTerm);
332
267
  return [4 /*yield*/, 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)];
333
268
  case 1:
334
269
  dependencies = _a.sent();
@@ -348,18 +283,7 @@ describe('loadDependencies', function () {
348
283
  return __generator(this, function (_a) {
349
284
  switch (_a.label) {
350
285
  case 0:
351
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
352
- return Promise.resolve({
353
- content: "\n* ServiceInit start;\n" + fakeJobInit2 + "\n* ServiceInit end;",
354
- filePath: ''
355
- });
356
- });
357
- jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
358
- return Promise.resolve({
359
- content: "\n* ServiceTerm start;\n" + fakeTerm2 + "\n* ServiceTerm end;",
360
- filePath: ''
361
- });
362
- });
286
+ getInitTerm_1.mockGetProgram(internalModule, fakeJobInit2, fakeTerm2);
363
287
  return [4 /*yield*/, 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)];
364
288
  case 1:
365
289
  dependencies = _a.sent();
@@ -379,18 +303,7 @@ describe('loadDependencies', function () {
379
303
  return __generator(this, function (_a) {
380
304
  switch (_a.label) {
381
305
  case 0:
382
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
383
- return Promise.resolve({
384
- content: "\n* JobInit start;\n" + fakeJobInit2 + "\n* JobInit end;",
385
- filePath: ''
386
- });
387
- });
388
- jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
389
- return Promise.resolve({
390
- content: "\n* JobTerm start;\n" + fakeTerm2 + "\n* JobTerm end;",
391
- filePath: ''
392
- });
393
- });
306
+ getInitTerm_1.mockGetProgram(internalModule, fakeJobInit2, fakeTerm2);
394
307
  return [4 /*yield*/, 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)];
395
308
  case 1:
396
309
  dependencies = _a.sent();
@@ -410,18 +323,7 @@ describe('loadDependencies', function () {
410
323
  return __generator(this, function (_a) {
411
324
  switch (_a.label) {
412
325
  case 0:
413
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
414
- return Promise.resolve({
415
- content: "\n* JobInit start;\n" + fakeJobInit + "\n* JobInit end;",
416
- filePath: ''
417
- });
418
- });
419
- jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
420
- return Promise.resolve({
421
- content: "\n* JobTerm start;\n" + fakeTerm2 + "\n* JobTerm end;",
422
- filePath: ''
423
- });
424
- });
326
+ getInitTerm_1.mockGetProgram(internalModule, fakeJobInit, fakeTerm2);
425
327
  return [4 /*yield*/, 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)];
426
328
  case 1:
427
329
  dependencies = _a.sent();
@@ -444,18 +346,7 @@ describe('loadDependencies', function () {
444
346
  return __generator(this, function (_a) {
445
347
  switch (_a.label) {
446
348
  case 0:
447
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
448
- return Promise.resolve({
449
- content: "\n* JobInit start;\n" + fakeInit2 + "\n* JobInit end;",
450
- filePath: ''
451
- });
452
- });
453
- jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
454
- return Promise.resolve({
455
- content: "\n* JobTerm start;\n" + fakeJobInit + "\n* JobTerm end;",
456
- filePath: ''
457
- });
458
- });
349
+ getInitTerm_1.mockGetProgram(internalModule, fakeInit2, fakeJobInit);
459
350
  return [4 /*yield*/, 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)];
460
351
  case 1:
461
352
  dependencies = _a.sent();
@@ -477,18 +368,7 @@ describe('loadDependencies', function () {
477
368
  return __generator(this, function (_a) {
478
369
  switch (_a.label) {
479
370
  case 0:
480
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
481
- return Promise.resolve({
482
- content: "\n* ServiceInit start;\n" + fakeJobInit + "\n* ServiceInit end;",
483
- filePath: ''
484
- });
485
- });
486
- jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
487
- return Promise.resolve({
488
- content: "\n* ServiceTerm start;\n" + fakeTerm2 + "\n* ServiceTerm end;",
489
- filePath: ''
490
- });
491
- });
371
+ getInitTerm_1.mockGetProgram(internalModule, fakeJobInit, fakeTerm2);
492
372
  return [4 /*yield*/, 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)];
493
373
  case 1:
494
374
  dependencies = _a.sent();
@@ -511,18 +391,7 @@ describe('loadDependencies', function () {
511
391
  return __generator(this, function (_a) {
512
392
  switch (_a.label) {
513
393
  case 0:
514
- jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
515
- return Promise.resolve({
516
- content: "\n* ServiceInit start;\n" + fakeInit2 + "\n* ServiceInit end;",
517
- filePath: ''
518
- });
519
- });
520
- jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
521
- return Promise.resolve({
522
- content: "\n* ServiceTerm start;\n" + fakeJobInit + "\n* ServiceTerm end;",
523
- filePath: ''
524
- });
525
- });
394
+ getInitTerm_1.mockGetProgram(internalModule, fakeInit2, fakeJobInit);
526
395
  return [4 /*yield*/, 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)];
527
396
  case 1:
528
397
  dependencies = _a.sent();
package/package.json CHANGED
@@ -52,7 +52,7 @@
52
52
  "@sasjs/adapter": "3.4.1",
53
53
  "@sasjs/core": "3.10.0",
54
54
  "@sasjs/lint": "1.11.2",
55
- "@sasjs/utils": "2.35.0",
55
+ "@sasjs/utils": "2.36.0",
56
56
  "chalk": "4.1.2",
57
57
  "csv-stringify": "5.6.5",
58
58
  "dotenv": "10.0.0",
@@ -97,5 +97,5 @@
97
97
  "typescript": "4.3.5",
98
98
  "util": "0.12.4"
99
99
  },
100
- "version": "3.6.1"
100
+ "version": "3.6.2"
101
101
  }