@sasjs/cli 4.20.0 → 4.20.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.
- package/build/cli.js +4 -5
- package/build/cli.spec.js +19 -9
- package/build/commands/add/addCommand.js +2 -2
- package/build/commands/add/addCredential.js +2 -2
- package/build/commands/add/addTarget.js +13 -14
- package/build/commands/add/internal/input.js +14 -14
- package/build/commands/add/internal/saveConfig.js +3 -4
- package/build/commands/add/spec/addCommand.spec.js +19 -9
- package/build/commands/add/spec/addCredential.spec.js +19 -9
- package/build/commands/add/spec/addTarget.spec.js +19 -9
- package/build/commands/auth/authCommand.js +8 -8
- package/build/commands/auth/login.js +40 -14
- package/build/commands/auth/spec/authCommand.spec.js +19 -9
- package/build/commands/auth/spec/login.spec.js +19 -9
- package/build/commands/build/build.js +25 -26
- package/build/commands/build/buildCommand.js +2 -2
- package/build/commands/build/compileBuildCommand.js +3 -3
- package/build/commands/build/internal/config.js +2 -2
- package/build/commands/build/spec/build.spec.js +2 -2
- package/build/commands/build/spec/buildCommand.spec.js +19 -9
- package/build/commands/build/spec/cb.spec.server.viya.js +2 -2
- package/build/commands/build/spec/compileBuildCommand.spec.js +19 -9
- package/build/commands/compile/compile.js +29 -20
- package/build/commands/compile/compileCommand.js +2 -2
- package/build/commands/compile/compileSingleFile.js +15 -15
- package/build/commands/compile/internal/checkCompileStatus.js +3 -4
- package/build/commands/compile/internal/compareFolders.js +2 -2
- package/build/commands/compile/internal/compileFile.js +6 -7
- package/build/commands/compile/internal/compileTestFile.js +17 -13
- package/build/commands/compile/internal/copySyncFolder.js +2 -2
- package/build/commands/compile/internal/getAllFolders.js +3 -3
- package/build/commands/compile/internal/identifySasFile.js +2 -2
- package/build/commands/compile/internal/loadDependencies.js +10 -10
- package/build/commands/compile/internal/spec/compileTestFile.spec.js +2 -2
- package/build/commands/compile/internal/spec/getAllFolders.spec.js +19 -9
- package/build/commands/compile/spec/compareFolders.spec.js +3 -3
- package/build/commands/compile/spec/compile.spec.js +19 -9
- package/build/commands/compile/spec/compileCommand.spec.js +19 -9
- package/build/commands/compile/spec/compileFile.spec.js +19 -9
- package/build/commands/compile/spec/compileSingleFile.spec.js +19 -9
- package/build/commands/compile/spec/copyFilesToBuildFolder.spec.js +20 -10
- package/build/commands/compile/spec/loadDependencies.spec.js +19 -9
- package/build/commands/context/contextCommand.js +3 -3
- package/build/commands/context/create.js +4 -5
- package/build/commands/context/delete.js +4 -5
- package/build/commands/context/edit.js +4 -5
- package/build/commands/context/export.js +4 -5
- package/build/commands/context/internal/parseConfig.js +1 -2
- package/build/commands/context/internal/validateConfigPath.js +3 -4
- package/build/commands/context/list.js +4 -5
- package/build/commands/context/spec/contextCommand.spec.js +19 -9
- package/build/commands/context/spec/create.spec.js +2 -2
- package/build/commands/context/spec/delete.spec.js +2 -2
- package/build/commands/context/spec/edit.spec.js +2 -2
- package/build/commands/context/spec/export.spec.js +19 -9
- package/build/commands/context/spec/list.spec.js +2 -2
- package/build/commands/create/create.js +4 -5
- package/build/commands/create/createCommand.js +2 -2
- package/build/commands/create/createTemplate.js +1 -1
- package/build/commands/create/internal/createReadme.js +3 -4
- package/build/commands/create/spec/create.spec.js +2 -2
- package/build/commands/create/spec/createCommand.spec.js +19 -9
- package/build/commands/db/db.js +8 -9
- package/build/commands/db/dbCommand.js +2 -2
- package/build/commands/db/spec/db.spec.js +2 -2
- package/build/commands/db/spec/dbCommand.spec.js +19 -9
- package/build/commands/deploy/compileBuildDeployCommand.js +8 -8
- package/build/commands/deploy/deploy.js +4 -5
- package/build/commands/deploy/deployCommand.js +2 -2
- package/build/commands/deploy/internal/deployToSASJSWithServicePack.js +11 -12
- package/build/commands/deploy/internal/executeDeployScript.js +3 -4
- package/build/commands/deploy/internal/executeDeployScriptSas9.js +10 -11
- package/build/commands/deploy/internal/executeDeployScriptSasViya.js +11 -12
- package/build/commands/deploy/internal/executeDeployScriptSasjs.js +12 -13
- package/build/commands/deploy/internal/executeNonSasScript.js +4 -5
- package/build/commands/deploy/internal/executeSasScript.js +5 -6
- package/build/commands/deploy/internal/getDeployScripts.js +4 -5
- package/build/commands/deploy/spec/cbd.spec.js +19 -9
- package/build/commands/deploy/spec/cbd.spec.server.viya.js +19 -9
- package/build/commands/deploy/spec/compileBuildDeployCommand.spec.js +19 -9
- package/build/commands/deploy/spec/deploy.spec.js +19 -9
- package/build/commands/deploy/spec/deployCommand.spec.js +19 -9
- package/build/commands/deploy/spec/getDeployScripts.spec.js +2 -2
- package/build/commands/deploy/spec/utils.js +41 -8
- package/build/commands/docs/docsCommand.js +2 -2
- package/build/commands/docs/generateDocs.js +11 -12
- package/build/commands/docs/generateDot.js +3 -4
- package/build/commands/docs/initDocs.js +3 -4
- package/build/commands/docs/internal/createDotFiles.js +4 -5
- package/build/commands/docs/internal/getDocConfig.d.ts +8 -8
- package/build/commands/docs/internal/getDocConfig.js +1 -2
- package/build/commands/docs/internal/getDotFileContent.js +3 -4
- package/build/commands/docs/internal/getFileInputs.js +1 -2
- package/build/commands/docs/internal/getFileOutputs.js +1 -2
- package/build/commands/docs/internal/getFoldersForDocs.js +1 -2
- package/build/commands/docs/internal/populateNodeDictionary.js +1 -2
- package/build/commands/docs/internal/populateParamNodeTypes.js +21 -22
- package/build/commands/docs/spec/docsCommand.spec.js +19 -9
- package/build/commands/docs/spec/generateDocs.spec.js +2 -2
- package/build/commands/docs/spec/generateDot.spec.js +2 -2
- package/build/commands/docs/spec/getDocConfig.spec.js +2 -2
- package/build/commands/docs/spec/initDocs.spec.js +2 -2
- package/build/commands/flow/execute.js +6 -7
- package/build/commands/flow/flowCommand.js +2 -2
- package/build/commands/flow/internal/executeFlow.js +3 -3
- package/build/commands/flow/internal/saveLog.js +34 -5
- package/build/commands/flow/internal/saveToCsv.js +2 -2
- package/build/commands/flow/internal/spec/executeFlow.spec.js +19 -9
- package/build/commands/flow/internal/spec/saveToCsv.spec.js +2 -2
- package/build/commands/flow/internal/spec/validateParams.spec.js +19 -9
- package/build/commands/flow/internal/validateParams.d.ts +4 -4
- package/build/commands/flow/internal/validateParams.js +2 -2
- package/build/commands/flow/spec/flow.spec.js +19 -9
- package/build/commands/flow/spec/flow.spec.server.viya.js +2 -2
- package/build/commands/flow/spec/flowCommand.spec.js +19 -9
- package/build/commands/folder/create.js +2 -2
- package/build/commands/folder/delete.js +2 -2
- package/build/commands/folder/folderCommand.js +13 -13
- package/build/commands/folder/list.js +2 -2
- package/build/commands/folder/move.js +2 -2
- package/build/commands/folder/spec/folder.spec.server.viya.js +2 -2
- package/build/commands/folder/spec/folderCommand.spec.js +19 -9
- package/build/commands/fs/fsCommand.js +34 -36
- package/build/commands/fs/internal/executeCode.js +2 -2
- package/build/commands/fs/spec/executeCode.spec.js +19 -9
- package/build/commands/fs/spec/fsCommand.spec.js +19 -9
- package/build/commands/help/help.js +3 -4
- package/build/commands/help/helpCommand.js +2 -2
- package/build/commands/help/spec/help.spec.js +2 -2
- package/build/commands/help/spec/helpCommand.spec.js +19 -9
- package/build/commands/index.js +1 -1
- package/build/commands/init/init.js +5 -5
- package/build/commands/init/initCommand.js +2 -2
- package/build/commands/init/spec/init.spec.js +2 -2
- package/build/commands/init/spec/initCommand.spec.js +19 -9
- package/build/commands/job/internal/execute/sas9.js +3 -4
- package/build/commands/job/internal/execute/sasjs.js +4 -5
- package/build/commands/job/internal/execute/viya.js +10 -11
- package/build/commands/job/internal/utils.js +2 -2
- package/build/commands/job/jobCommand.js +19 -19
- package/build/commands/job/spec/execute.spec.js +43 -11
- package/build/commands/job/spec/getContextName.spec.js +2 -2
- package/build/commands/job/spec/job.spec.server.viya.js +24 -16
- package/build/commands/job/spec/jobCommand.spec.js +19 -9
- package/build/commands/lint/initLint.js +3 -4
- package/build/commands/lint/lintCommand.js +2 -2
- package/build/commands/lint/processLint.js +13 -14
- package/build/commands/lint/spec/lintCommand.spec.js +19 -9
- package/build/commands/request/request.js +3 -4
- package/build/commands/request/requestCommand.js +2 -2
- package/build/commands/request/spec/request.spec.server.sas9.js +19 -9
- package/build/commands/request/spec/request.spec.server.viya.js +19 -9
- package/build/commands/request/spec/requestCommand.spec.js +19 -9
- package/build/commands/request/spec/utils.js +2 -2
- package/build/commands/run/run.js +29 -30
- package/build/commands/run/runCommand.js +2 -2
- package/build/commands/run/spec/run.spec.js +19 -9
- package/build/commands/run/spec/run.spec.server.sas9.js +2 -2
- package/build/commands/run/spec/run.spec.server.sasjs.js +2 -2
- package/build/commands/run/spec/run.spec.server.viya.js +4 -4
- package/build/commands/run/spec/runCommand.spec.js +19 -9
- package/build/commands/servicepack/deploy.js +7 -8
- package/build/commands/servicepack/servicePackCommand.js +7 -7
- package/build/commands/servicepack/spec/servicepack.spec.server.viya.js +2 -2
- package/build/commands/servicepack/spec/servicepackCommand.spec.js +19 -9
- package/build/commands/shared/createConfigFile.js +2 -2
- package/build/commands/shared/createFileStructure.js +2 -2
- package/build/commands/shared/createLintConfigFile.js +2 -2
- package/build/commands/shared/deployToSasViyaWithServicePack.js +6 -7
- package/build/commands/shared/fetchLogFileContent.js +2 -2
- package/build/commands/shared/spec/deployToSasViyaWithServicePack.spec.js +19 -9
- package/build/commands/snippets/snippets.js +3 -4
- package/build/commands/snippets/snippetsCommand.js +2 -2
- package/build/commands/snippets/spec/snippets.spec.js +2 -2
- package/build/commands/snippets/spec/snippetsCommand.spec.js +19 -9
- package/build/commands/testing/internal/saveOutput.js +23 -15
- package/build/commands/testing/spec/testCommand.spec.js +19 -9
- package/build/commands/testing/spec/testing.spec.js +19 -9
- package/build/commands/testing/test.js +14 -14
- package/build/commands/testing/testCommand.js +2 -2
- package/build/commands/version/spec/version.spec.js +2 -2
- package/build/commands/version/spec/versionCommand.spec.js +19 -9
- package/build/commands/version/version.js +4 -5
- package/build/commands/version/versionCommand.js +2 -2
- package/build/commands/web/internal/createAssetServices.js +39 -41
- package/build/commands/web/internal/sas9/createClickMeService.js +2 -2
- package/build/commands/web/internal/sas9/generateAssetService.js +2 -2
- package/build/commands/web/internal/sas9/getWebServiceContent.js +34 -5
- package/build/commands/web/internal/sasViya/createClickMeFile.js +2 -2
- package/build/commands/web/internal/spec/updateSasjstag.spec.js +2 -2
- package/build/commands/web/internal/spec/updateScriptTag.spec.js +2 -2
- package/build/commands/web/internal/spec/updateStyleTag.spec.js +2 -2
- package/build/commands/web/internal/updateAllTags.js +86 -88
- package/build/commands/web/internal/updateLinkTag.d.ts +1 -1
- package/build/commands/web/internal/updateScriptTag.js +2 -2
- package/build/commands/web/internal/updateStyleTag.js +2 -2
- package/build/commands/web/spec/web.spec.js +2 -2
- package/build/commands/web/spec/webCommand.spec.js +19 -9
- package/build/commands/web/web.js +10 -11
- package/build/commands/web/webCommand.js +2 -2
- package/build/types/command/commandAliases.d.ts +1 -1
- package/build/types/command/commandBase.js +2 -2
- package/build/types/command/commandFactory.d.ts +1 -1
- package/build/types/command/returnCode.js +1 -1
- package/build/types/command/spec/commandBase.spec.js +2 -2
- package/build/types/command/spec/targetCommand.spec.js +19 -9
- package/build/types/command/targetCommand.js +2 -2
- package/build/types/flow.js +1 -1
- package/build/types/targetScope.js +1 -1
- package/build/types/testing.js +3 -3
- package/build/utils/auth.js +8 -8
- package/build/utils/compressAndSave.js +2 -2
- package/build/utils/config.js +82 -84
- package/build/utils/displayResult.js +2 -3
- package/build/utils/file.js +13 -13
- package/build/utils/loadEnvVariables.js +4 -5
- package/build/utils/parseSourceFile.js +3 -4
- package/build/utils/saveLog.js +34 -5
- package/build/utils/setConstants.js +34 -5
- package/build/utils/setProjectDir.js +2 -2
- package/build/utils/spec/auth.spec.js +2 -2
- package/build/utils/spec/config.spec.js +19 -9
- package/build/utils/spec/file.spec.js +2 -2
- package/build/utils/spec/saveLog.spec.js +2 -2
- package/build/utils/spec/setConstants.spec.js +20 -10
- package/build/utils/spec/utils.spec.js +2 -2
- package/build/utils/test.d.ts +2 -3
- package/build/utils/test.js +103 -40
- package/build/utils/utils.js +22 -22
- package/package.json +32 -32
package/build/utils/test.js
CHANGED
|
@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
20
20
|
});
|
|
21
21
|
};
|
|
22
22
|
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
23
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
24
|
-
return g =
|
|
23
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
24
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
25
25
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
26
|
function step(op) {
|
|
27
27
|
if (f) throw new TypeError("Generator is already executing.");
|
|
@@ -46,6 +46,31 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
46
46
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
47
|
}
|
|
48
48
|
};
|
|
49
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
50
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
51
|
+
if (!m) return o;
|
|
52
|
+
var i = m.call(o), r, ar = [], e;
|
|
53
|
+
try {
|
|
54
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
55
|
+
}
|
|
56
|
+
catch (error) { e = { error: error }; }
|
|
57
|
+
finally {
|
|
58
|
+
try {
|
|
59
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
60
|
+
}
|
|
61
|
+
finally { if (e) throw e.error; }
|
|
62
|
+
}
|
|
63
|
+
return ar;
|
|
64
|
+
};
|
|
65
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
66
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
67
|
+
if (ar || !(i in from)) {
|
|
68
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
69
|
+
ar[i] = from[i];
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
73
|
+
};
|
|
49
74
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
50
75
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
51
76
|
};
|
|
@@ -224,16 +249,20 @@ var generateTestTarget = function (targetName, appLoc, serviceConfig, serverType
|
|
|
224
249
|
return target;
|
|
225
250
|
};
|
|
226
251
|
exports.generateTestTarget = generateTestTarget;
|
|
227
|
-
var createTestGlobalTarget = function (
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
}; }
|
|
234
|
-
if (serverType === void 0) { serverType = types_1.ServerType.SasViya; }
|
|
235
|
-
return __awaiter(void 0, void 0, void 0, function () {
|
|
252
|
+
var createTestGlobalTarget = function (targetName_1, appLoc_1) {
|
|
253
|
+
var args_1 = [];
|
|
254
|
+
for (var _i = 2; _i < arguments.length; _i++) {
|
|
255
|
+
args_1[_i - 2] = arguments[_i];
|
|
256
|
+
}
|
|
257
|
+
return __awaiter(void 0, __spreadArray([targetName_1, appLoc_1], __read(args_1), false), void 0, function (targetName, appLoc, serviceConfig, serverType) {
|
|
236
258
|
var target;
|
|
259
|
+
if (serviceConfig === void 0) { serviceConfig = {
|
|
260
|
+
serviceFolders: [path_1.default.join('sasjs', 'services')],
|
|
261
|
+
initProgram: '',
|
|
262
|
+
termProgram: '',
|
|
263
|
+
macroVars: {}
|
|
264
|
+
}; }
|
|
265
|
+
if (serverType === void 0) { serverType = types_1.ServerType.SasViya; }
|
|
237
266
|
return __generator(this, function (_a) {
|
|
238
267
|
switch (_a.label) {
|
|
239
268
|
case 0:
|
|
@@ -247,12 +276,16 @@ var createTestGlobalTarget = function (targetName, appLoc, serviceConfig, server
|
|
|
247
276
|
});
|
|
248
277
|
};
|
|
249
278
|
exports.createTestGlobalTarget = createTestGlobalTarget;
|
|
250
|
-
var verifyStep = function (
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
279
|
+
var verifyStep = function () {
|
|
280
|
+
var args_1 = [];
|
|
281
|
+
for (var _i = 0; _i < arguments.length; _i++) {
|
|
282
|
+
args_1[_i] = arguments[_i];
|
|
283
|
+
}
|
|
284
|
+
return __awaiter(void 0, __spreadArray([], __read(args_1), false), void 0, function (step, buildFileName, customFiles) {
|
|
255
285
|
var fileStructure, buildJsonFilePath, buildJson, _a, _b, buildSasFilePath, buildSas;
|
|
286
|
+
if (step === void 0) { step = 'compile'; }
|
|
287
|
+
if (buildFileName === void 0) { buildFileName = 'viya'; }
|
|
288
|
+
if (customFiles === void 0) { customFiles = 'no'; }
|
|
256
289
|
return __generator(this, function (_c) {
|
|
257
290
|
switch (_c.label) {
|
|
258
291
|
case 0:
|
|
@@ -289,7 +322,9 @@ var verifyStep = function (step, buildFileName, customFiles) {
|
|
|
289
322
|
};
|
|
290
323
|
exports.verifyStep = verifyStep;
|
|
291
324
|
var mockProcessExit = function () {
|
|
292
|
-
return jest
|
|
325
|
+
return jest
|
|
326
|
+
.spyOn(process, 'exit')
|
|
327
|
+
.mockImplementation(function (code) {
|
|
293
328
|
return code;
|
|
294
329
|
});
|
|
295
330
|
};
|
|
@@ -314,9 +349,13 @@ var verifyBuildJson = function (folders, buildJson, buildSas) {
|
|
|
314
349
|
});
|
|
315
350
|
return true;
|
|
316
351
|
};
|
|
317
|
-
var verifyFolder = function (
|
|
318
|
-
|
|
319
|
-
|
|
352
|
+
var verifyFolder = function (folder_1) {
|
|
353
|
+
var args_1 = [];
|
|
354
|
+
for (var _i = 1; _i < arguments.length; _i++) {
|
|
355
|
+
args_1[_i - 1] = arguments[_i];
|
|
356
|
+
}
|
|
357
|
+
return __awaiter(void 0, __spreadArray([folder_1], __read(args_1), false), void 0, function (folder, parentFolderName) {
|
|
358
|
+
if (parentFolderName === void 0) { parentFolderName = '.'; }
|
|
320
359
|
return __generator(this, function (_a) {
|
|
321
360
|
switch (_a.label) {
|
|
322
361
|
case 0: return [4 /*yield*/, expect((0, utils_1.folderExists)(path_1.default.join(process.projectDir, parentFolderName, folder.folderName))).resolves.toEqual(true)];
|
|
@@ -352,10 +391,14 @@ var verifyFolder = function (folder, parentFolderName) {
|
|
|
352
391
|
});
|
|
353
392
|
};
|
|
354
393
|
exports.verifyFolder = verifyFolder;
|
|
355
|
-
var verifyPackageJsonContent = function (
|
|
356
|
-
|
|
357
|
-
|
|
394
|
+
var verifyPackageJsonContent = function () {
|
|
395
|
+
var args_1 = [];
|
|
396
|
+
for (var _i = 0; _i < arguments.length; _i++) {
|
|
397
|
+
args_1[_i] = arguments[_i];
|
|
398
|
+
}
|
|
399
|
+
return __awaiter(void 0, __spreadArray([], __read(args_1), false), void 0, function (parentFolderName) {
|
|
358
400
|
var packageJsonPath, packageJsonContent, packageJson;
|
|
401
|
+
if (parentFolderName === void 0) { parentFolderName = '.'; }
|
|
359
402
|
return __generator(this, function (_a) {
|
|
360
403
|
switch (_a.label) {
|
|
361
404
|
case 0:
|
|
@@ -405,10 +448,14 @@ var removeAllTargetsFromConfigs = function () { return __awaiter(void 0, void 0,
|
|
|
405
448
|
});
|
|
406
449
|
}); };
|
|
407
450
|
exports.removeAllTargetsFromConfigs = removeAllTargetsFromConfigs;
|
|
408
|
-
var updateTarget = function (
|
|
409
|
-
|
|
410
|
-
|
|
451
|
+
var updateTarget = function (targetJson_1, targetName_1) {
|
|
452
|
+
var args_1 = [];
|
|
453
|
+
for (var _i = 2; _i < arguments.length; _i++) {
|
|
454
|
+
args_1[_i - 2] = arguments[_i];
|
|
455
|
+
}
|
|
456
|
+
return __awaiter(void 0, __spreadArray([targetJson_1, targetName_1], __read(args_1), false), void 0, function (targetJson, targetName, isLocal) {
|
|
411
457
|
var config, _a, targetIndex, _b;
|
|
458
|
+
if (isLocal === void 0) { isLocal = true; }
|
|
412
459
|
return __generator(this, function (_c) {
|
|
413
460
|
switch (_c.label) {
|
|
414
461
|
case 0:
|
|
@@ -449,10 +496,14 @@ var updateTarget = function (targetJson, targetName, isLocal) {
|
|
|
449
496
|
});
|
|
450
497
|
};
|
|
451
498
|
exports.updateTarget = updateTarget;
|
|
452
|
-
var updateConfig = function (
|
|
453
|
-
|
|
454
|
-
|
|
499
|
+
var updateConfig = function (config_2) {
|
|
500
|
+
var args_1 = [];
|
|
501
|
+
for (var _i = 1; _i < arguments.length; _i++) {
|
|
502
|
+
args_1[_i - 1] = arguments[_i];
|
|
503
|
+
}
|
|
504
|
+
return __awaiter(void 0, __spreadArray([config_2], __read(args_1), false), void 0, function (config, isLocal) {
|
|
455
505
|
var currentConfig, _a, updatedConfig, _b;
|
|
506
|
+
if (isLocal === void 0) { isLocal = true; }
|
|
456
507
|
return __generator(this, function (_c) {
|
|
457
508
|
switch (_c.label) {
|
|
458
509
|
case 0:
|
|
@@ -485,10 +536,14 @@ var updateConfig = function (config, isLocal) {
|
|
|
485
536
|
});
|
|
486
537
|
};
|
|
487
538
|
exports.updateConfig = updateConfig;
|
|
488
|
-
var verifyDocs = function (
|
|
489
|
-
|
|
490
|
-
|
|
539
|
+
var verifyDocs = function (docsFolder_1, target_1) {
|
|
540
|
+
var args_1 = [];
|
|
541
|
+
for (var _i = 2; _i < arguments.length; _i++) {
|
|
542
|
+
args_1[_i - 2] = arguments[_i];
|
|
543
|
+
}
|
|
544
|
+
return __awaiter(void 0, __spreadArray([docsFolder_1, target_1], __read(args_1), false), void 0, function (docsFolder, target, macroCore) {
|
|
491
545
|
var indexHTML, appInitHTML, sas9MacrosExampleMacro, sas9ServicesAdminDostuff, viyaMacrosExampleMacro, viyaServicesAdminDostuff, yetAnotherMacro, yetAnotherMacroSource, macroCoreFile, macroCoreFileSource, expectSas9Files, expectViyaFiles, indexHTMLContent;
|
|
546
|
+
if (macroCore === void 0) { macroCore = true; }
|
|
492
547
|
return __generator(this, function (_a) {
|
|
493
548
|
switch (_a.label) {
|
|
494
549
|
case 0:
|
|
@@ -587,10 +642,14 @@ var verifyDotFilesNotGenerated = function (docsFolder) { return __awaiter(void 0
|
|
|
587
642
|
});
|
|
588
643
|
}); };
|
|
589
644
|
exports.verifyDotFilesNotGenerated = verifyDotFilesNotGenerated;
|
|
590
|
-
var verifyCompiledService = function (
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
645
|
+
var verifyCompiledService = function (compiledContent_1, macrosToTest_1) {
|
|
646
|
+
var args_1 = [];
|
|
647
|
+
for (var _i = 2; _i < arguments.length; _i++) {
|
|
648
|
+
args_1[_i - 2] = arguments[_i];
|
|
649
|
+
}
|
|
650
|
+
return __awaiter(void 0, __spreadArray([compiledContent_1, macrosToTest_1], __read(args_1), false), void 0, function (compiledContent, macrosToTest, checkInit, checkTerm) {
|
|
651
|
+
if (checkInit === void 0) { checkInit = true; }
|
|
652
|
+
if (checkTerm === void 0) { checkTerm = true; }
|
|
594
653
|
return __generator(this, function (_a) {
|
|
595
654
|
switch (_a.label) {
|
|
596
655
|
case 0: return [4 /*yield*/, verifyCompile(compiledContent, macrosToTest, checkInit, checkTerm, 'service')];
|
|
@@ -602,10 +661,14 @@ var verifyCompiledService = function (compiledContent, macrosToTest, checkInit,
|
|
|
602
661
|
});
|
|
603
662
|
};
|
|
604
663
|
exports.verifyCompiledService = verifyCompiledService;
|
|
605
|
-
var verifyCompiledJob = function (
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
664
|
+
var verifyCompiledJob = function (compiledContent_1, macrosToTest_1) {
|
|
665
|
+
var args_1 = [];
|
|
666
|
+
for (var _i = 2; _i < arguments.length; _i++) {
|
|
667
|
+
args_1[_i - 2] = arguments[_i];
|
|
668
|
+
}
|
|
669
|
+
return __awaiter(void 0, __spreadArray([compiledContent_1, macrosToTest_1], __read(args_1), false), void 0, function (compiledContent, macrosToTest, checkInit, checkTerm) {
|
|
670
|
+
if (checkInit === void 0) { checkInit = true; }
|
|
671
|
+
if (checkTerm === void 0) { checkTerm = true; }
|
|
609
672
|
return __generator(this, function (_a) {
|
|
610
673
|
switch (_a.label) {
|
|
611
674
|
case 0: return [4 /*yield*/, verifyCompile(compiledContent, macrosToTest, checkInit, checkTerm, 'job')];
|
package/build/utils/utils.js
CHANGED
|
@@ -24,8 +24,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
24
24
|
});
|
|
25
25
|
};
|
|
26
26
|
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
27
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
28
|
-
return g =
|
|
27
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
28
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
29
29
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
30
30
|
function step(op) {
|
|
31
31
|
if (f) throw new TypeError("Generator is already executing.");
|
|
@@ -90,7 +90,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
90
90
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
91
91
|
};
|
|
92
92
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
93
|
-
exports.isSasJsServerInServerMode = exports.getNodeModulePath = exports.isSASjsProject = exports.terminateProcess = exports.
|
|
93
|
+
exports.isSasJsServerInServerMode = exports.getNodeModulePath = exports.isSASjsProject = exports.terminateProcess = exports.loadEnvVariables = exports.millisecondsToDdHhMmSs = exports.arrToObj = void 0;
|
|
94
|
+
exports.inExistingProject = inExistingProject;
|
|
95
|
+
exports.diff = diff;
|
|
96
|
+
exports.createReactApp = createReactApp;
|
|
97
|
+
exports.createAngularApp = createAngularApp;
|
|
98
|
+
exports.createMinimalApp = createMinimalApp;
|
|
99
|
+
exports.createTemplateApp = createTemplateApp;
|
|
100
|
+
exports.setupNpmProject = setupNpmProject;
|
|
101
|
+
exports.setupGitIgnore = setupGitIgnore;
|
|
102
|
+
exports.setupDoxygen = setupDoxygen;
|
|
103
|
+
exports.getUniqServicesObj = getUniqServicesObj;
|
|
104
|
+
exports.executeShellScript = executeShellScript;
|
|
105
|
+
exports.executePowerShellScript = executePowerShellScript;
|
|
106
|
+
exports.parseLogLines = parseLogLines;
|
|
107
|
+
exports.convertToSASStatements = convertToSASStatements;
|
|
108
|
+
exports.checkNodeVersion = checkNodeVersion;
|
|
109
|
+
exports.getAdapterInstance = getAdapterInstance;
|
|
110
|
+
exports.displaySasjsRunnerError = displaySasjsRunnerError;
|
|
111
|
+
exports.prefixAppLoc = prefixAppLoc;
|
|
94
112
|
var shelljs_1 = __importDefault(require("shelljs"));
|
|
95
113
|
var node_powershell_1 = require("node-powershell");
|
|
96
114
|
var path_1 = __importDefault(require("path"));
|
|
@@ -114,7 +132,6 @@ function inExistingProject(folderPath) {
|
|
|
114
132
|
});
|
|
115
133
|
});
|
|
116
134
|
}
|
|
117
|
-
exports.inExistingProject = inExistingProject;
|
|
118
135
|
function diff(a, b) {
|
|
119
136
|
var notInA = a.filter(function (item) {
|
|
120
137
|
return typeof item === 'object'
|
|
@@ -128,7 +145,6 @@ function diff(a, b) {
|
|
|
128
145
|
});
|
|
129
146
|
return __spreadArray(__spreadArray([], __read(notInA), false), __read(notInB), false);
|
|
130
147
|
}
|
|
131
|
-
exports.diff = diff;
|
|
132
148
|
function createReactApp(folderPath) {
|
|
133
149
|
return __awaiter(this, void 0, void 0, function () {
|
|
134
150
|
var _this = this;
|
|
@@ -144,7 +160,6 @@ function createReactApp(folderPath) {
|
|
|
144
160
|
});
|
|
145
161
|
});
|
|
146
162
|
}
|
|
147
|
-
exports.createReactApp = createReactApp;
|
|
148
163
|
function createAngularApp(folderPath) {
|
|
149
164
|
return __awaiter(this, void 0, void 0, function () {
|
|
150
165
|
var _this = this;
|
|
@@ -160,7 +175,6 @@ function createAngularApp(folderPath) {
|
|
|
160
175
|
});
|
|
161
176
|
});
|
|
162
177
|
}
|
|
163
|
-
exports.createAngularApp = createAngularApp;
|
|
164
178
|
function createMinimalApp(folderPath) {
|
|
165
179
|
return __awaiter(this, void 0, void 0, function () {
|
|
166
180
|
var _this = this;
|
|
@@ -176,7 +190,6 @@ function createMinimalApp(folderPath) {
|
|
|
176
190
|
});
|
|
177
191
|
});
|
|
178
192
|
}
|
|
179
|
-
exports.createMinimalApp = createMinimalApp;
|
|
180
193
|
function createTemplateApp(folderPath, template) {
|
|
181
194
|
return __awaiter(this, void 0, void 0, function () {
|
|
182
195
|
var _this = this;
|
|
@@ -204,7 +217,6 @@ function createTemplateApp(folderPath, template) {
|
|
|
204
217
|
});
|
|
205
218
|
});
|
|
206
219
|
}
|
|
207
|
-
exports.createTemplateApp = createTemplateApp;
|
|
208
220
|
/**
|
|
209
221
|
* This function will first download / unzip the target app from repoUrl, then download / unzip the sasjs/docs repo into a subdirectory named 'docs'.
|
|
210
222
|
* Finally, if installDependencies is true, the npm install command will be executed.
|
|
@@ -334,11 +346,10 @@ function setupNpmProject(folderName) {
|
|
|
334
346
|
});
|
|
335
347
|
});
|
|
336
348
|
}
|
|
337
|
-
exports.setupNpmProject = setupNpmProject;
|
|
338
349
|
function setupGitIgnore(folderName) {
|
|
339
|
-
var _a, _b;
|
|
340
350
|
return __awaiter(this, void 0, void 0, function () {
|
|
341
351
|
var gitIgnoreFilePath, gitIgnoreExists, gitIgnoreContent, newgitIgnoreContent, regExpSasjsBuild, regExpSasjsResults, regExpNodeModules, regExpEnv;
|
|
352
|
+
var _a, _b;
|
|
342
353
|
return __generator(this, function (_c) {
|
|
343
354
|
switch (_c.label) {
|
|
344
355
|
case 0:
|
|
@@ -389,7 +400,6 @@ function setupGitIgnore(folderName) {
|
|
|
389
400
|
});
|
|
390
401
|
});
|
|
391
402
|
}
|
|
392
|
-
exports.setupGitIgnore = setupGitIgnore;
|
|
393
403
|
function setupDoxygen(folderPath) {
|
|
394
404
|
return __awaiter(this, void 0, void 0, function () {
|
|
395
405
|
var doxyFilesPath, doxyFolderPathSource, doxyFolderPath;
|
|
@@ -407,7 +417,6 @@ function setupDoxygen(folderPath) {
|
|
|
407
417
|
});
|
|
408
418
|
});
|
|
409
419
|
}
|
|
410
|
-
exports.setupDoxygen = setupDoxygen;
|
|
411
420
|
function getUniqServicesObj(services) {
|
|
412
421
|
var returnObj = {};
|
|
413
422
|
if (!services)
|
|
@@ -420,7 +429,6 @@ function getUniqServicesObj(services) {
|
|
|
420
429
|
});
|
|
421
430
|
return returnObj;
|
|
422
431
|
}
|
|
423
|
-
exports.getUniqServicesObj = getUniqServicesObj;
|
|
424
432
|
function executeShellScript(filePath, logFilePath) {
|
|
425
433
|
return __awaiter(this, void 0, void 0, function () {
|
|
426
434
|
var _this = this;
|
|
@@ -453,7 +461,6 @@ function executeShellScript(filePath, logFilePath) {
|
|
|
453
461
|
});
|
|
454
462
|
});
|
|
455
463
|
}
|
|
456
|
-
exports.executeShellScript = executeShellScript;
|
|
457
464
|
function executePowerShellScript(filePath, logFilePath) {
|
|
458
465
|
return __awaiter(this, void 0, void 0, function () {
|
|
459
466
|
var ps, scriptCommand;
|
|
@@ -512,7 +519,6 @@ function executePowerShellScript(filePath, logFilePath) {
|
|
|
512
519
|
});
|
|
513
520
|
});
|
|
514
521
|
}
|
|
515
|
-
exports.executePowerShellScript = executePowerShellScript;
|
|
516
522
|
/**
|
|
517
523
|
* Extracts plain text job log from fetched json log
|
|
518
524
|
* @param {object} logJson
|
|
@@ -535,7 +541,6 @@ function parseLogLines(logJson) {
|
|
|
535
541
|
}
|
|
536
542
|
return logLines;
|
|
537
543
|
}
|
|
538
|
-
exports.parseLogLines = parseLogLines;
|
|
539
544
|
/**
|
|
540
545
|
* Converts MacroVars JSON from command source param to sas statements
|
|
541
546
|
* The JSON must have the following structure:
|
|
@@ -564,7 +569,6 @@ function convertToSASStatements(json) {
|
|
|
564
569
|
}
|
|
565
570
|
return sasStatements;
|
|
566
571
|
}
|
|
567
|
-
exports.convertToSASStatements = convertToSASStatements;
|
|
568
572
|
var arrToObj = function (arr) {
|
|
569
573
|
return arr.reduce(function (o, key) {
|
|
570
574
|
var _a;
|
|
@@ -592,7 +596,6 @@ function checkNodeVersion() {
|
|
|
592
596
|
process.exit(1);
|
|
593
597
|
}
|
|
594
598
|
}
|
|
595
|
-
exports.checkNodeVersion = checkNodeVersion;
|
|
596
599
|
function getAdapterInstance(target) {
|
|
597
600
|
if (!target) {
|
|
598
601
|
throw new Error('Unable to create SASjs adapter instance: Invalid target.');
|
|
@@ -606,7 +609,6 @@ function getAdapterInstance(target) {
|
|
|
606
609
|
var sasjs = (0, config_1.getSASjs)(target);
|
|
607
610
|
return sasjs;
|
|
608
611
|
}
|
|
609
|
-
exports.getAdapterInstance = getAdapterInstance;
|
|
610
612
|
function displaySasjsRunnerError(username) {
|
|
611
613
|
var _a;
|
|
612
614
|
var sasjsRunnerCode = "\nfilename mc url \"https://raw.githubusercontent.com/sasjs/core/main/all.sas\";\n%inc mc;\nfilename ft15f001 temp;\nparmcards4;\n%macro sasjs_runner();\n%if %symexist(_webin_fileref) %then %do;\n%inc &_webin_fileref;\n%end;\n%mend sasjs_runner;\n%sasjs_runner()\n;;;;\n%mm_createwebservice(path=/User Folders/&_metauser/My Folder/sasjs,name=runner)\n";
|
|
@@ -614,7 +616,6 @@ function displaySasjsRunnerError(username) {
|
|
|
614
616
|
(0, displayResult_1.displayError)(message, 'An error occurred while executing the request.');
|
|
615
617
|
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Please deploy the SASjs runner by running the code below and try again:\n".concat(sasjsRunnerCode));
|
|
616
618
|
}
|
|
617
|
-
exports.displaySasjsRunnerError = displaySasjsRunnerError;
|
|
618
619
|
var loadEnvVariables = function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
|
|
619
620
|
var envFileExistsInCurrentPath, envFileExistsInParentPath, envFilePath;
|
|
620
621
|
return __generator(this, function (_a) {
|
|
@@ -652,7 +653,6 @@ function prefixAppLoc(appLoc, path) {
|
|
|
652
653
|
.map(function (p) { return (/^\//.test(p) ? p : "".concat(appLoc, "/").concat(p)); })
|
|
653
654
|
.join(' ');
|
|
654
655
|
}
|
|
655
|
-
exports.prefixAppLoc = prefixAppLoc;
|
|
656
656
|
var terminateProcess = function (status) {
|
|
657
657
|
var _a;
|
|
658
658
|
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Process will be terminated with the status code ".concat(status, "."));
|
package/package.json
CHANGED
|
@@ -70,22 +70,22 @@
|
|
|
70
70
|
},
|
|
71
71
|
"dependencies": {
|
|
72
72
|
"@sasjs/adapter": "^4.19.0",
|
|
73
|
-
"@sasjs/core": "
|
|
74
|
-
"@sasjs/lint": "2.
|
|
75
|
-
"@sasjs/utils": "
|
|
73
|
+
"@sasjs/core": "5.2.4",
|
|
74
|
+
"@sasjs/lint": "2.5.0",
|
|
75
|
+
"@sasjs/utils": "3.6.2",
|
|
76
76
|
"adm-zip": "0.6.0",
|
|
77
77
|
"chalk": "4.1.2",
|
|
78
|
-
"dotenv": "
|
|
78
|
+
"dotenv": "17.4.2",
|
|
79
79
|
"find": "0.3.0",
|
|
80
|
-
"js-base64": "3.
|
|
81
|
-
"jsdom": "
|
|
80
|
+
"js-base64": "3.9.3",
|
|
81
|
+
"jsdom": "26.0.0",
|
|
82
82
|
"jwt-decode": "3.1.2",
|
|
83
83
|
"lodash.groupby": "4.6.0",
|
|
84
84
|
"lodash.uniqby": "4.7.0",
|
|
85
85
|
"node-graphviz": "0.1.1",
|
|
86
86
|
"node-powershell": "5.0.1",
|
|
87
87
|
"ora": "5.4.1",
|
|
88
|
-
"prompts": "2.4.
|
|
88
|
+
"prompts": "2.4.2",
|
|
89
89
|
"shelljs": "0.10.0",
|
|
90
90
|
"ssl-root-cas": "1.3.1",
|
|
91
91
|
"xml": "1.0.1",
|
|
@@ -93,36 +93,36 @@
|
|
|
93
93
|
},
|
|
94
94
|
"devDependencies": {
|
|
95
95
|
"@babel/core": "7.29.7",
|
|
96
|
-
"@babel/preset-env": "7.
|
|
97
|
-
"@babel/preset-typescript": "7.
|
|
98
|
-
"@types/adm-zip": "0.5.
|
|
99
|
-
"@types/debug": "4.1.
|
|
100
|
-
"@types/find": "0.2.
|
|
101
|
-
"@types/jest": "
|
|
96
|
+
"@babel/preset-env": "7.29.7",
|
|
97
|
+
"@babel/preset-typescript": "7.29.7",
|
|
98
|
+
"@types/adm-zip": "0.5.8",
|
|
99
|
+
"@types/debug": "4.1.13",
|
|
100
|
+
"@types/find": "0.2.4",
|
|
101
|
+
"@types/jest": "30.0.0",
|
|
102
102
|
"@types/jsdom": "21.1.1",
|
|
103
|
-
"@types/lodash.groupby": "4.6.
|
|
104
|
-
"@types/lodash.uniqby": "4.7.
|
|
105
|
-
"@types/node": "
|
|
106
|
-
"@types/shelljs": "0.8.
|
|
107
|
-
"@types/url-parse": "1.4.
|
|
108
|
-
"@types/xml": "1.0.
|
|
109
|
-
"babel-jest": "
|
|
103
|
+
"@types/lodash.groupby": "4.6.9",
|
|
104
|
+
"@types/lodash.uniqby": "4.7.9",
|
|
105
|
+
"@types/node": "22.10.2",
|
|
106
|
+
"@types/shelljs": "0.8.10",
|
|
107
|
+
"@types/url-parse": "1.4.11",
|
|
108
|
+
"@types/xml": "1.0.11",
|
|
109
|
+
"babel-jest": "30.5.1",
|
|
110
110
|
"copyfiles": "2.4.1",
|
|
111
|
-
"jest": "
|
|
112
|
-
"jest-cli": "
|
|
113
|
-
"jest-environment-jsdom": "
|
|
114
|
-
"jest-extended": "
|
|
115
|
-
"nodemon": "3.
|
|
116
|
-
"prettier": "
|
|
117
|
-
"ts-jest": "29.
|
|
118
|
-
"ts-node": "10.
|
|
119
|
-
"tslib": "2.
|
|
120
|
-
"typescript": "
|
|
121
|
-
"util": "0.12.
|
|
111
|
+
"jest": "30.5.1",
|
|
112
|
+
"jest-cli": "30.5.1",
|
|
113
|
+
"jest-environment-jsdom": "30.5.1",
|
|
114
|
+
"jest-extended": "4.0.2",
|
|
115
|
+
"nodemon": "3.1.14",
|
|
116
|
+
"prettier": "3.9.6",
|
|
117
|
+
"ts-jest": "29.4.12",
|
|
118
|
+
"ts-node": "10.9.2",
|
|
119
|
+
"tslib": "2.8.1",
|
|
120
|
+
"typescript": "5.9.3",
|
|
121
|
+
"util": "0.12.5"
|
|
122
122
|
},
|
|
123
123
|
"overrides": {
|
|
124
124
|
"ws": "8.21.0",
|
|
125
125
|
"nanoid": "3.3.18"
|
|
126
126
|
},
|
|
127
|
-
"version": "4.20.
|
|
127
|
+
"version": "4.20.2"
|
|
128
128
|
}
|