@sasjs/cli 6.2.3 → 6.2.5

package/build/commands/compile/spec/compileSingleFile.spec.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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -68,13 +79,21 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+var path_1 = __importDefault(require("path"));
+var fs_1 = __importDefault(require("fs"));
+var os_1 = __importDefault(require("os"));
 var compileSingleFile_1 = require("../compileSingleFile");
 var identifySasFileModule = __importStar(require("../internal/identifySasFile"));
 var fileModule = __importStar(require("@sasjs/utils/file"));
 var configModule = __importStar(require("../../../utils/config"));
 var loadDependenciesModule = __importStar(require("../internal/loadDependencies"));
 var compileTestFileModule = __importStar(require("../internal/compileTestFile"));
+var compileFileModule = __importStar(require("../internal/compileFile"));
+var getAllFoldersModule = __importStar(require("../internal/getAllFolders"));
 var internal_1 = require("../internal");
 describe('compileSingleFile', function () {
     it('should throw an error provided not supported subcommand', function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -140,6 +159,9 @@ describe('compileSingleFile', function () {
                     jest
                         .spyOn(compileTestFileModule, 'compileTestFile')
                         .mockImplementation(function () { return Promise.resolve(); });
+                    jest
+                        .spyOn(getAllFoldersModule, 'getAllFolders')
+                        .mockImplementation(function () { return Promise.resolve(['testCurrentDir']); });
                     jest.spyOn(identifySasFileModule, 'identifySasFile');
                     return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({}, 'identify', testFile, 'testOutput', false, 'testCurrentDir')];
                 case 1:
@@ -169,4 +191,296 @@ describe('compileSingleFile', function () {
             }
         });
     }); });
+    describe('destination folder', function () {
+        var projectRoot = 'project';
+        var originalConstants = process.sasjsConstants;
+        var source = path_1.default.join('sasjs', 'jobs', 'daily', 'myjob.sas');
+        beforeEach(function () {
+            process.sasjsConstants = {
+                buildDestinationJobsFolder: path_1.default.join('project', 'sasjsbuild', 'jobs'),
+                buildDestinationServicesFolder: path_1.default.join('project', 'sasjsbuild', 'services')
+            };
+            jest.spyOn(fileModule, 'fileExists').mockResolvedValue(true);
+            jest.spyOn(fileModule, 'deleteFolder').mockResolvedValue(undefined);
+            jest.spyOn(fileModule, 'createFolder').mockResolvedValue(undefined);
+            jest.spyOn(fileModule, 'copy').mockResolvedValue(undefined);
+            jest
+                .spyOn(configModule, 'getMacroFolders')
+                .mockImplementation(function () { return Promise.resolve([]); });
+            jest
+                .spyOn(configModule, 'getProgramFolders')
+                .mockImplementation(function () { return Promise.resolve([]); });
+            jest
+                .spyOn(loadDependenciesModule, 'getCompileTree')
+                .mockImplementation(function () { return ({ saveTree: function () { return Promise.resolve(); } }); });
+            jest
+                .spyOn(getAllFoldersModule, 'getAllFolders')
+                .mockImplementation(function (_target, type) {
+                return Promise.resolve(type === 'job'
+                    ? [path_1.default.join(projectRoot, 'sasjs', 'jobs', 'daily')]
+                    : [path_1.default.join(projectRoot, 'sasjs', 'services', 'example')]);
+            });
+            jest
+                .spyOn(compileFileModule, 'compileFile')
+                .mockImplementation(function () { return Promise.resolve(); });
+            jest
+                .spyOn(compileTestFileModule, 'compileTestFile')
+                .mockImplementation(function () { return Promise.resolve(); });
+        });
+        afterEach(function () {
+            process.sasjsConstants = originalConstants;
+        });
+        it('should send an identified job to the jobs folder', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var destinationPath;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        jest
+                            .spyOn(identifySasFileModule, 'identifySasFile')
+                            .mockImplementation(function () { return Promise.resolve(internal_1.SasFileType.Job); });
+                        return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({}, 'identify', source, undefined, false, projectRoot)];
+                    case 1:
+                        destinationPath = (_a.sent()).destinationPath;
+                        expect(destinationPath).toEqual(path_1.default.join('project', 'sasjsbuild', 'jobs', 'daily', 'myjob.sas'));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should send an identified service to the services folder', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var serviceSource, destinationPath;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        jest
+                            .spyOn(identifySasFileModule, 'identifySasFile')
+                            .mockImplementation(function () { return Promise.resolve(internal_1.SasFileType.Service); });
+                        serviceSource = path_1.default.join('sasjs', 'services', 'example', 'myService.sas');
+                        return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({}, 'identify', serviceSource, undefined, false, projectRoot)];
+                    case 1:
+                        destinationPath = (_a.sent()).destinationPath;
+                        expect(destinationPath).toEqual(path_1.default.join('project', 'sasjsbuild', 'services', 'example', 'myService.sas'));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should point _program at the leaf folder of the source', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var compileFileSpy, programVar;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        compileFileSpy = jest
+                            .spyOn(compileFileModule, 'compileFile')
+                            .mockImplementation(function () { return Promise.resolve(); });
+                        return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({ appLoc: '/Public/app' }, 'job', source, undefined, true, projectRoot)];
+                    case 1:
+                        _a.sent();
+                        programVar = compileFileSpy.mock.calls[0][4];
+                        expect(programVar).toContain('%let _program=/Public/app/jobs/daily/myjob;');
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should file a test under tests/<where the test lives>', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var serviceTest, destinationPath;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        serviceTest = path_1.default.join('sasjs', 'services', 'example', 'check.test.sas');
+                        process.sasjsConstants = __assign(__assign({}, process.sasjsConstants), { buildDestinationTestFolder: path_1.default.join('project', 'sasjsbuild', 'tests') });
+                        return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({}, 'test', serviceTest, undefined, false, projectRoot)];
+                    case 1:
+                        destinationPath = (_a.sent()).destinationPath;
+                        expect(destinationPath).toEqual(path_1.default.join('project', 'sasjsbuild', 'tests', 'services', 'example', 'check.test.sas'));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should take the test kind from a tests/<type> path', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var destinationPath;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        process.sasjsConstants = __assign(__assign({}, process.sasjsConstants), { buildDestinationTestFolder: path_1.default.join('project', 'sasjsbuild', 'tests') });
+                        return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({}, 'test', path_1.default.join('sasjs', 'tests', 'jobs', 'load.test.sas'), undefined, false, projectRoot)];
+                    case 1:
+                        destinationPath = (_a.sent()).destinationPath;
+                        expect(destinationPath).toEqual(path_1.default.join('project', 'sasjsbuild', 'tests', 'jobs', 'load.test.sas'));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should write below the output base when one is given', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var destinationPath;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({}, 'job', source, path_1.default.join('/tmp', 'out'), false, projectRoot)];
+                    case 1:
+                        destinationPath = (_a.sent()).destinationPath;
+                        expect(destinationPath).toEqual(path_1.default.join('/tmp', 'out', 'jobs', 'daily', 'myjob.sas'));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should keep a dotted file name in _program', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var compileFileSpy;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        compileFileSpy = jest
+                            .spyOn(compileFileModule, 'compileFile')
+                            .mockImplementation(function () { return Promise.resolve(); });
+                        return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({ appLoc: '/Public/app' }, 'job', path_1.default.join('sasjs', 'jobs', 'daily', 'load.daily.sas'), undefined, true, projectRoot)];
+                    case 1:
+                        _a.sent();
+                        expect(compileFileSpy.mock.calls[0][4]).toContain('%let _program=/Public/app/jobs/daily/load.daily;');
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should refuse a sub command it does not know', function () { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        jest
+                            .spyOn(identifySasFileModule, 'identifySasFile')
+                            .mockImplementation(function () { return Promise.resolve('nonsense'); });
+                        return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)({}, 'identify', source, undefined, false, projectRoot)).rejects.toThrow('Single file compilation failed. Unsupported sub command: nonsense')];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should refuse a test it cannot file under any tree', function () { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)({}, 'test', path_1.default.join('elsewhere', 'loose.test.sas'), undefined, false, projectRoot)).rejects.toThrow(/Cannot tell which test tree/)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should delete nothing, so sibling compiled files survive', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var deleteFolderSpy, createFolderSpy;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        deleteFolderSpy = jest.spyOn(fileModule, 'deleteFolder');
+                        createFolderSpy = jest.spyOn(fileModule, 'createFolder');
+                        return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({}, 'job', source, undefined, false, projectRoot)];
+                    case 1:
+                        _a.sent();
+                        expect(deleteFolderSpy).not.toHaveBeenCalled();
+                        // the folder is created if missing (mkdir is recursive and idempotent)
+                        expect(createFolderSpy).toHaveBeenCalledWith(path_1.default.join('project', 'sasjsbuild', 'jobs', 'daily'));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+    });
+    describe('sibling files on disk', function () {
+        var originalConstants = process.sasjsConstants;
+        var root;
+        beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        jest.restoreAllMocks();
+                        return [4 /*yield*/, fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'sasjs-single-'))];
+                    case 1:
+                        root = _a.sent();
+                        process.sasjsConstants = {
+                            buildDestinationJobsFolder: path_1.default.join(root, 'sasjsbuild', 'jobs'),
+                            buildDestinationServicesFolder: path_1.default.join(root, 'sasjsbuild', 'services')
+                        };
+                        jest
+                            .spyOn(configModule, 'getMacroFolders')
+                            .mockImplementation(function () { return Promise.resolve([]); });
+                        jest
+                            .spyOn(configModule, 'getProgramFolders')
+                            .mockImplementation(function () { return Promise.resolve([]); });
+                        jest
+                            .spyOn(loadDependenciesModule, 'getCompileTree')
+                            .mockImplementation(function () { return ({ saveTree: function () { return Promise.resolve(); } }); });
+                        jest
+                            .spyOn(getAllFoldersModule, 'getAllFolders')
+                            .mockImplementation(function () {
+                            return Promise.resolve([path_1.default.join(root, 'sasjs', 'jobs', 'daily')]);
+                        });
+                        jest
+                            .spyOn(compileFileModule, 'compileFile')
+                            .mockImplementation(function () { return Promise.resolve(); });
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        process.sasjsConstants = originalConstants;
+                        return [4 /*yield*/, fs_1.default.promises.rm(root, { recursive: true, force: true })];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should keep a sibling compiled file in the same leaf folder', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var sourceFolder, written;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        sourceFolder = path_1.default.join(root, 'sasjs', 'jobs', 'daily');
+                        return [4 /*yield*/, fs_1.default.promises.mkdir(sourceFolder, { recursive: true })];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, fs_1.default.promises.writeFile(path_1.default.join(sourceFolder, 'first.sas'), '/**\n  @file first.sas\n**/\n')];
+                    case 2:
+                        _a.sent();
+                        return [4 /*yield*/, fs_1.default.promises.writeFile(path_1.default.join(sourceFolder, 'second.sas'), '/**\n  @file second.sas\n**/\n')];
+                    case 3:
+                        _a.sent();
+                        return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({}, 'job', path_1.default.join(sourceFolder, 'first.sas'))];
+                    case 4:
+                        _a.sent();
+                        return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({}, 'job', path_1.default.join(sourceFolder, 'second.sas'))];
+                    case 5:
+                        _a.sent();
+                        return [4 /*yield*/, fs_1.default.promises.readdir(path_1.default.join(root, 'sasjsbuild', 'jobs', 'daily'))];
+                    case 6:
+                        written = _a.sent();
+                        expect(written.sort()).toEqual(['first.sas', 'second.sas']);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should point _program at the folder the file is written to', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var compileFileSpy, sourceFile, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        compileFileSpy = jest.spyOn(compileFileModule, 'compileFile');
+                        sourceFile = path_1.default.join(root, 'loose.sas');
+                        return [4 /*yield*/, fs_1.default.promises.writeFile(sourceFile, '/**\n  @file loose.sas\n**/\n')];
+                    case 1:
+                        _b.sent();
+                        return [4 /*yield*/, (0, compileSingleFile_1.compileSingleFile)({ appLoc: '/Public/app' }, 'job', sourceFile, undefined, true)
+                            // not below a configured folder, so it lands in the type folder itself
+                        ];
+                    case 2:
+                        _b.sent();
+                        // not below a configured folder, so it lands in the type folder itself
+                        _a = expect;
+                        return [4 /*yield*/, fs_1.default.promises.readFile(path_1.default.join(root, 'sasjsbuild', 'jobs', 'loose.sas'), 'utf8')];
+                    case 3:
+                        // not below a configured folder, so it lands in the type folder itself
+                        _a.apply(void 0, [_b.sent()]).toBeDefined();
+                        expect(compileFileSpy.mock.calls[0][4]).toContain('%let _program=/Public/app/jobs/loose;');
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+    });
 });

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

@@ -204,6 +204,26 @@ describe('loadDependencies', function () {
             }
         });
     }); });
+    test('it should name the file when a file header is truncated', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var filePath, error;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    filePath = path_1.default.join(__dirname, './truncated-header.sas');
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, filePath, [], [], utils_1.SASJsFileType.file, compileTree).catch(function (e) { return e; })
+                        // The wording belongs to @sasjs/utils; this pins the file name the CLI adds
+                        // and the shape of the diagnostic, not the library's phrasing.
+                    ];
+                case 1:
+                    error = _a.sent();
+                    // The wording belongs to @sasjs/utils; this pins the file name the CLI adds
+                    // and the shape of the diagnostic, not the library's phrasing.
+                    expect(error instanceof Error ? error.message : String(error)).toMatch(new RegExp("^".concat(filePath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), ": ")));
+                    expect(error instanceof Error ? error.message : String(error)).toMatch(/\bline \d+/);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     test("it should load dependencies for a job ".concat(utils_1.DependencyHeader.Macro), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {

package/build/commands/help/help.js

@@ -92,9 +92,12 @@ function printHelpText() {
                 },
                 {
                     name: 'compile',
-                    title: 'compile <targetName>',
+                    title: 'compile [subCommand]',
                     description: [
-                        "compiles the services specified in the ".concat(chalk_1.default.cyanBright('serviceFolders'), " property of the 'serviceConfig' in your target and common configuration.")
+                        "compiles the services specified in the ".concat(chalk_1.default.cyanBright('serviceFolders'), " property of the 'serviceConfig' in your target and common configuration."),
+                        "A single file is compiled by naming its type as a sub command - ".concat(chalk_1.default.cyanBright('job'), ", ").concat(chalk_1.default.cyanBright('service'), ", ").concat(chalk_1.default.cyanBright('test'), " or ").concat(chalk_1.default.cyanBright('identify'), ", which works the type out from the file itself - together with ").concat(chalk_1.default.cyanBright('--source'), " (or ").concat(chalk_1.default.cyanBright('-s'), ")."),
+                        "The compiled file is written to the ".concat(chalk_1.default.cyanBright('jobs'), " or ").concat(chalk_1.default.cyanBright('services'), " folder of sasjsbuild for its type, or below ").concat(chalk_1.default.cyanBright('--output'), " (or ").concat(chalk_1.default.cyanBright('-o'), ") when given."),
+                        "command example: sasjs compile identify --source sasjs/jobs/daily/load.sas --target myTarget"
                     ]
                 },
                 {

package/build/commands/run/run.js

@@ -72,7 +72,6 @@ var utils_1 = require("@sasjs/utils");
 var __1 = require("../");
 var utils_2 = require("../../utils/");
 var axios_1 = __importDefault(require("axios"));
-var internal_1 = require("../compile/internal");
 var saveLog_1 = require("../../utils/saveLog");
 var parseSourceFile_1 = require("../../utils/parseSourceFile");
 /**
@@ -84,7 +83,7 @@ var parseSourceFile_1 = require("../../utils/parseSourceFile");
  */
 function runSasCode(target_1, filePath_1) {
     return __awaiter(this, arguments, void 0, function (target, filePath, compile, logFile, source) {
-        var isTempFile, sourcefilePathParts, sourceFolderPath, sasFilePath, sasFileContent, linesToExecute, macroVars, macroVarStatements, _a;
+        var isTempFile, sasFilePath, sasFileContent, linesToExecute, macroVars, macroVarStatements, _a;
         var _b;
         var _c;
         if (compile === void 0) { compile = false; }
@@ -101,10 +100,8 @@ function runSasCode(target_1, filePath_1) {
                 case 2:
                     if (!compile) return [3 /*break*/, 5];
                     if (!/\.sas$/i.test(filePath)) return [3 /*break*/, 4];
-                    sourcefilePathParts = path_1.default.normalize(filePath).split(path_1.default.sep);
-                    sourcefilePathParts.splice(-1, 1);
-                    sourceFolderPath = sourcefilePathParts.join(path_1.default.sep);
-                    return [4 /*yield*/, (0, __1.compileSingleFile)(target, 'identify', filePath, (0, internal_1.getDestinationServicePath)(sourceFolderPath), true)];
+                    ;
+                    return [4 /*yield*/, (0, __1.compileSingleFile)(target, 'identify', filePath, undefined, true)];
                 case 3:
                     (filePath = (_d.sent()).destinationPath);
                     (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("File Compiled and placed at: ".concat(filePath, " ."));

package/package.json

@@ -71,8 +71,8 @@
   },
   "dependencies": {
     "@sasjs/adapter": "^5.1.1",
-    "@sasjs/core": "^6.0.0",
-    "@sasjs/utils": "^4.1.0",
+    "@sasjs/core": "^6.1.1",
+    "@sasjs/utils": "^4.1.1",
     "axios": "1.20.0",
     "chalk": "4.1.2",
     "dotenv": "18.0.8",
@@ -94,7 +94,7 @@
     "@babel/preset-env": "7.29.7",
     "@babel/preset-typescript": "7.29.7",
     "@nogoo9/gitleaks": "8.30.1-post.2",
-    "@sasjs/lint": "^4.3.2",
+    "@sasjs/lint": "^4.4.0",
     "@types/debug": "4.1.13",
     "@types/find": "0.2.4",
     "@types/jest": "30.0.0",
@@ -124,7 +124,7 @@
     "nanoid": "3.3.18"
   },
   "peerDependencies": {
-    "@sasjs/lint": "^4.3.2"
+    "@sasjs/lint": "^4.4.0"
   },
-  "version": "6.2.3"
+  "version": "6.2.5"
 }