@sasjs/cli 4.0.7 → 4.1.1

package/build/commands/build/build.js

@@ -95,7 +95,7 @@ var compressAndSave_1 = require("../../utils/compressAndSave");
 var config_1 = require("../../utils/config");
 var file_1 = require("../../utils/file");
 var compile_1 = require("../compile/compile");
-var loadDependencies_1 = require("../compile/internal/loadDependencies");
+var internal_1 = require("../compile/internal");
 var config_2 = require("./internal/config");
 var getLaunchPageCode_1 = require("./internal/getLaunchPageCode");
 function build(target) {
@@ -550,7 +550,7 @@ var getDepsContent = function (deps, target, macroFolders) { return __awaiter(vo
         switch (_a.label) {
             case 0:
                 dependenciesContent = '';
-                compileTree = (0, loadDependencies_1.getCompileTree)(target);
+                compileTree = (0, internal_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) {
@@ -558,7 +558,7 @@ var getDepsContent = function (deps, target, macroFolders) { return __awaiter(vo
                                 case 0:
                                     _a = dependenciesContent;
                                     _b = '\n';
-                                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, fp, macroFolders, [], types_1.SASJsFileType.file, compileTree)];
+                                    return [4 /*yield*/, (0, internal_1.loadDependencies)(target, fp, macroFolders, [], types_1.SASJsFileType.file, compileTree)];
                                 case 1:
                                     dependenciesContent = _a + (_b +
                                         (_c.sent()));

package/build/commands/compile/compile.js

@@ -82,13 +82,7 @@ var config_1 = require("../../utils/config");
 var file_1 = require("../../utils/file");
 var web_1 = require("../web/web");
 var compileModule = __importStar(require("./compile"));
-var checkCompileStatus_1 = require("./internal/checkCompileStatus");
-var compileFile_1 = require("./internal/compileFile");
-var getAllFolders_1 = require("./internal/getAllFolders");
-var compileTestFile_1 = require("./internal/compileTestFile");
-var copySyncFolder_1 = require("./internal/copySyncFolder");
-var getDestinationPath_1 = require("./internal/getDestinationPath");
-var loadDependencies_1 = require("./internal/loadDependencies");
+var internal_1 = require("./internal");
 function compile(target, forceCompile) {
     var _a, _b;
     if (forceCompile === void 0) { forceCompile = false; }
@@ -97,7 +91,7 @@ function compile(target, forceCompile) {
         var _this = this;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, (0, checkCompileStatus_1.checkCompileStatus)(target, ['tests'])
+                case 0: return [4 /*yield*/, (0, internal_1.checkCompileStatus)(target, ['tests'])
                     // no need to compile again
                 ];
                 case 1:
@@ -115,7 +109,7 @@ function compile(target, forceCompile) {
                         })];
                 case 2:
                     _c.sent();
-                    compileTree = (0, loadDependencies_1.getCompileTree)(target);
+                    compileTree = (0, internal_1.getCompileTree)(target);
                     return [4 /*yield*/, compileModule.compileJobsServicesTests(target, compileTree)];
                 case 3:
                     _c.sent();
@@ -128,7 +122,7 @@ function compile(target, forceCompile) {
                     programFolders_1 = _c.sent();
                     return [4 /*yield*/, (0, utils_1.asyncForEach)(macroFolders, function (macroFolder) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, (0, compileTestFile_1.copyTestMacroFiles)(macroFolder)];
+                                case 0: return [4 /*yield*/, (0, internal_1.copyTestMacroFiles)(macroFolder)];
                                 case 1: return [2 /*return*/, _a.sent()];
                             }
                         }); }); })];
@@ -145,7 +139,7 @@ function compile(target, forceCompile) {
                     return [4 /*yield*/, (0, utils_1.asyncForEach)(macroTestFiles, function (macroTestFile) { return __awaiter(_this, void 0, void 0, function () {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, path_1.default.join(buildMacroTestFolder_1, macroTestFile), macroFolders, programFolders_1, undefined, compileTree, types_1.SASJsFileType.service, '')];
+                                    case 0: return [4 /*yield*/, (0, internal_1.compileFile)(target, path_1.default.join(buildMacroTestFolder_1, macroTestFile), macroFolders, programFolders_1, undefined, compileTree, types_1.SASJsFileType.service, '')];
                                     case 1: return [2 /*return*/, _a.sent()];
                                 }
                             });
@@ -156,7 +150,7 @@ function compile(target, forceCompile) {
                 case 11: return [4 /*yield*/, compileTree.saveTree()];
                 case 12:
                     _c.sent();
-                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFlow)(target).catch(function (err) { var _a; return (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Test flow compilation has failed.'); })];
+                    return [4 /*yield*/, (0, internal_1.compileTestFlow)(target).catch(function (err) { var _a; return (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Test flow compilation has failed.'); })];
                 case 13:
                     _c.sent();
                     return [4 /*yield*/, compileWeb(target)];
@@ -187,10 +181,10 @@ function copyFilesToBuildFolder(target) {
                     _c.label = 2;
                 case 2:
                     _c.trys.push([2, 7, , 8]);
-                    return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Service)];
+                    return [4 /*yield*/, (0, internal_1.getAllFolders)(target, internal_1.SasFileType.Service)];
                 case 3:
                     serviceFolders = _c.sent();
-                    return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Job)
+                    return [4 /*yield*/, (0, internal_1.getAllFolders)(target, internal_1.SasFileType.Job)
                         // REFACTOR
                     ];
                 case 4:
@@ -201,7 +195,7 @@ function copyFilesToBuildFolder(target) {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
-                                        destinationPath = (0, getDestinationPath_1.getDestinationServicePath)(serviceFolder);
+                                        destinationPath = (0, internal_1.getDestinationServicePath)(serviceFolder);
                                         return [4 /*yield*/, (0, utils_1.copy)(serviceFolder, destinationPath)];
                                     case 1:
                                         _a.sent();
@@ -217,7 +211,7 @@ function copyFilesToBuildFolder(target) {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
-                                        destinationPath = (0, getDestinationPath_1.getDestinationJobPath)(jobFolder);
+                                        destinationPath = (0, internal_1.getDestinationJobPath)(jobFolder);
                                         return [4 /*yield*/, (0, utils_1.copy)(jobFolder, destinationPath)];
                                     case 1:
                                         _a.sent();
@@ -246,10 +240,10 @@ function compileJobsServicesTests(target, compileTree) {
             switch (_a.label) {
                 case 0:
                     _a.trys.push([0, 13, , 14]);
-                    return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Service)];
+                    return [4 /*yield*/, (0, internal_1.getAllFolders)(target, internal_1.SasFileType.Service)];
                 case 1:
                     serviceFolders = _a.sent();
-                    return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Job)];
+                    return [4 /*yield*/, (0, internal_1.getAllFolders)(target, internal_1.SasFileType.Job)];
                 case 2:
                     jobFolders = _a.sent();
                     return [4 /*yield*/, (0, config_1.getMacroFolders)(target)];
@@ -265,7 +259,7 @@ function compileJobsServicesTests(target, compileTree) {
                 case 6:
                     testTearDown = _a.sent();
                     if (!testSetUp) return [3 /*break*/, 8];
-                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, testSetUp, '', true, false, compileTree).catch(function (err) {
+                    return [4 /*yield*/, (0, internal_1.compileTestFile)(target, testSetUp, '', true, false, compileTree).catch(function (err) {
                             throw (0, error_1.prefixMessage)(err, 'Test set up compilation has failed. ');
                         })];
                 case 7:
@@ -273,7 +267,7 @@ function compileJobsServicesTests(target, compileTree) {
                     _a.label = 8;
                 case 8:
                     if (!testTearDown) return [3 /*break*/, 10];
-                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, testTearDown, '', true, false, compileTree).catch(function (err) {
+                    return [4 /*yield*/, (0, internal_1.compileTestFile)(target, testTearDown, '', true, false, compileTree).catch(function (err) {
                             throw (0, error_1.prefixMessage)(err, 'Test tear down compilation has failed. ');
                         })];
                 case 9:
@@ -344,7 +338,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                destinationPath = (0, getDestinationPath_1.getDestinationServicePath)(serviceFolder);
+                destinationPath = (0, internal_1.getDestinationServicePath)(serviceFolder);
                 return [4 /*yield*/, (0, utils_1.listSubFoldersInFolder)(destinationPath)];
             case 1:
                 subFolders = _a.sent();
@@ -379,11 +373,11 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                                 case 0:
                                     filePath = path_1.default.join(destinationPath, fileName);
                                     if (!(0, utils_1.isTestFile)(filePath)) return [3 /*break*/, 2];
-                                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, filePath, '', false, undefined, compileTree)];
+                                    return [4 /*yield*/, (0, internal_1.compileTestFile)(target, filePath, '', false, undefined, compileTree)];
                                 case 1:
                                     _a.sent();
                                     return [3 /*break*/, 4];
-                                case 2: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, filePath, macroFolders, programFolders, undefined, compileTree, types_1.SASJsFileType.service, serviceFolder)];
+                                case 2: return [4 /*yield*/, (0, internal_1.compileFile)(target, filePath, macroFolders, programFolders, undefined, compileTree, types_1.SASJsFileType.service, serviceFolder)];
                                 case 3:
                                     _a.sent();
                                     _a.label = 4;
@@ -409,11 +403,11 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                                                     case 0:
                                                         filePath = path_1.default.join(destinationPath, subFolder, fileName);
                                                         if (!(0, utils_1.isTestFile)(filePath)) return [3 /*break*/, 2];
-                                                        return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, filePath, '', false, undefined, compileTree)];
+                                                        return [4 /*yield*/, (0, internal_1.compileTestFile)(target, filePath, '', false, undefined, compileTree)];
                                                     case 1:
                                                         _a.sent();
                                                         return [3 /*break*/, 4];
-                                                    case 2: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, filePath, macroFolders, programFolders, undefined, compileTree, types_1.SASJsFileType.service, sourceFolder)];
+                                                    case 2: return [4 /*yield*/, (0, internal_1.compileFile)(target, filePath, macroFolders, programFolders, undefined, compileTree, types_1.SASJsFileType.service, sourceFolder)];
                                                     case 3:
                                                         _a.sent();
                                                         _a.label = 4;
@@ -439,7 +433,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                destinationPath = (0, getDestinationPath_1.getDestinationJobPath)(jobFolder);
+                destinationPath = (0, internal_1.getDestinationJobPath)(jobFolder);
                 return [4 /*yield*/, (0, utils_1.listSubFoldersInFolder)(destinationPath)];
             case 1:
                 subFolders = _a.sent();
@@ -474,11 +468,11 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                                 case 0:
                                     filePath = path_1.default.join(destinationPath, fileName);
                                     if (!(0, utils_1.isTestFile)(fileName)) return [3 /*break*/, 2];
-                                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, filePath, '', false, undefined, compileTree)];
+                                    return [4 /*yield*/, (0, internal_1.compileTestFile)(target, filePath, '', false, undefined, compileTree)];
                                 case 1:
                                     _a.sent();
                                     return [3 /*break*/, 4];
-                                case 2: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, filePath, macroFolders, programFolders, undefined, compileTree, types_1.SASJsFileType.job, jobFolder)];
+                                case 2: return [4 /*yield*/, (0, internal_1.compileFile)(target, filePath, macroFolders, programFolders, undefined, compileTree, types_1.SASJsFileType.job, jobFolder)];
                                 case 3:
                                     _a.sent();
                                     _a.label = 4;
@@ -504,11 +498,11 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                                                     case 0:
                                                         filePath = path_1.default.join(destinationPath, subFolder, fileName);
                                                         if (!(0, utils_1.isTestFile)(filePath)) return [3 /*break*/, 2];
-                                                        return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, filePath, '', false, undefined, compileTree)];
+                                                        return [4 /*yield*/, (0, internal_1.compileTestFile)(target, filePath, '', false, undefined, compileTree)];
                                                     case 1:
                                                         _a.sent();
                                                         return [3 /*break*/, 4];
-                                                    case 2: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, filePath, macroFolders, programFolders, undefined, compileTree, types_1.SASJsFileType.job, sourcePath)];
+                                                    case 2: return [4 /*yield*/, (0, internal_1.compileFile)(target, filePath, macroFolders, programFolders, undefined, compileTree, types_1.SASJsFileType.job, sourcePath)];
                                                     case 3:
                                                         _a.sent();
                                                         _a.label = 4;
@@ -561,13 +555,13 @@ var syncFolder = function (target) { return __awaiter(void 0, void 0, void 0, fu
             case 0:
                 configuration = process.sasjsConfig;
                 if (!configuration.syncFolder) return [3 /*break*/, 2];
-                return [4 /*yield*/, (0, copySyncFolder_1.copySyncFolder)(configuration.syncFolder)];
+                return [4 /*yield*/, (0, internal_1.copySyncFolder)(configuration.syncFolder)];
             case 1:
                 _a.sent();
                 _a.label = 2;
             case 2:
                 if (!target.syncFolder) return [3 /*break*/, 4];
-                return [4 /*yield*/, (0, copySyncFolder_1.copySyncFolder)(target.syncFolder)];
+                return [4 /*yield*/, (0, internal_1.copySyncFolder)(target.syncFolder)];
             case 3:
                 _a.sent();
                 _a.label = 4;

package/build/commands/compile/compileCommand.js

@@ -67,6 +67,7 @@ var CompileSubCommand;
 (function (CompileSubCommand) {
     CompileSubCommand["Job"] = "job";
     CompileSubCommand["Service"] = "service";
+    CompileSubCommand["Test"] = "test";
     CompileSubCommand["Identify"] = "identify";
 })(CompileSubCommand || (CompileSubCommand = {}));
 var syntax = 'compile [subCommand]';
@@ -94,8 +95,9 @@ var CompileCommand = /** @class */ (function (_super) {
         var subCommand = args[3];
         if ([
             CompileSubCommand.Job,
-            CompileSubCommand.Identify,
-            CompileSubCommand.Service
+            CompileSubCommand.Service,
+            CompileSubCommand.Test,
+            CompileSubCommand.Identify
         ].includes(subCommand)) {
             parseOptions = subCommandParseOptions;
         }

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

@@ -1,4 +1,9 @@
 import { Target } from '@sasjs/utils';
+export declare enum CompileSingleFileSubCommands {
+    Job = "job",
+    Service = "service",
+    Test = "test"
+}
 export declare function compileSingleFile(target: Target, subCommand: string | undefined, source: string, output: string, insertProgramVar?: boolean, currentFolder?: string): Promise<{
     destinationPath: string;
 }>;

package/build/commands/compile/compileSingleFile.js

@@ -39,28 +39,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compileSingleFile = void 0;
+exports.compileSingleFile = exports.CompileSingleFileSubCommands = void 0;
 var path_1 = __importDefault(require("path"));
 var config_1 = require("../../utils/config");
 var utils_1 = require("@sasjs/utils");
-var compileFile_1 = require("./internal/compileFile");
-var identifySasFile_1 = require("./internal/identifySasFile");
-var loadDependencies_1 = require("./internal/loadDependencies");
+var error_1 = require("@sasjs/utils/error");
+var internal_1 = require("./internal");
+var CompileSingleFileSubCommands;
+(function (CompileSingleFileSubCommands) {
+    CompileSingleFileSubCommands["Job"] = "job";
+    CompileSingleFileSubCommands["Service"] = "service";
+    CompileSingleFileSubCommands["Test"] = "test";
+})(CompileSingleFileSubCommands = exports.CompileSingleFileSubCommands || (exports.CompileSingleFileSubCommands = {}));
+var isCompileSingleFileSubCommands = function (command) {
+    return Object.values(CompileSingleFileSubCommands).includes(command);
+};
 function compileSingleFile(target, subCommand, source, output, insertProgramVar, currentFolder) {
     var _a;
     if (subCommand === void 0) { subCommand = 'identify'; }
     if (insertProgramVar === void 0) { insertProgramVar = false; }
     return __awaiter(this, void 0, void 0, function () {
-        var subCommands, commandExample, sourcePath, outputPathParts, leafFolderName, parentOutputFolder, pathExists, sourceFileName, destinationPath, sourceFileNameWithoutExt, macroFolders, programFolders, psMaxOption, programVar, compileTree, sourceFolder, _b;
+        var commandExample, sourcePath, outputPathParts, leafFolderName, parentOutputFolder, pathExists, sourceFileName, destinationPath, sourceFileNameWithoutExt, macroFolders, programFolders, psMaxOption, programVar, compileTree, sourceFolder, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
-                    subCommands = {
-                        job: 'job',
-                        service: 'service'
-                    };
-                    if (!subCommands.hasOwnProperty(subCommand) && subCommand !== 'identify') {
-                        throw new Error("Unsupported context command. Supported commands are:\n".concat(Object.keys(subCommands).join('\n')));
+                    if (!isCompileSingleFileSubCommands(subCommand) &&
+                        subCommand !== 'identify') {
+                        throw new Error("Unsupported context command. Supported commands are:\n".concat(Object.values(CompileSingleFileSubCommands).join('\n')));
                     }
                     commandExample = 'sasjs compile <command> --source myjob.sas --target targetName -output /some/folder';
                     if (!source) {
@@ -71,18 +76,20 @@ function compileSingleFile(target, subCommand, source, output, insertProgramVar,
                     return [4 /*yield*/, validateSourcePath(sourcePath)];
                 case 1:
                     if (!(_c.sent())) {
-                        throw new Error("Provide a path to source file (eg '".concat(commandExample, "')"));
+                        throw new Error("Provide a valid path to source file (eg '".concat(commandExample, "')"));
                     }
                     if (!(subCommand === 'identify')) return [3 /*break*/, 3];
-                    return [4 /*yield*/, (0, identifySasFile_1.identifySasFile)(target, sourcePath)];
+                    return [4 /*yield*/, (0, internal_1.identifySasFile)(target, sourcePath).catch(function (err) {
+                            throw (0, error_1.prefixMessage)(err, 'Single file compilation failed. ');
+                        })];
                 case 2:
                     subCommand = _c.sent();
                     _c.label = 3;
                 case 3:
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Compiling source file:\n- ".concat(sourcePath));
                     outputPathParts = output.split(path_1.default.sep);
-                    leafFolderName = source.split(path_1.default.sep).pop();
                     outputPathParts.pop(), outputPathParts.pop();
+                    leafFolderName = source.split(path_1.default.sep).pop();
                     parentOutputFolder = outputPathParts.join(path_1.default.sep);
                     return [4 /*yield*/, (0, utils_1.fileExists)(parentOutputFolder)];
                 case 4:
@@ -111,28 +118,32 @@ function compileSingleFile(target, subCommand, source, output, insertProgramVar,
                     programVar = insertProgramVar
                         ? "%let _program=".concat(target.appLoc, "/").concat(subCommand, "s/").concat(leafFolderName, "/").concat(sourceFileNameWithoutExt, ";\n").concat(psMaxOption)
                         : "".concat(psMaxOption);
-                    compileTree = (0, loadDependencies_1.getCompileTree)(target);
+                    compileTree = (0, internal_1.getCompileTree)(target);
                     sourceFolder = sourcePath
                         .split(path_1.default.sep)
                         .slice(0, sourcePath.split(path_1.default.sep).length - 1)
                         .join(path_1.default.sep);
                     _b = subCommand;
                     switch (_b) {
-                        case subCommands.service: return [3 /*break*/, 11];
-                        case subCommands.job: return [3 /*break*/, 13];
+                        case CompileSingleFileSubCommands.Service: return [3 /*break*/, 11];
+                        case CompileSingleFileSubCommands.Job: return [3 /*break*/, 13];
+                        case CompileSingleFileSubCommands.Test: return [3 /*break*/, 15];
                     }
-                    return [3 /*break*/, 15];
-                case 11: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, destinationPath, macroFolders, programFolders, programVar, compileTree, utils_1.SASJsFileType.service, sourceFolder)];
+                    return [3 /*break*/, 17];
+                case 11: return [4 /*yield*/, (0, internal_1.compileFile)(target, destinationPath, macroFolders, programFolders, programVar, compileTree, utils_1.SASJsFileType.service, sourceFolder)];
                 case 12:
                     _c.sent();
-                    return [3 /*break*/, 16];
-                case 13: return [4 /*yield*/, (0, compileFile_1.compileFile)(target, destinationPath, macroFolders, programFolders, programVar, compileTree, utils_1.SASJsFileType.job, sourceFolder)];
+                    return [3 /*break*/, 17];
+                case 13: return [4 /*yield*/, (0, internal_1.compileFile)(target, destinationPath, macroFolders, programFolders, programVar, compileTree, utils_1.SASJsFileType.job, sourceFolder)];
                 case 14:
                     _c.sent();
-                    return [3 /*break*/, 16];
-                case 15: return [3 /*break*/, 16];
-                case 16: return [4 /*yield*/, compileTree.saveTree()];
-                case 17:
+                    return [3 /*break*/, 17];
+                case 15: return [4 /*yield*/, (0, internal_1.compileTestFile)(target, sourcePath, programVar, undefined, false, compileTree, destinationPath)];
+                case 16:
+                    _c.sent();
+                    return [3 /*break*/, 17];
+                case 17: return [4 /*yield*/, compileTree.saveTree()];
+                case 18:
                     _c.sent();
                     return [2 /*return*/, { destinationPath: destinationPath }];
             }

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

@@ -38,9 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkCompileStatus = void 0;
 var utils_1 = require("@sasjs/utils");
-var compareFolders_1 = require("./compareFolders");
-var getAllFolders_1 = require("./getAllFolders");
-var getDestinationPath_1 = require("./getDestinationPath");
+var _1 = require("./");
 function checkCompileStatus(target, exceptions) {
     return __awaiter(this, void 0, void 0, function () {
         var buildDestinationFolder, pathExists, _a, areServiceFoldersMatching, serviceReasons, _b, areJobFoldersMatching, jobReasons, compiled;
@@ -86,7 +84,7 @@ var checkServiceFolders = function (target, exceptions) { return __awaiter(void
     var serviceFolders, areServiceFoldersMatching, reasons;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Service)];
+            case 0: return [4 /*yield*/, (0, _1.getAllFolders)(target, _1.SasFileType.Service)];
             case 1:
                 serviceFolders = _a.sent();
                 areServiceFoldersMatching = true;
@@ -96,8 +94,8 @@ var checkServiceFolders = function (target, exceptions) { return __awaiter(void
                         return __generator(this, function (_b) {
                             switch (_b.label) {
                                 case 0:
-                                    destinationPath = (0, getDestinationPath_1.getDestinationServicePath)(serviceFolder);
-                                    return [4 /*yield*/, (0, compareFolders_1.compareFolders)(serviceFolder, destinationPath, exceptions)];
+                                    destinationPath = (0, _1.getDestinationServicePath)(serviceFolder);
+                                    return [4 /*yield*/, (0, _1.compareFolders)(serviceFolder, destinationPath, exceptions)];
                                 case 1:
                                     _a = _b.sent(), equal = _a.equal, reason = _a.reason;
                                     areServiceFoldersMatching = areServiceFoldersMatching && equal;
@@ -125,7 +123,7 @@ var checkJobFolders = function (target, exceptions) { return __awaiter(void 0, v
     var jobFolders, areJobFoldersMatching, reasons;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Job)];
+            case 0: return [4 /*yield*/, (0, _1.getAllFolders)(target, _1.SasFileType.Job)];
             case 1:
                 jobFolders = _a.sent();
                 areJobFoldersMatching = true;
@@ -135,8 +133,8 @@ var checkJobFolders = function (target, exceptions) { return __awaiter(void 0, v
                         return __generator(this, function (_b) {
                             switch (_b.label) {
                                 case 0:
-                                    destinationPath = (0, getDestinationPath_1.getDestinationJobPath)(jobFolder);
-                                    return [4 /*yield*/, (0, compareFolders_1.compareFolders)(jobFolder, destinationPath, exceptions)];
+                                    destinationPath = (0, _1.getDestinationJobPath)(jobFolder);
+                                    return [4 /*yield*/, (0, _1.compareFolders)(jobFolder, destinationPath, exceptions)];
                                 case 1:
                                     _a = _b.sent(), equal = _a.equal, reason = _a.reason;
                                     areJobFoldersMatching = areJobFoldersMatching && equal;

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

@@ -42,7 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileFile = void 0;
 var utils_1 = require("@sasjs/utils");
 var types_1 = require("@sasjs/utils/types");
-var loadDependencies_1 = require("./loadDependencies");
+var _1 = require("./");
 var path_1 = __importDefault(require("path"));
 /**
  * Compiles file dependencies.
@@ -61,7 +61,7 @@ function compileFile(target, filePath, macroFolders, programFolders, programVar,
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, sourceFolder
+                case 0: return [4 /*yield*/, (0, _1.loadDependencies)(target, sourceFolder
                         ? path_1.default.join(sourceFolder, filePath.split(path_1.default.sep).pop())
                         : filePath, macroFolders, programFolders, (0, utils_1.isTestFile)(filePath) ? types_1.SASJsFileType.test : fileType, compileTree)];
                 case 1:

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

@@ -1,5 +1,5 @@
 import { CompileTree, Configuration, Target } from '@sasjs/utils';
 import { TestFlow } from '../../../types';
-export declare function compileTestFile(target: Target, filePath: string, testVar: string | undefined, saveToRoot: boolean | undefined, removeOriginalFile: boolean | undefined, compileTree: CompileTree): Promise<void>;
+export declare function compileTestFile(target: Target, filePath: string, testVar: string | undefined, saveToRoot: boolean | undefined, removeOriginalFile: boolean | undefined, compileTree: CompileTree, destinationPath?: string): Promise<void>;
 export declare function copyTestMacroFiles(folderAbsolutePath: string): Promise<void>;
 export declare const compileTestFlow: (target: Target, config?: Configuration) => Promise<TestFlow | undefined>;

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

@@ -71,18 +71,18 @@ var path_1 = __importDefault(require("path"));
 var types_1 = require("../../../types");
 var config_1 = require("../../../utils/config");
 var file_1 = require("../../../utils/file");
-var loadDependencies_1 = require("./loadDependencies");
+var _1 = require("./");
 var getFileName = function (filePath) { return path_1.default.parse(filePath).base; };
-function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFile, compileTree) {
+function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFile, compileTree, destinationPath) {
     if (testVar === void 0) { testVar = ''; }
     if (saveToRoot === void 0) { saveToRoot = true; }
     if (removeOriginalFile === void 0) { removeOriginalFile = true; }
     return __awaiter(this, void 0, void 0, function () {
-        var dependencies, _a, _b, _c, buildDestinationFolder, buildDestinationTestFolder, buildDestinationFolderName, destinationPath;
+        var dependencies, _a, _b, _c, buildDestinationFolder, buildDestinationTestFolder, buildDestinationFolderName;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
-                    _a = loadDependencies_1.loadDependencies;
+                    _a = _1.loadDependencies;
                     _b = [target,
                         (0, utils_1.getAbsolutePath)(filePath, process.projectDir)];
                     return [4 /*yield*/, (0, config_1.getMacroFolders)(target)];
@@ -98,16 +98,18 @@ function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFi
                     buildDestinationFolderName = buildDestinationFolder
                         .split(path_1.default.sep)
                         .pop();
-                    destinationPath = path_1.default.join(buildDestinationTestFolder, saveToRoot
-                        ? filePath.split(path_1.default.sep).pop() || ''
-                        : filePath
-                            .split(path_1.default.sep)
-                            .reduce(function (acc, item, i, arr) {
-                            return acc.length
-                                ? __spreadArray(__spreadArray([], __read(acc), false), [item], false) : arr[i - 1] === buildDestinationFolderName
-                                ? __spreadArray(__spreadArray([], __read(acc), false), [item], false) : acc;
-                        }, [])
-                            .join(path_1.default.sep));
+                    destinationPath =
+                        destinationPath ||
+                            path_1.default.join(buildDestinationTestFolder, saveToRoot
+                                ? filePath.split(path_1.default.sep).pop() || ''
+                                : filePath
+                                    .split(path_1.default.sep)
+                                    .reduce(function (acc, item, i, arr) {
+                                    return acc.length
+                                        ? __spreadArray(__spreadArray([], __read(acc), false), [item], false) : arr[i - 1] === buildDestinationFolderName
+                                        ? __spreadArray(__spreadArray([], __read(acc), false), [item], false) : acc;
+                                }, [])
+                                    .join(path_1.default.sep));
                     return [4 /*yield*/, (0, utils_1.createFile)(destinationPath, dependencies)];
                 case 4:
                     _d.sent();

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

@@ -1,6 +1,7 @@
 import { Configuration, Target } from '@sasjs/utils';
 export declare enum SasFileType {
     Service = "service",
-    Job = "job"
+    Job = "job",
+    Test = "test"
 }
-export declare const getAllFolders: (target: Target, type: SasFileType, rootConfig?: Configuration) => Promise<string[]>;
+export declare const getAllFolders: (target: Target, type: SasFileType.Service | SasFileType.Job, rootConfig?: Configuration) => Promise<string[]>;

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

@@ -67,6 +67,7 @@ var SasFileType;
 (function (SasFileType) {
     SasFileType["Service"] = "service";
     SasFileType["Job"] = "job";
+    SasFileType["Test"] = "test";
 })(SasFileType = exports.SasFileType || (exports.SasFileType = {}));
 var getAllFolders = function (target, type, rootConfig) { return __awaiter(void 0, void 0, void 0, function () {
     var configuration, allFolders, config, folders, addFolders, buildSourceFolder;

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

@@ -1,2 +1,3 @@
 import { Target } from '@sasjs/utils';
-export declare const identifySasFile: (target: Target, sourcePath: string) => Promise<'job' | 'service'>;
+import { SasFileType } from './';
+export declare const identifySasFile: (target: Target, sourcePath: string) => Promise<SasFileType>;

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

@@ -35,26 +35,35 @@ 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 });
 exports.identifySasFile = void 0;
-var getAllFolders_1 = require("./getAllFolders");
+var utils_1 = require("@sasjs/utils");
+var _1 = require("./");
+var path_1 = __importDefault(require("path"));
 var identifySasFile = function (target, sourcePath) { return __awaiter(void 0, void 0, void 0, function () {
-    var serviceFolders, isService, jobFolders, isJob;
+    var serviceFolders, jobFolders;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Service)];
+            case 0:
+                if ((0, utils_1.isTestFile)(sourcePath.split(path_1.default.sep).pop())) {
+                    return [2 /*return*/, _1.SasFileType.Test];
+                }
+                return [4 /*yield*/, (0, _1.getAllFolders)(target, _1.SasFileType.Service)];
             case 1:
                 serviceFolders = _a.sent();
-                isService = serviceFolders.find(function (folder) { return sourcePath.includes(folder); });
-                if (isService)
-                    return [2 /*return*/, 'service'];
-                return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Job)];
+                if (serviceFolders.find(function (folder) { return sourcePath.includes(folder); })) {
+                    return [2 /*return*/, _1.SasFileType.Service];
+                }
+                return [4 /*yield*/, (0, _1.getAllFolders)(target, _1.SasFileType.Job)];
             case 2:
                 jobFolders = _a.sent();
-                isJob = jobFolders.find(function (folder) { return sourcePath.includes(folder); });
-                if (isJob)
-                    return [2 /*return*/, 'job'];
-                throw 'Unable to identify file as Service or Job';
+                if (jobFolders.find(function (folder) { return sourcePath.includes(folder); })) {
+                    return [2 /*return*/, _1.SasFileType.Job];
+                }
+                throw "Unable to identify file as ".concat(_1.SasFileType.Service, ", ").concat(_1.SasFileType.Job, " or ").concat(_1.SasFileType.Test);
         }
     });
 }); };

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

@@ -0,0 +1,9 @@
+export * from './checkCompileStatus';
+export * from './compareFolders';
+export * from './compileFile';
+export * from './compileTestFile';
+export * from './copySyncFolder';
+export * from './getAllFolders';
+export * from './getDestinationPath';
+export * from './identifySasFile';
+export * from './loadDependencies';