@sasjs/cli 3.0.2 → 3.0.3

package/build/commands/build/build.js

@@ -92,8 +92,6 @@ var config_1 = require("../../utils/config");
 var compile_1 = require("../compile/compile");
 var config_2 = require("./internal/config");
 var getLaunchPageCode_1 = require("./internal/getLaunchPageCode");
-var dependencies_1 = require("../shared/dependencies");
-var compileTestFile_1 = require("../compile/internal/compileTestFile");
 function build(target) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -132,7 +130,7 @@ function createFinalSasFiles(target) {
 function createFinalSasFile(target, streamConfig) {
     var _a, _b, _c, _d, _e, _f;
     return __awaiter(this, void 0, void 0, function () {
-        var streamWeb, buildConfig, serverType, name, macroFolders, buildOutputFileName, buildDestinationFolder, finalSasFileContent, finalFilePath, finalFilePathJSON, buildInfo, buildInit, buildTerm, dependencyFilePaths, dependenciesContent, _g, folderContent, folderContentJSON;
+        var streamWeb, buildConfig, serverType, name, macroFolders, buildOutputFileName, buildDestinationFolder, finalSasFileContent, finalFilePath, finalFilePathJSON, buildInfo, buildInit, buildTerm, macroCorePath, dependencyFilePaths, dependenciesContent, _g, folderContent, folderContentJSON;
         return __generator(this, function (_h) {
             switch (_h.label) {
                 case 0:
@@ -156,7 +154,8 @@ function createFinalSasFile(target, streamConfig) {
                     return [4 /*yield*/, config_2.getBuildTerm(target)];
                 case 4:
                     buildTerm = _h.sent();
-                    return [4 /*yield*/, dependencies_1.getDependencyPaths(buildTerm + "\n" + buildInit, macroFolders)];
+                    macroCorePath = config_1.getMacroCorePath();
+                    return [4 /*yield*/, utils_1.getDependencyPaths(buildTerm + "\n" + buildInit, macroFolders, macroCorePath)];
                 case 5:
                     dependencyFilePaths = _h.sent();
                     return [4 /*yield*/, getDependencies(dependencyFilePaths)];
@@ -189,7 +188,7 @@ function createFinalSasFile(target, streamConfig) {
 }
 function getBuildInfo(target, streamWeb) {
     return __awaiter(this, void 0, void 0, function () {
-        var buildConfig, serverType, appLoc, macroFolders, createWebServiceScript, dependencyFilePaths, createFileScript, dependencyFilePathsForCreateFile, gsubScript, dependencyFilePathsForGsubScript, dependenciesContent, buildVars;
+        var buildConfig, serverType, appLoc, macroFolders, createWebServiceScript, macroCorePath, dependencyFilePaths, createFileScript, dependencyFilePathsForCreateFile, gsubScript, dependencyFilePathsForGsubScript, dependenciesContent, buildVars;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -201,8 +200,9 @@ function getBuildInfo(target, streamWeb) {
                     return [4 /*yield*/, getCreateWebServiceScript(serverType)];
                 case 2:
                     createWebServiceScript = _a.sent();
+                    macroCorePath = config_1.getMacroCorePath();
                     buildConfig += createWebServiceScript + "\n";
-                    return [4 /*yield*/, dependencies_1.getDependencyPaths(buildConfig, macroFolders)];
+                    return [4 /*yield*/, utils_1.getDependencyPaths(buildConfig, macroFolders, macroCorePath)];
                 case 3:
                     dependencyFilePaths = _a.sent();
                     if (!(target.serverType === utils_1.ServerType.SasViya && streamWeb)) return [3 /*break*/, 8];
@@ -210,7 +210,7 @@ function getBuildInfo(target, streamWeb) {
                 case 4:
                     createFileScript = _a.sent();
                     buildConfig += createFileScript + "\n";
-                    return [4 /*yield*/, dependencies_1.getDependencyPaths(createFileScript, macroFolders)
+                    return [4 /*yield*/, utils_1.getDependencyPaths(createFileScript, macroFolders, macroCorePath)
                         // The gsubScript is used to perform the replacement of the appLoc within
                         // the deployed index.html file.  This only happens when deploying using the
                         // SAS Program (build.sas) approach.
@@ -221,7 +221,7 @@ function getBuildInfo(target, streamWeb) {
                 case 6:
                     gsubScript = _a.sent();
                     buildConfig += gsubScript + "\n";
-                    return [4 /*yield*/, dependencies_1.getDependencyPaths(gsubScript, macroFolders)];
+                    return [4 /*yield*/, utils_1.getDependencyPaths(gsubScript, macroFolders, macroCorePath)];
                 case 7:
                     dependencyFilePathsForGsubScript = _a.sent();
                     dependencyFilePaths = __spreadArray([], __read(new Set(__spreadArray(__spreadArray(__spreadArray([], __read(dependencyFilePaths)), __read(dependencyFilePathsForCreateFile)), __read(dependencyFilePathsForGsubScript)))));
@@ -482,7 +482,7 @@ function getServiceText(serviceFileName, fileContent, serverType, testPath) {
         }
     });
     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 : '')
+        ? getWebServiceScriptInvocation(serverType, utils_1.isTestFile(serviceFileName) && testPath ? "" + testPath : '')
         : '') + "\nfilename sascode clear;\n";
 }
 function getFileText(fileName, fileContent, serverType) {
@@ -494,7 +494,7 @@ function getFileText(fileName, fileContent, serverType) {
 }
 function getWebFileContent(filecontent, type) {
     var parsedContent = '';
-    var chunkedLines = utils_2.chunk(filecontent);
+    var chunkedLines = utils_1.chunk(filecontent);
     if (chunkedLines.length === 1) {
         parsedContent = " put '" + chunkedLines[0].split("'").join("''") + "';\n";
     }
@@ -548,7 +548,7 @@ var convertVarsToSasFormat = function (vars) {
     try {
         for (var entries_1 = __values(entries), entries_1_1 = entries_1.next(); !entries_1_1.done; entries_1_1 = entries_1.next()) {
             var _b = __read(entries_1_1.value, 2), name_1 = _b[0], value = _b[1];
-            var chunks = utils_2.chunk(value);
+            var chunks = utils_1.chunk(value);
             var chunkedString = chunks.join('%trim(\n)');
             varsContent += "%let " + name_1 + "=" + chunkedString + ";\n";
         }

package/build/commands/build/internal/config.d.ts

@@ -1,3 +1,3 @@
-import { Target } from '@sasjs/utils/types';
+import { Target } from '@sasjs/utils';
 export declare const getBuildInit: (target: Target) => Promise<string>;
 export declare const getBuildTerm: (target: Target) => Promise<string>;

package/build/commands/build/internal/config.js

@@ -41,9 +41,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBuildTerm = exports.getBuildInit = void 0;
 var path_1 = __importDefault(require("path"));
+var utils_1 = require("@sasjs/utils");
 var config_1 = require("../../../utils/config");
-var utils_1 = require("../../../utils/utils");
-var utils_2 = require("@sasjs/utils");
 var getBuildInit = function (target) { return __awaiter(void 0, void 0, void 0, function () {
     var buildSourceFolder, buildInitContent, configuration;
     var _a, _b;
@@ -53,7 +52,7 @@ var getBuildInit = function (target) { return __awaiter(void 0, void 0, void 0,
                 buildSourceFolder = process.sasjsConstants.buildSourceFolder;
                 buildInitContent = '';
                 if (!((_a = target === null || target === void 0 ? void 0 : target.buildConfig) === null || _a === void 0 ? void 0 : _a.initProgram)) return [3 /*break*/, 2];
-                return [4 /*yield*/, utils_2.readFile(utils_1.getAbsolutePath(target.buildConfig.initProgram, buildSourceFolder))];
+                return [4 /*yield*/, utils_1.readFile(utils_1.getAbsolutePath(target.buildConfig.initProgram, buildSourceFolder))];
             case 1:
                 buildInitContent = _c.sent();
                 return [3 /*break*/, 5];
@@ -61,7 +60,7 @@ var getBuildInit = function (target) { return __awaiter(void 0, void 0, void 0,
             case 3:
                 configuration = _c.sent();
                 if (!((_b = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _b === void 0 ? void 0 : _b.initProgram)) return [3 /*break*/, 5];
-                return [4 /*yield*/, utils_2.readFile(utils_1.getAbsolutePath(configuration.buildConfig.initProgram, buildSourceFolder))];
+                return [4 /*yield*/, utils_1.readFile(utils_1.getAbsolutePath(configuration.buildConfig.initProgram, buildSourceFolder))];
             case 4:
                 buildInitContent = _c.sent();
                 _c.label = 5;
@@ -81,7 +80,7 @@ var getBuildTerm = function (target) { return __awaiter(void 0, void 0, void 0,
                 buildSourceFolder = process.sasjsConstants.buildSourceFolder;
                 buildTermContent = '';
                 if (!((_a = target === null || target === void 0 ? void 0 : target.buildConfig) === null || _a === void 0 ? void 0 : _a.termProgram)) return [3 /*break*/, 2];
-                return [4 /*yield*/, utils_2.readFile(utils_1.getAbsolutePath(target.buildConfig.termProgram, buildSourceFolder))];
+                return [4 /*yield*/, utils_1.readFile(utils_1.getAbsolutePath(target.buildConfig.termProgram, buildSourceFolder))];
             case 1:
                 buildTermContent = _c.sent();
                 return [3 /*break*/, 5];
@@ -89,7 +88,7 @@ var getBuildTerm = function (target) { return __awaiter(void 0, void 0, void 0,
             case 3:
                 configuration = _c.sent();
                 if (!((_b = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _b === void 0 ? void 0 : _b.termProgram)) return [3 /*break*/, 5];
-                return [4 /*yield*/, utils_2.readFile(utils_1.getAbsolutePath(configuration.buildConfig.termProgram, buildSourceFolder))];
+                return [4 /*yield*/, utils_1.readFile(utils_1.getAbsolutePath(configuration.buildConfig.termProgram, buildSourceFolder))];
             case 4:
                 buildTermContent = _c.sent();
                 _c.label = 5;

package/build/commands/compile/compile.js

@@ -338,7 +338,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                             switch (_a.label) {
                                 case 0:
                                     filePath = path_1.default.join(destinationPath, fileName);
-                                    if (!compileTestFile_1.isTestFile(filePath)) return [3 /*break*/, 2];
+                                    if (!utils_1.isTestFile(filePath)) return [3 /*break*/, 2];
                                     return [4 /*yield*/, compileTestFile_1.compileTestFile(target, filePath, '', false)];
                                 case 1:
                                     _a.sent();
@@ -366,7 +366,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                                                 switch (_a.label) {
                                                     case 0:
                                                         filePath = path_1.default.join(destinationPath, subFolder, fileName);
-                                                        if (!compileTestFile_1.isTestFile(filePath)) return [3 /*break*/, 2];
+                                                        if (!utils_1.isTestFile(filePath)) return [3 /*break*/, 2];
                                                         return [4 /*yield*/, compileTestFile_1.compileTestFile(target, filePath, '', false)];
                                                     case 1:
                                                         _a.sent();
@@ -409,7 +409,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                             switch (_a.label) {
                                 case 0:
                                     filePath = path_1.default.join(destinationPath, fileName);
-                                    if (!compileTestFile_1.isTestFile(fileName)) return [3 /*break*/, 2];
+                                    if (!utils_1.isTestFile(fileName)) return [3 /*break*/, 2];
                                     return [4 /*yield*/, compileTestFile_1.compileTestFile(target, filePath, '', false)];
                                 case 1:
                                     _a.sent();
@@ -437,7 +437,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                                                 switch (_a.label) {
                                                     case 0:
                                                         filePath = path_1.default.join(destinationPath, subFolder, fileName);
-                                                        if (!compileTestFile_1.isTestFile(filePath)) return [3 /*break*/, 2];
+                                                        if (!utils_1.isTestFile(filePath)) return [3 /*break*/, 2];
                                                         return [4 /*yield*/, compileTestFile_1.compileTestFile(target, filePath, '', false)];
                                                     case 1:
                                                         _a.sent();

package/build/commands/compile/compileCommand.js

@@ -62,6 +62,7 @@ var compile_1 = require("./compile");
 var path_1 = __importDefault(require("path"));
 var getDestinationPath_1 = require("./internal/getDestinationPath");
 var compileSingleFile_1 = require("./compileSingleFile");
+var utils_2 = require("@sasjs/utils");
 var CompileSubCommand;
 (function (CompileSubCommand) {
     CompileSubCommand["Job"] = "job";
@@ -121,7 +122,7 @@ var CompileCommand = /** @class */ (function (_super) {
                 var internal = [value, this.subCommand + "s"];
                 if (leafFolderName)
                     internal.push(leafFolderName);
-                outputPath = utils_1.getAbsolutePath(internal.join(path_1.default.sep), process.currentDir);
+                outputPath = utils_2.getAbsolutePath(internal.join(path_1.default.sep), process.currentDir);
             }
             else {
                 outputPath =

package/build/commands/compile/compileSingleFile.d.ts

@@ -1,4 +1,4 @@
-import { Target } from '@sasjs/utils/types';
+import { Target } from '@sasjs/utils';
 export declare function compileSingleFile(target: Target, subCommand: string | undefined, source: string, output: string, insertProgramVar?: boolean): Promise<{
     destinationPath: string;
 }>;

package/build/commands/compile/compileSingleFile.js

@@ -42,8 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileSingleFile = void 0;
 var path_1 = __importDefault(require("path"));
 var config_1 = require("../../utils/config");
-var utils_1 = require("../../utils/utils");
-var utils_2 = require("@sasjs/utils");
+var utils_1 = require("@sasjs/utils");
 var compileServiceFile_1 = require("./internal/compileServiceFile");
 var compileJobFile_1 = require("./internal/compileJobFile");
 var identifySasFile_1 = require("./internal/identifySasFile");
@@ -85,20 +84,20 @@ function compileSingleFile(target, subCommand, source, output, insertProgramVar)
                     leafFolderName = source.split(path_1.default.sep).pop();
                     outputPathParts.pop(), outputPathParts.pop();
                     parentOutputFolder = outputPathParts.join(path_1.default.sep);
-                    return [4 /*yield*/, utils_2.fileExists(parentOutputFolder)];
+                    return [4 /*yield*/, utils_1.fileExists(parentOutputFolder)];
                 case 4:
                     pathExists = _c.sent();
                     if (!pathExists) return [3 /*break*/, 6];
-                    return [4 /*yield*/, utils_2.deleteFolder(parentOutputFolder)];
+                    return [4 /*yield*/, utils_1.deleteFolder(parentOutputFolder)];
                 case 5:
                     _c.sent();
                     _c.label = 6;
-                case 6: return [4 /*yield*/, utils_2.createFolder(output)];
+                case 6: return [4 /*yield*/, utils_1.createFolder(output)];
                 case 7:
                     _c.sent();
                     sourceFileName = sourcePath.split(path_1.default.sep).pop();
                     destinationPath = path_1.default.join(output, sourceFileName);
-                    return [4 /*yield*/, utils_2.copy(sourcePath, destinationPath)];
+                    return [4 /*yield*/, utils_1.copy(sourcePath, destinationPath)];
                 case 8:
                     _c.sent();
                     sourceFileNameWithoutExt = sourceFileName.split('.')[0];
@@ -144,7 +143,7 @@ function validateSourcePath(path) {
                     isSourceFile = /\.sas$/i.test(path);
                     if (!isSourceFile)
                         return [2 /*return*/, false];
-                    return [4 /*yield*/, utils_2.fileExists(path)];
+                    return [4 /*yield*/, utils_1.fileExists(path)];
                 case 1: return [2 /*return*/, _a.sent()];
             }
         });

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

@@ -38,7 +38,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compareFolders = void 0;
 var utils_1 = require("@sasjs/utils");
-var compileTestFile_1 = require("./compileTestFile");
 var compareFolders = function (sourcePath, destinationPath, exceptions) { return __awaiter(void 0, void 0, void 0, function () {
     var sourcePathExists, destinationPathExists, sourceSubFolders, destinationSubFolders, sourceFiles, destinationFiles, areSubFoldersMatching, missingSubFolders, areFilesMatching, missingFiles;
     return __generator(this, function (_a) {
@@ -65,7 +64,7 @@ var compareFolders = function (sourcePath, destinationPath, exceptions) { return
             case 4:
                 destinationSubFolders = (_a.sent());
                 return [4 /*yield*/, utils_1.listFilesInFolder(sourcePath).then(function (files) {
-                        return files.filter(function (file) { return !compileTestFile_1.isTestFile(file); });
+                        return files.filter(function (file) { return !utils_1.isTestFile(file); });
                     })];
             case 5:
                 sourceFiles = (_a.sent());

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

@@ -45,7 +45,7 @@ function compileJobFile(target, filePath, macroFolders, programFolders, programV
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, loadDependencies_1.loadDependencies(target, filePath, macroFolders, programFolders, 'job')];
+                case 0: return [4 /*yield*/, loadDependencies_1.loadDependencies(target, filePath, macroFolders, programFolders, utils_1.isTestFile(filePath) ? utils_1.SASJsFileType.test : utils_1.SASJsFileType.job)];
                 case 1:
                     dependencies = _a.sent();
                     dependencies = "" + (programVar ? programVar + '\n' : '') + dependencies;

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

@@ -43,14 +43,13 @@ 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, compileTestFile_1.isTestFile(filePath) ? 'test' : undefined)];
+                case 0: return [4 /*yield*/, loadDependencies_1.loadDependencies(target, filePath, macroFolders, programFolders, utils_1.isTestFile(filePath) ? types_1.SASJsFileType.test : types_1.SASJsFileType.service)];
                 case 1:
                     dependencies = _a.sent();
                     return [4 /*yield*/, getServerType_1.getServerType(target)];

package/build/commands/compile/internal/compileTestFile.d.ts

@@ -2,6 +2,4 @@ import { Target } from '@sasjs/utils';
 export declare function compileTestFile(target: Target, filePath: string, testVar?: string, saveToRoot?: boolean, removeOriginalFile?: boolean): Promise<void>;
 export declare function moveTestFile(filePath: string): Promise<void>;
 export declare function copyTestMacroFiles(folderAbsolutePath: string): Promise<void>;
-export declare const testFileRegExp: RegExp;
-export declare const isTestFile: (fileName: string) => boolean;
 export declare const compileTestFlow: (target: Target) => Promise<void>;

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

@@ -60,7 +60,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compileTestFlow = exports.isTestFile = exports.testFileRegExp = exports.copyTestMacroFiles = exports.moveTestFile = exports.compileTestFile = void 0;
+exports.compileTestFlow = exports.copyTestMacroFiles = exports.moveTestFile = exports.compileTestFile = void 0;
 var types_1 = require("../../../types");
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
@@ -69,7 +69,6 @@ var file_1 = require("../../../utils/file");
 var chalk_1 = __importDefault(require("chalk"));
 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.projectDir, 'sasjsbuild', 'tests');
 };
@@ -85,12 +84,12 @@ function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFi
                 case 0:
                     _a = loadDependencies_1.loadDependencies;
                     _b = [target,
-                        utils_2.getAbsolutePath(filePath, process.projectDir)];
+                        utils_1.getAbsolutePath(filePath, process.projectDir)];
                     return [4 /*yield*/, config_1.getMacroFolders(target)];
                 case 1:
                     _b = _b.concat([_c.sent()]);
                     return [4 /*yield*/, config_1.getProgramFolders(target)];
-                case 2: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c.sent(), 'test']))];
+                case 2: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c.sent(), utils_1.SASJsFileType.test]))];
                 case 3:
                     dependencies = _c.sent();
                     return [4 /*yield*/, compileServiceFile_1.getPreCodeForServicePack(target.serverType)];
@@ -128,7 +127,7 @@ function moveTestFile(filePath) {
             switch (_a.label) {
                 case 0:
                     fileName = filePath.split(path_1.default.sep).pop();
-                    if (!exports.isTestFile(fileName))
+                    if (!utils_1.isTestFile(fileName))
                         return [2 /*return*/];
                     destinationPath = filePath.replace('sasjsbuild', 'sasjsbuild/tests');
                     testDestinationFolder = destinationPath
@@ -171,7 +170,7 @@ function copyTestMacroFiles(folderAbsolutePath) {
                 case 0: return [4 /*yield*/, utils_1.listFilesAndSubFoldersInFolder(folderAbsolutePath)];
                 case 1:
                     macroFiles = _a.sent();
-                    macroTestFiles = macroFiles.filter(function (item) { return exports.testFileRegExp.test(item); });
+                    macroTestFiles = macroFiles.filter(function (item) { return utils_1.testFileRegExp.test(item); });
                     return [4 /*yield*/, utils_1.asyncForEach(macroTestFiles, function (file) { return __awaiter(_this, void 0, void 0, function () {
                             var destinationFile;
                             return __generator(this, function (_a) {
@@ -197,9 +196,6 @@ function copyTestMacroFiles(folderAbsolutePath) {
     });
 }
 exports.copyTestMacroFiles = copyTestMacroFiles;
-exports.testFileRegExp = /\.test\.(\d+\.)?sas$/i;
-var isTestFile = function (fileName) { return exports.testFileRegExp.test(fileName); };
-exports.isTestFile = isTestFile;
 var compileTestFlow = function (target) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, buildDestinationFolder, buildDestinationTestFolder, testFiles, testFlow, testSetUp, testTearDown, testSetUpFileName_1, testTearDownFileName_1;
     var _b, _c;
@@ -278,14 +274,14 @@ var printTestCoverage = function (testFlow, buildDestinationFolder, target) { re
                                             shouldBeCovered = shouldBeCovered.split(path_1.default.sep).pop() || '';
                                         }
                                         if (testFlow.tests.find(function (testFile) {
-                                            var testCovering = testFile.replace(exports.testFileRegExp, '');
+                                            var testCovering = testFile.replace(utils_1.testFileRegExp, '');
                                             if (type === 'macros') {
                                                 testCovering = testCovering.split(path_1.default.sep).pop() || '';
                                             }
                                             if (testCovering === shouldBeCovered) {
                                                 extraTests = extraTests.filter(function (test) {
-                                                    return test.replace(exports.testFileRegExp, '') !==
-                                                        testFile.replace(exports.testFileRegExp, '');
+                                                    return test.replace(utils_1.testFileRegExp, '') !==
+                                                        testFile.replace(utils_1.testFileRegExp, '');
                                                 });
                                             }
                                             return testCovering === shouldBeCovered;
@@ -312,7 +308,7 @@ var printTestCoverage = function (testFlow, buildDestinationFolder, target) { re
                 return [4 /*yield*/, utils_1.asyncForEach(macroFolders, function (macroFolder) { return __awaiter(void 0, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, collectCoverage(macroFolder, 'macros', function (file) { return !exports.testFileRegExp.test(file); })];
+                                case 0: return [4 /*yield*/, collectCoverage(macroFolder, 'macros', function (file) { return !utils_1.testFileRegExp.test(file); })];
                                 case 1:
                                     _a.sent();
                                     return [2 /*return*/];
@@ -353,7 +349,7 @@ var printTestCoverage = function (testFlow, buildDestinationFolder, target) { re
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0: return [4 /*yield*/, utils_1.listFilesAndSubFoldersInFolder(macroFolder)];
-                                case 1: return [4 /*yield*/, (_a.sent()).filter(function (file) { return !exports.isTestFile(file); })];
+                                case 1: return [4 /*yield*/, (_a.sent()).filter(function (file) { return !utils_1.isTestFile(file); })];
                                 case 2:
                                     macros = _a.sent();
                                     macroTypeRegExp = new RegExp("^macros" + utils_1.pathSepEscaped);

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

@@ -58,8 +58,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllJobFolders = void 0;
+var utils_1 = require("@sasjs/utils");
 var config_1 = require("../../../utils/config");
-var utils_1 = require("../../../utils/utils");
 function getAllJobFolders(target) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {

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

@@ -58,8 +58,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllServiceFolders = void 0;
+var utils_1 = require("@sasjs/utils");
 var config_1 = require("../../../utils/config");
-var utils_1 = require("../../../utils/utils");
 function getAllServiceFolders(target) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {

package/build/commands/compile/internal/loadDependencies.d.ts

@@ -1,3 +1,2 @@
-import { Target } from '@sasjs/utils';
-export declare function loadDependencies(target: Target, filePath: string, macroFolders: string[], programFolders: string[], type?: string): Promise<string>;
-export declare const getVars: (varType: 'service' | 'job' | 'test', target: Target) => Promise<string>;
+import { Target, SASJsFileType } from '@sasjs/utils';
+export declare function loadDependencies(target: Target, filePath: string, macroFolders: string[], programFolders: string[], type: SASJsFileType): Promise<string>;