@sasjs/cli 4.20.6 → 4.20.8

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 (42) hide show
  1. package/build/commands/add/spec/addTarget.spec.js +5 -5
  2. package/build/commands/build/spec/build.spec.js +3 -3
  3. package/build/commands/compile/internal/spec/compileTestFile.spec.js +1 -1
  4. package/build/commands/compile/spec/compareFolders.spec.js +2 -1
  5. package/build/commands/compile/spec/compile.spec.js +7 -7
  6. package/build/commands/compile/spec/compileFile.spec.js +1 -1
  7. package/build/commands/compile/spec/copyFilesToBuildFolder.spec.js +1 -1
  8. package/build/commands/compile/spec/loadDependencies.spec.js +1 -1
  9. package/build/commands/create/spec/create.spec.js +45 -11
  10. package/build/commands/db/spec/db.spec.js +1 -1
  11. package/build/commands/deploy/spec/cbd.spec.js +1 -1
  12. package/build/commands/deploy/spec/deploy.spec.js +1 -1
  13. package/build/commands/deploy/spec/getDeployScripts.spec.js +1 -1
  14. package/build/commands/docs/generateDocs.js +2 -2
  15. package/build/commands/docs/spec/generateDocs.spec.js +41 -8
  16. package/build/commands/docs/spec/generateDot.spec.js +3 -3
  17. package/build/commands/docs/spec/initDocs.spec.js +1 -1
  18. package/build/commands/flow/internal/spec/saveToCsv.spec.js +4 -3
  19. package/build/commands/flow/internal/spec/validateParams.spec.js +2 -1
  20. package/build/commands/init/spec/init.spec.js +3 -3
  21. package/build/commands/testing/spec/testing.spec.js +1 -1
  22. package/build/commands/version/version.js +4 -9
  23. package/build/commands/web/internal/spec/updateScriptTag.spec.js +2 -1
  24. package/build/commands/web/internal/spec/updateStyleTag.spec.js +2 -1
  25. package/build/commands/web/spec/web.spec.js +1 -1
  26. package/build/utils/auth.d.ts +6 -0
  27. package/build/utils/auth.js +7 -1
  28. package/build/utils/shell.d.ts +60 -0
  29. package/build/utils/shell.js +155 -0
  30. package/build/utils/spec/auth.spec.js +13 -0
  31. package/build/utils/spec/config.spec.js +13 -13
  32. package/build/utils/spec/downloadFile.spec.js +37 -10
  33. package/build/utils/spec/file.spec.js +2 -1
  34. package/build/utils/spec/shell.spec.d.ts +1 -0
  35. package/build/utils/spec/shell.spec.js +156 -0
  36. package/build/utils/spec/utils.spec.js +5 -5
  37. package/build/utils/spec/zip.spec.js +2 -1
  38. package/build/utils/test.d.ts +10 -0
  39. package/build/utils/test.js +16 -1
  40. package/build/utils/utils.d.ts +2 -2
  41. package/build/utils/utils.js +65 -31
  42. package/package.json +8 -11
package/build/commands/add/spec/addTarget.spec.js CHANGED
@@ -93,10 +93,10 @@ var config_1 = require("../../../utils/config");
93
93
  var targetScope_1 = require("../../../types/targetScope");
94
94
  var test_1 = require("../../../utils/test");
95
95
  describe('addTarget', function () {
96
- var appName = "cli-tests-add-".concat((0, utils_1.generateTimestamp)());
97
- var viyaTargetName = "test-viya-".concat((0, utils_1.generateTimestamp)());
98
- var sas9TargetName = "test-sas9-".concat((0, utils_1.generateTimestamp)());
99
- var sasjsTargetName = "test-server-".concat((0, utils_1.generateTimestamp)());
96
+ var appName = "cli-tests-add-".concat((0, test_1.generateUniqueTimestamp)());
97
+ var viyaTargetName = "test-viya-".concat((0, test_1.generateUniqueTimestamp)());
98
+ var sas9TargetName = "test-sas9-".concat((0, test_1.generateUniqueTimestamp)());
99
+ var sasjsTargetName = "test-server-".concat((0, test_1.generateUniqueTimestamp)());
100
100
  var serverUrl = process.env.VIYA_SERVER_URL || '';
101
101
  var globalTestTarget;
102
102
  beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -127,7 +127,7 @@ describe('addTarget', function () {
127
127
  beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
128
128
  return __generator(this, function (_a) {
129
129
  switch (_a.label) {
130
- case 0: return [4 /*yield*/, (0, test_1.createTestGlobalTarget)("test-target-global-".concat((0, utils_1.generateTimestamp)()), "/Public/app/cli-tests/".concat(appName))];
130
+ case 0: return [4 /*yield*/, (0, test_1.createTestGlobalTarget)("test-target-global-".concat((0, test_1.generateUniqueTimestamp)()), "/Public/app/cli-tests/".concat(appName))];
131
131
  case 1:
132
132
  globalTestTarget = _a.sent();
133
133
  return [2 /*return*/];
package/build/commands/build/spec/build.spec.js CHANGED
@@ -65,7 +65,7 @@ describe('sasjs build', function () {
65
65
  return __generator(this, function (_a) {
66
66
  switch (_a.label) {
67
67
  case 0:
68
- appName = "test-app-build-minimal-".concat((0, utils_1.generateTimestamp)());
68
+ appName = "test-app-build-minimal-".concat((0, test_1.generateUniqueTimestamp)());
69
69
  return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
70
70
  case 1:
71
71
  _a.sent();
@@ -84,7 +84,7 @@ describe('sasjs build', function () {
84
84
  return __generator(this, function (_a) {
85
85
  switch (_a.label) {
86
86
  case 0:
87
- appName = "test-app-build-".concat((0, utils_1.generateTimestamp)());
87
+ appName = "test-app-build-".concat((0, test_1.generateUniqueTimestamp)());
88
88
  return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
89
89
  case 1:
90
90
  _a.sent();
@@ -116,7 +116,7 @@ describe('sasjs build', function () {
116
116
  commentLine2,
117
117
  afterComment
118
118
  ].join('\n');
119
- appName = "test-app-build-".concat((0, utils_1.generateTimestamp)());
119
+ appName = "test-app-build-".concat((0, test_1.generateUniqueTimestamp)());
120
120
  return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
121
121
  case 1:
122
122
  _c.sent();
package/build/commands/compile/internal/spec/compileTestFile.spec.js CHANGED
@@ -82,7 +82,7 @@ describe('getTestFileDestinationFragment', function () {
82
82
  });
83
83
  });
84
84
  describe('compileTestFile', function () {
85
- var appName = "cli-tests-compile-test-file-".concat((0, utils_1.generateTimestamp)());
85
+ var appName = "cli-tests-compile-test-file-".concat((0, test_1.generateUniqueTimestamp)());
86
86
  var temp = (0, test_1.generateTestTarget)(appName, '/Public/app', {
87
87
  serviceFolders: [path_1.default.join('sasjs', 'services')],
88
88
  initProgram: '',
package/build/commands/compile/spec/compareFolders.spec.js CHANGED
@@ -41,6 +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 test_1 = require("../../../utils/test");
44
45
  var internal_1 = require("../internal");
45
46
  describe('compareFolders', function () {
46
47
  var sourceFolderPath;
@@ -50,7 +51,7 @@ describe('compareFolders', function () {
50
51
  return __generator(this, function (_a) {
51
52
  switch (_a.label) {
52
53
  case 0:
53
- timestamp = (0, utils_1.generateTimestamp)();
54
+ timestamp = (0, test_1.generateUniqueTimestamp)();
54
55
  sourceFolderPath = path_1.default.join(__dirname, "cli-tests-source-".concat(timestamp));
55
56
  destinationFolderPath = path_1.default.join(__dirname, "cli-tests-destination-".concat(timestamp));
56
57
  return [4 /*yield*/, (0, utils_1.createFolder)(sourceFolderPath)];
package/build/commands/compile/spec/compile.spec.js CHANGED
@@ -103,7 +103,7 @@ describe('sasjs compile', function () {
103
103
  return __generator(this, function (_a) {
104
104
  switch (_a.label) {
105
105
  case 0:
106
- sharedAppName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
106
+ sharedAppName = "cli-tests-compile-".concat((0, test_1.generateUniqueTimestamp)());
107
107
  return [4 /*yield*/, (0, test_1.createTestApp)(homedir, sharedAppName)];
108
108
  case 1:
109
109
  _a.sent();
@@ -115,7 +115,7 @@ describe('sasjs compile', function () {
115
115
  return __generator(this, function (_a) {
116
116
  switch (_a.label) {
117
117
  case 0:
118
- appName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
118
+ appName = "cli-tests-compile-".concat((0, test_1.generateUniqueTimestamp)());
119
119
  return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
120
120
  case 1:
121
121
  _a.sent();
@@ -351,7 +351,7 @@ describe('sasjs compile single file', function () {
351
351
  return __generator(this, function (_a) {
352
352
  switch (_a.label) {
353
353
  case 0:
354
- appName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
354
+ appName = "cli-tests-compile-".concat((0, test_1.generateUniqueTimestamp)());
355
355
  return [4 /*yield*/, (0, test_1.createTestJobsApp)(__dirname, appName)];
356
356
  case 1:
357
357
  _a.sent();
@@ -417,7 +417,7 @@ describe('sasjs compile single file', function () {
417
417
  return __generator(this, function (_a) {
418
418
  switch (_a.label) {
419
419
  case 0:
420
- appName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
420
+ appName = "cli-tests-compile-".concat((0, test_1.generateUniqueTimestamp)());
421
421
  return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
422
422
  case 1:
423
423
  _a.sent();
@@ -512,7 +512,7 @@ describe('sasjs compile outside project', function () {
512
512
  return __generator(this, function (_a) {
513
513
  switch (_a.label) {
514
514
  case 0:
515
- sharedAppName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
515
+ sharedAppName = "cli-tests-compile-".concat((0, test_1.generateUniqueTimestamp)());
516
516
  return [4 /*yield*/, (0, test_1.createTestApp)(homedir, sharedAppName)];
517
517
  case 1:
518
518
  _a.sent();
@@ -525,7 +525,7 @@ describe('sasjs compile outside project', function () {
525
525
  return __generator(this, function (_a) {
526
526
  switch (_a.label) {
527
527
  case 0:
528
- appName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
528
+ appName = "cli-tests-compile-".concat((0, test_1.generateUniqueTimestamp)());
529
529
  return [4 /*yield*/, (0, test_1.updateConfig)({
530
530
  macroFolders: [
531
531
  "./".concat(sharedAppName, "/sasjs/macros"),
@@ -822,7 +822,7 @@ describe('sasjs compile outside project', function () {
822
822
  return __generator(this, function (_a) {
823
823
  switch (_a.label) {
824
824
  case 0:
825
- appName = "cli-tests-compile-".concat((0, utils_1.generateTimestamp)());
825
+ appName = "cli-tests-compile-".concat((0, test_1.generateUniqueTimestamp)());
826
826
  return [4 /*yield*/, (0, config_1.saveGlobalRcFile)('')];
827
827
  case 1:
828
828
  _a.sent();
package/build/commands/compile/spec/compileFile.spec.js CHANGED
@@ -90,7 +90,7 @@ var fakeProgramLines = [
90
90
  ];
91
91
  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';
92
92
  describe('compileFile', function () {
93
- var appName = "cli-tests-compile-service-file-".concat((0, utils_1.generateTimestamp)());
93
+ var appName = "cli-tests-compile-service-file-".concat((0, test_1.generateUniqueTimestamp)());
94
94
  var target = (0, test_1.generateTestTarget)(appName, '/Public/app', {
95
95
  serviceFolders: [path_1.default.join('sasjs', 'services')],
96
96
  initProgram: '',
package/build/commands/compile/spec/copyFilesToBuildFolder.spec.js CHANGED
@@ -80,7 +80,7 @@ describe('copyFilesToBuildFolder', function () {
80
80
  return __generator(this, function (_a) {
81
81
  switch (_a.label) {
82
82
  case 0:
83
- appName = "cli-tests-copyFilesToBuildFolder-".concat((0, utils_1.generateTimestamp)());
83
+ appName = "cli-tests-copyFilesToBuildFolder-".concat((0, test_1.generateUniqueTimestamp)());
84
84
  return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
85
85
  case 1:
86
86
  _a.sent();
package/build/commands/compile/spec/loadDependencies.spec.js CHANGED
@@ -140,7 +140,7 @@ var serviceConfig = function (root) {
140
140
  };
141
141
  var compiledVars = function (type) { return "* ".concat((0, utils_1.capitalizeFirstChar)(type), " Variables start;\n\n%let macrovar1=macro ").concat(type.toLowerCase(), " value configuration 1;\n%let macrovar2=macro ").concat(type.toLowerCase(), " value target 2;\n%let macrovar3=macro ").concat(type.toLowerCase(), " value target 3;\n\n* ").concat((0, utils_1.capitalizeFirstChar)(type), " Variables end;"); };
142
142
  describe('loadDependencies', function () {
143
- var appName = "cli-tests-load-dependencies-".concat((0, utils_1.generateTimestamp)());
143
+ var appName = "cli-tests-load-dependencies-".concat((0, test_1.generateUniqueTimestamp)());
144
144
  var temp = (0, test_1.generateTestTarget)(appName, '/Public/app', {
145
145
  serviceFolders: [path_1.default.join('sasjs', 'services')],
146
146
  initProgram: '',
package/build/commands/create/spec/create.spec.js CHANGED
@@ -1,4 +1,37 @@
1
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 () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
2
35
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
36
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
37
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -49,20 +82,21 @@ var reactAppFiles_1 = require("./reactAppFiles");
49
82
  var angularAppFiles_1 = require("./angularAppFiles");
50
83
  var create_1 = require("../create");
51
84
  var utils_2 = require("../../../utils");
52
- var shelljs_1 = __importDefault(require("shelljs"));
85
+ var shell = __importStar(require("../../../utils/shell"));
53
86
  describe('sasjs create', function () {
54
87
  beforeAll(function () {
55
88
  dotenv_1.default.config();
56
89
  });
57
90
  beforeEach(function () {
58
- var exec = shelljs_1.default.exec;
59
- jest.spyOn(shelljs_1.default, 'exec').mockImplementation(function (command) {
91
+ var exec = shell.exec;
92
+ jest.spyOn(shell, 'exec').mockImplementation(function (command) {
60
93
  if (!command.includes('npm install')) {
61
94
  return exec(command, {
62
95
  silent: true
63
96
  });
64
97
  }
65
- return undefined;
98
+ // The real install is skipped; the caller ignores the result.
99
+ return { stdout: '', stderr: '', code: 0 };
66
100
  });
67
101
  });
68
102
  afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -83,7 +117,7 @@ describe('sasjs create', function () {
83
117
  return __generator(this, function (_a) {
84
118
  switch (_a.label) {
85
119
  case 0:
86
- appName = "test-app-create-.-".concat((0, utils_1.generateTimestamp)());
120
+ appName = "test-app-create-.-".concat((0, test_1.generateUniqueTimestamp)());
87
121
  process.projectDir = path_1.default.join(__dirname, appName);
88
122
  return [4 /*yield*/, (0, utils_2.setConstants)()];
89
123
  case 1:
@@ -106,7 +140,7 @@ describe('sasjs create', function () {
106
140
  return __generator(this, function (_a) {
107
141
  switch (_a.label) {
108
142
  case 0:
109
- appName = "test-app-create-.-".concat((0, utils_1.generateTimestamp)(), "-sasonly");
143
+ appName = "test-app-create-.-".concat((0, test_1.generateUniqueTimestamp)(), "-sasonly");
110
144
  process.projectDir = path_1.default.join(__dirname, appName);
111
145
  return [4 /*yield*/, (0, utils_2.setConstants)()];
112
146
  case 1:
@@ -129,7 +163,7 @@ describe('sasjs create', function () {
129
163
  return __generator(this, function (_a) {
130
164
  switch (_a.label) {
131
165
  case 0:
132
- timestamp = (0, utils_1.generateTimestamp)();
166
+ timestamp = (0, test_1.generateUniqueTimestamp)();
133
167
  appName = "test-app-create-.-".concat(timestamp, "-react");
134
168
  process.projectDir = path_1.default.join(__dirname, appName);
135
169
  return [4 /*yield*/, (0, utils_2.setConstants)()];
@@ -156,7 +190,7 @@ describe('sasjs create', function () {
156
190
  return __generator(this, function (_a) {
157
191
  switch (_a.label) {
158
192
  case 0:
159
- timestamp = (0, utils_1.generateTimestamp)();
193
+ timestamp = (0, test_1.generateUniqueTimestamp)();
160
194
  appName = "test-app-create-.-".concat(timestamp, "-react");
161
195
  process.projectDir = path_1.default.join(__dirname, appName);
162
196
  return [4 /*yield*/, (0, utils_2.setConstants)()];
@@ -183,7 +217,7 @@ describe('sasjs create', function () {
183
217
  return __generator(this, function (_a) {
184
218
  switch (_a.label) {
185
219
  case 0:
186
- timestamp = (0, utils_1.generateTimestamp)();
220
+ timestamp = (0, test_1.generateUniqueTimestamp)();
187
221
  appName = "test-app-create-".concat(timestamp, "-minimal");
188
222
  process.projectDir = path_1.default.join(__dirname, appName);
189
223
  return [4 /*yield*/, (0, utils_2.setConstants)()];
@@ -207,7 +241,7 @@ describe('sasjs create', function () {
207
241
  return __generator(this, function (_a) {
208
242
  switch (_a.label) {
209
243
  case 0:
210
- timestamp = (0, utils_1.generateTimestamp)();
244
+ timestamp = (0, test_1.generateUniqueTimestamp)();
211
245
  appName = "test-app-create-".concat(timestamp, "-angular");
212
246
  process.projectDir = path_1.default.join(__dirname, appName);
213
247
  return [4 /*yield*/, (0, utils_2.setConstants)()];
@@ -234,7 +268,7 @@ describe('sasjs create', function () {
234
268
  return __generator(this, function (_a) {
235
269
  switch (_a.label) {
236
270
  case 0:
237
- timestamp = (0, utils_1.generateTimestamp)();
271
+ timestamp = (0, test_1.generateUniqueTimestamp)();
238
272
  appName = "test-app-create-".concat(timestamp, "-xyz");
239
273
  process.projectDir = path_1.default.join(__dirname, appName);
240
274
  return [4 /*yield*/, (0, utils_2.setConstants)()];
package/build/commands/db/spec/db.spec.js CHANGED
@@ -44,7 +44,7 @@ var test_1 = require("../../../utils/test");
44
44
  var utils_1 = require("@sasjs/utils");
45
45
  var db_1 = require("../db");
46
46
  describe("sasjs db", function () {
47
- var timestamp = (0, utils_1.generateTimestamp)();
47
+ var timestamp = (0, test_1.generateUniqueTimestamp)();
48
48
  var appName = "test-app-DB-".concat(timestamp);
49
49
  beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
50
50
  return __generator(this, function (_a) {
package/build/commands/deploy/spec/cbd.spec.js CHANGED
@@ -91,7 +91,7 @@ describe('sasjs cbd with server type SASJS', function () {
91
91
  return __generator(this, function (_a) {
92
92
  switch (_a.label) {
93
93
  case 0:
94
- appName = "cli-tests-cbd-sasjs-server-".concat((0, utils_1.generateTimestamp)());
94
+ appName = "cli-tests-cbd-sasjs-server-".concat((0, test_1.generateUniqueTimestamp)());
95
95
  return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, appName)];
96
96
  case 1:
97
97
  _a.sent();
package/build/commands/deploy/spec/deploy.spec.js CHANGED
@@ -102,7 +102,7 @@ describe('deploy', function () {
102
102
  return __generator(this, function (_a) {
103
103
  switch (_a.label) {
104
104
  case 0:
105
- appName = "cli-tests-".concat((0, utils_1.generateTimestamp)());
105
+ appName = "cli-tests-".concat((0, test_1.generateUniqueTimestamp)());
106
106
  return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
107
107
  case 1:
108
108
  _a.sent();
package/build/commands/deploy/spec/getDeployScripts.spec.js CHANGED
@@ -76,7 +76,7 @@ describe('getDeployScripts', function () {
76
76
  return __generator(this, function (_a) {
77
77
  switch (_a.label) {
78
78
  case 0:
79
- appName = "cli-tests-".concat((0, utils_1.generateTimestamp)());
79
+ appName = "cli-tests-".concat((0, test_1.generateUniqueTimestamp)());
80
80
  return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
81
81
  case 1:
82
82
  _a.sent();
package/build/commands/docs/generateDocs.js CHANGED
@@ -77,13 +77,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
77
77
  Object.defineProperty(exports, "__esModule", { value: true });
78
78
  exports.generateDocs = generateDocs;
79
79
  var path_1 = __importDefault(require("path"));
80
- var shelljs_1 = __importDefault(require("shelljs"));
81
80
  var chalk_1 = __importDefault(require("chalk"));
82
81
  var ora_1 = __importDefault(require("ora"));
83
82
  var utils_1 = require("@sasjs/utils");
84
83
  var getFoldersForDocs_1 = require("./internal/getFoldersForDocs");
85
84
  var createDotFiles_1 = require("./internal/createDotFiles");
86
85
  var getDocConfig_1 = require("./internal/getDocConfig");
86
+ var shell_1 = require("../../utils/shell");
87
87
  /**
88
88
  * Generates documentation(Doxygen)
89
89
  * By default the docs will be at 'sasjsbuild/docs' folder
@@ -194,7 +194,7 @@ function generateDocs(target, config, outDirectory) {
194
194
  case 9: return [4 /*yield*/, (0, utils_1.createFolder)(newOutDirectory)];
195
195
  case 10:
196
196
  _f.sent();
197
- _c = shelljs_1.default.exec("".concat(doxyParams, " doxygen \"").concat(doxyConfigPath, "\""), {
197
+ _c = (0, shell_1.exec)("".concat(doxyParams, " doxygen \"").concat(doxyConfigPath, "\""), {
198
198
  silent: process.env.LOG_LEVEL !== utils_1.LogLevel.Debug
199
199
  }), stderr = _c.stderr, code = _c.code;
200
200
  if (process.env.LOG_LEVEL !== utils_1.LogLevel.Debug)
package/build/commands/docs/spec/generateDocs.spec.js CHANGED
@@ -10,6 +10,39 @@ var __assign = (this && this.__assign) || function () {
10
10
  };
11
11
  return __assign.apply(this, arguments);
12
12
  };
13
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
14
+ if (k2 === undefined) k2 = k;
15
+ var desc = Object.getOwnPropertyDescriptor(m, k);
16
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
17
+ desc = { enumerable: true, get: function() { return m[k]; } };
18
+ }
19
+ Object.defineProperty(o, k2, desc);
20
+ }) : (function(o, m, k, k2) {
21
+ if (k2 === undefined) k2 = k;
22
+ o[k2] = m[k];
23
+ }));
24
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
25
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
26
+ }) : function(o, v) {
27
+ o["default"] = v;
28
+ });
29
+ var __importStar = (this && this.__importStar) || (function () {
30
+ var ownKeys = function(o) {
31
+ ownKeys = Object.getOwnPropertyNames || function (o) {
32
+ var ar = [];
33
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
34
+ return ar;
35
+ };
36
+ return ownKeys(o);
37
+ };
38
+ return function (mod) {
39
+ if (mod && mod.__esModule) return mod;
40
+ var result = {};
41
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
42
+ __setModuleDefault(result, mod);
43
+ return result;
44
+ };
45
+ })();
13
46
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
14
47
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
15
48
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -51,14 +84,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
51
84
  };
52
85
  Object.defineProperty(exports, "__esModule", { value: true });
53
86
  var path_1 = __importDefault(require("path"));
54
- var shelljs_1 = __importDefault(require("shelljs"));
87
+ var shell = __importStar(require("../../../utils/shell"));
55
88
  var test_1 = require("../../../utils/test");
56
89
  var utils_1 = require("@sasjs/utils");
57
90
  var generateDocs_1 = require("../generateDocs");
58
91
  var utils_2 = require("../../../utils");
59
92
  var types_1 = require("../../../types");
60
93
  describe('sasjs doc', function () {
61
- var appName = "test-app-doc-".concat((0, utils_1.generateTimestamp)());
94
+ var appName = "test-app-doc-".concat((0, test_1.generateUniqueTimestamp)());
62
95
  var docOutputDefault = path_1.default.join(__dirname, appName, 'sasjsbuild', 'docs');
63
96
  var doxyContentPath = path_1.default.join(__dirname, appName, 'sasjs', 'doxy');
64
97
  var defaultTarget;
@@ -209,7 +242,7 @@ describe('sasjs doc', function () {
209
242
  return __generator(this, function (_a) {
210
243
  switch (_a.label) {
211
244
  case 0:
212
- docOutputProvided = path_1.default.join(__dirname, appName, "my-docs-".concat((0, utils_1.generateTimestamp)()));
245
+ docOutputProvided = path_1.default.join(__dirname, appName, "my-docs-".concat((0, test_1.generateUniqueTimestamp)()));
213
246
  return [4 /*yield*/, expect((0, generateDocs_1.generateDocs)(defaultTarget, defaultConfig, docOutputProvided)).resolves.toEqual({
214
247
  outDirectory: docOutputProvided
215
248
  })];
@@ -247,7 +280,7 @@ describe('sasjs doc', function () {
247
280
  return __generator(this, function (_a) {
248
281
  switch (_a.label) {
249
282
  case 0:
250
- docOutputProvided = path_1.default.join(__dirname, appName, "xyz-".concat((0, utils_1.generateTimestamp)()));
283
+ docOutputProvided = path_1.default.join(__dirname, appName, "xyz-".concat((0, test_1.generateUniqueTimestamp)()));
251
284
  config = __assign(__assign({}, defaultConfig), { docConfig: { outDirectory: docOutputProvided } });
252
285
  return [4 /*yield*/, expect((0, generateDocs_1.generateDocs)(defaultTarget, config)).resolves.toEqual({
253
286
  outDirectory: docOutputProvided
@@ -325,7 +358,7 @@ describe('sasjs doc', function () {
325
358
  return __generator(this, function (_a) {
326
359
  switch (_a.label) {
327
360
  case 0:
328
- docOutputProvided = path_1.default.join(__dirname, appName, "xyz-".concat((0, utils_1.generateTimestamp)()));
361
+ docOutputProvided = path_1.default.join(__dirname, appName, "xyz-".concat((0, test_1.generateUniqueTimestamp)()));
329
362
  target = new utils_1.Target(__assign(__assign({}, defaultTarget.toJson()), { docConfig: {
330
363
  displayMacroCore: false,
331
364
  enableLineage: false,
@@ -351,7 +384,7 @@ describe('sasjs doc', function () {
351
384
  return __generator(this, function (_a) {
352
385
  switch (_a.label) {
353
386
  case 0:
354
- docOutputProvided = path_1.default.join(__dirname, appName, "xyz-".concat((0, utils_1.generateTimestamp)()));
387
+ docOutputProvided = path_1.default.join(__dirname, appName, "xyz-".concat((0, test_1.generateUniqueTimestamp)()));
355
388
  config = __assign(__assign({}, defaultConfig), { docConfig: null });
356
389
  target = new utils_1.Target(__assign(__assign({}, defaultTarget.toJson()), { docConfig: {
357
390
  displayMacroCore: false,
@@ -522,7 +555,7 @@ describe('sasjs doc', function () {
522
555
  return __generator(this, function (_a) {
523
556
  switch (_a.label) {
524
557
  case 0:
525
- jest.spyOn(shelljs_1.default, 'exec').mockReturnValueOnce({
558
+ jest.spyOn(shell, 'exec').mockReturnValueOnce({
526
559
  code: 1,
527
560
  stderr: 'error: bad config',
528
561
  stdout: ''
@@ -538,7 +571,7 @@ describe('sasjs doc', function () {
538
571
  return __generator(this, function (_a) {
539
572
  switch (_a.label) {
540
573
  case 0:
541
- jest.spyOn(shelljs_1.default, 'exec').mockReturnValueOnce({
574
+ jest.spyOn(shell, 'exec').mockReturnValueOnce({
542
575
  code: 1,
543
576
  stderr: 'command not found',
544
577
  stdout: ''
package/build/commands/docs/spec/generateDot.spec.js CHANGED
@@ -58,7 +58,7 @@ var generateDot_1 = require("../generateDot");
58
58
  var utils_2 = require("../../../utils");
59
59
  var types_1 = require("../../../types");
60
60
  describe('sasjs doc lineage', function () {
61
- var appName = "test-app-doc-".concat((0, utils_1.generateTimestamp)());
61
+ var appName = "test-app-doc-".concat((0, test_1.generateUniqueTimestamp)());
62
62
  var docOutputDefault = path_1.default.join(__dirname, appName, 'sasjsbuild', 'docs');
63
63
  var defaultTarget;
64
64
  var defaultConfig;
@@ -118,7 +118,7 @@ describe('sasjs doc lineage', function () {
118
118
  return __generator(this, function (_a) {
119
119
  switch (_a.label) {
120
120
  case 0:
121
- docOutputProvided = path_1.default.join(__dirname, appName, "my-docs-".concat((0, utils_1.generateTimestamp)()));
121
+ docOutputProvided = path_1.default.join(__dirname, appName, "my-docs-".concat((0, test_1.generateUniqueTimestamp)()));
122
122
  return [4 /*yield*/, expect((0, generateDot_1.generateDot)(defaultTarget, defaultConfig, docOutputProvided)).resolves.toEqual({
123
123
  outDirectory: docOutputProvided
124
124
  })];
@@ -136,7 +136,7 @@ describe('sasjs doc lineage', function () {
136
136
  return __generator(this, function (_a) {
137
137
  switch (_a.label) {
138
138
  case 0:
139
- docOutputProvided = path_1.default.join(__dirname, appName, "xyz-".concat((0, utils_1.generateTimestamp)()));
139
+ docOutputProvided = path_1.default.join(__dirname, appName, "xyz-".concat((0, test_1.generateUniqueTimestamp)()));
140
140
  target = new utils_1.Target(__assign(__assign({}, defaultTarget.toJson()), { docConfig: { outDirectory: docOutputProvided } }));
141
141
  return [4 /*yield*/, expect((0, generateDot_1.generateDot)(target, defaultConfig)).resolves.toEqual({
142
142
  outDirectory: docOutputProvided
package/build/commands/docs/spec/initDocs.spec.js CHANGED
@@ -60,7 +60,7 @@ describe('sasjs doc', function () {
60
60
  return __generator(this, function (_a) {
61
61
  switch (_a.label) {
62
62
  case 0:
63
- appName = "test-app-doc-".concat((0, utils_1.generateTimestamp)());
63
+ appName = "test-app-doc-".concat((0, test_1.generateUniqueTimestamp)());
64
64
  doxypath = path_1.default.join(__dirname, appName, 'sasjs', 'doxy');
65
65
  return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
66
66
  case 1:
package/build/commands/flow/internal/spec/saveToCsv.spec.js CHANGED
@@ -41,6 +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 test_1 = require("../../../../utils/test");
44
45
  var __1 = require("..");
45
46
  var csvColumns_1 = __importDefault(require("../csvColumns"));
46
47
  describe('saveToCsv', function () {
@@ -60,7 +61,7 @@ describe('saveToCsv', function () {
60
61
  return __generator(this, function (_a) {
61
62
  switch (_a.label) {
62
63
  case 0:
63
- csvFilePath = path_1.default.join(__dirname, "cli-tests-csv-".concat((0, utils_1.generateTimestamp)()));
64
+ csvFilePath = path_1.default.join(__dirname, "cli-tests-csv-".concat((0, test_1.generateUniqueTimestamp)()));
64
65
  return [4 /*yield*/, (0, __1.saveToCsv)(csvFilePath, [
65
66
  'someFlowName',
66
67
  ['flow1', 'flow2'].join(' | '),
@@ -84,7 +85,7 @@ describe('saveToCsv', function () {
84
85
  return __generator(this, function (_a) {
85
86
  switch (_a.label) {
86
87
  case 0:
87
- csvFilePath = path_1.default.join(__dirname, "cli-tests-csv-".concat((0, utils_1.generateTimestamp)()));
88
+ csvFilePath = path_1.default.join(__dirname, "cli-tests-csv-".concat((0, test_1.generateUniqueTimestamp)()));
88
89
  return [4 /*yield*/, Promise.all([1, 2, 3].map(function (_, i) { return __awaiter(void 0, void 0, void 0, function () {
89
90
  return __generator(this, function (_a) {
90
91
  switch (_a.label) {
@@ -125,7 +126,7 @@ describe('saveToCsv', function () {
125
126
  return __generator(this, function (_a) {
126
127
  switch (_a.label) {
127
128
  case 0:
128
- csvFilePath = path_1.default.join(__dirname, "cli-tests-csv-".concat((0, utils_1.generateTimestamp)()));
129
+ csvFilePath = path_1.default.join(__dirname, "cli-tests-csv-".concat((0, test_1.generateUniqueTimestamp)()));
129
130
  return [4 /*yield*/, Promise.all([1, 2, 3].map(function (_, i) { return __awaiter(void 0, void 0, void 0, function () {
130
131
  var randomNumber;
131
132
  return __generator(this, function (_a) {
package/build/commands/flow/internal/spec/validateParams.spec.js CHANGED
@@ -74,11 +74,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
74
74
  Object.defineProperty(exports, "__esModule", { value: true });
75
75
  var path_1 = __importDefault(require("path"));
76
76
  var utils_1 = require("@sasjs/utils");
77
+ var test_1 = require("../../../../utils/test");
77
78
  var __1 = require("..");
78
79
  var configUtils = __importStar(require("../../../../utils/config"));
79
80
  var examples_1 = __importDefault(require("../examples"));
80
81
  describe('validateParams', function () {
81
- var appFolder = path_1.default.join(__dirname, "cli-tests-validateParams-".concat((0, utils_1.generateTimestamp)()));
82
+ var appFolder = path_1.default.join(__dirname, "cli-tests-validateParams-".concat((0, test_1.generateUniqueTimestamp)()));
82
83
  beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
83
84
  return __generator(this, function (_a) {
84
85
  switch (_a.label) {
package/build/commands/init/spec/init.spec.js CHANGED
@@ -69,7 +69,7 @@ describe('sasjs init', function () {
69
69
  return __generator(this, function (_a) {
70
70
  switch (_a.label) {
71
71
  case 0:
72
- appName = "test-app-init-".concat((0, utils_1.generateTimestamp)());
72
+ appName = "test-app-init-".concat((0, test_1.generateUniqueTimestamp)());
73
73
  process.projectDir = path_1.default.join(__dirname, appName);
74
74
  return [4 /*yield*/, (0, utils_2.setConstants)()];
75
75
  case 1:
@@ -95,7 +95,7 @@ describe('sasjs init', function () {
95
95
  return __generator(this, function (_a) {
96
96
  switch (_a.label) {
97
97
  case 0:
98
- appName = "test-app-init-sasonly-".concat((0, utils_1.generateTimestamp)());
98
+ appName = "test-app-init-sasonly-".concat((0, test_1.generateUniqueTimestamp)());
99
99
  process.projectDir = path_1.default.join(__dirname, appName);
100
100
  return [4 /*yield*/, (0, utils_2.setConstants)()];
101
101
  case 1:
@@ -121,7 +121,7 @@ describe('sasjs init', function () {
121
121
  return __generator(this, function (_a) {
122
122
  switch (_a.label) {
123
123
  case 0:
124
- appName = "test-app-init-.-".concat((0, utils_1.generateTimestamp)());
124
+ appName = "test-app-init-.-".concat((0, test_1.generateUniqueTimestamp)());
125
125
  process.projectDir = path_1.default.join(__dirname, appName);
126
126
  return [4 /*yield*/, (0, utils_2.setConstants)()];
127
127
  case 1:
package/build/commands/testing/spec/testing.spec.js CHANGED
@@ -685,7 +685,7 @@ describe('sasjs test', function () {
685
685
  function generateTarget(serverType) {
686
686
  if (serverType === void 0) { serverType = utils_1.ServerType.SasViya; }
687
687
  dotenv_1.default.config();
688
- var timestamp = (0, utils_1.generateTimestamp)();
688
+ var timestamp = (0, test_2.generateUniqueTimestamp)();
689
689
  var targetName = "cli-tests-test-command-".concat(serverType, "-").concat(timestamp);
690
690
  return new utils_1.Target({
691
691
  name: targetName,
package/build/commands/version/version.js CHANGED
@@ -35,21 +35,16 @@ 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
- };
41
38
  Object.defineProperty(exports, "__esModule", { value: true });
42
39
  exports.printVersion = printVersion;
43
- var shelljs_1 = __importDefault(require("shelljs"));
40
+ var shell_1 = require("../../utils/shell");
44
41
  function printVersion() {
45
42
  return __awaiter(this, void 0, void 0, function () {
46
- var result, line, version, message;
43
+ var stdout, line, version, message;
47
44
  var _a;
48
45
  return __generator(this, function (_b) {
49
- result = shelljs_1.default.exec("npm list -g @sasjs/cli", {
50
- silent: true
51
- });
52
- line = result.split('\n').find(function (l) { return l.includes('@sasjs/cli'); }) || '';
46
+ stdout = (0, shell_1.exec)("npm list -g @sasjs/cli", { silent: true }).stdout;
47
+ line = stdout.split('\n').find(function (l) { return l.includes('@sasjs/cli'); }) || '';
53
48
  version = line.split('@')[2].trim();
54
49
  message = version.includes('->')
55
50
  ? "You are using a linked version of SASjs CLI running from sources at ".concat(version