@sasjs/cli 6.4.8 → 6.6.0

package/build/commands/compile/compile.js

@@ -79,6 +79,17 @@ 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 __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -97,57 +108,67 @@ var compileModule = __importStar(require("./compile"));
 var internal_1 = require("./internal");
 function compile(target_1) {
     return __awaiter(this, arguments, void 0, function (target, forceCompile) {
-        var result, compileTree, macroFolders, programFolders_1, buildMacroTestFolder_1, macroTestFiles;
+        var result, compileTree, _a, _b, macroFolders, programFolders_1, buildMacroTestFolder_1, macroTestFiles;
         var _this = this;
-        var _a, _b;
+        var _c, _d, _e;
         if (forceCompile === void 0) { forceCompile = false; }
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0: return [4 /*yield*/, (0, internal_1.checkCompileStatus)(target, ['tests'])
                     // no need to compile again
                 ];
                 case 1:
-                    result = _c.sent();
+                    result = _f.sent();
                     // no need to compile again
                     if (result.compiled && !forceCompile) {
-                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info('Skipping compilation.');
-                        (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info(result.message);
+                        (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info('Skipping compilation.');
+                        (_d = process.logger) === null || _d === void 0 ? void 0 : _d.info(result.message);
                         return [2 /*return*/];
                     }
+                    if (!result.compiled)
+                        (_e = process.logger) === null || _e === void 0 ? void 0 : _e.info("Compiling: ".concat(result.message));
                     return [4 /*yield*/, compileModule.copyFilesToBuildFolder(target).catch(function (error) {
                             var _a;
                             (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Project compilation has failed.');
                             throw error;
                         })];
                 case 2:
-                    _c.sent();
+                    _f.sent();
                     compileTree = (0, internal_1.getCompileTree)(target);
                     return [4 /*yield*/, compileModule.compileJobsServicesTests(target, compileTree)];
                 case 3:
-                    _c.sent();
-                    return [4 /*yield*/, (0, config_1.getMacroFolders)(target)];
+                    _f.sent();
+                    _a = internal_1.writeCompileManifest;
+                    return [4 /*yield*/, (0, internal_1.getManifestFolders)(target)];
                 case 4:
-                    macroFolders = _c.sent();
-                    if (!macroFolders.length) return [3 /*break*/, 11];
+                    _b = [_f.sent()];
+                    return [4 /*yield*/, (0, internal_1.getManifestStamps)(target)];
+                case 5: return [4 /*yield*/, _a.apply(void 0, _b.concat([_f.sent()]))];
+                case 6:
+                    _f.sent();
+                    return [4 /*yield*/, (0, config_1.getMacroFolders)(target)];
+                case 7:
+                    macroFolders = _f.sent();
+                    if (!macroFolders.length) return [3 /*break*/, 14];
                     return [4 /*yield*/, (0, config_1.getProgramFolders)(target)];
-                case 5:
-                    programFolders_1 = _c.sent();
+                case 8:
+                    programFolders_1 = _f.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, internal_1.copyTestMacroFiles)(macroFolder)];
                                 case 1: return [2 /*return*/, _a.sent()];
                             }
                         }); }); })];
-                case 6:
-                    _c.sent();
+                case 9:
+                    _f.sent();
                     buildMacroTestFolder_1 = path_1.default.join(process.sasjsConstants.buildDestinationTestFolder, 'macros');
                     return [4 /*yield*/, (0, utils_1.folderExists)(buildMacroTestFolder_1)];
-                case 7:
-                    if (!_c.sent()) return [3 /*break*/, 11];
+                case 10:
+                    if (!_f.sent()) return [3 /*break*/, 14];
                     return [4 /*yield*/, (0, utils_1.listFilesAndSubFoldersInFolder)(buildMacroTestFolder_1)];
-                case 8: return [4 /*yield*/, (_c.sent()).filter(file_1.isSasFile)];
-                case 9:
-                    macroTestFiles = _c.sent();
+                case 11: return [4 /*yield*/, (_f.sent()).filter(file_1.isSasFile)];
+                case 12:
+                    macroTestFiles = _f.sent();
                     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) {
@@ -156,21 +177,24 @@ function compile(target_1) {
                                 }
                             });
                         }); })];
-                case 10:
-                    _c.sent();
-                    _c.label = 11;
-                case 11: return [4 /*yield*/, compileTree.saveTree()];
-                case 12:
-                    _c.sent();
-                    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();
+                    _f.sent();
+                    _f.label = 14;
+                case 14: return [4 /*yield*/, compileTree.saveTree()];
+                case 15:
+                    _f.sent();
+                    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 16:
+                    _f.sent();
                     return [4 /*yield*/, compileWeb(target)];
-                case 14:
-                    _c.sent();
+                case 17:
+                    _f.sent();
                     return [4 /*yield*/, syncFolder(target)];
-                case 15:
-                    _c.sent();
+                case 18:
+                    _f.sent();
+                    return [4 /*yield*/, logCopiedFileCounts()];
+                case 19:
+                    _f.sent();
                     return [2 /*return*/];
             }
         });
@@ -316,6 +340,117 @@ function compileJobsServicesTests(target, compileTree) {
         });
     });
 }
+/**
+ * Reports what the build folder holds, SAS and otherwise.
+ *
+ * A JS-only services folder is a legitimate shape for a SASjs server, and it is
+ * also the shape where a silent "compiled" would hide an empty build - the
+ * counts make the difference between "0 and 45" and "nothing happened" visible.
+ */
+var logCopiedFileCounts = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, buildDestinationServicesFolder, buildDestinationJobsFolder, countFiles, services, jobs, sas, runtime, runtimeNote;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                _a = process.sasjsConstants, buildDestinationServicesFolder = _a.buildDestinationServicesFolder, buildDestinationJobsFolder = _a.buildDestinationJobsFolder;
+                countFiles = function (folder) { return __awaiter(void 0, void 0, void 0, function () {
+                    var counts, walk;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                counts = { sas: 0, runtime: 0 };
+                                return [4 /*yield*/, (0, utils_1.folderExists)(folder)];
+                            case 1:
+                                if (!(_a.sent()))
+                                    return [2 /*return*/, counts];
+                                walk = function (dir) { return __awaiter(void 0, void 0, void 0, function () {
+                                    var _a, _b, fileName, e_1_1, _c, _d, subFolder, e_2_1;
+                                    var e_1, _e, e_2, _f;
+                                    return __generator(this, function (_g) {
+                                        switch (_g.label) {
+                                            case 0:
+                                                _g.trys.push([0, 5, 6, 7]);
+                                                return [4 /*yield*/, (0, utils_1.listFilesInFolder)(dir)];
+                                            case 1:
+                                                _a = __values.apply(void 0, [_g.sent()]), _b = _a.next();
+                                                _g.label = 2;
+                                            case 2:
+                                                if (!!_b.done) return [3 /*break*/, 4];
+                                                fileName = _b.value;
+                                                if ((0, file_1.isSasFile)(fileName))
+                                                    counts.sas++;
+                                                else
+                                                    counts.runtime++;
+                                                _g.label = 3;
+                                            case 3:
+                                                _b = _a.next();
+                                                return [3 /*break*/, 2];
+                                            case 4: return [3 /*break*/, 7];
+                                            case 5:
+                                                e_1_1 = _g.sent();
+                                                e_1 = { error: e_1_1 };
+                                                return [3 /*break*/, 7];
+                                            case 6:
+                                                try {
+                                                    if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                                                }
+                                                finally { if (e_1) throw e_1.error; }
+                                                return [7 /*endfinally*/];
+                                            case 7:
+                                                _g.trys.push([7, 13, 14, 15]);
+                                                return [4 /*yield*/, (0, utils_1.listSubFoldersInFolder)(dir)];
+                                            case 8:
+                                                _c = __values.apply(void 0, [_g.sent()]), _d = _c.next();
+                                                _g.label = 9;
+                                            case 9:
+                                                if (!!_d.done) return [3 /*break*/, 12];
+                                                subFolder = _d.value;
+                                                return [4 /*yield*/, walk(path_1.default.join(dir, subFolder))];
+                                            case 10:
+                                                _g.sent();
+                                                _g.label = 11;
+                                            case 11:
+                                                _d = _c.next();
+                                                return [3 /*break*/, 9];
+                                            case 12: return [3 /*break*/, 15];
+                                            case 13:
+                                                e_2_1 = _g.sent();
+                                                e_2 = { error: e_2_1 };
+                                                return [3 /*break*/, 15];
+                                            case 14:
+                                                try {
+                                                    if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
+                                                }
+                                                finally { if (e_2) throw e_2.error; }
+                                                return [7 /*endfinally*/];
+                                            case 15: return [2 /*return*/];
+                                        }
+                                    });
+                                }); };
+                                return [4 /*yield*/, walk(folder)];
+                            case 2:
+                                _a.sent();
+                                return [2 /*return*/, counts];
+                        }
+                    });
+                }); };
+                return [4 /*yield*/, countFiles(buildDestinationServicesFolder)];
+            case 1:
+                services = _c.sent();
+                return [4 /*yield*/, countFiles(buildDestinationJobsFolder)];
+            case 2:
+                jobs = _c.sent();
+                sas = services.sas + jobs.sas;
+                runtime = services.runtime + jobs.runtime;
+                runtimeNote = runtime === 0
+                    ? ''
+                    : "; ".concat(runtime, " ").concat(runtime === 1 ? 'file' : 'files', " copied through unchanged (not SAS programs)");
+                (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Compiled ".concat(sas, " SAS ").concat(sas === 1 ? 'file' : 'files').concat(runtimeNote, "."));
+                return [2 /*return*/];
+        }
+    });
+}); };
 function recreateBuildFolder() {
     return __awaiter(this, void 0, void 0, function () {
         var buildDestinationFolder, pathExists;

package/build/commands/compile/compileCommand.js

@@ -152,7 +152,7 @@ var CompileCommand = /** @class */ (function (_super) {
                     case 1:
                         target = (_a.sent()).target;
                         buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
-                        return [4 /*yield*/, (0, compile_1.compile)(target, true)
+                        return [4 /*yield*/, (0, compile_1.compile)(target)
                                 .then(function () {
                                 var _a;
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("The project was successfully compiled for ".concat(target.serverType, " using target '").concat(target.name, "'\nThe compile output is located in the ").concat(buildDestinationFolder, " directory."));

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

@@ -41,14 +41,14 @@ var utils_1 = require("@sasjs/utils");
 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;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var buildDestinationFolder, pathExists, _a, areServiceFoldersMatching, serviceReasons, _b, areJobFoldersMatching, jobReasons, reasons, changedFiles, _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
                     return [4 /*yield*/, (0, utils_1.folderExists)(buildDestinationFolder)];
                 case 1:
-                    pathExists = _c.sent();
+                    pathExists = _e.sent();
                     if (!pathExists) {
                         return [2 /*return*/, {
                                 compiled: false,
@@ -57,16 +57,35 @@ function checkCompileStatus(target, exceptions) {
                     }
                     return [4 /*yield*/, checkServiceFolders(target, exceptions)];
                 case 2:
-                    _a = _c.sent(), areServiceFoldersMatching = _a.areServiceFoldersMatching, serviceReasons = _a.reasons;
+                    _a = _e.sent(), areServiceFoldersMatching = _a.areServiceFoldersMatching, serviceReasons = _a.reasons;
                     return [4 /*yield*/, checkJobFolders(target, exceptions)];
                 case 3:
-                    _b = _c.sent(), areJobFoldersMatching = _b.areJobFoldersMatching, jobReasons = _b.reasons;
-                    compiled = areServiceFoldersMatching && areJobFoldersMatching;
+                    _b = _e.sent(), areJobFoldersMatching = _b.areJobFoldersMatching, jobReasons = _b.reasons;
+                    if (!areServiceFoldersMatching || !areJobFoldersMatching) {
+                        reasons = [];
+                        if (!areServiceFoldersMatching)
+                            reasons.push("Missing Services: ".concat(serviceReasons.join(', ')));
+                        if (!areJobFoldersMatching)
+                            reasons.push("Missing jobs: ".concat(jobReasons.join(', ')));
+                        return [2 /*return*/, { compiled: false, message: reasons.join('\n') }];
+                    }
+                    _c = _1.getChangedFiles;
+                    return [4 /*yield*/, (0, _1.getManifestFolders)(target)];
+                case 4:
+                    _d = [_e.sent()];
+                    return [4 /*yield*/, (0, _1.getManifestStamps)(target)];
+                case 5: return [4 /*yield*/, _c.apply(void 0, _d.concat([_e.sent()]))];
+                case 6:
+                    changedFiles = _e.sent();
+                    if (changedFiles.length) {
+                        return [2 /*return*/, {
+                                compiled: false,
+                                message: "Changed since the last compile: ".concat(changedFiles.join(', '))
+                            }];
+                    }
                     return [2 /*return*/, {
-                            compiled: compiled,
-                            message: compiled
-                                ? 'All services and jobs are already present.'
-                                : "Missing Services: ".concat(serviceReasons.join(', '), "\nMissing jobs: ").concat(jobReasons.join(', '))
+                            compiled: true,
+                            message: 'All services and jobs are already present and up to date.'
                         }];
             }
         });

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

@@ -58,14 +58,23 @@ var path_1 = __importDefault(require("path"));
 function compileFile(target_1, filePath_1, macroFolders_1, programFolders_1) {
     return __awaiter(this, arguments, void 0, function (target, filePath, macroFolders, programFolders, programVar, compileTree, fileType, sourceFolder) {
         var dependencies;
+        var _a;
         if (programVar === void 0) { programVar = ''; }
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                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)];
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    // Only SAS programs are compiled. Anything else - a `.js` stored program, a
+                    // web asset, a file a deploy script reads - is already in the build folder
+                    // from the folder copy, and parsing it as SAS would corrupt it.
+                    if ((0, _1.shouldPassThrough)(path_1.default.basename(filePath))) {
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Copying ".concat(path_1.default.basename(filePath), " to the build folder unchanged - it is not a SAS program."));
+                        return [2 /*return*/];
+                    }
+                    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:
-                    dependencies = _a.sent();
+                    dependencies = _b.sent();
                     if (fileType === types_1.SASJsFileType.service) {
                         dependencies = "".concat(programVar, "\n").concat(dependencies);
                     }
@@ -74,7 +83,7 @@ function compileFile(target_1, filePath_1, macroFolders_1, programFolders_1) {
                     }
                     return [4 /*yield*/, (0, utils_1.createFile)(filePath, dependencies)];
                 case 2:
-                    _a.sent();
+                    _b.sent();
                     return [2 /*return*/];
             }
         });

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

@@ -0,0 +1,36 @@
+import { Target } from '@sasjs/utils';
+/**
+ * Hashes of the source files the last compile read, keyed by absolute path.
+ *
+ * The build folder cannot be used as the record of what was compiled: `compile`
+ * transforms the files it writes (macros and includes are inlined), so a
+ * compiled service never matches its source byte for byte. Comparing content
+ * hashes against a manifest written at the end of a successful compile is what
+ * makes "the source changed" detectable without the reader passing a force flag.
+ */
+export type CompileManifest = Record<string, string>;
+export declare const getManifestPath: () => string;
+export declare const writeCompileManifest: (folders: string[], stampFiles?: string[]) => Promise<void>;
+export declare const readCompileManifest: () => Promise<CompileManifest | null>;
+/**
+ * Names the source files that have changed since the last successful compile:
+ * edited content, new files, and files the manifest has never seen.
+ */
+export declare const getChangedFiles: (folders: string[], stampFiles?: string[]) => Promise<string[]>;
+/**
+ * Every folder whose contents feed the build: the services and jobs, plus the
+ * web app and the sync folder when the target uses them. A skip is only safe if
+ * it accounts for all of them - a frontend change with an unchanged services
+ * folder must still rebuild.
+ */
+export declare const getManifestFolders: (target: Target) => Promise<string[]>;
+/**
+ * Individual files whose change invalidates the whole build.
+ *
+ * The test programs are not inside a service folder, and the dependency
+ * manifests are the record of which @sasjs/core a build used: a core bump
+ * arrives as an install, so the version in `node_modules/@sasjs/core` and the
+ * lockfile are the signals - walking every macro of the library would cost
+ * more than it catches.
+ */
+export declare const getManifestStamps: (target: Target) => Promise<string[]>;