@sasjs/cli 3.16.1 → 3.17.1

package/build/commands/add/addCredential.js

@@ -75,7 +75,8 @@ var logger_1 = require("@sasjs/utils/logger");
 var types_1 = require("@sasjs/utils/types");
 var node_1 = __importStar(require("@sasjs/adapter/node"));
 var auth_1 = require("../../utils/auth");
-var utils_1 = require("@sasjs/utils");
+var utils_1 = require("../../utils");
+var utils_2 = require("@sasjs/utils");
 var input_1 = require("./internal/input");
 var targetScope_1 = require("../../types/targetScope");
 var saveConfig_1 = require("./internal/saveConfig");
@@ -114,7 +115,7 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
                     case types_1.ServerType.Sas9: return [3 /*break*/, 10];
                     case types_1.ServerType.Sasjs: return [3 /*break*/, 15];
                 }
-                return [3 /*break*/, 21];
+                return [3 /*break*/, 22];
             case 4: return [4 /*yield*/, (0, input_1.getCredentialsInputForViya)(target.name)];
             case 5:
                 _b = _j.sent(), client = _b.client, secret = _b.secret;
@@ -129,7 +130,7 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
             case 8:
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfig: { client: client, secret: secret, access_token: access_token, refresh_token: refresh_token } }));
                 _j.label = 9;
-            case 9: return [3 /*break*/, 22];
+            case 9: return [3 /*break*/, 23];
             case 10: return [4 /*yield*/, (0, input_1.getCredentialsInputSas9)(target, targetScope)];
             case 11:
                 _d = _j.sent(), userName = _d.userName, password = _d.password;
@@ -141,25 +142,31 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
             case 13:
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfigSas9: { userName: userName, password: password } }));
                 _j.label = 14;
-            case 14: return [3 /*break*/, 22];
-            case 15: return [4 /*yield*/, (0, input_1.getCredentialsInputSasjs)(target)];
+            case 14: return [3 /*break*/, 23];
+            case 15: return [4 /*yield*/, (0, utils_1.isSasJsServerInServerMode)(target)];
             case 16:
+                if (!(_j.sent())) {
+                    process.logger.info('No need to authenticate against the sasjs server running in desktop mode.');
+                    return [2 /*return*/, target];
+                }
+                return [4 /*yield*/, (0, input_1.getCredentialsInputSasjs)(target)];
+            case 17:
                 client = (_j.sent()).client;
                 return [4 /*yield*/, (0, exports.getTokens)(target, client, '', httpsAgentOptions)];
-            case 17:
+            case 18:
                 _e = _j.sent(), access_token = _e.access_token, refresh_token = _e.refresh_token;
-                if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 19];
+                if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 20];
                 return [4 /*yield*/, (0, exports.createEnvFileForSasjs)(target.name, client, access_token, refresh_token)];
-            case 18:
-                _j.sent();
-                return [3 /*break*/, 20];
             case 19:
+                _j.sent();
+                return [3 /*break*/, 21];
+            case 20:
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfig: { client: client, secret: '', access_token: access_token, refresh_token: refresh_token } }));
-                _j.label = 20;
-            case 20: return [3 /*break*/, 22];
-            case 21: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
-            case 22: return [4 /*yield*/, (0, saveConfig_1.saveConfig)(targetScope, target, false, false)];
-            case 23:
+                _j.label = 21;
+            case 21: return [3 /*break*/, 23];
+            case 22: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
+            case 23: return [4 /*yield*/, (0, saveConfig_1.saveConfig)(targetScope, target, false, false)];
+            case 24:
                 filePath = _j.sent();
                 (_h = process.logger) === null || _h === void 0 ? void 0 : _h.info("Target configuration has been saved to ".concat(filePath, " ."));
                 return [2 /*return*/, target];
@@ -216,7 +223,7 @@ var createEnvFileForViya = function (targetName, client, secret, accessToken, re
             case 0:
                 envFileContent = "CLIENT=".concat(client, "\nSECRET=").concat(secret, "\nACCESS_TOKEN=").concat(accessToken, "\nREFRESH_TOKEN=").concat(refreshToken, "\n");
                 envFilePath = path_1.default.join(process.projectDir, ".env.".concat(targetName));
-                return [4 /*yield*/, (0, utils_1.createFile)(envFilePath, envFileContent)];
+                return [4 /*yield*/, (0, utils_2.createFile)(envFilePath, envFileContent)];
             case 1:
                 _b.sent();
                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Environment file saved at ".concat(envFilePath));
@@ -233,7 +240,7 @@ var createEnvFileForSas9 = function (targetName, userName, password) { return __
             case 0:
                 envFileContent = "SAS_USERNAME=".concat(userName, "\nSAS_PASSWORD=").concat(password, "\n");
                 envFilePath = path_1.default.join(process.projectDir, ".env.".concat(targetName));
-                return [4 /*yield*/, (0, utils_1.createFile)(envFilePath, envFileContent)];
+                return [4 /*yield*/, (0, utils_2.createFile)(envFilePath, envFileContent)];
             case 1:
                 _b.sent();
                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Environment file saved at ".concat(envFilePath));
@@ -250,7 +257,7 @@ var createEnvFileForSasjs = function (targetName, client, accessToken, refreshTo
             case 0:
                 envFileContent = "CLIENT=".concat(client, "\nACCESS_TOKEN=").concat(accessToken, "\nREFRESH_TOKEN=").concat(refreshToken, "\n");
                 envFilePath = path_1.default.join(process.projectDir, ".env.".concat(targetName));
-                return [4 /*yield*/, (0, utils_1.createFile)(envFilePath, envFileContent)];
+                return [4 /*yield*/, (0, utils_2.createFile)(envFilePath, envFileContent)];
             case 1:
                 _b.sent();
                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Environment file saved at ".concat(envFilePath));

package/build/commands/add/addTarget.js

@@ -53,6 +53,7 @@ var targetScope_1 = require("../../types/targetScope");
 var input_1 = require("./internal/input");
 var saveConfig_1 = require("./internal/saveConfig");
 var addCredential_1 = require("./addCredential");
+var utils_1 = require("../../utils");
 /**
  * Creates new target/ updates current target(if found) for either local config or global config file.
  * @param {boolean} insecure- boolean to use insecure connection, default is false. lf true the server will not reject any connection which is not authorized with the list of supplied CAs
@@ -81,7 +82,7 @@ function addTarget(insecure) {
                         case types_1.ServerType.SasViya: return [3 /*break*/, 5];
                         case types_1.ServerType.Sasjs: return [3 /*break*/, 7];
                     }
-                    return [3 /*break*/, 9];
+                    return [3 /*break*/, 11];
                 case 3: return [4 /*yield*/, (0, input_1.getAndValidateSas9Fields)(target, scope)];
                 case 4:
                     _f = _h.sent(), serverName = _f.serverName, repositoryName = _f.repositoryName, userName = _f.userName, password = _f.password;
@@ -92,7 +93,7 @@ function addTarget(insecure) {
                     else {
                         targetJson = __assign(__assign({}, targetJson), { authConfigSas9: { userName: userName, password: password } });
                     }
-                    return [3 /*break*/, 10];
+                    return [3 /*break*/, 12];
                 case 5: return [4 /*yield*/, (0, input_1.getAndValidateSasViyaFields)(target, scope, serverUrl, insecure, addCredential_1.addCredential)];
                 case 6:
                     _g = _h.sent(), contextName = _g.contextName, updatedViyaTarget = _g.target;
@@ -100,18 +101,22 @@ function addTarget(insecure) {
                         contextName: contextName
                     };
                     targetJson = __assign(__assign({}, updatedViyaTarget.toJson(false)), targetJson);
-                    return [3 /*break*/, 10];
-                case 7: return [4 /*yield*/, (0, input_1.getAndValidateSasjsFields)(target, scope, insecure, addCredential_1.addCredential)];
+                    return [3 /*break*/, 12];
+                case 7: return [4 /*yield*/, (0, utils_1.isSasJsServerInServerMode)(target)];
                 case 8:
+                    if (!_h.sent()) return [3 /*break*/, 10];
+                    return [4 /*yield*/, (0, input_1.getAndValidateSasjsFields)(target, scope, insecure, addCredential_1.addCredential)];
+                case 9:
                     updatedSasjsTarget = (_h.sent()).target;
                     targetJson = updatedSasjsTarget.toJson(false);
-                    return [3 /*break*/, 10];
-                case 9: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
-                case 10: return [4 /*yield*/, (0, input_1.getIsDefault)()];
-                case 11:
+                    _h.label = 10;
+                case 10: return [3 /*break*/, 12];
+                case 11: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
+                case 12: return [4 /*yield*/, (0, input_1.getIsDefault)()];
+                case 13:
                     isDefault = _h.sent();
                     return [4 /*yield*/, (0, saveConfig_1.saveConfig)(scope, new types_1.Target(targetJson), isDefault, false)];
-                case 12:
+                case 14:
                     filePath = _h.sent();
                     (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Target configuration has been saved to ".concat(filePath));
                     return [2 /*return*/, true];

package/build/commands/add/spec/addTarget.spec.js

@@ -73,6 +73,7 @@ var utils_1 = require("@sasjs/utils");
 var dotenv_1 = __importDefault(require("dotenv"));
 var path_1 = __importDefault(require("path"));
 var inputModule = __importStar(require("../internal/input"));
+var utilsModule = __importStar(require("../../../utils/utils"));
 var addTarget_1 = require("../addTarget");
 var config_1 = require("../../../utils/config");
 var targetScope_1 = require("../../../types/targetScope");
@@ -192,6 +193,9 @@ describe('addTarget', function () {
                             target: new utils_1.Target(commonFields)
                         });
                     });
+                    jest
+                        .spyOn(utilsModule, 'isSasJsServerInServerMode')
+                        .mockImplementation(function () { return Promise.resolve(true); });
                     return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
                 case 1:
                     _a.sent();
@@ -392,6 +396,9 @@ describe('addTarget', function () {
                             target: new utils_1.Target(__assign(__assign({}, targetJson), commonFields))
                         });
                     });
+                    jest
+                        .spyOn(utilsModule, 'isSasJsServerInServerMode')
+                        .mockImplementation(function () { return Promise.resolve(true); });
                     return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
                 case 2:
                     _a.sent();

package/build/commands/build/build.js

@@ -90,7 +90,6 @@ exports.getBuildVars = exports.build = void 0;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var error_1 = require("@sasjs/utils/error");
-var utils_2 = require("../../utils/utils");
 var file_1 = require("../../utils/file");
 var config_1 = require("../../utils/config");
 var compile_1 = require("../compile/compile");
@@ -98,6 +97,7 @@ var config_2 = require("./internal/config");
 var getLaunchPageCode_1 = require("./internal/getLaunchPageCode");
 var types_1 = require("@sasjs/utils/types");
 var compressAndSave_1 = require("../../utils/compressAndSave");
+var loadDependencies_1 = require("../compile/internal/loadDependencies");
 function build(target) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -150,7 +150,7 @@ function createFinalSasFiles(target) {
                     return [4 /*yield*/, (0, utils_1.getDependencyPaths)("".concat(buildTerm, "\n").concat(buildInit), macroFolders, macroCorePath)];
                 case 6:
                     dependencyFilePaths = _l.sent();
-                    return [4 /*yield*/, getDependencies(dependencyFilePaths)];
+                    return [4 /*yield*/, getDepsContent(dependencyFilePaths, target, macroFolders)];
                 case 7:
                     dependenciesContent = _l.sent();
                     finalSasFileContent += "\n".concat(dependenciesContent, "\n\n").concat(buildInit, "\n");
@@ -174,7 +174,7 @@ function createFinalSasFiles(target) {
                             servicePackSASjs.streamWebFolder = streamConfig.streamWebFolder;
                         }
                     }
-                    finalSasFileContent = (0, utils_2.removeComments)(finalSasFileContent);
+                    finalSasFileContent = (0, utils_1.removeHeader)(finalSasFileContent);
                     (_d = process.logger) === null || _d === void 0 ? void 0 : _d.debug("Creating file ".concat(finalFilePath, " ."));
                     return [4 /*yield*/, (0, utils_1.createFile)(finalFilePath, finalSasFileContent)];
                 case 9:
@@ -238,13 +238,13 @@ function getBuildInfo(target, streamWeb) {
                     dependencyFilePathsForGsubScript = _a.sent();
                     dependencyFilePaths = __spreadArray([], __read(new Set(__spreadArray(__spreadArray(__spreadArray([], __read(dependencyFilePaths), false), __read(dependencyFilePathsForCreateFile), false), __read(dependencyFilePathsForGsubScript), false))), false);
                     _a.label = 8;
-                case 8: return [4 /*yield*/, getDependencies(dependencyFilePaths)];
+                case 8: return [4 /*yield*/, getDepsContent(dependencyFilePaths, target, macroFolders)];
                 case 9:
                     dependenciesContent = _a.sent();
                     return [4 /*yield*/, getBuildVars(target)];
                 case 10:
                     buildVars = _a.sent();
-                    return [2 /*return*/, "\n/**\n  * The appLoc represents the metadata or SAS Drive location of the app you\n  * are about to deploy\n  *\n  * To set an alternative appLoc, simply populate the appLoc variable prior\n  * to running this program, eg:\n  *\n  * %let apploc=/my/apploc;\n  * %inc thisfile;\n  *\n  */\n\n%global appLoc serverName;\n%let compiled_apploc=".concat(appLoc, ";\n\n").concat(serverType === utils_1.ServerType.Sas9 ? "%let serverName=".concat(serverName, ";") : '', "\n\n%let appLoc=%sysfunc(coalescec(&appLoc,&compiled_apploc));\n\n%let sasjs_clickmeservice=clickme;\n%let syscc=0;\noptions ps=max nonotes nosgen nomprint nomlogic nosource2 nosource noquotelenmax;\n/* user supplied build vars */\n").concat(buildVars, "\n/* user supplied build vars end */\n/* system macro dependencies for build process */\n").concat(dependenciesContent, "\n/* system macro dependencies for build process end*/\n/* system macros for build process */\n").concat(buildConfig, "\n/* system macros for build process end */\n")];
+                    return [2 /*return*/, "\n/**\n  * The appLoc represents the metadata or SAS Drive location of the app you\n  * are about to deploy\n  *\n  * To set an alternative appLoc, simply populate the appLoc variable prior\n  * to running this program, eg:\n  *\n  * %let apploc=/my/apploc;\n  * %inc thisfile;\n  *\n  */\n\n%global appLoc serverName;\n%let compiled_apploc=".concat(appLoc, ";\n\n").concat(serverType === utils_1.ServerType.Sas9 ? "%let serverName=".concat(serverName, ";") : '', "\n\n%let appLoc=%sysfunc(coalescec(&appLoc,&compiled_apploc));\n\n%let sasjs_clickmeservice=clickme;\n%let syscc=0;\noptions ps=max nonotes nosgen nomprint nomlogic nosource2 nosource noquotelenmax;\n/* user supplied build vars */\n").concat(buildVars, "\n/* user supplied build vars end */\n/* system macro dependencies for build process */\n").concat(dependenciesContent, "\n/* system macro dependencies for build process end*/\n/* system macros for build process */\n").concat((0, utils_1.removeHeader)(buildConfig), "\n/* system macros for build process end */\n")];
             }
         });
     });
@@ -364,33 +364,6 @@ function getFolderContent(serverType) {
         });
     });
 }
-function getDependencies(filePaths) {
-    return __awaiter(this, void 0, void 0, function () {
-        var dependenciesContent;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    dependenciesContent = [];
-                    return [4 /*yield*/, (0, utils_1.asyncForEach)(__spreadArray([], __read(new Set(filePaths)), false), function (filePath) { return __awaiter(_this, void 0, void 0, function () {
-                            var depFileContent;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, (0, utils_1.readFile)(filePath)];
-                                    case 1:
-                                        depFileContent = _a.sent();
-                                        dependenciesContent.push(depFileContent);
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, dependenciesContent.join('\n')];
-            }
-        });
-    });
-}
 function getContentFor(rootDirectory, folderPath, serverType) {
     return __awaiter(this, void 0, void 0, function () {
         var folderName, content, contentJSON, files, subFolders;
@@ -413,26 +386,27 @@ function getContentFor(rootDirectory, folderPath, serverType) {
                 case 1:
                     files = _a.sent();
                     return [4 /*yield*/, (0, utils_1.asyncForEach)(files, function (file) { return __awaiter(_this, void 0, void 0, function () {
-                            var filePath, fileContent, transformedContent, fileContentEncoded, transformedContent;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
+                            var filePath, fileContent, _a, transformedContent, fileContentEncoded, transformedContent;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
                                     case 0:
                                         filePath = path_1.default.join(folderPath, file);
                                         if (!(0, file_1.isSasFile)(file)) return [3 /*break*/, 2];
+                                        _a = utils_1.removeHeader;
                                         return [4 /*yield*/, (0, utils_1.readFile)(filePath)];
                                     case 1:
-                                        fileContent = _a.sent();
+                                        fileContent = _a.apply(void 0, [_b.sent()]);
                                         transformedContent = getServiceText(file, fileContent, serverType);
                                         content += "\n".concat(transformedContent, "\n");
                                         contentJSON.members.push({
                                             name: file.replace(/.sas$/, ''),
                                             type: types_1.MemberType.service,
-                                            code: (0, utils_2.removeComments)(fileContent)
+                                            code: (0, utils_1.removeHeader)(fileContent)
                                         });
                                         return [3 /*break*/, 4];
                                     case 2: return [4 /*yield*/, (0, utils_1.base64EncodeFile)(filePath)];
                                     case 3:
-                                        fileContentEncoded = _a.sent();
+                                        fileContentEncoded = _b.sent();
                                         transformedContent = getFileText(file, fileContentEncoded, serverType);
                                         content += "\n".concat(transformedContent, "\n");
                                         contentJSON.members.push({
@@ -440,7 +414,7 @@ function getContentFor(rootDirectory, folderPath, serverType) {
                                             type: types_1.MemberType.file,
                                             code: fileContentEncoded
                                         });
-                                        _a.label = 4;
+                                        _b.label = 4;
                                     case 4: return [2 /*return*/];
                                 }
                             });
@@ -472,7 +446,7 @@ function getContentFor(rootDirectory, folderPath, serverType) {
 }
 function getServiceText(serviceFileName, fileContent, serverType) {
     var serviceName = serviceFileName.replace(/.sas$/, '');
-    var sourceCodeLines = getLines((0, utils_2.removeComments)(fileContent));
+    var sourceCodeLines = getLines(fileContent);
     var content = "";
     sourceCodeLines.forEach(function (line) {
         var escapedLine = line.split("'").join("''");
@@ -561,3 +535,31 @@ var convertVarsToSasFormat = function (vars) {
     }
     return varsContent;
 };
+var getDepsContent = function (deps, target, macroFolders) { return __awaiter(void 0, void 0, void 0, function () {
+    var dependenciesContent, compileTree;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                dependenciesContent = '';
+                compileTree = (0, loadDependencies_1.getCompileTree)(target);
+                return [4 /*yield*/, (0, utils_1.asyncForEach)(deps, function (fp) { return __awaiter(void 0, void 0, void 0, function () {
+                        var _a, _b;
+                        return __generator(this, function (_c) {
+                            switch (_c.label) {
+                                case 0:
+                                    _a = dependenciesContent;
+                                    _b = '\n';
+                                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, fp, macroFolders, [], types_1.SASJsFileType.file, compileTree)];
+                                case 1:
+                                    dependenciesContent = _a + (_b +
+                                        (_c.sent()));
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })];
+            case 1:
+                _a.sent();
+                return [2 /*return*/, dependenciesContent];
+        }
+    });
+}); };

package/build/commands/build/spec/build.spec.js

@@ -35,12 +35,16 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var test_1 = require("../../../utils/test");
 var utils_1 = require("@sasjs/utils");
 var utils_2 = require("../../../utils");
 var build_1 = require("../build");
 var __1 = require("../..");
+var path_1 = __importDefault(require("path"));
 describe('sasjs build', function () {
     var appName;
     beforeAll(function () {
@@ -97,4 +101,51 @@ describe('sasjs build', function () {
             }
         });
     }); }, 2 * 60 * 1000);
+    it("should compile and build remaining multiline comments", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var beforeComment, afterComment, commentLine1, commentLine2, testContent, macroPath, _a, _b, target, finalSasFilePath, finalSasFile;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    beforeComment = 'before comment;';
+                    afterComment = 'after comment;';
+                    commentLine1 = "/*Name_corrected2=translate(trim(Name_corrected),'_','~!@#$%^&*()+-=[]{}|;:\",./<>?\u00C2\u00B0\u00B2\u00B3\u00B5 ');";
+                    commentLine2 = "/* Name_corrected2=translate(trim(Name_corrected),'_','/','(',')','?','\u00C2\u00B2','#','\u00B0C','\u00B5','\u00B3'); */";
+                    testContent = [
+                        beforeComment,
+                        commentLine1,
+                        commentLine2,
+                        afterComment
+                    ].join('\n');
+                    appName = "test-app-build-".concat((0, utils_1.generateTimestamp)());
+                    return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
+                case 1:
+                    _c.sent();
+                    macroPath = path_1.default.join(__dirname, appName, 'sasjs', 'macros', 'examplemacro.sas');
+                    _a = utils_1.createFile;
+                    _b = [macroPath];
+                    return [4 /*yield*/, (0, utils_1.readFile)(macroPath)];
+                case 2: return [4 /*yield*/, _a.apply(void 0, _b.concat([(_c.sent()) + testContent]))];
+                case 3:
+                    _c.sent();
+                    return [4 /*yield*/, (0, utils_2.findTargetInConfiguration)('viya')];
+                case 4:
+                    target = (_c.sent()).target;
+                    return [4 /*yield*/, (0, __1.compile)(target)];
+                case 5:
+                    _c.sent();
+                    return [4 /*yield*/, (0, build_1.build)(target)];
+                case 6:
+                    _c.sent();
+                    finalSasFilePath = path_1.default.join(__dirname, appName, 'sasjsbuild', target.buildConfig.buildOutputFileName);
+                    return [4 /*yield*/, (0, utils_1.readFile)(finalSasFilePath)];
+                case 7:
+                    finalSasFile = _c.sent();
+                    expect(finalSasFile.includes(beforeComment)).toBeTruthy();
+                    expect(finalSasFile.includes(commentLine1.split("'").join("'".repeat(2)))).toBeTruthy();
+                    expect(commentLine2.split("'").join("'".repeat(2))).toBeTruthy();
+                    expect(finalSasFile.includes(afterComment)).toBeTruthy();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 });

package/build/commands/build/spec/{cb.spec.server.js → cb.spec.server.viya.js}

@@ -44,7 +44,7 @@ var test_1 = require("../../../utils/test");
 var utils_1 = require("@sasjs/utils");
 var compile_1 = require("../../compile/compile");
 var build_1 = require("../build");
-describe('sasjs compile', function () {
+describe('sasjs compile with Viya', function () {
     var target;
     beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
         var appName;

package/build/commands/compile/internal/loadDependencies.js

@@ -46,33 +46,41 @@ var path_1 = __importDefault(require("path"));
 function loadDependencies(target, filePath, macroFolders, programFolders, type, compileTree) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var fileContent, leaf, configuration, _b, buildSourceFolder, macroCorePath, binaryFolders;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var fileContent, _b, leaf, configuration, _c, buildSourceFolder, macroCorePath, binaryFolders;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Loading dependencies for ".concat(filePath));
                     fileContent = '';
-                    if (!(compileTree && Object.keys(compileTree).length)) return [3 /*break*/, 4];
+                    if (!(compileTree && Object.keys(compileTree).length)) return [3 /*break*/, 6];
+                    if (!(type === utils_1.SASJsFileType.file)) return [3 /*break*/, 2];
+                    _b = utils_1.removeHeader;
+                    return [4 /*yield*/, (0, utils_1.readFile)(filePath)];
+                case 1:
+                    // If file is of a generic type SASJsFileType.file, then just read the file content without header
+                    fileContent = _b.apply(void 0, [_d.sent()]);
+                    return [3 /*break*/, 5];
+                case 2:
                     leaf = compileTree.getLeaf(filePath);
-                    if (!leaf) return [3 /*break*/, 1];
+                    if (!leaf) return [3 /*break*/, 3];
                     fileContent = leaf.content;
-                    return [3 /*break*/, 3];
-                case 1: return [4 /*yield*/, (0, utils_1.readFile)(filePath)];
-                case 2:
-                    fileContent = _c.sent();
-                    _c.label = 3;
-                case 3: return [3 /*break*/, 6];
-                case 4: return [4 /*yield*/, (0, utils_1.readFile)(filePath)];
-                case 5:
-                    fileContent = _c.sent();
-                    _c.label = 6;
-                case 6: return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
+                    return [3 /*break*/, 5];
+                case 3: return [4 /*yield*/, (0, utils_1.readFile)(filePath)];
+                case 4:
+                    fileContent = _d.sent();
+                    _d.label = 5;
+                case 5: return [3 /*break*/, 8];
+                case 6: return [4 /*yield*/, (0, utils_1.readFile)(filePath)];
                 case 7:
-                    configuration = (_c.sent()).configuration;
-                    _b = process.sasjsConstants, buildSourceFolder = _b.buildSourceFolder, macroCorePath = _b.macroCorePath;
+                    fileContent = _d.sent();
+                    _d.label = 8;
+                case 8: return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
+                case 9:
+                    configuration = (_d.sent()).configuration;
+                    _c = process.sasjsConstants, buildSourceFolder = _c.buildSourceFolder, macroCorePath = _c.macroCorePath;
                     return [4 /*yield*/, (0, config_1.getBinaryFolders)(target)];
-                case 8:
-                    binaryFolders = _c.sent();
+                case 10:
+                    binaryFolders = _d.sent();
                     headerSyntaxNotices(fileContent);
                     return [4 /*yield*/, (0, utils_1.loadDependenciesFile)({
                             fileContent: fileContent,
@@ -87,7 +95,7 @@ function loadDependencies(target, filePath, macroFolders, programFolders, type,
                             binaryFolders: binaryFolders,
                             compileTree: compileTree
                         })];
-                case 9: return [2 /*return*/, _c.sent()];
+                case 11: return [2 /*return*/, _d.sent()];
             }
         });
     });

package/build/commands/deploy/spec/cbd.spec.js

@@ -49,7 +49,6 @@ var build_1 = require("../../build/build");
 var deploy_1 = require("../deploy");
 var utils_2 = require("./utils");
 var config_1 = require("../../../utils/config");
-var utils_3 = require("../../../utils");
 describe('sasjs cbd with server type SASJS', function () {
     var target;
     var appName;
@@ -80,9 +79,9 @@ describe('sasjs cbd with server type SASJS', function () {
         });
     }); });
     it("should deploy compile and build to sasjs/server", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var sasjs, customTarget, macroCorePath, mf_getuser, mp_jsonout, ms_webout, webout, mocksPath, appinitJSPath, getdataJSPath, appinitJSContents, getdataJSContents;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var sasjs, customTarget, macroCorePath, mf_getuser, _a, mp_jsonout, ms_webout, webout, mocksPath, appinitJSPath, getdataJSPath, appinitJSContents, getdataJSContents, depsInserts, appinit, getdata, getCode;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     sasjs = new node_1.default();
                     jest.mock('@sasjs/adapter');
@@ -98,7 +97,7 @@ describe('sasjs cbd with server type SASJS', function () {
                             }
                         })];
                 case 1:
-                    _a.sent();
+                    _b.sent();
                     return [4 /*yield*/, (0, utils_2.updateLocalTarget)(target.name, {
                             jobConfig: undefined,
                             serviceConfig: undefined,
@@ -108,26 +107,27 @@ describe('sasjs cbd with server type SASJS', function () {
                             }
                         })];
                 case 2:
-                    _a.sent();
+                    _b.sent();
                     return [4 /*yield*/, (0, config_1.findTargetInConfiguration)(target.name, types_1.TargetScope.Local)];
                 case 3:
-                    customTarget = (_a.sent()).target;
+                    customTarget = (_b.sent()).target;
                     return [4 /*yield*/, expect((0, build_1.build)(customTarget)).toResolve()];
                 case 4:
-                    _a.sent();
+                    _b.sent();
                     return [4 /*yield*/, (0, deploy_1.deploy)(customTarget, true, sasjs)];
                 case 5:
-                    _a.sent();
+                    _b.sent();
                     macroCorePath = process.sasjsConstants.macroCorePath;
+                    _a = utils_1.removeHeader;
                     return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/base/mf_getuser.sas"))];
                 case 6:
-                    mf_getuser = _a.sent();
+                    mf_getuser = _a.apply(void 0, [_b.sent()]);
                     return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/base/mp_jsonout.sas"))];
                 case 7:
-                    mp_jsonout = _a.sent();
+                    mp_jsonout = _b.sent();
                     return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/server/ms_webout.sas"))];
                 case 8:
-                    ms_webout = _a.sent();
+                    ms_webout = _b.sent();
                     webout = '  %macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO);\n' +
                         '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n' +
                         '      ,missing=&missing\n' +
@@ -139,10 +139,16 @@ describe('sasjs cbd with server type SASJS', function () {
                     getdataJSPath = path_1.default.join(mocksPath, 'services', 'common', 'getdata.js');
                     return [4 /*yield*/, (0, utils_1.readFile)(appinitJSPath)];
                 case 9:
-                    appinitJSContents = _a.sent();
+                    appinitJSContents = _b.sent();
                     return [4 /*yield*/, (0, utils_1.readFile)(getdataJSPath)];
                 case 10:
-                    getdataJSContents = _a.sent();
+                    getdataJSContents = _b.sent();
+                    depsInserts = "\n\n* Service Variables start;\n\n\n* Service Variables end;\n* SAS Macros start;\n\n\n\n* SAS Macros end;\n* SAS Includes start;\n\n* SAS Includes end;\n* Binary Files start;\n\n* Binary Files end;\n\n    \n* Service start;\n";
+                    appinit = "/**\n  @file appinit.sas\n  @brief Initialisation service - runs on app startup\n  @details  This is always the first service called when the app is opened.\n\n  <h4> SAS Macros </h4>\n\n**/\n\nproc sql;\ncreate table areas as select distinct area\n  from mydb.springs;\n\n%webout(OPEN)\n%webout(OBJ,areas)\n%webout(CLOSE)\n\n";
+                    getdata = "/**\n  @file getdata.sas\n  @brief Get Data service - runs on app startup\n  @details  This is always the first service called when the app is opened.\n\n  <h4> SAS Macros </h4>\n\n**/\n\n%webout(FETCH)\n\nproc sql;\ncreate table springs as select * from mydb.springs\n  where area in (select area from work.areas);\n\n%webout(OPEN)\n%webout(OBJ,springs)\n%webout(CLOSE)\n\n";
+                    getCode = function (file) {
+                        return "".concat(mf_getuser).concat(mp_jsonout).concat(ms_webout).concat(webout, "/* 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.);").concat(depsInserts).concat(file, "* Service end;");
+                    };
                     expect(sasjs.deployToSASjs).toHaveBeenCalledWith({
                         appLoc: target.appLoc,
                         fileTree: {
@@ -163,8 +169,7 @@ describe('sasjs cbd with server type SASJS', function () {
                                                 {
                                                     name: 'appinit',
                                                     type: 'service',
-                                                    code: (0, utils_3.removeComments)("".concat(mf_getuser).concat(mp_jsonout).concat(ms_webout).concat(webout) +
-                                                        '/* 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* Service Variables start;\n* Service Variables end;\n* SAS Macros start;\n* SAS Macros end;\n* SAS Includes start;\n* SAS Includes end;\n* Binary Files start;\n* Binary Files end;\n* Service start;\nproc sql;\ncreate table areas as select distinct area\n  from mydb.springs;\n%webout(OPEN)\n%webout(OBJ,areas)\n%webout(CLOSE)\n* Service end;')
+                                                    code: getCode(appinit)
                                                 },
                                                 {
                                                     name: 'getdata.js',
@@ -174,8 +179,7 @@ describe('sasjs cbd with server type SASJS', function () {
                                                 {
                                                     name: 'getdata',
                                                     type: 'service',
-                                                    code: (0, utils_3.removeComments)("".concat(mf_getuser).concat(mp_jsonout).concat(ms_webout).concat(webout) +
-                                                        '/* 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* Service Variables start;\n* Service Variables end;\n* SAS Macros start;\n* SAS Macros end;\n* SAS Includes start;\n* SAS Includes end;\n* Binary Files start;\n* Binary Files end;\n* Service start;\n%webout(FETCH)\nproc sql;\ncreate table springs as select * from mydb.springs\n  where area in (select area from work.areas);\n%webout(OPEN)\n%webout(OBJ,springs)\n%webout(CLOSE)\n* Service end;')
+                                                    code: getCode(getdata)
                                                 }
                                             ]
                                         }