@sasjs/cli 2.38.8 → 3.0.2

package/build/commands/add/addCredential.d.ts

@@ -1,4 +1,4 @@
-import { SasAuthResponse, Target } from '@sasjs/utils/types';
+import { SasAuthResponse, Target, HttpsAgentOptions } from '@sasjs/utils/types';
 import { TargetScope } from '../../types/targetScope';
 /**
  * Creates a .env file for the specified target.
@@ -10,6 +10,6 @@ import { TargetScope } from '../../types/targetScope';
  */
 export declare const addCredential: (target: Target, insecure: boolean, targetScope: TargetScope) => Promise<Target>;
 export declare const validateTargetName: (targetName: string) => string;
-export declare const getTokens: (target: Target, client: string, secret: string, insecure?: boolean) => Promise<SasAuthResponse>;
+export declare const getTokens: (target: Target, client: string, secret: string, httpsAgentOptions?: HttpsAgentOptions | undefined) => Promise<SasAuthResponse>;
 export declare const createEnvFileForViya: (targetName: string, client: string, secret: string, accessToken: string, refreshToken: string) => Promise<void>;
 export declare const createEnvFileForSas9: (targetName: string, userName: string, password: string) => Promise<void>;

package/build/commands/add/addCredential.js

@@ -69,12 +69,13 @@ var saveConfig_1 = require("./internal/saveConfig");
  * @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
  */
 var addCredential = function (target, insecure, targetScope) { return __awaiter(void 0, void 0, void 0, function () {
-    var serverUrl, filePath, _a, client, secret, _b, access_token, refresh_token, filePath, _c, userName, password, filePath;
+    var httpsAgentOptions, serverUrl, filePath, _a, client, secret, _b, access_token, refresh_token, filePath, _c, userName, password, filePath;
     var _d, _e, _f, _g;
     return __generator(this, function (_h) {
         switch (_h.label) {
             case 0:
-                insecure = insecure || target.allowInsecureRequests;
+                httpsAgentOptions = insecure
+                    ? __assign(__assign({}, target.httpsAgentOptions), { allowInsecureRequests: true, rejectUnauthorized: false }) : target.httpsAgentOptions;
                 if (insecure)
                     (_d = process.logger) === null || _d === void 0 ? void 0 : _d.warn('Executing with insecure connection.');
                 if (!!target.serverUrl) return [3 /*break*/, 3];
@@ -92,7 +93,7 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
                 return [4 /*yield*/, input_1.getCredentialsInputForViya(target.name)];
             case 4:
                 _a = _h.sent(), client = _a.client, secret = _a.secret;
-                return [4 /*yield*/, exports.getTokens(target, client, secret, insecure)];
+                return [4 /*yield*/, exports.getTokens(target, client, secret, httpsAgentOptions)];
             case 5:
                 _b = _h.sent(), access_token = _b.access_token, refresh_token = _b.refresh_token;
                 if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 7];
@@ -144,32 +145,29 @@ var validateTargetName = function (targetName) {
     return targetName;
 };
 exports.validateTargetName = validateTargetName;
-var getTokens = function (target, client, secret, insecure) {
-    if (insecure === void 0) { insecure = false; }
-    return __awaiter(void 0, void 0, void 0, function () {
-        var adapter, authResponse;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    adapter = new node_1.default({
-                        serverUrl: target.serverUrl,
-                        serverType: target.serverType,
-                        allowInsecureRequests: insecure,
-                        debug: ((_a = process.logger) === null || _a === void 0 ? void 0 : _a.logLevel) === logger_1.LogLevel.Debug
-                    });
-                    return [4 /*yield*/, auth_1.getNewAccessToken(adapter, client, secret, target).catch(function (e) {
-                            var _a;
-                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred while validating your credentials: " + e + "\nPlease check your Client ID and Client Secret and try again.\n");
-                            throw e;
-                        })];
-                case 1:
-                    authResponse = _b.sent();
-                    return [2 /*return*/, authResponse];
-            }
-        });
+var getTokens = function (target, client, secret, httpsAgentOptions) { return __awaiter(void 0, void 0, void 0, function () {
+    var adapter, authResponse;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                adapter = new node_1.default({
+                    serverUrl: target.serverUrl,
+                    serverType: target.serverType,
+                    httpsAgentOptions: httpsAgentOptions,
+                    debug: ((_a = process.logger) === null || _a === void 0 ? void 0 : _a.logLevel) === logger_1.LogLevel.Debug
+                });
+                return [4 /*yield*/, auth_1.getNewAccessToken(adapter, client, secret, target).catch(function (e) {
+                        var _a;
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred while validating your credentials: " + e + "\nPlease check your Client ID and Client Secret and try again.\n");
+                        throw e;
+                    })];
+            case 1:
+                authResponse = _b.sent();
+                return [2 /*return*/, authResponse];
+        }
     });
-};
+}); };
 exports.getTokens = getTokens;
 var createEnvFileForViya = function (targetName, client, secret, accessToken, refreshToken) { return __awaiter(void 0, void 0, void 0, function () {
     var envFileContent, envFilePath;

package/build/commands/add/internal/input.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -229,7 +240,7 @@ exports.getAndValidateSas9Fields = getAndValidateSas9Fields;
 function getAndValidateSasViyaFields(target, scope, serverUrl, insecure, authenticateCallback) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var contextName, shouldAuthenticate, sasjs, contexts, contextNumberErrorMessage, contextNumber;
+        var contextName, shouldAuthenticate, httpsAgentOptions, sasjs, contexts, contextNumberErrorMessage, contextNumber;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -241,10 +252,12 @@ function getAndValidateSasViyaFields(target, scope, serverUrl, insecure, authent
                     return [4 /*yield*/, authenticateCallback(target, insecure, scope)];
                 case 2:
                     target = _b.sent();
+                    httpsAgentOptions = insecure
+                        ? __assign(__assign({}, target.httpsAgentOptions), { allowInsecureRequests: true, rejectUnauthorized: false }) : target.httpsAgentOptions;
                     sasjs = new node_1.default({
                         serverUrl: serverUrl,
                         serverType: types_1.ServerType.SasViya,
-                        allowInsecureRequests: insecure,
+                        httpsAgentOptions: httpsAgentOptions,
                         debug: ((_a = process.logger) === null || _a === void 0 ? void 0 : _a.logLevel) === logger_1.LogLevel.Debug
                     });
                     contexts = [];

package/build/commands/build/build.d.ts

@@ -1,3 +1,3 @@
-import { Target } from '@sasjs/utils/types';
+import { Target } from '@sasjs/utils';
 export declare function build(target: Target): Promise<void>;
 export declare function getBuildVars(target: Target): Promise<string>;

package/build/commands/build/build.js

@@ -84,8 +84,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBuildVars = exports.build = void 0;
 var path_1 = __importDefault(require("path"));
-var types_1 = require("@sasjs/utils/types");
 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");
@@ -205,7 +205,7 @@ function getBuildInfo(target, streamWeb) {
                     return [4 /*yield*/, dependencies_1.getDependencyPaths(buildConfig, macroFolders)];
                 case 3:
                     dependencyFilePaths = _a.sent();
-                    if (!(target.serverType === types_1.ServerType.SasViya && streamWeb)) return [3 /*break*/, 8];
+                    if (!(target.serverType === utils_1.ServerType.SasViya && streamWeb)) return [3 /*break*/, 8];
                     return [4 /*yield*/, getCreateFileScript(serverType)];
                 case 4:
                     createFileScript = _a.sent();
@@ -245,15 +245,22 @@ function getCreateWebServiceScript(serverType) {
                 case 0:
                     _a = serverType;
                     switch (_a) {
-                        case types_1.ServerType.SasViya: return [3 /*break*/, 1];
-                        case types_1.ServerType.Sas9: return [3 /*break*/, 3];
+                        case utils_1.ServerType.SasViya: return [3 /*break*/, 1];
+                        case utils_1.ServerType.Sas9: return [3 /*break*/, 3];
+                        case utils_1.ServerType.Sasjs: return [3 /*break*/, 5];
                     }
-                    return [3 /*break*/, 5];
+                    return [3 /*break*/, 7];
                 case 1: return [4 /*yield*/, utils_1.readFile(config_1.getMacroCorePath() + "/viya/mv_createwebservice.sas")];
                 case 2: return [2 /*return*/, _b.sent()];
-                case 3: return [4 /*yield*/, utils_1.readFile(config_1.getMacroCorePath() + "/meta/mm_createwebservice.sas")];
-                case 4: return [2 /*return*/, _b.sent()];
-                case 5: throw new Error("Invalid server type: valid options are " + types_1.ServerType.SasViya + " and " + types_1.ServerType.Sas9);
+                case 3: return [4 /*yield*/, utils_1.readFile(config_1.getMacroCorePath() + "/meta/mm_createwebservice.sas")
+                    // FIXME: use sasjs/mv_createwebservice.sas ones created
+                ];
+                case 4: return [2 /*return*/, _b.sent()
+                    // FIXME: use sasjs/mv_createwebservice.sas ones created
+                ];
+                case 5: return [4 /*yield*/, utils_1.readFile(config_1.getMacroCorePath() + "/viya/mv_createwebservice.sas")];
+                case 6: return [2 /*return*/, _b.sent()];
+                case 7: throw new error_1.ServerTypeError();
             }
         });
     });
@@ -266,12 +273,19 @@ function getCreateFileScript(serverType) {
                 case 0:
                     _a = serverType;
                     switch (_a) {
-                        case types_1.ServerType.SasViya: return [3 /*break*/, 1];
+                        case utils_1.ServerType.SasViya: return [3 /*break*/, 1];
+                        case utils_1.ServerType.Sasjs: return [3 /*break*/, 3];
                     }
-                    return [3 /*break*/, 3];
-                case 1: return [4 /*yield*/, utils_1.readFile(config_1.getMacroCorePath() + "/viya/mv_createfile.sas")];
-                case 2: return [2 /*return*/, _b.sent()];
-                case 3: throw new Error("Invalid server type: valid option is " + types_1.ServerType.SasViya);
+                    return [3 /*break*/, 5];
+                case 1: return [4 /*yield*/, utils_1.readFile(config_1.getMacroCorePath() + "/viya/mv_createfile.sas")
+                    // FIXME: use sasjs/mv_createfile.sas ones created
+                ];
+                case 2: return [2 /*return*/, _b.sent()
+                    // FIXME: use sasjs/mv_createfile.sas ones created
+                ];
+                case 3: return [4 /*yield*/, utils_1.readFile(config_1.getMacroCorePath() + "/viya/mv_createfile.sas")];
+                case 4: return [2 /*return*/, _b.sent()];
+                case 5: throw new error_1.ServerTypeError([utils_1.ServerType.SasViya, utils_1.ServerType.Sasjs]);
             }
         });
     });
@@ -281,16 +295,20 @@ function getWebServiceScriptInvocation(serverType, filePath, isSASFile, encoded)
     if (isSASFile === void 0) { isSASFile = true; }
     if (encoded === void 0) { encoded = false; }
     var loc = filePath === '' ? 'services' : 'tests';
+    var encodedParam = encoded ? ', intype=BASE64' : '';
     switch (serverType) {
-        case types_1.ServerType.SasViya:
-            var encodedParam = encoded ? ', intype=BASE64' : '';
+        case utils_1.ServerType.SasViya:
             return isSASFile
                 ? "%mv_createwebservice(path=&appLoc/" + loc + "/&path, name=&service, code=sascode ,replace=yes)"
                 : "%mv_createfile(path=&appLoc/" + loc + "/&path, name=&filename, inref=filecode" + encodedParam + ")";
-        case types_1.ServerType.Sas9:
+        case utils_1.ServerType.Sas9:
             return "%mm_createwebservice(path=&appLoc/" + loc + "/&path, name=&service, code=sascode ,replace=yes)";
+        case utils_1.ServerType.Sasjs:
+            return isSASFile
+                ? "%mv_createwebservice(path=&appLoc/" + loc + "/&path, name=&service, code=sascode ,replace=yes)"
+                : "%mv_createfile(path=&appLoc/" + loc + "/&path, name=&filename, inref=filecode" + encodedParam + ")";
         default:
-            throw new Error("Invalid server type: valid options are " + types_1.ServerType.SasViya + " and " + types_1.ServerType.Sas9);
+            throw new error_1.ServerTypeError();
     }
 }
 /**
@@ -463,12 +481,16 @@ function getServiceText(serviceFileName, fileContent, serverType, testPath) {
             content += "\n put '" + escapedLine.trim() + "';";
         }
     });
-    return "%let service=" + serviceName + ";\nfilename sascode temp lrecl=32767;\ndata _null_;\nfile sascode;\n" + content + "\n\nrun;\n" + getWebServiceScriptInvocation(serverType, compileTestFile_1.isTestFile(serviceFileName) && testPath ? "" + testPath : '') + "\nfilename sascode clear;\n";
+    return "%let service=" + serviceName + ";\nfilename sascode temp lrecl=32767;\ndata _null_;\nfile sascode;\n" + content + "\n\nrun;\n" + (serverType !== utils_1.ServerType.Sasjs
+        ? getWebServiceScriptInvocation(serverType, compileTestFile_1.isTestFile(serviceFileName) && testPath ? "" + testPath : '')
+        : '') + "\nfilename sascode clear;\n";
 }
 function getFileText(fileName, fileContent, serverType) {
     var fileExtension = path_1.default.extname(fileName).substring(1).toUpperCase();
     var _a = getWebFileContent(fileContent, fileExtension), content = _a.content, maxLineLength = _a.maxLineLength;
-    return "%let filename=" + fileName + ";\nfilename filecode temp lrecl=" + maxLineLength + ";\ndata _null_;\nfile filecode;\n" + content + "\n\nrun;\n" + getWebServiceScriptInvocation(serverType, undefined, false, true) + "\nfilename filecode clear;\n";
+    return "%let filename=" + fileName + ";\nfilename filecode temp lrecl=" + maxLineLength + ";\ndata _null_;\nfile filecode;\n" + content + "\n\nrun;\n" + (serverType !== utils_1.ServerType.Sasjs
+        ? getWebServiceScriptInvocation(serverType, undefined, false, true)
+        : '') + "\nfilename filecode clear;\n";
 }
 function getWebFileContent(filecontent, type) {
     var parsedContent = '';

package/build/commands/build/internal/getLaunchPageCode.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLaunchPageCode = void 0;
+var error_1 = require("@sasjs/utils/error");
 var types_1 = require("@sasjs/utils/types");
 var SAS9Code = function (streamServiceName) { return "\noptions notes;\ndata _null_;\n format url $256.;\n rc=METADATA_GETURI(\"Stored Process Web App\",url);\n url=coalescec(url,\"localhost/SASStoredProcess\");\n urlEscaped = tranwrd(trim(url),\" \",\"%20\");\n putlog \"NOTE: SASjs Streaming App Created! Check it out here:\" ;\n putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";\n putlog \"NOTE- \" urlEscaped +(-1) \"?_program=&appLoc/services/" + streamServiceName + "\" ;\n putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";\nrun;\n"; };
 var SASViyaCode = function (streamServiceName) { return "\n\n/**\n  * The streamService we just deployed (as a _FILE) had the compile-time appLoc\n  * In this section we replace with the deploy-time appLoc\n  */\n\nfilename _homein filesrvc\n  folderPath=\"&apploc/services\"\n  filename=\"" + streamServiceName + ".html\"\n  recfm=v\n  lrecl=1048544;\n\n%let local_file=%sysfunc(pathname(work))/service.html;\nfilename _homeout \"&local_file\";\n\ndata _null_;\n  rc=fcopy('_homein','_homeout');\n  put rc=;\nrun;\n\n%mp_gsubfile(file=&local_file, patternvar=compiled_apploc, replacevar=apploc)\n\ndata _null_;\n  rc=fcopy('_homeout','_homein');\n  put rc=;\nrun;\n\n/* Tell the user where the app was deployed so they can open it */\noptions notes;\ndata _null_;\n if symexist('_baseurl') then do;\n   url=symget('_baseurl');\n   if subpad(url,length(url)-9,9)='SASStudio'\n     then url=substr(url,1,length(url)-11);\n   else url=\"&systcpiphostname\";\n end;\n else url=\"&systcpiphostname\";\n url=cats(url,\"/SASJobExecution?_FILE=&appLoc/services/\");\n urlEscaped = tranwrd(trim(url),\" \",\"%20\");\n putlog \"NOTE: SASjs Streaming App Created! Check it out here:\" ;\n putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";\n putlog \"NOTE- \" urlEscaped +(-1) '" + streamServiceName + ".html&_debug=2' ;\n putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";putlog \"NOTE- \";\nrun;\n"; };
@@ -11,7 +12,7 @@ var getLaunchPageCode = function (serverType, streamServiceName) {
         case types_1.ServerType.Sas9:
             return SAS9Code(streamServiceName);
         default:
-            throw new Error("Invalid server type: valid options are " + types_1.ServerType.SasViya + " and " + types_1.ServerType.Sas9);
+            throw new error_1.ServerTypeError([types_1.ServerType.SasViya, types_1.ServerType.Sas9]);
     }
 };
 exports.getLaunchPageCode = getLaunchPageCode;

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

@@ -37,18 +37,20 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPreCodeForServicePack = exports.compileServiceFile = void 0;
-var types_1 = require("@sasjs/utils/types");
 var config_1 = require("../../../utils/config");
 var utils_1 = require("@sasjs/utils");
+var types_1 = require("@sasjs/utils/types");
+var error_1 = require("@sasjs/utils/error");
 var loadDependencies_1 = require("./loadDependencies");
 var getServerType_1 = require("./getServerType");
+var compileTestFile_1 = require("./compileTestFile");
 function compileServiceFile(target, filePath, macroFolders, programFolders, programVar) {
     if (programVar === void 0) { programVar = ''; }
     return __awaiter(this, void 0, void 0, function () {
         var dependencies, serverType, preCode;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, loadDependencies_1.loadDependencies(target, filePath, macroFolders, programFolders)];
+                case 0: return [4 /*yield*/, loadDependencies_1.loadDependencies(target, filePath, macroFolders, programFolders, compileTestFile_1.isTestFile(filePath) ? 'test' : undefined)];
                 case 1:
                     dependencies = _a.sent();
                     return [4 /*yield*/, getServerType_1.getServerType(target)];
@@ -79,8 +81,9 @@ function getPreCodeForServicePack(serverType) {
                     switch (_a) {
                         case types_1.ServerType.SasViya: return [3 /*break*/, 1];
                         case types_1.ServerType.Sas9: return [3 /*break*/, 5];
+                        case types_1.ServerType.Sasjs: return [3 /*break*/, 9];
                     }
-                    return [3 /*break*/, 9];
+                    return [3 /*break*/, 10];
                 case 1:
                     _b = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mf_getuser.sas")];
@@ -102,7 +105,7 @@ function getPreCodeForServicePack(serverType) {
                             '%macro webout(action,ds,dslabel=,fmt=);\n' +
                             '%mv_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt)\n' +
                             '%mend;\n';
-                    return [3 /*break*/, 10];
+                    return [3 /*break*/, 11];
                 case 5:
                     _e = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mf_getuser.sas")];
@@ -120,9 +123,10 @@ function getPreCodeForServicePack(serverType) {
                         '  %macro webout(action,ds,dslabel=,fmt=);\n' +
                             '    %mm_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt)\n' +
                             '  %mend;\n';
-                    return [3 /*break*/, 10];
-                case 9: throw new Error("Invalid server type: valid options are 'SASVIYA' and 'SAS9'.");
-                case 10:
+                    return [3 /*break*/, 11];
+                case 9: return [3 /*break*/, 11];
+                case 10: throw new error_1.ServerTypeError();
+                case 11:
                     content +=
                         '/* provide additional debug info */\n' +
                             '%global _program;\n' +

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

@@ -71,7 +71,7 @@ var config_1 = require("../../../utils/config");
 var compileServiceFile_1 = require("./compileServiceFile");
 var utils_2 = require("../../../utils/utils");
 var testsBuildFolder = function () {
-    return path_1.default.join(process.currentDir, 'sasjsbuild', 'tests');
+    return path_1.default.join(process.projectDir, 'sasjsbuild', 'tests');
 };
 var getFileName = function (filePath) { return path_1.default.parse(filePath).base; };
 function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFile) {

package/build/commands/compile/internal/spec/compileTestFile.spec.js

@@ -66,7 +66,7 @@ describe('compileTestFile', function () {
     }, utils_1.ServerType.SasViya);
     var target = new utils_1.Target(__assign(__assign({}, temp.toJson()), { jobConfig: {
             jobFolders: [path_1.default.join('sasjs', 'jobs')]
-        } }));
+        }, macroFolders: ['sasjs/macros'] }));
     var sasjsPath;
     var testBody;
     var buildPath;
@@ -151,6 +151,9 @@ describe('compileTestFile', function () {
                         _a.sent();
                         return [4 /*yield*/, testContent(path_1.default.join('testteardown.sas'))];
                     case 5:
+                        _a.sent();
+                        return [4 /*yield*/, testContent(path_1.default.join('macros', 'testMacro.test.sas'))];
+                    case 6:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -236,6 +239,7 @@ describe('compileTestFile', function () {
                         expectedTestFlow = {
                             tests: [
                                 ['tests', 'jobs', 'jobs', 'testJob.test.sas'].join('/'),
+                                ['tests', 'macros', 'testMacro.test.sas'].join('/'),
                                 ['tests', 'services', 'services', 'admin', 'random.test.sas'].join('/'),
                                 ['tests', 'services', 'services', 'admin', 'random.test.0.sas'].join('/')
                             ].sort(),
@@ -290,6 +294,11 @@ describe('compileTestFile', function () {
                                 'test',
                                 'standalone'
                             ],
+                            [
+                                ['tests', 'macros', 'testMacro.test.sas'].join('/'),
+                                'test',
+                                'standalone'
+                            ],
                             [
                                 ['tests', 'services', 'services', 'admin', 'random.test.sas'].join('/'),
                                 'test',
@@ -313,9 +322,9 @@ describe('compileTestFile', function () {
                         return [4 /*yield*/, compile_1.compile(target)];
                     case 1:
                         _a.sent();
-                        expect(process.logger.info).toHaveBeenCalledTimes(14);
-                        expect(process.logger.info).toHaveBeenNthCalledWith(12, "Test coverage:");
-                        expect(process.logger.info).toHaveBeenNthCalledWith(13, "Services coverage: 0/4 (" + chalk_1.default.greenBright('0%') + ")");
+                        expect(process.logger.info).toHaveBeenCalledTimes(15);
+                        expect(process.logger.info).toHaveBeenNthCalledWith(13, "Test coverage:");
+                        expect(process.logger.info).toHaveBeenNthCalledWith(14, "Services coverage: 0/4 (" + chalk_1.default.greenBright('0%') + ")");
                         expect(process.logger.info).toHaveBeenLastCalledWith("Overall coverage: 0/4 (" + chalk_1.default.greenBright('0%') + ")");
                         return [2 /*return*/];
                 }
@@ -348,6 +357,9 @@ var copyTestFiles = function (appName) { return __awaiter(void 0, void 0, void 0
                 _a.sent();
                 return [4 /*yield*/, utils_1.copy(path_1.default.join(__dirname, 'testFiles', 'jobs'), path_1.default.join(__dirname, appName, 'sasjs', 'jobs'))];
             case 3:
+                _a.sent();
+                return [4 /*yield*/, utils_1.copy(path_1.default.join(__dirname, 'testFiles', 'macros'), path_1.default.join(__dirname, appName, 'sasjs', 'macros'))];
+            case 4:
                 _a.sent();
                 return [2 /*return*/];
         }

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

@@ -133,6 +133,36 @@ describe('sasjs compile', function () {
             }
         });
     }); });
+    it('it should compile project from sub folder', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var serviceFolder, testFile, wrongSasjsBuildFolder, correctSasjsBuildFolder, correctBuildFile;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    serviceFolder = path_1.default.join(process.projectDir, 'sasjs', 'services', 'admin');
+                    testFile = 'dostuff.test.sas';
+                    wrongSasjsBuildFolder = path_1.default.join(serviceFolder, 'sasjsbuild');
+                    correctSasjsBuildFolder = path_1.default.join(process.currentDir, 'sasjsbuild');
+                    correctBuildFile = path_1.default.join(correctSasjsBuildFolder, 'tests', 'services', 'admin', testFile);
+                    return [4 /*yield*/, utils_1.createFile(path_1.default.join(serviceFolder, testFile), '')];
+                case 1:
+                    _a.sent();
+                    process.currentDir = serviceFolder;
+                    return [4 /*yield*/, expect(compileModule.compile(target)).toResolve()];
+                case 2:
+                    _a.sent();
+                    return [4 /*yield*/, expect(utils_1.folderExists(wrongSasjsBuildFolder)).resolves.toEqual(false)];
+                case 3:
+                    _a.sent();
+                    return [4 /*yield*/, expect(utils_1.folderExists(correctSasjsBuildFolder)).resolves.toEqual(true)];
+                case 4:
+                    _a.sent();
+                    return [4 /*yield*/, expect(utils_1.fileExists(correctBuildFile)).resolves.toEqual(true)];
+                case 5:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('should compile an uncompiled project', function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {

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

@@ -74,8 +74,8 @@ var utils_1 = require("@sasjs/utils");
 var internalModule = __importStar(require("../internal/config"));
 var test_1 = require("../../../utils/test");
 var loadDependencies_1 = require("../internal/loadDependencies");
-var fakeInit = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  <h4> Dependencies </h4>\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;";
-var fakeTerm = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  <h4> Dependencies </h4>\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;";
+var fakeInit = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;";
+var fakeTerm = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;";
 var fakeInit2 = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;";
 var fakeTerm2 = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;";
 var fakeJobInit = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  <h4> SAS Programs </h4>\n  @li test.sas TEST\n\n  <h4> SAS Macros </h4>\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;";
@@ -188,7 +188,7 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load dependencies for a job <h4> Dependencies </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test('it should load dependencies for a job <h4> SAS Macros </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {

package/build/commands/context/contextCommand.js

@@ -221,7 +221,7 @@ var ContextCommand = /** @class */ (function (_super) {
                         target = (_a.sent()).target;
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });
@@ -269,7 +269,7 @@ var ContextCommand = /** @class */ (function (_super) {
                         target = (_a.sent()).target;
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });
@@ -308,7 +308,7 @@ var ContextCommand = /** @class */ (function (_super) {
                         target = (_a.sent()).target;
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });
@@ -356,7 +356,7 @@ var ContextCommand = /** @class */ (function (_super) {
                         target = (_a.sent()).target;
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });
@@ -399,7 +399,7 @@ var ContextCommand = /** @class */ (function (_super) {
                         }
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });

package/build/commands/deploy/deploy.d.ts

@@ -1,2 +1,3 @@
+import SASjs from '@sasjs/adapter/node';
 import { Target } from '@sasjs/utils';
-export declare function deploy(target: Target, isLocal: boolean): Promise<void>;
+export declare function deploy(target: Target, isLocal: boolean, sasjs?: SASjs): Promise<void>;